diff options
Diffstat (limited to 'pkgs')
82 files changed, 619 insertions, 2680 deletions
diff --git a/pkgs/applications/blockchains/chia-dev-tools/default.nix b/pkgs/applications/blockchains/chia-dev-tools/default.nix deleted file mode 100644 index 287a711d23489..0000000000000 --- a/pkgs/applications/blockchains/chia-dev-tools/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ lib -, fetchFromGitHub -, substituteAll -, python3Packages -, chia -, -}: -python3Packages.buildPythonApplication rec { - pname = "chia-dev-tools"; - version = "1.1.5"; - - src = fetchFromGitHub { - owner = "Chia-Network"; - repo = pname; - rev = "v${version}"; - hash = "sha256-qWWLQ+SkoRu5cLytwwrslqsKORy+4ebO8brULEFGaF0="; - }; - - patches = [ - (substituteAll { - src = ./fix-paths.patch; - inherit chia; - }) - ]; - - postPatch = '' - substituteInPlace setup.py \ - --replace "==" ">=" - ''; - - nativeBuildInputs = [ - python3Packages.setuptools-scm - ]; - - # give a hint to setuptools-scm on package version - SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}"; - - propagatedBuildInputs = with python3Packages; [ - anyio - (toPythonModule chia) - pytest # required at runtime by the "test" command - pytest-asyncio - pytimeparse - ]; - - nativeCheckInputs = with python3Packages; [ - pytestCheckHook - ]; - - preCheck = '' - export HOME=$(mktemp -d) - ''; - postCheck = "unset HOME"; - - disabledTests = [ - "test_spendbundles" - ]; - - meta = with lib; { - homepage = "https://www.chia.net/"; - description = "Utility for developing in the Chia ecosystem: Chialisp functions, object inspection, RPC client and more"; - license = with licenses; [ asl20 ]; - maintainers = teams.chia.members; - }; -} diff --git a/pkgs/applications/blockchains/chia-dev-tools/fix-paths.patch b/pkgs/applications/blockchains/chia-dev-tools/fix-paths.patch deleted file mode 100644 index 9fb8fefe197af..0000000000000 --- a/pkgs/applications/blockchains/chia-dev-tools/fix-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cdv/cmds/sim_utils.py b/cdv/cmds/sim_utils.py -index e59ba8f..20912ff 100644 ---- a/cdv/cmds/sim_utils.py -+++ b/cdv/cmds/sim_utils.py -@@ -67,7 +67,7 @@ async def start_async(root_path: Path, group: Any, restart: bool) -> None: - - from chia.cmds.start_funcs import async_start - -- sys.argv[0] = str(Path(sys.executable).parent / "chia") # this gives the correct path to the chia executable -+ sys.argv[0] = "@chia@/bin/chia" # this gives the correct path to the chia executable - if root_path.exists(): - config = load_config(root_path, "config.yaml") - await async_start(root_path, config, group, restart) diff --git a/pkgs/applications/blockchains/chia-plotter/default.nix b/pkgs/applications/blockchains/chia-plotter/default.nix deleted file mode 100644 index 5c0fa18739fb6..0000000000000 --- a/pkgs/applications/blockchains/chia-plotter/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ lib -, fetchFromGitHub -, stdenv -, libsodium -, cmake -, substituteAll -, python3Packages -}: - -stdenv.mkDerivation { - pname = "chia-plotter"; - version = "1.1.8"; - - src = fetchFromGitHub { - owner = "madMAx43v3r"; - repo = "chia-plotter"; - rev = "9d7fd929919d1adde6404cb4718a665a81bcef6d"; - sha256 = "sha256-TMAly+Qof2DHPRHqE1nZuHQaCeMo0jEd8MWy4OlXrcs="; - fetchSubmodules = true; - }; - - patches = [ - # prevent CMake from trying to get libraries on the Internet - (substituteAll { - src = ./dont_fetch_dependencies.patch; - pybind11_src = python3Packages.pybind11.src; - relic_src = fetchFromGitHub { - owner = "Chia-Network"; - repo = "relic"; - rev = "1d98e5abf3ca5b14fd729bd5bcced88ea70ecfd7"; - hash = "sha256-IfTD8DvTEXeLUoKe4Ejafb+PEJW5DV/VXRYuutwGQHU="; - }; - sodium_src = fetchFromGitHub { - owner = "AmineKhaldi"; - repo = "libsodium-cmake"; - rev = "f73a3fe1afdc4e37ac5fe0ddd401bf521f6bba65"; # pinned by upstream - sha256 = "sha256-lGz7o6DQVAuEc7yTp8bYS2kwjzHwGaNjugDi1ruRJOA="; - fetchSubmodules = true; - }; - }) - ]; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ libsodium ]; - - # These flags come from the upstream build script: - # https://github.com/madMAx43v3r/chia-plotter/blob/974d6e5f1440f68c48492122ca33828a98864dfc/make_devel.sh#L7 - CXXFLAGS = "-O3 -fmax-errors=1"; - cmakeFlags = [ - "-DARITH=easy" - "-DBUILD_BLS_PYTHON_BINDINGS=false" - "-DBUILD_BLS_TESTS=false" - "-DBUILD_BLS_BENCHMARKS=false" - ]; - - installPhase = '' - runHook preInstall - - install -D -m 755 chia_plot $out/bin/chia_plot - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://github.com/madMAx43v3r/chia-plotter"; - description = "New implementation of a chia plotter which is designed as a processing pipeline"; - license = licenses.gpl3Only; - platforms = platforms.linux; - maintainers = with maintainers; [ ilyakooo0 ]; - mainProgram = "chia_plot"; - }; -} diff --git a/pkgs/applications/blockchains/chia-plotter/dont_fetch_dependencies.patch b/pkgs/applications/blockchains/chia-plotter/dont_fetch_dependencies.patch deleted file mode 100644 index b7474af4c9634..0000000000000 --- a/pkgs/applications/blockchains/chia-plotter/dont_fetch_dependencies.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff --git a/lib/bls-signatures/python-bindings/CMakeLists.txt b/lib/bls-signatures/python-bindings/CMakeLists.txt -index 255e3bb..5f99c3a 100644 ---- a/lib/bls-signatures/python-bindings/CMakeLists.txt -+++ b/lib/bls-signatures/python-bindings/CMakeLists.txt -@@ -6,8 +6,7 @@ include(FetchContent) - - FetchContent_Declare( - pybind11 -- GIT_REPOSITORY https://github.com/pybind/pybind11.git -- GIT_TAG v2.6.2 -+ SOURCE_DIR @pybind11_src@ - ) - FetchContent_MakeAvailable(pybind11 relic) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6922167..23d8da6 100644 ---- a/lib/bls-signatures/CMakeLists.txt -+++ b/lib/bls-signatures/CMakeLists.txt -@@ -31,29 +31,18 @@ set(CMAKE_MODULE_PATH - include(FetchContent) - - FetchContent_Declare(Sodium -- GIT_REPOSITORY https://github.com/AmineKhaldi/libsodium-cmake.git -- # Latest commit at the moment this was added here -- # Anchored to libsodium v1.0.18 -- GIT_TAG f73a3fe1afdc4e37ac5fe0ddd401bf521f6bba65 -+ URL @sodium_src@ - ) - set(SODIUM_PCH "on" CACHE STRING "") - set(SODIUM_DISABLE_TESTS "on" CACHE STRING "") - set(SODIUM_CHIA_MINIMAL "on" CACHE STRING "") - FetchContent_MakeAvailable(Sodium) - --if (DEFINED ENV{RELIC_MAIN}) -- set(RELIC_GIT_TAG "origin/main") --else () -- # This is currently anchored to upstream aecdcae7956f542fbee2392c1f0feb0a8ac41dc5 -- set(RELIC_GIT_TAG "1d98e5abf3ca5b14fd729bd5bcced88ea70ecfd7") --endif () -- - message(STATUS "Relic will be built from: ${RELIC_GIT_TAG}") - - FetchContent_Declare( - relic -- GIT_REPOSITORY https://github.com/Chia-Network/relic.git -- GIT_TAG ${RELIC_GIT_TAG} -+ SOURCE_DIR @relic_src@ - ) - - # Relic related options - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 970ec74..948441a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -38,6 +38,7 @@ include_directories( - ${BLAKE3_PATH} - ${CMAKE_BINARY_DIR}/_deps/relic-src/include - ${CMAKE_BINARY_DIR}/_deps/relic-build/include -+ @relic_src@/include - ) - - IF (WIN32) diff --git a/pkgs/applications/blockchains/chia/default.nix b/pkgs/applications/blockchains/chia/default.nix deleted file mode 100644 index a07a0ea1e2814..0000000000000 --- a/pkgs/applications/blockchains/chia/default.nix +++ /dev/null @@ -1,98 +0,0 @@ -{ lib -, cacert -, fetchFromGitHub -, python3Packages -}: - -let chia = python3Packages.buildPythonApplication rec { - pname = "chia"; - version = "1.7.0"; - - src = fetchFromGitHub { - owner = "Chia-Network"; - repo = "chia-blockchain"; - rev = version; - fetchSubmodules = true; - hash = "sha256-hsh2HHpm103JfUTPwk+8zIkhVrglIP8xMovFIibn8+g="; - }; - - postPatch = '' - substituteInPlace setup.py \ - --replace "==" ">=" - - cp ${cacert}/etc/ssl/certs/ca-bundle.crt mozilla-ca/cacert.pem - ''; - - nativeBuildInputs = [ - python3Packages.setuptools-scm - ]; - - # give a hint to setuptools-scm on package version - SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}"; - - propagatedBuildInputs = with python3Packages; [ - aiofiles - aiohttp - aiosqlite - bitstring - blspy - chiapos - chiavdf - chiabip158 - chia-rs - click - clvm - clvm-rs - clvm-tools - clvm-tools-rs - colorama - colorlog - concurrent-log-handler - cryptography - dnslib - dnspython - fasteners - filelock - keyrings-cryptfile - psutil - pyyaml - setproctitle - setuptools # needs pkg_resources at runtime - sortedcontainers - watchdog - websockets - zstd - ]; - - nativeCheckInputs = with python3Packages; [ - pytestCheckHook - ]; - - # Testsuite is expensive and non-deterministic, so it is available in - # passthru.tests instead. - doCheck = false; - - disabledTests = [ - "test_spend_through_n" - "test_spend_zero_coin" - "test_default_cached_master_passphrase" - "test_using_legacy_keyring" - ]; - - preCheck = '' - export HOME=`mktemp -d` - ''; - - passthru.tests = { - chiaWithTests = chia.overrideAttrs (_: { doCheck = true; }); - }; - - meta = with lib; { - homepage = "https://www.chia.net/"; - description = "Chia is a modern cryptocurrency built from scratch, designed to be efficient, decentralized, and secure."; - license = with licenses; [ asl20 ]; - maintainers = teams.chia.members; - platforms = platforms.all; - }; -}; -in chia diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 6b2e7aac485bb..0abcd3c744d6c 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3951,6 +3951,23 @@ let }; }; + ziglang.vscode-zig = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-zig"; + publisher = "ziglang"; + version = "0.5.1"; + sha256 = "sha256-ygxvkewK5Tf1zNIXxzu6D/tKYNVcNsU9cKij7d5aRdQ="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/ziglang.vscode-zig/changelog"; + description = "Zig support for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ziglang.vscode-zig"; + homepage = "https://github.com/ziglang/vscode-zig"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.wackbyte ]; + }; + }; + zxh404.vscode-proto3 = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-proto3"; diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index 07069dce1ac3b..fb954cef5c658 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "dasel"; - version = "2.4.1"; + version = "2.5.0"; src = fetchFromGitHub { owner = "TomWright"; repo = "dasel"; rev = "v${version}"; - hash = "sha256-zxTT/CkSbH40R7itXAx0zD+haHOoMep/W4KfalJQ/8w="; + hash = "sha256-frd4jNn5uruz9oX40ly/AR5I/uKRIfQ8IjOlIvlsOlY="; }; - vendorHash = "sha256-CbR0uHtha2OoHW9mcB1I2lGJbjerbZARVN/mTstv/Y0="; + vendorHash = "sha256-B3d+pbk0smBXqcJnac5he0TZPLiT1cLtz02OAGfqhC0="; ldflags = [ "-s" "-w" "-X github.com/tomwright/dasel/v2/internal.Version=${version}" diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 0c9907764f225..8114f2ecb416c 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -32,6 +32,9 @@ , tbb_2021_8 , wxGTK32 , xorg +, libbgcode +, heatshrink +, catch2 , fetchpatch , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd , wxGTK-override ? null @@ -68,7 +71,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "prusa-slicer"; - version = "2.6.1"; + version = "2.7.0"; + + src = fetchFromGitHub { + owner = "prusa3d"; + repo = "PrusaSlicer"; + hash = "sha256-S0z2v6knkQ+xlABB1zedEGtlxA/65X/vxLh304StfbE="; + rev = "version_${finalAttrs.version}"; + }; nativeBuildInputs = [ cmake @@ -102,6 +112,9 @@ stdenv.mkDerivation (finalAttrs: { tbb_2021_8 wxGTK-override' xorg.libX11 + libbgcode + heatshrink + catch2 ] ++ lib.optionals withSystemd [ systemd ]; @@ -143,21 +156,6 @@ stdenv.mkDerivation (finalAttrs: { --replace "#ifdef __APPLE__" "#if 0" ''; - patches = [ - # wxWidgets: CheckResizerFlags assert fix - (fetchpatch { - url = "https://github.com/prusa3d/PrusaSlicer/commit/24a5ebd65c9d25a0fd69a3716d079fd1b00eb15c.patch"; - hash = "sha256-MNGtaI7THu6HEl9dMwcO1hkrCtIkscoNh4ulA2cKtZA="; - }) - ]; - - src = fetchFromGitHub { - owner = "prusa3d"; - repo = "PrusaSlicer"; - hash = "sha256-t5lnBL7SZVfyR680ZK29YXgE3pag+uVv4+BGJZq40/A="; - rev = "version_${finalAttrs.version}"; - }; - cmakeFlags = [ "-DSLIC3R_STATIC=0" "-DSLIC3R_FHS=1" diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index ffe1786be32ec..4396d7e85d419 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -236,6 +236,15 @@ buildStdenv.mkDerivation { ++ lib.optional (lib.versionAtLeast version "111") ./env_var_for_system_dir-ff111.patch ++ lib.optional (lib.versionAtLeast version "96" && lib.versionOlder version "121") ./no-buildconfig-ffx96.patch ++ lib.optional (lib.versionAtLeast version "121") ./no-buildconfig-ffx121.patch + ++ lib.optionals (lib.versionAtLeast version "120" && lib.versionOlder version "120.0.1") [ + (fetchpatch { + # Do not crash on systems without an expected statically assumed page size. + # https://phabricator.services.mozilla.com/D194458 + name = "mozbz1866025.patch"; + url = "https://hg.mozilla.org/mozilla-central/raw-rev/42c80086da4468f407648f2f57a7222aab2e9951"; + hash = "sha256-cWOyvjIPUU1tavPRqg61xJ53XE4EJTdsFzadfVxyTyM="; + }) + ] ++ extraPatches; postPatch = '' diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 801e1ca0ad407..4386e998801a3 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -3,20 +3,13 @@ { firefox = buildMozillaMach rec { pname = "firefox"; - version = "120.0"; + version = "120.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "31d5f9e1d4173280c8de6d9b8551bc6bba5e2c49b84f944f50d42002d5b39c2fb743bc130f26c81160388a102b8301b94a0a378ecdfa6f943860f971a860df8c"; + sha512 = "dd0e3eb234d58c39431d1f100834ef4bcc8cfb89ff471a37b948eda4dd3874b63b1979cda39a0db0dd3b4a579b5f09a7d2d1f39d26fd9f2b8d5635e4b8738b6c"; }; extraPatches = [ - (fetchpatch { - # Do not crash on systems without an expected statically assumed page size. - # https://phabricator.services.mozilla.com/D194458 - name = "mozbz1866025.patch"; - url = "https://hg.mozilla.org/mozilla-central/raw-rev/42c80086da4468f407648f2f57a7222aab2e9951"; - hash = "sha256-cWOyvjIPUU1tavPRqg61xJ53XE4EJTdsFzadfVxyTyM="; - }) ]; meta = { diff --git a/pkgs/applications/science/biology/kent/default.nix b/pkgs/applications/science/biology/kent/default.nix index f1e891bb85aa1..b6e4661ccfd61 100644 --- a/pkgs/applications/science/biology/kent/default.nix +++ b/pkgs/applications/science/biology/kent/default.nix @@ -24,16 +24,12 @@ stdenv.mkDerivation rec { buildInputs = [ libpng libuuid zlib bzip2 xz openssl curl libmysqlclient ]; - patchPhase = '' - runHook prePatch - + postPatch = '' substituteInPlace ./src/checkUmask.sh \ --replace "/bin/bash" "${bash}/bin/bash" substituteInPlace ./src/hg/sqlEnvTest.sh \ --replace "which mysql_config" "${which}/bin/which ${libmysqlclient}/bin/mysql_config" - - runHook postPatch ''; buildPhase = '' diff --git a/pkgs/applications/version-management/git-absorb/default.nix b/pkgs/applications/version-management/git-absorb/default.nix index b0d00c912a783..b45df5d9a0f66 100644 --- a/pkgs/applications/version-management/git-absorb/default.nix +++ b/pkgs/applications/version-management/git-absorb/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "git-absorb"; - version = "0.6.10"; + version = "0.6.11"; src = fetchFromGitHub { owner = "tummychow"; - repo = pname; + repo = "git-absorb"; rev = "refs/tags/${version}"; - hash = "sha256-lFaiv9bgzu6XVcQuLXWoWsKl0cylfrF5rC0i3qj+zU0="; + hash = "sha256-SYBJKnzv2oktWubgm/j6wEeoLSBjGqQVXQf9LOaq+NU="; }; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoHash = "sha256-hksSyVdsGe/Ha3F5orL4W/k2nzFCuMqQjBgsT1jiWLw="; + cargoHash = "sha256-i2ntM7NTi+hiB7DxEEV+3SXV8sVVWcNanif/wUZ9XvI="; postInstall = '' installManPage Documentation/git-absorb.1 diff --git a/pkgs/applications/window-managers/spectrwm/default.nix b/pkgs/applications/window-managers/spectrwm/default.nix index 7c4a1faddb319..2bb5aca9d91c1 100644 --- a/pkgs/applications/window-managers/spectrwm/default.nix +++ b/pkgs/applications/window-managers/spectrwm/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, pkg-config, xorg }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "spectrwm"; - version = "unstable-2023-05-07"; + version = "3.5.1"; src = fetchFromGitHub { owner = "conformal"; repo = "spectrwm"; - rev = "06e3733175969c307a6fd47240a7a37b29d60513"; - sha256 = "QcEwFg9QTi+cCl2JghKOzEZ19LP/ZFMbZJAMJ0BLH9M="; + rev = "SPECTRWM_${lib.replaceStrings ["."] ["_"] finalAttrs.version}"; + hash = "sha256-Nlzo35OsNqFbR6nl3nnGXDWmwc8JlP4tyDuIGtKTnIY="; }; nativeBuildInputs = [ pkg-config ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation { meta = with lib; { description = "A tiling window manager"; homepage = "https://github.com/conformal/spectrwm"; - maintainers = with maintainers; [ christianharke ]; + maintainers = with maintainers; [ rake5k ]; license = licenses.isc; platforms = platforms.all; @@ -45,4 +45,4 @@ stdenv.mkDerivation { ''; }; -} +}) diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix index 07e935962da0d..0e4a312bdea7d 100644 --- a/pkgs/by-name/ez/eza/package.nix +++ b/pkgs/by-name/ez/eza/package.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage rec { pname = "eza"; - version = "0.16.1"; + version = "0.16.2"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; rev = "v${version}"; - hash = "sha256-wydKLy02S2REgN01Gb4PK1KsczjXsx5hU+hO9o9iZzE="; + hash = "sha256-AqOvhi/26Nl3ex6iJ9DxC/jMdgZ331VdrJTsjBrc490="; }; - cargoHash = "sha256-MybbaJQqVHz7yt8rPp8k3aWqQHD7SJkbC7PDjwgmpLo="; + cargoHash = "sha256-1hZZvXOV6towMVpnlf4P8jZei2pAZTKAfi362RKL+Jo="; nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] diff --git a/pkgs/by-name/fo/fortune-kind/package.nix b/pkgs/by-name/fo/fortune-kind/package.nix index 81e4b88340257..ca88e6f2197a5 100644 --- a/pkgs/by-name/fo/fortune-kind/package.nix +++ b/pkgs/by-name/fo/fortune-kind/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "fortune-kind"; - version = "0.1.10"; + version = "0.1.11"; src = fetchFromGitHub { owner = "cafkafk"; repo = "fortune-kind"; rev = "v${version}"; - hash = "sha256-KOrJIGLNZxFJ/KeRq1hcIQHDYPQQdQCzr6QA/pVIs5A="; + hash = "sha256-sk1Gj+QgU9eUjRySHsJTfM/tUcyLdqOxycAdrBPUSmg="; }; - cargoHash = "sha256-iiGCCbTc0b+93XRMpkhFs0hj9Nuse1HaqahQz7NaheU="; + cargoHash = "sha256-u2CwBV2sz2EIqwUR+sJ+xyvAIyoq3ujkx39e/Bq2V8s="; nativeBuildInputs = [ makeBinaryWrapper installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/by-name/li/libbgcode/package.nix b/pkgs/by-name/li/libbgcode/package.nix new file mode 100644 index 0000000000000..e4dd6099bc9de --- /dev/null +++ b/pkgs/by-name/li/libbgcode/package.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, heatshrink +, zlib +, boost +, catch2 +}: +stdenv.mkDerivation { + pname = "libbgcode"; + version = "2023-11-16"; + + src = fetchFromGitHub { + owner = "prusa3d"; + repo = "libbgcode"; + rev = "bc390aab4427589a6402b4c7f65cf4d0a8f987ec"; + hash = "sha256-TZShYeDAh+fNdmTr1Xqctji9f0vEGpNZv1ba/IY5EoY="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + heatshrink + zlib + boost + catch2 + ]; + + meta = with lib; { + homepage = "https://github.com/prusa3d/libbgcode"; + description = "Prusa Block & Binary G-code reader / writer / converter"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ lach ]; + }; +} diff --git a/pkgs/data/icons/super-tiny-icons/default.nix b/pkgs/data/icons/super-tiny-icons/default.nix index 502086be41a22..48af800e1f2bc 100644 --- a/pkgs/data/icons/super-tiny-icons/default.nix +++ b/pkgs/data/icons/super-tiny-icons/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation { pname = "super-tiny-icons"; - version = "unstable-2023-05-22"; + version = "unstable-2023-11-06"; src = fetchFromGitHub { owner = "edent"; repo = "SuperTinyIcons"; - rev = "69689fc05d6a14a865723a01b67c1af4741ed357"; - sha256 = "F1Qw1SLP7+LEiUch0YjBXQcpfU17YLCBk8q6cM77plU="; + rev = "888f449af8fb8df93241204e99fece85b9d225a5"; + hash = "sha256-L/7CEvG0NPbF8+ysiEHPiPnCMAW3cUu/e3XwtatRdbg="; }; installPhase = '' diff --git a/pkgs/data/themes/materia-theme/default.nix b/pkgs/data/themes/materia-theme/default.nix index da79f68638b9d..f42e532b64913 100644 --- a/pkgs/data/themes/materia-theme/default.nix +++ b/pkgs/data/themes/materia-theme/default.nix @@ -27,8 +27,6 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - dontBuild = true; - mesonFlags = [ "-Dgnome_shell_version=${lib.versions.majorMinor gnome.gnome-shell.version}" ]; diff --git a/pkgs/development/compilers/gcc/patches/6/libstdc++-disable-flat_namespace.patch b/pkgs/development/compilers/gcc/patches/6/libstdc++-disable-flat_namespace.patch new file mode 100644 index 0000000000000..571644410def0 --- /dev/null +++ b/pkgs/development/compilers/gcc/patches/6/libstdc++-disable-flat_namespace.patch @@ -0,0 +1,26 @@ +Backported from GCC 7. + +diff --git a/libstdc++-v3/configure.host b/libstdc++-v3/configure.host +index 304a7f5aff6..d1a189d93d0 100644 +--- a/libstdc++-v3/configure.host ++++ b/libstdc++-v3/configure.host +@@ -234,7 +234,7 @@ case "${host_os}" in + os_include_dir="os/newlib" + OPT_LDFLAGS="${OPT_LDFLAGS} \$(lt_host_flags)" + ;; +- darwin | darwin[1-7] | darwin[1-7].*) ++ darwin[1-7] | darwin[1-7].*) + # On Darwin, performance is improved if libstdc++ is single-module. + # Up to at least 10.3.7, -flat_namespace is required for proper + # treatment of coalesced symbols. +@@ -252,6 +252,10 @@ case "${host_os}" in + esac + os_include_dir="os/bsd/darwin" + ;; ++ darwin*) ++ # Post Darwin8, defaults should be sufficient. ++ os_include_dir="os/bsd/darwin" ++ ;; + *djgpp*) # leading * picks up "msdosdjgpp" + os_include_dir="os/djgpp" + error_constants_dir="os/djgpp" diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix index c4b0dbf91b665..9eda241f6d3ac 100644 --- a/pkgs/development/compilers/gcc/patches/default.nix +++ b/pkgs/development/compilers/gcc/patches/default.nix @@ -259,6 +259,9 @@ in # This patch can be dropped should darwin.cctools-llvm ever implement support. ++ optional (!atLeast7 && hostPlatform.isDarwin && lib.versionAtLeast (lib.getVersion stdenv.cc) "12") ./4.9/darwin-clang-as.patch +# Building libstdc++ with flat namespaces results in trying to link CoreFoundation, which +# defaults to the impure, system location and causes the build to fail. +++ optional (is6 && hostPlatform.isDarwin) ./6/libstdc++-disable-flat_namespace.patch ## gcc 4.9 and older ############################################################################## diff --git a/pkgs/development/coq-modules/gaia-hydras/default.nix b/pkgs/development/coq-modules/gaia-hydras/default.nix index 4f9e7a12e0482..1e16adddf4958 100644 --- a/pkgs/development/coq-modules/gaia-hydras/default.nix +++ b/pkgs/development/coq-modules/gaia-hydras/default.nix @@ -7,11 +7,12 @@ mkCoqDerivation rec { release."0.5".sha256 = "121pcbn6v59l0c165ha9n00whbddpy11npx2y9cn7g879sfk2nqk"; release."0.6".sha256 = "1dri4sisa7mhclf8w4kw7ixs5zxm8xyjr034r1377p96rdk3jj0j"; + release."0.9".sha256 = "sha256-wlK+154owQD/03FB669KCjyQlL2YOXLCi0KLSo0DOwc="; releaseRev = (v: "v${v}"); inherit version; defaultVersion = with lib.versions; lib.switch [coq.coq-version mathcomp.version] [ - { cases = [ (range "8.14" "8.16") (isGe "1.12.0") ]; out = "0.6"; } + { cases = [ (range "8.13" "8.16") (isGe "1.12.0") ]; out = "0.9"; } { cases = [ (range "8.13" "8.14") (isGe "1.12.0") ]; out = "0.5"; } ] null; diff --git a/pkgs/development/coq-modules/gaia/default.nix b/pkgs/development/coq-modules/gaia/default.nix index a2994dcc9b347..715f5ec3d3644 100644 --- a/pkgs/development/coq-modules/gaia/default.nix +++ b/pkgs/development/coq-modules/gaia/default.nix @@ -8,11 +8,12 @@ mkCoqDerivation { release."1.13".sha256 = "sha256:0i8ix2rbw10v34bi0yrx0z89ng96ydqbxm8rv2rnfgy4d1b27x6q"; release."1.14".sha256 = "sha256-wgeQC0fIN3PSmRY1K6/KTy+rJmqqxdo3Bhsz1vjVAes="; release."1.15".sha256 = "sha256:04zchnkvaq2mzpcilpspn5l947689gj3m0w20m0nd7w4drvlahnw"; + release."1.17".sha256 = "sha256-2VzdopXgKS/wC5Rd1/Zlr12J5bSIGINFjG1nrMjDrGE="; releaseRev = (v: "v${v}"); inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.10" "8.16") (isGe "1.12.0") ]; out = "1.15"; } + { cases = [ (range "8.10" "8.18") (range "1.12.0" "1.18.0") ]; out = "1.17"; } { cases = [ (range "8.10" "8.12") "1.11.0" ]; out = "1.11"; } ] null; diff --git a/pkgs/development/coq-modules/hydra-battles/default.nix b/pkgs/development/coq-modules/hydra-battles/default.nix index 06798c5fcc291..4a6823dcf4203 100644 --- a/pkgs/development/coq-modules/hydra-battles/default.nix +++ b/pkgs/development/coq-modules/hydra-battles/default.nix @@ -7,11 +7,12 @@ release."0.4".sha256 = "1f7pc4w3kir4c9p0fjx5l77401bx12y72nmqxrqs3qqd3iynvqlp"; release."0.5".sha256 = "121pcbn6v59l0c165ha9n00whbddpy11npx2y9cn7g879sfk2nqk"; release."0.6".sha256 = "1dri4sisa7mhclf8w4kw7ixs5zxm8xyjr034r1377p96rdk3jj0j"; + release."0.9".sha256 = "sha256-wlK+154owQD/03FB669KCjyQlL2YOXLCi0KLSo0DOwc="; releaseRev = (v: "v${v}"); inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.13" "8.16"; out = "0.6"; } + { case = range "8.13" "8.16"; out = "0.9"; } { case = range "8.11" "8.12"; out = "0.4"; } ] null; diff --git a/pkgs/development/ocaml-modules/fiber/default.nix b/pkgs/development/ocaml-modules/fiber/default.nix index da5e4580e168f..69bd4a067e274 100644 --- a/pkgs/development/ocaml-modules/fiber/default.nix +++ b/pkgs/development/ocaml-modules/fiber/default.nix @@ -1,20 +1,29 @@ -{ lib, buildDunePackage, fetchFromGitHub, stdune, dyn }: +{ lib +, buildDunePackage +, dyn +, fetchurl +, ocaml +, ppx_expect +, stdune +}: buildDunePackage rec { pname = "fiber"; - version = "unstable-2023-02-28"; + version = "3.7.0"; - src = fetchFromGitHub { - owner = "ocaml-dune"; - repo = "fiber"; - rev = "5563b588c1313f128eafa74d66f0626c9128d34d"; - hash = "sha256-18GfGXpu+uiIiCuLhIx5z5jRkem1nNWaQB6Ms0AE9sE="; + src = fetchurl { + url = "https://github.com/ocaml-dune/fiber/releases/download/${version}/fiber-lwt-${version}.tbz"; + hash = "sha256-hkihWuk/5pQpmc42iHQpo5E7YoKcRxTlIMwOehw7loI="; }; - duneVersion = "3"; - buildInputs = [ stdune dyn ]; + checkInputs = [ ppx_expect ]; + + # Tests are Ocaml version dependent + # https://github.com/ocaml-dune/fiber/issues/27 + doCheck = false; + meta = with lib; { description = "Structured concurrency library"; homepage = "https://github.com/ocaml-dune/fiber"; diff --git a/pkgs/development/perl-modules/Bio-BigFile/default.nix b/pkgs/development/perl-modules/Bio-BigFile/default.nix new file mode 100644 index 0000000000000..516b6d014c5a4 --- /dev/null +++ b/pkgs/development/perl-modules/Bio-BigFile/default.nix @@ -0,0 +1,66 @@ +{ + BioPerl, + IOString, + buildPerlModule, + fetchFromGitHub, + fetchpatch, + fetchurl, + kent, + lib, + libmysqlclient, + libpng, + openssl, + perl +}: + +buildPerlModule rec { + pname = "Bio-BigFile"; + version = "1.07"; + + src = fetchurl { + url = "mirror://cpan/authors/id/L/LD/LDS/Bio-BigFile-${version}.tar.gz"; + sha256 = "277b66ce8acbdd52399e2c5a0cf4e3bd5c74c12b94877cd383d0c4c97740d16d"; + }; + + # Only kent 335 works with Bio-BigFile, see + # - official documentation: https://www.ensembl.org/info/docs/tools/vep/script/vep_download.html#bigfile + # - one of the developer's answer: https://github.com/Ensembl/ensembl-vep/issues/1412 + # BioBigfile needs the environment variable KENT_SRC to find kent + KENT_SRC = kent.overrideAttrs (old: rec { + pname = "kent"; + version = "335"; + + src = fetchFromGitHub { + owner = "ucscGenomeBrowser"; + repo = "kent"; + rev = "v${version}_base"; + sha256 = "1455dwzpaq4hyhcqj3fpwgq5a39kp46qarfbr6ms6l2lz583r083"; + }; + + patches = [ + # Fix for linking error with zlib. Adding zlib as a dependency is not enough + ./kent-utils.patch + # Vendoring upstream patch (not merged in uscsGenomeBrowser/kent) + ./kent-316e4fd40f53c96850128fd65097a42623d1e736.patch + ]; + }); + + + buildInputs = [ + BioPerl + IOString + libpng + libmysqlclient + openssl + ]; + + # Ensure compatibility with GCC-11 (compilation fails if -Wno-format-security) + hardeningDisable = [ "format" ]; + + meta = with lib; { + homepage = "https://metacpan.org/dist/Bio-BigFile"; + description = "Manipulate Jim Kent's BigWig and BigBed index files for genomic features"; + license = licenses.artistic2; + maintainers = with maintainers; [ apraga ]; + }; +} diff --git a/pkgs/development/perl-modules/Bio-BigFile/kent-316e4fd40f53c96850128fd65097a42623d1e736.patch b/pkgs/development/perl-modules/Bio-BigFile/kent-316e4fd40f53c96850128fd65097a42623d1e736.patch new file mode 100644 index 0000000000000..42d122a8b0f75 --- /dev/null +++ b/pkgs/development/perl-modules/Bio-BigFile/kent-316e4fd40f53c96850128fd65097a42623d1e736.patch @@ -0,0 +1,25 @@ +From 316e4fd40f53c96850128fd65097a42623d1e736 Mon Sep 17 00:00:00 2001 +From: Marcel Bargull <marcel.bargull@udo.edu> +Date: Sat, 27 Mar 2021 16:23:34 +0100 +Subject: [PATCH] Fix linking Clang 11 compiled objects + +With Clang 11 htmlRecover from lib/htmshell.h is picked up as a +definition, not just declaration of the jmp_buf. As such both +lib/htmshell.c and hg/lib/cart.c export two symbols with the same name. +--- + src/inc/htmshell.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/inc/htmshell.h b/src/inc/htmshell.h +index 9d85f45b936..dd586db761c 100644 +--- a/src/inc/htmshell.h ++++ b/src/inc/htmshell.h +@@ -160,7 +160,7 @@ void htmlBadVar(char *varName); + void htmlImage(char *fileName, int width, int height); + /* Display centered image file. */ + +-jmp_buf htmlRecover; /* Error recovery jump. Exposed for cart's use. */ ++extern jmp_buf htmlRecover; /* Error recovery jump. Exposed for cart's use. */ + + void htmlVaWarn(char *format, va_list args); + /* Write an error message. (Generally you just call warn() or errAbort(). diff --git a/pkgs/development/perl-modules/Bio-BigFile/kent-utils.patch b/pkgs/development/perl-modules/Bio-BigFile/kent-utils.patch new file mode 100644 index 0000000000000..0c1db4d6c66ca --- /dev/null +++ b/pkgs/development/perl-modules/Bio-BigFile/kent-utils.patch @@ -0,0 +1,27 @@ +--- ./src/utils/bigWigCat/makefile 2023-03-27 14:03:01.585896516 +0000 ++++ ./src/utils/bigWigCat/makefile 2023-03-27 14:03:27.716180479 +0000 +@@ -1,3 +1,4 @@ + kentSrc = ../.. + A = bigWigCat + include $(kentSrc)/inc/userApp.mk ++L += -lz + +--- ./src/utils/pslLiftSubrangeBlat/makefile 1970-01-01 00:00:01.000000000 +0000 ++++ ./src/utils/pslLiftSubrangeBlat/makefile 2023-03-27 14:36:59.044600213 +0000 +@@ -3,7 +3,7 @@ + preMyLibs += ../../lib/$(MACHTYPE)/jkhgap.a + include $(kentSrc)/inc/userApp.mk + HG_INC += -I../../hg/inc +-L += $(MYSQLLIBS) -lm ++L += $(MYSQLLIBS) -lm -lz + + test:: + cd tests && ${MAKE} test + +--- ./src/utils/bigWigCorrelate/makefile 2023-03-27 14:36:23.117545553 +0000 ++++ ./src/utils/bigWigCorrelate/makefile 2023-03-27 14:36:33.854328176 +0000 +@@ -1,3 +1,4 @@ + kentSrc = ../.. + A = bigWigCorrelate + include $(kentSrc)/inc/userApp.mk ++L += -lz diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix index 32a8baa44864a..5d7cbaf889f0d 100644 --- a/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aws-sam-translator"; - version = "1.78.0"; + version = "1.81.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "aws"; repo = "serverless-application-model"; rev = "refs/tags/v${version}"; - hash = "sha256-hSXJBEntj3k3Kml+Yuvn19X7YXL+Y1hXBkb8iZ7DxR4="; + hash = "sha256-Ik9ZO7l2dbjJg+PlSRUoMkrjSBeghKN5DZjx7CjDBPg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/blspy/default.nix b/pkgs/development/python-modules/blspy/default.nix deleted file mode 100644 index 929f1c90b7ce7..0000000000000 --- a/pkgs/development/python-modules/blspy/default.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, fetchFromGitHub -, setuptools-scm -, substituteAll -, cmake -, boost -, gmp -, pybind11 -, pythonOlder -}: - -buildPythonPackage rec { - pname = "blspy"; - version = "1.0.16"; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-XABdS6CCUJpZ9N1Vra078V0HoDU32u1l3yz96ZKHwFc="; - }; - - patches = [ - # prevent CMake from trying to get libraries on the Internet - (substituteAll { - src = ./dont_fetch_dependencies.patch; - pybind11_src = pybind11.src; - relic_src = fetchFromGitHub { - owner = "Chia-Network"; - repo = "relic"; - rev = "215c69966cb78b255995f0ee9c86bbbb41c3c42b"; # pinned by blspy - hash = "sha256-wivK18Cp7BMZJvrYxJgSHInRZgFgsgSzd0YIy5IWoYA="; - }; - sodium_src = fetchFromGitHub { - owner = "AmineKhaldi"; - repo = "libsodium-cmake"; - rev = "f73a3fe1afdc4e37ac5fe0ddd401bf521f6bba65"; # pinned by blspy - hash = "sha256-lGz7o6DQVAuEc7yTp8bYS2kwjzHwGaNjugDi1ruRJOA="; - fetchSubmodules = true; - }; - catch2_src = fetchFromGitHub { - owner = "catchorg"; - repo = "Catch2"; - rev = "v3.0.0-preview5"; # pinned by blspy - hash = "sha256-IQ1yGZo3nKHTqScUoq3i3Njxqvk7uW8hQ3GT0/SxGaw="; - }; - }) - ]; - - # ImportError: cannot import name 'setuptools' from 'setuptools' - # this is resolved in the next release, v2 - postPatch = '' - substituteInPlace setup.py \ - --replace "from setuptools import Extension, setup, setuptools" "from setuptools import Extension, setup" - ''; - - nativeBuildInputs = [ cmake setuptools-scm ]; - - buildInputs = [ boost gmp.static pybind11 ]; - - pythonImportsCheck = [ - "blspy" - ]; - - # Note: upstream testsuite is just a single test.py script outside of any framework - doCheck = false; - - # CMake needs to be run by setuptools rather than by its hook - dontConfigure = true; - - meta = with lib; { - description = "BLS signatures with aggregation"; - homepage = "https://github.com/Chia-Network/bls-signatures/"; - license = licenses.asl20; - maintainers = teams.chia.members; - }; -} diff --git a/pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch b/pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch deleted file mode 100644 index 6acc6f878f51a..0000000000000 --- a/pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7922652..d85b058 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -31,29 +31,18 @@ set(CMAKE_MODULE_PATH - include(FetchContent) - - FetchContent_Declare(Sodium -- GIT_REPOSITORY https://github.com/AmineKhaldi/libsodium-cmake.git -- # Latest commit at the moment this was added here -- # Anchored to libsodium v1.0.18 -- GIT_TAG f73a3fe1afdc4e37ac5fe0ddd401bf521f6bba65 -+ URL /nix/store/2nj48a8vb7rzxhwaigdcpa0yyax7yrv7-source - ) - set(SODIUM_PCH "on" CACHE STRING "") - set(SODIUM_DISABLE_TESTS "on" CACHE STRING "") - set(SODIUM_CHIA_MINIMAL "on" CACHE STRING "") - FetchContent_MakeAvailable(Sodium) - --if (DEFINED ENV{RELIC_MAIN}) -- set(RELIC_GIT_TAG "origin/main") --else () -- # This is currently anchored to upstream aecdcae7956f542fbee2392c1f0feb0a8ac41dc5 -- set(RELIC_GIT_TAG "215c69966cb78b255995f0ee9c86bbbb41c3c42b") --endif () -- - message(STATUS "Relic will be built from: ${RELIC_GIT_TAG}") - - FetchContent_Declare( - relic -- GIT_REPOSITORY https://github.com/Chia-Network/relic.git -- GIT_TAG ${RELIC_GIT_TAG} -+ SOURCE_DIR /nix/store/6r9v1cmmy535q2y0pk0bkjh3ppyzb2ch-source - ) - - # Relic related options -diff --git a/python-bindings/CMakeLists.txt b/python-bindings/CMakeLists.txt -index 2e331c3..d9aa940 100644 ---- a/python-bindings/CMakeLists.txt -+++ b/python-bindings/CMakeLists.txt -@@ -1,8 +1,7 @@ - - FetchContent_Declare( - pybind11 -- GIT_REPOSITORY https://github.com/pybind/pybind11.git -- GIT_TAG v2.10.0 -+ SOURCE_DIR @pybind11_src@ - ) - FetchContent_MakeAvailable(pybind11 relic) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 3164f7f..15a955e 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -37,8 +37,7 @@ install(FILES $<TARGET_FILE:bls> DESTINATION lib) - if(BUILD_BLS_TESTS) - FetchContent_Declare( - Catch2 -- GIT_REPOSITORY https://github.com/catchorg/Catch2.git -- GIT_TAG v3.0.0-preview5 -+ URL @catch2_src@ - ) - FetchContent_MakeAvailable(Catch2) - add_executable(runtest test.cpp) diff --git a/pkgs/development/python-modules/chia-rs/Cargo.lock b/pkgs/development/python-modules/chia-rs/Cargo.lock deleted file mode 100644 index 5e120ecc88d84..0000000000000 --- a/pkgs/development/python-modules/chia-rs/Cargo.lock +++ /dev/null @@ -1,1476 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "anes" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" - -[[package]] -name = "anyhow" -version = "1.0.65" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602" - -[[package]] -name = "atomic-polyfill" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ff7eb3f316534d83a8a2c3d1674ace8a5a71198eba31e2e2b597833f699b28" -dependencies = [ - "critical-section", -] - -[[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 = "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.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "generic-array", -] - -[[package]] -name = "block-buffer" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" -dependencies = [ - "generic-array", -] - -[[package]] -name = "bls12_381" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62250ece575fa9b22068b3a8d59586f01d426dd7785522efd97632959e71c986" -dependencies = [ - "ff", - "group", - "pairing", - "rand_core", - "subtle", -] - -[[package]] -name = "bls12_381_plus" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7c681aa947677ec0c5ccfa6f14c0dd039ddbaa7b12952bf146bd5226a5f9880" -dependencies = [ - "digest 0.9.0", - "ff", - "group", - "heapless", - "pairing", - "rand_core", - "serde", - "subtle", - "zeroize", -] - -[[package]] -name = "bumpalo" -version = "3.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[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 = "chia" -version = "0.2.0" -dependencies = [ - "chia-protocol", - "clvm-utils", - "clvmr", - "hex", - "num-traits", - "pyo3", -] - -[[package]] -name = "chia-bls" -version = "0.2.0" -dependencies = [ - "anyhow", - "bls12_381_plus", - "criterion", - "group", - "hex", - "hkdf", - "num-bigint", - "rand", - "sha2 0.9.9", - "tiny-bip39", -] - -[[package]] -name = "chia-protocol" -version = "0.2.0" -dependencies = [ - "chia_py_streamable_macro", - "chia_streamable_macro", - "clvmr", - "hex", - "pyo3", - "sha2 0.10.2", -] - -[[package]] -name = "chia_py_streamable_macro" -version = "0.1.2" -dependencies = [ - "quote", - "syn", -] - -[[package]] -name = "chia_rs" -version = "0.2.0" -dependencies = [ - "chia", - "chia-protocol", - "chia_py_streamable_macro", - "chia_streamable_macro", - "clvmr", - "hex", - "pyo3", -] - -[[package]] -name = "chia_streamable_macro" -version = "0.2.3" -dependencies = [ - "quote", - "syn", -] - -[[package]] -name = "chia_wasm" -version = "0.2.0" -dependencies = [ - "chia", - "wasm-bindgen", - "wasm-bindgen-test", -] - -[[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 = "clap" -version = "3.2.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" -dependencies = [ - "bitflags", - "clap_lex", - "indexmap", - "textwrap", -] - -[[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 = "clvm-utils" -version = "0.2.0" -dependencies = [ - "clvmr", -] - -[[package]] -name = "clvmr" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c6bb157d96f8309f2081663887e055b6f500f00d50235290690988d11197e84" -dependencies = [ - "bls12_381", - "hex", - "lazy_static", - "num-bigint", - "num-integer", - "num-traits", - "sha2 0.10.2", -] - -[[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 = "cpufeatures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" -dependencies = [ - "libc", -] - -[[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", - "criterion-plot", - "itertools", - "lazy_static", - "num-traits", - "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 = "critical-section" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6548a0ad5d2549e111e1f6a11a6c2e2d00ce6a3dafe22948d67c2b443f775e52" - -[[package]] -name = "crossbeam-channel" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" -dependencies = [ - "cfg-if", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" -dependencies = [ - "autocfg", - "cfg-if", - "crossbeam-utils", - "memoffset", - "scopeguard", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" -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 = "crypto-mac" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" -dependencies = [ - "generic-array", - "subtle", -] - -[[package]] -name = "ctor" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" -dependencies = [ - "quote", - "syn", -] - -[[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.3", - "crypto-common", - "subtle", -] - -[[package]] -name = "either" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" - -[[package]] -name = "ff" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" -dependencies = [ - "bitvec", - "rand_core", - "subtle", -] - -[[package]] -name = "funty" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" - -[[package]] -name = "generic-array" -version = "0.14.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "getrandom" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "ghost" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41973d4c45f7a35af8753ba3457cc99d406d863941fd7f52663cff54a5ab99b3" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "group" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7391856def869c1c81063a03457c676fbcd419709c3dfb33d8d319de484b154d" -dependencies = [ - "byteorder", - "ff", - "rand_core", - "subtle", -] - -[[package]] -name = "half" -version = "1.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" - -[[package]] -name = "hash32" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" -dependencies = [ - "byteorder", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "heapless" -version = "0.7.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743" -dependencies = [ - "atomic-polyfill", - "hash32", - "rustc_version", - "spin", - "stable_deref_trait", -] - -[[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 = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "hkdf" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01706d578d5c281058480e673ae4086a9f4710d8df1ad80a5b03e39ece5f886b" -dependencies = [ - "digest 0.9.0", - "hmac 0.11.0", -] - -[[package]] -name = "hmac" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" -dependencies = [ - "crypto-mac", - "digest 0.9.0", -] - -[[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 = "indexmap" -version = "1.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" -dependencies = [ - "autocfg", - "hashbrown", -] - -[[package]] -name = "indoc" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47741a8bc60fb26eb8d6e0238bbb26d8575ff623fdc97b1a2c00c050b9684ed8" -dependencies = [ - "indoc-impl", - "proc-macro-hack", -] - -[[package]] -name = "indoc-impl" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce046d161f000fffde5f432a0d034d0341dc152643b2598ed5bfce44c4f3a8f0" -dependencies = [ - "proc-macro-hack", - "proc-macro2", - "quote", - "syn", - "unindent", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "inventory" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb5160c60ba1e809707918ee329adb99d222888155835c6feedba19f6c3fd4" -dependencies = [ - "ctor", - "ghost", - "inventory-impl", -] - -[[package]] -name = "inventory-impl" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e41b53715c6f0c4be49510bb82dee2c1e51c8586d885abe65396e82ed518548" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" - -[[package]] -name = "js-sys" -version = "0.3.52" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce791b7ca6638aae45be056e068fc756d871eb3b3b10b8efa62d1c9cec616752" -dependencies = [ - "wasm-bindgen", -] - -[[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.139" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" - -[[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 = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num-bigint" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" - -[[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 = "os_str_bytes" -version = "6.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" - -[[package]] -name = "pairing" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "135590d8bdba2b31346f9cd1fb2a912329f5135e832a4f422942eb6ead8b6b3b" -dependencies = [ - "group", -] - -[[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", -] - -[[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", - "smallvec", - "winapi", -] - -[[package]] -name = "paste" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" -dependencies = [ - "paste-impl", - "proc-macro-hack", -] - -[[package]] -name = "paste-impl" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" -dependencies = [ - "proc-macro-hack", -] - -[[package]] -name = "pbkdf2" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" -dependencies = [ - "digest 0.10.6", -] - -[[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 = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[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.49" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "pyo3" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cf01dbf1c05af0a14c7779ed6f3aa9deac9c3419606ac9de537a2d649005720" -dependencies = [ - "cfg-if", - "indoc", - "inventory", - "libc", - "parking_lot", - "paste", - "pyo3-build-config", - "pyo3-macros", - "unindent", -] - -[[package]] -name = "pyo3-build-config" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "779239fc40b8e18bc8416d3a37d280ca9b9fb04bda54b98037bb6748595c2410" -dependencies = [ - "once_cell", -] - -[[package]] -name = "pyo3-macros" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67701eb32b1f9a9722b4bc54b548ff9d7ebfded011c12daece7b9063be1fd755" -dependencies = [ - "pyo3-macros-backend", - "quote", - "syn", -] - -[[package]] -name = "pyo3-macros-backend" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f44f09e825ee49a105f2c7b23ebee50886a9aee0746f4dd5a704138a64b0218a" -dependencies = [ - "proc-macro2", - "pyo3-build-config", - "quote", - "syn", -] - -[[package]] -name = "quote" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "radium" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rayon" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3" -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", -] - -[[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-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - -[[package]] -name = "ryu" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" - -[[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 = "scoped-tls" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[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 = "serde_json" -version = "1.0.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest 0.10.6", -] - -[[package]] -name = "smallvec" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" - -[[package]] -name = "spin" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09" -dependencies = [ - "lock_api", -] - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[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.107" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" -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", - "unicode-xid", -] - -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - -[[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.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", - "quote", - "syn", -] - -[[package]] -name = "tiny-bip39" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62cc94d358b5a1e84a5cb9109f559aa3c4d634d2b1b4de3d0fa4adc7c78e2861" -dependencies = [ - "anyhow", - "hmac 0.12.1", - "once_cell", - "pbkdf2", - "rand", - "rustc-hash", - "sha2 0.10.2", - "thiserror", - "unicode-normalization", - "wasm-bindgen", - "zeroize", -] - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" - -[[package]] -name = "typenum" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" - -[[package]] -name = "unicode-ident" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" - -[[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-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - -[[package]] -name = "unindent" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" - -[[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 = "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.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b608ecc8f4198fe8680e2ed18eccab5f0cd4caaf3d83516fa5fb2e927fda2586" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "580aa3a91a63d23aac5b6b267e2d13cb4f363e31dce6c352fca4752ae12e479f" -dependencies = [ - "bumpalo", - "lazy_static", - "log", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16646b21c3add8e13fdb8f20172f8a28c3dbf62f45406bcff0233188226cfe0c" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "171ebf0ed9e1458810dfcb31f2e766ad6b3a89dbda42d8901f2b268277e5f09c" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c2657dd393f03aa2a659c25c6ae18a13a4048cebd220e147933ea837efc589f" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e0c4a743a309662d45f4ede961d7afa4ba4131a59a639f29b0069c3798bbcc2" - -[[package]] -name = "wasm-bindgen-test" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce783b6c3854292723f498b7bfcf65a782a320b6f1cb3012d08dfbc603fa62f5" -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.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3859815cf8435b92f3a34381bef950daffc1403bbb77ef99e35422a7b0abb194" -dependencies = [ - "proc-macro2", - "quote", -] - -[[package]] -name = "web-sys" -version = "0.3.52" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01c70a82d842c9979078c772d4a1344685045f1a5628f677c2b2eab4dd7d2696" -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 = "wyz" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" -dependencies = [ - "tap", -] - -[[package]] -name = "zeroize" -version = "1.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f" -dependencies = [ - "zeroize_derive", -] - -[[package]] -name = "zeroize_derive" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "synstructure", -] diff --git a/pkgs/development/python-modules/chia-rs/default.nix b/pkgs/development/python-modules/chia-rs/default.nix deleted file mode 100644 index 7afec2e1a4265..0000000000000 --- a/pkgs/development/python-modules/chia-rs/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ buildPythonPackage -, lib -, fetchFromGitHub -, pytestCheckHook -, rustPlatform -}: - -buildPythonPackage rec { - pname = "chia-rs"; - version = "0.2.10"; - - src = fetchFromGitHub { - owner = "chia-network"; - repo = "chia_rs"; - rev = "refs/tags/${version}"; - hash = "sha256-MFVWdpfvmvGfWIuVdrigGucP52/dB4xCO4Pn1RvUJnM="; - }; - - patches = [ - # undo a hack from upstream that confuses our build hook - ./fix-build.patch - ]; - - cargoDeps = rustPlatform.importCargoLock { - lockFile = ./Cargo.lock; - }; - - postPatch = '' - cp ${./Cargo.lock} Cargo.lock - ''; - - nativeBuildInputs = with rustPlatform; [ - cargoSetupHook - maturinBuildHook - ]; - - preBuild = '' - # avoid ENOENT in maturinBuildHook - touch wheel/Cargo.lock - ''; - - nativeCheckInputs = [ - pytestCheckHook - ]; - - buildAndTestSubdir = "wheel"; - - meta = with lib; { - description = "Rust crate & wheel with consensus code"; - homepage = "https://github.com/Chia-Network/chia_rs/"; - license = licenses.asl20; - maintainers = teams.chia.members; - }; -} diff --git a/pkgs/development/python-modules/chia-rs/fix-build.patch b/pkgs/development/python-modules/chia-rs/fix-build.patch deleted file mode 100644 index cf793f78a744d..0000000000000 --- a/pkgs/development/python-modules/chia-rs/fix-build.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -1,8 +1,5 @@ --# the "wheel" crate is excluded from the workspace because pyo3 has problems with --# "cargo test" and "cargo bench" - [workspace] --members = ["wasm", "chia_streamable_macro", "chia-bls", "clvm-utils", "chia-protocol", "chia_py_streamable_macro"] --exclude = ["wheel"] -+members = ["wasm", "wheel", "chia_streamable_macro", "chia-bls", "clvm-utils", "chia-protocol", "chia_py_streamable_macro"] - - [package] - name = "chia" diff --git a/pkgs/development/python-modules/chiabip158/default.nix b/pkgs/development/python-modules/chiabip158/default.nix deleted file mode 100644 index d926a3e5e2186..0000000000000 --- a/pkgs/development/python-modules/chiabip158/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv -, lib -, buildPythonPackage -, fetchPypi -, cmake -, pybind11 -, pythonOlder -, pytestCheckHook -, setuptools-scm -}: - -buildPythonPackage rec { - pname = "chiabip158"; - version = "1.3"; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-HUgYVVQ7yc2X3ffnV7mCZf+oFUHl/29Mb4n91dRJ7gc="; - }; - - nativeBuildInputs = [ cmake setuptools-scm ]; - - buildInputs = [ pybind11 ]; - - nativeCheckInputs = [ - pytestCheckHook - ]; - - # CMake needs to be run by setuptools rather than by its hook - dontConfigure = true; - - meta = with lib; { - broken = stdenv.isDarwin; - description = "Chia's implementation of BIP 158"; - homepage = "https://www.chia.net/"; - license = licenses.asl20; - maintainers = teams.chia.members; - }; -} diff --git a/pkgs/development/python-modules/chiapos/default.nix b/pkgs/development/python-modules/chiapos/default.nix deleted file mode 100644 index 501a8f543b2b5..0000000000000 --- a/pkgs/development/python-modules/chiapos/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ stdenv -, lib -, substituteAll -, buildPythonPackage -, fetchPypi -, catch2 -, cmake -, cxxopts -, ghc_filesystem -, pybind11 -, pytestCheckHook -, pythonOlder -, psutil -, setuptools-scm -}: - -buildPythonPackage rec { - pname = "chiapos"; - version = "1.0.11"; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-TMRf9549z3IQzGt5c53Rk1Vq3tdrpZ3Pqc8jhj4AKzo="; - }; - - patches = [ - # prevent CMake from trying to get libraries on the Internet - (substituteAll { - src = ./dont_fetch_dependencies.patch; - inherit cxxopts ghc_filesystem; - catch2_src = catch2.src; - pybind11_src = pybind11.src; - }) - ]; - - nativeBuildInputs = [ cmake setuptools-scm ]; - - buildInputs = [ pybind11 ]; - - nativeCheckInputs = [ - psutil - pytestCheckHook - ]; - - # A fix for cxxopts >=3.1 - postPatch = '' - substituteInPlace src/cli.cpp \ - --replace "cxxopts::OptionException" "cxxopts::exceptions::exception" - ''; - - # CMake needs to be run by setuptools rather than by its hook - dontConfigure = true; - - meta = with lib; { - broken = stdenv.isDarwin; - description = "Chia proof of space library"; - homepage = "https://www.chia.net/"; - license = licenses.asl20; - maintainers = teams.chia.members; - }; -} diff --git a/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch b/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch deleted file mode 100644 index 86dfad747d851..0000000000000 --- a/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d1dd25d..96abc65 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -21,23 +21,20 @@ include(${CMAKE_INSTALL_PREFIX}/share/cmake/pybind11/pybind11Config.cmake) - else() - FetchContent_Declare( - pybind11-src -- GIT_REPOSITORY https://github.com/pybind/pybind11.git -- GIT_TAG v2.10.0 -+ SOURCE_DIR @pybind11_src@ - ) - FetchContent_MakeAvailable(pybind11-src) - endif() - - FetchContent_Declare( - cxxopts -- GIT_REPOSITORY https://github.com/jarro2783/cxxopts.git -- GIT_TAG v2.2.1 -+ SOURCE_DIR @cxxopts@ - ) - FetchContent_MakeAvailable(cxxopts) - - FetchContent_Declare( - gulrak -- GIT_REPOSITORY https://github.com/gulrak/filesystem.git -- GIT_TAG v1.5.6 -+ SOURCE_DIR @ghc_filesystem@ - ) - FetchContent_MakeAvailable(gulrak) - -@@ -150,8 +147,7 @@ ENDIF() - - FetchContent_Declare( - Catch2 -- GIT_REPOSITORY https://github.com/catchorg/Catch2.git -- GIT_TAG v2.13.7 -+ SOURCE_DIR @catch2_src@ - ) - FetchContent_MakeAvailable(Catch2) - diff --git a/pkgs/development/python-modules/chiavdf/default.nix b/pkgs/development/python-modules/chiavdf/default.nix deleted file mode 100644 index acd5e4ea0926e..0000000000000 --- a/pkgs/development/python-modules/chiavdf/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib -, stdenv -, buildPythonPackage -, fetchPypi -, setuptools-scm -, substituteAll -, cmake -, boost -, gmp -, pybind11 -, pytestCheckHook -, pythonOlder -}: - -buildPythonPackage rec { - pname = "chiavdf"; - version = "1.0.11"; - disabled = pythonOlder "3.8"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-PjUgpMTdWLMFQdnrpeWmn8vA8SlORjmu52ODc/2hivE="; - }; - - patches = [ - # prevent CMake from trying to get libraries on the Internet - (substituteAll { - src = ./dont_fetch_dependencies.patch; - pybind11_src = pybind11.src; - }) - ]; - - # x86 instructions are needed for this component - BUILD_VDF_CLIENT = lib.optionalString (!stdenv.isx86_64) "N"; - - nativeBuildInputs = [ cmake setuptools-scm ]; - - buildInputs = [ boost gmp pybind11 ]; - - nativeCheckInputs = [ - pytestCheckHook - ]; - - # CMake needs to be run by setuptools rather than by its hook - dontConfigure = true; - - meta = with lib; { - broken = stdenv.isDarwin; - description = "Chia verifiable delay function utilities"; - homepage = "https://www.chia.net/"; - license = licenses.asl20; - maintainers = teams.chia.members; - }; -} diff --git a/pkgs/development/python-modules/chiavdf/dont_fetch_dependencies.patch b/pkgs/development/python-modules/chiavdf/dont_fetch_dependencies.patch deleted file mode 100644 index 1bcea2e68b31a..0000000000000 --- a/pkgs/development/python-modules/chiavdf/dont_fetch_dependencies.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index fb92c4d..9fa52ef 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -31,8 +31,7 @@ include(FetchContent) - - FetchContent_Declare( - pybind11-src -- GIT_REPOSITORY https://github.com/pybind/pybind11.git -- GIT_TAG v2.10.0 -+ SOURCE_DIR @pybind11_src@ - ) - FetchContent_MakeAvailable(pybind11-src) - diff --git a/pkgs/development/python-modules/cloup/default.nix b/pkgs/development/python-modules/cloup/default.nix index a05ea2d4e3b54..091677c5faf4f 100644 --- a/pkgs/development/python-modules/cloup/default.nix +++ b/pkgs/development/python-modules/cloup/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "cloup"; - version = "3.0.2"; + version = "3.0.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zBBZYQ2B2qCMxgflbHroGfqwEPGdGfPIdc7rZ1GDrPY="; + hash = "sha256-5b13idF8DelxOaxeuK+ML42Wotg2PoQRIk32JaaFjSE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/clvm-rs/default.nix b/pkgs/development/python-modules/clvm-rs/default.nix deleted file mode 100644 index f51df558c0ae0..0000000000000 --- a/pkgs/development/python-modules/clvm-rs/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, buildPythonPackage -, rustPlatform -, pythonOlder -, openssl -, perl -}: - -buildPythonPackage rec { - pname = "clvm_rs"; - version = "0.3.0"; - disabled = pythonOlder "3.7"; - - src = fetchFromGitHub { - owner = "Chia-Network"; - repo = "clvm_rs"; - rev = version; - hash = "sha256-DJviuIBJg+MF0NvmdeWK31nV+q4UZCRdmdbEAJqwXXg="; - }; - - cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - name = "${pname}-${version}"; - hash = "sha256-bgXUSm3M8J7E2ohPjPIimHJvz1ivWrsliKZlgchOdhQ="; - }; - - format = "pyproject"; - - buildAndTestSubdir = "wheel"; - - nativeBuildInputs = [ - perl # used by openssl-sys to configure - ] ++ (with rustPlatform; [ - cargoSetupHook - maturinBuildHook - ]); - - buildInputs = [ openssl ]; - - pythonImportsCheck = [ "clvm_rs" ]; - - meta = with lib; { - broken = stdenv.isDarwin; - homepage = "https://chialisp.com/"; - description = "Rust implementation of clvm"; - license = licenses.asl20; - maintainers = teams.chia.members; - }; -} diff --git a/pkgs/development/python-modules/clvm-tools-rs/default.nix b/pkgs/development/python-modules/clvm-tools-rs/default.nix deleted file mode 100644 index a69362c660518..0000000000000 --- a/pkgs/development/python-modules/clvm-tools-rs/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib -, fetchFromGitHub -, buildPythonPackage -, rustPlatform -, pythonOlder -}: - -buildPythonPackage rec { - pname = "clvm-tools-rs"; - version = "0.1.30"; - disabled = pythonOlder "3.7"; - format = "pyproject"; - - src = fetchFromGitHub { - owner = "Chia-Network"; - repo = "clvm_tools_rs"; - rev = version; - hash = "sha256-7eGOJgcZcSGmvLJc5BVfWarcu9kQb/uEcnG70JWXDSw="; - }; - - cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - name = "${pname}-${version}"; - hash = "sha256-46WEmp1FT6biM9A2M7z5onb45XhWjePKb6NSwLjuemc="; - }; - - nativeBuildInputs = with rustPlatform; [ - cargoSetupHook - maturinBuildHook - ]; - - pythonImportsCheck = [ "clvm_tools_rs" ]; - - meta = with lib; { - homepage = "https://chialisp.com/"; - description = "Rust port of clvm_tools"; - license = licenses.asl20; - maintainers = teams.chia.members; - }; -} diff --git a/pkgs/development/python-modules/clvm-tools/default.nix b/pkgs/development/python-modules/clvm-tools/default.nix deleted file mode 100644 index 9312c18ade5de..0000000000000 --- a/pkgs/development/python-modules/clvm-tools/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -, clvm -, clvm-tools-rs -, setuptools-scm -, pytestCheckHook -}: - -buildPythonPackage rec { - pname = "clvm_tools"; - version = "0.4.6"; - disabled = pythonOlder "3.7"; - - src = fetchFromGitHub { - owner = "Chia-Network"; - repo = "clvm_tools"; - rev = version; - hash = "sha256-MAtVTSv1RR2/7QEKCOEQ+QH5vK4aE0Us2TXyRRAMl8U="; - }; - - nativeBuildInputs = [ - setuptools-scm - ]; - - propagatedBuildInputs = [ - clvm - clvm-tools-rs - ]; - - nativeCheckInputs = [ - pytestCheckHook - ]; - - pythonImportsCheck = [ - "clvm_tools" - ]; - - disabledTests = [ - "test_cmd_unknown-1_txt" - ]; - - # give a hint to setuptools-scm on package version - SETUPTOOLS_SCM_PRETEND_VERSION="v${version}"; - - meta = with lib; { - description = "Tools for clvm development"; - homepage = "https://www.chialisp.com/"; - license = licenses.asl20; - maintainers = teams.chia.members; - }; -} diff --git a/pkgs/development/python-modules/clvm/default.nix b/pkgs/development/python-modules/clvm/default.nix deleted file mode 100644 index a633f85b0a6e8..0000000000000 --- a/pkgs/development/python-modules/clvm/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -, blspy -, setuptools-scm -, pytestCheckHook -}: - -buildPythonPackage rec { - pname = "clvm"; - version = "0.9.7"; - disabled = pythonOlder "3.7"; - - src = fetchFromGitHub { - owner = "Chia-Network"; - repo = "clvm"; - rev = version; - hash = "sha256-kTmuiy0IbTGjDokZjxp3p8lr/0uVxG/0pRN2hETLBtA="; - }; - - nativeBuildInputs = [ - setuptools-scm - ]; - - # give a hint to setuptools-scm on package version - SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}"; - - propagatedBuildInputs = [ - blspy - ]; - - nativeCheckInputs = [ - pytestCheckHook - ]; - - disabledTestPaths = [ - # all tests in this file have a circular dependency on clvm-tools - "tests/cmds_test.py" - ]; - - pythonImportsCheck = [ - "clvm" - ]; - - meta = with lib; { - description = "Chia Lisp virtual machine"; - homepage = "https://www.chia.net/"; - license = licenses.asl20; - maintainers = teams.chia.members; - }; -} diff --git a/pkgs/development/python-modules/concurrent-log-handler/default.nix b/pkgs/development/python-modules/concurrent-log-handler/default.nix index d971c80089364..bdf74940c9505 100644 --- a/pkgs/development/python-modules/concurrent-log-handler/default.nix +++ b/pkgs/development/python-modules/concurrent-log-handler/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Python logging handler that allows multiple processes to safely write to the same log file concurrently"; homepage = "https://pypi.org/project/concurrent-log-handler"; license = licenses.asl20; - maintainers = teams.chia.members; + maintainers = [ maintainers.lourkeur ]; }; } diff --git a/pkgs/development/python-modules/cssbeautifier/default.nix b/pkgs/development/python-modules/cssbeautifier/default.nix index 390c459242ae3..3144c5114fc29 100644 --- a/pkgs/development/python-modules/cssbeautifier/default.nix +++ b/pkgs/development/python-modules/cssbeautifier/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "cssbeautifier"; - version = "1.14.9"; + version = "1.14.11"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-LaQyRy9oFw64VK/5exaiRyH1CQ7javLjEZlZConn9x8="; + hash = "sha256-QFRMK2K7y2TKpefzegLflWVOXOG8rK2sTKHz3InDFRM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/importlab/default.nix b/pkgs/development/python-modules/importlab/default.nix index 9937ff89d3346..8fd01ca7008e7 100644 --- a/pkgs/development/python-modules/importlab/default.nix +++ b/pkgs/development/python-modules/importlab/default.nix @@ -21,10 +21,12 @@ buildPythonPackage rec { disabledTestPaths = [ "tests/test_parsepy.py" ]; + # Test fails on darwin filesystem + disabledTests = [ "testIsDir" ]; + pythonImportsCheck = [ "importlab" ]; meta = with lib; { - broken = stdenv.isDarwin; description = "A library that automatically infers dependencies for Python files"; homepage = "https://github.com/google/importlab"; license = licenses.mit; diff --git a/pkgs/development/python-modules/keyrings-cryptfile/default.nix b/pkgs/development/python-modules/keyrings-cryptfile/default.nix index 4a640d7b1b7c4..f15e65a32b570 100644 --- a/pkgs/development/python-modules/keyrings-cryptfile/default.nix +++ b/pkgs/development/python-modules/keyrings-cryptfile/default.nix @@ -50,6 +50,6 @@ buildPythonPackage rec { homepage = "https://github.com/frispete/keyrings.cryptfile"; changelog = "https://github.com/frispete/keyrings.cryptfile/blob/v${version}/CHANGES.md"; license = licenses.mit; - maintainers = teams.chia.members; + maintainers = [ maintainers.lourkeur ]; }; } diff --git a/pkgs/development/python-modules/keyrings-cryptfile/fix-testsuite.patch b/pkgs/development/python-modules/keyrings-cryptfile/fix-testsuite.patch deleted file mode 100644 index 8e32a64e52925..0000000000000 --- a/pkgs/development/python-modules/keyrings-cryptfile/fix-testsuite.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/setup.cfg b/setup.cfg -index ec7eb30..7ffd831 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -5,9 +5,6 @@ dists = clean --all sdist bdist_wheel - [wheel] - universal = 1 - --[tool:pytest] --addopts = -s --cov=keyrings/cryptfile -- - [egg_info] - tag_build = - tag_date = 0 diff --git a/pkgs/development/python-modules/pynamodb/default.nix b/pkgs/development/python-modules/pynamodb/default.nix index e52cb5da77fc8..8f75abea64fd0 100644 --- a/pkgs/development/python-modules/pynamodb/default.nix +++ b/pkgs/development/python-modules/pynamodb/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pynamodb"; - version = "5.5.0"; + version = "5.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "pynamodb"; repo = "PynamoDB"; rev = "refs/tags/${version}"; - hash = "sha256-sbGrFTpupBP0VQWR9gUVoCiw6D61s6GsmBvjgD1u99g="; + hash = "sha256-VZHEXAuHGn10EMkyd8hibipu6tw5JvOP4XwdB+xdjN8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index e0f393ff61342..0e216ce185087 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -1,25 +1,27 @@ { lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, pytestCheckHook +, pythonOlder , stdenv + , affine , attrs , boto3 -, buildPythonPackage +, certifi , click , click-plugins , cligj -, certifi , cython_3 -, fetchFromGitHub , gdal , hypothesis -, matplotlib , ipython +, matplotlib , numpy , oldest-supported-numpy , packaging , pytest-randomly -, pytestCheckHook -, pythonOlder , setuptools , shapely , snuggs @@ -40,6 +42,18 @@ buildPythonPackage rec { hash = "sha256-Tp6BSU33FaszrIXQgU0Asb7IMue0C939o/atAKz+3Q4="; }; + patches = [ + # fix tests failing with GDAL 3.8.0 + (fetchpatch { + url = "https://github.com/rasterio/rasterio/commit/54ec554a6d9ee52207ad17dee42cbc51c613f709.diff"; + hash = "sha256-Vjt9HRYNAWyj0myMdtSUENbcLjACfzegEClzZb4BxY8="; + }) + (fetchpatch { + url = "https://github.com/rasterio/rasterio/commit/5a72613c58d1482bf297d08cbacf27992f52b2c4.diff"; + hash = "sha256-bV6rh3GBmeqq9+Jff2b8/1wOuyF3Iqducu2eN4CT3lM="; + }) + ]; + nativeBuildInputs = [ cython_3 gdal @@ -52,13 +66,13 @@ buildPythonPackage rec { propagatedBuildInputs = [ affine attrs + certifi click click-plugins cligj - certifi numpy - snuggs setuptools + snuggs ]; passthru.optional-dependencies = { @@ -77,8 +91,8 @@ buildPythonPackage rec { boto3 hypothesis packaging - pytest-randomly pytestCheckHook + pytest-randomly shapely ]; diff --git a/pkgs/development/tools/mold/default.nix b/pkgs/development/tools/mold/default.nix index d8edce696a787..a5ac2dd3380cc 100644 --- a/pkgs/development/tools/mold/default.nix +++ b/pkgs/development/tools/mold/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "mold"; - version = "2.3.3"; + version = "2.4.0"; src = fetchFromGitHub { owner = "rui314"; repo = "mold"; rev = "v${version}"; - hash = "sha256-YXFfjJp4dSxzEyAtrEi/ONQZKD7QAU/MZ62l4QCcbwE="; + hash = "sha256-ufqTbY59AI1MrY/vrsDg5a4WEVz9IFTdgl1GHMw9HGc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/okteto/default.nix b/pkgs/development/tools/okteto/default.nix index 428f3d91864e5..9b58214895ef8 100644 --- a/pkgs/development/tools/okteto/default.nix +++ b/pkgs/development/tools/okteto/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "okteto"; - version = "2.22.0"; + version = "2.22.3"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; rev = version; - hash = "sha256-HqMnZireYw8k7TXkR+M+Ct97OISaBUNCABR0nYqljjQ="; + hash = "sha256-XvoWLCM1RWc8/v4BQt5Ik89sGWmZAruIKlu5N/WBim4="; }; vendorHash = "sha256-z4ERIfwLPYIMpSetepDx0U2WUA+9RXjoQICMbp+qS3k="; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index 29b65870fe29d..32ace9924d15b 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -58,6 +58,7 @@ tree-sitter-nickel = lib.importJSON ./tree-sitter-nickel.json; tree-sitter-nix = lib.importJSON ./tree-sitter-nix.json; tree-sitter-norg = lib.importJSON ./tree-sitter-norg.json; + tree-sitter-norg-meta = lib.importJSON ./tree-sitter-norg-meta.json; tree-sitter-nu = lib.importJSON ./tree-sitter-nu.json; tree-sitter-ocaml = lib.importJSON ./tree-sitter-ocaml.json; tree-sitter-org-nvim = lib.importJSON ./tree-sitter-org-nvim.json; @@ -95,6 +96,7 @@ tree-sitter-turtle = lib.importJSON ./tree-sitter-turtle.json; tree-sitter-typescript = lib.importJSON ./tree-sitter-typescript.json; tree-sitter-typst = lib.importJSON ./tree-sitter-typst.json; + tree-sitter-uiua = lib.importJSON ./tree-sitter-uiua.json; tree-sitter-verilog = lib.importJSON ./tree-sitter-verilog.json; tree-sitter-vim = lib.importJSON ./tree-sitter-vim.json; tree-sitter-vue = lib.importJSON ./tree-sitter-vue.json; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg-meta.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg-meta.json new file mode 100644 index 0000000000000..93f8737bb7d9d --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg-meta.json @@ -0,0 +1,12 @@ +{ + "url": "https://github.com/nvim-neorg/tree-sitter-norg-meta", + "rev": "a479d1ca05848d0b51dd25bc9f71a17e0108b240", + "date": "2023-05-28T19:01:42+02:00", + "path": "/nix/store/7yp5rzpmdvyhhl38brhz0vl3gd9qv03y-tree-sitter-norg-meta", + "sha256": "1vvl39m41wgsq7xkfi523zx6nza03dkzgk6izc39igmwx5hsdl7f", + "hash": "sha256-7tCmYem8vpgG+9HM92cbQH1r+h+iRDf7wfrxQGoadO8=", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-uiua.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-uiua.json new file mode 100644 index 0000000000000..89e087c661c14 --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-uiua.json @@ -0,0 +1,12 @@ +{ + "url": "https://github.com/shnarazk/tree-sitter-uiua", + "rev": "aa1e0202dbf2ba654d79f880b86f6c1073d81b20", + "date": "2023-11-20T13:01:37+09:00", + "path": "/nix/store/lawqd38bskf5gxsls3w9jjgdaj08q1ym-tree-sitter-uiua", + "sha256": "0sn1vrpdkkaw2j6sp403bhijz3561n0qjh2wcpgp6qbqaxj4gxap", + "hash": "sha256-V/VHZFd4YXPfZVxAiYENpowvI1wDkKuNFFzN2W7ewWo=", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix index b2f301aee54a1..423536dee92a0 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -75,6 +75,8 @@ let "tree-sitter-agda" # abandoned "tree-sitter-fluent" + # to unblock my update + "csharp-tree-sitter" ]; ignoredTreeSitterOrgReposJson = jsonFile "ignored-tree-sitter-org-repos" ignoredTreeSitterOrgRepos; @@ -175,6 +177,10 @@ let orga = "nvim-neorg"; repo = "tree-sitter-norg"; }; + "tree-sitter-norg-meta" = { + orga = "nvim-neorg"; + repo = "tree-sitter-norg-meta"; + }; "tree-sitter-commonlisp" = { orga = "thehamsta"; repo = "tree-sitter-commonlisp"; @@ -379,6 +385,10 @@ let orga = "eonpatapon"; repo = "tree-sitter-cue"; }; + "tree-sitter-uiua" = { + orga = "shnarazk"; + repo = "tree-sitter-uiua"; + }; "tree-sitter-wing" = { orga = "winglang"; repo = "wing"; diff --git a/pkgs/development/web/publii/default.nix b/pkgs/development/web/publii/default.nix index 9fb23dc7fc98c..00b379d551625 100644 --- a/pkgs/development/web/publii/default.nix +++ b/pkgs/development/web/publii/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "publii"; - version = "0.43.1"; + version = "0.44.1"; src = fetchurl { url = "https://getpublii.com/download/Publii-${version}.deb"; - hash = "sha256-+AhvRHw/u66ziqhlHE4BShgoimInE+vT5/kbMn69VF4="; + hash = "sha256-jpEVn7Suv/mNdbxwnjmOMvMJizJLQCeE+aFbmprE52g="; }; dontConfigure = true; diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix index eed9853ece9d8..bec2b9bc7aa79 100644 --- a/pkgs/games/teeworlds/default.nix +++ b/pkgs/games/teeworlds/default.nix @@ -99,7 +99,18 @@ stdenv.mkDerivation rec { ''; homepage = "https://teeworlds.com/"; - license = "BSD-style, see `license.txt'"; + license = with lib.licenses; [ + # See https://github.com/teeworlds/teeworlds/blob/master/license.txt + lib.licenses.zlib # Main license + cc-by-sa-30 # All content under 'datasrc' except the fonts + ofl # datasrc/fonts/SourceHanSans.ttc + free # datasrc/fonts/DejaVuSans.ttf + bsd2 # src/engine/external/json-parser/ + bsd3 # src/engine/external/wavpack + # zlib src/engine/external/md5/ + # zlib src/engine/external/pnglite/ + # zlib src/engine/external/zlib/ + ]; maintainers = with lib.maintainers; [ astsmtl Luflosi ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix index ed0f4449dbe7d..b5f879c1bd31b 100644 --- a/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "android-udev-rules"; - version = "20231104"; + version = "20231124"; src = fetchFromGitHub { owner = "M0Rf30"; repo = "android-udev-rules"; rev = version; - sha256 = "sha256-ziZDu4BWrotG93znEAeZFJ3RffYkotMcsQMFkfDY890="; + hash = "sha256-pDAAC8RibPtkhVVz5WPj/eUjz0A+8bZt/pjzG8zpaE4="; }; installPhase = '' diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix index 695012effc5c9..62db42e13aa0b 100644 --- a/pkgs/os-specific/linux/libselinux/default.nix +++ b/pkgs/os-specific/linux/libselinux/default.nix @@ -61,6 +61,8 @@ stdenv.mkDerivation rec { "LIBSEPOLA=${lib.getLib libsepol}/lib/libsepol.a" "ARCH=${stdenv.hostPlatform.linuxArch}" + ] ++ optionals (fts != null) [ + "FTS_LDLIBS=-lfts" ] ++ optionals stdenv.hostPlatform.isStatic [ "DISABLE_SHARED=y" ] ++ optionals enablePython [ diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index 1e94991b5c089..2d449c531cc8b 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "consul"; - version = "1.16.1"; + version = "1.16.3"; rev = "v${version}"; # Note: Currently only release tags are supported, because they have the Consul UI @@ -17,7 +17,7 @@ buildGoModule rec { owner = "hashicorp"; repo = pname; inherit rev; - hash = "sha256-EEreAhxBQm6Wj1JFGfC9Ql3NARPXNOhqZkzIDJ2NMkg="; + hash = "sha256-XxT+66CNuDeVBoaNhlgET5bJYB/KDCjcO0RDmyI6S9o="; }; passthru.tests.consul = nixosTests.consul; @@ -26,7 +26,7 @@ buildGoModule rec { # has a split module structure in one repo subPackages = ["." "connect/certgen"]; - vendorHash = "sha256-zERHmtmGrPrUPJ2fFc+J0pWKLKQc9TTSFkN2RUOXOoM="; + vendorHash = "sha256-WNvdHT915GSTFhZZfoi/MCHAjzBVYkhUiPNPw5GDT4s="; doCheck = false; diff --git a/pkgs/servers/pocketbase/default.nix b/pkgs/servers/pocketbase/default.nix index ec57634a902a4..56287e66bbb6d 100644 --- a/pkgs/servers/pocketbase/default.nix +++ b/pkgs/servers/pocketbase/default.nix @@ -1,6 +1,7 @@ { lib , buildGoModule , fetchFromGitHub +, nix-update-script }: buildGoModule rec { @@ -32,6 +33,8 @@ buildGoModule rec { mv $out/bin/base $out/bin/pocketbase ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Open Source realtime backend in 1 file"; homepage = "https://github.com/pocketbase/pocketbase"; diff --git a/pkgs/servers/sql/cockroachdb/cockroachdb-bin.nix b/pkgs/servers/sql/cockroachdb/cockroachdb-bin.nix index 2e66ce3c646f9..363e7cd224a76 100644 --- a/pkgs/servers/sql/cockroachdb/cockroachdb-bin.nix +++ b/pkgs/servers/sql/cockroachdb/cockroachdb-bin.nix @@ -32,6 +32,10 @@ buildFHSEnv { runScript = "${src}/cockroach"; + extraInstallCommands = '' + cp -P $out/bin/cockroachdb $out/bin/cockroach + ''; + meta = with lib; { homepage = "https://www.cockroachlabs.com"; description = "A scalable, survivable, strongly-consistent SQL database"; diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 63d02c8f08570..faa83507893f1 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -427,6 +427,8 @@ else let "-DCMAKE_HOST_SYSTEM_VERSION=${stdenv.buildPlatform.uname.release}" ] ++ optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ "-DCMAKE_CROSSCOMPILING_EMULATOR=env" + ] ++ lib.optionals stdenv.hostPlatform.isStatic [ + "-DCMAKE_LINK_SEARCH_START_STATIC=ON" ]); mesonFlags = diff --git a/pkgs/tools/compression/heatshrink/default.nix b/pkgs/tools/compression/heatshrink/default.nix index 49ef7354cbc91..b5cfb92247afa 100644 --- a/pkgs/tools/compression/heatshrink/default.nix +++ b/pkgs/tools/compression/heatshrink/default.nix @@ -1,6 +1,8 @@ { lib , stdenv , fetchFromGitHub +, cmake +, fetchpatch }: stdenv.mkDerivation rec { @@ -14,14 +16,17 @@ stdenv.mkDerivation rec { hash = "sha256-Nm9/+JFMDXY1N90hmNFGh755V2sXSRQ4VBN9f8TcsGk="; }; - makeFlags = [ "PREFIX=$(out)" ]; + patches = [ + # Add CMake build script, wanted by prusa-slicer and libbgcode, which are the only users of this library. + (fetchpatch { + url = "https://github.com/atomicobject/heatshrink/commit/0886e9ca76552b8e325841e2b820b4563e5d5aba.patch"; + hash = "sha256-13hy4+/RDaaKgQcdaSbACvMfElUIskvJ+owXqm40feY="; + }) + ]; - preInstall = '' - mkdir -p $out/{bin,lib,include} - ''; - - doCheck = true; - checkTarget = "test"; + nativeBuildInputs = [ + cmake + ]; doInstallCheck = true; installCheckPhase = '' diff --git a/pkgs/tools/compression/xar/default.nix b/pkgs/tools/compression/xar/default.nix index fa680ebcf51c5..9c03c41054be9 100644 --- a/pkgs/tools/compression/xar/default.nix +++ b/pkgs/tools/compression/xar/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { --replace 'openssl/evp.h' 'openssl/crypto.h' ''; + configureFlags = lib.optional (fts != null) "LDFLAGS=-lfts"; + meta = { homepage = "https://mackyle.github.io/xar/"; description = "Extensible Archiver"; diff --git a/pkgs/tools/graphics/svg2pdf/default.nix b/pkgs/tools/graphics/svg2pdf/default.nix index d92fa5802d876..24065574ddcca 100644 --- a/pkgs/tools/graphics/svg2pdf/default.nix +++ b/pkgs/tools/graphics/svg2pdf/default.nix @@ -5,16 +5,20 @@ rustPlatform.buildRustPackage rec { pname = "svg2pdf"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "typst"; repo = "svg2pdf"; rev = "v${version}"; - hash = "sha256-Xy1ID2/M3v9/ZEo8fWEDlJ8+cmgAMdHhs27xDfe8IYQ="; + hash = "sha256-mWj9zWxqcJ+5VFYSaeNLxClWdOGd34JboZBwT8E75Ew="; }; - cargoHash = "sha256-l3671zvqSM4CY7lOXOur0Q6PBDVf6jXnhZ/8kADWQz4="; - buildFeatures = [ "cli" ]; + + cargoHash = "sha256-zP448dFnkoPca/GJA2kT5ht1fVGkWN0XdaKEePJaloQ="; + + cargoBuildFlags = [ + "-p=svg2pdf-cli" + ]; meta = with lib; { description = "Convert SVG files to PDFs"; diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index b23fe3fa4ed8d..9395cade650b1 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "direnv"; - version = "2.32.3"; + version = "2.33.0"; src = fetchFromGitHub { owner = "direnv"; repo = "direnv"; rev = "v${version}"; - sha256 = "sha256-TDr2eL7Jft1r2IMm6CToVCEhiNo+Rj1H/Skoe+wx1MM="; + sha256 = "sha256-/xOqJ3dr+3S502rXHVBcHhgBCctoMYnWpfLqgrxIoN8="; }; - vendorHash = "sha256-eQaQ77pOYC8q+IA26ArEhHQ0DCU093TbzaYhdV3UydE="; + vendorHash = "sha256-QGPcNgA/iiGt0CdFs2kR3zLL5/SWulSyyf/pW212JpU="; # we have no bash at the moment for windows BASH_PATH = diff --git a/pkgs/tools/misc/pastebinit/default.nix b/pkgs/tools/misc/pastebinit/default.nix index 461e9c9c87fce..ba597934ebbed 100644 --- a/pkgs/tools/misc/pastebinit/default.nix +++ b/pkgs/tools/misc/pastebinit/default.nix @@ -1,51 +1,55 @@ { lib , stdenv -, fetchurl -, fetchpatch +, fetchFromGitHub , python3 +, libxslt +, docbook_xsl +, installShellFiles +, callPackage }: stdenv.mkDerivation rec { - version = "1.5"; + version = "1.6.2"; pname = "pastebinit"; - src = fetchurl { - url = "https://launchpad.net/pastebinit/trunk/${version}/+download/${pname}-${version}.tar.bz2"; - sha256 = "0mw48fgm9lyh9d3pw997fccmglzsjccf2y347gxjas74wx6aira2"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + hash = "sha256-vuAWkHlQM6QTWarThpSbY0qrxzej0GvLU0jT2JOS/qc="; }; - buildInputs = [ - (python3.withPackages (p: [ p.distro ])) + patches = [ + ./use-drv-etc.patch ]; - patchFlags = [ "-p0" ]; + nativeBuildInputs = [ + libxslt + installShellFiles + ]; - patches = [ - # Required to allow pastebinit 1.5 to run on Python 3.8 - ./use-distro-module.patch - # Required to remove the deprecation warning of FancyURLopener - ./use-urllib-request.patch - # Required because pastebin.com now redirects http requests to https - (fetchpatch { - name = "pastebin-com-https.patch"; - url = "https://bazaar.launchpad.net/~arnouten/pastebinit/pastebin-com-https/diff/264?context=3"; - sha256 = "0hxhhfcai0mll8qfyhdl3slmbf34ynb759b648x63274m9nd2kji"; - }) + buildInputs = [ + (python3.withPackages (p: [ p.distro ])) ]; + buildPhase = '' + xsltproc --nonet ${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl pastebinit.xml + ''; + installPhase = '' mkdir -p $out/bin mkdir -p $out/etc cp -a pastebinit $out/bin + cp -a utils/* $out/bin cp -a pastebin.d $out/etc - substituteInPlace $out/bin/pastebinit --replace "'/etc/pastebin.d" "'$out/etc/pastebin.d" + substituteInPlace $out/bin/pastebinit --subst-var-by "etc" "$out/etc" + installManPage pastebinit.1 ''; meta = with lib; { - homepage = "https://launchpad.net/pastebinit"; + homepage = "https://stgraber.org/category/pastebinit/"; description = "A software that lets you send anything you want directly to a pastebin from the command line"; - maintainers = with maintainers; [ raboof ]; + maintainers = with maintainers; [ raboof samuel-martineau ]; license = licenses.gpl2; platforms = platforms.linux ++ lib.platforms.darwin; - mainProgram = "pastebinit"; }; } diff --git a/pkgs/tools/misc/pastebinit/use-distro-module.patch b/pkgs/tools/misc/pastebinit/use-distro-module.patch deleted file mode 100644 index 0e5dbf7860ae1..0000000000000 --- a/pkgs/tools/misc/pastebinit/use-distro-module.patch +++ /dev/null @@ -1,14 +0,0 @@ -=== modified file 'pastebinit' ---- pastebinit 2018-07-04 00:46:08 +0000 -+++ pastebinit 2020-11-13 14:21:11 +0000 -@@ -38,8 +38,8 @@ - - # Now try to override it with a distributor pastebin - try: -- import platform -- release = platform.linux_distribution()[0].lower() -+ import distro -+ release = distro.id() - if release == 'debian': - defaultPB = "paste.debian.net" - elif release == 'fedora': diff --git a/pkgs/tools/misc/pastebinit/use-drv-etc.patch b/pkgs/tools/misc/pastebinit/use-drv-etc.patch new file mode 100644 index 0000000000000..6ccd7897ddf27 --- /dev/null +++ b/pkgs/tools/misc/pastebinit/use-drv-etc.patch @@ -0,0 +1,13 @@ +diff --git a/pastebinit b/pastebinit +index 4e5f9ce..fe06bd3 100755 +--- a/pastebinit ++++ b/pastebinit +@@ -91,7 +91,7 @@ try: + # Files found later override files found earlier. + pastebind = {} + confdirs = [] +- for confdir in ['/usr/share', '/usr/local/share'] \ ++ for confdir in ['@etc@', '/usr/share', '/usr/local/share'] \ + + list(reversed(os.environ.get('XDG_DATA_DIRS', '').split(':'))) \ + + list(reversed(os.environ.get('XDG_CONFIG_DIRS', '').split(':'))) \ + + ['/etc', '/usr/local/etc', diff --git a/pkgs/tools/misc/pastebinit/use-urllib-request.patch b/pkgs/tools/misc/pastebinit/use-urllib-request.patch deleted file mode 100644 index f379fd0651dbd..0000000000000 --- a/pkgs/tools/misc/pastebinit/use-urllib-request.patch +++ /dev/null @@ -1,66 +0,0 @@ -=== modified file 'pastebinit' ---- pastebinit 2018-07-04 00:46:08 +0000 -+++ pastebinit 2020-11-13 14:21:11 +0000 -@@ -23,15 +23,9 @@ - from __future__ import print_function - - import sys --if sys.version[0] == "2": -- from ConfigParser import NoOptionError -- from ConfigParser import SafeConfigParser as ConfigParser -- from urllib import urlencode -- from urllib import FancyURLopener --else: -- from configparser import ConfigParser, NoOptionError -- from urllib.parse import urlencode -- from urllib.request import FancyURLopener -+from configparser import ConfigParser, NoOptionError -+from urllib.parse import urlencode -+from urllib.request import urlopen, Request - - # Set the default pastebin - defaultPB = "pastebin.com" -@@ -72,13 +66,6 @@ try: - version = "1.5" - configfile = os.path.expanduser("~/.pastebinit.xml") - -- # Custom urlopener to handle 401's -- class pasteURLopener(FancyURLopener): -- version = "Pastebinit v%s" % version -- -- def http_error_401(self, url, fp, errcode, errmsg, headers, data=None): -- return None -- - def preloadPastebins(): - # Check several places for config files: - # - global config in /etc/pastebin.d -@@ -410,12 +397,18 @@ try: - else: - post_format = 'standard' - -- url_opener = pasteURLopener() -+ request = Request( -+ fetch_url, -+ method="POST", -+ headers={ -+ 'User-Agent': "Pastebinit v%s" % version -+ } -+ ) - - if post_format == 'json': - if json: - params = json.dumps(params) -- url_opener.addheader('Content-type', 'text/json') -+ request.add_header('Content-type', 'text/json') - else: - print(_("Could not find any json library."), file=sys.stderr) - sys.exit(1) -@@ -428,7 +421,7 @@ try: - print("POSTing to: %s\nParams: %s" % ( - fetch_url, str(params)), file=sys.stderr) - try: -- page = url_opener.open(fetch_url, params) -+ page = urlopen(request, params.encode("utf-8")) - except Exception as e: - print(_("Failed to contact the server: %s") % e, file=sys.stderr) - sys.exit(1) diff --git a/pkgs/tools/misc/rtx/default.nix b/pkgs/tools/misc/rtx/default.nix index f51b896159a4a..51cba8e4b3758 100644 --- a/pkgs/tools/misc/rtx/default.nix +++ b/pkgs/tools/misc/rtx/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { version = "2023.11.2"; src = fetchFromGitHub { - owner = "jdxcode"; + owner = "jdx"; repo = "rtx"; rev = "v${version}"; hash = "sha256-OdqHyxqufJJTfP7frjLKf5R0WNySDyZc7Sh0Mpdord0="; @@ -62,9 +62,9 @@ rustPlatform.buildRustPackage rec { }; meta = { - homepage = "https://github.com/jdxcode/rtx"; + homepage = "https://github.com/jdx/rtx"; description = "Polyglot runtime manager (asdf rust clone)"; - changelog = "https://github.com/jdxcode/rtx/releases/tag/v${version}"; + changelog = "https://github.com/jdx/rtx/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ konradmalik ]; mainProgram = "rtx"; diff --git a/pkgs/tools/networking/aardvark-dns/default.nix b/pkgs/tools/networking/aardvark-dns/default.nix index ea43200b53499..8ecc0442ecc3b 100644 --- a/pkgs/tools/networking/aardvark-dns/default.nix +++ b/pkgs/tools/networking/aardvark-dns/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "aardvark-dns"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - hash = "sha256-7nuLHhkVwMc2RYq3rS9bZl39asjFAnsHxnecPypT1HM="; + hash = "sha256-ZpZlmAlHtlg7a/81TEGRj80Z6Vahk0CFgQmjU9W/tc8="; }; - cargoHash = "sha256-WwM4lPWQmfsBjL4M/j3sZkLtH+Wdy9LTv4M4AF0Z6oo="; + cargoHash = "sha256-6OMiLcSTndX/c5xHe896PMuRpvT21jFpDfCxH15UQIA="; passthru.tests = { inherit (nixosTests) podman; }; diff --git a/pkgs/tools/networking/sing-box/default.nix b/pkgs/tools/networking/sing-box/default.nix index 0463265008acc..d29bbe1292db5 100644 --- a/pkgs/tools/networking/sing-box/default.nix +++ b/pkgs/tools/networking/sing-box/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "sing-box"; - version = "1.6.7"; + version = "1.7.0"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-aER74HRU3yohIIhNel6KdmfDkrrSOiB8pkTf/hEA5uU="; + hash = "sha256-XD4xWOQumqbXMBbzHgCIgFIegUqJnFZsAvk1VZXX5rc="; }; - vendorHash = "sha256-+L816RufHZ7TSoJF7HzCvS+GfWxeGBRXh7nOF0gYIZ8="; + vendorHash = "sha256-U70FjJ0HO5dyFj50qpyjy+k2r7IR/6gOLDi2LM3M3No="; tags = [ "with_quic" diff --git a/pkgs/tools/virtualization/distrobuilder/default.nix b/pkgs/tools/virtualization/distrobuilder/default.nix index a1a0cfde0fe73..e6b867139165d 100644 --- a/pkgs/tools/virtualization/distrobuilder/default.nix +++ b/pkgs/tools/virtualization/distrobuilder/default.nix @@ -8,7 +8,8 @@ , gnutar , squashfsTools , debootstrap -, fetchpatch +, callPackage +, nixosTests }: let @@ -22,34 +23,20 @@ let in buildGoModule rec { pname = "distrobuilder"; - version = "2.1"; + version = "3.0"; - vendorHash = "sha256-yRMsf8KfpNmVUX4Rn4ZPLUPFZCT/g78MKAfgbFDPVkE="; + vendorHash = "sha256-pFrEkZnrcx0d3oM1klQrNHH+MiLvO4V1uFQdE0kXUqM="; src = fetchFromGitHub { owner = "lxc"; repo = "distrobuilder"; - rev = "distrobuilder-${version}"; - sha256 = "sha256-t3ECLtb0tvIzTWgjmVQDFza+kcm3abTZZMSGYjvw1qQ="; + rev = "refs/tags/distrobuilder-${version}"; + sha256 = "sha256-JfME9VaqaQnrhnzhSLGUy9uU+tki1hXdnwqBUD/5XH0="; fetchSubmodules = false; }; buildInputs = bins; - patches = [ - # go.mod update: needed to to include a newer lxd which contains - # https://github.com/canonical/lxd/commit/d83f061a21f509d42b7a334b97403d2a019a7b52 - # which is needed to fix the build w/glibc-2.36. - (fetchpatch { - url = "https://github.com/lxc/distrobuilder/commit/5346bcc77dd7f141a36a8da851f016d0b929835e.patch"; - sha256 = "sha256-H6cSbY0v/FThx72AvoAvUCs2VCYN/PQ0W4H82mQQ3SI="; - }) - # Fixup to keep it building after go.mod update. - (fetchpatch { - url = "https://github.com/lxc/distrobuilder/commit/2c8cbfbf603e7446efce9f30812812336ccf4f2c.patch"; - sha256 = "sha256-qqofghcHGosR2qycGb02c8rwErFyRRhsRKdQfyah8Ds="; - }) - ]; # tests require a local keyserver (mkg20001/nixpkgs branch distrobuilder-with-tests) but gpg is currently broken in tests doCheck = false; @@ -63,12 +50,18 @@ buildGoModule rec { wrapProgram $out/bin/distrobuilder --prefix PATH ":" ${lib.makeBinPath bins} ''; - meta = with lib; { + passthru = { + tests.incus = nixosTests.incus.container; + + generator = callPackage ./generator.nix { inherit src version; }; + }; + + meta = { description = "System container image builder for LXC and LXD"; homepage = "https://github.com/lxc/distrobuilder"; - license = licenses.asl20; - maintainers = with maintainers; [ megheaiulian ]; - platforms = platforms.linux; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ megheaiulian adamcstephens ]; + platforms = lib.platforms.linux; mainProgram = "distrobuilder"; }; } diff --git a/pkgs/tools/virtualization/distrobuilder/generator.nix b/pkgs/tools/virtualization/distrobuilder/generator.nix new file mode 100644 index 0000000000000..e514a7df2e082 --- /dev/null +++ b/pkgs/tools/virtualization/distrobuilder/generator.nix @@ -0,0 +1,19 @@ +{ stdenvNoCC, lib, src, version, makeWrapper, coreutils, findutils, gnugrep, systemd }: + +stdenvNoCC.mkDerivation { + name = "distrobuilder-nixos-generator"; + + inherit src version; + + patches = [ + ./nixos-generator.patch + ]; + + dontBuild = true; + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + install -D -m 0555 distrobuilder/lxc.generator $out/lib/systemd/system-generators/lxc + wrapProgram $out/lib/systemd/system-generators/lxc --prefix PATH : ${lib.makeBinPath [coreutils findutils gnugrep systemd]}:${systemd}/lib/systemd + ''; +} diff --git a/pkgs/tools/virtualization/distrobuilder/nixos-generator.patch b/pkgs/tools/virtualization/distrobuilder/nixos-generator.patch new file mode 100644 index 0000000000000..6194f33e19185 --- /dev/null +++ b/pkgs/tools/virtualization/distrobuilder/nixos-generator.patch @@ -0,0 +1,113 @@ +diff --git a/distrobuilder/lxc.generator b/distrobuilder/lxc.generator +index 0ad81d1..69dbfe7 100644 +--- a/distrobuilder/lxc.generator ++++ b/distrobuilder/lxc.generator +@@ -25,16 +25,6 @@ is_incus_vm() { + [ -e /dev/virtio-ports/org.linuxcontainers.incus ] + } + +-# is_in_path succeeds if the given file exists in on of the paths +-is_in_path() { +- # Don't use $PATH as that may not include all relevant paths +- for path in /bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin; do +- [ -e "${path}/$1" ] && return 0 +- done +- +- return 1 +-} +- + ## Fix functions + # fix_ro_paths avoids udevd issues with /sys and /proc being writable + fix_ro_paths() { +@@ -45,35 +35,6 @@ BindReadOnlyPaths=/sys /proc + EOF + } + +-# fix_nm_link_state forces the network interface to a DOWN state ahead of NetworkManager starting up +-fix_nm_link_state() { +- [ -e "/sys/class/net/$1" ] || return 0 +- ip_path= +- if [ -f /sbin/ip ]; then +- ip_path=/sbin/ip +- elif [ -f /bin/ip ]; then +- ip_path=/bin/ip +- else +- return 0 +- fi +- cat <<-EOF > /run/systemd/system/network-device-down.service +-[Unit] +-Description=Turn off network device +-Before=NetworkManager.service +-Before=systemd-networkd.service +-[Service] +-# do not turn off if there is a default route to 169.254.0.1, i.e. the device is a routed nic +-ExecCondition=/bin/sh -c '! /usr/bin/grep -qs 00000000.0100FEA9 /proc/net/route' +-ExecStart=-${ip_path} link set $1 down +-Type=oneshot +-RemainAfterExit=true +-[Install] +-WantedBy=default.target +-EOF +- mkdir -p /run/systemd/system/default.target.wants +- ln -sf /run/systemd/system/network-device-down.service /run/systemd/system/default.target.wants/network-device-down.service +-} +- + # fix_systemd_override_unit generates a unit specific override + fix_systemd_override_unit() { + dropin_dir="/run/systemd/${1}.d" +@@ -112,16 +73,7 @@ fix_systemd_mask() { + # fix_systemd_udev_trigger overrides the systemd-udev-trigger.service to match the latest version + # of the file which uses "ExecStart=-" instead of "ExecStart=". + fix_systemd_udev_trigger() { +- cmd= +- if [ -f /usr/bin/udevadm ]; then +- cmd=/usr/bin/udevadm +- elif [ -f /sbin/udevadm ]; then +- cmd=/sbin/udevadm +- elif [ -f /bin/udevadm ]; then +- cmd=/bin/udevadm +- else +- return 0 +- fi ++ cmd=udevadm + + mkdir -p /run/systemd/system/systemd-udev-trigger.service.d + cat <<-EOF > /run/systemd/system/systemd-udev-trigger.service.d/zzz-lxc-override.conf +@@ -145,24 +97,12 @@ EOF + } + + ## Main logic +-# Nothing to do in Incus VM but deployed in case it is later converted to a container +-is_incus_vm || is_lxd_vm && exit 0 + + # Exit immediately if not an Incus/LXC container + is_lxc_container || exit 0 + +-# Check for NetworkManager +-nm_exists=0 +- +-is_in_path NetworkManager && nm_exists=1 +- + # Determine systemd version +-for path in /usr/lib/systemd/systemd /lib/systemd/systemd; do +- [ -x "${path}" ] || continue +- +- systemd_version="$("${path}" --version | head -n1 | cut -d' ' -f2)" +- break +-done ++systemd_version="$(systemd --version | head -n1 | cut -d' ' -f2)" + + # Determine distro name and release + ID="" +@@ -222,11 +162,6 @@ ACTION=="add|change|move", ENV{ID_NET_DRIVER}=="veth", ENV{INTERFACE}=="eth[0-9] + EOF + fi + +-# Workarounds for NetworkManager in containers +-if [ "${nm_exists}" -eq 1 ]; then +- fix_nm_link_state eth0 +-fi +- + # Allow masking units created by the lxc system-generator. + for d in /etc/systemd/system /usr/lib/systemd/system /lib/systemd/system; do + if ! [ -d "${d}" ]; then diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7325b6a4ff4a0..aaaa3fa903153 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37012,11 +37012,11 @@ with pkgs; cgminer = callPackage ../applications/blockchains/cgminer { }; - chia = callPackage ../applications/blockchains/chia { }; + chia = throw "chia has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; - chia-dev-tools = callPackage ../applications/blockchains/chia-dev-tools { }; + chia-dev-tools = throw "chia-dev-tools has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; - chia-plotter = callPackage ../applications/blockchains/chia-plotter { }; + chia-plotter = throw "chia-plotter has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; clboss = callPackage ../applications/blockchains/clboss { }; @@ -41815,7 +41815,7 @@ with pkgs; mount wall hostname more sysctl getconf getent locale killall xxd watch; - fts = if stdenv.hostPlatform.isMusl then netbsd.fts else null; + fts = if stdenv.hostPlatform.isMusl then musl-fts else null; bsdSetupHook = makeSetupHook { name = "bsd-setup-hook"; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 7218a8ed8dda1..efd25b37fa60e 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -166,7 +166,6 @@ in { kernelPatches.bridge_stp_helper kernelPatches.request_key_helper kernelPatches.export-rt-sched-migrate - kernelPatches.dell_xps_regression ]; }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 71c9bf760d20f..91135d86429a8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1803,6 +1803,8 @@ with self; { }; }; + BioBigFile = callPackage ../development/perl-modules/Bio-BigFile { }; + BioPerl = buildPerlPackage { pname = "BioPerl"; version = "1.7.8"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e0f35fb332ee5..ee7379a862f1d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1524,8 +1524,6 @@ self: super: with self; { blosc2 = callPackage ../development/python-modules/blosc2 { }; - blspy = callPackage ../development/python-modules/blspy { }; - bluemaestro-ble = callPackage ../development/python-modules/bluemaestro-ble { }; bluepy = callPackage ../development/python-modules/bluepy { }; @@ -1976,13 +1974,13 @@ self: super: with self; { chex = callPackage ../development/python-modules/chex { }; - chiabip158 = callPackage ../development/python-modules/chiabip158 { }; + chiabip158 = throw "chiabip158 has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; - chiapos = callPackage ../development/python-modules/chiapos { }; + chiapos = throw "chiapos has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; - chiavdf = callPackage ../development/python-modules/chiavdf { }; + chiavdf = throw "chiavdf has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; - chia-rs = callPackage ../development/python-modules/chia-rs { }; + chia-rs = throw "chia-rs has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; chirpstack-api = callPackage ../development/python-modules/chirpstack-api { }; @@ -2150,13 +2148,13 @@ self: super: with self; { clustershell = callPackage ../development/python-modules/clustershell { }; - clvm = callPackage ../development/python-modules/clvm { }; + clvm = throw "clvm has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; - clvm-rs = callPackage ../development/python-modules/clvm-rs { }; + clvm-rs = throw "clvm-rs has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; - clvm-tools = callPackage ../development/python-modules/clvm-tools { }; + clvm-tools = throw "clvm-tools has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; - clvm-tools-rs = callPackage ../development/python-modules/clvm-tools-rs { }; + clvm-tools-rs = throw "clvm-tools-rs has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; cma = callPackage ../development/python-modules/cma { }; |