diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 958948d62b19..db641b750733 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -20672,6 +20672,13 @@ githubId = 3512122; keys = [ { fingerprint = "5F29 132D EFA8 5DA0 B598 5BF2 5941 754C 1CDE 33BB"; } ]; }; + TheColorman = { + name = "colorman"; + email = "nixpkgs@colorman.me"; + github = "TheColorman"; + githubId = 18369995; + keys = [ { fingerprint = "3D8C A43C FBA2 5D28 0196 19F0 AB11 0475 B417 291D"; } ]; + }; thedavidmeister = { email = "thedavidmeister@gmail.com"; github = "thedavidmeister"; diff --git a/nixos/modules/services/mail/stalwart-mail.nix b/nixos/modules/services/mail/stalwart-mail.nix index fe433f9a2662..aabe46d607a8 100644 --- a/nixos/modules/services/mail/stalwart-mail.nix +++ b/nixos/modules/services/mail/stalwart-mail.nix @@ -73,8 +73,14 @@ in { resolver.public-suffix = lib.mkDefault [ "file://${pkgs.publicsuffix-list}/share/publicsuffix/public_suffix_list.dat" ]; - config.resource = { + config.resource = let + hasHttpListener = builtins.any (listener: listener.protocol == "http") (lib.attrValues cfg.settings.server.listener); + in { spam-filter = lib.mkDefault "file://${cfg.package}/etc/stalwart/spamfilter.toml"; + } // lib.optionalAttrs ( + (builtins.hasAttr "listener" cfg.settings.server) && hasHttpListener + ) { + webadmin = lib.mkDefault "file://${cfg.package.webadmin}/webadmin.zip"; }; }; diff --git a/nixos/modules/system/boot/unl0kr.nix b/nixos/modules/system/boot/unl0kr.nix index f5ce693c2de4..bb3916ed4599 100644 --- a/nixos/modules/system/boot/unl0kr.nix +++ b/nixos/modules/system/boot/unl0kr.nix @@ -13,7 +13,7 @@ in }; config = lib.mkIf cfg.enable { - meta.maintainers = with lib.maintainers; [ tomfitzhenry ]; + meta.maintainers = []; assertions = [ { assertion = cfg.enable -> config.boot.initrd.systemd.enable; diff --git a/nixos/tests/systemd-initrd-luks-unl0kr.nix b/nixos/tests/systemd-initrd-luks-unl0kr.nix index 0658a098cfa2..83b52646d112 100644 --- a/nixos/tests/systemd-initrd-luks-unl0kr.nix +++ b/nixos/tests/systemd-initrd-luks-unl0kr.nix @@ -2,8 +2,8 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: let passphrase = "secret"; in { name = "systemd-initrd-luks-unl0kr"; - meta = with pkgs.lib.maintainers; { - maintainers = [ tomfitzhenry ]; + meta = { + maintainers = []; }; enableOCR = true; diff --git a/pkgs/applications/misc/gpu-burn/default.nix b/pkgs/applications/misc/gpu-burn/default.nix deleted file mode 100644 index 97d6b674d5e5..000000000000 --- a/pkgs/applications/misc/gpu-burn/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, addDriverRunpath, cudatoolkit }: - -stdenv.mkDerivation { - pname = "gpu-burn"; - version = "unstable-2023-11-10"; - - src = fetchFromGitHub { - owner = "wilicc"; - repo = "gpu-burn"; - rev = "b99aedce3e020d2ca419832ee27b7f29dfa6373e"; - sha256 = "sha256-cLO0GXvujZ+g64j+OY31n43MsVER3ljo8Qrt+EzSKjc="; - }; - - postPatch = '' - substituteInPlace gpu_burn-drv.cpp \ - --replace "#define COMPARE_KERNEL \"compare.ptx\"" \ - "#define COMPARE_KERNEL \"$out/share/compare.ptx\"" - ''; - - buildInputs = [ cudatoolkit ]; - - nativeBuildInputs = [ addDriverRunpath ]; - - makeFlags = [ "CUDAPATH=${cudatoolkit}" ]; - - LDFLAGS = "-L${cudatoolkit}/lib/stubs"; - - installPhase = '' - mkdir -p $out/{bin,share} - cp gpu_burn $out/bin/ - cp compare.ptx $out/share/ - ''; - - postFixup = '' - addDriverRunpath $out/bin/gpu_burn - ''; - - meta = with lib; { - homepage = "http://wili.cc/blog/gpu-burn.html"; - description = "Multi-GPU CUDA stress test"; - platforms = platforms.linux; - license = licenses.bsd2; - mainProgram = "gpu_burn"; - }; -} diff --git a/pkgs/by-name/ei/eintopf/frontend.nix b/pkgs/by-name/ei/eintopf/frontend.nix index 80cb19001f5b..c87c850eeb06 100644 --- a/pkgs/by-name/ei/eintopf/frontend.nix +++ b/pkgs/by-name/ei/eintopf/frontend.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/backstage/yarn.lock"; - hash = "sha256-Z/Pkk/qCWwr99g11DjEgnisPfxOhfD8+OCn6otxJtfI="; + hash = "sha256-7Br2FBhLZf7Cuul5n55EHfqyW8GbujB+yZ/RK6f7I4M="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ei/eintopf/package.nix b/pkgs/by-name/ei/eintopf/package.nix index 7a2a08c453f0..fddd943b7af6 100644 --- a/pkgs/by-name/ei/eintopf/package.nix +++ b/pkgs/by-name/ei/eintopf/package.nix @@ -6,13 +6,13 @@ }: let - version = "0.13.16"; + version = "0.14.1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "Klasse-Methode"; repo = "eintopf"; rev = "v${version}"; - hash = "sha256-ex5bpO60ousJcgZGdviqWrCyihycW+JT+EYFvdooUDw="; + hash = "sha256-+QEAUyAqFLcc3bhGI3v4FxhDt+3P6vBnxWsFPp56lfg="; }; frontend = callPackage ./frontend.nix { inherit src version; }; in @@ -21,7 +21,7 @@ buildGoModule rec { pname = "eintopf"; inherit version src; - vendorHash = "sha256-dBxI6cUGc16lg89x8b+hSLcv5y/MLf6vDIvqdMBUz3I="; + vendorHash = "sha256-ODVCZWxkPWW8ZlONiVXwVQalsLIUl9x512JimLAUm6U="; ldflags = [ "-s" @@ -47,9 +47,7 @@ buildGoModule rec { meta = with lib; { description = "A calendar for Stuttgart, showing events, groups and places"; homepage = "https://codeberg.org/Klasse-Methode/eintopf"; - # License is going to change back to AGPL in the next release - # https://codeberg.org/Klasse-Methode/eintopf/issues/351#issuecomment-2076870 - license = licenses.gpl3Plus; + license = licenses.agpl3Only; maintainers = with maintainers; [ onny ]; platforms = platforms.unix; }; diff --git a/pkgs/by-name/ga/gamescope/package.nix b/pkgs/by-name/ga/gamescope/package.nix index 3c31cf6cf435..26dbdf8440e4 100644 --- a/pkgs/by-name/ga/gamescope/package.nix +++ b/pkgs/by-name/ga/gamescope/package.nix @@ -46,14 +46,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gamescope"; - version = "3.15.2"; + version = "3.15.5"; src = fetchFromGitHub { owner = "ValveSoftware"; repo = "gamescope"; rev = "refs/tags/${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-g6H68dYMmpQYlwhZ6b84yY/qbAP18iNrmYOWf9rL5gc="; + hash = "sha256-H6o0UdJ+wpfy0YY6LDzncWWzUGAMwQC7sHPu5TxHC8I="; }; patches = [ diff --git a/pkgs/by-name/gi/github-runner/package.nix b/pkgs/by-name/gi/github-runner/package.nix index ff69321e65bd..535aaeed42cf 100644 --- a/pkgs/by-name/gi/github-runner/package.nix +++ b/pkgs/by-name/gi/github-runner/package.nix @@ -318,7 +318,7 @@ buildDotnetModule rec { description = "Self-hosted runner for GitHub Actions"; homepage = "https://github.com/actions/runner"; license = licenses.mit; - maintainers = with maintainers; [ veehaitch newam kfollesdal aanderse zimbatm ]; + maintainers = with maintainers; [ veehaitch kfollesdal aanderse zimbatm ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; diff --git a/pkgs/by-name/gp/gpu-burn/package.nix b/pkgs/by-name/gp/gpu-burn/package.nix new file mode 100644 index 000000000000..d2b2bd45ea3a --- /dev/null +++ b/pkgs/by-name/gp/gpu-burn/package.nix @@ -0,0 +1,81 @@ +{ + autoAddDriverRunpath, + config, + cudaPackages, + fetchFromGitHub, + lib, +}: +let + inherit (lib.attrsets) getBin; + inherit (lib.lists) last map optionals; + inherit (lib.trivial) boolToString; + inherit (config) cudaSupport; + inherit (cudaPackages) + backendStdenv + cuda_cccl + cuda_cudart + cuda_nvcc + libcublas + ; + inherit (cudaPackages.cudaFlags) cudaCapabilities dropDot isJetsonBuild; +in +backendStdenv.mkDerivation { + pname = "gpu-burn"; + version = "unstable-2024-04-09"; + + strictDeps = true; + + src = fetchFromGitHub { + owner = "wilicc"; + repo = "gpu-burn"; + rev = "9aefd7c0cc603bbc8c3c102f5338c6af26f8127c"; + hash = "sha256-Nz0yaoHGfodaYl2HJ7p+1nasqRmxwPJ9aL9oxitXDpM="; + }; + + postPatch = '' + substituteInPlace gpu_burn-drv.cpp \ + --replace-fail \ + '#define COMPARE_KERNEL "compare.ptx"' \ + "#define COMPARE_KERNEL \"$out/share/compare.ptx\"" + ''; + + nativeBuildInputs = [ + autoAddDriverRunpath + cuda_nvcc + ]; + + buildInputs = [ + cuda_cccl # + cuda_cudart # driver_types.h + cuda_nvcc # crt/host_defines.h + libcublas # cublas_v2.h + ]; + + makeFlags = [ + "CUDAPATH=${getBin cuda_nvcc}" + "COMPUTE=${last (map dropDot cudaCapabilities)}" + "IS_JETSON=${boolToString isJetsonBuild}" + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/{bin,share} + install -Dm755 gpu_burn $out/bin/ + install -Dm644 compare.ptx $out/share/ + runHook postInstall + ''; + + # NOTE: Certain packages may be missing from cudaPackages on non-Linux platforms. To avoid evaluation failure, + # we only include the platforms where we know the package is available -- thus the conditionals setting the + # platforms and badPlatforms fields. + meta = { + badPlatforms = optionals (!cudaSupport) lib.platforms.all; + broken = !cudaSupport; + description = "Multi-GPU CUDA stress test"; + homepage = "http://wili.cc/blog/gpu-burn.html"; + license = lib.licenses.bsd2; + mainProgram = "gpu_burn"; + maintainers = with lib.maintainers; [ connorbaker ]; + platforms = optionals cudaSupport lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/hd/hdr10plus_tool/Cargo.lock b/pkgs/by-name/hd/hdr10plus_tool/Cargo.lock new file mode 100644 index 000000000000..d768dc8506b2 --- /dev/null +++ b/pkgs/by-name/hd/hdr10plus_tool/Cargo.lock @@ -0,0 +1,1431 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "ab_glyph" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe21446ad43aa56417a767f3e2f3d7c4ca522904de1dd640529a76e9c5c3b33c" +dependencies = [ + "ab_glyph_rasterizer", + "owned_ttf_parser", +] + +[[package]] +name = "ab_glyph_rasterizer" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aho-corasick" +version = "0.7.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +dependencies = [ + "memchr", +] + +[[package]] +name = "anyhow" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" + +[[package]] +name = "assert_cmd" +version = "2.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9834fcc22e0874394a010230586367d4a3e9f11b560f469262678547e1d2575e" +dependencies = [ + "bstr", + "doc-comment", + "predicates", + "predicates-core", + "predicates-tree", + "wait-timeout", +] + +[[package]] +name = "assert_fs" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d94b2a3f3786ff2996a98afbd6b4e5b7e890d685ccf67577f508ee2342c71cc9" +dependencies = [ + "doc-comment", + "globwalk", + "predicates", + "predicates-core", + "predicates-tree", + "tempfile", +] + +[[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 = "bitstream-io" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d28070975aaf4ef1fd0bd1f29b739c06c2cdd9972e090617fb6dca3b2cb564e" + +[[package]] +name = "bitvec_helpers" +version = "3.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ef6883bd86b4112b56be19de3a1628de6c4063be7be6e641d484c83069efb4a" +dependencies = [ + "bitstream-io", +] + +[[package]] +name = "bstr" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ffdb39cb703212f3c11973452c2861b972f757b021158f3516ba10f2fa8b2c1" +dependencies = [ + "memchr", + "once_cell", + "regex-automata", + "serde", +] + +[[package]] +name = "bumpalo" +version = "3.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" + +[[package]] +name = "bytemuck" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "cc" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clap" +version = "4.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3d7ae14b20b94cb02149ed21a86c423859cbe18dc7ed69845cace50e52b40a5" +dependencies = [ + "bitflags", + "clap_derive", + "clap_lex", + "is-terminal", + "once_cell", + "strsim", + "termcolor", + "terminal_size", +] + +[[package]] +name = "clap_derive" +version = "4.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44bec8e5c9d09e439c4335b1af0abaab56dcf3b94999a936e1bb47b9134288f0" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "350b9cf31731f9957399229e9b2adc51eeabdfbe9d71d9a0552275fd12710d09" +dependencies = [ + "os_str_bytes", +] + +[[package]] +name = "cmake" +version = "0.1.49" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db34956e100b30725f2eb215f90d4871051239535632f84fea3bc92722c66b7c" +dependencies = [ + "cc", +] + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "console" +version = "0.15.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "unicode-width", + "windows-sys 0.42.0", +] + +[[package]] +name = "const-cstr" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3d0b5ff30645a68f35ece8cea4556ca14ef8a1651455f789a099a0513532a6" + +[[package]] +name = "core-foundation" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" + +[[package]] +name = "core-graphics" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" +dependencies = [ + "bitflags", + "core-foundation", + "core-graphics-types", + "foreign-types", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" +dependencies = [ + "bitflags", + "core-foundation", + "foreign-types", + "libc", +] + +[[package]] +name = "core-text" +version = "19.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d74ada66e07c1cefa18f8abfba765b486f250de2e4a999e5727fc0dd4b4a25" +dependencies = [ + "core-foundation", + "core-graphics", + "foreign-types", + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "difflib" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" + +[[package]] +name = "dirs-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if", + "dirs-sys-next", +] + +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "dlib" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac1b7517328c04c2aa68422fc60a41b92208182142ed04a25879c26c8f878794" +dependencies = [ + "libloading", +] + +[[package]] +name = "doc-comment" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" + +[[package]] +name = "dwrote" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439a1c2ba5611ad3ed731280541d36d2e9c4ac5e7fb818a27b604bdc5a6aa65b" +dependencies = [ + "lazy_static", + "libc", + "winapi", + "wio", +] + +[[package]] +name = "either" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "errno" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +dependencies = [ + "errno-dragonfly", + "libc", + "winapi", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "flate2" +version = "1.0.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "float-cmp" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" +dependencies = [ + "num-traits", +] + +[[package]] +name = "float-ord" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bad48618fdb549078c333a7a8528acb57af271d0433bdecd523eb620628364e" + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "font-kit" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21fe28504d371085fae9ac7a3450f0b289ab71e07c8e57baa3fb68b9e57d6ce5" +dependencies = [ + "bitflags", + "byteorder", + "core-foundation", + "core-graphics", + "core-text", + "dirs-next", + "dwrote", + "float-ord", + "freetype", + "lazy_static", + "libc", + "log", + "pathfinder_geometry", + "pathfinder_simd", + "walkdir", + "winapi", + "yeslogic-fontconfig-sys", +] + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "freetype" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bee38378a9e3db1cc693b4f88d166ae375338a0ff75cb8263e1c601d51f35dc6" +dependencies = [ + "freetype-sys", + "libc", +] + +[[package]] +name = "freetype-sys" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a37d4011c0cc628dfa766fcc195454f4b068d7afdc2adfd28861191d866e731a" +dependencies = [ + "cmake", + "libc", + "pkg-config", +] + +[[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 = "globset" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" +dependencies = [ + "aho-corasick", + "bstr", + "fnv", + "log", + "regex", +] + +[[package]] +name = "globwalk" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93e3af942408868f6934a7b85134a3230832b9977cf66125df2f9edcfce4ddcc" +dependencies = [ + "bitflags", + "ignore", + "walkdir", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hdr10plus" +version = "2.1.0" +dependencies = [ + "anyhow", + "bitvec_helpers", + "hevc_parser", + "serde", + "serde_json", +] + +[[package]] +name = "hdr10plus_tool" +version = "1.6.0" +dependencies = [ + "anyhow", + "assert_cmd", + "assert_fs", + "bitvec_helpers", + "clap", + "hdr10plus", + "hevc_parser", + "indicatif", + "plotters", + "predicates", + "serde_json", + "thiserror", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + +[[package]] +name = "hevc_parser" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e447b63b4e80dac36e368a9d147d7ba212b4c4b10c516312137f39cea60ff617" +dependencies = [ + "anyhow", + "bitvec_helpers", + "nom", + "regex", +] + +[[package]] +name = "ignore" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" +dependencies = [ + "globset", + "lazy_static", + "log", + "memchr", + "regex", + "same-file", + "thread_local", + "walkdir", + "winapi-util", +] + +[[package]] +name = "image" +version = "0.24.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69b7ea949b537b0fd0af141fff8c77690f2ce96f4f41f042ccb6c69c6c965945" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "jpeg-decoder", + "num-rational", + "num-traits", + "png", +] + +[[package]] +name = "indexmap" +version = "1.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +dependencies = [ + "autocfg", + "hashbrown", +] + +[[package]] +name = "indicatif" +version = "0.17.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cef509aa9bc73864d6756f0d34d35504af3cf0844373afe9b8669a5b8005a729" +dependencies = [ + "console", + "number_prefix", + "portable-atomic", + "unicode-width", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3" +dependencies = [ + "libc", + "windows-sys 0.45.0", +] + +[[package]] +name = "is-terminal" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b6b32576413a8e69b90e952e4a026476040d81017b80445deda5f2d3921857" +dependencies = [ + "hermit-abi", + "io-lifetimes", + "rustix", + "windows-sys 0.45.0", +] + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" + +[[package]] +name = "jpeg-decoder" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" + +[[package]] +name = "js-sys" +version = "0.3.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "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 = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "linux-raw-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" + +[[package]] +name = "log" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +dependencies = [ + "adler", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "normalize-line-endings" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" + +[[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-rational" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg", +] + +[[package]] +name = "number_prefix" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + +[[package]] +name = "once_cell" +version = "1.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" + +[[package]] +name = "os_str_bytes" +version = "6.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" + +[[package]] +name = "owned_ttf_parser" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e25e9fb15717794fae58ab55c26e044103aad13186fbb625893f9a3bbcc24228" +dependencies = [ + "ttf-parser 0.18.1", +] + +[[package]] +name = "pathfinder_geometry" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b7e7b4ea703700ce73ebf128e1450eb69c3a8329199ffbfb9b2a0418e5ad3" +dependencies = [ + "log", + "pathfinder_simd", +] + +[[package]] +name = "pathfinder_simd" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39fe46acc5503595e5949c17b818714d26fdf9b4920eacf3b2947f0199f4a6ff" +dependencies = [ + "rustc_version", +] + +[[package]] +name = "pest" +version = "2.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "028accff104c4e513bad663bbcd2ad7cfd5304144404c31ed0a77ac103d00660" +dependencies = [ + "thiserror", + "ucd-trie", +] + +[[package]] +name = "pkg-config" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" + +[[package]] +name = "plotters" +version = "0.3.5" +source = "git+https://github.com/plotters-rs/plotters#acf5158c6f49b8bfe8a5431c64b0867a1a8b36d1" +dependencies = [ + "ab_glyph", + "font-kit", + "lazy_static", + "num-traits", + "once_cell", + "pathfinder_geometry", + "plotters-backend", + "plotters-bitmap", + "ttf-parser 0.17.1", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "plotters-backend" +version = "0.3.4" +source = "git+https://github.com/plotters-rs/plotters#acf5158c6f49b8bfe8a5431c64b0867a1a8b36d1" + +[[package]] +name = "plotters-bitmap" +version = "0.3.3" +source = "git+https://github.com/plotters-rs/plotters#acf5158c6f49b8bfe8a5431c64b0867a1a8b36d1" +dependencies = [ + "image", + "plotters-backend", +] + +[[package]] +name = "png" +version = "0.17.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638" +dependencies = [ + "bitflags", + "crc32fast", + "flate2", + "miniz_oxide", +] + +[[package]] +name = "portable-atomic" +version = "0.3.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26f6a7b87c2e435a3241addceeeff740ff8b7e76b74c13bf9acb17fa454ea00b" + +[[package]] +name = "predicates" +version = "2.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" +dependencies = [ + "difflib", + "float-cmp", + "itertools", + "normalize-line-endings", + "predicates-core", + "regex", +] + +[[package]] +name = "predicates-core" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72f883590242d3c6fc5bf50299011695fa6590c2c70eac95ee1bdb9a733ad1a2" + +[[package]] +name = "predicates-tree" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54ff541861505aabf6ea722d2131ee980b8276e10a1297b94e896dd8b621850d" +dependencies = [ + "predicates-core", + "termtree", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.51" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags", +] + +[[package]] +name = "redox_users" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +dependencies = [ + "getrandom", + "redox_syscall", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" + +[[package]] +name = "regex-syntax" +version = "0.6.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" + +[[package]] +name = "rustc_version" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.36.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys 0.45.0", +] + +[[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 = "semver" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" +dependencies = [ + "semver-parser", +] + +[[package]] +name = "semver-parser" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" +dependencies = [ + "pest", +] + +[[package]] +name = "serde" +version = "1.0.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.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76" +dependencies = [ + "indexmap", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tempfile" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95" +dependencies = [ + "cfg-if", + "fastrand", + "redox_syscall", + "rustix", + "windows-sys 0.42.0", +] + +[[package]] +name = "termcolor" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "terminal_size" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c9afddd2cec1c0909f06b00ef33f94ab2cc0578c4a610aa208ddfec8aa2b43a" +dependencies = [ + "rustix", + "windows-sys 0.45.0", +] + +[[package]] +name = "termtree" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95059e91184749cb66be6dc994f67f182b6d897cb3df74a5bf66b5e709295fd8" + +[[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 = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "ttf-parser" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "375812fa44dab6df41c195cd2f7fecb488f6c09fbaafb62807488cefab642bff" + +[[package]] +name = "ttf-parser" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0609f771ad9c6155384897e1df4d948e692667cc0588548b68eb44d052b27633" + +[[package]] +name = "ucd-trie" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" + +[[package]] +name = "unicode-ident" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" + +[[package]] +name = "unicode-width" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "wait-timeout" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" +dependencies = [ + "libc", +] + +[[package]] +name = "walkdir" +version = "2.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.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" + +[[package]] +name = "web-sys" +version = "0.3.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" + +[[package]] +name = "wio" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5" +dependencies = [ + "winapi", +] + +[[package]] +name = "yeslogic-fontconfig-sys" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2bbd69036d397ebbff671b1b8e4d918610c181c5a16073b96f984a38d08c386" +dependencies = [ + "const-cstr", + "dlib", + "once_cell", + "pkg-config", +] diff --git a/pkgs/by-name/hd/hdr10plus_tool/package.nix b/pkgs/by-name/hd/hdr10plus_tool/package.nix new file mode 100644 index 000000000000..d1ef9534e934 --- /dev/null +++ b/pkgs/by-name/hd/hdr10plus_tool/package.nix @@ -0,0 +1,46 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + pkg-config, + fontconfig, + nix-update-script, +}: + +rustPlatform.buildRustPackage rec { + pname = "hdr10plus_tool"; + version = "1.6.0"; + + src = fetchFromGitHub { + owner = "quietvoid"; + repo = "hdr10plus_tool"; + rev = "refs/tags/${version}"; + hash = "sha256-EyKCdrilb6Ha9avEe5L4Snbufq8pEiTvr8tcdj0M6Zs="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "plotters-0.3.5" = "sha256-cz8/chdq8C/h1q5yFcQp0Rzg89XHnQhIN1Va52p6Z2Y="; + }; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ fontconfig ]; + + passthru = { + updateScript = nix-update-script { }; + }; + + doCheck = false; + + meta = with lib; { + description = "CLI utility to work with HDR10+ in HEVC files."; + homepage = "https://github.com/quietvoid/hdr10plus_tool"; + changelog = "https://github.com/quietvoid/hdr10plus_tool/releases"; + license = licenses.mit; + maintainers = with maintainers; [ johnrtitor ]; + mainProgram = "hdr10plus_tool"; + }; +} diff --git a/pkgs/by-name/he/heliocron/package.nix b/pkgs/by-name/he/heliocron/package.nix new file mode 100644 index 000000000000..00ca02f3c5b3 --- /dev/null +++ b/pkgs/by-name/he/heliocron/package.nix @@ -0,0 +1,33 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "heliocron"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "mfreeborn"; + repo = "heliocron"; + rev = "v${version}"; + hash = "sha256-5rzFz29Bpy2GR6bEt2DdCq9RtpdcY3SK/KnZrBrHUvk="; + }; + + cargoHash = "sha256-RjYE2TBvHnBgiwJi/Ys+wAmJoMHJuimcD07FOqwkcis="; + + meta = { + description = "Execute tasks relative to sunset, sunrise and other solar events"; + longDescription = "A simple command line application that integrates with `cron` to execute tasks relative to sunset, sunrise and other such solar events."; + homepage = "https://github.com/mfreeborn/heliocron"; + changelog = "https://github.com/mfreeborn/heliocron/releases/tag/v${version}"; + license = with lib.licenses; [ + mit + asl20 + ]; + maintainers = with lib.maintainers; [ TheColorman ]; + mainProgram = "heliocron"; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/ni/nix-direnv/package.nix b/pkgs/by-name/ni/nix-direnv/package.nix index 214c603ee2de..ff56c097c29a 100644 --- a/pkgs/by-name/ni/nix-direnv/package.nix +++ b/pkgs/by-name/ni/nix-direnv/package.nix @@ -1,23 +1,25 @@ -{ resholve, lib, coreutils, direnv, nix, fetchFromGitHub }: +{ + resholve, + lib, + coreutils, + nix, + fetchFromGitHub, + writeText, +}: # resholve does not yet support `finalAttrs` call pattern hence `rec` # https://github.com/abathur/resholve/issues/107 resholve.mkDerivation rec { pname = "nix-direnv"; - version = "3.0.5"; + version = "3.0.6"; src = fetchFromGitHub { owner = "nix-community"; repo = "nix-direnv"; rev = version; - hash = "sha256-imUlc5v/Ow7dgjCjTyEeet+4lNHLeEwfqGQcB4dKcao="; + hash = "sha256-oNqhPqgQT92yxbKmcgX4F3e2yTUPyXYG7b2xQm3TvQw="; }; - # skip min version checks which are redundant when built with nix - postPatch = '' - sed -i 1iNIX_DIRENV_SKIP_VERSION_CHECK=1 direnvrc - ''; - installPhase = '' runHook preInstall install -m400 -D direnvrc $out/share/nix-direnv/direnvrc @@ -28,7 +30,7 @@ resholve.mkDerivation rec { default = { scripts = [ "share/nix-direnv/direnvrc" ]; interpreter = "none"; - inputs = [ coreutils nix ]; + inputs = [ coreutils ]; fake = { builtin = [ "PATH_add" @@ -43,23 +45,36 @@ resholve.mkDerivation rec { # cannot be reached when built with nix "shasum" ]; + external = [ + # We want to reference the ambient Nix when possible, and have custom logic + # for the fallback + "nix" + ]; }; keep = { "$cmd" = true; "$direnv" = true; + + # Nix fallback implementation + "$_nix_direnv_nix" = true; + "$ambient_nix" = true; + "$NIX_DIRENV_FALLBACK_NIX" = true; }; - execer = [ - "cannot:${direnv}/bin/direnv" - "cannot:${nix}/bin/nix" - ]; + prologue = + (writeText "prologue.sh" '' + NIX_DIRENV_FALLBACK_NIX=''${NIX_DIRENV_FALLBACK_NIX:-${lib.getExe nix}} + '').outPath; }; }; meta = { description = "Fast, persistent use_nix implementation for direnv"; - homepage = "https://github.com/nix-community/nix-direnv"; - license = lib.licenses.mit; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ mic92 bbenne10 ]; + homepage = "https://github.com/nix-community/nix-direnv"; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ + mic92 + bbenne10 + ]; }; } diff --git a/pkgs/by-name/rc/rcu/package.nix b/pkgs/by-name/rc/rcu/package.nix index d792eee00af3..489bdefbb136 100644 --- a/pkgs/by-name/rc/rcu/package.nix +++ b/pkgs/by-name/rc/rcu/package.nix @@ -148,5 +148,6 @@ python3Packages.buildPythonApplication rec { homepage = "http://www.davisr.me/projects/rcu/"; license = licenses.agpl3Plus; maintainers = with maintainers; [ OPNA2608 ]; + hydraPlatforms = [ ]; # requireFile used as src }; } diff --git a/pkgs/by-name/so/soteria/package.nix b/pkgs/by-name/so/soteria/package.nix new file mode 100644 index 000000000000..e7c66ed0c305 --- /dev/null +++ b/pkgs/by-name/so/soteria/package.nix @@ -0,0 +1,63 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + wrapGAppsHook4, + cairo, + gdk-pixbuf, + glib, + gtk4, + pango, + polkit, +}: +let + version = "0.1.0"; +in +rustPlatform.buildRustPackage { + pname = "soteria"; + inherit version; + + src = fetchFromGitHub { + owner = "imvaskel"; + repo = "soteria"; + rev = "refs/tags/v${version}"; + hash = "sha256-lhS+37DqSgZrgrYgKGUpKMC22Qjdq9LPNS5k/dqvkRY="; + }; + + cargoHash = "sha256-NMSGSqdCu/kW6vv8+C7UC6oitZqlTklO1sRKDcc1T9o="; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook4 + ]; + + buildInputs = [ + cairo + gdk-pixbuf + glib + gtk4 + pango + ]; + + # From upstream packaging: + # Takes advantage of nixpkgs manually editing PACKAGE_PREFIX by grabbing it from + # the binary itself. + # https://github.com/NixOS/nixpkgs/blob/9b5328b7f761a7bbdc0e332ac4cf076a3eedb89b/pkgs/development/libraries/polkit/default.nix#L142 + # https://github.com/polkit-org/polkit/blob/d89c3604e2a86f4904566896c89e1e6b037a6f50/src/polkitagent/polkitagentsession.c#L599 + preBuild = '' + export POLKIT_AGENT_HELPER_PATH="$(strings ${polkit.out}/lib/libpolkit-agent-1.so | grep "polkit-agent-helper-1")" + ''; + + meta = { + description = "Polkit authentication agent written in GTK designed to be used with any desktop environment"; + homepage = "https://github.com/ImVaskel/soteria"; + license = lib.licenses.asl20; + mainProgram = "soteria"; + maintainers = with lib.maintainers; [ + NotAShelf + lychee + ]; + inherit (polkit.meta) platforms; + }; +} diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix index 045143f15b79..c2a1d339caea 100644 --- a/pkgs/by-name/st/stalwart-mail/package.nix +++ b/pkgs/by-name/st/stalwart-mail/package.nix @@ -15,6 +15,7 @@ nix-update-script, nixosTests, rocksdb_8_11, + callPackage, }: let @@ -144,6 +145,7 @@ rustPlatform.buildRustPackage { doCheck = !(stdenv.isLinux && stdenv.isAarch64); passthru = { + webadmin = callPackage ./webadmin.nix { }; update-script = nix-update-script { }; tests.stalwart-mail = nixosTests.stalwart-mail; }; diff --git a/pkgs/by-name/st/stalwart-mail/webadmin.nix b/pkgs/by-name/st/stalwart-mail/webadmin.nix new file mode 100644 index 000000000000..62db1c422ac4 --- /dev/null +++ b/pkgs/by-name/st/stalwart-mail/webadmin.nix @@ -0,0 +1,70 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + trunk-ng, + tailwindcss, + fetchNpmDeps, + nodejs, + npmHooks, + llvmPackages, + wasm-bindgen-cli, + binaryen, + zip, +}: + +rustPlatform.buildRustPackage rec { + pname = "webadmin"; + version = "0.1.13"; + + src = fetchFromGitHub { + owner = "stalwartlabs"; + repo = "webadmin"; + rev = "refs/tags/v${version}"; + hash = "sha256-QtQAcbyTSAj56QZky7eyNS15pnetLVN1Z4cN5pxlJFc="; + }; + + npmDeps = fetchNpmDeps { + inherit src; + name = "${pname}-npm-deps"; + hash = "sha256-na1HEueX8w7kuDp8LEtJ0nD1Yv39cyk6sEMpS1zix2s="; + }; + + cargoHash = "sha256-CWDwVVea+cdsoIbQdQ3HDiVwYuMSplWZSUXTweibu9s="; + + postPatch = '' + # Using local tailwindcss for compilation + substituteInPlace Trunk.toml --replace-fail "npx tailwindcss" "tailwindcss" + ''; + + nativeBuildInputs = [ + binaryen + llvmPackages.bintools-unwrapped + nodejs + npmHooks.npmConfigHook + tailwindcss + trunk-ng + wasm-bindgen-cli + zip + ]; + + NODE_PATH = "$npmDeps"; + + buildPhase = '' + trunk-ng build --offline --verbose --release + ''; + + installPhase = '' + cd dist + mkdir -p $out + zip -r $out/webadmin.zip * + ''; + + meta = with lib; { + description = "Secure & modern all-in-one mail server Stalwart (webadmin module)"; + homepage = "https://github.com/stalwartlabs/webadmin"; + changelog = "https://github.com/stalwartlabs/mail-server/blob/${version}/CHANGELOG"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/by-name/su/surrealist/0001-Cargo.patch b/pkgs/by-name/su/surrealist/0001-Cargo.patch new file mode 100644 index 000000000000..46ed9c272028 --- /dev/null +++ b/pkgs/by-name/su/surrealist/0001-Cargo.patch @@ -0,0 +1,148 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 55f480a8..a69f9ed9 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1839,6 +1839,22 @@ dependencies = [ + "tower-service", + ] + ++[[package]] ++name = "hyper-tls" ++version = "0.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" ++dependencies = [ ++ "bytes", ++ "http-body-util", ++ "hyper", ++ "hyper-util", ++ "native-tls", ++ "tokio", ++ "tokio-native-tls", ++ "tower-service", ++] ++ + [[package]] + name = "hyper-util" + version = "0.1.3" +@@ -2302,6 +2318,23 @@ dependencies = [ + "windows-sys 0.52.0", + ] + ++[[package]] ++name = "native-tls" ++version = "0.2.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" ++dependencies = [ ++ "libc", ++ "log", ++ "openssl", ++ "openssl-probe", ++ "openssl-sys", ++ "schannel", ++ "security-framework", ++ "security-framework-sys", ++ "tempfile", ++] ++ + [[package]] + name = "ndk" + version = "0.7.0" +@@ -2511,6 +2544,12 @@ dependencies = [ + "syn 2.0.50", + ] + ++[[package]] ++name = "openssl-probe" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" ++ + [[package]] + name = "openssl-src" + version = "300.2.3+3.2.1" +@@ -3416,6 +3455,15 @@ dependencies = [ + "winapi-util", + ] + ++[[package]] ++name = "schannel" ++version = "0.1.23" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" ++dependencies = [ ++ "windows-sys 0.52.0", ++] ++ + [[package]] + name = "schemars" + version = "0.8.19" +@@ -3460,6 +3508,29 @@ version = "4.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" + ++[[package]] ++name = "security-framework" ++version = "2.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" ++dependencies = [ ++ "bitflags 1.3.2", ++ "core-foundation", ++ "core-foundation-sys", ++ "libc", ++ "security-framework-sys", ++] ++ ++[[package]] ++name = "security-framework-sys" ++version = "2.11.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" ++dependencies = [ ++ "core-foundation-sys", ++ "libc", ++] ++ + [[package]] + name = "selectors" + version = "0.22.0" +@@ -3847,6 +3918,7 @@ name = "surrealist" + version = "0.0.0" + dependencies = [ + "dirs", ++ "hyper-tls", + "log", + "openssl", + "portpicker", +@@ -4563,6 +4635,16 @@ dependencies = [ + "windows-sys 0.48.0", + ] + ++[[package]] ++name = "tokio-native-tls" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" ++dependencies = [ ++ "native-tls", ++ "tokio", ++] ++ + [[package]] + name = "tokio-rustls" + version = "0.25.0" +diff --git a/Cargo.toml b/Cargo.toml +index 3e3ab7ee..b6612f95 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -28,6 +28,8 @@ time = { version = "0.3", default-features = false} + log = "^0.4" + url = "2" + ++hyper-tls = "0.6.0" ++ + [target.'cfg(target_os = "linux")'.dependencies] + openssl = { version = "0.10.64", features = ["vendored"] } + diff --git a/pkgs/by-name/su/surrealist/package.nix b/pkgs/by-name/su/surrealist/package.nix index 69278f94bec3..2efacf5d195f 100644 --- a/pkgs/by-name/su/surrealist/package.nix +++ b/pkgs/by-name/su/surrealist/package.nix @@ -5,9 +5,10 @@ , esbuild , fetchFromGitHub , gdk-pixbuf +, glib-networking , gobject-introspection , lib -, libsoup +, libsoup_3 , makeBinaryWrapper , nodejs , openssl @@ -18,12 +19,30 @@ , rustPlatform , stdenv , stdenvNoCC -, webkitgtk +, webkitgtk_4_1 }: let - esbuild-20-2 = let version = "0.20.2"; + cargo-tauri_2 = let + version = "2.0.0-rc.3"; + src = fetchFromGitHub { + owner = "tauri-apps"; + repo = "tauri"; + rev = "tauri-v${version}"; + hash = "sha256-PV8m/MzYgbY4Hv71dZrqVbrxmxrwFfOAraLJIaQk6FQ="; + }; + in cargo-tauri.overrideAttrs (drv: { + inherit src version; + cargoDeps = drv.cargoDeps.overrideAttrs (lib.const { + inherit src; + name = "tauri-${version}-vendor.tar.gz"; + outputHash = "sha256-BrIH0JkGMp68O+4B+0g7X3lSdNSPXo+otlBgslCzPZE="; + }); + }); + + esbuild_21-5 = let + version = "0.21.5"; in esbuild.override { buildGoModule = args: buildGoModule (args // { @@ -32,7 +51,7 @@ let owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-h/Vqwax4B4nehRP9TaYbdixAZdb1hx373dNxNHvDrtY="; + hash = "sha256-FpvXWIlt67G8w3pBKZo/mcp57LunxDmRUaCU/Ne89B8="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; }); @@ -40,34 +59,44 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "surrealist"; - version = "2.0.6"; + version = "2.1.6"; src = fetchFromGitHub { owner = "surrealdb"; repo = "surrealist"; rev = "surrealist-v${finalAttrs.version}"; - hash = "sha256-5OiVqn+ujssxXZXC6pnGiG1Nw8cAhoDU5IIl9skywBw="; + hash = "sha256-jOjOdrVOcGPenFW5mkkXKA64C6c+/f9KzlvtUmw6vXc="; }; sourceRoot = "${finalAttrs.src.name}/src-tauri"; + # HACK: A dependency (surrealist -> tauri -> **reqwest**) contains hyper-tls + # as an actually optional dependency. It ends up in the `Cargo.lock` file of + # tauri, but not in the one of surrealist. We apply a patch to `Cargo.toml` + # and `Cargo.lock` to ensure that we have it in our vendor archive. This may + # be a result of the following bug: + # https://github.com/rust-lang/cargo/issues/10801 + patches = [ + ./0001-Cargo.patch + ]; + ui = stdenvNoCC.mkDerivation { inherit (finalAttrs) src version; pname = "${finalAttrs.pname}-ui"; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-apvU7nanzueaF7PEQL7EKjVT5z1M6I7PZpEIJxfKuCQ="; + hash = "sha256-zGs1MWJ8TEFuHOoekCNIKQo2PBnp95xLz+R8mzeJXh8="; }; - ESBUILD_BINARY_PATH = "${lib.getExe esbuild-20-2}"; + ESBUILD_BINARY_PATH = lib.getExe esbuild_21-5; nativeBuildInputs = [ nodejs pnpm.configHook ]; buildPhase = '' runHook preBuild - pnpm build + pnpm build:desktop runHook postBuild ''; @@ -82,22 +111,29 @@ in stdenv.mkDerivation (finalAttrs: { }; cargoDeps = rustPlatform.fetchCargoTarball { - inherit (finalAttrs) src sourceRoot version; + inherit (finalAttrs) patches src sourceRoot version; name = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-uE4r0smgSbl4l77/MsHtn1Ar5fqspsYcLC/u8TUrcu8="; + hash = "sha256-LtQS0kH+2P4odV7BJYiH6T51+iZHAM9W9mV96rNfNWs="; }; nativeBuildInputs = [ cargo - cargo-tauri + cargo-tauri_2 + gobject-introspection makeBinaryWrapper pkg-config rustc rustPlatform.cargoSetupHook ]; - buildInputs = - [ cairo gdk-pixbuf gobject-introspection libsoup openssl pango webkitgtk ]; + buildInputs = [ + cairo + gdk-pixbuf + libsoup_3 + openssl + pango + webkitgtk_4_1 + ]; env = { OPENSSL_NO_VENDOR = 1; @@ -105,8 +141,8 @@ in stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace ./tauri.conf.json \ - --replace-fail '"distDir": "../dist",' '"distDir": "${finalAttrs.ui}",' \ - --replace-fail '"beforeBuildCommand": "pnpm build",' '"beforeBuildCommand": "",' + --replace-fail '"frontendDist": "../dist",' '"frontendDist": "${finalAttrs.ui}",' \ + --replace-fail '"beforeBuildCommand": "pnpm build:desktop",' '"beforeBuildCommand": "",' ''; postBuild = '' @@ -114,12 +150,14 @@ in stdenv.mkDerivation (finalAttrs: { ''; postInstall = '' - install -Dm555 target/release/bundle/deb/surrealist_${finalAttrs.version}_*/data/usr/bin/surrealist -t $out/bin - cp -r target/release/bundle/deb/surrealist_${finalAttrs.version}_*/data/usr/share $out + install -Dm555 target/release/bundle/deb/Surrealist_${finalAttrs.version}_*/data/usr/bin/surrealist -t $out/bin + cp -r target/release/bundle/deb/Surrealist_${finalAttrs.version}_*/data/usr/share $out ''; postFixup = '' - wrapProgram "$out/bin/surrealist" --set WEBKIT_DISABLE_COMPOSITING_MODE 1 + wrapProgram "$out/bin/surrealist" \ + --set GIO_EXTRA_MODULES ${glib-networking}/lib/gio/modules \ + --set WEBKIT_DISABLE_COMPOSITING_MODE 1 ''; meta = with lib; { diff --git a/pkgs/by-name/ti/tippecanoe/package.nix b/pkgs/by-name/ti/tippecanoe/package.nix index 66bcca14f038..2be8a374d232 100644 --- a/pkgs/by-name/ti/tippecanoe/package.nix +++ b/pkgs/by-name/ti/tippecanoe/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Build vector tilesets from large collections of GeoJSON features"; homepage = "https://github.com/felt/tippecanoe"; license = licenses.bsd2; - maintainers = with maintainers; [ sikmir ]; + maintainers = teams.geospatial.members; platforms = platforms.unix; mainProgram = "tippecanoe"; }; diff --git a/pkgs/by-name/un/unl0kr/package.nix b/pkgs/by-name/un/unl0kr/package.nix index 345a07ea9291..4f3589bd5973 100644 --- a/pkgs/by-name/un/unl0kr/package.nix +++ b/pkgs/by-name/un/unl0kr/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "unl0kr"; homepage = "https://gitlab.com/cherrypicker/unl0kr"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ tomfitzhenry ]; + maintainers = []; platforms = platforms.linux; }; }) diff --git a/pkgs/by-name/wa/wasm-bindgen-cli/package.nix b/pkgs/by-name/wa/wasm-bindgen-cli/package.nix new file mode 100644 index 000000000000..517b2813478f --- /dev/null +++ b/pkgs/by-name/wa/wasm-bindgen-cli/package.nix @@ -0,0 +1,49 @@ +{ + lib, + rustPlatform, + fetchCrate, + nix-update-script, + nodejs_latest, + pkg-config, + openssl, + stdenv, + curl, + darwin, + version ? "0.2.93", + hash ? "sha256-DDdu5mM3gneraM85pAepBXWn3TMofarVR4NbjMdz3r0=", + cargoHash ? "sha256-birrg+XABBHHKJxfTKAMSlmTVYLmnmqMDfRnmG6g/YQ=", +}: + +rustPlatform.buildRustPackage rec { + pname = "wasm-bindgen-cli"; + inherit version hash cargoHash; + + src = fetchCrate { inherit pname version hash; }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = + [ openssl ] + ++ lib.optionals stdenv.isDarwin [ + curl + darwin.apple_sdk.frameworks.Security + ]; + + nativeCheckInputs = [ nodejs_latest ]; + + # tests require it to be ran in the wasm-bindgen monorepo + doCheck = false; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://rustwasm.github.io/docs/wasm-bindgen/"; + license = with lib.licenses; [ + asl20 # or + mit + ]; + description = "Facilitating high-level interactions between wasm modules and JavaScript"; + maintainers = with lib.maintainers; [ rizary ]; + mainProgram = "wasm-bindgen"; + }; +} diff --git a/pkgs/development/compilers/go/1.23.nix b/pkgs/development/compilers/go/1.23.nix index b9644f8d0aae..d4486ff319e4 100644 --- a/pkgs/development/compilers/go/1.23.nix +++ b/pkgs/development/compilers/go/1.23.nix @@ -47,11 +47,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.23.0"; + version = "1.23.1"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-Qreo6A2AXaoDAi7T/eQyHUw78smQoUQWXQHu7Nb2mcY="; + hash = "sha256-buROKYN50Ual5aprHFtdX10KM2XqvdcHQebiE0DsOw0="; }; strictDeps = true; diff --git a/pkgs/development/libraries/quantlib/default.nix b/pkgs/development/libraries/quantlib/default.nix index a84221b1b176..f38d560a8e68 100644 --- a/pkgs/development/libraries/quantlib/default.nix +++ b/pkgs/development/libraries/quantlib/default.nix @@ -5,17 +5,17 @@ , boost }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "quantlib"; - version = "1.34"; + version = "1.35"; outputs = [ "out" "dev" ]; src = fetchFromGitHub { owner = "lballabio"; repo = "QuantLib"; - rev = "v${version}"; - sha256 = "sha256-qrMaIBiDg7bFtWTDAQgAMtekb/7VrI7Ix+G59mU4WHI="; + rev = "v${finalAttrs.version}"; + hash = "sha256-L0cdfrVZTwyRcDnYhbmRbH53+mBt6AnrKm+in++du2M="; }; nativeBuildInputs = [ cmake ]; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = [ maintainers.kupac ]; }; -} +}) diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index 9f3f97b1bc57..8e16ca72e003 100644 --- a/pkgs/development/libraries/x265/default.nix +++ b/pkgs/development/libraries/x265/default.nix @@ -79,6 +79,9 @@ stdenv.mkDerivation rec { "-DEXPORT_C_API=OFF" ] ++ lib.optionals stdenv.hostPlatform.isPower [ "-DENABLE_ALTIVEC=OFF" # https://bitbucket.org/multicoreware/x265_git/issues/320/fail-to-build-on-power8-le + ] ++ lib.optionals isCross [ + (mkFlag stdenv.hostPlatform.isAarch32 "CROSS_COMPILE_ARM") + (mkFlag stdenv.hostPlatform.isAarch64 "CROSS_COMPILE_ARM64") ]; preConfigure = lib.optionalString multibitdepthSupport '' @@ -99,11 +102,6 @@ stdenv.mkDerivation rec { ${mkFlag cliSupport "ENABLE_CLI"} ${mkFlag unittestsSupport "ENABLE_TESTS"} ) - '' + lib.optionalString isCross '' - cmakeFlagsArray+=( - ${mkFlag (stdenv.hostPlatform.isAarch32) "CROSS_COMPILE_ARM"} - ${mkFlag (stdenv.hostPlatform.isAarch64) "CROSS_COMPILE_ARM64"} - ) ''; # Builds 10bits and 12bits static libs on the side if multi bit-depth is wanted diff --git a/pkgs/development/python-modules/hypothesmith/default.nix b/pkgs/development/python-modules/hypothesmith/default.nix index a69c0c08214e..c53c3c2e3670 100644 --- a/pkgs/development/python-modules/hypothesmith/default.nix +++ b/pkgs/development/python-modules/hypothesmith/default.nix @@ -1,5 +1,6 @@ { lib, + black, buildPythonPackage, fetchPypi, hypothesis, @@ -7,59 +8,45 @@ libcst, parso, pytestCheckHook, + pytest-cov-stub, pytest-xdist, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "hypothesmith"; version = "0.3.3"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; hash = "sha256-lsFIAtbI6F2JdSZBdoeNtUso0u2SH9v+3C5rjOPIFxY="; }; - patches = [ ./remove-black.patch ]; + build-system = [ setuptools ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "lark-parser" "lark" - - substituteInPlace tox.ini \ - --replace "--cov=hypothesmith" "" \ - --replace "--cov-branch" "" \ - --replace "--cov-report=term-missing:skip-covered" "" \ - --replace "--cov-fail-under=100" "" - ''; - - propagatedBuildInputs = [ + dependencies = [ hypothesis lark libcst ]; nativeCheckInputs = [ + black parso pytestCheckHook + pytest-cov-stub pytest-xdist ]; - pytestFlagsArray = [ "-v" ]; - disabledTests = [ - # https://github.com/Zac-HD/hypothesmith/issues/21 + # super slow "test_source_code_from_libcst_node_type" ]; - disabledTestPaths = [ - # missing blib2to3 - "tests/test_syntactic.py" - ]; - pythonImportsCheck = [ "hypothesmith" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/hypothesmith/remove-black.patch b/pkgs/development/python-modules/hypothesmith/remove-black.patch deleted file mode 100644 index d37222ef4b2c..000000000000 --- a/pkgs/development/python-modules/hypothesmith/remove-black.patch +++ /dev/null @@ -1,87 +0,0 @@ -diff --git a/tests/test_cst.py b/tests/test_cst.py -index 8532240..bdba2d7 100644 ---- a/tests/test_cst.py -+++ b/tests/test_cst.py -@@ -3,7 +3,6 @@ import ast - from inspect import isabstract - from operator import attrgetter - --import black - import libcst - import parso - import pytest -@@ -51,27 +50,6 @@ def test_ast_unparse_from_nodes(source_code): - assert ast.dump(first) == ast.dump(second) - - --@pytest.mark.xfail --@example("A\u2592", black.Mode()) --@given( -- source_code=hypothesmith.from_node(), -- mode=st.builds( -- black.Mode, -- line_length=st.just(88) | st.integers(0, 200), -- string_normalization=st.booleans(), -- is_pyi=st.booleans(), -- ), --) --def test_black_autoformatter_from_nodes(source_code, mode): -- try: -- result = black.format_file_contents(source_code, fast=False, mode=mode) -- except black.NothingChanged: -- pass -- else: -- with pytest.raises(black.NothingChanged): -- black.format_file_contents(result, fast=False, mode=mode) -- -- - @given(source_code=hypothesmith.from_node()) - def test_from_node_always_compilable(source_code): - compile(source_code, "", "exec") -diff --git a/tests/test_syntactic.py b/tests/test_syntactic.py -index 7fe9835..17c4f7c 100644 ---- a/tests/test_syntactic.py -+++ b/tests/test_syntactic.py -@@ -3,7 +3,6 @@ import ast - import io - import tokenize - --import black - import blib2to3 - import parso - import pytest -@@ -58,34 +57,6 @@ def test_ast_unparse_from_grammar(source_code): - assert ast.dump(first) == ast.dump(second) - - --@example("\\", black.Mode()) --@example("A#\r#", black.Mode()) --@given( -- source_code=hypothesmith.from_grammar(), -- mode=st.builds( -- black.Mode, -- line_length=st.just(88) | st.integers(0, 200), -- string_normalization=st.booleans(), -- is_pyi=st.booleans(), -- ), --) --def test_black_autoformatter_from_grammar(source_code, mode): -- try: -- result = black.format_file_contents(source_code, fast=False, mode=mode) -- except black.NothingChanged: -- pass -- except blib2to3.pgen2.tokenize.TokenError: -- # Fails to tokenise e.g. "\\", though compile("\\", "", "exec") works. -- # See https://github.com/psf/black/issues/1012 -- reject() -- except black.InvalidInput: -- # e.g. "A#\r#", see https://github.com/psf/black/issues/970 -- reject() -- else: -- with pytest.raises(black.NothingChanged): -- black.format_file_contents(result, fast=False, mode=mode) -- -- - @given(source_code=hypothesmith.from_grammar("eval_input")) - def test_eval_input_generation(source_code): - compile(source_code, filename="", mode="eval") diff --git a/pkgs/development/python-modules/libcst/default.nix b/pkgs/development/python-modules/libcst/default.nix index ab176fd8252f..a0863f9bfd1c 100644 --- a/pkgs/development/python-modules/libcst/default.nix +++ b/pkgs/development/python-modules/libcst/default.nix @@ -3,8 +3,10 @@ stdenv, buildPythonPackage, fetchFromGitHub, + callPackage, cargo, - hypothesis, + hypothesmith, + libcst, libiconv, pytestCheckHook, python, @@ -16,14 +18,15 @@ setuptools-scm, typing-extensions, typing-inspect, + ufmt, }: buildPythonPackage rec { pname = "libcst"; version = "1.4.0"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "instagram"; @@ -41,15 +44,12 @@ buildPythonPackage rec { cargoRoot = "native"; - postPatch = '' - # avoid infinite recursion by not formatting the release files - substituteInPlace libcst/codegen/generate.py \ - --replace '"ufmt"' '"true"' - ''; - - nativeBuildInputs = [ + build-system = [ setuptools-rust setuptools-scm + ]; + + nativeBuildInputs = [ rustPlatform.cargoSetupHook cargo rustc @@ -57,44 +57,48 @@ buildPythonPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; - propagatedBuildInputs = [ + dependencies = [ typing-extensions typing-inspect pyyaml ]; nativeCheckInputs = [ - hypothesis + hypothesmith pytestCheckHook + ufmt ]; preCheck = '' - # otherwise import libcst.native fails - cp build/lib.*/libcst/native.* libcst/ - - ${python.interpreter} -m libcst.codegen.generate visitors - ${python.interpreter} -m libcst.codegen.generate return_types - - # Can't run all tests due to circular dependency on hypothesmith -> libcst - rm -r {libcst/tests,libcst/codegen/tests,libcst/m*/tests} + # import from $out instead + rm libcst/__init__.py ''; disabledTests = [ - # No files are generated - "test_codemod_formatter_error_input" + # FIXME package pyre-test + "TypeInferenceProviderTest" + # we'd need to run `python -m libcst.codegen.generate all` but shouldn't modify $out + "test_codegen_clean_visitor_functions" ]; + # circular dependency on hypothesmith and ufmt + doCheck = false; + + passthru.tests = { + pytest = libcst.overridePythonAttrs { doCheck = true; }; + }; + pythonImportsCheck = [ "libcst" ]; - meta = with lib; { + meta = { description = "Concrete Syntax Tree (CST) parser and serializer library for Python"; homepage = "https://github.com/Instagram/libcst"; changelog = "https://github.com/Instagram/LibCST/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ + license = with lib.licenses; [ mit asl20 psfl ]; - maintainers = [ ]; + maintainers = with lib.maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/playwright/default.nix b/pkgs/development/python-modules/playwright/default.nix index 217e8d7cd292..1c215be9d897 100644 --- a/pkgs/development/python-modules/playwright/default.nix +++ b/pkgs/development/python-modules/playwright/default.nix @@ -66,7 +66,7 @@ buildPythonPackage rec { # Set the correct driver path with the help of a patch in patches substituteInPlace playwright/_impl/_driver.py \ --replace-fail "@node@" "${lib.getExe nodejs}" \ - --replace-fail "@driver@" "${driver}/package/cli.js" + --replace-fail "@driver@" "${driver}/cli.js" ''; nativeBuildInputs = [ diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 145f0e685a4a..6e8b2ce8a7ec 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -318,6 +318,7 @@ let svaNUMT = [ jbedo ]; svaRetro = [ jbedo ]; StructuralVariantAnnotation = [ jbedo ]; + RQuantLib = [ kupac ]; }; packagesWithRDepends = { diff --git a/pkgs/development/tools/rust/leptosfmt/default.nix b/pkgs/development/tools/rust/leptosfmt/default.nix index 0a6f53fa0533..ef5324d4ba37 100644 --- a/pkgs/development/tools/rust/leptosfmt/default.nix +++ b/pkgs/development/tools/rust/leptosfmt/default.nix @@ -5,16 +5,17 @@ rustPlatform.buildRustPackage rec { pname = "leptosfmt"; - version = "0.1.18"; + version = "0.1.30"; src = fetchFromGitHub { owner = "bram209"; repo = "leptosfmt"; - rev = version; - hash = "sha256-bNfTZgcru7PJR/9AcaOmW0E8QwdiXcuP7MWXcDPXGso="; + rev = "85b06b9a8bb0616b6a03ba43517245c79e1dd4cf"; + hash = "sha256-PiVPnni7W8SIhO6L9698RSMTD4VVTB+klLrqMzEtWWo="; + fetchSubmodules = true; }; - cargoHash = "sha256-NQYIq9Wc2mtUGeS3Iv2e0nfQkvcX6hOxZ6FHVcHD5cs="; + cargoHash = "sha256-zj81fXjDM648Y8mIb6QMmAh/ck9GGEypzuJIBWZ32r8="; meta = with lib; { description = "Formatter for the leptos view! macro"; diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix deleted file mode 100644 index 3b0a6c1b53eb..000000000000 --- a/pkgs/development/tools/wasm-bindgen-cli/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, rustPlatform -, fetchCrate -, nix-update-script -, nodejs -, pkg-config -, openssl -, stdenv -, curl -, Security -, version ? "0.2.93" -, hash ? "sha256-DDdu5mM3gneraM85pAepBXWn3TMofarVR4NbjMdz3r0=" -, cargoHash ? "sha256-birrg+XABBHHKJxfTKAMSlmTVYLmnmqMDfRnmG6g/YQ=" -}: - -rustPlatform.buildRustPackage rec { - pname = "wasm-bindgen-cli"; - inherit version hash cargoHash; - - src = fetchCrate { - inherit pname version hash; - }; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ curl Security ]; - - nativeCheckInputs = [ nodejs ]; - - # tests require it to be ran in the wasm-bindgen monorepo - doCheck = false; - - meta = with lib; { - homepage = "https://rustwasm.github.io/docs/wasm-bindgen/"; - license = with licenses; [ asl20 /* or */ mit ]; - description = "Facilitating high-level interactions between wasm modules and JavaScript"; - maintainers = with maintainers; [ rizary ]; - mainProgram = "wasm-bindgen"; - }; - - passthru.updateScript = nix-update-script { }; -} diff --git a/pkgs/servers/redpanda/default.nix b/pkgs/servers/redpanda/default.nix index f232e4804c6c..8d282ab7876b 100644 --- a/pkgs/servers/redpanda/default.nix +++ b/pkgs/servers/redpanda/default.nix @@ -6,12 +6,12 @@ , stdenv }: let - version = "24.2.3"; + version = "24.2.4"; src = fetchFromGitHub { owner = "redpanda-data"; repo = "redpanda"; rev = "v${version}"; - sha256 = "sha256-X9RvMjmI6IMFsBvutXH8Bb8TTLRgaFGGXLxrIlmMEaU="; + sha256 = "sha256-DSwD9oN5hrDjUL0Ey8ARvojr54abBXUNvj/06lLvURk="; }; in buildGoModule rec { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 96b015cc65dd..6392a855ce74 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5272,12 +5272,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - gpu-burn = callPackage ../applications/misc/gpu-burn { - # gpu-burn doesn't build on gcc11. CUDA 11.3 is the last version to use - # pre-gcc11, in particular gcc9. - stdenv = gcc9Stdenv; - }; - gpu-viewer = callPackage ../applications/misc/gpu-viewer { }; greg = callPackage ../applications/audio/greg { @@ -13779,11 +13773,6 @@ with pkgs; wasm-text-gen = nodePackages."@webassemblyjs/wasm-text-gen-1.11.1"; wast-refmt = nodePackages."@webassemblyjs/wast-refmt-1.11.1"; - wasm-bindgen-cli = callPackage ../development/tools/wasm-bindgen-cli { - inherit (darwin.apple_sdk.frameworks) Security; - nodejs = nodejs_latest; - }; - wasm-tools = callPackage ../tools/misc/wasm-tools { }; wasmedge = callPackage ../development/tools/wasmedge {