diff options
Diffstat (limited to 'pkgs/development/compilers')
435 files changed, 9236 insertions, 25802 deletions
diff --git a/pkgs/development/compilers/acme/default.nix b/pkgs/development/compilers/acme/default.nix deleted file mode 100644 index 855abe1844d6..000000000000 --- a/pkgs/development/compilers/acme/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchsvn }: - -stdenv.mkDerivation rec { - pname = "acme"; - version = "unstable-2021-11-05"; - - src = fetchsvn { - url = "svn://svn.code.sf.net/p/acme-crossass/code-0/trunk"; - rev = "323"; - sha256 = "1dzvip90yf1wg0fhfghn96dwrhg289d06b624px9a2wwy3vp5ryg"; - }; - - sourceRoot = "${src.name}/src"; - - postPatch = '' - substituteInPlace Makefile \ - --replace "= gcc" "?= gcc" - ''; - - enableParallelBuilding = true; - - makeFlags = [ "BINDIR=$(out)/bin" ]; - - meta = with lib; { - description = "Multi-platform cross assembler for 6502/6510/65816 CPUs"; - mainProgram = "acme"; - homepage = "https://sourceforge.net/projects/acme-crossass/"; - license = licenses.gpl2Plus; - platforms = platforms.all; - maintainers = with maintainers; [ OPNA2608 ]; - }; -} diff --git a/pkgs/development/compilers/ante/Cargo.lock b/pkgs/development/compilers/ante/Cargo.lock deleted file mode 100644 index a3ffcbfbdaf4..000000000000 --- a/pkgs/development/compilers/ante/Cargo.lock +++ /dev/null @@ -1,970 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "ahash" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - -[[package]] -name = "aho-corasick" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" -dependencies = [ - "memchr", -] - -[[package]] -name = "anstream" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" - -[[package]] -name = "anstyle-parse" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" -dependencies = [ - "windows-sys 0.48.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" -dependencies = [ - "anstyle", - "windows-sys 0.48.0", -] - -[[package]] -name = "ante" -version = "0.1.1" -dependencies = [ - "clap", - "clap_complete", - "colored", - "cranelift", - "cranelift-jit", - "cranelift-module", - "cranelift-object", - "difference", - "goldentests", - "inkwell", - "mimalloc", - "petgraph", - "target-lexicon", -] - -[[package]] -name = "anyhow" -version = "1.0.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "cc" -version = "1.0.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "clap" -version = "4.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_complete" -version = "4.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffe91f06a11b4b9420f62103854e90867812cd5d01557f853c5ee8e791b12ae" -dependencies = [ - "clap", -] - -[[package]] -name = "clap_derive" -version = "4.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "clap_lex" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "colored" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6" -dependencies = [ - "is-terminal", - "lazy_static", - "windows-sys 0.48.0", -] - -[[package]] -name = "cranelift" -version = "0.86.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd96bba738454eb373087df6d6891b18009361123fef90930def4978e3837448" -dependencies = [ - "cranelift-codegen", - "cranelift-frontend", -] - -[[package]] -name = "cranelift-bforest" -version = "0.86.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "529ffacce2249ac60edba2941672dfedf3d96558b415d0d8083cd007456e0f55" -dependencies = [ - "cranelift-entity", -] - -[[package]] -name = "cranelift-codegen" -version = "0.86.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "427d105f617efc8cb55f8d036a7fded2e227892d8780b4985e5551f8d27c4a92" -dependencies = [ - "cranelift-bforest", - "cranelift-codegen-meta", - "cranelift-codegen-shared", - "cranelift-entity", - "cranelift-isle", - "log", - "regalloc2", - "smallvec", - "target-lexicon", -] - -[[package]] -name = "cranelift-codegen-meta" -version = "0.86.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "551674bed85b838d45358e3eab4f0ffaa6790c70dc08184204b9a54b41cdb7d1" -dependencies = [ - "cranelift-codegen-shared", -] - -[[package]] -name = "cranelift-codegen-shared" -version = "0.86.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b3a63ae57498c3eb495360944a33571754241e15e47e3bcae6082f40fec5866" - -[[package]] -name = "cranelift-entity" -version = "0.86.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11aa8aa624c72cc1c94ea3d0739fa61248260b5b14d3646f51593a88d67f3e6e" - -[[package]] -name = "cranelift-frontend" -version = "0.86.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "544ee8f4d1c9559c9aa6d46e7aaeac4a13856d620561094f35527356c7d21bd0" -dependencies = [ - "cranelift-codegen", - "log", - "smallvec", - "target-lexicon", -] - -[[package]] -name = "cranelift-isle" -version = "0.86.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed16b14363d929b8c37e3c557d0a7396791b383ecc302141643c054343170aad" - -[[package]] -name = "cranelift-jit" -version = "0.86.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0308e7418208639fb96c1a3dc04955fa41c4bc92dfce9106635185f71d5caf46" -dependencies = [ - "anyhow", - "cranelift-codegen", - "cranelift-entity", - "cranelift-module", - "cranelift-native", - "libc", - "log", - "region", - "target-lexicon", - "windows-sys 0.36.1", -] - -[[package]] -name = "cranelift-module" -version = "0.86.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76979aac10dbcf0c222cd5902565bc93597ac30bbe9d879a2aa5f2402d1561f2" -dependencies = [ - "anyhow", - "cranelift-codegen", -] - -[[package]] -name = "cranelift-native" -version = "0.86.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51617cf8744634f2ed3c989c3c40cd6444f63377c6d994adab0d85807f3eb682" -dependencies = [ - "cranelift-codegen", - "libc", - "target-lexicon", -] - -[[package]] -name = "cranelift-object" -version = "0.86.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50e649a13f3951ad3b8cb13a3a774481c12159a98eb386b04583573c57d7cf56" -dependencies = [ - "anyhow", - "cranelift-codegen", - "cranelift-module", - "log", - "object", - "target-lexicon", -] - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" -dependencies = [ - "cfg-if", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" -dependencies = [ - "autocfg", - "cfg-if", - "crossbeam-utils", - "memoffset", - "scopeguard", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "difference" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" - -[[package]] -name = "either" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "errno" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8" -dependencies = [ - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "fixedbitset" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" - -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - -[[package]] -name = "getrandom" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "goldentests" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8476785a67758ffc17be1d41009468ef27fb96b5211c9d375a4356bf891dcbc5" -dependencies = [ - "colored", - "rayon", - "shlex", - "similar", -] - -[[package]] -name = "hashbrown" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" -dependencies = [ - "ahash", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hashbrown" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "hermit-abi" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" - -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - -[[package]] -name = "indexmap" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" -dependencies = [ - "equivalent", - "hashbrown 0.14.2", -] - -[[package]] -name = "inkwell" -version = "0.2.0" -source = "git+https://github.com/TheDan64/inkwell?branch=master#7a09ad8a5f3b1fc416f95b5e1c97d33df0ab3f06" -dependencies = [ - "either", - "inkwell_internals", - "libc", - "llvm-sys", - "once_cell", - "thiserror", -] - -[[package]] -name = "inkwell_internals" -version = "0.8.0" -source = "git+https://github.com/TheDan64/inkwell?branch=master#7a09ad8a5f3b1fc416f95b5e1c97d33df0ab3f06" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "is-terminal" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" -dependencies = [ - "hermit-abi", - "rustix", - "windows-sys 0.48.0", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libc" -version = "0.2.150" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" - -[[package]] -name = "libmimalloc-sys" -version = "0.1.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3979b5c37ece694f1f5e51e7ecc871fdb0f517ed04ee45f88d15d6d553cb9664" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "linux-raw-sys" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" - -[[package]] -name = "llvm-sys" -version = "160.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf51981ac0622b10fe4790763e3de1f3d68a0ee4222e03accaaab6731bd508d" -dependencies = [ - "cc", - "lazy_static", - "libc", - "regex", - "semver", -] - -[[package]] -name = "log" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" - -[[package]] -name = "mach" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" -dependencies = [ - "libc", -] - -[[package]] -name = "memchr" -version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "mimalloc" -version = "0.1.39" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa01922b5ea280a911e323e4d2fd24b7fe5cc4042e0d2cda3c40775cdc4bdc9c" -dependencies = [ - "libmimalloc-sys", -] - -[[package]] -name = "object" -version = "0.28.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424" -dependencies = [ - "crc32fast", - "hashbrown 0.11.2", - "indexmap 1.9.3", - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" - -[[package]] -name = "petgraph" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" -dependencies = [ - "fixedbitset", - "indexmap 2.1.0", -] - -[[package]] -name = "proc-macro2" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rayon" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils", -] - -[[package]] -name = "regalloc2" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d43a209257d978ef079f3d446331d0f1794f5e0fc19b306a199983857833a779" -dependencies = [ - "fxhash", - "log", - "slice-group-by", - "smallvec", -] - -[[package]] -name = "regex" -version = "1.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" - -[[package]] -name = "region" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877e54ea2adcd70d80e9179344c97f93ef0dffd6b03e1f4529e6e83ab2fa9ae0" -dependencies = [ - "bitflags 1.3.2", - "libc", - "mach", - "winapi", -] - -[[package]] -name = "rustix" -version = "0.38.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e" -dependencies = [ - "bitflags 2.4.1", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.48.0", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "semver" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" - -[[package]] -name = "shlex" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" - -[[package]] -name = "similar" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aeaf503862c419d66959f5d7ca015337d864e9c49485d771b732e2a20453597" - -[[package]] -name = "slice-group-by" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7" - -[[package]] -name = "smallvec" -version = "1.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "syn" -version = "2.0.39" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "target-lexicon" -version = "0.12.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" - -[[package]] -name = "thiserror" -version = "1.0.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-sys" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" -dependencies = [ - "windows_aarch64_msvc 0.36.1", - "windows_i686_gnu 0.36.1", - "windows_i686_msvc 0.36.1", - "windows_x86_64_gnu 0.36.1", - "windows_x86_64_msvc 0.36.1", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_i686_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" diff --git a/pkgs/development/compilers/ante/default.nix b/pkgs/development/compilers/ante/default.nix deleted file mode 100644 index e3b4738b7b21..000000000000 --- a/pkgs/development/compilers/ante/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ fetchFromGitHub -, lib -, libffi -, libxml2 -, llvmPackages_16 -, ncurses -, rustPlatform -}: - -rustPlatform.buildRustPackage { - pname = "ante"; - version = "unstable-2023-12-18"; - src = fetchFromGitHub { - owner = "jfecher"; - repo = "ante"; - rev = "e38231ffa51b84a2ca53b4b0439d1ca5e0dea32a"; - hash = "sha256-UKEoOm+Jc0YUwO74Tn038MLeX/c3d2z8I0cTBVfX61U="; - }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "inkwell-0.2.0" = "sha256-eMoclRtekg8v+m5KsTcjB3zCdPkcJy42NALEEuT/fw8="; - }; - }; - - /* - https://crates.io/crates/llvm-sys#llvm-compatibility - llvm-sys requires a specific version of llvmPackages, - that is not the same as the one included by default with rustPlatform. - */ - nativeBuildInputs = [ llvmPackages_16.llvm ]; - buildInputs = [ libffi libxml2 ncurses ]; - - postPatch = '' - substituteInPlace tests/golden_tests.rs --replace \ - 'target/debug' "target/$(rustc -vV | sed -n 's|host: ||p')/release" - ''; - preBuild = - let - major = lib.versions.major llvmPackages_16.llvm.version; - minor = lib.versions.minor llvmPackages_16.llvm.version; - llvm-sys-ver = "${major}${builtins.substring 0 1 minor}"; - in - '' - # On some architectures llvm-sys is not using the package listed inside nativeBuildInputs - export LLVM_SYS_${llvm-sys-ver}_PREFIX=${llvmPackages_16.llvm.dev} - export ANTE_STDLIB_DIR=$out/lib - mkdir -p $ANTE_STDLIB_DIR - cp -r $src/stdlib/* $ANTE_STDLIB_DIR - ''; - - meta = with lib; { - homepage = "https://antelang.org/"; - description = "Low-level functional language for exploring refinement types, lifetime inference, and algebraic effects"; - mainProgram = "ante"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ ehllie ]; - }; -} diff --git a/pkgs/development/compilers/apache-flex-sdk/default.nix b/pkgs/development/compilers/apache-flex-sdk/default.nix deleted file mode 100644 index 527b800551eb..000000000000 --- a/pkgs/development/compilers/apache-flex-sdk/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib, stdenv, fetchurl, makeWrapper, jre }: - -let - playerglobal_ver = "27.0"; - playerglobal = fetchurl { - url = "https://fpdownload.macromedia.com/get/flashplayer/updaters/27/playerglobal27_0.swc"; - sha256 = "0qw2bgls8qsmp80j8vpd4c7s0c8anlrk0ac8z42w89bajcdbwk2f"; - }; -in stdenv.mkDerivation rec { - pname = "apache-flex-sdk"; - version = "4.16.1"; - - src = fetchurl { - url = "mirror://apache/flex/${version}/binaries/${pname}-${version}-bin.tar.gz"; - sha256 = "13iq16dqvgcpb0p35x66hzxsq5pkbr2lbwr766nnqiryinnagz8p"; - }; - - nativeBuildInputs = [ makeWrapper ]; - - buildInputs = [ jre ]; - - dontBuild = true; - - postPatch = '' - shopt -s extglob - for i in bin/!(aasdoc|acompc|amxmlc); do - substituteInPlace $i --replace "java " "${jre}/bin/java " - done - ''; - - installPhase = '' - t=$out/opt/apache-flex-sdk - mkdir -p $t $out/bin - mv * $t - rm $t/bin/*.bat - ln -s $t/bin/* $out/bin/ - - for i in $out/bin/!(aasdoc|acompc|amxmlc); do - wrapProgram $i \ - --set FLEX_HOME $t \ - --set PLAYERGLOBAL_HOME $t/frameworks/libs/player/ - done - - mkdir -p $t/frameworks/libs/player/${playerglobal_ver}/ - cp ${playerglobal} $t/frameworks/libs/player/${playerglobal_ver}/playerglobal.swc - ''; - - dontFixup = true; - - meta = with lib; { - description = "Flex SDK for Adobe Flash / ActionScript"; - homepage = "https://flex.apache.org/"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ dywedir ]; - }; -} diff --git a/pkgs/development/compilers/arachne-pnr/default.nix b/pkgs/development/compilers/arachne-pnr/default.nix deleted file mode 100644 index 37b7158c6284..000000000000 --- a/pkgs/development/compilers/arachne-pnr/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, icestorm }: - -stdenv.mkDerivation rec { - pname = "arachne-pnr"; - version = "2019.07.29"; - - src = fetchFromGitHub { - owner = "yosyshq"; - repo = "arachne-pnr"; - rev = "c40fb2289952f4f120cc10a5a4c82a6fb88442dc"; - sha256 = "0lg9rccr486cvips3jf289af2b4a2j9chc8iqnkhykgi1hw4pszc"; - }; - - enableParallelBuilding = true; - makeFlags = [ - "PREFIX=$(out)" - "ICEBOX=${icestorm}/share/icebox" - ]; - - postPatch = '' - substituteInPlace ./Makefile \ - --replace 'echo UNKNOWN' 'echo ${lib.substring 0 10 src.rev}' - ''; - - meta = with lib; { - description = "Place and route tool for FPGAs"; - mainProgram = "arachne-pnr"; - longDescription = '' - Arachne-pnr implements the place and route step of - the hardware compilation process for FPGAs. It - accepts as input a technology-mapped netlist in BLIF - format, as output by the Yosys [0] synthesis suite - for example. It currently targets the Lattice - Semiconductor iCE40 family of FPGAs [1]. Its output - is a textual bitstream representation for assembly by - the IceStorm [2] icepack command. - ''; - homepage = "https://github.com/cseed/arachne-pnr"; - license = licenses.mit; - maintainers = with maintainers; [ shell thoughtpolice ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/compilers/asn1c/default.nix b/pkgs/development/compilers/asn1c/default.nix deleted file mode 100644 index bcaab6fae867..000000000000 --- a/pkgs/development/compilers/asn1c/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchurl, perl }: - -stdenv.mkDerivation rec { - pname = "asn1c"; - version = "0.9.28"; - - src = fetchurl { - url = "https://lionet.info/soft/asn1c-${version}.tar.gz"; - sha256 = "1fc64g45ykmv73kdndr4zdm4wxhimhrir4rxnygxvwkych5l81w0"; - }; - - outputs = [ "out" "doc" "man" ]; - - buildInputs = [ perl ]; - - preConfigure = '' - patchShebangs examples/crfc2asn1.pl - ''; - - postInstall = '' - cp -r skeletons/standard-modules $out/share/asn1c - ''; - - doCheck = true; - - meta = with lib; { - homepage = "http://lionet.info/asn1c/compiler.html"; - description = "Open Source ASN.1 Compiler"; - license = licenses.bsd2; - platforms = platforms.unix; - maintainers = [ maintainers.numinit ]; - }; -} diff --git a/pkgs/development/compilers/aspectj/default.nix b/pkgs/development/compilers/aspectj/default.nix deleted file mode 100644 index 55b9cf5af86c..000000000000 --- a/pkgs/development/compilers/aspectj/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ - lib, - stdenvNoCC, - fetchurl, - jre, -}: - -let - version = "1.9.22.1"; - versionSnakeCase = builtins.replaceStrings [ "." ] [ "_" ] version; -in -stdenvNoCC.mkDerivation { - pname = "aspectj"; - inherit version; - - __structuredAttrs = true; - - src = fetchurl { - url = "https://github.com/eclipse/org.aspectj/releases/download/V${versionSnakeCase}/aspectj-${version}.jar"; - hash = "sha256-NIyYVhJIGXz+vNVoAQzYsDfmOYc4QrRzJGWeQjS4X0U="; - }; - - dontUnpack = true; - - nativeBuildInputs = [ jre ]; - - installPhase = '' - runHook preInstall - - cat >> props <<EOF - output.dir=$out - context.javaPath=${jre} - EOF - - mkdir -p $out - java -jar $src -text props - - cat >> $out/bin/aj-runtime-env <<EOF - #! ${stdenvNoCC.shell} - - export CLASSPATH=$CLASSPATH:.:$out/lib/aspectjrt.jar - EOF - - chmod u+x $out/bin/aj-runtime-env - - runHook postInstall - ''; - - meta = { - homepage = "https://www.eclipse.org/aspectj/"; - description = "Seamless aspect-oriented extension to the Java programming language"; - license = lib.licenses.epl10; - platforms = lib.platforms.unix; - sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - }; -} diff --git a/pkgs/development/compilers/ats/default.nix b/pkgs/development/compilers/ats/default.nix deleted file mode 100644 index 35e1b1dd1058..000000000000 --- a/pkgs/development/compilers/ats/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchurl, gmp }: - -stdenv.mkDerivation rec { - pname = "ats"; - version = "0.2.12"; - - src = fetchurl { - url = "mirror://sourceforge/ats-lang/ats-lang-anairiats-${version}.tgz"; - sha256 = "0l2kj1fzhxwsklwmn5yj2vp9rmw4jg0b18bzwqz72bfi8i39736k"; - }; - - # this is necessary because atxt files usually include some .hats files - patches = [ ./install-atsdoc-hats-files.patch ]; - buildInputs = [ gmp ]; - - meta = { - description = "Functional programming language with dependent types"; - homepage = "http://www.ats-lang.org"; - license = lib.licenses.gpl3Plus; - # TODO: it looks like ATS requires gcc specifically. Someone with more knowledge - # will need to experiment. - platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.thoughtpolice ]; - }; -} diff --git a/pkgs/development/compilers/ats/install-atsdoc-hats-files.patch b/pkgs/development/compilers/ats/install-atsdoc-hats-files.patch deleted file mode 100644 index 93c6fa07d8a6..000000000000 --- a/pkgs/development/compilers/ats/install-atsdoc-hats-files.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- ats-lang-anairiats-0.2.11/Makefile 2013-12-10 00:43:52.000000000 +0100 -+++ ats-lang-anairiats-0.2.11/Makefile 2014-03-02 07:49:06.985837425 +0100 -@@ -97,7 +97,7 @@ - cd $(abs_top_srcdir) - [ -d $(bindir2) ] || $(MKDIR_P) $(bindir2) - $(MKDIR_P) $(ATSLIBHOME2)/bin -- find ccomp contrib doc libats libc prelude -type d \ -+ find ccomp contrib doc libats libatsdoc libc prelude -type d \ - -exec $(MKDIR_P) $(ATSLIBHOME2)/\{} \; \ - -print - -@@ -105,7 +105,7 @@ - # - # recursively install all files in the list except .svn control files. - # -- for d in ccomp/runtime contrib doc libats libc prelude; do \ -+ for d in ccomp/runtime contrib doc libats libatsdoc libc prelude; do \ - cd $(abs_top_srcdir) && \ - $(INSTALL) -d $(ATSLIBHOME2)/"$$d" && \ - find "$$d" -name .svn -prune -o -type f \ -@@ -143,6 +143,17 @@ - $(INSTALL) -m 755 ats_env.sh $(bindir2)/"$$b" && \ - echo [ats_env.sh] is installed into $(bindir2)/"$$b"; \ - done -+# -+# install atsdoc headers -+# -+ for f in \ -+ utils/atsdoc/SATS/*.sats utils/atsdoc/DATS/*.dats utils/atsdoc/HATS/*.hats; \ -+ do \ -+ [ -f "$$f" ] || continue; \ -+ cd $(abs_top_srcdir) && \ -+ $(INSTALL) -m 644 -D "$$f" $(ATSLIBHOME2)/"$$f" && \ -+ echo "$$f"; \ -+ done - - install:: install_files - diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix deleted file mode 100644 index 2dad47c08abc..000000000000 --- a/pkgs/development/compilers/ats2/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ lib, stdenv, fetchurl, gmp -, withEmacsSupport ? true -, withContrib ? true }: - -let - versionPkg = "0.4.2"; - - contrib = fetchurl { - url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-contrib-${versionPkg}.tgz"; - hash = "sha256-m0hfBLsaNiLaIktcioK+ZtWUsWht3IDSJ6CzgJmS06c="; - }; - - postInstallContrib = lib.optionalString withContrib - '' - local contribDir=$out/lib/ats2-postiats-*/ ; - mkdir -p $contribDir ; - tar -xzf "${contrib}" --strip-components 1 -C $contribDir ; - ''; - - postInstallEmacs = lib.optionalString withEmacsSupport - '' - local siteLispDir=$out/share/emacs/site-lisp/ats2 ; - mkdir -p $siteLispDir ; - install -m 0644 -v ./utils/emacs/*.el $siteLispDir ; - ''; -in - -stdenv.mkDerivation rec { - pname = "ats2"; - version = versionPkg; - - src = fetchurl { - url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-gmp-${version}.tgz"; - hash = "sha256-UWgDjFojPBYgykrCrJyYvVWY+Gc5d4aRGjTWjc528AM="; - }; - - postPatch = lib.optionalString stdenv.cc.isClang '' - sed -i 's/gcc/clang/g' utils/*/DATS/atscc_util.dats - ''; - - buildInputs = [ gmp ]; - - # Disable parallel build, errors: - # *** No rule to make target 'patscc.dats', needed by 'patscc_dats.c'. Stop. - enableParallelBuilding = false; - - makeFlags = [ - "CC=${stdenv.cc.targetPrefix}cc" - "CCOMP=${stdenv.cc.targetPrefix}cc" - ]; - - setupHook = - let - hookFiles = [ ./setup-hook.sh ] ++ lib.optional withContrib ./setup-contrib-hook.sh; - in - builtins.toFile "setupHook.sh" - (lib.concatMapStringsSep "\n" builtins.readFile hookFiles); - - postInstall = postInstallContrib + postInstallEmacs; - - meta = with lib; { - description = "Functional programming language with dependent types"; - homepage = "http://www.ats-lang.org"; - license = licenses.gpl3Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ thoughtpolice ttuegel bbarker ]; - }; -} diff --git a/pkgs/development/compilers/ats2/setup-contrib-hook.sh b/pkgs/development/compilers/ats2/setup-contrib-hook.sh deleted file mode 100644 index 8c5e123b61c4..000000000000 --- a/pkgs/development/compilers/ats2/setup-contrib-hook.sh +++ /dev/null @@ -1 +0,0 @@ -export PATSHOMERELOC=@out@/lib/ats2-postiats-@version@ diff --git a/pkgs/development/compilers/ats2/setup-hook.sh b/pkgs/development/compilers/ats2/setup-hook.sh deleted file mode 100644 index 67647b1edf69..000000000000 --- a/pkgs/development/compilers/ats2/setup-hook.sh +++ /dev/null @@ -1 +0,0 @@ -export PATSHOME=@out@/lib/ats2-postiats-@version@ diff --git a/pkgs/development/compilers/august/default.nix b/pkgs/development/compilers/august/default.nix deleted file mode 100644 index 2e8aec11763c..000000000000 --- a/pkgs/development/compilers/august/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -}: - -rustPlatform.buildRustPackage { - pname = "august"; - version = "unstable-2023-08-13"; - - src = fetchFromGitHub { - owner = "yoav-lavi"; - repo = "august"; - rev = "42b8a1bf5ca079aca1769d92315f70b193a9cd4a"; - hash = "sha256-58DZMoRH9PBbM4sok/XbUcwSXBeqUAmFZpffdMKQ+dE="; - }; - - cargoHash = "sha256-/GvBbsSL0dZ0xTystIpb8sk1nNg5hmP4yceCHlh7EQE="; - - postInstall = '' - mv $out/bin/{august-cli,ag} - ''; - - meta = with lib; { - description = "Emmet-like language that produces JSON, TOML, or YAML"; - homepage = "https://github.com/yoav-lavi/august"; - license = with licenses; [ asl20 mit ]; - maintainers = with maintainers; [ figsoda ]; - mainProgram = "ag"; - }; -} diff --git a/pkgs/development/compilers/avra/default.nix b/pkgs/development/compilers/avra/default.nix deleted file mode 100644 index 8e2d2558c571..000000000000 --- a/pkgs/development/compilers/avra/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "avra"; - version = "1.4.2"; - - src = fetchFromGitHub { - owner = "Ro5bert"; - repo = pname; - rev = version; - hash = "sha256-joOj89WZ9Si5fcu1w1VHj5fOcnB9N2313Yb29A+nCCY="; - }; - - makeFlags = [ "PREFIX=${placeholder "out"}" ]; - - doCheck = true; - - meta = with lib; { - description = "Assembler for the Atmel AVR microcontroller family"; - mainProgram = "avra"; - homepage = "https://github.com/Ro5bert/avra"; - license = licenses.gpl2Plus; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/compilers/ballerina/default.nix b/pkgs/development/compilers/ballerina/default.nix index 6dd49281bb81..2b75299dd81e 100644 --- a/pkgs/development/compilers/ballerina/default.nix +++ b/pkgs/development/compilers/ballerina/default.nix @@ -1,6 +1,6 @@ { ballerina, lib, writeText, runCommand, makeWrapper, fetchzip, stdenv, openjdk }: let - version = "2201.9.2"; + version = "2201.10.1"; codeName = "swan-lake"; in stdenv.mkDerivation { pname = "ballerina"; @@ -8,7 +8,7 @@ in stdenv.mkDerivation { src = fetchzip { url = "https://dist.ballerina.io/downloads/${version}/ballerina-${version}-${codeName}.zip"; - hash = "sha256-J73fai5mPPNHk/wux4nhX3KsalxWER8nMqWovWgm6WA="; + hash = "sha256-gKxJnoNWYE3ozQ0JvMgHgrg/DCkvFnJqZAecgqvJGq8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/compilers/bfc/default.nix b/pkgs/development/compilers/bfc/default.nix deleted file mode 100644 index 83710df4c13b..000000000000 --- a/pkgs/development/compilers/bfc/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, llvmPackages_13 -, libxml2 -, ncurses -, zlib -, stdenv -}: - -rustPlatform.buildRustPackage rec { - pname = "bfc"; - version = "1.12.0"; - - src = fetchFromGitHub { - owner = "Wilfred"; - repo = "bfc"; - rev = version; - hash = "sha256-5pcvwCtXWEexvV3TS62dZ6Opg8ANP2L8B0Z8u/OQENU="; - }; - - cargoHash = "sha256-1w/jPBO1TZpa0ju+O/NxQ/oMyzIvYVoXpj+ZLcIpQoU="; - - buildInputs = [ - libxml2 - ncurses - zlib - ]; - - env.LLVM_SYS_130_PREFIX = llvmPackages_13.llvm.dev; - - # process didn't exit successfully: <...> SIGSEGV - doCheck = false; - - meta = with lib; { - description = "Industrial-grade brainfuck compiler"; - mainProgram = "bfc"; - homepage = "https://bfc.wilfred.me.uk"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ figsoda ]; - broken = stdenv.isAarch64 && stdenv.isLinux; - }; -} diff --git a/pkgs/development/compilers/bigloo/default.nix b/pkgs/development/compilers/bigloo/default.nix deleted file mode 100644 index 9bf22ba6dcf2..000000000000 --- a/pkgs/development/compilers/bigloo/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ fetchurl, lib, stdenv, autoconf, automake, libtool, gmp -, darwin, libunistring -}: - -stdenv.mkDerivation rec { - pname = "bigloo"; - version = "4.4b"; - - src = fetchurl { - url = "ftp://ftp-sop.inria.fr/indes/fp/Bigloo/bigloo-${version}.tar.gz"; - sha256 = "sha256-oxOSJwKWmwo7PYAwmeoFrKaYdYvmvQquWXyutolc488="; - }; - - nativeBuildInputs = [ autoconf automake libtool ]; - - buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.ApplicationServices - libunistring - ]; - - propagatedBuildInputs = [ gmp ]; - - preConfigure = - # For libuv on darwin - lib.optionalString stdenv.isDarwin '' - export LIBTOOLIZE=libtoolize - '' + - # Help libgc's configure. - '' export CXXCPP="$CXX -E" - ''; - - patchPhase = '' - # Fix absolute paths. - sed -e 's=/bin/mv=mv=g' -e 's=/bin/rm=rm=g' \ - -e 's=/tmp=$TMPDIR=g' -i autoconf/* \ - [Mm]akefile* */[Mm]akefile* */*/[Mm]akefile* \ - */*/*/[Mm]akefile* */*/*/*/[Mm]akefile* \ - comptime/Cc/cc.scm gc/install-* - - # Make sure we don't change string lengths in the generated - # C files. - sed -e 's=/bin/rm= rm=g' -e 's=/bin/mv= mv=g' \ - -i comptime/Cc/cc.c - ''; - - checkTarget = "test"; - - # remove forbidden references to $TMPDIR - preFixup = lib.optionalString stdenv.isLinux '' - for f in "$out"/bin/*; do - if isELF "$f"; then - patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$f" - fi - done - ''; - - meta = { - description = "Efficient Scheme compiler"; - homepage = "http://www-sop.inria.fr/indes/fp/Bigloo/"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ thoughtpolice ]; - broken = stdenv.isDarwin && stdenv.isAarch64; # segfault during build - - longDescription = '' - Bigloo is a Scheme implementation devoted to one goal: enabling - Scheme based programming style where C(++) is usually - required. Bigloo attempts to make Scheme practical by offering - features usually presented by traditional programming languages - but not offered by Scheme and functional programming. Bigloo - compiles Scheme modules. It delivers small and fast stand alone - binary executables. Bigloo enables full connections between - Scheme and C programs, between Scheme and Java programs, and - between Scheme and C# programs. - ''; - }; -} diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index d6c1442a8b8b..7d78c1d65972 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { # "binaryenjs" "binaryenjs_wasm" # not building this "lit" "gtest" ]; - doCheck = stdenv.isLinux; + doCheck = stdenv.hostPlatform.isLinux; meta = with lib; { homepage = "https://github.com/WebAssembly/binaryen"; diff --git a/pkgs/development/compilers/blueprint/default.nix b/pkgs/development/compilers/blueprint/default.nix deleted file mode 100644 index 5c1aa1b2a2cd..000000000000 --- a/pkgs/development/compilers/blueprint/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ dbus -, fetchFromGitLab -, gobject-introspection -, lib -, libadwaita -, meson -, ninja -, python3 -, stdenv -, testers -, xvfb-run -}: -stdenv.mkDerivation (finalAttrs: { - pname = "blueprint-compiler"; - version = "0.12.0"; - - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "jwestman"; - repo = "blueprint-compiler"; - rev = "v${finalAttrs.version}"; - hash = "sha256-pvYSFCiYynH3E6QOTu4RfG+6eucq++yiRu75qucSlZU="; - }; - - nativeBuildInputs = [ - meson - ninja - ]; - - buildInputs = [ - libadwaita - (python3.withPackages (ps: with ps; [ - pygobject3 - ])) - ]; - - propagatedBuildInputs = [ - # For setup hook, so that the compiler can find typelib files - gobject-introspection - ]; - - nativeCheckInputs = [ - dbus - xvfb-run - ]; - - # requires xvfb-run - doCheck = !stdenv.isDarwin - && false; # tests time out - - checkPhase = '' - runHook preCheck - - xvfb-run dbus-run-session \ - --config-file=${dbus}/share/dbus-1/session.conf \ - meson test --no-rebuild --print-errorlogs - - runHook postCheck - ''; - - passthru.tests.version = testers.testVersion { - package = finalAttrs.finalPackage; - }; - - meta = with lib; { - description = "Markup language for GTK user interface files"; - mainProgram = "blueprint-compiler"; - homepage = "https://gitlab.gnome.org/jwestman/blueprint-compiler"; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ benediktbroich ranfdev ]; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/development/compilers/bluespec/default.nix b/pkgs/development/compilers/bluespec/default.nix deleted file mode 100644 index e761c8609e8b..000000000000 --- a/pkgs/development/compilers/bluespec/default.nix +++ /dev/null @@ -1,138 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchurl -, autoconf -, automake -, fontconfig -, libX11 -, perl -, flex -, bison -, pkg-config -, tcl -, tk -, xorg -, yices # bsc uses a patched version of yices -, zlib -, ghc -, gmp-static -, iverilog -, asciidoctor -, texliveFull -, which -}: - -let - ghcWithPackages = ghc.withPackages (g: (with g; [ old-time regex-compat syb split ])); - -in stdenv.mkDerivation rec { - pname = "bluespec"; - version = "2024.01"; - - src = fetchFromGitHub { - owner = "B-Lang-org"; - repo = "bsc"; - rev = version; - sha256 = "sha256-yqmtydv94p7qhps0t4EdPaSZNh/9XCuUwOzLqz0gjxE="; - }; - - yices-src = fetchurl { - url = "https://github.com/B-Lang-org/bsc/releases/download/${version}/yices-src-for-bsc-${version}.tar.gz"; - sha256 = "sha256-pyEdCJvmgwOYPMZEtw7aro76tSn/Y/2GcKTyARmIh4E="; - }; - - enableParallelBuilding = true; - - outputs = [ "out" "doc" ]; - - # https://github.com/B-Lang-org/bsc/pull/278 is still applicable, but will probably not be applied as such - # there is work ongoing: https://github.com/B-Lang-org/bsc/issues/595 https://github.com/B-Lang-org/bsc/pull/600 - patches = [ ./libstp_stub_makefile.patch ]; - - postUnpack = '' - tar -C $sourceRoot/ -xf ${yices-src} - chmod -R +rwX $sourceRoot/src/vendor/yices/v2.6/yices2 - ''; - - preBuild = '' - patchShebangs \ - src/Verilog/copy_module.pl \ - src/comp/update-build-version.sh \ - src/comp/update-build-system.sh \ - src/comp/wrapper.sh - - substituteInPlace src/comp/Makefile \ - --replace 'BINDDIR' 'BINDIR' \ - --replace 'install-bsc install-bluetcl' 'install-bsc install-bluetcl $(UTILEXES) install-utils' - - # allow running bsc to bootstrap - export LD_LIBRARY_PATH=$PWD/inst/lib/SAT - - # use more cores for GHC building, 44 causes heap overflows in ghc, and - # there is not much speedup after 8.. - if [[ $NIX_BUILD_CORES -gt 8 ]] ; then export GHCJOBS=8; else export GHCJOBS=$NIX_BUILD_CORES; fi - ''; - - buildInputs = yices.buildInputs ++ [ - fontconfig - libX11 # tcltk - tcl - tk - which - xorg.libXft - zlib - ]; - - nativeBuildInputs = [ - automake - autoconf - asciidoctor - bison - flex - ghcWithPackages - perl - pkg-config - texliveFull - ]; - - makeFlags = [ - "release" - "NO_DEPS_CHECKS=1" # skip the subrepo check (this deriviation uses yices-src instead of the subrepo) - "NOGIT=1" # https://github.com/B-Lang-org/bsc/issues/12 - "LDCONFIG=ldconfig" # https://github.com/B-Lang-org/bsc/pull/43 - "STP_STUB=1" # uses yices as a SMT solver and stub out STP - ]; - - doCheck = true; - - nativeCheckInputs = [ - gmp-static - iverilog - ]; - - checkTarget = "check-smoke"; # this is the shortest check but "check-suite" tests much more - - installPhase = '' - mkdir -p $out - mv inst/bin $out - mv inst/lib $out - - # fragile, I know.. - mkdir -p $doc/share/doc/bsc - mv inst/README $doc/share/doc/bsc - mv inst/ReleaseNotes.* $doc/share/doc/bsc - mv inst/doc/*.pdf $doc/share/doc/bsc - ''; - - meta = { - description = "Toolchain for the Bluespec Hardware Definition Language"; - homepage = "https://github.com/B-Lang-org/bsc"; - license = lib.licenses.bsd3; - platforms = [ "x86_64-linux" ]; - mainProgram = "bsc"; - # darwin fails at https://github.com/B-Lang-org/bsc/pull/35#issuecomment-583731562 - # aarch64 fails, as GHC fails with "ghc: could not execute: opt" - maintainers = with lib.maintainers; [ jcumming thoughtpolice ]; - }; -} diff --git a/pkgs/development/compilers/bluespec/libstp_stub_makefile.patch b/pkgs/development/compilers/bluespec/libstp_stub_makefile.patch deleted file mode 100644 index c714afc670c5..000000000000 --- a/pkgs/development/compilers/bluespec/libstp_stub_makefile.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -ru bsc-orig/src/vendor/stp/Makefile bsc-new/src/vendor/stp/Makefile ---- bsc-orig/src/vendor/stp/Makefile 1969-12-31 16:00:01.000000000 -0800 -+++ bsc-new/src/vendor/stp/Makefile 2020-11-12 17:42:40.115143035 -0800 -@@ -9,12 +9,13 @@ - SRC = src - else - SRC = src_stub -+SNAME += lib/libstp_stub.so - endif - - ifeq ($(OSTYPE), Darwin) --SNAME=libstp.dylib -+SNAME = lib/libstp.dylib - else --SNAME=libstp.so.1 -+SNAME += lib/libstp.so.1 - endif - - all: install -@@ -23,7 +24,7 @@ - $(MAKE) -C $(SRC) install - ln -fsn HaskellIfc include_hs - install -m 755 -d $(PREFIX)/lib/SAT -- install -m 644 lib/$(SNAME) $(PREFIX)/lib/SAT -+ install -m 644 $(SNAME) $(PREFIX)/lib/SAT - - clean: - $(MAKE) -C $(SRC) clean diff --git a/pkgs/development/compilers/c0/default.nix b/pkgs/development/compilers/c0/default.nix index 4c3f5ba201de..8dbb1627db3a 100644 --- a/pkgs/development/compilers/c0/default.nix +++ b/pkgs/development/compilers/c0/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { --replace '`../get_version.sh`' '${version}' \ --replace '`date`' '1970-01-01T00:00:00Z' \ --replace '`hostname`' 'nixpkgs' - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' for f in cc0/compiler/bin/coin-o0-support cc0/compiler/bin/cc0-o0-support; do substituteInPlace $f --replace '$(brew --prefix gnu-getopt)' '${getopt}' done @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { getopt mlton pkg-config - ] ++ lib.optionals stdenv.isDarwin [ darwin.sigtool ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.sigtool ]; buildInputs = [ boehmgc @@ -80,6 +80,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; # line 1: ../../bin/wrappergen: cannot execute: required file not found # make[2]: *** [../../lib.mk:83: - broken = stdenv.isLinux; + broken = stdenv.hostPlatform.isLinux; }; } diff --git a/pkgs/development/compilers/c3c/default.nix b/pkgs/development/compilers/c3c/default.nix deleted file mode 100644 index 01cc7fa28ce3..000000000000 --- a/pkgs/development/compilers/c3c/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ - llvmPackages, - lib, - fetchFromGitHub, - cmake, - python3, - curl, - libxml2, - libffi, - xar, - versionCheckHook, -}: - -llvmPackages.stdenv.mkDerivation (finalAttrs: { - pname = "c3c"; - version = "0.6.2"; - - src = fetchFromGitHub { - owner = "c3lang"; - repo = "c3c"; - rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-bGMtrdwjlTxEQdsasOvVuI+mRzir/tnENCIfy1/6JMM="; - }; - - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace-fail "\''${LLVM_LIBRARY_DIRS}" "${llvmPackages.lld.lib}/lib ${llvmPackages.llvm.lib}/lib" - ''; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ - llvmPackages.llvm - llvmPackages.lld - curl - libxml2 - libffi - ] ++ lib.optionals llvmPackages.stdenv.isDarwin [ xar ]; - - nativeCheckInputs = [ python3 ]; - - doCheck = llvmPackages.stdenv.system == "x86_64-linux"; - - checkPhase = '' - runHook preCheck - ( cd ../resources/testproject; ../../build/c3c build ) - ( cd ../test; python src/tester.py ../build/c3c test_suite ) - runHook postCheck - ''; - - nativeInstallCheckInputs = [ versionCheckHook ]; - doInstallCheck = true; - - meta = with lib; { - description = "Compiler for the C3 language"; - homepage = "https://github.com/c3lang/c3c"; - license = licenses.lgpl3Only; - maintainers = with maintainers; [ - luc65r - anas - ]; - platforms = platforms.all; - mainProgram = "c3c"; - }; -}) diff --git a/pkgs/development/compilers/cairo/default.nix b/pkgs/development/compilers/cairo/default.nix deleted file mode 100644 index 0749175f0837..000000000000 --- a/pkgs/development/compilers/cairo/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, rustfmt -, perl -}: - -rustPlatform.buildRustPackage rec { - pname = "cairo"; - version = "2.8.2"; - - src = fetchFromGitHub { - owner = "starkware-libs"; - repo = "cairo"; - rev = "v${version}"; - hash = "sha256-vBdIGkdQa/csqsu4DbgIYitVbDLDUAFmIUytZ7IcxNk="; - }; - - cargoHash = "sha256-w3kzEM34HYQ6KgILaDpmZbCgAh8Ql24DRe12woUAhVI="; - - # openssl crate requires perl during build process - nativeBuildInputs = [ - perl - ]; - - nativeCheckInputs = [ - rustfmt - ]; - - checkFlags = [ - # Requires a mythical rustfmt 2.0 or a nightly compiler - "--skip=golden_test::sourcegen_ast" - - # Test broken - "--skip=test_lowering_consistency" - ]; - - postInstall = '' - # The core library is needed for compilation. - cp -r corelib $out/ - ''; - - meta = with lib; { - description = "Turing-complete language for creating provable programs for general computation"; - homepage = "https://github.com/starkware-libs/cairo"; - license = licenses.asl20; - maintainers = with maintainers; [ raitobezarius ]; - }; -} diff --git a/pkgs/development/compilers/cakelisp/default.nix b/pkgs/development/compilers/cakelisp/default.nix deleted file mode 100644 index c52c93c5e6c7..000000000000 --- a/pkgs/development/compilers/cakelisp/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib, stdenv, fetchgit, gcc, unstableGitUpdater }: - -stdenv.mkDerivation { - pname = "cakelisp"; - # using unstable as it's the only version that builds against gcc-13 - version = "0.3.0-unstable-2024-04-25"; - - src = fetchgit { - url = "https://macoy.me/code/macoy/cakelisp"; - rev = "eb4427f555c3def9d65612672ccfe59e11b14059"; - hash = "sha256-wFyqAbHrBMFKqMYlBjS6flYHPn3Rxtaiqb1rRmlZrB4="; - }; - - buildInputs = [ gcc ]; - - postPatch = '' - substituteInPlace runtime/HotReloading.cake \ - --replace '"/usr/bin/g++"' '"${gcc}/bin/g++"' - substituteInPlace src/ModuleManager.cpp \ - --replace '"/usr/bin/g++"' '"${gcc}/bin/g++"' - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace Build.sh --replace '--export-dynamic' '-export_dynamic' - substituteInPlace runtime/HotReloading.cake --replace '--export-dynamic' '-export_dynamic' - substituteInPlace Bootstrap.cake --replace '--export-dynamic' '-export_dynamic' - ''; - - buildPhase = '' - runHook preBuild - ./Build.sh - runHook postBuild - ''; - - env.NIX_CFLAGS_COMPILE = "-Wno-error=format"; - - installPhase = '' - runHook preInstall - install -Dm755 bin/cakelisp -t $out/bin - runHook postInstall - ''; - - passthru.updateScript = unstableGitUpdater { - url = "https://macoy.me/code/macoy/cakelisp"; - }; - - meta = with lib; { - description = "Performance-oriented Lisp-like language"; - mainProgram = "cakelisp"; - homepage = "https://macoy.me/code/macoy/cakelisp"; - license = licenses.gpl3Plus; - platforms = platforms.darwin ++ platforms.linux; - maintainers = [ maintainers.sbond75 ]; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; - }; -} diff --git a/pkgs/development/compilers/carp/default.nix b/pkgs/development/compilers/carp/default.nix deleted file mode 100644 index 9e54e19ba699..000000000000 --- a/pkgs/development/compilers/carp/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib, fetchFromGitHub, fetchpatch, makeWrapper, clang, haskellPackages }: - -haskellPackages.mkDerivation rec { - pname = "carp"; - version = "0.5.5"; - - src = fetchFromGitHub { - owner = "carp-lang"; - repo = "Carp"; - rev = "v${version}"; - sha256 = "sha256-B7SBzjegFzL2gGivIJE6BZcLD3f0Bsh8yndjScG2TZI="; - }; - - patches = [ - # Compat with GHC 9.2 / Stackage LTS 20, can be dropped at the next release - # https://github.com/carp-lang/Carp/pull/1449 - (fetchpatch { - name = "carp-lts-20.patch"; - url = "https://github.com/carp-lang/Carp/commit/25f50c92a57cc91b6cb4ec48df658439f936b641.patch"; - sha256 = "14yjv0hcvw1qyjmrhksrj6chac3n14d1f1gcaxldfa05llrbfqk0"; - }) - ]; - - # -Werror breaks build with GHC >= 9.0 - # https://github.com/carp-lang/Carp/issues/1386 - postPatch = '' - substituteInPlace CarpHask.cabal --replace "-Werror" "" - ''; - - buildTools = [ makeWrapper ]; - - executableHaskellDepends = with haskellPackages; [ - HUnit blaze-markup blaze-html split ansi-terminal cmark - edit-distance hashable open-browser optparse-applicative - ]; - - isExecutable = true; - - # The carp executable must know where to find its core libraries and other - # files. Set the environment variable CARP_DIR so that it points to the root - # of the Carp repo. See: - # https://github.com/carp-lang/Carp/blob/master/docs/Install.md#setting-the-carp_dir - # - # Also, clang must be available run-time because carp is compiled to C which - # is then compiled with clang. - postInstall = '' - wrapProgram $out/bin/carp \ - --set CARP_DIR $src \ - --prefix PATH : ${clang}/bin - wrapProgram $out/bin/carp-header-parse \ - --set CARP_DIR $src \ - --prefix PATH : ${clang}/bin - ''; - - description = "Statically typed lisp, without a GC, for real-time applications"; - homepage = "https://github.com/carp-lang/Carp"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ jluttine ]; - # Not actively maintained at the moment - broken = true; - - # Windows not (yet) supported. - platforms = with lib.platforms; unix ++ darwin; -} diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix index 9fe1a8aa8e56..ae82b0ccfda2 100644 --- a/pkgs/development/compilers/ccl/default.nix +++ b/pkgs/development/compilers/ccl/default.nix @@ -40,12 +40,12 @@ in stdenv.mkDerivation rec { sha256 = cfg.sha256; }; - buildInputs = if stdenv.isDarwin then [ bootstrap_cmds m4 ] else [ glibc m4 ]; + buildInputs = if stdenv.hostPlatform.isDarwin then [ bootstrap_cmds m4 ] else [ glibc m4 ]; CCL_RUNTIME = cfg.runtime; CCL_KERNEL = cfg.kernel; - postPatch = if stdenv.isDarwin then '' + postPatch = if stdenv.hostPlatform.isDarwin then '' substituteInPlace lisp-kernel/${CCL_KERNEL}/Makefile \ --replace "M4 = gm4" "M4 = m4" \ --replace "dtrace" "/usr/sbin/dtrace" \ @@ -88,7 +88,7 @@ in stdenv.mkDerivation rec { maintainers = lib.teams.lisp.members; platforms = attrNames options; # assembler failures during build, x86_64-darwin broken since 2020-10-14 - broken = (stdenv.isDarwin && stdenv.isx86_64); + broken = (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64); license = licenses.asl20; }; } diff --git a/pkgs/development/compilers/chez-racket/default.nix b/pkgs/development/compilers/chez-racket/default.nix deleted file mode 100644 index 158dfa052933..000000000000 --- a/pkgs/development/compilers/chez-racket/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ stdenv, buildPackages, callPackage }: - -let - chezArch = - /**/ if stdenv.hostPlatform.isAarch then "arm${toString stdenv.hostPlatform.parsed.cpu.bits}" - else if stdenv.hostPlatform.isx86_32 then "i3" - else if stdenv.hostPlatform.isx86_64 then "a6" - else if stdenv.hostPlatform.isPower then "ppc${toString stdenv.hostPlatform.parsed.cpu.bits}" - else throw "Add ${stdenv.hostPlatform.parsed.cpu.arch} to chezArch to enable building chez-racket"; - - chezOs = - /**/ if stdenv.hostPlatform.isDarwin then "osx" - else if stdenv.hostPlatform.isFreeBSD then "fb" - else if stdenv.hostPlatform.isLinux then "le" - else if stdenv.hostPlatform.isNetBSD then "nb" - else if stdenv.hostPlatform.isOpenBSD then "ob" - else throw "Add ${stdenv.hostPlatform.uname.system} to chezOs to enable building chez-racket"; - - inherit (stdenv.hostPlatform) system; - chezSystem = "t${chezArch}${chezOs}"; - # Chez Scheme uses an ad-hoc `configure`, hence we don't use the usual - # stdenv abstractions. - forBoot = { - pname = "chez-scheme-racket-boot"; - configurePhase = '' - runHook preConfigure - ./configure --pb ZLIB=$ZLIB LZ4=$LZ4 - runHook postConfigure - ''; - makeFlags = [ "${chezSystem}.bootquick" ]; - installPhase = '' - runHook preInstall - mkdir -p $out - pushd boot - mv $(ls -1 | grep -v "^pb$") -t $out - popd - runHook postInstall - ''; - }; - boot = buildPackages.callPackage (import ./shared.nix forBoot) {}; - forFinal = { - pname = "chez-scheme-racket"; - configurePhase = '' - runHook preConfigure - cp -r ${boot}/* -t ./boot - ./configure -m=${chezSystem} --installprefix=$out --installman=$out/share/man ZLIB=$ZLIB LZ4=$LZ4 - runHook postConfigure - ''; - preBuild = '' - pushd ${chezSystem}/c - ''; - postBuild = '' - popd - ''; - setupHook = ./setup-hook.sh; - }; - final = callPackage (import ./shared.nix forFinal) {}; -in -final diff --git a/pkgs/development/compilers/chez-racket/setup-hook.sh b/pkgs/development/compilers/chez-racket/setup-hook.sh deleted file mode 100644 index 1d81489bd4e4..000000000000 --- a/pkgs/development/compilers/chez-racket/setup-hook.sh +++ /dev/null @@ -1,5 +0,0 @@ -addChezLibraryPath() { - addToSearchPath CHEZSCHEMELIBDIRS "$1/lib/csv-site" -} - -addEnvHooks "$targetOffset" addChezLibraryPath diff --git a/pkgs/development/compilers/chez-racket/shared.nix b/pkgs/development/compilers/chez-racket/shared.nix deleted file mode 100644 index b9368dd4ebea..000000000000 --- a/pkgs/development/compilers/chez-racket/shared.nix +++ /dev/null @@ -1,40 +0,0 @@ -args: -{ stdenv, lib, fetchFromGitHub, coreutils, cctools, darwin -, ncurses, libiconv, libX11, zlib, lz4 -}: - -stdenv.mkDerivation (args // { - version = "unstable-2021-12-11"; - - src = fetchFromGitHub { - owner = "racket"; - repo = "ChezScheme"; - rev = "8846c96b08561f05a937d5ecfe4edc96cc99be39"; - sha256 = "IYJQzT88T8kFahx2BusDOyzz6lQDCbZIfSz9rZoNF7A="; - fetchSubmodules = true; - }; - - prePatch = '' - rm -rf zlib/*.c lz4/lib/*.c - ''; - - postPatch = '' - export ZLIB="$(find ${zlib.out}/lib -type f | sort | head -n1)" - export LZ4="$(find ${lz4.out}/lib -type f | sort | head -n1)" - ''; - - nativeBuildInputs = lib.optionals stdenv.isDarwin ([ cctools darwin.autoSignDarwinBinariesHook ]); - buildInputs = [ libiconv libX11 lz4 ncurses zlib ]; - - enableParallelBuilding = true; - - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=format-truncation"; - - meta = { - description = "Fork of Chez Scheme for Racket"; - homepage = "https://github.com/racket/ChezScheme"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ l-as ]; - platforms = lib.platforms.unix; - }; -}) diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/development/compilers/chez/default.nix deleted file mode 100644 index 9002db42abc2..000000000000 --- a/pkgs/development/compilers/chez/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ lib, stdenv, fetchurl -, coreutils, cctools -, darwin -, ncurses, libiconv, libX11, libuuid, testers -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "chez-scheme"; - version = "10.0.0"; - - src = fetchurl { - url = "https://github.com/cisco/ChezScheme/releases/download/v${finalAttrs.version}/csv${finalAttrs.version}.tar.gz"; - hash = "sha256-03GZASte0ZhcQGnWqH/xjl4fWi3yfkApkfr0XcTyIyw="; - }; - - nativeBuildInputs = lib.optionals stdenv.isDarwin [ - cctools - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ - darwin.autoSignDarwinBinariesHook - ]; - buildInputs = [ ncurses libiconv libX11 libuuid ]; - - enableParallelBuilding = true; - - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=format-truncation"; - - /* - ** We have to fix a few occurrences to tools with absolute - ** paths in some helper scripts, otherwise the build will fail on - ** NixOS or in any chroot build. - */ - patchPhase = '' - substituteInPlace ./makefiles/installsh \ - --replace-warn "/usr/bin/true" "${coreutils}/bin/true" - - substituteInPlace zlib/configure \ - --replace-warn "/usr/bin/libtool" libtool - ''; - - /* - ** Don't use configureFlags, since that just implicitly appends - ** everything onto a --prefix flag, which ./configure gets very angry - ** about. - ** - ** Also, carefully set a manual workarea argument, so that we - ** can later easily find the machine type that we built Chez - ** for. - */ - configurePhase = '' - ./configure --as-is --threads --installprefix=$out --installman=$out/share/man - ''; - - /* - ** Clean up some of the examples from the build output. - */ - postInstall = '' - rm -rf $out/lib/csv${finalAttrs.version}/examples - ''; - - setupHook = ./setup-hook.sh; - - passthru.tests = { - version = testers.testVersion { - package = finalAttrs.finalPackage; - }; - }; - - meta = { - description = "Powerful and incredibly fast R6RS Scheme compiler"; - homepage = "https://cisco.github.io/ChezScheme/"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ thoughtpolice ]; - platforms = lib.platforms.unix; - mainProgram = "scheme"; - }; -}) diff --git a/pkgs/development/compilers/chez/setup-hook.sh b/pkgs/development/compilers/chez/setup-hook.sh deleted file mode 100644 index 1d81489bd4e4..000000000000 --- a/pkgs/development/compilers/chez/setup-hook.sh +++ /dev/null @@ -1,5 +0,0 @@ -addChezLibraryPath() { - addToSearchPath CHEZSCHEMELIBDIRS "$1/lib/csv-site" -} - -addEnvHooks "$targetOffset" addChezLibraryPath diff --git a/pkgs/development/compilers/chicken/4/chicken.nix b/pkgs/development/compilers/chicken/4/chicken.nix index b96a1d459d71..a36ef4569e30 100644 --- a/pkgs/development/compilers/chicken/4/chicken.nix +++ b/pkgs/development/compilers/chicken/4/chicken.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { sha256 = "0hvckhi5gfny3mlva6d7y9pmx7cbwvq0r7mk11k3sdiik9hlkmdd"; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' # There is not enough space in the load command to accomodate a full path to the store, # so use `@executable_path` to specify a relative path to chicken’s lib folder. sed -e '/POSTINSTALL_PROGRAM_FLAGS = /{s|$(LIBDIR)|@executable_path/../lib|}' \ @@ -30,12 +30,12 @@ stdenv.mkDerivation { setupHook = lib.optional (bootstrap-chicken != null) ./setup-hook.sh; # -fno-strict-overflow is not a supported argument in clang on darwin - hardeningDisable = lib.optionals stdenv.isDarwin ["strictoverflow"]; + hardeningDisable = lib.optionals stdenv.hostPlatform.isDarwin ["strictoverflow"]; makeFlags = [ "PLATFORM=${platform}" "PREFIX=$(out)" "VARDIR=$(out)/var/lib" - ] ++ (lib.optionals stdenv.isDarwin [ + ] ++ (lib.optionals stdenv.hostPlatform.isDarwin [ "XCODE_TOOL_PATH=${darwin.binutils.bintools}/bin" "C_COMPILER=$(CC)" "POSTINSTALL_PROGRAM=${stdenv.cc.targetPrefix}install_name_tool" @@ -49,7 +49,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ darwin.autoSignDarwinBinariesHook ]; diff --git a/pkgs/development/compilers/chicken/5/chicken.nix b/pkgs/development/compilers/chicken/5/chicken.nix index 2f0b8316ae8b..6d9563b9f662 100644 --- a/pkgs/development/compilers/chicken/5/chicken.nix +++ b/pkgs/development/compilers/chicken/5/chicken.nix @@ -27,15 +27,12 @@ stdenv.mkDerivation (finalAttrs: { setupHook = lib.optional (bootstrap-chicken != null) ./setup-hook.sh; - # -fno-strict-overflow is not a supported argument in clang - hardeningDisable = lib.optionals stdenv.cc.isClang [ "strictoverflow" ]; - makeFlags = [ "PLATFORM=${platform}" "PREFIX=$(out)" "C_COMPILER=$(CC)" "CXX_COMPILER=$(CXX)" - ] ++ (lib.optionals stdenv.isDarwin [ + ] ++ (lib.optionals stdenv.hostPlatform.isDarwin [ "XCODE_TOOL_PATH=${darwin.binutils.bintools}/bin" "LINKER_OPTIONS=-headerpad_max_install_names" "POSTINSTALL_PROGRAM=install_name_tool" @@ -47,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeWrapper - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ darwin.autoSignDarwinBinariesHook ]; @@ -55,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { bootstrap-chicken ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; postCheck = '' ./csi -R chicken.pathname -R chicken.platform \ -p "(assert (equal? \"${toString finalAttrs.binaryVersion}\" (pathname-file (car (repository-path)))))" diff --git a/pkgs/development/compilers/chicken/5/overrides.nix b/pkgs/development/compilers/chicken/5/overrides.nix index b132036bbae4..ec465aa8d783 100644 --- a/pkgs/development/compilers/chicken/5/overrides.nix +++ b/pkgs/development/compilers/chicken/5/overrides.nix @@ -19,7 +19,7 @@ let addToPropagatedBuildInputsWithPkgConfig = pkg: old: (addPkgConfig old) // (addToPropagatedBuildInputs pkg old); broken = addMetaAttrs { broken = true; }; - brokenOnDarwin = addMetaAttrs { broken = stdenv.isDarwin; }; + brokenOnDarwin = addMetaAttrs { broken = stdenv.hostPlatform.isDarwin; }; addToCscOptions = opt: old: { CSC_OPTIONS = lib.concatStringsSep " " ([ old.CSC_OPTIONS or "" ] ++ lib.toList opt); }; @@ -27,8 +27,8 @@ in { allegro = old: ((addToBuildInputsWithPkgConfig ([ pkgs.allegro5 pkgs.libglvnd pkgs.libGLU ] - ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.OpenGL ] - ++ lib.optionals stdenv.isLinux [ pkgs.xorg.libX11 ])) old) // { + ++ lib.optionals stdenv.hostPlatform.isDarwin [ pkgs.darwin.apple_sdk.frameworks.OpenGL ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ pkgs.xorg.libX11 ])) old) // { # depends on 'chicken' egg, which doesn't exist, # so we specify all the deps here propagatedBuildInputs = [ @@ -43,6 +43,13 @@ in (addToBuildInputsWithPkgConfig pkgs.cairo old) // (addToPropagatedBuildInputs (with chickenEggs; [ srfi-1 srfi-13 ]) old); cmark = addToBuildInputs pkgs.cmark; + comparse = old: { + # For some reason lazy-seq 2 gets interpreted as lazy-seq 0.0.0?? + postPatch = '' + substituteInPlace comparse.egg \ + --replace-fail 'lazy-seq "0.1.0"' 'lazy-seq "0.0.0"' + ''; + }; epoxy = old: (addToPropagatedBuildInputsWithPkgConfig pkgs.libepoxy old) // lib.optionalAttrs stdenv.cc.isClang { @@ -72,12 +79,12 @@ in gl-utils = addPkgConfig; glfw3 = addToBuildInputsWithPkgConfig pkgs.glfw3; glls = addPkgConfig; - iconv = addToBuildInputs (lib.optional stdenv.isDarwin pkgs.libiconv); + iconv = addToBuildInputs (lib.optional stdenv.hostPlatform.isDarwin pkgs.libiconv); icu = addToBuildInputsWithPkgConfig pkgs.icu; imlib2 = addToBuildInputsWithPkgConfig pkgs.imlib2; inotify = old: - (addToBuildInputs (lib.optional stdenv.isDarwin pkgs.libinotify-kqueue) old) - // lib.optionalAttrs stdenv.isDarwin (addToCscOptions "-L -linotify" old); + (addToBuildInputs (lib.optional stdenv.hostPlatform.isDarwin pkgs.libinotify-kqueue) old) + // lib.optionalAttrs stdenv.hostPlatform.isDarwin (addToCscOptions "-L -linotify" old); leveldb = addToBuildInputs pkgs.leveldb; magic = addToBuildInputs pkgs.file; mdh = old: @@ -94,7 +101,7 @@ in nanomsg = addToBuildInputs pkgs.nanomsg; ncurses = addToBuildInputsWithPkgConfig [ pkgs.ncurses ]; opencl = addToBuildInputs ([ pkgs.opencl-headers pkgs.ocl-icd ] - ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.OpenCL ]); + ++ lib.optionals stdenv.hostPlatform.isDarwin [ pkgs.darwin.apple_sdk.frameworks.OpenCL ]); openssl = addToBuildInputs pkgs.openssl; plot = addToBuildInputs pkgs.plotutils; postgresql = addToBuildInputsWithPkgConfig pkgs.postgresql; @@ -132,6 +139,7 @@ in addToNativeBuildInputs pkgs.taglib old ); uuid-lib = addToBuildInputs pkgs.libuuid; + webview = addToBuildInputsWithPkgConfig pkgs.webkitgtk_4_0; ws-client = addToBuildInputs pkgs.zlib; xlib = addToPropagatedBuildInputs pkgs.xorg.libX11; yaml = addToBuildInputs pkgs.libyaml; @@ -154,8 +162,8 @@ in }; opengl = old: (addToBuildInputsWithPkgConfig - (lib.optionals (!stdenv.isDarwin) [ pkgs.libGL pkgs.libGLU ] - ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Foundation pkgs.darwin.apple_sdk.frameworks.OpenGL ]) + (lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkgs.libGL pkgs.libGLU ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Foundation pkgs.darwin.apple_sdk.frameworks.OpenGL ]) old) // { postPatch = '' @@ -164,7 +172,7 @@ in ''; }; posix-shm = old: { - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace build.scm \ --replace "-lrt" "" ''; @@ -209,7 +217,6 @@ in begin-syntax = broken; canvas-draw = broken; chicken-doc-admin = broken; - comparse = broken; coops-utils = broken; crypt = broken; hypergiant = broken; @@ -224,7 +231,6 @@ in svn-client = broken; system = broken; tokyocabinet = broken; - webview = broken; # mark broken darwin diff --git a/pkgs/development/compilers/ciao/default.nix b/pkgs/development/compilers/ciao/default.nix deleted file mode 100644 index 29e103226022..000000000000 --- a/pkgs/development/compilers/ciao/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "ciao"; - version = "1.23.0-m1"; - src = fetchFromGitHub { - owner = "ciao-lang"; - repo = "ciao"; - rev = "v${version}"; - sha256 = "sha256-JMHln0nYveEEfEr4AMyrEL9KlCDiqV53BWRNMUL8nN0="; - }; - - configurePhase = '' - ./ciao-boot.sh configure --instype=global --prefix=$prefix - ''; - - buildPhase = '' - ./ciao-boot.sh build - ''; - - installPhase = '' - ./ciao-boot.sh install - ''; - - meta = with lib; { - homepage = "https://ciao-lang.org/"; - description = "General purpose, multi-paradigm programming language in the Prolog family"; - license = licenses.lgpl21; - maintainers = with maintainers; [ suhr ]; - platforms = platforms.unix; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/ciao.x86_64-darwin - }; -} diff --git a/pkgs/development/compilers/circt/circt-llvm.nix b/pkgs/development/compilers/circt/circt-llvm.nix deleted file mode 100644 index 0043702fd847..000000000000 --- a/pkgs/development/compilers/circt/circt-llvm.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ lib -, stdenv -, cmake -, ninja -, circt -, llvm -, python3 -}: stdenv.mkDerivation { - pname = circt.pname + "-llvm"; - inherit (circt) version src; - - requiredSystemFeatures = [ "big-parallel" ]; - - nativeBuildInputs = [ cmake ninja python3 ]; - - preConfigure = '' - cd llvm/llvm - ''; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - "-DLLVM_ENABLE_BINDINGS=OFF" - "-DLLVM_ENABLE_OCAMLDOC=OFF" - "-DLLVM_BUILD_EXAMPLES=OFF" - "-DLLVM_OPTIMIZED_TABLEGEN=ON" - "-DLLVM_ENABLE_PROJECTS=mlir" - "-DLLVM_TARGETS_TO_BUILD=Native" - - # This option is needed to install llvm-config - "-DLLVM_INSTALL_UTILS=ON" - ]; - - outputs = [ "out" "lib" "dev" ]; - - # Get rid of ${extra_libdir} (which ends up containing a path to circt-llvm.dev - # in circt) so that we only have to remove the one fixed rpath. - postPatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace llvm/llvm/cmake/modules/AddLLVM.cmake \ - --replace-fail 'set(_install_rpath "@loader_path/../lib''${LLVM_LIBDIR_SUFFIX}" ''${extra_libdir})' \ - 'set(_install_rpath "@loader_path/../lib''${LLVM_LIBDIR_SUFFIX}")' - ''; - - postInstall = '' - # move llvm-config to $dev to resolve a circular dependency - moveToOutput "bin/llvm-config*" "$dev" - - # move all lib files to $lib except lib/cmake - moveToOutput "lib" "$lib" - moveToOutput "lib/cmake" "$dev" - - # patch configuration files so each path points to the new $lib or $dev paths - substituteInPlace "$dev/lib/cmake/llvm/LLVMConfig.cmake" \ - --replace 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}")' 'set(LLVM_BINARY_DIR "'"$lib"'")' - substituteInPlace \ - "$dev/lib/cmake/llvm/LLVMExports-release.cmake" \ - "$dev/lib/cmake/mlir/MLIRTargets-release.cmake" \ - --replace "\''${_IMPORT_PREFIX}/lib/lib" "$lib/lib/lib" \ - --replace "\''${_IMPORT_PREFIX}/lib/objects-Release" "$lib/lib/objects-Release" \ - --replace "$out/bin/llvm-config" "$dev/bin/llvm-config" # patch path for llvm-config - ''; - - # Replace all references to @rpath with absolute paths and remove the rpaths. - # - # This is different from what the regular LLVM package does, which is to make - # everything absolute from the start: however, that doesn't work for us because - # we have `-DBUILD_SHARED_LIBS=ON`, meaning that many more things are - # dynamically rather than statically linked. This includes TableGen, which then - # fails to run halfway through the build because it tries to reference $lib when - # it hasn't been populated yet. - # - # Inspired by fixDarwinDylibNames. - postFixup = lib.optionalString stdenv.isDarwin '' - local flags=(-delete_rpath @loader_path/../lib) - for file in "$lib"/lib/*.dylib; do - flags+=(-change @rpath/"$(basename "$file")" "$file") - done - - for file in "$out"/bin/* "$lib"/lib/*.dylib; do - if [ -L "$file" ]; then continue; fi - echo "$file: fixing dylib references" - # note that -id does nothing on binaries - install_name_tool -id "$file" "''${flags[@]}" "$file" - done - ''; - - # circt only use the mlir part of llvm, occasionally there are some unrelated failure from llvm, - # disable the llvm check, but keep the circt check enabled. - doCheck = false; - checkTarget = "check-mlir"; - - meta = llvm.meta // { - inherit (circt.meta) maintainers; - }; -} diff --git a/pkgs/development/compilers/circt/default.nix b/pkgs/development/compilers/circt/default.nix deleted file mode 100644 index 493a42613584..000000000000 --- a/pkgs/development/compilers/circt/default.nix +++ /dev/null @@ -1,95 +0,0 @@ -{ stdenv -, lib -, cmake -, coreutils -, python3 -, git -, fetchFromGitHub -, ninja -, lit -, z3 -, gitUpdater -, callPackage -}: - -let - pythonEnv = python3.withPackages (ps: [ ps.psutil ]); - circt-llvm = callPackage ./circt-llvm.nix { }; -in -stdenv.mkDerivation rec { - pname = "circt"; - version = "1.86.0"; - src = fetchFromGitHub { - owner = "llvm"; - repo = "circt"; - rev = "firtool-${version}"; - hash = "sha256-xV7vu3zdWBXgnCCUN9ge1GZemo0prmpQrZ1np86i3jI="; - fetchSubmodules = true; - }; - - requiredSystemFeatures = [ "big-parallel" ]; - - nativeBuildInputs = [ cmake ninja git pythonEnv z3 ]; - buildInputs = [ circt-llvm ]; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - "-DMLIR_DIR=${circt-llvm.dev}/lib/cmake/mlir" - - # LLVM_EXTERNAL_LIT is executed by python3, the wrapped bash script will not work - "-DLLVM_EXTERNAL_LIT=${lit}/bin/.lit-wrapped" - "-DCIRCT_LLHD_SIM_ENABLED=OFF" - ]; - - # There are some tests depending on `clang-tools` to work. They are activated only when detected - # `clang-tidy` in PATH, However, we cannot simply put `clang-tools` in checkInputs to make these - # tests work. Because - # - # 1. The absolute paths of binaries used in tests are resolved in configure phase. - # 2. When stdenv = clangStdenv, the `clang-tidy` binary appears in PATH via `clang-unwrapped`, - # which is always placed before `${clang-tools}/bin` in PATH. `clang-tidy` provided in - # `clang-unwrapped` cause tests failing because it is not wrapped to resolve header search paths. - # https://github.com/NixOS/nixpkgs/issues/214945 discusses this issue. - # - # As a temporary fix, we disabled these tests when using clang stdenv - # cannot use lib.optionalString as it creates an empty string, disabling all tests - LIT_FILTER_OUT = if stdenv.cc.isClang then "CIRCT :: Target/ExportSystemC/.*\.mlir" else null; - - preConfigure = '' - find ./test -name '*.mlir' -exec sed -i 's|/usr/bin/env|${coreutils}/bin/env|g' {} \; - # circt uses git to check its version, but when cloned on nix it can't access git. - # So this hard codes the version. - substituteInPlace cmake/modules/GenVersionFile.cmake --replace "unknown git version" "${src.rev}" - ''; - - doCheck = true; - checkTarget = "check-circt check-circt-integration"; - - outputs = [ "out" "lib" "dev" ]; - - # Copy circt-llvm's postFixup stage so that it can make all our dylib references - # absolute as well. - # - # We don't need `postPatch` because circt seems to be automatically inheriting - # the config somehow, presumably via. `-DMLIR_DIR`. - postFixup = circt-llvm.postFixup; - - postInstall = '' - moveToOutput lib "$lib" - ''; - - passthru = { - updateScript = gitUpdater { - rev-prefix = "firtool-"; - }; - llvm = circt-llvm; - }; - - meta = { - description = "Circuit IR compilers and tools"; - homepage = "https://circt.org/"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ sharzy pineapplehunter sequencer ]; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/development/compilers/clasp/default.nix b/pkgs/development/compilers/clasp/default.nix index d5d56546b576..4613357ded3b 100644 --- a/pkgs/development/compilers/clasp/default.nix +++ b/pkgs/development/compilers/clasp/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { platforms = ["x86_64-linux" "x86_64-darwin"]; # Upstream claims support, but breaks with: # error: use of undeclared identifier 'aligned_alloc' - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://github.com/clasp-developers/clasp"; mainProgram = "clasp"; }; diff --git a/pkgs/development/compilers/clean/chroot-build-support-do-not-rebuild-equal-timestamps.patch b/pkgs/development/compilers/clean/chroot-build-support-do-not-rebuild-equal-timestamps.patch deleted file mode 100644 index 3e0fbe6b996d..000000000000 --- a/pkgs/development/compilers/clean/chroot-build-support-do-not-rebuild-equal-timestamps.patch +++ /dev/null @@ -1,17 +0,0 @@ -The clean command line compiler clm checks modules for freshness by comparing timestamps. -However, in chroot builds all files installed have the same timestamp. This leads to clm -trying to rebuild the library modules distributed with the Clean install every time a user -compiles any file. This patch changes the freshness check to use less than instead of less -than or equal to in order to avoid this. - ---- clean-upstream/src/tools/clm/clm.c 2010-12-10 06:12:17.000000000 -0430 -+++ clean/src/tools/clm/clm.c 2010-12-25 10:29:09.840675925 -0430 -@@ -250,7 +250,7 @@ - || (t1.dwHighDateTime==t2.dwHighDateTime && (unsigned)(t1.dwLowDateTime)<=(unsigned)(t2.dwLowDateTime))) - #else - typedef unsigned long FileTime; --# define FILE_TIME_LE(t1,t2) (t1<=t2) -+# define FILE_TIME_LE(t1,t2) (t1<t2) - #endif - - typedef struct project_node { diff --git a/pkgs/development/compilers/clean/default.nix b/pkgs/development/compilers/clean/default.nix deleted file mode 100644 index e360bb05f40d..000000000000 --- a/pkgs/development/compilers/clean/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation { - pname = "clean"; - version = "3.0"; - - src = - if stdenv.hostPlatform.system == "i686-linux" then (fetchurl { - url = "https://ftp.cs.ru.nl/Clean/Clean30/linux/clean3.0_32_boot.tar.gz"; - sha256 = "0cjxv3vqrg6pz3aicwfdz1zyhk0q650464j3qyl0wzaikh750010"; - }) - else if stdenv.hostPlatform.system == "x86_64-linux" then (fetchurl { - url = "https://ftp.cs.ru.nl/Clean/Clean30/linux/clean3.0_64_boot.tar.gz"; - sha256 = "06k283y9adbi28f78k3m5ssg6py73qqkz3sm8dgxc89drv4krl2i"; - }) - else throw "Architecture not supported"; - - hardeningDisable = [ "format" "pic" ]; - - # clm uses timestamps of dcl, icl, abc and o files to decide what must be rebuild - # and for chroot builds all of the library files will have equal timestamps. This - # makes clm try to rebuild the library modules (and fail due to absence of write permission - # on the Nix store) every time any file is compiled. - patches = [ ./chroot-build-support-do-not-rebuild-equal-timestamps.patch ]; - - preBuild = '' - substituteInPlace Makefile --replace 'INSTALL_DIR = $(CURRENTDIR)' 'INSTALL_DIR = '$out - - substituteInPlace src/tools/clm/clm.c --replace '/usr/bin/gcc' $(type -p gcc) - substituteInPlace src/tools/clm/clm.c --replace '/usr/bin/as' $(type -p as) - - cd src - ''; - - postBuild = '' - cd .. - ''; - - meta = { - description = "General purpose, state-of-the-art, pure and lazy functional programming language"; - longDescription = '' - Clean is a general purpose, state-of-the-art, pure and lazy functional - programming language designed for making real-world applications. Some - of its most notable language features are uniqueness typing, dynamic typing, - and generic functions. - ''; - - homepage = "http://wiki.clean.cs.ru.nl/Clean"; - license = lib.licenses.bsd2; - maintainers = [ lib.maintainers.erin ]; - platforms = [ "i686-linux" "x86_64-linux" ]; - }; -} diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix deleted file mode 100644 index 2bb2340261c2..000000000000 --- a/pkgs/development/compilers/closure/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchurl, jre, makeWrapper }: - -stdenv.mkDerivation rec { - pname = "closure-compiler"; - version = "20240317"; - - src = fetchurl { - url = "mirror://maven/com/google/javascript/closure-compiler/v${version}/closure-compiler-v${version}.jar"; - sha256 = "sha256-axJQrCHAW90gncUV2bYDezC1VVooTddB/wWRqChIt84="; - }; - - dontUnpack = true; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ jre ]; - - installPhase = '' - mkdir -p $out/share/java $out/bin - cp ${src} $out/share/java/closure-compiler-v${version}.jar - makeWrapper ${jre}/bin/java $out/bin/closure-compiler \ - --add-flags "-jar $out/share/java/closure-compiler-v${version}.jar" - ''; - - meta = with lib; { - description = "Tool for making JavaScript download and run faster"; - mainProgram = "closure-compiler"; - homepage = "https://developers.google.com/closure/compiler/"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.asl20; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/compilers/cmdstan/default.nix b/pkgs/development/compilers/cmdstan/default.nix deleted file mode 100644 index a6b6833289b7..000000000000 --- a/pkgs/development/compilers/cmdstan/default.nix +++ /dev/null @@ -1,95 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, python3 -, stanc -, buildPackages -, runtimeShell -, runCommandCC -, cmdstan -}: - -stdenv.mkDerivation rec { - pname = "cmdstan"; - version = "2.35.0"; - - src = fetchFromGitHub { - owner = "stan-dev"; - repo = pname; - rev = "v${version}"; - fetchSubmodules = true; - hash = "sha256-bmzkXbR4KSnpfXjs2MAx8mbNSbNrIWDP/O8S+JGWrcg="; - }; - - postPatch = '' - substituteInPlace stan/lib/stan_math/make/libraries \ - --replace "/usr/bin/env bash" "bash" - ''; - - nativeBuildInputs = [ - python3 - stanc - ]; - - preConfigure = '' - patchShebangs test-all.sh runCmdStanTests.py stan/ - '' - # Fix inclusion of hardcoded paths in PCH files, by building in the store. - + '' - mkdir -p $out/opt - cp -R . $out/opt/cmdstan - cd $out/opt/cmdstan - mkdir -p bin - ln -s ${buildPackages.stanc}/bin/stanc bin/stanc - ''; - - makeFlags = [ - "build" - ] ++ lib.optionals stdenv.isDarwin [ - "arch=${stdenv.hostPlatform.darwinArch}" - ]; - - # Disable inclusion of timestamps in PCH files when using Clang. - env.CXXFLAGS = lib.optionalString stdenv.cc.isClang "-Xclang -fno-pch-timestamp"; - - enableParallelBuilding = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - ln -s $out/opt/cmdstan/bin/stanc $out/bin/stanc - ln -s $out/opt/cmdstan/bin/stansummary $out/bin/stansummary - cat > $out/bin/stan <<EOF - #!${runtimeShell} - make -C $out/opt/cmdstan "\$(realpath "\$1")" - EOF - chmod a+x $out/bin/stan - - runHook postInstall - ''; - - passthru.tests = { - test = runCommandCC "cmdstan-test" { } '' - cp -R ${cmdstan}/opt/cmdstan cmdstan - chmod -R +w cmdstan - cd cmdstan - ./runCmdStanTests.py -j$NIX_BUILD_CORES src/test/interface - touch $out - ''; - }; - - meta = with lib; { - description = "Command-line interface to Stan"; - longDescription = '' - Stan is a probabilistic programming language implementing full Bayesian - statistical inference with MCMC sampling (NUTS, HMC), approximate Bayesian - inference with Variational inference (ADVI) and penalized maximum - likelihood estimation with Optimization (L-BFGS). - ''; - homepage = "https://mc-stan.org/interfaces/cmdstan.html"; - license = licenses.bsd3; - maintainers = with maintainers; [ wegank ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/compilers/codon/default.nix b/pkgs/development/compilers/codon/default.nix index 520c6386490b..88d3c01d713a 100644 --- a/pkgs/development/compilers/codon/default.nix +++ b/pkgs/development/compilers/codon/default.nix @@ -125,7 +125,7 @@ stdenv.mkDerivation { "-DLLVM_USE_LINKER=lld" ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' ln -s $out/lib/codon/*.dylib $out/lib/ ''; diff --git a/pkgs/development/compilers/coffeescript/default.nix b/pkgs/development/compilers/coffeescript/default.nix deleted file mode 100644 index a5ef29967e07..000000000000 --- a/pkgs/development/compilers/coffeescript/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub -}: - -buildNpmPackage rec { - pname = "coffeescript"; - version = "2.7.0"; - - src = fetchFromGitHub { - owner = "jashkenas"; - repo = "coffeescript"; - rev = version; - hash = "sha256-vr46LKICX61rFPCkZ3G+8gJykg+MO43YRJnZGM3RoY0="; - }; - - npmDepsHash = "sha256-mCm31OwI3wjq8taKRQuEj4+IWVZO9Z5KuIDBf39lYoQ="; - - env = { - PUPPETEER_SKIP_DOWNLOAD = true; - }; - - dontNpmBuild = true; - - meta = { - description = "Little language that compiles into JavaScript"; - homepage = "https://github.com/jashkenas/coffeescript"; - license = lib.licenses.mit; - mainProgram = "coffee"; - maintainers = with lib.maintainers; [ cdmistman ]; - }; -} diff --git a/pkgs/development/compilers/colm/cross-compile.patch b/pkgs/development/compilers/colm/cross-compile.patch deleted file mode 100644 index 470ea23aaf1b..000000000000 --- a/pkgs/development/compilers/colm/cross-compile.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/configure.ac 2019-07-09 22:41:03.166948024 -0700 -+++ b/configure.ac 2019-07-09 22:41:16.699948056 -0700 -@@ -40,9 +40,7 @@ - - dnl Choose a default for the build_manual var. If the dist file is present in - dnl the root then default to no, otherwise go for it. --AC_CHECK_FILES( [$srcdir/DIST], -- [. $srcdir/DIST;], -- [build_manual=yes; ] ) -+build_manual=yes; - - dnl Set to true if the manual should be built. - AM_CONDITIONAL(BUILD_MANUAL, [test "x$build_manual" = "xyes"]) diff --git a/pkgs/development/compilers/colm/default.nix b/pkgs/development/compilers/colm/default.nix deleted file mode 100644 index 6ec15a0ebdf9..000000000000 --- a/pkgs/development/compilers/colm/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchurl, makeWrapper, gcc, asciidoc, autoreconfHook }: - -stdenv.mkDerivation rec { - pname = "colm"; - version = "0.13.0.7"; - - src = fetchurl { - url = "https://www.colm.net/files/colm/${pname}-${version}.tar.gz"; - sha256 = "0f76iri173l2wja2v7qrwmf958cqwh5g9x4bhj2z8wknmlla6gz4"; - }; - - patches = [ ./cross-compile.patch ]; - - nativeBuildInputs = [ makeWrapper asciidoc autoreconfHook ]; - - doCheck = true; - - postInstall = '' - wrapProgram $out/bin/colm \ - --prefix PATH ":" ${gcc}/bin - ''; - - meta = with lib; { - description = "Programming language for the analysis and transformation of computer languages"; - mainProgram = "colm"; - homepage = "http://www.colm.net/open-source/colm"; - license = licenses.gpl2; - platforms = platforms.unix; - maintainers = with maintainers; [ pSub ]; - }; -} diff --git a/pkgs/development/compilers/computecpp/default.nix b/pkgs/development/compilers/computecpp/default.nix deleted file mode 100644 index 4e6e7ad43416..000000000000 --- a/pkgs/development/compilers/computecpp/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, stdenv -, fetchzip -, pkg-config -, autoPatchelfHook -, installShellFiles -, ocl-icd -, zlib -}: - -stdenv.mkDerivation rec { - pname = "computecpp"; - version = "2.11.0"; - - src = fetchzip { - url = "https://computecpp.codeplay.com/downloads/computecpp-ce/${version}/x86_64-linux-gnu.tar.gz"; - hash = "sha256-xHOPuijx5TZeHzRHPXcll0WqoBzHBryIoe3BnOxBVVY="; - stripRoot = true; - }; - - dontStrip = true; - - buildInputs = [ stdenv.cc.cc.lib ocl-icd zlib ]; - nativeBuildInputs = [ autoPatchelfHook pkg-config installShellFiles ]; - - installPhase = '' - runHook preInstall - - find ./lib -type f -exec install -D -m 0755 {} -t $out/lib \; - find ./bin -type l -exec install -D -m 0755 {} -t $out/bin \; - find ./bin -type f -exec install -D -m 0755 {} -t $out/bin \; - find ./doc -type f -exec install -D -m 0644 {} -t $out/doc \; - find ./include -type f -exec install -D -m 0644 {} -t $out/include \; - - runHook postInstall - ''; - - passthru = { - isClang = true; - }; - - meta = with lib; { - description = - "Accelerate Complex C++ Applications on Heterogeneous Compute Systems using Open Standards"; - homepage = "https://www.codeplay.com/products/computesuite/computecpp"; - license = licenses.unfree; - maintainers = with maintainers; [ davidtwco ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/development/compilers/copper/default.nix b/pkgs/development/compilers/copper/default.nix deleted file mode 100644 index f202932743f1..000000000000 --- a/pkgs/development/compilers/copper/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, stdenv -, fetchurl -, libffi -}: -stdenv.mkDerivation rec { - pname = "copper"; - version = "4.6"; - src = fetchurl { - url = "https://tibleiz.net/download/copper-${version}-src.tar.gz"; - sha256 = "sha256-tyxAMJp4H50eBz8gjt2O3zj5fq6nOIXKX47wql8aUUg="; - }; - buildInputs = [ - libffi - ]; - postPatch = '' - patchShebangs . - ''; - buildPhase = '' - make BACKEND=elf64 boot-elf64 - make BACKEND=elf64 COPPER=stage3/copper-elf64 copper-elf64 - ''; - installPhase = '' - make BACKEND=elf64 install prefix=$out - ''; - meta = with lib; { - description = "Simple imperative language, statically typed with type inference and genericity"; - homepage = "https://tibleiz.net/copper/"; - license = licenses.bsd2; - platforms = platforms.x86_64; - broken = true; - }; -} diff --git a/pkgs/development/compilers/corretto/11.nix b/pkgs/development/compilers/corretto/11.nix index b7bd676143c0..c1bf6347947c 100644 --- a/pkgs/development/compilers/corretto/11.nix +++ b/pkgs/development/compilers/corretto/11.nix @@ -1,16 +1,23 @@ -{ fetchFromGitHub -, gradle_7 -, jdk11 -, lib -, stdenv -, rsync -, runCommand -, testers +{ + fetchFromGitHub, + gradle_7, + jdk11, + lib, + stdenv, + rsync, + runCommand, + testers, }: let corretto = import ./mk-corretto.nix rec { - inherit lib stdenv rsync runCommand testers; + inherit + lib + stdenv + rsync + runCommand + testers + ; jdk = jdk11; gradle = gradle_7; extraConfig = [ @@ -19,12 +26,12 @@ let # Corretto, too. "--disable-warnings-as-errors" ]; - version = "11.0.23.9.1"; + version = "11.0.24.8.1"; src = fetchFromGitHub { owner = "corretto"; repo = "corretto-11"; rev = version; - sha256 = "sha256-qSx0kgXTgvsvBaEqgy7Jrp/c1Imoi5/IOqEWoLenJYI="; + sha256 = "sha256-MD/ipEulQCEgfqqa0QQrD6x6GQwirQfb8OT2UBDLYEE="; }; }; in diff --git a/pkgs/development/compilers/corretto/17.nix b/pkgs/development/compilers/corretto/17.nix index c557012e8cdb..90ca350a355d 100644 --- a/pkgs/development/compilers/corretto/17.nix +++ b/pkgs/development/compilers/corretto/17.nix @@ -1,34 +1,43 @@ -{ fetchFromGitHub -, fetchurl -, gradle_7 -, jdk17 -, lib -, stdenv -, rsync -, runCommand -, testers +{ + fetchFromGitHub, + fetchurl, + gradle_7, + jdk17, + lib, + stdenv, + rsync, + runCommand, + testers, }: let corretto = import ./mk-corretto.nix rec { - inherit lib stdenv rsync runCommand testers; + inherit + lib + stdenv + rsync + runCommand + testers + ; jdk = jdk17; gradle = gradle_7; - version = "17.0.11.9.1"; + version = "17.0.12.7.1"; src = fetchFromGitHub { owner = "corretto"; repo = "corretto-17"; rev = version; - sha256 = "sha256-LxZSFILFfyh8oBiYEnuBQ0Og2i713qdK2jIiCBnrlj0="; + sha256 = "sha256-aRn1hqaqNsBkp2jHHkwMKc8cNiBM+TYVm3tVMPJJ1YE="; }; }; in -corretto.overrideAttrs (final: prev: { - # HACK: Removes the FixNullPtrCast patch, as it fails to apply. Need to figure out what causes it to fail to apply. - patches = lib.remove - (fetchurl { +corretto.overrideAttrs ( + final: prev: { + # Corretto17 has incorporated this patch already so it fails to apply. + # We thus skip it here. + # See https://github.com/corretto/corretto-17/pull/158 + patches = lib.remove (fetchurl { url = "https://git.alpinelinux.org/aports/plain/community/openjdk17/FixNullPtrCast.patch?id=41e78a067953e0b13d062d632bae6c4f8028d91c"; sha256 = "sha256-LzmSew51+DyqqGyyMw2fbXeBluCiCYsS1nCjt9hX6zo="; - }) - (prev.patches or [ ]); -}) + }) (prev.patches or [ ]); + } +) diff --git a/pkgs/development/compilers/corretto/21.nix b/pkgs/development/compilers/corretto/21.nix index 9656ace73cef..a5ab64d02c24 100644 --- a/pkgs/development/compilers/corretto/21.nix +++ b/pkgs/development/compilers/corretto/21.nix @@ -1,25 +1,32 @@ -{ corretto21 -, fetchFromGitHub -, gradle_7 -, jdk21 -, lib -, stdenv -, rsync -, runCommand -, testers +{ + corretto21, + fetchFromGitHub, + gradle_7, + jdk21, + lib, + stdenv, + rsync, + runCommand, + testers, }: let corretto = import ./mk-corretto.nix rec { - inherit lib stdenv rsync runCommand testers; + inherit + lib + stdenv + rsync + runCommand + testers + ; jdk = jdk21; gradle = gradle_7; - version = "21.0.3.9.1"; + version = "21.0.4.7.1"; src = fetchFromGitHub { owner = "corretto"; repo = "corretto-21"; rev = version; - sha256 = "sha256-V8UDyukDCQVTWUg4IpSKoY0qnnQ5fePbm3rxcw06Vr0="; + sha256 = "sha256-EQqktd2Uz9PhkCaqvbuzmONcSiRppQ40tpLB3mqu2wo="; }; }; in diff --git a/pkgs/development/compilers/corretto/mk-corretto.nix b/pkgs/development/compilers/corretto/mk-corretto.nix index 1059935ce20f..0de05fb0f6c8 100644 --- a/pkgs/development/compilers/corretto/mk-corretto.nix +++ b/pkgs/development/compilers/corretto/mk-corretto.nix @@ -1,13 +1,14 @@ -{ jdk -, version -, src -, lib -, stdenv -, gradle -, extraConfig ? [ ] -, rsync -, runCommand -, testers +{ + jdk, + version, + src, + lib, + stdenv, + gradle, + extraConfig ? [ ], + rsync, + runCommand, + testers, }: # Each Corretto version is based on a corresponding OpenJDK version. So @@ -19,97 +20,111 @@ let pname = "corretto"; - # The version scheme is different between OpenJDK & Corretto. - # See https://github.com/corretto/corretto-17/blob/release-17.0.8.8.1/build.gradle#L40 - # "major.minor.security.build.revision" in -jdk.overrideAttrs (finalAttrs: oldAttrs: { - inherit pname version src; - name = "${pname}-${version}"; +# The version scheme is different between OpenJDK & Corretto. +# See https://github.com/corretto/corretto-17/blob/release-17.0.8.8.1/build.gradle#L40 +# "major.minor.security.build.revision" +jdk.overrideAttrs ( + finalAttrs: oldAttrs: { + inherit pname version src; + name = "${pname}-${version}"; - nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ jdk gradle rsync ]; + nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ + jdk + gradle + rsync + ]; - dontConfigure = true; + dontConfigure = true; - postPatch = let - extra_config = builtins.concatStringsSep " " extraConfig; - in '' - # The rpm/deb task definitions require a Gradle plugin which we don't - # have and so the build fails. We'll simply remove them here because - # they are not needed anyways. - rm -rf installers/linux/universal/{rpm,deb} + postPatch = + let + extra_config = builtins.concatStringsSep " " extraConfig; + in + '' + # The rpm/deb task definitions require a Gradle plugin which we don't + # have and so the build fails. We'll simply remove them here because + # they are not needed anyways. + rm -rf installers/linux/universal/{rpm,deb} - # `/usr/bin/rsync` is invoked to copy the source tree. We don't have that. - for file in $(find installers -name "build.gradle"); do - substituteInPlace $file --replace-warn "workingDir '/usr/bin'" "workingDir '.'" - done + # `/usr/bin/rsync` is invoked to copy the source tree. We don't have that. + for file in $(find installers -name "build.gradle"); do + substituteInPlace $file --replace-warn "workingDir '/usr/bin'" "workingDir '.'" + done - gradleFlagsArray+=(-Pcorretto.extra_config="${extra_config}") - ''; + gradleFlagsArray+=(-Pcorretto.extra_config="${extra_config}") + ''; - # since we dontConfigure, we must run this manually - preBuild = "gradleConfigureHook"; + # since we dontConfigure, we must run this manually + preBuild = "gradleConfigureHook"; - # The Linux installer is placed at linux/universal/tar whereas the MacOS - # one is at mac/tar. - gradleBuildTask = - if stdenv.isDarwin then - ":installers:mac:tar:build" - else ":installers:linux:universal:tar:packageBuildResults"; + # The Linux installer is placed at linux/universal/tar whereas the MacOS + # one is at mac/tar. + gradleBuildTask = + if stdenv.hostPlatform.isDarwin then + ":installers:mac:tar:build" + else + ":installers:linux:universal:tar:packageBuildResults"; - postBuild = '' - # Prepare for the installPhase so that it looks like if a normal - # OpenJDK had been built. - dir=build/jdkImageName/images - mkdir -p $dir - file=$(find ./installers -name 'amazon-corretto-${version}*.tar.gz') - tar -xzf $file -C $dir - mv $dir/amazon-corretto-* $dir/jdk - '' + oldAttrs.postBuild or ""; + postBuild = + '' + # Prepare for the installPhase so that it looks like if a normal + # OpenJDK had been built. + dir=build/jdkImageName/images + mkdir -p $dir + file=$(find ./installers -name 'amazon-corretto-${version}*.tar.gz') + tar -xzf $file -C $dir + mv $dir/amazon-corretto-* $dir/jdk + '' + + oldAttrs.postBuild or ""; - installPhase = oldAttrs.installPhase + '' - # The installPhase will place everything in $out/lib/openjdk and - # reference through symlinks. We don't rewrite the installPhase but at - # least move the folder to convey that this is not OpenJDK anymore. - mv $out/lib/openjdk $out/lib/corretto - ln -s $out/lib/corretto $out/lib/openjdk - ''; + installPhase = + oldAttrs.installPhase + + '' + # The installPhase will place everything in $out/lib/openjdk and + # reference through symlinks. We don't rewrite the installPhase but at + # least move the folder to convey that this is not OpenJDK anymore. + mv $out/lib/openjdk $out/lib/corretto + ln -s $out/lib/corretto $out/lib/openjdk + ''; - passthru = - let - pkg = finalAttrs.finalPackage; - in - oldAttrs.passthru // { - tests = { - version = testers.testVersion { - package = pkg; + passthru = + let + pkg = finalAttrs.finalPackage; + in + oldAttrs.passthru + // { + tests = { + version = testers.testVersion { package = pkg; }; + vendor = runCommand "${pname}-vendor" { nativeBuildInputs = [ pkg ]; } '' + output=$(${pkg.meta.mainProgram} -XshowSettings:properties -version 2>&1 | grep vendor) + grep -Fq "java.vendor = Amazon.com Inc." - <<< "$output" && touch $out + ''; + compiler = runCommand "${pname}-compiler" { nativeBuildInputs = [ pkg ]; } '' + cat << EOF > Main.java + class Main { + public static void main(String[] args) { + System.out.println("Hello, World!"); + } + } + EOF + ${pkg}/bin/javac Main.java + ${pkg}/bin/java Main | grep -q "Hello, World!" && touch $out + ''; }; - vendor = runCommand "${pname}-vendor" { nativeBuildInputs = [ pkg ]; } '' - output=$(${pkg.meta.mainProgram} -XshowSettings:properties -version 2>&1 | grep vendor) - grep -Fq "java.vendor = Amazon.com Inc." - <<< "$output" && touch $out - ''; - compiler = runCommand "${pname}-compiler" { nativeBuildInputs = [ pkg ]; } '' - cat << EOF > Main.java - class Main { - public static void main(String[] args) { - System.out.println("Hello, World!"); - } - } - EOF - ${pkg}/bin/javac Main.java - ${pkg}/bin/java Main | grep -q "Hello, World!" && touch $out - ''; }; - }; - - # Some of the OpenJDK derivation set their `pos` by hand. We need to - # overwrite this in order to point to Corretto, not OpenJDK. - pos = __curPos; - meta = with lib; oldAttrs.meta // { - homepage = "https://aws.amazon.com/corretto"; - license = licenses.gpl2Only; - description = "Amazon's distribution of OpenJDK"; - maintainers = with maintainers; [ rollf ]; - }; -}) + # Some of the OpenJDK derivation set their `pos` by hand. We need to + # overwrite this in order to point to Corretto, not OpenJDK. + pos = __curPos; + meta = + with lib; + oldAttrs.meta + // { + homepage = "https://aws.amazon.com/corretto"; + license = licenses.gpl2Only; + description = "Amazon's distribution of OpenJDK"; + maintainers = with maintainers; [ rollf ]; + }; + } +) diff --git a/pkgs/development/compilers/critcl/default.nix b/pkgs/development/compilers/critcl/default.nix deleted file mode 100644 index 5caf63d9dba6..000000000000 --- a/pkgs/development/compilers/critcl/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib -, fetchFromGitHub -, tcl -, tcllib -}: - -tcl.mkTclDerivation rec { - pname = "critcl"; - version = "3.2"; - - src = fetchFromGitHub { - owner = "andreas-kupries"; - repo = "critcl"; - rev = version; - hash = "sha256-IxScn9ZTlqD9mG9VJLG+TtplLFhhahOiFhQCjxp22Uk="; - }; - - buildInputs = [ - tcl - tcllib - ]; - - dontBuild = true; - doCheck = true; - - checkPhase = '' - runHook preInstall - HOME="$(mktemp -d)" tclsh ./build.tcl test - runHook postInstall - ''; - - installPhase = '' - runHook preInstall - tclsh ./build.tcl install --prefix $out - runHook postInstall - ''; - - meta = with lib; { - description = "Easily embed C code in Tcl"; - homepage = "https://andreas-kupries.github.io/critcl/"; - license = licenses.tcltk; - mainProgram = "critcl"; - maintainers = with maintainers; [ fgaz ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index c95298cbfe2a..39745f61faca 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -19,6 +19,7 @@ , libffi , llvmPackages_13 , llvmPackages_15 +, llvmPackages_18 , makeWrapper , openssl , pcre2 @@ -144,7 +145,7 @@ let substituteInPlace spec/std/socket/udp_socket_spec.cr \ --replace 'it "joins and transmits to multicast groups"' 'pending "joins and transmits to multicast groups"' - '' + lib.optionalString (stdenv.isDarwin && lib.versionAtLeast version "1.3.0" && lib.versionOlder version "1.7.0") '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionAtLeast version "1.3.0" && lib.versionOlder version "1.7.0") '' # See https://github.com/NixOS/nixpkgs/pull/195606#issuecomment-1356491277 substituteInPlace spec/compiler/loader/unix_spec.cr \ --replace 'it "parses file paths"' 'pending "parses file paths"' @@ -175,7 +176,7 @@ let libxml2 openssl ] ++ extraBuildInputs - ++ lib.optionals stdenv.isDarwin [ libiconv ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; makeFlags = [ "CRYSTAL_CONFIG_VERSION=${version}" @@ -246,6 +247,7 @@ let passthru.buildCrystalPackage = callPackage ./build-package.nix { crystal = finalAttrs.finalPackage; }; + passthru.llvmPackages = llvmPackages; meta = with lib; { inherit (binary.meta) platforms; @@ -314,5 +316,21 @@ rec { llvmPackages = llvmPackages_15; }; - crystal = crystal_1_11; + crystal_1_12 = generic { + version = "1.12.1"; + sha256 = "sha256-Q6uI9zPZ3IOGyUuWdC179GPktPGFPRbRWKtOF4YWCBw="; + binary = binaryCrystal_1_10; + llvmPackages = llvmPackages_18; + }; + + crystal_1_14 = generic { + version = "1.14.0"; + sha256 = "sha256-ayMF5yinHVOUaZxhlmqxb/iiGJHmloeYuKcnrPmxo9Y="; + binary = binaryCrystal_1_10; + llvmPackages = llvmPackages_18; + doCheck = false; # Some compiler spec problems on x86-64_linux with the .0 release + }; + + + crystal = crystal_1_14; } diff --git a/pkgs/development/compilers/crystal2nix/default.nix b/pkgs/development/compilers/crystal2nix/default.nix deleted file mode 100644 index 2ba0fefd6aba..000000000000 --- a/pkgs/development/compilers/crystal2nix/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, fetchFromGitHub, crystal, makeWrapper, nix-prefetch-git }: - -crystal.buildCrystalPackage rec { - pname = "crystal2nix"; - version = "0.3.0"; - - src = fetchFromGitHub { - owner = "peterhoeg"; - repo = "crystal2nix"; - rev = "v${version}"; - hash = "sha256-gb2vgKWVXwYWfUUcFvOLFF0qB4CTBekEllpyKduU1Mo="; - }; - - format = "shards"; - - shardsFile = ./shards.nix; - - nativeBuildInputs = [ makeWrapper ]; - - postInstall = '' - wrapProgram $out/bin/crystal2nix \ - --prefix PATH : ${lib.makeBinPath [ nix-prefetch-git ]} - ''; - - # temporarily off. We need the checks to execute the wrapped binary - doCheck = false; - - doInstallCheck = true; - - meta = with lib; { - description = "Utility to convert Crystal's shard.lock files to a Nix file"; - mainProgram = "crystal2nix"; - license = licenses.mit; - maintainers = with maintainers; [ manveru peterhoeg ]; - }; -} diff --git a/pkgs/development/compilers/crystal2nix/shards.nix b/pkgs/development/compilers/crystal2nix/shards.nix deleted file mode 100644 index 728aefb80502..000000000000 --- a/pkgs/development/compilers/crystal2nix/shards.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ - spectator = { - url = "https://gitlab.com/arctic-fox/spectator.git"; - rev = "v0.10.5"; - sha256 = "1fgjz5vg59h4m25v4fjklimcdn62ngqbchm00kw1160ggjpgpzw2"; - }; - version_from_shard = { - url = "https://github.com/hugopl/version_from_shard.git"; - rev = "v1.2.5"; - sha256 = "0xizj0q4rd541rwjbx04cjifc2gfx4l5v6q2y7gmd0ndjmkgb8ik"; - }; -} diff --git a/pkgs/development/compilers/dale/default.nix b/pkgs/development/compilers/dale/default.nix deleted file mode 100644 index 816e8e08f4a7..000000000000 --- a/pkgs/development/compilers/dale/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, libffi -, llvm_13 -, perl -}: - -stdenv.mkDerivation { - pname = "dale"; - version = "20220411"; - - src = fetchFromGitHub { - owner = "tomhrr"; - repo = "dale"; - rev = "7386ef2d8912c60c6fb157a1e5cd772e15eaf658"; - sha256 = "sha256-LNWqrFuEjtL7zuPTBfe4qQWr8IrT/ldQWSeDTK3Wqmo="; - }; - - nativeBuildInputs = [ cmake pkg-config llvm_13.dev ]; - buildInputs = [ libffi llvm_13 ]; - - nativeCheckInputs = [ perl ]; - - checkTarget = "tests"; - - meta = with lib; { - description = "Lisp-flavoured C"; - longDescription = '' - Dale is a system (no GC) programming language that uses - S-expressions for syntax and supports syntactic macros. - ''; - homepage = "https://github.com/tomhrr/dale"; - license = licenses.bsd3; - maintainers = with maintainers; [ amiloradovsky ]; - platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; - # failed on Darwin: linker couldn't find the FFI lib - }; -} diff --git a/pkgs/development/compilers/dart/default.nix b/pkgs/development/compilers/dart/default.nix index 9a08b3d51732..d6d538d5c844 100644 --- a/pkgs/development/compilers/dart/default.nix +++ b/pkgs/development/compilers/dart/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $out cp -R * $out/ echo $libPath - '' + lib.optionalString (stdenv.isLinux) '' + '' + lib.optionalString (stdenv.hostPlatform.isLinux) '' find $out/bin -executable -type f -exec patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) {} \; ''; @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { testCompile = runCommand "dart-test-compile" { nativeBuildInputs = [ finalAttrs.finalPackage ] - ++ lib.optionals stdenv.isDarwin [ cctools darwin.sigtool ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools darwin.sigtool ]; } '' HELLO_MESSAGE="Hello, world!" echo "void main() => print('$HELLO_MESSAGE');" > hello.dart diff --git a/pkgs/development/compilers/dart/sources.nix b/pkgs/development/compilers/dart/sources.nix index 7f2054e3e0c1..b2fc4fdc01ee 100644 --- a/pkgs/development/compilers/dart/sources.nix +++ b/pkgs/development/compilers/dart/sources.nix @@ -1,24 +1,24 @@ -let version = "3.5.3"; in +let version = "3.5.4"; in { fetchurl }: { versionUsed = version; "${version}-x86_64-darwin" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-x64-release.zip"; - sha256 = "1z6hl6pqsg2l7pfchzr5dk90b2dchidhwnnnc4q5dzz0xjikqrvx"; + sha256 = "0x4kjkgva143g0d07rcz9zd9dfmsr9zfhrx4kj9z0ap9s3rv6vdh"; }; "${version}-aarch64-darwin" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-arm64-release.zip"; - sha256 = "12rzl1nm1y0q5ff9p8gslki4cz37y3bdn8p2s3x2nc81bdda4gn7"; + sha256 = "00iw0nsxhq4aas717b0vhcz3hlwrpyixbgkf9sksqk2x1w798if0"; }; "${version}-aarch64-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-arm64-release.zip"; - sha256 = "1rp54g8di8j715n955wdr6i0pcrx2dn73qmvmrisyahi0qjrk0py"; + sha256 = "1v437zpksk0jhib6vhpcbvv715mv32zmwby8b3p9qd3k67fn87d9"; }; "${version}-x86_64-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-x64-release.zip"; - sha256 = "001mpb3fniamlmnqmhxdpbvp8crdvnf6sam13vvfmnr6na1fpxil"; + sha256 = "0rv9rp8g5blhncqwciymhxh3z2832yp54lphxgsvkmm9y8s5w34d"; }; "${version}-i686-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-ia32-release.zip"; - sha256 = "0z9qjx2b2rmiqyqww0a5slj0pi1k8sn4fjihkn53im65rhhqra2y"; + sha256 = "02kv119swcp7y4n3yb2i5a4dagjpf0zq3b3an1apahj5zn6ak41g"; }; } diff --git a/pkgs/development/compilers/dasm/default.nix b/pkgs/development/compilers/dasm/default.nix deleted file mode 100644 index 7f57f47f2ed6..000000000000 --- a/pkgs/development/compilers/dasm/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "dasm"; - version = "2.20.14.1"; - - src = fetchFromGitHub { - owner = "dasm-assembler"; - repo = "dasm"; - rev = version; - sha256 = "1bna0bj503xyn5inwzzsrsgi9qg8p20by4dfk7azj91ynw56pl41"; - }; - - configurePhase = false; - installPhase = '' - mkdir -p $out/bin - install bin/* $out/bin - ''; - - preCheck = '' - patchShebangs ./test/ - ''; - - checkTarget = "test"; - doCheck = true; - - meta = with lib; { - description = "Assembler for 6502 and other 8-bit microprocessors"; - homepage = "https://dasm-assembler.github.io"; - license = licenses.gpl2; - maintainers = [ maintainers.jwatt ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/compilers/dictu/0001-force-sqlite-to-be-found.patch b/pkgs/development/compilers/dictu/0001-force-sqlite-to-be-found.patch deleted file mode 100644 index 8de4c9f57f6a..000000000000 --- a/pkgs/development/compilers/dictu/0001-force-sqlite-to-be-found.patch +++ /dev/null @@ -1,46 +0,0 @@ -From bb4767f8fc413ca4cb42879a9a226fd26f10e094 Mon Sep 17 00:00:00 2001 -From: Lucas Ransan <lucas@ransan.tk> -Date: Tue, 3 Aug 2021 20:39:11 +0200 -Subject: [PATCH] force sqlite to be found - ---- - src/CMakeLists.txt | 16 +++++----------- - 1 file changed, 5 insertions(+), 11 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index a0f3fee..58b4d0b 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -9,7 +9,7 @@ set(INCLUDE_DIR include/) - list(FILTER sources EXCLUDE REGEX "(main|linenoise|utf8).c") - list(FILTER headers EXCLUDE REGEX "(linenoise|utf8).h") - --find_library(SQLITE_LIB SQLite3) -+find_package(SQLite3 REQUIRED) - set(THREADS) - - if(DISABLE_HTTP) -@@ -20,16 +20,10 @@ else() - list(APPEND libraries curl) - endif() - --if(NOT SQLITE_LIB) -- set(THREADS_PREFER_PTHREAD_FLAG ON) -- find_package(Threads REQUIRED) -- set(THREADS Threads::Threads) --else() -- list(FILTER sources EXCLUDE REGEX "sqlite3.c") -- list(FILTER headers EXCLUDE REGEX "sqlite3.h") -- list(APPEND libraries ${SQLITE_LIB}) -- add_compile_definitions(INCLUDE_SQLITE_LIB) --endif() -+list(FILTER sources EXCLUDE REGEX "sqlite3.c") -+list(FILTER headers EXCLUDE REGEX "sqlite3.h") -+list(APPEND libraries ${SQLite3_LIBRARIES}) -+add_compile_definitions(SQLite3_INCLUDE_DIR) - - if(WIN32) - # ws2_32 is required for winsock2.h to work correctly --- -2.32.0 - diff --git a/pkgs/development/compilers/dictu/default.nix b/pkgs/development/compilers/dictu/default.nix deleted file mode 100644 index b58d86871374..000000000000 --- a/pkgs/development/compilers/dictu/default.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, sqlite -, httpSupport ? true, curl -, cliSupport ? true -, linenoiseSupport ? cliSupport, linenoise -, enableLTO ? stdenv.cc.isGNU -}: - -assert enableLTO -> stdenv.cc.isGNU; - -stdenv.mkDerivation rec { - pname = "dictu"; - version = "0.25.0"; - - src = fetchFromGitHub { - owner = "dictu-lang"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-Tahi2K8Q/KPc9MN7yWhkqp/MzXfzJzrGSsvnTCyI03U="; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ - sqlite - ] ++ lib.optional httpSupport curl - ++ lib.optional linenoiseSupport linenoise; - - patches = [ - ./0001-force-sqlite-to-be-found.patch - ]; - - postPatch = lib.optionalString (!enableLTO) '' - sed -i src/CMakeLists.txt \ - -e 's/-flto/${lib.optionalString stdenv.cc.isGNU "-Wno-error=format-truncation"}/' - ''; - - cmakeFlags = [ - "-DBUILD_CLI=${if cliSupport then "ON" else "OFF"}" - "-DDISABLE_HTTP=${if httpSupport then "OFF" else "ON"}" - "-DDISABLE_LINENOISE=${if linenoiseSupport then "OFF" else "ON"}" - ] ++ lib.optionals enableLTO [ # TODO: LTO with LLVM - "-DCMAKE_AR=${stdenv.cc.cc}/bin/gcc-ar" - "-DCMAKE_RANLIB=${stdenv.cc.cc}/bin/gcc-ranlib" - ]; - - postBuild = '' - cd .. # move out of cmakeBuildDir - ''; - - doCheck = cliSupport; - - preCheck = '' - sed -i tests/runTests.du \ - -e '/http/d' - sed -i tests/path/realpath.du \ - -e 's/usr/build/g' - sed -i tests/path/isDir.du \ - -e "s,/usr/bin,$PWD," \ - -e '/home/d' - ''; - - checkPhase = '' - runHook preCheck - ./dictu tests/runTests.du - ''; - - installPhase = '' - mkdir -p $out - cp -r src/include $out/include - mkdir -p $out/lib - cp build/src/libdictu_api* $out/lib - '' + lib.optionalString cliSupport '' - install -Dm755 dictu $out/bin/dictu - ''; - - meta = with lib; { - description = "High-level dynamically typed, multi-paradigm, interpreted programming language"; - mainProgram = "dictu"; - homepage = "https://dictu-lang.com"; - license = licenses.mit; - maintainers = with maintainers; [ luc65r ]; - platforms = platforms.all; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/dictu.x86_64-darwin - }; -} diff --git a/pkgs/development/compilers/dotnet/8/bootstrap-sdk.nix b/pkgs/development/compilers/dotnet/8/bootstrap-sdk.nix new file mode 100644 index 000000000000..06153d33d4ce --- /dev/null +++ b/pkgs/development/compilers/dotnet/8/bootstrap-sdk.nix @@ -0,0 +1,293 @@ +{ buildAspNetCore, buildNetRuntime, buildNetSdk, fetchNupkg }: + +# v8.0 (active) + +let + commonPackages = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Ref"; version = "8.0.8"; hash = "sha256-5iWiiKBaB6V5x3GDvZ1DpyxDHFIsmewksoeIizz8Z7k="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-2KBKkVUlpiO1bOY+Ia2PKjurY2taV7CHnzU7Jr5HYUs="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Ref"; version = "8.0.8"; hash = "sha256-3x7ltOqJJXYO+zHIIvH1SDEz9fTrHqNoyK68teiHGZQ="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-ZGunPQaL6Kz97BpQY9lSOPEsy1CvZiTZeidqnG18anw="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-x45oE7EFl6V29tVnuvzfcnAufOQjVf8FYxG8TSNz77k="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-UHKTFAfqIxoBZ38I6wBdMNA6NyQ4FhSJcHNQZxjaCu4="; }) + (fetchNupkg { pname = "Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-KmiA+uHHYOnsfdG3F20mu0XllcRxEvMvWkHz7vK39KQ="; }) + (fetchNupkg { pname = "Microsoft.NET.ILLink.Tasks"; version = "8.0.8"; hash = "sha256-st7UdPx9AFKf9o6WewsmUKhbP2IG2KQjHRCTdP4Vj00="; }) + ]; + + hostPackages = { + linux-arm = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "8.0.8"; hash = "sha256-VL9omnR1wz323jyU+UQWPuwKOv7UfkkiZ+8ja1JYDM8="; }) + ]; + linux-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "8.0.8"; hash = "sha256-MaWj6kbZ4td5Yq1aMyK1nqUva7d5bDXSewRoqjF0jS0="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-Dz8dkFRN//VvdLjWxe8+5o81adh/gqYyo5aHxtjzoqs="; }) + ]; + linux-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "8.0.8"; hash = "sha256-MJmQmBHWgvsqO8XYLnqsyUTfQ72VeJ/3EHq6OHtZ+n8="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-dmtcy7cqijoJAUCEJTNcvqaRneRMCn7WJkurjk2YpN8="; }) + ]; + linux-musl-arm = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "8.0.8"; hash = "sha256-liIF45Ljv47Wkl9xhN2IWH4vbFPCUkvF++i7ENsCB+o="; }) + ]; + linux-musl-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "8.0.8"; hash = "sha256-Y3KRiZ9i1IQoU/X70+c5hUkPsfSUJD8mrWecspUAEPw="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-LACty1K+yIIJiTgArn6DpuMqKS+uhVBCgIG2e4W1XBI="; }) + ]; + linux-musl-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "8.0.8"; hash = "sha256-deYqv/tadlpOOMof1/MoLu2fIjcfbQ4Y/auc97c0GIM="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-a6q/Fq88tknCNUEMiGAdCNOMj8rUyWMa3LdasqMl06I="; }) + ]; + osx-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "8.0.8"; hash = "sha256-MeztjburvdAXPWL4eLVhvL2+K9qd3otNatH8QbJf3Mk="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-Q7ZRUqGLN41EIbmTPQXiiLIJsLWwHHlTMCg7e9B38Fs="; }) + ]; + osx-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "8.0.8"; hash = "sha256-nb0PV2g3PjENKIFLnnUynIxa9GWjVRyprHRbrMAfHW4="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-exBYb8kUySdkudyNrs5ArXa/wkkS2b6lhVpm4jZMnqQ="; }) + ]; + win-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-arm64"; version = "8.0.8"; hash = "sha256-b6WidfvMYv6zHy1nd4kGc5oCg5tTDxPlg8CESjurv5E="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-4OtC6HUOpa6DSJPkA+/72wQHgGj3Kqh7iQyJtvvNtz8="; }) + ]; + win-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x64"; version = "8.0.8"; hash = "sha256-bHuEFTwVzaQOEV1w/Jtfe8ZHMOtwHWsSqiiqoun+SkQ="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; hash = "sha256-wTLpzd7iu6eCyOn6ct4ZzB2NQq7GzNUJEsh+zkgHbdU="; }) + ]; + win-x86 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x86"; version = "8.0.8"; hash = "sha256-Q6mYxptkYaF0ThyJSX0uUVKK6R6x6Xkfi/40EqiDAQA="; }) + ]; + }; + + targetPackages = { + linux-arm = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "8.0.8"; hash = "sha256-H3XoUT5B3taEoJvUFhlTRZ5/LI8VVaFxd82QZejD+xE="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "8.0.8"; hash = "sha256-eYuDkv5aQvet7FzZOsZ5LZHnbNE4na74cmq3JsDaBNA="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "8.0.8"; hash = "sha256-UMSNfp7fmU9UTkCj6GFoqz4iLDpM1zh0WP9W7KBIMAM="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-lSBjAXq7gADmOA7NaK9S+S+8Xx8oTsI6Mrp3fgA3eVM="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-RZ3KnxLJocJS9mSAwP69XCe0kA/uCppUNSMp4soCkN0="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-iW0U93hxohZrnGYB4us1XAaOBXMtMofMlN/FVdVjSS4="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-X6iM6I4WpVbLCEDhwwUrih1801VKfFz3gAaYZuQMTxk="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "8.0.8"; hash = "sha256-wCNIvKB1pav/orE1e9Ljcb8NUiaIZ447KsyHtEI1uFM="; }) + ]; + linux-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "8.0.8"; hash = "sha256-Yu/CZXF9OS9CtGV1ohPRRLHKpg3xZXmH+8aukhZjJO4="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "8.0.8"; hash = "sha256-hSj6/ogmBRNoC4VIqmkp7IsFcYf1IzVhHFsGU4BW/ug="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "8.0.8"; hash = "sha256-VXwu3zMEoxrLfABVIc2zIN22JsoUwCeuM7W++7lGeVc="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-GRldzHE2XXJdR6qAdcxgLcXZM1gNoiGsfJg0M5qnlR4="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-VACUGeR/lEFnS8O3kVBimN8U2sIr1/aU9hHyBA4cnKU="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-C3891F6er32h/x4bjp7nMbHOWvaGhjaAVxPwGQtxwtc="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-s57vIXMmdrTdlGmfqyemkSJP11MltQWemJnet92e+A8="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "8.0.8"; hash = "sha256-HDpL4+yMCXuy05nnJWKqZB2KkumluhvznAxAglZ2x5o="; }) + ]; + linux-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "8.0.8"; hash = "sha256-/9Hsru4pLWKMb2LTF1erdHILGdEc/2NnuTIG+dcf1jY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "8.0.8"; hash = "sha256-Leqb/Un4/GRgRcymCJWnPhjZCn8A2hl4nFdYJfkNdqs="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.8"; hash = "sha256-y5IbKOkqAKBpyWiA0PFmrtVXGXsWLHvX2FsiICm6egU="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-Ls2+jcDC4FW9zO81O2JP6BtKeazhydWEiXBPg/GJsfw="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-jJ7jGIYzDYqBZzJEG3BwS+NqUv7o7tRxUNgOTQ0oFSs="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-SCj9QjWOJvv3TvlR0TpIyFZrebRFTkVFVPdQ82F08gQ="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-LbvKpuOg1Rdqtabz1UvoADiNOkh+phBdXcD9iBGAAD0="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "8.0.8"; hash = "sha256-TwTvStZ7PMGpFh16lSI4iAJwDz/lnJkqHk/RQ0KEQB0="; }) + ]; + linux-musl-arm = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "8.0.8"; hash = "sha256-p2Xix0JrQlMxDbvuPmXXaikVLVdKo1OPdk5w5PKSp3A="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "8.0.8"; hash = "sha256-shWbs109a6xx0JyJH1hwjs0OR/KhemxYjjLJhrTzE7w="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "8.0.8"; hash = "sha256-cdjNG4XehuADgSuW0c/PKC+6VA0rdzisUKYJXMPhSvM="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-kxAG5q8z/6d3jjYhIbEOLTa9sFUveg9AK9QWEYb+Osc="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-M881jx3YlNWC51BZguFtvn9UfU6neFeRhSaq0zsMCFI="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-BwC5R+ECo52tePjkq/B6OEQvS4hq8tlAfUOBi9UufSg="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-E6clBJ6GdZd3d6XaGqlwcyJq9UN4a9t+ixdZi7Ro4Xw="; }) + ]; + linux-musl-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "8.0.8"; hash = "sha256-epjQsC2vTOpppEuMljG78vm/RWecUu/YJRAt+2ETd9s="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "8.0.8"; hash = "sha256-DHGL/dDpQ6LhathaNJxp3M3qQcCEG9oYisUQ6WMurMA="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "8.0.8"; hash = "sha256-6hx88DtgvvwRhyEFHS32AKvRwwHZyS44SxYRG4La+i0="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-KdRDHgeE6ShPewlbreXJ+87JrPGdhO5CEGBzVOyn44M="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-g7De3JFCkr1wtMguY1QJXAZD5CX855/xen6pCMCrkDE="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-PdskfOr7EiC4VDvyAo5k5MjmKayexsyPNkJhaAhVXjg="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-tSZ9tj81dWrHqrau0in1b/ZgbMyDs5P9Ea3sofhQ/ks="; }) + ]; + linux-musl-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "8.0.8"; hash = "sha256-21RqIxjfaIOaABcqoe9AlZElWdXNd44dX0jodejOFNY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "8.0.8"; hash = "sha256-nCSziE636/NGvg4J8HKI0CZ48SZZvwKu22QZa7Q/sAg="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "8.0.8"; hash = "sha256-3vnqKFPAhjoLP6h/MnVfhoWOr2/0XvnUyufafbYED8Q="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-4zmkFZSBB46KjlubRHJ+DIBZs22CJLbIonT9hVsf57o="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-JeCvY8S+YPlFMwNokIxIfOsMc+cPSxIRozAVT03+ZlU="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-EXfxzK1Z7kqCDckq829GHat6EfYCKJ+9BrcBeHd1raA="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-oDjnxygsxPsy1Mgnx59tpmqikAgN5H4o3IBzXup4zNo="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "8.0.8"; hash = "sha256-xxkmlp9i3x/4Ii+e4YYMPAA4iWdK2cwwj4030tp3o+U="; }) + ]; + osx-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "8.0.8"; hash = "sha256-ZB3eGK98abOZpcYmfWx0V3G/8AWr20gGyB/Ko5Zl91I="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "8.0.8"; hash = "sha256-L1IBy+DvMCZIbTzmlvSU2vsRrlZz7f29VS4H0+1/stw="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "8.0.8"; hash = "sha256-6G+7coU3SeYUTAjWl0iSYi28nGv5mzTnS8nkMMffGP0="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-O59V6pzicz7KWwUy+5qB3nAwSxhRsM9HoCq2uInaaHY="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-o3tSBAtHJGV5FbpreOQPF1VPb1ZoJI0unynfBUwvZ+E="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-NI6EnCoVuFHZ6mH9ZMXb38GhmQUhfxwP+vPlO/MsVnI="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-zvmCpjhY5JRezpwVr0S90rJfV0YGZ/wFJswo7Bl6tQQ="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "8.0.8"; hash = "sha256-D4qB2A3tJGN3nJcxMl/gBxA+LQx5QiawYWHn1Y3jWHs="; }) + ]; + osx-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "8.0.8"; hash = "sha256-emanxsPDi9tYicfkeLRVN4r+yZq06jG2RdoVpRG/lK0="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "8.0.8"; hash = "sha256-x7WOZWhE4NX6yc5MBlFO4EKHt4ExhnGx6lhmYrr8wfk="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "8.0.8"; hash = "sha256-SWEUTsvHkPP9S8iRW/PrneIZV7NRkz3IPiVmKZ95X6w="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-bG/yxRP8uNHjCcZkSOlqSqgWIesuww8irvtSsC8jIfE="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-0EJXF7Aa+7nEUOvqMCDLr5Gwa9OWu/Ol5kpCymTVkP8="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-sdCf4IfySwQalViNicdX1NFN3obWCImm6I6Zzhu1pxs="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-jHU0GS/mtOjKniVojxzKdk6VgQghNLRWi4G0/W+kflw="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "8.0.8"; hash = "sha256-hBmQqsJX4lPCEkwh0kuZl81KNkqR+4FZWwBKaGQPPPk="; }) + ]; + win-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "8.0.8"; hash = "sha256-kWp27hqFc4GlvnFiiPZlW8F6UEXmFRNAN5RkkNfM0D4="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "8.0.8"; hash = "sha256-lD/M7PhWXUSsS3FJ4doXNo+zFLIAnhqBmtfBkDvOX9U="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "8.0.8"; hash = "sha256-xJc8ynP8Yaq3fdBrd+1wSgF02dx6fKaO8Ty1JJvm87w="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-/1nQT+3thlkAeQbfsIakuD+/oZsq9KeI0vCgCFubOO8="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-2P9wZVY4iQmOxKttjrqb2fKQMWHzupFgVuwcE4egAOU="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-ZTK07ZSjid/flmTDgrp/GH37rmYpOYdXTKzJnEeIx3k="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-Lzxot9nzljMCvyqLHiXOu6qC3rgB3iN6JG5t1QCAbko="; }) + ]; + win-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "8.0.8"; hash = "sha256-NmsUnkmjpbxYa3jNjLa3+CbbSa1ipFvolk6fjJQ52co="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "8.0.8"; hash = "sha256-pkfKvNeb779TUp9jp19peJjCXK3NGpexaFjWwc3dSBo="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "8.0.8"; hash = "sha256-C0zUiMMAQ9nd1n7PDVoBhCShHzdGI67YFySTpeFH8uE="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-ojXEKX1OwepAx61seCAPh27UATzGTsE6VenT061IOmU="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-wMhsf3QncEUGSnFrGEck2Kyb8cPLPW8n7ZgKHwebdI4="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-AGqQ6fZicft/cBquuHb9jOh10N8gr/sLfijYzwm9vcM="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-hl5uj5iR2xXkefLQJ7DVU0NfThLatJUOqm9MGZUN9HM="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "8.0.8"; hash = "sha256-gS1Lu8UcYwlJL+N4Q86NnObCYOjsaG09+bHbjXr1Ro8="; }) + ]; + win-x86 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "8.0.8"; hash = "sha256-z5swa/BoIPh7oDb4WpAh5uvXZ46artGD/lnQm4e2cko="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "8.0.8"; hash = "sha256-fpqkDTGVOO85fWS+X5Yj//NRkVoRf/RxJZ974N4OKvI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "8.0.8"; hash = "sha256-nZEdf9Y3TLgyLOzSpn5ryl4xAbIy1vMGnVqCcYr4G74="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; hash = "sha256-NDGG0iZtxXLArTb3DEF1ELT3nHNTT5ogXqG00+70f9s="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; hash = "sha256-QYpsPJMunG+1LY6iOhkqe3TWZeUnV2sFdCRGKByEJcg="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; hash = "sha256-B0EIM5Jxi367oSvB1mHiHE3VpdoE02OF9FbFC1FlkLk="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; hash = "sha256-y1V5P/emZwwzWoz0UtMC/OYQjK+nGe9vkrY4RE9HRVI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "8.0.8"; hash = "sha256-vz7hG4LOgtZVpOMCCDrosxSiSUAIFmHWHxPe2kfIAWo="; }) + ]; + }; + +in rec { + release_8_0 = "8.0.8"; + + aspnetcore_8_0 = buildAspNetCore { + version = "8.0.8"; + srcs = { + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/26f16795-9928-4ddd-96f4-666e6e256715/bf797e4f997c965aeb0183b467fcf71a/aspnetcore-runtime-8.0.8-linux-arm.tar.gz"; + hash = "sha512-0P7t2Ru0AoBp2M/xcmGR6fCZIOdWQF3g0rv29DEWJ3zJPr4kg/QFuqSXK1T/6JsJy+FypjnmA5eucTjfXvSMTg=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/f6fcf2c9-39ad-49c7-80b5-92306309e796/3cac9217f55528cb60c95702ba92d78b/aspnetcore-runtime-8.0.8-linux-arm64.tar.gz"; + hash = "sha512-w9ydcfygpI7algdMvO9MmiZcHE4Qy/84YU3XTXlEOunRzNEHFHZM0EEpH4HYPA7Rwwer+JJJq0tvWKXelS/P/Q=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/648de803-0b0c-46bc-9601-42a94dae0b41/241fd17cee8d473a78675e30681979bb/aspnetcore-runtime-8.0.8-linux-x64.tar.gz"; + hash = "sha512-1sDMKqx5+6y/gbWX8oZ2NZn2YnjBfdtEjOC5PUmbrY+Id31CWFTmhgKUWrGK+KYfHuWdQx1VAwBhN/hhE/qosg=="; + }; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/9255e487-cdf2-4690-9840-74712503e37d/40be3d122db1d1ffa53a9843321c3979/aspnetcore-runtime-8.0.8-linux-musl-arm.tar.gz"; + hash = "sha512-XZ9gnnLc/MFra7Y9Sef9R8Pi13kT2d4UhkQX+ypTSy99tWUw2xZazGNjNkHHBtD6upXbmFsJhEZ32MtBA5oMZw=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/95f358cf-86b5-4789-8ee8-063067081c8b/e50e603b2453d7dc65eeb26dd4cfb398/aspnetcore-runtime-8.0.8-linux-musl-arm64.tar.gz"; + hash = "sha512-YCjCkwbUlp7kBMRZ3KMTDx6WFNGVTo7UQAFAs1rYoeZqCos64CFV32vQRs2TCQdCIEh6HCYlw58IG9xsjtYgBQ=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/7d2ac05d-2bef-4069-9513-bb2ef7fab48d/4f3d2d3fec003a65513dc1f70c126ab7/aspnetcore-runtime-8.0.8-linux-musl-x64.tar.gz"; + hash = "sha512-gi8uFxbcLSqkb/CPTS2bueqMgjMnhdCrpfTzPl62C9zYTomc0qE8qTAyImcQtfDKXHFZvtoXAn+E76KFJ4tXmA=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/a7080974-fac8-446c-ba20-313f6f323fbe/f907c126c9bcd394939a7cdf86b85f4b/aspnetcore-runtime-8.0.8-osx-arm64.tar.gz"; + hash = "sha512-oZbGKxTpE2NiBzgmoD524KFHAn8DZVUpQm5ZT35E643QNtrqgJl4dgRxccF5PH7c+lFGvVWgG1kdlAX7FkbrAA=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/465bdf6e-407d-4512-a222-32dafb225ad8/c22004de330d10a06141dee0f42b5d12/aspnetcore-runtime-8.0.8-osx-x64.tar.gz"; + hash = "sha512-07qNz63c1tUP1DSRH+PrgwlmaTmooe3oANfaLdgU7714HRRJpCtx0ccdlZNGXp6XIFAl60MoCO+aO6DcvboOPg=="; + }; + }; + }; + + runtime_8_0 = buildNetRuntime { + version = "8.0.8"; + srcs = { + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/5e427de4-981a-481e-9fec-fa77b02a7edb/0d156acae55ca1329b6b9a8de70f398f/dotnet-runtime-8.0.8-linux-arm.tar.gz"; + hash = "sha512-yHr1qq8y4YzNwpZRecZaq65eDp6Oogn2w2QnDOLkr//ql5yiLhQ95GdONqKxLGa1dViK4hnxZjaspxIUQCQCiA=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/ac04b123-0542-4e80-9216-93f51a6814b3/d110733c152d34ab4eedb435ccfdab4d/dotnet-runtime-8.0.8-linux-arm64.tar.gz"; + hash = "sha512-JG+35e21Hbk0Ica7dCD3o1hDC5iyJKcftw5xorzgvJH4U6qJEJ8hiLCrKFMqJFw9UrqsFjRj4BoCAZ3qN/058g=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/68c87f8a-862c-4870-a792-9c89b3c8aa2d/2319ebfb46d3a903341966586e8b0898/dotnet-runtime-8.0.8-linux-x64.tar.gz"; + hash = "sha512-j1IgCYxWL6NJBBd0jrn0+coVUfcVVyi567GSQ1nGPBje3vZDvNiexntZy1sbnecoPuFW7zgf+xaAG1FtupsbDw=="; + }; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/2f4507aa-972d-429c-9129-cfe95c1279eb/60dd9afc3f4786a568b01119c2280c63/dotnet-runtime-8.0.8-linux-musl-arm.tar.gz"; + hash = "sha512-im+SDZPX1VJ9won0clIeKmca+05mOqrP2CwyZYwuo56rQ6XJfT09e6WEA+v79suW/HP/W3zMGpRH0Tv0HuuAyQ=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/8d78f160-0833-4db5-bd62-947f8bc2d571/25638f47211018a7bd8fd9d314763196/dotnet-runtime-8.0.8-linux-musl-arm64.tar.gz"; + hash = "sha512-JvNeHGB0p9maQOpI9sAtt49OLHQ8vHRGOglNoBThJuk3nQm05WgJrJgpsmtroKkBrcR638PF01qX6erVppMUiQ=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/d9c4e4e4-bb2d-4f1a-9ded-bff5e354bd5a/0c6dbc5f68bea36a65fdf80e6aa4d55f/dotnet-runtime-8.0.8-linux-musl-x64.tar.gz"; + hash = "sha512-yi/zIUVQZRMlP4Ds1ytcJNi9oo9EroPJiMOev6dec31VELy4S8J6FJ0uaZV2H4sSTXcBUirpu8rBf8MmZyF+tg=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/e9ded115-7a30-4952-bb72-ff101583f20b/5a7628261b98d095d2c97ec3fe5267be/dotnet-runtime-8.0.8-osx-arm64.tar.gz"; + hash = "sha512-iLBt0FGBm9noziw0CyUW3A5Kd9Vl7/FF2OlXslUqZB4jWlzn6Ns2B0dYh7x2bxUw0B0Ofv2A0QzWUqKZlUOYtA=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/0159972b-a4d6-4683-b32a-9da824d5689e/ffb0784119abf49015be375b5a016413/dotnet-runtime-8.0.8-osx-x64.tar.gz"; + hash = "sha512-gCmYbB+LvxsOjQkpdWFW/kHUbS326+GrHGb7zqKt1Hw1uTRXPGGYeXz2DSs3LNRj5wMmwKNbCSbatNXBV6NX8w=="; + }; + }; + }; + + sdk_8_0_1xx = buildNetSdk { + version = "8.0.108"; + srcs = { + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/27228a4b-1ae9-4c1f-8a21-eecd21d6c7b8/c0500c9fac6db54f68c04956b828e8ea/dotnet-sdk-8.0.108-linux-arm.tar.gz"; + hash = "sha512-+vqFZLNLUktCCeEEfOfPEZCl1C57obE1JPXeYCsHXmMM3SKVZ/FOsvCubJaskQrp27T8TlKN+VjJ0xRxNB7tyg=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/07df5bfc-98ae-4335-91c4-c95ec5f99a58/48a310e5d1bde3e77c53a51c99bdfc08/dotnet-sdk-8.0.108-linux-arm64.tar.gz"; + hash = "sha512-bMcj8rE50ZsuF9pZNmmNOIpbZGOLde94xAxAftPP096nRcKRbwPvyeZkefxV1gjrOokwVyfs2xyZmxg7WN4ljQ=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/95a365b4-ac3b-4300-ab6b-54cbc73220f4/4aabad928064af8761315ef34b08c24b/dotnet-sdk-8.0.108-linux-x64.tar.gz"; + hash = "sha512-Vmbd9vqbZd6rpNfF/MLi1W9jHE9fb7Kp9ZGa8GFqsrQgsSqCi+zC5LhiinasPa6CS1Wr3lxtWsWe4THX7Ornwg=="; + }; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/24ef2f24-ca8e-4c3d-8466-2311550147d4/acbf2877ab4b8a611a3b63a9b9853dfc/dotnet-sdk-8.0.108-linux-musl-arm.tar.gz"; + hash = "sha512-77MI2BrBAgli8U0D58qUGaKQGghGEg4HzZXGVAf+KYGiY2DC/+oUHYBYGqxtLDanN5x2wHsvs31O+4NpBfj/aA=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/63bf0f75-e962-46b3-b7c3-12aa20129d46/071514943265037c423e6f5e40df7ace/dotnet-sdk-8.0.108-linux-musl-arm64.tar.gz"; + hash = "sha512-5wCbo3OwQ8y0aVVycayK5RirnJtbNk6YQdi5cwW2A28zJA5nLnxIN5hhaiM0KXSNUDj9/TNjUrggYK/WRXRwRQ=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/cab77c39-2e16-4f29-a9cb-e490d7fff442/ee37bc88e34e082a64d834ed5041bcee/dotnet-sdk-8.0.108-linux-musl-x64.tar.gz"; + hash = "sha512-dEcVUB3jlG8GzTFvNcq8DjY+CvZRBEyXZwjA1I1OsNCUidkszrKDx1Gy7tDik86qq93Lq/fCXiHWWOv/ncMEqg=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/64a3d858-c2e3-48d1-8236-7c6702efc1f8/191bed6c7f89244eb998b0f186db57d7/dotnet-sdk-8.0.108-osx-arm64.tar.gz"; + hash = "sha512-g7ASdkdLS2K/CigvvhHSNTohkdkL7NQDs3PNbfyVJkRCqQcRetj2FXZbE5aSZ7iH0mqfJNvV+I2LVdqpRBLRPA=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/5ea78b09-65a7-4b08-ac65-bfae17afb322/7416ecc76a30ae4c77e71aade36e037f/dotnet-sdk-8.0.108-osx-x64.tar.gz"; + hash = "sha512-qA/uJ5q/61WKVUDKKpaaEbs9vq3ow52MR76KLWIu8cK+2yLIdFmK1B2/8rldWkMZe9n1X8kzq07eXty2p2z2yw=="; + }; + }; + inherit commonPackages hostPackages targetPackages; + }; + + sdk = sdk_8_0; + + + sdk_8_0 = sdk_8_0_1xx; +} diff --git a/pkgs/development/compilers/dotnet/8/default.nix b/pkgs/development/compilers/dotnet/8/default.nix index 8b98aa962dc9..d7310cd81994 100644 --- a/pkgs/development/compilers/dotnet/8/default.nix +++ b/pkgs/development/compilers/dotnet/8/default.nix @@ -1,9 +1,8 @@ { callPackage , dotnetCorePackages -, bootstrapSdk }: callPackage ../dotnet.nix { releaseManifestFile = ./release.json; releaseInfoFile = ./release-info.json; + bootstrapSdkFile = ./bootstrap-sdk.nix; depsFile = ./deps.nix; - inherit bootstrapSdk; } diff --git a/pkgs/development/compilers/dotnet/8/deps.nix b/pkgs/development/compilers/dotnet/8/deps.nix index b77029b3ac7a..db44150cdd91 100644 --- a/pkgs/development/compilers/dotnet/8/deps.nix +++ b/pkgs/development/compilers/dotnet/8/deps.nix @@ -1,11 +1,11 @@ { fetchNuGet }: [ (fetchNuGet { hash = "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="; pname = "Newtonsoft.Json"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/newtonsoft.json/13.0.1/newtonsoft.json.13.0.1.nupkg"; version = "13.0.1"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.ILAsm"; sha256 = "327399b6bee8f18db222120e77f662addcac6fe8c6e46a5e238d4cc9a3ee7b30"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/8.0.7-servicing.24313.11/runtime.linux-arm64.microsoft.netcore.ilasm.8.0.7-servicing.24313.11.nupkg"; version = "8.0.7-servicing.24313.11"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.ILDAsm"; sha256 = "c8adbb9a816a3272fd305c827a6183be673a143e693a803ab038b737ce5cc7eb"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/8.0.7-servicing.24313.11/runtime.linux-arm64.microsoft.netcore.ildasm.8.0.7-servicing.24313.11.nupkg"; version = "8.0.7-servicing.24313.11"; }) - (fetchNuGet { hash = "sha256-8B+2bg279IxspjUCUG2kvvwrOJ4kBfqgAZLYkSpFXDA="; pname = "runtime.linux-x64.Microsoft.NETCore.ILAsm"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/8.0.7-servicing.24313.11/runtime.linux-x64.microsoft.netcore.ilasm.8.0.7-servicing.24313.11.nupkg"; version = "8.0.7-servicing.24313.11"; }) - (fetchNuGet { hash = "sha256-qwzB9mCoBWiqz7sMfDMwBwgZHm4Jls7Uq23dhpPE8dE="; pname = "runtime.linux-x64.Microsoft.NETCore.ILDAsm"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/8.0.7-servicing.24313.11/runtime.linux-x64.microsoft.netcore.ildasm.8.0.7-servicing.24313.11.nupkg"; version = "8.0.7-servicing.24313.11"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.ILAsm"; sha256 = "6b4e532da6481799e2d5ba0f466439b1dbb72b38f99d658f01ef13abb8fa4143"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/8.0.7-servicing.24313.11/runtime.osx-arm64.microsoft.netcore.ilasm.8.0.7-servicing.24313.11.nupkg"; version = "8.0.7-servicing.24313.11"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.ILDAsm"; sha256 = "45944f5e8b6a2f55defb432e47aef685842445edcbd209dc714efea5a7500422"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/8.0.7-servicing.24313.11/runtime.osx-arm64.microsoft.netcore.ildasm.8.0.7-servicing.24313.11.nupkg"; version = "8.0.7-servicing.24313.11"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.ILAsm"; sha256 = "249166f90b4ed837c0797d8c7bed45d55d058aae223e9f163590bee2bbeaf996"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/8.0.7-servicing.24313.11/runtime.osx-x64.microsoft.netcore.ilasm.8.0.7-servicing.24313.11.nupkg"; version = "8.0.7-servicing.24313.11"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.ILDAsm"; sha256 = "ad9bda1369dab0aeb3179735a653f6cd92af08a01c33b220a902f9da1b0b9e65"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/8.0.7-servicing.24313.11/runtime.osx-x64.microsoft.netcore.ildasm.8.0.7-servicing.24313.11.nupkg"; version = "8.0.7-servicing.24313.11"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.ILAsm"; sha256 = "5e6469e8cb678ffe0dd238b80cec17ef6667291b481c375e81292fd403b9ae6e"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/8.0.8-servicing.24366.12/runtime.linux-arm64.microsoft.netcore.ilasm.8.0.8-servicing.24366.12.nupkg"; version = "8.0.8-servicing.24366.12"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.ILDAsm"; sha256 = "57aba33fa6933c296454ceab3d58469ce089573218595efdaac74ca047562dce"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/8.0.8-servicing.24366.12/runtime.linux-arm64.microsoft.netcore.ildasm.8.0.8-servicing.24366.12.nupkg"; version = "8.0.8-servicing.24366.12"; }) + (fetchNuGet { hash = "sha256-5wddL132f1W80dHLP8Nn5EVvStTauNUH+E5JvVboC5k="; pname = "runtime.linux-x64.Microsoft.NETCore.ILAsm"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/8.0.8-servicing.24366.12/runtime.linux-x64.microsoft.netcore.ilasm.8.0.8-servicing.24366.12.nupkg"; version = "8.0.8-servicing.24366.12"; }) + (fetchNuGet { hash = "sha256-73CVn14q/pnCxN2qPaINi+u6YQSVwEKI8xtCT1NAs04="; pname = "runtime.linux-x64.Microsoft.NETCore.ILDAsm"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/8.0.8-servicing.24366.12/runtime.linux-x64.microsoft.netcore.ildasm.8.0.8-servicing.24366.12.nupkg"; version = "8.0.8-servicing.24366.12"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.ILAsm"; sha256 = "e386ffb4c9bb0a5f9f3fc8ff1cf389a6564c8d4d6747b39954207f2a541cc67c"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/8.0.8-servicing.24366.12/runtime.osx-arm64.microsoft.netcore.ilasm.8.0.8-servicing.24366.12.nupkg"; version = "8.0.8-servicing.24366.12"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.ILDAsm"; sha256 = "479117fab25d26d59d8d605a308b53116a0cdce88e4cb5923a31187916d8297c"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/8.0.8-servicing.24366.12/runtime.osx-arm64.microsoft.netcore.ildasm.8.0.8-servicing.24366.12.nupkg"; version = "8.0.8-servicing.24366.12"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.ILAsm"; sha256 = "dcd72a80e4268a8231790b647ed83b214185f0c8c33fc3656618495d2cefb343"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/8.0.8-servicing.24366.12/runtime.osx-x64.microsoft.netcore.ilasm.8.0.8-servicing.24366.12.nupkg"; version = "8.0.8-servicing.24366.12"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.ILDAsm"; sha256 = "0a77e58f66baa31981d503bcc8ebbda4816643c8162e685d8b0620cb707f5668"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/8.0.8-servicing.24366.12/runtime.osx-x64.microsoft.netcore.ildasm.8.0.8-servicing.24366.12.nupkg"; version = "8.0.8-servicing.24366.12"; }) ] diff --git a/pkgs/development/compilers/dotnet/8/release-info.json b/pkgs/development/compilers/dotnet/8/release-info.json index c444ebd7f13e..55471559c4c7 100644 --- a/pkgs/development/compilers/dotnet/8/release-info.json +++ b/pkgs/development/compilers/dotnet/8/release-info.json @@ -1,5 +1,5 @@ { - "tarballHash": "sha256-/LB6wcJyN25e8+wuBBmnBhdafkczl0LoUX0R/NlUdEU=", - "artifactsUrl": "https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.107-servicing.24317.1.centos.9-x64.tar.gz", - "artifactsHash": "sha256-eduApTyIPz8aVvMCHckVLEJ69/fDLWNtw7EpRq36Qfo=" + "tarballHash": "sha256-HSks3/qFi3khT0E4bU1ek+g8xd5yzmhlqCfnec30EKo=", + "artifactsUrl": "https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.108-servicing.24372.1.centos.9-x64.tar.gz", + "artifactsHash": "sha256-hEAyX3XJG6jHJV4sv1DHxT48u1mSTTXEWwODBm4L7cE=" } diff --git a/pkgs/development/compilers/dotnet/8/release.json b/pkgs/development/compilers/dotnet/8/release.json index 0da99bb31cd9..501d01cd0a3a 100644 --- a/pkgs/development/compilers/dotnet/8/release.json +++ b/pkgs/development/compilers/dotnet/8/release.json @@ -1,10 +1,10 @@ { - "release": "8.0.8", + "release": "8.0.10", "channel": "8.0", - "tag": "v8.0.8", - "sdkVersion": "8.0.108", - "runtimeVersion": "8.0.8", - "aspNetCoreVersion": "8.0.8", + "tag": "v8.0.10", + "sdkVersion": "8.0.110", + "runtimeVersion": "8.0.10", + "aspNetCoreVersion": "8.0.10", "sourceRepository": "https://github.com/dotnet/dotnet", - "sourceVersion": "e78e8a64f20e61e1fea4f24afca66ad1dc56285f" + "sourceVersion": "8922fe64a1903ed4e35e24568efb056b3e0fad43" } diff --git a/pkgs/development/compilers/dotnet/9/bootstrap-sdk.nix b/pkgs/development/compilers/dotnet/9/bootstrap-sdk.nix new file mode 100644 index 000000000000..f01b54a350d3 --- /dev/null +++ b/pkgs/development/compilers/dotnet/9/bootstrap-sdk.nix @@ -0,0 +1,249 @@ +{ buildAspNetCore, buildNetRuntime, buildNetSdk, fetchNupkg }: + +# v9.0 (go-live) + +let + commonPackages = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Ref"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-IcIfs7kmYWeUW0xI23FCgzzdTx/TstTzY/En7HZ3IYE="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-YtwuWl1DpYuKY97P2iJmm7ov5q05by3eFL4inl+Kwhc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Ref"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-aHywWxrhPfKRL5sZelbQiUZaMLRn+e4A3UXihjNBLoE="; }) + (fetchNupkg { pname = "Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-KaSR5WA+aTDOR41PuvwsXZt/zHsOJOKxBEfSGxFO07o="; }) + (fetchNupkg { pname = "Microsoft.NET.ILLink.Tasks"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-f9o3PGHsW2BNMN9noBsUFv0SRRUR2m+RHceJtjCzd60="; }) + ]; + + hostPackages = { + linux-arm = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-1P7Y8+FoxfaL3vTLPx5/LPYw2ZVhxC5sTSKbjHCPAuc="; }) + ]; + linux-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-yT+zcwYGL1f8oMC7S9sdLjbLpaR5/zdrRtpozZ+w/YY="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-U8rxugP2w8JS1I1cTMzN3XYjw9uVHZqPDDppdE9dtns="; }) + ]; + linux-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-iRO1a77VwLcu4vWro3eHHcxh8nQlY/ik4+pT/2c3khA="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-XIODRgELUOKfn5L5g40Mxzcf/qH7pCJoRRvZPW1eY38="; }) + ]; + linux-musl-arm = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-hqYfNrj8fhgSMkK+sEQTtZdidJeD2vvvDoMBtK8ZmYI="; }) + ]; + linux-musl-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-JMpiQJY23noyNK0KjkkyGmYJJLyTNiHhlZPKA6vSQB4="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-XjcQWqUEadp9u90HZU45gt/ANzn7Z7yuV24SrMKY7tM="; }) + ]; + linux-musl-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-Dbt1T/Y9AsuITCNDu7+9to+9Q8aUAGmEsemONyucNkg="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-AlWrYGpqFSTj6UDEZ77kFq+KrN9SOO7fLu+R5hiICTM="; }) + ]; + osx-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-ewDINCVRtePHQRceMn0xhUFNjEr08AsaS9WBvz3lcLs="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-8CNaSv1PxoyQGSc7W64BlviEgBtggYzSjDh6vPl3YSI="; }) + ]; + osx-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-DV1kc2BhDSHgmWE7lqUtM3u5YfXl/EKo3FU04LHzP5o="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-58cO2fdzdLYkWC6q7dn5dXKpMj4WzE95tlnPqW0X+W0="; }) + ]; + win-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-GugOroZ0SRoGoP3xE3jt91vTbHwXLPq8bHYckNC8SIA="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-ceT9q9ZCwhGnp+BrxgjPcoyrAqKHc7VK47M4tM2pQmw="; }) + ]; + win-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-lvAHbw3hhS6OnCuUMLEa4NKJWZPHqcBM3IeXpeYtLHo="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-ZV5ptFKjt4UX+ytjnWMRk0/Xc+hR8tuYb8ADqLlTFnU="; }) + ]; + win-x86 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x86"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-ULArvCiy+bOHtkD5E0q7u+Cfg7R+IJZ4A60ldV798vs="; }) + ]; + }; + + targetPackages = { + linux-arm = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-eC46DyuObx9VhFP4PyY/3JWqAck8bW4Bt2hZyuapLRY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-6WaE1hKyIBnsTe3YlVP/lHR9HOnMkYtqDZEZLzidFAc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-u7sukf/qUk+gUVxFj/r9rzkQTVUcg2SqNhOmhPOsEyg="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-pYPVNaL6x5zRCBxCsPso8Ae0k9aaDbvH0aHS+j5pdIs="; }) + ]; + linux-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-hKCalXcwzlgMLwthSnTcHkDOW1g2XUo4Kj49uryZvt8="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-qlxs6pqhMQHkvOkJY37f9VMlxwnjUffue656XJaRLWI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-h1FtdGrQp0HjK8fJajK1h5YV9fgBZCBQOH9M4pqMamE="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-EBCX8Uvy+Z40i+VjuUK+F5CAZYblQLKzAExfx/uQ+gE="; }) + ]; + linux-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-KmyOl6C8u/PrCAMiY/KwELYvRafnM4SfcnEhKvU5BeU="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-Q41rpitFgIbgUpIh7iGzXTaCVDoUoDJ7HYddW2krHAE="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-bsQyjyidOkZLtjR1JadsIkRp6gDlHjEsJEbNLgKGtdE="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-2YfhVuvSJe2sIkPFgocqAJubbb1PU7r93YoICq3ntAo="; }) + ]; + linux-musl-arm = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-oPUyQZ9bGNbk6yPeIAQkNmDmDNcq3o2jFIsunotBBps="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-CBwqR3ii9Yg3O9lG/UAFaltVHmH5aFk2r8+IV1zeIS4="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-Uw965RIeMJJ3uV5xX6WWGVq8i+CHXpiOw1mOT6rPmFI="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-JBUxkn0eUboAElHl+o2LyC7f9eJz4jJ9/odxXa43FSM="; }) + ]; + linux-musl-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-ZsUpPpaD4cfjTnTPAw1VqKHYX51XFG1ck0Ae2dWUKt8="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-RY5CrQ9K9VZeh8+1r8Rjg0gEFBBRqR5EGTFkBfx0+3Q="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-FG9CGm1wZlMzKGzr70+qg62NLmYot0uG9yilyoEBpmw="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-QtCqH/Ah7EW2lNWHq9y4sAQI+8XOWMLBrqPIuDEV1ic="; }) + ]; + linux-musl-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-wdwHZFStEDDU0v8nah6hylLErKUxC9x3CvgL/9Qcfwo="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-QnGhafheornOKm2H+UO9M+a57S7OzU7oomMp1Gs+qcQ="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-v8J9etz1hP2q02KbUjKxDUc8So2qlzajFCDbM9N9TiE="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-HZS5qup9w2rWf1K5zIq7BEYTi8BC5co+Mz9Ey7iOcPc="; }) + ]; + osx-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-hSj4rqdeeerbuFQT7DI38eIOI3XUUun7nfi4ypPyggU="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-4sp79lNVzgWRV2l1WjURkZBTq13OTRPfoRsaWU1Kd+Q="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-JT2SL5C1RXS80C7hB+YcCHW9Nynq4+1dCd4nckZVDsM="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-pnE0Z0AxP+2tiQT72EIjrsfRxN9q/rWQ/5J1SIF8rVg="; }) + ]; + osx-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-DO5bDJGbzav8ji/1Wp5+VCU2xd/7P+tD8eMCBCeisq0="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-ORBkaFVuxvBBcqo0vklECC72Paoy13E33gt/ctHojq0="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-oFvsMtKz+O9/B7asuc2DsH8KhRhAdS4D6qR64O8dE48="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-sXYAaSQvdrsknqu85ZzDfRFKQ3lKxPmK3CeYJwJ/u78="; }) + ]; + win-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-/GFhQQTpATa+eVsIKIS5hYQwEzueYT7IClqfTuO7OiY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-DJWq3FrbwU6QCJLuMWKFvQhwrszUHIHbZEi+cjnUkAI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-NtpJ9HN+LvXLb/qBn3Dz5XGTqhrlB8oUFCzge9zkxJ0="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-quzQ5GEyFmdsn7VXSsjSFHIcYnHwxb3OXP5Rcnar7mw="; }) + ]; + win-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-53HpBsY1A7xFKDSKW+yMjoTdK+calt2k8z1XQbIx39I="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-zzq0pwTb9ayiuFijGfhXPyIk7YsGu1Q611CvHhPAGPM="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-WUB7TDKuqe/+vZMdwtmb8yst0+6STi/H7gf1jmb0adw="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-mc6g5oRPUbsFFwn5KDeY0LbzLGlyiPZxAhtjGEsIh+I="; }) + ]; + win-x86 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "9.0.0-rc.1.24452.1"; hash = "sha256-lMVZtEPD48KKReYFsJ2rmJzCvlQNkGvajbfmd/ZYfFA="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-mHRvOES1i3VCmHfyQOakMNyvvJYS0xGdF8YFNpTEDx8="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-X29sAPaFb6yZptgoQK6QnRKbLRmmkrnvWw2zHC1MHE8="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; hash = "sha256-8LP07HWuRAyUGk5aSIpBHcAso16yM6UQ7YbPAen0Zgs="; }) + ]; + }; + +in rec { + release_9_0 = "9.0.0-rc.1"; + + aspnetcore_9_0 = buildAspNetCore { + version = "9.0.0-rc.1.24452.1"; + srcs = { + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/c414fabc-f831-4c5d-af5e-8e85ebecc6a0/670acec9f83315bec2788393db85e708/aspnetcore-runtime-9.0.0-rc.1.24452.1-linux-arm.tar.gz"; + hash = "sha512-EgHd12xUpnbLKHRD7xszFtCHufNVfHl/ckzU/LhphutJmzEilZskl2RE4mIoXAWooPjz8oKJRjHlj6TeQrtUiQ=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/c5075cd5-2552-4f77-96ce-31450f9ff8d5/e6ff2b52e2a27a60eb3585cbca01d60b/aspnetcore-runtime-9.0.0-rc.1.24452.1-linux-arm64.tar.gz"; + hash = "sha512-hGEKOPuamOt70muompxJmGguw//7Xq3lu6+6/WPKx9mlJ5YYu1slddJ/7sCY2l/m9xUMZyU/Pzd2JgFZA5bhIg=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/da25731f-e296-4e2a-8f2b-0213d26e1799/859039cd012f8cfba53991f8f5543609/aspnetcore-runtime-9.0.0-rc.1.24452.1-linux-x64.tar.gz"; + hash = "sha512-+P0oXWe7BE1jFZaGnWMB4QoqJDyByaBQlqZq/0+zQxUpgSx0gubPDgZejgZfxQsWtQ1/KklaswB3povUWzujdg=="; + }; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/8d4492ed-c733-4cfc-bf16-4f13191587f2/c843723067d5fc1d790ffa1810c683c1/aspnetcore-runtime-9.0.0-rc.1.24452.1-linux-musl-arm.tar.gz"; + hash = "sha512-Kdvu4spDebM0V+KwVliBFPoxgTUGxTWaIxRfI6QdBj0F6qCX6hF2I6QPqxE1FrRRUL0XovBXKHViwz/pFovymQ=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/bc3735cb-fea1-4f97-8669-3ab0e389d055/084b94228b13a45478ac75f5158801b3/aspnetcore-runtime-9.0.0-rc.1.24452.1-linux-musl-arm64.tar.gz"; + hash = "sha512-n08aOk85N3d5v092zguXYxAtnKYX/99h/3Wg2Bxcxj+1BCcI/xCxqD5VgFDZuVu68Vn6d+J8wD4K00NEHhZLXg=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/10aac5f7-c037-4874-8c05-425e668b0a24/4706d38e511259862e93a61f15dda28f/aspnetcore-runtime-9.0.0-rc.1.24452.1-linux-musl-x64.tar.gz"; + hash = "sha512-D5RfnHYZkY1hmmbPtsiwH9mTlDjOjvi+B5f66ky9c87eb9JcIlhV77eTvmcL/A9xmOnyMfoFEdfPMZ0vq7rJ0w=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/0bae8dff-9440-4388-a03e-af44e20673a8/8ab257a4963967970cd59c31c213f38d/aspnetcore-runtime-9.0.0-rc.1.24452.1-osx-arm64.tar.gz"; + hash = "sha512-A/fgM1LRrS1U6d5MHN16lMIxG7NtTGKWZh+rKGzd6/P1cgT3OJLv1T9Dz7E7pzyvrpXQUixHvgMgPV+2mg7P6Q=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/b0414fd7-20f9-4363-9dbf-072880e97b17/89584fa06e9ba1154a7e02402a28d82f/aspnetcore-runtime-9.0.0-rc.1.24452.1-osx-x64.tar.gz"; + hash = "sha512-/0puNbQfUgBSHqSyV7KT5NSPF4bMqpzYW1W6lq02A228FJ0v+CDx3/Xy2az2w4tsNUDnAMLC21/m2C1PhfRhrg=="; + }; + }; + }; + + runtime_9_0 = buildNetRuntime { + version = "9.0.0-rc.1.24431.7"; + srcs = { + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/26c238f2-53a2-4fdc-981e-31272c80d107/67c11b008d57d501cd2e5ca642cbc8c1/dotnet-runtime-9.0.0-rc.1.24431.7-linux-arm.tar.gz"; + hash = "sha512-ioPeMA6PnsZ/cFAE9VIpVz3Yv7EG9sQjie+ylsI4buJ4Rvgbqv5rQmnpxyaQN+XsPxN2xyvBA+RkHJGBp+V2Rw=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/54f6fb3b-da5b-4a2d-98f4-ae07c814a586/e5f2a5ba551ffe53ea1c2ae9b7681f0b/dotnet-runtime-9.0.0-rc.1.24431.7-linux-arm64.tar.gz"; + hash = "sha512-hUK7k4Hk7Kbw687d7GhSXMWeNPckRhPPM8shUfVwwzRcttCBxJKwEHDnYtNEDwLUVYI0Uy1Y/z3JGQV+Bre9rA=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/72048153-7c19-4e69-bcf3-22563060db07/cd181715a0f7cd3cec8c87b115181da9/dotnet-runtime-9.0.0-rc.1.24431.7-linux-x64.tar.gz"; + hash = "sha512-n5qFuNn2Ni7SwtDt79BJmRgbLDhmR2RPvB2fJIJVOHMkOZ7bHEC8f6jEetwi4tcdtfJc55RSHVnkbEBZO19sxQ=="; + }; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/c948e710-a590-4492-870d-1e44ce476a55/86522880c5160af3c81bfa71378b79b9/dotnet-runtime-9.0.0-rc.1.24431.7-linux-musl-arm.tar.gz"; + hash = "sha512-ERibzBMUhpSROsX7BQt324EErGLdOblwzZau85n3p87mVqMUtE8BE/lnJufuCiad6jhjcCD+BiYaiwHKDfnktA=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/9ef6c8f0-49ac-4b37-9e7a-0f2cbbc74472/ceebdb8281a18bc80d17147ec3146cd0/dotnet-runtime-9.0.0-rc.1.24431.7-linux-musl-arm64.tar.gz"; + hash = "sha512-3WKnNzaydaFbWv+jRloO89aWGaBsyqo5FrMx9Fs4WakCjnjrfNhcdm3v+5cDx7uWeI9AYdVJy98yW/gYlDEFIQ=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/30c11bec-b456-45de-bb45-5e892fd1a509/cd72910d2c8b0c908f717a3563c2445f/dotnet-runtime-9.0.0-rc.1.24431.7-linux-musl-x64.tar.gz"; + hash = "sha512-vXcBXKRriSj3CmHmz+8jxeMIrUDAPd1CHCEBQbGjjNXE2O31Nl6LruIn21pqxx++pIHBqLPFum6lgzCv3X/iMQ=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/8abf3e03-1ab3-40fd-a9cf-fa22005be2e8/cb0c3c5d130ef8ae76a982860fd3606a/dotnet-runtime-9.0.0-rc.1.24431.7-osx-arm64.tar.gz"; + hash = "sha512-qCX8qe3eU6tqvA7+DETW+yXFx3rrLTW2xBTULzZEU86wae2duIZcK7glI5ifzrfMy/hgR2mVkP91amucVMIddA=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/13d7d905-549f-44e8-9062-a678a742c5fb/94c51ca9c08ef9b5cceabafc2337118f/dotnet-runtime-9.0.0-rc.1.24431.7-osx-x64.tar.gz"; + hash = "sha512-9i+GfqtjNzfEUP+wVDpybxui9GpCZctHl42I2tDGuAqNtcz29YOEL4XLYTuW0vfGgG1mmCb0uSuQbnHY0Q5T6A=="; + }; + }; + }; + + sdk_9_0_1xx = buildNetSdk { + version = "9.0.100-rc.1.24452.12"; + srcs = { + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/87c96627-cf20-47d7-8cb4-d5e083084dd4/07d4b533e746b344a3dbf9f7279f450b/dotnet-sdk-9.0.100-rc.1.24452.12-linux-arm.tar.gz"; + hash = "sha512-8xpKLDCAqSHP3XGTPR9XwvV/9MQ/WgrW9SZAvHkeVPjAUm2OEgatIfhoI1elPPbUiKiwEQfnw0vq/iyMNCXdjA=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/f7739964-9e84-4bb7-9435-509458a15f9c/a95ad7f9deb8ce2fd30173dfe86f55ba/dotnet-sdk-9.0.100-rc.1.24452.12-linux-arm64.tar.gz"; + hash = "sha512-9XQlNxKIAcGZoScmYXUGYFh4iibopgPL0mocFunvM6XUGOR5Cjzqci195IPu6LaODeS7Hf3yeXEzae07TRY6EQ=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/3b2b3c23-574b-45d7-b2b0-c67f0e935308/23ed647eb71a8f07414124422c15927d/dotnet-sdk-9.0.100-rc.1.24452.12-linux-x64.tar.gz"; + hash = "sha512-6BMIF7d50BBKbu4z2Y2Xw/rRwzYBNDX0fA6eIjcBcrddo3reduSd7Hy+aWiEOQ0uaUHMaeK61Vk9bRxrQQgwUQ=="; + }; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/8cb683aa-4558-45ac-944a-73ac40b708d2/2795bd0253d5518490378edc7f7b562e/dotnet-sdk-9.0.100-rc.1.24452.12-linux-musl-arm.tar.gz"; + hash = "sha512-hICQDhS9EDT1hsPhdAK+LwTKslDXm00d2jqoh+n6+mg604it9/JbXHsNxDM3XOHCcrPZQZY25tsPe/MA6EGgpQ=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/8737d284-0c4b-49a0-984c-23fddc7abcd8/ada586539e4417b557d60d0214e8b2eb/dotnet-sdk-9.0.100-rc.1.24452.12-linux-musl-arm64.tar.gz"; + hash = "sha512-ZWv6TnxKPuKAuZ6v+mILCbibOjufbTPJ14fB+JOLhK+1qkPYBUboGiv9UydwwoLFmuoWf1DQGlcCeiBh5ZXw6Q=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/791e9a41-59da-4f92-9dfb-2cceaaea001b/710f7adf35dc2f32be49ac2834ad0afd/dotnet-sdk-9.0.100-rc.1.24452.12-linux-musl-x64.tar.gz"; + hash = "sha512-sdgATPnD/7Uw+7PUJZF0ywdqMroAJo2qQ9v0Uv5tRsz5eaY9f1OucKL6ehAanfG9O4QFUqySqFIRm7c4WmX2Xw=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/930f4eb8-188f-47d5-8a26-28ca393b7d1b/c07a519e3d7e326c3f640ef72ea1193e/dotnet-sdk-9.0.100-rc.1.24452.12-osx-arm64.tar.gz"; + hash = "sha512-rzCzHNk36fyX4WS4NijCwezSEym3X3Qtn1IyqmhCfSW11wLMVlqoYNPHOMhyd5BWm/ZqPtdOXO9xmuWJ0wKEbw=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/e26e36f6-746f-462c-8599-5d0a1f00e786/f1b8264ac10442b40009aa8cea46b23b/dotnet-sdk-9.0.100-rc.1.24452.12-osx-x64.tar.gz"; + hash = "sha512-DR8HGO7vAGw+z77+6/nfB3LsIsdNtLtjW2RjuK7f05VydLkItR7AGc7WnT569K6SUvGOh7FKRBHhCJpMxB430A=="; + }; + }; + inherit commonPackages hostPackages targetPackages; + }; + + sdk = sdk_9_0; + + + sdk_9_0 = sdk_9_0_1xx; +} diff --git a/pkgs/development/compilers/dotnet/9/default.nix b/pkgs/development/compilers/dotnet/9/default.nix index 2c7c83aaa6be..55cb65f49503 100644 --- a/pkgs/development/compilers/dotnet/9/default.nix +++ b/pkgs/development/compilers/dotnet/9/default.nix @@ -3,7 +3,7 @@ }: callPackage ../dotnet.nix { releaseManifestFile = ./release.json; releaseInfoFile = ./release-info.json; + bootstrapSdkFile = ./bootstrap-sdk.nix; allowPrerelease = true; depsFile = ./deps.nix; - bootstrapSdk = dotnetCorePackages.sdk_9_0; } diff --git a/pkgs/development/compilers/dotnet/9/release-info.json b/pkgs/development/compilers/dotnet/9/release-info.json index 89a33e292fae..6e9805f3ea94 100644 --- a/pkgs/development/compilers/dotnet/9/release-info.json +++ b/pkgs/development/compilers/dotnet/9/release-info.json @@ -1,5 +1,5 @@ { - "tarballHash": "sha256-t4BQcN1rCG5XKfsJJqnpBHzyXtCrWbQaxpJ8gBpRrVk=", + "tarballHash": "sha256-VvRGu2GKw8XBvfOuICjQvV1UlTjRcuHX8j6x3w7uJtY=", "artifactsUrl": "https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.9.0.100-rc.1.24452.1.centos.9-x64.tar.gz", "artifactsHash": "sha256-HRu23+7cJVAoTaFm0hnHk1lOC8HiBIvTs9TgWKVS8xw=" } diff --git a/pkgs/development/compilers/dotnet/9/release.json b/pkgs/development/compilers/dotnet/9/release.json index 61f7c3e524a7..2afbc2fc6e33 100644 --- a/pkgs/development/compilers/dotnet/9/release.json +++ b/pkgs/development/compilers/dotnet/9/release.json @@ -1,10 +1,10 @@ { - "release": "9.0.0-rc.1", + "release": "9.0.0-rc.2", "channel": "9.0", - "tag": "v9.0.0-rc.1.24431.7", - "sdkVersion": "9.0.100-rc.1.24452.1", - "runtimeVersion": "9.0.0-rc.1.24431.7", - "aspNetCoreVersion": "9.0.0-rc.1.24452.1", + "tag": "v9.0.0-rc.2.24473.5", + "sdkVersion": "9.0.100-rc.2.24474.1", + "runtimeVersion": "9.0.0-rc.2.24473.5", + "aspNetCoreVersion": "9.0.0-rc.2.24474.3", "sourceRepository": "https://github.com/dotnet/dotnet", - "sourceVersion": "f2e150252ab0fe4f796fac30ba5ffeb22c1c4156" + "sourceVersion": "b4c156e3f670d86ad737595a912c5c85c481b9ac" } diff --git a/pkgs/development/compilers/dotnet/UpdateNuGetConfigPackageSourcesMappings-don-t-add-em.patch b/pkgs/development/compilers/dotnet/UpdateNuGetConfigPackageSourcesMappings-don-t-add-em.patch new file mode 100644 index 000000000000..089b8b0fcaab --- /dev/null +++ b/pkgs/development/compilers/dotnet/UpdateNuGetConfigPackageSourcesMappings-don-t-add-em.patch @@ -0,0 +1,30 @@ +From 93137ea040472f4042dd186427699ad249e7251b Mon Sep 17 00:00:00 2001 +From: David McFarland <corngood@gmail.com> +Date: Sun, 22 Sep 2024 16:41:07 -0300 +Subject: [PATCH] UpdateNuGetConfigPackageSourcesMappings: don't add empty + mappings + +--- + .../UpdateNuGetConfigPackageSourcesMappings.cs | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UpdateNuGetConfigPackageSourcesMappings.cs b/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UpdateNuGetConfigPackageSourcesMappings.cs +index 3b188c1801..9b7050ef46 100644 +--- a/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UpdateNuGetConfigPackageSourcesMappings.cs ++++ b/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UpdateNuGetConfigPackageSourcesMappings.cs +@@ -115,7 +115,11 @@ namespace Microsoft.DotNet.UnifiedBuild.Tasks + // Skip sources with zero package patterns + if (allSourcesPackages[packageSource]?.Count > 0) + { +- pkgSrcMappingClearElement.AddAfterSelf(GetPackageMappingsElementForSource(packageSource)); ++ var pkgSrc = GetPackageMappingsElementForSource(packageSource); ++ if (pkgSrc.Elements().Any()) ++ { ++ pkgSrcMappingClearElement.AddAfterSelf(pkgSrc); ++ } + } + } + +-- +2.46.0 + diff --git a/pkgs/development/compilers/dotnet/build-dotnet.nix b/pkgs/development/compilers/dotnet/build-dotnet.nix index 0c9de3f05cab..3d48e1d98178 100644 --- a/pkgs/development/compilers/dotnet/build-dotnet.nix +++ b/pkgs/development/compilers/dotnet/build-dotnet.nix @@ -1,33 +1,45 @@ -{ type -, version -, srcs -, packages ? null +{ + type, + version, + srcs, + commonPackages ? null, + hostPackages ? null, + targetPackages ? null, }: -assert builtins.elem type [ "aspnetcore" "runtime" "sdk" ]; -assert if type == "sdk" then packages != null else true; - -{ lib -, stdenv -, fetchurl -, writeText -, autoPatchelfHook -, makeWrapper -, libunwind -, icu -, libuuid -, zlib -, libkrb5 -, openssl -, curl -, lttng-ust_2_12 -, testers -, runCommand -, writeShellScript -, mkNugetDeps -, callPackage -, dotnetCorePackages -, xmlstarlet +assert builtins.elem type [ + "aspnetcore" + "runtime" + "sdk" +]; +assert + if type == "sdk" then + commonPackages != null && hostPackages != null && targetPackages != null + else + true; + +{ + lib, + stdenv, + fetchurl, + writeText, + autoPatchelfHook, + makeWrapper, + libunwind, + icu, + libuuid, + zlib, + libkrb5, + openssl, + curl, + lttng-ust_2_12, + testers, + runCommand, + writeShellScript, + mkNugetDeps, + callPackage, + systemToDotnetRid, + xmlstarlet, }: let @@ -45,40 +57,53 @@ let sdk = ".NET SDK ${version}"; }; - mkCommon = callPackage ./common.nix {}; + mkCommon = callPackage ./common.nix { }; - targetRid = dotnetCorePackages.systemToDotnetRid stdenv.targetPlatform.system; + hostRid = systemToDotnetRid stdenv.hostPlatform.system; + targetRid = systemToDotnetRid stdenv.targetPlatform.system; - sigtool = callPackage ./sigtool.nix {}; - signAppHost = callPackage ./sign-apphost.nix {}; + sigtool = callPackage ./sigtool.nix { }; + signAppHost = callPackage ./sign-apphost.nix { }; - hasILCompiler = - lib.versionAtLeast version (if targetRid == "osx-arm64" then "8" else "7"); + hasILCompiler = lib.versionAtLeast version (if hostRid == "osx-arm64" then "8" else "7"); - extraTargets = writeText "extra.targets" ('' - <Project> - '' + lib.optionalString hasILCompiler '' + extraTargets = writeText "extra.targets" ( + '' + <Project> + '' + + lib.optionalString hasILCompiler '' <ItemGroup> - <CustomLinkerArg Include="-Wl,-rpath,'${lib.makeLibraryPath [ icu zlib openssl ]}'" /> + <CustomLinkerArg Include="-Wl,-rpath,'${ + lib.makeLibraryPath [ + icu + zlib + openssl + ] + }'" /> </ItemGroup> - '' + lib.optionalString stdenv.isDarwin '' + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' <Import Project="${signAppHost}" /> - '' + '' - </Project> - ''); + '' + + '' + </Project> + '' + ); in mkCommon type rec { inherit pname version; # Some of these dependencies are `dlopen()`ed. - nativeBuildInputs = [ - makeWrapper - ] ++ lib.optional stdenv.isLinux autoPatchelfHook - ++ lib.optionals (type == "sdk" && stdenv.isDarwin) [ - xmlstarlet - sigtool - ]; + nativeBuildInputs = + [ + makeWrapper + ] + ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook + ++ lib.optionals (type == "sdk" && stdenv.hostPlatform.isDarwin) [ + xmlstarlet + sigtool + ]; buildInputs = [ stdenv.cc.cc @@ -87,24 +112,30 @@ mkCommon type rec { libkrb5 curl xmlstarlet - ] ++ lib.optional stdenv.isLinux lttng-ust_2_12; + ] ++ lib.optional stdenv.hostPlatform.isLinux lttng-ust_2_12; src = fetchurl ( - srcs."${stdenv.hostPlatform.system}" or (throw - "Missing source (url and hash) for host system: ${stdenv.hostPlatform.system}") + srcs.${hostRid} or (throw "Missing source (url and hash) for host RID: ${hostRid}") ); sourceRoot = "."; - postPatch = if type == "sdk" then ('' - xmlstarlet ed \ - --inplace \ - -s //_:Project -t elem -n Import \ - -i \$prev -t attr -n Project -v "${extraTargets}" \ - sdk/*/Sdks/Microsoft.NET.Sdk/targets/Microsoft.NET.Sdk.targets - '' + lib.optionalString stdenv.isDarwin '' - codesign --remove-signature packs/Microsoft.NETCore.App.Host.osx-*/*/runtimes/osx-*/native/{apphost,singlefilehost} - '') else null; + postPatch = + if type == "sdk" then + ( + '' + xmlstarlet ed \ + --inplace \ + -s //_:Project -t elem -n Import \ + -i \$prev -t attr -n Project -v "${extraTargets}" \ + sdk/*/Sdks/Microsoft.NET.Sdk/targets/Microsoft.NET.Sdk.targets + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + codesign --remove-signature packs/Microsoft.NETCore.App.Host.osx-*/*/runtimes/osx-*/native/{apphost,singlefilehost} + '' + ) + else + null; dontPatchELF = true; noDumpEnvVars = true; @@ -132,49 +163,63 @@ mkCommon type rec { --add-needed libicuuc.so \ $out/shared/Microsoft.NETCore.App/*/libcoreclr.so \ $out/shared/Microsoft.NETCore.App/*/*System.Globalization.Native.so \ - $out/packs/Microsoft.NETCore.App.Host.${targetRid}/*/runtimes/${targetRid}/native/*host + $out/packs/Microsoft.NETCore.App.Host.${hostRid}/*/runtimes/${hostRid}/native/*host patchelf \ --add-needed libgssapi_krb5.so \ $out/shared/Microsoft.NETCore.App/*/*System.Net.Security.Native.so \ - $out/packs/Microsoft.NETCore.App.Host.${targetRid}/*/runtimes/${targetRid}/native/*host + $out/packs/Microsoft.NETCore.App.Host.${hostRid}/*/runtimes/${hostRid}/native/*host patchelf \ --add-needed libssl.so \ $out/shared/Microsoft.NETCore.App/*/*System.Security.Cryptography.Native.OpenSsl.so \ - $out/packs/Microsoft.NETCore.App.Host.${targetRid}/*/runtimes/${targetRid}/native/*host + $out/packs/Microsoft.NETCore.App.Host.${hostRid}/*/runtimes/${hostRid}/native/*host ''; # fixes: Could not load ICU data. UErrorCode: 2 - propagatedSandboxProfile = lib.optionalString stdenv.isDarwin '' + propagatedSandboxProfile = lib.optionalString stdenv.hostPlatform.isDarwin '' (allow file-read* (subpath "/usr/share/icu")) (allow file-read* (subpath "/private/var/db/mds/system")) (allow mach-lookup (global-name "com.apple.SecurityServer") (global-name "com.apple.system.opendirectoryd.membership")) ''; - passthru = { - inherit icu hasILCompiler; - } // lib.optionalAttrs (type == "sdk") { - packages = mkNugetDeps { - name = "${pname}-${version}-deps"; - nugetDeps = packages; + passthru = + { + inherit icu hasILCompiler; + } + // lib.optionalAttrs (type == "sdk") { + packages = commonPackages ++ hostPackages.${hostRid} ++ targetPackages.${targetRid}; + inherit targetPackages; + + updateScript = + let + majorVersion = lib.concatStringsSep "." (lib.take 2 (lib.splitVersion version)); + in + [ + ./update.sh + majorVersion + ]; }; - updateScript = - let - majorVersion = lib.concatStringsSep "." (lib.take 2 (lib.splitVersion version)); - in - writeShellScript "update-dotnet-${majorVersion}" '' - pushd pkgs/development/compilers/dotnet - exec ${./update.sh} "${majorVersion}" - ''; - }; - meta = with lib; { description = builtins.getAttr type descriptions; homepage = "https://dotnet.github.io/"; license = licenses.mit; - maintainers = with maintainers; [ kuznero mdarocha ]; + maintainers = with maintainers; [ + kuznero + mdarocha + corngood + ]; mainProgram = "dotnet"; - platforms = attrNames srcs; + platforms = lib.filter ( + platform: + let + e = builtins.tryEval (systemToDotnetRid platform); + in + e.success && srcs ? "${e.value}" + ) lib.platforms.all; + sourceProvenance = with lib.sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; }; } diff --git a/pkgs/development/compilers/dotnet/combine-deps.nix b/pkgs/development/compilers/dotnet/combine-deps.nix index af21c3aa248e..188c26cf27fa 100644 --- a/pkgs/development/compilers/dotnet/combine-deps.nix +++ b/pkgs/development/compilers/dotnet/combine-deps.nix @@ -2,7 +2,7 @@ list, baseRid, otherRids, - pkgs ? import ../../../.. {} + pkgs ? import ../../../.. { }, }: let inherit (pkgs) writeText; @@ -20,31 +20,36 @@ let fns = map (file: import file) list; - packages = unique - (concatMap (fn: fn { fetchNuGet = package: package; }) fns); + packages = unique (concatMap (fn: fn { fetchNuGet = package: package; }) fns); - changePackageRid = package: rid: - let replace = replaceStrings [".${baseRid}"] [".${rid}"]; - in rec { + changePackageRid = + package: rid: + let + replace = replaceStrings [ ".${baseRid}" ] [ ".${rid}" ]; + in + rec { pname = replace package.pname; inherit (package) version; url = replace package.url; sha256 = builtins.hashFile "sha256" (builtins.fetchurl url); }; - expandPackage = package: - [ package ] ++ - optionals (strings.match ".*\\.${baseRid}(\\..*|$)" package.pname != null) - (map (changePackageRid package) otherRids); + expandPackage = + package: + [ package ] + ++ optionals (strings.match ".*\\.${baseRid}(\\..*|$)" package.pname != null) ( + map (changePackageRid package) otherRids + ); - allPackages = - sortOn (package: [ package.pname package.version ]) - (concatMap expandPackage packages); + allPackages = sortOn (package: [ + package.pname + package.version + ]) (concatMap expandPackage packages); - fetchExpr = package: - " (fetchNuGet ${generators.toPretty { multiline = false; } package})"; + fetchExpr = package: " (fetchNuGet ${generators.toPretty { multiline = false; } package})"; -in writeText "deps.nix" '' +in +writeText "deps.nix" '' { fetchNuGet }: [ ${concatMapStringsSep "\n" fetchExpr allPackages} ] diff --git a/pkgs/development/compilers/dotnet/combine-packages.nix b/pkgs/development/compilers/dotnet/combine-packages.nix index 303e5eaba847..661f9c482a12 100644 --- a/pkgs/development/compilers/dotnet/combine-packages.nix +++ b/pkgs/development/compilers/dotnet/combine-packages.nix @@ -1,37 +1,50 @@ dotnetPackages: -{ buildEnv, makeWrapper, lib, symlinkJoin }: +{ + buildEnv, + makeWrapper, + lib, + symlinkJoin, +}: # TODO: Rethink how we determine and/or get the CLI. # Possible options raised in #187118: # 1. A separate argument for the CLI (as suggested by IvarWithoutBones # 2. Use the highest version SDK for the CLI (as suggested by GGG) # 3. Something else? -let cli = builtins.head dotnetPackages; +let + cli = builtins.head dotnetPackages; in -assert lib.assertMsg ((builtins.length dotnetPackages) > 0) - ''You must include at least one package, e.g - `with dotnetCorePackages; combinePackages [ - sdk_6_0 aspnetcore_7_0 - ];`'' ; - buildEnv { - name = "dotnet-core-combined"; - paths = dotnetPackages; - pathsToLink = [ "/host" "/packs" "/sdk" "/sdk-manifests" "/shared" "/templates" ]; - ignoreCollisions = true; - postBuild = '' - cp -R ${cli}/{dotnet,share,nix-support} $out/ +assert lib.assertMsg ((builtins.length dotnetPackages) > 0) '' + You must include at least one package, e.g + `with dotnetCorePackages; combinePackages [ + sdk_6_0 aspnetcore_7_0 + ];`''; +buildEnv { + name = "dotnet-core-combined"; + paths = dotnetPackages; + pathsToLink = [ + "/host" + "/packs" + "/sdk" + "/sdk-manifests" + "/shared" + "/templates" + ]; + ignoreCollisions = true; + postBuild = '' + cp -R ${cli}/{dotnet,share,nix-support} $out/ - mkdir $out/bin - ln -s $out/dotnet $out/bin/dotnet - ''; - passthru = { - inherit (cli) icu; + mkdir $out/bin + ln -s $out/dotnet $out/bin/dotnet + ''; + passthru = { + inherit (cli) icu; - versions = lib.catAttrs "version" dotnetPackages; - packages = symlinkJoin { - name = "combined-packages"; - paths = lib.remove null (lib.catAttrs "packages" dotnetPackages); - }; - }; + versions = lib.catAttrs "version" dotnetPackages; + packages = lib.concatLists (lib.catAttrs "packages" dotnetPackages); + targetPackages = lib.zipAttrsWith (_: lib.concatLists) ( + lib.catAttrs "targetPackages" dotnetPackages + ); + }; - inherit (cli) meta; - } + inherit (cli) meta; +} diff --git a/pkgs/development/compilers/dotnet/common.nix b/pkgs/development/compilers/dotnet/common.nix index 9fcd79c752d1..426eb848d869 100644 --- a/pkgs/development/compilers/dotnet/common.nix +++ b/pkgs/development/compilers/dotnet/common.nix @@ -1,204 +1,241 @@ # TODO: switch to stdenvNoCC -{ stdenv -, stdenvNoCC -, lib -, writeText -, testers -, runCommand -, runCommandWith -, expect -, curl -, installShellFiles -, callPackage -, zlib -, swiftPackages -, darwin -, icu -, lndir -, substituteAll -, nugetPackageHook -, xmlstarlet -}: type: args: stdenv.mkDerivation (finalAttrs: args // { - doInstallCheck = true; +{ + stdenv, + stdenvNoCC, + lib, + writeText, + testers, + runCommand, + runCommandWith, + expect, + curl, + installShellFiles, + callPackage, + zlib, + swiftPackages, + darwin, + icu, + lndir, + substituteAll, + nugetPackageHook, + xmlstarlet, +}: +type: args: +stdenv.mkDerivation ( + finalAttrs: + args + // { + doInstallCheck = true; - # TODO: this should probably be postInstallCheck - # TODO: send output to /dev/null - installCheckPhase = args.installCheckPhase or "" + '' - $out/bin/dotnet --info - ''; + # TODO: this should probably be postInstallCheck + # TODO: send output to /dev/null + installCheckPhase = + args.installCheckPhase or "" + + '' + $out/bin/dotnet --info + ''; - setupHooks = args.setupHooks or [] ++ [ - ./dotnet-setup-hook.sh - ] ++ lib.optional (type == "sdk") (substituteAll { - src = ./dotnet-sdk-setup-hook.sh; - inherit lndir xmlstarlet; - }); + setupHooks = + args.setupHooks or [ ] + ++ [ + ./dotnet-setup-hook.sh + ] + ++ lib.optional (type == "sdk") (substituteAll { + src = ./dotnet-sdk-setup-hook.sh; + inherit lndir xmlstarlet; + }); - propagatedBuildInputs = - (args.propagatedBuildInputs or [ ]) - ++ lib.optional (type == "sdk") nugetPackageHook; + propagatedBuildInputs = + (args.propagatedBuildInputs or [ ]) + ++ lib.optional (type == "sdk") nugetPackageHook; - nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ installShellFiles ]; + nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ installShellFiles ]; - postInstall = '' - # completions snippets taken from https://learn.microsoft.com/en-us/dotnet/core/tools/enable-tab-autocomplete - installShellCompletion --cmd dotnet \ - --bash ${./completions/dotnet.bash} \ - --zsh ${./completions/dotnet.zsh} \ - --fish ${./completions/dotnet.fish} - ''; + postInstall = '' + # completions snippets taken from https://learn.microsoft.com/en-us/dotnet/core/tools/enable-tab-autocomplete + installShellCompletion --cmd dotnet \ + --bash ${./completions/dotnet.bash} \ + --zsh ${./completions/dotnet.zsh} \ + --fish ${./completions/dotnet.fish} + ''; - passthru = { - tests = let - mkDotnetTest = - { - name, - stdenv ? stdenvNoCC, - template, - usePackageSource ? false, - build, - buildInputs ? [], - # TODO: use correct runtimes instead of sdk - runtime ? finalAttrs.finalPackage, - runInputs ? [], - run ? null, - runAllowNetworking ? false, - }: + passthru = { + tests = let - sdk = finalAttrs.finalPackage; - built = stdenv.mkDerivation { - name = "dotnet-test-${name}"; - buildInputs = - [ sdk ] - ++ buildInputs - ++ lib.optional (usePackageSource) sdk.packages; - # make sure ICU works in a sandbox - propagatedSandboxProfile = toString sdk.__propagatedSandboxProfile; - unpackPhase = '' - mkdir test - cd test - dotnet new ${template} -o . - ''; - buildPhase = build; - dontPatchELF = true; - }; - in - if run == null - then built - else - runCommand "${built.name}-run" ({ - src = built; - nativeBuildInputs = [ built ] ++ runInputs; - passthru = { inherit built; }; - } // lib.optionalAttrs (stdenv.isDarwin && runAllowNetworking) { - sandboxProfile = '' - (allow network-inbound (local ip)) - (allow mach-lookup (global-name "com.apple.FSEvents")) - ''; - __darwinAllowLocalNetworking = true; - }) (lib.optionalString (runtime != null) '' - # TODO: use runtime here - export DOTNET_ROOT=${runtime} - '' + run); + mkDotnetTest = + { + name, + stdenv ? stdenvNoCC, + template, + usePackageSource ? false, + build, + buildInputs ? [ ], + # TODO: use correct runtimes instead of sdk + runtime ? finalAttrs.finalPackage, + runInputs ? [ ], + run ? null, + runAllowNetworking ? false, + }: + let + sdk = finalAttrs.finalPackage; + built = stdenv.mkDerivation { + name = "dotnet-test-${name}"; + buildInputs = [ sdk ] ++ buildInputs ++ lib.optional (usePackageSource) sdk.packages; + # make sure ICU works in a sandbox + propagatedSandboxProfile = toString sdk.__propagatedSandboxProfile; + unpackPhase = '' + mkdir test + cd test + dotnet new ${template} -o . --no-restore + ''; + buildPhase = build; + dontPatchELF = true; + }; + in + if run == null then + built + else + runCommand "${built.name}-run" + ( + { + src = built; + nativeBuildInputs = [ built ] ++ runInputs; + passthru = { + inherit built; + }; + } + // lib.optionalAttrs (stdenv.hostPlatform.isDarwin && runAllowNetworking) { + sandboxProfile = '' + (allow network-inbound (local ip)) + (allow mach-lookup (global-name "com.apple.FSEvents")) + ''; + __darwinAllowLocalNetworking = true; + } + ) + ( + lib.optionalString (runtime != null) '' + # TODO: use runtime here + export DOTNET_ROOT=${runtime} + '' + + run + ); - # Setting LANG to something other than 'C' forces the runtime to search - # for ICU, which will be required in most user environments. - checkConsoleOutput = command: '' - output="$(LANG=C.UTF-8 ${command})" - # yes, older SDKs omit the comma - [[ "$output" =~ Hello,?\ World! ]] && touch "$out" - ''; - in { - version = testers.testVersion ({ - package = finalAttrs.finalPackage; - } // lib.optionalAttrs (type != "sdk") { - command = "dotnet --info"; - }); - } - // lib.optionalAttrs (type == "sdk") ({ - console = mkDotnetTest { - name = "console"; - template = "console"; - build = checkConsoleOutput "dotnet run"; - }; + # Setting LANG to something other than 'C' forces the runtime to search + # for ICU, which will be required in most user environments. + checkConsoleOutput = command: '' + output="$(LANG=C.UTF-8 ${command})" + # yes, older SDKs omit the comma + [[ "$output" =~ Hello,?\ World! ]] && touch "$out" + ''; + in + { + version = testers.testVersion ( + { + package = finalAttrs.finalPackage; + } + // lib.optionalAttrs (type != "sdk") { + command = "dotnet --info"; + } + ); + } + // lib.optionalAttrs (type == "sdk") ( + { + console = mkDotnetTest { + name = "console"; + template = "console"; + build = checkConsoleOutput "dotnet run"; + }; - publish = mkDotnetTest { - name = "publish"; - template = "console"; - build = "dotnet publish -o $out/bin"; - run = checkConsoleOutput "$src/bin/test"; - }; + publish = mkDotnetTest { + name = "publish"; + template = "console"; + build = "dotnet publish -o $out/bin"; + run = checkConsoleOutput "$src/bin/test"; + }; - self-contained = mkDotnetTest { - name = "self-contained"; - template = "console"; - usePackageSource = true; - build = "dotnet publish --use-current-runtime --sc -o $out"; - runtime = null; - run = checkConsoleOutput "$src/test"; - }; + self-contained = mkDotnetTest { + name = "self-contained"; + template = "console"; + usePackageSource = true; + build = "dotnet publish --use-current-runtime --sc -o $out"; + runtime = null; + run = checkConsoleOutput "$src/test"; + }; - single-file = mkDotnetTest { - name = "single-file"; - template = "console"; - usePackageSource = true; - build = "dotnet publish --use-current-runtime -p:PublishSingleFile=true -o $out/bin"; - runtime = null; - run = checkConsoleOutput "$src/bin/test"; - }; + single-file = mkDotnetTest { + name = "single-file"; + template = "console"; + usePackageSource = true; + build = "dotnet publish --use-current-runtime -p:PublishSingleFile=true -o $out/bin"; + runtime = null; + run = checkConsoleOutput "$src/bin/test"; + }; - web = mkDotnetTest { - name = "web"; - template = "web"; - build = "dotnet publish -o $out/bin"; - runInputs = [ expect curl ]; - run = '' - expect <<"EOF" - set status 1 - spawn $env(src)/bin/test - proc abort { } { exit 2 } - expect_before default abort - expect -re {Now listening on: ([^\r]+)\r} { - set url $expect_out(1,string) - } - expect "Application started. Press Ctrl+C to shut down." - set output [exec curl -sSf $url] - if {$output != "Hello World!"} { - send_error "Unexpected output: $output\n" - exit 1 - } - send \x03 - expect_before timeout abort - expect eof - catch wait result - exit [lindex $result 3] - EOF - touch $out - ''; - runAllowNetworking = true; - }; - } // lib.optionalAttrs finalAttrs.finalPackage.hasILCompiler { - aot = mkDotnetTest { - name = "aot"; - stdenv = if stdenv.isDarwin then swiftPackages.stdenv else stdenv; - template = "console"; - usePackageSource = true; - buildInputs = - [ zlib - ] ++ lib.optional stdenv.isDarwin (with darwin; with apple_sdk.frameworks; [ - swiftPackages.swift - Foundation - CryptoKit - GSS - ICU - ]); - build = '' - dotnet restore -p:PublishAot=true - dotnet publish -p:PublishAot=true -o $out/bin - ''; - runtime = null; - run = checkConsoleOutput "$src/bin/test"; - }; - }) // args.passthru.tests or {}; - } // args.passthru or {}; -}) + web = mkDotnetTest { + name = "web"; + template = "web"; + build = "dotnet publish -o $out/bin"; + runInputs = [ + expect + curl + ]; + run = '' + expect <<"EOF" + set status 1 + spawn $env(src)/bin/test + proc abort { } { exit 2 } + expect_before default abort + expect -re {Now listening on: ([^\r]+)\r} { + set url $expect_out(1,string) + } + expect "Application started. Press Ctrl+C to shut down." + set output [exec curl -sSf $url] + if {$output != "Hello World!"} { + send_error "Unexpected output: $output\n" + exit 1 + } + send \x03 + expect_before timeout abort + expect eof + catch wait result + exit [lindex $result 3] + EOF + touch $out + ''; + runAllowNetworking = true; + }; + } + // lib.optionalAttrs finalAttrs.finalPackage.hasILCompiler { + aot = mkDotnetTest { + name = "aot"; + stdenv = if stdenv.hostPlatform.isDarwin then swiftPackages.stdenv else stdenv; + template = "console"; + usePackageSource = true; + buildInputs = + [ + zlib + ] + ++ lib.optional stdenv.hostPlatform.isDarwin ( + with darwin; + with apple_sdk.frameworks; + [ + swiftPackages.swift + Foundation + CryptoKit + GSS + ICU + ] + ); + build = '' + dotnet restore -p:PublishAot=true + dotnet publish -p:PublishAot=true -o $out/bin + ''; + runtime = null; + run = checkConsoleOutput "$src/bin/test"; + }; + } + ) + // args.passthru.tests or { }; + } // args.passthru or { }; + } +) diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index 0c6999471c48..88aaa28c8d2d 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -1,35 +1,42 @@ /* -How to combine packages for use in development: -dotnetCombined = with dotnetCorePackages; combinePackages [ sdk_6_0 aspnetcore_7_0 ]; + How to combine packages for use in development: + dotnetCombined = with dotnetCorePackages; combinePackages [ sdk_6_0 aspnetcore_7_0 ]; -Hashes and urls are retrieved from: -https://dotnet.microsoft.com/download/dotnet + Hashes and urls are retrieved from: + https://dotnet.microsoft.com/download/dotnet */ -{ lib -, config -, recurseIntoAttrs -, generateSplicesForMkScope -, makeScopeWithSplicing' +{ + lib, + config, + recurseIntoAttrs, + generateSplicesForMkScope, + makeScopeWithSplicing', }: makeScopeWithSplicing' { otherSplices = generateSplicesForMkScope "dotnetCorePackages"; - f = (self: + f = ( + self: let callPackage = self.callPackage; - buildDotnet = attrs: callPackage (import ./build-dotnet.nix attrs) {}; - buildAttrs = { - buildAspNetCore = attrs: buildDotnet (attrs // { type = "aspnetcore"; }); - buildNetRuntime = attrs: buildDotnet (attrs // { type = "runtime"; }); - buildNetSdk = attrs: buildDotnet (attrs // { type = "sdk"; }); - }; + fetchNupkg = callPackage ../../../build-support/dotnet/fetch-nupkg { }; + + buildDotnet = attrs: callPackage (import ./build-dotnet.nix attrs) { }; + buildDotnetSdk = + version: + import version { + inherit fetchNupkg; + buildAspNetCore = attrs: buildDotnet (attrs // { type = "aspnetcore"; }); + buildNetRuntime = attrs: buildDotnet (attrs // { type = "runtime"; }); + buildNetSdk = attrs: buildDotnet (attrs // { type = "sdk"; }); + }; ## Files in versions/ are generated automatically by update.sh ## - dotnet_6_0 = import ./versions/6.0.nix buildAttrs; - dotnet_7_0 = import ./versions/7.0.nix buildAttrs; - dotnet_8_0 = import ./versions/8.0.nix buildAttrs; - dotnet_9_0 = import ./versions/9.0.nix buildAttrs; + dotnet_6_0 = buildDotnetSdk ./versions/6.0.nix; + dotnet_7_0 = buildDotnetSdk ./versions/7.0.nix; + dotnet_8_0 = buildDotnetSdk ./versions/8.0.nix; + dotnet_9_0 = buildDotnetSdk ./versions/9.0.nix; runtimeIdentifierMap = { "x86_64-linux" = "linux-x64"; @@ -40,16 +47,18 @@ makeScopeWithSplicing' { "i686-windows" = "win-x86"; }; - in { - inherit callPackage; + in + { + inherit callPackage fetchNupkg buildDotnetSdk; # Convert a "stdenv.hostPlatform.system" to a dotnet RID - systemToDotnetRid = system: runtimeIdentifierMap.${system} or (throw "unsupported platform ${system}"); + systemToDotnetRid = + system: runtimeIdentifierMap.${system} or (throw "unsupported platform ${system}"); - combinePackages = attrs: callPackage (import ./combine-packages.nix attrs) {}; + combinePackages = attrs: callPackage (import ./combine-packages.nix attrs) { }; - patchNupkgs = callPackage ./patch-nupkgs.nix {}; - nugetPackageHook = callPackage ./nuget-package-hook.nix {}; + patchNupkgs = callPackage ./patch-nupkgs.nix { }; + nugetPackageHook = callPackage ./nuget-package-hook.nix { }; buildDotnetModule = callPackage ../../../build-support/dotnet/build-dotnet-module { }; buildDotnetGlobalTool = callPackage ../../../build-support/dotnet/build-dotnet-global-tool { }; @@ -57,16 +66,21 @@ makeScopeWithSplicing' { mkNugetSource = callPackage ../../../build-support/dotnet/make-nuget-source { }; mkNugetDeps = callPackage ../../../build-support/dotnet/make-nuget-deps { }; addNuGetDeps = callPackage ../../../build-support/dotnet/add-nuget-deps { }; - fetchNupkg = callPackage ../../../build-support/dotnet/fetch-nupkg { }; - dotnet_8 = recurseIntoAttrs (callPackage ./8 { bootstrapSdk = dotnet_8_0.sdk_8_0_1xx; }); - dotnet_9 = recurseIntoAttrs (callPackage ./9 {}); - } // lib.optionalAttrs config.allowAliases { + dotnet_8 = recurseIntoAttrs (callPackage ./8 { }); + dotnet_9 = recurseIntoAttrs (callPackage ./9 { }); + } + // lib.optionalAttrs config.allowAliases { # EOL sdk_2_1 = throw "Dotnet SDK 2.1 is EOL, please use 6.0 (LTS) or 7.0 (Current)"; sdk_2_2 = throw "Dotnet SDK 2.2 is EOL, please use 6.0 (LTS) or 7.0 (Current)"; sdk_3_0 = throw "Dotnet SDK 3.0 is EOL, please use 6.0 (LTS) or 7.0 (Current)"; sdk_3_1 = throw "Dotnet SDK 3.1 is EOL, please use 6.0 (LTS) or 7.0 (Current)"; sdk_5_0 = throw "Dotnet SDK 5.0 is EOL, please use 6.0 (LTS) or 7.0 (Current)"; - } // dotnet_6_0 // dotnet_7_0 // dotnet_8_0 // dotnet_9_0); + } + // dotnet_6_0 + // dotnet_7_0 + // dotnet_8_0 + // dotnet_9_0 + ); } diff --git a/pkgs/development/compilers/dotnet/dotnet-sdk-setup-hook.sh b/pkgs/development/compilers/dotnet/dotnet-sdk-setup-hook.sh index b36f3dfd7059..76f8734d4e12 100644 --- a/pkgs/development/compilers/dotnet/dotnet-sdk-setup-hook.sh +++ b/pkgs/development/compilers/dotnet/dotnet-sdk-setup-hook.sh @@ -135,7 +135,7 @@ configureNuget() { -s '/configuration/packageSourceMapping/packageSource[@key="_nix"]' -t elem -n package -i \$prev -t attr -n pattern -v "$id") done - cd - < /dev/null + cd - > /dev/null else xmlConfigArgs+=( "${xmlSourceConfigArgs[@]}" @@ -198,5 +198,5 @@ configureNuget() { } if [[ -z ${dontConfigureNuget-} ]]; then - preConfigurePhases+=(configureNuget) + appendToVar preConfigurePhases configureNuget fi diff --git a/pkgs/development/compilers/dotnet/dotnet.nix b/pkgs/development/compilers/dotnet/dotnet.nix index 7e629383ab37..c56ff5527982 100644 --- a/pkgs/development/compilers/dotnet/dotnet.nix +++ b/pkgs/development/compilers/dotnet/dotnet.nix @@ -1,48 +1,64 @@ -{ callPackage -, lib -, releaseManifestFile -, releaseInfoFile -, allowPrerelease ? false -, depsFile -, bootstrapSdk -, pkgsBuildHost +{ + stdenvNoCC, + callPackage, + lib, + fetchurl, + releaseManifestFile, + releaseInfoFile, + bootstrapSdkFile, + allowPrerelease ? false, + depsFile, + pkgsBuildHost, + buildDotnetSdk, }: let - inherit (lib.importJSON releaseInfoFile) tarballHash artifactsUrl artifactsHash; + inherit (lib.importJSON releaseInfoFile) + tarballHash + artifactsUrl + artifactsHash + bootstrapSdk + ; pkgs = callPackage ./stage1.nix { - inherit releaseManifestFile tarballHash depsFile; - bootstrapSdk = - { stdenvNoCC - , dotnetCorePackages - , fetchurl - }: bootstrapSdk.overrideAttrs (old: { - passthru = old.passthru or {} // { - artifacts = stdenvNoCC.mkDerivation rec { - name = lib.nameFromURL artifactsUrl ".tar.gz"; + inherit + releaseManifestFile + tarballHash + depsFile + ; + bootstrapSdk = (buildDotnetSdk bootstrapSdkFile).sdk.overrideAttrs (old: { + passthru = old.passthru or { } // { + artifacts = stdenvNoCC.mkDerivation rec { + name = lib.nameFromURL artifactsUrl ".tar.gz"; - src = fetchurl { - url = artifactsUrl; - hash = artifactsHash; - }; + src = fetchurl { + url = artifactsUrl; + hash = artifactsHash; + }; - sourceRoot = "."; + sourceRoot = "."; - installPhase = '' - mkdir -p $out - cp -r * $out/ - ''; - }; + installPhase = '' + mkdir -p $out + cp -r * $out/ + ''; }; - }); + }; + }); }; -in pkgs // { - vmr = pkgs.vmr.overrideAttrs(old: { +in +pkgs +// { + vmr = pkgs.vmr.overrideAttrs (old: { passthru = old.passthru // { updateScript = pkgsBuildHost.callPackage ./update.nix { - inherit releaseManifestFile releaseInfoFile allowPrerelease; + inherit + releaseManifestFile + releaseInfoFile + bootstrapSdkFile + allowPrerelease + ; }; }; }); diff --git a/pkgs/development/compilers/dotnet/packages.nix b/pkgs/development/compilers/dotnet/packages.nix index 801896f38625..b32bf3f2d9cf 100644 --- a/pkgs/development/compilers/dotnet/packages.nix +++ b/pkgs/development/compilers/dotnet/packages.nix @@ -1,19 +1,100 @@ -{ stdenv -, callPackage -, vmr -, xmlstarlet -, strip-nondeterminism -, zip +{ + stdenvNoCC, + lib, + callPackage, + vmr, + xmlstarlet, + strip-nondeterminism, + zip, + nugetPackageHook, + baseName ? "dotnet", + fallbackTargetPackages ? { }, }: let - mkCommon = callPackage ./common.nix {}; + mkCommon = callPackage ./common.nix { }; inherit (vmr) targetRid releaseManifest; -in { - inherit vmr; + # TODO: do this properly + hostRid = targetRid; + + mkPackage = + pname: version: + stdenvNoCC.mkDerivation { + inherit pname version; + + src = vmr; + dontUnpack = true; + + nativeBuildInputs = [ + xmlstarlet + nugetPackageHook + ]; + + installPhase = '' + runHook preInstall + + mkdir -p "$out" + + pushd "$src"/Private.SourceBuilt.Artifacts.*.${targetRid} + pushd ${pname}.${version}.nupkg + + xmlstarlet \ + sel -t \ + -m /_:package/_:metadata \ + -v _:id -nl \ + -v _:version -nl \ + *.nuspec | ( + read id + read version + id=''${id,,} + version=''${version,,} + mkdir -p "$out"/share/nuget/packages/"$id" + cp -r . "$out"/share/nuget/packages/"$id"/"$version" + chmod +w "$out"/share/nuget/packages/"$id"/"$version" + echo {} > "$out"/share/nuget/packages/"$id"/"$version"/.nupkg.metadata + ) + + popd + popd + + runHook postInstall + ''; + }; + + packages = + [ + (mkPackage "Microsoft.AspNetCore.App.Ref" aspnetcore.version) + (mkPackage "Microsoft.NETCore.DotNetAppHost" runtime.version) + (mkPackage "Microsoft.NETCore.App.Ref" runtime.version) + (mkPackage "Microsoft.DotNet.ILCompiler" runtime.version) + (mkPackage "Microsoft.NET.ILLink.Tasks" runtime.version) + (mkPackage "Microsoft.NETCore.App.Crossgen2.${hostRid}" runtime.version) + (mkPackage "runtime.${hostRid}.Microsoft.DotNet.ILCompiler" runtime.version) + ] + ++ lib.optionals (lib.versionOlder runtime.version "9") [ + (mkPackage "Microsoft.NETCore.DotNetHost" runtime.version) + (mkPackage "Microsoft.NETCore.DotNetHostPolicy" runtime.version) + (mkPackage "Microsoft.NETCore.DotNetHostResolver" runtime.version) + ]; + + targetPackages = fallbackTargetPackages // { + ${targetRid} = + [ + (mkPackage "Microsoft.AspNetCore.App.Runtime.${targetRid}" aspnetcore.version) + (mkPackage "Microsoft.NETCore.App.Host.${targetRid}" runtime.version) + (mkPackage "Microsoft.NETCore.App.Runtime.${targetRid}" runtime.version) + (mkPackage "runtime.${targetRid}.Microsoft.NETCore.DotNetAppHost" runtime.version) + ] + ++ lib.optionals (lib.versionOlder runtime.version "9") [ + (mkPackage "runtime.${targetRid}.Microsoft.NETCore.DotNetHost" runtime.version) + (mkPackage "runtime.${targetRid}.Microsoft.NETCore.DotNetHostPolicy" runtime.version) + (mkPackage "runtime.${targetRid}.Microsoft.NETCore.DotNetHostResolver" runtime.version) + ]; + }; + sdk = mkCommon "sdk" rec { - pname = "dotnet-sdk"; + pname = "${baseName}-sdk"; version = releaseManifest.sdkVersion; src = vmr; @@ -25,7 +106,10 @@ in { zip ]; - outputs = [ "out" "packages" "artifacts" ]; + outputs = [ + "out" + "artifacts" + ]; installPhase = '' runHook preInstall @@ -35,42 +119,12 @@ in { mkdir "$out"/bin ln -s "$out"/dotnet "$out"/bin/dotnet - mkdir -p "$packages" "$artifacts" + mkdir -p "$artifacts" cp -r "$src"/Private.SourceBuilt.Artifacts.*.${targetRid}/* "$artifacts"/ chmod +w -R "$artifacts" local package - for package in "$artifacts"/*.nupkg; do - local copy - case "$(basename "$package")" in - *Microsoft.NET.* | \ - *Microsoft.ILLink.* | \ - *Microsoft.Tasks.* | \ - *Microsoft.NETCore.* | \ - *Microsoft.DotNet.* | \ - *Microsoft.AspNetCore.*) copy=1 ;; - *) copy= ;; - esac - if [[ -n $copy ]]; then - echo copying "$package" to packages - xmlstarlet \ - sel -t \ - -m /_:package/_:metadata \ - -v _:id -nl \ - -v _:version -nl \ - "$package"/*.nuspec | ( - read id - read version - id=''${id,,} - version=''${version,,} - mkdir -p "$packages"/share/nuget/packages/"$id" - cp -r "$package" "$packages"/share/nuget/packages/"$id"/"$version" - echo {} > "$packages"/share/nuget/packages/"$id"/"$version"/.nupkg.metadata - ) - fi - done - for package in "$artifacts"/{,SourceBuildReferencePackages/}*.nupkg; do echo packing "$package" to artifacts (cd "$package" && zip -rq0 "$package.tmp" .) @@ -84,6 +138,8 @@ in { passthru = { inherit (vmr) icu targetRid hasILCompiler; + + inherit packages targetPackages; }; meta = vmr.meta // { @@ -92,7 +148,7 @@ in { }; runtime = mkCommon "runtime" rec { - pname = "dotnet-runtime"; + pname = "${baseName}-runtime"; version = releaseManifest.runtimeVersion; src = vmr; @@ -117,7 +173,7 @@ in { }; aspnetcore = mkCommon "aspnetcore" rec { - pname = "dotnet-aspnetcore-runtime"; + pname = "${baseName}-aspnetcore-runtime"; version = releaseManifest.aspNetCoreVersion or releaseManifest.runtimeVersion; src = vmr; @@ -143,4 +199,13 @@ in { mainProgram = "dotnet"; }; }; +in +{ + inherit + vmr + sdk + runtime + aspnetcore + ; + } diff --git a/pkgs/development/compilers/dotnet/patch-nupkgs.nix b/pkgs/development/compilers/dotnet/patch-nupkgs.nix index c351ea7b32ef..6885d8df71f3 100644 --- a/pkgs/development/compilers/dotnet/patch-nupkgs.nix +++ b/pkgs/development/compilers/dotnet/patch-nupkgs.nix @@ -1,83 +1,92 @@ -{ stdenv -, lib -, zlib -, curl -, icu -, libunwind -, libuuid -, openssl -, lttng-ust_2_12 -, patchelf -, writeShellScriptBin +{ + stdenv, + lib, + zlib, + curl, + icu, + libunwind, + libuuid, + openssl, + lttng-ust_2_12, + patchelf, + writeShellScriptBin, }: let - binaryRPath = lib.makeLibraryPath ([ - stdenv.cc.cc - zlib - curl - icu - libunwind - libuuid - openssl - ] ++ lib.optional stdenv.isLinux lttng-ust_2_12); + binaryRPath = lib.makeLibraryPath ( + [ + stdenv.cc.cc + zlib + curl + icu + libunwind + libuuid + openssl + ] + ++ lib.optional stdenv.hostPlatform.isLinux lttng-ust_2_12 + ); -in writeShellScriptBin "patch-nupkgs" ('' - set -euo pipefail - shopt -s nullglob - isELF() { - local fn="$1" - local fd - local magic - exec {fd}< "$fn" - read -r -n 4 -u "$fd" magic - exec {fd}<&- - if [ "$magic" = $'\177ELF' ]; then return 0; else return 1; fi - } - cd "$1" -'' + lib.optionalString stdenv.isLinux '' - for x in */* */*; do - # .nupkg.metadata is written last, so we know the packages is complete - [[ -d "$x" ]] && [[ -f "$x"/.nupkg.metadata ]] \ - && [[ ! -f "$x"/.nix-patched ]] || continue - echo "Patching package $x" - find "$x" -type f -print0 | while IFS= read -rd "" p; do - if [[ "$p" != *.nix-patched ]] \ - && isELF "$p" \ - && ${patchelf}/bin/patchelf --print-interpreter "$p" &>/dev/null; then - tmp="$p".$$.nix-patched - # if this fails to copy then another process must have patched it - cp --reflink=auto "$p" "$tmp" || continue - echo "Patchelfing $p as $tmp" - ${patchelf}/bin/patchelf \ - --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" \ - "$tmp" ||: - # This makes sure that if the binary requires some specific runtime dependencies, it can find it. - # This fixes dotnet-built binaries like crossgen2 - ${patchelf}/bin/patchelf \ - --add-needed libicui18n.so \ - --add-needed libicuuc.so \ - --add-needed libz.so \ - --add-needed libssl.so \ - "$tmp" - ${patchelf}/bin/patchelf \ - --add-rpath "${binaryRPath}" \ - "$tmp" ||: - mv "$tmp" "$p" - fi +in +writeShellScriptBin "patch-nupkgs" ( + '' + set -euo pipefail + shopt -s nullglob + isELF() { + local fn="$1" + local fd + local magic + exec {fd}< "$fn" + read -r -n 4 -u "$fd" magic + exec {fd}<&- + if [ "$magic" = $'\177ELF' ]; then return 0; else return 1; fi + } + cd "$1" + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' + for x in */* */*; do + # .nupkg.metadata is written last, so we know the packages is complete + [[ -d "$x" ]] && [[ -f "$x"/.nupkg.metadata ]] \ + && [[ ! -f "$x"/.nix-patched ]] || continue + echo "Patching package $x" + find "$x" -type f -print0 | while IFS= read -rd "" p; do + if [[ "$p" != *.nix-patched ]] \ + && isELF "$p" \ + && ${patchelf}/bin/patchelf --print-interpreter "$p" &>/dev/null; then + tmp="$p".$$.nix-patched + # if this fails to copy then another process must have patched it + cp --reflink=auto "$p" "$tmp" || continue + echo "Patchelfing $p as $tmp" + ${patchelf}/bin/patchelf \ + --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" \ + "$tmp" ||: + # This makes sure that if the binary requires some specific runtime dependencies, it can find it. + # This fixes dotnet-built binaries like crossgen2 + ${patchelf}/bin/patchelf \ + --add-needed libicui18n.so \ + --add-needed libicuuc.so \ + --add-needed libz.so \ + --add-needed libssl.so \ + "$tmp" + ${patchelf}/bin/patchelf \ + --add-rpath "${binaryRPath}" \ + "$tmp" ||: + mv "$tmp" "$p" + fi + done + touch "$x"/.nix-patched done - touch "$x"/.nix-patched - done -'' + lib.optionalString stdenv.isDarwin '' - for x in microsoft.dotnet.ilcompiler/*; do - # .nupkg.metadata is written last, so we know the packages is complete - [[ -d "$x" ]] && [[ -f "$x"/.nupkg.metadata ]] \ - && [[ ! -f "$x"/.nix-patched-ilcompiler ]] || continue - echo "Patching package $x" - pushd "$x" - sed -i 's: -no_code_signature_warning::g' build/Microsoft.NETCore.Native.targets - sed -i 's:Include="-ld_classic"::g' build/Microsoft.NETCore.Native.Unix.targets - touch .nix-patched-ilcompiler - popd - done -'') + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + for x in microsoft.dotnet.ilcompiler/*; do + # .nupkg.metadata is written last, so we know the packages is complete + [[ -d "$x" ]] && [[ -f "$x"/.nupkg.metadata ]] \ + && [[ ! -f "$x"/.nix-patched-ilcompiler ]] || continue + echo "Patching package $x" + pushd "$x" + sed -i 's: -no_code_signature_warning::g' build/Microsoft.NETCore.Native.targets + sed -i 's:Include="-ld_classic"::g' build/Microsoft.NETCore.Native.Unix.targets + touch .nix-patched-ilcompiler + popd + done + '' +) diff --git a/pkgs/development/compilers/dotnet/sign-apphost.nix b/pkgs/development/compilers/dotnet/sign-apphost.nix index f804ab79d332..021d9ef61a90 100644 --- a/pkgs/development/compilers/dotnet/sign-apphost.nix +++ b/pkgs/development/compilers/dotnet/sign-apphost.nix @@ -1,10 +1,12 @@ -{ substituteAll -, callPackage +{ + substituteAll, + callPackage, }: let - sigtool = callPackage ./sigtool.nix {}; + sigtool = callPackage ./sigtool.nix { }; -in substituteAll { +in +substituteAll { src = ./sign-apphost.proj; codesign = "${sigtool}/bin/codesign"; } diff --git a/pkgs/development/compilers/dotnet/sigtool.nix b/pkgs/development/compilers/dotnet/sigtool.nix index fe5d1ebc6879..04e0d5215098 100644 --- a/pkgs/development/compilers/dotnet/sigtool.nix +++ b/pkgs/development/compilers/dotnet/sigtool.nix @@ -1,7 +1,8 @@ -{ cctools -, darwin -, fetchFromGitHub -, makeWrapper +{ + cctools, + darwin, + fetchFromGitHub, + makeWrapper, }: darwin.sigtool.overrideAttrs (old: { @@ -14,13 +15,15 @@ darwin.sigtool.overrideAttrs (old: { sha256 = "sha256-EVM5ZG3sAHrIXuWrnqA9/4pDkJOpWCeBUl5fh0mkK4k="; }; - nativeBuildInputs = old.nativeBuildInputs or [] ++ [ + nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ makeWrapper ]; - postInstall = old.postInstall or "" + '' - wrapProgram $out/bin/codesign \ - --set-default CODESIGN_ALLOCATE \ - "${cctools}/bin/${cctools.targetPrefix}codesign_allocate" - ''; + postInstall = + old.postInstall or "" + + '' + wrapProgram $out/bin/codesign \ + --set-default CODESIGN_ALLOCATE \ + "${cctools}/bin/${cctools.targetPrefix}codesign_allocate" + ''; }) diff --git a/pkgs/development/compilers/dotnet/stage0.nix b/pkgs/development/compilers/dotnet/stage0.nix index 7e2717aba1a1..e8be69d1f038 100644 --- a/pkgs/development/compilers/dotnet/stage0.nix +++ b/pkgs/development/compilers/dotnet/stage0.nix @@ -1,130 +1,147 @@ -{ stdenv -, callPackage -, lib -, writeShellScript -, mkNugetDeps -, nix -, cacert -, nuget-to-nix -, dotnetCorePackages -, xmlstarlet -, patchNupkgs - -, releaseManifestFile -, tarballHash -, depsFile -, bootstrapSdk +{ + stdenv, + callPackage, + lib, + writeShellScript, + mkNugetDeps, + nix, + cacert, + nuget-to-nix, + dotnetCorePackages, + xmlstarlet, + patchNupkgs, + symlinkJoin, + + baseName ? "dotnet", + releaseManifestFile, + tarballHash, + depsFile, + bootstrapSdk, }: let mkPackages = callPackage ./packages.nix; mkVMR = callPackage ./vmr.nix; - dotnetSdk = callPackage bootstrapSdk {}; - - deps = mkNugetDeps { - name = "dotnet-vmr-deps"; - sourceFile = depsFile; - }; - - sdkPackages = dotnetSdk.packages.override { - installable = true; + sdkPackages = symlinkJoin { + name = "${bootstrapSdk.name}-packages"; + paths = map ( + p: + p.override { + installable = true; + } + ) bootstrapSdk.packages; }; - vmr = (mkVMR { - inherit releaseManifestFile tarballHash dotnetSdk; - }).overrideAttrs (old: rec { - prebuiltPackages = mkNugetDeps { - name = "dotnet-vmr-deps"; - sourceFile = depsFile; - installable = true; - }; - - nativeBuildInputs = - old.nativeBuildInputs or [] - ++ [ xmlstarlet patchNupkgs ]; - - postPatch = old.postPatch or "" + '' - xmlstarlet ed \ - --inplace \ - -s //Project -t elem -n Import \ - -i \$prev -t attr -n Project -v "${./patch-restored-packages.proj}" \ - src/*/Directory.Build.targets - ''; - - postConfigure = old.postConfigure or "" + '' - [[ ! -v prebuiltPackages ]] || \ - ln -sf "$prebuiltPackages"/share/nuget/source/*/*/*.nupkg prereqs/packages/prebuilt/ - ln -sf "${sdkPackages}"/share/nuget/source/*/*/*.nupkg prereqs/packages/prebuilt/ - ''; - - buildFlags = - old.buildFlags - ++ lib.optionals (lib.versionAtLeast old.version "9") [ - # We need to set this as long as we have something in deps.nix. Currently - # that's the portable ilasm/ildasm which aren't in the centos sourcebuilt - # artifacts. - "-p:SkipErrorOnPrebuilts=true" - ]; - - passthru = old.passthru or {} // { fetch-deps = - let - inherit (vmr) targetRid updateScript; - otherRids = - lib.remove targetRid ( - map (system: dotnetCorePackages.systemToDotnetRid system) - vmr.meta.platforms); - - pkg = vmr.overrideAttrs (old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ - nix - cacert - nuget-to-nix - ]; - postPatch = old.postPatch or "" + '' + vmr = + (mkVMR { + inherit + baseName + releaseManifestFile + tarballHash + bootstrapSdk + ; + }).overrideAttrs + (old: rec { + prebuiltPackages = mkNugetDeps { + name = "dotnet-vmr-deps"; + sourceFile = depsFile; + installable = true; + }; + + nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ + xmlstarlet + patchNupkgs + ]; + + postPatch = + old.postPatch or "" + + '' xmlstarlet ed \ --inplace \ -s //Project -t elem -n Import \ - -i \$prev -t attr -n Project -v "${./record-downloaded-packages.proj}" \ - repo-projects/Directory.Build.targets - # make nuget-client use the standard arcade package-cache dir, which - # is where we scan for dependencies - xmlstarlet ed \ - --inplace \ - -s //Project -t elem -n ItemGroup \ - -s \$prev -t elem -n EnvironmentVariables \ - -i \$prev -t attr -n Include -v 'NUGET_PACKAGES=$(ProjectDirectory)artifacts/sb/package-cache/' \ - repo-projects/nuget-client.proj + -i \$prev -t attr -n Project -v "${./patch-restored-packages.proj}" \ + src/*/Directory.Build.targets ''; - buildFlags = [ "--online" ] ++ old.buildFlags; - prebuiltPackages = null; - }); - - drv = builtins.unsafeDiscardOutputDependency pkg.drvPath; - in - writeShellScript "fetch-dotnet-sdk-deps" '' - ${nix}/bin/nix-shell --pure --run 'source /dev/stdin' "${drv}" << 'EOF' - set -e - - tmp=$(mktemp -d) - trap 'rm -fr "$tmp"' EXIT - - HOME=$tmp/.home - cd "$tmp" - - phases="''${prePhases[*]:-} unpackPhase patchPhase ''${preConfigurePhases[*]:-} \ - configurePhase ''${preBuildPhases[*]:-} buildPhase checkPhase" \ - genericBuild - - depsFiles=(./src/*/deps.nix) - - cat $(nix-build ${toString ./combine-deps.nix} \ - --arg list "[ ''${depsFiles[*]} ]" \ - --argstr baseRid ${targetRid} \ - --arg otherRids '${lib.generators.toPretty { multiline = false; } otherRids}' \ - ) > "${toString prebuiltPackages.sourceFile}" - EOF - ''; - }; - }); -in mkPackages { inherit vmr; } + + postConfigure = + old.postConfigure or "" + + '' + [[ ! -v prebuiltPackages ]] || \ + ln -sf "$prebuiltPackages"/share/nuget/source/*/*/*.nupkg prereqs/packages/prebuilt/ + ln -sf "${sdkPackages}"/share/nuget/source/*/*/*.nupkg prereqs/packages/prebuilt/ + ''; + + buildFlags = + old.buildFlags + ++ lib.optionals (lib.versionAtLeast old.version "9") [ + # We need to set this as long as we have something in deps.nix. Currently + # that's the portable ilasm/ildasm which aren't in the centos sourcebuilt + # artifacts. + "-p:SkipErrorOnPrebuilts=true" + ]; + + passthru = old.passthru or { } // { + fetch-deps = + let + inherit (vmr) targetRid updateScript; + otherRids = lib.remove targetRid ( + map (system: dotnetCorePackages.systemToDotnetRid system) vmr.meta.platforms + ); + + pkg = vmr.overrideAttrs (old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ + nix + cacert + nuget-to-nix + ]; + postPatch = + old.postPatch or "" + + '' + xmlstarlet ed \ + --inplace \ + -s //Project -t elem -n Import \ + -i \$prev -t attr -n Project -v "${./record-downloaded-packages.proj}" \ + repo-projects/Directory.Build.targets + # make nuget-client use the standard arcade package-cache dir, which + # is where we scan for dependencies + xmlstarlet ed \ + --inplace \ + -s //Project -t elem -n ItemGroup \ + -s \$prev -t elem -n EnvironmentVariables \ + -i \$prev -t attr -n Include -v 'NUGET_PACKAGES=$(ProjectDirectory)artifacts/sb/package-cache/' \ + repo-projects/nuget-client.proj + ''; + buildFlags = [ "--online" ] ++ old.buildFlags; + prebuiltPackages = null; + }); + + drv = builtins.unsafeDiscardOutputDependency pkg.drvPath; + in + writeShellScript "fetch-dotnet-sdk-deps" '' + ${nix}/bin/nix-shell --pure --run 'source /dev/stdin' "${drv}" << 'EOF' + set -e + + tmp=$(mktemp -d) + trap 'rm -fr "$tmp"' EXIT + + HOME=$tmp/.home + cd "$tmp" + + phases="''${prePhases[*]:-} unpackPhase patchPhase ''${preConfigurePhases[*]:-} \ + configurePhase ''${preBuildPhases[*]:-} buildPhase checkPhase" \ + genericBuild + + depsFiles=(./src/*/deps.nix) + + cat $(nix-build ${toString ./combine-deps.nix} \ + --arg list "[ ''${depsFiles[*]} ]" \ + --argstr baseRid ${targetRid} \ + --arg otherRids '${lib.generators.toPretty { multiline = false; } otherRids}' \ + ) > "${toString prebuiltPackages.sourceFile}" + EOF + ''; + }; + }); +in +mkPackages { inherit baseName vmr; } diff --git a/pkgs/development/compilers/dotnet/stage1.nix b/pkgs/development/compilers/dotnet/stage1.nix index 9014e60b4e90..0aa67615ade5 100644 --- a/pkgs/development/compilers/dotnet/stage1.nix +++ b/pkgs/development/compilers/dotnet/stage1.nix @@ -1,26 +1,41 @@ -{ stdenv -, lib -, callPackage +{ + stdenv, + lib, + callPackage, -, releaseManifestFile -, tarballHash -, depsFile -, bootstrapSdk + releaseManifestFile, + tarballHash, + depsFile, + bootstrapSdk, }@args: let mkPackages = callPackage ./packages.nix; mkVMR = callPackage ./vmr.nix; - stage0 = callPackage ./stage0.nix args; + stage0 = callPackage ./stage0.nix ( + args + // { + baseName = "dotnet-stage0"; + } + ); - vmr = (mkVMR { - inherit releaseManifestFile tarballHash; - dotnetSdk = stage0.sdk; - }).overrideAttrs (old: { - passthru = old.passthru or {} // { - inherit (stage0.vmr) fetch-deps; - }; - }); + vmr = + (mkVMR { + inherit releaseManifestFile tarballHash; + bootstrapSdk = stage0.sdk; + }).overrideAttrs + (old: { + passthru = old.passthru or { } // { + inherit (stage0.vmr) fetch-deps; + }; + }); -in mkPackages { inherit vmr; } // { stage0 = lib.dontRecurseIntoAttrs stage0; } +in +mkPackages { + inherit vmr; + fallbackTargetPackages = bootstrapSdk.targetPackages; +} +// { + stage0 = lib.dontRecurseIntoAttrs stage0; +} diff --git a/pkgs/development/compilers/dotnet/update.nix b/pkgs/development/compilers/dotnet/update.nix index 58304188afa8..4fa837a4a274 100644 --- a/pkgs/development/compilers/dotnet/update.nix +++ b/pkgs/development/compilers/dotnet/update.nix @@ -1,18 +1,20 @@ -{ stdenvNoCC -, lib -, fetchurl -, writeScript -, nix -, runtimeShell -, curl -, cacert -, jq -, yq -, gnupg - -, releaseManifestFile -, releaseInfoFile -, allowPrerelease +{ + stdenvNoCC, + lib, + fetchurl, + writeScript, + nix, + runtimeShell, + curl, + cacert, + jq, + yq, + gnupg, + + releaseManifestFile, + releaseInfoFile, + bootstrapSdkFile, + allowPrerelease, }: let @@ -38,18 +40,36 @@ let drv = builtins.unsafeDiscardOutputDependency pkg.drvPath; -in writeScript "update-dotnet-vmr.sh" '' +in +writeScript "update-dotnet-vmr.sh" '' #! ${nix}/bin/nix-shell - #! nix-shell -i ${runtimeShell} --pure ${drv} + #! nix-shell -i ${runtimeShell} --pure ${drv} --keep UPDATE_NIX_ATTR_PATH set -euo pipefail - query=$(cat <<EOF - map( - select( - ${lib.optionalString (!allowPrerelease) ".prerelease == false and"} - .draft == false and - (.name | startswith(".NET ${channel}")))) | - first | ( + tag=''${1-} + + if [[ -n $tag ]]; then + query=$(cat <<EOF + map( + select( + (.tag_name == "$tag"))) | + first + EOF + ) + else + query=$(cat <<EOF + map( + select( + ${lib.optionalString (!allowPrerelease) ".prerelease == false and"} + .draft == false and + (.tag_name | startswith("v${channel}")))) | + first + EOF + ) + fi + + query="$query "$(cat <<EOF + | ( .tag_name, (.assets | .[] | @@ -63,7 +83,7 @@ in writeScript "update-dotnet-vmr.sh" '' ) ( - curl -fsL https://api.github.com/repos/dotnet/dotnet/releases | \ + curl -fsSL https://api.github.com/repos/dotnet/dotnet/releases | \ jq -r "$query" \ ) | ( read tagName @@ -73,12 +93,15 @@ in writeScript "update-dotnet-vmr.sh" '' tmp="$(mktemp -d)" trap 'rm -rf "$tmp"' EXIT + echo ${lib.escapeShellArg (toString ./update.sh)} \ + -o ${lib.escapeShellArg (toString bootstrapSdkFile)} --sdk foo + cd "$tmp" - curl -fsL "$releaseUrl" -o release.json + curl -fsSL "$releaseUrl" -o release.json release=$(jq -r .release release.json) - if [[ "$release" == "${release}" ]]; then + if [[ -z $tag && "$release" == "${release}" ]]; then >&2 echo "release is already $release" exit fi @@ -89,13 +112,16 @@ in writeScript "update-dotnet-vmr.sh" '' tarballHash=$(nix-hash --to-sri --type sha256 "''${prefetch[0]}") tarball=''${prefetch[1]} - curl -L "$sigUrl" -o release.sig + curl -fssL "$sigUrl" -o release.sig - export GNUPGHOME=$PWD/.gnupg - gpg --batch --import ${releaseKey} - gpg --batch --verify release.sig "$tarball" + ( + export GNUPGHOME=$PWD/.gnupg + trap 'gpgconf --kill all' EXIT + gpg --batch --import ${releaseKey} + gpg --batch --verify release.sig "$tarball" + ) - tar --strip-components=1 --no-wildcards-match-slash --wildcards -xzf "$tarball" \*/eng/Versions.props + tar --strip-components=1 --no-wildcards-match-slash --wildcards -xzf "$tarball" \*/eng/Versions.props \*/global.json artifactsVersion=$(xq -r '.Project.PropertyGroup | map(select(.PrivateSourceBuiltArtifactsVersion)) | .[] | .PrivateSourceBuiltArtifactsVersion' eng/Versions.props) @@ -110,6 +136,8 @@ in writeScript "update-dotnet-vmr.sh" '' artifactsHash=$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url "$artifactsUrl")") + sdkVersion=$(jq -r .tools.dotnet global.json) + jq --null-input \ --arg _0 "$tarballHash" \ --arg _1 "$artifactsUrl" \ @@ -121,5 +149,13 @@ in writeScript "update-dotnet-vmr.sh" '' }' > "${toString releaseInfoFile}" cp release.json "${toString releaseManifestFile}" + + cd - + + # needs to be run in nixpkgs + ${lib.escapeShellArg (toString ./update.sh)} \ + -o ${lib.escapeShellArg (toString bootstrapSdkFile)} --sdk "$sdkVersion" + + $(nix-build -A $UPDATE_NIX_ATTR_PATH.fetch-deps --no-out-link) ) '' diff --git a/pkgs/development/compilers/dotnet/update.sh b/pkgs/development/compilers/dotnet/update.sh index 3c5f29d8f046..8598f1f5d783 100755 --- a/pkgs/development/compilers/dotnet/update.sh +++ b/pkgs/development/compilers/dotnet/update.sh @@ -4,7 +4,7 @@ set -Eeuo pipefail -cd "$(dirname "${BASH_SOURCE[0]}")" +rids=({linux-{,musl-}{arm,arm64,x64},osx-{arm64,x64},win-{arm64,x64,x86}}) release () { local content="$1" @@ -30,373 +30,291 @@ release_platform_attr () { platform_sources () { local release_files="$1" - local platforms=( - "x86_64-linux linux-x64" - "aarch64-linux linux-arm64" - "x86_64-darwin osx-x64" - "aarch64-darwin osx-arm64" - ) echo "srcs = {" - local kv - for kv in "${platforms[@]}"; do - local nix_platform=${kv%% *} - local ms_platform=${kv##* } + for rid in "${rids[@]}"; do local url hash - url=$(release_platform_attr "$release_files" "$ms_platform" url) - hash=$(release_platform_attr "$release_files" "$ms_platform" hash) + url=$(release_platform_attr "$release_files" "$rid" url) + hash=$(release_platform_attr "$release_files" "$rid" hash) [[ -z "$url" || -z "$hash" ]] && continue - echo " $nix_platform = { - url = \"$url\"; - sha512 = \"$hash\"; + + hash=$(nix-hash --to-sri --type sha512 "$hash") + + echo " $rid = { + url = \"$url\"; + hash = \"$hash\"; };" done echo " };" } -generate_package_list() { - local version="$1" - shift - local pkgs=( "$@" ) nuget_url pkg url hash +nuget_url="$(curl -fsSL "https://api.nuget.org/v3/index.json" | jq --raw-output '.resources[] | select(."@type" == "PackageBaseAddress/3.0.0")."@id"')" - nuget_url="$(curl -f "https://api.nuget.org/v3/index.json" | jq --raw-output '.resources[] | select(."@type" == "PackageBaseAddress/3.0.0")."@id"')" +generate_package_list() { + local version="$1" indent="$2" + shift 2 + local pkgs=( "$@" ) pkg url hash for pkg in "${pkgs[@]}"; do - url="${nuget_url}${pkg,,}/${version,,}/${pkg,,}.${version,,}.nupkg" - hash="$(nix-prefetch-url "$url")" - if [[ -z "$hash" ]]; then + url=${nuget_url}${pkg,,}/${version,,}/${pkg,,}.${version,,}.nupkg + if ! hash=$(nix-prefetch-url "$url"); then echo "Failed to fetch hash for $url" >&2 exit 1 fi + hash=$(nix-hash --to-sri --type sha256 "$hash") - echo " (fetchNuGet { pname = \"${pkg}\"; version = \"${version}\"; sha256 = \"${hash}\"; })" + echo "$indent(fetchNupkg { pname = \"${pkg}\"; version = \"${version}\"; hash = \"${hash}\"; })" done } -version_older () { - local cur_version=$1 - local max_version=$2 - local result - - result=$(nix-instantiate -I ../../../../. \ - --eval -E "(import ../../../../. {}).lib.versionOlder \"$cur_version\" \"$max_version\"") - if [[ "$result" == "true" ]]; then - return 0 - else - return 1 - fi +versionAtLeast () { + local cur_version=$1 min_version=$2 + printf "%s\0%s" "$min_version" "$cur_version" | sort -zVC } +# These packages are implicitly references by the build process, +# based on the specific project configurations (RIDs, used features, etc.) +# They are always referenced with the same version as the SDK used for building. +# Since we lock nuget dependencies, when these packages are included in the generated +# lock files (deps.nix), every update of SDK required those lock files to be +# updated to reflect the new versions of these packages - otherwise, the build +# would fail due to missing dependencies. +# +# Moving them to a separate list stored alongside the SDK package definitions, +# and implicitly including them along in buildDotnetModule allows us +# to make updating .NET SDK packages a lot easier - we now just update +# the versions of these packages in one place, and all packages that +# use buildDotnetModule continue building with the new .NET version without changes. +# +# Keep in mind that there is no canonical list of these implicitly +# referenced packages - this list was created based on looking into +# the deps.nix files of existing packages, and which dependencies required +# updating after a SDK version bump. +# +# Due to this, make sure to check if new SDK versions introduce any new packages. +# This should not happend in minor or bugfix updates, but probably happens +# with every new major .NET release. aspnetcore_packages () { local version=$1 - # These packages are implicitly references by the build process, - # based on the specific project configurations (RIDs, used features, etc.) - # They are always referenced with the same version as the SDK used for building. - # Since we lock nuget dependencies, when these packages are included in the generated - # lock files (deps.nix), every update of SDK required those lock files to be - # updated to reflect the new versions of these packages - otherwise, the build - # would fail due to missing dependencies. - # - # Moving them to a separate list stored alongside the SDK package definitions, - # and implicitly including them along in buildDotnetModule allows us - # to make updating .NET SDK packages a lot easier - we now just update - # the versions of these packages in one place, and all packages that - # use buildDotnetModule continue building with the new .NET version without changes. - # - # Keep in mind that there is no canonical list of these implicitly - # referenced packages - this list was created based on looking into - # the deps.nix files of existing packages, and which dependencies required - # updating after a SDK version bump. - # - # Due to this, make sure to check if new SDK versions introduce any new packages. - # This should not happend in minor or bugfix updates, but probably happens - # with every new major .NET release. local pkgs=( - "Microsoft.AspNetCore.App.Runtime.linux-arm" - "Microsoft.AspNetCore.App.Runtime.linux-arm64" - "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64" - "Microsoft.AspNetCore.App.Runtime.linux-musl-x64" - "Microsoft.AspNetCore.App.Runtime.linux-x64" - "Microsoft.AspNetCore.App.Runtime.osx-x64" - "Microsoft.AspNetCore.App.Runtime.win-arm64" - "Microsoft.AspNetCore.App.Runtime.win-x64" - "Microsoft.AspNetCore.App.Runtime.win-x86" + Microsoft.AspNetCore.App.Ref + ) + + generate_package_list "$version" ' ' "${pkgs[@]}" +} + +aspnetcore_target_packages () { + local version=$1 + local rid=$2 + local pkgs=( + "Microsoft.AspNetCore.App.Runtime.$rid" + ) + + generate_package_list "$version" ' ' "${pkgs[@]}" +} + +netcore_packages () { + local version=$1 + local pkgs=( + Microsoft.NETCore.DotNetAppHost + Microsoft.NETCore.App.Ref ) - # These packages are currently broken on .NET 8 - if version_older "$version" "8"; then + if ! versionAtLeast "$version" 9; then pkgs+=( - "Microsoft.AspNetCore.App.Runtime.win-arm" + Microsoft.NETCore.DotNetHost + Microsoft.NETCore.DotNetHostPolicy + Microsoft.NETCore.DotNetHostResolver ) fi - # Packages that only apply to .NET 6 and up - if ! version_older "$version" "6"; then + if versionAtLeast "$version" 7; then pkgs+=( - "Microsoft.AspNetCore.App.Ref" - "Microsoft.AspNetCore.App.Runtime.linux-musl-arm" - "Microsoft.AspNetCore.App.Runtime.osx-arm64" + Microsoft.DotNet.ILCompiler ) fi + if versionAtLeast "$version" 8; then + pkgs+=( + Microsoft.NET.ILLink.Tasks + ) + fi - generate_package_list "$version" "${pkgs[@]}" + generate_package_list "$version" ' ' "${pkgs[@]}" } -sdk_packages () { +netcore_host_packages () { local version=$1 - # These packages are implicitly references by the build process, - # based on the specific project configurations (RIDs, used features, etc.) - # They are always referenced with the same version as the SDK used for building. - # Since we lock nuget dependencies, when these packages are included in the generated - # lock files (deps.nix), every update of SDK required those lock files to be - # updated to reflect the new versions of these packages - otherwise, the build - # would fail due to missing dependencies. - # - # Moving them to a separate list stored alongside the SDK package definitions, - # and implicitly including them along in buildDotnetModule allows us - # to make updating .NET SDK packages a lot easier - we now just update - # the versions of these packages in one place, and all packages that - # use buildDotnetModule continue building with the new .NET version without changes. - # - # Keep in mind that there is no canonical list of these implicitly - # referenced packages - this list was created based on looking into - # the deps.nix files of existing packages, and which dependencies required - # updating after a SDK version bump. - # - # Due to this, make sure to check if new SDK versions introduce any new packages. - # This should not happend in minor or bugfix updates, but probably happens - # with every new major .NET release. + local rid=$2 local pkgs=( - "Microsoft.NETCore.App.Host.linux-arm" - "Microsoft.NETCore.App.Host.linux-arm64" - "Microsoft.NETCore.App.Host.linux-musl-arm64" - "Microsoft.NETCore.App.Host.linux-musl-x64" - "Microsoft.NETCore.App.Host.linux-x64" - "Microsoft.NETCore.App.Host.osx-x64" - "Microsoft.NETCore.App.Host.win-arm64" - "Microsoft.NETCore.App.Host.win-x64" - "Microsoft.NETCore.App.Host.win-x86" - "Microsoft.NETCore.App.Runtime.linux-arm" - "Microsoft.NETCore.App.Runtime.linux-arm64" - "Microsoft.NETCore.App.Runtime.linux-musl-arm64" - "Microsoft.NETCore.App.Runtime.linux-musl-x64" - "Microsoft.NETCore.App.Runtime.linux-x64" - "Microsoft.NETCore.App.Runtime.osx-x64" - "Microsoft.NETCore.App.Runtime.win-arm64" - "Microsoft.NETCore.App.Runtime.win-x64" - "Microsoft.NETCore.App.Runtime.win-x86" - "Microsoft.NETCore.DotNetAppHost" - "Microsoft.NETCore.DotNetHost" - "Microsoft.NETCore.DotNetHostPolicy" - "Microsoft.NETCore.DotNetHostResolver" - "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost" - "runtime.linux-arm64.Microsoft.NETCore.DotNetHost" - "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy" - "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver" - "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost" - "runtime.linux-arm.Microsoft.NETCore.DotNetHost" - "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy" - "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver" - "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost" - "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost" - "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy" - "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver" - "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost" - "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost" - "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy" - "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver" - "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" - "runtime.linux-x64.Microsoft.NETCore.DotNetHost" - "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" - "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" - "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost" - "runtime.osx-x64.Microsoft.NETCore.DotNetHost" - "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy" - "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver" - "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost" - "runtime.win-arm64.Microsoft.NETCore.DotNetHost" - "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy" - "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver" - "runtime.win-x64.Microsoft.NETCore.DotNetAppHost" - "runtime.win-x64.Microsoft.NETCore.DotNetHost" - "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy" - "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" - "runtime.win-x86.Microsoft.NETCore.DotNetAppHost" - "runtime.win-x86.Microsoft.NETCore.DotNetHost" - "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy" - "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" - "Microsoft.NETCore.App.Host.linux-musl-arm" - "Microsoft.NETCore.App.Host.osx-arm64" - "Microsoft.NETCore.App.Runtime.linux-musl-arm" - "Microsoft.NETCore.App.Runtime.osx-arm64" - "Microsoft.NETCore.App.Ref" - "Microsoft.NETCore.App.Runtime.Mono.linux-arm" - "Microsoft.NETCore.App.Runtime.Mono.linux-arm64" - "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64" - "Microsoft.NETCore.App.Runtime.Mono.linux-x64" - "Microsoft.NETCore.App.Runtime.Mono.osx-arm64" - "Microsoft.NETCore.App.Runtime.Mono.osx-x64" - "Microsoft.NETCore.App.Runtime.Mono.win-x64" - "Microsoft.NETCore.App.Runtime.Mono.win-x86" - "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost" - "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost" - "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy" - "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver" - "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost" - "runtime.osx-arm64.Microsoft.NETCore.DotNetHost" - "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy" - "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver" - "Microsoft.NETCore.App.Crossgen2.linux-musl-arm" - "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64" - "Microsoft.NETCore.App.Crossgen2.linux-musl-x64" - "Microsoft.NETCore.App.Crossgen2.linux-arm" - "Microsoft.NETCore.App.Crossgen2.linux-arm64" - "Microsoft.NETCore.App.Crossgen2.linux-x64" - "Microsoft.NETCore.App.Crossgen2.osx-x64" - "Microsoft.NETCore.App.Crossgen2.osx-arm64" + "Microsoft.NETCore.App.Crossgen2.$rid" ) - # These packages were removed on .NET 9 - if ! version_older "$version" "9"; then - local newpkgs=() - local pkg - for pkg in "${pkgs[@]}"; do - case "$pkg" in - *Microsoft.NETCore.DotNetHost*);; - Microsoft.NETCore.App.Runtime.Mono.*);; - *) newpkgs+=("$pkg");; - esac - done - pkgs=("${newpkgs[@]}") - fi + local min_ilcompiler= + case "$rid" in + linux-musl-arm) ;; + linux-arm) ;; + win-x86) ;; + osx-arm64) min_ilcompiler=8 ;; + *) min_ilcompiler=7 ;; + esac - # These packages were removed on .NET 8 - if version_older "$version" "8"; then + if [[ -n "$min_ilcompiler" ]] && versionAtLeast "$version" "$min_ilcompiler"; then pkgs+=( - "Microsoft.NETCore.App.Host.win-arm" - "Microsoft.NETCore.App.Runtime.win-arm" - "runtime.win-arm.Microsoft.NETCore.DotNetAppHost" - "runtime.win-arm.Microsoft.NETCore.DotNetHost" - "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy" - "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver" - "Microsoft.NETCore.App.Composite" + "runtime.$rid.Microsoft.DotNet.ILCompiler" ) fi - # Packages that only apply to .NET 7 and up - if ! version_older "$version" "7"; then - pkgs+=( - "Microsoft.DotNet.ILCompiler" - "runtime.linux-arm64.Microsoft.DotNet.ILCompiler" - "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler" - "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler" - "runtime.linux-x64.Microsoft.DotNet.ILCompiler" - "runtime.osx-x64.Microsoft.DotNet.ILCompiler" - "runtime.win-arm64.Microsoft.DotNet.ILCompiler" - "runtime.win-x64.Microsoft.DotNet.ILCompiler" - ) - fi + generate_package_list "$version" ' ' "${pkgs[@]}" +} + +netcore_target_packages () { + local version=$1 + local rid=$2 + local pkgs=( + "Microsoft.NETCore.App.Host.$rid" + "Microsoft.NETCore.App.Runtime.$rid" + "runtime.$rid.Microsoft.NETCore.DotNetAppHost" + ) - # These packges were added on .NET 8 - if ! version_older "$version" "8"; then + if ! versionAtLeast "$version" 9; then pkgs+=( - "Microsoft.NET.ILLink.Tasks" - "runtime.osx-arm64.Microsoft.DotNet.ILCompiler" + "runtime.$rid.Microsoft.NETCore.DotNetHost" + "runtime.$rid.Microsoft.NETCore.DotNetHostPolicy" + "runtime.$rid.Microsoft.NETCore.DotNetHostResolver" ) + case "$rid" in + linux-musl-arm*) ;; + win-arm64) ;; + *) pkgs+=( + "Microsoft.NETCore.App.Runtime.Mono.$rid" + ) ;; + esac fi - generate_package_list "$version" "${pkgs[@]}" + generate_package_list "$version" ' ' "${pkgs[@]}" } -main () { - local pname - pname=$(basename "$0") - if [[ ! "$*" =~ ^.*[0-9]{1,}\.[0-9]{1,}.*$ ]]; then - echo "Usage: $pname [sem-versions] +usage () { + echo "Usage: $pname [[--sdk] [-o output] sem-version] ... Get updated dotnet src (platform - url & sha512) expressions for specified versions Examples: $pname 6.0.14 7.0.201 - specific x.y.z versions $pname 6.0 7.0 - latest x.y versions " >&2 - exit 1 - fi +} - for sem_version in "$@"; do - echo "Generating ./versions/${sem_version}.nix" - local patch_specified=false - # Check if a patch was specified as an argument. - # If so, generate file for the specific version. - # If only x.y version was provided, get the latest patch - # version of the given x.y version. - if [[ "$sem_version" =~ ^[0-9]{1,}\.[0-9]{1,}\.[0-9]{1,} ]]; then - patch_specified=true - elif [[ ! "$sem_version" =~ ^[0-9]{1,}\.[0-9]{1,}$ ]]; then - continue - fi +update() { + local -r sem_version=$1 sdk=$2 + local output=$3 + + local patch_specified=false + # Check if a patch was specified as an argument. + # If so, generate file for the specific version. + # If only x.y version was provided, get the latest patch + # version of the given x.y version. + if [[ "$sem_version" =~ ^[0-9]{1,}\.[0-9]{1,}\.[0-9]{1,} ]]; then + patch_specified=true + elif [[ ! "$sem_version" =~ ^[0-9]{1,}\.[0-9]{1,}$ ]]; then + usage + return 1 + fi - # Make sure the x.y version is properly passed to .NET release metadata url. - # Then get the json file and parse it to find the latest patch release. - local major_minor content major_minor_patch - major_minor=$(sed 's/^\([0-9]*\.[0-9]*\).*$/\1/' <<< "$sem_version") - content=$(curl -sL https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/"$major_minor"/releases.json) + : ${output:="$(dirname "${BASH_SOURCE[0]}")"/versions/$sem_version.nix} + echo "Generating $output" + + # Make sure the x.y version is properly passed to .NET release metadata url. + # Then get the json file and parse it to find the latest patch release. + local major_minor content major_minor_patch + major_minor=$(sed 's/^\([0-9]*\.[0-9]*\).*$/\1/' <<< "$sem_version") + content=$(curl -fsSL https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/"$major_minor"/releases.json) + if [[ -n $sdk ]]; then + major_minor_patch=$( + jq -r --arg version "$sem_version" ' + .releases[] | + select(.sdks[].version == $version) | + ."release-version"' <<< "$content") + else major_minor_patch=$([ "$patch_specified" == true ] && echo "$sem_version" || jq -r '."latest-release"' <<< "$content") - local major_minor_underscore=${major_minor/./_} + fi + local major_minor_underscore=${major_minor/./_} - local release_content aspnetcore_version runtime_version - release_content=$(release "$content" "$major_minor_patch") - aspnetcore_version=$(jq -r '."aspnetcore-runtime".version' <<< "$release_content") - runtime_version=$(jq -r '.runtime.version' <<< "$release_content") - local -a sdk_versions + local release_content aspnetcore_version runtime_version + local -a sdk_versions + + release_content=$(release "$content" "$major_minor_patch") + aspnetcore_version=$(jq -r '."aspnetcore-runtime".version' <<< "$release_content") + runtime_version=$(jq -r '.runtime.version' <<< "$release_content") + + if [[ -n $sdk ]]; then + sdk_versions=("$sem_version") + else mapfile -t sdk_versions < <(jq -r '.sdks[] | .version' <<< "$release_content" | sort -rn) + fi - # If patch was not specified, check if the package is already the latest version - # If it is, exit early - if [ "$patch_specified" == false ] && [ -f "./versions/${sem_version}.nix" ]; then - local current_version - current_version=$(nix-instantiate --eval -E "(import ./versions/${sem_version}.nix { \ - buildAspNetCore = { ... }: {}; \ - buildNetSdk = { ... }: {}; \ - buildNetRuntime = { ... }: {}; \ - }).release_${major_minor_underscore}" | jq -r) - - if [[ "$current_version" == "$major_minor_patch" ]]; then - echo "Nothing to update." - continue - fi + # If patch was not specified, check if the package is already the latest version + # If it is, exit early + if [ "$patch_specified" == false ] && [ -f "$output" ]; then + local current_version + current_version=$(nix-instantiate --eval -E "(import $output { \ + buildAspNetCore = { ... }: {}; \ + buildNetSdk = { ... }: {}; \ + buildNetRuntime = { ... }: {}; \ + fetchNupkg = { ... }: {}; \ + }).release_${major_minor_underscore}" | jq -r) + + if [[ "$current_version" == "$major_minor_patch" ]]; then + echo "Nothing to update." + return fi + fi - local aspnetcore_files runtime_files - aspnetcore_files="$(release_files "$release_content" .\"aspnetcore-runtime\")" - runtime_files="$(release_files "$release_content" .runtime)" - - local channel_version support_phase - channel_version=$(jq -r '."channel-version"' <<< "$content") - support_phase=$(jq -r '."support-phase"' <<< "$content") + local aspnetcore_files runtime_files + aspnetcore_files="$(release_files "$release_content" .\"aspnetcore-runtime\")" + runtime_files="$(release_files "$release_content" .runtime)" - local aspnetcore_sources runtime_sources - aspnetcore_sources="$(platform_sources "$aspnetcore_files")" - runtime_sources="$(platform_sources "$runtime_files")" + local channel_version support_phase + channel_version=$(jq -r '."channel-version"' <<< "$content") + support_phase=$(jq -r '."support-phase"' <<< "$content") - local sdk_packages aspnetcore_packages - sdk_packages="$(sdk_packages "${runtime_version}")" - aspnetcore_packages="$(aspnetcore_packages "${aspnetcore_version}")" + local aspnetcore_sources runtime_sources + aspnetcore_sources="$(platform_sources "$aspnetcore_files")" + runtime_sources="$(platform_sources "$runtime_files")" - result=$(mktemp) - trap "rm -f $result" TERM INT EXIT + result=$(mktemp) + trap "rm -f $result" TERM INT EXIT - echo "{ buildAspNetCore, buildNetRuntime, buildNetSdk }: + ( + echo "{ buildAspNetCore, buildNetRuntime, buildNetSdk, fetchNupkg }: # v$channel_version ($support_phase) let - packages = { fetchNuGet }: [ -$aspnetcore_packages -$sdk_packages - ]; + commonPackages = [" + aspnetcore_packages "${aspnetcore_version}" + netcore_packages "${runtime_version}" + echo " ]; + + hostPackages = {" + for rid in "${rids[@]}"; do + echo " $rid = [" + netcore_host_packages "${runtime_version}" "$rid" + echo " ];" + done + echo " }; + + targetPackages = {" + for rid in "${rids[@]}"; do + echo " $rid = [" + aspnetcore_target_packages "${aspnetcore_version}" "$rid" + netcore_target_packages "${runtime_version}" "$rid" + echo " ];" + done + echo " }; + in rec { release_$major_minor_underscore = \"$major_minor_patch\"; @@ -408,7 +326,7 @@ in rec { runtime_$major_minor_underscore = buildNetRuntime { version = \"${runtime_version}\"; $runtime_sources - };" > "${result}" + };" local -A feature_bands unset latest_sdk @@ -429,17 +347,49 @@ in rec { $sdk_attrname = buildNetSdk { version = \"${sdk_version}\"; $sdk_sources - inherit packages; - };" >> "${result}" + inherit commonPackages hostPackages targetPackages; + };" done + if [[ -n $sdk ]]; then + echo " + sdk = sdk_$major_minor_underscore; +" + fi + echo " sdk_$major_minor_underscore = $latest_sdk; -}" >> "${result}" +}" + )> "${result}" - cp "${result}" "./versions/${sem_version}.nix" - echo "Generated ./versions/${sem_version}.nix" - done + cp "${result}" "$output" + echo "Generated $output" +} + +main () { + local pname sdk output + pname=$(basename "$0") + + sdk= + output= + + while [ $# -gt 0 ]; do + case $1 in + --sdk) + shift + sdk=1 + ;; + -o) + shift + output=$1 + shift + ;; + *) + update "$1" "$sdk" "$output" + shift + ;; + esac + done } main "$@" diff --git a/pkgs/development/compilers/dotnet/versions/6.0.nix b/pkgs/development/compilers/dotnet/versions/6.0.nix index e2a792457994..388943cf2378 100644 --- a/pkgs/development/compilers/dotnet/versions/6.0.nix +++ b/pkgs/development/compilers/dotnet/versions/6.0.nix @@ -1,208 +1,318 @@ -{ buildAspNetCore, buildNetRuntime, buildNetSdk }: +{ buildAspNetCore, buildNetRuntime, buildNetSdk, fetchNupkg }: # v6.0 (maintenance) let - packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.33"; sha256 = "0xpki5wnl629zcih2d70vr1cgrhwr10mf4r89dyfm4hmwfpjz0pl"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.33"; sha256 = "0d26nch9v7aaxb6m8xjbwbbag88j8r7igbg512p242g7a03xp743"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "6.0.33"; sha256 = "06mdbp3z8pvj6q15agzdgxiqdvk057k0ld0q6q2bcy5i39x9744m"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "6.0.33"; sha256 = "1gyxvfaigp8i7x7yf24xzk4z5p638zxfa0pmahcyly0afl8s0i2v"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.33"; sha256 = "1q5aigywyx1jcm0ws2gql8y2ns6lrs9q6h85k3l8kamrbjls51jf"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.33"; sha256 = "1m1qac3mpnhdz3xpjn3a659nis10v687aacjrgrlbmjffibh0wz7"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "6.0.33"; sha256 = "0rks3lj4vwxlv1w6bk2v0z7lm5i22hzf46qcmc3qxndwmlp1frr3"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.33"; sha256 = "101ibi2xfy9wnll7qbm257ifsmn4plqfa5649i331481m6hjscjj"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "6.0.33"; sha256 = "14fgl7m0r9q3j0ab2v2g0jkby28d6c7386n0dx4zd1j516kcrzpg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "6.0.33"; sha256 = "00ky4jnrpq5zcpmrkjny74j2k466kw7sj4sbh361wql3q0ma9nm2"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.33"; sha256 = "0fx2zh5266inw8c2a353gl6sfcssnc4l952sc83rpl48x0xy5hqr"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "6.0.33"; sha256 = "0iwxzkdlmhd4ks6ivrfp5hgwgxmr2cbx8jvz7vzj01v3zbv8m8hd"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.33"; sha256 = "0r1knq9hzvx4qibrlvq8809r6pf3j3inq6aiw94dyrrkl1vfz3rr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.33"; sha256 = "03rxxv7vlaf7pbdcbyv2q93f5d0w7v9mhi2qy2nyiwscx1b1rrj5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.33"; sha256 = "1qazlv2aczbrzv5l4l0p94ix7q321i3j3jn6fcw0yxlgznjqw1dg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "6.0.33"; sha256 = "01kqcqjp2f5bx7nwx7ma90r7pjnc9vdb16k3fs1v3lvdb83mlwjn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "6.0.33"; sha256 = "04vrmd5blrqv2immaw4xlwcc8krlpnckdlxl5jg9mr7azq657z9d"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.33"; sha256 = "15ki8y9607dw4ldixy041v3s6ld36j7r8gdhn31y6ffp0ij0s9p6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.33"; sha256 = "153hdch33nxbs4lwd799rvbac8kvbg1jbkkq440fmmy7001zdvmn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "6.0.33"; sha256 = "0v86zfpln81b7r5yxjf676xx372kmwn0fcciwnnx6xks3i9qdzy0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.33"; sha256 = "0rcg68qj84584v6vij6kqk2jrmgci26rc40cmf9ibc2h65cm3hjx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "6.0.33"; sha256 = "1605avj9l3f6vxghkwzvqhyx5n2ipyb9y7d0n32777pg0kjc29iv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.33"; sha256 = "0f92sp9120a4bqcws53migvpbv6iixfqb43jp38s3sgdv0dx3i1l"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.33"; sha256 = "0xn1ckjg0zha3wib7pin29i0b3390xmanfrivm29x98mj644md51"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "6.0.33"; sha256 = "0yn9cczgh2clmxl92jca176dkvqn33jc4jyl25s41z9y58gbc9nz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "6.0.33"; sha256 = "18b8pf3dkbgav63yb2szdi96v6s1brn6yhbragzsw9iiwhvqxw8n"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.33"; sha256 = "1c4j03a7dcxvb0lajllnkyi7jdjzvvfd739mnhpcy5dcfaz625yv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.33"; sha256 = "09hbn47rn8yn5646p12xzw60ijhshrwav5jsha2hn27d4i57ls5j"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "6.0.33"; sha256 = "1x1b6hc4jg3l3fypdll6rqq29021v2p8y5piclyhsqwwhlzjb2cl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.33"; sha256 = "01pvlmwhdhp6ny3h5m0rm5mahkj33xgmrbcldvh1qsilwb4vqvsb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "6.0.33"; sha256 = "1yl8gy6abj4c7n2mkzs6v9mjzv2bhwdny7za6pclay4m1a4kijlf"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "16ij3bf9kil06kh0ca1csqcg3x5ang46z9pd17y6f08im1l0xfj9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "122aw6hy2xws6wi00g3swcp7ria1qwzrz4ywakwbqjac0winshmn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "186r14nlx93g053yhxcq9lfai2j9w7nrjiff1y2q5bmnkfnbd38j"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "12mxxvzi9rf53lj3vz2q8fpar915ghdhixpkm9q29kz8ly3hbv1c"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "0zjpj744gld18fni5gwr94yp5bmf7hk8k7mcpg5s34pyyzp3zd0q"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "0yzs527173v46x77if2ark872sjx0a1spz08xsm9d3bpkx0ncyd1"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "1hf30pxgpc1kcmfpcnd4v69xrav99npsv7apzj55fy9z83a2djgy"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "13vpx6vayxqk7g975bgvdslcfwaxvs3rj7ikn7ir3k0kivsp7dlq"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "1i60ry18padghnnwlyxcij0hc8361mh4mnsx4wy1y8ys45s5garc"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "0k4h0j73sjd1w1zkcq1qdz2kdmrjnssr5w9g7xx2l1djkvw93lkv"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "09kzlvz9ddzj4x8p9qnjvb2xkzbhwn2phs4sxwa8305janbhypy7"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "12sjcxxg0l2q3ks4s8lac2l5yb7xn691idww895jkxar7d47vjy4"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "119szgcdrbxqqmmz59phw83b7kv0vmfl2pafhnmx63wvyda1717x"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "15fmfgl0ga7fkz4bw74552ljs2l0iw6sm6xk0v90k6qdihy4z9ay"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "1a0dvvsivcsr6r2ln8r0g7d08swh2pa5fnzcabif833x7rxlriqz"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "0kv445lsj1kkp2mgayp211i5q28j808v54z4fxifda3cynjpsyv1"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "090v3q7d7i1h4a8zafhhh4h4qgws7i4vr20px4x3sq2lcigqky28"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "1s9ia1hh82pnzj0w6szjyg56vb9w9h1rlnqj1nb6nk6vj3a6ihiq"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "1n5j69z3pvmas6a6p5c45qn6mzdmb8ns4yl2if1cc69n3fs6axmw"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "1zbdbainvfx8m1228ql3zs2zs2dincl1fwgfivbwg0pb578l70ab"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "08aqnwzvxhvk9dlxra5f022hjgcsqgcs1kpdm09yy6yma3xd8v6y"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "04asl4lwf3wlrghccip463fri9sgarbgijky8052c1caj68bmscv"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "0x38bnmilkkc2c3i62jkn3vj3visjx87drsj3m3k0x6psn6h3qmr"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "1hkfp1p8z6ada8z5ilbn2j1pw6mqxw69r6719rcv8ggngpwwd21y"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "099s3fcqjl2sjp3fsn1xb3yq3qjv5nwsmy40ipr2wrf17lasjz2w"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "1wbzabbc7br7my9f453n8jds29ry2mx3l3b03b4bc3zl1ri6spzn"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "0jwyfcw085svfr1f3y5xbpap3mhszpax95l7rw6g77fp15qfdzf0"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "0yk7j0d8hgkb9dkgkxrp19cjg09sl3vycpz9ff16md8jjakd2ywz"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "06156xl3wia310qcfjahs5ni58j42pg8s0gjy7yzz7m7ixkig1kp"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "1sydbax1kcg8nbcry6h4ik54gk2q5swbw5cay2w5xl985p6dwkjg"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "00pcsz4vd9mscrwbpwlqqnlacw2xihxgvlp6xw0ycjsdrkq4621z"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "0l9j0fqpi22b791xs1vik98gr4zz004gxni85zmss64pqj7zabkb"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "1zpciqzf5g7sygj1iw3r575msfmr8bs56j68rx7jl90hzrdf14mr"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "1qwbplriqj5b720lnl4h9848pixxagqqa7k73fa11x2r8yqn399b"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "1nyffsb8lvj23x2xg38ngcbg8bh3apv9px1n9slf8jf9qlb6hnhc"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "1ynzpwx6mmj3w5x37ivqjjk5is9hmgwwlb8p50rjhidhc99avlwj"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "00if84zqqkrl7gdak1hx8l93ixidj4sgxj5d6wjji93iiph4m9md"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "0vd5xvmxvlqc6k1c86ib0fk582899vvkfnsnnfmw7f6s8271jcs3"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "0lkv19rqhvykdvs3lnbv0lda66s6wz52ad244yirmmr6gx54a7jg"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "0g4aqyz0685mh4b2w3d96q0m7138w3j5w9ds9yli51gdlv0xpy13"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "6.0.33"; sha256 = "11qqd4vkjmypah5lg9y37ma374a7kwvrrqi14knc9rzi038xdzc3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.33"; sha256 = "0ghxb55azggk0cs8aasv57w7n1ag7wb981dfrqrag5cfi6gdwwlk"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "6.0.33"; sha256 = "0vglrj3yx5ykxy6lbpb6frsxcp3109rpl6zl859vy6vdmjskpdn2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.33"; sha256 = "1cnm270drlfq1f839r5frljfg8q4xqn0fqicf97bd2cwd1nyx8gl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.33"; sha256 = "0vrg6xbzhi8mbp6nas6admh6pja3akc9synlcpjh859mg9qr8886"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "6.0.33"; sha256 = "0vdabiysl8hjaza06yfmk2x45i2qhr092izx820qv8clfdggmb8k"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "6.0.33"; sha256 = "0zlsdg3bn5i1s09p9lw7xfdcfrm0ii9a1zbfqhvqgvs4zwcvk17n"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "6.0.33"; sha256 = "0jgmmy5y2ci29izn0w1dh73xvrmvmypbyxjiq1kxjq1si5j465mv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "6.0.33"; sha256 = "0l7bh7mfha16dbpmlvgfpkgblw0p00x52bcki96pkjldgqnf2fwr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "6.0.33"; sha256 = "03bk8c7shd8sfvlw8k58aq95yc094247722fs2s2456j1gsirqqj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "6.0.33"; sha256 = "0qzdhg82sxa1srjh5lpnjyyz6lww00j1b4sgm0581ya1cjz8b38c"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "6.0.33"; sha256 = "1sn5q5q0qwnj5majqsfbzgirv0kgxs538ri9cbrp52sdz017c3a1"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "6.0.33"; sha256 = "1ddmaapazmsvwmry58x117hjl2l3q7r52l8wk45h820q46v8m26v"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "13l2xvm9zlb2b8xmznjj341nrknhaqcz7hlg4ccs9rmw32p0zvdy"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "1fiqsm2nwz45gxrakbkvfcsp3g8l0nl678df0k52ql4inn77f7p3"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "1nrnwgpgqrjr1pipjld74h1nk2m1gfk83f6lid4hvznyvi4181ph"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "0n8hm8dhl1k70iag7n6pkzi9nfc56xkz4y4xsn6hy792nw17haz2"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "02cjzf07kp8k2vb8hmf72rz6fx2y29biqvdhdva2jj2j1768a9gd"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "0k0cc1swhcrf6ydw0qkx52ikc8mnjv9i0v963yp61n6dhsa5cv2z"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "0ascpl1c8a710ggmxvkxw63rgp1gwkjdr03mmvwlwiwgxks5z4d0"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "0ra2v9l3w9sid1hg21ss7lawp8mgdhv1g04napa4nrv84bcz7kkh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "6.0.33"; sha256 = "10hswinnzm4mvhaqj1kr352lx7a7m2c6dc96q7p5dizlsg2rsh54"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "6.0.33"; sha256 = "0h990mf442c2s9k3vfis7r1nhf36bm2xsmz8472vlhdgym3bvr9h"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "6.0.33"; sha256 = "15s3ihn50jwh3wdswy2563fl8rjdn5lxwhfcsd8xsjp9j5ixpm27"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "6.0.33"; sha256 = "1vcq2m5bcrkvqdphjcx7lz780rgddi4h2sbwhw5ysxmns5nkpim4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "6.0.33"; sha256 = "1jh4xm42mzrd7xqp96qvvinhz7rs9qfal7243nfiznl4y9az4k85"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "6.0.33"; sha256 = "0zfqp5axbl5066655wsd4435194xfnfbs2k8hb1dp82a74fwz2p1"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "6.0.33"; sha256 = "0kkqj31kxdsd8jzna25lh6f1kqlwpx5pfwgdn02qr7dzln8c25vw"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "6.0.33"; sha256 = "04gc5p591kmn3divsqqn8s29x1l3klcysj4zskcidp1dkclx1dq2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "6.0.33"; sha256 = "1aik89f8pjg5vrz1lx6g0ccsbkcf38mw0591dbryqjwfdzp08g2f"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "6.0.33"; sha256 = "171qj7ajbc3fhld7dbqm04xrqmqmhbfmh9vpsl6sqkgp58b8vg11"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.33"; sha256 = "1pf31zyfxd68cs6pklhg5g8izp8r5jzkcxgq85px62ym6xp83r0w"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.33"; sha256 = "0in7gk5bi69gmm992cs4apj2kaxdjsdmfxcrl291822mi2ai3d2r"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.33"; sha256 = "18m6qi5hjlscd8lkmc8a513zycfhm64mqyd7g032j02vrrz1d20y"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.33"; sha256 = "1jq2mc722g8xc7wggyxayfvhan9dplvk4rbp9pjkpiby25mlhj8g"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "6.0.33"; sha256 = "1ighzhn8ngjnv53nn98b8n8krwh6k764r2kkxwfccajwhpn9sb23"; }) + commonPackages = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.35"; hash = "sha256-BxvIeZIaBdC0wyDQqKW0E5axSRSrtQk3oEPsT287014="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetAppHost"; version = "6.0.35"; hash = "sha256-9q5paA6a9Z9XH939/LI3CY3WUMI3k+3r5ql5DCQIvR4="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.35"; hash = "sha256-IcpSbsSHgYBbNVvbcXfmRRM9bdx3pogLncO4RuXEab0="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetHost"; version = "6.0.35"; hash = "sha256-sbboITtBgkzX9wtGhtQbjVHVlP+tOjr0eBvuTPR5n+I="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.35"; hash = "sha256-CgptZ0sWSK+sq1S6vaHPSeX2VZiWQ1qB94BngSE3eTg="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "6.0.35"; hash = "sha256-3fYohmmqpwAaIbZSD8bCOrHpsj6HbbOebamH4JxNk/8="; }) ]; + + hostPackages = { + linux-arm = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "6.0.35"; hash = "sha256-VQHuYjJLLOhgV0Bc2qiuLjDBYj/ZdayFApxvsMaybfQ="; }) + ]; + linux-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "6.0.35"; hash = "sha256-CEguy8PYd6Q/xgPVoUJiT9Kjvpk3ViyY9S0mKkZRtYc="; }) + ]; + linux-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "6.0.35"; hash = "sha256-3vy31ixbl8nmjyWgquh47daDf8KYJK1GiKdgUobZ4OE="; }) + ]; + linux-musl-arm = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "6.0.35"; hash = "sha256-HffLekYLq/WAmBJaK7JS+08P5MXbsZRSO7zQsP28KIg="; }) + ]; + linux-musl-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "6.0.35"; hash = "sha256-7SitZSktVg5PPAxl3zh9v09ls4u57jqKoV3YDZWgkRo="; }) + ]; + linux-musl-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "6.0.35"; hash = "sha256-b7swPOMAs3J++EXnwPP9BnG/5ti+qs3q+73gO33cIx0="; }) + ]; + osx-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "6.0.35"; hash = "sha256-LjGQxsPj2WeXJEM/t89iw5mZg6uOFD0fkLil0lqKq50="; }) + ]; + osx-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "6.0.35"; hash = "sha256-6Zc+12VfsFsFbfuh727PB1j7EDQeiuJYtSA7MUxUXj0="; }) + ]; + win-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-arm64"; version = "6.0.35"; hash = "sha256-XPnsu3T9dfuwupKbGDQK2LsrMsvVasZZlN1b7usP+kg="; }) + ]; + win-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x64"; version = "6.0.35"; hash = "sha256-7+ldzOhrKwoQymhLz9Nk6tO7Hd3VxLYYUuTLAttmWZ8="; }) + ]; + win-x86 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x86"; version = "6.0.35"; hash = "sha256-SWxLLPrTpdw9EE0sZeS4GGcDzi7vGVvO19TeD/Zo+kA="; }) + ]; + }; + + targetPackages = { + linux-arm = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.35"; hash = "sha256-tpSLvTe0WX8+N4L6Ww9F35aobI2F06lGLwmtoVGPoMc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.35"; hash = "sha256-NDUtM1/wQYziwzGZEtizHqLfgsbqCDyXdqRziZgZ1xc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.35"; hash = "sha256-eJDl6txbRr3/Bcm0jgLq5sa0RjCpKjx9gJtxRkwKFa0="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.35"; hash = "sha256-c4OtjF4mwQ5oDg7aTIL3UXWlgjzScj7MAiOZkwvtUBs="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.35"; hash = "sha256-NqFL81Xr7RMl7Mc/bdKI2TCHzq4QpG4kdd7sERPzOWc="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.35"; hash = "sha256-WUnzXWrYltA+PDv5lOIoNA6d7c6Yk0x5bO4AqjkttFM="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.35"; hash = "sha256-PR+IPCMNROJiZxu7ZYRpzeAhW5N+HC6jEC3N/VXwyyQ="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "6.0.35"; hash = "sha256-RoTet98wvZZiKsDu2ex7HPtxrEIvDXm571bTMHPd4zc="; }) + ]; + linux-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.35"; hash = "sha256-jM/HzLumZvI939DrNb8LHnEr/in1Lws0j/FAfdXSzbk="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.35"; hash = "sha256-yrtPCYD8skaWnfIoaUdQ1dns0YrypxDocskS2WGxF6g="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.35"; hash = "sha256-jPUhSrzqnH1GNi/c7dSnZSQhFNVGdmlAQkDLdXVWBBc="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.35"; hash = "sha256-pQd99gNiGGK41kib34QMP2JN2nkqrVrYJqX4qZoZSN0="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.35"; hash = "sha256-86wblZsGVVwesDUfxhsCHXecS2NpwBLAEZUeUmaHnVg="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.35"; hash = "sha256-JRXfIeOZL7DVzc2Tb0AuNo3PBKn//bqtUzkyoqWF8oA="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.35"; hash = "sha256-A1E7kjTJKLAoZ4CyImcFGus7w+/H99/U1MUhQXJzIl8="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "6.0.35"; hash = "sha256-VbV29mYgcewUk/aCnc28eUCH616+h3M7K+HTLs4rqeU="; }) + ]; + linux-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.35"; hash = "sha256-2eUqoTcqTU3ebv53IV6yvN9EhkOqnyBRd2tz74HuSsE="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.35"; hash = "sha256-maNzxJQ5oCd86VI4ROzl4RqOV1RNXn3qWjrAfBjr2Y0="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.35"; hash = "sha256-Gf3e0EdBEgq8GcZttTHbKGupFlDyB80nhYpBN0X9Kro="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.35"; hash = "sha256-FemQgMovKuiS9dS48aAsMH9rQbUJnTM+olHU2gXJiqI="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.35"; hash = "sha256-bQHLUwuKtiBUc02l6nqw0UntRySCZZ5f80jqE9GRJ1k="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.35"; hash = "sha256-y0ZMcO7UQHK/tsV7FWxcaWs4cHnQIwDyS5KF4/MUrB4="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.35"; hash = "sha256-0Nf5dX053Yy3ErDt/GH0IdefsE4C5Iwxu+V3yBQGXac="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "6.0.35"; hash = "sha256-NK9bR7E+4z4v6G1WqG74Be431jTgQZZnVUKIL1YH1vA="; }) + ]; + linux-musl-arm = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "6.0.35"; hash = "sha256-INxaOVFZsCkue1I+uBBbB6bVUinMSJwzoW1nREyC/TY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "6.0.35"; hash = "sha256-KG5o3HrmzzUcHn9MmaQsELqhW9pbf8v/BEl8XOy26bE="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "6.0.35"; hash = "sha256-1gKuXzwtNC84PBNOSX76ZFUT87DHuOEJmKhmZg026tM="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.35"; hash = "sha256-G9oP2+gqthzh1TzcPx9rhuA9rIdxm4aKpds2jLbz98g="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.35"; hash = "sha256-fMyXnJKdHAcPQF3bG5It53BmwVICOBJZ9mZ5e8rhjIg="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.35"; hash = "sha256-rL3yEEknGnpA0/W8GWkoT62C2nm2P1IY5b0FlWqNVIQ="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.35"; hash = "sha256-hBpRmWVYievxvE7Oq2LOsq6flZWAMqOGILa1T4dySL8="; }) + ]; + linux-musl-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "6.0.35"; hash = "sha256-FfDa/XMaER+fNf0ESjA+ZG1YsxbniiDf667N1I0i9EM="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "6.0.35"; hash = "sha256-Yb5w1a3vVPTd9YRdmsmB/GmVIA2h5UUMex6eJILttyQ="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "6.0.35"; hash = "sha256-T9wE4xhZFDRBFdY+aJ5ljQedmq94ULjgUl80JgOOLls="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.35"; hash = "sha256-GqDM1An86Cix3IeE0ptVz/GevTeodIap+OnC+UK1JCE="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.35"; hash = "sha256-Z2v8eRQTqqI1JTZELbRyC5nXWtq6Iq4hw2Kq/kZesTQ="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.35"; hash = "sha256-Y+0OeW13o2vT3ZRUlSQnVMzhQefZnB3bEpniCK/7NXs="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.35"; hash = "sha256-hkiXK3LEUWpi1sPKfjISRyDN9whidIW/7TcYKsf5sX0="; }) + ]; + linux-musl-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "6.0.35"; hash = "sha256-QtmwSe9LB21xBOEIP37msHIbLV9g/cp5j5qI7UeVy8k="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "6.0.35"; hash = "sha256-H+fKDq3g0i6dgvbpI2U/EcH0qW+oTr5mkh7S44AWaLo="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "6.0.35"; hash = "sha256-lyFTNQNL5Gd/Yz/wIn5pp38lQh91mpfSSX4ofsyPaXE="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.35"; hash = "sha256-zP5FKatImRSjN+UKbPpmB+ILTrBrL+YnEt+DoI2x00c="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.35"; hash = "sha256-s+E1b74zGUPjb2ON4Ecu0YyaBmh89R7FuLumBIWwrww="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.35"; hash = "sha256-71iLcbj3hgrGalx1p3aP3gnukTbbIzGX0DHayfoqc14="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.35"; hash = "sha256-myOR5s0P8oGaNvefX2RBOMKIoWKdTYyN/VVXzjOUkRs="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "6.0.35"; hash = "sha256-vTMU6Vb6WXB9Nwf/naJAG1Lv2SfmAd2rTSEh9e+ITsM="; }) + ]; + osx-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.35"; hash = "sha256-6mY2uBhvKCpEFJLYX9+f1mpYrWdN69i+14DPjO4U8eo="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.35"; hash = "sha256-cBcfv7tnZa2xO5T5VOx3/7EvJ5u4/C4dFnV1Jj6VFPU="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.35"; hash = "sha256-IGArFhlq3UzZY93lJ+WrB+zmuu/2o8lVwT7MJKpz6DE="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.35"; hash = "sha256-L1rUVh+A+U0kgoPe5dtsPiigrAwHYkMaHeI5deU/VCw="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.35"; hash = "sha256-cOGw/YSJucZXdEki9rDo7XAWibi/9xbC1dfE13g+dNw="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.35"; hash = "sha256-oZujYDpYlBKGKd6W72VJklXnywJmTAJAUbgD90u7wC0="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.35"; hash = "sha256-9OvPAvtnIEx/opAkBBmqMGcRfjfCP3WVgJSydZNT2Rw="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "6.0.35"; hash = "sha256-uOoIWrQ6cAUFTtAaaI8VMzk43m+eA6jijUQUU7e/87I="; }) + ]; + osx-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.35"; hash = "sha256-ljEkMgkgfEeqzRnmTubjSK2dzkph0cSQ7+2J986F7HI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.35"; hash = "sha256-05wMp5+etiV/vgktqGo8+4XB7FNYxwCUKpJsW48tgvQ="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.35"; hash = "sha256-EtFBg8yBNhAEQlL97oVGiu05rPMSKLd0wE44zTBT7FI="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.35"; hash = "sha256-v9FM/PSYQ0a6Mhp/xU0kTzqz6G1JEvFDgcvcOgoMg4c="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.35"; hash = "sha256-UalwiTf1Wqbxi8duMS1L9S/P1xFAD4qkd1YnJjkWWMA="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.35"; hash = "sha256-TKywsrAlBP3OIY6rieeO4wGuGvKIoeNx+rhRz3Qn+tw="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.35"; hash = "sha256-nBjl1AgKzjNgAy9ebqwuMW++3agzj21DQRGOE6i4s6w="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "6.0.35"; hash = "sha256-Cal1R6Vv7iuN45fuIOx85LlRk0tdB0YmhVtoKmkmWCQ="; }) + ]; + win-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "6.0.35"; hash = "sha256-cDfyVD5ium1TUmjAEwmSIPZVOodXsE76lSi5l6fRiZI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "6.0.35"; hash = "sha256-/bEn2roiWJVqTJvBFIAdNDLVHaP6HVWRkJYFKQ1BwnQ="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "6.0.35"; hash = "sha256-yzO+2ZY1c2Qa5zYlGWcPw62lorqvmC9w3kqMemuDdIs="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.35"; hash = "sha256-HBi4LxSX6yEC/L8b2SIOXxNLeUAJz2XJ8m0gSvg8JEs="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.35"; hash = "sha256-P0bPG2kQtwoaSZRrWvWbHvVtKQ0bbaYBIL6y6R4AzCw="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.35"; hash = "sha256-8KpLHzAuQtxX9ZvAah9tIZffgr3UdA1ioVjQhTGGoF8="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.35"; hash = "sha256-4gcr5XiY62fdxU1PgF8URrhmRF38IwqTnCb4w211me8="; }) + ]; + win-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.35"; hash = "sha256-CbAFtObNlLAFckuxQ098QyRydKFer3Lx5GFqI384IHY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.35"; hash = "sha256-K48UCK5GmLu8XcwnhcnU/vGRp3Myg99zA1qjLmYf++0="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.35"; hash = "sha256-TF0WcItnVgxmveY+HuQuPkJcTN0Ow2ek2vLNrYnM1wI="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.35"; hash = "sha256-zQTo+xPX8ybQNELE+urZr4gpkk7DVmWioAh95yrTMaQ="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.35"; hash = "sha256-9gM7UTQezIFzY12Q2hCnHfTyyP08LokuEpQM92axC3Q="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.35"; hash = "sha256-4MuvhqMTP7CjUU5t5FuR31tDr36XGe4vO1Qa9T6OCb0="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.35"; hash = "sha256-Xx5O61O33NGDkh5+RYwBtHKuiWr40Y7T01dwCSAzd+M="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "6.0.35"; hash = "sha256-1Lj+5osDgRccxe8LD7cFnOQLSznv7QqspICltvG5Jag="; }) + ]; + win-x86 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "6.0.35"; hash = "sha256-54J48BHMX4YBZYBlSh8servhI9IVHs1rsf5gJVr2SPg="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "6.0.35"; hash = "sha256-ckJ2xR4qf8OQdk/KhCjVmV91lX8pj19qjlsJ+i5bkMI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "6.0.35"; hash = "sha256-yKl+zDJ8afJUSJbaoXvgEWDGsedDFR0xL7ov+ww8MXk="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "6.0.35"; hash = "sha256-8+ZO5pMigKiX5bVQSthNZGm+HV3MCiDOZZ/RvyFZ6hw="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "6.0.35"; hash = "sha256-LQ5JsLnwzLDBWi0vEBAFD3tsLTqxn8pB21nyxctBXDg="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.35"; hash = "sha256-CK5Ms6ByKq57M0zbzRclrooBpNW4CHq5Pr8D1I8jvQY="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.35"; hash = "sha256-A3STk3RqaylVSY2mKRgcF+WHXXIKhobaOT/zNRo+wHs="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "6.0.35"; hash = "sha256-Z3OPxtSzMp5QpQKPg7/PSPMSKbx1XNK3rOGvMulLCq4="; }) + ]; + }; + in rec { - release_6_0 = "6.0.33"; + release_6_0 = "6.0.35"; aspnetcore_6_0 = buildAspNetCore { - version = "6.0.33"; + version = "6.0.35"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/91f66f75-bd3e-48f1-acb9-99c0da753f96/42c47999ee4c4d108774536afe5da160/aspnetcore-runtime-6.0.33-linux-x64.tar.gz"; - sha512 = "12b34fe1d0a679ff63db4bf002a2988194d9e64d0e107d128c247821dd939a86eced0fe453c0638d3742dac3a32e533792c26299400fb4fd5566b75177e66875"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/44b0aa96-3ad1-4406-946f-680e9a52897b/8a6b84db7a63924f98b4197ce07313be/aspnetcore-runtime-6.0.35-linux-arm.tar.gz"; + hash = "sha512-LRUjAbm/xfnO2rxsmJAYdXXpDCNivscJ+73opCPab1M6z3ePNNVf4XSQbq7y3AnaVwtanSXdeopUy+TnP3RfQw=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/5b5b9407-22c3-4ea4-aefe-c958ea78e7d1/1abb142a2ff944d822d133af369dbe21/aspnetcore-runtime-6.0.35-linux-arm64.tar.gz"; + hash = "sha512-yUn9G57+kjHkxuAG7zxKWu3B1M5kypvBzVLxzpiE6iODe0nx5qerS23wxvYKMlc+Ku/eThTyBYEtAEt7nr4Pdg=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/0c5a5f3a-881e-4ceb-a334-c5e3b210eef8/9834ffebacea659cd14d272fb01f81c4/aspnetcore-runtime-6.0.33-linux-arm64.tar.gz"; - sha512 = "7a60a77a306070a3b94db1acfa73938b6880cd079bdac3e5cab174a47af467b9208e9f41d8e12e080831d528151cdaa5b660bea5aa6fe537ec144543c0fffd95"; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/ccdb3628-8f55-411b-b0f1-669d42604ad8/81283ab8762aaab1be72772711f07f86/aspnetcore-runtime-6.0.35-linux-x64.tar.gz"; + hash = "sha512-2G2pODOKbZclBDbUk0Do8RTAW0ZRLKViqtym8+d0A9NkaNPzTtXy2TXAcPnhSu33KZ9aA9KWTb1ldrmi0+d26A=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/d4641b35-5b85-4250-9913-0f6a2c276888/bd8483d09a767f6c19f9274da2819624/aspnetcore-runtime-6.0.33-osx-x64.tar.gz"; - sha512 = "f8dcf3d6de7a34d7fb402fd1ddf55bd810cccb95831d12312bc7607c6c7de8a46200c66d7e753250103961ba2e97fa6a85206b49442e1aeab1e290ec69bb55c5"; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/5d62f7bf-a359-4213-9801-a6e625abcd5f/3d21aef16435231e8dba45d9d97b66f4/aspnetcore-runtime-6.0.35-linux-musl-arm.tar.gz"; + hash = "sha512-Rbo8KaqV5IEKcQkHvZPafD46CceXLXsZhXqkeuT9X60ZvawsXgN/mr0ZlqJ9Djms/8Mnjy53gkdBQAcPNV2Iig=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/74fa4afa-a6d6-4c32-8ef7-fe88148f10cd/c887bff014d198532ba942988cba124b/aspnetcore-runtime-6.0.33-osx-arm64.tar.gz"; - sha512 = "26a2f1d6cb3ef9df5b6abc16e025fc2e9aeda386b5da53428abae67d76ff007bc921aec60cff9675dbb7291db7b75c5a7bcaadb54e8c04de59308b02dde924cc"; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/fd8b54ab-b3da-4bbc-8cad-e15955a61813/f8afd41bb9cf46a39da72177b56b3a29/aspnetcore-runtime-6.0.35-linux-musl-arm64.tar.gz"; + hash = "sha512-TpkmOTjp3h+lCPzfClnn9hojT4vWCklH0EPFrFvDEI60YlS8txSMoKA5H16c7nTbHqYX9XbX43ryK6EI6UM+Gg=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/69cd357d-c16c-4578-a109-8fbcdd5f0e30/9c6b46794e4c784fdec1990ffeffb021/aspnetcore-runtime-6.0.35-linux-musl-x64.tar.gz"; + hash = "sha512-UCEM7ZDRfqg3D7vK3j+/ub6SaQ+up31VFtyK3k7ug0CLLTf4EsygIAh0QdLzFGUHCGeSz/F/dBMwjrEvpKvWbQ=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/ebda945e-7bb9-4079-b4f2-6a444bbc8d4c/1b7c0b929586db13610d8613329a9fba/aspnetcore-runtime-6.0.35-osx-arm64.tar.gz"; + hash = "sha512-VEhzIbRxDYIt1W31Bp1q/N0fmHZyd9yJ4bMDWrG61QKLRXk+m4+f9X4y1jMrW//ztobGUIbsR0OgJ2G0KVeTtA=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/12e0840c-f541-4796-9b7d-7c4568f6af78/41fd0ea7532a0f0e26a6a8755103856e/aspnetcore-runtime-6.0.35-osx-x64.tar.gz"; + hash = "sha512-zIC6WajaQRI4noQs89svOqJjZUR1neTScPuwXHAOyR2gYrrTSYSYnFblwaecL/YMuDR+jmei8UqSqFm2pSVHxQ=="; }; }; }; runtime_6_0 = buildNetRuntime { - version = "6.0.33"; + version = "6.0.35"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/250c78ac-a53f-4679-ad2a-cc31fa4c4001/204b39eb9634a8dd9f39cbcaf56030f2/dotnet-runtime-6.0.33-linux-x64.tar.gz"; - sha512 = "0892015544d8903999f8e0fadab6b4b91eb180e495fa5e36c1a755b1d42e134858b7bdbfd60d1880650d9c528d07e31b9ccfc73e650e5d890a955902a89139cf"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/2c52af07-c968-4edd-acb7-766d81766809/9de0174ec8abfc27498b763c0e1bd370/dotnet-runtime-6.0.35-linux-arm.tar.gz"; + hash = "sha512-X0HAD45gzirQe+91o+rYmGuZtwaoxLsssPqMrfovq9rjwXUBqpx39jSq0CooyMiGkjWQe68LnXI9ZQITlSzpJA=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/8f344652-6b7e-4136-b6ca-c1a46d998835/e00bad479ac747a8ddc90e7d006aaa52/dotnet-runtime-6.0.35-linux-arm64.tar.gz"; + hash = "sha512-lF4k+cLWd+Zf3aoGyv6NUY7lmc6YiDtg/Z1zQyD6Lz4cy/tG6ibukl4xn7VDDC4Y1kJp/a6WAwFpxLbT2BHqdw=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/79e3d66e-14b8-4c20-9816-37c0c0964c8c/98ed84be388dfa1a7db279e9beefbee8/dotnet-runtime-6.0.35-linux-x64.tar.gz"; + hash = "sha512-2NENYA+2ZDNpSVdvjsBTTb/9Vz91S550HyCBIiH6/KxfUJp+GrROnmP8Mae128sZ5OwZMP/SkxIhLcdFSXcJDg=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/694cd8af-7e9f-4161-8c1d-1c9a7b1d074f/d3a8dc90d971ec4f135f6452c176dc93/dotnet-runtime-6.0.33-linux-arm64.tar.gz"; - sha512 = "c700d4ae3e361fa2a390a8fcf294a2277931b0ea60bd4a2f0ec2bb982bb6c618ba002e5955c3ee96807207b256e10289cf1cfa372029b758aefa6bf1268d45fb"; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/4355d376-a0b5-4b33-8a80-3171b45100bb/d8ee2b66411370f06b55daaaa8bbac4f/dotnet-runtime-6.0.35-linux-musl-arm.tar.gz"; + hash = "sha512-ya+XXOzd9F2FX8DnU1dkokso1kr0OmasJb/9a+lpmn5dsg9WrN7emeluRun2ITXlGvE25yJVnQx3++uH0m3qxg=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/82217487-71ef-43cb-8678-d293b802b5a6/cfe49dd7b7e0e3040d4fdc9258c61dde/dotnet-runtime-6.0.33-osx-x64.tar.gz"; - sha512 = "a0ad81d4bb361d91edc7b42142828fb5ac5b75376e6ad0137f7f28bba5c0d0b68c67af708bc85c15ebb7aac5f98df20bd83a56144a1bf9ac5aeaf5caf84e4128"; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/b737d8bf-ec51-490b-a86d-fd6309965ed4/c2631e668020a1114fd5aa54adabb19f/dotnet-runtime-6.0.35-linux-musl-arm64.tar.gz"; + hash = "sha512-wBNlsOXMct/HvzwdUS7cdNDvlZy3phN9Z+ntnYom2HRCWOowBd8AmELLr0aETJE2JuPcuhWDARis2V4U08LmcA=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/aad5df88-c193-4579-b847-633186659a2f/1688cb1838ae0f0b67d16f3ed808f566/dotnet-runtime-6.0.33-osx-arm64.tar.gz"; - sha512 = "95d0e646f688e6f46545625dfae46d8325c7aee4661d3f0e59044acced9c6192ff51524355696e8f868ebd112e9a036d01c951f7249d863c300d07c1a0913d1a"; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/30443c06-a028-4ccc-88b0-8a98691ec823/d0ee93efc931577aa00eabf7cfea98ad/dotnet-runtime-6.0.35-linux-musl-x64.tar.gz"; + hash = "sha512-sqP6JlbLJVI12IbadHU8eMPW1Sti4Q1pBTucCLZiZYZ9bzabSm4TOr/yHSspEnIudXQ44unbrRC522pVVFzUFQ=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/079437b4-612a-4a5e-be11-decf9fd90666/1932ebb2603542a3b647d958c9412824/dotnet-runtime-6.0.35-osx-arm64.tar.gz"; + hash = "sha512-SIDLPGlnRFKDHBMOAqShKCZTTWBbEVnEMu060E5hjg2gdgN0hMPDS9jHORwXMF63a2lXzaFGAK755yvUfaW9Zg=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/55a4f552-2e06-4ecf-bb99-873cc072646f/0b2a5a90c60e8ceb862aa7f7160cf0e8/dotnet-runtime-6.0.35-osx-x64.tar.gz"; + hash = "sha512-czTb9uCb6tbvJwPd5p5qWo2b9D08otb8rzk/XE9K5arXyAPQxFR9AdbwgGD4Zm/PLB+9VDlXnVjZKHCGwNwfSg=="; }; }; }; sdk_6_0_4xx = buildNetSdk { - version = "6.0.425"; + version = "6.0.427"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/f57cd7db-7781-4ee0-9285-010a6435ef4f/ebc5bb7e43d2a288a8efcc6401ce3f85/dotnet-sdk-6.0.425-linux-x64.tar.gz"; - sha512 = "a04b75af7c5850238a8d99a6f60b37753467db615831bb3833c14aec86faa2d6ee9b8643885798924a01e28acff44ac9ed39c89f7cbe53c5cb8753c802e85039"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/7ba415c7-4750-44a2-9007-1bdcdee75c34/05c4467df0d7b5de0bc228a25e342ea4/dotnet-sdk-6.0.427-linux-arm.tar.gz"; + hash = "sha512-THZlTY0q6YxztN+GAC3wfFSaQRz3+hPxHoEVAbpH5e4EKC6sdab82s8686M/h/WrOowfLLTebSXgkTl5edDy6g=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/30d99992-ae6a-45b8-a8b3-560d2e587ea8/a35304fce1d8a6f5c76a2ccd8da9d431/dotnet-sdk-6.0.427-linux-arm64.tar.gz"; + hash = "sha512-kSmWG1Std9rCtN6XOHX3rNHo0oM2c6UZI3BmIODFt7jFsFfI05VTKtnaRrHctauP0HpPVSvVclbVoMIQcK1XcQ=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/12ee34e8-640c-400e-a6dc-4892b442df92/81d40fc98a5bbbfbafa4cc1ab86d6288/dotnet-sdk-6.0.427-linux-x64.tar.gz"; + hash = "sha512-qc0eXMw8XYR6yi7yHdFF9hxrGMTnWjwvya7VksYGbVEbi2WMVMLNhRk4/lq6I4bl9vUQBfZAa0IBEMDsQIqEAQ=="; + }; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/58a54963-a8a8-44fc-bfc2-c2e87e066656/7d0a5a831d123b801c55bd6993c9e69b/dotnet-sdk-6.0.427-linux-musl-arm.tar.gz"; + hash = "sha512-QpfEiPsM33LE+zutBXQTwXOgcGa/ZR/IxAdbhsIjFhLmlJR7fsvsDUPNaSG4PfIGulKNOHo23dbGcLOK/ZOV2Q=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/ec8e29f5-2fbe-47d8-b0c5-81f11434c00f/ba4bd30be448d649e5ddf1991bf76252/dotnet-sdk-6.0.425-linux-arm64.tar.gz"; - sha512 = "c15f95664fd0570d5b0cb94c7af6bba5fe830470004f0e958e49d53764714cbf8ddd620b38d487b60a27dbfd467a955856aab3df9c958cde17c942079fdaa55a"; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/49bb77df-ebaf-4a77-b6d7-d178c3b1f97f/c87e3f996af3fddd9cb253f0f5720d1c/dotnet-sdk-6.0.427-linux-musl-arm64.tar.gz"; + hash = "sha512-Zw6MlJQ5qm11NI0vphAYxmIdghzrX4Rz/5uBvBsh3Ck9Cxb6gETG5XKarcBJEmVNGuCkqEr03KCJFXExHp1M8A=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/ce410b9f-c7f6-4180-a373-bcb6528a0778/448c9df07432b5dc62d08868ccfef62a/dotnet-sdk-6.0.425-osx-x64.tar.gz"; - sha512 = "5757c661d82408680a6e45efbca260bb9da145bd83f8275280e9ba756a2827ce35c7ae77cb248e9ee6c6cf46730c6e50152b98c0a082c0de764f5e522dfb6ca2"; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/8db04a7e-0da2-4064-b17a-c36888961d8a/3919a6cc424dc0dfd581569d02f1db54/dotnet-sdk-6.0.427-linux-musl-x64.tar.gz"; + hash = "sha512-OOY7wulLXfuqX/zDHpbqr5iJqGrgOyu6cu1zQ015hX1WVmNFxlogx6XmL0RLjxOj7Wo+flaKPDTIN8/OzRymjw=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/24192716-57e3-4e69-9950-7840e05053d1/79398f054d34fb3e424c029e6d41a551/dotnet-sdk-6.0.425-osx-arm64.tar.gz"; - sha512 = "7383b188c8500ab8625cd34f69f7ec5a4d9ff4ca715f95ee020f2bd082d5023697b021ca4b3b1e6a0782fae2ff89586e541e454fedacdf1c49b42f6e47d12011"; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/9354e51e-f557-4d99-8b0c-53bb03055201/8267bd56eb17a930408805fc986e8b98/dotnet-sdk-6.0.427-osx-arm64.tar.gz"; + hash = "sha512-itcxThu4FvtBmIQpMSIOnsjIiFtDWW7IkK88IXeJQQE1Ov66tj8rhwFiMExqKiDRpFzu9Bn3LZBNWYouTo2c6Q=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/fb30dfb9-b1d0-46a1-a59f-ae1037158de1/83d66d2d78b8ae231c3ded22f1832537/dotnet-sdk-6.0.427-osx-x64.tar.gz"; + hash = "sha512-HVZg3R7ObcaX5GeYGy9pxrM5q5PJdtSC76m0L2tcg/EsGS5bQg9zqajkb7vtk1+DZCF6pBC+3g8DKsmSstPqfA=="; }; }; - inherit packages; + inherit commonPackages hostPackages targetPackages; }; sdk_6_0_1xx = buildNetSdk { - version = "6.0.133"; + version = "6.0.135"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/3fd189c1-072f-4193-8f1c-663b68b9b06f/bf63007e0f0ba0b3d07f1af06c1dee6a/dotnet-sdk-6.0.133-linux-x64.tar.gz"; - sha512 = "7b4fe0095bc6d3ea43fc3b32f2fc2ccc8fec83b0c50ff74b9e9a019ed40721f46c60d7b3ac08841a5f89d0802d8c347b14a445032a00f3d9a8661558b9c74794"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/dfdf3287-c7bd-42be-9bbe-caeb66babde2/c611e2e9ea33fa8fd38f56fac2b185aa/dotnet-sdk-6.0.135-linux-arm.tar.gz"; + hash = "sha512-i5xwskkBYby1C9jOi/gis+ToVv62pVJXVSzBEaaBBb2HJkHBBIwTKAWEhJLoS8Ryc3zqZkcG/Mt5Duu//ASd3g=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/26d70255-74d7-4d66-81e2-529690046f82/701bfc25c386baea4bfcc727c9790b81/dotnet-sdk-6.0.135-linux-arm64.tar.gz"; + hash = "sha512-aTnKlKkdaGKn8+shVeRXIMmetEHBzR8qIt7YNRxf6gmBwu9DOwVzwe0uQzdWRmZqmvLI4KUawabDA92R4YdnYQ=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/69e35e96-d24c-45c9-a653-ea977a7e2a22/f31e9851ba9b2524740bf9d8b5a9af70/dotnet-sdk-6.0.135-linux-x64.tar.gz"; + hash = "sha512-+ZD6BjY4WjpOprDhzKpFYT/vRC02EAFSNvwkdIlfLCRGVZ8vuULJARcbuEfNgl/MV1+4LRIMxdHPF11cCuAc/w=="; + }; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/1bec17df-b72b-4c12-a2b6-c994a956fa68/11909df0d405b09250451b8392eaa953/dotnet-sdk-6.0.135-linux-musl-arm.tar.gz"; + hash = "sha512-efG9eL5bl3eyr9+J+SVy0ykVja4A+qVPTnquRxZBzOkNQx8DmpNQ2iWPz+MhjF62ovJnbzl25RqLp0KBy5q44A=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/350dc511-d24e-4435-a503-97cb85bc2e10/9adae96f67f61a23a47a73165a55117a/dotnet-sdk-6.0.135-linux-musl-arm64.tar.gz"; + hash = "sha512-3Jw7lZ/WZCT7nDdVf/ZdsH7dXsgWvNBSTNYPioeQJa4bQOy3dXkto3etz8IjDl0g9y5olGQU8xi7M5AdXmKJaQ=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/759c84b7-4d67-4eb4-94c6-0214d150db31/aea9ac1878560278c50174ee213d88c6/dotnet-sdk-6.0.133-linux-arm64.tar.gz"; - sha512 = "6820d62ced6d9770ebd3667a64a74e2249471ee5920e4ce4101f21e55950f8d44ebe4ffbf20bc66260fd5d1edc5e534a6f0b70522fc41a5e48e75b0bb00e6ea1"; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/97d9a05f-760a-43a3-84c2-d401617a76b7/17811377c44145af03fab8023b8b1661/dotnet-sdk-6.0.135-linux-musl-x64.tar.gz"; + hash = "sha512-5g8kSywm1Aurm3r05RBcQtM3928dMzcQk9ssfsARi6Zl2VoJzZSl3jJPIspEWAayD+ELMGhEBjhzI60PoiKgVw=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/c8f09b91-04fe-4d0a-8d01-0556c53f2a5d/cbfe49b3182a2c4ebc7aecd22b6ac881/dotnet-sdk-6.0.133-osx-x64.tar.gz"; - sha512 = "e142785256b731abd6f7bda79b1422ba6eb9135f61526d6f687be67146253403cbec85d3ee66f49e577e7f296b32f94fa705ccf048292b1c00f981d2ef4fd52e"; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/82ff3f30-674d-4b21-94c1-9dc86a365a35/49c84376a1478ce39a77447e1b0925fe/dotnet-sdk-6.0.135-osx-arm64.tar.gz"; + hash = "sha512-R2bOlU/MCbDAThs+GeVZ3JzdwFU8gPKhanf7UGoqthAEDu05DJFT8+6nYnG7W6/NaWyhvHry7JzZIE9G72acTQ=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/fee562a1-baa6-4e8f-a3dd-2c49eae8a891/564d31d1daea39179782c413f99c6160/dotnet-sdk-6.0.133-osx-arm64.tar.gz"; - sha512 = "c0193152166cefbe60a7cbdb4af7e2df365c9e67a0ce0ff5cc1aa06a46d4ffd6cccda3bf026a47116f02e4c52875fdd704aa380817dbc3eab653d30f4f5ffe20"; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/22a4f335-6027-4d0e-a3bf-8ae061a5c958/8c710aceee7279ed15e5acdcaff49589/dotnet-sdk-6.0.135-osx-x64.tar.gz"; + hash = "sha512-jyLm2pDs2qiwXu5EP+YIn+iWgto6xOjT7i7iyf5gorXxZap0TKEqCnG3HsoSXVPa/GSL6C0a7ErjOhRDzpZj+g=="; }; }; - inherit packages; + inherit commonPackages hostPackages targetPackages; }; sdk_6_0 = sdk_6_0_4xx; diff --git a/pkgs/development/compilers/dotnet/versions/7.0.nix b/pkgs/development/compilers/dotnet/versions/7.0.nix index 159d9cc23985..21fa129c3363 100644 --- a/pkgs/development/compilers/dotnet/versions/7.0.nix +++ b/pkgs/development/compilers/dotnet/versions/7.0.nix @@ -1,146 +1,208 @@ -{ buildAspNetCore, buildNetRuntime, buildNetSdk }: +{ buildAspNetCore, buildNetRuntime, buildNetSdk, fetchNupkg }: # v7.0 (eol) let - packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "7.0.20"; sha256 = "0ab1l6r77a11sk450jhhi9flvsn8gp4fz2il2a0vk1lw5rw23047"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "7.0.20"; sha256 = "050wdpwp7hjk5c9xyx0vj1cmslcdl9acldhxs6al3nx83vssa1kv"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "7.0.20"; sha256 = "0wi679cxlfx8s5nl3iqgma9nmxzbi73wamxshgpaaj2dg3z5xrqz"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "7.0.20"; sha256 = "0bgi8rx7dam9727v936h5ap81fx4k9n708002raw9v69p8yva5v6"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "7.0.20"; sha256 = "0h6f18k05w66797yyj7yqbf6jv5k3c5r089mkw43y4gbqz27vbmy"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "7.0.20"; sha256 = "1xlqjar4j0g1a7wf8ixjpnn6i19zxr3c7pwr6jdn06yzbi20ri7q"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "7.0.20"; sha256 = "0l2md2g657arlf703vf9y8x1k0zx50zf4wy4f96m6qgs9jx8s6py"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "7.0.20"; sha256 = "1r2nxc0nm2n5dc7laf65yqbjv23g9fzwcvv8vhrnvir6j3lgxfcl"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "7.0.20"; sha256 = "1n0dz6k338wmadkgb7x0jywz2qxf3427wkjw8xn2zdz4m1fcj58c"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "7.0.20"; sha256 = "05srdy7bvgasr0yx1mxkilbkls14k0dmp4mzc7jiqv7xspc4jwwn"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "7.0.20"; sha256 = "00npza90sgnvls4k1k95mhgiw5fpxcrxf60fi17k871m6igdfh1q"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "7.0.20"; sha256 = "1q86xz3v8p24728bl7sw0flhzk042ygxa23k0qyhxdn0qwzzq6bw"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "7.0.20"; sha256 = "1jjb4jsnm0f1q0s8199nympm9vifaa129l0bj4j1z94i1g85nw1w"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "7.0.20"; sha256 = "0cn8j76jbbp6vpf00kr1wwr4z1ij0sgdymawff32qvj44wfmhpnl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "7.0.20"; sha256 = "0cbk7shnry75p95zyg14pszf396pgpyjwzhraqbds5mmncqisvgz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "7.0.20"; sha256 = "02fz22di6ax1819spb4v22nb89glp3h08kk88am6rx3vgb440sbm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "7.0.20"; sha256 = "0wvg2rfp4v8cnqkfjv4ifj9q0bd3vljqnbnf719nf1h0ilmcxcjx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "7.0.20"; sha256 = "1mq59gpd6p46zl2nl5ijjncghx6fms9nig9zqhxazjd15bqy0l33"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "7.0.20"; sha256 = "01xpgbphknkjqgsbcngvckg3a8q0y74g409v7hmxsh7rjcradnqd"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "7.0.20"; sha256 = "155z494bpri732h1yba6ggmalgwxw68qjpyrbzfj9mi4whwy6p47"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "7.0.20"; sha256 = "021mg80b9x25jpdm2rc6m91wib15bb5arkxjjfa0cp509i5hnshi"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "7.0.20"; sha256 = "0jpxs82ndrbs3r28951v0p31ngfkhcs0k7plgywyvd1lpkvdm2nh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "7.0.20"; sha256 = "0bcnw653m7w7if6z84rf4k3mr7hdmvnlv4icflk0kc5jd98bkvhc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "7.0.20"; sha256 = "03107bdy4i9sckpwnk9s497sfq1prl4mccbc3mak43vbnfyqrsad"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "7.0.20"; sha256 = "1lhlaj2ra25jjr6f6rq5rw4wg981h9js7amld10ccyg2vfrswv9d"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "7.0.20"; sha256 = "1w5r2nv27h3csd5qd3sx2zmf5drrp3ygb519m4hvn5lazyfah5p6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "7.0.20"; sha256 = "0r002hclq07y275qwj5pq0nxmb6k8h8yglcynpvw8m0pz8d9mr9g"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "7.0.20"; sha256 = "0msncsn0lz0dvc6clvc4blq8a1bv5qap7qx27fdibdx24i5lsjya"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "7.0.20"; sha256 = "13x37m9mdg8pvq1rzcrr4bp5yqaayz7173p39s623n8zjxrh60ww"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "7.0.20"; sha256 = "1cv1zmkiz114vk0b0spnnczagbcks5k1fb198lc88pi3c9dpfm0d"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "7.0.20"; sha256 = "0wpf2p1476ns8xd5qvih5llswag133q4s6mj62yzbba890lg5y78"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "02iri99mhfq9awdymsqhg86pg6qfgfig2r2w96jm9lbx4gkg1rgm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "0g24nr6v86nikikfvg2b3d8im9cp1hib3xiccklbhkpbym3y98dj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "1dldykby8yfvq7r7kmlg5wi6spy1ngsxbs18ng34lcqjfxjjdnpb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "07ip7aflkg89gsbfm1w7sgidn4lvc3csrirzkbdv2jhm876bxz2y"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "13pvjwqlacls6hz719lwc6rz0ghs29gxywisldwnwwbm9i6wdnga"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "15qwwdf3c03gs916r3k49wwg411cmrf5xldydkxjjab8pavdlq0s"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "1mjwlxy5gy7k2iil1jcrssqspn3hrpm2dqwghzx9dr61wvpl6sq6"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "0dwpzaasn5044aqm2xix3czfgrwx0y0jwis6p0x8n8jdqyskpim2"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "0ai75b700v76rmqlblxpkwsd97jidfd5kn3jl0y52yq0ylvc4zyf"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "1jkh7kjhaghslhlx6x7w03kdxi1xbrgxwdj9qav0ci7nvf5j00v6"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "0k5skgnss5hknr4r15gxph54zhk65cnglp117gih8qxyzn0245m7"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "1kllpbyldix05ab1pb775ykxwh9lrcji9vqbyp964b8m68r9yf1h"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "0a5gajmkchf2ad3zwmjaa6mw72snf6hrf3xz581mn8qnjjv68whj"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "0xsyd8jvj39z99ga9x26g1fi4zi39pf3ym87fr9102bg5rllj8m6"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "18jp8cykpj40r61ji5fpvfj7yw6cw041l6r4q30am9sj80sgq73m"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "086cn7jilskr7q2hfy810f4hshzhm9r6kvd2kjzvjwf93s0qfgya"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "11y8c16m63kb1masa0x7ympwjg93ffyp4yfycd0fcf0zhzyw00bx"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "175qh1czpm8vs0ifbg3iwgz2cn3v0rvd51g1k81k6j00z9gmhrsm"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "098177bqda2viwzcabsxrpj1p45jqi5fnyfg9xnnw198gh0iskvj"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "180bkmdr4h14a8l2gs9khm835037pw8aqgjz4snx6wxhq7jbdypr"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "0jdvi1pcb3fxqa01633asixs93rg1lfq98vnba018nbqdifqyvf1"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "09can99m6psr9v93awwkahyxq899sg1l6p8gpp4qscqwpil22r4c"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "0idzsi16ny8bjhii6fwjwqn8wmy8x4q2y0zx4d1vmxfx51ym634f"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "1k5yigh196dn961bbvbyy8jfvw8ghmk4da313a304b4m9rf6q5c6"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "1rnpmqmgdw2y9snjj3kp2irg1aggkq2lccd7v4q53ghnl55jdil8"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "0xibpawi6nahdbrdcb71panhx4w5zlmbfxspwmljn2a77sy9caw7"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "07qrpww6nd67xjj3jin97jwiymyxgpm9mdg4raxs9ss0pc05l5xv"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "0dskgn19yhsq28hvzqs422bq64y5gx5cx33m1m3zq8mfycvscnsv"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "0k70cb1lh6j9qg4pjy6r58z0n5xip3l6i6vkgrdx2rqqvpmq2ky8"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "1qr458jrmsb9nijll88hp56msjmvnk20q73x7qypvqlydsn2ap3y"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "1503pddh5klr3z9kpmbxnr4w472v1w8ggh37iqi79z3b0x72zzi6"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "09ddji35a92iq9f4rm5xmz1vi3bki75xskq3iypjbc52ar7wkfl1"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "03338hfl2sb8ca9v3a42b4fgr7qyv3r2khc0ydhif45r0xjx6zrx"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "0lnm29n2z4r7kjwyfa5gbl8qc5nbbc5qkl9kg8vj2xb9mlk5zsmz"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "15ah793265ikivb5iqblcl4x86g4bqgwmhdlhikgv6a18bq32sjz"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "1jnz72f7m292863wvpmm12gwdnqwbvm45br1958f0gkgp0zmhyjs"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "18k3qs54a4x342ypc0p54ch6xwx9wpfgb5f6iyw0i0f8jjxspbay"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "0nyk8x3myh6b0jfka8mvxbhlzl38qiljky8acfkyvw4dzw0y63rb"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "0541ykf9hhc56jin59lg5iw96apcg740wg1hrj0m8dagjll2c599"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "09dlmiqcscdrvjrg9w5mjlz59ly0la4as4hkadz6j4mqvv2k7j6y"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "7.0.20"; sha256 = "11bcpf986m4wzrln9v4frh63arrg9r3vmv2lq7x338xnrwxadz8q"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "7.0.20"; sha256 = "0i07x8kwsifhzkbx1j8argx31g9dxppqwaysn21cd623d16r2g1i"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "7.0.20"; sha256 = "0aq01ld9k4064bgki4q4g4fl08i82pnh5xgxaqk3k48nbsbrzvwc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "7.0.20"; sha256 = "18an54s6jldf330ckigig6s1xnadm7zygrlb35qrhawvygbqayal"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "7.0.20"; sha256 = "1fv6p9idx6g58y0khw7jl23lkwj01l8246mv045i9q6sp3fm9m2v"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "7.0.20"; sha256 = "0qfv5w1s5pj3c46jx2g75parx12p40rywacvb7v0fbllj2nvm89r"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "7.0.20"; sha256 = "10d13b4vl5nhk3iqcpbhdhqgwmymzx875w4yq3pwjkcc2vyhg3j5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "7.0.20"; sha256 = "1rbl46pfwh1hkbf5djy1khqyiv2fivkgxs0gcnpx0kpx4lncf73a"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "7.0.20"; sha256 = "03760jw9bbhcg5gmx5z5xjyccl0sv1lzznk3hx2ynwrwg6dhbkyi"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "7.0.20"; sha256 = "1gw4wlraqbr5m5w62wyfx7gsvyj92a8h7i04n9jgc6sfs4yfrsz4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "7.0.20"; sha256 = "0fcph5pd0myyzzl3ihnvp6wii4vl09ayri5ba12xgixb3qidskgp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "7.0.20"; sha256 = "1zxpbwc52xsylc6kwk0sqf24cgyv9b2cz9l3icpl1hnkqims9xy4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "7.0.20"; sha256 = "1jhw9f2mzx8a1bqdiq7ylk8nccwcqa57sd31ykd7lzq1wbhy2r45"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "11l84kx7v6y10kzlsr74kwvvz44wzj476m5mkm2xv2b8pv1z0i7z"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "11xxvyals3q16bzjd7a4gg0nzidsm822aa92yd752jzcxchdn6z0"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "0dg1m80mxvabdkqjgynnws6vlzj9469d5nrjnk5x2zqcsw9kjj08"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "0rdq3z66azlwsak8n8j9jz8pj0lwsvz9f7n6k7x6mlz20wcw4qs6"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "02ymh38rj3pwak3g9qhviv64kqpclcp40paijg7m184y5bli68b3"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "0s9bca6p8j96as25r22vbcmyyhbavkczdk68ypd7qn4g1s44l34w"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "1mi25ilkzw9375lybrmi78g24xzmcz7mnqgjf8y9qvivwsf7ysgn"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "15jfwa5fva8qz6g2gnbxnppd9cfs7r8fspc9xb7n9zgxl7w5n6gd"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "7.0.20"; sha256 = "1xvhyafgxaraf97s364a3jk5dad4hsssqqvzx4i8qwg36fdijcq2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "7.0.20"; sha256 = "1r27bm12x9gwzv0cid1fdzx9hv9bdy6p6a65lypjzvgwfdgnyksv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "7.0.20"; sha256 = "039l3qdsz3ima2jgvp8nqby68cr9mvj8q2xd0lmx37drxvck7bx4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "7.0.20"; sha256 = "05zybhb8dc22f934gj3f55xvsfvqizq0nf4d29ns3z9d370jklp3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "7.0.20"; sha256 = "01rrnbwjpy138pra53ypixk3cr528fazjsl3vsrvf6jnymgxlb4y"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "7.0.20"; sha256 = "0g09yyi0a00q9xa51p1k9hvdj20jmy1ss2r2l28zk9s7lwyih7kl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "7.0.20"; sha256 = "09kb949p1qc6rz6mf736id8qfsj6dq8azbrpzx19xzpnylqjch47"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "7.0.20"; sha256 = "0l76v2w34igvh6i2hgvhfwmkcch1574ylwl1159649pg7c95kj7c"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "7.0.20"; sha256 = "1jj2mzcn1dd66fic37wnyrvd07fplrsdj4azrvi0qz3qyykc8wmj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "7.0.20"; sha256 = "0q8i69qc58kyxzxfz0cqjlbjcz1n3p130nz2q852rvvcxa4644zc"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "09xk16nb9wrsgjr531dhd7mvpqa7b50akmkqrlndyspma7cbvrzn"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "0l82bqvqw5qqhkgrxfscc4dw197b5sh7ic63pymdhixvx0d3fi1h"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "18sarln3kbkqc1ab9jnadcqqxs8iicf7jqldxzbjzhdpmf96vwna"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "1vh3ymhv33qysc4vj4gb3g1rgajy4jr4kxfjcsq2myn96aan84i1"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "7.0.20"; sha256 = "12w9hlq70ynkrgqbr555lnqmbf67iz3kaci2vi07zsn3mmak3z6j"; }) - (fetchNuGet { pname = "Microsoft.DotNet.ILCompiler"; version = "7.0.20"; sha256 = "0c966243j6m22hy3n922rl64vi6y1l7ljn69bwydm5clyh7zvn0a"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; sha256 = "11c31fzq4qfxcsz3p6vzdfnaqs29saf1dnmzq7l90p6ylwsblc7f"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; sha256 = "087q3p57snmvvzzqpxp3vwvi2q21kzlk8qh1w6axrcjdci31xmji"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; sha256 = "1nc8m38jsqai934nn26f6dkl3c0r4sabssjiizcixdyypzlv3hcf"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; sha256 = "0iyn0rkf9vf7vbd58xs24209557dzq1dppjb5d35g39z2kh06k1c"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; sha256 = "1b0ys3g3bg9kxxvs1h1kj79b9n9nl2g6hjhmb3c2cpp4slzlsd3d"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; sha256 = "14nq8b869k43chsn4ba3b3ww9w25fip39ik8rfxa1z8l5k4k6xb0"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; sha256 = "1gajqvzf18p0jppvcwky0shkmw4nzwz8hzx4kwblrs41d8xmw39a"; }) + commonPackages = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Ref"; version = "7.0.20"; hash = "sha256-OEDXXjQ1HDRPiA4Y1zPr1xUeH6wlzTCJpts+DZL61wI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; hash = "sha256-9eXw5iN90VSlSVxk8aJ7Dpt3DXoQ6+obVwk7WFOKOQo="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Ref"; version = "7.0.20"; hash = "sha256-W9RU3bja4BQLAbsaIhANQPJJh6DycDiBR+WZ3mK6Zrs="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetHost"; version = "7.0.20"; hash = "sha256-sqHkR/XrTrjoZCz2sSIMl6UaURtLvO1mnNEatE22RDw="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha256-69omZXcSM0rGsyjo1fWzwV9tIi+P1nnywdt55Nf0jbY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha256-Xvy+zEEVSrHbmj/HrNlgmxLb4tOHh+qWfgm9SZ06Nx4="; }) + (fetchNupkg { pname = "Microsoft.DotNet.ILCompiler"; version = "7.0.20"; hash = "sha256-Ctj9D/SUldo8X8lYSQ8N3sRNDM1CJDs8FKIaOYgwJjE="; }) ]; + + hostPackages = { + linux-arm = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "7.0.20"; hash = "sha256-49IpwRkt/aFtEo04C/CPeDu9eyluyEdGckKwhhZc/hc="; }) + ]; + linux-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "7.0.20"; hash = "sha256-nizaX/VWGrez3oNq+ZVDomQ2Zo/Xj6LyRSP4K/myOQc="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; hash = "sha256-7jC6NKfeXJDowb/aFpzSSWisrGt/mzu+Zt1hgr8Lg4U="; }) + ]; + linux-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "7.0.20"; hash = "sha256-dB4YPadHp/mRoCILrYOvEgjZNkwz3FBUTxgABaL3CTw="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; hash = "sha256-LEwD4BQ/jVdGK0ve2wL+7ZSSgCBCd1Ta2sft5GYG1kc="; }) + ]; + linux-musl-arm = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "7.0.20"; hash = "sha256-AjMZmzPjcYwi6X9jrLWGpKlWphyKmKFPciqr/pzycPc="; }) + ]; + linux-musl-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "7.0.20"; hash = "sha256-W09vX3P87S+vp8Uoc41vK22Y+m8utMjA/vylLkJdR+Q="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; hash = "sha256-UdYeRmRNstyV4QFiNOmfQWARN9/j9ov/37tafcod+CA="; }) + ]; + linux-musl-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "7.0.20"; hash = "sha256-pK8z2e65ndErBa0LjOSuKTNk/MIW3f2kUDWOrxseNA0="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; hash = "sha256-jsGx6b/etx7Zj1FqvZQmGbBBZzPOCGvJSFFhLdGoiNk="; }) + ]; + osx-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "7.0.20"; hash = "sha256-7MhZEjvvJmJSCYFy6skpATI2K3dwPyiigftFMrjY5lA="; }) + ]; + osx-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "7.0.20"; hash = "sha256-h0AmMfX2/p5C/zevrxBuRmqHUYtmHFfNz4bhcBNJayY="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; hash = "sha256-bTRNP9XkXibYWBVKaJ6gNtm00pEzwKB37zO9Nd7QHqw="; }) + ]; + win-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-arm64"; version = "7.0.20"; hash = "sha256-dXex6q5gQcBJ5Xccf27GxrTAvTlJyTC5i9Ln0IWBjJA="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; hash = "sha256-YHUzySwU/aC6y2jGNG50RfDE+VhDLWI1ZIPMZNBC2JI="; }) + ]; + win-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x64"; version = "7.0.20"; hash = "sha256-5nZu1DgEqIy5HufEOE/4wyXuVyUWSozmpMh/+kqt95A="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; hash = "sha256-Kg1eO2qB6EwXn6R/iD7/lvA6oQZ+crbvleCi4P7GUr0="; }) + ]; + win-x86 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x86"; version = "7.0.20"; hash = "sha256-T6M4ND0K6i9CI5g08rgaPpECR2968YsJ2+2N2FsKYz4="; }) + ]; + }; + + targetPackages = { + linux-arm = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "7.0.20"; hash = "sha256-h4AheC6chrmBEjSK78h9yOpNXYoQSlDI1CGoc7KhYSk="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "7.0.20"; hash = "sha256-1F5YHSdEbiyGc1xV354GMoZPMuchTwDc3eauJc2RyDI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "7.0.20"; hash = "sha256-DO65UGqysAkmdSySTe2uDZ5cxyQuE/SNi4efOorhli0="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; hash = "sha256-zn/CNvUAe1E8oHLYWZprUZ7UNJ+300VxzeZsAM4qJyo="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; hash = "sha256-ZgMgi9v2RAa2wkk23l9ePcTe5gD8dNMppBo+BeU8cMo="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha256-pxYigP2+YwTjOyFc+iwrZsJPCrz9lZBJthMWre2bukw="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha256-MDifMjIVLWLS9QvvFCXLNEHepy/nrBuWKqDHRv26lM4="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "7.0.20"; hash = "sha256-OaG6rZCULgf2WZsp7jMgV4Se1S3niS4NYUPeogMv22E="; }) + ]; + linux-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "7.0.20"; hash = "sha256-ewal9R6o20GV0R02ylSijVFdWZAbdN8TK1PCc/ltHBQ="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "7.0.20"; hash = "sha256-/20dMbO1Ft0WVhl+Lv1916Thvr4kPP9LuuX4bKE+czE="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "7.0.20"; hash = "sha256-TemMvbNrDzJVHWwxVgnNN2CnTyI6TcvvZDpF4ts6IAw="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; hash = "sha256-6tnGTUx1cW55ozpy318SGj7ws2GcpnA+NJoyRTGX+44="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; hash = "sha256-GmDatrpoKSn7bL7RXlyuLATyOE9kjmxC0m8ANlzjHJc="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha256-BmtD7+bB5Jb6h4/jJurNcNirsdaZyUBjFPP4V3ynXNY="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha256-osY7tcdNIos6uEZHLoEHnefnPhs9dlGxIgQUq5X6lzc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "7.0.20"; hash = "sha256-RY4H/RaMTcnvwJ7wclD/1Vf+MGxwXYbjmNAWuskaoYE="; }) + ]; + linux-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "7.0.20"; hash = "sha256-vq59xMfrET8InzUhkAsbs2xp3ML+SO9POsbwAiYKzkA="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "7.0.20"; hash = "sha256-Y1Dg8Sqhya86xD+9aJOuznT4mJUyFmoF/YZc0+5LBdc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "7.0.20"; hash = "sha256-L+WaGvoXVMT3tZ7R5xFE06zaLcC3SI7LEf4ATBkUAGQ="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; hash = "sha256-wW2PXWx4WRSAWnajhB0NL4+ke9RqDBOAwt2NxW6Iu0k="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; hash = "sha256-jGQhaLwcM43JvQ9dQ8PTKSHcPVSTczXSTllfU1OyiiU="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha256-jgxTfSjd9bpDI/0DLzDpyFeOLOaSOxMjlAt5a0LUv0U="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha256-hhVsXE6VLAKGGmGoRmaFD/HtJPJ+7bWCSbaZFOCLvsw="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "7.0.20"; hash = "sha256-0c8Fm3k8c+tFh2Pa/2nYGlDGvOzll15feQyulbgE5gw="; }) + ]; + linux-musl-arm = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "7.0.20"; hash = "sha256-fBn8P8fAtg49BnMI1Z8XBMwPqQNcH7qQOERctMfvBuE="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "7.0.20"; hash = "sha256-GP2mOs+2ozH6wVTsukdOL2c1DMyO7GRp/pxUg5K7bIU="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "7.0.20"; hash = "sha256-jO+fl14WkTkmVv31Au0VKCJAHXkEkzjfIgaQmRoNACs="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; hash = "sha256-/0Tww75oid1FnbVUc4j8nJC/N5/kZE3/BMGbffokiIY="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; hash = "sha256-4BvbIOvsS1FO8yIpJQSqusVvwXtEnSb/MgEPTZXfvYc="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha256-CEg5E9cMf9HLtDLb0pIhSX66jebW+ifxbEvtXgGq4TU="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha256-RmPCGQfi02r6mcYel/7WnAJ50ZdJIoum0px+ZcwfuGU="; }) + ]; + linux-musl-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "7.0.20"; hash = "sha256-H+de/nhNSKXug7pXxceJ6/dqk6oPx0Ft0ag72lk6JnI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "7.0.20"; hash = "sha256-dWlAyHp79GyqQmhOBOC49CW0rBCbrKtTQKErE5sQ3wk="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "7.0.20"; hash = "sha256-LW2us9viecZAaLSqo2WCAaXHCc8FZ+NMlrIIlYVUFNI="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; hash = "sha256-EnJktpQWI1sDKr8Pl6FxVovDq1FKVv5HU8JBNqtUryg="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; hash = "sha256-piJJaS5vCRBSdgdVP9xNI34SXXhG9KReSj8NuSVqXnc="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha256-dRz8NEBSp6rAwCQbGgjgzHB/pNvXlSiDyYDIOz1DV6I="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha256-yj+HgR7Jcbm/nKLtaXKq8EMNiQMBeQcFPnlqGuWxzCA="; }) + ]; + linux-musl-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "7.0.20"; hash = "sha256-Zhe1PbrJ7MRVFgAgcGyapLuArirQjLSPOKmqdnpG8S0="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "7.0.20"; hash = "sha256-XbLOKo0ABmdTOM4uiyXdoy2Ak3SRbOkmtgxtcl0Wb3M="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "7.0.20"; hash = "sha256-5haonP+KFrshqSmU9fy4Obfi6hddj4ZL02zAI7YVufA="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; hash = "sha256-fQHA/YcfOOZAY955cr1zIz3Jb/WnA6VVDWsOU01gyIc="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; hash = "sha256-VWdYX/oASDMDmuGF0nYGe1gm/uNxvOUi0BvV+1mAuJw="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha256-ck8dAXwoBW5tT89560rEspAb5M1dL8U+j1uohtc5ASU="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha256-+fq25MGwc9OtJl8+rBC/Z4AyUIUz6ScoUiRAkludC6A="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "7.0.20"; hash = "sha256-ahzHLCX9TtCvZQ/o/uaOTuzoMZzBy1bcmjBA7q4hdOU="; }) + ]; + osx-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "7.0.20"; hash = "sha256-PHBb0AuRpB8kkQvQJIJSLu5Ub/U2pYA0wMGBarUkS8o="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "7.0.20"; hash = "sha256-MTyRTWhDmMaCsNorju/tLb0w+ssKydDX/NBFzSfqB0Q="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "7.0.20"; hash = "sha256-VHmF1/ObK5hxGYvm5/+pTdketHnxxcnAGK5RaTQpVqE="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; hash = "sha256-YyET6SqeoFDPk1FdQC6j7OJJzI4b4vTGVPwOmdGA1Qs="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; hash = "sha256-nAxKiA6PWHza9cjM9tncakHvK1tbiFyEViZJdI1iK2k="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha256-9ml/nOY7bpw8cvJhW89n9XciHjqx5uVpOSPxP2ksItY="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha256-7Rlb+KH9/WTP6old7VA+2rHU7rV92See+Rip7YriTpY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "7.0.20"; hash = "sha256-5OvsPNFOG/ZksgTEA5ESSfqt3+nOc2F4qSUvrDLlhL8="; }) + ]; + osx-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "7.0.20"; hash = "sha256-+MQMRFzfG2CbNJnfw0buP4VorL2yR+T4UeEBSbKSmPY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "7.0.20"; hash = "sha256-DdumMpP5QN0rPDsB8sjxACM13mT7Wbb0w3LaCe96twc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "7.0.20"; hash = "sha256-yktNSySitxWbO6LjcxUuewWFMF2EbcoM2w18CqxmVlc="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; hash = "sha256-iMYmS6EWvlEw2acxRgWe76nwchR3DimtTl7w9iqu1+Y="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; hash = "sha256-hyuWvD5HCStp5Vd3tyr9hZMOrbrhLNbyalBZE7m6K3Y="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha256-uxdaALtA66S7yuS1mup93VcfuTzJRjmk7Mc0azi/GR8="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha256-W1umN/OuIvxHDXWMzkp/xRODlxBE478hElhDn4J9Uzc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "7.0.20"; hash = "sha256-903dIh6rx9dFUKvE7FUCdJMYubnbwjjo/95X0G6Blzk="; }) + ]; + win-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "7.0.20"; hash = "sha256-/hqNukz6YVNNcsRz4j4o/YMZOvLJ7QGOo1mdYp5oVVA="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "7.0.20"; hash = "sha256-h1zjOeQk1iTdX9lfiZHhnT+q6ntGLR+gGCfmu0giv5Q="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "7.0.20"; hash = "sha256-nAMDc5cf2SGMTuOOE873SmFf7iI5s58D3he9VlM9o48="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; hash = "sha256-yE+B690YZ9FbfnObaOi4sRcLPirZeHnJw0kaSMNi4Ew="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; hash = "sha256-flwlrG6e4n09Pn0cDMS0u0pdTbkQIUpltGnpmiUqJOM="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha256-Jv4vTgdr/HQijmfA9xAPWxzCSbZ91TvTH5nOAlu7A5Q="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha256-gbrJT1aisCWvjwNP3cuJc424w6+91ExcwlEkVUaUrSU="; }) + ]; + win-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "7.0.20"; hash = "sha256-lLn+6JAmx20z3Ghvxr9Lb4gtF/bFOEUPa8WKagHrVuQ="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "7.0.20"; hash = "sha256-EWoLS0ygXAaUk7LPrMpaJazIQ6qGZVHblUX0tAB6NQg="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "7.0.20"; hash = "sha256-DVR3W2IjXoQYRSksF2bRk62nPrP2arDA3CSEH2f9YbM="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; hash = "sha256-PX/TZQe5EBdh84DBKfLYHp/8HFmCqLGTYmhpQR1EYww="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; hash = "sha256-v+pfJq1pdSE3ejPRiQtbyxaGEV2vKOe5nCeTL2wS1VI="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha256-X2ox8EJBmf1mhLTByh9e5BnUCWV04VjWjjMWI0Y6UJU="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha256-WnpYP7hvPuBQSSGvQupeHNvGnwi13s2HQSKJepw438o="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "7.0.20"; hash = "sha256-xPeka8TTwkAvi4Omz8RK2z9GhMMaTD4No153URhft/8="; }) + ]; + win-x86 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "7.0.20"; hash = "sha256-DBXJXKjkty9sR1xOfgQZrmPxuZegn/VmU5WjMab5Ddg="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "7.0.20"; hash = "sha256-0Ira9rw0tO25f/SeCTSD0z0bxgU7lIREHnrlZgXS/Uo="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "7.0.20"; hash = "sha256-6PjyKEhIrfW9MLIaTfAY4SmuKS0wblxaR9qaQ8IV7nI="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; hash = "sha256-Xq2ru5TIgQi4j8aV9dzlqfNuICPlAna9IKMTRYrGY6I="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; hash = "sha256-Kw/jAf+N8O2nYwr5KWnEaNBP4eq7IjWdBMtAX0dH01s="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; hash = "sha256-KRUmKJVPNVSBzDA8Dsh57CqTeCyPpmKjNIVBmNz0gRQ="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; hash = "sha256-3sgzxd64Eml+UxMSrYiiwNNUPpW18PSy3LkxzXCstCU="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "7.0.20"; hash = "sha256-hWTh4eIBf3ra9GE0fYrCjDNm0aT+4NjwCgr1X4VLHMo="; }) + ]; + }; + in rec { release_7_0 = "7.0.20"; aspnetcore_7_0 = buildAspNetCore { version = "7.0.20"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/09e67261-215a-4003-bcf8-f90d67dcd02b/b32cf12a5c10b1f74e21c8cb03880891/aspnetcore-runtime-7.0.20-linux-x64.tar.gz"; - sha512 = "62ed9743972043a72e48d5aa2f7fdf3483cf684a32b051315004d1c778e9712bf66e5e7a97a5a53993fa8e92daf5bacaf2cdb3eae44bb9a9e25532b9a80f4f70"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/7e8680cf-0baa-4957-99b7-81395b8ff60d/5a9c578ff9aaefc7ed77e63b6a90dc03/aspnetcore-runtime-7.0.20-linux-arm.tar.gz"; + hash = "sha512-6Cuw8dUtkf6mvtQZoYVhKC7Q6d425WTmQeKWyRf39l/HVVzMBG/tZ1rWe058UKcPD0joVZ/08qm7rSvGLc9qsw=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/ae3027ce-cadf-4510-a1aa-125958cf0432/c3d958ba80ec21e9d75ca5e8f43ec2d3/aspnetcore-runtime-7.0.20-linux-arm64.tar.gz"; + hash = "sha512-37HBvvTYJt79PZlVmaXAPhvxpkxl2YtnXWwF27c4DZgjOVPmjVP8Xr7GCtTvdUFwc/sfsyVqAXa7lk8OARYfbA=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/09e67261-215a-4003-bcf8-f90d67dcd02b/b32cf12a5c10b1f74e21c8cb03880891/aspnetcore-runtime-7.0.20-linux-x64.tar.gz"; + hash = "sha512-Yu2XQ5cgQ6cuSNWqL3/fNIPPaEoysFExUATRx3jpcSv2bl56l6WlOZP6jpLa9brK8s2z6uRLuaniVTK5qA9PcA=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/ae3027ce-cadf-4510-a1aa-125958cf0432/c3d958ba80ec21e9d75ca5e8f43ec2d3/aspnetcore-runtime-7.0.20-linux-arm64.tar.gz"; - sha512 = "dfb1c1bef4d826defd3d995599a5c03e1bf1a64c65d98b675d6c05dbb7380d98233953e68d53fc5ebec60ad4ef75417073fb1fb3256a0176bb964f0e01161f6c"; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/40131679-906c-4afd-90f0-576fbed036b1/85a0c856077ad82c29350486ebdb912d/aspnetcore-runtime-7.0.20-linux-musl-arm.tar.gz"; + hash = "sha512-yoTg7/BS1Ft/qa/Ypo8dViZBVbUHiBEF0gaWmSIFe/MyiVo8OioXAmSORnEvAiV02Trhh8j9JhD4OSkJVoq/Vg=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/65fff3f3-1b87-42aa-b1f9-04e7e318c1af/4bfbb002455b9a037e75791e99a18c19/aspnetcore-runtime-7.0.20-osx-x64.tar.gz"; - sha512 = "00677819450d14d9adc2b65f25b9a069bc2b43f72e4db651e77fe0e48320be8eb7c555277281de968e75d0fb19bef960d4dcb27161b8c57bce076ee18bb5ca98"; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/6ef9e16e-9a83-401e-8ef5-905ef374b768/725507d68a8bc4a4297e2c82bb1d06db/aspnetcore-runtime-7.0.20-linux-musl-arm64.tar.gz"; + hash = "sha512-ZUBuFxSjEX2qNCs/0NvNXDIUMVYR6su9hYCCf2mgepSAUwMgukBpKj1tv/gy2SmhQgB58dswyj/Wem/QNRSdBA=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/2833b957-8fb7-45fa-bf85-4960260ae344/fa4678e8c3ceba67771b5195a2343049/aspnetcore-runtime-7.0.20-osx-arm64.tar.gz"; - sha512 = "7de161ea45faef7693d78ca44b585ab73fc183232d3f8d229fde3d05d696818d8d6402ac7ac86ce239a0a6cdae8fc2eafbb445e99443d0c7a4aab3781df35be6"; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/a3f5953c-68f8-48e1-91bb-0ca62199e6db/b3d7a2de0488fd63fa286c3fc371d68f/aspnetcore-runtime-7.0.20-linux-musl-x64.tar.gz"; + hash = "sha512-qA8xGTr3DVVujQJtOdeYY8g4mwZf4HeOe0Ng99H202UDulJzbEDnSnFsPDBQCxhYFu1g15sGrilXVLZzdKH6RQ=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/2833b957-8fb7-45fa-bf85-4960260ae344/fa4678e8c3ceba67771b5195a2343049/aspnetcore-runtime-7.0.20-osx-arm64.tar.gz"; + hash = "sha512-feFh6kX673aT14ykS1hatz/BgyMtP40in949BdaWgY2NZAKseshs4jmgps2uj8Lq+7RF6ZRD0MekqrN4HfNb5g=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/65fff3f3-1b87-42aa-b1f9-04e7e318c1af/4bfbb002455b9a037e75791e99a18c19/aspnetcore-runtime-7.0.20-osx-x64.tar.gz"; + hash = "sha512-AGd4GUUNFNmtwrZfJbmgabwrQ/cuTbZR53/g5IMgvo63xVUncoHelo510PsZvvlg1NyycWG4xXvOB27hi7XKmA=="; }; }; }; @@ -148,21 +210,37 @@ in rec { runtime_7_0 = buildNetRuntime { version = "7.0.20"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/2c5981ff-0f0c-47ab-bff4-0ea4919b395b/cbfdfa7f35d133b0bdef87fa3830bfa0/dotnet-runtime-7.0.20-linux-x64.tar.gz"; - sha512 = "87855297338555a7b577d7e314e5dbf2c2350f8c867a489cd1e535634bad5c123a1871464d37fc9421837ff5d426c2eadecbe0f60bbf3fd32bc2461f47790a40"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/06e8869b-e332-411b-aea2-7e29daae6953/6b8f60cbb630acd5d94219faa15faf6f/dotnet-runtime-7.0.20-linux-arm.tar.gz"; + hash = "sha512-okqnr+R45ir052xA5j5eXoMkqwHZrZz/MYMkXN63CGH/wRjJq9qfLy/tQjc1yieqwVvsjMX8NS8FvVtyYmWEmg=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/af6e12de-a63c-449f-b35b-b72ec6ee3da5/ae129eca3d734117d14cd5965dca93a3/dotnet-runtime-7.0.20-linux-arm64.tar.gz"; + hash = "sha512-wkUSXuJwglIRmhVEVW4aqeAKoYsjA95ph32hDGwX4/JQJLdJypO1O+du4Ojkp11AP3AZuLwuUO0SePZWyy9+Bg=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/2c5981ff-0f0c-47ab-bff4-0ea4919b395b/cbfdfa7f35d133b0bdef87fa3830bfa0/dotnet-runtime-7.0.20-linux-x64.tar.gz"; + hash = "sha512-h4VSlzOFVae1d9fjFOXb8sI1D4yGekic0eU1Y0utXBI6GHFGTTf8lCGDf/XUJsLq3svg9gu/P9MrwkYfR3kKQA=="; + }; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/7d1ca778-4415-451e-873a-dc4062d8d9a9/f38f41e5784c0832e24fe18a938ed5e5/dotnet-runtime-7.0.20-linux-musl-arm.tar.gz"; + hash = "sha512-JczDc9HEwOt0HgSMb9SDZjELNqxvBoxQ9rwBNCoABGQUToRX5+G2zPbZlUTUkUAi78uCTnVjZRe79hyUhSzddA=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/c30b2e10-7c18-447c-b66b-47bf12f88692/0d5fbdecc6b2cc86fd2f43ebfffd7aa2/dotnet-runtime-7.0.20-linux-musl-arm64.tar.gz"; + hash = "sha512-VSynNGf4BD01HCDXHflbqWOzLox1cG329dP85SXz798TFN8pbET77a1VdXguN2M5mKebLCP390IPgU7iSI8wog=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/af6e12de-a63c-449f-b35b-b72ec6ee3da5/ae129eca3d734117d14cd5965dca93a3/dotnet-runtime-7.0.20-linux-arm64.tar.gz"; - sha512 = "c245125ee2708252119a1544556e1aa9e00aa18b2303de69877da10c6c17e3f25024b749ca93b53be76ee0e8e4a75d403f7019b8bc2e50ed1278f656cb2f7e06"; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/3297a5d6-9f41-4098-9597-c1b966c19983/46559d0d813b36264fb414562caca171/dotnet-runtime-7.0.20-linux-musl-x64.tar.gz"; + hash = "sha512-MbnaCNYzzQAo6wjDbuLFw8sb5tPF4BDIWuKRSW/l6Bi1vln11Hr/hu2TnCYPdi5X/waTSk0JVDdpNbGtx5nxvw=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/cbade9d9-be1e-46c0-9f90-13ba882965dc/31c86e8f4beaf0e5ad9ad35a408be7de/dotnet-runtime-7.0.20-osx-x64.tar.gz"; - sha512 = "acdcde92f2f2e43584ee59be447f778f4a152c308975c7bdc5c2372b5bbd3092eb9d2233aec3b82756ba1e352a0877ffc17e4c8cfb20a9de91ca6db54d79b591"; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/50dbf5c1-942d-4fd8-b646-1f024326ec1c/5fb99e9dae294298a8131757b3ea829e/dotnet-runtime-7.0.20-osx-arm64.tar.gz"; + hash = "sha512-rxy2LinGlkjr4zTmUcJwPNXof6C7KMZwuss7PdFgiurjWuU0AsXrTti/NKvYMaCMy174Tl7HBhfZ+NmWn+e4+g=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/50dbf5c1-942d-4fd8-b646-1f024326ec1c/5fb99e9dae294298a8131757b3ea829e/dotnet-runtime-7.0.20-osx-arm64.tar.gz"; - sha512 = "af1cb62e29c69648ebe334e651c2703cd5e87fa0bb28c670bacb3b3dd1608aeae35ae53402c5eb4ed8bf34abd831a08ccb5ef84e5ec70617d9f8d9969fe7b8fa"; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/cbade9d9-be1e-46c0-9f90-13ba882965dc/31c86e8f4beaf0e5ad9ad35a408be7de/dotnet-runtime-7.0.20-osx-x64.tar.gz"; + hash = "sha512-rNzekvLy5DWE7lm+RH93j0oVLDCJdce9xcI3K1u9MJLrnSIzrsO4J1a6HjUqCHf/wX5MjPsgqd6Rym21TXm1kQ=="; }; }; }; @@ -170,70 +248,118 @@ in rec { sdk_7_0_4xx = buildNetSdk { version = "7.0.410"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/0ddc1522-2361-4394-97e9-52318bf51951/c5aef30601a86810f1f8ea89d42c26a0/dotnet-sdk-7.0.410-linux-x64.tar.gz"; - sha512 = "20b8e02979328e4c4a14493f7791ed419aabd0175233db80cd60e2c004b829b3e8301281ea86b27ba818372473accf5a6d553e5354c54917c8e84d25f5855caa"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/4b1d565b-7a3d-4e7e-87ad-7c662ec59020/4c6cb8a150efb42f7cea7e0b4c2f61cf/dotnet-sdk-7.0.410-linux-arm.tar.gz"; + hash = "sha512-lbY5oUddm3Y31BoUwMqzmTs6K0vmPb8lH/74QEYcUdnV7NeO8JyFf+KDmRVfekBEngjHozzgiFDE4Y76q6tFrA=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/3e408891-74af-4ccb-9ce8-895f6806a97d/3a589bbf6e264059544cef47be672540/dotnet-sdk-7.0.410-linux-arm64.tar.gz"; - sha512 = "2db6a3b9a532d2f59a2b459e634206913a9585c821f3f578a421e3bae346a92dd9b85b76ebde343ca3057275f7ec4d0bca71cbb7f2badb6dcdb516244e84da46"; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/3e408891-74af-4ccb-9ce8-895f6806a97d/3a589bbf6e264059544cef47be672540/dotnet-sdk-7.0.410-linux-arm64.tar.gz"; + hash = "sha512-LbajuaUy0vWaK0WeY0IGkTqVhcgh8/V4pCHjuuNGqS3ZuFt26940PKMFcnX37E0LynHLt/K6223NtRYkToTaRg=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/fc8614cd-f333-4adb-815a-9bbd07e02b16/0ccf5e50cf8fa5c600716395e240aff1/dotnet-sdk-7.0.410-osx-x64.tar.gz"; - sha512 = "782e15c19ce20aa8333566f23c2d3cdb8e89c7626de6330ddf670c4426e30cc854e44ff3341578622aecf210fa66ddcb63a7d2ad629ed92cb5582ab670f953d2"; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/0ddc1522-2361-4394-97e9-52318bf51951/c5aef30601a86810f1f8ea89d42c26a0/dotnet-sdk-7.0.410-linux-x64.tar.gz"; + hash = "sha512-ILjgKXkyjkxKFEk/d5HtQZqr0BdSM9uAzWDiwAS4KbPoMBKB6oaye6gYNyRzrM9abVU+U1TFSRfI6E0l9YVcqg=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/bfba06ea-d182-4a12-8066-fd78413e6cc3/f7940d1e8d8ae641a3a3d65b6bfa1071/dotnet-sdk-7.0.410-osx-arm64.tar.gz"; - sha512 = "c0ef1914f2b298504433bca9cdab02dcf324421ece39657b66523f13b7a7166e726783673a602fb462f3db5c53f59a89381b918e7658d49a57763b43cf75cedc"; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/fb542b02-38a4-4564-bc66-d7822758cf1c/d18f1e24ef1b3cdb4ef10bc641ce9a5b/dotnet-sdk-7.0.410-linux-musl-arm.tar.gz"; + hash = "sha512-x7Gc3yExJkVv5/IBcf+/XMQXcjBbR9jQbGRhKlCeiRMSZAXKjqW2T5P/TSz+op+hKGcdQO8jrWadi0coIjjfwQ=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/7e1f9446-53ee-469e-8dde-cc307306ac61/bce850d1c118b4b6dcf9f808b22a8a54/dotnet-sdk-7.0.410-linux-musl-arm64.tar.gz"; + hash = "sha512-O+6089U2DMm8Fzm2kCj1grZqajhMlmj/EqD9ucKfktx1e3sXs9/MgeVQP5razNe56lSQ+OFinN2Y4bRZKbaS3Q=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/6d16b077-939f-435d-8f2e-11813d76db6b/ba4829249b04d6c818bc175846e694b5/dotnet-sdk-7.0.410-linux-musl-x64.tar.gz"; + hash = "sha512-Y0W6gTmvQteoMwtaXhfHGz4GgGZWEAbGi/4r+1wavSiS8NkD+3rrwqU22Ee8End4DNZR+lMTMMFvowKgdstUFQ=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/bfba06ea-d182-4a12-8066-fd78413e6cc3/f7940d1e8d8ae641a3a3d65b6bfa1071/dotnet-sdk-7.0.410-osx-arm64.tar.gz"; + hash = "sha512-wO8ZFPKymFBEM7ypzasC3PMkQh7OOWV7ZlI/E7enFm5yZ4NnOmAvtGLz21xT9ZqJOBuRjnZY1JpXdjtDz3XO3A=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/fc8614cd-f333-4adb-815a-9bbd07e02b16/0ccf5e50cf8fa5c600716395e240aff1/dotnet-sdk-7.0.410-osx-x64.tar.gz"; + hash = "sha512-eC4VwZziCqgzNWbyPC08246Jx2Jt5jMN32cMRCbjDMhU5E/zNBV4Yirs8hD6Zt3LY6fSrWKe2Sy1WCq2cPlT0g=="; }; }; - inherit packages; + inherit commonPackages hostPackages targetPackages; }; sdk_7_0_3xx = buildNetSdk { version = "7.0.317"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/3207f51e-26ad-4d43-9249-5e03e93e5895/af409554ce918557a05f8e8102f199ea/dotnet-sdk-7.0.317-linux-x64.tar.gz"; - sha512 = "906ecbfa31b10ae5e2a8ba713d113ccd83e3a9b9e4d3e322482692891542959e76c51db5dd3825fb4a2cf1e951737006a99be7290f309d6822567d3a533a7a9e"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/8aacc3f6-bf06-4cb1-ba10-ea76c29bf550/7c657ce9fbaf35843a30a34a7ba0e3c9/dotnet-sdk-7.0.317-linux-arm.tar.gz"; + hash = "sha512-S1DHTRWHGrRc9/0Bb6BR8Dg/AJX5G07ycQUCgY4vn2kCO00A1YTvd9gYeujpWo0pI7PQPr4qP/cKkQntEvdI/w=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/e08e38c2-46b5-45ba-b318-6b0949b3cc2b/1780549adba82e521439b7a0511229ef/dotnet-sdk-7.0.317-linux-arm64.tar.gz"; + hash = "sha512-Irrc2yy6Dxvtsfy9yZJppmoBojIZPgC0KCOAbO5dRhlLjdAIpT4XRVBypBD3e9NRZ281FnC+lsE1ctjjDPrRgA=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/3207f51e-26ad-4d43-9249-5e03e93e5895/af409554ce918557a05f8e8102f199ea/dotnet-sdk-7.0.317-linux-x64.tar.gz"; + hash = "sha512-kG7L+jGxCuXiqLpxPRE8zYPjqbnk0+MiSCaSiRVClZ52xR213Tgl+0os8elRc3AGqZvnKQ8wnWgiVn06Uzp6ng=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/e08e38c2-46b5-45ba-b318-6b0949b3cc2b/1780549adba82e521439b7a0511229ef/dotnet-sdk-7.0.317-linux-arm64.tar.gz"; - sha512 = "22badcdb2cba0f1bedb1fcbdc99269a66a01a232193e00b42823806cee5d46194b8dd008a53e17455072a410f77bd351676f351670be96c13572d8e30cfad180"; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/6e895738-571a-4d6f-8519-0d64ad4a95d2/75c8734c8f3dee31dca0591f7634b4f8/dotnet-sdk-7.0.317-linux-musl-arm.tar.gz"; + hash = "sha512-fKoRN8pHJHGrlZ3s634+KCigjbX7Dhxrlz8kcKHLbIv60zLMrDH2bhGYLkc6/4KAmzX6XANkF4J66DcTe+NPOQ=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/c03db249-372d-404f-8767-dc7e4a104ade/49d2336dc14b70dc937d8f91716e4fba/dotnet-sdk-7.0.317-osx-x64.tar.gz"; - sha512 = "d3dbd0fe7cbc62388f150adba5d818abee3986863d757ce63088f4feabf801052c08a608acd5036f97191435fe99224acb12c7365be7f77def28553a231ac3c9"; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/2df5854b-e405-4191-a794-8c24ddb9b95b/b0c9ac55d4f324aa81bb5918e115347c/dotnet-sdk-7.0.317-linux-musl-arm64.tar.gz"; + hash = "sha512-7US11MyzefQoaSLiJtGC5eubwS9M7bYALwbleUt5XT6/GajlqOmQxFfff566mUe8HHIQr2qN/yxnItZMnmHwQA=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/697b6485-989f-48d7-86ac-320529a85b35/5b5ed55e7e4e2c0a1ba2c3e0cceefe95/dotnet-sdk-7.0.317-osx-arm64.tar.gz"; - sha512 = "b5f367e1e20d728d7167c81e4146358e760f136b9ee0fc410d813c14366e38b09a069031aa8ca6d8df438435b6ab4e2e989be309e097169459365d4befaf9f5a"; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/9141d472-8ae1-46aa-8218-190017c16ed6/7877e0accaa6b6800570f7b46a831c97/dotnet-sdk-7.0.317-linux-musl-x64.tar.gz"; + hash = "sha512-Wn1fIXAQs1QfqdC9tD12lJaFW54RQ4TPZ4jtR3G4NUZqsYeMU3nIkUk7VLh8FHB3j1CTHFpsiZr2E0gZO7lj1A=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/697b6485-989f-48d7-86ac-320529a85b35/5b5ed55e7e4e2c0a1ba2c3e0cceefe95/dotnet-sdk-7.0.317-osx-arm64.tar.gz"; + hash = "sha512-tfNn4eINco1xZ8geQUY1jnYPE2ue4PxBDYE8FDZuOLCaBpAxqoym2N9DhDW2q04umJvjCeCXFpRZNl1L76+fWg=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/c03db249-372d-404f-8767-dc7e4a104ade/49d2336dc14b70dc937d8f91716e4fba/dotnet-sdk-7.0.317-osx-x64.tar.gz"; + hash = "sha512-09vQ/ny8YjiPFQrbpdgYq+45hoY9dXzmMIj0/qv4AQUsCKYIrNUDb5cZFDX+mSJKyxLHNlvn933vKFU6IxrDyQ=="; }; }; - inherit packages; + inherit commonPackages hostPackages targetPackages; }; sdk_7_0_1xx = buildNetSdk { version = "7.0.120"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/8b678e05-b3c7-43ae-a31a-c007a901d939/934ec0853faa6404aa924c99e019f788/dotnet-sdk-7.0.120-linux-x64.tar.gz"; - sha512 = "cb9faba83ab276c935ef35b31f016ca4617f0d967c5b4bf1e993c2159992fb59d1dd25dce09928915b9ff586ead7acf92ec1dd96937c93317a99ca0c92b616c9"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/3ab51fcf-7641-4e33-aa59-53b394ae1e2e/79905a3a4708000a7a50da44a7256ad7/dotnet-sdk-7.0.120-linux-arm.tar.gz"; + hash = "sha512-epZI3jwx+NElfZiYL0rivTusMkQLz8uAQCdShZkJNK7ocZASoso/VkZUblZtKWP2O/idGbVordxNMkzpdOpLxw=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/17a7bef9-4696-4b93-a3cb-f4bb9aaf2985/3e19b62d05b8e85b0a46d5dfd99196a5/dotnet-sdk-7.0.120-linux-arm64.tar.gz"; + hash = "sha512-9TD3lK/jw7m9h7jtUJoaE7HI/m8rxubM4+jNa1YyfA/yf8E4EiwtrWh3DMUBVzfgB+9XBlmcGJ7wzHUhy/C2VA=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/8b678e05-b3c7-43ae-a31a-c007a901d939/934ec0853faa6404aa924c99e019f788/dotnet-sdk-7.0.120-linux-x64.tar.gz"; + hash = "sha512-y5+rqDqydsk17zWzHwFspGF/DZZ8W0vx6ZPCFZmS+1nR3SXc4JkokVuf9Ybq16z5LsHdlpN8kzF6mcoMkrYWyQ=="; + }; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/202eccdf-4461-42ed-a260-0061216380b1/076bff1764888073337b16ed57dbdbec/dotnet-sdk-7.0.120-linux-musl-arm.tar.gz"; + hash = "sha512-HNomb4ipUPRUT9/M8ezCaBa3XCn0hmv9mFiSkJQtmCp0zhfy9QfGKAsPM3t0OprQHlOjwQAcdHe91K3VO7BhXw=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/69b2b43d-6e1b-46c8-96b1-6f2e8871dd26/0405b62c3762de24e55635674a37f038/dotnet-sdk-7.0.120-linux-musl-arm64.tar.gz"; + hash = "sha512-XTEkw9rx7RzvDIOOdTY3rx5SAws2Ywu/p9uhdqfsok/p5cTfnv8hcPqWz2PgBV30LwlQs7WQDesoJZDkthLz+w=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/17a7bef9-4696-4b93-a3cb-f4bb9aaf2985/3e19b62d05b8e85b0a46d5dfd99196a5/dotnet-sdk-7.0.120-linux-arm64.tar.gz"; - sha512 = "f530f794afe3c3b9bd87b8ed509a1a13b1c8fe6f2bc6e6cce3e8cd6b56327c0ff27fc138122c2dad68770cc5015737e007ef5706599c189ef0cc7521cbf0b654"; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/0aafc9ee-0ca2-484e-b1ce-5f40458d49ed/06cf3c6a1515f931527e8fd6986e3982/dotnet-sdk-7.0.120-linux-musl-x64.tar.gz"; + hash = "sha512-xQirUxDXQ/V+p4YR/+NUJo/og+fGc+6Ajaqm3eMLpFTV1w+BkcSetSrkqAwGLtZJC6HWt1L8xUGw63g19O7ofw=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/b1da5ec0-e336-4716-b9ff-77f8160e7878/5c40db0a17dc493eb0be8d047d0c6885/dotnet-sdk-7.0.120-osx-x64.tar.gz"; - sha512 = "94deb9988509fcbfffc357114d0f5645fc6b6f6156664040cd5643a191bef10ae2fba4168aa689ff7da1a1b6fa779eb4e53a77a7847beceb7f0ba451d2c20d57"; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/3d081107-64cb-46ef-ab37-41560d585efb/5aa6a70b37790bbea98d7b8c380eacaa/dotnet-sdk-7.0.120-osx-arm64.tar.gz"; + hash = "sha512-3AaAHY3jTfaY+T46qHLVcTHdPjOsT3zdvJYiORHg/zL9zqeDMtp74AEzYskM0k2y2GweJ1KXvm3RYpSPK9OMvA=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/3d081107-64cb-46ef-ab37-41560d585efb/5aa6a70b37790bbea98d7b8c380eacaa/dotnet-sdk-7.0.120-osx-arm64.tar.gz"; - sha512 = "dc06801d8de34df698f93e3aa872d57131dd3e33ac4f7cddbc96223911e0ff32fdcea78332da7be0013362c90cd24db2d86c1e275297be6dd162948f2bd38cbc"; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/b1da5ec0-e336-4716-b9ff-77f8160e7878/5c40db0a17dc493eb0be8d047d0c6885/dotnet-sdk-7.0.120-osx-x64.tar.gz"; + hash = "sha512-lN65mIUJ/L//w1cRTQ9WRfxrb2FWZkBAzVZDoZG+8Qri+6QWiqaJ/32hobb6d5605Tp3p4R77Ot/C6RR0sINVw=="; }; }; - inherit packages; + inherit commonPackages hostPackages targetPackages; }; sdk_7_0 = sdk_7_0_4xx; diff --git a/pkgs/development/compilers/dotnet/versions/8.0.nix b/pkgs/development/compilers/dotnet/versions/8.0.nix index a982f4ab9f88..56c405200a39 100644 --- a/pkgs/development/compilers/dotnet/versions/8.0.nix +++ b/pkgs/development/compilers/dotnet/versions/8.0.nix @@ -1,233 +1,367 @@ -{ buildAspNetCore, buildNetRuntime, buildNetSdk }: +{ buildAspNetCore, buildNetRuntime, buildNetSdk, fetchNupkg }: # v8.0 (active) let - packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "8.0.8"; sha256 = "04gvqgl6b46dfxqs2m8miwn7z7j5accidm4vl22ddpj17r8yhx8z"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "8.0.8"; sha256 = "1vi4ccb95bn6zf3pjrgi1nkcmca4s49s4xb5ni12yfbxf5jw5vv2"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "8.0.8"; sha256 = "1nvp2dhznb8h4pcfyllwcx2vzygjpcqrd32blilylk5g5nqd163s"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "8.0.8"; sha256 = "1mhlrvl7bs28bwfqwxydsmcjb4cm83ps2ahp02d86s6z30inlm6v"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "8.0.8"; sha256 = "0dnn3zbzj1ijp5kn7zqws4chnwklmdbiglv2dy664b99xspfrlgz"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "8.0.8"; sha256 = "1bclpw8sa5fs8nv33smlkb4zx2ipans7ir67i5cdp2y3qg3afrks"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "8.0.8"; sha256 = "0gnhrkbr0r4l6x0165g68m87mhavcpv8hqkipsjq2ww53bp7csli"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "8.0.8"; sha256 = "1jnr76a8r7sfjvl5p932mm4xn9pqnyv8rkbqddcbr9d396g18srn"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "8.0.8"; sha256 = "0jkjns3rpl2rzs1x3blsirkxgsz64685my1nl1xzh838y1mk16yg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "8.0.8"; sha256 = "1fb7zhy8p247n8jfr69ca8f46b578ffvv0viqxwsa1ssl24a49g6"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "8.0.8"; sha256 = "0w57jbrf8w2ffs7m78saawniaabasxjkxvmv1lqm6hkb8b3y4rd7"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "8.0.8"; sha256 = "0lppcnba7jhzr034inxb0pqbywapfin7s9n6lncv6sbwmwcdw7b4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "8.0.8"; sha256 = "1l04vb02ddvafbwax79qs5nfg49dg733mnawxjnzfhjszs9872vr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "8.0.8"; sha256 = "1s7yas0561jv3ihka8zmhxqhb2zc55lslj451dl16196i3zgla45"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "8.0.8"; sha256 = "1h5c5riyj465i8cdl6w4q10ymkfwd6f38nnqdbhs4hz9s3yqnw8c"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "8.0.8"; sha256 = "025h7ys6n6b4vfp05gsr4vqph9nhi1rg028fpr3g7sxp9s4b694w"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "8.0.8"; sha256 = "1avn1pwjan2pkiw1knh0gw5dj61ylyahi9nc8mh69z7q97yrpsid"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "8.0.8"; sha256 = "1yf1zjx64rjqxaqp31iih6vqfhp09r8hck6fr7xdbq24d1jqxdf7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "8.0.8"; sha256 = "1mazrqxr1hfpka0im7h0n8ab73rn2zdf2jbi9fn48panz3ncqgwl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "8.0.8"; sha256 = "06j8vp6w3mjqd2qrf6ndmmfc563qd5gsfqwza99vzvwvsyyclix6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "8.0.8"; sha256 = "1wia1vgf0ywz4mqz8zqiba8m3wzz4fb5zgk4glwyyf4m646s96ky"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "8.0.8"; sha256 = "00rh92hfqmpzb1s3imsc78n24gmbd1hyi8s09ra4z6fzkrz8vi2h"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "8.0.8"; sha256 = "0mvr8swzpgmm6fp2gh0lr8kbdp90ng6j2m80gk5im8q46ggjwz2m"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "8.0.8"; sha256 = "0bgsva11n48n9cw2xjfr071x3aq0yqnis191hw8zrgk07gq7q77a"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "8.0.8"; sha256 = "1i0g0jv7vnp7rbagjppldypqx1c6bxsk4zx87w5km1n0aclfmyfy"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.8"; sha256 = "01bsp8lj08jvv3bpnb0ngccmgmdfcvqx1038r5ls001ax4l1p4nb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "8.0.8"; sha256 = "1b2zg6gjjri57v43v4sindbikqlxxgrmp4f89gyz7467rd718qa9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "8.0.8"; sha256 = "1g7kwsdj9d9wy67acz3svkcp80aaf3npfsyhgnvslqgwfg53r5y4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "8.0.8"; sha256 = "1qgj8zhsb4r42zcaw8s66wgs294405d0vkvysvfxjhq0qf4d8k0b"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "8.0.8"; sha256 = "1ghvz25730jskl3g7mijn80k2pnaddzadlpc5hrbhk1psrziv4cx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; sha256 = "0jv18yz2cfrmky3v0mssddisnfraiynj2gp6djsj79i5an8lm86q"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "8.0.8"; sha256 = "0z3aginrqsi7gbcj8rmga35jrw9qabcn6l0sxkysrs4b0qysfsv4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; sha256 = "1fggfcilvg0icc2zym93wiy2ww3jvzyblrymyrvab5q5n49ni3n7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; sha256 = "1vhav8c6fl3kf24i85iq4hvkml1hbl0fn23zcw0il8za0wa96wjh"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; sha256 = "07lmlyd36d4qgjn238hdb0rxki9dc367b05a8xfp4p9nf765s68r"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; sha256 = "19cw3h709whiysagdmrbqbd19pwqc9893dy39dkl353zwhcr802l"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; sha256 = "1my2f45ikw0kay03d1l6yrdcxc9iwyg8w6qyzyhpvbwybva3szqb"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; sha256 = "03zqkvfvgplrk2g0bd95agbly8lilqksp7v9jkfv8xi6fchyz7mk"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; sha256 = "0lvr6w07wxxs68xc4ki83xgvqbzraapnik8f73k0105vg80n684m"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; sha256 = "1pch0b5f4a936ma9l2pf1y8b89swppzc1034yr9c58f92agwm7a5"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; sha256 = "0bj9cgambifzjk68fcidfc2qw1jw6pmy40b6kimid8kig3vi8vc9"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; sha256 = "06ag1kj6d606h3vmqz2aap9pq7ca5c2w7qa0135md98nivl8ra2z"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; sha256 = "10z3lzn58wv0211fx14xy6nckkpvr7jssnq9gd7jisc40wg47m19"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; sha256 = "0cchmg00iabygbqrzrzw4pj461jw15a66bn8niqbv4j2j7fdxc43"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; sha256 = "0f2yal46hqa26s7wrilymhlydj74cj705wivajw204pvx9y29nrx"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; sha256 = "0jzya3wa3v5d27yr7cw3rin61xkgyllx5bmnmb3nlx9m7yv7s9mm"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; sha256 = "1fp73xdqbzbllb4bc942dnrmk00cgrr496svis58w1w1jhas8fg3"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; sha256 = "0mb6zr6ly59hlc8i4jqgwxrhrsvw92690s036d2zjq5yqiiszq15"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; sha256 = "185dfmvph0dp0syrya02yq8pmaqx8rpz6an91n14mvjrmp6g2xqi"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; sha256 = "1nncg3m5www0vhl7xr0d128a4sm6dngwf9y8shrgpi1c533yff50"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; sha256 = "1z5ii7qq6kvhi62dbjg1miwll6z89xi3ndggrjymbq62q26vxk9f"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; sha256 = "0aqm506ls3nqa1qx9vp8zr96mqsbf1q1ni1jcy0ql39khqcf77lc"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; sha256 = "017jfihz6l7pai2lakj5niwnnmn890xd2lgr9vvzn9lf6m1gsa28"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; sha256 = "0g80h08qizf0bmfi19ky90x8sf00x15xbwx6nmm1gmd0wfkcmfrd"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; sha256 = "1w914cpv0lpvmqi0zhrfxchida2adbllhr6617ix3f7w2g2z4vvc"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; sha256 = "1zwhsmjclhjawsjz7fwnsdmv14dgrch31spba32bkyqsn0bmfhnh"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; sha256 = "06x7nldwx6cfx2k8j26nhvg4vlflaz3qk3aqjld08jzjhzh9zl5i"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; sha256 = "0p3ylipzvd41idbb8d11120rakknr8f8ys15kv5fid765wck8xcc"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; sha256 = "1vrqkddhi87hsa4agx1akfhvygxqlj3b1pq6g405k1pdxm7x0ngz"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; sha256 = "1r80l23i677carh93fpkc4qr1wnrkfx8wvdbqj70k29qarjp1zyq"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; sha256 = "0yf7i13rrjdc9ibqff99cspgnz8qgyx85hv4jvgxz2d3jknv8ck5"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; sha256 = "0jkfh00davbf4ix27ph1p3g85amvrqjix2rapw1375pkv6vnhg1g"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; sha256 = "0r9s92nx7lz9alxc2kn67h0x8vl71wh7hv5dqx0fmhafgllw8dd2"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; sha256 = "13klkc3iy2lqxlknygfbqgqrpb6q4i3ihsvi9834aw17fiznrj60"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; sha256 = "1hxxpl4wzn18gq5zpbr0vz87bs4czmvbibhsf1zznwb2yvlr0sh0"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; sha256 = "0wzl1naijk3gm879bd6s2975yhsksnq2gl7jg7j1bnwik27nwpl6"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; sha256 = "1nvzykpd7d51bqh9lkskfffggd0hfm0hrxrnmp075ibd4v98cc9l"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; sha256 = "1j15hhf2hii4fh2nnmr7wmjxcx3v58ckm8lf5nsnz71fjcy6r2j1"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; sha256 = "1fchcm8hpianyj2n7lq4vajxak8ww9hxdh9bl6xpx2vij8rhhh87"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; sha256 = "0lj58x7l8f5nj9pyy6d7my611rpw0b9m5x4cb8rhqrx6ywzpjmfb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "8.0.8"; sha256 = "1g0kyfs8dj9jirc6qym1y93hxkcff1c1z2cws1qsqsrxbnrrn5dj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "8.0.8"; sha256 = "1p5jgznx61rfanyzvvbkasp13yysjks9driwdm42cc7gw35h2lig"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "8.0.8"; sha256 = "1wsaw71mq2d6a2n3hxrb1mablbr8rz7x35ibh41y11nyhldwvn3i"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "8.0.8"; sha256 = "1z8qvz3k1r699gkk96zrdffbqbb2j949gmh89hafcj9phmrbnvz8"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "8.0.8"; sha256 = "150rhzlbbg5fr1la67pbyksk6ca8ypqj5j1izc77c9c9xasfa7nz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "8.0.8"; sha256 = "0lxq6m1b91yc58xqwrw84r90vgviwg97nddilbzsp9bml2y4h8y0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "8.0.8"; sha256 = "16n7frb84h0ckkripfm5x698l7b4m9i2brwrsfr7n2ccxkilnfhw"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "8.0.8"; sha256 = "1rd3fzdd4dwdiwqcrnaacy4kh01w1j3f37ig4bw1zpv2kyb2c6f7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "8.0.8"; sha256 = "07a0hi147lag3qm9k7757w7p00l870i9ayhx2slw2g3vsr5fy12g"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "8.0.8"; sha256 = "0ysqwf6xbrv1c6q2chkr1hnkw407w1gk4ccpkivn697d1pc832hg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "8.0.8"; sha256 = "1y9w1xj6hjh0bdcq3ywi98v4mkcpk55x48ac2b157qjpqam906c4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "8.0.8"; sha256 = "13s6ymx8vnxiz4ynss7cx1hc5rlwip746y735x4hjqqwqnxlnbc1"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "8.0.8"; sha256 = "0sh1r13xmphk3zb625h8814s455kx0x0h0p3liaxd0nfh8dy2gmz"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; sha256 = "1irszs3125nl5d00yyiganqbsdid1sqj289nirvsgzrkmzk0c44k"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; sha256 = "0lh81hxx7ai6hn8mfy579rym8zxydphq4nahwy1db56q3n7kbkrk"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; sha256 = "0a3x5vaqp0a3gm0dkwkai15jyi1qgbqapr7qg2nrv8q2w53vj007"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; sha256 = "0z71d2s8nn8pidzdnsvq8gsnl8kkf2limnm5fxvrfxc6kq22b9qk"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.8"; sha256 = "0xk8va4vidial13wzc2i315k0w6yh6dgnch5bg53wwz2kkm5b7rv"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.8"; sha256 = "1qb75x60bpr9kwp8s938arplym8p1zj7hsxs2mwna9271c254yx3"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.8"; sha256 = "0wjn5krkprgkz87iqzr10ncs3hfzvg2n9zb1xbcm3f0m5af893il"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.8"; sha256 = "015mg8cyqa6c4q2zqrq68rbmzcnjpm2ay5cwrrg99r2q72k85yff"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "8.0.8"; sha256 = "1sh70bdi1fz8zg2lnln2adn2yzjqi3fq8wazjbb8xgz3jbiha8ln"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "8.0.8"; sha256 = "1z0h02av5737mlk3y94lyjqhyjc577kx7yzmacl89m32ky4r2wk3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "8.0.8"; sha256 = "10qq6jvzg75bzlc0wv8z6wi9zv9f53rxf7ya7175lxjszfzjmrkm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "8.0.8"; sha256 = "1kqcb196n8zgcwi4jznlzqx0mv1y2r2gk51wvvv3vhvmfjd6igsl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "8.0.8"; sha256 = "0bcdfhqsls04gg93av3rnxmjz9cynli36nmdc9wxgqnr8vma799i"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "8.0.8"; sha256 = "0zzsb5xkifks23vryy4mpm1xyi69mix2xn657cmgp0nn26c9169h"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "8.0.8"; sha256 = "0vhx3z0aqnvlmjliqmd3cps5m34w69srwjw1506k2gipd1bhzgcx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "8.0.8"; sha256 = "1jfwbyr43z6id96qpplxv8mvxgdwc6spiy327lbx1gdbpf6yvv1i"; }) - (fetchNuGet { pname = "Microsoft.DotNet.ILCompiler"; version = "8.0.8"; sha256 = "197lnzrfxws1b8pz64kiqjayaidv4rnigdyigpnfjq67w7x80s1a"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; sha256 = "1ax2ygccd1wnlcrad0kzv1lkb3z67vpwbmmqfipzbzsdaj81sgqg"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; sha256 = "04jwnn2ppdl1h11511df5wljmqx6hdzaw01qi44q5j5yab5ss01c"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; sha256 = "18nk4niv4nmpvhd67jflra7qrlq83mh8h3216p14kdiwmwbbzakb"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; sha256 = "1px4k16qxasb4vb7w2jcwjfr39mybhrjb120044km2ianz5mqsvn"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; sha256 = "194y9hvf4rjshnjvxn8j971byxmd837ax3fwp5j2gj8lr5pmh43v"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; sha256 = "0gxprpxvd28ci5xshappd200f16vzgph7r4k921sx98ffpl45sz0"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; sha256 = "1mbd0x4cwzn8284xbk66mr18s7fc37g75yp9r21agfz2vv6yjcn1"; }) - (fetchNuGet { pname = "Microsoft.NET.ILLink.Tasks"; version = "8.0.8"; sha256 = "0kcg2pz794qh3lis9n06c8zmpa2h4q5pp5lfysgm403xzisd9pmj"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.8"; sha256 = "0nzhfz87nfr8619pj75hnnq0kcl8w82kv4xr4528sdwbl5953dj3"; }) + commonPackages = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Ref"; version = "8.0.10"; hash = "sha256-qr83tlgz2OZRkz8f8uquUeZbQpB8WAGd5o+XYl36giY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetAppHost"; version = "8.0.10"; hash = "sha256-IKp5I4FIEGQ5+Xsjc48EG63eHAIraQWUcJcvf5vIeIE="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Ref"; version = "8.0.10"; hash = "sha256-DloETXESPFWqSvOdmAOFnKCq+veTqhdltiYj87Euhr4="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetHost"; version = "8.0.10"; hash = "sha256-2co1p+5boK5rAuf9AET29KV+kTv9zhHc6PSoamkHZRA="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.10"; hash = "sha256-HFlAWYmT55k/Y+QxnueMGptQDgkuFdQtrmWL1lCVviE="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "8.0.10"; hash = "sha256-29PVFF5yeT0svgK2xWVG23xOrRSDCFJK+wVZGZHtY7c="; }) + (fetchNupkg { pname = "Microsoft.DotNet.ILCompiler"; version = "8.0.10"; hash = "sha256-vSt23zRo8oVhOv91+Eo743yMB5ng+X7iKkr+NW4EfMc="; }) + (fetchNupkg { pname = "Microsoft.NET.ILLink.Tasks"; version = "8.0.10"; hash = "sha256-QIiMkIBvrdaep+lvBn4YiB6h63FbSVi7UmDz32nLZ+E="; }) ]; + + hostPackages = { + linux-arm = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "8.0.10"; hash = "sha256-PAHPeo+P+orHurd4JstFAFnC61j4uwq2eE4c1nQmh+w="; }) + ]; + linux-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "8.0.10"; hash = "sha256-ssF6ALeeAGnvYFd5kFTuJoxLwtV8lk5u6LlnXMbJ59U="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.10"; hash = "sha256-ufgpQqiZuvToDX8hMnZ7KSZPiVJKRuHzOo/uVtwWQpQ="; }) + ]; + linux-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "8.0.10"; hash = "sha256-EBtD7t30cZibJ4VDdZET1ASVU2yp9FYMDNUsgaJoLGw="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.10"; hash = "sha256-dUr7mwCg93f+Oc54hzUzxGxv8J5TR4dCVhsYBfLn6KY="; }) + ]; + linux-musl-arm = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "8.0.10"; hash = "sha256-rtKhU2VHqLi7cHJVb6Miw0BJNcabrHNve4fjpsIQe5E="; }) + ]; + linux-musl-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "8.0.10"; hash = "sha256-1wIIAc/Bp4YnWSXxI9/1UT/Iz8mW/OQSgGKCEen7SD4="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.10"; hash = "sha256-DYMtF8/2qOg+XrfPSWJ1RB623Wn8Bjp3cuaqT5iQiZI="; }) + ]; + linux-musl-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "8.0.10"; hash = "sha256-zcfmtvbRzfrzM/fc7aPWHUhLGetn8u3G9LXTBNGy55I="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.10"; hash = "sha256-GIwrkh6iD0c+cLdcYhJJHAXhBhA7ZWXs4/MmWWnaHOY="; }) + ]; + osx-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "8.0.10"; hash = "sha256-okqfX5kWkn+fYSqx/lNhvxkGeTmgjlvrXMVDpuF+/y0="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.10"; hash = "sha256-5U/C3N47whMMmfBAD8hyM3ZBs2ZxFqaKhobXWLkRXgs="; }) + ]; + osx-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "8.0.10"; hash = "sha256-8+LQHhzQvobpEOVLDC8ySv/qhzC1uf0jk6nj8ioMWnc="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.10"; hash = "sha256-NZVCCKfPG3LBGYVGTk23fvSqXk8AOq8J9f4caTvRulg="; }) + ]; + win-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-arm64"; version = "8.0.10"; hash = "sha256-CZL295MOXANUs9tgO9Kul2m46zfr/EcrJWXep74w8PE="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.10"; hash = "sha256-yrvkrtY6qrs+2a6FghTL2uQgf6L2o3oh/WG9KWcwgog="; }) + ]; + win-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x64"; version = "8.0.10"; hash = "sha256-ccqaKMg/PMKHZ2kjqOrM4wIh8V/R1cYyPnWYYa9jR+w="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.10"; hash = "sha256-HqFgB9cr0v3WstnK+wNjdVZerbQbfufzKA9NsHdIrWw="; }) + ]; + win-x86 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x86"; version = "8.0.10"; hash = "sha256-jenosV/Wf8K2SiLsp4rzIu7/c2A3s+jydkmwCZ+jj44="; }) + ]; + }; + + targetPackages = { + linux-arm = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "8.0.10"; hash = "sha256-/s3SAZgRROQSOBYAAKgZwhj/FJXN3+RG5VPDbn663QA="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "8.0.10"; hash = "sha256-aVWKeHvQ4zS5bXZAoUqjefBp4TYwxW6vap5XvklN7uc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "8.0.10"; hash = "sha256-Eg/hxnHtIiJ8Zcne4x4KI0xzpmxlK+1Xm2WtrZZXWjg="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.10"; hash = "sha256-xfTjxK8Oojq87vappJZkQDWvt406M8LjqrWmzdb7SQQ="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.10"; hash = "sha256-qNdDGfs2NBc22FcSI/jut1QPCaRn//vEZbl3+YieO2Q="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.10"; hash = "sha256-juf2Zbtxh2JqAXB7GYa5HBJxcUrzXQrtK16ZfszEJ4A="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.10"; hash = "sha256-SRtJaf4VwCLFM1NICesfSgrxYYYVEXK3bCse0QJ0yW8="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "8.0.10"; hash = "sha256-X4vSzi9KUcNracYG7VtEGBuLfI0UBljMjypxqQBFFfw="; }) + ]; + linux-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "8.0.10"; hash = "sha256-uiplc7OczySA2Ni9Tnmi17FOYHp/U57qH0ou7Pc2OzI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "8.0.10"; hash = "sha256-VFIH/EWE2TW+akirg+IpaISG289PP0tl5Ur8+sGFj8I="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "8.0.10"; hash = "sha256-EhepWr2Mk/nPAtE+J++1MHQkbu5n9xewHwroSWlcr/Y="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.10"; hash = "sha256-eLxtO3uYgCYryuidL2O2fG8egh+np0HTb3bJ/rKs14Q="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.10"; hash = "sha256-oQ7p6X/5NVdVw7U4wbnNy4xK+dZNvPbXWFjA4UuPGzo="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.10"; hash = "sha256-2l0Q+H02bzRG0NBStTaVOKLeZ4CNjWCj07cjkgOugIs="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.10"; hash = "sha256-EmYjZ/h+hH0NLe4estuua0Yh33yoIMHNosVuyTNQDaY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "8.0.10"; hash = "sha256-yyTxpyvp6NWMODvZ0wVZRAWVzCgODFvBBnWrGawP7+8="; }) + ]; + linux-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "8.0.10"; hash = "sha256-8noK1Ws4w7JCCH5NGT9DYNqKUIE/89omwoJJaT31DvE="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "8.0.10"; hash = "sha256-NUzt/9eU3UV1iw8hggRTDV1po5Xtq9ooEZ5inJ0TRp8="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.10"; hash = "sha256-lYyvJWF0qVxM1u/rpXMpAuekwQX8+ATX4H0B1VYKPu8="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.10"; hash = "sha256-Yp9WQ3kQzP5AFc+luQ3t+6x3nbpnSBmSeXaQUda2+jM="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.10"; hash = "sha256-H6CfsMpTtenNySVdYFt27DJqM+89paFp6V7PK91XDqA="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.10"; hash = "sha256-RUTadf5Nxvt0McVm/z29y3LQNGvakR0DGAXvQISk/F4="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.10"; hash = "sha256-CSp3a8I3EbjXozgWQGl2nzn1o4TdbgZeQ6d5A/ipOVg="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "8.0.10"; hash = "sha256-t0vB9HOaB5CLKvRST1QeKlpgEG6nvX+qRkEvAZffUFY="; }) + ]; + linux-musl-arm = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "8.0.10"; hash = "sha256-wDwLqu16ILj4q1eu+/tMZR3D0CuX7zeoPZe233hg7Vc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "8.0.10"; hash = "sha256-n3fx5GHZrP0PTb8UMusgZe1nHkrsi6Vk7iY+NqRJ4Ss="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "8.0.10"; hash = "sha256-l3yE6YMFKts1bBxbJUILpd2g4I75MWAgqeW2TMMgNzs="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.10"; hash = "sha256-yxkx7C3R64TDYbsgVGPoM+8BFD8PS41/MHmOZiJJhwc="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.10"; hash = "sha256-yqOvz/0ZgF6pWzg6gtiHGPfm3GKfMwAaqJGfd+K+0ng="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.10"; hash = "sha256-EGK0d5m88xBScyeohJOsfNeiaK4Iis94TkqPHoBDOrI="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.10"; hash = "sha256-iACw3MvgxtdoHeLF+sBPJVbRYDlFj/ixTeaNw5qXGR4="; }) + ]; + linux-musl-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "8.0.10"; hash = "sha256-trm/1LZPN4BDr1SvQmacTGVZDQLVKuVH0w7GJ84FQVg="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "8.0.10"; hash = "sha256-e+o0ec/E4I4blmj1ltcovIXqK6GCEwV5CMblUZuD2/8="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "8.0.10"; hash = "sha256-OhXUVHm0WABY9w9oTX6rCNI5iQhJcqzhwS7V2HIsWp4="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.10"; hash = "sha256-IzTftfK+vS8ZBo//8XPxDMUbvNirBaQSz21q3jNAvag="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.10"; hash = "sha256-XRTCbG+e85AGYcv8wDvL2NmrRwHUPb4xgjKWwmOhVyw="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.10"; hash = "sha256-9kP2XFjP+som53HTV97vTEmqyZLN+KIVj+RzcaPKcI0="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.10"; hash = "sha256-k3XtnZPIHDWE6bZX0IDVOJ3MMhBcd/y3Wq0Qkeqm7bU="; }) + ]; + linux-musl-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "8.0.10"; hash = "sha256-HUrye7hNJsLS36Vh/dDiQDn1oUtoNcTWwulersn2k/c="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "8.0.10"; hash = "sha256-Jqxj6tDq1DadZk4tMNQo8RpLNhmlFlN0kBFY9VRJmb0="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "8.0.10"; hash = "sha256-JnHGicqJ2Na95KyJkX+UAM0uDmAhkqmVIhktMg49aWU="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.10"; hash = "sha256-Itqy8JDjPpXH5U1wLl6gj80b65zI8tQYAe+AEzgxtZE="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.10"; hash = "sha256-OSDH9d9EASV/kswQjlEIu6kaQlfRMpT91TPJDkPlb4Q="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.10"; hash = "sha256-GdPlVPjzC0scVledxgs24kFZSHujYyq2UHDAzLgt/eE="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.10"; hash = "sha256-I3jZdK86aqDnxz2xvcp8oGJurpmaPckuJR0TG3OxOOc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "8.0.10"; hash = "sha256-QQ+B9S/q35MsxikeP43OQ8J5mghq5f+xdPHaNdBMeCc="; }) + ]; + osx-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "8.0.10"; hash = "sha256-GL7OjLalZPKLsoheVJAmVStJFpJ7zTDJtikCP7fB3jU="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "8.0.10"; hash = "sha256-IZ59kjeU/mGHBVXtOO5AFK0ocxwFAkFqwtn99N+l0zw="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "8.0.10"; hash = "sha256-0fH2KlzVL5ydblrVtBtAoHa5kNYY92Wzv8FCVqav3Mw="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.10"; hash = "sha256-XTWvKlTEEi6lrBZcJawPrxj2bjmsWVFGphjCxpSIBLM="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.10"; hash = "sha256-C+u78GUiX6VzkoOYuqiTy8DvHUsJzWR+apJu8ZU/tWI="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.10"; hash = "sha256-DVxeH8nfflyG+pCdft8MfDfEBCD/7dXTwlOz0aGnH8A="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.10"; hash = "sha256-p9KjfiNnhtqTCl2aQlYq/UmPsyqx2+mddTA8nbh2xnk="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "8.0.10"; hash = "sha256-d7Gb+lPHI7xmMwhsTQzWJBq42QUsSRRU9BWZxmdXKWo="; }) + ]; + osx-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "8.0.10"; hash = "sha256-u6/4q54irXtyKSSi1bH6HYrvcod7yfs5YdYD0NXeYbs="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "8.0.10"; hash = "sha256-B4aqUvMpyewAwquTRVh+bs2RG875ZsveYQU89+4VFxw="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "8.0.10"; hash = "sha256-XKUQ0DDWWbZNtgGPKhdI7ufpd9Ki1EcOcK9ojiaWEVM="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.10"; hash = "sha256-Gl5S9T53P3xZj5eRwPe26SnMlPboQHB4lxTw1nIB2Ac="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.10"; hash = "sha256-vmGaHkqKQC4WA9Kl26ZpQv4H8YIJblk15RayYATG1JA="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.10"; hash = "sha256-MFSnCAiE9A6EvhUQff4g/6Js/sxORln2lhW74NTeQ34="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.10"; hash = "sha256-lYNFKHvU3RZVzwqkGzxPem5LHfijEFnO4OcGGn5BUMg="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "8.0.10"; hash = "sha256-7RRH1rAdGFkdB/FNrQTDgBywr1tYc1Rezo8LXRSZ70A="; }) + ]; + win-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "8.0.10"; hash = "sha256-OdRFIExBixFh1xwOtEA94xedmHVGPXvPopF9Lbf3ec0="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "8.0.10"; hash = "sha256-pmsaof0XFXZQmn+s5nijm820TSdQaFlH/EpGy4OqMhA="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "8.0.10"; hash = "sha256-xbgfV4a1gtH6gzoXSe7njaDEvvx3L+zVfLhfF4705r8="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.10"; hash = "sha256-1H/t2OQMWfypSe1g6jWITx3klMD+QgUAj5iApzL2vTY="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.10"; hash = "sha256-HmWsVmYVtNxX4xbQ3Mbra2vo0kjvMGXEQ+zbcTAAmsY="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.10"; hash = "sha256-rHlT/ZFXIVkgo1QgJh+h0OJ6gnizyuqAaBczb7Z1NOU="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.10"; hash = "sha256-d+ILcAY9ZvXx2klfv6zxASRq76htI4k9eTO+Ctq6+DE="; }) + ]; + win-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "8.0.10"; hash = "sha256-MrEAlX9Ep1w6fnXM1H5PehDbVXj6HrSSBE8ka5+zr4w="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "8.0.10"; hash = "sha256-bLWBI3G4+TrV5cyaaKbuk0RSh7Q6lYI5msZd8QXi7so="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "8.0.10"; hash = "sha256-B6o1+6o3Cih7cmgo2ClwBkIYcDA7NGZ6JClaHRDJ/B8="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.10"; hash = "sha256-TJtsPhmyiE6XAX6WmSASd7vcRQwREJYd76CKGzCt3c4="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.10"; hash = "sha256-59D1z/LeAqw09/SsJegUQWQ702r5wsmp7O87iDZz788="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.10"; hash = "sha256-OCDkL6JuPoxle/clIRlg8A2/COUIuzqeq7cSYzNWcmQ="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.10"; hash = "sha256-ld/Tu7HAiAGZg6+RYMO4hpg3NKs3dX8XlSHPsLLygrs="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "8.0.10"; hash = "sha256-3nn0MR1m1P1usLy0JCtiCjon3w0xdl2MyEJaHbILmW0="; }) + ]; + win-x86 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "8.0.10"; hash = "sha256-O7gy7qe+EQsU/i9LVpNFjs2RjrLppQFatD+u9W8Wgo4="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "8.0.10"; hash = "sha256-oA9gg0LDJrjGx69md9bWUfQy2ED3OVhhMMmAw26L2mg="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "8.0.10"; hash = "sha256-02ueHHg0U7yEvkLV4gdxXg2XIDSJ0LBCt5gNcrsy3O4="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "8.0.10"; hash = "sha256-M4LLVUaJpyHWzSqYsXMzB4OgxlzHf4Pp79XwNgnO6DQ="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "8.0.10"; hash = "sha256-yRaUcqgJr+XHo70nWJUxX4yJwavaiN3pBKE+Ov8bFTs="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.10"; hash = "sha256-ZJN/v/J1b/89BquCxWHZlnfbsQn8N3756HPQ3Z8Zv0g="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.10"; hash = "sha256-4mNR0mls8jqyh4Lu+Wv/HykJOlwLlX0ceyR4arrnNe4="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "8.0.10"; hash = "sha256-KUdzJDhpW9xj5xSH4zovpwZb7I3zcTKXa2PFRlBlOzs="; }) + ]; + }; + in rec { - release_8_0 = "8.0.8"; + release_8_0 = "8.0.10"; aspnetcore_8_0 = buildAspNetCore { - version = "8.0.8"; + version = "8.0.10"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/648de803-0b0c-46bc-9601-42a94dae0b41/241fd17cee8d473a78675e30681979bb/aspnetcore-runtime-8.0.8-linux-x64.tar.gz"; - sha512 = "d6c0cc2aac79fbacbf81b597f286763599f66278c17ddb448ce0b93d499bad8f88777d425854e68602945ab18af8a61f1ee59d431d5503006137f86113faa8b2"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/50a67fd4-a5dd-42f1-a3ac-e008c3115dcc/816972da008ae5cee7612cad9b6808f0/aspnetcore-runtime-8.0.10-linux-arm.tar.gz"; + hash = "sha512-+ui2snCk3JIY35m7PMEPClLbntNjC6ggVkAhVNJ8I4925EVh+FNIzxpPfivR29kQ1BOKke9mq+VoXZlys9BQqg=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/f93af34d-cde3-4231-a54f-119c328bd876/663b3c2dbf1ed2a3e08ac8e614060571/aspnetcore-runtime-8.0.10-linux-arm64.tar.gz"; + hash = "sha512-OkePkxDHSLdCfJHes7qD9MAlV6fXo9c4JSa23Dna09k4AiR1qyDwYPG07TZcexuVodCJzKUCpCMpjEE3m/+BEQ=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/6d143cf6-e215-428e-bcde-9fd50ea0e1be/99652e31b3e0161a3f1f933e0bedf223/aspnetcore-runtime-8.0.10-linux-x64.tar.gz"; + hash = "sha512-MyIfGZZMywbLp0Qg2sv+W/0Db3hHOHCTEZ+POR1XFuHFqOBXIfIzWYRAm0NCPXm1HsVx5R8M365tnSorLZhQWg=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/f6fcf2c9-39ad-49c7-80b5-92306309e796/3cac9217f55528cb60c95702ba92d78b/aspnetcore-runtime-8.0.8-linux-arm64.tar.gz"; - sha512 = "c3dc9d71fca0a48eda96074cbcef4c9a265c1c4e10cbff38614dd74d79443ae9d1ccd10714764cd041291f81d83c0ed1c307abf89249ab4b6f58a5de952fcffd"; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/ccbec918-1f15-4f1e-ad7e-b4d1a679fa91/f8fc5b5f2fccf1fbdf164132da8fbda6/aspnetcore-runtime-8.0.10-linux-musl-arm.tar.gz"; + hash = "sha512-RbGzEQzSxmhMMSCnGdemLXpqwVR0EB5in0fOASq+HGWqZ7k/sKBRKLdGL+PwPtxcukD8eIAE+Iio47J8hh7sVg=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/465bdf6e-407d-4512-a222-32dafb225ad8/c22004de330d10a06141dee0f42b5d12/aspnetcore-runtime-8.0.8-osx-x64.tar.gz"; - sha512 = "d3ba8dcfaddcd6d50fd434911fe3eb8309666939a8a1ede800d7da2dd814efbd781d1449a42b71d1c71d9593465e9e97205025eb432808ef9a3ba0dcbdba0e3e"; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/c150b15d-79f6-4343-8aad-7748ad4765de/0e0768e8874957a8b37415919d77a9e1/aspnetcore-runtime-8.0.10-linux-musl-arm64.tar.gz"; + hash = "sha512-xx6iRxYGYJa0i+XOi5/ToUT/hlg4L3sZPJw4jq20J5tkSyvHoCk8AaYQhDmdXonIlS+T3tkL6qxqAcNhxXqP4Q=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/a7080974-fac8-446c-ba20-313f6f323fbe/f907c126c9bcd394939a7cdf86b85f4b/aspnetcore-runtime-8.0.8-osx-arm64.tar.gz"; - sha512 = "a196c62b14e9136362073826a03e76e0a147027f03655529426e594f7e44eb8dd036daea80997876047171c1793c7edcfa5146bd55a01b591d9405fb1646eb00"; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/fd29b6fd-e351-4758-8c61-0d9c0a6813d9/8be59cf5b2537298eb59d44e472c6b4b/aspnetcore-runtime-8.0.10-linux-musl-x64.tar.gz"; + hash = "sha512-hK8Vb9YUX8aZxzhl6hKlmU5D54iUX+3NXIDZE2uUgq0NngvduTP19y/x3PuQ0G3C6Uoh0C7aELwQFfPkuGOdFA=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/05bfc51d-d738-4796-ad78-6f16dadd2382/9a64a66f30708e38b6470a480ecc850c/aspnetcore-runtime-8.0.10-osx-arm64.tar.gz"; + hash = "sha512-K8kXmEOTIij7NVDNPu6IpkXFttaVpWFWQZXwtFg/wMkHFiVN3pJQIL3aA9DgGB8El1DAb4OYoht/0O9bjB/lhA=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/135424ff-12b7-4b4b-83e0-1d04b053ef5e/9274109d1ec702677474c148ad2af1ff/aspnetcore-runtime-8.0.10-osx-x64.tar.gz"; + hash = "sha512-euH0JLv/pSuB5duPHVkNZ8NKiGUOtXPQXJIiu7dP+J5v8FgbbOJnVY8Z/jQzRz1KhRO+9PXhiAzeA/GWBrDULQ=="; }; }; }; runtime_8_0 = buildNetRuntime { - version = "8.0.8"; + version = "8.0.10"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/68c87f8a-862c-4870-a792-9c89b3c8aa2d/2319ebfb46d3a903341966586e8b0898/dotnet-runtime-8.0.8-linux-x64.tar.gz"; - sha512 = "8f5220098c562fa3490417748eb9f4f9ca1551f7155728b9ebb1924359c63c18dedef643bcd89ec67b59cb5b1b9de7283ee156ef381ffb16801b516dba9b1b0f"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/3f8dea7e-13bf-4931-b11e-77fcc6de7ca9/37531adc6a054037c064c47dae4e7f77/dotnet-runtime-8.0.10-linux-arm.tar.gz"; + hash = "sha512-8GuHh+T4b2FWmVkiiprn0Qu3ofqWcBDX88oAgMhQUTz1ZXwY1HIhHOFogP9er8bIRCpWSy+DUdd8XdJwITyYTA=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/6c71a005-d902-4df5-8cbb-f1fd53cf14f7/658dd2a2a839c14173e3804befec6a7e/dotnet-runtime-8.0.10-linux-arm64.tar.gz"; + hash = "sha512-MVmf+8pxAkf04D/pmxCYsoeg7YIKlEtabtIjcmUcl9Z1McNKutvFLlno9wtPds0zEiHQCGhPP+79m+KQSnPjiA=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/ebc433c4-8f01-43c8-a1e2-bbe1291ba857/e073f3f679d7a4067a56e8f5d12fc0e5/dotnet-runtime-8.0.10-linux-x64.tar.gz"; + hash = "sha512-f7gTZ3cg0SXCM3/txhMbIw2vHB151ZEqHKa14Iv3gCtBLeMkjWRbZIOrI/P66DftAqDlIOMwIM/vLIiMVPR0rA=="; + }; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/a254fc53-e78b-4039-91ca-38fb3e42535e/be0d765e74b082a5919248c97866c7cd/dotnet-runtime-8.0.10-linux-musl-arm.tar.gz"; + hash = "sha512-rsjIIFkaE9F9gKFogPpiKWHqOpgtXqMLJuqRXtjYYOlQCyrHruB6rMCj9QXqM6ZlA3CWo9vJ7ZX8zzNeS0udqw=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/aa047a4f-73b1-4a00-bb94-1fdf28bdf606/533876a5403795f02d8071d6fc9be4d6/dotnet-runtime-8.0.10-linux-musl-arm64.tar.gz"; + hash = "sha512-Huyv4nKgce14vJG0yQCrcOwQLJ+Cztz94nm9mSGn50DunogVOKAKbOQA2dwOvJMF6M1JYtskMec7aR4QUmlOwQ=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/ac04b123-0542-4e80-9216-93f51a6814b3/d110733c152d34ab4eedb435ccfdab4d/dotnet-runtime-8.0.8-linux-arm64.tar.gz"; - sha512 = "246fb7e5edb51db93421c6bb7420f7a358430b98b224a71fb70e71a2bce0bc91f853aa89109f2188b0ab28532a245c3d52baac163463e01a02019dea37fd39f2"; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/abd532e1-6dae-443d-a35c-fdbd5053e239/1ab2cb2acddcbd435cb6970721f0f85a/dotnet-runtime-8.0.10-linux-musl-x64.tar.gz"; + hash = "sha512-LW7cwUudn++TrHL7MrF6Yxjyr1vdg8SzSzXFkdzUBtpNSJwaTVgIphusLuFLQLtrDo/+m0JJAbcP4tlp3v+ghw=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/0159972b-a4d6-4683-b32a-9da824d5689e/ffb0784119abf49015be375b5a016413/dotnet-runtime-8.0.8-osx-x64.tar.gz"; - sha512 = "8029986c1f8bbf1b0e8d0929756156fe41d46d2df6ebe1ab1c66fbcea2add47c35b934573c6198797cf60d2b372cd463e70326c0a35b0926dab4d5c157a357f3"; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/5fcb418a-d290-4fd9-bba3-d0ebe56eab58/e20afef70b5f56e36daf054ee3e09d82/dotnet-runtime-8.0.10-osx-arm64.tar.gz"; + hash = "sha512-10aWjQSUf0qH0k+/RxMJoDd/mQoYd+km1uUbUCIQQ6snDABRf1eKpT1lPhiszDhvVVGp9KzTawIz+2Y8NTOtLg=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/e9ded115-7a30-4952-bb72-ff101583f20b/5a7628261b98d095d2c97ec3fe5267be/dotnet-runtime-8.0.8-osx-arm64.tar.gz"; - sha512 = "88b06dd051819bd9e8ce2c340b2516dc0e4a77d565eff145d8e957b2552a641e235a5ce7e8db3607475887bc766f1530d01d0e7efd80d10cd652a299954398b4"; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/c71dbec0-22de-4f32-aa1f-8e7112fa380a/54b3ec6159d2f72c813d913afaebcf2f/dotnet-runtime-8.0.10-osx-x64.tar.gz"; + hash = "sha512-RKvEd79+tA4UHXFfiVw8WwkUgYVHNt3lNHqZcxkdy188P5bdk2DighSfHZejPXwIuTgAil7fO1xI47k9s1FxBw=="; }; }; }; sdk_8_0_4xx = buildNetSdk { - version = "8.0.401"; + version = "8.0.403"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/db901b0a-3144-4d07-b8ab-6e7a43e7a791/4d9d1b39b879ad969c6c0ceb6d052381/dotnet-sdk-8.0.401-linux-x64.tar.gz"; - sha512 = "4d2180e82c963318863476cf61c035bd3d82165e7b70751ba231225b5575df24d30c0789d5748c3a379e1e6896b57e59286218cacd440ffb0075c9355094fd8c"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/382e3bc7-f055-48b9-965b-89b070c15713/54b2af6b1ef970f852c29a850661728b/dotnet-sdk-8.0.403-linux-arm.tar.gz"; + hash = "sha512-3cwikxZHW6c8xGUY6iY6l71X+nhGpP5277kPh0MR6Kf1cYrG3LhhaDW0Mhr0bw4CZa5IsQblrcm6gszojoBKSw=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/14742499-fc32-461e-bdb8-67b147763eee/c14113944f734526153f1aaac38ddfca/dotnet-sdk-8.0.401-linux-arm64.tar.gz"; - sha512 = "e8738b21351d030a83be644571f3674c8dda9e6fbd360b221907a7108fab02becd18e1331907535a1294d8c4d0f608519674c27c77dc2c2803cc53cce3e10e0d"; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/853490db-6fd3-4c17-ad8e-9dbb61261252/3d36d7d5b861bbb219aa1a66af6e6fd2/dotnet-sdk-8.0.403-linux-arm64.tar.gz"; + hash = "sha512-9C4bqaiX+RyNc0sJqb/IJCjwYpt83ZN1JiFY2fKCeXwZlVjDeufzaUflfYrcYa+UkFlcTmu9BSF/1tBRM93tTQ=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/b266f183-c677-4f93-a729-abe0334401ea/ca0ce4f684c4cfea2d372223f9c67cbd/dotnet-sdk-8.0.401-osx-x64.tar.gz"; - sha512 = "063aeaf4e949b96d501b77873279f0286cde46f9212b59181c6db21630401fd6a352e3259848cee8e127e4ceac85a25e0bce36699a2fb6f6e2a91997c6f61eae"; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/ca6cd525-677e-4d3a-b66c-11348a6f920a/ec395f498f89d0ca4d67d903892af82d/dotnet-sdk-8.0.403-linux-x64.tar.gz"; + hash = "sha512-eqA2eCKLF09RxFNfGDSM33pdNeJDsfjLKKSjDkAuR1Z9Bt9jyPbaS9w8fomPVPSswI2ZUr+knT8iDQNTJTrD6Q=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/29ef2c29-154a-4c44-9450-071ae664767a/4ce00627f3eaee13874b54f033a9a27a/dotnet-sdk-8.0.401-osx-arm64.tar.gz"; - sha512 = "a3232c0693b41ee6b18dc3c8b26d82dd9116132bd7871dc9c0a0acc5e7995f352e760869fe91a08828417ea7b91fc27859aeea449b9efabc17c136a57737c93e"; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/8c87dbf9-f000-41f4-bb78-3aea9eceb73c/d75a2445ca5e49bb07243f047c602013/dotnet-sdk-8.0.403-linux-musl-arm.tar.gz"; + hash = "sha512-a8XsagruodiwAq8e32PaD9yj1U0s605RqQ6lOpp1hWHRYeT6EKw+68Vku9QAwblN8uBMJrrgHZm7wQnk7uMjZQ=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/18e32a84-60ec-4d82-8ab1-84511be4172b/4a1e6bdd4f15e0d55e0d9bb20c67631e/dotnet-sdk-8.0.403-linux-musl-arm64.tar.gz"; + hash = "sha512-u2POAascZLhr2U2QwQ5WhocnYnWlz5FvaE/l8TFyN0UhZjnjfTzPK3kj9VjxkN04SP9iH7yOnspbSVG1t1uhEA=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/662d63c4-fb9e-494f-96a6-e5d564dbb488/b39e35ac3115e6c8b0c1333d8327d7c8/dotnet-sdk-8.0.403-linux-musl-x64.tar.gz"; + hash = "sha512-kgNzMgsHaVRhgPUJn9ujNDg7RRAxIPxa34dlg5huw6VxToL81kdUed9BXzMtzk0KmJwF2uH00aUNAmW5Eh+NLw=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/0f1c8c1a-a14d-451e-8a14-4088b0d29cf0/37d7a2637468a506214ce484985fe040/dotnet-sdk-8.0.403-osx-arm64.tar.gz"; + hash = "sha512-89r8w54THem///GQrswI2HqgYlpmJFr1XAGbXLZNFZPNq/ZSwZfOQVK718VM9ownNJnZaaNIheO33wiQv1yTNg=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/8d0cf513-65cf-4691-a436-7363a5c10af7/ea63a46f9c1f901cec977f2c88538146/dotnet-sdk-8.0.403-osx-x64.tar.gz"; + hash = "sha512-Px9csJDUYaAmUF/8XR/ObxW6U1SzAiVMB37rl88jyDUDtFTi+BJfvdNkf00686GkNngNKihC1csJ0HarXkAURg=="; }; }; - inherit packages; + inherit commonPackages hostPackages targetPackages; }; sdk_8_0_3xx = buildNetSdk { - version = "8.0.304"; + version = "8.0.306"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/52cedf32-8a92-4966-b184-18404ea1c5a4/cc399fff1b152b822776514ad247df50/dotnet-sdk-8.0.304-linux-x64.tar.gz"; - sha512 = "971c344379240ec4bfaaf1eca69c6667e594cdd0dfdcde6e8962cb7a41d669dff91c644e48eed3573d841b7b3e60ce02e0c27a7ce37b66cdec27bf3457087c4a"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/4bbd0de3-6535-4f95-9b21-e0ca491bf9e3/9fb72861024e7ba9d6a35292cbc0e06c/dotnet-sdk-8.0.306-linux-arm.tar.gz"; + hash = "sha512-3fTLvDPhTqU0n9DRNy82uOMpIL7INiXa0YeH5xf2FNlKn9ntpC4LP75o/9vHnTQ/Nww0EsagvEdQqIw+XF3wpw=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/ef4ce459-c628-43c8-86af-353d9d7e7c44/804deed3b6ec5a3312867f62e6cda7f4/dotnet-sdk-8.0.306-linux-arm64.tar.gz"; + hash = "sha512-OlVLkjULbn09hu2SlJKV1GmWNZRhgkDJiBrbNvzK+4pRpZYahQVvMvC7V0O23c/YjnOTWeDKzGniAnfHR8K+Kw=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/29fd0b9f-1b65-41ee-8d3b-9621c99ffa68/67a5a0c8846c41bfb5521c1df3915bd8/dotnet-sdk-8.0.306-linux-x64.tar.gz"; + hash = "sha512-tZZTUIp/G3/1Y8M9ItkufnHV/qLwHWAEKd8+8mL9rfEdEcwlH8s0lxWuhv4Os/jzUiPw+E1w3S/hw5o/CfbgIQ=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/be9572a5-bcd5-46a0-b10d-0d00229ad57c/b80d3adb25c20fec467bd33f29f9a1be/dotnet-sdk-8.0.304-linux-arm64.tar.gz"; - sha512 = "6ce93ba330848b4045b6c63f96ad0a91c474361cb0a208bd4128d418fd6da04695559add63df9a0acf283a32e6e781328d3979af900e0b2382cf006c9982806d"; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/45e213b3-e64a-4425-8022-12551182f8d7/7440e33fddc3b065de3ec91c25dc1169/dotnet-sdk-8.0.306-linux-musl-arm.tar.gz"; + hash = "sha512-JtkK+U9PC0AXRiHatloxTBxlgSNlDV5ypD/9rNxdHocYGo7OHNDuZwrmkLZRzWiUdW/RqzzxMxfeVddhkK+vEA=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/8b5c27ce-6c82-4a06-8960-15ebd5434595/508572144872e190e7f00ba6583011d4/dotnet-sdk-8.0.304-osx-x64.tar.gz"; - sha512 = "50f0265436e8c3d756ba00ab7fcd606cb5d452d7bede4daf97e4c02cc97dbbafc00b76f37ec4f07bbed4bee643a433849ddbd363ad2d916aa5965ee74ba317d6"; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/5ecf5f2d-d4a3-4e2d-a78e-9d0d02352473/b1167527b6911875ef8b4ae1734c6fd3/dotnet-sdk-8.0.306-linux-musl-arm64.tar.gz"; + hash = "sha512-Ce0bWlt6EDoFg1O+EHEhK16ZWI2fiEHWeRSsO/c1b3zWGn2qnU+JmMlBCARiVxe4Cgw2eygNxBubelwTJRnV9A=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/5ba638c9-0721-42c5-8bf8-9706c0f9c033/f8dbde51758bd9e734a9c932b60e12bc/dotnet-sdk-8.0.304-osx-arm64.tar.gz"; - sha512 = "6993a950bc5bff0efe762ba2562a88761e93c61024d93633209950cbb68aeb5ff189fcbfe9247a1cdebbe37e738136123c7d4eda1050708608bb1ff0408eff4d"; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/5b32ef16-9c52-45e7-b713-afede9fad881/f15872dc2cc9df4d85b4b8d34f94d559/dotnet-sdk-8.0.306-linux-musl-x64.tar.gz"; + hash = "sha512-dWVzSibY7znXyOrylnYoyeDkyr3CJTkKhOKI4zXNLjZ67zxivkLybqP3cA+T12wFyulXyqjY96yOKsSl0SfT6Q=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/5750e793-89c6-419a-9d06-cb4f85dc5884/de1bdcda0b0a5b42ce1e82e8011d97ac/dotnet-sdk-8.0.306-osx-arm64.tar.gz"; + hash = "sha512-MGq/ju8/FtiJlW8YQzsKcdnf7sw8Bj5ODTP9/jfU8tEQbCfMxElhqeLgWIOCwz0SGSuXNGIeqk7a5o561BWRpQ=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/c5d29ba1-2952-4da3-8eb0-9eb0aad0a857/8535d896d90cf0e02244a20ad895290e/dotnet-sdk-8.0.306-osx-x64.tar.gz"; + hash = "sha512-cq9N/PmNTi7bq0hd1zeRoXucJ+ya/YekCo8KsDXKcE0MxRScNLSeKZh1/K7DCaFy2rgTYLziewm1F94CJLyuAg=="; }; }; - inherit packages; + inherit commonPackages hostPackages targetPackages; }; sdk_8_0_1xx = buildNetSdk { - version = "8.0.108"; + version = "8.0.110"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/95a365b4-ac3b-4300-ab6b-54cbc73220f4/4aabad928064af8761315ef34b08c24b/dotnet-sdk-8.0.108-linux-x64.tar.gz"; - sha512 = "5666ddf6fa9b65deaba4d7c5fcc2e2d56f631c4f5f6fb2a9f5919af0616ab2b420b12a828becc2e4b8628a76ac3dae824b55abde5c6d5ac59ee131d7eceae7c2"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/090357d3-4a98-4737-af12-95cd0f7c51d9/d3c813f556a47c6e302767b8ee1d2915/dotnet-sdk-8.0.110-linux-arm.tar.gz"; + hash = "sha512-QP5sEu4/Vim45hUFIGVPmVqg7pgxXeFiN0IDDhaLFiJyGtZA0m9Ev8EfIZO3r6D4vcu5U81Be0V254rLBTu3Yw=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/22fdf62f-eb78-456c-9a82-75da635a2dfc/d47faae423b4f0666944beeee63cb6b3/dotnet-sdk-8.0.110-linux-arm64.tar.gz"; + hash = "sha512-KGylYOebHHidgPtvm2qtLhBdbjk5z2djlBJ+SB6bIAvJ2nLYe7gWK2sqT2JpSjbtZsofPY7eJhp5CrtnZTfRZA=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/9d4db360-5016-4be5-9783-cbf515a7d011/17e0019da97f0f57548a2d7a53edcf28/dotnet-sdk-8.0.110-linux-x64.tar.gz"; + hash = "sha512-Pcckqt3tl7rmOZafixVgGWJlSvZWGhMv1lDsagOnRzoQYfj192BstLGksSfmzb+1k1S8AlvT8HtW4Khxa0tmrA=="; + }; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/8991cc2c-60ba-4cf9-a687-1fc9c07f459b/12e0c566b39176c4c57f080c30754964/dotnet-sdk-8.0.110-linux-musl-arm.tar.gz"; + hash = "sha512-5YzynONaW3dGYQ8u3TVVZ1GTUBuZjafZ7FKHVcuz/cTSJJ2zOGRah4DUevRvFpw3wTybrWfgDIYNM0xGoBFAeg=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/a06e8e00-14bf-48c6-af18-799760b12228/8765ce8c3bf2e468a640084d3c12a702/dotnet-sdk-8.0.110-linux-musl-arm64.tar.gz"; + hash = "sha512-ejcF2layS9s3tRbkJd+UT6jPMqPV4lI5z6Sq2UpxbV8QkYMK1FJ0omEEq0q3cuDc2GeaaY2vW8NLJMtygtiG4A=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/07df5bfc-98ae-4335-91c4-c95ec5f99a58/48a310e5d1bde3e77c53a51c99bdfc08/dotnet-sdk-8.0.108-linux-arm64.tar.gz"; - sha512 = "6cc723f2b139d19b2e17da5936698d388a5b64638b75ef78c40c407ed3cfd3dea745c2916f03efc9e66479fc55d608eb3a89305727ecdb1c999b183b58de258d"; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/47769d7e-7c66-4887-9041-caf21b3766f7/46218edc4901dc48740c6a154ae21b83/dotnet-sdk-8.0.110-linux-musl-x64.tar.gz"; + hash = "sha512-jjgxPlsWv8ATmiK6tkx4GPm2bbn/7U5q3sINyuhhjZ3CDGy+8rwks0QLZ5Vp4d3qRLB2YeQdRd4LoZbkUm9oGA=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/5ea78b09-65a7-4b08-ac65-bfae17afb322/7416ecc76a30ae4c77e71aade36e037f/dotnet-sdk-8.0.108-osx-x64.tar.gz"; - sha512 = "a80fee279abfeb558a5540ca2a969a11bb3dbeade8c39d8c47be8a2d622ef1c2bedb22c874598ad41dbff2b95d5a43197bd9f55fc933ab4ede5edcb6a76cf6cb"; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/8d926822-6970-434e-b77f-13db037f929c/73e8ebd5b9129e903e6833c8e755b1ed/dotnet-sdk-8.0.110-osx-arm64.tar.gz"; + hash = "sha512-bWTqXAA4FLD+9LW750yvnqUCZ32iLGdrLbAbuUBTokM+qaqTIGcUWAnF2YhTpsSoB0s/JK6Ld8g1lAJwiYv8zA=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/64a3d858-c2e3-48d1-8236-7c6702efc1f8/191bed6c7f89244eb998b0f186db57d7/dotnet-sdk-8.0.108-osx-arm64.tar.gz"; - sha512 = "83b01276474b4b62bf0a282fbe11d2353a2191d90becd403b373cd6dfc95264442a907117ad8f615765b13969267b887d26a9f24dbd5f88d8b55daa94412d13c"; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/3927a23c-34ce-48e5-804d-a83c9a4110f9/5e5642702e03e8572f2f772c2166d331/dotnet-sdk-8.0.110-osx-x64.tar.gz"; + hash = "sha512-xWuCfacAPfcAZiq9CPWvBr4iOHlL9O0kl41hLkW5fA2ieSv7RSOHGoCjI7stT3aJ3p0hbu8ptlEIeV3sIKdBgA=="; }; }; - inherit packages; + inherit commonPackages hostPackages targetPackages; }; sdk_8_0 = sdk_8_0_4xx; diff --git a/pkgs/development/compilers/dotnet/versions/9.0.nix b/pkgs/development/compilers/dotnet/versions/9.0.nix index 9232daa7073c..e740d180f0aa 100644 --- a/pkgs/development/compilers/dotnet/versions/9.0.nix +++ b/pkgs/development/compilers/dotnet/versions/9.0.nix @@ -1,143 +1,245 @@ -{ buildAspNetCore, buildNetRuntime, buildNetSdk }: +{ buildAspNetCore, buildNetRuntime, buildNetSdk, fetchNupkg }: # v9.0 (go-live) let - packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "9.0.0-rc.1.24452.1"; sha256 = "05idm7kclnb8nw0nwv9wr40sm5fw7wk3zy2khiaiyvwf5c7klbkq"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "9.0.0-rc.1.24452.1"; sha256 = "1pxyk6yblg9y58w4lp9nb1dwwh0yvis4lq8b5w65ikihfyarm844"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "9.0.0-rc.1.24452.1"; sha256 = "1prajkaxj7j0jdf6s52pkmgxi8d8al6h7kvl9viwgqc3jqz2kib6"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "9.0.0-rc.1.24452.1"; sha256 = "02kz3kagy2zq19vxq2rilnnc8lnal4g6l9zzsba3045daij0gp61"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "9.0.0-rc.1.24452.1"; sha256 = "1r8577sjl8bifagq8cz7lx2jzdhhn3r668h313mz7fxwl2bqwv1a"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "9.0.0-rc.1.24452.1"; sha256 = "1bdjl8kh80p3y51yngzvvz2kc9algsg5mx9givyapkcvj465pvhc"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "9.0.0-rc.1.24452.1"; sha256 = "09ispgilx7ss1b43wqcy7c9k1145p622h22vg6z3c0g90i0n2qgw"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "9.0.0-rc.1.24452.1"; sha256 = "1lnz66r42mrxyfjdv5hswwmxv14fikn5p2il512vq0rmqq3fjwg7"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "9.0.0-rc.1.24452.1"; sha256 = "0l3wb3v7grmpipd6p40dajzc574qmffv01g68n5c5qy38fs5kicl"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "9.0.0-rc.1.24452.1"; sha256 = "1091fxvfq9zicgrx9cnk3x7xsg4389qxnj2cbfa6fq96p6rizhi1"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "9.0.0-rc.1.24452.1"; sha256 = "16q6865rwblb2jiqvpiasw6fcq1n4h221pi3xgjdc62vkx0k5xd0"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "9.0.0-rc.1.24452.1"; sha256 = "01c2ya9wmf7qkpxyjlnlflihxqpi6wrfq4slp3dylyaylypgha45"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "9.0.0-rc.1.24431.7"; sha256 = "01qlklw2y6ci1mm8p4fcx4f7sx4lzx9rbn7d9pn1j85j2bb88rp9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "0qidj6b5qymfggpgflg3173jalzmvxz662g9pkj02cd1kbm6qp5a"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "0x7vfky0ar1i3521xaai20a08j43cg2azdfghxg5dxaa1ynl53j5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "1i597rmx8ab3lbl4xkff5vnvkrikpm1zk1vd5b7bk8jyz1ls2wa2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "008w5dlmnpc73mxk580l79a84djxnchyw8cjabh8d0255fk6p3a3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "1bcfx38p4zqbvqvp3mrjm8yzcbh88i4vwd5af90z1ikfaml6841r"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "00lhshwp5gj8ckdq276lrjp7025xhmi33vlj1284xhfvbbfam58c"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "1wqqq09ixbshswx59fq6ignj88izazw1k8sqp2iarxfv0jkv8fng"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "9.0.0-rc.1.24431.7"; sha256 = "07qgqja3c1f62yfi3lqjjsyazp1hlkk41wkpk117b2xm8hw6yx4q"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "9.0.0-rc.1.24431.7"; sha256 = "0a0kmkrq99hk6sm690qwam6i0fdgzpx8yiawa6h4ylpazy8jxfxv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "0qbaijdf4k3z71820r01z3sib5l7nlr6mjf75gil39yhd9s6slc7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "0v56060wm998yy34pdr8cqp8vbc3m97yzsvc50rm6rkhdld44vql"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "08afgp9k7nr02jikd5xaim53qiqdn4r556v2sfmgv17mvix7vhmz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "1ldmhq12xka64hn327p503m6ji12djkjax9lnr5lcflx527k5i3f"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "13qk3ppy0ym4x81jwxa0322hlzxhhg6vkb5n0xzyzy5ks8rfqnx0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "17f4wkf7pq1c2hacl1z53am96wg5ydq9z0gsdz5zabkyfgs4knin"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "1p39yik8xx87xv3jykljxv9jsazkkgcw47ckppzfzadf6967nh2r"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "9.0.0-rc.1.24431.7"; sha256 = "0kqw9hnircqdbgpvk4m634nrn4lxj2p40a6qlscsqvw5yq06qvsz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "05y2i9grw8my2kg2svrrmpk2zflvcqidmkyycf58p9a3bmd2xp32"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "00gsj3xwfpsc02rv4h75hrjq140ppr1bjqz5ics9xygj9gqrf40h"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "12vld4zgmlm1s73vn3csss9v81zh53xv0hhw138rrizsl8sxb0x5"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "09yn2lqvij53mv0w4n6fqpxhh15hp3fap1ymjjv4bv11y0gsml22"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "1xvhiswcni1z6czcmra2q25i6ih4pf5crfajgzb6mhvxxambk50x"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "02mlwynhl24avpyvllsgpmnrp6q05a3q5ia34anfs9fjxdbf31yr"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "1gxvgw12g617vj5gki2ag51ll4bxqfffbg5bkqjbnxig4ilh0xmi"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "0v7fmdv74lgybk7bvighf5i1qwhlsb44lmxmkxn6f5ijc7jd1v5a"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "1ql7115ihqqv09qzd23jd4ng7dnhk0vjiy892w2vnlaghkka1klr"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "02v6yklh3kw6xl8aacxjbsijrh0x8654hnjf3aa0qi5ffpng9czh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "9.0.0-rc.1.24431.7"; sha256 = "0bi1vrf5g26gmwv5js7rc4g5anva0m0gsinr7cvqixd2g13jl708"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "1r3p996mj6hvl7gi6kffbnmm744i24smlxb9ay8hbkjmagv7pjp2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "9.0.0-rc.1.24431.7"; sha256 = "0llqrym4z3jrqf79hpl7w25vqnhrjsjmywayp5vr4c0y2bjpl3sk"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "1hqfam3749yy15fyvqza54vvsx883kk0gq9fs2y78idmj0pr4g95"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "9.0.0-rc.1.24431.7"; sha256 = "109f84rqdqj5vl0fxyb7nhq5lil9s1b7l6cv5y8z4gg139dv0z38"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "08qm6yp5swc7zryk5qkkwbsxybn8if6zmrai280bll8ygn932594"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "0n5dgj0lhxcjzy8bbzkavz2d3ixf4d1diyq4i6nysgri81kk8wd6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "9.0.0-rc.1.24431.7"; sha256 = "10lr36pv80c31vpzpnl3jxs655xm2d2b1gj26891hzpwp0v1z9l6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "07j0samh7jlkjphj2dlkphj0jrhs694qw2md6hr7mpinjr065ji4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "0j1nkhmkg3p9n626j04lqr1vv3xnpnzvnhr39j4cn0ixyr7pbfqd"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "9.0.0-rc.1.24431.7"; sha256 = "1rq2ixq8r6r29mn2xi31jpck1xicgwg3zjzlvs5zdib8w7rxiznl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "11pxn2gwss6s8rmkgzvrljjwndif3pdlpfy0l3y5fbq60rrv6gy9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "044j6xkzylzawfjghqr5fkr63k0xhxvs7azmw8pbgh6mprmva4w9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "16izyfqy0d2mvjl45z75ymhvjyrk5njrcfv1k7h223b1c1rn8p8d"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "1fvhwlyvz0fm9cd0pw7l9a64shc565yk47hp873y7dai4lsch03v"; }) - (fetchNuGet { pname = "Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; sha256 = "1fnk9q8iplj70jqy490fgg67z6sx5kyblkwd8z730s9yc3jr3919"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; sha256 = "0yxnbm7p8s9s1j7rl7cmvg1j6xnxrp64qp4dsi9c5hzn0fxg3jjk"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; sha256 = "1lzfk31aq4kfaypbqrzv74vw1pw27576a1yxpdyxls84lmd10dsy"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; sha256 = "0cq9i0cfd4gg5vgywf2jvyn8mbqnwjz6gi20x7ij85bad9hanm82"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; sha256 = "0zv3brnkvn8v8ml2597vl7z1ydy71j6q7ycjkygy4l0b053870sw"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; sha256 = "0vgr2xnskksrnrwlzk0n7qrajwkmz7cyvaifb0jbcx3kyzchxiz7"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; sha256 = "0v22m76v8f5kwd5baww7l81ap33jrw4ccsz0lyki3hj2ssmzvr3i"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; sha256 = "0x8nafwsh0y0dycdpwjix1rxfkwk25irsqrbzcbqbdx3aas6jpk5"; }) - (fetchNuGet { pname = "Microsoft.NET.ILLink.Tasks"; version = "9.0.0-rc.1.24431.7"; sha256 = "1bbpncqbd2f73n8nznhi2m2i5z8n2hds0ryz616n0nzcc4y3gnkz"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; sha256 = "08k1fzwvqyiqik98r0b03f089y4n06p5nfr73688rijgzm55l8zh"; }) + commonPackages = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Ref"; version = "9.0.0-rc.2.24474.3"; hash = "sha256-dhl6zr9+TY8ty/bJjkm7bVbRwc6J+P8FqOiv1B3/+yc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-5NMC2RF2xmdc5tPbeDvkMtr24JeWfh1LzqU8+3o9nz8="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Ref"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-N3eNI7njwqYAwf6Y/MEliLinqCbR05lSelIWgFG/P1A="; }) + (fetchNupkg { pname = "Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-KlBEQYRSy00ZH+bFkG0xPpwT7qOmm47bBgeblYtI5G4="; }) + (fetchNupkg { pname = "Microsoft.NET.ILLink.Tasks"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-FJ+4ZPyU6LZLGr0c/zffRGH2lpNrclbaC3V8a8u9kro="; }) ]; + + hostPackages = { + linux-arm = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-Ye6nUVh6gkD68zVlUg5uXYob2WCfNb+NgI7ByGkPrsY="; }) + ]; + linux-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-PnyYvI8pAmh1P9VWXX/Ckz4THQEbiwg/3wD7unDy/5E="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-leqqHeRkRMJCDX6P4mzjdc/E7X1GfvdN2iZ3QRAOjCA="; }) + ]; + linux-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-tmEH/rvjBsmocEFt4iFnzILq+kJqEO9E6GHXqFTLmE4="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-v5lk9Y0Krg3P6umdHnB+3RORoovXRzUkKjmd0WWLtB8="; }) + ]; + linux-musl-arm = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-Yv0eYUjFuGPEl+NNGboMQEsuuh72pg5adUHWA0lg+9w="; }) + ]; + linux-musl-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-x1VIdkrzpg3GTVtHRlKPsPC062H3FZyu4ZZsaitTjLw="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-f7gxJhKCgdqoByaOCQUCJRfkzvvQn+EbaZJqXJTTLCU="; }) + ]; + linux-musl-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-qjvgKFhLLRDYEJZqJzzosj+G0/2rHVo9iltR6w5YvOI="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-9odWsDB2OiwJ1Rw0SfNREnSvYn1p3WSmomBFbWegwOw="; }) + ]; + osx-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-BVQtI6mHKz/uRk6jszpYesgKvnOmiTEQa5JwjFmhp4A="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-hioVbT84W4i7/Li0UIuebF34RHwkHRCdYyn7vxkMyk0="; }) + ]; + osx-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-zqAivHOPdikSayzdg4lWEaB8yvbdRIbhwuYonx+cYoo="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-y+lKV0p7ybzXtDpTY2GwCdh2IWnAb6MdeQiRD87tr4Y="; }) + ]; + win-arm64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-arm64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-fhc4491T3JB+k4XmPyfMK6bwqpfx7Mbugs/sh9hCb6U="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-hF/f/muateSDsp9oNafpzgtFtNm0kYuAG5YhJCVx0L0="; }) + ]; + win-x64 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-9AbfJQ6S6wxIwyecuMQPFp5g1Be/MZKz0A+YLvg0vME="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-gJIIbWDEcDP3fJZLS67+pSeIUBJPdAxy/ICLU8nKGLU="; }) + ]; + win-x86 = [ + (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x86"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-SdNqAE+cjhGk8Be1sPOy3SvcXmUlBEvFUAMnGaBm9dU="; }) + ]; + }; + + targetPackages = { + linux-arm = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "9.0.0-rc.2.24474.3"; hash = "sha256-C/rbNcMEVFr+X4cc8uWafZZfTBmVrdohkwlVay49i5o="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-CrY8BoFI0y3jGCoMUxGle+q/1eR0jDo3c4/OHGkfpWc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-ry7q5h8R7E5EYWekPpurKvQSzIvgk6+PDhXmO8LGmbc="; }) + (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-rWX+2sujaeh4865lAXlazeEkAhdHv+nOw+nUGFg/PCY="; }) + ]; + linux-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "9.0.0-rc.2.24474.3"; hash = "sha256-X+/z6pjwjLfAaVlRu9a8UppQH+rWGNfOd+M6T6IpGA8="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-AkQO8KH84aWw/nbLTU5Pwe3Y+nMY6qO/ocak626vfTI="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-gX5B8VfFFKQ/c+ZyW/plJQvJR0tD3/L5u2LAF0GwqKg="; }) + (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-/h8tt997pSkGTKFcPjc41m1L6aFtnlrhyI89qtT4AAo="; }) + ]; + linux-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "9.0.0-rc.2.24474.3"; hash = "sha256-hzjiFI6ldUwohHqn+joLwj0QCSEsKA7fpsusiSUYiOE="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-c7USudhIPx+sIax6rAq35ZWENK7VcvTRMI5Zjw0lBRg="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-rW+noSMYQ/9HGMWY4Q1GdLyJ4XlwPGyBoOxJaldKU3k="; }) + (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-3PrM40rNOxEETs+BuB4apQp11UM/Tt4qCqqEe6pDCug="; }) + ]; + linux-musl-arm = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "9.0.0-rc.2.24474.3"; hash = "sha256-fbp4ArPk2XTAssAQTkrNtFHU9kzIV5zY/Jjq92Mpi+s="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-RWW2aK5C5b6opNsXqnO6XjCDPZ0EtHToHBOgPjGQS1g="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-Wd+w/+tWFL+gmhmf0wj1ym/JURGxHjJqLsieHsDw5sg="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-QELdzwfVBm1vMmFWdSN23g35/O/rtan708KHN1PiDV4="; }) + ]; + linux-musl-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "9.0.0-rc.2.24474.3"; hash = "sha256-yvHXdiGpCUWxLduToPbio8fcw9Mtyl5zvo9tCg0aV98="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-Zrs2qA7PtIYBjpk/i3HzMrqOvU00I9hBfTjp5o+4fsk="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-fsmi+VG1+9QYegQT3vPN6QhNVUOKQu2X4u92etqPTfI="; }) + (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-Wr6Tsylj+lyhfrwMUJ44duIJ8qTNQzxkmAMy90hv1uM="; }) + ]; + linux-musl-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "9.0.0-rc.2.24474.3"; hash = "sha256-Cn7eSPm1YLMdEXGkNwiFo9nGfHNq+bJRFA3f4A/9Aec="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-CGdQ7pTIO8gUrWB6KozR9DWrILLNk4K50p7hfj/KA/4="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-PHMxmQJ8GxmSliTONInEGcKUxAfLAlmY4v8H86dxxYs="; }) + (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-9Botmmfm2w8kmre5N6QdhczSl9ULvPKzNi8A5SNxP/I="; }) + ]; + osx-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "9.0.0-rc.2.24474.3"; hash = "sha256-FCTCJCtnbeN46+G6jionwMVL/ombLiWJ12w8gZv7vPk="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-O2kh/ld/qx8AoltZBY5QScxXmePNwu25xwix6aLPhuQ="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-Nek+eCGSSlSXFElKc3ZDdKAR+VqfYIKO0ZvXxLPAnvQ="; }) + (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-GhT5AhdQZnFFr3LZsArYg9asONt+teRjUJJjenhSY3k="; }) + ]; + osx-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "9.0.0-rc.2.24474.3"; hash = "sha256-Goj+/hMmaBAMPB9E1whGTgDfu2a5Kd6uAnIrLI88juQ="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-dkt2vVIvPIt+ewrp8ggNODm6Bvbj6LLpFmHH81PnVSw="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-mQflfj047ONkda7KpQZga0WWzbIGzMf9Ls+ipMrnpuw="; }) + (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-LIOwkyYFeTVmiQjJLt++yutwY7rLupshKhptuciNjVI="; }) + ]; + win-arm64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "9.0.0-rc.2.24474.3"; hash = "sha256-6aXnFRj5cnGWFjL830CktLTqisZsqnSaeuBC5J39eeY="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-V0WFhdRjor/oI4pcB7/XhKjBFefJFy6Mo4BZjmUJjEc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-btKg62ky/0St7WYjXXZnoz99DdHNUpCnOXHaBWSc/rs="; }) + (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-LX5fCmJl4PFgHStU5s4cNjUIeXFlinlA0PAD4tRYZk8="; }) + ]; + win-x64 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "9.0.0-rc.2.24474.3"; hash = "sha256-gRLb6tj22ig30xwYcSGL+mb3IEAoPweMGJtbTpfTS5k="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-WgEZAR4QO34XCQHhxbZ4DAlRDXkdyftbVFjanN7lm1o="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-W2K3711R50a4ofgvv9lOsHY8HC2luKjfSTPByGJhP1I="; }) + (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-Zv+W3RVduqZy+8tDuGOzgYEDwsJf3rBTehoZKGC1eEw="; }) + ]; + win-x86 = [ + (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "9.0.0-rc.2.24474.3"; hash = "sha256-R2ZhPNxNQxgvDMENdOblDL+PpZqfjzau70COkjUTO10="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-XgQyMZ2KEgZaBgrJKGYtlL6msnvxoLvzisHdOkN3Nlc="; }) + (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-1RpTJXq08lBJ1SqBNKSzZPs3DB6Wc1hNXYYuyqwI700="; }) + (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.2.24473.5"; hash = "sha256-IMroqfAI4aHTFggLYwURdsY7Z8M3mly8QEJjQRSgPa8="; }) + ]; + }; + in rec { - release_9_0 = "9.0.0-rc.1"; + release_9_0 = "9.0.0-rc.2"; aspnetcore_9_0 = buildAspNetCore { - version = "9.0.0-rc.1.24452.1"; + version = "9.0.0-rc.2.24474.3"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/da25731f-e296-4e2a-8f2b-0213d26e1799/859039cd012f8cfba53991f8f5543609/aspnetcore-runtime-9.0.0-rc.1.24452.1-linux-x64.tar.gz"; - sha512 = "f8fd285d67bb044d631596869d6301e10a2a243c81c9a05096a66aff4fb3431529812c7482e6cf0e065e8e065fc50b16b50d7f2a495ab30077a68bd45b3ba376"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/bb68e2f8-fc3e-42ae-85f6-ba2bf4bc8ecb/524d5256a3798a7795837d7b104fb927/aspnetcore-runtime-9.0.0-rc.2.24474.3-linux-arm.tar.gz"; + hash = "sha512-1qqmHfZrxCKWNQ9WoT5PWltWdw5izfS7KmR/gNs7ymMuf4tk27LSuEJuhi7fPKdb68/p219qbpTsCFV6T3pGGw=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/687495c2-a3a5-4cf5-98e3-2adfef55a1e4/ef59f43e13c7107ab17e59c276da2485/aspnetcore-runtime-9.0.0-rc.2.24474.3-linux-arm64.tar.gz"; + hash = "sha512-tt5mjOhxRHa+eK4A7WYCfzpbBtlcZ2itaz7KTQ85bJGEMmfA6MAxYLcJp6zcvCsJBH8eyNRjCdQMPTH4ScyYHw=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/f75b68ca-9e93-468c-925d-3ce85f8a4d0f/3a31e60149a0ca0f9e8d7c05666cfcba/aspnetcore-runtime-9.0.0-rc.2.24474.3-linux-x64.tar.gz"; + hash = "sha512-k3DCYXTNfxsv71jgpTBByUt9VBLxXqWGX7xlOmWxSLH5LnmS8UdhCmyi6SAR/yjENICrJqbn+M1W8hia8GEL6A=="; + }; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/bc4a32ff-51a4-44af-9f7e-fec219ed91b6/4ef16e8019a45a760fc00569cb979ccd/aspnetcore-runtime-9.0.0-rc.2.24474.3-linux-musl-arm.tar.gz"; + hash = "sha512-+mwjYESxZ9+g44mq87jkLRQp8ZOvAUua5oV+LcG2SmWoAoxqwX6D2+Xsh25o7py4U9/gGciLOp+hX8xqoLAX+A=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/8548303d-93c5-4846-87ad-af4c79877a26/6e3dc8573f2cd923959bdc39c8d37eb4/aspnetcore-runtime-9.0.0-rc.2.24474.3-linux-musl-arm64.tar.gz"; + hash = "sha512-YwPe+FCO5N+Xnm7mgBB32n0FF9MgO9/3SjbNuuVwidfHJpHtoApdqnQLKDGQlQtcqO0PoRErfSqxHBRZCd6RmQ=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/c5075cd5-2552-4f77-96ce-31450f9ff8d5/e6ff2b52e2a27a60eb3585cbca01d60b/aspnetcore-runtime-9.0.0-rc.1.24452.1-linux-arm64.tar.gz"; - sha512 = "84610a38fb9a98eb7bd26ba89a9c4998682ec3fffb5eade5bbafbafd63cac7d9a5279618bb5b2575d27feec098da5fe6f7150c67253f3f37762601590396e122"; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/ee8ef896-6330-4f7f-86ad-172d67793e08/fdbe8aa1eb6fe38e8ad3fe471495d388/aspnetcore-runtime-9.0.0-rc.2.24474.3-linux-musl-x64.tar.gz"; + hash = "sha512-nEGqO/ymPJSP+HPMNBoJEEmEEWfmRMwU8fVD/qO+dbEICMOEgwORb/NHIAOszYAfe8gfzIbZLBpcns0p2b3jug=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/b0414fd7-20f9-4363-9dbf-072880e97b17/89584fa06e9ba1154a7e02402a28d82f/aspnetcore-runtime-9.0.0-rc.1.24452.1-osx-x64.tar.gz"; - sha512 = "ff4a6e35b41f5200521ea4b257b293e4d48f1786ccaa9cd85b55ba96ad36036dbc149d2ff820f1dff5f2d9acf6c38b6c3540e700c2c2db5fe6d82d4f85f461ae"; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/0ffcfb0e-3d17-4b00-8bf2-db75b095252c/5bd0a672caf63b32b39b92c0677a2a4f/aspnetcore-runtime-9.0.0-rc.2.24474.3-osx-arm64.tar.gz"; + hash = "sha512-HdXqCzgA3Ti9piOSgJM2A5ummzrD8agnOmhmTKDCO2MoSKNIuNnp4OdlObbl4VgkMguDBXHC+uPflK0PJiiNMA=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/0bae8dff-9440-4388-a03e-af44e20673a8/8ab257a4963967970cd59c31c213f38d/aspnetcore-runtime-9.0.0-rc.1.24452.1-osx-arm64.tar.gz"; - sha512 = "03f7e03352d1ad2d54e9de4c1cdd7a94c2311bb36d4c6296661fab286cddebf3f57204f73892efd53f43cfb13ba73cafae95d0522c47be03203d5fb69a0ecfe9"; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/7a757e46-1c68-449e-8b1c-64293c30242d/aa10955edc95ab4419bbad34f8e4899a/aspnetcore-runtime-9.0.0-rc.2.24474.3-osx-x64.tar.gz"; + hash = "sha512-tirwJSlndP0w9g6+OKgGEviqB4Av/PHJPT2pBStGEQj+XK7DVvlczYdy6nUUhiw3mvuzwZsjyOi1OvmhhAiBPg=="; }; }; }; runtime_9_0 = buildNetRuntime { - version = "9.0.0-rc.1.24431.7"; + version = "9.0.0-rc.2.24473.5"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/72048153-7c19-4e69-bcf3-22563060db07/cd181715a0f7cd3cec8c87b115181da9/dotnet-runtime-9.0.0-rc.1.24431.7-linux-x64.tar.gz"; - sha512 = "9f9a85b8d9f6362ed2c2d0edefd04999181b2c386647644fbc1d9f248255387324399edb1c40bc7fa8c47adc22e2d71db5f25ce794521d59e46c40593b5f6cc5"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/a0fea09f-b78f-4381-be80-3bb7c363f010/7dbd31bdfde0fd28038f9feb5c24de4e/dotnet-runtime-9.0.0-rc.2.24473.5-linux-arm.tar.gz"; + hash = "sha512-w+oUlK7VbFV0BnhuFtriWi0bCeCG+kcL7nhQID88mV/wh4ujZwehFxnbHlF8b8ulOxA6aYe0/akVjfU2y/0n0A=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/54f6fb3b-da5b-4a2d-98f4-ae07c814a586/e5f2a5ba551ffe53ea1c2ae9b7681f0b/dotnet-runtime-9.0.0-rc.1.24431.7-linux-arm64.tar.gz"; - sha512 = "8542bb9381e4eca6f0ebceddec68525cc59e34f7244613cf33cb2151f570c3345cb6d081c492b01070e762d3440f02d4558234532d58ff3dc919057e06b7bdac"; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/59fcedfa-70be-4166-ad7a-aa724c8d0754/56ab42fd18b3ec36eca8e9a52398032a/dotnet-runtime-9.0.0-rc.2.24473.5-linux-arm64.tar.gz"; + hash = "sha512-NVzbOrCgH74jtwZ5FsdRazFq2jYN6pt3Nf6TXsoXI8obMkB+yjr6fHIrvwYZkAGabVY7w1l/33KUDOs4rirQTg=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/13d7d905-549f-44e8-9062-a678a742c5fb/94c51ca9c08ef9b5cceabafc2337118f/dotnet-runtime-9.0.0-rc.1.24431.7-osx-x64.tar.gz"; - sha512 = "f62f867eab633737c450ffb0543a726f1ba2f46a4265cb47978d88dad0c6b80a8db5ccf6f583842f85cb613b96d2f7c6806d669826f4b92b906e71d8d10e53e8"; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/69beb740-ba0e-4a0b-a82a-737c61cb75cb/eff5e94b382efcdcd2a80278e04edb92/dotnet-runtime-9.0.0-rc.2.24473.5-linux-x64.tar.gz"; + hash = "sha512-ugQx57uCrMqxRM8WZsRwVJ2BAqF/JgzX4NmIkjon861cEMrdFgtaGA1bsVlyFD8w/bc7aH0fjMwC6ekzSrjCzQ=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/8abf3e03-1ab3-40fd-a9cf-fa22005be2e8/cb0c3c5d130ef8ae76a982860fd3606a/dotnet-runtime-9.0.0-rc.1.24431.7-osx-arm64.tar.gz"; - sha512 = "a825fca9edde53ab6abc0efe0c44d6fb25c5c77aeb2d35b6c414d42f364453ceb069ed9db8865c2bb82523989fceb7cccbf86047699590ff756a6b9c54c21d74"; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/1ae9bcc8-f0c6-4e58-ae9e-1a97ad4176e7/97a25ba8dd8535ed125d0c3773a8f64b/dotnet-runtime-9.0.0-rc.2.24473.5-linux-musl-arm.tar.gz"; + hash = "sha512-WeLXyzWmOYR1LSlr8CoejCqNsNy7K7zkM3X59+qN7ZOGfOTCCwnAPelOPjNGPxXL+a/wWKkzHa8KxQTEdx25bA=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/f5868a65-9c13-4020-8f22-afbd6ce09d13/7a342e4798cebc6cba90a6569e9dbec0/dotnet-runtime-9.0.0-rc.2.24473.5-linux-musl-arm64.tar.gz"; + hash = "sha512-PekyCYPo4EPrW8MB4yRCVXCyHM8NXrl8Ph/eKrl+mCBtjReE2W1pE74LtLjOUMXP+Vbn+Jge4KHxyd8idnkhKg=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/d9e2009e-5bab-4a62-88e1-ae5e3ed4e0a0/617b2bf0e8292164424e71c342ed8d13/dotnet-runtime-9.0.0-rc.2.24473.5-linux-musl-x64.tar.gz"; + hash = "sha512-1AoYYdTlUKRtTpEEF20QfqoKG+lMxqxYPvMx5q0xzK9NN6QnYgMAo3N2yG8SKpIKK3tAtOSsNHvi1io43IPZZQ=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/cb30091f-cc2e-489f-a8ae-87a08a9d220d/7ce11a740f6d5641c514fe68b2cb2dd2/dotnet-runtime-9.0.0-rc.2.24473.5-osx-arm64.tar.gz"; + hash = "sha512-e1DF3vwyGDOYKU5MuRpZBgYXZ4QIpYbOmB4PR/uDPIUxsw4D/EZXoJFjRgYFcwJB42bJITw4EHfmVHU441bosw=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/b9385375-2ccd-4e9f-9e4a-8d7f6d58c3d3/00e123163e6bfaae9119c5fb355f0d53/dotnet-runtime-9.0.0-rc.2.24473.5-osx-x64.tar.gz"; + hash = "sha512-TSYNygwim2QOkORVS1FhwLnZX4u5gOtT5hlAviLIMoSdMokQfhyBWMgYklh2GidpXppClrkIag1EyMEkQFMfyA=="; }; }; }; sdk_9_0_1xx = buildNetSdk { - version = "9.0.100-rc.1.24452.12"; + version = "9.0.100-rc.2.24474.11"; srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/3b2b3c23-574b-45d7-b2b0-c67f0e935308/23ed647eb71a8f07414124422c15927d/dotnet-sdk-9.0.100-rc.1.24452.12-linux-x64.tar.gz"; - sha512 = "e8130817b779d0104a6eee33d98d97c3fad1c336013435f47c0e9e22370172b75da37ade76e49dec7cbe696884390d2e6941cc69e2bad5593d6d1c6b41083051"; + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/ba992713-4a38-4b45-9c24-8222f2ba01d7/e8746f2e70e0f06e3d9282c6d43bce65/dotnet-sdk-9.0.100-rc.2.24474.11-linux-arm.tar.gz"; + hash = "sha512-c2oOG/d5FSjmyYhIUX9s5x2U+hpacrHl2iybVycJ1Xlkq1OyDx4rn8aOLMc5zbo7kfwI2F6EB/u/zQ1fuxHH2Q=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/817f5589-0347-4254-b19a-67c30d9ce4f8/3dfe6b98927c4003fc004a1a32132a76/dotnet-sdk-9.0.100-rc.2.24474.11-linux-arm64.tar.gz"; + hash = "sha512-tTLcvLR8T9LJBgGNLsZj3hcZF598naj2Kj8hpi40zSYJ+3zuyJ9a7bKjUkf2f1Q6AsaE4WkgU7/y/cQYTfY/Uw=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/202e929a-e985-4eab-a78a-d7159fc204e4/0c85219d441cd3bbffd4fb65b7e36fe5/dotnet-sdk-9.0.100-rc.2.24474.11-linux-x64.tar.gz"; + hash = "sha512-EmqSv6nvTnBgn4snzeD64bFEqRr4pG3pSdgD0qobrQKFsbm4/GDUAgbTRqrEnkhwm+xOds325Un4kFCGAD6AmA=="; + }; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/ce9a6b41-d58d-4def-bf4d-2ff6a022c846/321706c736aaf0391a642d5d1e4d3e1b/dotnet-sdk-9.0.100-rc.2.24474.11-linux-musl-arm.tar.gz"; + hash = "sha512-pzn40pdEFS0zt7O3SThvD1E7ZtHy42PBCCu4dt7TiOHMbdJrD5ArO835V07dOGn4ALkjZIw92pDckbdsStXNlw=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/add40efa-8de0-4fb8-9ac1-bed94c85caae/30527cbdf0f429eb778ab03f2fadf896/dotnet-sdk-9.0.100-rc.2.24474.11-linux-musl-arm64.tar.gz"; + hash = "sha512-KlWo4OMbUg3ZzfPvqA9Seuh77DuA26RLxhPKq0dWtz0fFFCGSJ+rD1WpZogCmsoUBhriWNHc/Dbt6O4LKo9Htw=="; }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/f7739964-9e84-4bb7-9435-509458a15f9c/a95ad7f9deb8ce2fd30173dfe86f55ba/dotnet-sdk-9.0.100-rc.1.24452.12-linux-arm64.tar.gz"; - sha512 = "f5742537128801c199a127266175066058788a26e8a603cbd26a1c16e9ef33a5d418e4790a3cea722d7de483eee8b68e0de4bb1dfdf279713369ed3b4d163a11"; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/5e1ed970-6da9-42aa-840c-784c63c3a1af/4bb5d67f6983d22667d4d198d6e72ffd/dotnet-sdk-9.0.100-rc.2.24474.11-linux-musl-x64.tar.gz"; + hash = "sha512-JCyCo2HXOcuZdhnJggR7BfpGyNclZOq4TaSdK4Mb6xxcvyveWA3wtoVYdL8aQ2CiYxkSd9VgLc3GoBlDWgDO2A=="; }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/e26e36f6-746f-462c-8599-5d0a1f00e786/f1b8264ac10442b40009aa8cea46b23b/dotnet-sdk-9.0.100-rc.1.24452.12-osx-x64.tar.gz"; - sha512 = "0d1f0718eeef006c3ecfbefeebf9df0772ec22c74db4bb635b6463b8aedfd3957274b908b51ec019ced69d3e7af4ae9252f18e87b14a4411e1089a4cc41e37d0"; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/90c92374-0f9d-457b-a612-13cef4db7507/fc5ff8876123abfcde954906215ed1d0/dotnet-sdk-9.0.100-rc.2.24474.11-osx-arm64.tar.gz"; + hash = "sha512-wkVoXBJXKVaXrqxs8WnNY3XX5yXruHYO/OvsOfpuv2/jrVtgmUJviZ+KCgMywEeXfef4QypObyijSEiRSpJboQ=="; }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/930f4eb8-188f-47d5-8a26-28ca393b7d1b/c07a519e3d7e326c3f640ef72ea1193e/dotnet-sdk-9.0.100-rc.1.24452.12-osx-arm64.tar.gz"; - sha512 = "af30b31cd937e9fc97e164b83628c2c1ecd21329b75f742d9f5232aa68427d25b5d702cc565aa860d3c738c8727790569bf66a3ed74e5cef719ae589d302846f"; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/33f4f5cb-7423-4930-8e4b-d96f1fd088a9/87d414df2c160713cdaeec06c62cf6a9/dotnet-sdk-9.0.100-rc.2.24474.11-osx-x64.tar.gz"; + hash = "sha512-EY+pVt0zDQ30SeFGhbNi4ut7RPvpVBuXwSXZOnjcLlMCiKO6Hro5KNMF9KC5JUyEgMC4kwQYciZnn5W9bxvHWg=="; }; }; - inherit packages; + inherit commonPackages hostPackages targetPackages; }; sdk_9_0 = sdk_9_0_1xx; diff --git a/pkgs/development/compilers/dotnet/vmr.nix b/pkgs/development/compilers/dotnet/vmr.nix index d6cfcd9035d9..7cdbd36e9b5d 100644 --- a/pkgs/development/compilers/dotnet/vmr.nix +++ b/pkgs/development/compilers/dotnet/vmr.nix @@ -1,46 +1,48 @@ -{ clangStdenv -, lib -, fetchurl -, dotnetCorePackages -, jq -, curl -, git -, cmake -, pkg-config -, llvm -, zlib -, icu -, lttng-ust_2_12 -, krb5 -, glibcLocales -, ensureNewerSourcesForZipFilesHook -, darwin -, xcbuild -, swiftPackages -, openssl -, getconf -, python3 -, xmlstarlet -, nodejs -, callPackage -, unzip -, yq - -, dotnetSdk -, releaseManifestFile -, tarballHash +{ + clangStdenv, + lib, + fetchurl, + fetchpatch, + dotnetCorePackages, + jq, + curl, + git, + cmake, + pkg-config, + llvm, + zlib, + icu, + lttng-ust_2_12, + krb5, + glibcLocales, + ensureNewerSourcesForZipFilesHook, + darwin, + xcbuild, + swiftPackages, + openssl, + getconf, + python3, + xmlstarlet, + nodejs, + callPackage, + unzip, + yq, + + baseName ? "dotnet", + bootstrapSdk, + releaseManifestFile, + tarballHash, }: let - stdenv = if clangStdenv.isDarwin - then swiftPackages.stdenv - else clangStdenv; + stdenv = if clangStdenv.hostPlatform.isDarwin then swiftPackages.stdenv else clangStdenv; inherit (stdenv) isLinux isDarwin buildPlatform - targetPlatform; + targetPlatform + ; inherit (swiftPackages) apple_sdk swift; releaseManifest = lib.importJSON releaseManifestFile; @@ -50,16 +52,23 @@ let targetRid = dotnetCorePackages.systemToDotnetRid targetPlatform.system; targetArch = lib.elemAt (lib.splitString "-" targetRid) 1; - sigtool = callPackage ./sigtool.nix {}; + sigtool = callPackage ./sigtool.nix { }; _icu = if isDarwin then darwin.ICU else icu; -in stdenv.mkDerivation rec { - pname = "dotnet-vmr"; + # error NU1903: Package 'System.Text.Json' 8.0.4 has a known high severity vulnerability, + disableNU1903 = fetchpatch { + url = "https://github.com/dotnet/sdk/pull/44028.patch"; + hash = "sha256-r6AOhXhwT8ar3aS0r5CA9sPiBsp3pnnPIVO+5l5CUGM="; + }; + +in +stdenv.mkDerivation rec { + pname = "${baseName}-vmr"; version = release; # TODO: fix this in the binary sdk packages - preHook = lib.optionalString stdenv.isDarwin '' + preHook = lib.optionalString stdenv.hostPlatform.isDarwin '' addToSearchPath DYLD_LIBRARY_PATH "${_icu}/lib" export DYLD_LIBRARY_PATH ''; @@ -69,53 +78,58 @@ in stdenv.mkDerivation rec { hash = tarballHash; }; - nativeBuildInputs = [ - ensureNewerSourcesForZipFilesHook - jq - curl.bin - git - cmake - pkg-config - python3 - xmlstarlet - unzip - yq - ] - ++ lib.optionals (lib.versionAtLeast version "9") [ - nodejs - ] - ++ lib.optionals isDarwin [ - getconf - ]; + nativeBuildInputs = + [ + ensureNewerSourcesForZipFilesHook + jq + curl.bin + git + cmake + pkg-config + python3 + xmlstarlet + unzip + yq + ] + ++ lib.optionals (lib.versionAtLeast version "9") [ + nodejs + ] + ++ lib.optionals isDarwin [ + getconf + ]; - buildInputs = [ - # this gets copied into the tree, but we still want the hooks to run - dotnetSdk - # the propagated build inputs in llvm.dev break swift compilation - llvm.out - zlib - _icu - openssl - ] - ++ lib.optionals isLinux [ - krb5 - lttng-ust_2_12 - ] - ++ lib.optionals isDarwin (with apple_sdk.frameworks; [ - xcbuild - swift - (krb5.overrideAttrs (old: { - # the propagated build inputs break swift compilation - buildInputs = old.buildInputs ++ old.propagatedBuildInputs; - propagatedBuildInputs = []; - })) - sigtool - Foundation - CoreFoundation - CryptoKit - System - ] - ++ lib.optional (lib.versionAtLeast version "9") GSS); + buildInputs = + [ + # this gets copied into the tree, but we still want the hooks to run + bootstrapSdk + # the propagated build inputs in llvm.dev break swift compilation + llvm.out + zlib + _icu + openssl + ] + ++ lib.optionals isLinux [ + krb5 + lttng-ust_2_12 + ] + ++ lib.optionals isDarwin ( + with apple_sdk.frameworks; + [ + xcbuild + swift + (krb5.overrideAttrs (old: { + # the propagated build inputs break swift compilation + buildInputs = old.buildInputs ++ old.propagatedBuildInputs; + propagatedBuildInputs = [ ]; + })) + sigtool + Foundation + CoreFoundation + CryptoKit + System + ] + ++ lib.optional (lib.versionAtLeast version "9") GSS + ); # This is required to fix the error: # > CSSM_ModuleLoad(): One or more parameters passed to a function were not valid. @@ -132,216 +146,228 @@ in stdenv.mkDerivation rec { (global-name "com.apple.system.opendirectoryd.membership")) ''; - patches = lib.optionals (lib.versionOlder version "9") [ - ./fix-aspnetcore-portable-build.patch - ]; + patches = + lib.optionals (lib.versionAtLeast version "9") [ + ./UpdateNuGetConfigPackageSourcesMappings-don-t-add-em.patch + ] + ++ lib.optionals (lib.versionOlder version "9") [ + ./fix-aspnetcore-portable-build.patch + ]; - postPatch = '' - # set the sdk version in global.json to match the bootstrap sdk - jq '(.tools.dotnet=$dotnet)' global.json --arg dotnet "$(${dotnetSdk}/bin/dotnet --version)" > global.json~ - mv global.json{~,} - - patchShebangs $(find -name \*.sh -type f -executable) - - # I'm not sure why this is required, but these files seem to use the wrong - # property name. - # TODO: not needed in 9.0? - [[ ! -f src/xliff-tasks/eng/Versions.props ]] || \ - sed -i 's:\bVersionBase\b:VersionPrefix:g' \ - src/xliff-tasks/eng/Versions.props - - # at least in 9.0 preview 1, this package depends on a specific beta build - # of System.CommandLine - xmlstarlet ed \ - --inplace \ - -s //Project -t elem -n PropertyGroup \ - -s \$prev -t elem -n NoWarn -v '$(NoWarn);NU1603' \ - src/nuget-client/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj - - # AD0001 crashes intermittently in source-build-reference-packages with - # CSC : error AD0001: Analyzer 'Microsoft.NetCore.CSharp.Analyzers.Runtime.CSharpDetectPreviewFeatureAnalyzer' threw an exception of type 'System.NullReferenceException' with message 'Object reference not set to an instance of an object.'. - # possibly related to https://github.com/dotnet/runtime/issues/90356 - xmlstarlet ed \ - --inplace \ - -s //Project -t elem -n PropertyGroup \ - -s \$prev -t elem -n NoWarn -v '$(NoWarn);AD0001' \ - src/source-build-reference-packages/src/referencePackages/Directory.Build.props - - # https://github.com/microsoft/ApplicationInsights-dotnet/issues/2848 - xmlstarlet ed \ - --inplace \ - -u //_:Project/_:PropertyGroup/_:BuildNumber -v 0 \ - src/source-build-externals/src/application-insights/.props/_GlobalStaticVersion.props - - # this fixes compile errors with clang 15 (e.g. darwin) - substituteInPlace \ - src/runtime/src/native/libs/CMakeLists.txt \ - --replace-fail 'add_compile_options(-Weverything)' 'add_compile_options(-Wall)' - - # strip native symbols in runtime - # see: https://github.com/dotnet/source-build/issues/2543 - xmlstarlet ed \ - --inplace \ - -s //Project -t elem -n PropertyGroup \ - -s \$prev -t elem -n KeepNativeSymbols -v false \ - src/runtime/Directory.Build.props - '' - + lib.optionalString (lib.versionAtLeast version "9") '' - # repro.csproj fails to restore due to missing freebsd packages - xmlstarlet ed \ - --inplace \ - -s //Project -t elem -n PropertyGroup \ - -s \$prev -t elem -n RuntimeIdentifiers -v ${targetRid} \ - src/runtime/src/coreclr/tools/aot/ILCompiler/repro/repro.csproj - - # https://github.com/dotnet/runtime/pull/98559#issuecomment-1965338627 - xmlstarlet ed \ - --inplace \ - -s //Project -t elem -n PropertyGroup \ - -s \$prev -t elem -n NoWarn -v '$(NoWarn);CS9216' \ - src/runtime/Directory.Build.props - - # patch packages installed from npm cache - xmlstarlet ed \ - --inplace \ - -s //Project -t elem -n Import \ - -i \$prev -t attr -n Project -v "${./patch-npm-packages.proj}" \ - src/aspnetcore/eng/DotNetBuild.props - '' - + lib.optionalString (lib.versionAtLeast version "9") '' - # https://github.com/dotnet/source-build/issues/3131#issuecomment-2030215805 - substituteInPlace \ - src/aspnetcore/eng/Dependencies.props \ - --replace-fail \ - "'\$(DotNetBuildSourceOnly)' == 'true'" \ - "'\$(DotNetBuildSourceOnly)' == 'true' and \$(PortableBuild) == 'false'" - - # https://github.com/dotnet/source-build/issues/4325 - xmlstarlet ed \ - --inplace \ - -r '//Target[@Name="UnpackTarballs"]/Move' -v Copy \ - eng/init-source-only.proj - - # error: _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror,-W#warnings] - substituteInPlace \ - src/runtime/src/coreclr/ilasm/CMakeLists.txt \ - --replace-fail 'set_source_files_properties( prebuilt/asmparse.cpp PROPERTIES COMPILE_FLAGS "-O0" )' "" - - # https://github.com/dotnet/source-build/issues/4444 - xmlstarlet ed \ - --inplace \ - -s '//Project/Target/MSBuild[@Targets="Restore"]' \ - -t attr -n Properties -v "NUGET_PACKAGES='\$(CurrentRepoSourceBuildPackageCache)'" \ - src/aspnetcore/eng/Tools.props - '' - + lib.optionalString isLinux ('' - substituteInPlace \ - src/runtime/src/native/libs/System.Security.Cryptography.Native/opensslshim.c \ - --replace-fail '"libssl.so"' '"${openssl.out}/lib/libssl.so"' - - substituteInPlace \ - src/runtime/src/native/libs/System.Net.Security.Native/pal_gssapi.c \ - --replace-fail '"libgssapi_krb5.so.2"' '"${lib.getLib krb5}/lib/libgssapi_krb5.so.2"' - - substituteInPlace \ - src/runtime/src/native/libs/System.Globalization.Native/pal_icushim.c \ - --replace-fail '"libicui18n.so"' '"${icu}/lib/libicui18n.so"' \ - --replace-fail '"libicuuc.so"' '"${icu}/lib/libicuuc.so"' - '' - + lib.optionalString (lib.versionAtLeast version "9") '' - substituteInPlace \ - src/runtime/src/native/libs/System.Globalization.Native/pal_icushim.c \ - --replace-fail '#define VERSIONED_LIB_NAME_LEN 64' '#define VERSIONED_LIB_NAME_LEN 256' - '' - + lib.optionalString (lib.versionOlder version "9") '' - substituteInPlace \ - src/runtime/src/native/libs/System.Globalization.Native/pal_icushim.c \ - --replace-warn 'libicuucName[64]' 'libicuucName[256]' \ - --replace-warn 'libicui18nName[64]' 'libicui18nName[256]' - '') - + lib.optionalString isDarwin ('' - substituteInPlace \ - src/runtime/src/native/libs/System.Globalization.Native/CMakeLists.txt \ - --replace-fail '/usr/lib/libicucore.dylib' '${darwin.ICU}/lib/libicucore.dylib' - - substituteInPlace \ - src/runtime/src/installer/managed/Microsoft.NET.HostModel/HostModelUtils.cs \ - src/sdk/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets \ - --replace-fail '/usr/bin/codesign' '${sigtool}/bin/codesign' - - # fix: strip: error: unknown argument '-n' - substituteInPlace \ - src/runtime/eng/native/functions.cmake \ - --replace-fail ' -no_code_signature_warning' "" - - # [...]/installer.singlerid.targets(434,5): error MSB3073: The command "pkgbuild [...]" exited with code 127 - xmlstarlet ed \ - --inplace \ - -s //Project -t elem -n PropertyGroup \ - -s \$prev -t elem -n SkipInstallerBuild -v true \ - src/runtime/Directory.Build.props - - # stop passing -sdk without a path - # stop using xcrun - # add -module-cache-path to fix swift errors, see sandboxProfile - # <unknown>:0: error: unable to open output file '/var/folders/[...]/C/clang/ModuleCache/[...]/SwiftShims-[...].pcm': 'Operation not permitted' - # <unknown>:0: error: could not build Objective-C module 'SwiftShims' - substituteInPlace \ - src/runtime/src/native/libs/System.Security.Cryptography.Native.Apple/CMakeLists.txt \ - --replace-fail ' -sdk ''${CMAKE_OSX_SYSROOT}' "" \ - --replace-fail 'xcrun swiftc' 'swiftc -module-cache-path "$ENV{HOME}/.cache/module-cache"' - '' - + lib.optionalString (lib.versionAtLeast version "9") '' - # fix: strip: error: unknown argument '-n' - substituteInPlace \ - src/runtime/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets \ - src/runtime/src/native/managed/native-library.targets \ - --replace-fail ' -no_code_signature_warning' "" - - # ld: library not found for -ld_classic - substituteInPlace \ - src/runtime/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets \ - src/runtime/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj \ - --replace-fail 'Include="-ld_classic"' "" - '' - + lib.optionalString (lib.versionOlder version "9") '' - # [...]/build.proj(123,5): error : Did not find PDBs for the following SDK files: - # [...]/build.proj(123,5): error : sdk/8.0.102/System.Resources.Extensions.dll - # [...]/build.proj(123,5): error : sdk/8.0.102/System.CodeDom.dll - # [...]/build.proj(123,5): error : sdk/8.0.102/FSharp/System.Resources.Extensions.dll - # [...]/build.proj(123,5): error : sdk/8.0.102/FSharp/System.CodeDom.dll - substituteInPlace \ - build.proj \ - --replace-fail 'FailOnMissingPDBs="true"' 'FailOnMissingPDBs="false"' - - substituteInPlace \ - src/runtime/src/mono/CMakeLists.txt \ - --replace-fail '/usr/lib/libicucore.dylib' '${darwin.ICU}/lib/libicucore.dylib' - ''); + postPatch = + '' + # set the sdk version in global.json to match the bootstrap sdk + jq '(.tools.dotnet=$dotnet)' global.json --arg dotnet "$(${bootstrapSdk}/bin/dotnet --version)" > global.json~ + mv global.json{~,} + + patchShebangs $(find -name \*.sh -type f -executable) + + # I'm not sure why this is required, but these files seem to use the wrong + # property name. + # TODO: not needed in 9.0? + [[ ! -f src/xliff-tasks/eng/Versions.props ]] || \ + sed -i 's:\bVersionBase\b:VersionPrefix:g' \ + src/xliff-tasks/eng/Versions.props + + # at least in 9.0 preview 1, this package depends on a specific beta build + # of System.CommandLine + xmlstarlet ed \ + --inplace \ + -s //Project -t elem -n PropertyGroup \ + -s \$prev -t elem -n NoWarn -v '$(NoWarn);NU1603' \ + src/nuget-client/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj + + # AD0001 crashes intermittently in source-build-reference-packages with + # CSC : error AD0001: Analyzer 'Microsoft.NetCore.CSharp.Analyzers.Runtime.CSharpDetectPreviewFeatureAnalyzer' threw an exception of type 'System.NullReferenceException' with message 'Object reference not set to an instance of an object.'. + # possibly related to https://github.com/dotnet/runtime/issues/90356 + xmlstarlet ed \ + --inplace \ + -s //Project -t elem -n PropertyGroup \ + -s \$prev -t elem -n NoWarn -v '$(NoWarn);AD0001' \ + src/source-build-reference-packages/src/referencePackages/Directory.Build.props + + # https://github.com/microsoft/ApplicationInsights-dotnet/issues/2848 + xmlstarlet ed \ + --inplace \ + -u //_:Project/_:PropertyGroup/_:BuildNumber -v 0 \ + src/source-build-externals/src/application-insights/.props/_GlobalStaticVersion.props + + # this fixes compile errors with clang 15 (e.g. darwin) + substituteInPlace \ + src/runtime/src/native/libs/CMakeLists.txt \ + --replace-fail 'add_compile_options(-Weverything)' 'add_compile_options(-Wall)' + + # strip native symbols in runtime + # see: https://github.com/dotnet/source-build/issues/2543 + xmlstarlet ed \ + --inplace \ + -s //Project -t elem -n PropertyGroup \ + -s \$prev -t elem -n KeepNativeSymbols -v false \ + src/runtime/Directory.Build.props + '' + + lib.optionalString (lib.versionAtLeast version "9") '' + # repro.csproj fails to restore due to missing freebsd packages + xmlstarlet ed \ + --inplace \ + -s //Project -t elem -n PropertyGroup \ + -s \$prev -t elem -n RuntimeIdentifiers -v ${targetRid} \ + src/runtime/src/coreclr/tools/aot/ILCompiler/repro/repro.csproj + + # https://github.com/dotnet/runtime/pull/98559#issuecomment-1965338627 + xmlstarlet ed \ + --inplace \ + -s //Project -t elem -n PropertyGroup \ + -s \$prev -t elem -n NoWarn -v '$(NoWarn);CS9216' \ + src/runtime/Directory.Build.props + + # patch packages installed from npm cache + xmlstarlet ed \ + --inplace \ + -s //Project -t elem -n Import \ + -i \$prev -t attr -n Project -v "${./patch-npm-packages.proj}" \ + src/aspnetcore/eng/DotNetBuild.props + + # patch is from sdk repo where vmr bits are in src/SourceBuild/content + patch -p4 < ${disableNU1903} + '' + + lib.optionalString (lib.versionAtLeast version "9") '' + # https://github.com/dotnet/source-build/issues/3131#issuecomment-2030215805 + substituteInPlace \ + src/aspnetcore/eng/Dependencies.props \ + --replace-fail \ + "'\$(DotNetBuildSourceOnly)' == 'true'" \ + "'\$(DotNetBuildSourceOnly)' == 'true' and \$(PortableBuild) == 'false'" + + # https://github.com/dotnet/source-build/issues/4325 + xmlstarlet ed \ + --inplace \ + -r '//Target[@Name="UnpackTarballs"]/Move' -v Copy \ + eng/init-source-only.proj + + # error: _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror,-W#warnings] + substituteInPlace \ + src/runtime/src/coreclr/ilasm/CMakeLists.txt \ + --replace-fail 'set_source_files_properties( prebuilt/asmparse.cpp PROPERTIES COMPILE_FLAGS "-O0" )' "" + + # https://github.com/dotnet/source-build/issues/4444 + xmlstarlet ed \ + --inplace \ + -s '//Project/Target/MSBuild[@Targets="Restore"]' \ + -t attr -n Properties -v "NUGET_PACKAGES='\$(CurrentRepoSourceBuildPackageCache)'" \ + src/aspnetcore/eng/Tools.props + '' + + lib.optionalString isLinux ( + '' + substituteInPlace \ + src/runtime/src/native/libs/System.Security.Cryptography.Native/opensslshim.c \ + --replace-fail '"libssl.so"' '"${openssl.out}/lib/libssl.so"' + + substituteInPlace \ + src/runtime/src/native/libs/System.Net.Security.Native/pal_gssapi.c \ + --replace-fail '"libgssapi_krb5.so.2"' '"${lib.getLib krb5}/lib/libgssapi_krb5.so.2"' + + substituteInPlace \ + src/runtime/src/native/libs/System.Globalization.Native/pal_icushim.c \ + --replace-fail '"libicui18n.so"' '"${icu}/lib/libicui18n.so"' \ + --replace-fail '"libicuuc.so"' '"${icu}/lib/libicuuc.so"' + '' + + lib.optionalString (lib.versionAtLeast version "9") '' + substituteInPlace \ + src/runtime/src/native/libs/System.Globalization.Native/pal_icushim.c \ + --replace-fail '#define VERSIONED_LIB_NAME_LEN 64' '#define VERSIONED_LIB_NAME_LEN 256' + '' + + lib.optionalString (lib.versionOlder version "9") '' + substituteInPlace \ + src/runtime/src/native/libs/System.Globalization.Native/pal_icushim.c \ + --replace-warn 'libicuucName[64]' 'libicuucName[256]' \ + --replace-warn 'libicui18nName[64]' 'libicui18nName[256]' + '' + ) + + lib.optionalString isDarwin ( + '' + substituteInPlace \ + src/runtime/src/native/libs/System.Globalization.Native/CMakeLists.txt \ + --replace-fail '/usr/lib/libicucore.dylib' '${darwin.ICU}/lib/libicucore.dylib' + + substituteInPlace \ + src/runtime/src/installer/managed/Microsoft.NET.HostModel/HostModelUtils.cs \ + src/sdk/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets \ + --replace-fail '/usr/bin/codesign' '${sigtool}/bin/codesign' + + # fix: strip: error: unknown argument '-n' + substituteInPlace \ + src/runtime/eng/native/functions.cmake \ + --replace-fail ' -no_code_signature_warning' "" + + # [...]/installer.singlerid.targets(434,5): error MSB3073: The command "pkgbuild [...]" exited with code 127 + xmlstarlet ed \ + --inplace \ + -s //Project -t elem -n PropertyGroup \ + -s \$prev -t elem -n SkipInstallerBuild -v true \ + src/runtime/Directory.Build.props + + # stop passing -sdk without a path + # stop using xcrun + # add -module-cache-path to fix swift errors, see sandboxProfile + # <unknown>:0: error: unable to open output file '/var/folders/[...]/C/clang/ModuleCache/[...]/SwiftShims-[...].pcm': 'Operation not permitted' + # <unknown>:0: error: could not build Objective-C module 'SwiftShims' + substituteInPlace \ + src/runtime/src/native/libs/System.Security.Cryptography.Native.Apple/CMakeLists.txt \ + --replace-fail ' -sdk ''${CMAKE_OSX_SYSROOT}' "" \ + --replace-fail 'xcrun swiftc' 'swiftc -module-cache-path "$ENV{HOME}/.cache/module-cache"' + '' + + lib.optionalString (lib.versionAtLeast version "9") '' + # fix: strip: error: unknown argument '-n' + substituteInPlace \ + src/runtime/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets \ + src/runtime/src/native/managed/native-library.targets \ + --replace-fail ' -no_code_signature_warning' "" + + # ld: library not found for -ld_classic + substituteInPlace \ + src/runtime/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets \ + src/runtime/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj \ + --replace-fail 'Include="-ld_classic"' "" + '' + + lib.optionalString (lib.versionOlder version "9") '' + # [...]/build.proj(123,5): error : Did not find PDBs for the following SDK files: + # [...]/build.proj(123,5): error : sdk/8.0.102/System.Resources.Extensions.dll + # [...]/build.proj(123,5): error : sdk/8.0.102/System.CodeDom.dll + # [...]/build.proj(123,5): error : sdk/8.0.102/FSharp/System.Resources.Extensions.dll + # [...]/build.proj(123,5): error : sdk/8.0.102/FSharp/System.CodeDom.dll + substituteInPlace \ + build.proj \ + --replace-fail 'FailOnMissingPDBs="true"' 'FailOnMissingPDBs="false"' + + substituteInPlace \ + src/runtime/src/mono/CMakeLists.txt \ + --replace-fail '/usr/lib/libicucore.dylib' '${darwin.ICU}/lib/libicucore.dylib' + '' + ); prepFlags = [ "--no-artifacts" "--no-prebuilts" - "--with-packages" dotnetSdk.artifacts + "--with-packages" + bootstrapSdk.artifacts ]; - configurePhase = let - prepScript = - if (lib.versionAtLeast version "9") - then "./prep-source-build.sh" - else "./prep.sh"; - in '' - runHook preConfigure + configurePhase = + let + prepScript = if (lib.versionAtLeast version "9") then "./prep-source-build.sh" else "./prep.sh"; + in + '' + runHook preConfigure - # The build process tries to overwrite some things in the sdk (e.g. - # SourceBuild.MSBuildSdkResolver.dll), so it needs to be mutable. - cp -Tr ${dotnetSdk} .dotnet - chmod -R +w .dotnet + # The build process tries to overwrite some things in the sdk (e.g. + # SourceBuild.MSBuildSdkResolver.dll), so it needs to be mutable. + cp -Tr ${bootstrapSdk} .dotnet + chmod -R +w .dotnet - ${prepScript} $prepFlags + ${prepScript} $prepFlags - runHook postConfigure - ''; + runHook postConfigure + ''; postConfigure = lib.optionalString (lib.versionAtLeast version "9") '' # see patch-npm-packages.proj @@ -353,21 +379,24 @@ in stdenv.mkDerivation rec { # https://github.com/NixOS/nixpkgs/issues/38991 # bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8) - LOCALE_ARCHIVE = lib.optionalString isLinux - "${glibcLocales}/lib/locale/locale-archive"; - - buildFlags = [ - "--with-packages" dotnetSdk.artifacts - "--clean-while-building" - "--release-manifest" releaseManifestFile - ] - ++ lib.optionals (lib.versionAtLeast version "9") [ - "--source-build" - ] - ++ [ - "--" - "-p:PortableBuild=true" - ] ++ lib.optional (targetRid != buildRid) "-p:TargetRid=${targetRid}"; + LOCALE_ARCHIVE = lib.optionalString isLinux "${glibcLocales}/lib/locale/locale-archive"; + + buildFlags = + [ + "--with-packages" + bootstrapSdk.artifacts + "--clean-while-building" + "--release-manifest" + releaseManifestFile + ] + ++ lib.optionals (lib.versionAtLeast version "9") [ + "--source-build" + ] + ++ [ + "--" + "-p:PortableBuild=true" + ] + ++ lib.optional (targetRid != buildRid) "-p:TargetRid=${targetRid}"; buildPhase = '' runHook preBuild @@ -389,35 +418,37 @@ in stdenv.mkDerivation rec { runHook postBuild ''; - installPhase = let - assets = if (lib.versionAtLeast version "9") then "assets" else targetArch; - in '' - runHook preInstall - - mkdir "$out" - - pushd "artifacts/${assets}/Release" - find . -name \*.tar.gz | while read archive; do - target=$out/$(basename "$archive" .tar.gz) - # dotnet 9 currently has two copies of the sdk tarball - [[ ! -e "$target" ]] || continue - mkdir "$target" - tar -C "$target" -xzf "$PWD/$archive" - done - popd - - local -r unpacked="$PWD/.unpacked" - for nupkg in $out/Private.SourceBuilt.Artifacts.*.${targetRid}/{,SourceBuildReferencePackages/}*.nupkg; do - rm -rf "$unpacked" - unzip -qd "$unpacked" "$nupkg" - chmod -R +rw "$unpacked" - rm "$nupkg" - mv "$unpacked" "$nupkg" - # TODO: should we fix executable flags here? see dotnetInstallHook - done - - runHook postInstall - ''; + installPhase = + let + assets = if (lib.versionAtLeast version "9") then "assets" else targetArch; + in + '' + runHook preInstall + + mkdir "$out" + + pushd "artifacts/${assets}/Release" + find . -name \*.tar.gz | while read archive; do + target=$out/$(basename "$archive" .tar.gz) + # dotnet 9 currently has two copies of the sdk tarball + [[ ! -e "$target" ]] || continue + mkdir "$target" + tar -C "$target" -xzf "$PWD/$archive" + done + popd + + local -r unpacked="$PWD/.unpacked" + for nupkg in $out/Private.SourceBuilt.Artifacts.*.${targetRid}/{,SourceBuildReferencePackages/}*.nupkg; do + rm -rf "$unpacked" + unzip -qd "$unpacked" "$nupkg" + chmod -R +rw "$unpacked" + rm "$nupkg" + mv "$unpacked" "$nupkg" + # TODO: should we fix executable flags here? see dotnetInstallHook + done + + runHook postInstall + ''; # dotnet cli is in the root, so we need to strip from there # TODO: should we install in $out/share/dotnet? diff --git a/pkgs/development/compilers/dtc/default.nix b/pkgs/development/compilers/dtc/default.nix deleted file mode 100644 index d244fc62aef4..000000000000 --- a/pkgs/development/compilers/dtc/default.nix +++ /dev/null @@ -1,131 +0,0 @@ -{ stdenv -, lib -, fetchzip -, fetchpatch -, meson -, ninja -, flex -, bison -, pkg-config -, which -, pythonSupport ? false -, python ? null -, swig -, libyaml -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "dtc"; - version = "1.7.0"; - - src = fetchzip { - url = "https://git.kernel.org/pub/scm/utils/dtc/dtc.git/snapshot/dtc-v${finalAttrs.version}.tar.gz"; - sha256 = "sha256-FMh3VvlY3fUK8fbd0M+aCmlUrmG9YegiOOQ7MOByffc="; - }; - - # Big pile of backports. - # FIXME: remove all of these after next upstream release. - patches = let - fetchUpstreamPatch = { rev, hash }: fetchpatch { - name = "dtc-${rev}.patch"; - url = "https://git.kernel.org/pub/scm/utils/dtc/dtc.git/patch/?id=${rev}"; - inherit hash; - }; - in [ - # meson: Fix cell overflow tests when running from meson - (fetchUpstreamPatch { - rev = "32174a66efa4ad19fc6a2a6422e4af2ae4f055cb"; - hash = "sha256-C7OzwY0zq+2CV3SB5unI7Ill2M3deF7FXeQE3B/Kx2s="; - }) - - # Use #ifdef NO_VALGRIND - (fetchUpstreamPatch { - rev = "41821821101ad8a9f83746b96b163e5bcbdbe804"; - hash = "sha256-7QEFDtap2DWbUGqtyT/RgJZJFldKB8oSubKiCtLZ0w4="; - }) - - # dtc: Fix linker options so it also works in Darwin - (fetchUpstreamPatch { - rev = "71a8b8ef0adf01af4c78c739e04533a35c1dc89c"; - hash = "sha256-uLXL0Sjcn+bnMuF+A6PjUW1Rq6uNg1dQl58zbeYpP/U="; - }) - - # meson: allow disabling tests - (fetchUpstreamPatch { - rev = "bdc5c8793a13abb8846d115b7923df87605d05bd"; - hash = "sha256-cO4f/jJX/pQL7kk4jpKUhsCVESW2ZuWaTr7z3BuvVkw="; - }) - - # meson: fix installation with meson-python - (fetchUpstreamPatch { - rev = "3fbfdd08afd2a7a25b27433f6f5678c0fe694721"; - hash = "sha256-skK8m1s4xkK6x9AqzxiEK+1uMEmS27dBI1CdEXNFTfU="; - }) - - # pylibfdt: fix get_mem_rsv for newer Python versions - (fetchUpstreamPatch { - rev = "822123856980f84562406cc7bd1d4d6c2b8bc184"; - hash = "sha256-IJpRgP3pP8Eewx2PNKxhXZdsnomz2AR6oOsun50qAms="; - }) - ]; - - env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version; - - nativeBuildInputs = [ - meson - ninja - flex - bison - pkg-config - which - ] ++ lib.optionals pythonSupport [ - python - python.pkgs.setuptools-scm - swig - ]; - - buildInputs = [ libyaml ]; - - postPatch = '' - patchShebangs setup.py - - # meson.build: bump version to 1.7.0 - substituteInPlace libfdt/meson.build \ - --replace "version: '1.6.0'," "version: '${finalAttrs.version}'," - substituteInPlace meson.build \ - --replace "version: '1.6.0'," "version: '${finalAttrs.version}'," - ''; - - # Required for installation of Python library and is innocuous otherwise. - env.DESTDIR = "/"; - - mesonAutoFeatures = "auto"; - mesonFlags = [ - (lib.mesonBool "static-build" stdenv.hostPlatform.isStatic) - (lib.mesonBool "tests" finalAttrs.finalPackage.doCheck) - ]; - - doCheck = - # Checks are broken on aarch64 darwin - # https://github.com/NixOS/nixpkgs/pull/118700#issuecomment-885892436 - !stdenv.isDarwin && - # Checks are broken when building statically on x86_64 linux with musl - # One of the test tries to build a shared library and this causes the linker: - # x86_64-unknown-linux-musl-ld: /nix/store/h9gcvnp90mpniyx2v0d0p3s06hkx1v2p-x86_64-unknown-linux-musl-gcc-13.3.0/lib/gcc/x86_64-unknown-linux-musl/13.3.0/crtbeginT.o: relocation R_X86_64_32 against hidden symbol `__TMC_END__' can not be used when making a shared object - # x86_64-unknown-linux-musl-ld: failed to set dynamic section sizes: bad value - !stdenv.hostPlatform.isStatic && - - # we must explicitly disable this here so that mesonFlags receives - # `-Dtests=disabled`; without it meson will attempt to run - # hostPlatform binaries during the configurePhase. - (with stdenv; buildPlatform.canExecute hostPlatform); - - meta = with lib; { - description = "Device Tree Compiler"; - homepage = "https://git.kernel.org/pub/scm/utils/dtc/dtc.git"; - license = licenses.gpl2Plus; # dtc itself is GPLv2, libfdt is dual GPL/BSD - maintainers = [ maintainers.dezgeg ]; - platforms = platforms.unix; - mainProgram = "dtc"; - }; -}) diff --git a/pkgs/development/compilers/ecl/16.1.2.nix b/pkgs/development/compilers/ecl/16.1.2.nix index 75055130ada2..121935df5f05 100644 --- a/pkgs/development/compilers/ecl/16.1.2.nix +++ b/pkgs/development/compilers/ecl/16.1.2.nix @@ -94,6 +94,6 @@ stdenv.mkDerivation rec { maintainers = lib.teams.lisp.members; platforms = platforms.unix; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/development/compilers/eli/default.nix b/pkgs/development/compilers/eli/default.nix deleted file mode 100644 index 7cd9413991fc..000000000000 --- a/pkgs/development/compilers/eli/default.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ lib, stdenv -, fetchurl -, symlinkJoin -, makeWrapper -, tcl -, fontconfig -, tk -, ncurses -, xorg -, file -}: - -let - # eli derives the location of the include folder from the location of the lib folder - tk_combined = symlinkJoin { - name = "tk_combined"; - paths = [ - tk - tk.dev - ]; - }; - curses_combined = symlinkJoin { - name = "curses_combined"; - paths = [ - ncurses - ncurses.dev - ]; - }; -in -stdenv.mkDerivation rec { - pname = "eli"; - version = "4.8.1"; - - src = fetchurl { - url = "mirror://sourceforge/project/eli-project/Eli/Eli%20${version}/${pname}-${version}.tar.bz2"; - sha256="1vran8583hbwrr5dciji4zkhz3f88w4mn8n9sdpr6zw0plpf1whj"; - }; - - buildInputs = [ - ncurses - fontconfig - ] ++ (with xorg; [ - libX11.dev - libXt.dev - libXaw.dev - libXext.dev - ]); - - nativeBuildInputs = [ - file - makeWrapper - ]; - - # skip interactive browser check - buildFlags = [ "nobrowsers" ]; - - # Workaround build failure on -fno-common toolchains: - # ld: cexp.o:(.bss+0x40): multiple definition of `obstck'; cccp.o:(.bss+0x0): first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - preConfigure='' - configureFlagsArray=( - --with-tcltk="${tcl} ${tk_combined}" - --with-curses="${curses_combined}" - ) - export ODIN_LOCALIPC=1 - ''; - - postInstall = '' - wrapProgram "$out/bin/eli" \ - --set ODIN_LOCALIPC 1 - ''; - - # Test if eli starts - doInstallCheck = true; - installCheckPhase = '' - export HOME="$TMP/home" - mkdir -p "$HOME" - $out/bin/eli "!ls" - ''; - - meta = { - description = "Translator Construction Made Easy"; - longDescription = '' - Eli is a programming environment that supports all phases of translator - construction with extensive libraries implementing common tasks, yet handling - arbitrary special cases. Output is the C subset of C++. - ''; - homepage = "https://eli-project.sourceforge.net/"; - license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ timokau ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/compilers/elm/packages/elm-json/default.nix b/pkgs/development/compilers/elm/packages/elm-json/default.nix index efb3fbfcc5cd..bc456d2479c1 100644 --- a/pkgs/development/compilers/elm/packages/elm-json/default.nix +++ b/pkgs/development/compilers/elm/packages/elm-json/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ curl openssl - ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; cargoHash = "sha256-8SOpL8nfhYen9vza0LYpB/5fgVmBwG7vGMmFOaJskIc="; diff --git a/pkgs/development/compilers/elm/packages/elm-test-rs/default.nix b/pkgs/development/compilers/elm/packages/elm-test-rs/default.nix index a457a422cf85..5ff6d4117b10 100644 --- a/pkgs/development/compilers/elm/packages/elm-test-rs/default.nix +++ b/pkgs/development/compilers/elm/packages/elm-test-rs/default.nix @@ -19,8 +19,8 @@ rustPlatform.buildRustPackage rec { }; buildInputs = - lib.optionals (!stdenv.isDarwin) [ openssl ] - ++ lib.optionals stdenv.isDarwin ( + lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ Security diff --git a/pkgs/development/compilers/elm/packages/lamdera/default.nix b/pkgs/development/compilers/elm/packages/lamdera/default.nix index 79101092e788..60c72eb623fa 100644 --- a/pkgs/development/compilers/elm/packages/lamdera/default.nix +++ b/pkgs/development/compilers/elm/packages/lamdera/default.nix @@ -4,20 +4,20 @@ }: let - os = if stdenv.isDarwin then "macos" else "linux"; - arch = if stdenv.isAarch64 then "arm64" else "x86_64"; + os = if stdenv.hostPlatform.isDarwin then "macos" else "linux"; + arch = if stdenv.hostPlatform.isAarch64 then "arm64" else "x86_64"; hashes = { - "x86_64-linux" = "a51d5b9a011c54b0001ff3273cee027774686e233adadb20b1978d2cabfe32a6"; - "aarch64-linux" = "8904ce928f60e06df1f06b3af5ee5eb320c388922aa38b698d823df1d73e8e49"; - "x86_64-darwin" = "b4d1bb5ddc3503862750e5b241f74c22dc013792bc4f410dd914a5216e20ed2f"; - "aarch64-darwin" = "6d20e384dae90bb994c3f1e866c964124c7e8a51e9e08bad0e90a2b560bb5a18"; + "x86_64-linux" = "15a69bfa98155651749e31c68d05a04fcf48bdccb86bce77b7c8872f545cecfa"; + "aarch64-linux" = "68a16bbbd2ed0ee19c36112a4c2d0abca66cf17465747e55adf2596b0921f8d7"; + "x86_64-darwin" = "af2c63a60a689091a01bfd212e0ce141a6d7ba61d34a585d8f83159d0ed39c6f"; + "aarch64-darwin" = "06f9f7fdcbb392a0a8a5034baf915d2b95b2876255aa8df8397ddafd1e540b7a"; }; in stdenv.mkDerivation rec { pname = "lamdera"; - version = "1.2.1"; + version = "1.3.2"; src = fetchurl { url = "https://static.lamdera.com/bin/lamdera-${version}-${os}-${arch}"; diff --git a/pkgs/development/compilers/elm/packages/node/default.nix b/pkgs/development/compilers/elm/packages/node/default.nix index bb58c212649b..3d6f550f4331 100644 --- a/pkgs/development/compilers/elm/packages/node/default.nix +++ b/pkgs/development/compilers/elm/packages/node/default.nix @@ -6,6 +6,20 @@ let inherit pkgs nodejs; inherit (pkgs.stdenv.hostPlatform) system; }; + ESBUILD_BINARY_PATH = lib.getExe ( + pkgs.esbuild.override { + buildGoModule = args: pkgs.buildGoModule (args // rec { + version = "0.20.2"; + src = pkgs.fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + rev = "v${version}"; + hash = "sha256-h/Vqwax4B4nehRP9TaYbdixAZdb1hx373dNxNHvDrtY="; + }; + vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; + }); + } + ); in with self; with elmLib; { inherit (nodePkgs) elm-live elm-upgrade elm-xref elm-analyse elm-git-install; @@ -22,6 +36,7 @@ with self; with elmLib; { }; in patched.override (old: { + inherit ESBUILD_BINARY_PATH; preRebuild = (old.preRebuild or "") + '' # This should not be needed (thanks to binwrap* being nooped) but for some reason it still needs to be done # in case of just this package @@ -124,6 +139,7 @@ with self; with elmLib; { patched = patchNpmElm nodePkgs.elm-land; in patched.override (old: { + inherit ESBUILD_BINARY_PATH; meta = with lib; nodePkgs."elm-land".meta // { description = "Production-ready framework for building Elm applications"; homepage = "https://elm.land/"; diff --git a/pkgs/development/compilers/elm/packages/node/elm-pages/default.nix b/pkgs/development/compilers/elm/packages/node/elm-pages/default.nix index 4f057be3a304..d3f48ae83505 100644 --- a/pkgs/development/compilers/elm/packages/node/elm-pages/default.nix +++ b/pkgs/development/compilers/elm/packages/node/elm-pages/default.nix @@ -1,9 +1,29 @@ { nodePkgs, pkgs, lib, makeWrapper }: -nodePkgs."elm-pages".overrideAttrs ( +let + ESBUILD_BINARY_PATH = lib.getExe ( + pkgs.esbuild.override { + buildGoModule = args: pkgs.buildGoModule (args // rec { + version = "0.21.5"; + src = pkgs.fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + rev = "v${version}"; + hash = "sha256-FpvXWIlt67G8w3pBKZo/mcp57LunxDmRUaCU/Ne89B8="; + }; + vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; + }); + } + ); +in nodePkgs."elm-pages".overrideAttrs ( old: { + inherit ESBUILD_BINARY_PATH; nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ makeWrapper old.nodejs.pkgs.node-gyp-build ]; + preRebuild = '' + sed -i 's/"esbuild": "0\.19\.12"/"esbuild": "0.21.5"/' package.json + ''; + # can't use `patches = [ <patch_file> ]` with a nodePkgs derivation; # need to patch in one of the build phases instead. # see upstream issue https://github.com/dillonkearns/elm-pages/issues/305 for dealing with the read-only problem diff --git a/pkgs/development/compilers/elm/packages/node/generate-node-packages.sh b/pkgs/development/compilers/elm/packages/node/generate-node-packages.sh index 66cc71ca32bb..8a326b6fc5ba 100755 --- a/pkgs/development/compilers/elm/packages/node/generate-node-packages.sh +++ b/pkgs/development/compilers/elm/packages/node/generate-node-packages.sh @@ -10,3 +10,5 @@ $(nix-build $ROOT -A nodePackages.node2nix --no-out-link)/bin/node2nix \ -o node-packages.nix \ -c node-composition.nix \ --no-copy-node-env -e ../../../../node-packages/node-env.nix +# well, elm-pages requires two different version of esbuild so we twist it's wrist to only use one +sed -i 's/sources."esbuild-0.19.12"/sources."esbuild-0.21.5"/' node-packages.nix diff --git a/pkgs/development/compilers/elm/packages/node/node-packages.nix b/pkgs/development/compilers/elm/packages/node/node-packages.nix index 3c7d770bdf48..a542d0e7ec4b 100644 --- a/pkgs/development/compilers/elm/packages/node/node-packages.nix +++ b/pkgs/development/compilers/elm/packages/node/node-packages.nix @@ -4,13 +4,13 @@ let sources = { - "@adobe/css-tools-4.3.2" = { + "@adobe/css-tools-4.3.3" = { name = "_at_adobe_slash_css-tools"; packageName = "@adobe/css-tools"; - version = "4.3.2"; + version = "4.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.2.tgz"; - sha512 = "DA5a1C0gD/pLOvhv33YMrbf2FK3oUzwNl9oOJqE4XVjuEtt6XIakRcsd7eLiOSPkp1kTRQGICTA8cKra/vFbjw=="; + url = "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.3.tgz"; + sha512 = "rE0Pygv0sEZ4vBWHlAgJLGDU7Pm8xoO6p3wsEceb7GYAjScrOHpEo8KK/eVkAcnSM+slAEtXjA2JpdjLp4fJQQ=="; }; }; "@babel/cli-7.12.10" = { @@ -31,22 +31,22 @@ let sha512 = "OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA=="; }; }; - "@babel/code-frame-7.23.5" = { + "@babel/code-frame-7.24.7" = { name = "_at_babel_slash_code-frame"; packageName = "@babel/code-frame"; - version = "7.23.5"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz"; - sha512 = "CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA=="; + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz"; + sha512 = "BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA=="; }; }; - "@babel/compat-data-7.23.5" = { + "@babel/compat-data-7.25.4" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.23.5"; + version = "7.25.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.5.tgz"; - sha512 = "uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.4.tgz"; + sha512 = "+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ=="; }; }; "@babel/core-7.12.10" = { @@ -58,238 +58,211 @@ let sha512 = "eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w=="; }; }; - "@babel/generator-7.23.6" = { + "@babel/generator-7.25.6" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.23.6"; + version = "7.25.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz"; - sha512 = "qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.25.6.tgz"; + sha512 = "VPC82gr1seXOpkjAAKoLhP50vx4vGNlF4msF64dSFq1P8RfB+QAuJWGHPXXPc8QyfVWwwB/TNNU4+ayZmHNbZw=="; }; }; - "@babel/helper-annotate-as-pure-7.22.5" = { + "@babel/helper-annotate-as-pure-7.24.7" = { name = "_at_babel_slash_helper-annotate-as-pure"; packageName = "@babel/helper-annotate-as-pure"; - version = "7.22.5"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz"; - sha512 = "LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg=="; + url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz"; + sha512 = "BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg=="; }; }; - "@babel/helper-builder-binary-assignment-operator-visitor-7.22.15" = { + "@babel/helper-builder-binary-assignment-operator-visitor-7.24.7" = { name = "_at_babel_slash_helper-builder-binary-assignment-operator-visitor"; packageName = "@babel/helper-builder-binary-assignment-operator-visitor"; - version = "7.22.15"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz"; - sha512 = "QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw=="; + url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.24.7.tgz"; + sha512 = "xZeCVVdwb4MsDBkkyZ64tReWYrLRHlMN72vP7Bdm3OUOuyFZExhsHUUnuWnm2/XOlAJzR0LfPpB56WXZn0X/lA=="; }; }; - "@babel/helper-compilation-targets-7.23.6" = { + "@babel/helper-compilation-targets-7.25.2" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.23.6"; + version = "7.25.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz"; - sha512 = "9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz"; + sha512 = "U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw=="; }; }; - "@babel/helper-create-class-features-plugin-7.23.7" = { + "@babel/helper-create-class-features-plugin-7.25.4" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.23.7"; + version = "7.25.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.23.7.tgz"; - sha512 = "xCoqR/8+BoNnXOY7RVSgv6X+o7pmT5q1d+gGcRlXYkI+9B31glE4jeejhKVpA04O1AtzOt7OSQ6VYKP5FcRl9g=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.4.tgz"; + sha512 = "ro/bFs3/84MDgDmMwbcHgDa8/E6J3QKNTk4xJJnVeFtGE+tL0K26E3pNxhYz2b67fJpt7Aphw5XcploKXuCvCQ=="; }; }; - "@babel/helper-create-regexp-features-plugin-7.22.15" = { + "@babel/helper-create-regexp-features-plugin-7.25.2" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.22.15"; + version = "7.25.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz"; - sha512 = "29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w=="; + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.2.tgz"; + sha512 = "+wqVGP+DFmqwFD3EH6TMTfUNeqDehV3E/dl+Sd54eaXqm17tEUNbEIn4sVivVowbvUpOtIGxdo3GoXyDH9N/9g=="; }; }; - "@babel/helper-environment-visitor-7.22.20" = { + "@babel/helper-environment-visitor-7.24.7" = { name = "_at_babel_slash_helper-environment-visitor"; packageName = "@babel/helper-environment-visitor"; - version = "7.22.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz"; - sha512 = "zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA=="; - }; - }; - "@babel/helper-function-name-7.23.0" = { - name = "_at_babel_slash_helper-function-name"; - packageName = "@babel/helper-function-name"; - version = "7.23.0"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz"; - sha512 = "OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw=="; + url = "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz"; + sha512 = "DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ=="; }; }; - "@babel/helper-hoist-variables-7.22.5" = { - name = "_at_babel_slash_helper-hoist-variables"; - packageName = "@babel/helper-hoist-variables"; - version = "7.22.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz"; - sha512 = "wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw=="; - }; - }; - "@babel/helper-member-expression-to-functions-7.23.0" = { + "@babel/helper-member-expression-to-functions-7.24.8" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.23.0"; + version = "7.24.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz"; - sha512 = "6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.8.tgz"; + sha512 = "LABppdt+Lp/RlBxqrh4qgf1oEH/WxdzQNDJIu5gC/W1GyvPVrOBiItmmM8wan2fm4oYqFuFfkXmlGpLQhPY8CA=="; }; }; - "@babel/helper-module-imports-7.22.15" = { + "@babel/helper-module-imports-7.24.7" = { name = "_at_babel_slash_helper-module-imports"; packageName = "@babel/helper-module-imports"; - version = "7.22.15"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz"; - sha512 = "0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w=="; + url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz"; + sha512 = "8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA=="; }; }; - "@babel/helper-module-transforms-7.23.3" = { + "@babel/helper-module-transforms-7.25.2" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.23.3"; + version = "7.25.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz"; - sha512 = "7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz"; + sha512 = "BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ=="; }; }; - "@babel/helper-optimise-call-expression-7.22.5" = { + "@babel/helper-optimise-call-expression-7.24.7" = { name = "_at_babel_slash_helper-optimise-call-expression"; packageName = "@babel/helper-optimise-call-expression"; - version = "7.22.5"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz"; - sha512 = "HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw=="; + url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.24.7.tgz"; + sha512 = "jKiTsW2xmWwxT1ixIdfXUZp+P5yURx2suzLZr5Hi64rURpDYdMW0pv+Uf17EYk2Rd428Lx4tLsnjGJzYKDM/6A=="; }; }; - "@babel/helper-plugin-utils-7.22.5" = { + "@babel/helper-plugin-utils-7.24.8" = { name = "_at_babel_slash_helper-plugin-utils"; packageName = "@babel/helper-plugin-utils"; - version = "7.22.5"; + version = "7.24.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz"; - sha512 = "uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg=="; + url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz"; + sha512 = "FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg=="; }; }; - "@babel/helper-remap-async-to-generator-7.22.20" = { + "@babel/helper-remap-async-to-generator-7.25.0" = { name = "_at_babel_slash_helper-remap-async-to-generator"; packageName = "@babel/helper-remap-async-to-generator"; - version = "7.22.20"; + version = "7.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz"; - sha512 = "pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw=="; + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.0.tgz"; + sha512 = "NhavI2eWEIz/H9dbrG0TuOicDhNexze43i5z7lEqwYm0WEZVTwnPpA0EafUTP7+6/W79HWIP2cTe3Z5NiSTVpw=="; }; }; - "@babel/helper-replace-supers-7.22.20" = { + "@babel/helper-replace-supers-7.25.0" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.22.20"; + version = "7.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz"; - sha512 = "qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.25.0.tgz"; + sha512 = "q688zIvQVYtZu+i2PsdIu/uWGRpfxzr5WESsfpShfZECkO+d2o+WROWezCi/Q6kJ0tfPa5+pUGUlfx2HhrA3Bg=="; }; }; - "@babel/helper-simple-access-7.22.5" = { + "@babel/helper-simple-access-7.24.7" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; - version = "7.22.5"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz"; - sha512 = "n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w=="; + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz"; + sha512 = "zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg=="; }; }; - "@babel/helper-skip-transparent-expression-wrappers-7.22.5" = { + "@babel/helper-skip-transparent-expression-wrappers-7.24.7" = { name = "_at_babel_slash_helper-skip-transparent-expression-wrappers"; packageName = "@babel/helper-skip-transparent-expression-wrappers"; - version = "7.22.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz"; - sha512 = "tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q=="; - }; - }; - "@babel/helper-split-export-declaration-7.22.6" = { - name = "_at_babel_slash_helper-split-export-declaration"; - packageName = "@babel/helper-split-export-declaration"; - version = "7.22.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz"; - sha512 = "AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g=="; + url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.24.7.tgz"; + sha512 = "IO+DLT3LQUElMbpzlatRASEyQtfhSE0+m465v++3jyyXeBTBUjtVZg28/gHeV5mrTJqvEKhKroBGAvhW+qPHiQ=="; }; }; - "@babel/helper-string-parser-7.23.4" = { + "@babel/helper-string-parser-7.24.8" = { name = "_at_babel_slash_helper-string-parser"; packageName = "@babel/helper-string-parser"; - version = "7.23.4"; + version = "7.24.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz"; - sha512 = "803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ=="; + url = "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz"; + sha512 = "pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ=="; }; }; - "@babel/helper-validator-identifier-7.22.20" = { + "@babel/helper-validator-identifier-7.24.7" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; - version = "7.22.20"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz"; - sha512 = "Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A=="; + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz"; + sha512 = "rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w=="; }; }; - "@babel/helper-validator-option-7.23.5" = { + "@babel/helper-validator-option-7.24.8" = { name = "_at_babel_slash_helper-validator-option"; packageName = "@babel/helper-validator-option"; - version = "7.23.5"; + version = "7.24.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz"; - sha512 = "85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw=="; + url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz"; + sha512 = "xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q=="; }; }; - "@babel/helper-wrap-function-7.22.20" = { + "@babel/helper-wrap-function-7.25.0" = { name = "_at_babel_slash_helper-wrap-function"; packageName = "@babel/helper-wrap-function"; - version = "7.22.20"; + version = "7.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz"; - sha512 = "pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw=="; + url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.0.tgz"; + sha512 = "s6Q1ebqutSiZnEjaofc/UKDyC4SbzV5n5SrA2Gq8UawLycr3i04f1dX4OzoQVnexm6aOCh37SQNYlJ/8Ku+PMQ=="; }; }; - "@babel/helpers-7.23.7" = { + "@babel/helpers-7.25.6" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.23.7"; + version = "7.25.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.7.tgz"; - sha512 = "6AMnjCoC8wjqBzDHkuqpa7jAKwvMo4dC+lr/TFBz+ucfulO1XMpDnwWPGBNwClOKZ8h6xn5N81W/R5OrcKtCbQ=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.6.tgz"; + sha512 = "Xg0tn4HcfTijTwfDwYlvVCl43V6h4KyVVX2aEm4qdO/PC6L2YvzLHFdmxhoeSA3eslcE6+ZVXHgWwopXYLNq4Q=="; }; }; - "@babel/highlight-7.23.4" = { + "@babel/highlight-7.24.7" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.23.4"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz"; - sha512 = "acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz"; + sha512 = "EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw=="; }; }; - "@babel/parser-7.23.6" = { + "@babel/parser-7.25.6" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.23.6"; + version = "7.25.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.23.6.tgz"; - sha512 = "Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.25.6.tgz"; + sha512 = "trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q=="; }; }; "@babel/plugin-proposal-async-generator-functions-7.20.7" = { @@ -517,229 +490,229 @@ let sha512 = "hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw=="; }; }; - "@babel/plugin-transform-arrow-functions-7.23.3" = { + "@babel/plugin-transform-arrow-functions-7.24.7" = { name = "_at_babel_slash_plugin-transform-arrow-functions"; packageName = "@babel/plugin-transform-arrow-functions"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.23.3.tgz"; - sha512 = "NzQcQrzaQPkaEwoTm4Mhyl8jI1huEL/WWIEvudjTCMJ9aBZNpsJbMASx7EQECtQQPS/DcnFpo0FIh3LvEO9cxQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.7.tgz"; + sha512 = "Dt9LQs6iEY++gXUwY03DNFat5C2NbO48jj+j/bSAz6b3HgPs39qcPiYt77fDObIcFwj3/C2ICX9YMwGflUoSHQ=="; }; }; - "@babel/plugin-transform-async-to-generator-7.23.3" = { + "@babel/plugin-transform-async-to-generator-7.24.7" = { name = "_at_babel_slash_plugin-transform-async-to-generator"; packageName = "@babel/plugin-transform-async-to-generator"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.23.3.tgz"; - sha512 = "A7LFsKi4U4fomjqXJlZg/u0ft/n8/7n7lpffUP/ZULx/DtV9SGlNKZolHH6PE8Xl1ngCc0M11OaeZptXVkfKSw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.24.7.tgz"; + sha512 = "SQY01PcJfmQ+4Ash7NE+rpbLFbmqA2GPIgqzxfFTL4t1FKRq4zTms/7htKpoCUI9OcFYgzqfmCdH53s6/jn5fA=="; }; }; - "@babel/plugin-transform-block-scoped-functions-7.23.3" = { + "@babel/plugin-transform-block-scoped-functions-7.24.7" = { name = "_at_babel_slash_plugin-transform-block-scoped-functions"; packageName = "@babel/plugin-transform-block-scoped-functions"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.23.3.tgz"; - sha512 = "vI+0sIaPIO6CNuM9Kk5VmXcMVRiOpDh7w2zZt9GXzmE/9KD70CUEVhvPR/etAeNK/FAEkhxQtXOzVF3EuRL41A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.7.tgz"; + sha512 = "yO7RAz6EsVQDaBH18IDJcMB1HnrUn2FJ/Jslc/WtPPWcjhpUJXU/rjbwmluzp7v/ZzWcEhTMXELnnsz8djWDwQ=="; }; }; - "@babel/plugin-transform-block-scoping-7.23.4" = { + "@babel/plugin-transform-block-scoping-7.25.0" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.23.4"; + version = "7.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.4.tgz"; - sha512 = "0QqbP6B6HOh7/8iNR4CQU2Th/bbRtBp4KS9vcaZd1fZ0wSh5Fyssg0UCIHwxh+ka+pNDREbVLQnHCMHKZfPwfw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.0.tgz"; + sha512 = "yBQjYoOjXlFv9nlXb3f1casSHOZkWr29NX+zChVanLg5Nc157CrbEX9D7hxxtTpuFy7Q0YzmmWfJxzvps4kXrQ=="; }; }; - "@babel/plugin-transform-classes-7.23.5" = { + "@babel/plugin-transform-classes-7.25.4" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.23.5"; + version = "7.25.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.5.tgz"; - sha512 = "jvOTR4nicqYC9yzOHIhXG5emiFEOpappSJAl73SDSEDcybD+Puuze8Tnpb9p9qEyYup24tq891gkaygIFvWDqg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.4.tgz"; + sha512 = "oexUfaQle2pF/b6E0dwsxQtAol9TLSO88kQvym6HHBWFliV2lGdrPieX+WgMRLSJDVzdYywk7jXbLPuO2KLTLg=="; }; }; - "@babel/plugin-transform-computed-properties-7.23.3" = { + "@babel/plugin-transform-computed-properties-7.24.7" = { name = "_at_babel_slash_plugin-transform-computed-properties"; packageName = "@babel/plugin-transform-computed-properties"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.23.3.tgz"; - sha512 = "dTj83UVTLw/+nbiHqQSFdwO9CbTtwq1DsDqm3CUEtDrZNET5rT5E6bIdTlOftDTDLMYxvxHNEYO4B9SLl8SLZw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.7.tgz"; + sha512 = "25cS7v+707Gu6Ds2oY6tCkUwsJ9YIDbggd9+cu9jzzDgiNq7hR/8dkzxWfKWnTic26vsI3EsCXNd4iEB6e8esQ=="; }; }; - "@babel/plugin-transform-destructuring-7.23.3" = { + "@babel/plugin-transform-destructuring-7.24.8" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.23.3"; + version = "7.24.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.3.tgz"; - sha512 = "n225npDqjDIr967cMScVKHXJs7rout1q+tt50inyBCPkyZ8KxeI6d+GIbSBTT/w/9WdlWDOej3V9HE5Lgk57gw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.8.tgz"; + sha512 = "36e87mfY8TnRxc7yc6M9g9gOB7rKgSahqkIKwLpz4Ppk2+zC2Cy1is0uwtuSG6AE4zlTOUa+7JGz9jCJGLqQFQ=="; }; }; - "@babel/plugin-transform-dotall-regex-7.23.3" = { + "@babel/plugin-transform-dotall-regex-7.24.7" = { name = "_at_babel_slash_plugin-transform-dotall-regex"; packageName = "@babel/plugin-transform-dotall-regex"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.23.3.tgz"; - sha512 = "vgnFYDHAKzFaTVp+mneDsIEbnJ2Np/9ng9iviHw3P/KVcgONxpNULEW/51Z/BaFojG2GI2GwwXck5uV1+1NOYQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.7.tgz"; + sha512 = "ZOA3W+1RRTSWvyqcMJDLqbchh7U4NRGqwRfFSVbOLS/ePIP4vHB5e8T8eXcuqyN1QkgKyj5wuW0lcS85v4CrSw=="; }; }; - "@babel/plugin-transform-duplicate-keys-7.23.3" = { + "@babel/plugin-transform-duplicate-keys-7.24.7" = { name = "_at_babel_slash_plugin-transform-duplicate-keys"; packageName = "@babel/plugin-transform-duplicate-keys"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.23.3.tgz"; - sha512 = "RrqQ+BQmU3Oyav3J+7/myfvRCq7Tbz+kKLLshUmMwNlDHExbGL7ARhajvoBJEvc+fCguPPu887N+3RRXBVKZUA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.7.tgz"; + sha512 = "JdYfXyCRihAe46jUIliuL2/s0x0wObgwwiGxw/UbgJBr20gQBThrokO4nYKgWkD7uBaqM7+9x5TU7NkExZJyzw=="; }; }; - "@babel/plugin-transform-exponentiation-operator-7.23.3" = { + "@babel/plugin-transform-exponentiation-operator-7.24.7" = { name = "_at_babel_slash_plugin-transform-exponentiation-operator"; packageName = "@babel/plugin-transform-exponentiation-operator"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.23.3.tgz"; - sha512 = "5fhCsl1odX96u7ILKHBj4/Y8vipoqwsJMh4csSA8qFfxrZDEA4Ssku2DyNvMJSmZNOEBT750LfFPbtrnTP90BQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.7.tgz"; + sha512 = "Rqe/vSc9OYgDajNIK35u7ot+KeCoetqQYFXM4Epf7M7ez3lWlOjrDjrwMei6caCVhfdw+mIKD4cgdGNy5JQotQ=="; }; }; - "@babel/plugin-transform-for-of-7.23.6" = { + "@babel/plugin-transform-for-of-7.24.7" = { name = "_at_babel_slash_plugin-transform-for-of"; packageName = "@babel/plugin-transform-for-of"; - version = "7.23.6"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.23.6.tgz"; - sha512 = "aYH4ytZ0qSuBbpfhuofbg/e96oQ7U2w1Aw/UQmKT+1l39uEhUPoFS3fHevDc1G0OvewyDudfMKY1OulczHzWIw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.7.tgz"; + sha512 = "wo9ogrDG1ITTTBsy46oGiN1dS9A7MROBTcYsfS8DtsImMkHk9JXJ3EWQM6X2SUw4x80uGPlwj0o00Uoc6nEE3g=="; }; }; - "@babel/plugin-transform-function-name-7.23.3" = { + "@babel/plugin-transform-function-name-7.25.1" = { name = "_at_babel_slash_plugin-transform-function-name"; packageName = "@babel/plugin-transform-function-name"; - version = "7.23.3"; + version = "7.25.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.23.3.tgz"; - sha512 = "I1QXp1LxIvt8yLaib49dRW5Okt7Q4oaxao6tFVKS/anCdEOMtYwWVKoiOA1p34GOWIZjUK0E+zCp7+l1pfQyiw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.1.tgz"; + sha512 = "TVVJVdW9RKMNgJJlLtHsKDTydjZAbwIsn6ySBPQaEAUU5+gVvlJt/9nRmqVbsV/IBanRjzWoaAQKLoamWVOUuA=="; }; }; - "@babel/plugin-transform-literals-7.23.3" = { + "@babel/plugin-transform-literals-7.25.2" = { name = "_at_babel_slash_plugin-transform-literals"; packageName = "@babel/plugin-transform-literals"; - version = "7.23.3"; + version = "7.25.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.23.3.tgz"; - sha512 = "wZ0PIXRxnwZvl9AYpqNUxpZ5BiTGrYt7kueGQ+N5FiQ7RCOD4cm8iShd6S6ggfVIWaJf2EMk8eRzAh52RfP4rQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.2.tgz"; + sha512 = "HQI+HcTbm9ur3Z2DkO+jgESMAMcYLuN/A7NRw9juzxAezN9AvqvUTnpKP/9kkYANz6u7dFlAyOu44ejuGySlfw=="; }; }; - "@babel/plugin-transform-member-expression-literals-7.23.3" = { + "@babel/plugin-transform-member-expression-literals-7.24.7" = { name = "_at_babel_slash_plugin-transform-member-expression-literals"; packageName = "@babel/plugin-transform-member-expression-literals"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.23.3.tgz"; - sha512 = "sC3LdDBDi5x96LA+Ytekz2ZPk8i/Ck+DEuDbRAll5rknJ5XRTSaPKEYwomLcs1AA8wg9b3KjIQRsnApj+q51Ag=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.7.tgz"; + sha512 = "T/hRC1uqrzXMKLQ6UCwMT85S3EvqaBXDGf0FaMf4446Qx9vKwlghvee0+uuZcDUCZU5RuNi4781UQ7R308zzBw=="; }; }; - "@babel/plugin-transform-modules-amd-7.23.3" = { + "@babel/plugin-transform-modules-amd-7.24.7" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.3.tgz"; - sha512 = "vJYQGxeKM4t8hYCKVBlZX/gtIY2I7mRGFNcm85sgXGMTBcoV3QdVtdpbcWEbzbfUIUZKwvgFT82mRvaQIebZzw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.7.tgz"; + sha512 = "9+pB1qxV3vs/8Hdmz/CulFB8w2tuu6EB94JZFsjdqxQokwGa9Unap7Bo2gGBGIvPmDIVvQrom7r5m/TCDMURhg=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.23.3" = { + "@babel/plugin-transform-modules-commonjs-7.24.8" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.23.3"; + version = "7.24.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.3.tgz"; - sha512 = "aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.8.tgz"; + sha512 = "WHsk9H8XxRs3JXKWFiqtQebdh9b/pTk4EgueygFzYlTKAg0Ud985mSevdNjdXdFBATSKVJGQXP1tv6aGbssLKA=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.23.3" = { + "@babel/plugin-transform-modules-systemjs-7.25.0" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.23.3"; + version = "7.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.3.tgz"; - sha512 = "ZxyKGTkF9xT9YJuKQRo19ewf3pXpopuYQd8cDXqNzc3mUNbOME0RKMoZxviQk74hwzfQsEe66dE92MaZbdHKNQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.0.tgz"; + sha512 = "YPJfjQPDXxyQWg/0+jHKj1llnY5f/R6a0p/vP4lPymxLu7Lvl4k2WMitqi08yxwQcCVUUdG9LCUj4TNEgAp3Jw=="; }; }; - "@babel/plugin-transform-modules-umd-7.23.3" = { + "@babel/plugin-transform-modules-umd-7.24.7" = { name = "_at_babel_slash_plugin-transform-modules-umd"; packageName = "@babel/plugin-transform-modules-umd"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.23.3.tgz"; - sha512 = "zHsy9iXX2nIsCBFPud3jKn1IRPWg3Ing1qOZgeKV39m1ZgIdpJqvlWVeiHBZC6ITRG0MfskhYe9cLgntfSFPIg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.7.tgz"; + sha512 = "3aytQvqJ/h9z4g8AsKPLvD4Zqi2qT+L3j7XoFFu1XBlZWEl2/1kWnhmAbxpLgPrHSY0M6UA02jyTiwUVtiKR6A=="; }; }; - "@babel/plugin-transform-named-capturing-groups-regex-7.22.5" = { + "@babel/plugin-transform-named-capturing-groups-regex-7.24.7" = { name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.22.5"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz"; - sha512 = "YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.24.7.tgz"; + sha512 = "/jr7h/EWeJtk1U/uz2jlsCioHkZk1JJZVcc8oQsJ1dUlaJD83f4/6Zeh2aHt9BIFokHIsSeDfhUmju0+1GPd6g=="; }; }; - "@babel/plugin-transform-new-target-7.23.3" = { + "@babel/plugin-transform-new-target-7.24.7" = { name = "_at_babel_slash_plugin-transform-new-target"; packageName = "@babel/plugin-transform-new-target"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.23.3.tgz"; - sha512 = "YJ3xKqtJMAT5/TIZnpAR3I+K+WaDowYbN3xyxI8zxx/Gsypwf9B9h0VB+1Nh6ACAAPRS5NSRje0uVv5i79HYGQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.7.tgz"; + sha512 = "RNKwfRIXg4Ls/8mMTza5oPF5RkOW8Wy/WgMAp1/F1yZ8mMbtwXW+HDoJiOsagWrAhI5f57Vncrmr9XeT4CVapA=="; }; }; - "@babel/plugin-transform-object-super-7.23.3" = { + "@babel/plugin-transform-object-super-7.24.7" = { name = "_at_babel_slash_plugin-transform-object-super"; packageName = "@babel/plugin-transform-object-super"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.23.3.tgz"; - sha512 = "BwQ8q0x2JG+3lxCVFohg+KbQM7plfpBwThdW9A6TMtWwLsbDA01Ek2Zb/AgDN39BiZsExm4qrXxjk+P1/fzGrA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.7.tgz"; + sha512 = "A/vVLwN6lBrMFmMDmPPz0jnE6ZGx7Jq7d6sT/Ev4H65RER6pZ+kczlf1DthF5N0qaPHBsI7UXiE8Zy66nmAovg=="; }; }; - "@babel/plugin-transform-parameters-7.23.3" = { + "@babel/plugin-transform-parameters-7.24.7" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.23.3.tgz"; - sha512 = "09lMt6UsUb3/34BbECKVbVwrT9bO6lILWln237z7sLaWnMsTi7Yc9fhX5DLpkJzAGfaReXI22wP41SZmnAA3Vw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.7.tgz"; + sha512 = "yGWW5Rr+sQOhK0Ot8hjDJuxU3XLRQGflvT4lhlSY0DFvdb3TwKaY26CJzHtYllU0vT9j58hc37ndFPsqT1SrzA=="; }; }; - "@babel/plugin-transform-property-literals-7.23.3" = { + "@babel/plugin-transform-property-literals-7.24.7" = { name = "_at_babel_slash_plugin-transform-property-literals"; packageName = "@babel/plugin-transform-property-literals"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.23.3.tgz"; - sha512 = "jR3Jn3y7cZp4oEWPFAlRsSWjxKe4PZILGBSd4nis1TsC5qeSpb+nrtihJuDhNI7QHiVbUaiXa0X2RZY3/TI6Nw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.7.tgz"; + sha512 = "EMi4MLQSHfd2nrCqQEWxFdha2gBCqU4ZcCng4WBGZ5CJL4bBRW0ptdqqDdeirGZcpALazVVNJqRmsO8/+oNCBA=="; }; }; - "@babel/plugin-transform-regenerator-7.23.3" = { + "@babel/plugin-transform-regenerator-7.24.7" = { name = "_at_babel_slash_plugin-transform-regenerator"; packageName = "@babel/plugin-transform-regenerator"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.23.3.tgz"; - sha512 = "KP+75h0KghBMcVpuKisx3XTu9Ncut8Q8TuvGO4IhY+9D5DFEckQefOuIsB/gQ2tG71lCke4NMrtIPS8pOj18BQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.7.tgz"; + sha512 = "lq3fvXPdimDrlg6LWBoqj+r/DEWgONuwjuOuQCSYgRroXDH/IdM1C0IZf59fL5cHLpjEH/O6opIRBbqv7ELnuA=="; }; }; - "@babel/plugin-transform-reserved-words-7.23.3" = { + "@babel/plugin-transform-reserved-words-7.24.7" = { name = "_at_babel_slash_plugin-transform-reserved-words"; packageName = "@babel/plugin-transform-reserved-words"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.23.3.tgz"; - sha512 = "QnNTazY54YqgGxwIexMZva9gqbPa15t/x9VS+0fsEFWplwVpXYZivtgl43Z1vMpc1bdPP2PP8siFeVcnFvA3Cg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.24.7.tgz"; + sha512 = "0DUq0pHcPKbjFZCfTss/pGkYMfy3vFWydkUBd9r0GHpIyfs2eCDENvqadMycRS9wZCXR41wucAfJHJmwA0UmoQ=="; }; }; "@babel/plugin-transform-runtime-7.12.10" = { @@ -751,67 +724,67 @@ let sha512 = "xOrUfzPxw7+WDm9igMgQCbO3cJKymX7dFdsgRr1eu9n3KjjyU4pptIXbXPseQDquw+W+RuJEJMHKHNsPNNm3CA=="; }; }; - "@babel/plugin-transform-shorthand-properties-7.23.3" = { + "@babel/plugin-transform-shorthand-properties-7.24.7" = { name = "_at_babel_slash_plugin-transform-shorthand-properties"; packageName = "@babel/plugin-transform-shorthand-properties"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.23.3.tgz"; - sha512 = "ED2fgqZLmexWiN+YNFX26fx4gh5qHDhn1O2gvEhreLW2iI63Sqm4llRLCXALKrCnbN4Jy0VcMQZl/SAzqug/jg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.7.tgz"; + sha512 = "KsDsevZMDsigzbA09+vacnLpmPH4aWjcZjXdyFKGzpplxhbeB4wYtury3vglQkg6KM/xEPKt73eCjPPf1PgXBA=="; }; }; - "@babel/plugin-transform-spread-7.23.3" = { + "@babel/plugin-transform-spread-7.24.7" = { name = "_at_babel_slash_plugin-transform-spread"; packageName = "@babel/plugin-transform-spread"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.23.3.tgz"; - sha512 = "VvfVYlrlBVu+77xVTOAoxQ6mZbnIq5FM0aGBSFEcIh03qHf+zNqA4DC/3XMUozTg7bZV3e3mZQ0i13VB6v5yUg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.7.tgz"; + sha512 = "x96oO0I09dgMDxJaANcRyD4ellXFLLiWhuwDxKZX5g2rWP1bTPkBSwCYv96VDXVT1bD9aPj8tppr5ITIh8hBng=="; }; }; - "@babel/plugin-transform-sticky-regex-7.23.3" = { + "@babel/plugin-transform-sticky-regex-7.24.7" = { name = "_at_babel_slash_plugin-transform-sticky-regex"; packageName = "@babel/plugin-transform-sticky-regex"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.23.3.tgz"; - sha512 = "HZOyN9g+rtvnOU3Yh7kSxXrKbzgrm5X4GncPY1QOquu7epga5MxKHVpYu2hvQnry/H+JjckSYRb93iNfsioAGg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.7.tgz"; + sha512 = "kHPSIJc9v24zEml5geKg9Mjx5ULpfncj0wRpYtxbvKyTtHCYDkVE3aHQ03FrpEo4gEe2vrJJS1Y9CJTaThA52g=="; }; }; - "@babel/plugin-transform-template-literals-7.23.3" = { + "@babel/plugin-transform-template-literals-7.24.7" = { name = "_at_babel_slash_plugin-transform-template-literals"; packageName = "@babel/plugin-transform-template-literals"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.23.3.tgz"; - sha512 = "Flok06AYNp7GV2oJPZZcP9vZdszev6vPBkHLwxwSpaIqx75wn6mUd3UFWsSsA0l8nXAKkyCmL/sR02m8RYGeHg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.7.tgz"; + sha512 = "AfDTQmClklHCOLxtGoP7HkeMw56k1/bTQjwsfhL6pppo/M4TOBSq+jjBUBLmV/4oeFg4GWMavIl44ZeCtmmZTw=="; }; }; - "@babel/plugin-transform-typeof-symbol-7.23.3" = { + "@babel/plugin-transform-typeof-symbol-7.24.8" = { name = "_at_babel_slash_plugin-transform-typeof-symbol"; packageName = "@babel/plugin-transform-typeof-symbol"; - version = "7.23.3"; + version = "7.24.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.23.3.tgz"; - sha512 = "4t15ViVnaFdrPC74be1gXBSMzXk3B4Us9lP7uLRQHTFpV5Dvt33pn+2MyyNxmN3VTTm3oTrZVMUmuw3oBnQ2oQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.8.tgz"; + sha512 = "adNTUpDCVnmAE58VEqKlAA6ZBlNkMnWD0ZcW76lyNFN3MJniyGFZfNwERVk8Ap56MCnXztmDr19T4mPTztcuaw=="; }; }; - "@babel/plugin-transform-unicode-escapes-7.23.3" = { + "@babel/plugin-transform-unicode-escapes-7.24.7" = { name = "_at_babel_slash_plugin-transform-unicode-escapes"; packageName = "@babel/plugin-transform-unicode-escapes"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.23.3.tgz"; - sha512 = "OMCUx/bU6ChE3r4+ZdylEqAjaQgHAgipgW8nsCfu5pGqDcFytVd91AwRvUJSBZDz0exPGgnjoqhgRYLRjFZc9Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.7.tgz"; + sha512 = "U3ap1gm5+4edc2Q/P+9VrBNhGkfnf+8ZqppY71Bo/pzZmXhhLdqgaUl6cuB07O1+AQJtCLfaOmswiNbSQ9ivhw=="; }; }; - "@babel/plugin-transform-unicode-regex-7.23.3" = { + "@babel/plugin-transform-unicode-regex-7.24.7" = { name = "_at_babel_slash_plugin-transform-unicode-regex"; packageName = "@babel/plugin-transform-unicode-regex"; - version = "7.23.3"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.23.3.tgz"; - sha512 = "wMHpNA4x2cIA32b/ci3AfwNgheiva2W0WUKWTK7vBHBhDKfPsc5cFGNWm69WBqpwd86u1qwZ9PWevKqm1A3yAw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.7.tgz"; + sha512 = "hlQ96MBZSAXUq7ltkjtu3FJCCSMx/j629ns3hA3pXnBXjanNP0LHi+JpPeA81zaWgVK1VGH95Xuy7u0RyQ8kMg=="; }; }; "@babel/preset-env-7.12.10" = { @@ -850,427 +823,40 @@ let sha512 = "plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg=="; }; }; - "@babel/template-7.22.15" = { + "@babel/template-7.25.0" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; - version = "7.22.15"; + version = "7.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz"; - sha512 = "QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w=="; + url = "https://registry.npmjs.org/@babel/template/-/template-7.25.0.tgz"; + sha512 = "aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q=="; }; }; - "@babel/traverse-7.23.7" = { + "@babel/traverse-7.25.6" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.23.7"; + version = "7.25.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.7.tgz"; - sha512 = "tY3mM8rH9jM0YHFGyfC0/xf+SB5eKUu7HPj7/k3fpi9dAlsMc5YbQvDi0Sh2QTPXqMhyaAtzAr807TIyfQrmyg=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.6.tgz"; + sha512 = "9Vrcx5ZW6UwK5tvqsj0nGpp/XzqthkT0dqIc9g1AdtygFToNtTF67XzYS//dm+SAK9cp3B9R4ZO/46p63SCjlQ=="; }; }; - "@babel/types-7.23.6" = { + "@babel/types-7.25.6" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.23.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.23.6.tgz"; - sha512 = "+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg=="; - }; - }; - "@esbuild/android-arm-0.17.19" = { - name = "_at_esbuild_slash_android-arm"; - packageName = "@esbuild/android-arm"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.19.tgz"; - sha512 = "rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A=="; - }; - }; - "@esbuild/android-arm-0.18.20" = { - name = "_at_esbuild_slash_android-arm"; - packageName = "@esbuild/android-arm"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz"; - sha512 = "fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw=="; - }; - }; - "@esbuild/android-arm64-0.17.19" = { - name = "_at_esbuild_slash_android-arm64"; - packageName = "@esbuild/android-arm64"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.19.tgz"; - sha512 = "KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA=="; - }; - }; - "@esbuild/android-arm64-0.18.20" = { - name = "_at_esbuild_slash_android-arm64"; - packageName = "@esbuild/android-arm64"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz"; - sha512 = "Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ=="; - }; - }; - "@esbuild/android-x64-0.17.19" = { - name = "_at_esbuild_slash_android-x64"; - packageName = "@esbuild/android-x64"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.19.tgz"; - sha512 = "uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww=="; - }; - }; - "@esbuild/android-x64-0.18.20" = { - name = "_at_esbuild_slash_android-x64"; - packageName = "@esbuild/android-x64"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz"; - sha512 = "8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg=="; - }; - }; - "@esbuild/darwin-arm64-0.17.19" = { - name = "_at_esbuild_slash_darwin-arm64"; - packageName = "@esbuild/darwin-arm64"; - version = "0.17.19"; + version = "7.25.6"; src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.19.tgz"; - sha512 = "80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.25.6.tgz"; + sha512 = "/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw=="; }; }; - "@esbuild/darwin-arm64-0.18.20" = { - name = "_at_esbuild_slash_darwin-arm64"; - packageName = "@esbuild/darwin-arm64"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz"; - sha512 = "bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA=="; - }; - }; - "@esbuild/darwin-x64-0.17.19" = { - name = "_at_esbuild_slash_darwin-x64"; - packageName = "@esbuild/darwin-x64"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.19.tgz"; - sha512 = "IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw=="; - }; - }; - "@esbuild/darwin-x64-0.18.20" = { - name = "_at_esbuild_slash_darwin-x64"; - packageName = "@esbuild/darwin-x64"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz"; - sha512 = "pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ=="; - }; - }; - "@esbuild/freebsd-arm64-0.17.19" = { - name = "_at_esbuild_slash_freebsd-arm64"; - packageName = "@esbuild/freebsd-arm64"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.19.tgz"; - sha512 = "pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ=="; - }; - }; - "@esbuild/freebsd-arm64-0.18.20" = { - name = "_at_esbuild_slash_freebsd-arm64"; - packageName = "@esbuild/freebsd-arm64"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz"; - sha512 = "yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw=="; - }; - }; - "@esbuild/freebsd-x64-0.17.19" = { - name = "_at_esbuild_slash_freebsd-x64"; - packageName = "@esbuild/freebsd-x64"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.19.tgz"; - sha512 = "4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ=="; - }; - }; - "@esbuild/freebsd-x64-0.18.20" = { - name = "_at_esbuild_slash_freebsd-x64"; - packageName = "@esbuild/freebsd-x64"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz"; - sha512 = "tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ=="; - }; - }; - "@esbuild/linux-arm-0.17.19" = { - name = "_at_esbuild_slash_linux-arm"; - packageName = "@esbuild/linux-arm"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.19.tgz"; - sha512 = "cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA=="; - }; - }; - "@esbuild/linux-arm-0.18.20" = { - name = "_at_esbuild_slash_linux-arm"; - packageName = "@esbuild/linux-arm"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz"; - sha512 = "/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg=="; - }; - }; - "@esbuild/linux-arm64-0.17.19" = { - name = "_at_esbuild_slash_linux-arm64"; - packageName = "@esbuild/linux-arm64"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.19.tgz"; - sha512 = "ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg=="; - }; - }; - "@esbuild/linux-arm64-0.18.20" = { - name = "_at_esbuild_slash_linux-arm64"; - packageName = "@esbuild/linux-arm64"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz"; - sha512 = "2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA=="; - }; - }; - "@esbuild/linux-ia32-0.17.19" = { - name = "_at_esbuild_slash_linux-ia32"; - packageName = "@esbuild/linux-ia32"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.19.tgz"; - sha512 = "w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ=="; - }; - }; - "@esbuild/linux-ia32-0.18.20" = { - name = "_at_esbuild_slash_linux-ia32"; - packageName = "@esbuild/linux-ia32"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz"; - sha512 = "P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA=="; - }; - }; - "@esbuild/linux-loong64-0.17.19" = { - name = "_at_esbuild_slash_linux-loong64"; - packageName = "@esbuild/linux-loong64"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.19.tgz"; - sha512 = "2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ=="; - }; - }; - "@esbuild/linux-loong64-0.18.20" = { - name = "_at_esbuild_slash_linux-loong64"; - packageName = "@esbuild/linux-loong64"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz"; - sha512 = "nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg=="; - }; - }; - "@esbuild/linux-mips64el-0.17.19" = { - name = "_at_esbuild_slash_linux-mips64el"; - packageName = "@esbuild/linux-mips64el"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.19.tgz"; - sha512 = "LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A=="; - }; - }; - "@esbuild/linux-mips64el-0.18.20" = { - name = "_at_esbuild_slash_linux-mips64el"; - packageName = "@esbuild/linux-mips64el"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz"; - sha512 = "d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ=="; - }; - }; - "@esbuild/linux-ppc64-0.17.19" = { - name = "_at_esbuild_slash_linux-ppc64"; - packageName = "@esbuild/linux-ppc64"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.19.tgz"; - sha512 = "/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg=="; - }; - }; - "@esbuild/linux-ppc64-0.18.20" = { - name = "_at_esbuild_slash_linux-ppc64"; - packageName = "@esbuild/linux-ppc64"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz"; - sha512 = "WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA=="; - }; - }; - "@esbuild/linux-riscv64-0.17.19" = { - name = "_at_esbuild_slash_linux-riscv64"; - packageName = "@esbuild/linux-riscv64"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.19.tgz"; - sha512 = "FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA=="; - }; - }; - "@esbuild/linux-riscv64-0.18.20" = { - name = "_at_esbuild_slash_linux-riscv64"; - packageName = "@esbuild/linux-riscv64"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz"; - sha512 = "WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A=="; - }; - }; - "@esbuild/linux-s390x-0.17.19" = { - name = "_at_esbuild_slash_linux-s390x"; - packageName = "@esbuild/linux-s390x"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.19.tgz"; - sha512 = "IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q=="; - }; - }; - "@esbuild/linux-s390x-0.18.20" = { - name = "_at_esbuild_slash_linux-s390x"; - packageName = "@esbuild/linux-s390x"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz"; - sha512 = "+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ=="; - }; - }; - "@esbuild/linux-x64-0.17.19" = { - name = "_at_esbuild_slash_linux-x64"; - packageName = "@esbuild/linux-x64"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.19.tgz"; - sha512 = "68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw=="; - }; - }; - "@esbuild/linux-x64-0.18.20" = { - name = "_at_esbuild_slash_linux-x64"; - packageName = "@esbuild/linux-x64"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz"; - sha512 = "UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w=="; - }; - }; - "@esbuild/netbsd-x64-0.17.19" = { - name = "_at_esbuild_slash_netbsd-x64"; - packageName = "@esbuild/netbsd-x64"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.19.tgz"; - sha512 = "CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q=="; - }; - }; - "@esbuild/netbsd-x64-0.18.20" = { - name = "_at_esbuild_slash_netbsd-x64"; - packageName = "@esbuild/netbsd-x64"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz"; - sha512 = "iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A=="; - }; - }; - "@esbuild/openbsd-x64-0.17.19" = { - name = "_at_esbuild_slash_openbsd-x64"; - packageName = "@esbuild/openbsd-x64"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.19.tgz"; - sha512 = "cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g=="; - }; - }; - "@esbuild/openbsd-x64-0.18.20" = { - name = "_at_esbuild_slash_openbsd-x64"; - packageName = "@esbuild/openbsd-x64"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz"; - sha512 = "e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg=="; - }; - }; - "@esbuild/sunos-x64-0.17.19" = { - name = "_at_esbuild_slash_sunos-x64"; - packageName = "@esbuild/sunos-x64"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.19.tgz"; - sha512 = "vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg=="; - }; - }; - "@esbuild/sunos-x64-0.18.20" = { - name = "_at_esbuild_slash_sunos-x64"; - packageName = "@esbuild/sunos-x64"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz"; - sha512 = "kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ=="; - }; - }; - "@esbuild/win32-arm64-0.17.19" = { - name = "_at_esbuild_slash_win32-arm64"; - packageName = "@esbuild/win32-arm64"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.19.tgz"; - sha512 = "yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag=="; - }; - }; - "@esbuild/win32-arm64-0.18.20" = { - name = "_at_esbuild_slash_win32-arm64"; - packageName = "@esbuild/win32-arm64"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz"; - sha512 = "ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg=="; - }; - }; - "@esbuild/win32-ia32-0.17.19" = { - name = "_at_esbuild_slash_win32-ia32"; - packageName = "@esbuild/win32-ia32"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.19.tgz"; - sha512 = "eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw=="; - }; - }; - "@esbuild/win32-ia32-0.18.20" = { - name = "_at_esbuild_slash_win32-ia32"; - packageName = "@esbuild/win32-ia32"; - version = "0.18.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz"; - sha512 = "Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g=="; - }; - }; - "@esbuild/win32-x64-0.17.19" = { - name = "_at_esbuild_slash_win32-x64"; - packageName = "@esbuild/win32-x64"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.19.tgz"; - sha512 = "lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA=="; - }; - }; - "@esbuild/win32-x64-0.18.20" = { - name = "_at_esbuild_slash_win32-x64"; - packageName = "@esbuild/win32-x64"; - version = "0.18.20"; + "@bufbuild/protobuf-2.1.0" = { + name = "_at_bufbuild_slash_protobuf"; + packageName = "@bufbuild/protobuf"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz"; - sha512 = "kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ=="; + url = "https://registry.npmjs.org/@bufbuild/protobuf/-/protobuf-2.1.0.tgz"; + sha512 = "+2Mx67Y3skJ4NCD/qNSdBJNWtu6x6Qr53jeNg+QcwiL6mt0wK+3jwHH2x1p7xaYH6Ve2JKOVn0OxU35WsmqI9A=="; }; }; "@hapi/address-2.1.4" = { @@ -1327,58 +913,85 @@ let sha512 = "O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA=="; }; }; - "@jridgewell/gen-mapping-0.3.3" = { + "@jridgewell/gen-mapping-0.3.5" = { name = "_at_jridgewell_slash_gen-mapping"; packageName = "@jridgewell/gen-mapping"; - version = "0.3.3"; + version = "0.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz"; - sha512 = "HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ=="; + url = "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz"; + sha512 = "IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg=="; }; }; - "@jridgewell/resolve-uri-3.1.1" = { + "@jridgewell/resolve-uri-3.1.2" = { name = "_at_jridgewell_slash_resolve-uri"; packageName = "@jridgewell/resolve-uri"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz"; - sha512 = "dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA=="; + url = "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz"; + sha512 = "bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw=="; }; }; - "@jridgewell/set-array-1.1.2" = { + "@jridgewell/set-array-1.2.1" = { name = "_at_jridgewell_slash_set-array"; packageName = "@jridgewell/set-array"; - version = "1.1.2"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz"; - sha512 = "xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw=="; + url = "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz"; + sha512 = "R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A=="; }; }; - "@jridgewell/source-map-0.3.5" = { + "@jridgewell/source-map-0.3.6" = { name = "_at_jridgewell_slash_source-map"; packageName = "@jridgewell/source-map"; - version = "0.3.5"; + version = "0.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz"; - sha512 = "UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ=="; + url = "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz"; + sha512 = "1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ=="; }; }; - "@jridgewell/sourcemap-codec-1.4.15" = { + "@jridgewell/sourcemap-codec-1.5.0" = { name = "_at_jridgewell_slash_sourcemap-codec"; packageName = "@jridgewell/sourcemap-codec"; - version = "1.4.15"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz"; - sha512 = "eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="; + url = "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz"; + sha512 = "gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ=="; }; }; - "@jridgewell/trace-mapping-0.3.20" = { + "@jridgewell/trace-mapping-0.3.25" = { name = "_at_jridgewell_slash_trace-mapping"; packageName = "@jridgewell/trace-mapping"; - version = "0.3.20"; + version = "0.3.25"; + src = fetchurl { + url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz"; + sha512 = "vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ=="; + }; + }; + "@jsonjoy.com/base64-1.1.2" = { + name = "_at_jsonjoy.com_slash_base64"; + packageName = "@jsonjoy.com/base64"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz"; - sha512 = "R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q=="; + url = "https://registry.npmjs.org/@jsonjoy.com/base64/-/base64-1.1.2.tgz"; + sha512 = "q6XAnWQDIMA3+FTiOYajoYqySkO+JSat0ytXGSuRdq9uXE7o92gzuQwQM14xaCRlBLGq3v5miDGC4vkVTn54xA=="; + }; + }; + "@jsonjoy.com/json-pack-1.1.0" = { + name = "_at_jsonjoy.com_slash_json-pack"; + packageName = "@jsonjoy.com/json-pack"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@jsonjoy.com/json-pack/-/json-pack-1.1.0.tgz"; + sha512 = "zlQONA+msXPPwHWZMKFVS78ewFczIll5lXiVPwFPCZUsrOKdxc2AvxU1HoNBmMRhqDZUR9HkC3UOm+6pME6Xsg=="; + }; + }; + "@jsonjoy.com/util-1.3.0" = { + name = "_at_jsonjoy.com_slash_util"; + packageName = "@jsonjoy.com/util"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@jsonjoy.com/util/-/util-1.3.0.tgz"; + sha512 = "Cebt4Vk7k1xHy87kHY7KSPLT77A7Ev7IfOblyLZhtYEhrdQ6fX4EoLq3xOQ3O/DRMEh2ok5nyC180E+ABS8Wmw=="; }; }; "@kwsites/file-exists-1.1.1" = { @@ -1399,6 +1012,69 @@ let sha512 = "GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw=="; }; }; + "@lydell/elm-0.19.1-14" = { + name = "_at_lydell_slash_elm"; + packageName = "@lydell/elm"; + version = "0.19.1-14"; + src = fetchurl { + url = "https://registry.npmjs.org/@lydell/elm/-/elm-0.19.1-14.tgz"; + sha512 = "otpGlYiNRvL7F9k6MJOTcuyIgHr+XWy/1NtHpGUgQi8lHrnuyCjwKFPPiimKpr3bcZTwpD4nebHuYR0bmPIKuA=="; + }; + }; + "@lydell/elm_darwin_arm64-0.19.1-3" = { + name = "_at_lydell_slash_elm_darwin_arm64"; + packageName = "@lydell/elm_darwin_arm64"; + version = "0.19.1-3"; + src = fetchurl { + url = "https://registry.npmjs.org/@lydell/elm_darwin_arm64/-/elm_darwin_arm64-0.19.1-3.tgz"; + sha512 = "RuKTz5ck+RBx4urj1EL/r0xWZZqBMPEXzNBQTEBCAMWLSi4Ck3TVz5pkhBaK+cRZXI+cCgytm/1bIttbp2fFIg=="; + }; + }; + "@lydell/elm_darwin_x64-0.19.1-2" = { + name = "_at_lydell_slash_elm_darwin_x64"; + packageName = "@lydell/elm_darwin_x64"; + version = "0.19.1-2"; + src = fetchurl { + url = "https://registry.npmjs.org/@lydell/elm_darwin_x64/-/elm_darwin_x64-0.19.1-2.tgz"; + sha512 = "MXfQwxdQfmuQ22iDCFlcXu5YTA0w6/ASzbxmWc+8DkgUkHTynjViGBVkQljAbYe4ZWgrYGWinZQQyhVnp/5oZw=="; + }; + }; + "@lydell/elm_linux_arm-0.19.1-0" = { + name = "_at_lydell_slash_elm_linux_arm"; + packageName = "@lydell/elm_linux_arm"; + version = "0.19.1-0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lydell/elm_linux_arm/-/elm_linux_arm-0.19.1-0.tgz"; + sha512 = "crKrLzuT6jn4OOS7PWKZGYFw6vHwPu3iNP7lg8rFkOog/HxlkRwX4S695aILBG8SGTLhEdfP9tg28SQ7vR4Lpg=="; + }; + }; + "@lydell/elm_linux_arm64-0.19.1-4" = { + name = "_at_lydell_slash_elm_linux_arm64"; + packageName = "@lydell/elm_linux_arm64"; + version = "0.19.1-4"; + src = fetchurl { + url = "https://registry.npmjs.org/@lydell/elm_linux_arm64/-/elm_linux_arm64-0.19.1-4.tgz"; + sha512 = "JuUkkVBtJjUajtTriQFFANHDmwA14NhqNqgIcq5LCJ6vUQv5/LVd6NUOkl/Rdq7Ju/VN/XwBD1/vm7MGIMOTqA=="; + }; + }; + "@lydell/elm_linux_x64-0.19.1-1" = { + name = "_at_lydell_slash_elm_linux_x64"; + packageName = "@lydell/elm_linux_x64"; + version = "0.19.1-1"; + src = fetchurl { + url = "https://registry.npmjs.org/@lydell/elm_linux_x64/-/elm_linux_x64-0.19.1-1.tgz"; + sha512 = "1Y8UAb+GfUqlSjUTX9CaaZhJqvhVcfNbYC0N9AEutlXf1CzFMvF4VsDeZdxzhNI4allPRWBD1IqtdlLhBTFacA=="; + }; + }; + "@lydell/elm_win32_x64-0.19.1-1" = { + name = "_at_lydell_slash_elm_win32_x64"; + packageName = "@lydell/elm_win32_x64"; + version = "0.19.1-1"; + src = fetchurl { + url = "https://registry.npmjs.org/@lydell/elm_win32_x64/-/elm_win32_x64-0.19.1-1.tgz"; + sha512 = "3LMiJ+uUxDFLNnCd6HBmvVWSjSWjs/Z9dMXZWCMOcw3vrW9iOkRrsNGNxohRXun2YRd8wXOX8/DwVn8i2SJ3KA=="; + }; + }; "@mrmlnc/readdir-enhanced-2.2.1" = { name = "_at_mrmlnc_slash_readdir-enhanced"; packageName = "@mrmlnc/readdir-enhanced"; @@ -1444,13 +1120,22 @@ let sha512 = "oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="; }; }; - "@npmcli/fs-3.1.0" = { + "@npmcli/agent-2.2.2" = { + name = "_at_npmcli_slash_agent"; + packageName = "@npmcli/agent"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/agent/-/agent-2.2.2.tgz"; + sha512 = "OrcNPXdpSl9UX7qPVRWbmWMCSXrcDa2M9DvrbOTj7ao1S4PlqVFYv9/yLKMkrJKZ/V5A/kDBC690or307i26Og=="; + }; + }; + "@npmcli/fs-3.1.1" = { name = "_at_npmcli_slash_fs"; packageName = "@npmcli/fs"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.0.tgz"; - sha512 = "7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w=="; + url = "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz"; + sha512 = "q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg=="; }; }; "@sindresorhus/is-0.14.0" = { @@ -1480,6 +1165,24 @@ let sha512 = "t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw=="; }; }; + "@sindresorhus/merge-streams-1.0.0" = { + name = "_at_sindresorhus_slash_merge-streams"; + packageName = "@sindresorhus/merge-streams"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-1.0.0.tgz"; + sha512 = "rUV5WyJrJLoloD4NDN1V1+LDMDWOa4OTsT4yYJwQNpTU6FWxkxHpL7eu4w+DmiH8x/EAM1otkPE1+LaspIbplw=="; + }; + }; + "@sindresorhus/merge-streams-3.0.0" = { + name = "_at_sindresorhus_slash_merge-streams"; + packageName = "@sindresorhus/merge-streams"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-3.0.0.tgz"; + sha512 = "5Muw0TDzXvK/i0BmrL1tiTsb6Sh/DXe/e5d63GpmHWr59t7rUyQhhiIuw605q/yvJxyBf6gMWmsxCC2fqtcFvQ=="; + }; + }; "@szmarczak/http-timer-1.1.2" = { name = "_at_szmarczak_slash_http-timer"; packageName = "@szmarczak/http-timer"; @@ -1498,15 +1201,6 @@ let sha512 = "4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w=="; }; }; - "@tootallnate/once-2.0.0" = { - name = "_at_tootallnate_slash_once"; - packageName = "@tootallnate/once"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz"; - sha512 = "XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A=="; - }; - }; "@types/cacheable-request-6.0.3" = { name = "_at_types_slash_cacheable-request"; packageName = "@types/cacheable-request"; @@ -1534,6 +1228,15 @@ let sha512 = "orGL5LXERPYsLov6CWs3Fh6203+dXzJkR7OnddIr2514Hsecwc8xRpzCapshBbKFImCsvS/mk6+FWiN5LyZJAQ=="; }; }; + "@types/estree-1.0.6" = { + name = "_at_types_slash_estree"; + packageName = "@types/estree"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz"; + sha512 = "AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw=="; + }; + }; "@types/get-port-3.2.0" = { name = "_at_types_slash_get-port"; packageName = "@types/get-port"; @@ -1579,13 +1282,13 @@ let sha512 = "1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA=="; }; }; - "@types/http-proxy-1.17.14" = { + "@types/http-proxy-1.17.15" = { name = "_at_types_slash_http-proxy"; packageName = "@types/http-proxy"; - version = "1.17.14"; + version = "1.17.15"; src = fetchurl { - url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.14.tgz"; - sha512 = "SSrD0c1OQzlFX7pGu1eXxSEjemej64aaNPRhhVYUGqXh0BtldAAx37MG8btcumvpgKyZp1F5Gn3JkktdxiFv6w=="; + url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.15.tgz"; + sha512 = "25g5atgiVNTIv0LBDTg1H74Hvayx0ajtJPLLcYE3whFv75J0pWNtOBzaXJQgDTmrX1bx5U9YC2w/n65BN1HwRQ=="; }; }; "@types/jest-27.5.2" = { @@ -1615,13 +1318,13 @@ let sha512 = "BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg=="; }; }; - "@types/lodash-4.14.202" = { + "@types/lodash-4.17.9" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.202"; + version = "4.17.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.202.tgz"; - sha512 = "OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.9.tgz"; + sha512 = "w9iWudx1XWOHW5lQRS9iKpK/XuRhnN+0T7HvdCCd802FYkT1AMTnxndJHGrNJwRoRHkslGr4S29tjm1cT7x/7w=="; }; }; "@types/minimatch-5.1.2" = { @@ -1642,13 +1345,13 @@ let sha512 = "U5icWpv7YnZYGsN4/cmh3WD2onMY0aJIiTE6+51TwJCttdHvtCYmkBNOobHlXwrJRL0nkH9jH4kD+1FAdMN4Tg=="; }; }; - "@types/node-20.10.6" = { + "@types/node-22.7.3" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "20.10.6"; + version = "22.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-20.10.6.tgz"; - sha512 = "Vac8H+NlRNNlAmDfGUP7b5h/KA+AtWIzuXy0E6OyP8f1tCLYAtPvKRRDJjAPqhpCb0t6U2j7/xqAuLEebW2kiw=="; + url = "https://registry.npmjs.org/@types/node/-/node-22.7.3.tgz"; + sha512 = "qXKfhXXqGTyBskvWEzJZPUxSslAiLaB6JGP1ic/XTH9ctGgzdgYguuLP1C601aRTSDNlLb0jbKqXjZ48GNraSA=="; }; }; "@types/node-8.10.66" = { @@ -1723,22 +1426,22 @@ let sha512 = "gVC1InwyVrO326wbBZw+AO3u2vRXz/iRWq9jYhpG4W8LXyIgDv3ZmcLQ5Q4Gs+gFMyqx+viFoFT+l3p61QFCmQ=="; }; }; - "@types/uglify-js-3.17.4" = { + "@types/uglify-js-3.17.5" = { name = "_at_types_slash_uglify-js"; packageName = "@types/uglify-js"; - version = "3.17.4"; + version = "3.17.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.17.4.tgz"; - sha512 = "Hm/T0kV3ywpJyMGNbsItdivRhYNCQQf1IIsYsXnoVPES4t+FMLyDe0/K+Ea7ahWtMtSNb22ZdY7MIyoD9rqARg=="; + url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.17.5.tgz"; + sha512 = "TU+fZFBTBcXj/GpDpDaBmgWk/gn96kMZ+uocaFUlV2f8a6WdMzzI44QBCmGcCiYR0Y6ZlNRiyUyKKt5nl/lbzQ=="; }; }; - "@types/webpack-4.41.38" = { + "@types/webpack-4.41.39" = { name = "_at_types_slash_webpack"; packageName = "@types/webpack"; - version = "4.41.38"; + version = "4.41.39"; src = fetchurl { - url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.38.tgz"; - sha512 = "oOW7E931XJU1mVfCnxCVgv8GLFL768pDO5u2Gzk82i8yTIgX6i7cntyZOkZYb/JtYM8252SN9bQp9tgkVDSsRw=="; + url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.39.tgz"; + sha512 = "otxUJvoi6FbBq/64gGH34eblpKLgdi+gf08GaAh8Bx6So0ZZic028Ev/SUxD22gbthMKCkeeiXEat1kHLDJfYg=="; }; }; "@types/webpack-sources-3.2.3" = { @@ -1930,15 +1633,6 @@ let sha512 = "NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="; }; }; - "abbrev-1.1.1" = { - name = "abbrev"; - packageName = "abbrev"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"; - sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; - }; - }; "accepts-1.3.8" = { name = "accepts"; packageName = "accepts"; @@ -1957,13 +1651,13 @@ let sha512 = "XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ=="; }; }; - "acorn-8.11.3" = { + "acorn-8.12.1" = { name = "acorn"; packageName = "acorn"; - version = "8.11.3"; + version = "8.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz"; - sha512 = "Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg=="; + url = "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz"; + sha512 = "tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg=="; }; }; "address-1.0.3" = { @@ -1975,22 +1669,13 @@ let sha512 = "z55ocwKBRLryBs394Sm3ushTtBeg6VAeuku7utSoSnsJKvKcnXFIyC6vh27n3rXyxSgkJBBCAvyOn7gSUcTYjg=="; }; }; - "agent-base-6.0.2" = { + "agent-base-7.1.1" = { name = "agent-base"; packageName = "agent-base"; - version = "6.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz"; - sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="; - }; - }; - "agentkeepalive-4.5.0" = { - name = "agentkeepalive"; - packageName = "agentkeepalive"; - version = "4.5.0"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.5.0.tgz"; - sha512 = "5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew=="; + url = "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz"; + sha512 = "H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA=="; }; }; "aggregate-error-3.1.0" = { @@ -2011,13 +1696,13 @@ let sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; }; }; - "ajv-8.12.0" = { + "ajv-8.17.1" = { name = "ajv"; packageName = "ajv"; - version = "8.12.0"; + version = "8.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz"; - sha512 = "sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA=="; + url = "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz"; + sha512 = "B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g=="; }; }; "ajv-errors-1.0.1" = { @@ -2119,13 +1804,13 @@ let sha512 = "quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="; }; }; - "ansi-regex-6.0.1" = { + "ansi-regex-6.1.0" = { name = "ansi-regex"; packageName = "ansi-regex"; - version = "6.0.1"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz"; - sha512 = "n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA=="; + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz"; + sha512 = "7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA=="; }; }; "ansi-styles-2.2.1" = { @@ -2245,13 +1930,13 @@ let sha512 = "sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q=="; }; }; - "array-buffer-byte-length-1.0.0" = { + "array-buffer-byte-length-1.0.1" = { name = "array-buffer-byte-length"; packageName = "array-buffer-byte-length"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz"; - sha512 = "LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A=="; + url = "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz"; + sha512 = "ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg=="; }; }; "array-filter-0.0.1" = { @@ -2335,22 +2020,22 @@ let sha512 = "SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ=="; }; }; - "array.prototype.reduce-1.0.6" = { + "array.prototype.reduce-1.0.7" = { name = "array.prototype.reduce"; packageName = "array.prototype.reduce"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.6.tgz"; - sha512 = "UW+Mz8LG/sPSU8jRDCjVr6J/ZKAGpHfwrZ6kWTG5qCxIEiXdVshqGnu5vEZA8S1y6X4aCSbQZ0/EEsfvEvBiSg=="; + url = "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.7.tgz"; + sha512 = "mzmiUCVwtiD4lgxYP8g7IYy8El8p2CSMePvIbTS7gchKir/L1fgJrk0yDKmAX6mnRQFKNADYIk8nNlTris5H1Q=="; }; }; - "arraybuffer.prototype.slice-1.0.2" = { + "arraybuffer.prototype.slice-1.0.3" = { name = "arraybuffer.prototype.slice"; packageName = "arraybuffer.prototype.slice"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz"; - sha512 = "yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw=="; + url = "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz"; + sha512 = "bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A=="; }; }; "asap-2.0.6" = { @@ -2371,13 +2056,13 @@ let sha512 = "ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ=="; }; }; - "asn1.js-5.4.1" = { + "asn1.js-4.10.1" = { name = "asn1.js"; packageName = "asn1.js"; - version = "5.4.1"; + version = "4.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz"; - sha512 = "+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA=="; + url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz"; + sha512 = "p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw=="; }; }; "assert-1.5.1" = { @@ -2506,13 +2191,13 @@ let sha512 = "0/lBNwN+ZUnb5su18NZo5MBIjDaq6boQKZcxwy86Gip/CmXA2zZqUoFQLCNAGI5P25ZWSP2RWdhDJ8osfKEjoQ=="; }; }; - "available-typed-arrays-1.0.5" = { + "available-typed-arrays-1.0.7" = { name = "available-typed-arrays"; packageName = "available-typed-arrays"; - version = "1.0.5"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz"; - sha512 = "DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw=="; + url = "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz"; + sha512 = "wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ=="; }; }; "aws-sign2-0.7.0" = { @@ -2524,13 +2209,13 @@ let sha512 = "08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA=="; }; }; - "aws4-1.12.0" = { + "aws4-1.13.2" = { name = "aws4"; packageName = "aws4"; - version = "1.12.0"; + version = "1.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz"; - sha512 = "NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg=="; + url = "https://registry.npmjs.org/aws4/-/aws4-1.13.2.tgz"; + sha512 = "lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw=="; }; }; "babel-extract-comments-1.0.0" = { @@ -2677,13 +2362,13 @@ let sha512 = "Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw=="; }; }; - "binary-extensions-2.2.0" = { + "binary-extensions-2.3.0" = { name = "binary-extensions"; packageName = "binary-extensions"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz"; - sha512 = "jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA=="; + url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz"; + sha512 = "Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw=="; }; }; "bindings-1.5.0" = { @@ -2767,13 +2452,13 @@ let sha512 = "dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw=="; }; }; - "body-parser-1.20.1" = { + "body-parser-1.20.3" = { name = "body-parser"; packageName = "body-parser"; - version = "1.20.1"; + version = "1.20.3"; src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz"; - sha512 = "jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw=="; + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz"; + sha512 = "7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g=="; }; }; "bonjour-3.5.0" = { @@ -2821,13 +2506,13 @@ let sha512 = "aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w=="; }; }; - "braces-3.0.2" = { + "braces-3.0.3" = { name = "braces"; packageName = "braces"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"; - sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; + url = "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz"; + sha512 = "yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA=="; }; }; "brorand-1.1.0" = { @@ -2866,22 +2551,22 @@ let sha512 = "BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A=="; }; }; - "browserify-rsa-4.1.0" = { + "browserify-rsa-4.1.1" = { name = "browserify-rsa"; packageName = "browserify-rsa"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz"; - sha512 = "AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog=="; + url = "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.1.tgz"; + sha512 = "YBjSAiTqM04ZVei6sXighu679a3SqWORA3qZTEqZImnlkDIFtKc6pNutpjyZ8RJTjQtuYfeetkxM11GwoYXMIQ=="; }; }; - "browserify-sign-4.2.2" = { + "browserify-sign-4.2.3" = { name = "browserify-sign"; packageName = "browserify-sign"; - version = "4.2.2"; + version = "4.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz"; - sha512 = "1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg=="; + url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.3.tgz"; + sha512 = "JWCZW6SKhfhjJxO8Tyiiy+XYB7cqd2S5/+WeYHsKdNKFlCBhKbblba1A/HN/90YwtxKc8tCErjffZl++UNmGiw=="; }; }; "browserify-zlib-0.2.0" = { @@ -2902,13 +2587,13 @@ let sha512 = "VBorw+tgpOtZ1BYhrVSVTzTt/3+vSE3eFUh0N2GCFK1HffceOaf32YS/bs6WiFhjDAblAFrx85jMy3BG9fBK2Q=="; }; }; - "browserslist-4.22.2" = { + "browserslist-4.24.0" = { name = "browserslist"; packageName = "browserslist"; - version = "4.22.2"; + version = "4.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.22.2.tgz"; - sha512 = "0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.24.0.tgz"; + sha512 = "Rmb62sR1Zpjql25eSanFGEhAxcFwfA1K0GuQcLoaJBAcENegrQut3hYdhXFF1obQfiDyqIW/cLM5HSJ/9k884A=="; }; }; "buffer-4.9.2" = { @@ -2929,6 +2614,15 @@ let sha512 = "EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ=="; }; }; + "buffer-builder-0.2.0" = { + name = "buffer-builder"; + packageName = "buffer-builder"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-builder/-/buffer-builder-0.2.0.tgz"; + sha512 = "7VPMEPuYznPSoR21NE1zvd2Xna6c/CloiZCfcMXR1Jny6PjX0N4Nsa38zcBFo/FMK+BlA+FLKbJCQ0i2yxp+Xg=="; + }; + }; "buffer-from-1.1.2" = { name = "buffer-from"; packageName = "buffer-from"; @@ -3037,13 +2731,13 @@ let sha512 = "a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ=="; }; }; - "cacache-17.1.4" = { + "cacache-18.0.4" = { name = "cacache"; packageName = "cacache"; - version = "17.1.4"; + version = "18.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/cacache/-/cacache-17.1.4.tgz"; - sha512 = "/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A=="; + url = "https://registry.npmjs.org/cacache/-/cacache-18.0.4.tgz"; + sha512 = "B+L5iIa9mgcjLbliir2th36yEwPftrzteHYujzsx3dFP/31GCHcIeS8f5MGd80odLOjaOvSpU3EEAmRQptkxLQ=="; }; }; "cache-base-1.0.1" = { @@ -3091,13 +2785,13 @@ let sha512 = "v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg=="; }; }; - "call-bind-1.0.5" = { + "call-bind-1.0.7" = { name = "call-bind"; packageName = "call-bind"; - version = "1.0.5"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz"; - sha512 = "C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ=="; + url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz"; + sha512 = "GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w=="; }; }; "call-me-maybe-1.0.2" = { @@ -3190,13 +2884,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001574" = { + "caniuse-lite-1.0.30001664" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001574"; + version = "1.0.30001664"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001574.tgz"; - sha512 = "BtYEK4r/iHt/txm81KBudCUcTy7t+s9emrIaHqjYurQ10x71zJ5VQ9x1dYPcz/b+pKSp4y/v1xSI67A+LzpNyg=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001664.tgz"; + sha512 = "AmE7k4dXiNKQipgn7a2xg558IRqPN3jMQY/rOsbxDhrd0tyChwbITBfiwtnqz8bi2M5mIWbxAYBvk7W7QBUS2g=="; }; }; "case-sensitive-paths-webpack-plugin-2.3.0" = { @@ -3343,6 +3037,24 @@ let sha512 = "Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw=="; }; }; + "chokidar-3.6.0" = { + name = "chokidar"; + packageName = "chokidar"; + version = "3.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz"; + sha512 = "7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw=="; + }; + }; + "chokidar-4.0.1" = { + name = "chokidar"; + packageName = "chokidar"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-4.0.1.tgz"; + sha512 = "n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA=="; + }; + }; "chownr-1.1.4" = { name = "chownr"; packageName = "chownr"; @@ -3361,13 +3073,13 @@ let sha512 = "bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="; }; }; - "chrome-trace-event-1.0.3" = { + "chrome-trace-event-1.0.4" = { name = "chrome-trace-event"; packageName = "chrome-trace-event"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz"; - sha512 = "p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg=="; + url = "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz"; + sha512 = "rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ=="; }; }; "cipher-base-1.0.4" = { @@ -3424,6 +3136,15 @@ let sha512 = "I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw=="; }; }; + "cli-cursor-4.0.0" = { + name = "cli-cursor"; + packageName = "cli-cursor"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-4.0.0.tgz"; + sha512 = "VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg=="; + }; + }; "cli-spinners-2.9.2" = { name = "cli-spinners"; packageName = "cli-spinners"; @@ -3595,6 +3316,15 @@ let sha512 = "Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g=="; }; }; + "colorjs.io-0.5.2" = { + name = "colorjs.io"; + packageName = "colorjs.io"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/colorjs.io/-/colorjs.io-0.5.2.tgz"; + sha512 = "twmVoizEW7ylZSN32OgKdXRmo1qg+wT5/6C3xu5b9QsWzSFAhHLn2xd8ro0diCsKfCj1RdaTP/nrcW+vAoQPIw=="; + }; + }; "colors-1.0.3" = { name = "colors"; packageName = "colors"; @@ -3631,13 +3361,13 @@ let sha512 = "LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w=="; }; }; - "commander-10.0.1" = { + "commander-11.1.0" = { name = "commander"; packageName = "commander"; - version = "10.0.1"; + version = "11.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz"; - sha512 = "y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug=="; + url = "https://registry.npmjs.org/commander/-/commander-11.1.0.tgz"; + sha512 = "yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ=="; }; }; "commander-2.14.1" = { @@ -3874,13 +3604,13 @@ let sha512 = "+IJOX0OqlHCszo2mBUq+SrEbCj6w7Kpffqx60zYbPTFaO4+yYgRjHwcZNpWvaTylDHaV7PPmBHzSecZiMhtPgw=="; }; }; - "cookie-0.5.0" = { + "cookie-0.6.0" = { name = "cookie"; packageName = "cookie"; - version = "0.5.0"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz"; - sha512 = "YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw=="; + url = "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz"; + sha512 = "U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw=="; }; }; "cookie-signature-1.0.6" = { @@ -3946,13 +3676,13 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-compat-3.35.0" = { + "core-js-compat-3.38.1" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.35.0"; + version = "3.38.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.35.0.tgz"; - sha512 = "5blwFAddknKeNgsjBzilkdQ0+YK8L1PfqPYq40NOYMYFSS38qj+hpTcLLWwpIwA2A5bje/x5jmVn2tzUMg9IVw=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.38.1.tgz"; + sha512 = "JRH6gfXxGmrzF3tZ57lFx97YARxCXPaMzPo6jELZhv88pBH5VXpQ+y0znKGlFnzuaihqhLbefxSJxWJMPtfDzw=="; }; }; "core-util-is-1.0.2" = { @@ -4279,13 +4009,13 @@ let sha512 = "0sVXIohTfLqVIW3kb/0n6IiWF3Ifj5nm2XaSrLq2DI6fKIGa2fYAZdk917rUneaeLVpYfFcyXE2ft0fe3remsA=="; }; }; - "d-1.0.1" = { + "d-1.0.2" = { name = "d"; packageName = "d"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/d/-/d-1.0.1.tgz"; - sha512 = "m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA=="; + url = "https://registry.npmjs.org/d/-/d-1.0.2.tgz"; + sha512 = "MOqHvMWF9/9MX6nza0KgvFH4HpMU0EF5uUDXqX/BtxtU8NfB0QzRtJ8Oe/6SuS4kbhyzVJwjd97EA4PKrzJ8bw=="; }; }; "dashdash-1.14.1" = { @@ -4297,6 +4027,33 @@ let sha512 = "jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g=="; }; }; + "data-view-buffer-1.0.1" = { + name = "data-view-buffer"; + packageName = "data-view-buffer"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz"; + sha512 = "0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA=="; + }; + }; + "data-view-byte-length-1.0.1" = { + name = "data-view-byte-length"; + packageName = "data-view-byte-length"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz"; + sha512 = "4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ=="; + }; + }; + "data-view-byte-offset-1.0.0" = { + name = "data-view-byte-offset"; + packageName = "data-view-byte-offset"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz"; + sha512 = "t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA=="; + }; + }; "debug-2.6.9" = { name = "debug"; packageName = "debug"; @@ -4315,13 +4072,13 @@ let sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ=="; }; }; - "debug-4.3.4" = { + "debug-4.3.7" = { name = "debug"; packageName = "debug"; - version = "4.3.4"; + version = "4.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"; - sha512 = "PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ=="; + url = "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz"; + sha512 = "Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ=="; }; }; "decamelize-1.2.0" = { @@ -4432,13 +4189,13 @@ let sha512 = "4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg=="; }; }; - "define-data-property-1.1.1" = { + "define-data-property-1.1.4" = { name = "define-data-property"; packageName = "define-data-property"; - version = "1.1.1"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz"; - sha512 = "E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ=="; + url = "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz"; + sha512 = "rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A=="; }; }; "define-properties-1.2.1" = { @@ -4810,22 +4567,22 @@ let sha512 = "WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="; }; }; - "electron-to-chromium-1.4.622" = { + "electron-to-chromium-1.5.29" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.622"; + version = "1.5.29"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.622.tgz"; - sha512 = "GZ47DEy0Gm2Z8RVG092CkFvX7SdotG57c4YZOe8W8qD4rOmk3plgeNmiLVRHP/Liqj1wRiY3uUUod9vb9hnxZA=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.29.tgz"; + sha512 = "PF8n2AlIhCKXQ+gTpiJi0VhcHDb69kYX4MtCiivctc2QD3XuNZ/XIOlbGzt7WAjjEev0TtaH6Cu3arZExm5DOw=="; }; }; - "elliptic-6.5.4" = { + "elliptic-6.5.7" = { name = "elliptic"; packageName = "elliptic"; - version = "6.5.4"; + version = "6.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz"; - sha512 = "iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ=="; + url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.7.tgz"; + sha512 = "ESVCtTwiA+XhY3wyh24QqRGBoP3rEdDUl3EDUUo9tft074fi19IrdpH7hLCMMP3CIj7jb3W96rn8lt/BqIlt5Q=="; }; }; "elm-0.19.1" = { @@ -4927,15 +4684,6 @@ let sha512 = "5GV3WkJ8R/faOP1hwElQdNuCt8tKx2+1lsMrdeIYWSFz01Kp9gJl/R6zGtp4QUyrUtO8KnHsxjHrQNUf2CHkrg=="; }; }; - "elm-tooling-1.15.0" = { - name = "elm-tooling"; - packageName = "elm-tooling"; - version = "1.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/elm-tooling/-/elm-tooling-1.15.0.tgz"; - sha512 = "quRE5LGJyrkPBoJ3MvFQ5RGgf80J0L0d3NkduStvXh4TmZuMXNC3Z/l2ZRoq2UTUaNWeYfO1Zx5wns1AvsTrnw=="; - }; - }; "elm-webpack-loader-6.0.1" = { name = "elm-webpack-loader"; packageName = "elm-webpack-loader"; @@ -5008,6 +4756,15 @@ let sha512 = "TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="; }; }; + "encodeurl-2.0.0" = { + name = "encodeurl"; + packageName = "encodeurl"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz"; + sha512 = "Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg=="; + }; + }; "encoding-0.1.13" = { name = "encoding"; packageName = "encoding"; @@ -5080,13 +4837,13 @@ let sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; }; }; - "es-abstract-1.22.3" = { + "es-abstract-1.23.3" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.22.3"; + version = "1.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.3.tgz"; - sha512 = "eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz"; + sha512 = "e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A=="; }; }; "es-array-method-boxes-properly-1.0.0" = { @@ -5098,13 +4855,40 @@ let sha512 = "wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA=="; }; }; - "es-set-tostringtag-2.0.2" = { + "es-define-property-1.0.0" = { + name = "es-define-property"; + packageName = "es-define-property"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz"; + sha512 = "jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ=="; + }; + }; + "es-errors-1.3.0" = { + name = "es-errors"; + packageName = "es-errors"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz"; + sha512 = "Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw=="; + }; + }; + "es-object-atoms-1.0.0" = { + name = "es-object-atoms"; + packageName = "es-object-atoms"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz"; + sha512 = "MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw=="; + }; + }; + "es-set-tostringtag-2.0.3" = { name = "es-set-tostringtag"; packageName = "es-set-tostringtag"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz"; - sha512 = "BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q=="; + url = "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz"; + sha512 = "3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ=="; }; }; "es-to-primitive-1.2.1" = { @@ -5116,13 +4900,13 @@ let sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA=="; }; }; - "es5-ext-0.10.62" = { + "es5-ext-0.10.64" = { name = "es5-ext"; packageName = "es5-ext"; - version = "0.10.62"; + version = "0.10.64"; src = fetchurl { - url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.62.tgz"; - sha512 = "BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA=="; + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.64.tgz"; + sha512 = "p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg=="; }; }; "es6-iterator-2.0.3" = { @@ -5143,40 +4927,49 @@ let sha512 = "HBL8I3mIki5C1Cc9QjKUenHtnG0A5/xA8Q/AllRcfiwl2CZFXGK7ddBiCoRwAix4i2KxcQfjtIVcrVbB3vbmwg=="; }; }; - "es6-symbol-3.1.3" = { + "es6-symbol-3.1.4" = { name = "es6-symbol"; packageName = "es6-symbol"; - version = "3.1.3"; + version = "3.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.4.tgz"; + sha512 = "U9bFFjX8tFiATgtkJ1zg25+KviIXpgRvRHS8sau3GfhVzThRQrOeksPeT0BWW2MNZs1OEWJ1DPXOQMn0KKRkvg=="; + }; + }; + "esbuild-0.19.12" = { + name = "esbuild"; + packageName = "esbuild"; + version = "0.19.12"; src = fetchurl { - url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz"; - sha512 = "NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA=="; + url = "https://registry.npmjs.org/esbuild/-/esbuild-0.19.12.tgz"; + sha512 = "aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg=="; }; }; - "esbuild-0.17.19" = { + "esbuild-0.20.2" = { name = "esbuild"; packageName = "esbuild"; - version = "0.17.19"; + version = "0.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/esbuild/-/esbuild-0.17.19.tgz"; - sha512 = "XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw=="; + url = "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz"; + sha512 = "WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g=="; }; }; - "esbuild-0.18.20" = { + "esbuild-0.21.5" = { name = "esbuild"; packageName = "esbuild"; - version = "0.18.20"; + version = "0.21.5"; src = fetchurl { - url = "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz"; - sha512 = "ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA=="; + url = "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz"; + sha512 = "mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw=="; }; }; - "escalade-3.1.1" = { + "escalade-3.2.0" = { name = "escalade"; packageName = "escalade"; - version = "3.1.1"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz"; - sha512 = "k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="; + url = "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz"; + sha512 = "WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA=="; }; }; "escape-html-1.0.3" = { @@ -5224,6 +5017,15 @@ let sha512 = "p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg=="; }; }; + "esniff-2.0.1" = { + name = "esniff"; + packageName = "esniff"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/esniff/-/esniff-2.0.1.tgz"; + sha512 = "kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg=="; + }; + }; "esprima-4.0.1" = { name = "esprima"; packageName = "esprima"; @@ -5278,6 +5080,15 @@ let sha512 = "aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="; }; }; + "event-emitter-0.3.5" = { + name = "event-emitter"; + packageName = "event-emitter"; + version = "0.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz"; + sha512 = "D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA=="; + }; + }; "eventemitter3-3.1.2" = { name = "eventemitter3"; packageName = "eventemitter3"; @@ -5377,13 +5188,13 @@ let sha512 = "CDaOBMB9knI6vx9SpIxEMOJ6VBbC2U/tYNILs0qv1YOZc15K9U2EcF06v10F0JX6IYcWnKYZJwIDJspEHLvUaQ=="; }; }; - "express-4.18.2" = { + "express-4.21.0" = { name = "express"; packageName = "express"; - version = "4.18.2"; + version = "4.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.18.2.tgz"; - sha512 = "5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ=="; + url = "https://registry.npmjs.org/express/-/express-4.21.0.tgz"; + sha512 = "VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng=="; }; }; "express-ws-2.0.0" = { @@ -5530,6 +5341,15 @@ let sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; }; }; + "fast-uri-3.0.2" = { + name = "fast-uri"; + packageName = "fast-uri"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.2.tgz"; + sha512 = "GR6f0hD7XXyNJa25Tb9BuIdN0tdr+0BMi6/CJPH3wJO1JjNG3n/VsSw38AwRdKZABm8lGbPfakLRkYzx2V9row=="; + }; + }; "fastest-levenshtein-1.0.16" = { name = "fastest-levenshtein"; packageName = "fastest-levenshtein"; @@ -5539,13 +5359,13 @@ let sha512 = "eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg=="; }; }; - "fastq-1.16.0" = { + "fastq-1.17.1" = { name = "fastq"; packageName = "fastq"; - version = "1.16.0"; + version = "1.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/fastq/-/fastq-1.16.0.tgz"; - sha512 = "ifCoaXsDrsdkWTtiNJX5uzHDsrck5TzfKKDcuFFTIrrc/BS076qgEIfoIy1VeZqViznfKiysPYTh/QeHtnIsYA=="; + url = "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz"; + sha512 = "sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w=="; }; }; "faye-websocket-0.10.0" = { @@ -5620,13 +5440,13 @@ let sha512 = "VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ=="; }; }; - "fill-range-7.0.1" = { + "fill-range-7.1.1" = { name = "fill-range"; packageName = "fill-range"; - version = "7.0.1"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"; - sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; + url = "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz"; + sha512 = "YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg=="; }; }; "finalhandler-1.1.1" = { @@ -5647,13 +5467,13 @@ let sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="; }; }; - "finalhandler-1.2.0" = { + "finalhandler-1.3.1" = { name = "finalhandler"; packageName = "finalhandler"; - version = "1.2.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz"; - sha512 = "5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg=="; + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz"; + sha512 = "6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ=="; }; }; "find-0.2.7" = { @@ -5809,13 +5629,13 @@ let sha512 = "SDgHBgV+RCjrYs8aUwCb9rTgbTVuSdzvFmLaChsLre1yf+D64khCW++VYciaByZ8Rm0uKF8R/XEpXuTRSGUM1A=="; }; }; - "follow-redirects-1.15.4" = { + "follow-redirects-1.15.9" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.15.4"; + version = "1.15.9"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz"; - sha512 = "Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz"; + sha512 = "gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ=="; }; }; "for-each-0.3.3" = { @@ -5836,13 +5656,13 @@ let sha512 = "7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ=="; }; }; - "foreground-child-3.1.1" = { + "foreground-child-3.3.0" = { name = "foreground-child"; packageName = "foreground-child"; - version = "3.1.1"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz"; - sha512 = "TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg=="; + url = "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz"; + sha512 = "Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg=="; }; }; "forever-agent-0.6.1" = { @@ -6007,15 +5827,6 @@ let sha512 = "XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw=="; }; }; - "fs-monkey-1.0.5" = { - name = "fs-monkey"; - packageName = "fs-monkey"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.5.tgz"; - sha512 = "8uMbBjrhzW76TYgEV27Y5E//W2f/lTFmx78P2w19FZSxarhI/798APGQyuGCwmkNxgwGRhrLfvWyLBvNtuOmew=="; - }; - }; "fs-readdir-recursive-1.1.0" = { name = "fs-readdir-recursive"; packageName = "fs-readdir-recursive"; @@ -6124,13 +5935,13 @@ let sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; }; }; - "get-intrinsic-1.2.2" = { + "get-intrinsic-1.2.4" = { name = "get-intrinsic"; packageName = "get-intrinsic"; - version = "1.2.2"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz"; - sha512 = "0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA=="; + url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz"; + sha512 = "5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ=="; }; }; "get-own-enumerable-property-symbols-3.0.2" = { @@ -6187,13 +5998,13 @@ let sha512 = "ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="; }; }; - "get-symbol-description-1.0.0" = { + "get-symbol-description-1.0.2" = { name = "get-symbol-description"; packageName = "get-symbol-description"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz"; - sha512 = "2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw=="; + url = "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz"; + sha512 = "g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg=="; }; }; "get-value-2.0.6" = { @@ -6223,13 +6034,13 @@ let sha512 = "0pcXixfRCfLXdkwC/FJxiYEg5sYnbqYqtMmtXRzlKrStI9tLev7G/PDuFH2GmySJQ3ix5YUPRN/OJEuFD827EA=="; }; }; - "glob-10.3.10" = { + "glob-10.4.5" = { name = "glob"; packageName = "glob"; - version = "10.3.10"; + version = "10.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz"; - sha512 = "fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g=="; + url = "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz"; + sha512 = "7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg=="; }; }; "glob-7.1.4" = { @@ -6313,13 +6124,13 @@ let sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; }; }; - "globalthis-1.0.3" = { + "globalthis-1.0.4" = { name = "globalthis"; packageName = "globalthis"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz"; - sha512 = "sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA=="; + url = "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz"; + sha512 = "DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ=="; }; }; "globby-11.1.0" = { @@ -6331,13 +6142,22 @@ let sha512 = "jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g=="; }; }; - "globby-13.1.4" = { + "globby-13.2.2" = { + name = "globby"; + packageName = "globby"; + version = "13.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-13.2.2.tgz"; + sha512 = "Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w=="; + }; + }; + "globby-14.0.0" = { name = "globby"; packageName = "globby"; - version = "13.1.4"; + version = "14.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-13.1.4.tgz"; - sha512 = "iui/IiiW+QrJ1X1hKH5qwlMQyv34wJAYwH1vrf8b9kBA4sNiif3gKsMHa+BrdnOpEudWjpotfa7LrTzB1ERS/g=="; + url = "https://registry.npmjs.org/globby/-/globby-14.0.0.tgz"; + sha512 = "/1WM/LNHRAOH9lZta77uGbq0dAEQM+XjNesWwhlERDVenqothRbnzTrL3/LrIoEPPjeUHC3vrS6TwoyxeHs7MQ=="; }; }; "globby-6.1.0" = { @@ -6412,13 +6232,13 @@ let sha512 = "RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="; }; }; - "graphql-16.8.1" = { + "graphql-16.9.0" = { name = "graphql"; packageName = "graphql"; - version = "16.8.1"; + version = "16.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/graphql/-/graphql-16.8.1.tgz"; - sha512 = "59LZHPdGZVh695Ud9lRzPBVTtlX9ZCV150Er2W43ro37wVof0ctenSaskPPjN7lVTIN8mSZt8PHUNKZuNQUuxw=="; + url = "https://registry.npmjs.org/graphql/-/graphql-16.9.0.tgz"; + sha512 = "GGTKBX4SD7Wdb8mqeDLni2oaRGYQWjWHGKPQ24ZMnUtKfcsVoiv4uX8+LJr1K6U5VW2Lu1BwJnj7uiori0YtRw=="; }; }; "graphql-request-3.7.0" = { @@ -6520,22 +6340,22 @@ let sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; }; }; - "has-property-descriptors-1.0.1" = { + "has-property-descriptors-1.0.2" = { name = "has-property-descriptors"; packageName = "has-property-descriptors"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz"; - sha512 = "VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg=="; + url = "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz"; + sha512 = "55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg=="; }; }; - "has-proto-1.0.1" = { + "has-proto-1.0.3" = { name = "has-proto"; packageName = "has-proto"; - version = "1.0.1"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz"; - sha512 = "7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg=="; + url = "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz"; + sha512 = "SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q=="; }; }; "has-symbol-support-x-1.4.2" = { @@ -6565,13 +6385,13 @@ let sha512 = "vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw=="; }; }; - "has-tostringtag-1.0.0" = { + "has-tostringtag-1.0.2" = { name = "has-tostringtag"; packageName = "has-tostringtag"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz"; - sha512 = "kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ=="; + url = "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz"; + sha512 = "NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw=="; }; }; "has-value-0.3.1" = { @@ -6610,6 +6430,15 @@ let sha512 = "ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ=="; }; }; + "hash-base-3.0.4" = { + name = "hash-base"; + packageName = "hash-base"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz"; + sha512 = "EeeoJKjTyt868liAlVmcv2ZsUfGHlE3Q+BICOXcZiwN3osr5Q/zFGYmTJpoIzuaSTAwndFy+GqhEwlU4L3j4Ow=="; + }; + }; "hash-base-3.1.0" = { name = "hash-base"; packageName = "hash-base"; @@ -6628,13 +6457,13 @@ let sha512 = "taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA=="; }; }; - "hasown-2.0.0" = { + "hasown-2.0.2" = { name = "hasown"; packageName = "hasown"; - version = "2.0.0"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz"; - sha512 = "vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA=="; + url = "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz"; + sha512 = "0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ=="; }; }; "he-1.2.0" = { @@ -6835,13 +6664,13 @@ let sha512 = "7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ=="; }; }; - "http-proxy-agent-5.0.0" = { + "http-proxy-agent-7.0.2" = { name = "http-proxy-agent"; packageName = "http-proxy-agent"; - version = "5.0.0"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz"; - sha512 = "n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w=="; + url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz"; + sha512 = "T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig=="; }; }; "http-proxy-middleware-0.19.1" = { @@ -6889,13 +6718,13 @@ let sha512 = "J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg=="; }; }; - "https-proxy-agent-5.0.1" = { + "https-proxy-agent-7.0.5" = { name = "https-proxy-agent"; packageName = "https-proxy-agent"; - version = "5.0.1"; + version = "7.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz"; - sha512 = "dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA=="; + url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz"; + sha512 = "1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw=="; }; }; "human-signals-2.1.0" = { @@ -6907,13 +6736,13 @@ let sha512 = "B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="; }; }; - "humanize-ms-1.2.1" = { - name = "humanize-ms"; - packageName = "humanize-ms"; - version = "1.2.1"; + "hyperdyperid-1.2.0" = { + name = "hyperdyperid"; + packageName = "hyperdyperid"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz"; - sha512 = "Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ=="; + url = "https://registry.npmjs.org/hyperdyperid/-/hyperdyperid-1.2.0.tgz"; + sha512 = "Y93lCzHYgGWdrJ66yIktxiaGULYc6oGiABxhcO5AufBeOyoIdZF7bIfLaOrbM0iGIOXQQgxxRrFEnb+Y6w1n4A=="; }; }; "i-0.3.7" = { @@ -6988,13 +6817,13 @@ let sha512 = "Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug=="; }; }; - "ignore-5.3.0" = { + "ignore-5.3.2" = { name = "ignore"; packageName = "ignore"; - version = "5.3.0"; + version = "5.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz"; - sha512 = "g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg=="; + url = "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz"; + sha512 = "hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g=="; }; }; "image-size-0.5.5" = { @@ -7015,13 +6844,13 @@ let sha512 = "4Urocwu9+XLDJw4Tc6ZCg7APVjjLInCFvO4TwGsAYV5zT6YYSor14dsZR0+0tHlDIN92cFUOq+i7fC00G5vTxA=="; }; }; - "immutable-4.3.4" = { + "immutable-4.3.7" = { name = "immutable"; packageName = "immutable"; - version = "4.3.4"; + version = "4.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/immutable/-/immutable-4.3.4.tgz"; - sha512 = "fsXeu4J4i6WNWSikpI88v/PcVflZz+6kMhUfIwc5SY+poQRPnaf5V7qds6SUyUN3cVxEzuCab7QIoLOQ+DQ1wA=="; + url = "https://registry.npmjs.org/immutable/-/immutable-4.3.7.tgz"; + sha512 = "1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw=="; }; }; "import-fresh-2.0.0" = { @@ -7141,13 +6970,13 @@ let sha512 = "S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg=="; }; }; - "internal-slot-1.0.6" = { + "internal-slot-1.0.7" = { name = "internal-slot"; packageName = "internal-slot"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.6.tgz"; - sha512 = "Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg=="; + url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz"; + sha512 = "NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g=="; }; }; "invert-kv-1.0.0" = { @@ -7159,22 +6988,22 @@ let sha512 = "xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ=="; }; }; - "ip-1.1.8" = { + "ip-1.1.9" = { name = "ip"; packageName = "ip"; - version = "1.1.8"; + version = "1.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz"; - sha512 = "PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg=="; + url = "https://registry.npmjs.org/ip/-/ip-1.1.9.tgz"; + sha512 = "cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ=="; }; }; - "ip-2.0.0" = { - name = "ip"; - packageName = "ip"; - version = "2.0.0"; + "ip-address-9.0.5" = { + name = "ip-address"; + packageName = "ip-address"; + version = "9.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz"; - sha512 = "WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ=="; + url = "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz"; + sha512 = "zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g=="; }; }; "ip-regex-2.1.0" = { @@ -7231,13 +7060,13 @@ let sha512 = "8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA=="; }; }; - "is-array-buffer-3.0.2" = { + "is-array-buffer-3.0.4" = { name = "is-array-buffer"; packageName = "is-array-buffer"; - version = "3.0.2"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz"; - sha512 = "y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w=="; + url = "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz"; + sha512 = "wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw=="; }; }; "is-arrayish-0.2.1" = { @@ -7321,13 +7150,13 @@ let sha512 = "H1U8Vz0cfXNujrJzEcvvwMDW9Ra+biSYA3ThdQvAnMLJkEHQXn6bWzLkxHtVYJ+Sdbx0b6finn3jZiaVe7MAHA=="; }; }; - "is-core-module-2.13.1" = { + "is-core-module-2.15.1" = { name = "is-core-module"; packageName = "is-core-module"; - version = "2.13.1"; + version = "2.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz"; - sha512 = "hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw=="; + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz"; + sha512 = "z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ=="; }; }; "is-data-descriptor-1.0.1" = { @@ -7339,6 +7168,15 @@ let sha512 = "bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw=="; }; }; + "is-data-view-1.0.1" = { + name = "is-data-view"; + packageName = "is-data-view"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz"; + sha512 = "AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w=="; + }; + }; "is-date-object-1.0.5" = { name = "is-date-object"; packageName = "is-date-object"; @@ -7474,13 +7312,13 @@ let sha512 = "z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ=="; }; }; - "is-negative-zero-2.0.2" = { + "is-negative-zero-2.0.3" = { name = "is-negative-zero"; packageName = "is-negative-zero"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz"; - sha512 = "dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="; + url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz"; + sha512 = "5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw=="; }; }; "is-number-3.0.0" = { @@ -7618,13 +7456,13 @@ let sha512 = "F/pJIk8QD6OX5DNhRB7hWamLsUilmkDGho48KbgZ6xg/lmAZXHxzXQ91jzB3yRSw5kdQGGGc4yz8HYhTYIMWPg=="; }; }; - "is-shared-array-buffer-1.0.2" = { + "is-shared-array-buffer-1.0.3" = { name = "is-shared-array-buffer"; packageName = "is-shared-array-buffer"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz"; - sha512 = "sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA=="; + url = "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz"; + sha512 = "nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg=="; }; }; "is-stream-1.1.0" = { @@ -7663,13 +7501,13 @@ let sha512 = "C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg=="; }; }; - "is-typed-array-1.1.12" = { + "is-typed-array-1.1.13" = { name = "is-typed-array"; packageName = "is-typed-array"; - version = "1.1.12"; + version = "1.1.13"; src = fetchurl { - url = "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz"; - sha512 = "Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg=="; + url = "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz"; + sha512 = "uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw=="; }; }; "is-typedarray-1.0.0" = { @@ -7780,6 +7618,15 @@ let sha512 = "RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="; }; }; + "isexe-3.1.1" = { + name = "isexe"; + packageName = "isexe"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz"; + sha512 = "LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ=="; + }; + }; "isobject-2.1.0" = { name = "isobject"; packageName = "isobject"; @@ -7816,13 +7663,13 @@ let sha512 = "1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w=="; }; }; - "jackspeak-2.3.6" = { + "jackspeak-3.4.3" = { name = "jackspeak"; packageName = "jackspeak"; - version = "2.3.6"; + version = "3.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz"; - sha512 = "N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ=="; + url = "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz"; + sha512 = "OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw=="; }; }; "jest-diff-27.5.1" = { @@ -7879,6 +7726,15 @@ let sha512 = "UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg=="; }; }; + "jsbn-1.1.0" = { + name = "jsbn"; + packageName = "jsbn"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz"; + sha512 = "4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A=="; + }; + }; "jsesc-0.5.0" = { name = "jsesc"; packageName = "jsesc"; @@ -7969,13 +7825,13 @@ let sha512 = "NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="; }; }; - "json-stable-stringify-1.1.0" = { + "json-stable-stringify-1.1.1" = { name = "json-stable-stringify"; packageName = "json-stable-stringify"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.1.0.tgz"; - sha512 = "zfA+5SuwYN2VWqN1/5HZaDzQKLJHaBVMZIIM+wuYjdptkaQsqzDdqjqf+lZZJUuJq1aanHiY8LhH8LmH+qBYJA=="; + url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.1.1.tgz"; + sha512 = "SU/971Kt5qVQfJpyDveVhQ/vya+5hvrjClFOcr8c0Fq5aODJjMwutrOfCU+eCnVD5gpx1Q3fEqkyom77zH1iIg=="; }; }; "json-stringify-safe-5.0.1" = { @@ -8176,6 +8032,15 @@ let sha512 = "weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA=="; }; }; + "launch-editor-2.6.1" = { + name = "launch-editor"; + packageName = "launch-editor"; + version = "2.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.1.tgz"; + sha512 = "eB/uXmFVpY4zezmGp5XtU21kwo7GBbKB+EQ+UZeWtGb9yAM5xt/Evk+lYH3eRNAtId+ej4u7TYPFZ07w4s7rRw=="; + }; + }; "lcid-1.0.0" = { name = "lcid"; packageName = "lcid"; @@ -8194,13 +8059,13 @@ let sha512 = "P3b3HJDBtSzsXUl0im2L7gTO5Ubg8mEN6G8qoTS77iXxXX4Hvu4Qj540PZDvQ8V6DmX6iXo98k7Md0Cm1PrLaA=="; }; }; - "lightningcss-1.22.1" = { + "lightningcss-1.27.0" = { name = "lightningcss"; packageName = "lightningcss"; - version = "1.22.1"; + version = "1.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/lightningcss/-/lightningcss-1.22.1.tgz"; - sha512 = "Fy45PhibiNXkm0cK5FJCbfO8Y6jUpD/YcHf/BtuI+jvYYqSXKF4muk61jjE8YxCR9y+hDYIWSzHTc+bwhDE6rQ=="; + url = "https://registry.npmjs.org/lightningcss/-/lightningcss-1.27.0.tgz"; + sha512 = "8f7aNmS1+etYSLHht0fQApPc2kNO8qGRutifN5rVIc6Xo6ABsEbqOr758UwI7ALVbTt4x1fllKt0PYgzD9S3yQ=="; }; }; "lines-and-columns-1.2.4" = { @@ -8365,13 +8230,13 @@ let sha512 = "8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg=="; }; }; - "loglevel-1.8.1" = { + "loglevel-1.9.2" = { name = "loglevel"; packageName = "loglevel"; - version = "1.8.1"; + version = "1.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/loglevel/-/loglevel-1.8.1.tgz"; - sha512 = "tCRIJM51SHjAayKwC+QAg8hT8vg6z7GSgLJKGvzuPb1Wc+hLzqtuVLxp6/HzSPOozuK+8ErAhy7U/sVzw8Dgfg=="; + url = "https://registry.npmjs.org/loglevel/-/loglevel-1.9.2.tgz"; + sha512 = "HgMmCqIJSAKqo68l0rS2AanEWfkxaZ5wNiEFb5ggm08lDs9Xl2KxBlX3PTcaD2chBM1gXAYf491/M2Rv8Jwayg=="; }; }; "lower-case-2.0.2" = { @@ -8401,13 +8266,13 @@ let sha512 = "tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA=="; }; }; - "lru-cache-10.1.0" = { + "lru-cache-10.4.3" = { name = "lru-cache"; packageName = "lru-cache"; - version = "10.1.0"; + version = "10.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-10.1.0.tgz"; - sha512 = "/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag=="; + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz"; + sha512 = "JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ=="; }; }; "lru-cache-4.1.5" = { @@ -8428,24 +8293,6 @@ let sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="; }; }; - "lru-cache-6.0.0" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz"; - sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; - }; - }; - "lru-cache-7.18.3" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "7.18.3"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz"; - sha512 = "jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA=="; - }; - }; "make-dir-1.3.0" = { name = "make-dir"; packageName = "make-dir"; @@ -8473,13 +8320,13 @@ let sha512 = "g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw=="; }; }; - "make-fetch-happen-11.1.1" = { + "make-fetch-happen-13.0.1" = { name = "make-fetch-happen"; packageName = "make-fetch-happen"; - version = "11.1.1"; + version = "13.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz"; - sha512 = "rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w=="; + url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.1.tgz"; + sha512 = "cKTUFc/rbKUd/9meOvgrpJ2WrNzymt6jfRDdwg5UCnVzv9dTpEj9JS5m3wtziXVCjluIXyL8pcaukYqezIzZQA=="; }; }; "map-cache-0.2.2" = { @@ -8545,13 +8392,13 @@ let sha512 = "dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="; }; }; - "memfs-3.6.0" = { + "memfs-4.12.0" = { name = "memfs"; packageName = "memfs"; - version = "3.6.0"; + version = "4.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/memfs/-/memfs-3.6.0.tgz"; - sha512 = "EGowvkkgbMcIChjMTMkESFDbZeSh8xZ7kNSF0hAiAN4Jh6jgHCRS0Ga/+C8y6Au+oqpezRHCfPsmJ2+DwAgiwQ=="; + url = "https://registry.npmjs.org/memfs/-/memfs-4.12.0.tgz"; + sha512 = "74wDsex5tQDSClVkeK1vtxqYCAgCoXxx+K4NSHzgU/muYVYByFqa+0RnrPO9NM6naWm1+G9JmZ0p6QHhXmeYfA=="; }; }; "memory-fs-0.4.1" = { @@ -8581,6 +8428,15 @@ let sha512 = "cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="; }; }; + "merge-descriptors-1.0.3" = { + name = "merge-descriptors"; + packageName = "merge-descriptors"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz"; + sha512 = "gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ=="; + }; + }; "merge-stream-2.0.0" = { name = "merge-stream"; packageName = "merge-stream"; @@ -8617,13 +8473,13 @@ let sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg=="; }; }; - "micromatch-4.0.5" = { + "micromatch-4.0.8" = { name = "micromatch"; packageName = "micromatch"; - version = "4.0.5"; + version = "4.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz"; - sha512 = "DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA=="; + url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz"; + sha512 = "PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA=="; }; }; "miller-rabin-4.0.1" = { @@ -8806,13 +8662,13 @@ let sha512 = "lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g=="; }; }; - "minimatch-9.0.3" = { + "minimatch-9.0.5" = { name = "minimatch"; packageName = "minimatch"; - version = "9.0.3"; + version = "9.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz"; - sha512 = "RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg=="; + url = "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz"; + sha512 = "G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow=="; }; }; "minimist-1.2.0" = { @@ -8869,31 +8725,31 @@ let sha512 = "3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ=="; }; }; - "minipass-7.0.4" = { + "minipass-7.1.2" = { name = "minipass"; packageName = "minipass"; - version = "7.0.4"; + version = "7.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz"; - sha512 = "jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ=="; + url = "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz"; + sha512 = "qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw=="; }; }; - "minipass-collect-1.0.2" = { + "minipass-collect-2.0.1" = { name = "minipass-collect"; packageName = "minipass-collect"; - version = "1.0.2"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz"; - sha512 = "6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA=="; + url = "https://registry.npmjs.org/minipass-collect/-/minipass-collect-2.0.1.tgz"; + sha512 = "D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw=="; }; }; - "minipass-fetch-3.0.4" = { + "minipass-fetch-3.0.5" = { name = "minipass-fetch"; packageName = "minipass-fetch"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.4.tgz"; - sha512 = "jHAqnA728uUpIaFm7NWsCnqKT6UqZz7GcI/bDpPATuwYyKwJwW0remxSCxUlKiEty+eopHGa3oc8WxgQ1FFJqg=="; + url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz"; + sha512 = "2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg=="; }; }; "minipass-flush-1.0.5" = { @@ -9040,15 +8896,6 @@ let sha512 = "tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="; }; }; - "ms-2.1.2" = { - name = "ms"; - packageName = "ms"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"; - sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; - }; - }; "ms-2.1.3" = { name = "ms"; packageName = "ms"; @@ -9112,13 +8959,13 @@ let sha512 = "nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="; }; }; - "nan-2.18.0" = { + "nan-2.20.0" = { name = "nan"; packageName = "nan"; - version = "2.18.0"; + version = "2.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz"; - sha512 = "W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w=="; + url = "https://registry.npmjs.org/nan/-/nan-2.20.0.tgz"; + sha512 = "bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw=="; }; }; "nanoid-3.3.7" = { @@ -9247,13 +9094,13 @@ let sha512 = "PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA=="; }; }; - "node-gyp-build-4.7.1" = { + "node-gyp-build-4.8.2" = { name = "node-gyp-build"; packageName = "node-gyp-build"; - version = "4.7.1"; + version = "4.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.7.1.tgz"; - sha512 = "wTSrZ+8lsRRa3I3H8Xr65dLWSgCvY2l4AOnaeKdPA9TB/WYMPaTcrzf3rXvFoVvjKNVnu0CcWSx54qq9GKRUYg=="; + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.2.tgz"; + sha512 = "IRUxE4BVsHWXkV/SFOut4qTlagw2aM8T5/vnTsmrHJvVoKueJHRc/JaFND7QDDc61kLYUJ6qlZM3sqTSyx2dTw=="; }; }; "node-libs-browser-2.2.1" = { @@ -9274,31 +9121,22 @@ let sha512 = "rB1DUFUNAN4Gn9keO2K1efO35IDK7yKHCdCaIMvFO7yUYmmZYeDjnGKle26G4rwj+LKRQpjyUUvMkPglwGCYNQ=="; }; }; - "node-releases-2.0.14" = { + "node-releases-2.0.18" = { name = "node-releases"; packageName = "node-releases"; - version = "2.0.14"; + version = "2.0.18"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz"; - sha512 = "y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz"; + sha512 = "d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g=="; }; }; - "node-watch-0.7.4" = { + "node-watch-0.5.5" = { name = "node-watch"; packageName = "node-watch"; - version = "0.7.4"; - src = fetchurl { - url = "https://registry.npmjs.org/node-watch/-/node-watch-0.7.4.tgz"; - sha512 = "RinNxoz4W1cep1b928fuFhvAQ5ag/+1UlMDV7rbyGthBIgsiEouS4kvRayvvboxii4m8eolKOIBo3OjDqbc+uQ=="; - }; - }; - "nopt-1.0.10" = { - name = "nopt"; - packageName = "nopt"; - version = "1.0.10"; + version = "0.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz"; - sha512 = "NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg=="; + url = "https://registry.npmjs.org/node-watch/-/node-watch-0.5.5.tgz"; + sha512 = "z9xN2ibI6P0UylFadN7oMcIMsoTeCENC0rZyRM5MVK9AqzSPx+uGqKG6KMPeC/laOV4wOGZq/GH0PTstRNSqOA=="; }; }; "normalize-package-data-2.5.0" = { @@ -9454,22 +9292,22 @@ let sha512 = "79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ=="; }; }; - "object-inspect-1.13.1" = { + "object-inspect-1.13.2" = { name = "object-inspect"; packageName = "object-inspect"; - version = "1.13.1"; + version = "1.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz"; - sha512 = "5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ=="; + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz"; + sha512 = "IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g=="; }; }; - "object-is-1.1.5" = { + "object-is-1.1.6" = { name = "object-is"; packageName = "object-is"; - version = "1.1.5"; + version = "1.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz"; - sha512 = "3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw=="; + url = "https://registry.npmjs.org/object-is/-/object-is-1.1.6.tgz"; + sha512 = "F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q=="; }; }; "object-keys-1.1.1" = { @@ -9499,22 +9337,22 @@ let sha512 = "byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ=="; }; }; - "object.entries-1.1.7" = { + "object.entries-1.1.8" = { name = "object.entries"; packageName = "object.entries"; - version = "1.1.7"; + version = "1.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/object.entries/-/object.entries-1.1.7.tgz"; - sha512 = "jCBs/0plmPsOnrKAfFQXRG2NFjlhZgjjcBLSmTnEhU8U6vVTsVe8ANeQJCHTl3gSsI4J+0emOoCgoKlmQPMgmA=="; + url = "https://registry.npmjs.org/object.entries/-/object.entries-1.1.8.tgz"; + sha512 = "cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ=="; }; }; - "object.getownpropertydescriptors-2.1.7" = { + "object.getownpropertydescriptors-2.1.8" = { name = "object.getownpropertydescriptors"; packageName = "object.getownpropertydescriptors"; - version = "2.1.7"; + version = "2.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.7.tgz"; - sha512 = "PrJz0C2xJ58FNn11XV2lr4Jt5Gzl94qpy9Lu0JlfEj14z88sqbSBJCBEzdlNUCzY2gburhbrwOZ5BHCmuNUy0g=="; + url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.8.tgz"; + sha512 = "qkHIGe4q0lSYMv0XI4SsBTJz3WaURhLvd0lKSgtVuOsJ2krg4SgMw3PIRQFMp07yi++UR3se2mkcLqsBNpBb/A=="; }; }; "object.pick-1.3.0" = { @@ -9526,13 +9364,13 @@ let sha512 = "tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ=="; }; }; - "object.values-1.1.7" = { + "object.values-1.2.0" = { name = "object.values"; packageName = "object.values"; - version = "1.1.7"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/object.values/-/object.values-1.1.7.tgz"; - sha512 = "aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng=="; + url = "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz"; + sha512 = "yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ=="; }; }; "obuf-1.1.2" = { @@ -9850,6 +9688,15 @@ let sha512 = "k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ=="; }; }; + "package-json-from-dist-1.0.1" = { + name = "package-json-from-dist"; + packageName = "package-json-from-dist"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz"; + sha512 = "UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw=="; + }; + }; "pako-1.0.11" = { name = "pako"; packageName = "pako"; @@ -9886,13 +9733,13 @@ let sha512 = "GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g=="; }; }; - "parse-asn1-5.1.6" = { + "parse-asn1-5.1.7" = { name = "parse-asn1"; packageName = "parse-asn1"; - version = "5.1.6"; + version = "5.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz"; - sha512 = "RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw=="; + url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.7.tgz"; + sha512 = "CTM5kuWR3sx9IFamcl5ErfPl6ea/N8IYwiJ+vpeB2g+1iknv7zBl5uPwbMbRVznRVbrNY6lGuDoE5b30grmbqg=="; }; }; "parse-json-2.2.0" = { @@ -10066,13 +9913,22 @@ let sha512 = "LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="; }; }; - "path-scurry-1.10.1" = { + "path-scurry-1.11.1" = { name = "path-scurry"; packageName = "path-scurry"; - version = "1.10.1"; + version = "1.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz"; - sha512 = "MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ=="; + url = "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz"; + sha512 = "Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA=="; + }; + }; + "path-to-regexp-0.1.10" = { + name = "path-to-regexp"; + packageName = "path-to-regexp"; + version = "0.1.10"; + src = fetchurl { + url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz"; + sha512 = "7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w=="; }; }; "path-to-regexp-0.1.7" = { @@ -10111,6 +9967,15 @@ let sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="; }; }; + "path-type-5.0.0" = { + name = "path-type"; + packageName = "path-type"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-type/-/path-type-5.0.0.tgz"; + sha512 = "5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg=="; + }; + }; "pbkdf2-3.1.2" = { name = "pbkdf2"; packageName = "pbkdf2"; @@ -10147,13 +10012,13 @@ let sha512 = "cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA=="; }; }; - "picocolors-1.0.0" = { + "picocolors-1.1.0" = { name = "picocolors"; packageName = "picocolors"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz"; - sha512 = "1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="; + url = "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz"; + sha512 = "TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw=="; }; }; "picomatch-2.3.1" = { @@ -10291,6 +10156,15 @@ let sha512 = "xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg=="; }; }; + "possible-typed-array-names-1.0.0" = { + name = "possible-typed-array-names"; + packageName = "possible-typed-array-names"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz"; + sha512 = "d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q=="; + }; + }; "postcss-7.0.39" = { name = "postcss"; packageName = "postcss"; @@ -10300,13 +10174,13 @@ let sha512 = "yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="; }; }; - "postcss-8.4.33" = { + "postcss-8.4.47" = { name = "postcss"; packageName = "postcss"; - version = "8.4.33"; + version = "8.4.47"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.33.tgz"; - sha512 = "Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz"; + sha512 = "56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ=="; }; }; "postcss-calc-7.0.5" = { @@ -10606,13 +10480,13 @@ let sha512 = "h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA=="; }; }; - "postcss-selector-parser-6.0.15" = { + "postcss-selector-parser-6.1.2" = { name = "postcss-selector-parser"; packageName = "postcss-selector-parser"; - version = "6.0.15"; + version = "6.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.15.tgz"; - sha512 = "rEYkQOMUCEMhsKbK66tbEU9QVIxbhN18YiniAwA7XQYTVBqrBy+P2p5JcdqsHgKM2zWylp8d7J6eszocfds5Sw=="; + url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz"; + sha512 = "Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg=="; }; }; "postcss-svgo-4.0.3" = { @@ -10696,6 +10570,15 @@ let sha512 = "Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ=="; }; }; + "proc-log-4.2.0" = { + name = "proc-log"; + packageName = "proc-log"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz"; + sha512 = "g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA=="; + }; + }; "process-0.11.10" = { name = "process"; packageName = "process"; @@ -10831,13 +10714,13 @@ let sha512 = "ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA=="; }; }; - "pump-3.0.0" = { + "pump-3.0.2" = { name = "pump"; packageName = "pump"; - version = "3.0.0"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz"; - sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; + url = "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz"; + sha512 = "tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw=="; }; }; "pumpify-1.5.1" = { @@ -10876,22 +10759,13 @@ let sha512 = "kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw=="; }; }; - "qs-6.11.0" = { - name = "qs"; - packageName = "qs"; - version = "6.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz"; - sha512 = "MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q=="; - }; - }; - "qs-6.11.2" = { + "qs-6.13.0" = { name = "qs"; packageName = "qs"; - version = "6.11.2"; + version = "6.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz"; - sha512 = "tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA=="; + url = "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz"; + sha512 = "+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg=="; }; }; "qs-6.5.1" = { @@ -11011,13 +10885,13 @@ let sha512 = "4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q=="; }; }; - "raw-body-2.5.1" = { + "raw-body-2.5.2" = { name = "raw-body"; packageName = "raw-body"; - version = "2.5.1"; + version = "2.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz"; - sha512 = "qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig=="; + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz"; + sha512 = "8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA=="; }; }; "rc-1.2.8" = { @@ -11155,6 +11029,15 @@ let sha512 = "hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA=="; }; }; + "readdirp-4.0.1" = { + name = "readdirp"; + packageName = "readdirp"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/readdirp/-/readdirp-4.0.1.tgz"; + sha512 = "GkMg9uOTpIWWKbSsgwb5fA4EavTR+SG/PMPoAY8hkhHfEEY0/vqljY+XHqtDf2cr2IJtoNRDbrrEpZUiZCkYRw=="; + }; + }; "recursive-readdir-2.2.2" = { name = "recursive-readdir"; packageName = "recursive-readdir"; @@ -11164,13 +11047,13 @@ let sha512 = "nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg=="; }; }; - "reflect-metadata-0.2.1" = { + "reflect-metadata-0.2.2" = { name = "reflect-metadata"; packageName = "reflect-metadata"; - version = "0.2.1"; + version = "0.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.2.1.tgz"; - sha512 = "i5lLI6iw9AU3Uu4szRNPPEkomnkjRTaVt9hy/bn5g/oSzekBSMeLZblcjP74AW0vBabqERLLIrz+gR8QYR54Tw=="; + url = "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.2.2.tgz"; + sha512 = "urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q=="; }; }; "regenerate-1.4.2" = { @@ -11182,13 +11065,13 @@ let sha512 = "zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="; }; }; - "regenerate-unicode-properties-10.1.1" = { + "regenerate-unicode-properties-10.2.0" = { name = "regenerate-unicode-properties"; packageName = "regenerate-unicode-properties"; - version = "10.1.1"; + version = "10.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz"; - sha512 = "X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q=="; + url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.0.tgz"; + sha512 = "DqHn3DwbmmPVzeKj9woBadqmXxLvQoQIwu7nopMc72ztvxVmVk2SBhSnx67zuye5TP+lJsb/TBQsjLKhnDf3MA=="; }; }; "regenerator-runtime-0.11.1" = { @@ -11236,13 +11119,13 @@ let sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A=="; }; }; - "regexp.prototype.flags-1.5.1" = { + "regexp.prototype.flags-1.5.2" = { name = "regexp.prototype.flags"; packageName = "regexp.prototype.flags"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz"; - sha512 = "sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg=="; + url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz"; + sha512 = "NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw=="; }; }; "regexpu-core-5.3.2" = { @@ -11515,6 +11398,15 @@ let sha512 = "l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA=="; }; }; + "restore-cursor-4.0.0" = { + name = "restore-cursor"; + packageName = "restore-cursor"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-4.0.0.tgz"; + sha512 = "I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg=="; + }; + }; "ret-0.1.15" = { name = "ret"; packageName = "ret"; @@ -11587,13 +11479,13 @@ let sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="; }; }; - "rimraf-5.0.5" = { + "rimraf-5.0.10" = { name = "rimraf"; packageName = "rimraf"; - version = "5.0.5"; + version = "5.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-5.0.5.tgz"; - sha512 = "CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A=="; + url = "https://registry.npmjs.org/rimraf/-/rimraf-5.0.10.tgz"; + sha512 = "l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ=="; }; }; "ripemd160-2.0.2" = { @@ -11605,13 +11497,13 @@ let sha512 = "ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA=="; }; }; - "rollup-3.29.4" = { + "rollup-4.22.5" = { name = "rollup"; packageName = "rollup"; - version = "3.29.4"; + version = "4.22.5"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz"; - sha512 = "oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw=="; + url = "https://registry.npmjs.org/rollup/-/rollup-4.22.5.tgz"; + sha512 = "WoinX7GeQOFMGznEcWA1WrTQCd/tpEbMkc3nuMs9BT0CPjMdSjPMTVClwWd4pgSQwJdP65SK9mTCNvItlr5o7w=="; }; }; "run-async-2.4.1" = { @@ -11650,13 +11542,22 @@ let sha512 = "hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ=="; }; }; - "safe-array-concat-1.0.1" = { + "rxjs-7.8.1" = { + name = "rxjs"; + packageName = "rxjs"; + version = "7.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz"; + sha512 = "AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg=="; + }; + }; + "safe-array-concat-1.1.2" = { name = "safe-array-concat"; packageName = "safe-array-concat"; - version = "1.0.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.1.tgz"; - sha512 = "6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q=="; + url = "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz"; + sha512 = "vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q=="; }; }; "safe-buffer-5.1.1" = { @@ -11695,13 +11596,13 @@ let sha512 = "aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg=="; }; }; - "safe-regex-test-1.0.0" = { + "safe-regex-test-1.0.3" = { name = "safe-regex-test"; packageName = "safe-regex-test"; - version = "1.0.0"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz"; - sha512 = "JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA=="; + url = "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz"; + sha512 = "CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw=="; }; }; "safename-1.0.2" = { @@ -11722,13 +11623,22 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "sass-1.69.7" = { + "sass-1.79.3" = { name = "sass"; packageName = "sass"; - version = "1.69.7"; + version = "1.79.3"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.69.7.tgz"; - sha512 = "rzj2soDeZ8wtE2egyLXgOOHQvaC2iosZrkF6v3EUG+tBwEvhqUCzm0VP3k9gHF9LXbSrRhT5SksoI56Iw8NPnQ=="; + url = "https://registry.npmjs.org/sass/-/sass-1.79.3.tgz"; + sha512 = "m7dZxh0W9EZ3cw50Me5GOuYm/tVAJAn91SUnohLRo9cXBixGUOdvmryN+dXpwR831bhoY3Zv7rEFt85PUwTmzA=="; + }; + }; + "sass-embedded-1.79.3" = { + name = "sass-embedded"; + packageName = "sass-embedded"; + version = "1.79.3"; + src = fetchurl { + url = "https://registry.npmjs.org/sass-embedded/-/sass-embedded-1.79.3.tgz"; + sha512 = "zUve2qCn6uSOMZnZazLzrDWq//OQWFle5G45vJjv3B/ADIA3TXVgqHqN3u7D2vGajOGREz0HN5nhliSoKmQqZA=="; }; }; "sax-1.2.4" = { @@ -11749,6 +11659,15 @@ let sha512 = "0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA=="; }; }; + "sax-1.4.1" = { + name = "sax"; + packageName = "sax"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz"; + sha512 = "+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg=="; + }; + }; "schema-utils-0.4.7" = { name = "schema-utils"; packageName = "schema-utils"; @@ -11830,13 +11749,13 @@ let sha512 = "BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="; }; }; - "semver-7.5.4" = { + "semver-7.6.3" = { name = "semver"; packageName = "semver"; - version = "7.5.4"; + version = "7.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz"; - sha512 = "1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA=="; + url = "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz"; + sha512 = "oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A=="; }; }; "semver-regex-3.1.4" = { @@ -11875,13 +11794,13 @@ let sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg=="; }; }; - "send-0.18.0" = { + "send-0.19.0" = { name = "send"; packageName = "send"; - version = "0.18.0"; + version = "0.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.18.0.tgz"; - sha512 = "qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg=="; + url = "https://registry.npmjs.org/send/-/send-0.19.0.tgz"; + sha512 = "dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw=="; }; }; "serialize-javascript-1.9.1" = { @@ -11929,13 +11848,13 @@ let sha512 = "JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg=="; }; }; - "serve-static-1.15.0" = { + "serve-static-1.16.2" = { name = "serve-static"; packageName = "serve-static"; - version = "1.15.0"; + version = "1.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz"; - sha512 = "XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g=="; + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz"; + sha512 = "VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw=="; }; }; "set-blocking-2.0.0" = { @@ -11947,22 +11866,22 @@ let sha512 = "KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="; }; }; - "set-function-length-1.1.1" = { + "set-function-length-1.2.2" = { name = "set-function-length"; packageName = "set-function-length"; - version = "1.1.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz"; - sha512 = "VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ=="; + url = "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz"; + sha512 = "pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg=="; }; }; - "set-function-name-2.0.1" = { + "set-function-name-2.0.2" = { name = "set-function-name"; packageName = "set-function-name"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz"; - sha512 = "tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA=="; + url = "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz"; + sha512 = "7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ=="; }; }; "set-value-2.0.1" = { @@ -12073,13 +11992,22 @@ let sha512 = "V0iQEZ/uoem3NmD91rD8XiuozJnq9/ZJnbHVXHnWqP1ucAhS3yJ7sLIIzEi57wFFcK3oi3kFUC46uSyWr35mxg=="; }; }; - "side-channel-1.0.4" = { + "shell-quote-1.8.1" = { + name = "shell-quote"; + packageName = "shell-quote"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz"; + sha512 = "6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA=="; + }; + }; + "side-channel-1.0.6" = { name = "side-channel"; packageName = "side-channel"; - version = "1.0.4"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz"; - sha512 = "q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw=="; + url = "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz"; + sha512 = "fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA=="; }; }; "signal-exit-3.0.7" = { @@ -12100,13 +12028,13 @@ let sha512 = "bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw=="; }; }; - "simple-git-3.22.0" = { + "simple-git-3.27.0" = { name = "simple-git"; packageName = "simple-git"; - version = "3.22.0"; + version = "3.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-3.22.0.tgz"; - sha512 = "6JujwSs0ac82jkGjMHiCnTifvf1crOiY/+tfs/Pqih6iow7VrpNKRRNdWm6RtaXpvvv/JGNYhlUtLhGFqHF+Yw=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-3.27.0.tgz"; + sha512 = "ivHoFS9Yi9GY49ogc6/YAi3Fl9ROnF4VyubNylgCkA+RVqLaKWnDSzXOVzya8csELIaWaYNutsEuAhZrtOjozA=="; }; }; "simple-swizzle-0.2.2" = { @@ -12163,6 +12091,15 @@ let sha512 = "3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew=="; }; }; + "slash-5.1.0" = { + name = "slash"; + packageName = "slash"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz"; + sha512 = "ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg=="; + }; + }; "slice-ansi-4.0.0" = { name = "slice-ansi"; packageName = "slice-ansi"; @@ -12235,22 +12172,22 @@ let sha512 = "5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g=="; }; }; - "socks-2.7.1" = { + "socks-2.8.3" = { name = "socks"; packageName = "socks"; - version = "2.7.1"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz"; - sha512 = "7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ=="; + url = "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz"; + sha512 = "l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw=="; }; }; - "socks-proxy-agent-7.0.0" = { + "socks-proxy-agent-8.0.4" = { name = "socks-proxy-agent"; packageName = "socks-proxy-agent"; - version = "7.0.0"; + version = "8.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz"; - sha512 = "Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww=="; + url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.4.tgz"; + sha512 = "GNAq/eg8Udq2x0eNiFkr9gRg5bA7PXEWagQdeRX4cPSG+X/8V38v637gim9bjFptMk1QWsCTr0ttrJEiXbNnRw=="; }; }; "sort-keys-1.1.2" = { @@ -12298,13 +12235,13 @@ let sha512 = "l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA=="; }; }; - "source-map-js-1.0.2" = { + "source-map-js-1.2.1" = { name = "source-map-js"; packageName = "source-map-js"; - version = "1.0.2"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz"; - sha512 = "R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="; + url = "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz"; + sha512 = "UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA=="; }; }; "source-map-resolve-0.5.3" = { @@ -12343,13 +12280,13 @@ let sha512 = "kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA=="; }; }; - "spdx-exceptions-2.3.0" = { + "spdx-exceptions-2.5.0" = { name = "spdx-exceptions"; packageName = "spdx-exceptions"; - version = "2.3.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"; - sha512 = "/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="; + url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz"; + sha512 = "PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w=="; }; }; "spdx-expression-parse-3.0.1" = { @@ -12361,13 +12298,13 @@ let sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; }; }; - "spdx-license-ids-3.0.16" = { + "spdx-license-ids-3.0.20" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; - version = "3.0.16"; + version = "3.0.20"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz"; - sha512 = "eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw=="; + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.20.tgz"; + sha512 = "jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw=="; }; }; "spdy-4.0.2" = { @@ -12415,6 +12352,15 @@ let sha512 = "D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="; }; }; + "sprintf-js-1.1.3" = { + name = "sprintf-js"; + packageName = "sprintf-js"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz"; + sha512 = "Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA=="; + }; + }; "sshpk-1.18.0" = { name = "sshpk"; packageName = "sshpk"; @@ -12424,13 +12370,13 @@ let sha512 = "2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ=="; }; }; - "ssri-10.0.5" = { + "ssri-10.0.6" = { name = "ssri"; packageName = "ssri"; - version = "10.0.5"; + version = "10.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/ssri/-/ssri-10.0.5.tgz"; - sha512 = "bSf16tAFkGeRlUNDjXu8FzaMQt6g2HZJrun7mtMbIPOddxt3GLMSz5VWUWcqTJUPfLEaDIepGxv+bYQW49596A=="; + url = "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz"; + sha512 = "MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ=="; }; }; "ssri-5.3.0" = { @@ -12541,13 +12487,13 @@ let sha512 = "+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw=="; }; }; - "stream-shift-1.0.1" = { + "stream-shift-1.0.3" = { name = "stream-shift"; packageName = "stream-shift"; - version = "1.0.1"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz"; - sha512 = "AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ=="; + url = "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.3.tgz"; + sha512 = "76ORR0DO1o1hlKwTbi/DM3EXWGf3ZJYO8cXX5RJwnul2DEg2oyoZyjLNoQM8WsvZiFKCRfC1O0J7iCvie3RZmQ=="; }; }; "streamsearch-1.1.0" = { @@ -12631,31 +12577,31 @@ let sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; }; }; - "string.prototype.trim-1.2.8" = { + "string.prototype.trim-1.2.9" = { name = "string.prototype.trim"; packageName = "string.prototype.trim"; - version = "1.2.8"; + version = "1.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz"; - sha512 = "lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ=="; + url = "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz"; + sha512 = "klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw=="; }; }; - "string.prototype.trimend-1.0.7" = { + "string.prototype.trimend-1.0.8" = { name = "string.prototype.trimend"; packageName = "string.prototype.trimend"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz"; - sha512 = "Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA=="; + url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz"; + sha512 = "p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ=="; }; }; - "string.prototype.trimstart-1.0.7" = { + "string.prototype.trimstart-1.0.8" = { name = "string.prototype.trimstart"; packageName = "string.prototype.trimstart"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz"; - sha512 = "NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg=="; + url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz"; + sha512 = "UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg=="; }; }; "string_decoder-0.10.31" = { @@ -12829,13 +12775,13 @@ let sha512 = "7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g=="; }; }; - "stylus-0.62.0" = { + "stylus-0.63.0" = { name = "stylus"; packageName = "stylus"; - version = "0.62.0"; + version = "0.63.0"; src = fetchurl { - url = "https://registry.npmjs.org/stylus/-/stylus-0.62.0.tgz"; - sha512 = "v3YCf31atbwJQIMtPNX8hcQ+okD4NQaTuKGUWfII8eaqn+3otrbttGL1zSMZAAtiPsBztQnujVBugg/cXFUpyg=="; + url = "https://registry.npmjs.org/stylus/-/stylus-0.63.0.tgz"; + sha512 = "OMlgrTCPzE/ibtRMoeLVhOY0RcNuNWh0rhAVqeKnk/QwcuUKQbnqhZ1kg2vzD8VU/6h3FoPTq4RJPHgLBvX6Bw=="; }; }; "sudo-prompt-8.2.5" = { @@ -12910,6 +12856,15 @@ let sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; }; }; + "supports-color-8.1.1" = { + name = "supports-color"; + packageName = "supports-color"; + version = "8.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz"; + sha512 = "MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q=="; + }; + }; "supports-hyperlinks-2.3.0" = { name = "supports-hyperlinks"; packageName = "supports-hyperlinks"; @@ -12937,13 +12892,13 @@ let sha512 = "yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw=="; }; }; - "table-6.8.1" = { + "table-6.8.2" = { name = "table"; packageName = "table"; - version = "6.8.1"; + version = "6.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-6.8.1.tgz"; - sha512 = "Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA=="; + url = "https://registry.npmjs.org/table/-/table-6.8.2.tgz"; + sha512 = "w2sfv80nrAh2VCbqR5AK27wswXhqcck2AhfnNW76beQXskGZ1V12GwS//yYVa3d3fcvAip2OUnbDAjW2k3v9fA=="; }; }; "tapable-1.1.3" = { @@ -12964,13 +12919,13 @@ let sha512 = "a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA=="; }; }; - "tar-6.2.0" = { + "tar-6.2.1" = { name = "tar"; packageName = "tar"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-6.2.0.tgz"; - sha512 = "/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ=="; + url = "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz"; + sha512 = "DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A=="; }; }; "temp-0.9.0" = { @@ -13036,13 +12991,22 @@ let sha512 = "zVotuHoIfnYjtlurOouTazciEfL7V38QMAOhGqpXDEg6yT13cF4+fEP9b0rrCEQTn+tT46uxgFsTZzhygk+CzQ=="; }; }; - "terser-webpack-plugin-1.4.5" = { + "terser-5.34.0" = { + name = "terser"; + packageName = "terser"; + version = "5.34.0"; + src = fetchurl { + url = "https://registry.npmjs.org/terser/-/terser-5.34.0.tgz"; + sha512 = "y5NUX+U9HhVsK/zihZwoq4r9dICLyV2jXGOriDAVOeKhq3LKVjgJbGO90FisozXLlJfvjHqgckGmJFBb9KYoWQ=="; + }; + }; + "terser-webpack-plugin-1.4.6" = { name = "terser-webpack-plugin"; packageName = "terser-webpack-plugin"; - version = "1.4.5"; + version = "1.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz"; - sha512 = "04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw=="; + url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.6.tgz"; + sha512 = "2lBVf/VMVIddjSn3GqbT90GvIJ/eYXJkt8cTzU7NbjKqK8fwv18Ftr4PlbF46b/e88743iZFL5Dtr/rC4hjIeA=="; }; }; "text-table-0.2.0" = { @@ -13054,6 +13018,15 @@ let sha512 = "N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="; }; }; + "thingies-1.21.0" = { + name = "thingies"; + packageName = "thingies"; + version = "1.21.0"; + src = fetchurl { + url = "https://registry.npmjs.org/thingies/-/thingies-1.21.0.tgz"; + sha512 = "hsqsJsFMsV+aD4s3CWKk85ep/3I9XzYV/IXaSouJMYIoDlgyi11cBhsqYe9/geRfB0YIikBQg6raRaM+nIMP9g=="; + }; + }; "through-2.3.8" = { name = "through"; packageName = "through"; @@ -13108,6 +13081,15 @@ let sha512 = "qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A=="; }; }; + "tiny-decoders-7.0.1" = { + name = "tiny-decoders"; + packageName = "tiny-decoders"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tiny-decoders/-/tiny-decoders-7.0.1.tgz"; + sha512 = "P1LaHTLASl/lCrdtwgAAVwxt4bEAPmxpf9HMQrlCkAseaT8oH8oxm8ndy4nx5rLTcL5U/Qxp1a+FDoQfS/ZgQQ=="; + }; + }; "tmp-0.0.31" = { name = "tmp"; packageName = "tmp"; @@ -13225,13 +13207,13 @@ let sha512 = "o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="; }; }; - "touch-3.1.0" = { + "touch-3.1.1" = { name = "touch"; packageName = "touch"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz"; - sha512 = "WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA=="; + url = "https://registry.npmjs.org/touch/-/touch-3.1.1.tgz"; + sha512 = "r0eojU4bI8MnHr8c5bNo7lJDdI2qXlWWJk6a9EAFG7vbhTjElYhBVS3/miuE0uOuoLdb8Mc/rVfsmm6eo5o9GA=="; }; }; "tough-cookie-2.4.3" = { @@ -13279,6 +13261,15 @@ let sha512 = "up6Yvai4PYKhpNp5PkYtx50m3KbwQrqDwbuZP/ItyL64YEWHAvH6Md83LFLV/GRSk/BoUVwwgUzX6SOQSbsfAg=="; }; }; + "tree-dump-1.0.2" = { + name = "tree-dump"; + packageName = "tree-dump"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/tree-dump/-/tree-dump-1.0.2.tgz"; + sha512 = "dpev9ABuLWdEubk+cIaI9cHwRNNDjkBBLXTwI4UCUFdQ5xXKqNXoK4FEciw/vxf+NQ7Cb7sGUyeUtORvHIdRXQ=="; + }; + }; "ts-debounce-4.0.0" = { name = "ts-debounce"; packageName = "ts-debounce"; @@ -13306,13 +13297,13 @@ let sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; }; }; - "tslib-2.6.2" = { + "tslib-2.7.0" = { name = "tslib"; packageName = "tslib"; - version = "2.6.2"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz"; - sha512 = "AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="; + url = "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz"; + sha512 = "gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA=="; }; }; "tsyringe-4.8.0" = { @@ -13351,22 +13342,13 @@ let sha512 = "KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA=="; }; }; - "type-1.2.0" = { - name = "type"; - packageName = "type"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/type/-/type-1.2.0.tgz"; - sha512 = "+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="; - }; - }; - "type-2.7.2" = { + "type-2.7.3" = { name = "type"; packageName = "type"; - version = "2.7.2"; + version = "2.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/type/-/type-2.7.2.tgz"; - sha512 = "dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw=="; + url = "https://registry.npmjs.org/type/-/type-2.7.3.tgz"; + sha512 = "8j+1QmAbPvLZow5Qpi6NCaN8FB60p/6x8/vfNqOk/hC+HuvFZhL4+WfekuhQLiqFZXOgQdrs3B+XxEmCc6b3FQ=="; }; }; "type-fest-0.10.0" = { @@ -13396,40 +13378,40 @@ let sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; }; }; - "typed-array-buffer-1.0.0" = { + "typed-array-buffer-1.0.2" = { name = "typed-array-buffer"; packageName = "typed-array-buffer"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz"; - sha512 = "Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw=="; + url = "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz"; + sha512 = "gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ=="; }; }; - "typed-array-byte-length-1.0.0" = { + "typed-array-byte-length-1.0.1" = { name = "typed-array-byte-length"; packageName = "typed-array-byte-length"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz"; - sha512 = "Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA=="; + url = "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz"; + sha512 = "3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw=="; }; }; - "typed-array-byte-offset-1.0.0" = { + "typed-array-byte-offset-1.0.2" = { name = "typed-array-byte-offset"; packageName = "typed-array-byte-offset"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz"; - sha512 = "RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg=="; + url = "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz"; + sha512 = "Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA=="; }; }; - "typed-array-length-1.0.4" = { + "typed-array-length-1.0.6" = { name = "typed-array-length"; packageName = "typed-array-length"; - version = "1.0.4"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz"; - sha512 = "KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng=="; + url = "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.6.tgz"; + sha512 = "/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g=="; }; }; "typedarray-0.0.6" = { @@ -13522,22 +13504,22 @@ let sha512 = "61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw=="; }; }; - "undici-types-5.26.5" = { + "undici-types-6.19.8" = { name = "undici-types"; packageName = "undici-types"; - version = "5.26.5"; + version = "6.19.8"; src = fetchurl { - url = "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz"; - sha512 = "JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="; + url = "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz"; + sha512 = "ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw=="; }; }; - "unicode-canonical-property-names-ecmascript-2.0.0" = { + "unicode-canonical-property-names-ecmascript-2.0.1" = { name = "unicode-canonical-property-names-ecmascript"; packageName = "unicode-canonical-property-names-ecmascript"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz"; - sha512 = "yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ=="; + url = "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.1.tgz"; + sha512 = "dA8WbNeb2a6oQzAQ55YlT5vQAWGV9WXOsi3SskE3bcCdM0P4SDd+24zS/OCacdRq5BkdsRj9q3Pg6YyQoxIGqg=="; }; }; "unicode-match-property-ecmascript-2.0.0" = { @@ -13549,13 +13531,13 @@ let sha512 = "5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q=="; }; }; - "unicode-match-property-value-ecmascript-2.1.0" = { + "unicode-match-property-value-ecmascript-2.2.0" = { name = "unicode-match-property-value-ecmascript"; packageName = "unicode-match-property-value-ecmascript"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz"; - sha512 = "qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA=="; + url = "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.2.0.tgz"; + sha512 = "4IehN3V/+kkr5YeSSDDQG8QLqO26XpL2XP3GQtqwlT/QYSECAwFztxVHjlbh0+gjJ3XmNLS0zDsbgs9jWKExLg=="; }; }; "unicode-property-aliases-ecmascript-2.1.0" = { @@ -13567,6 +13549,15 @@ let sha512 = "6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w=="; }; }; + "unicorn-magic-0.1.0" = { + name = "unicorn-magic"; + packageName = "unicorn-magic"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.1.0.tgz"; + sha512 = "lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ=="; + }; + }; "union-value-1.0.1" = { name = "union-value"; packageName = "union-value"; @@ -13675,13 +13666,13 @@ let sha512 = "PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ=="; }; }; - "unzip-stream-0.3.1" = { + "unzip-stream-0.3.4" = { name = "unzip-stream"; packageName = "unzip-stream"; - version = "0.3.1"; + version = "0.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/unzip-stream/-/unzip-stream-0.3.1.tgz"; - sha512 = "RzaGXLNt+CW+T41h1zl6pGz3EaeVhYlK+rdAap+7DxW5kqsqePO8kRtWPaCiVqdhZc86EctSPVYNix30YOMzmw=="; + url = "https://registry.npmjs.org/unzip-stream/-/unzip-stream-0.3.4.tgz"; + sha512 = "PyofABPVv+d7fL7GOpusx7eRT9YETY2X04PhwbSipdj6bMxVCFJrr+nm0Mxqbf9hUiTin/UsnuFWBXlDZFy0Cw=="; }; }; "upath-1.2.0" = { @@ -13702,13 +13693,13 @@ let sha512 = "1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w=="; }; }; - "update-browserslist-db-1.0.13" = { + "update-browserslist-db-1.1.1" = { name = "update-browserslist-db"; packageName = "update-browserslist-db"; - version = "1.0.13"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz"; - sha512 = "xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg=="; + url = "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz"; + sha512 = "R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A=="; }; }; "upgrade-1.1.0" = { @@ -13738,13 +13729,13 @@ let sha512 = "Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg=="; }; }; - "url-0.11.3" = { + "url-0.11.4" = { name = "url"; packageName = "url"; - version = "0.11.3"; + version = "0.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/url/-/url-0.11.3.tgz"; - sha512 = "6hxOLGfZASQK/cijlZnZJTq8OXAkt/3YGfQX45vvMYXpZoo8NdWZcY73K108Jf759lS1Bv/8wXnHDTSz17dSRw=="; + url = "https://registry.npmjs.org/url/-/url-0.11.4.tgz"; + sha512 = "oCwdVC7mTuWiPyjLUz/COz5TLk6wgp0RCsN+wHZ2Ekneac9w8uuV0njcbbie2ME+Vs+d6duwmYuR3HgQXs1fOg=="; }; }; "url-loader-4.1.1" = { @@ -13882,6 +13873,15 @@ let sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew=="; }; }; + "varint-6.0.0" = { + name = "varint"; + packageName = "varint"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/varint/-/varint-6.0.0.tgz"; + sha512 = "cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg=="; + }; + }; "vary-1.1.2" = { name = "vary"; packageName = "vary"; @@ -13909,22 +13909,31 @@ let sha512 = "ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw=="; }; }; - "vite-4.3.9" = { + "vite-5.2.8" = { name = "vite"; packageName = "vite"; - version = "4.3.9"; + version = "5.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/vite/-/vite-4.3.9.tgz"; - sha512 = "qsTNZjO9NoJNW7KnOrgYwczm0WctJ8m/yqYAMAK9Lxt4SoySUfS5S8ia9K7JHpa3KEeMfyF8LoJ3c5NeBJy6pg=="; + url = "https://registry.npmjs.org/vite/-/vite-5.2.8.tgz"; + sha512 = "OyZR+c1CE8yeHw5V5t59aXsUPPVTHMDjEZz8MgguLL/Q7NblxhZUlTu9xSPqlsUO/y+X7dlU05jdhvyycD55DA=="; }; }; - "vite-4.5.1" = { + "vite-5.4.8" = { name = "vite"; packageName = "vite"; - version = "4.5.1"; + version = "5.4.8"; src = fetchurl { - url = "https://registry.npmjs.org/vite/-/vite-4.5.1.tgz"; - sha512 = "AXXFaAJ8yebyqzoNB9fu2pHoo/nWX+xZlaRwoeYUxEqBO+Zj4msE5G+BhGBll9lYEKv9Hfks52PAF2X7qDYXQA=="; + url = "https://registry.npmjs.org/vite/-/vite-5.4.8.tgz"; + sha512 = "FqrItQ4DT1NC4zCUqMB4c4AZORMKIa0m8/URVCZ77OZ/QSNeJ54bU1vrFADbDsuwfIPcgknRkmqakQcgnL4GiQ=="; + }; + }; + "vite-plugin-elm-watch-1.3.3" = { + name = "vite-plugin-elm-watch"; + packageName = "vite-plugin-elm-watch"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vite-plugin-elm-watch/-/vite-plugin-elm-watch-1.3.3.tgz"; + sha512 = "rR78gmeYp08E4CvtpnZuumsmNXaG/XOJ/xtOVfEG3TOJqDChXy1DzE1pnPsERohbELkov7ZZPHRLGV1z2iyxKg=="; }; }; "vm-browserify-1.1.2" = { @@ -14179,13 +14188,13 @@ let sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; }; }; - "which-3.0.1" = { + "which-4.0.0" = { name = "which"; packageName = "which"; - version = "3.0.1"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-3.0.1.tgz"; - sha512 = "XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg=="; + url = "https://registry.npmjs.org/which/-/which-4.0.0.tgz"; + sha512 = "GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg=="; }; }; "which-boxed-primitive-1.0.2" = { @@ -14215,13 +14224,13 @@ let sha512 = "iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ=="; }; }; - "which-typed-array-1.1.13" = { + "which-typed-array-1.1.15" = { name = "which-typed-array"; packageName = "which-typed-array"; - version = "1.1.13"; + version = "1.1.15"; src = fetchurl { - url = "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.13.tgz"; - sha512 = "P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow=="; + url = "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz"; + sha512 = "oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA=="; }; }; "winston-2.1.1" = { @@ -14467,22 +14476,22 @@ let sha512 = "8A/uRMnQy8KCQsmep1m7Bk+z/+LIkeF7w+TDMLtX1iZm5Hq9HsUDmgFGaW1ACW5Cj0b2Qo7wCvRhYN2ErUVp/A=="; }; }; - "ws-5.2.3" = { + "ws-5.2.4" = { name = "ws"; packageName = "ws"; - version = "5.2.3"; + version = "5.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-5.2.3.tgz"; - sha512 = "jZArVERrMsKUatIdnLzqvcfydI85dvd/Fp1u/VOpfdDWQ4c9qWXe+VIeAbQ5FrDwciAkr+lzofXLz3Kuf26AOA=="; + url = "https://registry.npmjs.org/ws/-/ws-5.2.4.tgz"; + sha512 = "fFCejsuC8f9kOSu9FYaOw8CdO68O3h5v0lg4p74o8JqWpwTf9tniOD+nOB78aWoVSS6WptVUmDrp/KPsMVBWFQ=="; }; }; - "ws-6.2.2" = { + "ws-6.2.3" = { name = "ws"; packageName = "ws"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz"; - sha512 = "zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw=="; + url = "https://registry.npmjs.org/ws/-/ws-6.2.3.tgz"; + sha512 = "jmTjYU0j60B+vHey6TfR3Z7RD61z/hmxBS3VMSGIrroOWXQEneK1zNuotOUrGyBHQj0yrpsLHPWtigEFd13ndA=="; }; }; "ws-7.1.1" = { @@ -14494,13 +14503,13 @@ let sha512 = "o41D/WmDeca0BqYhsr3nJzQyg9NF5X8l/UdnFNux9cS3lwB+swm8qGWX5rn+aD6xfBU3rGmtHij7g7x6LxFU3A=="; }; }; - "ws-7.5.9" = { + "ws-7.5.10" = { name = "ws"; packageName = "ws"; - version = "7.5.9"; + version = "7.5.10"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz"; - sha512 = "F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q=="; + url = "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz"; + sha512 = "+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ=="; }; }; "xmlbuilder-13.0.2" = { @@ -14703,7 +14712,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.12.0" + sources."aws4-1.13.2" sources."babel-runtime-6.18.0" sources."bcrypt-pbkdf-1.0.2" sources."body-parser-1.19.0" @@ -14795,7 +14804,7 @@ in sources."minimist-1.2.0" sources."ms-2.0.0" sources."negotiator-0.6.3" - sources."node-watch-0.7.4" + sources."node-watch-0.5.5" sources."oauth-sign-0.9.0" sources."on-finished-2.3.0" sources."opn-5.4.0" @@ -14808,7 +14817,7 @@ in sources."process-nextick-args-1.0.7" sources."proxy-addr-2.0.7" sources."psl-1.9.0" - sources."punycode-2.3.1" + sources."punycode-1.4.1" sources."qs-6.7.0" sources."range-parser-1.2.1" sources."raw-body-2.4.0" @@ -14838,11 +14847,7 @@ in sources."through2-2.0.1" sources."tmp-0.0.31" sources."toidentifier-1.0.0" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.4.3" sources."traverse-chain-0.1.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -14850,7 +14855,11 @@ in sources."typedarray-0.0.7" sources."ultron-1.0.2" sources."unpipe-1.0.0" - sources."uri-js-4.4.1" + (sources."uri-js-4.4.1" // { + dependencies = [ + sources."punycode-2.3.1" + ]; + }) sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-3.4.0" @@ -14881,7 +14890,6 @@ in sha512 = "flFXaCikbA6NccBEvrFIgJj9up7rc9A8aOwe0o0Erruvk5f5idWu3/gIBfqTaos7Xc2Fz6fshYyoH5sfyt1r7g=="; }; dependencies = [ - sources."abbrev-1.1.1" sources."ajv-6.12.6" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" @@ -14891,15 +14899,15 @@ in sources."astral-regex-2.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.12.0" + sources."aws4-1.13.2" sources."balanced-match-1.0.2" sources."bcrypt-pbkdf-1.0.2" sources."binary-0.3.0" - sources."binary-extensions-2.2.0" + sources."binary-extensions-2.3.0" sources."binwrap-0.2.3" sources."bluebird-3.7.2" sources."brace-expansion-1.1.11" - sources."braces-3.0.2" + sources."braces-3.0.3" sources."buffers-0.1.1" sources."camelcase-5.3.1" sources."caseless-0.12.0" @@ -14953,7 +14961,8 @@ in sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" - sources."fill-range-7.0.1" + sources."fast-uri-3.0.2" + sources."fill-range-7.1.1" sources."find-0.2.9" (sources."find-elm-dependencies-2.0.2" // { dependencies = [ @@ -15030,7 +15039,6 @@ in sources."path-key-2.0.1" ]; }) - sources."nopt-1.0.10" sources."normalize-path-3.0.0" sources."oauth-sign-0.9.0" sources."once-1.4.0" @@ -15079,25 +15087,25 @@ in sources."has-flag-4.0.0" ]; }) - (sources."table-6.8.1" // { + (sources."table-6.8.2" // { dependencies = [ - sources."ajv-8.12.0" + sources."ajv-8.17.1" sources."json-schema-traverse-1.0.0" ]; }) - sources."tar-6.2.0" + sources."tar-6.2.1" sources."temp-0.9.0" sources."through-2.3.8" sources."tmp-0.0.33" sources."to-regex-range-5.0.1" - sources."touch-3.1.0" + sources."touch-3.1.1" sources."tough-cookie-2.5.0" sources."traverse-0.3.9" sources."traverse-chain-0.1.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."universalify-0.1.2" - (sources."unzip-stream-0.3.1" // { + (sources."unzip-stream-0.3.4" // { dependencies = [ sources."mkdirp-0.5.6" ]; @@ -15150,10 +15158,10 @@ in sources."async-limiter-1.0.1" sources."balanced-match-1.0.2" sources."batch-0.6.1" - sources."binary-extensions-2.2.0" - sources."body-parser-1.20.1" + sources."binary-extensions-2.3.0" + sources."body-parser-1.20.3" sources."brace-expansion-1.1.11" - sources."braces-3.0.2" + sources."braces-3.0.3" sources."bufferutil-4.0.8" sources."bytes-3.1.2" (sources."cacheable-request-6.1.0" // { @@ -15162,9 +15170,9 @@ in sources."lowercase-keys-2.0.0" ]; }) - sources."call-bind-1.0.5" + sources."call-bind-1.0.7" sources."chalk-3.0.0" - sources."chokidar-3.5.3" + sources."chokidar-3.6.0" sources."clone-response-1.0.3" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -15172,46 +15180,51 @@ in sources."concat-map-0.0.1" sources."content-disposition-0.5.4" sources."content-type-1.0.5" - sources."cookie-0.5.0" + sources."cookie-0.6.0" sources."cookie-signature-1.0.6" sources."cross-spawn-7.0.3" - sources."debug-2.6.9" + (sources."debug-2.6.9" // { + dependencies = [ + sources."ms-2.0.0" + ]; + }) sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."defer-to-connect-1.1.3" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" sources."depd-2.0.0" sources."destroy-1.2.0" sources."duplexer3-0.1.5" sources."ee-first-1.1.1" - sources."encodeurl-1.0.2" + sources."encodeurl-2.0.0" sources."end-of-stream-1.4.4" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" sources."escape-html-1.0.3" sources."etag-1.8.1" - sources."express-4.18.2" + sources."express-4.21.0" (sources."express-ws-4.0.0" // { dependencies = [ - sources."ws-5.2.3" + sources."ws-5.2.4" ]; }) - sources."fill-range-7.0.1" - sources."finalhandler-1.2.0" + sources."fill-range-7.1.1" + sources."finalhandler-1.3.1" sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."fs.realpath-1.0.0" - sources."fsevents-2.3.3" sources."function-bind-1.1.2" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" sources."get-stream-4.1.0" sources."glob-7.2.3" sources."glob-parent-5.1.2" sources."gopd-1.0.1" sources."got-9.6.0" sources."has-flag-4.0.0" - sources."has-property-descriptors-1.0.1" - sources."has-proto-1.0.1" + sources."has-property-descriptors-1.0.2" + sources."has-proto-1.0.3" sources."has-symbols-1.0.3" - sources."hasown-2.0.0" + sources."hasown-2.0.2" sources."http-cache-semantics-4.1.1" sources."http-errors-2.0.0" sources."iconv-lite-0.4.24" @@ -15231,7 +15244,7 @@ in sources."latest-version-5.1.0" sources."lowercase-keys-1.0.1" sources."media-typer-0.3.0" - sources."merge-descriptors-1.0.1" + sources."merge-descriptors-1.0.3" sources."methods-1.1.2" sources."mime-1.6.0" sources."mime-db-1.52.0" @@ -15239,12 +15252,12 @@ in sources."mimic-response-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.8" - sources."ms-2.0.0" + sources."ms-2.1.3" sources."negotiator-0.6.3" - sources."node-gyp-build-4.7.1" + sources."node-gyp-build-4.8.2" sources."normalize-path-3.0.0" sources."normalize-url-4.5.1" - sources."object-inspect-1.13.1" + sources."object-inspect-1.13.2" sources."on-finished-2.4.1" sources."once-1.4.0" sources."open-7.4.2" @@ -15253,14 +15266,14 @@ in sources."parseurl-1.3.3" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" - sources."path-to-regexp-0.1.7" + sources."path-to-regexp-0.1.10" sources."picomatch-2.3.1" sources."prepend-http-2.0.0" sources."proxy-addr-2.0.7" - sources."pump-3.0.0" - sources."qs-6.11.0" + sources."pump-3.0.2" + sources."qs-6.13.0" sources."range-parser-1.2.1" - sources."raw-body-2.5.1" + sources."raw-body-2.5.2" sources."rc-1.2.8" sources."readdirp-3.6.0" sources."registry-auth-token-4.2.2" @@ -15270,9 +15283,9 @@ in sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-6.3.1" - (sources."send-0.18.0" // { + (sources."send-0.19.0" // { dependencies = [ - sources."ms-2.1.3" + sources."encodeurl-1.0.2" ]; }) (sources."serve-index-1.9.1" // { @@ -15284,12 +15297,12 @@ in sources."statuses-1.5.0" ]; }) - sources."serve-static-1.15.0" - sources."set-function-length-1.1.1" + sources."serve-static-1.16.2" + sources."set-function-length-1.2.2" sources."setprototypeof-1.2.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."side-channel-1.0.4" + sources."side-channel-1.0.6" sources."statuses-2.0.1" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" @@ -15305,7 +15318,7 @@ in sources."vary-1.1.2" sources."which-2.0.2" sources."wrappy-1.0.2" - sources."ws-7.5.9" + sources."ws-7.5.10" ]; buildInputs = globalBuildInputs; meta = { @@ -15331,23 +15344,22 @@ in sources."@nodelib/fs.walk-1.2.8" sources."anymatch-3.1.3" sources."array-union-2.1.0" - sources."binary-extensions-2.2.0" - sources."braces-3.0.2" - sources."chokidar-3.5.3" + sources."binary-extensions-2.3.0" + sources."braces-3.0.3" + sources."chokidar-3.6.0" sources."cross-spawn-7.0.3" sources."dir-glob-3.0.1" sources."escape-string-regexp-4.0.0" sources."execa-5.1.1" sources."fast-diff-1.3.0" sources."fast-glob-3.3.2" - sources."fastq-1.16.0" - sources."fill-range-7.0.1" - sources."fsevents-2.3.3" + sources."fastq-1.17.1" + sources."fill-range-7.1.1" sources."get-stream-6.0.1" sources."glob-parent-5.1.2" sources."globby-11.1.0" sources."human-signals-2.1.0" - sources."ignore-5.3.0" + sources."ignore-5.3.2" sources."is-binary-path-2.1.0" sources."is-extglob-2.1.1" sources."is-glob-4.0.3" @@ -15356,7 +15368,7 @@ in sources."isexe-2.0.0" sources."merge-stream-2.0.0" sources."merge2-1.4.1" - sources."micromatch-4.0.5" + sources."micromatch-4.0.8" sources."mimic-fn-2.1.0" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" @@ -15367,7 +15379,7 @@ in sources."pjson-1.0.9" sources."queue-microtask-1.2.3" sources."readdirp-3.6.0" - sources."reflect-metadata-0.2.1" + sources."reflect-metadata-0.2.2" sources."request-light-0.7.0" sources."reusify-1.0.4" sources."run-parallel-1.2.0" @@ -15402,61 +15414,46 @@ in elm-land = nodeEnv.buildNodePackage { name = "elm-land"; packageName = "elm-land"; - version = "0.19.5"; + version = "0.20.1"; src = fetchurl { - url = "https://registry.npmjs.org/elm-land/-/elm-land-0.19.5.tgz"; - sha512 = "OWcnWmd+BMzRlyLpjkKjmazUJeKlgvXsPJcrhdVYhfeSdAbDDcAok7CgvSoqReN6Y36DEUUeRE5AGJMj8HVUOA=="; + url = "https://registry.npmjs.org/elm-land/-/elm-land-0.20.1.tgz"; + sha512 = "AY8BxYNT7mblaIO9SS2YQPdskZdMsLL6fqjAA5bORdkGIRDkMeaw+rXgiVSHUM2+TK0k/ld0TdQEAd24Moi5nw=="; }; dependencies = [ - sources."@adobe/css-tools-4.3.2" - sources."@esbuild/android-arm-0.17.19" - sources."@esbuild/android-arm64-0.17.19" - sources."@esbuild/android-x64-0.17.19" - sources."@esbuild/darwin-arm64-0.17.19" - sources."@esbuild/darwin-x64-0.17.19" - sources."@esbuild/freebsd-arm64-0.17.19" - sources."@esbuild/freebsd-x64-0.17.19" - sources."@esbuild/linux-arm-0.17.19" - sources."@esbuild/linux-arm64-0.17.19" - sources."@esbuild/linux-ia32-0.17.19" - sources."@esbuild/linux-loong64-0.17.19" - sources."@esbuild/linux-mips64el-0.17.19" - sources."@esbuild/linux-ppc64-0.17.19" - sources."@esbuild/linux-riscv64-0.17.19" - sources."@esbuild/linux-s390x-0.17.19" - sources."@esbuild/linux-x64-0.17.19" - sources."@esbuild/netbsd-x64-0.17.19" - sources."@esbuild/openbsd-x64-0.17.19" - sources."@esbuild/sunos-x64-0.17.19" - sources."@esbuild/win32-arm64-0.17.19" - sources."@esbuild/win32-ia32-0.17.19" - sources."@esbuild/win32-x64-0.17.19" - sources."@jridgewell/gen-mapping-0.3.3" - sources."@jridgewell/resolve-uri-3.1.1" - sources."@jridgewell/set-array-1.1.2" - sources."@jridgewell/source-map-0.3.5" - sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@jridgewell/trace-mapping-0.3.20" - sources."@types/node-20.10.6" - sources."acorn-8.11.3" + sources."@adobe/css-tools-4.3.3" + sources."@jridgewell/gen-mapping-0.3.5" + sources."@jridgewell/resolve-uri-3.1.2" + sources."@jridgewell/set-array-1.2.1" + sources."@jridgewell/source-map-0.3.6" + sources."@jridgewell/sourcemap-codec-1.5.0" + sources."@jridgewell/trace-mapping-0.3.25" + sources."@lydell/elm-0.19.1-14" + sources."@lydell/elm_darwin_arm64-0.19.1-3" + sources."@lydell/elm_darwin_x64-0.19.1-2" + sources."@lydell/elm_linux_arm-0.19.1-0" + sources."@lydell/elm_linux_arm64-0.19.1-4" + sources."@lydell/elm_linux_x64-0.19.1-1" + sources."@lydell/elm_win32_x64-0.19.1-1" + sources."@types/estree-1.0.6" + sources."@types/node-22.7.3" + sources."acorn-8.12.1" sources."anymatch-3.1.3" sources."balanced-match-1.0.2" - sources."binary-extensions-2.2.0" + sources."binary-extensions-2.3.0" sources."brace-expansion-1.1.11" - sources."braces-3.0.2" + sources."braces-3.0.3" sources."buffer-from-1.1.2" sources."chokidar-3.5.3" sources."commander-2.20.3" sources."concat-map-0.0.1" sources."copy-anything-2.0.6" - sources."cross-spawn-6.0.5" - sources."debug-4.3.4" + sources."cross-spawn-7.0.3" + sources."debug-4.3.7" + sources."detect-libc-1.0.3" sources."elm-0.19.1-6" sources."errno-0.1.8" - sources."esbuild-0.17.19" - sources."fill-range-7.0.1" - sources."find-elm-dependencies-2.0.4" - sources."firstline-1.3.1" + sources."esbuild-0.20.2" + sources."fill-range-7.1.1" sources."fs.realpath-1.0.0" sources."fsevents-2.3.3" sources."glob-7.2.3" @@ -15464,7 +15461,7 @@ in sources."graceful-fs-4.2.11" sources."iconv-lite-0.6.3" sources."image-size-0.5.5" - sources."immutable-4.3.4" + sources."immutable-4.3.7" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-binary-path-2.1.0" @@ -15473,54 +15470,62 @@ in sources."is-number-7.0.0" sources."is-what-3.14.1" sources."isexe-2.0.0" + sources."launch-editor-2.6.1" sources."less-4.2.0" - sources."lodash-4.17.21" + sources."lightningcss-1.27.0" sources."make-dir-2.1.0" sources."mime-1.6.0" sources."minimatch-3.1.2" - sources."minimist-1.2.8" - sources."mkdirp-0.5.6" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."nanoid-3.3.7" sources."needle-3.3.1" - sources."nice-try-1.0.5" - sources."node-elm-compiler-5.0.6" sources."normalize-path-3.0.0" sources."once-1.4.0" sources."parse-node-version-1.0.1" sources."path-is-absolute-1.0.1" - sources."path-key-2.0.1" - sources."picocolors-1.0.0" + sources."path-key-3.1.1" + sources."picocolors-1.1.0" sources."picomatch-2.3.1" sources."pify-4.0.1" - sources."postcss-8.4.33" + sources."postcss-8.4.47" sources."prr-1.0.1" sources."readdirp-3.6.0" - sources."rimraf-2.6.3" - sources."rollup-3.29.4" + sources."rollup-4.22.5" sources."safer-buffer-2.1.2" - sources."sass-1.69.7" - sources."sax-1.3.0" + (sources."sass-1.79.3" // { + dependencies = [ + sources."chokidar-4.0.1" + sources."readdirp-4.0.1" + ]; + }) + sources."sax-1.4.1" sources."semver-5.7.2" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."shell-quote-1.8.1" sources."source-map-0.6.1" - sources."source-map-js-1.0.2" + sources."source-map-js-1.2.1" sources."source-map-support-0.5.21" - (sources."stylus-0.62.0" // { + (sources."stylus-0.63.0" // { dependencies = [ + sources."sax-1.3.0" sources."source-map-0.7.4" ]; }) sources."sugarss-4.0.1" - sources."temp-0.9.4" sources."terser-5.15.1" + sources."tiny-decoders-7.0.1" sources."to-regex-range-5.0.1" - sources."tslib-2.6.2" + sources."tslib-2.7.0" sources."typescript-4.9.3" - sources."undici-types-5.26.5" - sources."vite-4.3.9" - sources."which-1.3.1" + sources."undici-types-6.19.8" + sources."vite-5.2.8" + (sources."vite-plugin-elm-watch-1.3.3" // { + dependencies = [ + sources."terser-5.26.0" + ]; + }) + sources."which-2.0.2" sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; @@ -15546,8 +15551,8 @@ in sources."ansi-styles-2.2.1" sources."anymatch-3.1.3" sources."async-limiter-1.0.1" - sources."binary-extensions-2.2.0" - sources."braces-3.0.2" + sources."binary-extensions-2.3.0" + sources."braces-3.0.3" sources."chalk-1.1.3" sources."charenc-0.0.2" sources."chokidar-3.0.2" @@ -15573,9 +15578,9 @@ in sources."cross-spawn-6.0.5" ]; }) - sources."fill-range-7.0.1" + sources."fill-range-7.1.1" sources."finalhandler-1.1.2" - sources."follow-redirects-1.15.4" + sources."follow-redirects-1.15.9" sources."fresh-0.5.2" sources."fsevents-2.3.3" sources."get-stream-4.1.0" @@ -15612,7 +15617,7 @@ in sources."pem-1.14.2" sources."picomatch-2.3.1" sources."pseudomap-1.0.2" - sources."pump-3.0.0" + sources."pump-3.0.2" sources."range-parser-1.2.1" sources."readdirp-3.6.0" sources."requires-port-1.0.0" @@ -15653,34 +15658,32 @@ in elm-spa = nodeEnv.buildNodePackage { name = "elm-spa"; packageName = "elm-spa"; - version = "6.0.4"; + version = "6.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/elm-spa/-/elm-spa-6.0.4.tgz"; - sha512 = "TiOBuxL1SrzqYyWkime3AZ1/xFqKa6B/Bi4SplFg7YmlwPL5d7R+u6w0dxc14cnvmP1RS2+QZAkczZtqayFK9A=="; + url = "https://registry.npmjs.org/elm-spa/-/elm-spa-6.0.6.tgz"; + sha512 = "FslLqKt2D5EjMJjtYU55P9xu/LGNnWL8pTzWAaOtTTFkNq2vVXFEknXRq1SCahicMEPRp+26r7NvawV+XuAxMA=="; }; dependencies = [ sources."anymatch-3.1.3" sources."balanced-match-1.0.2" - sources."binary-extensions-2.2.0" + sources."binary-extensions-2.3.0" sources."brace-expansion-1.1.11" - sources."braces-3.0.2" + sources."braces-3.0.3" sources."buffer-from-1.1.2" sources."bufferutil-4.0.8" sources."chokidar-3.4.2" sources."commander-2.20.3" sources."concat-map-0.0.1" sources."cross-spawn-6.0.5" - sources."d-1.0.1" + sources."d-1.0.2" sources."debug-2.6.9" - sources."es5-ext-0.10.62" + sources."es5-ext-0.10.64" sources."es6-iterator-2.0.3" - sources."es6-symbol-3.1.3" - (sources."ext-1.7.0" // { - dependencies = [ - sources."type-2.7.2" - ]; - }) - sources."fill-range-7.0.1" + sources."es6-symbol-3.1.4" + sources."esniff-2.0.1" + sources."event-emitter-0.3.5" + sources."ext-1.7.0" + sources."fill-range-7.1.1" sources."find-elm-dependencies-2.0.4" sources."firstline-1.3.1" sources."fs.realpath-1.0.0" @@ -15704,7 +15707,7 @@ in sources."next-tick-1.1.0" sources."nice-try-1.0.5" sources."node-elm-compiler-5.0.5" - sources."node-gyp-build-4.7.1" + sources."node-gyp-build-4.8.2" sources."normalize-path-3.0.0" sources."once-1.4.0" sources."path-is-absolute-1.0.1" @@ -15724,7 +15727,7 @@ in sources."temp-0.9.4" sources."terser-5.3.8" sources."to-regex-range-5.0.1" - sources."type-1.2.0" + sources."type-2.7.3" sources."typedarray-to-buffer-3.1.5" sources."utf-8-validate-5.0.10" sources."websocket-1.0.32" @@ -15735,7 +15738,7 @@ in buildInputs = globalBuildInputs; meta = { description = "single page apps made easy"; - homepage = "https://github.com/ryannhg/elm-spa#readme"; + homepage = "https://github.com/ryan-haskell/elm-spa#readme"; license = "BSD-3-Clause"; }; production = true; @@ -15754,19 +15757,18 @@ in sources."ansi-styles-4.3.0" sources."anymatch-3.1.3" sources."balanced-match-1.0.2" - sources."binary-extensions-2.2.0" + sources."binary-extensions-2.3.0" sources."brace-expansion-2.0.1" - sources."braces-3.0.2" + sources."braces-3.0.3" sources."chalk-4.1.2" - sources."chokidar-3.5.3" + sources."chokidar-3.6.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."commander-9.5.0" sources."cross-spawn-7.0.3" sources."elm-solve-deps-wasm-1.0.2" - sources."fill-range-7.0.1" + sources."fill-range-7.1.1" sources."fs.realpath-1.0.0" - sources."fsevents-2.3.3" sources."glob-8.1.0" sources."glob-parent-5.1.2" sources."graceful-fs-4.2.11" @@ -15818,7 +15820,7 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.4" sources."@types/keyv-3.1.4" - sources."@types/node-20.10.6" + sources."@types/node-22.7.3" sources."@types/responselike-1.0.3" sources."cacheable-lookup-2.0.1" sources."cacheable-request-7.0.4" @@ -15849,7 +15851,6 @@ in sources."jsonfile-4.0.0" sources."keyv-4.5.4" sources."lowercase-keys-2.0.0" - sources."lru-cache-6.0.0" sources."mimic-response-2.1.0" sources."normalize-url-6.1.0" sources."npm-conf-1.1.3" @@ -15860,20 +15861,19 @@ in sources."p-timeout-3.2.0" sources."pify-3.0.0" sources."proto-list-1.2.4" - sources."pump-3.0.0" + sources."pump-3.0.2" sources."responselike-2.0.1" sources."safe-buffer-5.2.1" sources."safename-1.0.2" - sources."semver-7.5.4" + sources."semver-7.6.3" sources."to-readable-stream-2.1.0" sources."tunnel-agent-0.6.0" sources."type-fest-0.10.0" - sources."undici-types-5.26.5" + sources."undici-types-6.19.8" sources."universalify-0.1.2" sources."url-to-options-1.0.1" sources."which-2.0.2" sources."wrappy-1.0.2" - sources."yallist-4.0.0" sources."yn-4.0.0" ]; buildInputs = globalBuildInputs; @@ -15889,36 +15889,18 @@ in elm-verify-examples = nodeEnv.buildNodePackage { name = "elm-verify-examples"; packageName = "elm-verify-examples"; - version = "5.3.0"; + version = "6.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/elm-verify-examples/-/elm-verify-examples-5.3.0.tgz"; - sha512 = "6TG+4L/yEamiHpxVQUJPRgHoeEOmk5LhWuVRECMHTKPpvuM2BCYMGwCMUGJ0Wh64RW8oERIdnicsvUDlvDwiTg=="; + url = "https://registry.npmjs.org/elm-verify-examples/-/elm-verify-examples-6.0.3.tgz"; + sha512 = "VgZpUwYik+d7u9ZDLhbTEMN/MIE7qJ9OQRtreGmwE9ehr+JSJvnKcpZwGILIHjiNWjZqarx4d6vA2OtLZm48AA=="; }; dependencies = [ sources."@isaacs/cliui-8.0.2" - sources."ajv-6.12.6" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" - sources."anymatch-3.1.3" - sources."asn1-0.2.6" - sources."assert-plus-1.0.0" - sources."asynckit-0.4.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.12.0" sources."balanced-match-1.0.2" - sources."bcrypt-pbkdf-1.0.2" - sources."binary-0.3.0" - sources."binary-extensions-2.2.0" - sources."binwrap-0.2.2" - sources."bluebird-3.7.2" - sources."brace-expansion-1.1.11" - sources."braces-3.0.2" - sources."buffers-0.1.1" - sources."caseless-0.12.0" - sources."chainsaw-0.1.0" + sources."brace-expansion-2.0.1" sources."chalk-4.1.2" - sources."chokidar-3.2.1" - sources."chownr-1.1.4" (sources."cliui-8.0.1" // { dependencies = [ sources."emoji-regex-8.0.0" @@ -15929,151 +15911,32 @@ in }) sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."combined-stream-1.0.8" - sources."concat-map-0.0.1" - sources."core-util-is-1.0.2" - (sources."cross-spawn-7.0.0" // { - dependencies = [ - sources."which-1.3.1" - ]; - }) - sources."dashdash-1.14.1" - sources."delayed-stream-1.0.0" + sources."cross-spawn-7.0.3" sources."eastasianwidth-0.2.0" - sources."ecc-jsbn-0.1.2" - (sources."elm-test-0.19.1" // { - dependencies = [ - sources."ansi-styles-3.2.1" - (sources."chalk-2.4.2" // { - dependencies = [ - sources."supports-color-5.5.0" - ]; - }) - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."fs-extra-8.1.0" - sources."has-flag-3.0.0" - (sources."supports-color-7.1.0" // { - dependencies = [ - sources."has-flag-4.0.0" - ]; - }) - ]; - }) - sources."elmi-to-json-1.2.0" sources."emoji-regex-9.2.2" - sources."escalade-3.1.1" - sources."escape-string-regexp-1.0.5" - sources."extend-3.0.2" - sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" - sources."fill-range-7.0.1" - (sources."find-elm-dependencies-2.0.2" // { - dependencies = [ - sources."firstline-1.2.0" - ]; - }) - sources."find-parent-dir-0.3.1" - sources."firstline-2.0.2" - sources."foreground-child-3.1.1" - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" - (sources."fs-extra-11.2.0" // { - dependencies = [ - sources."jsonfile-6.1.0" - sources."universalify-2.0.1" - ]; - }) - sources."fs-minipass-1.2.7" - sources."fs.realpath-1.0.0" - sources."fsevents-2.1.3" + sources."escalade-3.2.0" + sources."foreground-child-3.3.0" + sources."fs-extra-11.2.0" sources."get-caller-file-2.0.5" - sources."getpass-0.1.7" - sources."glob-7.1.4" - sources."glob-parent-5.1.2" + sources."glob-10.4.5" sources."graceful-fs-4.2.11" - sources."har-schema-2.0.0" - sources."har-validator-5.1.5" sources."has-flag-4.0.0" - sources."http-signature-1.2.0" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."is-binary-path-2.1.0" - sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" - sources."is-glob-4.0.3" - sources."is-number-7.0.0" - sources."is-typedarray-1.0.0" sources."isexe-2.0.0" - sources."isstream-0.1.2" - sources."jackspeak-2.3.6" - sources."jsbn-0.1.1" - sources."json-schema-0.4.0" - sources."json-schema-traverse-0.4.1" - sources."json-stringify-safe-5.0.1" - sources."jsonfile-4.0.0" - sources."jsprim-1.4.2" - sources."lodash-4.17.15" - sources."lru-cache-10.1.0" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."minimatch-3.1.2" - sources."minimist-1.2.8" - sources."minipass-2.9.0" - sources."minizlib-1.3.3" + sources."jackspeak-3.4.3" + sources."jsonfile-6.1.0" + sources."lru-cache-10.4.3" + sources."minimatch-9.0.5" + sources."minipass-7.1.2" sources."mkdirp-3.0.1" - sources."murmur-hash-js-1.0.0" - sources."mustache-3.2.1" - sources."nice-try-1.0.5" - (sources."node-elm-compiler-5.0.4" // { - dependencies = [ - sources."cross-spawn-6.0.5" - sources."path-key-2.0.1" - sources."which-1.3.1" - ]; - }) - sources."normalize-path-3.0.0" - sources."oauth-sign-0.9.0" - sources."once-1.4.0" - sources."path-is-absolute-1.0.1" + sources."package-json-from-dist-1.0.1" sources."path-key-3.1.1" - (sources."path-scurry-1.10.1" // { - dependencies = [ - sources."minipass-7.0.4" - ]; - }) - sources."performance-now-2.1.0" - sources."picomatch-2.3.1" - sources."psl-1.9.0" - sources."punycode-2.3.1" - sources."qs-6.5.3" - sources."readdirp-3.1.3" - sources."request-2.88.2" - sources."request-promise-4.2.6" - (sources."request-promise-core-1.1.4" // { - dependencies = [ - sources."lodash-4.17.21" - ]; - }) + sources."path-scurry-1.11.1" sources."require-directory-2.1.1" - (sources."rimraf-5.0.5" // { - dependencies = [ - sources."brace-expansion-2.0.1" - sources."glob-10.3.10" - sources."minimatch-9.0.3" - sources."minipass-7.0.4" - ]; - }) - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" - sources."semver-5.7.2" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" + sources."rimraf-5.0.10" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" sources."signal-exit-4.1.0" - sources."split-1.0.1" - sources."sshpk-1.18.0" - sources."stealthy-require-1.1.1" sources."string-width-5.1.2" (sources."string-width-cjs-4.2.3" // { dependencies = [ @@ -16083,37 +15946,13 @@ in }) (sources."strip-ansi-7.1.0" // { dependencies = [ - sources."ansi-regex-6.0.1" + sources."ansi-regex-6.1.0" ]; }) sources."strip-ansi-cjs-6.0.1" sources."supports-color-7.2.0" - (sources."tar-4.4.19" // { - dependencies = [ - sources."mkdirp-0.5.6" - ]; - }) - (sources."temp-0.9.0" // { - dependencies = [ - sources."rimraf-2.6.3" - ]; - }) - sources."through-2.3.8" - sources."to-regex-range-5.0.1" - sources."tough-cookie-2.5.0" - sources."traverse-0.3.9" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."universalify-0.1.2" - (sources."unzip-stream-0.3.1" // { - dependencies = [ - sources."mkdirp-0.5.6" - ]; - }) - sources."uri-js-4.4.1" - sources."uuid-3.4.0" - sources."verror-1.10.0" - sources."which-2.0.1" + sources."universalify-2.0.1" + sources."which-2.0.2" (sources."wrap-ansi-8.1.0" // { dependencies = [ sources."ansi-styles-6.2.1" @@ -16126,10 +15965,7 @@ in sources."strip-ansi-6.0.1" ]; }) - sources."wrappy-1.0.2" - sources."xmlbuilder-13.0.2" sources."y18n-5.0.8" - sources."yallist-3.1.1" (sources."yargs-17.7.2" // { dependencies = [ sources."emoji-regex-8.0.0" @@ -16203,47 +16039,44 @@ in }; dependencies = [ sources."@babel/cli-7.12.10" - sources."@babel/code-frame-7.23.5" - sources."@babel/compat-data-7.23.5" + sources."@babel/code-frame-7.24.7" + sources."@babel/compat-data-7.25.4" sources."@babel/core-7.12.10" - sources."@babel/generator-7.23.6" - sources."@babel/helper-annotate-as-pure-7.22.5" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.22.15" - (sources."@babel/helper-compilation-targets-7.23.6" // { + sources."@babel/generator-7.25.6" + sources."@babel/helper-annotate-as-pure-7.24.7" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.24.7" + (sources."@babel/helper-compilation-targets-7.25.2" // { dependencies = [ sources."semver-6.3.1" ]; }) - (sources."@babel/helper-create-class-features-plugin-7.23.7" // { + (sources."@babel/helper-create-class-features-plugin-7.25.4" // { dependencies = [ sources."semver-6.3.1" ]; }) - (sources."@babel/helper-create-regexp-features-plugin-7.22.15" // { + (sources."@babel/helper-create-regexp-features-plugin-7.25.2" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."@babel/helper-environment-visitor-7.22.20" - sources."@babel/helper-function-name-7.23.0" - sources."@babel/helper-hoist-variables-7.22.5" - sources."@babel/helper-member-expression-to-functions-7.23.0" - sources."@babel/helper-module-imports-7.22.15" - sources."@babel/helper-module-transforms-7.23.3" - sources."@babel/helper-optimise-call-expression-7.22.5" - sources."@babel/helper-plugin-utils-7.22.5" - sources."@babel/helper-remap-async-to-generator-7.22.20" - sources."@babel/helper-replace-supers-7.22.20" - sources."@babel/helper-simple-access-7.22.5" - sources."@babel/helper-skip-transparent-expression-wrappers-7.22.5" - sources."@babel/helper-split-export-declaration-7.22.6" - sources."@babel/helper-string-parser-7.23.4" - sources."@babel/helper-validator-identifier-7.22.20" - sources."@babel/helper-validator-option-7.23.5" - sources."@babel/helper-wrap-function-7.22.20" - sources."@babel/helpers-7.23.7" - sources."@babel/highlight-7.23.4" - sources."@babel/parser-7.23.6" + sources."@babel/helper-environment-visitor-7.24.7" + sources."@babel/helper-member-expression-to-functions-7.24.8" + sources."@babel/helper-module-imports-7.24.7" + sources."@babel/helper-module-transforms-7.25.2" + sources."@babel/helper-optimise-call-expression-7.24.7" + sources."@babel/helper-plugin-utils-7.24.8" + sources."@babel/helper-remap-async-to-generator-7.25.0" + sources."@babel/helper-replace-supers-7.25.0" + sources."@babel/helper-simple-access-7.24.7" + sources."@babel/helper-skip-transparent-expression-wrappers-7.24.7" + sources."@babel/helper-string-parser-7.24.8" + sources."@babel/helper-validator-identifier-7.24.7" + sources."@babel/helper-validator-option-7.24.8" + sources."@babel/helper-wrap-function-7.25.0" + sources."@babel/helpers-7.25.6" + sources."@babel/highlight-7.24.7" + sources."@babel/parser-7.25.6" sources."@babel/plugin-proposal-async-generator-functions-7.20.7" sources."@babel/plugin-proposal-class-properties-7.18.6" sources."@babel/plugin-proposal-dynamic-import-7.18.6" @@ -16269,74 +16102,74 @@ in sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" sources."@babel/plugin-syntax-top-level-await-7.14.5" - sources."@babel/plugin-transform-arrow-functions-7.23.3" - sources."@babel/plugin-transform-async-to-generator-7.23.3" - sources."@babel/plugin-transform-block-scoped-functions-7.23.3" - sources."@babel/plugin-transform-block-scoping-7.23.4" - sources."@babel/plugin-transform-classes-7.23.5" - sources."@babel/plugin-transform-computed-properties-7.23.3" - sources."@babel/plugin-transform-destructuring-7.23.3" - sources."@babel/plugin-transform-dotall-regex-7.23.3" - sources."@babel/plugin-transform-duplicate-keys-7.23.3" - sources."@babel/plugin-transform-exponentiation-operator-7.23.3" - sources."@babel/plugin-transform-for-of-7.23.6" - sources."@babel/plugin-transform-function-name-7.23.3" - sources."@babel/plugin-transform-literals-7.23.3" - sources."@babel/plugin-transform-member-expression-literals-7.23.3" - sources."@babel/plugin-transform-modules-amd-7.23.3" - sources."@babel/plugin-transform-modules-commonjs-7.23.3" - sources."@babel/plugin-transform-modules-systemjs-7.23.3" - sources."@babel/plugin-transform-modules-umd-7.23.3" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.22.5" - sources."@babel/plugin-transform-new-target-7.23.3" - sources."@babel/plugin-transform-object-super-7.23.3" - sources."@babel/plugin-transform-parameters-7.23.3" - sources."@babel/plugin-transform-property-literals-7.23.3" - sources."@babel/plugin-transform-regenerator-7.23.3" - sources."@babel/plugin-transform-reserved-words-7.23.3" + sources."@babel/plugin-transform-arrow-functions-7.24.7" + sources."@babel/plugin-transform-async-to-generator-7.24.7" + sources."@babel/plugin-transform-block-scoped-functions-7.24.7" + sources."@babel/plugin-transform-block-scoping-7.25.0" + sources."@babel/plugin-transform-classes-7.25.4" + sources."@babel/plugin-transform-computed-properties-7.24.7" + sources."@babel/plugin-transform-destructuring-7.24.8" + sources."@babel/plugin-transform-dotall-regex-7.24.7" + sources."@babel/plugin-transform-duplicate-keys-7.24.7" + sources."@babel/plugin-transform-exponentiation-operator-7.24.7" + sources."@babel/plugin-transform-for-of-7.24.7" + sources."@babel/plugin-transform-function-name-7.25.1" + sources."@babel/plugin-transform-literals-7.25.2" + sources."@babel/plugin-transform-member-expression-literals-7.24.7" + sources."@babel/plugin-transform-modules-amd-7.24.7" + sources."@babel/plugin-transform-modules-commonjs-7.24.8" + sources."@babel/plugin-transform-modules-systemjs-7.25.0" + sources."@babel/plugin-transform-modules-umd-7.24.7" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.24.7" + sources."@babel/plugin-transform-new-target-7.24.7" + sources."@babel/plugin-transform-object-super-7.24.7" + sources."@babel/plugin-transform-parameters-7.24.7" + sources."@babel/plugin-transform-property-literals-7.24.7" + sources."@babel/plugin-transform-regenerator-7.24.7" + sources."@babel/plugin-transform-reserved-words-7.24.7" sources."@babel/plugin-transform-runtime-7.12.10" - sources."@babel/plugin-transform-shorthand-properties-7.23.3" - sources."@babel/plugin-transform-spread-7.23.3" - sources."@babel/plugin-transform-sticky-regex-7.23.3" - sources."@babel/plugin-transform-template-literals-7.23.3" - sources."@babel/plugin-transform-typeof-symbol-7.23.3" - sources."@babel/plugin-transform-unicode-escapes-7.23.3" - sources."@babel/plugin-transform-unicode-regex-7.23.3" + sources."@babel/plugin-transform-shorthand-properties-7.24.7" + sources."@babel/plugin-transform-spread-7.24.7" + sources."@babel/plugin-transform-sticky-regex-7.24.7" + sources."@babel/plugin-transform-template-literals-7.24.7" + sources."@babel/plugin-transform-typeof-symbol-7.24.8" + sources."@babel/plugin-transform-unicode-escapes-7.24.7" + sources."@babel/plugin-transform-unicode-regex-7.24.7" sources."@babel/preset-env-7.12.10" sources."@babel/preset-modules-0.1.6" sources."@babel/regjsgen-0.8.0" sources."@babel/runtime-7.12.5" - sources."@babel/template-7.22.15" - sources."@babel/traverse-7.23.7" - sources."@babel/types-7.23.6" + sources."@babel/template-7.25.0" + sources."@babel/traverse-7.25.6" + sources."@babel/types-7.25.6" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" sources."@hapi/hoek-8.5.1" sources."@hapi/joi-15.1.1" sources."@hapi/topo-3.1.6" - sources."@jridgewell/gen-mapping-0.3.3" - sources."@jridgewell/resolve-uri-3.1.1" - sources."@jridgewell/set-array-1.1.2" - sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@jridgewell/trace-mapping-0.3.20" + sources."@jridgewell/gen-mapping-0.3.5" + sources."@jridgewell/resolve-uri-3.1.2" + sources."@jridgewell/set-array-1.2.1" + sources."@jridgewell/sourcemap-codec-1.5.0" + sources."@jridgewell/trace-mapping-0.3.25" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/glob-7.2.0" sources."@types/html-minifier-terser-5.1.2" - sources."@types/http-proxy-1.17.14" + sources."@types/http-proxy-1.17.15" sources."@types/json-schema-7.0.15" sources."@types/minimatch-5.1.2" - sources."@types/node-20.10.6" + sources."@types/node-22.7.3" sources."@types/parse-json-4.0.2" sources."@types/q-1.5.8" sources."@types/source-list-map-0.1.6" sources."@types/tapable-1.0.12" - (sources."@types/uglify-js-3.17.4" // { + (sources."@types/uglify-js-3.17.5" // { dependencies = [ sources."source-map-0.6.1" ]; }) - (sources."@types/webpack-4.41.38" // { + (sources."@types/webpack-4.41.39" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -16384,7 +16217,7 @@ in sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" - sources."array-buffer-byte-length-1.0.0" + sources."array-buffer-byte-length-1.0.1" sources."array-filter-0.0.1" sources."array-flatten-2.1.2" sources."array-map-0.0.1" @@ -16392,11 +16225,11 @@ in sources."array-union-1.0.2" sources."array-uniq-1.0.3" sources."array-unique-0.3.2" - sources."array.prototype.reduce-1.0.6" - sources."arraybuffer.prototype.slice-1.0.2" + sources."array.prototype.reduce-1.0.7" + sources."arraybuffer.prototype.slice-1.0.3" sources."asap-2.0.6" sources."asn1-0.2.6" - (sources."asn1.js-5.4.1" // { + (sources."asn1.js-4.10.1" // { dependencies = [ sources."bn.js-4.12.0" ]; @@ -16420,9 +16253,9 @@ in sources."asynckit-0.4.0" sources."atob-2.1.2" sources."autoprefixer-10.1.0" - sources."available-typed-arrays-1.0.5" + sources."available-typed-arrays-1.0.7" sources."aws-sign2-0.7.0" - sources."aws4-1.12.0" + sources."aws4-1.13.2" sources."babel-extract-comments-1.0.0" (sources."babel-loader-8.2.2" // { dependencies = [ @@ -16448,16 +16281,15 @@ in sources."batch-0.6.1" sources."bcrypt-pbkdf-1.0.2" sources."big.js-5.2.2" - sources."binary-extensions-2.2.0" + sources."binary-extensions-2.3.0" sources."bindings-1.5.0" sources."bluebird-3.7.2" sources."bn.js-5.2.1" - (sources."body-parser-1.20.1" // { + (sources."body-parser-1.20.3" // { dependencies = [ - sources."bytes-3.1.2" sources."debug-2.6.9" sources."ms-2.0.0" - sources."qs-6.11.0" + sources."qs-6.13.0" ]; }) (sources."bonjour-3.5.0" // { @@ -16467,29 +16299,33 @@ in }) sources."boolbase-1.0.0" sources."brace-expansion-1.1.11" - sources."braces-3.0.2" + sources."braces-3.0.3" sources."brorand-1.1.0" sources."browserify-aes-1.2.0" sources."browserify-cipher-1.0.1" sources."browserify-des-1.0.2" - sources."browserify-rsa-4.1.0" - (sources."browserify-sign-4.2.2" // { + (sources."browserify-rsa-4.1.1" // { dependencies = [ - sources."readable-stream-3.6.2" + sources."safe-buffer-5.2.1" + ]; + }) + (sources."browserify-sign-4.2.3" // { + dependencies = [ + sources."hash-base-3.0.4" sources."safe-buffer-5.2.1" ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.22.2" + sources."browserslist-4.24.0" sources."buffer-4.9.2" sources."buffer-from-1.1.2" sources."buffer-indexof-1.1.1" sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" - sources."bytes-3.0.0" + sources."bytes-3.1.2" sources."cacache-12.0.4" sources."cache-base-1.0.1" - sources."call-bind-1.0.5" + sources."call-bind-1.0.7" sources."call-me-maybe-1.0.2" sources."caller-callsite-2.0.0" sources."caller-path-2.0.0" @@ -16497,7 +16333,7 @@ in sources."camel-case-4.1.2" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001574" + sources."caniuse-lite-1.0.30001664" sources."case-sensitive-paths-webpack-plugin-2.3.0" sources."caseless-0.12.0" (sources."chalk-2.4.2" // { @@ -16506,13 +16342,13 @@ in ]; }) sources."chardet-0.7.0" - (sources."chokidar-3.5.3" // { + (sources."chokidar-3.6.0" // { dependencies = [ sources."glob-parent-5.1.2" ]; }) sources."chownr-1.1.4" - sources."chrome-trace-event-1.0.3" + sources."chrome-trace-event-1.0.4" sources."cipher-base-1.0.4" (sources."class-utils-0.3.6" // { dependencies = [ @@ -16553,6 +16389,7 @@ in sources."compressible-2.0.18" (sources."compression-1.7.4" // { dependencies = [ + sources."bytes-3.0.0" sources."debug-2.6.9" sources."ms-2.0.0" ]; @@ -16569,7 +16406,7 @@ in }) sources."content-type-1.0.5" sources."convert-source-map-1.9.0" - sources."cookie-0.5.0" + sources."cookie-0.6.0" sources."cookie-signature-1.0.6" sources."copy-concurrently-1.0.5" sources."copy-descriptor-0.1.1" @@ -16585,7 +16422,7 @@ in ]; }) sources."core-js-2.6.12" - sources."core-js-compat-3.35.0" + sources."core-js-compat-3.38.1" sources."core-util-is-1.0.3" sources."cosmiconfig-5.2.1" (sources."create-ecdh-4.0.4" // { @@ -16609,18 +16446,17 @@ in dependencies = [ sources."camelcase-6.3.0" sources."loader-utils-2.0.4" - sources."lru-cache-6.0.0" sources."picocolors-0.2.1" sources."postcss-7.0.39" - sources."semver-7.5.4" + sources."semver-7.6.3" sources."source-map-0.6.1" - sources."yallist-4.0.0" ]; }) sources."css-select-4.3.0" sources."css-select-base-adapter-0.1.1" (sources."css-tree-1.0.0-alpha.37" // { dependencies = [ + sources."mdn-data-2.0.4" sources."source-map-0.6.1" ]; }) @@ -16653,19 +16489,21 @@ in (sources."csso-4.2.0" // { dependencies = [ sources."css-tree-1.1.3" - sources."mdn-data-2.0.14" sources."source-map-0.6.1" ]; }) sources."cycle-1.0.3" sources."cyclist-1.0.2" sources."dashdash-1.14.1" - sources."debug-4.3.4" + sources."data-view-buffer-1.0.1" + sources."data-view-byte-length-1.0.1" + sources."data-view-byte-offset-1.0.0" + sources."debug-4.3.7" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.2" sources."deep-equal-0.2.2" sources."default-gateway-4.2.0" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" sources."define-properties-1.2.1" sources."define-property-2.0.2" (sources."del-4.1.1" // { @@ -16710,8 +16548,8 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.622" - (sources."elliptic-6.5.4" // { + sources."electron-to-chromium-1.5.29" + (sources."elliptic-6.5.7" // { dependencies = [ sources."bn.js-4.12.0" ]; @@ -16738,7 +16576,7 @@ in sources."elm-webpack-loader-6.0.1" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" - sources."encodeurl-1.0.2" + sources."encodeurl-2.0.0" sources."end-of-stream-1.4.4" (sources."enhanced-resolve-4.5.0" // { dependencies = [ @@ -16748,11 +16586,14 @@ in sources."entities-2.2.0" sources."errno-0.1.8" sources."error-ex-1.3.2" - sources."es-abstract-1.22.3" + sources."es-abstract-1.23.3" sources."es-array-method-boxes-properly-1.0.0" - sources."es-set-tostringtag-2.0.2" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" + sources."es-object-atoms-1.0.0" + sources."es-set-tostringtag-2.0.3" sources."es-to-primitive-1.2.1" - sources."escalade-3.1.1" + sources."escalade-3.2.0" sources."escape-html-1.0.3" sources."escape-string-regexp-2.0.0" sources."eslint-scope-4.0.3" @@ -16788,12 +16629,12 @@ in ]; }) sources."expand-tilde-2.0.2" - (sources."express-4.18.2" // { + (sources."express-4.21.0" // { dependencies = [ sources."array-flatten-1.1.1" sources."debug-2.6.9" sources."ms-2.0.0" - sources."qs-6.11.0" + sources."qs-6.13.0" sources."safe-buffer-5.2.1" ]; }) @@ -16850,8 +16691,8 @@ in }) sources."file-uri-to-path-1.0.0" sources."filesize-3.6.1" - sources."fill-range-7.0.1" - (sources."finalhandler-1.2.0" // { + sources."fill-range-7.1.1" + (sources."finalhandler-1.3.1" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" @@ -16867,7 +16708,7 @@ in sources."find-up-4.1.0" sources."firstline-1.3.1" sources."flush-write-stream-1.1.1" - sources."follow-redirects-1.15.4" + sources."follow-redirects-1.15.9" sources."for-each-0.3.3" sources."for-in-1.0.2" sources."forever-agent-0.6.1" @@ -16881,16 +16722,16 @@ in sources."fs-readdir-recursive-1.1.0" sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" - sources."fsevents-2.3.3" + sources."fsevents-1.2.13" sources."function-bind-1.1.2" sources."function.prototype.name-1.1.6" sources."functions-have-names-1.2.3" sources."gensync-1.0.0-beta.2" sources."get-caller-file-1.0.3" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" sources."get-own-enumerable-property-symbols-3.0.2" sources."get-stream-4.1.0" - sources."get-symbol-description-1.0.0" + sources."get-symbol-description-1.0.2" sources."get-value-2.0.6" sources."getpass-0.1.7" sources."glob-7.2.3" @@ -16907,7 +16748,7 @@ in ]; }) sources."globals-11.12.0" - sources."globalthis-1.0.3" + sources."globalthis-1.0.4" (sources."globby-7.1.1" // { dependencies = [ sources."pify-3.0.0" @@ -16927,10 +16768,10 @@ in sources."has-1.0.4" sources."has-bigints-1.0.2" sources."has-flag-3.0.0" - sources."has-property-descriptors-1.0.1" - sources."has-proto-1.0.1" + sources."has-property-descriptors-1.0.2" + sources."has-proto-1.0.3" sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" + sources."has-tostringtag-1.0.2" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -16949,7 +16790,7 @@ in ]; }) sources."hash.js-1.1.7" - sources."hasown-2.0.0" + sources."hasown-2.0.2" sources."he-1.2.0" sources."hex-color-regex-1.1.0" sources."hmac-drbg-1.0.1" @@ -17008,15 +16849,15 @@ in ]; }) sources."internal-ip-4.3.0" - sources."internal-slot-1.0.6" + sources."internal-slot-1.0.7" sources."invert-kv-1.0.0" - sources."ip-1.1.8" + sources."ip-1.1.9" sources."ip-regex-2.1.0" sources."ipaddr.js-1.9.1" sources."is-absolute-url-2.1.0" sources."is-accessor-descriptor-1.0.1" sources."is-arguments-1.1.1" - sources."is-array-buffer-3.0.2" + sources."is-array-buffer-3.0.4" sources."is-arrayish-0.2.1" sources."is-bigint-1.0.4" sources."is-binary-path-2.1.0" @@ -17024,8 +16865,9 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.7" sources."is-color-stop-1.1.0" - sources."is-core-module-2.13.1" + sources."is-core-module-2.15.1" sources."is-data-descriptor-1.0.1" + sources."is-data-view-1.0.1" sources."is-date-object-1.0.5" sources."is-descriptor-1.0.3" sources."is-directory-0.3.1" @@ -17033,7 +16875,7 @@ in sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" - sources."is-negative-zero-2.0.2" + sources."is-negative-zero-2.0.3" sources."is-number-7.0.0" sources."is-number-object-1.0.7" sources."is-obj-2.0.0" @@ -17046,11 +16888,11 @@ in sources."is-regexp-1.0.0" sources."is-resolvable-1.1.0" sources."is-root-2.0.0" - sources."is-shared-array-buffer-1.0.2" + sources."is-shared-array-buffer-1.0.3" sources."is-stream-1.1.0" sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.12" + sources."is-typed-array-1.1.13" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" sources."is-weakref-1.0.2" @@ -17068,7 +16910,7 @@ in sources."json-parse-even-better-errors-2.3.1" sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" - (sources."json-stable-stringify-1.1.0" // { + (sources."json-stable-stringify-1.1.1" // { dependencies = [ sources."isarray-2.0.5" ]; @@ -17104,20 +16946,20 @@ in sources."lodash.template-4.5.0" sources."lodash.templatesettings-4.2.0" sources."lodash.uniq-4.5.0" - sources."loglevel-1.8.1" + sources."loglevel-1.9.2" sources."lower-case-2.0.2" sources."lru-cache-5.1.1" sources."make-dir-2.1.0" sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."md5.js-1.3.5" - sources."mdn-data-2.0.4" + sources."mdn-data-2.0.14" sources."media-typer-0.3.0" sources."memory-fs-0.4.1" - sources."merge-descriptors-1.0.1" + sources."merge-descriptors-1.0.3" sources."merge2-1.4.1" sources."methods-1.1.2" - sources."micromatch-4.0.5" + sources."micromatch-4.0.8" (sources."miller-rabin-4.0.1" // { dependencies = [ sources."bn.js-4.12.0" @@ -17144,11 +16986,11 @@ in }) sources."mkdirp-0.5.3" sources."move-concurrently-1.0.1" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."multicast-dns-6.2.3" sources."multicast-dns-service-types-1.1.0" sources."mute-stream-0.0.8" - sources."nan-2.18.0" + sources."nan-2.20.0" sources."nanoid-3.3.7" sources."nanomatch-1.2.13" sources."ncp-1.0.1" @@ -17171,7 +17013,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-2.0.14" + sources."node-releases-2.0.18" sources."normalize-package-data-2.5.0" sources."normalize-path-3.0.0" sources."normalize-range-0.1.2" @@ -17192,15 +17034,15 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.13.1" - sources."object-is-1.1.5" + sources."object-inspect-1.13.2" + sources."object-is-1.1.6" sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.assign-4.1.5" - sources."object.entries-1.1.7" - sources."object.getownpropertydescriptors-2.1.7" + sources."object.entries-1.1.8" + sources."object.getownpropertydescriptors-2.1.8" sources."object.pick-1.3.0" - sources."object.values-1.1.7" + sources."object.values-1.2.0" sources."obuf-1.1.2" sources."on-finished-2.4.1" sources."on-headers-1.0.2" @@ -17226,7 +17068,12 @@ in sources."callsites-3.1.0" ]; }) - sources."parse-asn1-5.1.6" + (sources."parse-asn1-5.1.7" // { + dependencies = [ + sources."hash-base-3.0.4" + sources."safe-buffer-5.2.1" + ]; + }) sources."parse-json-4.0.0" sources."parse-passwd-1.0.0" sources."parseurl-1.3.3" @@ -17239,7 +17086,7 @@ in sources."path-is-inside-1.0.2" sources."path-key-3.1.1" sources."path-parse-1.0.7" - sources."path-to-regexp-0.1.7" + sources."path-to-regexp-0.1.10" (sources."path-type-3.0.0" // { dependencies = [ sources."pify-3.0.0" @@ -17247,7 +17094,7 @@ in }) sources."pbkdf2-3.1.2" sources."performance-now-2.1.0" - sources."picocolors-1.0.0" + sources."picocolors-1.1.0" sources."picomatch-2.3.1" sources."pify-4.0.1" sources."pinkie-2.0.4" @@ -17273,7 +17120,8 @@ in ]; }) sources."posix-character-classes-0.1.1" - sources."postcss-8.4.33" + sources."possible-typed-array-names-1.0.0" + sources."postcss-8.4.47" (sources."postcss-calc-7.0.5" // { dependencies = [ sources."picocolors-0.2.1" @@ -17337,13 +17185,11 @@ in sources."cosmiconfig-7.1.0" sources."import-fresh-3.3.0" sources."loader-utils-2.0.4" - sources."lru-cache-6.0.0" sources."parse-json-5.2.0" sources."path-type-4.0.0" sources."resolve-from-4.0.0" sources."schema-utils-3.3.0" - sources."semver-7.5.4" - sources."yallist-4.0.0" + sources."semver-7.6.3" ]; }) (sources."postcss-merge-longhand-4.0.11" // { @@ -17518,7 +17364,7 @@ in ]; }) sources."postcss-safe-parser-5.0.2" - sources."postcss-selector-parser-6.0.15" + sources."postcss-selector-parser-6.1.2" (sources."postcss-svgo-4.0.3" // { dependencies = [ sources."picocolors-0.2.1" @@ -17552,7 +17398,7 @@ in sources."bn.js-4.12.0" ]; }) - sources."pump-3.0.0" + sources."pump-3.0.2" (sources."pumpify-1.5.1" // { dependencies = [ sources."pump-2.0.1" @@ -17567,11 +17413,7 @@ in sources."randombytes-2.1.0" sources."randomfill-1.0.4" sources."range-parser-1.2.1" - (sources."raw-body-2.5.1" // { - dependencies = [ - sources."bytes-3.1.2" - ]; - }) + sources."raw-body-2.5.2" (sources."react-dev-utils-6.1.1" // { dependencies = [ sources."@babel/code-frame-7.0.0" @@ -17625,11 +17467,11 @@ in ]; }) sources."regenerate-1.4.2" - sources."regenerate-unicode-properties-10.1.1" + sources."regenerate-unicode-properties-10.2.0" sources."regenerator-runtime-0.13.11" sources."regenerator-transform-0.15.2" sources."regex-not-1.0.2" - sources."regexp.prototype.flags-1.5.1" + sources."regexp.prototype.flags-1.5.2" sources."regexpu-core-5.3.2" (sources."regjsparser-0.9.1" // { dependencies = [ @@ -17670,28 +17512,28 @@ in sources."tslib-1.14.1" ]; }) - (sources."safe-array-concat-1.0.1" // { + (sources."safe-array-concat-1.1.2" // { dependencies = [ sources."isarray-2.0.5" ]; }) sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" - sources."safe-regex-test-1.0.0" + sources."safe-regex-test-1.0.3" sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."schema-utils-2.7.1" sources."select-hose-2.0.0" sources."selfsigned-1.10.14" sources."semver-5.7.2" - (sources."send-0.18.0" // { + (sources."send-0.19.0" // { dependencies = [ (sources."debug-2.6.9" // { dependencies = [ sources."ms-2.0.0" ]; }) - sources."ms-2.1.3" + sources."encodeurl-1.0.2" ]; }) sources."serialize-javascript-4.0.0" @@ -17706,10 +17548,10 @@ in sources."statuses-1.5.0" ]; }) - sources."serve-static-1.15.0" + sources."serve-static-1.16.2" sources."set-blocking-2.0.0" - sources."set-function-length-1.1.1" - sources."set-function-name-2.0.1" + sources."set-function-length-1.2.2" + sources."set-function-name-2.0.2" (sources."set-value-2.0.1" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -17721,7 +17563,7 @@ in sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."shell-quote-1.6.1" - sources."side-channel-1.0.4" + sources."side-channel-1.0.6" sources."signal-exit-3.0.7" (sources."simple-swizzle-0.2.2" // { dependencies = [ @@ -17763,7 +17605,7 @@ in sources."sort-keys-1.1.2" sources."source-list-map-2.0.1" sources."source-map-0.5.7" - sources."source-map-js-1.0.2" + sources."source-map-js-1.2.1" sources."source-map-resolve-0.5.3" (sources."source-map-support-0.5.21" // { dependencies = [ @@ -17772,9 +17614,9 @@ in }) sources."source-map-url-0.4.1" sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.3.0" + sources."spdx-exceptions-2.5.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.16" + sources."spdx-license-ids-3.0.20" sources."spdy-4.0.2" (sources."spdy-transport-3.0.0" // { dependencies = [ @@ -17798,7 +17640,7 @@ in sources."stream-browserify-2.0.2" sources."stream-each-1.2.3" sources."stream-http-2.8.3" - sources."stream-shift-1.0.1" + sources."stream-shift-1.0.3" sources."strict-uri-encode-1.1.0" sources."string-replace-loader-2.3.0" (sources."string-width-4.2.3" // { @@ -17806,9 +17648,9 @@ in sources."strip-ansi-6.0.1" ]; }) - sources."string.prototype.trim-1.2.8" - sources."string.prototype.trimend-1.0.7" - sources."string.prototype.trimstart-1.0.7" + sources."string.prototype.trim-1.2.9" + sources."string.prototype.trimend-1.0.8" + sources."string.prototype.trimstart-1.0.8" sources."string_decoder-1.1.1" (sources."stringify-object-3.3.0" // { dependencies = [ @@ -17860,7 +17702,7 @@ in sources."source-map-0.6.1" ]; }) - (sources."terser-webpack-plugin-1.4.5" // { + (sources."terser-webpack-plugin-1.4.6" // { dependencies = [ sources."find-cache-dir-2.1.0" sources."find-up-3.0.0" @@ -17890,15 +17732,15 @@ in sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" sources."tough-cookie-2.5.0" - sources."tslib-2.6.2" + sources."tslib-2.7.0" sources."tty-browserify-0.0.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."typed-array-buffer-1.0.0" - sources."typed-array-byte-length-1.0.0" - sources."typed-array-byte-offset-1.0.0" - sources."typed-array-length-1.0.4" + sources."typed-array-buffer-1.0.2" + sources."typed-array-byte-length-1.0.1" + sources."typed-array-byte-offset-1.0.2" + sources."typed-array-length-1.0.6" sources."typedarray-0.0.6" (sources."uglify-es-3.3.10" // { dependencies = [ @@ -17930,10 +17772,10 @@ in ]; }) sources."unbox-primitive-1.0.2" - sources."undici-types-5.26.5" - sources."unicode-canonical-property-names-ecmascript-2.0.0" + sources."undici-types-6.19.8" + sources."unicode-canonical-property-names-ecmascript-2.0.1" sources."unicode-match-property-ecmascript-2.0.0" - sources."unicode-match-property-value-ecmascript-2.1.0" + sources."unicode-match-property-value-ecmascript-2.2.0" sources."unicode-property-aliases-ecmascript-2.1.0" sources."union-value-1.0.1" sources."uniq-1.0.1" @@ -17954,13 +17796,13 @@ in ]; }) sources."upath-1.2.0" - sources."update-browserslist-db-1.0.13" + sources."update-browserslist-db-1.1.1" sources."uri-js-4.4.1" sources."urix-0.1.0" - (sources."url-0.11.3" // { + (sources."url-0.11.4" // { dependencies = [ sources."punycode-1.4.1" - sources."qs-6.11.2" + sources."qs-6.13.0" ]; }) (sources."url-loader-4.1.1" // { @@ -18000,11 +17842,16 @@ in sources."chokidar-2.1.8" sources."extend-shallow-2.0.1" sources."fill-range-4.0.0" - sources."fsevents-1.2.13" sources."is-binary-path-1.0.1" + sources."is-extendable-1.0.1" sources."is-number-3.0.0" sources."kind-of-3.2.2" - sources."micromatch-3.1.10" + (sources."micromatch-3.1.10" // { + dependencies = [ + sources."extend-shallow-3.0.2" + sources."kind-of-6.0.3" + ]; + }) sources."normalize-path-2.1.1" sources."readdirp-2.2.1" sources."to-regex-range-2.1.1" @@ -18030,14 +17877,13 @@ in }) (sources."webpack-dev-server-3.11.0" // { dependencies = [ - sources."ansi-regex-2.1.1" + sources."ansi-regex-4.1.1" sources."anymatch-2.0.0" sources."binary-extensions-1.13.1" sources."braces-2.3.2" sources."chokidar-2.1.8" (sources."cliui-5.0.0" // { dependencies = [ - sources."ansi-regex-4.1.1" sources."strip-ansi-5.2.0" ]; }) @@ -18045,16 +17891,21 @@ in sources."extend-shallow-2.0.1" sources."fill-range-4.0.0" sources."find-up-3.0.0" - sources."fsevents-1.2.13" sources."get-caller-file-2.0.5" sources."http-proxy-middleware-0.19.1" sources."is-absolute-url-3.0.3" sources."is-binary-path-1.0.1" + sources."is-extendable-1.0.1" sources."is-fullwidth-code-point-2.0.0" sources."is-number-3.0.0" sources."kind-of-3.2.2" sources."locate-path-3.0.0" - sources."micromatch-3.1.10" + (sources."micromatch-3.1.10" // { + dependencies = [ + sources."extend-shallow-3.0.2" + sources."kind-of-6.0.3" + ]; + }) sources."normalize-path-2.1.1" sources."opn-5.5.0" sources."p-locate-3.0.0" @@ -18065,17 +17916,19 @@ in sources."semver-6.3.1" (sources."string-width-3.1.0" // { dependencies = [ - sources."ansi-regex-4.1.1" sources."strip-ansi-5.2.0" ]; }) - sources."strip-ansi-3.0.1" + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) sources."supports-color-6.1.0" sources."to-regex-range-2.1.1" sources."which-module-2.0.1" (sources."wrap-ansi-5.1.0" // { dependencies = [ - sources."ansi-regex-4.1.1" sources."strip-ansi-5.2.0" ]; }) @@ -18100,7 +17953,7 @@ in sources."which-2.0.2" sources."which-boxed-primitive-1.0.2" sources."which-module-1.0.0" - sources."which-typed-array-1.1.13" + sources."which-typed-array-1.1.15" (sources."winston-2.1.1" // { dependencies = [ sources."async-1.0.0" @@ -18138,7 +17991,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-6.2.2" + sources."ws-6.2.3" sources."xmlbuilder-15.1.1" sources."xtend-4.0.2" sources."y18n-4.0.3" @@ -18241,73 +18094,67 @@ in elm-pages = nodeEnv.buildNodePackage { name = "elm-pages"; packageName = "elm-pages"; - version = "3.0.9"; + version = "3.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/elm-pages/-/elm-pages-3.0.9.tgz"; - sha512 = "EFwDCYHm3rwCiwXwfSUKeDDcIYrQ61deChDk7ruXPN4y0PkIINIKbljLu3uOnKSYhzc5CGSc7avwiAlkxXnJsA=="; + url = "https://registry.npmjs.org/elm-pages/-/elm-pages-3.0.16.tgz"; + sha512 = "UG/tC57uFQ5bkhW+L+7ZFjSg0uPHEtUPsjotHl8CzXHqfOUR4pRIqQ6kyi7DOGxStmoTyTvjh7TFZGA54/mXgw=="; }; dependencies = [ - sources."@adobe/css-tools-4.3.2" - sources."@esbuild/android-arm-0.17.19" - sources."@esbuild/android-arm64-0.17.19" - sources."@esbuild/android-x64-0.17.19" - sources."@esbuild/darwin-arm64-0.17.19" - sources."@esbuild/darwin-x64-0.17.19" - sources."@esbuild/freebsd-arm64-0.17.19" - sources."@esbuild/freebsd-x64-0.17.19" - sources."@esbuild/linux-arm-0.17.19" - sources."@esbuild/linux-arm64-0.17.19" - sources."@esbuild/linux-ia32-0.17.19" - sources."@esbuild/linux-loong64-0.17.19" - sources."@esbuild/linux-mips64el-0.17.19" - sources."@esbuild/linux-ppc64-0.17.19" - sources."@esbuild/linux-riscv64-0.17.19" - sources."@esbuild/linux-s390x-0.17.19" - sources."@esbuild/linux-x64-0.17.19" - sources."@esbuild/netbsd-x64-0.17.19" - sources."@esbuild/openbsd-x64-0.17.19" - sources."@esbuild/sunos-x64-0.17.19" - sources."@esbuild/win32-arm64-0.17.19" - sources."@esbuild/win32-ia32-0.17.19" - sources."@esbuild/win32-x64-0.17.19" + sources."@adobe/css-tools-4.3.3" + sources."@bufbuild/protobuf-2.1.0" sources."@isaacs/cliui-8.0.2" - sources."@jridgewell/gen-mapping-0.3.3" - sources."@jridgewell/resolve-uri-3.1.1" - sources."@jridgewell/set-array-1.1.2" - sources."@jridgewell/source-map-0.3.5" - sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@jridgewell/trace-mapping-0.3.20" + sources."@jridgewell/gen-mapping-0.3.5" + sources."@jridgewell/resolve-uri-3.1.2" + sources."@jridgewell/set-array-1.2.1" + sources."@jridgewell/source-map-0.3.6" + sources."@jridgewell/sourcemap-codec-1.5.0" + sources."@jridgewell/trace-mapping-0.3.25" + (sources."@jsonjoy.com/base64-1.1.2" // { + dependencies = [ + sources."tslib-2.7.0" + ]; + }) + (sources."@jsonjoy.com/json-pack-1.1.0" // { + dependencies = [ + sources."tslib-2.7.0" + ]; + }) + (sources."@jsonjoy.com/util-1.3.0" // { + dependencies = [ + sources."tslib-2.7.0" + ]; + }) sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - (sources."@npmcli/fs-3.1.0" // { + sources."@npmcli/agent-2.2.2" + (sources."@npmcli/fs-3.1.1" // { dependencies = [ - sources."lru-cache-6.0.0" - sources."semver-7.5.4" + sources."semver-7.6.3" ]; }) sources."@sindresorhus/is-0.14.0" + sources."@sindresorhus/merge-streams-3.0.0" sources."@szmarczak/http-timer-1.1.2" - sources."@tootallnate/once-2.0.0" sources."@types/configstore-2.1.1" sources."@types/debug-0.0.30" + sources."@types/estree-1.0.6" sources."@types/get-port-3.2.0" sources."@types/glob-5.0.38" - sources."@types/lodash-4.14.202" + sources."@types/lodash-4.17.9" sources."@types/minimatch-5.1.2" sources."@types/mkdirp-0.5.2" sources."@types/node-8.10.66" sources."@types/rimraf-2.0.5" sources."@types/tmp-0.0.33" sources."accepts-1.3.8" - sources."acorn-8.11.3" - (sources."agent-base-6.0.2" // { + sources."acorn-8.12.1" + (sources."agent-base-7.1.1" // { dependencies = [ - sources."debug-4.3.4" - sources."ms-2.1.2" + sources."debug-4.3.7" + sources."ms-2.1.3" ]; }) - sources."agentkeepalive-4.5.0" sources."aggregate-error-3.1.0" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" @@ -18319,24 +18166,24 @@ in sources."async-limiter-1.0.1" sources."balanced-match-1.0.2" sources."batch-0.6.1" - sources."binary-extensions-2.2.0" - (sources."body-parser-1.20.1" // { + sources."binary-extensions-2.3.0" + (sources."body-parser-1.20.3" // { dependencies = [ sources."on-finished-2.4.1" ]; }) sources."brace-expansion-1.1.11" - sources."braces-3.0.2" + sources."braces-3.0.3" + sources."buffer-builder-0.2.0" sources."buffer-from-1.1.2" sources."bufferutil-4.0.8" sources."busboy-1.6.0" sources."bytes-3.1.2" - (sources."cacache-17.1.4" // { + (sources."cacache-18.0.4" // { dependencies = [ sources."brace-expansion-2.0.1" - sources."glob-10.3.10" - sources."minimatch-9.0.3" - sources."minipass-7.0.4" + sources."glob-10.4.5" + sources."minimatch-9.0.5" ]; }) (sources."cacheable-request-6.1.0" // { @@ -18345,21 +18192,23 @@ in sources."lowercase-keys-2.0.0" ]; }) - sources."call-bind-1.0.5" + sources."call-bind-1.0.7" sources."chalk-3.0.0" - sources."chokidar-3.5.3" + sources."chokidar-3.6.0" sources."chownr-2.0.0" sources."clean-stack-2.2.0" + sources."cli-cursor-4.0.0" sources."clone-response-1.0.3" sources."color-convert-2.0.1" sources."color-name-1.1.4" + sources."colorjs.io-0.5.2" sources."command-exists-1.2.9" - sources."commander-10.0.1" + sources."commander-11.1.0" sources."concat-map-0.0.1" sources."connect-3.7.0" sources."content-disposition-0.5.4" sources."content-type-1.0.5" - sources."cookie-0.5.0" + sources."cookie-0.6.0" sources."cookie-signature-1.2.1" sources."copy-anything-2.0.6" (sources."cross-spawn-7.0.3" // { @@ -18371,7 +18220,7 @@ in sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."defer-to-connect-1.1.3" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" sources."depd-2.0.0" sources."destroy-1.2.0" sources."detect-libc-1.0.3" @@ -18381,7 +18230,6 @@ in sources."ms-2.1.3" ]; }) - sources."dir-glob-3.0.1" sources."duplexer3-0.1.5" sources."eastasianwidth-0.2.0" sources."ee-first-1.1.1" @@ -18398,85 +18246,94 @@ in sources."eol-0.9.1" sources."err-code-2.0.3" sources."errno-0.1.8" - sources."esbuild-0.17.19" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" + sources."esbuild-0.21.5" sources."escape-html-1.0.3" sources."esprima-4.0.1" sources."etag-1.8.1" - (sources."express-4.18.2" // { + (sources."express-4.21.0" // { dependencies = [ sources."cookie-signature-1.0.6" - sources."finalhandler-1.2.0" + sources."encodeurl-2.0.0" + sources."finalhandler-1.3.1" sources."on-finished-2.4.1" sources."statuses-2.0.1" ]; }) (sources."express-ws-4.0.0" // { dependencies = [ - sources."ws-5.2.3" + sources."ws-5.2.4" ]; }) sources."extend-shallow-2.0.1" sources."fast-glob-3.3.2" - sources."fastq-1.16.0" - sources."fill-range-7.0.1" + sources."fastq-1.17.1" + sources."fill-range-7.1.1" sources."finalhandler-1.1.2" - sources."foreground-child-3.1.1" - sources."forwarded-0.2.0" - sources."fresh-0.5.2" - sources."fs-extra-11.2.0" - (sources."fs-minipass-3.0.3" // { + (sources."foreground-child-3.3.0" // { dependencies = [ - sources."minipass-7.0.4" + sources."signal-exit-4.1.0" ]; }) - sources."fs-monkey-1.0.5" + sources."forwarded-0.2.0" + sources."fresh-0.5.2" + sources."fs-extra-11.2.0" + sources."fs-minipass-3.0.3" sources."fs.realpath-1.0.0" - sources."fsevents-2.3.3" sources."function-bind-1.1.2" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" sources."get-port-3.2.0" sources."get-stream-4.1.0" sources."glob-7.2.3" sources."glob-parent-5.1.2" - sources."globby-13.1.4" + (sources."globby-14.0.0" // { + dependencies = [ + sources."@sindresorhus/merge-streams-1.0.0" + ]; + }) sources."gopd-1.0.1" sources."got-9.6.0" sources."graceful-fs-4.2.11" sources."gray-matter-4.0.3" sources."has-flag-4.0.0" - sources."has-property-descriptors-1.0.1" - sources."has-proto-1.0.1" + sources."has-property-descriptors-1.0.2" + sources."has-proto-1.0.3" sources."has-symbols-1.0.3" - sources."hasown-2.0.0" + sources."hasown-2.0.2" sources."http-cache-semantics-4.1.1" (sources."http-errors-2.0.0" // { dependencies = [ sources."statuses-2.0.1" ]; }) - (sources."http-proxy-agent-5.0.0" // { + (sources."http-proxy-agent-7.0.2" // { dependencies = [ - sources."debug-4.3.4" - sources."ms-2.1.2" + sources."debug-4.3.7" + sources."ms-2.1.3" ]; }) - (sources."https-proxy-agent-5.0.1" // { + (sources."https-proxy-agent-7.0.5" // { dependencies = [ - sources."debug-4.3.4" - sources."ms-2.1.2" + sources."debug-4.3.7" + sources."ms-2.1.3" ]; }) - sources."humanize-ms-1.2.1" + sources."hyperdyperid-1.2.0" sources."iconv-lite-0.4.24" - sources."ignore-5.3.0" + sources."ignore-5.3.2" sources."image-size-0.5.5" - sources."immutable-4.3.4" + sources."immutable-4.3.7" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" - sources."ip-2.0.0" + (sources."ip-address-9.0.5" // { + dependencies = [ + sources."sprintf-js-1.1.3" + ]; + }) sources."ipaddr.js-1.9.1" sources."is-binary-path-2.1.0" sources."is-docker-2.2.1" @@ -18490,8 +18347,9 @@ in sources."is-what-3.14.1" sources."is-wsl-2.2.0" sources."isexe-2.0.0" - sources."jackspeak-2.3.6" + sources."jackspeak-3.4.3" sources."js-yaml-3.14.1" + sources."jsbn-1.1.0" sources."jsesc-3.0.2" sources."json-buffer-3.0.0" sources."jsonfile-6.1.0" @@ -18501,42 +18359,39 @@ in sources."latest-version-5.1.0" (sources."less-4.2.0" // { dependencies = [ - sources."tslib-2.6.2" + sources."tslib-2.7.0" ]; }) - sources."lightningcss-1.22.1" + sources."lightningcss-1.27.0" sources."lodash-4.17.21" sources."lowercase-keys-1.0.1" - sources."lru-cache-7.18.3" + sources."lru-cache-10.4.3" (sources."make-dir-2.1.0" // { dependencies = [ sources."semver-5.7.2" ]; }) - sources."make-fetch-happen-11.1.1" + sources."make-fetch-happen-13.0.1" sources."media-typer-0.3.0" - sources."memfs-3.6.0" - sources."merge-descriptors-1.0.1" + (sources."memfs-4.12.0" // { + dependencies = [ + sources."tslib-2.7.0" + ]; + }) + sources."merge-descriptors-1.0.3" sources."merge2-1.4.1" sources."methods-1.1.2" - sources."micromatch-4.0.5" + sources."micromatch-4.0.8" sources."mime-1.6.0" sources."mime-db-1.52.0" sources."mime-types-2.1.35" + sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.8" - sources."minipass-5.0.0" - (sources."minipass-collect-1.0.2" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-fetch-3.0.4" // { - dependencies = [ - sources."minipass-7.0.4" - ]; - }) + sources."minipass-7.1.2" + sources."minipass-collect-2.0.1" + sources."minipass-fetch-3.0.5" (sources."minipass-flush-1.0.5" // { dependencies = [ sources."minipass-3.3.6" @@ -18566,60 +18421,75 @@ in ]; }) sources."negotiator-0.6.3" - sources."node-gyp-build-4.7.1" + sources."node-gyp-build-4.8.2" sources."normalize-path-3.0.0" sources."normalize-url-4.5.1" - sources."object-inspect-1.13.1" + sources."object-inspect-1.13.2" sources."on-finished-2.3.0" sources."once-1.4.0" + sources."onetime-5.1.2" sources."open-7.4.2" sources."os-tmpdir-1.0.2" sources."p-cancelable-1.1.0" sources."p-map-4.0.0" sources."package-json-6.5.0" + sources."package-json-from-dist-1.0.1" sources."parse-node-version-1.0.1" sources."parseurl-1.3.3" sources."password-prompt-1.1.3" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" - (sources."path-scurry-1.10.1" // { - dependencies = [ - sources."lru-cache-10.1.0" - ]; - }) - sources."path-to-regexp-0.1.7" - sources."path-type-4.0.0" - sources."picocolors-1.0.0" + sources."path-scurry-1.11.1" + sources."path-to-regexp-0.1.10" + sources."path-type-5.0.0" + sources."picocolors-1.1.0" sources."picomatch-2.3.1" sources."pify-4.0.1" - sources."postcss-8.4.33" + sources."postcss-8.4.47" sources."prepend-http-2.0.0" + sources."proc-log-4.2.0" sources."promise-retry-2.0.1" sources."proxy-addr-2.0.7" sources."prr-1.0.1" - sources."pump-3.0.0" + sources."pump-3.0.2" sources."punycode-2.3.1" - sources."qs-6.11.0" + sources."qs-6.13.0" sources."queue-microtask-1.2.3" sources."range-parser-1.2.1" - sources."raw-body-2.5.1" + sources."raw-body-2.5.2" sources."rc-1.2.8" sources."readdirp-3.6.0" sources."registry-auth-token-4.2.2" sources."registry-url-5.1.0" sources."responselike-1.0.2" + sources."restore-cursor-4.0.0" sources."retry-0.12.0" sources."reusify-1.0.4" sources."rimraf-2.7.1" - sources."rollup-3.29.4" + sources."rollup-4.22.5" sources."run-parallel-1.2.0" + (sources."rxjs-7.8.1" // { + dependencies = [ + sources."tslib-2.7.0" + ]; + }) sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."sass-1.69.7" - sources."sax-1.3.0" + (sources."sass-1.79.3" // { + dependencies = [ + sources."chokidar-4.0.1" + sources."readdirp-4.0.1" + ]; + }) + (sources."sass-embedded-1.79.3" // { + dependencies = [ + sources."supports-color-8.1.1" + ]; + }) + sources."sax-1.4.1" sources."section-matter-1.0.0" sources."semver-6.3.1" - (sources."send-0.18.0" // { + (sources."send-0.19.0" // { dependencies = [ sources."ms-2.1.3" sources."on-finished-2.4.1" @@ -18634,31 +18504,31 @@ in sources."setprototypeof-1.1.0" ]; }) - sources."serve-static-1.15.0" - sources."set-function-length-1.1.1" + (sources."serve-static-1.16.2" // { + dependencies = [ + sources."encodeurl-2.0.0" + ]; + }) + sources."set-function-length-1.2.2" sources."setprototypeof-1.2.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."side-channel-1.0.4" - sources."signal-exit-4.1.0" - sources."slash-4.0.0" + sources."side-channel-1.0.6" + sources."signal-exit-3.0.7" + sources."slash-5.1.0" sources."smart-buffer-4.2.0" - sources."socks-2.7.1" - (sources."socks-proxy-agent-7.0.0" // { + sources."socks-2.8.3" + (sources."socks-proxy-agent-8.0.4" // { dependencies = [ - sources."debug-4.3.4" - sources."ms-2.1.2" + sources."debug-4.3.7" + sources."ms-2.1.3" ]; }) sources."source-map-0.6.1" - sources."source-map-js-1.0.2" + sources."source-map-js-1.2.1" sources."source-map-support-0.5.21" sources."sprintf-js-1.0.3" - (sources."ssri-10.0.5" // { - dependencies = [ - sources."minipass-7.0.4" - ]; - }) + sources."ssri-10.0.6" sources."statuses-1.5.0" sources."streamsearch-1.1.0" sources."string-width-5.1.2" @@ -18670,45 +18540,58 @@ in }) (sources."strip-ansi-7.1.0" // { dependencies = [ - sources."ansi-regex-6.0.1" + sources."ansi-regex-6.1.0" ]; }) sources."strip-ansi-cjs-6.0.1" sources."strip-bom-string-1.0.0" sources."strip-json-comments-2.0.1" - (sources."stylus-0.62.0" // { + (sources."stylus-0.63.0" // { dependencies = [ - sources."debug-4.3.4" - sources."ms-2.1.2" + sources."debug-4.3.7" + sources."ms-2.1.3" + sources."sax-1.3.0" sources."source-map-0.7.4" ]; }) sources."sudo-prompt-8.2.5" sources."sugarss-4.0.1" sources."supports-color-7.2.0" - (sources."tar-6.2.0" // { + (sources."tar-6.2.1" // { dependencies = [ (sources."fs-minipass-2.1.0" // { dependencies = [ sources."minipass-3.3.6" ]; }) + sources."minipass-5.0.0" sources."mkdirp-1.0.4" ]; }) - (sources."terser-5.26.0" // { + (sources."terser-5.34.0" // { dependencies = [ sources."commander-2.20.3" ]; }) + (sources."thingies-1.21.0" // { + dependencies = [ + sources."tslib-2.7.0" + ]; + }) sources."tmp-0.0.33" sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" + (sources."tree-dump-1.0.2" // { + dependencies = [ + sources."tslib-2.7.0" + ]; + }) sources."tslib-1.14.1" sources."type-fest-0.21.3" sources."type-is-1.6.18" - sources."undici-types-5.26.5" + sources."undici-types-6.19.8" + sources."unicorn-magic-0.1.0" sources."unique-filename-3.0.0" sources."unique-slug-4.0.0" sources."universalify-2.0.1" @@ -18716,36 +18599,19 @@ in sources."url-parse-lax-3.0.0" sources."utf-8-validate-5.0.10" sources."utils-merge-1.0.1" + sources."varint-6.0.0" sources."vary-1.1.2" - (sources."vite-4.5.1" // { + (sources."vite-5.4.8" // { dependencies = [ - sources."@esbuild/android-arm-0.18.20" - sources."@esbuild/android-arm64-0.18.20" - sources."@esbuild/android-x64-0.18.20" - sources."@esbuild/darwin-arm64-0.18.20" - sources."@esbuild/darwin-x64-0.18.20" - sources."@esbuild/freebsd-arm64-0.18.20" - sources."@esbuild/freebsd-x64-0.18.20" - sources."@esbuild/linux-arm-0.18.20" - sources."@esbuild/linux-arm64-0.18.20" - sources."@esbuild/linux-ia32-0.18.20" - sources."@esbuild/linux-loong64-0.18.20" - sources."@esbuild/linux-mips64el-0.18.20" - sources."@esbuild/linux-ppc64-0.18.20" - sources."@esbuild/linux-riscv64-0.18.20" - sources."@esbuild/linux-s390x-0.18.20" - sources."@esbuild/linux-x64-0.18.20" - sources."@esbuild/netbsd-x64-0.18.20" - sources."@esbuild/openbsd-x64-0.18.20" - sources."@esbuild/sunos-x64-0.18.20" - sources."@esbuild/win32-arm64-0.18.20" - sources."@esbuild/win32-ia32-0.18.20" - sources."@esbuild/win32-x64-0.18.20" - sources."@types/node-20.10.6" - sources."esbuild-0.18.20" + sources."@types/node-22.7.3" + sources."esbuild-0.21.5" + ]; + }) + (sources."which-4.0.0" // { + dependencies = [ + sources."isexe-3.1.1" ]; }) - sources."which-3.0.1" (sources."wrap-ansi-8.1.0" // { dependencies = [ sources."ansi-styles-6.2.1" @@ -18759,7 +18625,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.5.9" + sources."ws-7.5.10" sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; @@ -18775,10 +18641,10 @@ in elm-review = nodeEnv.buildNodePackage { name = "elm-review"; packageName = "elm-review"; - version = "2.10.3"; + version = "2.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/elm-review/-/elm-review-2.10.3.tgz"; - sha512 = "9gBqLc5Xm3v9Ncpf8y2haEaBZZyMX25vmwQkrNqSIaNYQ2vdGOIx1eyqRtt1xwX5O8pZdqU8IWC/ENyTrOTKbw=="; + url = "https://registry.npmjs.org/elm-review/-/elm-review-2.12.0.tgz"; + sha512 = "so+G1hvCV85A63sQQzEhCNFNYyQVWDexXrz0TNEYg3/IIGHzN1bcRN+W4KJSvvFcmfEImzMSJ9AN20bvemU+4Q=="; }; dependencies = [ (sources."@isaacs/cliui-8.0.2" // { @@ -18788,29 +18654,32 @@ in sources."wrap-ansi-8.1.0" ]; }) + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.8" sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.4" sources."@types/keyv-3.1.4" - sources."@types/node-20.10.6" + sources."@types/node-22.7.3" sources."@types/responselike-1.0.3" sources."ansi-escapes-4.3.2" - sources."ansi-regex-6.0.1" + sources."ansi-regex-6.1.0" sources."ansi-styles-4.3.0" sources."anymatch-3.1.3" sources."at-least-node-1.0.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" - sources."binary-extensions-2.2.0" + sources."binary-extensions-2.3.0" sources."bl-4.1.0" sources."brace-expansion-1.1.11" - sources."braces-3.0.2" + sources."braces-3.0.3" sources."buffer-5.7.1" sources."cacheable-lookup-5.0.4" sources."cacheable-request-7.0.4" sources."chalk-4.1.2" - sources."chokidar-3.5.3" + sources."chokidar-3.6.0" sources."cli-cursor-3.1.0" sources."cli-spinners-2.9.2" sources."clone-1.0.4" @@ -18819,7 +18688,7 @@ in sources."color-name-1.1.4" sources."concat-map-0.0.1" sources."cross-spawn-7.0.3" - sources."debug-4.3.4" + sources."debug-4.3.7" (sources."decompress-response-6.0.0" // { dependencies = [ sources."mimic-response-3.1.0" @@ -18827,36 +18696,35 @@ in }) sources."defaults-1.0.4" sources."defer-to-connect-2.0.1" + sources."dir-glob-3.0.1" sources."eastasianwidth-0.2.0" - sources."elm-tooling-1.15.0" + sources."elm-solve-deps-wasm-1.0.2" sources."emoji-regex-9.2.2" sources."end-of-stream-1.4.4" + sources."fast-glob-3.3.2" sources."fastest-levenshtein-1.0.16" - sources."fill-range-7.0.1" + sources."fastq-1.17.1" + sources."fill-range-7.1.1" sources."find-up-4.1.0" sources."folder-hash-3.3.3" - (sources."foreground-child-3.1.1" // { - dependencies = [ - sources."signal-exit-4.1.0" - ]; - }) + sources."foreground-child-3.3.0" sources."fs-extra-9.1.0" - sources."fs.realpath-1.0.0" - sources."fsevents-2.3.3" sources."get-stream-5.2.0" - (sources."glob-7.2.3" // { + (sources."glob-10.4.5" // { dependencies = [ - sources."minimatch-3.1.2" + sources."brace-expansion-2.0.1" + sources."minimatch-9.0.5" ]; }) sources."glob-parent-5.1.2" + sources."globby-13.2.2" sources."got-11.8.6" sources."graceful-fs-4.2.11" sources."has-flag-4.0.0" sources."http-cache-semantics-4.1.1" sources."http2-wrapper-1.0.3" sources."ieee754-1.2.1" - sources."inflight-1.0.6" + sources."ignore-5.3.2" sources."inherits-2.0.4" sources."is-binary-path-2.1.0" sources."is-extglob-2.1.1" @@ -18866,7 +18734,7 @@ in sources."is-number-7.0.0" sources."is-unicode-supported-0.1.0" sources."isexe-2.0.0" - sources."jackspeak-2.3.6" + sources."jackspeak-3.4.3" sources."json-buffer-3.0.1" sources."jsonfile-6.1.0" sources."keyv-4.5.4" @@ -18874,13 +18742,15 @@ in sources."locate-path-5.0.0" sources."log-symbols-4.1.0" sources."lowercase-keys-2.0.0" - sources."lru-cache-10.1.0" + sources."lru-cache-10.4.3" + sources."merge2-1.4.1" + sources."micromatch-4.0.8" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.8" sources."minimist-1.2.8" - sources."minipass-7.0.4" - sources."ms-2.1.2" + sources."minipass-7.1.2" + sources."ms-2.1.3" sources."normalize-path-3.0.0" sources."normalize-url-6.1.0" sources."once-1.4.0" @@ -18890,31 +18760,34 @@ in sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" + sources."package-json-from-dist-1.0.1" sources."path-exists-4.0.0" - sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" - sources."path-scurry-1.10.1" + sources."path-scurry-1.11.1" + sources."path-type-4.0.0" sources."picomatch-2.3.1" sources."prompts-2.4.2" - sources."pump-3.0.0" + sources."pump-3.0.2" + sources."queue-microtask-1.2.3" sources."quick-lru-5.1.1" sources."readable-stream-3.6.2" sources."readdirp-3.6.0" sources."resolve-alpn-1.2.1" sources."responselike-2.0.1" - sources."restore-cursor-3.1.0" - (sources."rimraf-5.0.5" // { + (sources."restore-cursor-3.1.0" // { dependencies = [ - sources."brace-expansion-2.0.1" - sources."glob-10.3.10" - sources."minimatch-9.0.3" + sources."signal-exit-3.0.7" ]; }) + sources."reusify-1.0.4" + sources."rimraf-5.0.10" + sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.7" + sources."signal-exit-4.1.0" sources."sisteransi-1.0.5" + sources."slash-4.0.0" (sources."string-width-5.1.2" // { dependencies = [ sources."strip-ansi-7.1.0" @@ -18941,12 +18814,12 @@ in sources."terminal-link-2.1.1" sources."to-regex-range-5.0.1" sources."type-fest-0.21.3" - sources."undici-types-5.26.5" + sources."undici-types-6.19.8" sources."universalify-2.0.1" sources."util-deprecate-1.0.2" sources."wcwidth-1.0.1" sources."which-2.0.2" - (sources."wrap-ansi-6.2.0" // { + (sources."wrap-ansi-7.0.0" // { dependencies = [ sources."emoji-regex-8.0.0" sources."string-width-4.2.3" @@ -18981,14 +18854,12 @@ in dependencies = [ sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" - sources."debug-4.3.4" + sources."debug-4.3.7" sources."git-clone-able-0.1.2" - sources."lru-cache-6.0.0" - sources."ms-2.1.2" - sources."semver-7.5.4" - sources."simple-git-3.22.0" + sources."ms-2.1.3" + sources."semver-7.6.3" + sources."simple-git-3.27.0" sources."upath-2.0.1" - sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -19022,7 +18893,7 @@ in sources."form-data-3.0.1" sources."fs.realpath-1.0.0" sources."glob-7.2.3" - sources."graphql-16.8.1" + sources."graphql-16.9.0" sources."graphql-request-3.7.0" sources."iconv-lite-0.6.3" sources."inflight-1.0.6" diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index 2d94880976d7..7779bbbc670b 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { llvmEnv = symlinkJoin { name = "emscripten-llvm-${version}"; - paths = with llvmPackages; [ clang-unwrapped clang-unwrapped.lib lld llvm ]; + paths = with llvmPackages; [ clang-unwrapped (lib.getLib clang-unwrapped) lld llvm ]; }; nodeModules = buildNpmPackage { diff --git a/pkgs/development/compilers/erg/default.nix b/pkgs/development/compilers/erg/default.nix deleted file mode 100644 index 9276a311a581..000000000000 --- a/pkgs/development/compilers/erg/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, makeWrapper -, python3 -, which -, stdenv -}: - -rustPlatform.buildRustPackage rec { - pname = "erg"; - version = "0.6.44"; - - src = fetchFromGitHub { - owner = "erg-lang"; - repo = "erg"; - rev = "v${version}"; - hash = "sha256-Pw6q3qmYehTPnB3MyDi8Q5tC018H3zLsZAXWuc+abjE="; - }; - - cargoHash = "sha256-uO+j1kmoCLy00P0QHGy30XVPyG1tH4FU6YvTfWxxvWE="; - - nativeBuildInputs = [ - makeWrapper - python3 - which - ]; - - buildFeatures = [ "full" ]; - - env = { - BUILD_DATE = "1970/01/01 00:00:00"; - CASE_SENSITIVE = lib.boolToString (!stdenv.isDarwin); - GIT_HASH_SHORT = src.rev; - }; - - # TODO(figsoda): fix tests - doCheck = false; - - # the build script is impure and also assumes we are in a git repository - postPatch = '' - rm crates/erg_common/build.rs - ''; - - preBuild = '' - export HOME=$(mktemp -d) - export CARGO_ERG_PATH=$HOME/.erg - ''; - - postInstall = '' - mkdir -p $out/share - mv "$CARGO_ERG_PATH" $out/share/erg - - wrapProgram $out/bin/erg \ - --set-default ERG_PATH $out/share/erg - ''; - - meta = with lib; { - description = "Statically typed language that can deeply improve the Python ecosystem"; - mainProgram = "erg"; - homepage = "https://github.com/erg-lang/erg"; - changelog = "https://github.com/erg-lang/erg/releases/tag/${src.rev}"; - license = with licenses; [ asl20 mit ]; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/compilers/fasm/bin.nix b/pkgs/development/compilers/fasm/bin.nix index f23e9540928a..71e2146a7004 100644 --- a/pkgs/development/compilers/fasm/bin.nix +++ b/pkgs/development/compilers/fasm/bin.nix @@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - install -D fasm${lib.optionalString stdenvNoCC.isx86_64 ".x64"} $out/bin/fasm + install -D fasm${lib.optionalString stdenvNoCC.hostPlatform.isx86_64 ".x64"} $out/bin/fasm runHook postInstall ''; diff --git a/pkgs/development/compilers/fasmg/default.nix b/pkgs/development/compilers/fasmg/default.nix deleted file mode 100644 index b62c114c77e4..000000000000 --- a/pkgs/development/compilers/fasmg/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib, stdenv -, fetchzip -}: - -stdenv.mkDerivation rec { - pname = "fasmg"; - version = "j27m"; - - src = fetchzip { - url = "https://flatassembler.net/fasmg.${version}.zip"; - sha256 = "0qmklb24n3r0my2risid8r61pi88gqrvm1c0xvyd0bp1ans6d7zd"; - stripRoot = false; - }; - - buildPhase = let - inherit (stdenv.hostPlatform) system; - - path = { - x86_64-linux = { - bin = "fasmg.x64"; - asm = "source/linux/x64/fasmg.asm"; - }; - x86_64-darwin = { - bin = "source/macos/x64/fasmg"; - asm = "source/macos/x64/fasmg.asm"; - }; - x86-linux = { - bin = "fasmg"; - asm = "source/linux/fasmg.asm"; - }; - x86-darwin = { - bin = "source/macos/fasmg"; - asm = "source/macos/fasmg.asm"; - }; - }.${system} or (throw "Unsupported system: ${system}"); - - in '' - chmod +x ${path.bin} - ./${path.bin} ${path.asm} fasmg - ''; - - outputs = [ "out" "doc" ]; - - installPhase = '' - install -Dm755 fasmg $out/bin/fasmg - - mkdir -p $doc/share/doc/fasmg - cp docs/*.txt $doc/share/doc/fasmg - ''; - - meta = with lib; { - description = "x86(-64) macro assembler to binary, MZ, PE, COFF, and ELF"; - mainProgram = "fasmg"; - homepage = "https://flatassembler.net"; - license = licenses.bsd3; - maintainers = with maintainers; [ orivej luc65r ]; - platforms = with platforms; intersectLists (linux ++ darwin) x86; - }; -} diff --git a/pkgs/development/compilers/firrtl/default.nix b/pkgs/development/compilers/firrtl/default.nix deleted file mode 100644 index 3f005243d607..000000000000 --- a/pkgs/development/compilers/firrtl/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ lib, stdenv, jre, setJavaClassPath, coursier, makeWrapper }: - -stdenv.mkDerivation rec { - pname = "firrtl"; - version = "1.5.3"; - scalaVersion = "2.13"; # pin, for determinism - - deps = stdenv.mkDerivation { - pname = "${pname}-deps"; - inherit version; - nativeBuildInputs = [ coursier ]; - buildCommand = '' - export COURSIER_CACHE=$(pwd) - cs fetch edu.berkeley.cs:${pname}_${scalaVersion}:${version} > deps - mkdir -p $out/share/java - cp $(< deps) $out/share/java - ''; - outputHashMode = "recursive"; - outputHash = "sha256-xy3zdJZk6Q2HbEn5tRQ9Z0AjyXEteXepoWDaATjiUUw="; - }; - - nativeBuildInputs = [ makeWrapper setJavaClassPath ]; - buildInputs = [ deps ]; - - dontUnpack = true; - - installPhase = '' - runHook preInstall - - makeWrapper ${jre}/bin/java $out/bin/${pname} \ - --add-flags "-cp $CLASSPATH firrtl.stage.FirrtlMain" - - runHook postInstall - ''; - - doInstallCheck = true; - installCheckPhase = '' - $out/bin/firrtl --firrtl-source "${'' - circuit test: - module test: - input a: UInt<8> - input b: UInt<8> - output o: UInt - o <= add(a, not(b)) - ''}" -o test.v - cat test.v - grep -qFe "module test" -e "endmodule" test.v - ''; - - meta = with lib; { - description = "Flexible Intermediate Representation for RTL"; - mainProgram = "firrtl"; - longDescription = '' - Firrtl is an intermediate representation (IR) for digital circuits - designed as a platform for writing circuit-level transformations. - ''; - homepage = "https://www.chisel-lang.org/firrtl/"; - license = licenses.asl20; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/compilers/flasm/default.nix b/pkgs/development/compilers/flasm/default.nix deleted file mode 100644 index e1da977b0039..000000000000 --- a/pkgs/development/compilers/flasm/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, stdenv, fetchzip, unzip, fetchpatch, bison, flex, gperf, zlib }: - -stdenv.mkDerivation rec { - pname = "flasm"; - version = "1.64"; - - src = fetchzip { - url = "https://www.nowrap.de/download/flasm16src.zip"; - sha256 = "03hvxm66rb6rjwbr07hc3k7ia5rim2xlhxbd9qmcai9xwmyiqafg"; - stripRoot = false; - }; - - patches = [ - # Pull patch pending upstream inclusion for -fno-common toolchains: - # https://sourceforge.net/p/flasm/patches/2/ - (fetchpatch { - name = "fno-common.patch"; - url = "https://sourceforge.net/p/flasm/patches/2/attachment/0001-flasm-fix-build-on-gcc-10-fno-common.patch"; - sha256 = "0ic7k1mmyvhpnxam89dbg8i9bfzk70zslfdxgpmkszx097bj1hv6"; - }) - ]; - - makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; - - nativeBuildInputs = [ unzip bison flex gperf ]; - - buildInputs = [ zlib ]; - - installPhase = '' - install -Dm755 flasm -t $out/bin - ''; - - meta = with lib; { - description = "Assembler and disassembler for Flash (SWF) bytecode"; - mainProgram = "flasm"; - homepage = "https://flasm.sourceforge.net/"; - license = licenses.bsd2; - maintainers = with maintainers; [ siraben ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/compilers/flix/default.nix b/pkgs/development/compilers/flix/default.nix deleted file mode 100644 index 61fbdd6fe9d8..000000000000 --- a/pkgs/development/compilers/flix/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, fetchurl, stdenvNoCC, makeWrapper, jre }: - -stdenvNoCC.mkDerivation rec { - pname = "flix"; - version = "0.50.0"; - - src = fetchurl { - url = "https://github.com/flix/flix/releases/download/v${version}/flix.jar"; - sha256 = "sha256-fAEt7JsljnEXubYgiF8uEOuoOXHjv9AHgQbPunaEMw4="; - }; - - dontUnpack = true; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - runHook preInstall - - export JAR=$out/share/java/flix/flix.jar - install -D $src $JAR - makeWrapper ${jre}/bin/java $out/bin/flix \ - --add-flags "-jar $JAR" - - runHook postInstall - ''; - - meta = with lib; { - description = "Flix Programming Language"; - mainProgram = "flix"; - homepage = "https://github.com/flix/flix"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.asl20; - maintainers = with maintainers; [ athas ]; - inherit (jre.meta) platforms; - }; -} diff --git a/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix b/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix index 0e1ce6e678cb..e42654c36c51 100644 --- a/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix +++ b/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix @@ -59,15 +59,24 @@ runCommand "flutter-artifacts-${flutterPlatform}-${systemPlatform}" passthru = { inherit flutterPlatform; }; -} '' +} ('' export FLUTTER_ROOT="$NIX_BUILD_TOP" lndir -silent '${flutter'}' "$FLUTTER_ROOT" rm -rf "$FLUTTER_ROOT/bin/cache" mkdir "$FLUTTER_ROOT/bin/cache" +'' + lib.optionalString (lib.versionAtLeast flutter'.version "3.26") '' + mkdir "$FLUTTER_ROOT/bin/cache/dart-sdk" + lndir -silent '${flutter'}/bin/cache/dart-sdk' "$FLUTTER_ROOT/bin/cache/dart-sdk" +'' + '' + + HOME="$(mktemp -d)" flutter precache ${lib.optionalString (flutter ? engine && flutter.engine.meta.available) "--local-engine ${flutter.engine.outName}"} \ + -v '--${flutterPlatform}' ${builtins.concatStringsSep " " (map (p: "'--no-${p}'") (lib.remove flutterPlatform flutterPlatforms))} - HOME="$(mktemp -d)" flutter precache -v '--${flutterPlatform}' ${builtins.concatStringsSep " " (map (p: "'--no-${p}'") (lib.remove flutterPlatform flutterPlatforms))} rm -rf "$FLUTTER_ROOT/bin/cache/lockfile" +'' + lib.optionalString (lib.versionAtLeast flutter'.version "3.26") '' + rm -rf "$FLUTTER_ROOT/bin/cache/dart-sdk" +'' + '' find "$FLUTTER_ROOT" -type l -lname '${flutter'}/*' -delete cp -r bin/cache "$out" -'' +'') diff --git a/pkgs/development/compilers/flutter/artifacts/prepare-artifacts.nix b/pkgs/development/compilers/flutter/artifacts/prepare-artifacts.nix index def75e280da7..23bd8485ccff 100644 --- a/pkgs/development/compilers/flutter/artifacts/prepare-artifacts.nix +++ b/pkgs/development/compilers/flutter/artifacts/prepare-artifacts.nix @@ -16,6 +16,7 @@ mkdir -p "$out/bin" cp -r . "$out/bin/cache" + rm -f "$out/bin/cache/flutter.version.json" runHook postInstall ''; diff --git a/pkgs/development/compilers/flutter/build-support/build-flutter-application.nix b/pkgs/development/compilers/flutter/build-support/build-flutter-application.nix index ff6c6b31006f..ae89d3720b33 100644 --- a/pkgs/development/compilers/flutter/build-support/build-flutter-application.nix +++ b/pkgs/development/compilers/flutter/build-support/build-flutter-application.nix @@ -146,21 +146,22 @@ let built=build/linux/*/$flutterMode/bundle mkdir -p $out/bin - mv $built $out/app + mkdir -p $out/app + mv $built $out/app/$pname - for f in $(find $out/app -iname "*.desktop" -type f); do + for f in $(find $out/app/$pname -iname "*.desktop" -type f); do install -D $f $out/share/applications/$(basename $f) done - for f in $(find $out/app -maxdepth 1 -type f); do + for f in $(find $out/app/$pname -maxdepth 1 -type f); do ln -s $f $out/bin/$(basename $f) done # make *.so executable - find $out/app -iname "*.so" -type f -exec chmod +x {} + + find $out/app/$pname -iname "*.so" -type f -exec chmod +x {} + # remove stuff like /build/source/packages/ubuntu_desktop_installer/linux/flutter/ephemeral - for f in $(find $out/app -executable -type f); do + for f in $(find $out/app/$pname -executable -type f); do if patchelf --print-rpath "$f" | grep /build; then # this ignores static libs (e,g. libapp.so) also echo "strip RPath of $f" newrp=$(patchelf --print-rpath $f | sed -r "s|/build.*ephemeral:||g" | sed -r "s|/build.*profile:||g") diff --git a/pkgs/development/compilers/flutter/engine/package.nix b/pkgs/development/compilers/flutter/engine/package.nix index 443db6af3680..b4ac8c9828d9 100644 --- a/pkgs/development/compilers/flutter/engine/package.nix +++ b/pkgs/development/compilers/flutter/engine/package.nix @@ -3,12 +3,10 @@ callPackage, writeText, symlinkJoin, - targetPlatform, - buildPlatform, darwin, clang, llvm, - tools ? callPackage ./tools.nix { inherit buildPlatform; }, + tools ? callPackage ./tools.nix { }, stdenv, stdenvNoCC, dart, @@ -53,7 +51,7 @@ let expandDeps = deps: lib.flatten (map expandSingleDep deps); - constants = callPackage ./constants.nix { platform = targetPlatform; }; + constants = callPackage ./constants.nix { platform = stdenv.targetPlatform; }; python3 = if lib.versionAtLeast flutterVersion "3.20" then python312 else python39; @@ -64,8 +62,6 @@ let version hashes url - targetPlatform - buildPlatform ; }; @@ -114,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: { paths = expandDeps ( - lib.optionals (stdenv.isLinux) [ + lib.optionals (stdenv.hostPlatform.isLinux) [ gtk3 wayland libepoxy @@ -139,7 +135,7 @@ stdenv.mkDerivation (finalAttrs: { xorg.xorgproto zlib ] - ++ lib.optionals (stdenv.isDarwin) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ clang llvm ] @@ -161,7 +157,7 @@ stdenv.mkDerivation (finalAttrs: { "-I${finalAttrs.toolchain}/include" ] ++ lib.optional (!isOptimized) "-U_FORTIFY_SOURCE"; - nativeCheckInputs = lib.optionals stdenv.isLinux [ + nativeCheckInputs = lib.optionals stdenv.hostPlatform.isLinux [ xorg.xorgserver openbox ]; @@ -175,8 +171,8 @@ stdenv.mkDerivation (finalAttrs: { ninja dart ] - ++ lib.optionals (stdenv.isLinux) [ patchelf ] - ++ lib.optionals (stdenv.isDarwin) [ + ++ lib.optionals (stdenv.hostPlatform.isLinux) [ patchelf ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ darwin.system_cmds darwin.xcode tools.xcode-select @@ -214,7 +210,7 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p src/${dartPath}/tools/sdks ln -s ${dart} src/${dartPath}/tools/sdks/dart-sdk - ${lib.optionalString (stdenv.isLinux) '' + ${lib.optionalString (stdenv.hostPlatform.isLinux) '' for patchtool in ''${patchtools[@]}; do patchelf src/$patchtool --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) done @@ -253,7 +249,7 @@ stdenv.mkDerivation (finalAttrs: { "--embedder-for-target" "--no-goma" ] - ++ lib.optionals (targetPlatform.isx86_64 == false) [ + ++ lib.optionals (stdenv.targetPlatform.isx86_64 == false) [ "--linux" "--linux-cpu ${constants.alt-arch}" ] @@ -269,7 +265,7 @@ stdenv.mkDerivation (finalAttrs: { export PYTHONPATH=$src/src/build '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' export PATH=${darwin.xcode}/Contents/Developer/usr/bin/:$PATH '' + '' @@ -278,7 +274,7 @@ stdenv.mkDerivation (finalAttrs: { --out-dir $out \ --target-sysroot $toolchain \ --target-dir $outName \ - --target-triple ${targetPlatform.config} \ + --target-triple ${stdenv.targetPlatform.config} \ --enable-fontconfig runHook postConfigure @@ -322,7 +318,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { # Very broken on Darwin - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "The Flutter engine"; homepage = "https://flutter.dev"; maintainers = with maintainers; [ RossComputerGuy ]; diff --git a/pkgs/development/compilers/flutter/engine/source.nix b/pkgs/development/compilers/flutter/engine/source.nix index 426e4db4e664..8d38362464a2 100644 --- a/pkgs/development/compilers/flutter/engine/source.nix +++ b/pkgs/development/compilers/flutter/engine/source.nix @@ -1,9 +1,7 @@ { + stdenv, lib, callPackage, - buildPlatform, - targetPlatform, - hostPlatform, fetchgit, tools ? null, curl, @@ -19,13 +17,14 @@ url, }@pkgs: let - target-constants = callPackage ./constants.nix { platform = targetPlatform; }; - build-constants = callPackage ./constants.nix { platform = buildPlatform; }; - tools = pkgs.tools or (callPackage ./tools.nix { inherit hostPlatform buildPlatform; }); + target-constants = callPackage ./constants.nix { platform = stdenv.targetPlatform; }; + build-constants = callPackage ./constants.nix { platform = stdenv.buildPlatform; }; + tools = pkgs.tools or (callPackage ./tools.nix { }); boolOption = value: if value then "True" else "False"; in -runCommand "flutter-engine-source-${version}-${buildPlatform.system}-${targetPlatform.system}" +runCommand + "flutter-engine-source-${version}-${stdenv.buildPlatform.system}-${stdenv.targetPlatform.system}" { pname = "flutter-engine-source"; inherit version; @@ -53,7 +52,7 @@ runCommand "flutter-engine-source-${version}-${buildPlatform.system}-${targetPla "custom_vars": { "download_fuchsia_deps": False, "download_android_deps": False, - "download_linux_deps": ${boolOption targetPlatform.isLinux}, + "download_linux_deps": ${boolOption stdenv.targetPlatform.isLinux}, "setup_githooks": False, "download_esbuild": False, "download_dart_sdk": False, @@ -83,8 +82,8 @@ runCommand "flutter-engine-source-${version}-${buildPlatform.system}-${targetPla outputHashAlgo = "sha256"; outputHashMode = "recursive"; outputHash = - (hashes."${buildPlatform.system}" or { })."${targetPlatform.system}" - or (throw "Hash not set for ${targetPlatform.system} on ${buildPlatform.system}"); + (hashes."${stdenv.buildPlatform.system}" or { })."${stdenv.targetPlatform.system}" + or (throw "Hash not set for ${stdenv.targetPlatform.system} on ${stdenv.buildPlatform.system}"); } '' source ${../../../../build-support/fetchgit/deterministic-git} @@ -101,7 +100,7 @@ runCommand "flutter-engine-source-${version}-${buildPlatform.system}-${targetPla rm -rf $out/src/{buildtools,fuchsia} rm -rf $out/src/flutter/{buildtools,prebuilts,third_party/swiftshader,third_party/gn/.versions} - rm -rf $out/src/flutter/{third_party/dart/tools/sdks/dart-sdk,third_party/ninja/ninja} + rm -rf $out/src/flutter/{third_party/dart/tools/sdks/dart-sdk,third_party/ninja/ninja,third_party/java} rm -rf $out/src/third_party/{dart/tools/sdks/dart-sdk,libcxx/test} rm -rf $out/.cipd $out/.gclient $out/.gclient_entries $out/.gclient_previous_custom_vars $out/.gclient_previous_sync_commits diff --git a/pkgs/development/compilers/flutter/engine/tools.nix b/pkgs/development/compilers/flutter/engine/tools.nix index 42cfd5e6dca6..5fa068480515 100644 --- a/pkgs/development/compilers/flutter/engine/tools.nix +++ b/pkgs/development/compilers/flutter/engine/tools.nix @@ -5,8 +5,6 @@ fetchurl, writeText, runCommand, - buildPlatform, - hostPlatform, darwin, writeShellScriptBin, depot_toolsCommit ? "7d95eb2eb054447592585c73a8ff7adad97ecba1", @@ -31,8 +29,8 @@ }, }: let - constants = callPackage ./constants.nix { platform = buildPlatform; }; - host-constants = callPackage ./constants.nix { platform = hostPlatform; }; + constants = callPackage ./constants.nix { platform = stdenv.buildPlatform; }; + host-constants = callPackage ./constants.nix { platform = stdenv.hostPlatform; }; stdenv-constants = callPackage ./constants.nix { platform = stdenv.hostPlatform; }; in { @@ -73,6 +71,10 @@ in sed -i 's/''${platform}/${host-constants.platform}/g' "$ensureFile" sed -i 's/gn\/gn\/${stdenv-constants.platform}/gn\/gn\/${constants.platform}/g' "$ensureFile" + + if grep flutter/java/openjdk "$ensureFile" >/dev/null; then + sed -i '/src\/flutter\/third_party\/java\/openjdk/,+2 d' "$ensureFile" + fi else params="$params $1" shift 1 diff --git a/pkgs/development/compilers/flutter/flutter-tools.nix b/pkgs/development/compilers/flutter/flutter-tools.nix index 306765cd0a42..1639d54a869e 100644 --- a/pkgs/development/compilers/flutter/flutter-tools.nix +++ b/pkgs/development/compilers/flutter/flutter-tools.nix @@ -28,7 +28,7 @@ buildDartApplication.override { inherit dart; } rec { popd '' # Use arm64 instead of arm64e. - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace lib/src/ios/xcodeproj.dart \ --replace-fail arm64e arm64 ''; diff --git a/pkgs/development/compilers/flutter/update/get-engine-hashes.nix.in b/pkgs/development/compilers/flutter/update/get-engine-hashes.nix.in index f6746db43a76..5af7d7fc7719 100644 --- a/pkgs/development/compilers/flutter/update/get-engine-hashes.nix.in +++ b/pkgs/development/compilers/flutter/update/get-engine-hashes.nix.in @@ -1,4 +1,4 @@ -{ callPackage, symlinkJoin, lib }: +{ callPackage, symlinkJoin, stdenv, lib }: let nixpkgsRoot = "@nixpkgs_root@"; version = "@flutter_version@"; @@ -17,9 +17,11 @@ let ++ (map (targetPlatform: callPackage "${nixpkgsRoot}/pkgs/development/compilers/flutter/engine/source.nix" { - targetPlatform = lib.systems.elaborate targetPlatform; - hostPlatform = lib.systems.elaborate buildPlatform; - buildPlatform = lib.systems.elaborate buildPlatform; + stdenv = stdenv.override { + targetPlatform = lib.systems.elaborate targetPlatform; + hostPlatform = lib.systems.elaborate buildPlatform; + buildPlatform = lib.systems.elaborate buildPlatform; + }; flutterVersion = version; version = engineVersion; diff --git a/pkgs/development/compilers/flutter/versions/3_13/data.json b/pkgs/development/compilers/flutter/versions/3_13/data.json deleted file mode 100644 index e2df3de88528..000000000000 --- a/pkgs/development/compilers/flutter/versions/3_13/data.json +++ /dev/null @@ -1,922 +0,0 @@ -{ - "version": "3.13.8", - "engineVersion": "767d8c75e898091b925519803830fc2721658d07", - "engineSwiftShaderHash": "sha256-qKf5gXIpI4+05bs7d3W6JlMNTn3vHFQL+i3JpFdyPao=", - "engineSwiftShaderRev": "5f9ed9b16931c7155171d31f75004f73f0a3abc8", - "channel": "stable", - "engineHashes": { - "aarch64-linux": { - "aarch64-linux": "sha256-neB6HtnVeDFycfDNxoYvh1i8QwgtHx9zeEdVGXsm0cM=", - "x86_64-linux": "sha256-neB6HtnVeDFycfDNxoYvh1i8QwgtHx9zeEdVGXsm0cM=" - }, - "x86_64-linux": { - "aarch64-linux": "sha256-yMjdFSF8NoPnG7wHi6K14DobYjYDk9BCUWwWaWspLIA=", - "x86_64-linux": "sha256-yMjdFSF8NoPnG7wHi6K14DobYjYDk9BCUWwWaWspLIA=" - } - }, - "dartVersion": "3.1.4", - "dartHash": { - "x86_64-linux": "sha256-42wrqzjRcFDWw2aEY6+/faX+QE9PA8FmRWP4M/NkgBE=", - "aarch64-linux": "sha256-/tWWWwTOgXHbwzotc7ZDDZa8+cbX6NODGYrjLK9gPPg=", - "x86_64-darwin": "sha256-BchKowKd6BscVuk/dXibcQzdFkW9//GDfll77mHEI4M=", - "aarch64-darwin": "sha256-9yrx09vYrOTmdqkfJI7mfh7DI1/rg67tPlf82m5+iKI=" - }, - "flutterHash": "sha256-00G030FvZZTsdf9ruFs9jdIHcC5h+xpp4NlmL64qVZA=", - "artifactHashes": { - "android": { - "aarch64-darwin": "sha256-v/6/GTj7732fEOIgSaoM00yaw2qNwOMuvbuoCvii7vQ=", - "aarch64-linux": "sha256-Uc36aBq8wQo2aEvjAPOoixZElWOE/GNRm2GUfhbwT3Y=", - "x86_64-darwin": "sha256-v/6/GTj7732fEOIgSaoM00yaw2qNwOMuvbuoCvii7vQ=", - "x86_64-linux": "sha256-Uc36aBq8wQo2aEvjAPOoixZElWOE/GNRm2GUfhbwT3Y=" - }, - "fuchsia": { - "aarch64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", - "aarch64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", - "x86_64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", - "x86_64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=" - }, - "ios": { - "aarch64-darwin": "sha256-QwkeGnutTVsm682CqxRtEd9rKUvN7zlAJcqkvAQYwao=", - "aarch64-linux": "sha256-QwkeGnutTVsm682CqxRtEd9rKUvN7zlAJcqkvAQYwao=", - "x86_64-darwin": "sha256-QwkeGnutTVsm682CqxRtEd9rKUvN7zlAJcqkvAQYwao=", - "x86_64-linux": "sha256-QwkeGnutTVsm682CqxRtEd9rKUvN7zlAJcqkvAQYwao=" - }, - "linux": { - "aarch64-darwin": "sha256-drGHsuJoOCLqrhVrXczqJRCOtpeWVlqdWW0OSMS/l5M=", - "aarch64-linux": "sha256-drGHsuJoOCLqrhVrXczqJRCOtpeWVlqdWW0OSMS/l5M=", - "x86_64-darwin": "sha256-0gIOwux3YBdmcXgwICr8dpftj1CauaBUX8Rt5GG0WSs=", - "x86_64-linux": "sha256-0gIOwux3YBdmcXgwICr8dpftj1CauaBUX8Rt5GG0WSs=" - }, - "macos": { - "aarch64-darwin": "sha256-9WqCJQ37mcGc5tzfqQoY5CqHWHGTizjXf9p73bdnNWc=", - "aarch64-linux": "sha256-9WqCJQ37mcGc5tzfqQoY5CqHWHGTizjXf9p73bdnNWc=", - "x86_64-darwin": "sha256-9WqCJQ37mcGc5tzfqQoY5CqHWHGTizjXf9p73bdnNWc=", - "x86_64-linux": "sha256-9WqCJQ37mcGc5tzfqQoY5CqHWHGTizjXf9p73bdnNWc=" - }, - "universal": { - "aarch64-darwin": "sha256-mSpAPKyP9v0dbkXqYkzGOnD5OEjRZigiRElXXcHZ5TE=", - "aarch64-linux": "sha256-Z9bszNaIpCccG7OfvE5WFsw36dITiyCQAZ6p29+Yq68=", - "x86_64-darwin": "sha256-qN5bAXRfQ78TWF3FLBIxWzUB5y5OrZVQTEilY5J/+2k=", - "x86_64-linux": "sha256-wATt1UPjo/fh7RFO1vvcUAdo0dMAaaOUIuzYodsM0v0=" - }, - "web": { - "aarch64-darwin": "sha256-DVXJOOFxv7tKt3d0NaYMexkphEcr7+gDFV67I6iAYa0=", - "aarch64-linux": "sha256-DVXJOOFxv7tKt3d0NaYMexkphEcr7+gDFV67I6iAYa0=", - "x86_64-darwin": "sha256-DVXJOOFxv7tKt3d0NaYMexkphEcr7+gDFV67I6iAYa0=", - "x86_64-linux": "sha256-DVXJOOFxv7tKt3d0NaYMexkphEcr7+gDFV67I6iAYa0=" - }, - "windows": { - "aarch64-darwin": "sha256-s8fJtwQkuZaGXr6vrPiKfpwP/NfewbETwyp9ERGqHYI=", - "aarch64-linux": "sha256-s8fJtwQkuZaGXr6vrPiKfpwP/NfewbETwyp9ERGqHYI=", - "x86_64-darwin": "sha256-s8fJtwQkuZaGXr6vrPiKfpwP/NfewbETwyp9ERGqHYI=", - "x86_64-linux": "sha256-s8fJtwQkuZaGXr6vrPiKfpwP/NfewbETwyp9ERGqHYI=" - } - }, - "pubspecLock": { - "packages": { - "_fe_analyzer_shared": { - "dependency": "direct main", - "description": { - "name": "_fe_analyzer_shared", - "sha256": "ae92f5d747aee634b87f89d9946000c2de774be1d6ac3e58268224348cd0101a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "61.0.0" - }, - "analyzer": { - "dependency": "direct main", - "description": { - "name": "analyzer", - "sha256": "ea3d8652bda62982addfd92fdc2d0214e5f82e43325104990d4f4c4a2a313562", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.13.0" - }, - "archive": { - "dependency": "direct main", - "description": { - "name": "archive", - "sha256": "80e5141fafcb3361653ce308776cfd7d45e6e9fbb429e14eec571382c0c5fecb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.3.2" - }, - "args": { - "dependency": "direct main", - "description": { - "name": "args", - "sha256": "eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.2" - }, - "async": { - "dependency": "direct main", - "description": { - "name": "async", - "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.11.0" - }, - "boolean_selector": { - "dependency": "direct main", - "description": { - "name": "boolean_selector", - "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.1" - }, - "browser_launcher": { - "dependency": "direct main", - "description": { - "name": "browser_launcher", - "sha256": "6ee4c6b1f68a42e769ef6e663c4f56708522f7bce9d2ab6e308a37b612ffa4ec", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.1" - }, - "built_collection": { - "dependency": "direct main", - "description": { - "name": "built_collection", - "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.1.1" - }, - "built_value": { - "dependency": "direct main", - "description": { - "name": "built_value", - "sha256": "598a2a682e2a7a90f08ba39c0aaa9374c5112340f0a2e275f61b59389543d166", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "8.6.1" - }, - "checked_yaml": { - "dependency": "direct dev", - "description": { - "name": "checked_yaml", - "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.3" - }, - "clock": { - "dependency": "direct main", - "description": { - "name": "clock", - "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.1" - }, - "collection": { - "dependency": "direct dev", - "description": { - "name": "collection", - "sha256": "f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.17.2" - }, - "completion": { - "dependency": "direct main", - "description": { - "name": "completion", - "sha256": "f11b7a628e6c42b9edc9b0bc3aa490e2d930397546d2f794e8e1325909d11c60", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.1" - }, - "convert": { - "dependency": "direct main", - "description": { - "name": "convert", - "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.1.1" - }, - "coverage": { - "dependency": "direct main", - "description": { - "name": "coverage", - "sha256": "2fb815080e44a09b85e0f2ca8a820b15053982b2e714b59267719e8a9ff17097", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.6.3" - }, - "crypto": { - "dependency": "direct main", - "description": { - "name": "crypto", - "sha256": "ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.3" - }, - "csslib": { - "dependency": "direct main", - "description": { - "name": "csslib", - "sha256": "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.0" - }, - "dap": { - "dependency": "direct main", - "description": { - "name": "dap", - "sha256": "2120d4a8cbad45e5dbd518b713e8f064274e0a4c0e3edcaef1f4cf9ccbc90cd9", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.0" - }, - "dds": { - "dependency": "direct main", - "description": { - "name": "dds", - "sha256": "397c3c80919ee187b2efc28205af3c0378b6b757ea6d059083dece145a2e31e9", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.9.0+hotfix" - }, - "dds_service_extensions": { - "dependency": "direct main", - "description": { - "name": "dds_service_extensions", - "sha256": "9ac669bef49a4c13ed62073685089be121200fb213800ec59c202e90d569ea44", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.5.0" - }, - "devtools_shared": { - "dependency": "direct main", - "description": { - "name": "devtools_shared", - "sha256": "ad58ac3a5df41adf08d0d6f0a4d73349533edcc383ee93a30ac3d0fd0bb6df49", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.24.0" - }, - "dwds": { - "dependency": "direct main", - "description": { - "name": "dwds", - "sha256": "b6dad73ae56f00bff7647f531b9db018005f713328e816e7a277b544184e9170", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "19.0.1+1" - }, - "fake_async": { - "dependency": "direct main", - "description": { - "name": "fake_async", - "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.3.1" - }, - "file": { - "dependency": "direct main", - "description": { - "name": "file", - "sha256": "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.1.4" - }, - "file_testing": { - "dependency": "direct dev", - "description": { - "name": "file_testing", - "sha256": "0aaadb4025bd350403f4308ad6c4cea953278d9407814b8342558e4946840fb5", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.0" - }, - "fixnum": { - "dependency": "direct main", - "description": { - "name": "fixnum", - "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.0" - }, - "flutter_template_images": { - "dependency": "direct main", - "description": { - "name": "flutter_template_images", - "sha256": "fd3e55af73c577b9e3f88d4080d3e366cb5c8ef3fbd50b94dfeca56bb0235df6", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.2.0" - }, - "frontend_server_client": { - "dependency": "direct main", - "description": { - "name": "frontend_server_client", - "sha256": "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.2.0" - }, - "glob": { - "dependency": "direct main", - "description": { - "name": "glob", - "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.2" - }, - "html": { - "dependency": "direct main", - "description": { - "name": "html", - "sha256": "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.15.4" - }, - "http": { - "dependency": "direct main", - "description": { - "name": "http", - "sha256": "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.13.6" - }, - "http_multi_server": { - "dependency": "direct main", - "description": { - "name": "http_multi_server", - "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.2.1" - }, - "http_parser": { - "dependency": "direct main", - "description": { - "name": "http_parser", - "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.0.2" - }, - "intl": { - "dependency": "direct main", - "description": { - "name": "intl", - "sha256": "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.18.1" - }, - "io": { - "dependency": "direct main", - "description": { - "name": "io", - "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.4" - }, - "js": { - "dependency": "direct main", - "description": { - "name": "js", - "sha256": "f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.6.7" - }, - "json_annotation": { - "dependency": "direct dev", - "description": { - "name": "json_annotation", - "sha256": "b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.8.1" - }, - "json_rpc_2": { - "dependency": "direct main", - "description": { - "name": "json_rpc_2", - "sha256": "5e469bffa23899edacb7b22787780068d650b106a21c76db3c49218ab7ca447e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.2" - }, - "logging": { - "dependency": "direct main", - "description": { - "name": "logging", - "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.0" - }, - "matcher": { - "dependency": "direct main", - "description": { - "name": "matcher", - "sha256": "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.12.16" - }, - "meta": { - "dependency": "direct main", - "description": { - "name": "meta", - "sha256": "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.9.1" - }, - "mime": { - "dependency": "direct main", - "description": { - "name": "mime", - "sha256": "e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.4" - }, - "multicast_dns": { - "dependency": "direct main", - "description": { - "name": "multicast_dns", - "sha256": "80e54aba906a7cc68fdc6a201e76b135af27155e2f8e958181d85e2b73786591", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.3.2+3" - }, - "mustache_template": { - "dependency": "direct main", - "description": { - "name": "mustache_template", - "sha256": "a46e26f91445bfb0b60519be280555b06792460b27b19e2b19ad5b9740df5d1c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.0" - }, - "native_stack_traces": { - "dependency": "direct main", - "description": { - "name": "native_stack_traces", - "sha256": "c797830b9910d13b0f4e70ddef15cde034214fe3bdb8092c4ea5ffad2f74013f", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.5.6" - }, - "node_preamble": { - "dependency": "direct dev", - "description": { - "name": "node_preamble", - "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.2" - }, - "package_config": { - "dependency": "direct main", - "description": { - "name": "package_config", - "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.0" - }, - "path": { - "dependency": "direct main", - "description": { - "name": "path", - "sha256": "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.8.3" - }, - "petitparser": { - "dependency": "direct main", - "description": { - "name": "petitparser", - "sha256": "cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.4.0" - }, - "platform": { - "dependency": "direct main", - "description": { - "name": "platform", - "sha256": "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.1.0" - }, - "pool": { - "dependency": "direct main", - "description": { - "name": "pool", - "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.5.1" - }, - "process": { - "dependency": "direct main", - "description": { - "name": "process", - "sha256": "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.2.4" - }, - "pub_semver": { - "dependency": "direct main", - "description": { - "name": "pub_semver", - "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.4" - }, - "pubspec_parse": { - "dependency": "direct dev", - "description": { - "name": "pubspec_parse", - "sha256": "c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.3" - }, - "shelf": { - "dependency": "direct main", - "description": { - "name": "shelf", - "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.4.1" - }, - "shelf_packages_handler": { - "dependency": "direct main", - "description": { - "name": "shelf_packages_handler", - "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.2" - }, - "shelf_proxy": { - "dependency": "direct main", - "description": { - "name": "shelf_proxy", - "sha256": "a71d2307f4393211930c590c3d2c00630f6c5a7a77edc1ef6436dfd85a6a7ee3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.4" - }, - "shelf_static": { - "dependency": "direct main", - "description": { - "name": "shelf_static", - "sha256": "a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.2" - }, - "shelf_web_socket": { - "dependency": "direct main", - "description": { - "name": "shelf_web_socket", - "sha256": "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.4" - }, - "source_map_stack_trace": { - "dependency": "direct main", - "description": { - "name": "source_map_stack_trace", - "sha256": "84cf769ad83aa6bb61e0aa5a18e53aea683395f196a6f39c4c881fb90ed4f7ae", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.1" - }, - "source_maps": { - "dependency": "direct main", - "description": { - "name": "source_maps", - "sha256": "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.10.12" - }, - "source_span": { - "dependency": "direct main", - "description": { - "name": "source_span", - "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.10.0" - }, - "sse": { - "dependency": "direct main", - "description": { - "name": "sse", - "sha256": "3ff9088cac3f45aa8b91336f1962e3ea6c81baaba0bbba361c05f8aa7fb59442", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.1.2" - }, - "stack_trace": { - "dependency": "direct main", - "description": { - "name": "stack_trace", - "sha256": "c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.11.0" - }, - "standard_message_codec": { - "dependency": "direct main", - "description": { - "name": "standard_message_codec", - "sha256": "906e66549f0ea90d87c5320e0b0f04738c5d14bc7fb121a15da31b60e84f5b15", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.0.1+3" - }, - "stream_channel": { - "dependency": "direct main", - "description": { - "name": "stream_channel", - "sha256": "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.1" - }, - "string_scanner": { - "dependency": "direct main", - "description": { - "name": "string_scanner", - "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.0" - }, - "sync_http": { - "dependency": "direct main", - "description": { - "name": "sync_http", - "sha256": "7f0cd72eca000d2e026bcd6f990b81d0ca06022ef4e32fb257b30d3d1014a961", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.3.1" - }, - "term_glyph": { - "dependency": "direct main", - "description": { - "name": "term_glyph", - "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.1" - }, - "test": { - "dependency": "direct dev", - "description": { - "name": "test", - "sha256": "13b41f318e2a5751c3169137103b60c584297353d4b1761b66029bae6411fe46", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.24.3" - }, - "test_api": { - "dependency": "direct main", - "description": { - "name": "test_api", - "sha256": "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.6.0" - }, - "test_core": { - "dependency": "direct main", - "description": { - "name": "test_core", - "sha256": "99806e9e6d95c7b059b7a0fc08f07fc53fabe54a829497f0d9676299f1e8637e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.5.3" - }, - "typed_data": { - "dependency": "direct main", - "description": { - "name": "typed_data", - "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.3.2" - }, - "unified_analytics": { - "dependency": "direct main", - "description": { - "name": "unified_analytics", - "sha256": "4f9f29e5fd357d68fce270e37c7ad9bb489ee20098529199d6bc786b2b624298", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.0" - }, - "usage": { - "dependency": "direct main", - "description": { - "name": "usage", - "sha256": "0bdbde65a6e710343d02a56552eeaefd20b735e04bfb6b3ee025b6b22e8d0e15", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.1.1" - }, - "uuid": { - "dependency": "direct main", - "description": { - "name": "uuid", - "sha256": "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.7" - }, - "vm_service": { - "dependency": "direct main", - "description": { - "name": "vm_service", - "sha256": "c620a6f783fa22436da68e42db7ebbf18b8c44b9a46ab911f666ff09ffd9153f", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "11.7.1" - }, - "vm_snapshot_analysis": { - "dependency": "direct main", - "description": { - "name": "vm_snapshot_analysis", - "sha256": "5a79b9fbb6be2555090f55b03b23907e75d44c3fd7bdd88da09848aa5a1914c8", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.7.6" - }, - "watcher": { - "dependency": "direct main", - "description": { - "name": "watcher", - "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.0" - }, - "web_socket_channel": { - "dependency": "direct main", - "description": { - "name": "web_socket_channel", - "sha256": "d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.0" - }, - "webdriver": { - "dependency": "direct main", - "description": { - "name": "webdriver", - "sha256": "3c923e918918feeb90c4c9fdf1fe39220fa4c0e8e2c0fffaded174498ef86c49", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.2" - }, - "webkit_inspection_protocol": { - "dependency": "direct main", - "description": { - "name": "webkit_inspection_protocol", - "sha256": "67d3a8b6c79e1987d19d848b0892e582dbb0c66c57cc1fef58a177dd2aa2823d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.0" - }, - "xml": { - "dependency": "direct main", - "description": { - "name": "xml", - "sha256": "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.3.0" - }, - "yaml": { - "dependency": "direct main", - "description": { - "name": "yaml", - "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.1.2" - } - }, - "sdks": { - "dart": ">=3.0.0 <4.0.0" - } - } -} diff --git a/pkgs/development/compilers/flutter/versions/3_13/engine/patches/flutter-45098.patch b/pkgs/development/compilers/flutter/versions/3_13/engine/patches/flutter-45098.patch deleted file mode 100644 index 9f1b4f76f4d6..000000000000 --- a/pkgs/development/compilers/flutter/versions/3_13/engine/patches/flutter-45098.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 41bb032ef3e8332115ed9ebdaeed5d47b9c56098 Mon Sep 17 00:00:00 2001 -From: Robert Ancell <robert.ancell@canonical.com> -Date: Fri, 25 Aug 2023 16:46:52 +1200 -Subject: [PATCH] Fix building on Pango 1.49.4 - -This version added the autoptr macros which we no longer need to define. - -https://github.com/flutter/flutter/issues/132881 ---- - shell/platform/linux/fl_accessible_text_field.cc | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/shell/platform/linux/fl_accessible_text_field.cc b/shell/platform/linux/fl_accessible_text_field.cc -index 9a6052d4777ec..9dcc7f64fb820 100644 ---- a/shell/platform/linux/fl_accessible_text_field.cc -+++ b/shell/platform/linux/fl_accessible_text_field.cc -@@ -7,7 +7,11 @@ - #include "flutter/shell/platform/linux/public/flutter_linux/fl_value.h" - - G_DEFINE_AUTOPTR_CLEANUP_FUNC(PangoContext, g_object_unref) -+// PangoLayout g_autoptr macro weren't added until 1.49.4. Add them manually. -+// https://gitlab.gnome.org/GNOME/pango/-/commit/0b84e14 -+#if !PANGO_VERSION_CHECK(1, 49, 4) - G_DEFINE_AUTOPTR_CLEANUP_FUNC(PangoLayout, g_object_unref) -+#endif - - typedef bool (*FlTextBoundaryCallback)(const PangoLogAttr* attr); diff --git a/pkgs/development/compilers/flutter/versions/3_13/patches/disable-auto-update-shared.patch b/pkgs/development/compilers/flutter/versions/3_13/patches/disable-auto-update-shared.patch deleted file mode 100644 index be08c419fe1b..000000000000 --- a/pkgs/development/compilers/flutter/versions/3_13/patches/disable-auto-update-shared.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/bin/internal/shared.sh b/bin/internal/shared.sh -index 3532c23114..25dfcae4c7 100644 ---- a/bin/internal/shared.sh -+++ b/bin/internal/shared.sh -@@ -229,8 +229,6 @@ function shared::execute() { - exit 1 - fi - -- upgrade_flutter 7< "$PROG_NAME" -- - BIN_NAME="$(basename "$PROG_NAME")" - case "$BIN_NAME" in - flutter*) diff --git a/pkgs/development/compilers/flutter/versions/3_13/patches/disable-auto-update.patch b/pkgs/development/compilers/flutter/versions/3_13/patches/disable-auto-update.patch deleted file mode 100644 index 05960c01b737..000000000000 --- a/pkgs/development/compilers/flutter/versions/3_13/patches/disable-auto-update.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart -index b7e624b4e2..edfdde118b 100644 ---- a/packages/flutter_tools/lib/src/runner/flutter_command.dart -+++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart -@@ -1554,7 +1554,7 @@ Run 'flutter -h' (or 'flutter <command> -h') for available flutter commands and - - // Populate the cache. We call this before pub get below so that the - // sky_engine package is available in the flutter cache for pub to find. -- if (shouldUpdateCache) { -+ if (false) { - // First always update universal artifacts, as some of these (e.g. - // ios-deploy on macOS) are required to determine `requiredArtifacts`. - final bool offline; -diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -index 5d6d78639f..90a4dfa555 100644 ---- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -+++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -@@ -297,7 +297,6 @@ class FlutterCommandRunner extends CommandRunner<void> { - globals.flutterUsage.suppressAnalytics = true; - } - -- globals.flutterVersion.ensureVersionFile(); - final bool machineFlag = topLevelResults[FlutterGlobalOptions.kMachineFlag] as bool? ?? false; - final bool ci = await globals.botDetector.isRunningOnBot; - final bool redirectedCompletion = !globals.stdio.hasTerminal && -@@ -306,11 +305,6 @@ class FlutterCommandRunner extends CommandRunner<void> { - final bool versionCheckFlag = topLevelResults[FlutterGlobalOptions.kVersionCheckFlag] as bool? ?? false; - final bool explicitVersionCheckPassed = topLevelResults.wasParsed(FlutterGlobalOptions.kVersionCheckFlag) && versionCheckFlag; - -- if (topLevelResults.command?.name != 'upgrade' && -- (explicitVersionCheckPassed || (versionCheckFlag && !isMachine))) { -- await globals.flutterVersion.checkFlutterVersionFreshness(); -- } -- - // See if the user specified a specific device. - final String? specifiedDeviceId = topLevelResults[FlutterGlobalOptions.kDeviceIdOption] as String?; - if (specifiedDeviceId != null) { diff --git a/pkgs/development/compilers/flutter/versions/3_16/data.json b/pkgs/development/compilers/flutter/versions/3_16/data.json deleted file mode 100644 index a7724ad99952..000000000000 --- a/pkgs/development/compilers/flutter/versions/3_16/data.json +++ /dev/null @@ -1,972 +0,0 @@ -{ - "version": "3.16.7", - "engineVersion": "4a585b79294e830fa89c24924d58a27cc8fbf406", - "engineSwiftShaderHash": "sha256-qKf5gXIpI4+05bs7d3W6JlMNTn3vHFQL+i3JpFdyPao=", - "engineSwiftShaderRev": "5f9ed9b16931c7155171d31f75004f73f0a3abc8", - "channel": "stable", - "engineHashes": { - "aarch64-linux": { - "aarch64-linux": "sha256-yjoHWnuZCH6+khbO9DQ9ofn0ve9MQLe5d45itVENNSI=", - "x86_64-linux": "sha256-yjoHWnuZCH6+khbO9DQ9ofn0ve9MQLe5d45itVENNSI=" - }, - "x86_64-linux": { - "aarch64-linux": "sha256-4hGQ+SB+51b41Jq8wNXNORpRayFR2/IS7kPPgwv5HbU=", - "x86_64-linux": "sha256-4hGQ+SB+51b41Jq8wNXNORpRayFR2/IS7kPPgwv5HbU=" - } - }, - "dartVersion": "3.2.4", - "dartHash": { - "x86_64-linux": "sha256-qslf+wgmNz9r+e45o3Bg9/vDj75GkM9gQE2tb5rbIvw=", - "aarch64-linux": "sha256-Wsm8GKi7PR5iGx/lNtp2qBK+lMk2NIHf/RvO5G94QnQ=", - "x86_64-darwin": "sha256-8DXMj0yhKpxHdqS0vr5C/RwhQGxvUmvxJA6mOgqBXU8=", - "aarch64-darwin": "sha256-ic6txmbhsv4CarUwG+4xqXsaQrMN4AQrWwg8DxsZGps=" - }, - "flutterHash": "sha256-j+tc8hMgZMBhju89n4e9tKRrq+CFBGOyeE0y+Z4FtHE=", - "artifactHashes": { - "android": { - "aarch64-darwin": "sha256-0FBI0CGMcxyttkzrdyjJlkGAjFd/yMuAQS3pDrNXZZw=", - "aarch64-linux": "sha256-j8jstEE1RsTVHJbq6f6We0An+CyJz9JH/YClyNA4mwg=", - "x86_64-darwin": "sha256-0FBI0CGMcxyttkzrdyjJlkGAjFd/yMuAQS3pDrNXZZw=", - "x86_64-linux": "sha256-j8jstEE1RsTVHJbq6f6We0An+CyJz9JH/YClyNA4mwg=" - }, - "fuchsia": { - "aarch64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", - "aarch64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", - "x86_64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", - "x86_64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=" - }, - "ios": { - "aarch64-darwin": "sha256-V3VXRX8hn45J+NhzKli+NAc3TGiSoeVQRlJte8DDbZw=", - "aarch64-linux": "sha256-V3VXRX8hn45J+NhzKli+NAc3TGiSoeVQRlJte8DDbZw=", - "x86_64-darwin": "sha256-V3VXRX8hn45J+NhzKli+NAc3TGiSoeVQRlJte8DDbZw=", - "x86_64-linux": "sha256-V3VXRX8hn45J+NhzKli+NAc3TGiSoeVQRlJte8DDbZw=" - }, - "linux": { - "aarch64-darwin": "sha256-LWpou3L7bAWGn8i4nDT/BZez2Uhf/LbqC2C4Z98hCHQ=", - "aarch64-linux": "sha256-LWpou3L7bAWGn8i4nDT/BZez2Uhf/LbqC2C4Z98hCHQ=", - "x86_64-darwin": "sha256-BzjmO4F8B9GagYPbdvoT55r+YgZcP4BUaKgJPGZDXOU=", - "x86_64-linux": "sha256-BzjmO4F8B9GagYPbdvoT55r+YgZcP4BUaKgJPGZDXOU=" - }, - "macos": { - "aarch64-darwin": "sha256-BMFqhhy1O1hK33Pj2cxnCAzK9wwHkwT4gNbJ1GaLrnk=", - "aarch64-linux": "sha256-BMFqhhy1O1hK33Pj2cxnCAzK9wwHkwT4gNbJ1GaLrnk=", - "x86_64-darwin": "sha256-BMFqhhy1O1hK33Pj2cxnCAzK9wwHkwT4gNbJ1GaLrnk=", - "x86_64-linux": "sha256-BMFqhhy1O1hK33Pj2cxnCAzK9wwHkwT4gNbJ1GaLrnk=" - }, - "universal": { - "aarch64-darwin": "sha256-Emus5J3mqPv47PD6xqNUD1KpXhVkX4JpURWuYG6KC14=", - "aarch64-linux": "sha256-uB2YZRjioP/koMbPvaBHsezjPO0w5a+BpxZaDuiINIY=", - "x86_64-darwin": "sha256-Qwf12gMqrW5nDC9Is08oxWTbKMptRQRAIb58JETq3xA=", - "x86_64-linux": "sha256-quSFKx7TZRJpK+4YDt5f9jwr7rZsSsaXMxhJ8vIcczQ=" - }, - "web": { - "aarch64-darwin": "sha256-rQphVm+T4k5B4OYYw0sJwYBOsNvUOC9fu8IuvXN7hVw=", - "aarch64-linux": "sha256-rQphVm+T4k5B4OYYw0sJwYBOsNvUOC9fu8IuvXN7hVw=", - "x86_64-darwin": "sha256-rQphVm+T4k5B4OYYw0sJwYBOsNvUOC9fu8IuvXN7hVw=", - "x86_64-linux": "sha256-rQphVm+T4k5B4OYYw0sJwYBOsNvUOC9fu8IuvXN7hVw=" - }, - "windows": { - "aarch64-darwin": "sha256-HL3QLwzze9aO+T/2/xbHqhKV1/ba++MuRnk206hfJdU=", - "aarch64-linux": "sha256-HL3QLwzze9aO+T/2/xbHqhKV1/ba++MuRnk206hfJdU=", - "x86_64-darwin": "sha256-HL3QLwzze9aO+T/2/xbHqhKV1/ba++MuRnk206hfJdU=", - "x86_64-linux": "sha256-HL3QLwzze9aO+T/2/xbHqhKV1/ba++MuRnk206hfJdU=" - } - }, - "pubspecLock": { - "packages": { - "_fe_analyzer_shared": { - "dependency": "direct main", - "description": { - "name": "_fe_analyzer_shared", - "sha256": "eb376e9acf6938204f90eb3b1f00b578640d3188b4c8a8ec054f9f479af8d051", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "64.0.0" - }, - "analyzer": { - "dependency": "direct main", - "description": { - "name": "analyzer", - "sha256": "69f54f967773f6c26c7dcb13e93d7ccee8b17a641689da39e878d5cf13b06893", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.2.0" - }, - "archive": { - "dependency": "direct main", - "description": { - "name": "archive", - "sha256": "80e5141fafcb3361653ce308776cfd7d45e6e9fbb429e14eec571382c0c5fecb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.3.2" - }, - "args": { - "dependency": "direct main", - "description": { - "name": "args", - "sha256": "eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.2" - }, - "async": { - "dependency": "direct main", - "description": { - "name": "async", - "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.11.0" - }, - "boolean_selector": { - "dependency": "direct main", - "description": { - "name": "boolean_selector", - "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.1" - }, - "browser_launcher": { - "dependency": "direct main", - "description": { - "name": "browser_launcher", - "sha256": "6ee4c6b1f68a42e769ef6e663c4f56708522f7bce9d2ab6e308a37b612ffa4ec", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.1" - }, - "built_collection": { - "dependency": "direct main", - "description": { - "name": "built_collection", - "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.1.1" - }, - "built_value": { - "dependency": "direct main", - "description": { - "name": "built_value", - "sha256": "a8de5955205b4d1dbbbc267daddf2178bd737e4bab8987c04a500478c9651e74", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "8.6.3" - }, - "checked_yaml": { - "dependency": "direct dev", - "description": { - "name": "checked_yaml", - "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.3" - }, - "cli_config": { - "dependency": "direct main", - "description": { - "name": "cli_config", - "sha256": "76910209e4aee158f5e26721509c98d7cbb97085da637f62b7c461298033752d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.1" - }, - "clock": { - "dependency": "direct main", - "description": { - "name": "clock", - "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.1" - }, - "collection": { - "dependency": "direct dev", - "description": { - "name": "collection", - "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.18.0" - }, - "completion": { - "dependency": "direct main", - "description": { - "name": "completion", - "sha256": "f11b7a628e6c42b9edc9b0bc3aa490e2d930397546d2f794e8e1325909d11c60", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.1" - }, - "convert": { - "dependency": "direct main", - "description": { - "name": "convert", - "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.1.1" - }, - "coverage": { - "dependency": "direct main", - "description": { - "name": "coverage", - "sha256": "2fb815080e44a09b85e0f2ca8a820b15053982b2e714b59267719e8a9ff17097", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.6.3" - }, - "crypto": { - "dependency": "direct main", - "description": { - "name": "crypto", - "sha256": "ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.3" - }, - "csslib": { - "dependency": "direct main", - "description": { - "name": "csslib", - "sha256": "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.0" - }, - "dap": { - "dependency": "direct main", - "description": { - "name": "dap", - "sha256": "1dc9a11bc60836b151672d3edb6a56a18383ecf122e56eaf5837b32c81641aeb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.0" - }, - "dds": { - "dependency": "direct main", - "description": { - "name": "dds", - "sha256": "b7c2e57d24edda6b1d37fbd0748aefc1d75d9257a7dd0328d31398754144eac4", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.9.5" - }, - "dds_service_extensions": { - "dependency": "direct main", - "description": { - "name": "dds_service_extensions", - "sha256": "609d0a5d928502f7d160e4466f644474352721f4880c840ec9e8d208fff16d95", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.6.0" - }, - "devtools_shared": { - "dependency": "direct main", - "description": { - "name": "devtools_shared", - "sha256": "2fc4a90ba419b5cb59c6c7a060e94e9c4fdd993d96ef598910c572cb107f1f42", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.26.1" - }, - "dwds": { - "dependency": "direct main", - "description": { - "name": "dwds", - "sha256": "44778de6f92203fad32c550ca0d7a9bd1377e6926272ff7eda7c7a1bdde0cf2b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "21.0.0+1" - }, - "fake_async": { - "dependency": "direct main", - "description": { - "name": "fake_async", - "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.3.1" - }, - "file": { - "dependency": "direct main", - "description": { - "name": "file", - "sha256": "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.1.4" - }, - "file_testing": { - "dependency": "direct dev", - "description": { - "name": "file_testing", - "sha256": "0aaadb4025bd350403f4308ad6c4cea953278d9407814b8342558e4946840fb5", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.0" - }, - "fixnum": { - "dependency": "direct main", - "description": { - "name": "fixnum", - "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.0" - }, - "flutter_template_images": { - "dependency": "direct main", - "description": { - "name": "flutter_template_images", - "sha256": "fd3e55af73c577b9e3f88d4080d3e366cb5c8ef3fbd50b94dfeca56bb0235df6", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.2.0" - }, - "frontend_server_client": { - "dependency": "direct main", - "description": { - "name": "frontend_server_client", - "sha256": "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.2.0" - }, - "glob": { - "dependency": "direct main", - "description": { - "name": "glob", - "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.2" - }, - "graphs": { - "dependency": "direct main", - "description": { - "name": "graphs", - "sha256": "aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.3.1" - }, - "html": { - "dependency": "direct main", - "description": { - "name": "html", - "sha256": "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.15.4" - }, - "http": { - "dependency": "direct main", - "description": { - "name": "http", - "sha256": "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.13.6" - }, - "http_multi_server": { - "dependency": "direct main", - "description": { - "name": "http_multi_server", - "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.2.1" - }, - "http_parser": { - "dependency": "direct main", - "description": { - "name": "http_parser", - "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.0.2" - }, - "intl": { - "dependency": "direct main", - "description": { - "name": "intl", - "sha256": "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.18.1" - }, - "io": { - "dependency": "direct main", - "description": { - "name": "io", - "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.4" - }, - "js": { - "dependency": "direct main", - "description": { - "name": "js", - "sha256": "f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.6.7" - }, - "json_annotation": { - "dependency": "direct dev", - "description": { - "name": "json_annotation", - "sha256": "b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.8.1" - }, - "json_rpc_2": { - "dependency": "direct main", - "description": { - "name": "json_rpc_2", - "sha256": "5e469bffa23899edacb7b22787780068d650b106a21c76db3c49218ab7ca447e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.2" - }, - "logging": { - "dependency": "direct main", - "description": { - "name": "logging", - "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.0" - }, - "matcher": { - "dependency": "direct main", - "description": { - "name": "matcher", - "sha256": "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.12.16" - }, - "meta": { - "dependency": "direct main", - "description": { - "name": "meta", - "sha256": "a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.10.0" - }, - "mime": { - "dependency": "direct main", - "description": { - "name": "mime", - "sha256": "e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.4" - }, - "multicast_dns": { - "dependency": "direct main", - "description": { - "name": "multicast_dns", - "sha256": "f4fd1c3365171fac5160afcb1a283001d3413dee5fd41c61d80888952d609379", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.3.2+4" - }, - "mustache_template": { - "dependency": "direct main", - "description": { - "name": "mustache_template", - "sha256": "a46e26f91445bfb0b60519be280555b06792460b27b19e2b19ad5b9740df5d1c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.0" - }, - "native_assets_builder": { - "dependency": "direct main", - "description": { - "name": "native_assets_builder", - "sha256": "83e92c0f4917cfea0af594aac9ab5ee7d396fbcee1c19839ff33b8e1666cd84e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.2.3" - }, - "native_assets_cli": { - "dependency": "direct main", - "description": { - "name": "native_assets_cli", - "sha256": "51d1af3ebc2437f5883ed749f1877cb82d6a569b0712dad02c8370e6e4f2b5e3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.2.0" - }, - "native_stack_traces": { - "dependency": "direct main", - "description": { - "name": "native_stack_traces", - "sha256": "c797830b9910d13b0f4e70ddef15cde034214fe3bdb8092c4ea5ffad2f74013f", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.5.6" - }, - "node_preamble": { - "dependency": "direct dev", - "description": { - "name": "node_preamble", - "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.2" - }, - "package_config": { - "dependency": "direct main", - "description": { - "name": "package_config", - "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.0" - }, - "path": { - "dependency": "direct main", - "description": { - "name": "path", - "sha256": "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.8.3" - }, - "petitparser": { - "dependency": "direct main", - "description": { - "name": "petitparser", - "sha256": "eeb2d1428ee7f4170e2bd498827296a18d4e7fc462b71727d111c0ac7707cfa6", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.0.1" - }, - "platform": { - "dependency": "direct main", - "description": { - "name": "platform", - "sha256": "ae68c7bfcd7383af3629daafb32fb4e8681c7154428da4febcff06200585f102", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.1.2" - }, - "pool": { - "dependency": "direct main", - "description": { - "name": "pool", - "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.5.1" - }, - "process": { - "dependency": "direct main", - "description": { - "name": "process", - "sha256": "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.2.4" - }, - "pub_semver": { - "dependency": "direct main", - "description": { - "name": "pub_semver", - "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.4" - }, - "pubspec_parse": { - "dependency": "direct dev", - "description": { - "name": "pubspec_parse", - "sha256": "c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.3" - }, - "shelf": { - "dependency": "direct main", - "description": { - "name": "shelf", - "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.4.1" - }, - "shelf_packages_handler": { - "dependency": "direct main", - "description": { - "name": "shelf_packages_handler", - "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.2" - }, - "shelf_proxy": { - "dependency": "direct main", - "description": { - "name": "shelf_proxy", - "sha256": "a71d2307f4393211930c590c3d2c00630f6c5a7a77edc1ef6436dfd85a6a7ee3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.4" - }, - "shelf_static": { - "dependency": "direct main", - "description": { - "name": "shelf_static", - "sha256": "a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.2" - }, - "shelf_web_socket": { - "dependency": "direct main", - "description": { - "name": "shelf_web_socket", - "sha256": "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.4" - }, - "source_map_stack_trace": { - "dependency": "direct main", - "description": { - "name": "source_map_stack_trace", - "sha256": "84cf769ad83aa6bb61e0aa5a18e53aea683395f196a6f39c4c881fb90ed4f7ae", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.1" - }, - "source_maps": { - "dependency": "direct main", - "description": { - "name": "source_maps", - "sha256": "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.10.12" - }, - "source_span": { - "dependency": "direct main", - "description": { - "name": "source_span", - "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.10.0" - }, - "sse": { - "dependency": "direct main", - "description": { - "name": "sse", - "sha256": "3ff9088cac3f45aa8b91336f1962e3ea6c81baaba0bbba361c05f8aa7fb59442", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.1.2" - }, - "stack_trace": { - "dependency": "direct main", - "description": { - "name": "stack_trace", - "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.11.1" - }, - "standard_message_codec": { - "dependency": "direct main", - "description": { - "name": "standard_message_codec", - "sha256": "fc7dd712d191b7e33196a0ecf354c4573492bb95995e7166cb6f73b047f9cae0", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.0.1+4" - }, - "stream_channel": { - "dependency": "direct main", - "description": { - "name": "stream_channel", - "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.2" - }, - "string_scanner": { - "dependency": "direct main", - "description": { - "name": "string_scanner", - "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.0" - }, - "sync_http": { - "dependency": "direct main", - "description": { - "name": "sync_http", - "sha256": "7f0cd72eca000d2e026bcd6f990b81d0ca06022ef4e32fb257b30d3d1014a961", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.3.1" - }, - "term_glyph": { - "dependency": "direct main", - "description": { - "name": "term_glyph", - "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.1" - }, - "test": { - "dependency": "direct dev", - "description": { - "name": "test", - "sha256": "9b0dd8e36af4a5b1569029949d50a52cb2a2a2fdaa20cebb96e6603b9ae241f9", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.24.6" - }, - "test_api": { - "dependency": "direct main", - "description": { - "name": "test_api", - "sha256": "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.6.1" - }, - "test_core": { - "dependency": "direct main", - "description": { - "name": "test_core", - "sha256": "4bef837e56375537055fdbbbf6dd458b1859881f4c7e6da936158f77d61ab265", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.5.6" - }, - "typed_data": { - "dependency": "direct main", - "description": { - "name": "typed_data", - "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.3.2" - }, - "unified_analytics": { - "dependency": "direct main", - "description": { - "name": "unified_analytics", - "sha256": "fbcb0ad896a15c1ddea7ec45e8bfc92a894490e5792e07b74b2e6e992f4c77f8", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.8.0" - }, - "usage": { - "dependency": "direct main", - "description": { - "name": "usage", - "sha256": "0bdbde65a6e710343d02a56552eeaefd20b735e04bfb6b3ee025b6b22e8d0e15", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.1.1" - }, - "uuid": { - "dependency": "direct main", - "description": { - "name": "uuid", - "sha256": "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.7" - }, - "vm_service": { - "dependency": "direct main", - "description": { - "name": "vm_service", - "sha256": "c538be99af830f478718b51630ec1b6bee5e74e52c8a802d328d9e71d35d2583", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "11.10.0" - }, - "vm_snapshot_analysis": { - "dependency": "direct main", - "description": { - "name": "vm_snapshot_analysis", - "sha256": "5a79b9fbb6be2555090f55b03b23907e75d44c3fd7bdd88da09848aa5a1914c8", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.7.6" - }, - "watcher": { - "dependency": "direct main", - "description": { - "name": "watcher", - "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.0" - }, - "web_socket_channel": { - "dependency": "direct main", - "description": { - "name": "web_socket_channel", - "sha256": "d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.0" - }, - "webdriver": { - "dependency": "direct main", - "description": { - "name": "webdriver", - "sha256": "3c923e918918feeb90c4c9fdf1fe39220fa4c0e8e2c0fffaded174498ef86c49", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.2" - }, - "webkit_inspection_protocol": { - "dependency": "direct main", - "description": { - "name": "webkit_inspection_protocol", - "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.1" - }, - "xml": { - "dependency": "direct main", - "description": { - "name": "xml", - "sha256": "af5e77e9b83f2f4adc5d3f0a4ece1c7f45a2467b695c2540381bac793e34e556", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.4.2" - }, - "yaml": { - "dependency": "direct main", - "description": { - "name": "yaml", - "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.1.2" - }, - "yaml_edit": { - "dependency": "direct main", - "description": { - "name": "yaml_edit", - "sha256": "1579d4a0340a83cf9e4d580ea51a16329c916973bffd5bd4b45e911b25d46bfd", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.1" - } - }, - "sdks": { - "dart": ">=3.2.0-36.0.dev <4.0.0" - } - } -} diff --git a/pkgs/development/compilers/flutter/versions/3_16/patches/disable-auto-update-shared.patch b/pkgs/development/compilers/flutter/versions/3_16/patches/disable-auto-update-shared.patch deleted file mode 100644 index 961b41f7327c..000000000000 --- a/pkgs/development/compilers/flutter/versions/3_16/patches/disable-auto-update-shared.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/bin/internal/shared.sh b/bin/internal/shared.sh -index 75d9d3013e..657ad3cb78 100644 ---- a/bin/internal/shared.sh -+++ b/bin/internal/shared.sh -@@ -245,7 +245,7 @@ function shared::execute() { - # and will corrupt each others' downloads. - # - # SHARED_NAME itself is prepared by the caller script. -- upgrade_flutter 7< "$SHARED_NAME" -+ # upgrade_flutter 7< "$SHARED_NAME" - - BIN_NAME="$(basename "$PROG_NAME")" - case "$BIN_NAME" in diff --git a/pkgs/development/compilers/flutter/versions/3_16/patches/disable-auto-update.patch b/pkgs/development/compilers/flutter/versions/3_16/patches/disable-auto-update.patch deleted file mode 100644 index 05960c01b737..000000000000 --- a/pkgs/development/compilers/flutter/versions/3_16/patches/disable-auto-update.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart -index b7e624b4e2..edfdde118b 100644 ---- a/packages/flutter_tools/lib/src/runner/flutter_command.dart -+++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart -@@ -1554,7 +1554,7 @@ Run 'flutter -h' (or 'flutter <command> -h') for available flutter commands and - - // Populate the cache. We call this before pub get below so that the - // sky_engine package is available in the flutter cache for pub to find. -- if (shouldUpdateCache) { -+ if (false) { - // First always update universal artifacts, as some of these (e.g. - // ios-deploy on macOS) are required to determine `requiredArtifacts`. - final bool offline; -diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -index 5d6d78639f..90a4dfa555 100644 ---- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -+++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -@@ -297,7 +297,6 @@ class FlutterCommandRunner extends CommandRunner<void> { - globals.flutterUsage.suppressAnalytics = true; - } - -- globals.flutterVersion.ensureVersionFile(); - final bool machineFlag = topLevelResults[FlutterGlobalOptions.kMachineFlag] as bool? ?? false; - final bool ci = await globals.botDetector.isRunningOnBot; - final bool redirectedCompletion = !globals.stdio.hasTerminal && -@@ -306,11 +305,6 @@ class FlutterCommandRunner extends CommandRunner<void> { - final bool versionCheckFlag = topLevelResults[FlutterGlobalOptions.kVersionCheckFlag] as bool? ?? false; - final bool explicitVersionCheckPassed = topLevelResults.wasParsed(FlutterGlobalOptions.kVersionCheckFlag) && versionCheckFlag; - -- if (topLevelResults.command?.name != 'upgrade' && -- (explicitVersionCheckPassed || (versionCheckFlag && !isMachine))) { -- await globals.flutterVersion.checkFlutterVersionFreshness(); -- } -- - // See if the user specified a specific device. - final String? specifiedDeviceId = topLevelResults[FlutterGlobalOptions.kDeviceIdOption] as String?; - if (specifiedDeviceId != null) { diff --git a/pkgs/development/compilers/flutter/versions/3_22/patches/deregister-pub-dependencies-artifact.patch b/pkgs/development/compilers/flutter/versions/3_22/patches/deregister-pub-dependencies-artifact.patch deleted file mode 100644 index 01e34c6d292c..000000000000 --- a/pkgs/development/compilers/flutter/versions/3_22/patches/deregister-pub-dependencies-artifact.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/packages/flutter_tools/lib/src/flutter_cache.dart b/packages/flutter_tools/lib/src/flutter_cache.dart -index 252021cf78..e50ef0885d 100644 ---- a/packages/flutter_tools/lib/src/flutter_cache.dart -+++ b/packages/flutter_tools/lib/src/flutter_cache.dart -@@ -51,14 +51,6 @@ class FlutterCache extends Cache { - registerArtifact(IosUsbArtifacts(artifactName, this, platform: platform)); - } - registerArtifact(FontSubsetArtifacts(this, platform: platform)); -- registerArtifact(PubDependencies( -- logger: logger, -- // flutter root and pub must be lazily initialized to avoid accessing -- // before the version is determined. -- flutterRoot: () => Cache.flutterRoot!, -- pub: () => pub, -- projectFactory: projectFactory, -- )); - } - } - \ No newline at end of file diff --git a/pkgs/development/compilers/flutter/versions/3_22/patches/disable-auto-update-shared.patch b/pkgs/development/compilers/flutter/versions/3_22/patches/disable-auto-update-shared.patch deleted file mode 100644 index 961b41f7327c..000000000000 --- a/pkgs/development/compilers/flutter/versions/3_22/patches/disable-auto-update-shared.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/bin/internal/shared.sh b/bin/internal/shared.sh -index 75d9d3013e..657ad3cb78 100644 ---- a/bin/internal/shared.sh -+++ b/bin/internal/shared.sh -@@ -245,7 +245,7 @@ function shared::execute() { - # and will corrupt each others' downloads. - # - # SHARED_NAME itself is prepared by the caller script. -- upgrade_flutter 7< "$SHARED_NAME" -+ # upgrade_flutter 7< "$SHARED_NAME" - - BIN_NAME="$(basename "$PROG_NAME")" - case "$BIN_NAME" in diff --git a/pkgs/development/compilers/flutter/versions/3_23/patches/deregister-pub-dependencies-artifact.patch b/pkgs/development/compilers/flutter/versions/3_23/patches/deregister-pub-dependencies-artifact.patch deleted file mode 100644 index 01e34c6d292c..000000000000 --- a/pkgs/development/compilers/flutter/versions/3_23/patches/deregister-pub-dependencies-artifact.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/packages/flutter_tools/lib/src/flutter_cache.dart b/packages/flutter_tools/lib/src/flutter_cache.dart -index 252021cf78..e50ef0885d 100644 ---- a/packages/flutter_tools/lib/src/flutter_cache.dart -+++ b/packages/flutter_tools/lib/src/flutter_cache.dart -@@ -51,14 +51,6 @@ class FlutterCache extends Cache { - registerArtifact(IosUsbArtifacts(artifactName, this, platform: platform)); - } - registerArtifact(FontSubsetArtifacts(this, platform: platform)); -- registerArtifact(PubDependencies( -- logger: logger, -- // flutter root and pub must be lazily initialized to avoid accessing -- // before the version is determined. -- flutterRoot: () => Cache.flutterRoot!, -- pub: () => pub, -- projectFactory: projectFactory, -- )); - } - } - \ No newline at end of file diff --git a/pkgs/development/compilers/flutter/versions/3_24/data.json b/pkgs/development/compilers/flutter/versions/3_24/data.json index 2386379e4346..114e3e88686e 100644 --- a/pkgs/development/compilers/flutter/versions/3_24/data.json +++ b/pkgs/development/compilers/flutter/versions/3_24/data.json @@ -1,33 +1,33 @@ { - "version": "3.24.1", - "engineVersion": "c9b9d5780da342eb3f0f5e439a7db06f7d112575", + "version": "3.24.4", + "engineVersion": "db49896cf25ceabc44096d5f088d86414e05a7aa", "engineSwiftShaderHash": "sha256-mRLCvhNkmHz7Rv6GzXkY7OB1opBSq+ATWZ466qZdgto=", "engineSwiftShaderRev": "2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f", "channel": "stable", "engineHashes": { "aarch64-linux": { - "aarch64-linux": "sha256-+ot7+/DT18xZSysGqQ2v1hQOTbzO7Gr9zFeZPnrEy64=", - "x86_64-linux": "sha256-+ot7+/DT18xZSysGqQ2v1hQOTbzO7Gr9zFeZPnrEy64=" + "aarch64-linux": "sha256-/jkMlcE0AZFWgTtUaUk8e/RxD31mObG91C6nfLzXdYU=", + "x86_64-linux": "sha256-/jkMlcE0AZFWgTtUaUk8e/RxD31mObG91C6nfLzXdYU=" }, "x86_64-linux": { - "aarch64-linux": "sha256-hgKC9sBlP/82tPBTF7WMgNc/sc/qrymxiss8ux85XNU=", - "x86_64-linux": "sha256-hgKC9sBlP/82tPBTF7WMgNc/sc/qrymxiss8ux85XNU=" + "aarch64-linux": "sha256-/jkMlcE0AZFWgTtUaUk8e/RxD31mObG91C6nfLzXdYU=", + "x86_64-linux": "sha256-/jkMlcE0AZFWgTtUaUk8e/RxD31mObG91C6nfLzXdYU=" } }, - "dartVersion": "3.5.1", + "dartVersion": "3.5.4", "dartHash": { - "x86_64-linux": "sha256-dmi3KxcCfqmBvqp6BTMaeiAEayRpQfctSeHaucaZCaM=", - "aarch64-linux": "sha256-OoQYMsw/36lM9Sza+g9n6sJ+G2SmMtR+W3YrjyeOg/Q=", - "x86_64-darwin": "sha256-+OkDE+eEov5CZb08mVm2XhARu0x8O0X0XRWnMFYEr5o=", - "aarch64-darwin": "sha256-cMb7/EaHzSX0WorUuCOLEtBcYS8jyWNuviLhkYrWiOI=" + "x86_64-linux": "sha256-jHyCMOkrd8DEq/IBqCMTqJg9uFkcoAwHiJBFNUHENZY=", + "aarch64-linux": "sha256-fFHpWvwKYBC4fbKTMwfhemu4RCdyAqj+cIJgcoE1P30=", + "x86_64-darwin": "sha256-9BJL3FjwmPbJw2pdiXH0EjPqjaYavzxt6ohyNKAeyOg=", + "aarch64-darwin": "sha256-tebVH1N2VtPnyecH6wYyptkE0xjINpPv/mvKgaucBHk=" }, - "flutterHash": "sha256-Y/a8gab8YCEWa8G45a9H3r2ulgqUqjqDJbb2GR4iegQ=", + "flutterHash": "sha256-ykR2ul5JWEvopTMqXvRCAfqZ8ZlirNu0txVczWc/Nvg=", "artifactHashes": { "android": { - "aarch64-darwin": "sha256-0X224oHqrx+t5v/73TGiL1Z/3fcMnEhSyDVZ3rLQ5Dc=", - "aarch64-linux": "sha256-2MI9Fwf/anWfBunTxtG9DlyAdLe3iXWvl/ghkHTPMaw=", - "x86_64-darwin": "sha256-0X224oHqrx+t5v/73TGiL1Z/3fcMnEhSyDVZ3rLQ5Dc=", - "x86_64-linux": "sha256-2MI9Fwf/anWfBunTxtG9DlyAdLe3iXWvl/ghkHTPMaw=" + "aarch64-darwin": "sha256-LlTVOf+8AixZ/W5J+dlagdldwZTE7D2aA3tWYi3te+8=", + "aarch64-linux": "sha256-XfsBmIjmPzU+VNJvqu6uXOcKUwfUPXXoL2hUPso3DNo=", + "x86_64-darwin": "sha256-LlTVOf+8AixZ/W5J+dlagdldwZTE7D2aA3tWYi3te+8=", + "x86_64-linux": "sha256-XfsBmIjmPzU+VNJvqu6uXOcKUwfUPXXoL2hUPso3DNo=" }, "fuchsia": { "aarch64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", @@ -36,38 +36,38 @@ "x86_64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=" }, "ios": { - "aarch64-darwin": "sha256-JpEm6rxkiNVUZkvQpy7QhUNTamG274Tggh50wG/980M=", - "aarch64-linux": "sha256-JpEm6rxkiNVUZkvQpy7QhUNTamG274Tggh50wG/980M=", - "x86_64-darwin": "sha256-JpEm6rxkiNVUZkvQpy7QhUNTamG274Tggh50wG/980M=", - "x86_64-linux": "sha256-JpEm6rxkiNVUZkvQpy7QhUNTamG274Tggh50wG/980M=" + "aarch64-darwin": "sha256-LilLQf/+aBaaG7nVMSd4Ms36e1yos+yH6mbZQxukh8E=", + "aarch64-linux": "sha256-LilLQf/+aBaaG7nVMSd4Ms36e1yos+yH6mbZQxukh8E=", + "x86_64-darwin": "sha256-LilLQf/+aBaaG7nVMSd4Ms36e1yos+yH6mbZQxukh8E=", + "x86_64-linux": "sha256-LilLQf/+aBaaG7nVMSd4Ms36e1yos+yH6mbZQxukh8E=" }, "linux": { - "aarch64-darwin": "sha256-Xdbu9U1IxakBZt5uE9wg4V5FBsMOnAf8rgFe7fxqvYo=", - "aarch64-linux": "sha256-Xdbu9U1IxakBZt5uE9wg4V5FBsMOnAf8rgFe7fxqvYo=", - "x86_64-darwin": "sha256-hYPVRKCorPPlA1vEFNzEvBjsM8WJmrFBpDA9MZyaEy8=", - "x86_64-linux": "sha256-hYPVRKCorPPlA1vEFNzEvBjsM8WJmrFBpDA9MZyaEy8=" + "aarch64-darwin": "sha256-876g3jlrzaAiVN8zYbQe2B2eCXi7gygQNNZH+NSH6IU=", + "aarch64-linux": "sha256-876g3jlrzaAiVN8zYbQe2B2eCXi7gygQNNZH+NSH6IU=", + "x86_64-darwin": "sha256-zbyMRvUGIGj1Zk/U8xC/bewKAtWssWnAvQFj3wb8XcM=", + "x86_64-linux": "sha256-zbyMRvUGIGj1Zk/U8xC/bewKAtWssWnAvQFj3wb8XcM=" }, "macos": { - "aarch64-darwin": "sha256-KizzQKgKTJszSzPehIRJvxUuJ+rQHx00R27mvsBik7c=", - "aarch64-linux": "sha256-KizzQKgKTJszSzPehIRJvxUuJ+rQHx00R27mvsBik7c=", - "x86_64-darwin": "sha256-KizzQKgKTJszSzPehIRJvxUuJ+rQHx00R27mvsBik7c=", - "x86_64-linux": "sha256-KizzQKgKTJszSzPehIRJvxUuJ+rQHx00R27mvsBik7c=" + "aarch64-darwin": "sha256-mNKPcQh8cn3C45kQ474crY9vmWBdR8MdlLMCXofqv9w=", + "aarch64-linux": "sha256-mNKPcQh8cn3C45kQ474crY9vmWBdR8MdlLMCXofqv9w=", + "x86_64-darwin": "sha256-mNKPcQh8cn3C45kQ474crY9vmWBdR8MdlLMCXofqv9w=", + "x86_64-linux": "sha256-mNKPcQh8cn3C45kQ474crY9vmWBdR8MdlLMCXofqv9w=" }, "universal": { - "aarch64-darwin": "sha256-KTcQ2G531xTcxYxnhk5w+CSIsR9TQMxpP6EcNwBnJsE=", - "aarch64-linux": "sha256-At9+kymeYRqUpJXbzuEhbMRWaM3aFS0FhrESYYjre0U=", - "x86_64-darwin": "sha256-27TQMUlexqdiXfE5iDl6DPlCnSY0pAmhGDrne4SCXBM=", - "x86_64-linux": "sha256-qPhyn49fMto0EiHFMbARdWSjdRZvvV66GNlaQc087eY=" + "aarch64-darwin": "sha256-SVrhfvGunkEKraIapt2PcNr4VzWI9d5DYMwkE82hKC8=", + "aarch64-linux": "sha256-N4/BCd8JTXqMdfX65IhKlZo7EK88t0I47QVoqdlOg7s=", + "x86_64-darwin": "sha256-GdBinxPZHgYZdmHvtcT9+qPGadZKqWTOIHJcIJwN2rU=", + "x86_64-linux": "sha256-a/AMUZC3n4e/TAquu076vXq+4cuODYJyvIrayTw4o5U=" }, "web": { - "aarch64-darwin": "sha256-z6RjD56OVppribVXhbbPaRvjy+qU8PXyCg4yF0L0rUE=", - "aarch64-linux": "sha256-z6RjD56OVppribVXhbbPaRvjy+qU8PXyCg4yF0L0rUE=", - "x86_64-darwin": "sha256-z6RjD56OVppribVXhbbPaRvjy+qU8PXyCg4yF0L0rUE=", - "x86_64-linux": "sha256-z6RjD56OVppribVXhbbPaRvjy+qU8PXyCg4yF0L0rUE=" + "aarch64-darwin": "sha256-9JyId7oDRkwjjQp9tdD/LMiKs/DMorO/vyfxRcb+q8g=", + "aarch64-linux": "sha256-9JyId7oDRkwjjQp9tdD/LMiKs/DMorO/vyfxRcb+q8g=", + "x86_64-darwin": "sha256-9JyId7oDRkwjjQp9tdD/LMiKs/DMorO/vyfxRcb+q8g=", + "x86_64-linux": "sha256-9JyId7oDRkwjjQp9tdD/LMiKs/DMorO/vyfxRcb+q8g=" }, "windows": { - "x86_64-darwin": "sha256-+ZgOS8HK0S5T/wDJZcYM4ZtmvJwB2anyyp0Td0/w934=", - "x86_64-linux": "sha256-+ZgOS8HK0S5T/wDJZcYM4ZtmvJwB2anyyp0Td0/w934=" + "x86_64-darwin": "sha256-EvESJuNqDpnXw3RuEM11tq5k+DGF3Ytm4fqw1WT9dbI=", + "x86_64-linux": "sha256-EvESJuNqDpnXw3RuEM11tq5k+DGF3Ytm4fqw1WT9dbI=" } }, "pubspecLock": { @@ -272,11 +272,11 @@ "dependency": "direct main", "description": { "name": "dds", - "sha256": "14dcd48de0c83e98528d6da555de03c29d52b6711a82eb8c5495d41a110becec", + "sha256": "f3bca60b6b7d2b005268a1a579c82e38bec3d85cc85c332a872fe623c7ba94d7", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.2.4+1" + "version": "4.2.4+2" }, "dds_service_extensions": { "dependency": "direct main", diff --git a/pkgs/development/compilers/flutter/versions/3_23/data.json b/pkgs/development/compilers/flutter/versions/3_26/data.json index ab570ec0f879..8dc7dd1cce41 100644 --- a/pkgs/development/compilers/flutter/versions/3_23/data.json +++ b/pkgs/development/compilers/flutter/versions/3_26/data.json @@ -1,33 +1,33 @@ { - "version": "3.23.0-0.1.pre", - "engineVersion": "bb10c5466638e963479ba5e64e601e42d1a43447", + "version": "3.26.0-0.1.pre", + "engineVersion": "059e4e6d8ff6de39c29441c53e949bfb0bf17972", "engineSwiftShaderHash": "sha256-mRLCvhNkmHz7Rv6GzXkY7OB1opBSq+ATWZ466qZdgto=", "engineSwiftShaderRev": "2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f", "channel": "beta", "engineHashes": { "aarch64-linux": { - "aarch64-linux": "sha256-H+UEIEY3UwBBJePSuwsFWQIGuuYzPuX543Me3YplD14=", - "x86_64-linux": "sha256-H+UEIEY3UwBBJePSuwsFWQIGuuYzPuX543Me3YplD14=" + "aarch64-linux": "sha256-cDXCGikGuPWxMZZ0HWcnbS7Dt22no9wwbh4wei7w8Bw=", + "x86_64-linux": "sha256-cDXCGikGuPWxMZZ0HWcnbS7Dt22no9wwbh4wei7w8Bw=" }, "x86_64-linux": { - "aarch64-linux": "sha256-KJbjRfxC2S8JWeo1eTHObvumOjAVc/24jEvOu4znnAY=", - "x86_64-linux": "sha256-KJbjRfxC2S8JWeo1eTHObvumOjAVc/24jEvOu4znnAY=" + "aarch64-linux": "sha256-cDXCGikGuPWxMZZ0HWcnbS7Dt22no9wwbh4wei7w8Bw=", + "x86_64-linux": "sha256-cDXCGikGuPWxMZZ0HWcnbS7Dt22no9wwbh4wei7w8Bw=" } }, - "dartVersion": "3.5.0-180.3.beta", + "dartVersion": "3.6.0-216.1.beta", "dartHash": { - "x86_64-linux": "sha256-DXGyUTu9I602lLnDz9BKLfHEAeaMKtbZjxgmPPSTEv0=", - "aarch64-linux": "sha256-WFTHw5V6zWrpF7bx5wOQNOMJe+yn1j4rnfRSkW7hN9c=", - "x86_64-darwin": "sha256-nUFd3jMj1Totc2WPSToLvtSVNjmhKKWEXwzSKo1yT1w=", - "aarch64-darwin": "sha256-O5HYmZVveYGktks7we4uht9ZyaWJli5dSC22lrVqi58=" + "x86_64-linux": "sha256-Vvdx4Bi7a/ySrxAv3UejlmmbNyKzdDr9RCS9tVGscDQ=", + "aarch64-linux": "sha256-SHqk1bm/5+ixOA5RHuToHQDN/NrNKZIrkkaBh9Cvl/I=", + "x86_64-darwin": "sha256-dbw0+OtjYkdRCgLDP+oNcOUgR5C8gC12NdftNAk7x0Q=", + "aarch64-darwin": "sha256-XOpBwyrMqIKutXgLEjGuta/3yhK+DpoSChNVXc9MMYA=" }, - "flutterHash": "sha256-OFDPPoLvKG+H4Jylc6/NvvEe5g5I/lo4ViYNIUrgQXw=", + "flutterHash": "sha256-4YXm/MbhQsifJYpeUjmP8h6sm7pWrjBSpbCTV9p659o=", "artifactHashes": { "android": { - "aarch64-darwin": "sha256-UWZ6/XGOoTjfoENRs2f6ZbTcke76ieme4MnTqKVKYXo=", - "aarch64-linux": "sha256-orYFnnwdiN0jKTff34moVkBmAc2TWNz053mp0IVehmk=", - "x86_64-darwin": "sha256-UWZ6/XGOoTjfoENRs2f6ZbTcke76ieme4MnTqKVKYXo=", - "x86_64-linux": "sha256-orYFnnwdiN0jKTff34moVkBmAc2TWNz053mp0IVehmk=" + "aarch64-darwin": "sha256-CmjEq9T5gNgNKp8mik6HwVAsAfdWXBK2nHwL28L08xk=", + "aarch64-linux": "sha256-sucpfdtDzNMmCpWOZGVp48uNSrj221fOROI8huRs8Xc=", + "x86_64-darwin": "sha256-CmjEq9T5gNgNKp8mik6HwVAsAfdWXBK2nHwL28L08xk=", + "x86_64-linux": "sha256-sucpfdtDzNMmCpWOZGVp48uNSrj221fOROI8huRs8Xc=" }, "fuchsia": { "aarch64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", @@ -36,38 +36,38 @@ "x86_64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=" }, "ios": { - "aarch64-darwin": "sha256-lAo3yua8IbGiaVLt0JqDtehKROnibx60HtaBLupvILI=", - "aarch64-linux": "sha256-lAo3yua8IbGiaVLt0JqDtehKROnibx60HtaBLupvILI=", - "x86_64-darwin": "sha256-lAo3yua8IbGiaVLt0JqDtehKROnibx60HtaBLupvILI=", - "x86_64-linux": "sha256-lAo3yua8IbGiaVLt0JqDtehKROnibx60HtaBLupvILI=" + "aarch64-darwin": "sha256-kRgyKtnMs7xefe+XmCoYbO7sa7Dz1o0ltcRdiDvSeik=", + "aarch64-linux": "sha256-kRgyKtnMs7xefe+XmCoYbO7sa7Dz1o0ltcRdiDvSeik=", + "x86_64-darwin": "sha256-kRgyKtnMs7xefe+XmCoYbO7sa7Dz1o0ltcRdiDvSeik=", + "x86_64-linux": "sha256-kRgyKtnMs7xefe+XmCoYbO7sa7Dz1o0ltcRdiDvSeik=" }, "linux": { - "aarch64-darwin": "sha256-2d3gPOT2kBgHeTXOFOdEOAHkbv7ctXx51rtX497FEmU=", - "aarch64-linux": "sha256-2d3gPOT2kBgHeTXOFOdEOAHkbv7ctXx51rtX497FEmU=", - "x86_64-darwin": "sha256-LcEITSWg5VdUs9nXRu+mPGxxWqAuRRSbt9RCDeBa+74=", - "x86_64-linux": "sha256-LcEITSWg5VdUs9nXRu+mPGxxWqAuRRSbt9RCDeBa+74=" + "aarch64-darwin": "sha256-tnvQp4Vdthqwgt1bFRpZVJOuTX752yJE91yJNpwSOp4=", + "aarch64-linux": "sha256-tnvQp4Vdthqwgt1bFRpZVJOuTX752yJE91yJNpwSOp4=", + "x86_64-darwin": "sha256-vIfHgLif151Ymtu/aFtwHZTk28H2feHd9cOedUmSWXY=", + "x86_64-linux": "sha256-vIfHgLif151Ymtu/aFtwHZTk28H2feHd9cOedUmSWXY=" }, "macos": { - "aarch64-darwin": "sha256-b6ETaOTHSU58yLsMorKKhOOA7DkD+RtQ3DIqAJhSDjs=", - "aarch64-linux": "sha256-b6ETaOTHSU58yLsMorKKhOOA7DkD+RtQ3DIqAJhSDjs=", - "x86_64-darwin": "sha256-b6ETaOTHSU58yLsMorKKhOOA7DkD+RtQ3DIqAJhSDjs=", - "x86_64-linux": "sha256-b6ETaOTHSU58yLsMorKKhOOA7DkD+RtQ3DIqAJhSDjs=" + "aarch64-darwin": "sha256-/4R3Wlcs6ksMkTTZJ/YzEgWWCQJBKlnWr+PNCtcL3oc=", + "aarch64-linux": "sha256-/4R3Wlcs6ksMkTTZJ/YzEgWWCQJBKlnWr+PNCtcL3oc=", + "x86_64-darwin": "sha256-/4R3Wlcs6ksMkTTZJ/YzEgWWCQJBKlnWr+PNCtcL3oc=", + "x86_64-linux": "sha256-/4R3Wlcs6ksMkTTZJ/YzEgWWCQJBKlnWr+PNCtcL3oc=" }, "universal": { - "aarch64-darwin": "sha256-umn+onoRSmfuoL+ls/68xhCo34mgD1xMdMjUstmMC74=", - "aarch64-linux": "sha256-IKGrSAweOTwgesVt2PjUvYeTkpeSDRqXTeZWwd6ikvk=", - "x86_64-darwin": "sha256-C7/NtLOpFwyvUMBk7imz0Ovj/AjJ7vf2v6Sd2PZujiA=", - "x86_64-linux": "sha256-3W/S7/K30xJC6mA9S2n1rgD7lhUvz2ZDSKq7k/uRi2A=" + "aarch64-darwin": "sha256-M2Fuqfgq79+FilJ5vU0Iarn0cpV3+4AxuxFEc3fwm+4=", + "aarch64-linux": "sha256-NqlNboNjLFAeuLHu6lNnMnrEb902nwIV1b/DNfrr3h8=", + "x86_64-darwin": "sha256-tlGwnwAov1eBe54mD9Q6D86qIEBkHBODJs5SVJyP5M0=", + "x86_64-linux": "sha256-0lxLRRQq+bRDPXyxEtZVGtzzqhrcsTYx01jeFX3ejLc=" }, "web": { - "aarch64-darwin": "sha256-dyT9Cj33MmZdOhQwVuqkrxYjWeZxMXE35BKkRHjSKtQ=", - "aarch64-linux": "sha256-dyT9Cj33MmZdOhQwVuqkrxYjWeZxMXE35BKkRHjSKtQ=", - "x86_64-darwin": "sha256-dyT9Cj33MmZdOhQwVuqkrxYjWeZxMXE35BKkRHjSKtQ=", - "x86_64-linux": "sha256-dyT9Cj33MmZdOhQwVuqkrxYjWeZxMXE35BKkRHjSKtQ=" + "aarch64-darwin": "sha256-fVOuJCTciHWv+HRFtSgn8zrexspBe+MUnc/cZlOeoqM=", + "aarch64-linux": "sha256-fVOuJCTciHWv+HRFtSgn8zrexspBe+MUnc/cZlOeoqM=", + "x86_64-darwin": "sha256-fVOuJCTciHWv+HRFtSgn8zrexspBe+MUnc/cZlOeoqM=", + "x86_64-linux": "sha256-fVOuJCTciHWv+HRFtSgn8zrexspBe+MUnc/cZlOeoqM=" }, "windows": { - "x86_64-darwin": "sha256-0V63HjDy3mqNmGKM/5VVSibg8k7JtSaJ5RXXgk1XltQ=", - "x86_64-linux": "sha256-0V63HjDy3mqNmGKM/5VVSibg8k7JtSaJ5RXXgk1XltQ=" + "x86_64-darwin": "sha256-mwbk0VwxsbnMjy8trtjgZZ96jF3QuQJDcc0VSs6mQxI=", + "x86_64-linux": "sha256-mwbk0VwxsbnMjy8trtjgZZ96jF3QuQJDcc0VSs6mQxI=" } }, "pubspecLock": { @@ -76,37 +76,37 @@ "dependency": "direct main", "description": { "name": "_fe_analyzer_shared", - "sha256": "5aaf60d96c4cd00fe7f21594b5ad6a1b699c80a27420f8a837f4d68473ef09e3", + "sha256": "45cfa8471b89fb6643fe9bf51bd7931a76b8f5ec2d65de4fb176dba8d4f22c77", "url": "https://pub.dev" }, "source": "hosted", - "version": "68.0.0" + "version": "73.0.0" }, "_macros": { "dependency": "transitive", "description": "dart", "source": "sdk", - "version": "0.1.5" + "version": "0.3.2" }, "analyzer": { "dependency": "direct main", "description": { "name": "analyzer", - "sha256": "21f1d3720fd1c70316399d5e2bccaebb415c434592d778cce8acb967b8578808", + "sha256": "4959fec185fe70cce007c57e9ab6983101dbe593d2bf8bbfb4453aaec0cf470a", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.5.0" + "version": "6.8.0" }, "archive": { "dependency": "direct main", "description": { "name": "archive", - "sha256": "80e5141fafcb3361653ce308776cfd7d45e6e9fbb429e14eec571382c0c5fecb", + "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.3.2" + "version": "3.6.1" }, "args": { "dependency": "direct main", @@ -142,11 +142,11 @@ "dependency": "direct main", "description": { "name": "browser_launcher", - "sha256": "6ee4c6b1f68a42e769ef6e663c4f56708522f7bce9d2ab6e308a37b612ffa4ec", + "sha256": "54a2da4d152c34760b87cbd4a9fe8a563379487e57bfcd1b387be394dfa91734", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.1" + "version": "1.1.2" }, "built_collection": { "dependency": "direct main", @@ -202,11 +202,11 @@ "dependency": "direct dev", "description": { "name": "collection", - "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a", + "sha256": "a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.18.0" + "version": "1.19.0" }, "completion": { "dependency": "direct main", @@ -232,21 +232,21 @@ "dependency": "direct main", "description": { "name": "coverage", - "sha256": "3945034e86ea203af7a056d98e98e42a5518fff200d6e8e6647e1886b07e936e", + "sha256": "7b594a150942e0d3be99cd45a1d0b5caff27ba5a27f292ed8e8d904ba3f167b5", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.8.0" + "version": "1.9.1" }, "crypto": { "dependency": "direct main", "description": { "name": "crypto", - "sha256": "ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab", + "sha256": "ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.3" + "version": "3.0.5" }, "csslib": { "dependency": "direct main", @@ -262,21 +262,21 @@ "dependency": "direct main", "description": { "name": "dap", - "sha256": "fb7c8a64857d90bedf5c51954b83bee9304b607bcb8a03a89ec37afbf2d683a7", + "sha256": "c0e53b52c9529d901329045afc4c5acb04304a28acde4b54ab0a08a93da546aa", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.0" + "version": "1.3.0" }, "dds": { "dependency": "direct main", "description": { "name": "dds", - "sha256": "cf3868c2223864529d6e5aa0c07ce9ba0016b9d0e8cb67480c0eb810a42f56bd", + "sha256": "263f8831bfe57136fd4c07cf87df9b3f65457438b8b4d237e1b1d603c6d1cdbd", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.2.1" + "version": "4.2.6" }, "dds_service_extensions": { "dependency": "direct main", @@ -292,31 +292,31 @@ "dependency": "direct main", "description": { "name": "devtools_shared", - "sha256": "fbe1657c88dd476a70116e33b0d19f8a23b35fd6db93eab9f01fa32cc21a0c49", + "sha256": "72369878105eccd563547afbad97407a2431b96bd4c04a1d6da75cb068437f50", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.0.0-dev.1" + "version": "10.0.2" }, "dtd": { "dependency": "direct main", "description": { "name": "dtd", - "sha256": "58ac5c2d628e575dbcdfda44a698cd4c1212663e27fe5f8ced37aea85faa0d30", + "sha256": "6e4e508c0d03e12e2c96f21faa0e5acc191f9431ecd02adb8daee64dbfae6b86", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.0" + "version": "2.3.0" }, "dwds": { "dependency": "direct main", "description": { "name": "dwds", - "sha256": "61ebaabb04d779d040b47d3b4d0b3963449ced0920fb8efd81ca6d5e51ccfc1a", + "sha256": "d0cf9d18511df6b397c40527f3fd8ddb47b7efcc501e703dd94f13cabaf82ffc", "url": "https://pub.dev" }, "source": "hosted", - "version": "24.0.0" + "version": "24.1.0" }, "extension_discovery": { "dependency": "direct main", @@ -342,11 +342,11 @@ "dependency": "direct main", "description": { "name": "ffi", - "sha256": "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21", + "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.2" + "version": "2.1.3" }, "file": { "dependency": "direct main", @@ -412,11 +412,11 @@ "dependency": "direct main", "description": { "name": "graphs", - "sha256": "aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19", + "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.1" + "version": "2.3.2" }, "html": { "dependency": "direct main", @@ -432,11 +432,11 @@ "dependency": "direct main", "description": { "name": "http", - "sha256": "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2", + "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.13.6" + "version": "1.2.2" }, "http_multi_server": { "dependency": "direct main", @@ -452,11 +452,11 @@ "dependency": "direct main", "description": { "name": "http_parser", - "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b", + "sha256": "40f592dd352890c3b60fec1b68e786cefb9603e05ff303dbc4dda49b304ecdf4", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.2" + "version": "4.1.0" }, "intl": { "dependency": "direct main", @@ -479,7 +479,7 @@ "version": "1.0.4" }, "js": { - "dependency": "direct dev", + "dependency": "direct main", "description": { "name": "js", "sha256": "c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf", @@ -522,11 +522,11 @@ "dependency": "transitive", "description": { "name": "macros", - "sha256": "a8403c89b36483b4cbf9f1fcd24562f483cb34a5c9bf101cf2b0d8a083cf1239", + "sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.0-main.5" + "version": "0.1.2-main.4" }, "matcher": { "dependency": "direct main", @@ -542,31 +542,31 @@ "dependency": "direct main", "description": { "name": "meta", - "sha256": "25dfcaf170a0190f47ca6355bdd4552cb8924b430512ff0cafb8db9bd41fe33b", + "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.14.0" + "version": "1.15.0" }, "mime": { "dependency": "direct main", "description": { "name": "mime", - "sha256": "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2", + "sha256": "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.5" + "version": "1.0.6" }, "multicast_dns": { "dependency": "direct main", "description": { "name": "multicast_dns", - "sha256": "316cc47a958d4bd3c67bd238fe8b44fdfb6133bad89cb191c0c3bd3edb14e296", + "sha256": "982c4cc4cda5f98dd477bddfd623e8e4bd1014e7dbf9e7b05052e14a5b550b99", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.3.2+6" + "version": "0.3.2+7" }, "mustache_template": { "dependency": "direct main", @@ -582,34 +582,34 @@ "dependency": "direct main", "description": { "name": "native_assets_builder", - "sha256": "e6612ad01cbc3c4d1b00a1a42aa25aa567950ab10ae1f95721574923540f3bd8", + "sha256": "3368f3eda23d59e98c8eadeafe609feb3bf6c342e5885796d6eceadc3d4581f8", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.0" + "version": "0.8.2" }, "native_assets_cli": { "dependency": "direct main", "description": { "name": "native_assets_cli", - "sha256": "f54ddc4a3f8cff1d8d63723b4938902da7586a5a47fe3c1bfa226eb80223f32e", + "sha256": "1ff032c0ca050391c4c5107485f1a26e0e95cee18d1fdb2b7bdbb990efd3c188", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.0" + "version": "0.7.3" }, "native_stack_traces": { "dependency": "direct main", "description": { "name": "native_stack_traces", - "sha256": "64d2f4bcf3b69326fb9bc91b4dd3a06f94bb5bbc3a65e25ae6467ace0b34bfd3", + "sha256": "8ba566c10ea781491c203876b04b9bdcf19dfbe17b9e486869f20eaae0ee470f", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.7" + "version": "0.6.0" }, "node_preamble": { - "dependency": "direct dev", + "dependency": "direct main", "description": { "name": "node_preamble", "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db", @@ -652,11 +652,11 @@ "dependency": "direct main", "description": { "name": "platform", - "sha256": "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec", + "sha256": "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.4" + "version": "3.1.5" }, "pool": { "dependency": "direct main", @@ -692,21 +692,21 @@ "dependency": "direct dev", "description": { "name": "pubspec_parse", - "sha256": "c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367", + "sha256": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.3" + "version": "1.3.0" }, "shelf": { "dependency": "direct main", "description": { "name": "shelf", - "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4", + "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.4.1" + "version": "1.4.2" }, "shelf_packages_handler": { "dependency": "direct main", @@ -742,21 +742,21 @@ "dependency": "direct main", "description": { "name": "shelf_web_socket", - "sha256": "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1", + "sha256": "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.4" + "version": "2.0.0" }, "source_map_stack_trace": { "dependency": "direct main", "description": { "name": "source_map_stack_trace", - "sha256": "84cf769ad83aa6bb61e0aa5a18e53aea683395f196a6f39c4c881fb90ed4f7ae", + "sha256": "c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.1.2" }, "source_maps": { "dependency": "direct main", @@ -778,15 +778,25 @@ "source": "hosted", "version": "1.10.0" }, + "sprintf": { + "dependency": "direct main", + "description": { + "name": "sprintf", + "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0" + }, "sse": { "dependency": "direct main", "description": { "name": "sse", - "sha256": "fdce3a4ac3ae1c01083d05ded0bcdb7e02857ca2323823548e9e76d2f61638f0", + "sha256": "111a05843ea9035042975744fe61d5e8b95bc4d38656dbafc5532da77a0bb89a", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.1.5" + "version": "4.1.6" }, "stack_trace": { "dependency": "direct main", @@ -822,11 +832,11 @@ "dependency": "direct main", "description": { "name": "string_scanner", - "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde", + "sha256": "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.0" + "version": "1.3.0" }, "sync_http": { "dependency": "direct main", @@ -849,34 +859,34 @@ "version": "1.2.1" }, "test": { - "dependency": "direct dev", + "dependency": "direct main", "description": { "name": "test", - "sha256": "d11b55850c68c1f6c0cf00eabded4e66c4043feaf6c0d7ce4a36785137df6331", + "sha256": "713a8789d62f3233c46b4a90b174737b2c04cb6ae4500f2aa8b1be8f03f5e67f", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.25.5" + "version": "1.25.8" }, "test_api": { "dependency": "direct main", "description": { "name": "test_api", - "sha256": "2419f20b0c8677b2d67c8ac4d1ac7372d862dc6c460cdbb052b40155408cd794", + "sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.1" + "version": "0.7.3" }, "test_core": { "dependency": "direct main", "description": { "name": "test_core", - "sha256": "4d070a6bc36c1c4e89f20d353bfd71dc30cdf2bd0e14349090af360a029ab292", + "sha256": "12391302411737c176b0b5d6491f466b0dd56d4763e347b6714efbaa74d7953d", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.2" + "version": "0.6.5" }, "typed_data": { "dependency": "direct main", @@ -892,11 +902,11 @@ "dependency": "direct main", "description": { "name": "unified_analytics", - "sha256": "0271998bc95be272accda218841af6dfc7bb4ef666f6c21dd73d6807c2dfff0e", + "sha256": "916215af2dc2f54a204c6bfbc645ec401b6a150048764814379f42e09b557d2d", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.1.0" + "version": "6.1.2" }, "usage": { "dependency": "direct main", @@ -912,21 +922,21 @@ "dependency": "direct main", "description": { "name": "uuid", - "sha256": "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313", + "sha256": "83d37c7ad7aaf9aa8e275490669535c8080377cfa7a7004c24dfac53afffaa90", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.7" + "version": "4.4.2" }, "vm_service": { "dependency": "direct main", "description": { "name": "vm_service", - "sha256": "7475cb4dd713d57b6f7464c0e13f06da0d535d8b2067e188962a59bac2cf280b", + "sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d", "url": "https://pub.dev" }, "source": "hosted", - "version": "14.2.2" + "version": "14.2.5" }, "vm_service_interface": { "dependency": "direct main", @@ -962,21 +972,31 @@ "dependency": "direct main", "description": { "name": "web", - "sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27", + "sha256": "d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "web_socket": { + "dependency": "direct main", + "description": { + "name": "web_socket", + "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.1" + "version": "0.1.6" }, "web_socket_channel": { "dependency": "direct main", "description": { "name": "web_socket_channel", - "sha256": "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42", + "sha256": "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.5" + "version": "3.0.1" }, "webdriver": { "dependency": "direct main", @@ -1030,7 +1050,7 @@ } }, "sdks": { - "dart": ">=3.4.0-282.1.beta <4.0.0" + "dart": ">=3.4.3 <4.0.0" } } } diff --git a/pkgs/development/compilers/flutter/versions/3_13/patches/deregister-pub-dependencies-artifact.patch b/pkgs/development/compilers/flutter/versions/3_26/patches/deregister-pub-dependencies-artifact.patch index 01e34c6d292c..01e34c6d292c 100644 --- a/pkgs/development/compilers/flutter/versions/3_13/patches/deregister-pub-dependencies-artifact.patch +++ b/pkgs/development/compilers/flutter/versions/3_26/patches/deregister-pub-dependencies-artifact.patch diff --git a/pkgs/development/compilers/flutter/versions/3_23/patches/disable-auto-update.patch b/pkgs/development/compilers/flutter/versions/3_26/patches/disable-auto-update.patch index 05960c01b737..2ad292efd222 100644 --- a/pkgs/development/compilers/flutter/versions/3_23/patches/disable-auto-update.patch +++ b/pkgs/development/compilers/flutter/versions/3_26/patches/disable-auto-update.patch @@ -1,8 +1,8 @@ diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart -index b7e624b4e2..edfdde118b 100644 +index e4e474ab6e..5548599802 100644 --- a/packages/flutter_tools/lib/src/runner/flutter_command.dart +++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart -@@ -1554,7 +1554,7 @@ Run 'flutter -h' (or 'flutter <command> -h') for available flutter commands and +@@ -1693,7 +1693,7 @@ Run 'flutter -h' (or 'flutter <command> -h') for available flutter commands and // Populate the cache. We call this before pub get below so that the // sky_engine package is available in the flutter cache for pub to find. @@ -12,26 +12,19 @@ index b7e624b4e2..edfdde118b 100644 // ios-deploy on macOS) are required to determine `requiredArtifacts`. final bool offline; diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -index 5d6d78639f..90a4dfa555 100644 +index 50783f8435..db94062840 100644 --- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart +++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -@@ -297,7 +297,6 @@ class FlutterCommandRunner extends CommandRunner<void> { - globals.flutterUsage.suppressAnalytics = true; +@@ -377,11 +377,7 @@ class FlutterCommandRunner extends CommandRunner<void> { + globals.analytics.suppressTelemetry(); } - globals.flutterVersion.ensureVersionFile(); final bool machineFlag = topLevelResults[FlutterGlobalOptions.kMachineFlag] as bool? ?? false; - final bool ci = await globals.botDetector.isRunningOnBot; - final bool redirectedCompletion = !globals.stdio.hasTerminal && -@@ -306,11 +305,6 @@ class FlutterCommandRunner extends CommandRunner<void> { - final bool versionCheckFlag = topLevelResults[FlutterGlobalOptions.kVersionCheckFlag] as bool? ?? false; - final bool explicitVersionCheckPassed = topLevelResults.wasParsed(FlutterGlobalOptions.kVersionCheckFlag) && versionCheckFlag; - -- if (topLevelResults.command?.name != 'upgrade' && -- (explicitVersionCheckPassed || (versionCheckFlag && !isMachine))) { +- if (await _shouldCheckForUpdates(topLevelResults, topLevelMachineFlag: machineFlag)) { - await globals.flutterVersion.checkFlutterVersionFreshness(); - } -- + // See if the user specified a specific device. final String? specifiedDeviceId = topLevelResults[FlutterGlobalOptions.kDeviceIdOption] as String?; - if (specifiedDeviceId != null) { + diff --git a/pkgs/development/compilers/flutter/versions/3_26/patches/fix-ios-build-xcode-backend-sh.patch b/pkgs/development/compilers/flutter/versions/3_26/patches/fix-ios-build-xcode-backend-sh.patch new file mode 100644 index 000000000000..825d40fc6176 --- /dev/null +++ b/pkgs/development/compilers/flutter/versions/3_26/patches/fix-ios-build-xcode-backend-sh.patch @@ -0,0 +1,69 @@ +From 6df275df3b8694daf16302b407520e3b1dee6724 Mon Sep 17 00:00:00 2001 +From: Philip Hayes <philiphayes9@gmail.com> +Date: Thu, 12 Sep 2024 13:23:00 -0700 +Subject: [PATCH] fix: cleanup xcode_backend.sh to fix iOS build w/ + `NixOS/nixpkgs` flutter + +This patch cleans up `xcode_backend.sh`. It now effectively just runs +`exec $FLUTTER_ROOT/bin/dart ./xcode_backend.dart`. + +The previous `xcode_backend.sh` tries to discover `$FLUTTER_ROOT` from +argv[0], even though its presence is already guaranteed (the wrapped +`xcode_backend.dart` also relies on this env). + +When using nixpkgs flutter, the flutter SDK directory is composed of several +layers, joined together using symlinks (called a `symlinkJoin`). Without this +patch, the auto-discover traverses the symlinks into the wrong layer, and so it +uses an "unwrapped" `dart` command instead of a "wrapped" dart that sets some +important envs/flags (like `$FLUTTER_ROOT`). + +Using the "unwrapped" dart then manifests in this error when compiling, since +it doesn't see the ios build-support artifacts: + +``` +$ flutter run -d iphone +Running Xcode build... +Xcode build done. 6.4s +Failed to build iOS app +Error (Xcode): Target debug_unpack_ios failed: Error: Flutter failed to create a directory at "/<nix-store>/XXXX-flutter-3.24.1-unwrapped/bin/cache/artifacts". +``` +--- + packages/flutter_tools/bin/xcode_backend.sh | 25 ++++----------------- + 1 file changed, 4 insertions(+), 21 deletions(-) + +diff --git a/packages/flutter_tools/bin/xcode_backend.sh b/packages/flutter_tools/bin/xcode_backend.sh +index 2889d7c8e4..48b9d06c6e 100755 +--- a/packages/flutter_tools/bin/xcode_backend.sh ++++ b/packages/flutter_tools/bin/xcode_backend.sh +@@ -6,24 +6,7 @@ + # exit on error, or usage of unset var + set -euo pipefail + +-# Needed because if it is set, cd may print the path it changed to. +-unset CDPATH +- +-function follow_links() ( +- cd -P "$(dirname -- "$1")" +- file="$PWD/$(basename -- "$1")" +- while [[ -h "$file" ]]; do +- cd -P "$(dirname -- "$file")" +- file="$(readlink -- "$file")" +- cd -P "$(dirname -- "$file")" +- file="$PWD/$(basename -- "$file")" +- done +- echo "$file" +-) +- +-PROG_NAME="$(follow_links "${BASH_SOURCE[0]}")" +-BIN_DIR="$(cd "${PROG_NAME%/*}" ; pwd -P)" +-FLUTTER_ROOT="$BIN_DIR/../../.." +-DART="$FLUTTER_ROOT/bin/dart" +- +-"$DART" "$BIN_DIR/xcode_backend.dart" "$@" ++# Run `dart ./xcode_backend.dart` with the dart from $FLUTTER_ROOT. ++dart="${FLUTTER_ROOT}/bin/dart" ++xcode_backend_dart="${BASH_SOURCE[0]%.sh}.dart" ++exec "${dart}" "${xcode_backend_dart}" "$@" +-- +2.46.0 + diff --git a/pkgs/development/compilers/flutter/versions/3_22/patches/gradle-flutter-tools-wrapper.patch b/pkgs/development/compilers/flutter/versions/3_26/patches/gradle-flutter-tools-wrapper.patch index de6080efbba8..de6080efbba8 100644 --- a/pkgs/development/compilers/flutter/versions/3_22/patches/gradle-flutter-tools-wrapper.patch +++ b/pkgs/development/compilers/flutter/versions/3_26/patches/gradle-flutter-tools-wrapper.patch diff --git a/pkgs/development/compilers/flutter/versions/3_22/data.json b/pkgs/development/compilers/flutter/versions/3_27/data.json index 397b5934356a..04e89fdfdc05 100644 --- a/pkgs/development/compilers/flutter/versions/3_22/data.json +++ b/pkgs/development/compilers/flutter/versions/3_27/data.json @@ -1,33 +1,33 @@ { - "version": "3.22.2", - "engineVersion": "edd8546116457bdf1c5bdfb13ecb9463d2bb5ed4", + "version": "3.27.0-0.1.pre", + "engineVersion": "af0f0d559c8a87d912a20971bbd84afc80a54b0f", "engineSwiftShaderHash": "sha256-mRLCvhNkmHz7Rv6GzXkY7OB1opBSq+ATWZ466qZdgto=", "engineSwiftShaderRev": "2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f", - "channel": "stable", + "channel": "beta", "engineHashes": { "aarch64-linux": { - "aarch64-linux": "sha256-MiokUhxz23/HANUv8pD4jrJuj3/EAZNbJVpovM9upKI=", - "x86_64-linux": "sha256-MiokUhxz23/HANUv8pD4jrJuj3/EAZNbJVpovM9upKI=" + "aarch64-linux": "sha256-xEUUengFzRbQhFB7jxTBd8eTMWUhyBTTKyT/ObuyD/o=", + "x86_64-linux": "sha256-xEUUengFzRbQhFB7jxTBd8eTMWUhyBTTKyT/ObuyD/o=" }, "x86_64-linux": { - "aarch64-linux": "sha256-UWVjNgF94dYG7nSX+Gu6B9500RAHw1EOxE0+QJhS+Ao=", - "x86_64-linux": "sha256-UWVjNgF94dYG7nSX+Gu6B9500RAHw1EOxE0+QJhS+Ao=" + "aarch64-linux": "sha256-xEUUengFzRbQhFB7jxTBd8eTMWUhyBTTKyT/ObuyD/o=", + "x86_64-linux": "sha256-xEUUengFzRbQhFB7jxTBd8eTMWUhyBTTKyT/ObuyD/o=" } }, - "dartVersion": "3.4.3", + "dartVersion": "3.6.0-334.3.beta", "dartHash": { - "x86_64-linux": "sha256-wDIdoWoKlutP8kixd12Lppzv2aYeiTJ1A1Sy6lguXgg=", - "aarch64-linux": "sha256-sJBsZBA71Sht8wdUbPVzPv3Zf+vDJXY9w0a7ZC8/aF8=", - "x86_64-darwin": "sha256-XWDZae1bMeQsIOdv7BiMNneBKt6Xhras/QXtPukGyKA=", - "aarch64-darwin": "sha256-4D1e5EmBoA5eDw50EIVNsMjhCP33fNemmUD8/1WvxOM=" + "x86_64-linux": "sha256-xErMxL9HK+MSq++DcSiV95TInMPvKkc9tqQzzMRPYDU=", + "aarch64-linux": "sha256-1grsqBcTmfRlMMTB1rWHVVyzZS2RLA10AADkrV4kk9I=", + "x86_64-darwin": "sha256-4YwpUjyFXTk6/h5OMbOKwd0gTEX0CmHo0TByVs0milA=", + "aarch64-darwin": "sha256-bp2tSs+JDSj3xqurc2NOOfmhbq7u/meFbA7VZPNAyZ8=" }, - "flutterHash": "sha256-7ndnIw72YxNB+VeeejEeRD+xxuLXOcWo322s5CMWzBM=", + "flutterHash": "sha256-M9zETok2sIJP8V8QlvbQdobhnM0QM6OHiHF5mwUosB4=", "artifactHashes": { "android": { - "aarch64-darwin": "sha256-loGG9c6F0cnc5ue7cD6Tk8b79LGijd9YSfKWjlXk+TI=", - "aarch64-linux": "sha256-lIxH729tt0p+5LkLguf1lBk7YdinXngKPL05W6XdVDg=", - "x86_64-darwin": "sha256-loGG9c6F0cnc5ue7cD6Tk8b79LGijd9YSfKWjlXk+TI=", - "x86_64-linux": "sha256-lIxH729tt0p+5LkLguf1lBk7YdinXngKPL05W6XdVDg=" + "aarch64-darwin": "sha256-U29WM+8wPYmBifPWXS4TNdZM2ORsFzhV73B82RAH2TU=", + "aarch64-linux": "sha256-ABHHLnhJIqm4mT9FLMaMjJzecDgh6rLUJpVIuVqfUZg=", + "x86_64-darwin": "sha256-U29WM+8wPYmBifPWXS4TNdZM2ORsFzhV73B82RAH2TU=", + "x86_64-linux": "sha256-ABHHLnhJIqm4mT9FLMaMjJzecDgh6rLUJpVIuVqfUZg=" }, "fuchsia": { "aarch64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", @@ -36,38 +36,38 @@ "x86_64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=" }, "ios": { - "aarch64-darwin": "sha256-d/1d8/Md2tzf/Mu4d3RKHl5Jd8u5HzZSGfBKomt1mlo=", - "aarch64-linux": "sha256-d/1d8/Md2tzf/Mu4d3RKHl5Jd8u5HzZSGfBKomt1mlo=", - "x86_64-darwin": "sha256-d/1d8/Md2tzf/Mu4d3RKHl5Jd8u5HzZSGfBKomt1mlo=", - "x86_64-linux": "sha256-d/1d8/Md2tzf/Mu4d3RKHl5Jd8u5HzZSGfBKomt1mlo=" + "aarch64-darwin": "sha256-7faP4+NeYI79nUjts0UPcmWBI4R/CtGOSdhbozrMvYg=", + "aarch64-linux": "sha256-7faP4+NeYI79nUjts0UPcmWBI4R/CtGOSdhbozrMvYg=", + "x86_64-darwin": "sha256-7faP4+NeYI79nUjts0UPcmWBI4R/CtGOSdhbozrMvYg=", + "x86_64-linux": "sha256-7faP4+NeYI79nUjts0UPcmWBI4R/CtGOSdhbozrMvYg=" }, "linux": { - "aarch64-darwin": "sha256-UYb2OOB0riL+Qrhpke0vYpo0U4buKYcbJRgYSpugJQc=", - "aarch64-linux": "sha256-UYb2OOB0riL+Qrhpke0vYpo0U4buKYcbJRgYSpugJQc=", - "x86_64-darwin": "sha256-ytfyeJeDnAGDsg98POe3fKAxpq8lNVYlV1wY6p2pkbU=", - "x86_64-linux": "sha256-ytfyeJeDnAGDsg98POe3fKAxpq8lNVYlV1wY6p2pkbU=" + "aarch64-darwin": "sha256-bKyDwhYmbpcOa8Uk68+VP1KNpsbDPFqA95TeO/0oiNk=", + "aarch64-linux": "sha256-bKyDwhYmbpcOa8Uk68+VP1KNpsbDPFqA95TeO/0oiNk=", + "x86_64-darwin": "sha256-BCGsqIRYtAACYoBsLlV7m5J1P+M8Kyl9tUNj2jql/q4=", + "x86_64-linux": "sha256-BCGsqIRYtAACYoBsLlV7m5J1P+M8Kyl9tUNj2jql/q4=" }, "macos": { - "aarch64-darwin": "sha256-0XEdCeY1KTmtLz/cgZLSfDbjucXk0FpwVIDZuEPqngk=", - "aarch64-linux": "sha256-0XEdCeY1KTmtLz/cgZLSfDbjucXk0FpwVIDZuEPqngk=", - "x86_64-darwin": "sha256-0XEdCeY1KTmtLz/cgZLSfDbjucXk0FpwVIDZuEPqngk=", - "x86_64-linux": "sha256-0XEdCeY1KTmtLz/cgZLSfDbjucXk0FpwVIDZuEPqngk=" + "aarch64-darwin": "sha256-vYzob2BxI2Ol/H/K6/D8y9mx07PnDzbaZvZe/ukkVqk=", + "aarch64-linux": "sha256-vYzob2BxI2Ol/H/K6/D8y9mx07PnDzbaZvZe/ukkVqk=", + "x86_64-darwin": "sha256-vYzob2BxI2Ol/H/K6/D8y9mx07PnDzbaZvZe/ukkVqk=", + "x86_64-linux": "sha256-vYzob2BxI2Ol/H/K6/D8y9mx07PnDzbaZvZe/ukkVqk=" }, "universal": { - "aarch64-darwin": "sha256-TLDwggTgVTe0+v5lCutysF4ygKPiA1b48ImyNDyl7oA=", - "aarch64-linux": "sha256-rTAX+i+OhyKIevwSFgoWRHw8bHuQCC0Lx/YVlbpwL6c=", - "x86_64-darwin": "sha256-1NztXAPG6HWjk7++TLkq791f5t3Va/wP0I2j3ddmURI=", - "x86_64-linux": "sha256-qWZQdDB+yd7i/Cx15K7KQmzbgzxWDeOwcsHkNeDwRqw=" + "aarch64-darwin": "sha256-s6v1V/Xjt8OZgbjQLrSx+1NTKG9YpTpydQxtvmu3Bo8=", + "aarch64-linux": "sha256-KmwJH7uDLbdGQQsUhdTjjwuGB39cX7db5PncSQVbJ5U=", + "x86_64-darwin": "sha256-iL7+1bwMolQWWWLuXxfnBJWayEGk/KtDnXh+oHpBaZg=", + "x86_64-linux": "sha256-0oE3278pTid3n6zVXVxXV+nEzffCs2R1vzS61c76P5g=" }, "web": { - "aarch64-darwin": "sha256-IFg4+IOJbb2Zi4axzL9FezCzp3kLr2gHmEWUupBmxlg=", - "aarch64-linux": "sha256-IFg4+IOJbb2Zi4axzL9FezCzp3kLr2gHmEWUupBmxlg=", - "x86_64-darwin": "sha256-IFg4+IOJbb2Zi4axzL9FezCzp3kLr2gHmEWUupBmxlg=", - "x86_64-linux": "sha256-IFg4+IOJbb2Zi4axzL9FezCzp3kLr2gHmEWUupBmxlg=" + "aarch64-darwin": "sha256-jpT7q3iHqM0mXRNRgKeLJMA9P5c3P8Qg2m5EwnjtlKg=", + "aarch64-linux": "sha256-jpT7q3iHqM0mXRNRgKeLJMA9P5c3P8Qg2m5EwnjtlKg=", + "x86_64-darwin": "sha256-jpT7q3iHqM0mXRNRgKeLJMA9P5c3P8Qg2m5EwnjtlKg=", + "x86_64-linux": "sha256-jpT7q3iHqM0mXRNRgKeLJMA9P5c3P8Qg2m5EwnjtlKg=" }, "windows": { - "x86_64-darwin": "sha256-gTnkbp6cJHiW9nFYIfnHYJ+vMG1nGV5nZLY0LgFQPtg=", - "x86_64-linux": "sha256-gTnkbp6cJHiW9nFYIfnHYJ+vMG1nGV5nZLY0LgFQPtg=" + "x86_64-darwin": "sha256-LJxwZd/lDtrIMfLrMgG+/KOIAlGpW+b/EebMIngIq3w=", + "x86_64-linux": "sha256-LJxwZd/lDtrIMfLrMgG+/KOIAlGpW+b/EebMIngIq3w=" } }, "pubspecLock": { @@ -76,41 +76,47 @@ "dependency": "direct main", "description": { "name": "_fe_analyzer_shared", - "sha256": "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7", + "sha256": "f6dbf021f4b214d85c79822912c5fcd142a2c4869f01222ad371bc51f9f1c356", "url": "https://pub.dev" }, "source": "hosted", - "version": "67.0.0" + "version": "74.0.0" + }, + "_macros": { + "dependency": "transitive", + "description": "dart", + "source": "sdk", + "version": "0.3.3" }, "analyzer": { "dependency": "direct main", "description": { "name": "analyzer", - "sha256": "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d", + "sha256": "f7e8caf82f2d3190881d81012606effdf8a38e6c1ab9e30947149733065f817c", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.4.1" + "version": "6.9.0" }, "archive": { "dependency": "direct main", "description": { "name": "archive", - "sha256": "80e5141fafcb3361653ce308776cfd7d45e6e9fbb429e14eec571382c0c5fecb", + "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.3.2" + "version": "3.6.1" }, "args": { "dependency": "direct main", "description": { "name": "args", - "sha256": "eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596", + "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.2" + "version": "2.5.0" }, "async": { "dependency": "direct main", @@ -136,11 +142,11 @@ "dependency": "direct main", "description": { "name": "browser_launcher", - "sha256": "6ee4c6b1f68a42e769ef6e663c4f56708522f7bce9d2ab6e308a37b612ffa4ec", + "sha256": "54a2da4d152c34760b87cbd4a9fe8a563379487e57bfcd1b387be394dfa91734", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.1" + "version": "1.1.2" }, "built_collection": { "dependency": "direct main", @@ -156,11 +162,11 @@ "dependency": "direct main", "description": { "name": "built_value", - "sha256": "fedde275e0a6b798c3296963c5cd224e3e1b55d0e478d5b7e65e6b540f363a0e", + "sha256": "c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.9.1" + "version": "8.9.2" }, "checked_yaml": { "dependency": "direct dev", @@ -196,11 +202,11 @@ "dependency": "direct dev", "description": { "name": "collection", - "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a", + "sha256": "a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.18.0" + "version": "1.19.0" }, "completion": { "dependency": "direct main", @@ -226,21 +232,21 @@ "dependency": "direct main", "description": { "name": "coverage", - "sha256": "8acabb8306b57a409bf4c83522065672ee13179297a6bb0cb9ead73948df7c76", + "sha256": "c1fb2dce3c0085f39dc72668e85f8e0210ec7de05345821ff58530567df345a5", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.7.2" + "version": "1.9.2" }, "crypto": { "dependency": "direct main", "description": { "name": "crypto", - "sha256": "ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab", + "sha256": "ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.3" + "version": "3.0.5" }, "csslib": { "dependency": "direct main", @@ -256,71 +262,71 @@ "dependency": "direct main", "description": { "name": "dap", - "sha256": "fb7c8a64857d90bedf5c51954b83bee9304b607bcb8a03a89ec37afbf2d683a7", + "sha256": "c0e53b52c9529d901329045afc4c5acb04304a28acde4b54ab0a08a93da546aa", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.0" + "version": "1.3.0" }, "dds": { "dependency": "direct main", "description": { "name": "dds", - "sha256": "6228ad1e591ee9c54f7f0de3d679d328fb15a7f8d20984a02db2430c3e83816f", + "sha256": "c90723eb1f1402429c57f717550ce5af80288d74a27c45ccbe754a0e3e038f95", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.4.0" + "version": "4.2.7" }, "dds_service_extensions": { "dependency": "direct main", "description": { "name": "dds_service_extensions", - "sha256": "299ebf18d340693a7705a56aa2cc2d41df4081a6496b43b04163406496cea6d3", + "sha256": "390ae1d0128bb43ffe11f8e3c6cd3a481c1920492d1026883d379cee50bdf1a2", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.7.0" + "version": "2.0.0" }, "devtools_shared": { "dependency": "direct main", "description": { "name": "devtools_shared", - "sha256": "8d3452f1ca40d8bbe77db4851dd6f08ea12fc17624c037bfc355587cb8b321be", + "sha256": "72369878105eccd563547afbad97407a2431b96bd4c04a1d6da75cb068437f50", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.1.0" + "version": "10.0.2" }, "dtd": { "dependency": "direct main", "description": { "name": "dtd", - "sha256": "0d4a51ab223090d2d6b86477f414052db78cad1b2de020619f454a2a39369fec", + "sha256": "6e4e508c0d03e12e2c96f21faa0e5acc191f9431ecd02adb8daee64dbfae6b86", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.0" + "version": "2.3.0" }, "dwds": { "dependency": "direct main", "description": { "name": "dwds", - "sha256": "5e7e6d645447ccccd3931340d6e6676608aebc0d64a9a28f370e3b2f4e4eea8a", + "sha256": "d0cf9d18511df6b397c40527f3fd8ddb47b7efcc501e703dd94f13cabaf82ffc", "url": "https://pub.dev" }, "source": "hosted", - "version": "23.3.0" + "version": "24.1.0" }, "extension_discovery": { "dependency": "direct main", "description": { "name": "extension_discovery", - "sha256": "20735622d0763865f9d94c3ecdce4441174530870760253e9d364fb4f3da8688", + "sha256": "de1fce715ab013cdfb00befc3bdf0914bea5e409c3a567b7f8f144bc061611a7", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.0" + "version": "2.1.0" }, "fake_async": { "dependency": "direct main", @@ -336,11 +342,11 @@ "dependency": "direct main", "description": { "name": "ffi", - "sha256": "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21", + "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.2" + "version": "2.1.3" }, "file": { "dependency": "direct main", @@ -386,11 +392,11 @@ "dependency": "direct main", "description": { "name": "frontend_server_client", - "sha256": "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612", + "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.0" + "version": "4.0.0" }, "glob": { "dependency": "direct main", @@ -406,11 +412,11 @@ "dependency": "direct main", "description": { "name": "graphs", - "sha256": "aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19", + "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.1" + "version": "2.3.2" }, "html": { "dependency": "direct main", @@ -426,11 +432,11 @@ "dependency": "direct main", "description": { "name": "http", - "sha256": "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2", + "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.13.6" + "version": "1.2.2" }, "http_multi_server": { "dependency": "direct main", @@ -446,11 +452,11 @@ "dependency": "direct main", "description": { "name": "http_parser", - "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b", + "sha256": "40f592dd352890c3b60fec1b68e786cefb9603e05ff303dbc4dda49b304ecdf4", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.2" + "version": "4.1.0" }, "intl": { "dependency": "direct main", @@ -473,7 +479,7 @@ "version": "1.0.4" }, "js": { - "dependency": "direct dev", + "dependency": "direct main", "description": { "name": "js", "sha256": "c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf", @@ -486,11 +492,11 @@ "dependency": "direct dev", "description": { "name": "json_annotation", - "sha256": "b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467", + "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.8.1" + "version": "4.9.0" }, "json_rpc_2": { "dependency": "direct main", @@ -512,6 +518,16 @@ "source": "hosted", "version": "1.2.0" }, + "macros": { + "dependency": "transitive", + "description": { + "name": "macros", + "sha256": "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.3-main.0" + }, "matcher": { "dependency": "direct main", "description": { @@ -526,31 +542,31 @@ "dependency": "direct main", "description": { "name": "meta", - "sha256": "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136", + "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.12.0" + "version": "1.15.0" }, "mime": { "dependency": "direct main", "description": { "name": "mime", - "sha256": "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2", + "sha256": "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.5" + "version": "1.0.6" }, "multicast_dns": { "dependency": "direct main", "description": { "name": "multicast_dns", - "sha256": "316cc47a958d4bd3c67bd238fe8b44fdfb6133bad89cb191c0c3bd3edb14e296", + "sha256": "982c4cc4cda5f98dd477bddfd623e8e4bd1014e7dbf9e7b05052e14a5b550b99", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.3.2+6" + "version": "0.3.2+7" }, "mustache_template": { "dependency": "direct main", @@ -566,34 +582,34 @@ "dependency": "direct main", "description": { "name": "native_assets_builder", - "sha256": "32beacac1b465c63554eee65e5f1379bd0c7b98f5dcf8a9ac86f014ce450a832", + "sha256": "ad76e66cc1ca7aa922d682651aee2663cd80e6ba483a346d13a8c40f604ebfd9", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.1" + "version": "0.8.3" }, "native_assets_cli": { "dependency": "direct main", "description": { "name": "native_assets_cli", - "sha256": "aa257d7c8d2e4bee8339a077d0ddef97f01b28fadb7a379074142782928ab1c3", + "sha256": "db902509468ec2a6c6d11fa9ce02805ede280e8dbfb5f0014ef3de8483cadfce", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.3" + "version": "0.8.0" }, "native_stack_traces": { "dependency": "direct main", "description": { "name": "native_stack_traces", - "sha256": "c797830b9910d13b0f4e70ddef15cde034214fe3bdb8092c4ea5ffad2f74013f", + "sha256": "8ba566c10ea781491c203876b04b9bdcf19dfbe17b9e486869f20eaae0ee470f", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.6" + "version": "0.6.0" }, "node_preamble": { - "dependency": "direct dev", + "dependency": "direct main", "description": { "name": "node_preamble", "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db", @@ -636,11 +652,11 @@ "dependency": "direct main", "description": { "name": "platform", - "sha256": "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec", + "sha256": "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.4" + "version": "3.1.5" }, "pool": { "dependency": "direct main", @@ -676,21 +692,21 @@ "dependency": "direct dev", "description": { "name": "pubspec_parse", - "sha256": "c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367", + "sha256": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.3" + "version": "1.3.0" }, "shelf": { "dependency": "direct main", "description": { "name": "shelf", - "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4", + "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.4.1" + "version": "1.4.2" }, "shelf_packages_handler": { "dependency": "direct main", @@ -716,31 +732,31 @@ "dependency": "direct main", "description": { "name": "shelf_static", - "sha256": "a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e", + "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.2" + "version": "1.1.3" }, "shelf_web_socket": { "dependency": "direct main", "description": { "name": "shelf_web_socket", - "sha256": "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1", + "sha256": "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.4" + "version": "2.0.0" }, "source_map_stack_trace": { "dependency": "direct main", "description": { "name": "source_map_stack_trace", - "sha256": "84cf769ad83aa6bb61e0aa5a18e53aea683395f196a6f39c4c881fb90ed4f7ae", + "sha256": "c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.1.2" }, "source_maps": { "dependency": "direct main", @@ -762,25 +778,35 @@ "source": "hosted", "version": "1.10.0" }, + "sprintf": { + "dependency": "direct main", + "description": { + "name": "sprintf", + "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0" + }, "sse": { "dependency": "direct main", "description": { "name": "sse", - "sha256": "fdce3a4ac3ae1c01083d05ded0bcdb7e02857ca2323823548e9e76d2f61638f0", + "sha256": "111a05843ea9035042975744fe61d5e8b95bc4d38656dbafc5532da77a0bb89a", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.1.5" + "version": "4.1.6" }, "stack_trace": { "dependency": "direct main", "description": { "name": "stack_trace", - "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", + "sha256": "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.11.1" + "version": "1.12.0" }, "standard_message_codec": { "dependency": "direct main", @@ -806,11 +832,11 @@ "dependency": "direct main", "description": { "name": "string_scanner", - "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde", + "sha256": "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.0" + "version": "1.3.0" }, "sync_http": { "dependency": "direct main", @@ -833,34 +859,34 @@ "version": "1.2.1" }, "test": { - "dependency": "direct dev", + "dependency": "direct main", "description": { "name": "test", - "sha256": "7ee446762c2c50b3bd4ea96fe13ffac69919352bd3b4b17bac3f3465edc58073", + "sha256": "713a8789d62f3233c46b4a90b174737b2c04cb6ae4500f2aa8b1be8f03f5e67f", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.25.2" + "version": "1.25.8" }, "test_api": { "dependency": "direct main", "description": { "name": "test_api", - "sha256": "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f", + "sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.0" + "version": "0.7.3" }, "test_core": { "dependency": "direct main", "description": { "name": "test_core", - "sha256": "2bc4b4ecddd75309300d8096f781c0e3280ca1ef85beda558d33fcbedc2eead4", + "sha256": "12391302411737c176b0b5d6491f466b0dd56d4763e347b6714efbaa74d7953d", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.0" + "version": "0.6.5" }, "typed_data": { "dependency": "direct main", @@ -876,11 +902,11 @@ "dependency": "direct main", "description": { "name": "unified_analytics", - "sha256": "57f594f2eff970a74e43aedc9bdec8eb8e3d3c860da8e9e6bcdf7594a07dba6b", + "sha256": "9f3c68cb30faa6d05b920498d2af79eace00fef0bae9beba9f3cda84fdbe46df", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.8.8+1" + "version": "6.1.4" }, "usage": { "dependency": "direct main", @@ -896,31 +922,31 @@ "dependency": "direct main", "description": { "name": "uuid", - "sha256": "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313", + "sha256": "a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.7" + "version": "4.5.1" }, "vm_service": { "dependency": "direct main", "description": { "name": "vm_service", - "sha256": "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec", + "sha256": "f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b", "url": "https://pub.dev" }, "source": "hosted", - "version": "14.2.1" + "version": "14.3.0" }, "vm_service_interface": { "dependency": "direct main", "description": { "name": "vm_service_interface", - "sha256": "28c7c2c2531d94f827cb9ab5f4eacd5864013b559a302b50566b1fab1d9fb1bb", + "sha256": "f827453d9a3f8ceae04e389810da26f9b67636bdd13aa2dd9405b110c4daf59c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.1" + "version": "1.1.0" }, "vm_snapshot_analysis": { "dependency": "direct main", @@ -946,31 +972,41 @@ "dependency": "direct main", "description": { "name": "web", - "sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27", + "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "web_socket": { + "dependency": "direct main", + "description": { + "name": "web_socket", + "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.1" + "version": "0.1.6" }, "web_socket_channel": { "dependency": "direct main", "description": { "name": "web_socket_channel", - "sha256": "1d8e795e2a8b3730c41b8a98a2dff2e0fb57ae6f0764a1c46ec5915387d257b2", + "sha256": "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.4" + "version": "3.0.1" }, "webdriver": { "dependency": "direct main", "description": { "name": "webdriver", - "sha256": "003d7da9519e1e5f329422b36c4dcdf18d7d2978d1ba099ea4e45ba490ed845e", + "sha256": "3d773670966f02a646319410766d3b5e1037efb7f07cc68f844d5e06cd4d61c8", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.3" + "version": "3.0.4" }, "webkit_inspection_protocol": { "dependency": "direct main", @@ -1006,15 +1042,15 @@ "dependency": "direct main", "description": { "name": "yaml_edit", - "sha256": "c566f4f804215d84a7a2c377667f546c6033d5b34b4f9e60dfb09d17c4e97826", + "sha256": "e9c1a3543d2da0db3e90270dbb1e4eebc985ee5e3ffe468d83224472b2194a5f", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.0" + "version": "2.2.1" } }, "sdks": { - "dart": ">=3.3.0 <4.0.0" + "dart": ">=3.4.3 <4.0.0" } } } diff --git a/pkgs/development/compilers/flutter/versions/3_16/patches/deregister-pub-dependencies-artifact.patch b/pkgs/development/compilers/flutter/versions/3_27/patches/deregister-pub-dependencies-artifact.patch index 01e34c6d292c..01e34c6d292c 100644 --- a/pkgs/development/compilers/flutter/versions/3_16/patches/deregister-pub-dependencies-artifact.patch +++ b/pkgs/development/compilers/flutter/versions/3_27/patches/deregister-pub-dependencies-artifact.patch diff --git a/pkgs/development/compilers/flutter/versions/3_22/patches/disable-auto-update.patch b/pkgs/development/compilers/flutter/versions/3_27/patches/disable-auto-update.patch index 05960c01b737..2ad292efd222 100644 --- a/pkgs/development/compilers/flutter/versions/3_22/patches/disable-auto-update.patch +++ b/pkgs/development/compilers/flutter/versions/3_27/patches/disable-auto-update.patch @@ -1,8 +1,8 @@ diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart -index b7e624b4e2..edfdde118b 100644 +index e4e474ab6e..5548599802 100644 --- a/packages/flutter_tools/lib/src/runner/flutter_command.dart +++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart -@@ -1554,7 +1554,7 @@ Run 'flutter -h' (or 'flutter <command> -h') for available flutter commands and +@@ -1693,7 +1693,7 @@ Run 'flutter -h' (or 'flutter <command> -h') for available flutter commands and // Populate the cache. We call this before pub get below so that the // sky_engine package is available in the flutter cache for pub to find. @@ -12,26 +12,19 @@ index b7e624b4e2..edfdde118b 100644 // ios-deploy on macOS) are required to determine `requiredArtifacts`. final bool offline; diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -index 5d6d78639f..90a4dfa555 100644 +index 50783f8435..db94062840 100644 --- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart +++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -@@ -297,7 +297,6 @@ class FlutterCommandRunner extends CommandRunner<void> { - globals.flutterUsage.suppressAnalytics = true; +@@ -377,11 +377,7 @@ class FlutterCommandRunner extends CommandRunner<void> { + globals.analytics.suppressTelemetry(); } - globals.flutterVersion.ensureVersionFile(); final bool machineFlag = topLevelResults[FlutterGlobalOptions.kMachineFlag] as bool? ?? false; - final bool ci = await globals.botDetector.isRunningOnBot; - final bool redirectedCompletion = !globals.stdio.hasTerminal && -@@ -306,11 +305,6 @@ class FlutterCommandRunner extends CommandRunner<void> { - final bool versionCheckFlag = topLevelResults[FlutterGlobalOptions.kVersionCheckFlag] as bool? ?? false; - final bool explicitVersionCheckPassed = topLevelResults.wasParsed(FlutterGlobalOptions.kVersionCheckFlag) && versionCheckFlag; - -- if (topLevelResults.command?.name != 'upgrade' && -- (explicitVersionCheckPassed || (versionCheckFlag && !isMachine))) { +- if (await _shouldCheckForUpdates(topLevelResults, topLevelMachineFlag: machineFlag)) { - await globals.flutterVersion.checkFlutterVersionFreshness(); - } -- + // See if the user specified a specific device. final String? specifiedDeviceId = topLevelResults[FlutterGlobalOptions.kDeviceIdOption] as String?; - if (specifiedDeviceId != null) { + diff --git a/pkgs/development/compilers/flutter/versions/3_27/patches/fix-ios-build-xcode-backend-sh.patch b/pkgs/development/compilers/flutter/versions/3_27/patches/fix-ios-build-xcode-backend-sh.patch new file mode 100644 index 000000000000..825d40fc6176 --- /dev/null +++ b/pkgs/development/compilers/flutter/versions/3_27/patches/fix-ios-build-xcode-backend-sh.patch @@ -0,0 +1,69 @@ +From 6df275df3b8694daf16302b407520e3b1dee6724 Mon Sep 17 00:00:00 2001 +From: Philip Hayes <philiphayes9@gmail.com> +Date: Thu, 12 Sep 2024 13:23:00 -0700 +Subject: [PATCH] fix: cleanup xcode_backend.sh to fix iOS build w/ + `NixOS/nixpkgs` flutter + +This patch cleans up `xcode_backend.sh`. It now effectively just runs +`exec $FLUTTER_ROOT/bin/dart ./xcode_backend.dart`. + +The previous `xcode_backend.sh` tries to discover `$FLUTTER_ROOT` from +argv[0], even though its presence is already guaranteed (the wrapped +`xcode_backend.dart` also relies on this env). + +When using nixpkgs flutter, the flutter SDK directory is composed of several +layers, joined together using symlinks (called a `symlinkJoin`). Without this +patch, the auto-discover traverses the symlinks into the wrong layer, and so it +uses an "unwrapped" `dart` command instead of a "wrapped" dart that sets some +important envs/flags (like `$FLUTTER_ROOT`). + +Using the "unwrapped" dart then manifests in this error when compiling, since +it doesn't see the ios build-support artifacts: + +``` +$ flutter run -d iphone +Running Xcode build... +Xcode build done. 6.4s +Failed to build iOS app +Error (Xcode): Target debug_unpack_ios failed: Error: Flutter failed to create a directory at "/<nix-store>/XXXX-flutter-3.24.1-unwrapped/bin/cache/artifacts". +``` +--- + packages/flutter_tools/bin/xcode_backend.sh | 25 ++++----------------- + 1 file changed, 4 insertions(+), 21 deletions(-) + +diff --git a/packages/flutter_tools/bin/xcode_backend.sh b/packages/flutter_tools/bin/xcode_backend.sh +index 2889d7c8e4..48b9d06c6e 100755 +--- a/packages/flutter_tools/bin/xcode_backend.sh ++++ b/packages/flutter_tools/bin/xcode_backend.sh +@@ -6,24 +6,7 @@ + # exit on error, or usage of unset var + set -euo pipefail + +-# Needed because if it is set, cd may print the path it changed to. +-unset CDPATH +- +-function follow_links() ( +- cd -P "$(dirname -- "$1")" +- file="$PWD/$(basename -- "$1")" +- while [[ -h "$file" ]]; do +- cd -P "$(dirname -- "$file")" +- file="$(readlink -- "$file")" +- cd -P "$(dirname -- "$file")" +- file="$PWD/$(basename -- "$file")" +- done +- echo "$file" +-) +- +-PROG_NAME="$(follow_links "${BASH_SOURCE[0]}")" +-BIN_DIR="$(cd "${PROG_NAME%/*}" ; pwd -P)" +-FLUTTER_ROOT="$BIN_DIR/../../.." +-DART="$FLUTTER_ROOT/bin/dart" +- +-"$DART" "$BIN_DIR/xcode_backend.dart" "$@" ++# Run `dart ./xcode_backend.dart` with the dart from $FLUTTER_ROOT. ++dart="${FLUTTER_ROOT}/bin/dart" ++xcode_backend_dart="${BASH_SOURCE[0]%.sh}.dart" ++exec "${dart}" "${xcode_backend_dart}" "$@" +-- +2.46.0 + diff --git a/pkgs/development/compilers/flutter/versions/3_23/patches/gradle-flutter-tools-wrapper.patch b/pkgs/development/compilers/flutter/versions/3_27/patches/gradle-flutter-tools-wrapper.patch index de6080efbba8..de6080efbba8 100644 --- a/pkgs/development/compilers/flutter/versions/3_23/patches/gradle-flutter-tools-wrapper.patch +++ b/pkgs/development/compilers/flutter/versions/3_27/patches/gradle-flutter-tools-wrapper.patch diff --git a/pkgs/development/compilers/flutter/wrapper.nix b/pkgs/development/compilers/flutter/wrapper.nix index 2c1b1ea125c8..9b4123b0e7d9 100644 --- a/pkgs/development/compilers/flutter/wrapper.nix +++ b/pkgs/development/compilers/flutter/wrapper.nix @@ -146,7 +146,8 @@ in '' + lib.optionalString (flutter ? engine && flutter.engine.meta.available) '' --set-default FLUTTER_ENGINE "${flutter.engine}" \ --add-flags "--local-engine-host ${flutter.engine.outName}" \ - '' + '' --suffix PATH : '${lib.makeBinPath (tools ++ buildTools)}' \ + '' + '' + --suffix PATH : '${lib.makeBinPath (tools ++ buildTools)}' \ --suffix PKG_CONFIG_PATH : "$FLUTTER_PKG_CONFIG_PATH" \ --suffix LIBRARY_PATH : '${lib.makeLibraryPath appStaticBuildDeps}' \ --prefix CXXFLAGS "''\t" '${builtins.concatStringsSep " " (includeFlags ++ extraCxxFlags)}' \ diff --git a/pkgs/development/compilers/flux/default.nix b/pkgs/development/compilers/flux/default.nix deleted file mode 100644 index 6b5620774d3b..000000000000 --- a/pkgs/development/compilers/flux/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config }: - -stdenv.mkDerivation rec { - pname = "flux"; - version = "2013-09-20"; - - src = fetchFromGitHub { - owner = "deniskropp"; - repo = pname; - rev = "e45758aa9384b9740ff021ea952399fd113eb0e9"; - sha256 = "11f3ypg0sdq5kj69zgz6kih1yrzgm48r16spyvzwvlswng147410"; - }; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - - meta = with lib; { - description = "Interface description language used by DirectFB"; - mainProgram = "fluxcomp"; - homepage = "https://github.com/deniskropp/flux"; - license = licenses.mit; - }; -} diff --git a/pkgs/development/compilers/fpc/binary.nix b/pkgs/development/compilers/fpc/binary.nix index e4c8a2358fc8..6f8acae7f916 100644 --- a/pkgs/development/compilers/fpc/binary.nix +++ b/pkgs/development/compilers/fpc/binary.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/project/freepascal/Linux/${version}/fpc-${version}.aarch64-linux.tar"; sha256 = "b39470f9b6b5b82f50fc8680a5da37d2834f2129c65c24c5628a80894d565451"; } - else if stdenv.isDarwin then + else if stdenv.hostPlatform.isDarwin then fetchurl { url = "mirror://sourceforge/project/freepascal/Mac%20OS%20X/${version}/fpc-${version}.intelarm64-macosx.dmg"; sha256 = "05d4510c8c887e3c68de20272abf62171aa5b2ef1eba6bce25e4c0bc41ba8b7d"; diff --git a/pkgs/development/compilers/fpc/default.nix b/pkgs/development/compilers/fpc/default.nix index 3c9eb60d57c7..70f3b60efb8d 100644 --- a/pkgs/development/compilers/fpc/default.nix +++ b/pkgs/development/compilers/fpc/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ startFPC gawk ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.CoreFoundation ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { # Patch paths for linux systems. Other platforms will need their own patches. patches = [ ./mark-paths.patch # mark paths for later substitution in postPatch - ] ++ lib.optional stdenv.isAarch64 (fetchpatch { + ] ++ lib.optional stdenv.hostPlatform.isAarch64 (fetchpatch { # backport upstream patch for aarch64 glibc 2.34 url = "https://gitlab.com/freepascal.org/fpc/source/-/commit/a20a7e3497bccf3415bf47ccc55f133eb9d6d6a0.patch"; hash = "sha256-xKTBwuOxOwX9KCazQbBNLhMXCqkuJgIFvlXewHY63GM="; @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ''; NIX_LDFLAGS = lib.optionalString - stdenv.isDarwin (with darwin.apple_sdk.frameworks; "-F${CoreFoundation}/Library/Frameworks"); + stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; "-F${CoreFoundation}/Library/Frameworks"); makeFlags = [ "NOGDB=1" "FPC=${startFPC}/bin/fpc" ]; diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix index ba2eeada5e46..4cd1dd9ab2f0 100644 --- a/pkgs/development/compilers/fpc/lazarus.nix +++ b/pkgs/development/compilers/fpc/lazarus.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { LCL_PLATFORM = if withQt then "qt5" else "gtk2"; NIX_LDFLAGS = lib.concatStringsSep " " ([ - "-L${stdenv.cc.cc.lib}/lib" + "-L${lib.getLib stdenv.cc.cc}/lib" "-lX11" "-lXext" "-lXi" diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix deleted file mode 100644 index d141c6f5d4c5..000000000000 --- a/pkgs/development/compilers/fsharp/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -# Temporarily avoid dependency on dotnetbuildhelpers to avoid rebuilding many times while working on it - -{ lib, stdenv, fetchFromGitHub, mono, pkg-config, dotnetbuildhelpers, autoconf, automake, which }: - -stdenv.mkDerivation rec { - pname = "fsharp"; - version = "4.0.1.1"; - - src = fetchFromGitHub { - owner = "fsharp"; - repo = "fsharp"; - rev = version; - sha256 = "sha256-dgTEM2aL8lVjVMuW0+HLc+TUA39IiuBv/RfHYNURh5s="; - }; - - nativeBuildInputs = [ pkg-config autoconf automake ]; - buildInputs = [ mono dotnetbuildhelpers which ]; - - configurePhase = '' - sed -i '988d' src/FSharpSource.targets - substituteInPlace ./autogen.sh --replace "/usr/bin/env sh" "${stdenv.shell}" - ./autogen.sh --prefix $out - ''; - - # Make sure the executables use the right mono binary, - # and set up some symlinks for backwards compatibility. - postInstall = '' - substituteInPlace $out/bin/fsharpc --replace " mono " " ${mono}/bin/mono " - substituteInPlace $out/bin/fsharpi --replace " mono " " ${mono}/bin/mono " - substituteInPlace $out/bin/fsharpiAnyCpu --replace " mono " " ${mono}/bin/mono " - ln -s $out/bin/fsharpc $out/bin/fsc - ln -s $out/bin/fsharpi $out/bin/fsi - for dll in "$out/lib/mono/4.5"/FSharp*.dll - do - create-pkg-config-for-dll.sh "$out/lib/pkgconfig" "$dll" - done - ''; - - # To fix this error when running: - # The file "/nix/store/path/whatever.exe" is an not a valid CIL image - dontStrip = true; - - meta = { - description = "Functional CLI language"; - homepage = "https://fsharp.org/"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ thoughtpolice raskin ]; - platforms = with lib.platforms; unix; - }; -} diff --git a/pkgs/development/compilers/gambit/build.nix b/pkgs/development/compilers/gambit/build.nix index 05d92d434faf..78c98fe50f21 100644 --- a/pkgs/development/compilers/gambit/build.nix +++ b/pkgs/development/compilers/gambit/build.nix @@ -78,9 +78,9 @@ gccStdenv.mkDerivation rec { ] ++ gambit-params.extraOptions # TODO: pick an appropriate architecture to optimize on on x86-64? # https://gcc.gnu.org/onlinedocs/gcc-4.8.4/gcc/i386-and-x86-64-Options.html#i386-and-x86-64-Options - # ++ lib.optional pkgs.stdenv.isx86_64 "--enable-march=core-avx2" + # ++ lib.optional pkgs.stdenv.hostPlatform.isx86_64 "--enable-march=core-avx2" # Do not enable poll on darwin due to https://github.com/gambit/gambit/issues/498 - ++ lib.optional (!gccStdenv.isDarwin) "--enable-poll"; + ++ lib.optional (!gccStdenv.hostPlatform.isDarwin) "--enable-poll"; configurePhase = '' export CC=${gccStdenv.cc}/bin/${gccStdenv.cc.targetPrefix}gcc \ @@ -97,7 +97,7 @@ gccStdenv.mkDerivation rec { # OS-specific paths are hardcoded in ./configure substituteInPlace config.status \ - ${lib.optionalString (gccStdenv.isDarwin && !gambit-params.stable) + ${lib.optionalString (gccStdenv.hostPlatform.isDarwin && !gambit-params.stable) ''--replace "/usr/local/opt/openssl@1.1" "${lib.getLib openssl}"''} \ --replace "/usr/local/opt/openssl" "${lib.getLib openssl}" diff --git a/pkgs/development/compilers/gavrasm/default.nix b/pkgs/development/compilers/gavrasm/default.nix deleted file mode 100644 index d77ff0b8e6aa..000000000000 --- a/pkgs/development/compilers/gavrasm/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib, stdenv, fetchzip, fpc , lang ? "en" } : - -assert lib.assertOneOf "lang" lang ["cn" "de" "en" "fr" "tr"]; - -stdenv.mkDerivation rec { - pname = "gavrasm"; - version = "5.4"; - flatVersion = lib.strings.replaceStrings ["."] [""] version; - - src = fetchzip { - url = "http://www.avr-asm-tutorial.net/gavrasm/v${flatVersion}/gavrasm_sources_lin_${flatVersion}.zip"; - sha256 = "sha256-uTalb8Wzn2RAoUKZx9RZFCX+V9HUEtUnJ4eSltFumh0="; - stripRoot=false; - }; - - nativeBuildInputs = [ fpc ]; - - configurePhase = '' - runHook preConfigure - cp gavrlang_${lang}.pas gavrlang.pas - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - fpc gavrasm.pas - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin - cp gavrasm $out/bin - mkdir -p $out/doc - cp instr.asm $out/doc - cp ReadMe.Txt $out/doc - cp LiesMich.Txt $out/doc - runHook postInstall - ''; - - meta = with lib; { - homepage = "http://www.avr-asm-tutorial.net/gavrasm/"; - description = "AVR Assembler for ATMEL AVR-Processors"; - license = licenses.unfree; - maintainers = with maintainers; [ mafo ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/compilers/gbforth/default.nix b/pkgs/development/compilers/gbforth/default.nix deleted file mode 100644 index 22c559a97350..000000000000 --- a/pkgs/development/compilers/gbforth/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, makeWrapper -, gforth -}: - -stdenv.mkDerivation { - pname = "gbforth"; - version = "unstable-2023-03-02"; - - src = fetchFromGitHub { - owner = "ams-hackers"; - repo = "gbforth"; - rev = "428fcf5054fe301e90ac74b1d920ee3ecc375b5b"; - hash = "sha256-v1bdwT15Wg1VKpo74Cc3tsTl1uOKvKdlHWtbZkJ/qbA="; - }; - - nativeBuildInputs = [ - makeWrapper - ]; - - dontBuild = true; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/gbforth $out/bin - cp -r lib shared src gbforth.fs $out/share/gbforth/ - makeWrapper ${gforth}/bin/gforth $out/bin/gbforth \ - --set GBFORTH_PATH $out/share/gbforth/lib \ - --add-flags $out/share/gbforth/gbforth.fs - runHook postInstall - ''; - - doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck - $out/bin/gbforth examples/simon/simon.fs - runHook postInstallCheck - ''; - - meta = with lib; { - homepage = "https://gbforth.org/"; - description = "Forth-based Game Boy development kit"; - mainProgram = "gbforth"; - longDescription = '' - A Forth-based Game Boy development kit. - It features a Forth-based assembler, a cross-compiler with support for - lazy code generation and a library of useful words. - ''; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ fgaz ]; - }; -} diff --git a/pkgs/development/compilers/gcc-arm-embedded/10/default.nix b/pkgs/development/compilers/gcc-arm-embedded/10/default.nix deleted file mode 100644 index ad690cb26fa2..000000000000 --- a/pkgs/development/compilers/gcc-arm-embedded/10/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib -, stdenv -, fetchurl -, ncurses5 -}: - -stdenv.mkDerivation rec { - pname = "gcc-arm-embedded"; - version = "10.3.1"; - release = "10.3-2021.10"; - - suffix = { - aarch64-linux = "aarch64-linux"; - x86_64-darwin = "mac"; - x86_64-linux = "x86_64-linux"; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - src = fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${release}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2"; - sha256 = { - aarch64-linux = "020j8gkzc0i0b74vz98gvngnwjm5222j1gk5nswfk6587krba1gn"; - x86_64-darwin = "0fr8pki2g4bfk1rk90dzwql37d0b71ngzs9zyx0g2jainan3sqgv"; - x86_64-linux = "18y92vpl22hf74yqdvmpw8adrkl92s4crzzs6avm05md37qb9nwp"; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - }; - - dontConfigure = true; - dontBuild = true; - dontPatchELF = true; - dontStrip = true; - - installPhase = '' - mkdir -p $out - cp -r * $out - ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man - ''; - - preFixup = '' - find $out -type f | while read f; do - patchelf "$f" > /dev/null 2>&1 || continue - patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 ]} "$f" || true - done - ''; - - meta = with lib; { - description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; - homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; - license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; - maintainers = with maintainers; [ prusnak prtzl ]; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - }; -} diff --git a/pkgs/development/compilers/gcc-arm-embedded/11/default.nix b/pkgs/development/compilers/gcc-arm-embedded/11/default.nix deleted file mode 100644 index 4ed1ac9b99b0..000000000000 --- a/pkgs/development/compilers/gcc-arm-embedded/11/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ lib -, stdenv -, fetchurl -, ncurses5 -, python39 -, libxcrypt-legacy -, runtimeShell -}: - -stdenv.mkDerivation rec { - pname = "gcc-arm-embedded"; - version = "11.3.rel1"; - - platform = { - aarch64-linux = "aarch64"; - x86_64-darwin = "darwin-x86_64"; - x86_64-linux = "x86_64"; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - src = fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu/${version}/binrel/arm-gnu-toolchain-${version}-${platform}-arm-none-eabi.tar.xz"; - sha256 = { - aarch64-linux = "0pmm5r0k5mxd5drbn2s8a7qkm8c4fi8j5y31c70yrp0qs08kqwbc"; - x86_64-darwin = "1kr9kd9p2xk84fa99zf3gz5lkww2i9spqkjigjwakfkzbva56qw2"; - x86_64-linux = "08b1w1zmj4z80k59zmlc1bf34lg8d7z65fwvp5ir2pb1d1zxh86l"; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - }; - - dontConfigure = true; - dontBuild = true; - dontPatchELF = true; - dontStrip = true; - - installPhase = '' - mkdir -p $out - cp -r * $out - ''; - - preFixup = '' - find $out -type f | while read f; do - patchelf "$f" > /dev/null 2>&1 || continue - patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python39 libxcrypt-legacy ]} "$f" || true - done - ''; - - postFixup = '' - mv $out/bin/arm-none-eabi-gdb $out/bin/arm-none-eabi-gdb-unwrapped - cat <<EOF > $out/bin/arm-none-eabi-gdb - #!${runtimeShell} - export PYTHONPATH=${python39}/lib/python3.9 - export PYTHONHOME=${python39.interpreter} - exec $out/bin/arm-none-eabi-gdb-unwrapped "\$@" - EOF - chmod +x $out/bin/arm-none-eabi-gdb - ''; - - meta = with lib; { - description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; - homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; - license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; - maintainers = with maintainers; [ prusnak ]; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - }; -} diff --git a/pkgs/development/compilers/gcc-arm-embedded/12/default.nix b/pkgs/development/compilers/gcc-arm-embedded/12/default.nix deleted file mode 100644 index 0407cfa71e09..000000000000 --- a/pkgs/development/compilers/gcc-arm-embedded/12/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ lib -, stdenv -, fetchurl -, ncurses5 -, python39 -, libxcrypt-legacy -, runtimeShell -}: - -stdenv.mkDerivation rec { - pname = "gcc-arm-embedded"; - version = "12.3.rel1"; - - platform = { - aarch64-darwin = "darwin-arm64"; - aarch64-linux = "aarch64"; - x86_64-darwin = "darwin-x86_64"; - x86_64-linux = "x86_64"; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - src = fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu/${version}/binrel/arm-gnu-toolchain-${version}-${platform}-arm-none-eabi.tar.xz"; - sha256 = { - aarch64-darwin = "sha256-Oy7uC99xwbvrPDt0JPv3vZ1cPw9aOkp4FZyeOtIZ570="; - aarch64-linux = "sha256-FMBIfVdT9gcdJOVoiB98fmf4DdgxZd7FFks3MTlK9DE="; - x86_64-darwin = "sha256-5u2L+TD62c4z4SCrkLNpV7H3efzKpt5snKmliYLAQpE="; - x86_64-linux = "sha256-EqKBVkQxjrzOr4S+q7Zl0JJLbnniEEhFLFMxpWMyswk="; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - }; - - dontConfigure = true; - dontBuild = true; - dontPatchELF = true; - dontStrip = true; - - installPhase = '' - mkdir -p $out - cp -r * $out - ''; - - preFixup = '' - find $out -type f | while read f; do - patchelf "$f" > /dev/null 2>&1 || continue - patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python39 libxcrypt-legacy ]} "$f" || true - done - ''; - - postFixup = '' - mv $out/bin/arm-none-eabi-gdb $out/bin/arm-none-eabi-gdb-unwrapped - cat <<EOF > $out/bin/arm-none-eabi-gdb - #!${runtimeShell} - export PYTHONPATH=${python39}/lib/python3.9 - export PYTHONHOME=${python39.interpreter} - exec $out/bin/arm-none-eabi-gdb-unwrapped "\$@" - EOF - chmod +x $out/bin/arm-none-eabi-gdb - ''; - - meta = with lib; { - description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; - homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; - license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; - maintainers = with maintainers; [ prusnak prtzl ]; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - }; -} diff --git a/pkgs/development/compilers/gcc-arm-embedded/13/default.nix b/pkgs/development/compilers/gcc-arm-embedded/13/default.nix deleted file mode 100644 index f3870205a66f..000000000000 --- a/pkgs/development/compilers/gcc-arm-embedded/13/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ lib -, stdenv -, fetchurl -, ncurses5 -, python39 -, libxcrypt-legacy -, runtimeShell -}: - -stdenv.mkDerivation rec { - pname = "gcc-arm-embedded"; - version = "13.3.rel1"; - - platform = { - aarch64-darwin = "darwin-arm64"; - aarch64-linux = "aarch64"; - x86_64-darwin = "darwin-x86_64"; - x86_64-linux = "x86_64"; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - src = fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu/${version}/binrel/arm-gnu-toolchain-${version}-${platform}-arm-none-eabi.tar.xz"; - # hashes obtained from location ${url}.sha256asc - sha256 = { - aarch64-darwin = "fb6921db95d345dc7e5e487dd43b745e3a5b4d5c0c7ca4f707347148760317b4"; - aarch64-linux = "c8824bffd057afce2259f7618254e840715f33523a3d4e4294f471208f976764"; - x86_64-darwin = "1ab00742d1ed0926e6f227df39d767f8efab46f5250505c29cb81f548222d794"; - x86_64-linux = "95c011cee430e64dd6087c75c800f04b9c49832cc1000127a92a97f9c8d83af4"; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - }; - - dontConfigure = true; - dontBuild = true; - dontPatchELF = true; - dontStrip = true; - - installPhase = '' - mkdir -p $out - cp -r * $out - ''; - - preFixup = '' - find $out -type f | while read f; do - patchelf "$f" > /dev/null 2>&1 || continue - patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python39 libxcrypt-legacy ]} "$f" || true - done - ''; - - postFixup = '' - mv $out/bin/arm-none-eabi-gdb $out/bin/arm-none-eabi-gdb-unwrapped - cat <<EOF > $out/bin/arm-none-eabi-gdb - #!${runtimeShell} - export PYTHONPATH=${python39}/lib/python3.9 - export PYTHONHOME=${python39.interpreter} - exec $out/bin/arm-none-eabi-gdb-unwrapped "\$@" - EOF - chmod +x $out/bin/arm-none-eabi-gdb - ''; - - meta = with lib; { - description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; - homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; - license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; - maintainers = with maintainers; [ prusnak prtzl ]; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - }; -} diff --git a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix deleted file mode 100644 index d805c24e002c..000000000000 --- a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib -, stdenv -, fetchurl -, ncurses5 -}: - -stdenv.mkDerivation rec { - pname = "gcc-arm-embedded"; - version = "6.3.1"; - release = "6-2017-q2-update"; - subdir = "6-2017q2"; - - suffix = { - x86_64-darwin = "mac"; - x86_64-linux = "linux"; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - src = fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2"; - sha256 = { - x86_64-darwin = "0019ylpq4inq7p5gydpmc9m8ni72fz2csrjlqmgx1698998q0c3x"; - x86_64-linux = "1hvwi02mx34al525sngnl0cm7dkmzxfkb1brq9kvbv28wcplp3p6"; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - }; - - dontConfigure = true; - dontBuild = true; - dontPatchELF = true; - dontStrip = true; - - installPhase = '' - mkdir -p $out - cp -r * $out - ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man - ''; - - preFixup = '' - find $out -type f | while read f; do - patchelf "$f" > /dev/null 2>&1 || continue - patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 ]} "$f" || true - done - ''; - - meta = with lib; { - description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; - homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; - license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; - maintainers = with maintainers; [ prusnak ]; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - }; -} diff --git a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix deleted file mode 100644 index 13d8c12f52ce..000000000000 --- a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib -, stdenv -, fetchurl -, ncurses5 -}: - -stdenv.mkDerivation rec { - pname = "gcc-arm-embedded"; - version = "7.3.1"; - release = "7-2018-q2-update"; - subdir = "7-2018q2"; - - suffix = { - x86_64-darwin = "mac"; - x86_64-linux = "linux"; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - src = fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2"; - sha256 = { - x86_64-darwin = "0nc7m0mpa39qyhfyydxkkyqm7spfc27xf6ygi2vd2aym4r9azi61"; - x86_64-linux = "0sgysp3hfpgrkcbfiwkp0a7ymqs02khfbrjabm52b5z61sgi05xv"; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - }; - - dontConfigure = true; - dontBuild = true; - dontPatchELF = true; - dontStrip = true; - - installPhase = '' - mkdir -p $out - cp -r * $out - ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man - ''; - - preFixup = '' - find $out -type f | while read f; do - patchelf "$f" > /dev/null 2>&1 || continue - patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 ]} "$f" || true - done - ''; - - meta = with lib; { - description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; - homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; - license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; - maintainers = with maintainers; [ prusnak ]; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - }; -} diff --git a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix deleted file mode 100644 index a6448baa7919..000000000000 --- a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib -, stdenv -, fetchurl -, ncurses5 -}: - -stdenv.mkDerivation rec { - pname = "gcc-arm-embedded"; - version = "8.3.1"; - release = "8-2019-q3-update"; - subdir = "8-2019q3/RC1.1"; - - suffix = { - x86_64-darwin = "mac"; - x86_64-linux = "linux"; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - src = fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2"; - sha256 = { - x86_64-darwin = "fc235ce853bf3bceba46eff4b95764c5935ca07fc4998762ef5e5b7d05f37085"; - x86_64-linux = "b50b02b0a16e5aad8620e9d7c31110ef285c1dde28980b1a9448b764d77d8f92"; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - }; - - dontConfigure = true; - dontBuild = true; - dontPatchELF = true; - dontStrip = true; - - installPhase = '' - mkdir -p $out - cp -r * $out - ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man - ''; - - preFixup = '' - find $out -type f | while read f; do - patchelf "$f" > /dev/null 2>&1 || continue - patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 ]} "$f" || true - done - ''; - - meta = with lib; { - description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; - homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; - license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; - maintainers = with maintainers; [ prusnak ]; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - }; -} diff --git a/pkgs/development/compilers/gcc-arm-embedded/9/default.nix b/pkgs/development/compilers/gcc-arm-embedded/9/default.nix deleted file mode 100644 index 4c2b34b0c5b7..000000000000 --- a/pkgs/development/compilers/gcc-arm-embedded/9/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib -, stdenv -, fetchurl -, ncurses5 -}: - -stdenv.mkDerivation rec { - pname = "gcc-arm-embedded"; - version = "9.3.1"; - release = "9-2020-q2-update"; - subdir = "9-2020q2"; - - suffix = { - aarch64-linux = "aarch64-linux"; - x86_64-darwin = "mac"; - x86_64-linux = "x86_64-linux"; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - src = fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2"; - sha256 = { - aarch64-linux = "1b5q2y710hy7lddj8vj3zl54gfl74j30kx3hk3i81zrcbv16ah8z"; - x86_64-darwin = "1ils9z16wrvglh72m428y5irmd36biq79yj86756whib8izbifdv"; - x86_64-linux = "07zi2yr5gvhpbij5pnj49zswb9g2gw7zqp4xwwniqmq477h2xp2s"; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - }; - - dontConfigure = true; - dontBuild = true; - dontPatchELF = true; - dontStrip = true; - - installPhase = '' - mkdir -p $out - cp -r * $out - ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man - ''; - - preFixup = '' - find $out -type f | while read f; do - patchelf "$f" > /dev/null 2>&1 || continue - patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 ]} "$f" || true - done - ''; - - meta = with lib; { - description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; - homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; - license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; - maintainers = with maintainers; [ prusnak ]; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - }; -} diff --git a/pkgs/development/compilers/gcc/all.nix b/pkgs/development/compilers/gcc/all.nix index 232241989b9a..5d5abb82c3eb 100644 --- a/pkgs/development/compilers/gcc/all.nix +++ b/pkgs/development/compilers/gcc/all.nix @@ -24,7 +24,7 @@ let profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then args.libcCross else null; threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else { }; - isl = if stdenv.isDarwin then null + isl = if stdenv.hostPlatform.isDarwin then null else if atLeast "9" then isl_0_20 else /* atLeast "7" */ isl_0_17; } // lib.optionalAttrs (!(atLeast "9")) { diff --git a/pkgs/development/compilers/gcc/common/builder.nix b/pkgs/development/compilers/gcc/common/builder.nix index 8e087623879d..874a43a75f82 100644 --- a/pkgs/development/compilers/gcc/common/builder.nix +++ b/pkgs/development/compilers/gcc/common/builder.nix @@ -7,13 +7,6 @@ let forceLibgccToBuildCrtStuff = import ./libgcc-buildstuff.nix { inherit lib stdenv; }; - - # todo(@reckenrode) Remove in staging. This is ugly, but it avoid unwanted rebuilds on Darwin and Linux. - enableDarwinFixesForStagingNext = - version: - stdenv.buildPlatform.isDarwin - && stdenv.buildPlatform.isx86_64 - && lib.versionOlder version "10"; in originalAttrs: (stdenv.mkDerivation (finalAttrs: originalAttrs // { @@ -27,20 +20,11 @@ originalAttrs: (stdenv.mkDerivation (finalAttrs: originalAttrs // { if test "$staticCompiler" = "1"; then EXTRA_LDFLAGS="-static" - ${ - if enableDarwinFixesForStagingNext finalAttrs.version then - '' - elif test "''${NIX_DONT_SET_RPATH-}" != "1"; then - EXTRA_LDFLAGS="-Wl,-rpath,''${!outputLib}/lib" - else - EXTRA_LDFLAGS="" - '' - else - '' - else - EXTRA_LDFLAGS="-Wl,-rpath,''${!outputLib}/lib" - '' - }fi + elif test "''${NIX_DONT_SET_RPATH-}" != "1"; then + EXTRA_LDFLAGS="-Wl,-rpath,''${!outputLib}/lib" + else + EXTRA_LDFLAGS="" + fi # GCC interprets empty paths as ".", which we don't want. if test -z "''${CPATH-}"; then unset CPATH; fi @@ -74,24 +58,14 @@ originalAttrs: (stdenv.mkDerivation (finalAttrs: originalAttrs // { extraLDFlags=("-L/usr/lib64" "-L/usr/lib") libc_libdir="/usr/lib" fi - ${ - if enableDarwinFixesForStagingNext finalAttrs.version then - '' - extraLDFlags=("-L$libc_libdir") - nixDontSetRpathVar=NIX_DONT_SET_RPATH''${post} - if test "''${!nixDontSetRpathVar-}" != "1"; then - extraLDFlags+=("-rpath" "$libc_libdir") - fi - extraLDFlags+=("''${extraLDFlags[@]}") - '' - else - '' - extraLDFlags=("-L$libc_libdir" "-rpath" "$libc_libdir" - "''${extraLDFlags[@]}") - '' -# The strange indentation with the next line is to ensure the string renders the same when the condition is false, -# which is necessary to prevent unwanted rebuilds in staging-next. -} for i in "''${extraLDFlags[@]}"; do + declare -a prefixExtraLDFlags=() + prefixExtraLDFlags=("-L$libc_libdir") + nixDontSetRpathVar=NIX_DONT_SET_RPATH''${post} + if test "''${!nixDontSetRpathVar-}" != "1"; then + prefixExtraLDFlags+=("-rpath" "$libc_libdir") + fi + extraLDFlags=("''${prefixExtraLDFlags[@]}" "''${extraLDFlags[@]}") + for i in "''${extraLDFlags[@]}"; do declare -g EXTRA_LDFLAGS''${post}+=" -Wl,$i" done done @@ -302,7 +276,7 @@ originalAttrs: (stdenv.mkDerivation (finalAttrs: originalAttrs // { fi # Get rid of some "fixed" header files - rm -rfv $out/lib/gcc/*/*/include-fixed/{root,linux,sys/mount.h,bits/statx.h} + rm -rfv $out/lib/gcc/*/*/include-fixed/{root,linux,sys/mount.h,bits/statx.h,pthread.h} # Replace hard links for i686-pc-linux-gnu-gcc etc. with symlinks. for i in $out/bin/*-gcc*; do diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix index 104851930213..25d4f1f53bae 100644 --- a/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -5,7 +5,7 @@ , threadsCross , version -, binutils, gmp, mpfr, libmpc, isl +, apple-sdk, binutils, gmp, mpfr, libmpc, isl , enableLTO , enableMultilib @@ -112,7 +112,11 @@ let ] ++ lib.optionals (!withoutTargetLibc) [ (if libcCross == null - then "--with-native-system-header-dir=${lib.getDev stdenv.cc.libc}/include" + then ( + # GCC will search for the headers relative to SDKROOT on Darwin, so it will find them in the store. + if targetPlatform.isDarwin then "--with-native-system-header-dir=/usr/include" + else "--with-native-system-header-dir=${lib.getDev stdenv.cc.libc}/include" + ) else "--with-native-system-header-dir=${lib.getDev libcCross}${libcCross.incdir or "/include"}") # gcc builds for cross-compilers (build != host) or cross-built # gcc (host != target) always apply the offset prefix to disentangle @@ -132,7 +136,8 @@ let # # We pick "/" path to effectively avoid sysroot offset and make it work # as a native case. - "--with-build-sysroot=/" + # Darwin requires using the SDK as the sysroot for `SDKROOT` to work correctly. + "--with-build-sysroot=${if targetPlatform.isDarwin then apple-sdk.sdkroot else "/"}" # Same with the stdlibc++ headers embedded in the gcc output "--with-gxx-include-dir=${placeholder "out"}/include/c++/${version}/" ] diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix index f7e2e06bb79a..40a0484d5c50 100644 --- a/pkgs/development/compilers/gcc/default.nix +++ b/pkgs/development/compilers/gcc/default.nix @@ -34,6 +34,7 @@ , nukeReferences , callPackage , majorMinorVersion +, apple-sdk , cctools , darwin }: @@ -105,6 +106,7 @@ let ; # inherit generated with 'nix eval --json --impure --expr "with import ./. {}; lib.attrNames (lib.functionArgs gcc${majorVersion}.cc.override)" | jq '.[]' --raw-output' inherit + apple-sdk binutils buildPackages cargo @@ -224,7 +226,8 @@ pipe ((callFile ./common/builder.nix {}) ({ libc = if libcCross != null then libcCross else stdenv.cc.libc; in ( - '' echo "fixing the {GLIBC,UCLIBC,MUSL}_DYNAMIC_LINKER macros..." + '' + echo "fixing the {GLIBC,UCLIBC,MUSL}_DYNAMIC_LINKER macros..." for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h do grep -q _DYNAMIC_LINKER "$header" || continue diff --git a/pkgs/development/compilers/gcc/patches/11/libgcc-aarch64-darwin-detection.patch b/pkgs/development/compilers/gcc/patches/11/libgcc-aarch64-darwin-detection.patch deleted file mode 100644 index 08dbfec6b249..000000000000 --- a/pkgs/development/compilers/gcc/patches/11/libgcc-aarch64-darwin-detection.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -u a/libgcc/config.host b/libgcc/config.host ---- a/libgcc/config.host 2023-11-05 11:01:55.778638446 -0500 -+++ b/libgcc/config.host 2023-11-05 11:07:29.405103979 -0500 -@@ -227,7 +227,7 @@ - tmake_file="$tmake_file t-slibgcc-darwin" - # newer toolsets produce warnings when building for unsupported versions. - case ${host} in -- *-*-darwin1[89]* | *-*-darwin2* ) -+ *-*-darwin1[89]* | *-*-darwin2* | aarch64*-*-darwin*) - tmake_file="t-darwin-min-8 $tmake_file" - ;; - *-*-darwin9* | *-*-darwin1[0-7]*) -diff -ur a/libgcc/config/t-darwin-rpath b/libgcc/config/t-darwin-rpath ---- a/libgcc/config/t-darwin-rpath 2023-11-05 11:34:18.691150009 -0500 -+++ b/libgcc/config/t-darwin-rpath 2023-11-05 11:50:36.968920904 -0500 -@@ -2,4 +2,4 @@ - SHLIB_RPATH = @rpath - - # Which does not work for Darwin < 9 --HOST_LIBGCC2_CFLAGS += -mmacosx-version-min=10.5 -+SHLIB_LOADER_PATH = -Wl,-rpath,@loader_path diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix index b226975ef034..c25771a93723 100644 --- a/pkgs/development/compilers/gcc/patches/default.nix +++ b/pkgs/development/compilers/gcc/patches/default.nix @@ -120,16 +120,16 @@ in ## Darwin # Fixes detection of Darwin on x86_64-darwin. Otherwise, GCC uses a deployment target of 10.5, which crashes ld64. -++ optional (atLeast14 && stdenv.isDarwin && stdenv.isx86_64) ../patches/14/libgcc-darwin-detection.patch +++ optional (atLeast14 && stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) ../patches/14/libgcc-darwin-detection.patch # Fix detection of bootstrap compiler Ada support (cctools as) on Nix Darwin -++ optional (atLeast12 && stdenv.isDarwin && langAda) ./ada-cctools-as-detection-configure.patch +++ optional (atLeast12 && stdenv.hostPlatform.isDarwin && langAda) ./ada-cctools-as-detection-configure.patch # Remove CoreServices on Darwin, as it is only needed for macOS SDK 14+ -++ optional (atLeast14 && stdenv.isDarwin && langAda) ../patches/14/gcc-darwin-remove-coreservices.patch +++ optional (atLeast14 && stdenv.hostPlatform.isDarwin && langAda) ../patches/14/gcc-darwin-remove-coreservices.patch # Use absolute path in GNAT dylib install names on Darwin -++ optionals (stdenv.isDarwin && langAda) ({ +++ optionals (stdenv.hostPlatform.isDarwin && langAda) ({ "14" = [ ../patches/14/gnat-darwin-dylib-install-name-14.patch ]; "13" = [ ./gnat-darwin-dylib-install-name-13.patch ]; "12" = [ ./gnat-darwin-dylib-install-name.patch ]; @@ -137,7 +137,7 @@ in # We only apply this patch when building a native toolchain for aarch64-darwin, as it breaks building # a foreign one: https://github.com/iains/gcc-12-branch/issues/18 -++ optionals (stdenv.isDarwin && stdenv.isAarch64 && buildPlatform == hostPlatform && hostPlatform == targetPlatform) ({ +++ optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 && buildPlatform == hostPlatform && hostPlatform == targetPlatform) ({ "14" = [ (fetchpatch { # There are no upstream release tags in https://github.com/iains/gcc-14-branch. # 04696df09633baf97cdbbdd6e9929b9d472161d3 is the commit from https://github.com/gcc-mirror/gcc/releases/tag/releases%2Fgcc-14.2.0 @@ -157,9 +157,9 @@ in }) ]; "11" = [ (fetchpatch { # There are no upstream release tags in https://github.com/iains/gcc-11-branch. - # ff4bf32 is the commit from https://github.com/gcc-mirror/gcc/releases/tag/releases%2Fgcc-11.4.0 - url = "https://github.com/iains/gcc-11-branch/compare/ff4bf326d03e750a8d4905ea49425fe7d15a04b8..gcc-11.4-darwin-r0.diff"; - hash = "sha256-6prPgR2eGVJs7vKd6iM1eZsEPCD1ShzLns2Z+29vlt4="; + # 5cc4c42a0d4de08715c2eef8715ad5b2e92a23b6 is the commit from https://github.com/gcc-mirror/gcc/releases/tag/releases%2Fgcc-11.5.0 + url = "https://github.com/iains/gcc-11-branch/compare/5cc4c42a0d4de08715c2eef8715ad5b2e92a23b6..gcc-11.5-darwin-r0.diff"; + hash = "sha256-7lH+GkgkrE6nOp9PMdIoqlQNWK31s6oW+lDt1LIkadE="; }) ]; "10" = [ (fetchpatch { # There are no upstream release tags in https://github.com/iains/gcc-10-branch. @@ -170,7 +170,7 @@ in }.${majorVersion} or []) # Work around newer AvailabilityInternal.h when building older versions of GCC. -++ optionals (stdenv.isDarwin) ({ +++ optionals (stdenv.hostPlatform.isDarwin) ({ "9" = [ ../patches/9/AvailabilityInternal.h-fixincludes.patch ]; "8" = [ ../patches/8/AvailabilityInternal.h-fixincludes.patch ]; "7" = [ ../patches/7/AvailabilityInternal.h-fixincludes.patch ]; @@ -201,9 +201,6 @@ in ## gcc 11.0 and older ############################################################################## -# libgcc’s `configure` script misdetects aarch64-darwin, resulting in an invalid deployment target. -++ optional (is11 && stdenv.isDarwin && stdenv.isAarch64) ./11/libgcc-aarch64-darwin-detection.patch - # openjdk build fails without this on -march=opteron; is upstream in gcc12 ++ optionals (is11) [ ./11/gcc-issue-103910.patch ] diff --git a/pkgs/development/compilers/gerbil/build.nix b/pkgs/development/compilers/gerbil/build.nix index c71ea137eadc..5ed7339c31be 100644 --- a/pkgs/development/compilers/gerbil/build.nix +++ b/pkgs/development/compilers/gerbil/build.nix @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { ./install.sh (cd $out/bin ; ln -s ../gerbil/bin/* .) runHook postInstall - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' libgerbil="$(realpath "$out/gerbil/lib/libgerbil.so")" install_name_tool -id "$libgerbil" "$libgerbil" ''; diff --git a/pkgs/development/compilers/gforth/boot-forth.nix b/pkgs/development/compilers/gforth/boot-forth.nix deleted file mode 100644 index 657847164bb0..000000000000 --- a/pkgs/development/compilers/gforth/boot-forth.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchurl, m4 }: - -let - version = "0.7.3"; -in -stdenv.mkDerivation { - pname = "gforth-boot"; - inherit version; - src = fetchurl { - url = "https://ftp.gnu.org/gnu/gforth/gforth-${version}.tar.gz"; - sha256 = "1c1bahc9ypmca8rv2dijiqbangm1d9av286904yw48ph7ciz4qig"; - }; - - buildInputs = [ m4 ]; - - configureFlags = lib.optionals stdenv.isDarwin [ "--build=x86_64-apple-darwin" ]; - - meta = { - description = "Forth implementation of the GNU project (outdated version used to bootstrap)"; - homepage = "https://www.gnu.org/software/gforth/"; - license = lib.licenses.gpl3; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/development/compilers/gforth/default.nix b/pkgs/development/compilers/gforth/default.nix deleted file mode 100644 index 56d89fd628f2..000000000000 --- a/pkgs/development/compilers/gforth/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, callPackage -, autoreconfHook, texinfo, libffi -}: - -let - swig = callPackage ./swig.nix { }; - bootForth = callPackage ./boot-forth.nix { }; - lispDir = "${placeholder "out"}/share/emacs/site-lisp"; -in stdenv.mkDerivation rec { - - pname = "gforth"; - version = "0.7.9_20230518"; - - src = fetchFromGitHub { - owner = "forthy42"; - repo = "gforth"; - rev = version; - hash = "sha256-rXtmmENBt9RMdLPq8GDyndh4+CYnCmz6NYpe3kH5OwU="; - }; - - nativeBuildInputs = [ - autoreconfHook texinfo bootForth swig - ]; - buildInputs = [ - libffi - ]; - - passthru = { inherit bootForth; }; - - configureFlags = [ - "--with-lispdir=${lispDir}" - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ - "--build=x86_64-apple-darwin" - ]; - - preConfigure = '' - mkdir -p ${lispDir} - ''; - - meta = { - description = "Forth implementation of the GNU project"; - homepage = "https://github.com/forthy42/gforth"; - license = lib.licenses.gpl3; - broken = stdenv.isDarwin && stdenv.isAarch64; # segfault when running ./gforthmi - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/development/compilers/gforth/swig.nix b/pkgs/development/compilers/gforth/swig.nix deleted file mode 100644 index 84cdaee6a36a..000000000000 --- a/pkgs/development/compilers/gforth/swig.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - swig, - pcre, - fetchFromGitHub, -}: - -## for updating to SWIG 4, see -## https://github.com/GeraldWodni/swig/pull/6 -(swig.overrideAttrs (old: { - version = "3.0.9-forth"; - src = fetchFromGitHub { - owner = "GeraldWodni"; - repo = "swig"; - rev = "a45b807e5f9d8ca1a43649c8265d2741a393862a"; - sha256 = "sha256-6nOOPFGFNaQInEkul0ZAh+ks9n3wqCQ6/tbduvG/To0="; - }; - configureFlags = old.configureFlags ++ [ "--enable-forth" ]; -})).override - { pcre2 = pcre; } diff --git a/pkgs/development/compilers/ghc/8.10.7-binary.nix b/pkgs/development/compilers/ghc/8.10.7-binary.nix index a4602c9a645c..20ad72462401 100644 --- a/pkgs/development/compilers/ghc/8.10.7-binary.nix +++ b/pkgs/development/compilers/ghc/8.10.7-binary.nix @@ -199,7 +199,7 @@ stdenv.mkDerivation rec { # rcodesign is used to replace the signature instead of sigtool because it # supports setting the linker-signed flag, which will ensure future processing # of the binaries does not invalidate their signatures. - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ rcodesign ]; + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ rcodesign ]; # Set LD_LIBRARY_PATH or equivalent so that the programs running as part # of the bindist installer can find the libraries they expect. @@ -245,14 +245,14 @@ stdenv.mkDerivation rec { ]) # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib # during linking - + lib.optionalString stdenv.isDarwin ('' + + lib.optionalString stdenv.hostPlatform.isDarwin ('' export NIX_LDFLAGS+=" -no_dtrace_dof" # not enough room in the object files for the full path to libiconv :( for exe in $(find . -type f -executable); do isScript $exe && continue ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe - '' + lib.optionalString stdenv.isAarch64 '' + '' + lib.optionalString stdenv.hostPlatform.isAarch64 '' # Resign the binary and set the linker-signed flag. Ignore failures when the file is an object file. # Object files don’t have signatures, so ignoring the failures is harmless. rcodesign sign --code-signature-flags linker-signed $exe || true @@ -274,7 +274,7 @@ stdenv.mkDerivation rec { '' find . -name integer-gmp.buildinfo \ -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp.out}/lib@" {} \; - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' find . -name base.buildinfo \ -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \; '' + @@ -285,7 +285,7 @@ stdenv.mkDerivation rec { -exec sed -i "s@FFI_LIB_DIR@FFI_LIB_DIR ${numactl.out}/lib@g" {} \; '' + # Rename needed libraries and binaries, fix interpreter - lib.optionalString stdenv.isLinux '' + lib.optionalString stdenv.hostPlatform.isLinux '' find . -type f -executable -exec patchelf \ --interpreter ${stdenv.cc.bintools.dynamicLinker} {} \; '' + @@ -314,7 +314,7 @@ stdenv.mkDerivation rec { "--with-gmp-includes=${lib.getDev gmp}/include" # Note `--with-gmp-libraries` does nothing for GHC bindists: # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6124 - ] ++ lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" + ] ++ lib.optional stdenv.hostPlatform.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" # From: https://github.com/NixOS/nixpkgs/pull/43369/commits ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override"; @@ -349,7 +349,7 @@ stdenv.mkDerivation rec { # On Linux, use patchelf to modify the executables so that they can # find editline/gmp. - postFixup = lib.optionalString stdenv.isLinux + postFixup = lib.optionalString stdenv.hostPlatform.isLinux (if stdenv.hostPlatform.isAarch64 then # Keep rpath as small as possible on aarch64 for patchelf#244. All Elfs # are 2 directories deep from $out/lib, so pooling symlinks there makes @@ -377,7 +377,7 @@ stdenv.mkDerivation rec { patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p fi done - '') + lib.optionalString stdenv.isDarwin '' + '') + lib.optionalString stdenv.hostPlatform.isDarwin '' # not enough room in the object files for the full path to libiconv :( for exe in $(find "$out" -type f -executable); do isScript $exe && continue diff --git a/pkgs/development/compilers/ghc/8.10.7.nix b/pkgs/development/compilers/ghc/8.10.7.nix index a6694e2e99c9..03e4facd0198 100644 --- a/pkgs/development/compilers/ghc/8.10.7.nix +++ b/pkgs/development/compilers/ghc/8.10.7.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgsBuildTarget, pkgsHostTarget, targetPackages +{ lib, stdenv, pkgsBuildTarget, pkgsHostTarget, buildPackages, targetPackages # build-tools , bootPkgs @@ -32,14 +32,19 @@ , # If enabled, use -fPIC when compiling static libs. enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform -, enableProfiledLibs ? true + # Exceeds Hydra output limit (at the time of writing ~3GB) when cross compiled to riscv64. + # A riscv64 cross-compiler fits into the limit comfortably. +, enableProfiledLibs ? !stdenv.hostPlatform.isRiscV64 , # Whether to build dynamic libs for the standard library (on the target # platform). Static libs are always built. enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt , # Whether to build terminfo. - enableTerminfo ? !stdenv.targetPlatform.isWindows + enableTerminfo ? !(stdenv.targetPlatform.isWindows + # terminfo can't be built for cross + || (stdenv.buildPlatform != stdenv.hostPlatform) + || (stdenv.hostPlatform != stdenv.targetPlatform)) , # What flavour to build. An empty string indicates no # specific flavour and falls back to ghc default values. @@ -55,25 +60,31 @@ , enableHaddockProgram ? # Disabled for cross; see note [HADDOCK_DOCS]. - (stdenv.targetPlatform == stdenv.hostPlatform) + (stdenv.buildPlatform == stdenv.hostPlatform && stdenv.targetPlatform == stdenv.hostPlatform) , # Whether to disable the large address space allocator # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ disableLargeAddressSpace ? stdenv.targetPlatform.isiOS + +, # Whether to build an unregisterised version of GHC. + # GHC will normally auto-detect whether it can do a registered build, but this + # option will force it to do an unregistered build when set to true. + # See https://gitlab.haskell.org/ghc/ghc/-/wikis/building/unregisterised + enableUnregisterised ? false }@args: assert !enableIntegerSimple -> gmp != null; # Cross cannot currently build the `haddock` program for silly reasons, # see note [HADDOCK_DOCS]. -assert (stdenv.targetPlatform != stdenv.hostPlatform) -> !enableHaddockProgram; +assert (stdenv.buildPlatform != stdenv.hostPlatform || stdenv.targetPlatform != stdenv.hostPlatform) -> !enableHaddockProgram; + +# GHC does not support building when all 3 platforms are different. +assert stdenv.buildPlatform == stdenv.hostPlatform || stdenv.hostPlatform == stdenv.targetPlatform; let - libffi_name = if stdenv.isDarwin && stdenv.isAarch64 then "libffi" else "libffi_3_3"; inherit (stdenv) buildPlatform hostPlatform targetPlatform; - inherit (bootPkgs) ghc; - # TODO(@Ericson2314) Make unconditional targetPrefix = lib.optionalString (targetPlatform != hostPlatform) @@ -86,6 +97,8 @@ let endif BUILD_SPHINX_HTML = ${if enableDocs then "YES" else "NO"} BUILD_SPHINX_PDF = NO + + WITH_TERMINFO = ${if enableTerminfo then "YES" else "NO"} '' + # Note [HADDOCK_DOCS]: # Unfortunately currently `HADDOCK_DOCS` controls both whether the `haddock` @@ -134,7 +147,9 @@ let pkgsBuildTarget.targetPackages.stdenv.cc ] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm; + buildCC = buildPackages.stdenv.cc; targetCC = builtins.head toolsForTarget; + installCC = pkgsHostTarget.targetPackages.stdenv.cc; # toolPath calculates the absolute path to the name tool associated with a # given `stdenv.cc` derivation, i.e. it picks the correct derivation to take @@ -145,12 +160,13 @@ let tools = { "cc" = cc; "c++" = cc; - as = cc.bintools.bintools; + as = cc.bintools; - ar = cc.bintools.bintools; - ranlib = cc.bintools.bintools; - nm = cc.bintools.bintools; - readelf = cc.bintools.bintools; + ar = cc.bintools; + ranlib = cc.bintools; + nm = cc.bintools; + readelf = cc.bintools; + objdump = cc.bintools; ld = cc.bintools; "ld.gold" = cc.bintools; @@ -169,6 +185,9 @@ let if stdenv.targetPlatform.isDarwin then cc.bintools else cc.bintools.bintools; + + # clang is used as an assembler on darwin with the LLVM backend + clang = cc; }.${name}; in "${tools}/bin/${tools.targetPrefix}${name}"; @@ -185,14 +204,40 @@ let (lib.optionalString enableIntegerSimple "-integer-simple") ]; -in + libffi_name = + if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 + then "libffi" + else "libffi_3_3"; + + # These libraries are library dependencies of the standard libraries bundled + # by GHC (core libs) users will link their compiled artifacts again. Thus, + # they should be taken from targetPackages. + # + # We need to use pkgsHostTarget if we are cross compiling a native GHC compiler, + # though (when native compiling GHC, pkgsHostTarget == targetPackages): + # + # 1. targetPackages would be empty(-ish) in this situation since we can't + # execute cross compiled compilers in order to obtain the libraries + # that would be in targetPackages. + # 2. pkgsHostTarget is fine to use since hostPlatform == targetPlatform in this + # situation. + # 3. The core libs used by the final GHC (stage 2) for user artifacts are also + # used to build stage 2 GHC itself, i.e. the core libs are both host and + # target. + targetLibs = + let + basePackageSet = + if hostPlatform != targetPlatform + then targetPackages + else pkgsHostTarget; + in + { + inherit (basePackageSet) gmp ncurses; + # dynamic inherits are not possible in Nix + libffi = basePackageSet.${libffi_name}; + }; -# C compiler, bintools and LLVM are used at build time, but will also leak into -# the resulting GHC's settings file and used at runtime. This means that we are -# currently only able to build GHC if hostPlatform == buildPlatform. -assert targetCC == pkgsHostTarget.targetPackages.stdenv.cc; -assert buildTargetLlvmPackages.llvm == llvmPackages.llvm; -assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang; +in stdenv.mkDerivation (rec { version = "8.10.7"; @@ -253,7 +298,21 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/8f7dd5710b80906ea7a3e15b7bb56a883a49fed8.patch"; hash = "sha256-C636Nq2U8YOG/av7XQmG3L1rU0bmC9/7m7Hty5pm5+s="; }) - ] ++ lib.optionals stdenv.isDarwin [ + + # Backport part of <https://gitlab.haskell.org/ghc/ghc/-/merge_requests/7111> to 8.10.7 + # The change we are interested in is that Cabal no longer sets include-dirs + # for the GHCi library delegating to the system search path or (in our case) + # cc-wrapper. Without this patch, the target libffi ends up in there (which + # we provide via --with-ffi-includes) which breaks bootstrapping e.g. when + # cross compiling GHC. Without include-dirs, cc-wrapper and splicing will + # correctly pick the suitable libffi out of the build environment. + (fetchpatch { + name = "ghci-no-libffi-include.patch"; + url = "https://gitlab.haskell.org/ghc/ghc/-/commit/b2721819f391ab49871271283f32df54810c4387.patch"; + sha256 = "1rmv3132xhxbka97v0rx7r6larx5f5nnvs4mgm9q3rmgpjyd1vf9"; + includes = [ "libraries/ghci/ghci.cabal.in" ]; + }) + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Make Block.h compile with c++ compilers. Remove with the next release (fetchpatch { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/97d0b0a367e4c6a52a17c3299439ac7de129da24.patch"; @@ -277,6 +336,8 @@ stdenv.mkDerivation (rec { for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do export "''${env#TARGET_}=''${!env}" done + # Stage0 (build->build) which builds stage 1 + export GHC="${bootPkgs.ghc}/bin/ghc" # GHC is a bit confused on its cross terminology, as these would normally be # the *host* tools. export CC="${toolPath "cc" targetCC}" @@ -289,6 +350,7 @@ stdenv.mkDerivation (rec { export RANLIB="${toolPath "ranlib" targetCC}" export READELF="${toolPath "readelf" targetCC}" export STRIP="${toolPath "strip" targetCC}" + export OBJDUMP="${toolPath "objdump" targetCC}" '' + lib.optionalString (stdenv.targetPlatform.linker == "cctools") '' export OTOOL="${toolPath "otool" targetCC}" export INSTALL_NAME_TOOL="${toolPath "install_name_tool" targetCC}" @@ -297,14 +359,28 @@ stdenv.mkDerivation (rec { export OPT="${lib.getBin buildTargetLlvmPackages.llvm}/bin/opt" '' + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) '' # LLVM backend on Darwin needs clang: https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm - export CLANG="${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang" + # The executable we specify via $CLANG is used as an assembler (exclusively, it seems, but this isn't + # clarified in any user facing documentation). As such, it'll be called on assembly produced by $CC + # which usually comes from the darwin stdenv. To prevent a situation where $CLANG doesn't understand + # the assembly it is given, we need to make sure that it matches the LLVM version of $CC if possible. + # It is unclear (at the time of writing 2024-09-01) whether $CC should match the LLVM version we use + # for llc and opt which would require using a custom darwin stdenv for targetCC. + export CLANG="${ + if targetCC.isClang + then toolPath "clang" targetCC + else "${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang" + }" '' + '' + # No need for absolute paths since these tools only need to work during the build + export CC_STAGE0="$CC_FOR_BUILD" + export LD_STAGE0="$LD_FOR_BUILD" + export AR_STAGE0="$AR_FOR_BUILD" echo -n "${buildMK}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" # GHC tries the host xattr /usr/bin/xattr by default which fails since it expects python to be 2.7 @@ -329,21 +405,26 @@ stdenv.mkDerivation (rec { done ''; + # Although it is usually correct to pass --host, we don't do that here because + # GHC's usage of build, host, and target is non-standard. + # See https://gitlab.haskell.org/ghc/ghc/-/wikis/building/cross-compiling # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = [ "build" "host" ] - ++ lib.optional (targetPlatform != hostPlatform) "target"; + configurePlatforms = [ "build" ] + ++ lib.optional (buildPlatform != hostPlatform || targetPlatform != hostPlatform) "target"; # `--with` flags for libraries needed for RTS linker configureFlags = [ "--datadir=$doc/share/doc/ghc" - "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" + ] ++ lib.optionals enableTerminfo [ + "--with-curses-includes=${lib.getDev targetLibs.ncurses}/include" + "--with-curses-libraries=${lib.getLib targetLibs.ncurses}/lib" ] ++ lib.optionals (args.${libffi_name} != null) [ "--with-system-libffi" - "--with-ffi-includes=${targetPackages.${libffi_name}.dev}/include" - "--with-ffi-libraries=${targetPackages.${libffi_name}.out}/lib" + "--with-ffi-includes=${targetLibs.libffi.dev}/include" + "--with-ffi-libraries=${targetLibs.libffi.out}/lib" ] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ - "--with-gmp-includes=${targetPackages.gmp.dev}/include" - "--with-gmp-libraries=${targetPackages.gmp.out}/lib" + "--with-gmp-includes=${targetLibs.gmp.dev}/include" + "--with-gmp-libraries=${targetLibs.gmp.out}/lib" ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" @@ -355,6 +436,8 @@ stdenv.mkDerivation (rec { "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" ] ++ lib.optionals (disableLargeAddressSpace) [ "--disable-large-address-space" + ] ++ lib.optionals enableUnregisterised [ + "--enable-unregisterised" ]; # Make sure we never relax`$PATH` and hooks support for compatibility. @@ -365,17 +448,35 @@ stdenv.mkDerivation (rec { nativeBuildInputs = [ perl autoreconfHook autoconf automake m4 python3 - ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + bootPkgs.alex bootPkgs.happy bootPkgs.hscolour + bootPkgs.ghc-settings-edit + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ] ++ lib.optionals enableDocs [ sphinx ]; + # Everything the stage0 compiler needs to build stage1: CC, bintools, extra libs. + # See also GHC, {CC,LD,AR}_STAGE0 in preConfigure. + depsBuildBuild = [ + # N.B. We do not declare bootPkgs.ghc in any of the stdenv.mkDerivation + # dependency lists to prevent the bintools setup hook from adding ghc's + # lib directory to the linker flags. Instead we tell configure about it + # via the GHC environment variable. + buildCC + # stage0 builds terminfo unconditionally, so we always need ncurses + ncurses + ]; # For building runtime libs depsBuildTarget = toolsForTarget; - buildInputs = [ perl bash ] ++ (libDeps hostPlatform); + # Prevent stage0 ghc from leaking into the final result. This was an issue + # with GHC 9.6. + disallowedReferences = [ + bootPkgs.ghc + ]; + + buildInputs = [ bash ] ++ (libDeps hostPlatform); depsTargetTarget = map lib.getDev (libDeps targetPlatform); depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform); @@ -402,6 +503,39 @@ stdenv.mkDerivation (rec { requiredSystemFeatures = [ "big-parallel" ]; postInstall = '' + settingsFile="$out/lib/${targetPrefix}${passthru.haskellCompilerName}/settings" + + # Make the installed GHC use the host->target tools. + ghc-settings-edit "$settingsFile" \ + "C compiler command" "${toolPath "cc" installCC}" \ + "Haskell CPP command" "${toolPath "cc" installCC}" \ + "C++ compiler command" "${toolPath "c++" installCC}" \ + "ld command" "${toolPath "ld${lib.optionalString useLdGold ".gold"}" installCC}" \ + "Merge objects command" "${toolPath "ld${lib.optionalString useLdGold ".gold"}" installCC}" \ + "ar command" "${toolPath "ar" installCC}" \ + "ranlib command" "${toolPath "ranlib" installCC}" + '' + + lib.optionalString (stdenv.targetPlatform.linker == "cctools") '' + ghc-settings-edit "$settingsFile" \ + "otool command" "${toolPath "otool" installCC}" \ + "install_name_tool command" "${toolPath "install_name_tool" installCC}" + '' + + lib.optionalString useLLVM '' + ghc-settings-edit "$settingsFile" \ + "LLVM llc command" "${lib.getBin llvmPackages.llvm}/bin/llc" \ + "LLVM opt command" "${lib.getBin llvmPackages.llvm}/bin/opt" + '' + + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) '' + ghc-settings-edit "$settingsFile" \ + "LLVM clang command" "${ + # See comment for CLANG in preConfigure + if installCC.isClang + then toolPath "clang" installCC + else "${llvmPackages.clang}/bin/${llvmPackages.clang.targetPrefix}clang" + }" + '' + + '' + # Install the bash completion file. install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc ''; @@ -427,7 +561,8 @@ stdenv.mkDerivation (rec { guibou ] ++ lib.teams.haskell.members; timeout = 24 * 3600; - inherit (ghc.meta) license platforms; + platforms = lib.platforms.all; + inherit (bootPkgs.ghc.meta) license; }; } // lib.optionalAttrs targetPlatform.useAndroidPrebuilt { diff --git a/pkgs/development/compilers/ghc/8.6.5-binary.nix b/pkgs/development/compilers/ghc/8.6.5-binary.nix index d66f47b661a5..eef0cba9f00b 100644 --- a/pkgs/development/compilers/ghc/8.6.5-binary.nix +++ b/pkgs/development/compilers/ghc/8.6.5-binary.nix @@ -26,7 +26,7 @@ let libEnvVar = lib.optionalString stdenv.hostPlatform.isDarwin "DY" + "LD_LIBRARY_PATH"; - glibcDynLinker = assert stdenv.isLinux; + glibcDynLinker = assert stdenv.hostPlatform.isLinux; if stdenv.hostPlatform.libc == "glibc" then # Could be stdenv.cc.bintools.dynamicLinker, keeping as-is to avoid rebuild. ''"$(cat $NIX_CC/nix-support/dynamic-linker)"'' @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { postUnpack = # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib # during linking - lib.optionalString stdenv.isDarwin '' + lib.optionalString stdenv.hostPlatform.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" # not enough room in the object files for the full path to libiconv :( for exe in $(find . -type f -executable); do @@ -110,15 +110,15 @@ stdenv.mkDerivation rec { '' find . -name integer-gmp.buildinfo \ -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp.out}/lib@" {} \; - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' find . -name base.buildinfo \ -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \; '' + # Rename needed libraries and binaries, fix interpreter - lib.optionalString stdenv.isLinux '' + lib.optionalString stdenv.hostPlatform.isLinux '' find . -type f -perm -0100 \ -exec patchelf \ - --replace-needed libncurses${lib.optionalString stdenv.is64bit "w"}.so.5 libncurses.so \ + --replace-needed libncurses${lib.optionalString stdenv.hostPlatform.is64bit "w"}.so.5 libncurses.so \ ${ # This isn't required for x86_64-linux where we use ncurses6 lib.optionalString (!useNcurses6) "--replace-needed libtinfo.so libtinfo.so.5" } \ @@ -142,7 +142,7 @@ stdenv.mkDerivation rec { "--with-gmp-includes=${lib.getDev gmp}/include" # Note `--with-gmp-libraries` does nothing for GHC bindists: # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6124 - ] ++ lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" + ] ++ lib.optional stdenv.hostPlatform.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override"; # No building is necessary, but calling make without flags ironically @@ -160,14 +160,14 @@ stdenv.mkDerivation rec { # On Linux, use patchelf to modify the executables so that they can # find editline/gmp. - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' for p in $(find "$out" -type f -executable); do if isELF "$p"; then echo "Patchelfing $p" patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p fi done - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # not enough room in the object files for the full path to libiconv :( for exe in $(find "$out" -type f -executable); do isScript $exe && continue diff --git a/pkgs/development/compilers/ghc/9.2.4-binary.nix b/pkgs/development/compilers/ghc/9.2.4-binary.nix index 920b63ce4eab..e8c6d83ea82f 100644 --- a/pkgs/development/compilers/ghc/9.2.4-binary.nix +++ b/pkgs/development/compilers/ghc/9.2.4-binary.nix @@ -222,7 +222,7 @@ stdenv.mkDerivation rec { ]) # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib # during linking - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" # not enough room in the object files for the full path to libiconv :( for exe in $(find . -type f -executable); do @@ -247,7 +247,7 @@ stdenv.mkDerivation rec { # we need to modify the package db directly for hadrian bindists find . -name 'ghc-bignum*.conf' \ -exec sed -e '/^[a-z-]*library-dirs/a \ ${lib.getLib gmpUsed}/lib' -i {} \; - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # we need to modify the package db directly for hadrian bindists # (all darwin bindists are hadrian-based for 9.2.2) find . -name 'base*.conf' \ @@ -266,7 +266,7 @@ stdenv.mkDerivation rec { -exec sed -i "s@FFI_LIB_DIR@FFI_LIB_DIR ${numactl.out}/lib@g" {} \; '' + # Rename needed libraries and binaries, fix interpreter - lib.optionalString stdenv.isLinux '' + lib.optionalString stdenv.hostPlatform.isLinux '' find . -type f -executable -exec patchelf \ --interpreter ${stdenv.cc.bintools.dynamicLinker} {} \; ''; @@ -281,7 +281,7 @@ stdenv.mkDerivation rec { "--with-gmp-includes=${lib.getDev gmpUsed}/include" # Note `--with-gmp-libraries` does nothing for GHC bindists: # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6124 - ] ++ lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" + ] ++ lib.optional stdenv.hostPlatform.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" # From: https://github.com/NixOS/nixpkgs/pull/43369/commits ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override"; @@ -316,7 +316,7 @@ stdenv.mkDerivation rec { # On Linux, use patchelf to modify the executables so that they can # find editline/gmp. - postFixup = lib.optionalString (stdenv.isLinux && !(binDistUsed.isStatic or false)) + postFixup = lib.optionalString (stdenv.hostPlatform.isLinux && !(binDistUsed.isStatic or false)) (if stdenv.hostPlatform.isAarch64 then # Keep rpath as small as possible on aarch64 for patchelf#244. All Elfs # are 2 directories deep from $out/lib, so pooling symlinks there makes @@ -344,7 +344,7 @@ stdenv.mkDerivation rec { patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p fi done - '') + lib.optionalString stdenv.isDarwin '' + '') + lib.optionalString stdenv.hostPlatform.isDarwin '' # not enough room in the object files for the full path to libiconv :( for exe in $(find "$out" -type f -executable); do isScript $exe && continue diff --git a/pkgs/development/compilers/ghc/9.6.3-binary.nix b/pkgs/development/compilers/ghc/9.6.3-binary.nix index d67e9f47ac48..6d8f195bb9d3 100644 --- a/pkgs/development/compilers/ghc/9.6.3-binary.nix +++ b/pkgs/development/compilers/ghc/9.6.3-binary.nix @@ -218,7 +218,7 @@ stdenv.mkDerivation rec { ]) # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib # during linking - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" # not enough room in the object files for the full path to libiconv :( for exe in $(find . -type f -executable); do @@ -235,7 +235,7 @@ stdenv.mkDerivation rec { -exec sed -e '/^[a-z-]*library-dirs/a \ ${lib.getLib gmpUsed}/lib' -i {} \; '' # Similar for iconv and libffi on darwin - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' find . -name 'base*.conf' \ -exec sed -e '/^[a-z-]*library-dirs/a \ ${lib.getLib libiconv}/lib' -i {} \; @@ -252,7 +252,7 @@ stdenv.mkDerivation rec { -exec sed -i "s@FFI_LIB_DIR@FFI_LIB_DIR ${numactl.out}/lib@g" {} \; '' + # Rename needed libraries and binaries, fix interpreter - lib.optionalString stdenv.isLinux '' + lib.optionalString stdenv.hostPlatform.isLinux '' find . -type f -executable -exec patchelf \ --interpreter ${stdenv.cc.bintools.dynamicLinker} {} \; ''; @@ -267,7 +267,7 @@ stdenv.mkDerivation rec { configurePlatforms = [ ]; configureFlags = - lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" + lib.optional stdenv.hostPlatform.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" # From: https://github.com/NixOS/nixpkgs/pull/43369/commits ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override"; @@ -308,7 +308,7 @@ stdenv.mkDerivation rec { # On Linux, use patchelf to modify the executables so that they can # find editline/gmp. - postFixup = lib.optionalString (stdenv.isLinux && !(binDistUsed.isStatic or false)) + postFixup = lib.optionalString (stdenv.hostPlatform.isLinux && !(binDistUsed.isStatic or false)) (if stdenv.hostPlatform.isAarch64 then # Keep rpath as small as possible on aarch64 for patchelf#244. All Elfs # are 2 directories deep from $out/lib, so pooling symlinks there makes @@ -336,7 +336,7 @@ stdenv.mkDerivation rec { patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p fi done - '') + lib.optionalString stdenv.isDarwin '' + '') + lib.optionalString stdenv.hostPlatform.isDarwin '' # not enough room in the object files for the full path to libiconv :( for exe in $(find "$out" -type f -executable); do isMachO $exe || continue diff --git a/pkgs/development/compilers/ghc/9.8.3.nix b/pkgs/development/compilers/ghc/9.8.3.nix new file mode 100644 index 000000000000..ce77308f9212 --- /dev/null +++ b/pkgs/development/compilers/ghc/9.8.3.nix @@ -0,0 +1,4 @@ +import ./common-hadrian.nix rec { + version = "9.8.3"; + sha256 = "99e40d729ec8831a633b75fd85d65dd10e31a0133dec9d198d686a273679ab70"; +} diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index b6d4d7236fe6..7bb2135779a4 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -10,8 +10,10 @@ { lib , stdenv +, stdenvNoCC , pkgsBuildTarget , pkgsHostTarget +, buildPackages , targetPackages , fetchpatch @@ -58,15 +60,23 @@ , # If enabled, use -fPIC when compiling static libs. enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform -, enableProfiledLibs ? true + # Exceeds Hydra output limit (at the time of writing ~3GB) when cross compiled to riscv64. + # A riscv64 cross-compiler fits into the limit comfortably. +, enableProfiledLibs ? !stdenv.hostPlatform.isRiscV64 , # Whether to build dynamic libs for the standard library (on the target # platform). Static libs are always built. enableShared ? with stdenv.targetPlatform; !isWindows && !useiOSPrebuilt && !isStatic && !isGhcjs , # Whether to build terminfo. + # FIXME(@sternenseemann): This actually doesn't influence what hadrian does, + # just what buildInputs etc. looks like. It would be best if we could actually + # tell it what to do like it was possible with make. enableTerminfo ? !(stdenv.targetPlatform.isWindows - || stdenv.targetPlatform.isGhcjs) + || stdenv.targetPlatform.isGhcjs + # terminfo can't be built for cross + || (stdenv.buildPlatform != stdenv.hostPlatform) + || (stdenv.hostPlatform != stdenv.targetPlatform)) , # Libdw.c only supports x86_64, i686 and s390x as of 2022-08-04 enableDwarf ? (stdenv.targetPlatform.isx86 || @@ -117,9 +127,8 @@ -- no way to set this via the command line finalStage :: Stage finalStage = ${ - # Always build the stage 2 compiler if possible. Note we can currently - # assume hostPlatform == buildPlatform. - # TODO(@sternenseemann): improve this condition when we can cross-compile GHC + # Always build the stage 2 compiler if possible. + # TODO(@sternensemann): unify condition with make-built GHCs if stdenv.hostPlatform.canExecute stdenv.targetPlatform then "Stage2" # native compiler or “native” cross e.g. pkgsStatic else "Stage1" # cross compiler @@ -160,10 +169,11 @@ patches = let - # Disable haddock generating pretty source listings to stay under 3GB on aarch64-linux enableHyperlinkedSource = - lib.versionAtLeast version "9.8" || - !(stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux); + # Disable haddock generating pretty source listings to stay under 3GB on aarch64-linux + !(stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) + # 9.8 and 9.10 don't run into this problem for some reason + || (lib.versionAtLeast version "9.8" && lib.versionOlder version "9.11"); in [ # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129 @@ -178,6 +188,15 @@ hash = "sha256-MpvTmFFsNiPDoOp9BhZyWeapeibQ77zgEV+xzZ1UAXs="; }) ] + ++ lib.optionals (lib.versionAtLeast version "9.6" && lib.versionOlder version "9.8") [ + # Fix unlit being installed under a different name than is used in the + # settings file: https://gitlab.haskell.org/ghc/ghc/-/issues/23317 + (fetchpatch { + name = "ghc-9.6-fix-unlit-path.patch"; + url = "https://gitlab.haskell.org/ghc/ghc/-/commit/8fde4ac84ec7b1ead238cb158bbef48555d12af9.patch"; + hash = "sha256-3+CyRBpebEZi8YpS22SsdGQHqi0drR7cCKPtKbR3zyE="; + }) + ] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [ # Prevent the paths module from emitting symbols that we don't use # when building with separate outputs. @@ -189,18 +208,24 @@ then ./Cabal-at-least-3.6-paths-fix-cycle-aarch64-darwin.patch else ./Cabal-3.12-paths-fix-cycle-aarch64-darwin.patch) ] - # Prevents passing --hyperlinked-source to haddock. This is a custom - # workaround as we wait for this to be configurable via userSettings or - # similar. https://gitlab.haskell.org/ghc/ghc/-/issues/23625 + # Prevents passing --hyperlinked-source to haddock. Note that this can + # be configured via a user defined flavour now. Unfortunately, it is + # impossible to import an existing flavour in UserSettings, so patching + # the defaults is actually simpler and less maintenance intensive + # compared to keeping an entire flavour definition in sync with upstream + # manually. See also https://gitlab.haskell.org/ghc/ghc/-/issues/23625 ++ lib.optionals (!enableHyperlinkedSource) [ - # TODO(@sternenseemann): Doesn't apply for GHC >= 9.8 - ../../tools/haskell/hadrian/disable-hyperlinked-source.patch + (if lib.versionOlder version "9.8" + then ../../tools/haskell/hadrian/disable-hyperlinked-source-pre-9.8.patch + else ../../tools/haskell/hadrian/disable-hyperlinked-source-extra-args.patch) ] # Incorrect bounds on Cabal in hadrian # https://gitlab.haskell.org/ghc/ghc/-/issues/24100 ++ lib.optionals (lib.elem version [ "9.8.1" "9.8.2" ]) [ ../../tools/haskell/hadrian/hadrian-9.8.1-allow-Cabal-3.10.patch ]; + + stdenv = stdenvNoCC; } # GHC's build system hadrian built from the GHC-to-build's source tree @@ -222,15 +247,25 @@ , # Whether to disable the large address space allocator # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ disableLargeAddressSpace ? stdenv.targetPlatform.isiOS + +, # Whether to build an unregisterised version of GHC. + # GHC will normally auto-detect whether it can do a registered build, but this + # option will force it to do an unregistered build when set to true. + # See https://gitlab.haskell.org/ghc/ghc/-/wikis/building/unregisterised + enableUnregisterised ? false }: assert !enableNativeBignum -> gmp != null; +# GHC does not support building when all 3 platforms are different. +assert stdenv.buildPlatform == stdenv.hostPlatform || stdenv.hostPlatform == stdenv.targetPlatform; + +# It is currently impossible to cross-compile GHC with Hadrian. +assert stdenv.buildPlatform == stdenv.hostPlatform; + let inherit (stdenv) buildPlatform hostPlatform targetPlatform; - inherit (bootPkgs) ghc; - # TODO(@Ericson2314) Make unconditional targetPrefix = lib.optionalString (targetPlatform != hostPlatform) @@ -265,7 +300,12 @@ let else pkgsBuildTarget.targetPackages.stdenv.cc) ] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm; + buildCC = buildPackages.stdenv.cc; targetCC = builtins.head toolsForTarget; + installCC = + if targetPlatform.isGhcjs + then pkgsHostTarget.emscripten + else pkgsHostTarget.targetPackages.stdenv.cc; # toolPath calculates the absolute path to the name tool associated with a # given `stdenv.cc` derivation, i.e. it picks the correct derivation to take @@ -276,12 +316,13 @@ let tools = { "cc" = cc; "c++" = cc; - as = cc.bintools.bintools; + as = cc.bintools; - ar = cc.bintools.bintools; - ranlib = cc.bintools.bintools; - nm = cc.bintools.bintools; - readelf = cc.bintools.bintools; + ar = cc.bintools; + ranlib = cc.bintools; + nm = cc.bintools; + readelf = cc.bintools; + objdump = cc.bintools; ld = cc.bintools; "ld.gold" = cc.bintools; @@ -300,6 +341,9 @@ let if stdenv.targetPlatform.isDarwin then cc.bintools else cc.bintools.bintools; + + # clang is used as an assembler on darwin with the LLVM backend + clang = cc; }.${name}; in "${tools}/bin/${tools.targetPrefix}${name}"; @@ -316,14 +360,34 @@ let (lib.optionalString enableNativeBignum "-native-bignum") ]; -in + # These libraries are library dependencies of the standard libraries bundled + # by GHC (core libs) users will link their compiled artifacts again. Thus, + # they should be taken from targetPackages. + # + # We need to use pkgsHostTarget if we are cross compiling a native GHC compiler, + # though (when native compiling GHC, pkgsHostTarget == targetPackages): + # + # 1. targetPackages would be empty(-ish) in this situation since we can't + # execute cross compiled compilers in order to obtain the libraries + # that would be in targetPackages. + # 2. pkgsHostTarget is fine to use since hostPlatform == targetPlatform in this + # situation. + # 3. The core libs used by the final GHC (stage 2) for user artifacts are also + # used to build stage 2 GHC itself, i.e. the core libs are both host and + # target. + targetLibs = { + inherit + (if hostPlatform != targetPlatform then targetPackages else pkgsHostTarget) + elfutils + gmp + libffi + ncurses; + }; + + # Our Cabal compiler name + haskellCompilerName = "ghc-${version}"; -# C compiler, bintools and LLVM are used at build time, but will also leak into -# the resulting GHC's settings file and used at runtime. This means that we are -# currently only able to build GHC if hostPlatform == buildPlatform. -assert !targetPlatform.isGhcjs -> targetCC == pkgsHostTarget.targetPackages.stdenv.cc; -assert buildTargetLlvmPackages.llvm == llvmPackages.llvm; -assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang; +in stdenv.mkDerivation ({ pname = "${targetPrefix}ghc${variantSuffix}"; @@ -346,6 +410,13 @@ stdenv.mkDerivation ({ for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do export "''${env#TARGET_}=''${!env}" done + # No need for absolute paths since these tools only need to work during the build + export CC_STAGE0="$CC_FOR_BUILD" + export LD_STAGE0="$LD_FOR_BUILD" + export AR_STAGE0="$AR_FOR_BUILD" + + # Stage0 (build->build) which builds stage 1 + export GHC="${bootPkgs.ghc}/bin/ghc" # GHC is a bit confused on its cross terminology, as these would normally be # the *host* tools. export CC="${toolPath "cc" targetCC}" @@ -358,6 +429,7 @@ stdenv.mkDerivation ({ export RANLIB="${toolPath "ranlib" targetCC}" export READELF="${toolPath "readelf" targetCC}" export STRIP="${toolPath "strip" targetCC}" + export OBJDUMP="${toolPath "objdump" targetCC}" '' + lib.optionalString (stdenv.targetPlatform.linker == "cctools") '' export OTOOL="${toolPath "otool" targetCC}" export INSTALL_NAME_TOOL="${toolPath "install_name_tool" targetCC}" @@ -366,13 +438,23 @@ stdenv.mkDerivation ({ export OPT="${lib.getBin buildTargetLlvmPackages.llvm}/bin/opt" '' + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) '' # LLVM backend on Darwin needs clang: https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm - export CLANG="${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang" + # The executable we specify via $CLANG is used as an assembler (exclusively, it seems, but this isn't + # clarified in any user facing documentation). As such, it'll be called on assembly produced by $CC + # which usually comes from the darwin stdenv. To prevent a situation where $CLANG doesn't understand + # the assembly it is given, we need to make sure that it matches the LLVM version of $CC if possible. + # It is unclear (at the time of writing 2024-09-01) whether $CC should match the LLVM version we use + # for llc and opt which would require using a custom darwin stdenv for targetCC. + export CLANG="${ + if targetCC.isClang + then toolPath "clang" targetCC + else "${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang" + }" '' + - lib.optionalString (stdenv.isLinux && hostPlatform.libc == "glibc") '' + lib.optionalString (stdenv.hostPlatform.isLinux && hostPlatform.libc == "glibc") '' export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive" - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" # GHC tries the host xattr /usr/bin/xattr by default which fails since it expects python to be 2.7 @@ -433,14 +515,16 @@ stdenv.mkDerivation ({ # `--with` flags for libraries needed for RTS linker configureFlags = [ "--datadir=$doc/share/doc/ghc" - "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" + ] ++ lib.optionals enableTerminfo [ + "--with-curses-includes=${lib.getDev targetLibs.ncurses}/include" + "--with-curses-libraries=${lib.getLib targetLibs.ncurses}/lib" ] ++ lib.optionals (libffi != null && !targetPlatform.isGhcjs) [ "--with-system-libffi" - "--with-ffi-includes=${targetPackages.libffi.dev}/include" - "--with-ffi-libraries=${targetPackages.libffi.out}/lib" + "--with-ffi-includes=${targetLibs.libffi.dev}/include" + "--with-ffi-libraries=${targetLibs.libffi.out}/lib" ] ++ lib.optionals (targetPlatform == hostPlatform && !enableNativeBignum) [ - "--with-gmp-includes=${targetPackages.gmp.dev}/include" - "--with-gmp-libraries=${targetPackages.gmp.out}/lib" + "--with-gmp-includes=${targetLibs.gmp.dev}/include" + "--with-gmp-libraries=${targetLibs.gmp.out}/lib" ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" @@ -454,14 +538,16 @@ stdenv.mkDerivation ({ "--disable-large-address-space" ] ++ lib.optionals enableDwarf [ "--enable-dwarf-unwind" - "--with-libdw-includes=${lib.getDev targetPackages.elfutils}/include" - "--with-libdw-libraries=${lib.getLib targetPackages.elfutils}/lib" + "--with-libdw-includes=${lib.getDev targetLibs.elfutils}/include" + "--with-libdw-libraries=${lib.getLib targetLibs.elfutils}/lib" ] ++ lib.optionals targetPlatform.isDarwin [ # Darwin uses llvm-ar. GHC will try to use `-L` with `ar` when it is `llvm-ar` # but it doesn’t currently work because Cabal never uses `-L` on Darwin. See: # https://gitlab.haskell.org/ghc/ghc/-/issues/23188 # https://github.com/haskell/cabal/issues/8882 "fp_cv_prog_ar_supports_dash_l=no" + ] ++ lib.optionals enableUnregisterised [ + "--enable-unregisterised" ]; # Make sure we never relax`$PATH` and hooks support for compatibility. @@ -471,12 +557,14 @@ stdenv.mkDerivation ({ dontAddExtraLibs = true; nativeBuildInputs = [ - perl ghc hadrian bootPkgs.alex bootPkgs.happy bootPkgs.hscolour + perl hadrian bootPkgs.alex bootPkgs.happy bootPkgs.hscolour # autoconf and friends are necessary for hadrian to create the bindist autoconf automake m4 # Python is used in a few scripts invoked by hadrian to generate e.g. rts headers. python3 - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + # Tool used to update GHC's settings file in postInstall + bootPkgs.ghc-settings-edit + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ] ++ lib.optionals enableDocs [ sphinx @@ -484,8 +572,25 @@ stdenv.mkDerivation ({ # For building runtime libs depsBuildTarget = toolsForTarget; + # Everything the stage0 compiler needs to build stage1: CC, bintools, extra libs. + # See also GHC, {CC,LD,AR}_STAGE0 in preConfigure. + depsBuildBuild = [ + # N.B. We do not declare bootPkgs.ghc in any of the stdenv.mkDerivation + # dependency lists to prevent the bintools setup hook from adding ghc's + # lib directory to the linker flags. Instead we tell configure about it + # via the GHC environment variable. + buildCC + # stage0 builds terminfo unconditionally, so we always need ncurses + ncurses + ]; + + # Prevent stage0 ghc from leaking into the final result. This was an issue + # with GHC 9.6. + disallowedReferences = [ + bootPkgs.ghc + ]; - buildInputs = [ perl bash ] ++ (libDeps hostPlatform); + buildInputs = [ bash ] ++ (libDeps hostPlatform); depsTargetTarget = map lib.getDev (libDeps targetPlatform); depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform); @@ -553,19 +658,49 @@ stdenv.mkDerivation ({ # leave bindist directory popd + settingsFile="$out/lib/${targetPrefix}${haskellCompilerName}/lib/settings" + + # Make the installed GHC use the host->target tools. + ghc-settings-edit "$settingsFile" \ + "C compiler command" "${toolPath "cc" installCC}" \ + "Haskell CPP command" "${toolPath "cc" installCC}" \ + "C++ compiler command" "${toolPath "c++" installCC}" \ + "ld command" "${toolPath "ld${lib.optionalString useLdGold ".gold"}" installCC}" \ + "Merge objects command" "${toolPath "ld${lib.optionalString useLdGold ".gold"}" installCC}" \ + "ar command" "${toolPath "ar" installCC}" \ + "ranlib command" "${toolPath "ranlib" installCC}" + '' + + lib.optionalString (stdenv.targetPlatform.linker == "cctools") '' + ghc-settings-edit "$settingsFile" \ + "otool command" "${toolPath "otool" installCC}" \ + "install_name_tool command" "${toolPath "install_name_tool" installCC}" + '' + + lib.optionalString useLLVM '' + ghc-settings-edit "$settingsFile" \ + "LLVM llc command" "${lib.getBin llvmPackages.llvm}/bin/llc" \ + "LLVM opt command" "${lib.getBin llvmPackages.llvm}/bin/opt" + '' + + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) '' + ghc-settings-edit "$settingsFile" \ + "LLVM clang command" "${ + # See comment for CLANG in preConfigure + if installCC.isClang + then toolPath "clang" installCC + else "${llvmPackages.clang}/bin/${llvmPackages.clang.targetPrefix}clang" + }" + '' + + '' + # Install the bash completion file. install -Dm 644 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc ''; passthru = { - inherit bootPkgs targetPrefix; + inherit bootPkgs targetPrefix haskellCompilerName; inherit llvmPackages; inherit enableShared; - # Our Cabal compiler name - haskellCompilerName = "ghc-${version}"; - # Expose hadrian used for bootstrapping, for debugging purposes inherit hadrian; @@ -581,7 +716,8 @@ stdenv.mkDerivation ({ guibou ] ++ lib.teams.haskell.members; timeout = 24 * 3600; - inherit (ghc.meta) license platforms; + platforms = lib.platforms.all; + inherit (bootPkgs.ghc.meta) license; }; dontStrip = targetPlatform.useAndroidPrebuilt || targetPlatform.isWasm; diff --git a/pkgs/development/compilers/ghc/common-make-native-bignum.nix b/pkgs/development/compilers/ghc/common-make-native-bignum.nix index 2b23cd75a0ed..7593a175c77c 100644 --- a/pkgs/development/compilers/ghc/common-make-native-bignum.nix +++ b/pkgs/development/compilers/ghc/common-make-native-bignum.nix @@ -3,7 +3,7 @@ , url ? "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz" }: -{ lib, stdenv, pkgsBuildTarget, pkgsHostTarget, targetPackages +{ lib, stdenv, pkgsBuildTarget, pkgsHostTarget, buildPackages, targetPackages # build-tools , bootPkgs @@ -35,14 +35,19 @@ , # If enabled, use -fPIC when compiling static libs. enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform -, enableProfiledLibs ? true + # Exceeds Hydra output limit (at the time of writing ~3GB) when cross compiled to riscv64. + # A riscv64 cross-compiler fits into the limit comfortably. +, enableProfiledLibs ? !stdenv.hostPlatform.isRiscV64 , # Whether to build dynamic libs for the standard library (on the target # platform). Static libs are always built. enableShared ? with stdenv.targetPlatform; !isWindows && !useiOSPrebuilt && !isStatic , # Whether to build terminfo. - enableTerminfo ? !stdenv.targetPlatform.isWindows + enableTerminfo ? !(stdenv.targetPlatform.isWindows + # terminfo can't be built for cross + || (stdenv.buildPlatform != stdenv.hostPlatform) + || (stdenv.hostPlatform != stdenv.targetPlatform)) , # What flavour to build. An empty string indicates no # specific flavour and falls back to ghc default values. @@ -58,24 +63,33 @@ , enableHaddockProgram ? # Disabled for cross; see note [HADDOCK_DOCS]. - (stdenv.targetPlatform == stdenv.hostPlatform) + (stdenv.buildPlatform == stdenv.hostPlatform && stdenv.targetPlatform == stdenv.hostPlatform) , # Whether to disable the large address space allocator # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ disableLargeAddressSpace ? stdenv.targetPlatform.isiOS + +, # Whether to build an unregisterised version of GHC. + # GHC will normally auto-detect whether it can do a registered build, but this + # option will force it to do an unregistered build when set to true. + # See https://gitlab.haskell.org/ghc/ghc/-/wikis/building/unregisterised + # Registerised RV64 compiler produces programs that segfault + # See https://gitlab.haskell.org/ghc/ghc/-/issues/23957 + enableUnregisterised ? stdenv.hostPlatform.isRiscV64 || stdenv.targetPlatform.isRiscV64 }: assert !enableNativeBignum -> gmp != null; # Cross cannot currently build the `haddock` program for silly reasons, # see note [HADDOCK_DOCS]. -assert (stdenv.targetPlatform != stdenv.hostPlatform) -> !enableHaddockProgram; +assert (stdenv.buildPlatform != stdenv.hostPlatform || stdenv.targetPlatform != stdenv.hostPlatform) -> !enableHaddockProgram; + +# GHC does not support building when all 3 platforms are different. +assert stdenv.buildPlatform == stdenv.hostPlatform || stdenv.hostPlatform == stdenv.targetPlatform; let inherit (stdenv) buildPlatform hostPlatform targetPlatform; - inherit (bootPkgs) ghc; - # TODO(@Ericson2314) Make unconditional targetPrefix = lib.optionalString (targetPlatform != hostPlatform) @@ -88,6 +102,8 @@ let endif BUILD_SPHINX_HTML = ${if enableDocs then "YES" else "NO"} BUILD_SPHINX_PDF = NO + + WITH_TERMINFO = ${if enableTerminfo then "YES" else "NO"} '' + # Note [HADDOCK_DOCS]: # Unfortunately currently `HADDOCK_DOCS` controls both whether the `haddock` @@ -134,7 +150,9 @@ let pkgsBuildTarget.targetPackages.stdenv.cc ] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm; + buildCC = buildPackages.stdenv.cc; targetCC = builtins.head toolsForTarget; + installCC = pkgsHostTarget.targetPackages.stdenv.cc; # toolPath calculates the absolute path to the name tool associated with a # given `stdenv.cc` derivation, i.e. it picks the correct derivation to take @@ -145,12 +163,13 @@ let tools = { "cc" = cc; "c++" = cc; - as = cc.bintools.bintools; + as = cc.bintools; - ar = cc.bintools.bintools; - ranlib = cc.bintools.bintools; - nm = cc.bintools.bintools; - readelf = cc.bintools.bintools; + ar = cc.bintools; + ranlib = cc.bintools; + nm = cc.bintools; + readelf = cc.bintools; + objdump = cc.bintools; ld = cc.bintools; "ld.gold" = cc.bintools; @@ -169,6 +188,9 @@ let if stdenv.targetPlatform.isDarwin then cc.bintools else cc.bintools.bintools; + + # clang is used as an assembler on darwin with the LLVM backend + clang = cc; }.${name}; in "${tools}/bin/${tools.targetPrefix}${name}"; @@ -185,14 +207,30 @@ let (lib.optionalString enableNativeBignum "-native-bignum") ]; -in + # These libraries are library dependencies of the standard libraries bundled + # by GHC (core libs) users will link their compiled artifacts again. Thus, + # they should be taken from targetPackages. + # + # We need to use pkgsHostTarget if we are cross compiling a native GHC compiler, + # though (when native compiling GHC, pkgsHostTarget == targetPackages): + # + # 1. targetPackages would be empty(-ish) in this situation since we can't + # execute cross compiled compilers in order to obtain the libraries + # that would be in targetPackages. + # 2. pkgsHostTarget is fine to use since hostPlatform == targetPlatform in this + # situation. + # 3. The core libs used by the final GHC (stage 2) for user artifacts are also + # used to build stage 2 GHC itself, i.e. the core libs are both host and + # target. + targetLibs = { + inherit + (if hostPlatform != targetPlatform then targetPackages else pkgsHostTarget) + gmp + libffi + ncurses; + }; -# C compiler, bintools and LLVM are used at build time, but will also leak into -# the resulting GHC's settings file and used at runtime. This means that we are -# currently only able to build GHC if hostPlatform == buildPlatform. -assert targetCC == pkgsHostTarget.targetPackages.stdenv.cc; -assert buildTargetLlvmPackages.llvm == llvmPackages.llvm; -assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang; +in stdenv.mkDerivation (rec { pname = "${targetPrefix}ghc${variantSuffix}"; @@ -282,6 +320,8 @@ stdenv.mkDerivation (rec { for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do export "''${env#TARGET_}=''${!env}" done + # Stage0 (build->build) which builds stage 1 + export GHC="${bootPkgs.ghc}/bin/ghc" # GHC is a bit confused on its cross terminology, as these would normally be # the *host* tools. export CC="${toolPath "cc" targetCC}" @@ -294,6 +334,7 @@ stdenv.mkDerivation (rec { export RANLIB="${toolPath "ranlib" targetCC}" export READELF="${toolPath "readelf" targetCC}" export STRIP="${toolPath "strip" targetCC}" + export OBJDUMP="${toolPath "objdump" targetCC}" '' + lib.optionalString (stdenv.targetPlatform.linker == "cctools") '' export OTOOL="${toolPath "otool" targetCC}" export INSTALL_NAME_TOOL="${toolPath "install_name_tool" targetCC}" @@ -302,20 +343,35 @@ stdenv.mkDerivation (rec { export OPT="${lib.getBin buildTargetLlvmPackages.llvm}/bin/opt" '' + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) '' # LLVM backend on Darwin needs clang: https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm - export CLANG="${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang" + # The executable we specify via $CLANG is used as an assembler (exclusively, it seems, but this isn't + # clarified in any user facing documentation). As such, it'll be called on assembly produced by $CC + # which usually comes from the darwin stdenv. To prevent a situation where $CLANG doesn't understand + # the assembly it is given, we need to make sure that it matches the LLVM version of $CC if possible. + # It is unclear (at the time of writing 2024-09-01) whether $CC should match the LLVM version we use + # for llc and opt which would require using a custom darwin stdenv for targetCC. + export CLANG="${ + if targetCC.isClang + then toolPath "clang" targetCC + else "${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang" + }" '' + '' + # No need for absolute paths since these tools only need to work during the build + export CC_STAGE0="$CC_FOR_BUILD" + export LD_STAGE0="$LD_FOR_BUILD" + export AR_STAGE0="$AR_FOR_BUILD" + echo -n "${buildMK}" > mk/build.mk '' + lib.optionalString (lib.versionOlder version "9.2" || lib.versionAtLeast version "9.4") '' sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + lib.optionalString (stdenv.isLinux && hostPlatform.libc == "glibc") '' + '' + lib.optionalString (stdenv.hostPlatform.isLinux && hostPlatform.libc == "glibc") '' export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive" - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" - '' + lib.optionalString (stdenv.isDarwin && lib.versionAtLeast version "9.2") '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionAtLeast version "9.2") '' # GHC tries the host xattr /usr/bin/xattr by default which fails since it expects python to be 2.7 export XATTR=${lib.getBin xattr}/bin/xattr @@ -346,21 +402,26 @@ stdenv.mkDerivation (rec { 'MinBootGhcVersion="8.10"' ''; + # Although it is usually correct to pass --host, we don't do that here because + # GHC's usage of build, host, and target is non-standard. + # See https://gitlab.haskell.org/ghc/ghc/-/wikis/building/cross-compiling # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = [ "build" "host" ] - ++ lib.optional (targetPlatform != hostPlatform) "target"; + configurePlatforms = [ "build" ] + ++ lib.optional (buildPlatform != hostPlatform || targetPlatform != hostPlatform) "target"; # `--with` flags for libraries needed for RTS linker configureFlags = [ "--datadir=$doc/share/doc/ghc" - "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" + ] ++ lib.optionals enableTerminfo [ + "--with-curses-includes=${lib.getDev targetLibs.ncurses}/include" + "--with-curses-libraries=${lib.getLib targetLibs.ncurses}/lib" ] ++ lib.optionals (libffi != null) [ "--with-system-libffi" - "--with-ffi-includes=${targetPackages.libffi.dev}/include" - "--with-ffi-libraries=${targetPackages.libffi.out}/lib" + "--with-ffi-includes=${targetLibs.libffi.dev}/include" + "--with-ffi-libraries=${targetLibs.libffi.out}/lib" ] ++ lib.optionals (targetPlatform == hostPlatform && !enableNativeBignum) [ - "--with-gmp-includes=${targetPackages.gmp.dev}/include" - "--with-gmp-libraries=${targetPackages.gmp.out}/lib" + "--with-gmp-includes=${targetLibs.gmp.dev}/include" + "--with-gmp-libraries=${targetLibs.gmp.out}/lib" ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" @@ -372,6 +433,8 @@ stdenv.mkDerivation (rec { "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" ] ++ lib.optionals (disableLargeAddressSpace) [ "--disable-large-address-space" + ] ++ lib.optionals enableUnregisterised [ + "--enable-unregisterised" ]; # Make sure we never relax`$PATH` and hooks support for compatibility. @@ -382,21 +445,39 @@ stdenv.mkDerivation (rec { nativeBuildInputs = [ perl autoconf automake m4 python3 - ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + bootPkgs.alex bootPkgs.happy bootPkgs.hscolour + bootPkgs.ghc-settings-edit + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ] ++ lib.optionals enableDocs [ sphinx - ] ++ lib.optionals (stdenv.isDarwin && lib.versions.majorMinor version == "9.0") [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && lib.versions.majorMinor version == "9.0") [ # TODO(@sternenseemann): backport addition of XATTR env var like # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6447 xattr ]; + # Everything the stage0 compiler needs to build stage1: CC, bintools, extra libs. + # See also GHC, {CC,LD,AR}_STAGE0 in preConfigure. + depsBuildBuild = [ + # N.B. We do not declare bootPkgs.ghc in any of the stdenv.mkDerivation + # dependency lists to prevent the bintools setup hook from adding ghc's + # lib directory to the linker flags. Instead we tell configure about it + # via the GHC environment variable. + buildCC + # stage0 builds terminfo unconditionally, so we always need ncurses + ncurses + ]; # For building runtime libs depsBuildTarget = toolsForTarget; - buildInputs = [ perl bash ] ++ (libDeps hostPlatform); + # Prevent stage0 ghc from leaking into the final result. This was an issue + # with GHC 9.6. + disallowedReferences = [ + bootPkgs.ghc + ]; + + buildInputs = [ bash ] ++ (libDeps hostPlatform); depsTargetTarget = map lib.getDev (libDeps targetPlatform); depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform); @@ -423,6 +504,39 @@ stdenv.mkDerivation (rec { requiredSystemFeatures = [ "big-parallel" ]; postInstall = '' + settingsFile="$out/lib/${targetPrefix}${passthru.haskellCompilerName}/settings" + + # Make the installed GHC use the host->target tools. + ghc-settings-edit "$settingsFile" \ + "C compiler command" "${toolPath "cc" installCC}" \ + "Haskell CPP command" "${toolPath "cc" installCC}" \ + "C++ compiler command" "${toolPath "c++" installCC}" \ + "ld command" "${toolPath "ld${lib.optionalString useLdGold ".gold"}" installCC}" \ + "Merge objects command" "${toolPath "ld${lib.optionalString useLdGold ".gold"}" installCC}" \ + "ar command" "${toolPath "ar" installCC}" \ + "ranlib command" "${toolPath "ranlib" installCC}" + '' + + lib.optionalString (stdenv.targetPlatform.linker == "cctools") '' + ghc-settings-edit "$settingsFile" \ + "otool command" "${toolPath "otool" installCC}" \ + "install_name_tool command" "${toolPath "install_name_tool" installCC}" + '' + + lib.optionalString useLLVM '' + ghc-settings-edit "$settingsFile" \ + "LLVM llc command" "${lib.getBin llvmPackages.llvm}/bin/llc" \ + "LLVM opt command" "${lib.getBin llvmPackages.llvm}/bin/opt" + '' + + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) '' + ghc-settings-edit "$settingsFile" \ + "LLVM clang command" "${ + # See comment for CLANG in preConfigure + if installCC.isClang + then toolPath "clang" installCC + else "${llvmPackages.clang}/bin/${llvmPackages.clang.targetPrefix}clang" + }" + '' + + '' + # Install the bash completion file. install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc ''; @@ -448,7 +562,8 @@ stdenv.mkDerivation (rec { guibou ] ++ lib.teams.haskell.members; timeout = 24 * 3600; - inherit (ghc.meta) license platforms; + platforms = lib.platforms.all; + inherit (bootPkgs.ghc.meta) license; }; } // lib.optionalAttrs targetPlatform.useAndroidPrebuilt { diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 73808dc431a9..10554c4cb48a 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,11 +1,5 @@ import ./common-hadrian.nix { - version = "9.11.20240410"; - rev = "1b1a92bd25c3f7249cf922c5dbf4415d2de44a36"; - sha256 = "sha256-2HdhxhVrKn8c/ZOGYoYThqXpod2OPiGXgH+mAV69Ip0="; - # The STM benchmark contains chanbench.hs and ChanBench.hs causing a hash - # mismatch on case insensitive filesystems. See also - # https://gitlab.haskell.org/ghc/packages/stm/-/issues/2 - postFetch = '' - rm -rf "$out/libraries/stm/bench" - ''; + version = "9.13.20241031"; + rev = "0b11cdc022ce33d089db95b2b2e7c1f4bb326d37"; + sha256 = "0kqnpcgv49ricbr950lffs8gx7jrcg6anzc0qvwy5pb518w0d37i"; } diff --git a/pkgs/development/compilers/ghcjs/8.10/default.nix b/pkgs/development/compilers/ghcjs/8.10/default.nix index 9a648f838406..aea58c62b6d1 100644 --- a/pkgs/development/compilers/ghcjs/8.10/default.nix +++ b/pkgs/development/compilers/ghcjs/8.10/default.nix @@ -74,7 +74,7 @@ in stdenv.mkDerivation { xorg.lndir gmp pkg-config - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gcc # https://github.com/ghcjs/ghcjs/issues/663 ]; dontConfigure = true; diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index 075088306de6..a8454ba56f3b 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/development/compilers/gleam/default.nix @@ -5,6 +5,7 @@ , git , pkg-config , openssl +, erlang , Security , nix-update-script , SystemConfiguration @@ -12,21 +13,21 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-buMnbBg+/vHXzbBuMPuV8AfdUmYA9J6WTXP7Oqrdo34="; + hash = "sha256-4/NDZGq62M0tdWerIkmoYS0WHC06AV8c9vlo/6FhsAo="; }; nativeBuildInputs = [ git pkg-config ]; - buildInputs = [ openssl ] ++ - lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; + buildInputs = [ openssl erlang ] ++ + lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; - cargoHash = "sha256-0Vtf9UXLPW5HuqNIAGNyqIXCMTITdG7PuFdw4H4v6a4="; + cargoHash = "sha256-B8tCVkubP04gAHKQC0idR5AjpVHG/kCXvPCfwKCuaSo="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix deleted file mode 100644 index 9d67dde87c2d..000000000000 --- a/pkgs/development/compilers/glslang/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, bison -, cmake -, jq -, python3 -, spirv-headers -, spirv-tools -}: -stdenv.mkDerivation rec { - pname = "glslang"; - version = "14.3.0"; - - src = fetchFromGitHub { - owner = "KhronosGroup"; - repo = "glslang"; - rev = version; - hash = "sha256-slKBFq6NyWHQmJq/YR3LmbGnHyZgRg0hej90tZDOGzA="; - }; - - outputs = [ "bin" "out" "dev" ]; - - # These get set at all-packages, keep onto them for child drvs - passthru = { - spirv-tools = spirv-tools; - spirv-headers = spirv-headers; - }; - - nativeBuildInputs = [ cmake python3 bison jq ]; - - postPatch = '' - cp --no-preserve=mode -r "${spirv-tools.src}" External/spirv-tools - ln -s "${spirv-headers.src}" External/spirv-tools/external/spirv-headers - ''; - - # This is a dirty fix for lib/cmake/SPIRVTargets.cmake:51 which includes this directory - postInstall = '' - mkdir -p $dev/include/External - moveToOutput lib/pkgconfig "''${!outputDev}" - moveToOutput lib/cmake "''${!outputDev}" - ''; - - # Fix the paths in .pc, even though it's unclear if these .pc are really useful. - postFixup = '' - substituteInPlace $dev/lib/pkgconfig/*.pc \ - --replace-fail '=''${prefix}//' '=/' \ - --replace-fail "includedir=$dev/$dev" "includedir=$dev" - - # add a symlink for backwards compatibility - ln -s $bin/bin/glslang $bin/bin/glslangValidator - ''; - - meta = with lib; { - inherit (src.meta) homepage; - description = "Khronos reference front-end for GLSL and ESSL"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = [ maintainers.ralith ]; - }; -} diff --git a/pkgs/development/compilers/gmqcc/default.nix b/pkgs/development/compilers/gmqcc/default.nix deleted file mode 100644 index ec39f8744f58..000000000000 --- a/pkgs/development/compilers/gmqcc/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -}: - -stdenv.mkDerivation rec { - pname = "gmqcc"; - version = "0-unstable-2023-05-05"; - - src = fetchFromGitHub { - owner = "graphitemaster"; - repo = "gmqcc"; - rev = "2fe0af00e78d55edecd7ca7ee1808c4ea946b05f"; - hash = "sha256-AyuwsUIt+P/D4ABuIXGJxpp0TMAbnDg+R2iNMy6WjRw="; - }; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - install -m755 gmqcc $out/bin - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://graphitemaster.github.io/gmqcc/"; - description = "Modern QuakeC compiler"; - mainProgram = "gmqcc"; - longDescription = '' - For an enduring period of time the options for a decent compiler for - the Quake C programming language were confined to a specific compiler - known as QCC. Attempts were made to extend and improve upon the design - of QCC, but many foreseen the consequences of building on a broken - foundation. The solution was obvious, a new compiler; one born from - the NIH realm of sarcastic wit. - We welcome you. You won't find a better Quake C compiler. - ''; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ necrophcodr ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/compilers/gnostic/default.nix b/pkgs/development/compilers/gnostic/default.nix deleted file mode 100644 index e6c2b665c215..000000000000 --- a/pkgs/development/compilers/gnostic/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "gnostic"; - version = "0.7.0"; - - src = fetchFromGitHub { - owner = "google"; - repo = pname; - rev = "v${version}"; - hash = "sha256-Wpe+rK4XMfMZYhR1xTEr0nsEjRGkSDA7aiLeBbGcRpA="; - }; - - vendorHash = "sha256-Wyv5czvD3IwE236vlAdq8I/DnhPXxdbwZtUhun+97x4="; - - # some tests are broken and others require network access - doCheck = false; - - meta = with lib; { - homepage = "https://github.com/google/gnostic"; - description = "Compiler for APIs described by the OpenAPI Specification with plugins for code generation and other API support tasks"; - changelog = "https://github.com/google/gnostic/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ urandom ]; - }; -} diff --git a/pkgs/development/compilers/gnu-cim/default.nix b/pkgs/development/compilers/gnu-cim/default.nix deleted file mode 100644 index bf5b93c712fc..000000000000 --- a/pkgs/development/compilers/gnu-cim/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib -, stdenv -, fetchurl -}: - -stdenv.mkDerivation rec { - pname = "gnu-cim"; - version = "5.1"; - - outputs = ["out" "lib" "man" "info"]; - - src = fetchurl { - url = "mirror://gnu/cim/cim-${version}.tar.gz"; - hash = "sha256-uQcXtm7EAFA73WnlN+i38+ip0QbDupoIoErlc2mgaak="; - }; - - postPatch = '' - for fname in lib/{simulation,simset}.c; do - substituteInPlace "$fname" \ - --replace-fail \ - '#include "../../lib/cim.h"' \ - '#include "../lib/cim.h"' - done - ''; - - env.CFLAGS = lib.optionalString stdenv.cc.isClang "-Wno-return-type -Wno-error=implicit-function-declaration -Wno-error=implicit-int"; - - doCheck = true; - - meta = with lib; { - description = "GNU compiler for the programming language Simula"; - longDescription = '' - GNU Cim is a compiler for the programming language Simula. - It offers a class concept, separate compilation with full type checking, - interface to external C routines, an application package for process - simulation and a coroutine concept. Commonly used with the Demos for - discrete event modelling. - ''; - homepage = "https://www.gnu.org/software/cim/"; - license = licenses.gpl2; - platforms = platforms.all; - badPlatforms = [ "aarch64-darwin" ]; - maintainers = with maintainers; [ pbsds ]; - }; -} diff --git a/pkgs/development/compilers/go-jsonnet/default.nix b/pkgs/development/compilers/go-jsonnet/default.nix deleted file mode 100644 index 8f419a189e82..000000000000 --- a/pkgs/development/compilers/go-jsonnet/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, testers, go-jsonnet }: - -buildGoModule rec { - pname = "go-jsonnet"; - version = "0.20.0"; - - src = fetchFromGitHub { - owner = "google"; - repo = pname; - rev = "v${version}"; - hash = "sha256-P69tguBrFF/CSCOfHjCfBT5710oJdhZDh3kMCbc32eE="; - }; - - vendorHash = "sha256-j1fTOUpLx34TgzW94A/BctLrg9XoTtb3cBizhVJoEEI="; - - subPackages = [ "cmd/jsonnet*" ]; - - passthru.tests.version = testers.testVersion { - package = go-jsonnet; - version = "v${version}"; - }; - - meta = with lib; { - description = "Implementation of Jsonnet in pure Go"; - homepage = "https://github.com/google/go-jsonnet"; - license = licenses.asl20; - maintainers = with maintainers; [ nshalman aaronjheng ]; - mainProgram = "jsonnet"; - }; -} diff --git a/pkgs/development/compilers/go/1.21.nix b/pkgs/development/compilers/go/1.21.nix deleted file mode 100644 index 7c8f1fbd9cde..000000000000 --- a/pkgs/development/compilers/go/1.21.nix +++ /dev/null @@ -1,189 +0,0 @@ -{ lib -, stdenv -, fetchurl -, tzdata -, substituteAll -, iana-etc -, Security -, Foundation -, xcbuild -, mailcap -, buildPackages -, pkgsBuildTarget -, threadsCross -, testers -, skopeo -, buildGo121Module -}: - -let - goBootstrap = buildPackages.callPackage ./bootstrap121.nix { }; - - skopeoTest = skopeo.override { buildGoModule = buildGo121Module; }; - - goarch = platform: { - "aarch64" = "arm64"; - "arm" = "arm"; - "armv5tel" = "arm"; - "armv6l" = "arm"; - "armv7l" = "arm"; - "i686" = "386"; - "mips" = "mips"; - "mips64el" = "mips64le"; - "mipsel" = "mipsle"; - "powerpc64" = "ppc64"; - "powerpc64le" = "ppc64le"; - "riscv64" = "riscv64"; - "s390x" = "s390x"; - "x86_64" = "amd64"; - }.${platform.parsed.cpu.name} or (throw "Unsupported system: ${platform.parsed.cpu.name}"); - - # We need a target compiler which is still runnable at build time, - # to handle the cross-building case where build != host == target - targetCC = pkgsBuildTarget.targetPackages.stdenv.cc; - - isCross = stdenv.buildPlatform != stdenv.targetPlatform; -in -stdenv.mkDerivation (finalAttrs: { - pname = "go"; - version = "1.21.13"; - - src = fetchurl { - url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-cfsxYGod5I0SnVkehxemPgxVZf+6CaJOqfiZoTIUw00="; - }; - - strictDeps = true; - buildInputs = [ ] - ++ lib.optionals stdenv.isLinux [ stdenv.cc.libc.out ] - ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; - - depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ Foundation Security xcbuild ]; - - depsBuildTarget = lib.optional isCross targetCC; - - depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows threadsCross.package; - - postPatch = '' - patchShebangs . - ''; - - patches = [ - (substituteAll { - src = ./iana-etc-1.17.patch; - iana = iana-etc; - }) - # Patch the mimetype database location which is missing on NixOS. - # but also allow static binaries built with NixOS to run outside nix - (substituteAll { - src = ./mailcap-1.17.patch; - inherit mailcap; - }) - # prepend the nix path to the zoneinfo files but also leave the original value for static binaries - # that run outside a nix server - (substituteAll { - src = ./tzdata-1.19.patch; - inherit tzdata; - }) - ./remove-tools-1.11.patch - ./go_no_vendor_checks-1.21.patch - ]; - - GOOS = stdenv.targetPlatform.parsed.kernel.name; - GOARCH = goarch stdenv.targetPlatform; - # GOHOSTOS/GOHOSTARCH must match the building system, not the host system. - # Go will nevertheless build a for host system that we will copy over in - # the install phase. - GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name; - GOHOSTARCH = goarch stdenv.buildPlatform; - - # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those - # to be different from CC/CXX - CC_FOR_TARGET = - if isCross then - "${targetCC}/bin/${targetCC.targetPrefix}cc" - else - null; - CXX_FOR_TARGET = - if isCross then - "${targetCC}/bin/${targetCC.targetPrefix}c++" - else - null; - - GOARM = toString (lib.intersectLists [ (stdenv.hostPlatform.parsed.cpu.version or "") ] [ "5" "6" "7" ]); - GO386 = "softfloat"; # from Arch: don't assume sse2 on i686 - CGO_ENABLED = 1; - - GOROOT_BOOTSTRAP = "${goBootstrap}/share/go"; - - buildPhase = '' - runHook preBuild - export GOCACHE=$TMPDIR/go-cache - # this is compiled into the binary - export GOROOT_FINAL=$out/share/go - - export PATH=$(pwd)/bin:$PATH - - ${lib.optionalString isCross '' - # Independent from host/target, CC should produce code for the building system. - # We only set it when cross-compiling. - export CC=${buildPackages.stdenv.cc}/bin/cc - ''} - ulimit -a - - pushd src - ./make.bash - popd - runHook postBuild - ''; - - preInstall = '' - # Contains the wrong perl shebang when cross compiling, - # since it is not used for anything we can deleted as well. - rm src/regexp/syntax/make_perl_groups.pl - '' + (if (stdenv.buildPlatform.system != stdenv.hostPlatform.system) then '' - mv bin/*_*/* bin - rmdir bin/*_* - ${lib.optionalString (!(finalAttrs.GOHOSTARCH == finalAttrs.GOARCH && finalAttrs.GOOS == finalAttrs.GOHOSTOS)) '' - rm -rf pkg/${finalAttrs.GOHOSTOS}_${finalAttrs.GOHOSTARCH} pkg/tool/${finalAttrs.GOHOSTOS}_${finalAttrs.GOHOSTARCH} - ''} - '' else lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system) '' - rm -rf bin/*_* - ${lib.optionalString (!(finalAttrs.GOHOSTARCH == finalAttrs.GOARCH && finalAttrs.GOOS == finalAttrs.GOHOSTOS)) '' - rm -rf pkg/${finalAttrs.GOOS}_${finalAttrs.GOARCH} pkg/tool/${finalAttrs.GOOS}_${finalAttrs.GOARCH} - ''} - ''); - - installPhase = '' - runHook preInstall - mkdir -p $GOROOT_FINAL - cp -a bin pkg src lib misc api doc go.env $GOROOT_FINAL - mkdir -p $out/bin - ln -s $GOROOT_FINAL/bin/* $out/bin - runHook postInstall - ''; - - disallowedReferences = [ goBootstrap ]; - - passthru = { - inherit goBootstrap skopeoTest; - tests = { - skopeo = testers.testVersion { package = skopeoTest; }; - version = testers.testVersion { - package = finalAttrs.finalPackage; - command = "go version"; - version = "go${finalAttrs.version}"; - }; - }; - }; - - meta = with lib; { - changelog = "https://go.dev/doc/devel/release#go${lib.versions.majorMinor finalAttrs.version}"; - description = "Go Programming language"; - homepage = "https://go.dev/"; - license = licenses.bsd3; - maintainers = teams.golang.members; - platforms = platforms.darwin ++ platforms.linux ++ platforms.freebsd; - mainProgram = "go"; - }; -}) diff --git a/pkgs/development/compilers/go/1.22.nix b/pkgs/development/compilers/go/1.22.nix index 4060a6cf6975..4bb68cb2d3e8 100644 --- a/pkgs/development/compilers/go/1.22.nix +++ b/pkgs/development/compilers/go/1.22.nix @@ -4,8 +4,7 @@ , tzdata , substituteAll , iana-etc -, Security -, Foundation +, apple-sdk_11 , xcbuild , mailcap , buildPackages @@ -47,19 +46,19 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.22.7"; + version = "1.22.9"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-ZkMth9heDPrD7f/mN9WTD8Td9XkzE/4R5KDzMwI8h58="; + hash = "sha256-6Bo2L1Gu4hJXIrAY5GcU5qBVoZVCg0FMD5N+c3AT2yI="; }; strictDeps = true; buildInputs = [ ] - ++ lib.optionals stdenv.isLinux [ stdenv.cc.libc.out ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.libc.out ] ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; - depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ Foundation Security xcbuild ]; + depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ apple-sdk_11 xcbuild ]; depsBuildTarget = lib.optional isCross targetCC; diff --git a/pkgs/development/compilers/go/1.23.nix b/pkgs/development/compilers/go/1.23.nix index d4486ff319e4..14a80eae8046 100644 --- a/pkgs/development/compilers/go/1.23.nix +++ b/pkgs/development/compilers/go/1.23.nix @@ -4,8 +4,7 @@ , tzdata , substituteAll , iana-etc -, Security -, Foundation +, apple-sdk_11 , xcbuild , mailcap , buildPackages @@ -47,19 +46,19 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.23.1"; + version = "1.23.3"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-buROKYN50Ual5aprHFtdX10KM2XqvdcHQebiE0DsOw0="; + hash = "sha256-jWp3MySHVXxq+iQhExtQ+D20rjxXnDvHLmcO4faWhZk="; }; strictDeps = true; buildInputs = [ ] - ++ lib.optionals stdenv.isLinux [ stdenv.cc.libc.out ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.libc.out ] ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; - depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ Foundation Security xcbuild ]; + depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ apple-sdk_11 xcbuild ]; depsBuildTarget = lib.optional isCross targetCC; diff --git a/pkgs/development/compilers/go/go_no_vendor_checks-1.21.patch b/pkgs/development/compilers/go/go_no_vendor_checks-1.21.patch deleted file mode 100644 index 1adbf46398c5..000000000000 --- a/pkgs/development/compilers/go/go_no_vendor_checks-1.21.patch +++ /dev/null @@ -1,23 +0,0 @@ -Starting from go1.14, go verifes that vendor/modules.txt matches the requirements -and replacements listed in the main module go.mod file, and it is a hard failure if -vendor/modules.txt is missing. - -Relax module consistency checks and switch back to pre go1.14 behaviour if -vendor/modules.txt is missing regardless of go version requirement in go.mod. - -This has been ported from FreeBSD: https://reviews.freebsd.org/D24122 -See https://github.com/golang/go/issues/37948 for discussion. - -diff --git a/src/cmd/go/internal/modload/vendor.go b/src/cmd/go/internal/modload/vendor.go -index ffc79bb93f..2d0311975d 100644 ---- a/src/cmd/go/internal/modload/vendor.go -+++ b/src/cmd/go/internal/modload/vendor.go -@@ -144,7 +144,7 @@ func checkVendorConsistency(index *modFileIndex, modFile *modfile.File) { - readVendorList(MainModules.mustGetSingleMainModule()) - - pre114 := false -- if gover.Compare(index.goVersion, "1.14") < 0 { -+ if gover.Compare(index.goVersion, "1.14") < 0 || (os.Getenv("GO_NO_VENDOR_CHECKS") == "1" && len(vendorMeta) == 0) { - // Go versions before 1.14 did not include enough information in - // vendor/modules.txt to check for consistency. - // If we know that we're on an earlier version, relax the consistency check. diff --git a/pkgs/development/compilers/gprolog/default.nix b/pkgs/development/compilers/gprolog/default.nix deleted file mode 100644 index 6868ca9f8d8f..000000000000 --- a/pkgs/development/compilers/gprolog/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "gprolog"; - version = "1.5.0"; - - src = fetchurl { - urls = [ - "mirror://gnu/gprolog/gprolog-${version}.tar.gz" - "http://www.gprolog.org/gprolog-${version}.tar.gz" - ]; - sha256 = "sha256-ZwZCtDwPqifr1olh77F+vnB2iPkbaAlWbd1gYTlRLAE="; - }; - - hardeningDisable = lib.optional stdenv.isi686 "pic"; - - patchPhase = '' - sed -i -e "s|/tmp/make.log|$TMPDIR/make.log|g" src/Pl2Wam/check_boot - ''; - - preConfigure = '' - cd src - configureFlagsArray=( - "--with-install-dir=$out" - "--without-links-dir" - "--with-examples-dir=$out/share/gprolog-${version}/examples" - "--with-doc-dir=$out/share/gprolog-${version}/doc" - ) - ''; - - postInstall = '' - mv -v $out/[A-Z]* $out/gprolog.ico $out/share/gprolog-${version}/ - ''; - - doCheck = true; - - meta = { - homepage = "https://www.gnu.org/software/gprolog/"; - description = "GNU Prolog, a free Prolog compiler with constraint solving over finite domains"; - license = lib.licenses.lgpl3Plus; - - longDescription = '' - GNU Prolog is a free Prolog compiler with constraint solving - over finite domains developed by Daniel Diaz. - - GNU Prolog accepts Prolog+constraint programs and produces - native binaries (like gcc does from a C source). The obtained - executable is then stand-alone. The size of this executable can - be quite small since GNU Prolog can avoid to link the code of - most unused built-in predicates. The performances of GNU Prolog - are very encouraging (comparable to commercial systems). - - Beside the native-code compilation, GNU Prolog offers a - classical interactive interpreter (top-level) with a debugger. - - The Prolog part conforms to the ISO standard for Prolog with - many extensions very useful in practice (global variables, OS - interface, sockets,...). - - GNU Prolog also includes an efficient constraint solver over - Finite Domains (FD). This opens contraint logic programming to - the user combining the power of constraint programming to the - declarativity of logic programming. - ''; - - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix index 83d60202a4fc..6db4e4312f29 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix @@ -18,12 +18,12 @@ , zlib # extra params , extraCLibs ? [ ] -, gtkSupport ? stdenv.isLinux +, gtkSupport ? stdenv.hostPlatform.isLinux , useMusl ? false , ... } @ args: -assert useMusl -> stdenv.isLinux; +assert useMusl -> stdenv.hostPlatform.isLinux; let extraArgs = builtins.removeAttrs args [ "lib" @@ -51,7 +51,7 @@ let "meta" ]; - cLibs = lib.optionals stdenv.isLinux ( + cLibs = lib.optionals stdenv.hostPlatform.isLinux ( [ glibc zlib.static ] ++ lib.optionals (!useMusl) [ glibc.static ] ++ lib.optionals useMusl [ musl ] @@ -86,7 +86,7 @@ let # # We therefor use --strip-components=1 vs 3 depending on the platform. tar xf "$src" -C "$out" --strip-components=${ - if stdenv.isLinux then "1" else "3" + if stdenv.hostPlatform.isLinux then "1" else "3" } # Sanity check @@ -104,15 +104,15 @@ let dontStrip = true; nativeBuildInputs = [ unzip makeWrapper ] - ++ lib.optional stdenv.isLinux autoPatchelfHook; + ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; propagatedBuildInputs = [ setJavaClassPath zlib ] - ++ lib.optional stdenv.isDarwin darwin.apple_sdk_11_0.frameworks.Foundation; + ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk_11_0.frameworks.Foundation; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib # libasound.so wanted by lib/libjsound.so fontconfig - stdenv.cc.cc.lib # libstdc++.so.6 + (lib.getLib stdenv.cc.cc) # libstdc++.so.6 xorg.libX11 xorg.libXext xorg.libXi @@ -120,23 +120,46 @@ let xorg.libXtst ]; - postInstall = '' - # jni.h expects jni_md.h to be in the header search path. - ln -sf $out/include/linux/*_md.h $out/include/ - - # copy-paste openjdk's preFixup - # Set JAVA_HOME automatically. - mkdir -p $out/nix-support - cat > $out/nix-support/setup-hook << EOF - if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi - EOF - - wrapProgram $out/bin/native-image \ - --prefix PATH : ${binPath} \ - ${toString (map (l: "--add-flags '-H:CLibraryPath=${l}/lib'") cLibs)} - ''; - - preFixup = lib.optionalString (stdenv.isLinux) '' + postInstall = + let + cLibsAsFlags = (map (l: "--add-flags '-H:CLibraryPath=${l}/lib'") cLibs); + preservedNixVariables = [ + "-ELOCALE_ARCHIVE" + "-ENIX_BINTOOLS" + "-ENIX_BINTOOLS_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}" + "-ENIX_BUILD_CORES" + "-ENIX_BUILD_TOP" + "-ENIX_CC" + "-ENIX_CC_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}" + "-ENIX_CFLAGS_COMPILE" + "-ENIX_HARDENING_ENABLE" + "-ENIX_LDFLAGS" + ]; + preservedNixVariablesAsFlags = (map (f: "--add-flags '${f}'") preservedNixVariables); + in + '' + # jni.h expects jni_md.h to be in the header search path. + ln -sf $out/include/linux/*_md.h $out/include/ + + mkdir -p $out/share + # move files in $out like LICENSE.txt + find $out/ -maxdepth 1 -type f -exec mv {} $out/share \; + # symbolic link to $out/lib/svm/LICENSE_NATIVEIMAGE.txt + rm -f $out/LICENSE_NATIVEIMAGE.txt + + # copy-paste openjdk's preFixup + # Set JAVA_HOME automatically. + mkdir -p $out/nix-support + cat > $out/nix-support/setup-hook << EOF + if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi + EOF + + wrapProgram $out/bin/native-image \ + --prefix PATH : ${binPath} \ + ${toString (cLibsAsFlags ++ preservedNixVariablesAsFlags)} + ''; + + preFixup = lib.optionalString (stdenv.hostPlatform.isLinux) '' for bin in $(find "$out/bin" -executable -type f); do wrapProgram "$bin" --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}" done @@ -147,7 +170,7 @@ let runHook preInstallCheck ${# broken in darwin - lib.optionalString stdenv.isLinux '' + lib.optionalString stdenv.hostPlatform.isLinux '' echo "Testing Jshell" echo '1 + 1' | $out/bin/jshell ''} @@ -165,21 +188,19 @@ let echo "Testing GraalVM" $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld | fgrep 'Hello World' - extraNativeImageArgs="$(export -p | sed -n 's/^declare -x \([^=]\+\)=.*$/ -E\1/p' | tr -d \\n)" - echo "Ahead-Of-Time compilation" - $out/bin/native-image -H:+UnlockExperimentalVMOptions -H:-CheckToolchain -H:+ReportExceptionStackTraces -march=compatibility $extraNativeImageArgs HelloWorld + $out/bin/native-image -H:+UnlockExperimentalVMOptions -H:-CheckToolchain -H:+ReportExceptionStackTraces -march=compatibility HelloWorld ./helloworld | fgrep 'Hello World' ${# -H:+StaticExecutableWithDynamicLibC is only available in Linux - lib.optionalString (stdenv.isLinux && !useMusl) '' + lib.optionalString (stdenv.hostPlatform.isLinux && !useMusl) '' echo "Ahead-Of-Time compilation with -H:+StaticExecutableWithDynamicLibC" $out/bin/native-image -H:+UnlockExperimentalVMOptions -H:+StaticExecutableWithDynamicLibC -march=compatibility $extraNativeImageArgs HelloWorld ./helloworld | fgrep 'Hello World' ''} ${# --static is only available in Linux - lib.optionalString (stdenv.isLinux && useMusl) '' + lib.optionalString (stdenv.hostPlatform.isLinux && useMusl) '' echo "Ahead-Of-Time compilation with --static and --libc=musl" $out/bin/native-image $extraNativeImageArgs -march=compatibility --libc=musl --static HelloWorld ./helloworld | fgrep 'Hello World' diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix index 907441ff68c4..39b4136698c7 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix @@ -33,15 +33,15 @@ stdenv.mkDerivation ({ pname = product; nativeBuildInputs = [ makeWrapper ] - ++ lib.optional stdenv.isLinux autoPatchelfHook + ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook ++ extraNativeBuildInputs; buildInputs = [ - stdenv.cc.cc.lib # libstdc++.so.6 + (lib.getLib stdenv.cc.cc) # libstdc++.so.6 zlib libxcrypt-legacy # libcrypt.so.1 (default is .2 now) ] - ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Foundation + ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Foundation ++ extraBuildInputs; unpackPhase = '' diff --git a/pkgs/development/compilers/graalvm/community-edition/default.nix b/pkgs/development/compilers/graalvm/community-edition/default.nix index bfc9c729689c..c546d65ef02c 100644 --- a/pkgs/development/compilers/graalvm/community-edition/default.nix +++ b/pkgs/development/compilers/graalvm/community-edition/default.nix @@ -5,7 +5,7 @@ lib.makeScope pkgs.newScope (self: { stdenv = - if pkgs.stdenv.isDarwin then + if pkgs.stdenv.hostPlatform.isDarwin then pkgs.darwin.apple_sdk_11_0.stdenv else pkgs.stdenv; diff --git a/pkgs/development/compilers/graalvm/community-edition/truffleruby/default.nix b/pkgs/development/compilers/graalvm/community-edition/truffleruby/default.nix index 95e9c56fc23c..da971347652e 100644 --- a/pkgs/development/compilers/graalvm/community-edition/truffleruby/default.nix +++ b/pkgs/development/compilers/graalvm/community-edition/truffleruby/default.nix @@ -17,7 +17,7 @@ graalvmCEPackages.buildGraalvmProduct { openssl ]; - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf $out/lib/mri/openssl.so \ --replace-needed libssl.so.10 libssl.so \ --replace-needed libcrypto.so.10 libcrypto.so @@ -31,7 +31,7 @@ graalvmCEPackages.buildGraalvmProduct { export LC_ALL=C $out/bin/ruby -e 'puts(1 + 1)' ${# broken in darwin with sandbox enabled - lib.optionalString stdenv.isLinux '' + lib.optionalString stdenv.hostPlatform.isLinux '' echo '1 + 1' | $out/bin/irb ''} ''; diff --git a/pkgs/development/compilers/halide/default.nix b/pkgs/development/compilers/halide/default.nix index 738ecc81a156..19d24f47da47 100644 --- a/pkgs/development/compilers/halide/default.nix +++ b/pkgs/development/compilers/halide/default.nix @@ -1,59 +1,64 @@ -{ stdenv -, llvmPackages -, lib -, fetchFromGitHub -, cmake -, libffi -, libpng -, libjpeg -, mesa -, libGL -, eigen -, openblas -, blas -, lapack +{ + stdenv, + llvmPackages, + lib, + fetchFromGitHub, + cmake, + flatbuffers, + libffi, + libpng, + libjpeg, + mesa, + libGL, + eigen, + openblas, + blas, + lapack, + pythonSupport ? false, + python3Packages ? null, }: assert blas.implementation == "openblas" && lapack.implementation == "openblas"; stdenv.mkDerivation rec { pname = "halide"; - version = "16.0.0"; + version = "18.0.0"; src = fetchFromGitHub { owner = "halide"; repo = "Halide"; rev = "v${version}"; - sha256 = "sha256-lJQrXkJgBmGb/QMSxwuPkkHOSgEDowLWzIolp1km2Y8="; + hash = "sha256-BPalUh9EgdCqVaWC1HoreyyRcPQc4QMIYnLrRoNDDCI="; }; - postPatch = '' - # See https://github.com/halide/Halide/issues/7785 - substituteInPlace 'src/runtime/HalideRuntime.h' \ - --replace '#if defined(__x86_64__) || defined(__i386__) || defined(__arm__) || defined(__aarch64__) - #define HALIDE_CPP_COMPILER_HAS_FLOAT16' \ - '#if defined(__x86_64__) || defined(__i386__) - #define HALIDE_CPP_COMPILER_HAS_FLOAT16' - '' - # Note: on x86_64-darwin, clang fails to find AvailabilityVersions.h, so we remove it. - # Halide uses AvailabilityVersions.h and TargetConditionals.h to determine whether - # ::aligned_alloc is available. For us, it isn't. - + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' - substituteInPlace 'src/runtime/HalideBuffer.h' \ - --replace '#ifdef __APPLE__ - #include <AvailabilityVersions.h> - #include <TargetConditionals.h> - #endif' \ - ' ' \ - --replace 'TARGET_OS_OSX && (__MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_15)' \ - '1' \ - --replace 'TARGET_OS_IPHONE && (__IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_14_0)' \ - '0' - ''; + postPatch = + '' + # See https://github.com/halide/Halide/issues/7785 + substituteInPlace 'src/runtime/HalideRuntime.h' \ + --replace '#if defined(__x86_64__) || defined(__i386__) || defined(__arm__) || defined(__aarch64__) + #define HALIDE_CPP_COMPILER_HAS_FLOAT16' \ + '#if defined(__x86_64__) || defined(__i386__) + #define HALIDE_CPP_COMPILER_HAS_FLOAT16' + '' + # Note: on x86_64-darwin, clang fails to find AvailabilityVersions.h, so we remove it. + # Halide uses AvailabilityVersions.h and TargetConditionals.h to determine whether + # ::aligned_alloc is available. For us, it isn't. + + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' + substituteInPlace 'src/runtime/HalideBuffer.h' \ + --replace '#ifdef __APPLE__ + #include <AvailabilityVersions.h> + #include <TargetConditionals.h> + #endif' \ + ' ' \ + --replace 'TARGET_OS_OSX && (__MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_15)' \ + '1' \ + --replace 'TARGET_OS_IPHONE && (__IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_14_0)' \ + '0' + ''; cmakeFlags = [ "-DWARNINGS_AS_ERRORS=OFF" - "-DWITH_PYTHON_BINDINGS=OFF" + "-DWITH_PYTHON_BINDINGS=${if pythonSupport then "ON" else "OFF"}" "-DTARGET_WEBASSEMBLY=OFF" # Disable performance tests since they may fail on busy machines "-DWITH_TEST_PERFORMANCE=OFF" @@ -61,41 +66,79 @@ stdenv.mkDerivation rec { # v16 release (See https://github.com/halide/Halide/commit/09c5d1d19ec8e6280ccbc01a8a12decfb27226ba) # These tests also fail to compile on Darwin because of some missing command line options... "-DWITH_TEST_FUZZ=OFF" + # Disable FetchContent for flatbuffers and use the version from nixpkgs instead + "-DFLATBUFFERS_USE_FETCHCONTENT=OFF" + "-DPYBIND11_USE_FETCHCONTENT=OFF" ]; doCheck = true; - # Note: disable mullapudi2016_fibonacci because it requires too much - # parallelism for remote builders - preCheck = '' - checkFlagsArray+=("ARGS=-E 'mullapudi2016_fibonacci'") + preCheck = + let + disabledTests = lib.strings.concatStringsSep "|" [ + # Requires too much parallelism for remote builders. + "mullapudi2016_fibonacci" + # Take too long---we don't want to run these in CI. + "adams2019_test_apps_autoscheduler" + "anderson2021_test_apps_autoscheduler" + "correctness_cross_compilation" + "correctness_simd_op_check_hvx" + ]; + in + '' + checkFlagsArray+=("ARGS=-E '${disabledTests}'") + ''; + + postInstall = lib.optionalString pythonSupport '' + mkdir -p $out/${builtins.dirOf python3Packages.python.sitePackages} + mv -v $out/lib/python3/site-packages $out/${python3Packages.python.sitePackages} + rmdir $out/lib/python3/ ''; # Note: only openblas and not atlas part of this Nix expression # see pkgs/development/libraries/science/math/liblapack/3.5.0.nix # to get a hint howto setup atlas instead of openblas - buildInputs = [ - llvmPackages.llvm - llvmPackages.lld - llvmPackages.openmp - llvmPackages.libclang - libffi - libpng - libjpeg - eigen - openblas - ] ++ lib.optionals (!stdenv.isDarwin) [ - mesa - libGL - ]; + buildInputs = + [ + llvmPackages.llvm + llvmPackages.lld + llvmPackages.openmp + llvmPackages.libclang + libffi + libpng + libjpeg + eigen + openblas + ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + mesa + libGL + ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = + [ + cmake + flatbuffers + ] + ++ lib.optionals pythonSupport [ + python3Packages.python + python3Packages.pybind11 + ]; + + propagatedBuildInputs = lib.optionals pythonSupport [ + python3Packages.numpy + python3Packages.imageio + ]; meta = with lib; { description = "C++ based language for image processing and computational photography"; homepage = "https://halide-lang.org"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ ck3d atila twesterhout ]; + maintainers = with maintainers; [ + ck3d + atila + twesterhout + ]; }; } diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index 78e5770cc68e..4613b90113ef 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -65,7 +65,7 @@ let ] ++ (if lib.versionAtLeast version "4.3" then [ pcre2 ] else [ pcre ]) ++ lib.optional (lib.versionAtLeast version "4.1") mbedtls_2 - ++ lib.optional (lib.versionAtLeast version "4.1" && stdenv.isDarwin) Security + ++ lib.optional (lib.versionAtLeast version "4.1" && stdenv.hostPlatform.isDarwin) Security ++ ocamlDependencies version; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/hop/default.nix b/pkgs/development/compilers/hop/default.nix deleted file mode 100644 index 0c1f2a09e123..000000000000 --- a/pkgs/development/compilers/hop/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchurl, bigloo }: - -# Compute the “release” version of bigloo (before the first dash, if any) -let bigloo-release = - let inherit (lib) head splitString; in - head (splitString "-" (builtins.parseDrvName bigloo.name).version) -; in - -stdenv.mkDerivation rec { - pname = "hop"; - version = "3.4.4"; - src = fetchurl { - url = "ftp://ftp-sop.inria.fr/indes/fp/Hop/hop-${version}.tar.gz"; - sha256 = "sha256-GzXh4HC+SFFoUi7SMqu36iYRPAJ6tMnOHd+he6n9k1I="; - }; - - postPatch = '' - substituteInPlace configure --replace "(os-tmp)" '(getenv "TMPDIR")' - ''; - - buildInputs = [ bigloo ]; - - configureFlags = [ - "--bigloo=${bigloo}/bin/bigloo" - "--bigloolibdir=${bigloo}/lib/bigloo/${bigloo-release}/" - ]; - - meta = with lib; { - description = "Multi-tier programming language for the Web 2.0 and the so-called diffuse Web"; - homepage = "http://hop.inria.fr/"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ vbgl ]; - }; -} diff --git a/pkgs/development/compilers/idris2/default.nix b/pkgs/development/compilers/idris2/default.nix index 8f628246c649..57031f673d3e 100644 --- a/pkgs/development/compilers/idris2/default.nix +++ b/pkgs/development/compilers/idris2/default.nix @@ -4,5 +4,7 @@ idris2Api = callPackage ./idris2-api.nix { }; idris2Lsp = callPackage ./idris2-lsp.nix { }; + pack = callPackage ./pack.nix { }; + buildIdris = callPackage ./build-idris.nix { }; } diff --git a/pkgs/development/compilers/idris2/idris2.nix b/pkgs/development/compilers/idris2/idris2.nix index 2d5ec9a28368..6f39eea61868 100644 --- a/pkgs/development/compilers/idris2/idris2.nix +++ b/pkgs/development/compilers/idris2/idris2.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { makeWrapper clang platformChez - ] ++ lib.optionals stdenv.isDarwin [ zsh ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ zsh ]; buildInputs = [ platformChez gmp @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { patchShebangs --build tests ''; - makeFlags = [ "PREFIX=$(out)" ] ++ lib.optional stdenv.isDarwin "OS="; + makeFlags = [ "PREFIX=$(out)" ] ++ lib.optional stdenv.hostPlatform.isDarwin "OS="; # The name of the main executable of pkgs.chez is `scheme` buildFlags = [ diff --git a/pkgs/development/compilers/idris2/pack.nix b/pkgs/development/compilers/idris2/pack.nix new file mode 100644 index 000000000000..7e65a3f73a77 --- /dev/null +++ b/pkgs/development/compilers/idris2/pack.nix @@ -0,0 +1,55 @@ +{ + lib, + idris2Packages, + fetchFromGitHub, +}: +let + inherit (idris2Packages) idris2Api buildIdris; + toml = buildIdris { + ipkgName = "toml"; + version = "2022-05-05"; + src = fetchFromGitHub { + owner = "cuddlefishie"; + repo = "toml-idr"; + rev = "b4f5a4bd874fa32f20d02311a62a1910dc48123f"; + hash = "sha256-+bqfCE6m0aJ+S65urT+zQLuZUtUkC1qcuSsefML/fAE="; + }; + idrisLibraries = [ ]; + }; + filepath = buildIdris { + ipkgName = "filepath"; + version = "2023-12-04"; + src = fetchFromGitHub { + owner = "stefan-hoeck"; + repo = "idris2-filepath"; + rev = "eac02d51b631633f32330c788bcebeb24221fa09"; + hash = "sha256-noylxQvT2h50H0xmAiwe/cI6vz5gkbOhSD7mXuhJGfU="; + }; + idrisLibraries = [ ]; + }; + packPkg = buildIdris { + ipkgName = "pack"; + version = "2024-02-07"; + src = fetchFromGitHub { + owner = "stefan-hoeck"; + repo = "idris2-pack"; + rev = "305123401a28a57b02f750c589c35af628b2a5eb"; + hash = "sha256-IPAkwe6fEYWT3mpyKKkUPU0qFJX9gGIM1f7OeNWyB9w="; + }; + idrisLibraries = [ + idris2Api + toml + filepath + ]; + + meta = { + description = "An Idris2 Package Manager with Curated Package Collections"; + mainProgram = "pack"; + homepage = "https://github.com/stefan-hoeck/idris2-pack"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ mattpolzin ]; + inherit (idris2Packages.idris2.meta) platforms; + }; + }; +in +packPkg.executable diff --git a/pkgs/development/compilers/idris2/tests.nix b/pkgs/development/compilers/idris2/tests.nix index bb5cd140c90c..b4193286d49c 100644 --- a/pkgs/development/compilers/idris2/tests.nix +++ b/pkgs/development/compilers/idris2/tests.nix @@ -28,7 +28,7 @@ let # is not the case with pure nix environments. Thus, we need to include zsh # when we build for darwin in tests. While this is impure, this is also what # we find in real darwin hosts. - nativeBuildInputs = lib.optionals stdenv.isDarwin [ zsh ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ zsh ]; } '' set -eo pipefail diff --git a/pkgs/development/compilers/inform7/default.nix b/pkgs/development/compilers/inform7/default.nix deleted file mode 100644 index cb464e3484c2..000000000000 --- a/pkgs/development/compilers/inform7/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchzip, coreutils, perl, gnutar, gzip }: -let - version = "6M62"; -in stdenv.mkDerivation { - pname = "inform7"; - inherit version; - buildInputs = [ perl coreutils gnutar gzip ]; - src = fetchzip { - url = "http://inform7.com/download/content/6M62/I7_6M62_Linux_all.tar.gz"; - sha256 = "0bk0pfymvsn1g8ci0pfdw7dgrlzb232a8pc67y2xk6zgpf3m41vj"; - }; - preConfigure = "touch Makefile.PL"; - buildPhase = ""; - installPhase = '' - mkdir -p $out - pushd $src - ./install-inform7.sh --prefix $out - popd - - substituteInPlace "$out/bin/i7" \ - --replace "/usr/bin/perl" "${perl}/bin/perl" - ''; - - meta = with lib; { - description = "Design system for interactive fiction"; - mainProgram = "i7"; - homepage = "http://inform7.com/"; - license = licenses.artistic2; - maintainers = with maintainers; [ mbbx6spp ]; - platforms = platforms.unix; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = (stdenv.isDarwin && stdenv.isAarch64) || (stdenv.isLinux && stdenv.isAarch64); - }; -} diff --git a/pkgs/development/compilers/inklecate/default.nix b/pkgs/development/compilers/inklecate/default.nix deleted file mode 100644 index 52c278a1bd30..000000000000 --- a/pkgs/development/compilers/inklecate/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, stdenv -, buildDotnetModule -, dotnetCorePackages -, fetchFromGitHub -}: - -buildDotnetModule rec { - pname = "inklecate"; - version = "1.1.1"; - - src = fetchFromGitHub { - owner = "inkle"; - repo = "ink"; - rev = "v${version}"; - hash = "sha512-aUjjT5Qf64wrKRn1vkwJadMOBWMkvsXUjtZ7S3/ZWAh1CCDkQNO84mSbtbVc9ny0fKeJEqaDX2tJNwq7pYqAbA=="; - }; - - buildInputs = [ stdenv.cc.cc.lib ]; - - projectFile = "inklecate/inklecate.csproj"; - nugetDeps = ./deps.nix; - executables = [ "inklecate" ]; - - dotnet-sdk = dotnetCorePackages.sdk_6_0; - dotnet-runtime = dotnetCorePackages.runtime_6_0; - - meta = with lib; { - description = "Compiler for ink, inkle's scripting language"; - mainProgram = "inklecate"; - longDescription = '' - Inklecate is a command-line compiler for ink, inkle's open source - scripting language for writing interactive narrative - ''; - homepage = "https://www.inklestudios.com/ink/"; - downloadPage = "https://github.com/inkle/ink/"; - license = licenses.mit; - platforms = platforms.unix; - badPlatforms = platforms.aarch64; - maintainers = with maintainers; [ shreerammodi ]; - }; -} diff --git a/pkgs/development/compilers/inklecate/deps.nix b/pkgs/development/compilers/inklecate/deps.nix deleted file mode 100644 index f3a17967e25c..000000000000 --- a/pkgs/development/compilers/inklecate/deps.nix +++ /dev/null @@ -1,5 +0,0 @@ -# This file was automatically generated by passthru.fetch-deps. -# Please dont edit it manually, your changes might get overwritten! - -{ fetchNuGet }: [ -] diff --git a/pkgs/development/compilers/intel-graphics-compiler/default.nix b/pkgs/development/compilers/intel-graphics-compiler/default.nix deleted file mode 100644 index ef3ff5ff4565..000000000000 --- a/pkgs/development/compilers/intel-graphics-compiler/default.nix +++ /dev/null @@ -1,93 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, bash -, cmake -, runCommandLocal -, bison -, flex -, intel-compute-runtime -, llvmPackages_14 -, opencl-clang -, python3 -, spirv-tools -, spirv-headers -, spirv-llvm-translator - -, buildWithPatches ? true -}: - -let - vc_intrinsics_src = fetchFromGitHub { - owner = "intel"; - repo = "vc-intrinsics"; - rev = "v0.19.0"; - hash = "sha256-vOK7xfOR+aDpdGd8oOFLJc1Ct1S5BCJmLN6Ubn5wlkQ="; - }; - - inherit (llvmPackages_14) lld llvm; - inherit (if buildWithPatches then opencl-clang else llvmPackages_14) clang libclang; - spirv-llvm-translator' = spirv-llvm-translator.override { inherit llvm; }; -in - -stdenv.mkDerivation rec { - pname = "intel-graphics-compiler"; - version = "1.0.17384.11"; - - src = fetchFromGitHub { - owner = "intel"; - repo = "intel-graphics-compiler"; - rev = "igc-${version}"; - hash = "sha256-O4uMaPauRv2aMgM2B7XdzCcjI5JghsjX5XbkeloLyck="; - }; - - postPatch = '' - substituteInPlace IGC/AdaptorOCL/igc-opencl.pc.in \ - --replace-fail '/@CMAKE_INSTALL_INCLUDEDIR@' "/include" \ - --replace-fail '/@CMAKE_INSTALL_LIBDIR@' "/lib" - - chmod +x IGC/Scripts/igc_create_linker_script.sh - patchShebangs --build IGC/Scripts/igc_create_linker_script.sh - ''; - - nativeBuildInputs = [ bash bison cmake flex (python3.withPackages (ps : with ps; [ mako pyyaml ])) ]; - - buildInputs = [ lld llvm spirv-headers spirv-llvm-translator' spirv-tools ]; - - strictDeps = true; - - # testing is done via intel-compute-runtime - doCheck = false; - - # Handholding the braindead build script - # cmake requires an absolute path - prebuilds = runCommandLocal "igc-cclang-prebuilds" { } '' - mkdir $out - ln -s ${clang}/bin/clang $out/ - ln -s ${opencl-clang}/lib/* $out/ - ln -s ${lib.getLib libclang}/lib/clang/${lib.getVersion clang}/include/opencl-c.h $out/ - ln -s ${lib.getLib libclang}/lib/clang/${lib.getVersion clang}/include/opencl-c-base.h $out/ - ''; - - cmakeFlags = [ - "-DVC_INTRINSICS_SRC=${vc_intrinsics_src}" - "-DCCLANG_BUILD_PREBUILDS=ON" - "-DCCLANG_BUILD_PREBUILDS_DIR=${prebuilds}" - "-DIGC_OPTION__SPIRV_TOOLS_MODE=Prebuilds" - "-DIGC_OPTION__VC_INTRINSICS_MODE=Source" - "-Wno-dev" - ]; - - passthru.tests = { - inherit intel-compute-runtime; - }; - - meta = with lib; { - description = "LLVM-based compiler for OpenCL targeting Intel Gen graphics hardware"; - homepage = "https://github.com/intel/intel-graphics-compiler"; - changelog = "https://github.com/intel/intel-graphics-compiler/releases/tag/${src.rev}"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ SuperSandro2000 ]; - }; -} diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix index b8c48c5c6a01..c98712f5d964 100644 --- a/pkgs/development/compilers/ispc/default.nix +++ b/pkgs/development/compilers/ispc/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub -, cmake, which, m4, python3, bison, flex, llvmPackages, ncurses, xcode, tbb +, cmake, which, m4, python3, bison, flex, llvmPackages, ncurses, tbb # the default test target is sse4, but that is not supported by all Hydra agents -, testedTargets ? if stdenv.isAarch64 || stdenv.isAarch32 then [ "neon-i32x4" ] else [ "sse2-i32x4" ] +, testedTargets ? if stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32 then [ "neon-i32x4" ] else [ "sse2-i32x4" ] }: stdenv.mkDerivation rec { pname = "ispc"; - version = "1.24.0"; + version = "1.25.3"; dontFixCmake = true; # https://github.com/NixOS/nixpkgs/pull/232522#issuecomment-2133803566 @@ -14,10 +14,10 @@ stdenv.mkDerivation rec { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-1Ns8w34fXgYrSu3XE89uowjaVoW3MOgKYV1Jb/XRj1Q="; + sha256 = "sha256-baTJNfhOSYfJJnrutkW06AIMXpVP3eBpEes0GSI1yGY="; }; - nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev tbb ] ++ lib.lists.optionals stdenv.isDarwin [ xcode ]; + nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev tbb ]; buildInputs = with llvmPackages; [ libllvm libclang openmp ncurses @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { echo "================================" echo (cd ../ - PATH=${llvmPackages.clang}/bin:$PATH python run_tests.py -t $target --non-interactive --verbose --file=test_output.log + PATH=${llvmPackages.clang}/bin:$PATH python scripts/run_tests.py -t $target --non-interactive --verbose --file=test_output.log fgrep -q "No new fails" test_output.log || exit 1) done ''; @@ -61,10 +61,8 @@ stdenv.mkDerivation rec { "-DCLANGPP_EXECUTABLE=${llvmPackages.clang}/bin/clang++" "-DISPC_INCLUDE_EXAMPLES=OFF" "-DISPC_INCLUDE_UTILS=OFF" - ("-DARM_ENABLED=" + (if stdenv.isAarch64 || stdenv.isAarch32 then "TRUE" else "FALSE")) - ("-DX86_ENABLED=" + (if stdenv.isx86_64 || stdenv.isx86_32 then "TRUE" else "FALSE")) - ] ++ lib.lists.optionals stdenv.isDarwin [ - "-DISPC_MACOS_SDK_PATH=${xcode}/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk" + ("-DARM_ENABLED=" + (if stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32 then "TRUE" else "FALSE")) + ("-DX86_ENABLED=" + (if stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isx86_32 then "TRUE" else "FALSE")) ]; meta = with lib; { diff --git a/pkgs/development/compilers/jasmin-compiler/default.nix b/pkgs/development/compilers/jasmin-compiler/default.nix deleted file mode 100644 index a19dd7cfb603..000000000000 --- a/pkgs/development/compilers/jasmin-compiler/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ stdenv, lib, fetchurl, ocamlPackages, mpfr, ppl }: - -stdenv.mkDerivation rec { - pname = "jasmin-compiler"; - version = "2024.07.0"; - - src = fetchurl { - url = "https://github.com/jasmin-lang/jasmin/releases/download/v${version}/jasmin-compiler-v${version}.tar.bz2"; - hash = "sha256-jE1LSL/fW7RKE5GeVzYtw4aFxtzTiz7IasD5YwDm4HE="; - }; - - sourceRoot = "jasmin-compiler-v${version}/compiler"; - - nativeBuildInputs = with ocamlPackages; [ ocaml findlib dune_3 menhir camlidl cmdliner ]; - - buildInputs = [ - mpfr - ppl - ] ++ (with ocamlPackages; [ - apron - yojson - ]); - - propagatedBuildInputs = with ocamlPackages; [ - angstrom - batteries - menhirLib - zarith - ]; - - outputs = [ "bin" "lib" "out" ]; - - installPhase = '' - runHook preInstall - dune build @install - dune install --prefix=$bin --libdir=$out/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib - mkdir -p $lib/lib/jasmin/easycrypt - cp ../eclib/*.ec $lib/lib/jasmin/easycrypt - runHook postInstall - ''; - - meta = { - description = "Workbench for high-assurance and high-speed cryptography"; - homepage = "https://github.com/jasmin-lang/jasmin/"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.vbgl ]; - mainProgram = "jasminc"; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/development/compilers/jasmin/default.nix b/pkgs/development/compilers/jasmin/default.nix deleted file mode 100644 index e10109979f32..000000000000 --- a/pkgs/development/compilers/jasmin/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib -, stdenv -, fetchurl -, unzip -, ant -, jdk8 -, makeWrapper -, stripJavaArchivesHook -, callPackage -}: - -let - jdk = jdk8; - jre = jdk8.jre; - -in stdenv.mkDerivation (finalAttrs: { - pname = "jasmin"; - version = "2.4"; - - src = fetchurl { - url = "mirror://sourceforge/jasmin/jasmin-${finalAttrs.version}.zip"; - hash = "sha256-6qEMaM7Gggb9EC6exxE3OezNeQEIoblabow+k/IORJ0="; - }; - - nativeBuildInputs = [ - unzip - ant - jdk - makeWrapper - stripJavaArchivesHook - ]; - - buildPhase = '' - runHook preBuild - ant all - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - install -Dm644 jasmin.jar $out/share/java/jasmin.jar - makeWrapper ${jre}/bin/java $out/bin/jasmin \ - --add-flags "-jar $out/share/java/jasmin.jar" - - runHook postInstall - ''; - - passthru.tests = { - minimal-module = callPackage ./test-assemble-hello-world {}; - }; - - meta = with lib; { - description = "Assembler for the Java Virtual Machine"; - downloadPage = "https://sourceforge.net/projects/jasmin/files/latest/download"; - homepage = "https://jasmin.sourceforge.net/"; - license = licenses.bsd3; - mainProgram = "jasmin"; - maintainers = with maintainers; [ fgaz ]; - platforms = platforms.all; - }; -}) diff --git a/pkgs/development/compilers/jasmin/test-assemble-hello-world/HelloWorld.j b/pkgs/development/compilers/jasmin/test-assemble-hello-world/HelloWorld.j deleted file mode 100644 index 564e6c8a9aa2..000000000000 --- a/pkgs/development/compilers/jasmin/test-assemble-hello-world/HelloWorld.j +++ /dev/null @@ -1,31 +0,0 @@ -.class public HelloWorld -.super java/lang/Object - -; -; standard initializer (calls java.lang.Object's initializer) -; -.method public <init>()V - aload_0 - invokenonvirtual java/lang/Object/<init>()V - return -.end method - -; -; main() - prints out Hello World -; -.method public static main([Ljava/lang/String;)V - .limit stack 2 ; up to two items can be pushed - - ; push System.out onto the stack - getstatic java/lang/System/out Ljava/io/PrintStream; - - ; push a string onto the stack - ldc "Hello World!" - - ; call the PrintStream.println() method. - invokevirtual java/io/PrintStream/println(Ljava/lang/String;)V - - ; done - return -.end method - diff --git a/pkgs/development/compilers/jasmin/test-assemble-hello-world/default.nix b/pkgs/development/compilers/jasmin/test-assemble-hello-world/default.nix deleted file mode 100644 index 1840edffa779..000000000000 --- a/pkgs/development/compilers/jasmin/test-assemble-hello-world/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ stdenv, jasmin, jre }: - -stdenv.mkDerivation { - name = "jasmin-test-assemble-hello-world"; - meta.timeout = 60; - buildCommand = '' - ${jasmin}/bin/jasmin ${./HelloWorld.j} - ${jre}/bin/java HelloWorld | grep "Hello World" - touch $out - ''; -} - diff --git a/pkgs/development/compilers/javacard-devkit/default.nix b/pkgs/development/compilers/javacard-devkit/default.nix deleted file mode 100644 index c9e9b34e6ee0..000000000000 --- a/pkgs/development/compilers/javacard-devkit/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ lib, stdenv, requireFile, unzip, makeWrapper, oraclejdk8, autoPatchelfHook -, pcsclite -}: - -stdenv.mkDerivation rec { - pname = "javacard-devkit"; - version = "2.2.2"; - uscoreVersion = builtins.replaceStrings ["."] ["_"] version; - - src = requireFile { - name = "java_card_kit-${uscoreVersion}-linux.zip"; - url = "http://www.oracle.com/technetwork/java/javasebusiness/downloads/" - + "java-archive-downloads-javame-419430.html#java_card_kit-2.2.2-oth-JPR"; - sha256 = "1rzkw8izqq73ifvyp937wnjjc40a40drc4zsm0l1s6jyv3d7agb2"; - }; - - nativeBuildInputs = [ unzip oraclejdk8 makeWrapper autoPatchelfHook ]; - buildInputs = [ pcsclite ]; - - zipPrefix = "java_card_kit-${uscoreVersion}"; - - sourceRoot = "."; - unpackCmd = '' - unzip -p "$curSrc" "$zipPrefix/$zipPrefix-rr-bin-linux-do.zip" | jar x - ''; - - installPhase = '' - mkdir -p "$out/share/$pname" - cp -rt "$out/share/$pname" api_export_files - cp -rt "$out" lib - - for i in bin/*; do - case "$i" in - *.so) install -vD "$i" "$out/libexec/$pname/$(basename "$i")";; - *) target="$out/bin/$(basename "$i")" - install -vD "$i" "$target" - sed -i -e 's|^$JAVA_HOME/bin/java|''${JAVA:-$JAVA_HOME/bin/java}|' "$target" - wrapProgram "$target" \ - --set JAVA_HOME "$JAVA_HOME" \ - --prefix CLASSPATH : "$out/share/$pname/api_export_files" - ;; - esac - done - - makeWrapper "$JAVA_HOME/bin/javac" "$out/bin/javacardc" \ - --prefix CLASSPATH : "$out/lib/api.jar" - ''; - - meta = { - description = "Official development kit by Oracle for programming for the Java Card platform"; - longDescription = '' - This Java Card SDK is the official SDK made available by Oracle for programming for the Java Card platform. - - Instructions for usage: - - First, compile your '.java' (NixOS-specific: you should not need to set the class path -- if you need, it's a bug): - javacardc -source 1.5 -target 1.5 [MyJavaFile].java - Then, test with 'jcwde' (NixOS-specific: you can change the java version used to run jcwde with eg. JAVA=jdb): - CLASSPATH=. jcwde [MyJcwdeConfig].app & sleep 1 && apdutool [MyApdus].apdu - Finally, convert the '.class' file into a '.cap': - converter -applet [AppletAID] [MyApplet] [myPackage] [PackageAID] [Version] - For more details, please refer to the documentation by Oracle - ''; - homepage = "https://www.oracle.com/technetwork/java/embedded/javacard/overview/index.html"; - sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - license = lib.licenses.unfree; - maintainers = [ lib.maintainers.ekleog ]; - platforms = [ "i686-linux" "x86_64-linux" ]; - }; -} diff --git a/pkgs/development/compilers/jetbrains-jdk/17.nix b/pkgs/development/compilers/jetbrains-jdk/17.nix index 76d4079baafb..a868a441ba4c 100644 --- a/pkgs/development/compilers/jetbrains-jdk/17.nix +++ b/pkgs/development/compilers/jetbrains-jdk/17.nix @@ -147,7 +147,7 @@ openjdk17.overrideAttrs (oldAttrs: rec { inherit (openjdk17.meta) license platforms mainProgram; maintainers = with maintainers; [ edwtjo ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; passthru = oldAttrs.passthru // { diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index 59a6704e3103..77ac8e904d47 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -147,7 +147,7 @@ jdk.overrideAttrs (oldAttrs: rec { inherit (jdk.meta) license platforms mainProgram; maintainers = with maintainers; [ edwtjo ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; passthru = oldAttrs.passthru // { diff --git a/pkgs/development/compilers/jetbrains-jdk/jcef.nix b/pkgs/development/compilers/jetbrains-jdk/jcef.nix index 537133524a2c..9cda4fc51623 100644 --- a/pkgs/development/compilers/jetbrains-jdk/jcef.nix +++ b/pkgs/development/compilers/jetbrains-jdk/jcef.nix @@ -45,7 +45,7 @@ , thrift }: -assert !stdenv.isDarwin; +assert !stdenv.hostPlatform.isDarwin; # I can't test darwin let diff --git a/pkgs/development/compilers/jrsonnet/Cargo.lock b/pkgs/development/compilers/jrsonnet/Cargo.lock deleted file mode 100644 index 941503289d9a..000000000000 --- a/pkgs/development/compilers/jrsonnet/Cargo.lock +++ /dev/null @@ -1,551 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "annotate-snippets" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c96c3d1062ea7101741480185a6a1275eab01cbe8b20e378d1311bc056d2e08" -dependencies = [ - "unicode-width", - "yansi-term", -] - -[[package]] -name = "anyhow" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b" - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" - -[[package]] -name = "base64" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" - -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - -[[package]] -name = "bitflags" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" - -[[package]] -name = "cc" -version = "1.0.67" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd" - -[[package]] -name = "clap" -version = "3.0.0-beta.2" -source = "git+https://github.com/clap-rs/clap?rev=f0c5ea5e1503de5c8e74d8c047a799cf51498e83#f0c5ea5e1503de5c8e74d8c047a799cf51498e83" -dependencies = [ - "atty", - "bitflags", - "clap_derive", - "indexmap", - "lazy_static", - "os_str_bytes", - "strsim", - "termcolor", - "textwrap", - "vec_map", -] - -[[package]] -name = "clap_derive" -version = "3.0.0-beta.2" -source = "git+https://github.com/clap-rs/clap?rev=f0c5ea5e1503de5c8e74d8c047a799cf51498e83#f0c5ea5e1503de5c8e74d8c047a799cf51498e83" -dependencies = [ - "heck", - "proc-macro-error", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "clap_generate" -version = "3.0.0-beta.2" -source = "git+https://github.com/clap-rs/clap?rev=f0c5ea5e1503de5c8e74d8c047a799cf51498e83#f0c5ea5e1503de5c8e74d8c047a799cf51498e83" -dependencies = [ - "clap", -] - -[[package]] -name = "hashbrown" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" - -[[package]] -name = "heck" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "hermit-abi" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" -dependencies = [ - "libc", -] - -[[package]] -name = "indexmap" -version = "1.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824845a0bf897a9042383849b02c1bc219c2383772efcd5c6f9766fa4b81aef3" -dependencies = [ - "autocfg", - "hashbrown", -] - -[[package]] -name = "itoa" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" - -[[package]] -name = "jrsonnet" -version = "0.4.2" -dependencies = [ - "clap", - "clap_generate", - "jrsonnet-cli", - "jrsonnet-evaluator", - "jrsonnet-parser", - "mimallocator", - "thiserror", -] - -[[package]] -name = "jrsonnet-cli" -version = "0.4.2" -dependencies = [ - "clap", - "jrsonnet-evaluator", - "jrsonnet-gc", - "jrsonnet-parser", -] - -[[package]] -name = "jrsonnet-evaluator" -version = "0.4.2" -dependencies = [ - "annotate-snippets", - "anyhow", - "base64", - "bincode", - "jrsonnet-gc", - "jrsonnet-interner", - "jrsonnet-parser", - "jrsonnet-stdlib", - "jrsonnet-types", - "md5", - "pathdiff", - "rustc-hash", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "jrsonnet-gc" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68da8bc2f00117b1373bb8877af03b1d391e4c4800e6585d7279e5b99c919dde" -dependencies = [ - "jrsonnet-gc-derive", -] - -[[package]] -name = "jrsonnet-gc-derive" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcba9c387b64b054f06cc4d724905296e21edeeb7506847f3299117a2d92d12" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "synstructure", -] - -[[package]] -name = "jrsonnet-interner" -version = "0.4.2" -dependencies = [ - "jrsonnet-gc", - "rustc-hash", - "serde", -] - -[[package]] -name = "jrsonnet-parser" -version = "0.4.2" -dependencies = [ - "jrsonnet-gc", - "jrsonnet-interner", - "jrsonnet-stdlib", - "peg", - "serde", - "unescape", -] - -[[package]] -name = "jrsonnet-stdlib" -version = "0.4.2" - -[[package]] -name = "jrsonnet-types" -version = "0.4.2" -dependencies = [ - "jrsonnet-gc", - "peg", -] - -[[package]] -name = "jsonnet" -version = "0.4.2" -dependencies = [ - "jrsonnet-evaluator", - "jrsonnet-gc", - "jrsonnet-parser", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libc" -version = "0.2.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e" - -[[package]] -name = "md5" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" - -[[package]] -name = "mimalloc-sys" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4aa3cefb626f6ae3d0b2f71c5378c89d2b1d4d7bc246b0ca9a7ee61a4daad291" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "mimallocator" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d44fe4ebf6b538fcf39d9975c2b90bb3232d1ba8e8bffeacd004f27b20c577a" -dependencies = [ - "mimalloc-sys", -] - -[[package]] -name = "os_str_bytes" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e293568965aea261bdf010db17df7030e3c9a275c415d51d6112f7cf9b7af012" - -[[package]] -name = "pathdiff" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877630b3de15c0b64cc52f659345724fbf6bdad9bd9566699fc53688f3c34a34" - -[[package]] -name = "peg" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07c0b841ea54f523f7aa556956fbd293bcbe06f2e67d2eb732b7278aaf1d166a" -dependencies = [ - "peg-macros", - "peg-runtime", -] - -[[package]] -name = "peg-macros" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5aa52829b8decbef693af90202711348ab001456803ba2a98eb4ec8fb70844c" -dependencies = [ - "peg-runtime", - "proc-macro2", - "quote", -] - -[[package]] -name = "peg-runtime" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c719dcf55f09a3a7e764c6649ab594c18a177e3599c467983cdf644bfc0a4088" - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro2" -version = "1.0.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec" -dependencies = [ - "unicode-xid", -] - -[[package]] -name = "quote" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "ryu" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" - -[[package]] -name = "serde" -version = "1.0.125" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.125" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "syn" -version = "1.0.71" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad184cc9470f9117b2ac6817bfe297307418819ba40552f9b3846f05c33d5373" -dependencies = [ - "proc-macro2", - "quote", - "unicode-xid", -] - -[[package]] -name = "synstructure" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "unicode-xid", -] - -[[package]] -name = "termcolor" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "textwrap" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "thiserror" -version = "1.0.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "unescape" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccb97dac3243214f8d8507998906ca3e2e0b900bf9bf4870477f125b82e68f6e" - -[[package]] -name = "unicode-segmentation" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796" - -[[package]] -name = "unicode-width" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" - -[[package]] -name = "unicode-xid" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" - -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - -[[package]] -name = "version_check" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "yansi-term" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe5c30ade05e61656247b2e334a031dfd0cc466fadef865bdcdea8d537951bf1" -dependencies = [ - "winapi", -] diff --git a/pkgs/development/compilers/jrsonnet/default.nix b/pkgs/development/compilers/jrsonnet/default.nix deleted file mode 100644 index 2031c006de6f..000000000000 --- a/pkgs/development/compilers/jrsonnet/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub, installShellFiles, stdenv }: - -rustPlatform.buildRustPackage rec { - pname = "jrsonnet"; - version = "0.4.2"; - - src = fetchFromGitHub { - rev = "v${version}"; - owner = "CertainLach"; - repo = "jrsonnet"; - sha256 = "sha256-OX+iJJ3vdCsWWr8x31psV9Vne6xWDZnJc83NbJqMK1A="; - }; - - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "clap-3.0.0-beta.2" = "sha256-BaLzm2JZEicktfsCIXQipHtEKlEv2lBktfvHP58rjeM="; - }; - }; - - nativeBuildInputs = [ installShellFiles ]; - - # skip flaky tests - checkFlags = [ - "--skip=tests::native_ext" - ]; - - postInstall = '' - ln -s $out/bin/jrsonnet $out/bin/jsonnet - - '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - for shell in bash zsh fish; do - installShellCompletion --cmd jrsonnet \ - --$shell <($out/bin/jrsonnet --generate $shell /dev/null) - installShellCompletion --cmd jsonnet \ - --$shell <($out/bin/jrsonnet --generate $shell /dev/null | sed s/jrsonnet/jsonnet/g) - done - ''; - - meta = with lib; { - description = "Purely-functional configuration language that helps you define JSON data"; - homepage = "https://github.com/CertainLach/jrsonnet"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda lach ]; - }; -} diff --git a/pkgs/development/compilers/jsonnet/default.nix b/pkgs/development/compilers/jsonnet/default.nix deleted file mode 100644 index 8e723cdb8211..000000000000 --- a/pkgs/development/compilers/jsonnet/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ stdenv, lib, jekyll, cmake, fetchFromGitHub, gtest }: - -stdenv.mkDerivation rec { - pname = "jsonnet"; - version = "0.20.0"; - outputs = [ "out" "doc" ]; - - src = fetchFromGitHub { - rev = "v${version}"; - owner = "google"; - repo = "jsonnet"; - sha256 = "sha256-FtVJE9alEl56Uik+nCpJMV5DMVVmRCnE1xMAiWdK39Y="; - }; - - nativeBuildInputs = [ jekyll cmake ]; - buildInputs = [ gtest ]; - - cmakeFlags = [ - "-DUSE_SYSTEM_GTEST=ON" - "-DBUILD_STATIC_LIBS=${if stdenv.hostPlatform.isStatic then "ON" else "OFF"}" - ] ++ lib.optionals (!stdenv.isDarwin) [ - "-DBUILD_SHARED_BINARIES=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" - ]; - - # https://github.com/google/jsonnet/issues/778 - patches = [ - ./fix-cpp-unresolved-symbols.patch - ]; - - enableParallelBuilding = true; - - # Upstream writes documentation in html, not in markdown/rst, so no - # other output formats, sorry. - postBuild = '' - jekyll build --source ../doc --destination ./html - ''; - - postInstall = '' - mkdir -p $out/share/doc/jsonnet - cp -r ./html $out/share/doc/jsonnet - ''; - - meta = { - description = "Purely-functional configuration language that helps you define JSON data"; - maintainers = with lib.maintainers; [ benley copumpkin ]; - license = lib.licenses.asl20; - homepage = "https://github.com/google/jsonnet"; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/compilers/jsonnet/fix-cpp-unresolved-symbols.patch b/pkgs/development/compilers/jsonnet/fix-cpp-unresolved-symbols.patch deleted file mode 100644 index dc4cdcf2ea1b..000000000000 --- a/pkgs/development/compilers/jsonnet/fix-cpp-unresolved-symbols.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt -index 3a52458..872e6c6 100644 ---- a/cpp/CMakeLists.txt -+++ b/cpp/CMakeLists.txt -@@ -10,6 +10,7 @@ set(LIBJSONNETPP_SOURCE - - add_library(libjsonnet++ SHARED ${LIBJSONNETPP_HEADERS} ${LIBJSONNETPP_SOURCE}) - add_dependencies(libjsonnet++ jsonnet) -+target_link_libraries(libjsonnet++ libjsonnet) - # target_link_libraries(libjsonnet libjsonnet) - - # CMake prepends CMAKE_SHARED_LIBRARY_PREFIX to shared libraries, so without diff --git a/pkgs/development/compilers/julia/1.6-bin.nix b/pkgs/development/compilers/julia/1.6-bin.nix deleted file mode 100644 index dea8a140ee5f..000000000000 --- a/pkgs/development/compilers/julia/1.6-bin.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ autoPatchelfHook, fetchurl, lib, stdenv }: - -stdenv.mkDerivation rec { - pname = "julia-bin"; - version = "1.6.7"; - - src = { - x86_64-linux = fetchurl { - url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz"; - sha256 = "sha256-bEUi1ZXky80AFXrEWKcviuwBdXBT0gc/mdqjnkQrKjY="; - }; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - # Julia’s source files are in different locations for source and binary - # releases. Thus we temporarily create a symlink to allow us to share patches - # with source releases. - prePatch = '' - ln -s share/julia/test - ''; - patches = [ - # Source release Nix patch(es) relevant for binary releases as well. - ./patches/1.6-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch - ]; - postPatch = '' - # Revert symlink hack. - rm test - - # Julia fails to pick up our Certification Authority root certificates, but - # it provides its own so we can simply disable the test. Patching in the - # dynamic path to ours require us to rebuild the Julia system image. - substituteInPlace share/julia/stdlib/v${lib.versions.majorMinor version}/NetworkOptions/test/runtests.jl \ - --replace '@test ca_roots_path() != bundled_ca_roots()' \ - '@test_skip ca_roots_path() != bundled_ca_roots()' - ''; - - nativeBuildInputs = [ autoPatchelfHook ]; - - installPhase = '' - runHook preInstall - cp -r . $out - runHook postInstall - ''; - - # Breaks backtraces, etc. - dontStrip = true; - - doInstallCheck = true; - preInstallCheck = '' - # Some tests require read/write access to $HOME. - export HOME="$TMPDIR" - ''; - installCheckPhase = '' - runHook preInstallCheck - # Command lifted from `test/Makefile`. - $out/bin/julia \ - --check-bounds=yes \ - --startup-file=no \ - --depwarn=error \ - $out/share/julia/test/runtests.jl - runHook postInstallCheck - ''; - - meta = { - description = "High-level, high-performance, dynamic language for technical computing"; - homepage = "https://julialang.org"; - # Bundled and linked with various GPL code, although Julia itself is MIT. - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ raskin thomasjm ]; - platforms = [ "x86_64-linux" ]; - mainProgram = "julia"; - }; -} diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index becbd64ea55b..6a805b5ccb83 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -12,7 +12,6 @@ let in { - julia_16-bin = wrapJulia (callPackage ./1.6-bin.nix { }); julia_19-bin = wrapJulia (callPackage (import ./generic-bin.nix { version = "1.9.4"; @@ -39,6 +38,17 @@ in }; }) { }); + julia_111-bin = wrapJulia (callPackage + (import ./generic-bin.nix { + version = "1.11.1"; + sha256 = { + x86_64-linux = "cca8d13dc4507e4f62a129322293313ee574f300d4df9e7db30b7b41c5f8a8f3"; + aarch64-linux = "bd623ef3801c5a56103464d349c7901d5cc034405ad289332c67f1e8ecc05840"; + x86_64-darwin = "59885de9310788c1ed12f41e7d2c2f05eabd314888cd105d299837b76a4a7240"; + aarch64-darwin = "e09d13e1c6c98452e91e698220688dd784ec8e5367e9e6443099c5f9aa2add78"; + }; + }) + { }); julia_19 = wrapJulia (callPackage (import ./generic.nix { version = "1.9.4"; @@ -57,4 +67,13 @@ in ]; }) { }); + julia_111 = wrapJulia (callPackage + (import ./generic.nix { + version = "1.11.1"; + hash = "sha256-pJuATeboagP+Jsc/WIUeruH/JD1yBPK1rk28XB3CdY0="; + patches = [ + ./patches/1.11/0002-skip-failing-and-flaky-tests.patch + ]; + }) + { }); } diff --git a/pkgs/development/compilers/julia/generic-bin.nix b/pkgs/development/compilers/julia/generic-bin.nix index 09a8c2bce3bf..a7d7f127d5e4 100644 --- a/pkgs/development/compilers/julia/generic-bin.nix +++ b/pkgs/development/compilers/julia/generic-bin.nix @@ -24,14 +24,19 @@ let "REPL" # Test flaky "ccall" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals (lib.versionAtLeast version "1.11") [ + # Test flaky + # https://github.com/JuliaLang/julia/issues/54280 + "loading" + "cmdlineargs" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Test flaky on ofborg "FileWatching" # Test requires pbcopy "InteractiveUtils" # Test requires network access "Sockets" - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ # Test Failed at $out/share/julia/stdlib/v1.8/LinearAlgebra/test/blas.jl:702 "LinearAlgebra/blas" # Test Failed at $out/share/julia/test/misc.jl:724 @@ -71,7 +76,7 @@ stdenv.mkDerivation { '@test_skip ca_roots_path() != bundled_ca_roots()' ''; - nativeBuildInputs = lib.optionals stdenv.isLinux [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook # https://github.com/JuliaLang/julia/blob/v1.9.0/NEWS.md#external-dependencies stdenv.cc.cc diff --git a/pkgs/development/compilers/julia/generic.nix b/pkgs/development/compilers/julia/generic.nix index e3360137ca74..16f7bbce0759 100644 --- a/pkgs/development/compilers/julia/generic.nix +++ b/pkgs/development/compilers/julia/generic.nix @@ -9,12 +9,14 @@ , which , python3 , gfortran +, cacert , cmake , perl , gnum4 , openssl , libxml2 , zlib +, buildPackages }: stdenv.mkDerivation rec { @@ -42,21 +44,27 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 zlib + ] ++ lib.optionals (lib.versionAtLeast version "1.11") [ + cacert ]; dontUseCmakeConfigure = true; postPatch = '' patchShebangs . + '' + lib.optionalString (lib.versionAtLeast version "1.11") '' + substituteInPlace deps/curl.mk \ + --replace-fail 'cd $(dir $<) && $(TAR) jxf $(notdir $<)' \ + 'cd $(dir $<) && $(TAR) jxf $(notdir $<) && sed -i "s|/usr/bin/env perl|${lib.getExe buildPackages.perl}|" curl-$(CURL_VER)/scripts/cd2nroff' ''; makeFlags = [ "prefix=$(out)" "USE_BINARYBUILDER=0" - ] ++ lib.optionals stdenv.isx86_64 [ + ] ++ lib.optionals stdenv.hostPlatform.isx86_64 [ # https://github.com/JuliaCI/julia-buildkite/blob/main/utilities/build_envs.sh "JULIA_CPU_TARGET=generic;sandybridge,-xsaveopt,clone_all;haswell,-rdrnd,base(1);x86-64-v4,-rdrnd,base(1)" - ] ++ lib.optionals stdenv.isAarch64 [ + ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "JULIA_CPU_TARGET=generic;cortex-a57;thunderx2t99;carmel,clone_all;apple-m1,base(3);neoverse-512tvb,base(3)" ]; diff --git a/pkgs/development/compilers/julia/patches/1.11/0002-skip-failing-and-flaky-tests.patch b/pkgs/development/compilers/julia/patches/1.11/0002-skip-failing-and-flaky-tests.patch new file mode 100644 index 000000000000..3577e6e71e15 --- /dev/null +++ b/pkgs/development/compilers/julia/patches/1.11/0002-skip-failing-and-flaky-tests.patch @@ -0,0 +1,25 @@ +From 9da2f2596db9f4f1a61825d82d9b8c3f3b2e99aa Mon Sep 17 00:00:00 2001 +From: Nick Cao <nickcao@nichi.co> +Date: Wed, 10 Jan 2024 20:58:20 -0500 +Subject: [PATCH 2/2] skip failing and flaky tests + +--- + test/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/Makefile b/test/Makefile +index 88dbe5b2b4..a2a7a55e20 100644 +--- a/test/Makefile ++++ b/test/Makefile +@@ -28,7 +28,7 @@ default: + + $(TESTS): + @cd $(SRCDIR) && \ +- $(call PRINT_JULIA, $(call spawn,$(JULIA_EXECUTABLE)) --check-bounds=yes --startup-file=no --depwarn=error ./runtests.jl $@) ++ $(call PRINT_JULIA, $(call spawn,$(JULIA_EXECUTABLE)) --check-bounds=yes --startup-file=no --depwarn=error ./runtests.jl --skip NetworkOptions REPL channels FileWatching ccall loading cmdlineargs $@) + + $(addprefix revise-, $(TESTS)): revise-% : + @cd $(SRCDIR) && \ +-- +2.43.0 + diff --git a/pkgs/development/compilers/julia/patches/1.6-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch b/pkgs/development/compilers/julia/patches/1.6-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch deleted file mode 100644 index 243a9cfd76ae..000000000000 --- a/pkgs/development/compilers/julia/patches/1.6-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 44c2c979c4f2222567ce65f506cf47fb87482348 Mon Sep 17 00:00:00 2001 -From: Pontus Stenetorp <pontus@stenetorp.se> -Date: Thu, 8 Apr 2021 04:37:44 +0000 -Subject: [PATCH 5/6] nix: Enable parallel unit tests for sandbox - -Disabled by default due to lack of networking in the Nix sandbox. This -greatly speeds up the build process on a multi-core system. ---- - test/runtests.jl | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/test/runtests.jl b/test/runtests.jl -index 2f9cd058bb..2f8c19fa32 100644 ---- a/test/runtests.jl -+++ b/test/runtests.jl -@@ -83,8 +83,9 @@ prepend!(tests, linalg_tests) - import LinearAlgebra - cd(@__DIR__) do - n = 1 -- if net_on -- n = min(Sys.CPU_THREADS, length(tests)) -+ if net_on || haskey(ENV, "NIX_BUILD_CORES") -+ x = haskey(ENV, "NIX_BUILD_CORES") ? parse(Int, ENV["NIX_BUILD_CORES"]) : Sys.CPU_THREADS -+ n = min(x, Sys.CPU_THREADS, length(tests)) - n > 1 && addprocs_with_testenv(n) - LinearAlgebra.BLAS.set_num_threads(1) - end --- -2.29.3 - diff --git a/pkgs/development/compilers/juniper/default.nix b/pkgs/development/compilers/juniper/default.nix deleted file mode 100644 index e6a737fb4ebc..000000000000 --- a/pkgs/development/compilers/juniper/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - fetchFromGitHub, - buildDotnetModule, - dotnetCorePackages, -}: - -buildDotnetModule rec { - pname = "juniper"; - version = "4.0.0"; - - src = fetchFromGitHub { - owner = "calebh"; - repo = "Juniper"; - rev = "286050d6be5606db0973feda556d8fbc48b4566c"; - hash = "sha256-b+aDDz46Hxgt+Oh2fNMiXFfXhuy16mzauousQGq9+dg="; - }; - - projectFile = "Juniper/Juniper.fsproj"; - nugetDeps = ./deps.nix; - dotnet-sdk = dotnetCorePackages.sdk_8_0; - dotnet-runtime = dotnetCorePackages.runtime_8_0; - - meta = { - description = "Functional reactive programming language for programming Arduino"; - longDescription = '' - The purpose of Juniper is to provide a functional reactive programming - platform for designing Arduino projects. FRP's high-level approach to - timing-based events fits naturally with Arduino, with which programming - almost entirely revolves around reacting to realtime events. Juniper - transpiles to Arduino C++, which is then compiled to an Arduino - executable. - ''; - homepage = "https://www.juniper-lang.org/"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ AlexSKaye ]; - mainProgram = "Juniper"; - inherit (dotnet-sdk.meta) platforms; - }; -} diff --git a/pkgs/development/compilers/juniper/deps.nix b/pkgs/development/compilers/juniper/deps.nix deleted file mode 100644 index e25ea7b0bbf3..000000000000 --- a/pkgs/development/compilers/juniper/deps.nix +++ /dev/null @@ -1,203 +0,0 @@ -{ fetchNuGet }: -[ - (fetchNuGet { - pname = "FParsec"; - version = "1.1.1"; - sha256 = "01s3zrxl9kfx0264wy0m555pfx0s0z165n4fvpgx63jlqwbd8m04"; - }) - (fetchNuGet { - pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; - version = "8.0.5"; - sha256 = "1m9gp68z0wyv0xxr4aqc1c2v6v8grml3jxkiqabddn46d6gsisqh"; - }) - (fetchNuGet { - pname = "Microsoft.NETCore.App.Runtime.linux-x64"; - version = "8.0.5"; - sha256 = "15vadqfi0w7sdq0rh35rb9ph4h4qbal2i5m5ifabbfwjp7348z9c"; - }) - (fetchNuGet { - pname = "Microsoft.NETCore.Platforms"; - version = "1.1.0"; - sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; - }) - (fetchNuGet { - pname = "Microsoft.NETCore.Targets"; - version = "1.1.0"; - sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; - }) - (fetchNuGet { - pname = "QuikGraph"; - version = "2.5.0"; - sha256 = "0xjg7pxmmz5a1mmsxlpgbl6la4wrrjmpdijhjwqi42v88yqr4gd7"; - }) - (fetchNuGet { - pname = "runtime.any.System.Globalization"; - version = "4.3.0"; - sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; - }) - (fetchNuGet { - pname = "runtime.any.System.IO"; - version = "4.3.0"; - sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; - }) - (fetchNuGet { - pname = "runtime.any.System.Reflection"; - version = "4.3.0"; - sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; - }) - (fetchNuGet { - pname = "runtime.any.System.Reflection.Primitives"; - version = "4.3.0"; - sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; - }) - (fetchNuGet { - pname = "runtime.any.System.Resources.ResourceManager"; - version = "4.3.0"; - sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; - }) - (fetchNuGet { - pname = "runtime.any.System.Runtime"; - version = "4.3.0"; - sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; - }) - (fetchNuGet { - pname = "runtime.any.System.Text.Encoding"; - version = "4.3.0"; - sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; - }) - (fetchNuGet { - pname = "runtime.any.System.Threading.Tasks"; - version = "4.3.0"; - sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; - }) - (fetchNuGet { - pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; - }) - (fetchNuGet { - pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; - }) - (fetchNuGet { - pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; - }) - (fetchNuGet { - pname = "runtime.native.System"; - version = "4.3.0"; - sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; - }) - (fetchNuGet { - pname = "runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; - }) - (fetchNuGet { - pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; - }) - (fetchNuGet { - pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; - }) - (fetchNuGet { - pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; - }) - (fetchNuGet { - pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; - }) - (fetchNuGet { - pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; - }) - (fetchNuGet { - pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; - }) - (fetchNuGet { - pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; - }) - (fetchNuGet { - pname = "runtime.unix.System.Private.Uri"; - version = "4.3.0"; - sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; - }) - (fetchNuGet { - pname = "runtime.unix.System.Runtime.Extensions"; - version = "4.3.0"; - sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; - }) - (fetchNuGet { - pname = "Symbolism"; - version = "1.0.4"; - sha256 = "0da9g424x043bbd4pbgj7rsnpyvlbfmvxkyny7b3xd9smjx3dpr5"; - }) - (fetchNuGet { - pname = "System.Globalization"; - version = "4.3.0"; - sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; - }) - (fetchNuGet { - pname = "System.IO"; - version = "4.3.0"; - sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; - }) - (fetchNuGet { - pname = "System.Private.Uri"; - version = "4.3.0"; - sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; - }) - (fetchNuGet { - pname = "System.Reflection"; - version = "4.3.0"; - sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; - }) - (fetchNuGet { - pname = "System.Reflection.Primitives"; - version = "4.3.0"; - sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; - }) - (fetchNuGet { - pname = "System.Resources.ResourceManager"; - version = "4.3.0"; - sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; - }) - (fetchNuGet { - pname = "System.Runtime"; - version = "4.3.0"; - sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; - }) - (fetchNuGet { - pname = "System.Runtime.Extensions"; - version = "4.3.0"; - sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; - }) - (fetchNuGet { - pname = "System.Runtime.Numerics"; - version = "4.3.0"; - sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; - }) - (fetchNuGet { - pname = "System.Text.Encoding"; - version = "4.3.0"; - sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; - }) - (fetchNuGet { - pname = "System.Threading.Tasks"; - version = "4.3.0"; - sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; - }) -] diff --git a/pkgs/development/compilers/kaitai-struct-compiler/default.nix b/pkgs/development/compilers/kaitai-struct-compiler/default.nix deleted file mode 100644 index 2fd4fba11e3b..000000000000 --- a/pkgs/development/compilers/kaitai-struct-compiler/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib -, stdenv -, fetchzip -, openjdk8 -, makeWrapper -}: - - -stdenv.mkDerivation rec { - pname = "kaitai-struct-compiler"; - version = "0.10"; - - src = fetchzip { - url = "https://github.com/kaitai-io/kaitai_struct_compiler/releases/download/${version}/kaitai-struct-compiler-${version}.zip"; - sha256 = "sha256-oY1OiEq619kLmQPMRQ4sjuBnTXgJ2WfvsEj1JrxUGPA="; - }; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - install -D $src/bin/kaitai-struct-compiler $out/bin/kaitai-struct-compiler - ln -s $out/bin/kaitai-struct-compiler $out/bin/ksc - cp -R $src/lib $out/lib - wrapProgram $out/bin/kaitai-struct-compiler --prefix PATH : ${lib.makeBinPath [ openjdk8 ] } - ''; - - meta = with lib; { - homepage = "https://github.com/kaitai-io/kaitai_struct_compiler"; - description = - "Compiler to generate binary data parsers in C++ / C# / Go / Java / JavaScript / Lua / Perl / PHP / Python / Ruby "; - license = licenses.gpl3Only; - maintainers = with maintainers; [ qubasa ]; - platforms = platforms.unix; - }; -} - diff --git a/pkgs/development/compilers/kind2/default.nix b/pkgs/development/compilers/kind2/default.nix index 617f86880363..a5a8585d020e 100644 --- a/pkgs/development/compilers/kind2/default.nix +++ b/pkgs/development/compilers/kind2/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-KzoEh/kMKsHx9K3t1/uQZ7fdsZEM+v8UOft8JjEB1Zw="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Security ]; diff --git a/pkgs/development/compilers/lesscpy/default.nix b/pkgs/development/compilers/lesscpy/default.nix deleted file mode 100644 index 493fdc08f812..000000000000 --- a/pkgs/development/compilers/lesscpy/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, python3Packages, fetchPypi }: - -python3Packages.buildPythonApplication rec { - pname = "lesscpy"; - version = "0.15.1"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-EEXRepj2iGRsp1jf8lTm6cA3RWSOBRoIGwOVw7d8gkw="; - }; - - checkInputs = with python3Packages; [ pytestCheckHook ]; - pythonImportsCheck = [ "lesscpy" ]; - propagatedBuildInputs = with python3Packages; [ ply six ]; - - doCheck = false; # Really weird test failures (`nix-build-python2.css not found`) - - meta = with lib; { - description = "Python LESS Compiler"; - mainProgram = "lesscpy"; - homepage = "https://github.com/lesscpy/lesscpy"; - license = licenses.mit; - maintainers = with maintainers; [ s1341 ]; - }; -} diff --git a/pkgs/development/compilers/ligo/default.nix b/pkgs/development/compilers/ligo/default.nix index 8a76de022283..b472eb921cfa 100644 --- a/pkgs/development/compilers/ligo/default.nix +++ b/pkgs/development/compilers/ligo/default.nix @@ -113,7 +113,7 @@ ocamlPackages.buildDunePackage rec { seqes stdint tezt - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/development/compilers/lingua-franca/default.nix b/pkgs/development/compilers/lingua-franca/default.nix deleted file mode 100644 index f989a5e9d6be..000000000000 --- a/pkgs/development/compilers/lingua-franca/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchzip, jdk17_headless }: - -stdenv.mkDerivation rec { - pname = "lfc"; - version = "0.4.0"; - - src = fetchzip { - url = "https://github.com/lf-lang/lingua-franca/releases/download/v${version}/lf-cli-${version}.zip"; - sha256 = "sha256-LrAm77iPUlqVfRdYy2bZ4mim7DHIr5JxPdbrgxokGvc="; - }; - - buildInputs = [ jdk17_headless ]; - - _JAVA_HOME = "${jdk17_headless}/"; - - postPatch = '' - substituteInPlace bin/lfc \ - --replace 'base=`dirname $(dirname ''${abs_path})`' "base='$out'" \ - --replace "run_lfc_with_args" "${jdk17_headless}/bin/java -jar $out/lib/jars/org.lflang.lfc-${version}-all.jar" - ''; - - installPhase = '' - cp -r ./ $out/ - chmod +x $out/bin/lfc - ''; - - meta = with lib; { - description = "Polyglot coordination language"; - longDescription = '' - Lingua Franca (LF) is a polyglot coordination language for concurrent - and possibly time-sensitive applications ranging from low-level - embedded code to distributed cloud and edge applications. - ''; - homepage = "https://github.com/lf-lang/lingua-franca"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.bsd2; - platforms = platforms.linux; - maintainers = with maintainers; [ revol-xut ]; - }; -} diff --git a/pkgs/development/compilers/llvm/common/compiler-rt/7-12-codesign.patch b/pkgs/development/compilers/llvm/12/compiler-rt/codesign.patch index 3cc12b94b200..3cc12b94b200 100644 --- a/pkgs/development/compilers/llvm/common/compiler-rt/7-12-codesign.patch +++ b/pkgs/development/compilers/llvm/12/compiler-rt/codesign.patch diff --git a/pkgs/development/compilers/llvm/12/default.nix b/pkgs/development/compilers/llvm/12/default.nix deleted file mode 100644 index 4e2754def4de..000000000000 --- a/pkgs/development/compilers/llvm/12/default.nix +++ /dev/null @@ -1,445 +0,0 @@ -{ lowPrio, newScope, pkgs, lib, stdenv -, preLibcCrossHeaders -, substitute, substituteAll, fetchFromGitHub, fetchpatch, fetchurl -, overrideCC, wrapCCWith, wrapBintoolsWith -, libxcrypt -, buildLlvmTools # tools, but from the previous stage, for cross -, targetLlvmLibraries # libraries, but from the next stage, for cross -, targetLlvm -# This is the default binutils, but with *this* version of LLD rather -# than the default LLVM version's, if LLD is the choice. We use these for -# the `useLLVM` bootstrapping below. -, bootBintoolsNoLibc ? - if stdenv.targetPlatform.linker == "lld" - then null - else pkgs.bintoolsNoLibc -, bootBintools ? - if stdenv.targetPlatform.linker == "lld" - then null - else pkgs.bintools -, darwin -# Allows passthrough to packages via newScope. This makes it possible to -# do `(llvmPackages.override { <someLlvmDependency> = bar; }).clang` and get -# an llvmPackages whose packages are overridden in an internally consistent way. -, ... -}@args: - -let - candidate = ""; # empty or "rcN" - dash-candidate = lib.optionalString (candidate != "") "-${candidate}"; - - metadata = rec { - release_version = "12.0.1"; - version = "${release_version}${dash-candidate}"; # differentiating these (variables) is important for RCs - inherit (import ../common/common-let.nix { inherit lib release_version; }) llvm_meta; - fetch = name: sha256: fetchurl { - url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${metadata.version}/${name}-${metadata.release_version}${candidate}.src.tar.xz"; - inherit sha256; - }; - clang-tools-extra_src = fetch "clang-tools-extra" "1r9a4fdz9ci58b5z2inwvm4z4cdp6scrivnaw05dggkxz7yrwrb5"; - }; - - inherit (metadata) fetch; - - - tools = lib.makeExtensible (tools: let - callPackage = newScope (tools // args // metadata); - mkExtraBuildCommands0 = cc: '' - rsrc="$out/resource-root" - mkdir "$rsrc" - ln -s "${cc.lib}/lib/clang/${metadata.release_version}/include" "$rsrc" - echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - ''; - mkExtraBuildCommandsBasicRt = cc: mkExtraBuildCommands0 cc + '' - ln -s "${targetLlvmLibraries.compiler-rt-no-libc.out}/lib" "$rsrc/lib" - ln -s "${targetLlvmLibraries.compiler-rt-no-libc.out}/share" "$rsrc/share" - ''; - mkExtraBuildCommands = cc: mkExtraBuildCommands0 cc + '' - ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" - ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share" - ''; - - bintoolsNoLibc' = - if bootBintoolsNoLibc == null - then tools.bintoolsNoLibc - else bootBintoolsNoLibc; - bintools' = - if bootBintools == null - then tools.bintools - else bootBintools; - - in { - - libllvm = callPackage ../common/llvm { - src = fetch "llvm" "1pzx9zrmd7r3481sbhwvkms68fwhffpp4mmz45dgrkjpyl2q96kx"; - polly_src = fetch "polly" "1yfm9ixda4a2sx7ak5vswijx4ydk5lv1c1xh39xmd2kh299y4m12"; - patches = [ - # When cross-compiling we configure llvm-config-native with an approximation - # of the flags used for the normal LLVM build. To avoid the need for building - # a native libLLVM.so (which would fail) we force llvm-config to be linked - # statically against the necessary LLVM components always. - ../common/llvm/llvm-config-link-static.patch - # Fix llvm being miscompiled by some gccs. See llvm/llvm-project#49955 - # Fix llvm being miscompiled by some gccs. See https://github.com/llvm/llvm-project/issues/49955 - ./llvm/fix-llvm-issue-49955.patch - - ./llvm/gnu-install-dirs.patch - # On older CPUs (e.g. Hydra/wendy) we'd be getting an error in this test. - (fetchpatch { - name = "uops-CMOV16rm-noreg.diff"; - url = "https://github.com/llvm/llvm-project/commit/9e9f991ac033.diff"; - sha256 = "sha256:12s8vr6ibri8b48h2z38f3afhwam10arfiqfy4yg37bmc054p5hi"; - stripLen = 1; - }) - - # Fix musl build. - (fetchpatch { - url = "https://github.com/llvm/llvm-project/commit/5cd554303ead0f8891eee3cd6d25cb07f5a7bf67.patch"; - relative = "llvm"; - hash = "sha256-XPbvNJ45SzjMGlNUgt/IgEvM2dHQpDOe6woUJY+nUYA="; - }) - - # Backport gcc-13 fixes with missing includes. - (fetchpatch { - name = "signals-gcc-13.patch"; - url = "https://github.com/llvm/llvm-project/commit/ff1681ddb303223973653f7f5f3f3435b48a1983.patch"; - hash = "sha256-CXwYxQezTq5vdmc8Yn88BUAEly6YZ5VEIA6X3y5NNOs="; - stripLen = 1; - }) - (fetchpatch { - name = "base64-gcc-13.patch"; - url = "https://github.com/llvm/llvm-project/commit/5e9be93566f39ee6cecd579401e453eccfbe81e5.patch"; - hash = "sha256-PAwrVrvffPd7tphpwCkYiz+67szPRzRB2TXBvKfzQ7U="; - stripLen = 1; - }) - ]; - pollyPatches = [ - ./llvm/gnu-install-dirs-polly.patch - ]; - }; - - # `llvm` historically had the binaries. When choosing an output explicitly, - # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get* - llvm = tools.libllvm; - - libclang = callPackage ../common/clang { - src = fetch "clang" "0px4gl27az6cdz6adds89qzdwb1cqpjsfvrldbz9qvpmphrj34bf"; - patches = [ - ./clang/purity.patch - # https://reviews.llvm.org/D51899 - ./clang/gnu-install-dirs.patch - (substituteAll { - src = ../common/clang/clang-11-15-LLVMgold-path.patch; - libllvmLibdir = "${tools.libllvm.lib}/lib"; - }) - ]; - }; - - clang-unwrapped = tools.libclang; - - # disabled until recommonmark supports sphinx 3 - #Llvm-manpages = lowPrio (tools.libllvm.override { - # enableManpages = true; - # python3 = pkgs.python3; # don't use python-boot - #}); - - clang-manpages = lowPrio (tools.libclang.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); - - # disabled until recommonmark supports sphinx 3 - # lldb-manpages = lowPrio (tools.lldb.override { - # enableManpages = true; - # python3 = pkgs.python3; # don't use python-boot - # }); - - # Wrapper for standalone command line utilities - clang-tools = callPackage ../common/clang-tools { }; - - # pick clang appropriate for package set we are targeting - clang = - /**/ if stdenv.targetPlatform.libc == null then tools.clangNoLibc - else if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM - else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang - else tools.libcxxClang; - - libstdcxxClang = wrapCCWith rec { - cc = tools.clang-unwrapped; - # libstdcxx is taken from gcc in an ad-hoc way in cc-wrapper. - libcxx = null; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - }; - - libcxxClang = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = targetLlvmLibraries.libcxx; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - }; - - lld = callPackage ../common/lld { - src = fetch "lld" "0qg3fgc7wj34hdkqn21y03zcmsdd01szhhm1hfki63iifrm3y2v9"; - patches = [ - ./lld/gnu-install-dirs.patch - ]; - inherit (libraries) libunwind; - }; - - lldb = callPackage ../common/lldb.nix { - src = fetch "lldb" "0g3pj1m3chafavpr35r9fynm85y2hdyla6klj0h28khxs2613i78"; - patches = - let - resourceDirPatch = callPackage - ({ substituteAll, libclang }: substituteAll - { - src = ./lldb/resource-dir.patch; - clangLibDir = "${libclang.lib}/lib"; - }) - { }; - in - [ - ./lldb/procfs.patch - resourceDirPatch - ./lldb/gnu-install-dirs.patch - ]; - }; - - # Below, is the LLVM bootstrapping logic. It handles building a - # fully LLVM toolchain from scratch. No GCC toolchain should be - # pulled in. As a consequence, it is very quick to build different - # targets provided by LLVM and we can also build for what GCC - # doesn’t support like LLVM. Probably we should move to some other - # file. - - bintools-unwrapped = callPackage ../common/bintools.nix { }; - - bintoolsNoLibc = wrapBintoolsWith { - bintools = tools.bintools-unwrapped; - libc = preLibcCrossHeaders; - }; - - bintools = wrapBintoolsWith { - bintools = tools.bintools-unwrapped; - }; - - clangUseLLVM = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = targetLlvmLibraries.libcxx; - bintools = bintools'; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [ - targetLlvmLibraries.libunwind - ]; - extraBuildCommands = '' - echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags - echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags - '' + lib.optionalString (!stdenv.targetPlatform.isWasm) '' - echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags - echo "-L${targetLlvmLibraries.libunwind}/lib" >> $out/nix-support/cc-ldflags - '' + lib.optionalString (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) '' - echo "-lunwind" >> $out/nix-support/cc-ldflags - '' + lib.optionalString stdenv.targetPlatform.isWasm '' - echo "-fno-exceptions" >> $out/nix-support/cc-cflags - '' + mkExtraBuildCommands cc; - }; - - clangWithLibcAndBasicRtAndLibcxx = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = targetLlvmLibraries.libcxx; - bintools = bintools'; - extraPackages = [ - targetLlvmLibraries.compiler-rt-no-libc - ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [ - targetLlvmLibraries.libunwind - ]; - extraBuildCommands = '' - echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags - echo "-Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags - echo "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib" >> $out/nix-support/cc-cflags - '' + mkExtraBuildCommandsBasicRt cc; - }; - - clangWithLibcAndBasicRt = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintools'; - extraPackages = [ - targetLlvmLibraries.compiler-rt-no-libc - ]; - extraBuildCommands = '' - echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags - echo "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib" >> $out/nix-support/cc-cflags - echo "-nostdlib++" >> $out/nix-support/cc-cflags - '' + mkExtraBuildCommandsBasicRt cc; - }; - - clangNoLibcWithBasicRt = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintoolsNoLibc'; - extraPackages = [ - targetLlvmLibraries.compiler-rt-no-libc - ]; - extraBuildCommands = '' - echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags - echo "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib" >> $out/nix-support/cc-cflags - '' + mkExtraBuildCommandsBasicRt cc; - }; - - clangNoLibcNoRt = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintoolsNoLibc'; - extraPackages = [ ]; - extraBuildCommands = '' - echo "-nostartfiles" >> $out/nix-support/cc-cflags - '' + mkExtraBuildCommands0 cc; - }; - - # This is an "oddly ordered" bootstrap just for Darwin. Probably - # don't want it otherwise. - clangNoCompilerRtWithLibc = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintools'; - extraPackages = [ ]; - extraBuildCommands = mkExtraBuildCommands0 cc; - }; - - # Aliases - clangNoCompilerRt = tools.clangNoLibcNoRt; - clangNoLibc = tools.clangNoLibcWithBasicRt; - clangNoLibcxx = tools.clangWithLibcAndBasicRt; - }); - - libraries = lib.makeExtensible (libraries: let - callPackage = newScope (libraries // buildLlvmTools // args // metadata); - in { - - compiler-rt-libc = callPackage ../common/compiler-rt (let - stdenv = - if args.stdenv.hostPlatform.useLLVM or false then - overrideCC args.stdenv buildLlvmTools.clangWithLibcAndBasicRtAndLibcxx - else - args.stdenv; - in { - src = fetch "compiler-rt" "1950rg294izdwkaasi7yjrmadc9mzdd5paf0q63jjcq2m3rdbj5l"; - patches = [ - ../common/compiler-rt/7-12-codesign.patch # Revert compiler-rt commit that makes codesign mandatory - ./compiler-rt/X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config - ./compiler-rt/gnu-install-dirs.patch - # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the - # extra `/`. - ./compiler-rt/normalize-var.patch - ../common/compiler-rt/darwin-plistbuddy-workaround.patch - ./compiler-rt/armv7l.patch - # Fix build on armv6l - ../common/compiler-rt/armv6-mcr-dmb.patch - ../common/compiler-rt/armv6-sync-ops-no-thumb.patch - ../common/compiler-rt/armv6-no-ldrexd-strexd.patch - ]; - inherit stdenv; - } // lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { - libxcrypt = (libxcrypt.override { inherit stdenv; }).overrideAttrs (old: { - configureFlags = old.configureFlags ++ [ "--disable-symvers" ]; - }); - }); - - compiler-rt-no-libc = callPackage ../common/compiler-rt { - src = fetch "compiler-rt" "1950rg294izdwkaasi7yjrmadc9mzdd5paf0q63jjcq2m3rdbj5l"; - patches = [ - ../common/compiler-rt/7-12-codesign.patch # Revert compiler-rt commit that makes codesign mandatory - ./compiler-rt/X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config - ./compiler-rt/gnu-install-dirs.patch - # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the - # extra `/`. - ./compiler-rt/normalize-var.patch - ../common/compiler-rt/darwin-plistbuddy-workaround.patch - ./compiler-rt/armv7l.patch - # Fix build on armv6l - ../common/compiler-rt/armv6-mcr-dmb.patch - ../common/compiler-rt/armv6-sync-ops-no-thumb.patch - ../common/compiler-rt/armv6-no-ldrexd-strexd.patch - ]; - stdenv = - if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform then - stdenv - else - # TODO: make this branch unconditional next rebuild - overrideCC stdenv buildLlvmTools.clangNoLibcNoRt; - }; - - compiler-rt = - # Building the with-libc compiler-rt and WASM doesn't yet work, - # because wasilibc doesn't provide some expected things. See - # compiler-rt's file for further details. - if stdenv.hostPlatform.libc == null || stdenv.hostPlatform.isWasm then - libraries.compiler-rt-no-libc - else - libraries.compiler-rt-libc; - - stdenv = overrideCC stdenv buildLlvmTools.clang; - - libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; - - libcxx = callPackage ../common/libcxx { - src = fetchFromGitHub { - owner = "llvm"; - repo = "llvm-project"; - rev = "refs/tags/llvmorg-${metadata.version}"; - sparseCheckout = [ - "libcxx" - "libcxxabi" - "llvm/cmake" - "llvm/utils" - "runtimes" - ]; - hash = "sha256-etxgXIdWxMTmbZ83Hsc0w6Jt5OSQSUEPVEWqLkHsNBY="; - }; - patches = [ - (substitute { - src = ../common/libcxxabi/wasm.patch; - substitutions = [ - "--replace-fail" "/cmake/" "/llvm/cmake/" - ]; - }) - ] ++ lib.optionals stdenv.hostPlatform.isMusl [ - (substitute { - src = ../common/libcxx/libcxx-0001-musl-hacks.patch; - substitutions = [ - "--replace-fail" "/include/" "/libcxx/include/" - ]; - }) - ]; - stdenv = overrideCC stdenv buildLlvmTools.clangWithLibcAndBasicRt; - }; - - libunwind = callPackage ../common/libunwind { - src = fetch "libunwind" "192ww6n81lj2mb9pj4043z79jp3cf58a9c2qrxjwm5c3a64n1shb"; - patches = [ - ./libunwind/gnu-install-dirs.patch - ]; - stdenv = overrideCC stdenv buildLlvmTools.clangWithLibcAndBasicRt; - }; - - openmp = callPackage ../common/openmp { - src = fetch "openmp" "14dh0r6h2xh747ffgnsl4z08h0ri04azi9vf79cbz7ma1r27kzk0"; - patches = [ - # Fix cross. - (fetchpatch { - url = "https://github.com/llvm/llvm-project/commit/5e2358c781b85a18d1463fd924d2741d4ae5e42e.patch"; - hash = "sha256-UxIlAifXnexF/MaraPW0Ut6q+sf3e7y1fMdEv1q103A="; - }) - ]; - }; - }); - noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; - -in { inherit tools libraries; inherit (metadata) release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/pkgs/development/compilers/llvm/common/compiler-rt/armv6-scudo-libatomic.patch b/pkgs/development/compilers/llvm/14/compiler-rt/armv6-scudo-libatomic.patch index 13b67eb2a41c..13b67eb2a41c 100644 --- a/pkgs/development/compilers/llvm/common/compiler-rt/armv6-scudo-libatomic.patch +++ b/pkgs/development/compilers/llvm/14/compiler-rt/armv6-scudo-libatomic.patch diff --git a/pkgs/development/compilers/llvm/15/compiler-rt/armv6-scudo-libatomic.patch b/pkgs/development/compilers/llvm/15/compiler-rt/armv6-scudo-libatomic.patch new file mode 100644 index 000000000000..c4da700fea63 --- /dev/null +++ b/pkgs/development/compilers/llvm/15/compiler-rt/armv6-scudo-libatomic.patch @@ -0,0 +1,65 @@ +From a56bb19a9dc303a50ef12d83cd24c2395bf81076 Mon Sep 17 00:00:00 2001 +From: Ben Wolsieffer <benwolsieffer@gmail.com> +Date: Wed, 7 Dec 2022 21:25:46 -0500 +Subject: [PATCH] [scudo][standalone] Use CheckAtomic to decide to link to + libatomic + +Standalone scudo uses the atomic operation builtin functions, which require +linking to libatomic on some platforms. Currently, this is done in an ad-hoc +manner. MIPS platforms always link to libatomic, and the tests are always linked +to it as well. libatomic is required on base ARMv6 (but not ARMv6K), but it is +currently not linked, causing the build to fail. + +This patch replaces this ad-hoc logic with the CheckAtomic CMake module already +used in other parts of LLVM. The CheckAtomic module checks whether std::atomic +requires libatomic, which is not strictly the same as checking the atomic +builtins, but should have the same results as far as I know. If this is +problematic, a custom version of CheckAtomic could be used to specifically test +the builtins. +--- + compiler-rt/lib/scudo/standalone/CMakeLists.txt | 7 +++++++ + compiler-rt/lib/scudo/standalone/tests/CMakeLists.txt | 4 +--- + 2 files changed, 8 insertions(+), 3 deletions(-) + +diff --git a/lib/scudo/standalone/CMakeLists.txt b/lib/scudo/standalone/CMakeLists.txt +index ae5c354768c8..eb27374ca520 100644 +--- a/lib/scudo/standalone/CMakeLists.txt ++++ b/lib/scudo/standalone/CMakeLists.txt +@@ -1,5 +1,8 @@ + add_compiler_rt_component(scudo_standalone) + ++include(DetermineGCCCompatible) ++include(CheckAtomic) ++ + include_directories(../.. include) + + set(SCUDO_CFLAGS) +@@ -34,6 +37,10 @@ list(APPEND SCUDO_LINK_FLAGS -Wl,-z,defs,-z,now,-z,relro) + + list(APPEND SCUDO_LINK_FLAGS -ffunction-sections -fdata-sections -Wl,--gc-sections) + ++if(HAVE_CXX_ATOMICS_WITH_LIB OR HAVE_CXX_ATOMICS64_WITH_LIB) ++ list(APPEND SCUDO_LINK_FLAGS -latomic) ++endif() ++ + # We don't use the C++ standard library, so avoid including it by mistake. + append_list_if(COMPILER_RT_HAS_NOSTDLIBXX_FLAG -nostdlib++ SCUDO_LINK_FLAGS) + append_list_if(CXX_SUPPORTS_UNWINDLIB_NONE_FLAG --unwindlib=none SCUDO_LINK_FLAGS) +diff --git a/lib/scudo/standalone/tests/CMakeLists.txt b/lib/scudo/standalone/tests/CMakeLists.txt +index 8200cd2588b3..73b3e9403c35 100644 +--- a/lib/scudo/standalone/tests/CMakeLists.txt ++++ b/lib/scudo/standalone/tests/CMakeLists.txt +@@ -39,9 +39,7 @@ set(SCUDO_UNITTEST_LINK_FLAGS + ${COMPILER_RT_UNWINDER_LINK_LIBS} + ${SANITIZER_TEST_CXX_LIBRARIES}) + list(APPEND SCUDO_UNITTEST_LINK_FLAGS -pthread -no-pie) +-# Linking against libatomic is required with some compilers +-check_library_exists(atomic __atomic_load_8 "" COMPILER_RT_HAS_LIBATOMIC) +-if (COMPILER_RT_HAS_LIBATOMIC) ++if (HAVE_CXX_ATOMICS_WITH_LIB OR HAVE_CXX_ATOMICS64_WITH_LIB) + list(APPEND SCUDO_UNITTEST_LINK_FLAGS -latomic) + endif() + +-- +2.38.1 + diff --git a/pkgs/development/compilers/llvm/19/clang/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/19/clang/gnu-install-dirs.patch index b8c1c110cf22..30fdf2c56d5b 100644 --- a/pkgs/development/compilers/llvm/19/clang/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/19/clang/gnu-install-dirs.patch @@ -46,7 +46,7 @@ index 3aca22c0b..3115353e3 100644 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/${lib}) list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/${lib}) install(FILES lib/libscanbuild/${lib} -- DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libscanbuild +- DESTINATION lib/libscanbuild + DESTINATION "${CMAKE_INSTALL_LIBDIR}/libscanbuild" COMPONENT scan-build-py) endforeach() @@ -55,7 +55,7 @@ index 3aca22c0b..3115353e3 100644 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/resources/${resource}) list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/resources/${resource}) install(FILES lib/libscanbuild/resources/${resource} -- DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libscanbuild/resources +- DESTINATION lib/libscanbuild/resources + DESTINATION "${CMAKE_INSTALL_LIBDIR}/libscanbuild/resources" COMPONENT scan-build-py) endforeach() @@ -64,7 +64,7 @@ index 3aca22c0b..3115353e3 100644 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libear/${lib}) list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libear/${lib}) install(FILES lib/libear/${lib} -- DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libear +- DESTINATION lib/libear + DESTINATION "${CMAKE_INSTALL_LIBDIR}/libear" COMPONENT scan-build-py) endforeach() diff --git a/pkgs/development/compilers/llvm/19/compiler-rt/armv6-scudo-libatomic.patch b/pkgs/development/compilers/llvm/19/compiler-rt/armv6-scudo-libatomic.patch new file mode 100644 index 000000000000..6f8528cfa31f --- /dev/null +++ b/pkgs/development/compilers/llvm/19/compiler-rt/armv6-scudo-libatomic.patch @@ -0,0 +1,62 @@ +From a56bb19a9dc303a50ef12d83cd24c2395bf81076 Mon Sep 17 00:00:00 2001 +From: Ben Wolsieffer <benwolsieffer@gmail.com> +Date: Wed, 7 Dec 2022 21:25:46 -0500 +Subject: [PATCH] [scudo][standalone] Use CheckAtomic to decide to link to + libatomic + +Standalone scudo uses the atomic operation builtin functions, which require +linking to libatomic on some platforms. Currently, this is done in an ad-hoc +manner. MIPS platforms always link to libatomic, and the tests are always linked +to it as well. libatomic is required on base ARMv6 (but not ARMv6K), but it is +currently not linked, causing the build to fail. + +This patch replaces this ad-hoc logic with the CheckAtomic CMake module already +used in other parts of LLVM. The CheckAtomic module checks whether std::atomic +requires libatomic, which is not strictly the same as checking the atomic +builtins, but should have the same results as far as I know. If this is +problematic, a custom version of CheckAtomic could be used to specifically test +the builtins. +--- + compiler-rt/lib/scudo/standalone/CMakeLists.txt | 7 +++++++ + compiler-rt/lib/scudo/standalone/tests/CMakeLists.txt | 4 +--- + 2 files changed, 8 insertions(+), 3 deletions(-) + +diff --git a/lib/scudo/standalone/CMakeLists.txt b/lib/scudo/standalone/CMakeLists.txt +index dc700cec9bec..671dc7046604 100644 +--- a/lib/scudo/standalone/CMakeLists.txt ++++ b/lib/scudo/standalone/CMakeLists.txt +@@ -1,5 +1,8 @@ + add_compiler_rt_component(scudo_standalone) + ++include(DetermineGCCCompatible) ++include(CheckAtomic) ++ + include_directories(../.. include) + + set(SCUDO_CFLAGS) +@@ -39,6 +42,10 @@ list(APPEND SCUDO_LINK_FLAGS -Wl,-z,defs,-z,now,-z,relro) + + list(APPEND SCUDO_LINK_FLAGS -ffunction-sections -fdata-sections -Wl,--gc-sections) + ++if(HAVE_CXX_ATOMICS_WITH_LIB OR HAVE_CXX_ATOMICS64_WITH_LIB) ++ list(APPEND SCUDO_LINK_FLAGS -latomic) ++endif() ++ + # We don't use the C++ standard library, so avoid including it by mistake. + append_list_if(COMPILER_RT_HAS_NOSTDLIBXX_FLAG -nostdlib++ SCUDO_LINK_FLAGS) + append_list_if(CXX_SUPPORTS_UNWINDLIB_NONE_FLAG --unwindlib=none SCUDO_LINK_FLAGS) +diff --git a/lib/scudo/standalone/tests/CMakeLists.txt b/lib/scudo/standalone/tests/CMakeLists.txt +index a85eb737dba0..a23cf4d494f6 100644 +--- a/lib/scudo/standalone/tests/CMakeLists.txt ++++ b/lib/scudo/standalone/tests/CMakeLists.txt +@@ -47,7 +47,7 @@ set(SCUDO_UNITTEST_LINK_FLAGS + ${SANITIZER_TEST_CXX_LIBRARIES}) + list(APPEND SCUDO_UNITTEST_LINK_FLAGS -pthread -no-pie) + +-append_list_if(COMPILER_RT_HAS_LIBATOMIC -latomic SCUDO_UNITTEST_LINK_FLAGS) ++append_list_if((HAVE_CXX_ATOMICS_WITH_LIB OR HAVE_CXX_ATOMICS64_WITH_LIB) -latomic SCUDO_UNITTEST_LINK_FLAGS) + + set(SCUDO_TEST_HEADERS + scudo_unit_test.h +2.38.1 + diff --git a/pkgs/development/compilers/llvm/19/libclc/use-default-paths.patch b/pkgs/development/compilers/llvm/19/libclc/use-default-paths.patch new file mode 100644 index 000000000000..09079242eeac --- /dev/null +++ b/pkgs/development/compilers/llvm/19/libclc/use-default-paths.patch @@ -0,0 +1,31 @@ +From e8b910246d0c7c3d9fff994f71c6f8a48ec09a50 Mon Sep 17 00:00:00 2001 +From: Tristan Ross <tristan.ross@midstall.com> +Date: Sat, 24 Aug 2024 19:56:24 -0700 +Subject: [PATCH] [libclc] use default paths with find_program when possible + +--- + libclc/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 02bb859ae8590b..6bcd8ae52a5794 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -55,7 +55,7 @@ if( LIBCLC_STANDALONE_BUILD OR CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DI + # Import required tools + if( NOT EXISTS ${LIBCLC_CUSTOM_LLVM_TOOLS_BINARY_DIR} ) + foreach( tool IN ITEMS clang llvm-as llvm-link opt ) +- find_program( LLVM_TOOL_${tool} ${tool} PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH ) ++ find_program( LLVM_TOOL_${tool} ${tool} PATHS ${LLVM_TOOLS_BINARY_DIR} ) + set( ${tool}_exe ${LLVM_TOOL_${tool}} ) + set( ${tool}_target ) + endforeach() +@@ -104,7 +104,7 @@ foreach( tool IN ITEMS clang opt llvm-as llvm-link ) + endforeach() + + # llvm-spirv is an optional dependency, used to build spirv-* targets. +-find_program( LLVM_SPIRV llvm-spirv PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH ) ++find_program( LLVM_SPIRV llvm-spirv PATHS ${LLVM_TOOLS_BINARY_DIR} ) + + if( LLVM_SPIRV ) + add_executable( libclc::llvm-spirv IMPORTED GLOBAL ) diff --git a/pkgs/development/compilers/llvm/common/bolt/default.nix b/pkgs/development/compilers/llvm/common/bolt/default.nix index 9d6385ae74b3..d62841b48d0a 100644 --- a/pkgs/development/compilers/llvm/common/bolt/default.nix +++ b/pkgs/development/compilers/llvm/common/bolt/default.nix @@ -3,6 +3,7 @@ stdenv, llvm_meta, monorepoSrc, + release_version, runCommand, cmake, libxml2, @@ -20,16 +21,22 @@ stdenv.mkDerivation (finalAttrs: { inherit version patches; # Blank llvm dir just so relative path works - src = runCommand "bolt-src-${finalAttrs.version}" { } '' - mkdir $out - cp -r ${monorepoSrc}/cmake "$out" - cp -r ${monorepoSrc}/${finalAttrs.pname} "$out" - cp -r ${monorepoSrc}/third-party "$out" + src = runCommand "bolt-src-${finalAttrs.version}" { } ( + '' + mkdir $out + '' + + lib.optionalString (lib.versionAtLeast release_version "14") '' + cp -r ${monorepoSrc}/cmake "$out" + '' + + '' + cp -r ${monorepoSrc}/${finalAttrs.pname} "$out" + cp -r ${monorepoSrc}/third-party "$out" - # tablegen stuff, probably not the best way but it works... - cp -r ${monorepoSrc}/llvm/ "$out" - chmod -R +w $out/llvm - ''; + # tablegen stuff, probably not the best way but it works... + cp -r ${monorepoSrc}/llvm/ "$out" + chmod -R +w $out/llvm + '' + ); sourceRoot = "${finalAttrs.src.name}/bolt"; diff --git a/pkgs/development/compilers/llvm/common/clang/default.nix b/pkgs/development/compilers/llvm/common/clang/default.nix index 9ef1a3a3c644..44e13c48fd4b 100644 --- a/pkgs/development/compilers/llvm/common/clang/default.nix +++ b/pkgs/development/compilers/llvm/common/clang/default.nix @@ -16,7 +16,6 @@ , buildLlvmTools , fixDarwinDylibNames , enableManpages ? false -, clang-tools-extra_src ? null , devExtraCmakeFlags ? [] }: @@ -24,20 +23,21 @@ let pname = "clang"; src' = if monorepoSrc != null then - runCommand "${pname}-src-${version}" {} '' + runCommand "${pname}-src-${version}" {} ('' mkdir -p "$out" + '' + lib.optionalString (lib.versionAtLeast release_version "14") '' cp -r ${monorepoSrc}/cmake "$out" + '' + '' cp -r ${monorepoSrc}/${pname} "$out" cp -r ${monorepoSrc}/clang-tools-extra "$out" - '' else src; + '') else src; self = stdenv.mkDerivation (finalAttrs: rec { inherit pname version patches; src = src'; - sourceRoot = if lib.versionOlder release_version "13" then null - else "${src.name}/${pname}"; + sourceRoot = "${src.name}/${pname}"; nativeBuildInputs = [ cmake ] ++ (lib.optional (lib.versionAtLeast release_version "15") ninja) @@ -70,21 +70,19 @@ let # `clang-pseudo-gen`: https://github.com/llvm/llvm-project/commit/cd2292ef824591cc34cc299910a3098545c840c7 "-DCLANG_TIDY_CONFUSABLE_CHARS_GEN=${buildLlvmTools.libclang.dev}/bin/clang-tidy-confusable-chars-gen" "-DCLANG_PSEUDO_GEN=${buildLlvmTools.libclang.dev}/bin/clang-pseudo-gen" - ]) ++ lib.optionals (stdenv.targetPlatform.useLLVM or false) [ - "-DCLANG_DEFAULT_CXX_STDLIB=ON" - ] ++ devExtraCmakeFlags; + ]) ++ lib.optional (lib.versionAtLeast release_version "20") "-DLLVM_DIR=${libllvm.dev}/lib/cmake/llvm" + ++ devExtraCmakeFlags; postPatch = '' # Make sure clang passes the correct location of libLTO to ld64 substituteInPlace lib/Driver/ToolChains/Darwin.cpp \ --replace-fail 'StringRef P = llvm::sys::path::parent_path(D.Dir);' 'StringRef P = "${lib.getLib libllvm}";' - '' + (if lib.versionOlder release_version "13" then '' - sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \ - -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \ - lib/Driver/ToolChains/*.cpp - '' else '' (cd tools && ln -s ../../clang-tools-extra extra) - '') + lib.optionalString stdenv.hostPlatform.isMusl '' + '' + lib.optionalString (lib.versionOlder release_version "13") '' + substituteInPlace tools/extra/clangd/quality/CompletionModel.cmake \ + --replace ' ''${CMAKE_SOURCE_DIR}/../clang-tools-extra' ' ''${CMAKE_SOURCE_DIR}/tools/extra' + '' + + lib.optionalString stdenv.hostPlatform.isMusl '' sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp ''; @@ -132,8 +130,10 @@ let mkdir -p $dev/bin '' + (if lib.versionOlder release_version "15" then '' cp bin/clang-tblgen $dev/bin - '' else '' + '' else if lib.versionOlder release_version "20" then '' cp bin/{clang-tblgen,clang-tidy-confusable-chars-gen,clang-pseudo-gen} $dev/bin + '' else '' + cp bin/{clang-tblgen,clang-tidy-confusable-chars-gen} $dev/bin ''); passthru = { @@ -208,18 +208,7 @@ let ''; } else { ninjaFlags = [ "docs-clang-man" ]; - })) // (lib.optionalAttrs (clang-tools-extra_src != null) { inherit clang-tools-extra_src; }) - // (lib.optionalAttrs (lib.versionOlder release_version "13") { - unpackPhase = '' - unpackFile $src - mv clang-* clang - sourceRoot=$PWD/clang - unpackFile ${clang-tools-extra_src} - mv clang-tools-extra-* $sourceRoot/tools/extra - substituteInPlace $sourceRoot/tools/extra/clangd/quality/CompletionModel.cmake \ - --replace ' ''${CMAKE_SOURCE_DIR}/../clang-tools-extra' ' ''${CMAKE_SOURCE_DIR}/tools/extra' - ''; - }) + })) // (lib.optionalAttrs (lib.versionAtLeast release_version "15") { env = lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform && !stdenv.hostPlatform.useLLVM) { # The following warning is triggered with (at least) gcc >= diff --git a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix index e43ff09931b8..9ec3a2ddcbd6 100644 --- a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix @@ -7,10 +7,11 @@ , src ? null , monorepoSrc ? null , runCommand +, apple-sdk +, apple-sdk_10_13 , cmake , ninja , python3 -, xcbuild , libllvm , libcxx , linuxHeaders @@ -40,18 +41,28 @@ let # use clean up the `cmakeFlags` rats nest below. haveLibcxx = stdenv.cc.libcxx != null; isDarwinStatic = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isStatic && lib.versionAtLeast release_version "16"; - inherit (stdenv.hostPlatform) isMusl isAarch64; - noSanitizers = !haveLibc || bareMetal || isMusl || isDarwinStatic; + inherit (stdenv.hostPlatform) isMusl isAarch64 isWindows; + noSanitizers = !haveLibc || bareMetal || isMusl || isDarwinStatic || isWindows; baseName = "compiler-rt"; pname = baseName + lib.optionalString (haveLibc) "-libc"; + # Sanitizers require 10.13 or newer. Instead of disabling them for most x86_64-darwin users, + # build them with a newer SDK and the default (10.12) deployment target. + apple-sdk' = + if lib.versionOlder (lib.getVersion apple-sdk) "10.13" then + apple-sdk_10_13.override { enableBootstrap = true; } + else + apple-sdk.override { enableBootstrap = true; }; + src' = if monorepoSrc != null then - runCommand "${baseName}-src-${version}" {} '' + runCommand "${baseName}-src-${version}" {} ('' mkdir -p "$out" + '' + lib.optionalString (lib.versionAtLeast release_version "14") '' cp -r ${monorepoSrc}/cmake "$out" + '' + '' cp -r ${monorepoSrc}/${baseName} "$out" - '' else src; + '') else src; preConfigure = lib.optionalString (!haveLibc) '' cmakeFlagsArray+=(-DCMAKE_C_FLAGS="-nodefaultlibs -ffreestanding") @@ -62,27 +73,33 @@ stdenv.mkDerivation ({ inherit pname version patches; src = src'; - sourceRoot = if lib.versionOlder release_version "13" then null - else "${src'.name}/${baseName}"; + sourceRoot = "${src'.name}/${baseName}"; nativeBuildInputs = [ cmake ] ++ (lib.optional (lib.versionAtLeast release_version "15") ninja) - ++ [ python3 libllvm.dev ] - ++ lib.optional stdenv.isDarwin xcbuild.xcrun; + ++ [ python3 libllvm.dev ]; buildInputs = lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isRiscV) linuxHeaders - ++ lib.optional (stdenv.hostPlatform.isFreeBSD) freebsd.include; - - env.NIX_CFLAGS_COMPILE = toString ([ - "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" - ] ++ lib.optionals (!haveLibc) [ - # The compiler got stricter about this, and there is a usellvm patch below - # which patches out the assert include causing an implicit definition of - # assert. It would be nicer to understand why compiler-rt thinks it should - # be able to #include <assert.h> in the first place; perhaps it's in the - # wrong, or perhaps there is a way to provide an assert.h. - "-Wno-error=implicit-function-declaration" - ]); + ++ lib.optional (stdenv.hostPlatform.isFreeBSD) freebsd.include + # Adding the bootstrap SDK to `buildInputs` on static builds propagates it, breaking `xcrun`. + # This can be removed once the minimum SDK >10.12 on x86_64-darwin. + ++ lib.optionals (stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isStatic) [ apple-sdk' ]; + + env = { + NIX_CFLAGS_COMPILE = toString ([ + "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" + ] ++ lib.optionals (!haveLibc) [ + # The compiler got stricter about this, and there is a usellvm patch below + # which patches out the assert include causing an implicit definition of + # assert. It would be nicer to understand why compiler-rt thinks it should + # be able to #include <assert.h> in the first place; perhaps it's in the + # wrong, or perhaps there is a way to provide an assert.h. + "-Wno-error=implicit-function-declaration" + ]); + } // lib.optionalAttrs (stdenv.hostPlatform.isDarwin) { + # Work around clang’s trying to invoke unprefixed-ld on Darwin when `-target` is passed. + NIX_CFLAGS_LINK = "--ld-path=${stdenv.cc.bintools}/bin/${stdenv.cc.targetPrefix}ld"; + }; cmakeFlags = [ "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" @@ -125,33 +142,30 @@ stdenv.mkDerivation ({ "-DCOMPILER_RT_OS_DIR=baremetal" ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) (lib.optionals (lib.versionAtLeast release_version "16") [ "-DCMAKE_LIPO=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}lipo" + ] ++ lib.optionals (!haveLibcxx) [ + # Darwin fails to detect that the compiler supports the `-g` flag when there is no libc++ during the + # compiler-rt bootstrap, which prevents compiler-rt from building. The `-g` flag is required by the + # Darwin support, so force it to be enabled during the first stage of the compiler-rt bootstrap. + "-DCOMPILER_RT_HAS_G_FLAG=ON" ] ++ [ - "-DDARWIN_macosx_OVERRIDE_SDK_VERSION=ON" + "-DDARWIN_macosx_CACHED_SYSROOT=${apple-sdk'.sdkroot}" + "-DDARWIN_macosx_OVERRIDE_SDK_VERSION=${lib.versions.majorMinor (lib.getVersion apple-sdk)}" "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}" "-DDARWIN_osx_BUILTIN_ARCHS=${stdenv.hostPlatform.darwinArch}" + "-DSANITIZER_MIN_OSX_VERSION=${stdenv.hostPlatform.darwinMinVersion}" ] ++ lib.optionals (lib.versionAtLeast release_version "15") [ # `COMPILER_RT_DEFAULT_TARGET_ONLY` does not apply to Darwin: # https://github.com/llvm/llvm-project/blob/27ef42bec80b6c010b7b3729ed0528619521a690/compiler-rt/cmake/base-config-ix.cmake#L153 "-DCOMPILER_RT_ENABLE_IOS=OFF" - ]) ++ lib.optionals (lib.versionAtLeast version "19" && stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") [ - "-DSANITIZER_MIN_OSX_VERSION=10.10" - ] ++ lib.optionals (noSanitizers && lib.versionAtLeast release_version "19") [ + ]) ++ lib.optionals (noSanitizers && lib.versionAtLeast release_version "19") [ "-DCOMPILER_RT_BUILD_CTX_PROFILE=OFF" ] ++ devExtraCmakeFlags; outputs = [ "out" "dev" ]; - # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks - # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra - # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd - # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by - # a flag and turn the flag off during the stdenv build. - postPatch = lib.optionalString (!stdenv.isDarwin) '' + postPatch = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' substituteInPlace cmake/builtin-config-ix.cmake \ --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)' - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace cmake/config-ix.cmake \ - --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' '' + lib.optionalString (!haveLibc) ((lib.optionalString (lib.versionAtLeast release_version "18") '' substituteInPlace lib/builtins/aarch64/sme-libc-routines.c \ --replace "<stdlib.h>" "<stddef.h>" @@ -173,6 +187,13 @@ stdenv.mkDerivation ({ substituteInPlace ../libcxx/utils/merge_archives.py \ --replace-fail "import distutils.spawn" "from shutil import which as find_executable" \ --replace-fail "distutils.spawn." "" + '' + lib.optionalString (lib.versionAtLeast release_version "19") + # codesign in sigtool doesn't support the various options used by the build + # and is present in the bootstrap-tools. Removing find_program prevents the + # build from trying to use it and failing. + '' + substituteInPlace cmake/Modules/AddCompilerRT.cmake \ + --replace-fail 'find_program(CODESIGN codesign)' "" ''; # Hack around weird upsream RPATH bug diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index 689ea9f7cb7b..fa1f61bfd5d1 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -88,13 +88,8 @@ let } { after = "19"; - before = "20"; path = ../19; } - { - after = "20"; - path = ../git; - } ]; "clang/purity.patch" = [ { @@ -195,6 +190,21 @@ let path = ../12; } ]; + "compiler-rt/armv6-scudo-libatomic.patch" = [ + { + after = "19"; + path = ../19; + } + { + after = "15"; + before = "19"; + path = ../15; + } + { + before = "15"; + path = ../14; + } + ]; "compiler-rt/armv7l.patch" = [ { before = "15"; @@ -284,6 +294,12 @@ let path = ../14; } ]; + "libclc/use-default-paths.patch" = [ + { + after = "19"; + path = ../19; + } + ]; }; constraints = patches."${p}" or null; @@ -330,13 +346,7 @@ let tools = lib.makeExtensible ( tools: let - callPackage = newScope ( - tools - // args - // metadata - # Previously monorepoSrc was erroneously not being passed through. - // lib.optionalAttrs (lib.versionOlder metadata.release_version "14") { monorepoSrc = null; } # Preserve a bug during #307211, TODO: remove; causes llvm 13 rebuild. - ); + callPackage = newScope (tools // args // metadata); clangVersion = if (lib.versionOlder metadata.release_version "16") then metadata.release_version @@ -345,7 +355,7 @@ let mkExtraBuildCommands0 = cc: '' rsrc="$out/resource-root" mkdir "$rsrc" - ln -s "${cc.lib}/lib/clang/${clangVersion}/include" "$rsrc" + ln -s "${lib.getLib cc}/lib/clang/${clangVersion}/include" "$rsrc" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags ''; mkExtraBuildCommandsBasicRt = @@ -370,6 +380,17 @@ let libllvm = callPackage ./llvm { patches = lib.optional (lib.versionOlder metadata.release_version "14") ./llvm/llvm-config-link-static.patch + ++ lib.optionals (lib.versions.major metadata.release_version == "12") [ + (metadata.getVersionFile "llvm/fix-llvm-issue-49955.patch") + + # On older CPUs (e.g. Hydra/wendy) we'd be getting an error in this test. + (fetchpatch { + name = "uops-CMOV16rm-noreg.diff"; + url = "https://github.com/llvm/llvm-project/commit/9e9f991ac033.diff"; + sha256 = "sha256:12s8vr6ibri8b48h2z38f3afhwam10arfiqfy4yg37bmc054p5hi"; + stripLen = 1; + }) + ] ++ [ (metadata.getVersionFile "llvm/gnu-install-dirs.patch") ] ++ lib.optionals (lib.versionAtLeast metadata.release_version "15") [ # Running the tests involves invoking binaries (like `opt`) that depend on @@ -433,7 +454,7 @@ let hash = "sha256-XPbvNJ45SzjMGlNUgt/IgEvM2dHQpDOe6woUJY+nUYA="; } ) - ++ lib.optionals (lib.versions.major metadata.release_version == "13") [ + ++ lib.optionals (lib.versionOlder metadata.release_version "14") [ # Backport gcc-13 fixes with missing includes. (fetchpatch { name = "signals-gcc-13.patch"; @@ -483,7 +504,18 @@ let stripLen = 1; hash = "sha256-fqw5gTSEOGs3kAguR4tINFG7Xja1RAje+q67HJt2nGg="; }) - ]; + ] + ++ + lib.optionals + (lib.versionAtLeast metadata.release_version "17" && lib.versionOlder metadata.release_version "19") + [ + # Fixes test-suite on glibc 2.40 (https://github.com/llvm/llvm-project/pull/100804) + (fetchpatch2 { + url = "https://github.com/llvm/llvm-project/commit/1e8df9e85a1ff213e5868bd822877695f27504ad.patch"; + hash = "sha256-EX+PYGicK73lsL/J0kSZ4S5y1/NHIclBddhsnV6NPPI="; + stripLen = 1; + }) + ]; pollyPatches = [ (metadata.getVersionFile "llvm/gnu-install-dirs-polly.patch") ] ++ lib.optional (lib.versionAtLeast metadata.release_version "15") @@ -508,8 +540,24 @@ let # mis-compilation in firefox. # See: https://bugzilla.mozilla.org/show_bug.cgi?id=1741454 (metadata.getVersionFile "clang/revert-malloc-alignment-assumption.patch") + # This patch prevents global system header directories from + # leaking through on non‐NixOS Linux. However, on macOS, the + # SDK path is used as the sysroot, and forcing `-nostdlibinc` + # breaks `-isysroot` with an unwrapped compiler. As macOS has + # no `/usr/include`, there’s essentially no risk to skipping + # the patch there. It’s possible that Homebrew headers in + # `/usr/local/include` might leak through to unwrapped + # compilers being used without an SDK set or something, but + # it hopefully shouldn’t matter. + # + # TODO: Figure out a better solution to this whole problem so + # that we won’t have to choose between breaking unwrapped + # compilers breaking libclang when we can do Linux‐to‐Darwin + # cross‐compilation again. + ++ lib.optional ( + !args.stdenv.hostPlatform.isDarwin || !args.stdenv.targetPlatform.isDarwin + ) ./clang/add-nostdlibinc-flag.patch ++ [ - ./clang/add-nostdlibinc-flag.patch (substituteAll { src = if (lib.versionOlder metadata.release_version "16") then @@ -519,6 +567,29 @@ let libllvmLibdir = "${tools.libllvm.lib}/lib"; }) ] + # Backport version logic from Clang 16. This is needed by the following patch. + ++ lib.optional (lib.versions.major metadata.release_version == "15") (fetchpatch { + name = "clang-darwin-Use-consistent-version-define-stringifying-logic.patch"; + url = "https://github.com/llvm/llvm-project/commit/60a33ded751c86fff9ac1c4bdd2b341fbe4b0649.patch?full_index=1"; + includes = [ "lib/Basic/Targets/OSTargets.cpp" ]; + stripLen = 1; + hash = "sha256-YVTSg5eZLz3po2AUczPNXCK26JA3CuTh6Iqp7hAAKIs="; + }) + # Backport `__ENVIRONMENT_OS_VERSION_MIN_REQUIRED__` support from Clang 17. + # This is needed by newer SDKs (14+). + ++ + lib.optional + ( + lib.versionAtLeast (lib.versions.major metadata.release_version) "15" + && lib.versionOlder (lib.versions.major metadata.release_version) "17" + ) + (fetchpatch { + name = "clang-darwin-An-OS-version-preprocessor-define.patch"; + url = "https://github.com/llvm/llvm-project/commit/c8e2dd8c6f490b68e41fe663b44535a8a21dfeab.patch?full_index=1"; + includes = [ "lib/Basic/Targets/OSTargets.cpp" ]; + stripLen = 1; + hash = "sha256-Vs32kql7N6qtLqc12FtZHURcbenA7+N3E/nRRX3jdig="; + }) ++ lib.optional (lib.versions.major metadata.release_version == "18") (fetchpatch { name = "tweak-tryCaptureVariable-for-unevaluated-lambdas.patch"; url = "https://github.com/llvm/llvm-project/commit/3d361b225fe89ce1d8c93639f27d689082bd8dad.patch"; @@ -605,7 +676,7 @@ let { substituteAll, libclang }: (substituteAll { src = metadata.getVersionFile "lldb/resource-dir.patch"; - clangLibDir = "${libclang.lib}/lib"; + clangLibDir = "${lib.getLib libclang}/lib"; }).overrideAttrs (_: _: { name = "resource-dir.patch"; }) ) { }; @@ -653,8 +724,12 @@ let # # See here for some context: # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132 + # + # Patch is applied for >= 14 as the versions below are broken anyways. ++ lib.optional ( - stdenv.targetPlatform.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0" + lib.versionAtLeast metadata.release_version "14" + && stdenv.targetPlatform.isDarwin + && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0" ) (metadata.getVersionFile "lldb/cpu_subtype_arm64e_replacement.patch"); } // lib.optionalAttrs (lib.versions.major metadata.release_version == "16") { @@ -730,12 +805,9 @@ let && stdenv.targetPlatform.useLLVM or false ) "-lunwind" ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; - nixSupport.cc-ldflags = - lib.optionals (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD) - ( - [ "-L${targetLlvmLibraries.libunwind}/lib" ] - ++ lib.optional (lib.versionAtLeast metadata.release_version "17") "--undefined-version" - ); + nixSupport.cc-ldflags = lib.optionals ( + !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD + ) [ "-L${targetLlvmLibraries.libunwind}/lib" ]; } ); @@ -746,16 +818,20 @@ let bintools = bintools'; extraPackages = [ targetLlvmLibraries.compiler-rt-no-libc ] - ++ lib.optionals (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD) [ - targetLlvmLibraries.libunwind - ]; + ++ lib.optionals + ( + !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && !stdenv.targetPlatform.isDarwin + ) + [ + targetLlvmLibraries.libunwind + ]; extraBuildCommands = lib.optionalString (lib.versions.major metadata.release_version == "13") ( '' echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags echo "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib" >> $out/nix-support/cc-cflags '' - + lib.optionalString (!stdenv.targetPlatform.isWasm) '' + + lib.optionalString (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isDarwin) '' echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags echo "-L${targetLlvmLibraries.libunwind}/lib" >> $out/nix-support/cc-ldflags '' @@ -776,7 +852,7 @@ let "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib" ] ++ lib.optional ( - !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD + !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && !stdenv.targetPlatform.isDarwin ) "--unwindlib=libunwind" ++ lib.optional ( !stdenv.targetPlatform.isWasm @@ -785,7 +861,7 @@ let ) "-lunwind" ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; nixSupport.cc-ldflags = lib.optionals ( - !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD + !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && !stdenv.targetPlatform.isDarwin ) [ "-L${targetLlvmLibraries.libunwind}/lib" ]; } ); @@ -902,6 +978,10 @@ let url = "https://github.com/llvm/llvm-project/commit/abc2eae68290c453e1899a94eccc4ed5ea3b69c1.patch"; hash = "sha256-oxCxOjhi5BhNBEraWalEwa1rS3Mx9CuQgRVZ2hrbd7M="; }) + (fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/5909979869edca359bcbca74042c2939d900680e.patch"; + hash = "sha256-l4rQHYbblEADBXaZIdqTG0sZzH4fEQvYiqhLYNZDMa8="; + }) ]; }; } @@ -927,7 +1007,10 @@ let (metadata.getVersionFile "compiler-rt/X86-support-extension.patch") # Add support for i486 i586 i686 by reusing i386 config ] ++ lib.optional ( - lib.versionAtLeast metadata.release_version "14" && lib.versionOlder metadata.release_version "18" + lib.versions.major metadata.release_version == "12" + || ( + lib.versionAtLeast metadata.release_version "14" && lib.versionOlder metadata.release_version "18" + ) ) (metadata.getVersionFile "compiler-rt/gnu-install-dirs.patch") ++ [ # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the @@ -935,13 +1018,15 @@ let (metadata.getVersionFile "compiler-rt/normalize-var.patch") ] ++ - lib.optional (lib.versionOlder metadata.release_version "18") + lib.optional + (lib.versionAtLeast metadata.release_version "13" && lib.versionOlder metadata.release_version "18") # Prevent a compilation error on darwin (metadata.getVersionFile "compiler-rt/darwin-targetconditionals.patch") - ++ - lib.optional (lib.versionAtLeast metadata.release_version "15") - # See: https://github.com/NixOS/nixpkgs/pull/186575 - ./compiler-rt/darwin-plistbuddy-workaround.patch + # TODO: make unconditional and remove in <15 section below. Causes rebuilds. + ++ lib.optionals (lib.versionAtLeast metadata.release_version "15") [ + # See: https://github.com/NixOS/nixpkgs/pull/186575 + ./compiler-rt/darwin-plistbuddy-workaround.patch + ] ++ lib.optional (lib.versions.major metadata.release_version == "15") # See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893 @@ -952,9 +1037,20 @@ let # Fix build on armv6l ./compiler-rt/armv6-mcr-dmb.patch ./compiler-rt/armv6-sync-ops-no-thumb.patch + ] + ++ + lib.optionals + (lib.versionAtLeast metadata.release_version "13" && lib.versionOlder metadata.release_version "18") + [ + # Fix build on armv6l + ./compiler-rt/armv6-scudo-no-yield.patch + ] + ++ [ + # Fix build on armv6l ./compiler-rt/armv6-no-ldrexd-strexd.patch - ./compiler-rt/armv6-scudo-no-yield.patch - ./compiler-rt/armv6-scudo-libatomic.patch + ] + ++ lib.optionals (lib.versionAtLeast metadata.release_version "13") [ + (metadata.getVersionFile "compiler-rt/armv6-scudo-libatomic.patch") ] ++ lib.optional (lib.versionAtLeast metadata.release_version "19") (fetchpatch { url = "https://github.com/llvm/llvm-project/pull/99837/commits/14ae0a660a38e1feb151928a14f35ff0f4487351.patch"; @@ -967,14 +1063,11 @@ let let # temp rename to avoid infinite recursion stdenv = - if args.stdenv.hostPlatform.useLLVM or false then + # Darwin needs to use a bootstrap stdenv to avoid an infinite recursion when cross-compiling. + if args.stdenv.hostPlatform.isDarwin then + overrideCC darwin.bootstrapStdenv buildLlvmTools.clangWithLibcAndBasicRtAndLibcxx + else if args.stdenv.hostPlatform.useLLVM or false then overrideCC args.stdenv buildLlvmTools.clangWithLibcAndBasicRtAndLibcxx - else if - lib.versionAtLeast metadata.release_version "16" - && args.stdenv.hostPlatform.isDarwin - && args.stdenv.hostPlatform.isStatic - then - overrideCC args.stdenv buildLlvmTools.clangNoCompilerRtWithLibc else args.stdenv; in @@ -993,10 +1086,10 @@ let patches = compiler-rtPatches; doFakeLibgcc = stdenv.hostPlatform.useLLVM or false; stdenv = - if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform then - stdenv + # Darwin needs to use a bootstrap stdenv to avoid an infinite recursion when cross-compiling. + if stdenv.hostPlatform.isDarwin then + overrideCC darwin.bootstrapStdenv buildLlvmTools.clangNoLibcNoRt else - # TODO: make this branch unconditional next rebuild overrideCC stdenv buildLlvmTools.clangNoLibcNoRt; }; @@ -1058,7 +1151,7 @@ let lib.optional ( lib.versions.major metadata.release_version == "17" - && stdenv.isDarwin + && stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13" ) # https://github.com/llvm/llvm-project/issues/64226 @@ -1073,12 +1166,16 @@ let lib.optional ( lib.versionAtLeast metadata.release_version "18" - && stdenv.isDarwin + && stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13" ) # https://github.com/llvm/llvm-project/issues/64226 (metadata.getVersionFile "libcxx/0001-darwin-10.12-mbstate_t-fix.patch"); - stdenv = overrideCC stdenv buildLlvmTools.clangWithLibcAndBasicRt; + stdenv = + if stdenv.hostPlatform.isDarwin then + overrideCC darwin.bootstrapStdenv buildLlvmTools.clangWithLibcAndBasicRt + else + overrideCC stdenv buildLlvmTools.clangWithLibcAndBasicRt; } // lib.optionalAttrs (lib.versionOlder metadata.release_version "14") { # TODO: remove this, causes LLVM 13 packages rebuild. diff --git a/pkgs/development/compilers/llvm/common/libclc.nix b/pkgs/development/compilers/llvm/common/libclc.nix index 4c2081e693c1..d20e6877019b 100644 --- a/pkgs/development/compilers/llvm/common/libclc.nix +++ b/pkgs/development/compilers/llvm/common/libclc.nix @@ -1,42 +1,95 @@ -{ lib, stdenv, version, runCommand, monorepoSrc, llvm, buildPackages, buildLlvmTools, ninja, cmake, python3 }: +{ + lib, + stdenv, + version, + runCommand, + monorepoSrc, + llvm, + buildPackages, + buildLlvmTools, + ninja, + cmake, + python3, + release_version, + getVersionFile, +}: +let + spirv-llvm-translator = buildPackages.spirv-llvm-translator.override { + inherit (buildLlvmTools) llvm; + }; + # The build requires an unwrapped clang but wrapped clang++ thus we need to + # split the unwrapped clang out to prevent the build from finding the + # unwrapped clang++ + clang-only = runCommand "clang-only" { } '' + mkdir -p "$out"/bin + ln -s "${lib.getExe' buildLlvmTools.clang.cc "clang"}" "$out"/bin + ''; +in stdenv.mkDerivation rec { pname = "libclc"; inherit version; - src = runCommand "${pname}-src-${version}" {} '' - mkdir -p "$out" - cp -r ${monorepoSrc}/cmake "$out" - cp -r ${monorepoSrc}/${pname} "$out" - ''; + src = runCommand "${pname}-src-${version}" { } ( + '' + mkdir -p "$out" + '' + + lib.optionalString (lib.versionAtLeast release_version "14") '' + cp -r ${monorepoSrc}/cmake "$out" + '' + + '' + cp -r ${monorepoSrc}/${pname} "$out" + '' + ); sourceRoot = "${src.name}/${pname}"; - outputs = [ "out" "dev" ]; - - patches = [ - ./libclc/libclc-gnu-install-dirs.patch + outputs = [ + "out" + "dev" ]; + patches = + [ ./libclc/libclc-gnu-install-dirs.patch ] + # LLVM 19 changes how host tools are looked up. + # Need to remove NO_DEFAULT_PATH and the PATHS arguments for find_program + # so CMake can actually find the tools in nativeBuildInputs. + # https://github.com/llvm/llvm-project/pull/105969 + ++ lib.optional (lib.versionAtLeast release_version "19") ( + getVersionFile "libclc/use-default-paths.patch" + ); + # cmake expects all required binaries to be in the same place, so it will not be able to find clang without the patch - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace 'find_program( LLVM_CLANG clang PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ - 'find_program( LLVM_CLANG clang PATHS "${buildLlvmTools.clang.cc}/bin" NO_DEFAULT_PATH )' \ - --replace 'find_program( LLVM_AS llvm-as PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ - 'find_program( LLVM_AS llvm-as PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \ - --replace 'find_program( LLVM_LINK llvm-link PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ - 'find_program( LLVM_LINK llvm-link PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \ - --replace 'find_program( LLVM_OPT opt PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ - 'find_program( LLVM_OPT opt PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \ - --replace 'find_program( LLVM_SPIRV llvm-spirv PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ - 'find_program( LLVM_SPIRV llvm-spirv PATHS "${buildPackages.spirv-llvm-translator.override { inherit (buildLlvmTools) llvm; }}/bin" NO_DEFAULT_PATH )' - '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' - substituteInPlace CMakeLists.txt \ - --replace 'COMMAND prepare_builtins' 'COMMAND ${buildLlvmTools.libclc.dev}/bin/prepare_builtins' - ''; + postPatch = + lib.optionalString (lib.versionOlder release_version "19") '' + substituteInPlace CMakeLists.txt \ + --replace 'find_program( LLVM_CLANG clang PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ + 'find_program( LLVM_CLANG clang PATHS "${buildLlvmTools.clang.cc}/bin" NO_DEFAULT_PATH )' \ + --replace 'find_program( LLVM_AS llvm-as PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ + 'find_program( LLVM_AS llvm-as PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \ + --replace 'find_program( LLVM_LINK llvm-link PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ + 'find_program( LLVM_LINK llvm-link PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \ + --replace 'find_program( LLVM_OPT opt PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ + 'find_program( LLVM_OPT opt PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \ + --replace 'find_program( LLVM_SPIRV llvm-spirv PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ + 'find_program( LLVM_SPIRV llvm-spirv PATHS "${spirv-llvm-translator}/bin" NO_DEFAULT_PATH )' + '' + + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + substituteInPlace CMakeLists.txt \ + --replace 'COMMAND prepare_builtins' 'COMMAND ${buildLlvmTools.libclc.dev}/bin/prepare_builtins' + ''; - nativeBuildInputs = [ cmake ninja python3 ]; + nativeBuildInputs = + [ + cmake + ninja + python3 + ] + ++ lib.optional (lib.versionAtLeast release_version "19") [ + clang-only + buildLlvmTools.llvm + spirv-llvm-translator + ]; buildInputs = [ llvm ]; strictDeps = true; diff --git a/pkgs/development/compilers/llvm/common/libcxx/default.nix b/pkgs/development/compilers/llvm/common/libcxx/default.nix index 2893d012151d..c0d1ab02da85 100644 --- a/pkgs/development/compilers/llvm/common/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/common/libcxx/default.nix @@ -61,7 +61,8 @@ let ]) ++ lib.optionals stdenv.hostPlatform.isWasm [ "-DLIBCXXABI_ENABLE_THREADS=OFF" "-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF" - ] ++ lib.optionals (!enableShared) [ + ] ++ lib.optionals (!enableShared || stdenv.hostPlatform.isWindows) [ + # Required on Windows due to https://github.com/llvm/llvm-project/issues/55245 "-DLIBCXXABI_ENABLE_SHARED=OFF" ]; @@ -91,6 +92,9 @@ let "-DLIBCXX_ENABLE_THREADS=OFF" "-DLIBCXX_ENABLE_FILESYSTEM=OFF" "-DLIBCXX_ENABLE_EXCEPTIONS=OFF" + ] ++ lib.optionals stdenv.hostPlatform.isWindows [ + # https://github.com/llvm/llvm-project/issues/55245 + "-DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=ON" ] ++ lib.optionals (!enableShared) [ "-DLIBCXX_ENABLE_SHARED=OFF" ] ++ lib.optionals (cxxabi != null && cxxabi.libName == "cxxrt") [ @@ -99,9 +103,13 @@ let cmakeFlags = [ "-DLLVM_ENABLE_RUNTIMES=${lib.concatStringsSep ";" runtimes}" + ] ++ lib.optionals ( + stdenv.hostPlatform.isWasm + || (lib.versions.major release_version == "12" && stdenv.hostPlatform.isDarwin) + ) [ + "-DCMAKE_CXX_COMPILER_WORKS=ON" ] ++ lib.optionals stdenv.hostPlatform.isWasm [ "-DCMAKE_C_COMPILER_WORKS=ON" - "-DCMAKE_CXX_COMPILER_WORKS=ON" "-DUNIX=ON" # Required otherwise libc++ fails to detect the correct linker ] ++ cxxCMakeFlags ++ lib.optionals (cxxabi == null) cxxabiCMakeFlags @@ -121,7 +129,7 @@ stdenv.mkDerivation (rec { ''; nativeBuildInputs = [ cmake ninja python3 ] - ++ lib.optional stdenv.isDarwin fixDarwinDylibNames + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames ++ lib.optional (cxxabi != null) lndir; buildInputs = [ cxxabi ] diff --git a/pkgs/development/compilers/llvm/common/libunwind/default.nix b/pkgs/development/compilers/llvm/common/libunwind/default.nix index 77854ddfcc5d..4f1fa0107c14 100644 --- a/pkgs/development/compilers/llvm/common/libunwind/default.nix +++ b/pkgs/development/compilers/llvm/common/libunwind/default.nix @@ -19,7 +19,9 @@ let src' = if monorepoSrc != null then runCommand "${pname}-src-${version}" {} ('' mkdir -p "$out" + '' + lib.optionalString (lib.versionAtLeast release_version "14") '' cp -r ${monorepoSrc}/cmake "$out" + '' + '' cp -r ${monorepoSrc}/${pname} "$out" mkdir -p "$out/libcxx" cp -r ${monorepoSrc}/libcxx/cmake "$out/libcxx" @@ -33,11 +35,6 @@ let hasPatches = builtins.length patches > 0; - postUnpack = lib.optionalString (lib.versions.major release_version == "12") '' - ln -s ${libcxx.src}/libcxx . - ln -s ${libcxx.src}/llvm . - ''; - prePatch = lib.optionalString (lib.versionAtLeast release_version "15" && (hasPatches || lib.versionOlder release_version "18")) '' cd ../${pname} chmod -R u+w . @@ -58,8 +55,8 @@ stdenv.mkDerivation (rec { src = src'; sourceRoot = - if lib.versionOlder release_version "13" then null - else if lib.versionAtLeast release_version "15" then "${src.name}/runtimes" + if lib.versionAtLeast release_version "15" + then "${src.name}/runtimes" else "${src.name}/${pname}"; outputs = [ "out" "dev" ]; @@ -70,6 +67,9 @@ stdenv.mkDerivation (rec { cmakeFlags = lib.optional (lib.versionAtLeast release_version "15") "-DLLVM_ENABLE_RUNTIMES=libunwind" ++ lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF" + ++ lib.optionals (lib.versions.major release_version == "12" && stdenv.hostPlatform.isDarwin) [ + "-DCMAKE_CXX_COMPILER_WORKS=ON" + ] ++ devExtraCmakeFlags; meta = llvm_meta // { @@ -83,7 +83,6 @@ stdenv.mkDerivation (rec { dependency of other runtimes. ''; }; -} // (if postUnpack != "" then { inherit postUnpack; } else {}) - // (if (lib.versionAtLeast release_version "15") then { inherit postInstall; } else {}) +} // (if (lib.versionAtLeast release_version "15") then { inherit postInstall; } else {}) // (if prePatch != "" then { inherit prePatch; } else {}) // (if postPatch != "" then { inherit postPatch; } else {})) diff --git a/pkgs/development/compilers/llvm/common/lld/default.nix b/pkgs/development/compilers/llvm/common/lld/default.nix index 2c87d4cfa96f..4008f2076d73 100644 --- a/pkgs/development/compilers/llvm/common/lld/default.nix +++ b/pkgs/development/compilers/llvm/common/lld/default.nix @@ -6,7 +6,6 @@ , buildLlvmTools , monorepoSrc ? null , src ? null -, libunwind ? null , runCommand , cmake , ninja @@ -19,21 +18,18 @@ let pname = "lld"; src' = if monorepoSrc != null then - runCommand "lld-src-${version}" {} '' + runCommand "lld-src-${version}" {} ('' mkdir -p "$out" + '' + lib.optionalString (lib.versionAtLeast release_version "14") '' cp -r ${monorepoSrc}/cmake "$out" + '' + '' cp -r ${monorepoSrc}/${pname} "$out" mkdir -p "$out/libunwind" cp -r ${monorepoSrc}/libunwind/include "$out/libunwind" mkdir -p "$out/llvm" - '' else src; + '') else src; - postPatch = lib.optionalString (lib.versions.major release_version == "12") '' - substituteInPlace MachO/CMakeLists.txt --replace \ - '(''${LLVM_MAIN_SRC_DIR}/' '(' - mkdir -p libunwind/include - tar -xf "${libunwind.src}" --wildcards -C libunwind/include --strip-components=2 "libunwind-*/include/" - '' + lib.optionalString (lib.versions.major release_version == "13" && stdenv.isDarwin) '' + postPatch = lib.optionalString (lib.versionOlder release_version "14") '' substituteInPlace MachO/CMakeLists.txt --replace \ '(''${LLVM_MAIN_SRC_DIR}/' '(../' ''; @@ -43,9 +39,7 @@ stdenv.mkDerivation (rec { src = src'; - sourceRoot = - if lib.versionOlder release_version "13" then null - else "${src.name}/${pname}"; + sourceRoot = "${src.name}/${pname}"; nativeBuildInputs = [ cmake ] ++ lib.optional (lib.versionAtLeast release_version "15") ninja; buildInputs = [ libllvm libxml2 ]; @@ -75,4 +69,4 @@ stdenv.mkDerivation (rec { of several different linkers. ''; }; -} // (if (postPatch == "" && lib.versions.major release_version != "13") then {} else { inherit postPatch; })) +} // (lib.optionalAttrs (postPatch != "") { inherit postPatch; })) diff --git a/pkgs/development/compilers/llvm/common/lldb.nix b/pkgs/development/compilers/llvm/common/lldb.nix index d174570c1f34..1e2233790738 100644 --- a/pkgs/development/compilers/llvm/common/lldb.nix +++ b/pkgs/development/compilers/llvm/common/lldb.nix @@ -24,6 +24,8 @@ , patches ? [ ] , enableManpages ? false , devExtraCmakeFlags ? [ ] +, apple-sdk_11 +, darwinMinVersionHook , ... }: @@ -32,7 +34,9 @@ let if monorepoSrc != null then runCommand "lldb-src-${version}" { } ('' mkdir -p "$out" + '' + lib.optionalString (lib.versionAtLeast release_version "14") '' cp -r ${monorepoSrc}/cmake "$out" + '' + '' cp -r ${monorepoSrc}/lldb "$out" '' + lib.optionalString (lib.versionAtLeast release_version "19" && enableManpages) '' mkdir -p "$out/llvm" @@ -54,7 +58,7 @@ stdenv.mkDerivation (rec { # LLDB expects to find the path to `bin` relative to `lib` on Darwin. It can’t be patched with the location of # the `lib` output because that would create a cycle between it and the `out` output. - outputs = [ "out" "dev" ] ++ lib.optionals (!stdenv.isDarwin) [ "lib" ]; + outputs = [ "out" "dev" ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "lib" ]; sourceRoot = lib.optional (lib.versionAtLeast release_version "13") "${src.name}/${pname}"; @@ -87,34 +91,17 @@ stdenv.mkDerivation (rec { # libclang into the rpath of the lldb executables. By putting it into # buildInputs cc-wrapper will set up rpath correctly for us. (lib.getLib libclang) - ] ++ lib.optionals stdenv.isDarwin [ - darwin.libobjc - darwin.apple_sdk.libs.xpc - darwin.apple_sdk.frameworks.Foundation + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.bootstrap_cmds - darwin.apple_sdk.frameworks.Carbon - darwin.apple_sdk.frameworks.Cocoa ] - # The older libSystem used on x86_64 macOS is missing the - # `<bsm/audit_session.h>` header which `lldb` uses. - # - # We copy this header over from macOS 10.12 SDK. - # - # See here for context: - # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132 - ++ lib.optional + ++ lib.optionals ( stdenv.targetPlatform.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0" - && (lib.versionAtLeast release_version "15") - ) - ( - runCommand "bsm-audit-session-header" { } '' - install -Dm444 \ - "${lib.getDev darwin.apple_sdk.sdk}/include/bsm/audit_session.h" \ - "$out/include/bsm/audit_session.h" - '' - ); + ) [ + apple-sdk_11 + (darwinMinVersionHook "10.15") + ]; hardeningDisable = [ "format" ]; @@ -123,12 +110,12 @@ stdenv.mkDerivation (rec { "-DLLVM_ENABLE_RTTI=OFF" "-DClang_DIR=${lib.getDev libclang}/lib/cmake" "-DLLVM_EXTERNAL_LIT=${lit}/bin/lit" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DLLDB_USE_SYSTEM_DEBUGSERVER=ON" - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic ] ++ lib.optionals (lib.versionAtLeast release_version "17") [ - "-DCLANG_RESOURCE_DIR=../../../../${libclang.lib}" + "-DCLANG_RESOURCE_DIR=../../../../${lib.getLib libclang}" ] ++ lib.optionals enableManpages ([ "-DLLVM_ENABLE_SPHINX=ON" "-DSPHINX_OUTPUT_MAN=ON" diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix index e39ba171373f..be106b3db295 100644 --- a/pkgs/development/compilers/llvm/common/llvm/default.nix +++ b/pkgs/development/compilers/llvm/common/llvm/default.nix @@ -4,7 +4,6 @@ , pkgsBuildBuild , pollyPatches ? [] , patches ? [] -, polly_src ? null , src ? null , monorepoSrc ? null , runCommand @@ -17,6 +16,7 @@ # TODO: Can this memory corruption bug still occur? # <https://github.com/llvm/llvm-project/issues/61350> , enableGoldPlugin ? libbfd.hasPluginAPI +, ld64 , libbfd , libpfm , libxml2 @@ -28,13 +28,13 @@ , sysctl , buildLlvmTools , debugVersion ? false -, doCheck ? !stdenv.isAarch32 && (if lib.versionOlder release_version "15" then stdenv.isLinux else true) - && (!stdenv.isx86_32 /* TODO: why */) && (!stdenv.hostPlatform.isMusl) +, doCheck ? !stdenv.hostPlatform.isAarch32 && (if lib.versionOlder release_version "15" then stdenv.hostPlatform.isLinux else true) + && (!stdenv.hostPlatform.isx86_32 /* TODO: why */) && (!stdenv.hostPlatform.isMusl) && !(stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isBigEndian) && (stdenv.hostPlatform == stdenv.buildPlatform) , enableManpages ? false , enableSharedLibraries ? !stdenv.hostPlatform.isStatic -, enablePFM ? stdenv.isLinux /* PFM only supports Linux */ +, enablePFM ? stdenv.hostPlatform.isLinux /* PFM only supports Linux */ # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 # broken for the armv7l builder && !stdenv.hostPlatform.isAarch @@ -46,6 +46,11 @@ let inherit (lib) optional optionals optionalString; + # Is there a better way to do this? Darwin wants to disable tests in the first + # LLVM rebuild, but overriding doesn’t work when building libc++, libc++abi, + # and libunwind. It also wants to disable LTO in the first rebuild. + isDarwinBootstrap = lib.getName stdenv == "bootstrap-stage-xclang-stdenv-darwin"; + # Used when creating a version-suffixed symlink of libLLVM.dylib shortVersion = lib.concatStringsSep "." (lib.take 1 (lib.splitString "." release_version)); @@ -66,7 +71,7 @@ let # # So, we "manually" assemble one python derivation for the package to depend # on, taking into account whether checks are enabled or not: - python = if doCheck then + python = if doCheck && !isDarwinBootstrap then # Note that we _explicitly_ ask for a python interpreter for our host # platform here; the splicing that would ordinarily take care of this for # us does not seem to work once we use `withPackages`. @@ -77,11 +82,15 @@ let pname = "llvm"; + # TODO: simplify versionAtLeast condition for cmake and third-party via rebuild src' = if monorepoSrc != null then runCommand "${pname}-src-${version}" {} ('' mkdir -p "$out" + '' + lib.optionalString (lib.versionAtLeast release_version "14") '' cp -r ${monorepoSrc}/cmake "$out" + '' + '' cp -r ${monorepoSrc}/${pname} "$out" + '' + lib.optionalString (lib.versionAtLeast release_version "14") '' cp -r ${monorepoSrc}/third-party "$out" '' + lib.optionalString enablePolly '' chmod u+w "$out/${pname}/tools" @@ -91,14 +100,13 @@ let patches' = patches ++ lib.optionals enablePolly pollyPatches; in -stdenv.mkDerivation (rec { +stdenv.mkDerivation (finalAttrs: { inherit pname version; src = src'; patches = patches'; - sourceRoot = if lib.versionOlder release_version "13" then null - else "${src.name}/${pname}"; + sourceRoot = "${finalAttrs.src.name}/${pname}"; outputs = [ "out" "lib" "dev" "python" ]; @@ -126,7 +134,7 @@ stdenv.mkDerivation (rec { propagatedBuildInputs = (lib.optional (lib.versionAtLeast release_version "14" || stdenv.buildPlatform == stdenv.hostPlatform) ncurses) ++ [ zlib ]; - postPatch = optionalString stdenv.isDarwin ('' + postPatch = optionalString stdenv.hostPlatform.isDarwin ('' substituteInPlace cmake/modules/AddLLVM.cmake \ --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \ --replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}''${LLVM_LIBDIR_SUFFIX}" ''${extra_libdir})' "" @@ -167,7 +175,7 @@ stdenv.mkDerivation (rec { --replace "PhysicalFileSystemWorkingDirFailure" "DISABLED_PhysicalFileSystemWorkingDirFailure" ''))) + # dup of above patch with different conditions - optionalString (stdenv.isDarwin && stdenv.hostPlatform.isx86 && lib.versionAtLeast release_version "15") (optionalString (lib.versionOlder release_version "16") '' + optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86 && lib.versionAtLeast release_version "15") (optionalString (lib.versionOlder release_version "16") '' substituteInPlace test/ExecutionEngine/Interpreter/intrinsics.ll \ --replace "%roundeven32 = call float @llvm.roundeven.f32(float 0.000000e+00)" "" \ --replace "%roundeven64 = call double @llvm.roundeven.f64(double 0.000000e+00)" "" @@ -267,7 +275,7 @@ stdenv.mkDerivation (rec { # It seems to reference /usr/local/lib/libfile.a, which is clearly a problem. # 2. This test fails for the same reason it fails on MacOS, but the fix is # not trivial to apply. - optionalString stdenv.isFreeBSD '' + optionalString stdenv.hostPlatform.isFreeBSD '' rm test/tools/llvm-libtool-darwin/L-and-l.test rm test/ExecutionEngine/Interpreter/intrinsics.ll '' + '' @@ -319,7 +327,7 @@ stdenv.mkDerivation (rec { ''; # E.g. Mesa uses the build-id as a cache key (see #93946): - LDFLAGS = optionalString (enableSharedLibraries && !stdenv.isDarwin) "-Wl,--build-id=sha1"; + LDFLAGS = optionalString (enableSharedLibraries && !stdenv.hostPlatform.isDarwin) "-Wl,--build-id=sha1"; cmakeBuildType = if debugVersion then "Debug" else "Release"; @@ -342,13 +350,13 @@ stdenv.mkDerivation (rec { ]; in flagsForLlvmConfig ++ [ "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc - "-DLLVM_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" + "-DLLVM_BUILD_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}" "-DLLVM_ENABLE_FFI=ON" "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_ENABLE_DUMP=ON" (lib.cmakeBool "LLVM_ENABLE_TERMINFO" enableTerminfo) - ] ++ optionals (!doCheck) [ + ] ++ optionals (!finalAttrs.finalPackage.doCheck) [ "-DLLVM_INCLUDE_TESTS=OFF" ] ++ optionals stdenv.hostPlatform.isStatic [ # Disables building of shared libs, -fPIC is still injected by cc-wrapper @@ -367,7 +375,7 @@ stdenv.mkDerivation (rec { "-DSPHINX_WARNINGS_AS_ERRORS=OFF" ] ++ optionals (enableGoldPlugin) [ "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" - ] ++ optionals stdenv.isDarwin [ + ] ++ optionals stdenv.hostPlatform.isDarwin [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" ] ++ optionals ((stdenv.hostPlatform != stdenv.buildPlatform) && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) [ @@ -416,10 +424,10 @@ stdenv.mkDerivation (rec { substituteInPlace "$dev/lib/cmake/llvm/LLVMConfig.cmake" \ --replace 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}")' 'set(LLVM_BINARY_DIR "'"$lib"'")' '') - + optionalString (stdenv.isDarwin && enableSharedLibraries && lib.versionOlder release_version "18") '' + + optionalString (stdenv.hostPlatform.isDarwin && enableSharedLibraries && lib.versionOlder release_version "18") '' ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib '' - + optionalString (stdenv.isDarwin && enableSharedLibraries) '' + + optionalString (stdenv.hostPlatform.isDarwin && enableSharedLibraries) '' ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib '' + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) (if stdenv.buildPlatform.canExecute stdenv.hostPlatform then '' @@ -428,7 +436,7 @@ stdenv.mkDerivation (rec { cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native ''); - inherit doCheck; + doCheck = !isDarwinBootstrap && doCheck; checkTarget = "check-all"; @@ -483,19 +491,8 @@ stdenv.mkDerivation (rec { postPatch = null; postInstall = null; -})) // lib.optionalAttrs (lib.versionOlder release_version "13") { - inherit polly_src; - - unpackPhase = '' - unpackFile $src - mv llvm-${release_version}* llvm - sourceRoot=$PWD/llvm - '' + optionalString enablePolly '' - unpackFile $polly_src - mv polly-* $sourceRoot/tools/polly - ''; -} // lib.optionalAttrs (lib.versionAtLeast release_version "13") { - nativeCheckInputs = [ which ] ++ lib.optional (stdenv.isDarwin && lib.versionAtLeast release_version "15") sysctl; +})) // lib.optionalAttrs (lib.versionAtLeast release_version "13") { + nativeCheckInputs = [ which ] ++ lib.optional (stdenv.hostPlatform.isDarwin && lib.versionAtLeast release_version "15") sysctl; } // lib.optionalAttrs (lib.versionOlder release_version "15") { # hacky fix: created binaries need to be run before installation preBuild = '' diff --git a/pkgs/development/compilers/llvm/common/mlir/default.nix b/pkgs/development/compilers/llvm/common/mlir/default.nix index 3ef689b7fefe..9c3c71c3b705 100644 --- a/pkgs/development/compilers/llvm/common/mlir/default.nix +++ b/pkgs/development/compilers/llvm/common/mlir/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , llvm_meta +, release_version , buildLlvmTools , monorepoSrc , runCommand @@ -9,7 +10,7 @@ , libxml2 , libllvm , version -, doCheck ? (!stdenv.isx86_32 /* TODO: why */) && (!stdenv.hostPlatform.isMusl) +, doCheck ? (!stdenv.hostPlatform.isx86_32 /* TODO: why */) && (!stdenv.hostPlatform.isMusl) , devExtraCmakeFlags ? [] }: @@ -18,14 +19,16 @@ stdenv.mkDerivation rec { inherit version doCheck; # Blank llvm dir just so relative path works - src = runCommand "${pname}-src-${version}" { } '' + src = runCommand "${pname}-src-${version}" { } ('' mkdir -p "$out" + '' + lib.optionalString (lib.versionAtLeast release_version "14") '' cp -r ${monorepoSrc}/cmake "$out" + '' + '' cp -r ${monorepoSrc}/mlir "$out" cp -r ${monorepoSrc}/third-party "$out/third-party" mkdir -p "$out/llvm" - ''; + ''); sourceRoot = "${src.name}/mlir"; diff --git a/pkgs/development/compilers/llvm/common/openmp/default.nix b/pkgs/development/compilers/llvm/common/openmp/default.nix index 57c6de07c784..1fe089938f03 100644 --- a/pkgs/development/compilers/llvm/common/openmp/default.nix +++ b/pkgs/development/compilers/llvm/common/openmp/default.nix @@ -21,20 +21,20 @@ let pname = "openmp"; src' = if monorepoSrc != null then - runCommand "${pname}-src-${version}" {} '' + runCommand "${pname}-src-${version}" {} ('' mkdir -p "$out" + '' + lib.optionalString (lib.versionAtLeast release_version "14") '' cp -r ${monorepoSrc}/cmake "$out" + '' + '' cp -r ${monorepoSrc}/${pname} "$out" - '' else src; + '') else src; in stdenv.mkDerivation (rec { inherit pname version patches; src = src'; - sourceRoot = - if lib.versionOlder release_version "13" then null - else "${src.name}/${pname}"; + sourceRoot = "${src.name}/${pname}"; outputs = [ "out" ] ++ lib.optionals (lib.versionAtLeast release_version "14") [ "dev" ]; diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 2d0ffd4740f8..726b54a9d66e 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -22,17 +22,18 @@ }@packageSetArgs: let versions = { + "12.0.1".officialRelease.sha256 = "08s5w2db9imb2yaqsvxs6pg21csi1cf6wa35rf8x6q07mam7j8qv"; "13.0.1".officialRelease.sha256 = "06dv6h5dmvzdxbif2s8njki6h32796v368dyb5945x8gjj72xh7k"; "14.0.6".officialRelease.sha256 = "sha256-vffu4HilvYwtzwgq+NlS26m65DGbp6OSSne2aje1yJE="; "15.0.7".officialRelease.sha256 = "sha256-wjuZQyXQ/jsmvy6y1aksCcEDXGBjuhpgngF3XQJ/T4s="; "16.0.6".officialRelease.sha256 = "sha256-fspqSReX+VD+Nl/Cfq+tDcdPtnQPV1IRopNDfd5VtUs="; "17.0.6".officialRelease.sha256 = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag="; "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE="; - "19.1.0-rc3".officialRelease.sha256 = "sha256-SRonSpXt1pH6Xk+rQZk9mrfMdvYIvOImwUfMUu3sBgs="; + "19.1.3".officialRelease.sha256 = "sha256-NUx01eJNsYMlk+8mtlf10isIqhK8zBmqaOTjuFqMNRQ="; "20.0.0-git".gitRelease = { - rev = "48498ec7a4ded9f1bf813051abdc54c3e5b66fa7"; - rev-version = "20.0.0-unstable-2024-09-16"; - sha256 = "sha256-kybEr4T6vA4F9wtWdFf0QagVYU3tUvaXiSzPsxBkVUI="; + rev = "0e8555d4dbfdfeddc01dc2ecf9a9b6e804f7b645"; + rev-version = "20.0.0-unstable-2024-10-07"; + sha256 = "sha256-Rn8TkTUJKGFZ7uM1RiFOHIDTfpwEhLDpDh1zxVtTYG8="; }; } // llvmVersions; diff --git a/pkgs/development/compilers/llvm/git/clang/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/git/clang/gnu-install-dirs.patch deleted file mode 100644 index 30fdf2c56d5b..000000000000 --- a/pkgs/development/compilers/llvm/git/clang/gnu-install-dirs.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff --git a/cmake/modules/AddClang.cmake b/cmake/modules/AddClang.cmake -index 75b0080f6..c895b884c 100644 ---- a/cmake/modules/AddClang.cmake -+++ b/cmake/modules/AddClang.cmake -@@ -119,8 +119,8 @@ macro(add_clang_library name) - install(TARGETS ${lib} - COMPONENT ${lib} - ${export_to_clangtargets} -- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} -- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} -+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" -+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" - RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") - - if (NOT LLVM_ENABLE_IDE) -diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt -index e6ae4e19e..5ef01aea2 100644 ---- a/lib/Headers/CMakeLists.txt -+++ b/lib/Headers/CMakeLists.txt -@@ -337,6 +337,7 @@ set(llvm_libc_wrapper_files - - include(GetClangResourceDir) - get_clang_resource_dir(output_dir PREFIX ${LLVM_LIBRARY_OUTPUT_INTDIR}/.. SUBDIR include) -+set(header_install_dir ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION_MAJOR}/include) - set(out_files) - set(generated_files) - -diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt -index b5b6d2807..6b592d255 100644 ---- a/tools/libclang/CMakeLists.txt -+++ b/tools/libclang/CMakeLists.txt -@@ -246,7 +246,7 @@ foreach(PythonVersion ${CLANG_PYTHON_BINDINGS_VERSIONS}) - COMPONENT - libclang-python-bindings - DESTINATION -- "lib${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages") -+ "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages") - endforeach() - if(NOT LLVM_ENABLE_IDE) - add_custom_target(libclang-python-bindings) -diff --git a/tools/scan-build-py/CMakeLists.txt b/tools/scan-build-py/CMakeLists.txt -index 3aca22c0b..3115353e3 100644 ---- a/tools/scan-build-py/CMakeLists.txt -+++ b/tools/scan-build-py/CMakeLists.txt -@@ -88,7 +88,7 @@ foreach(lib ${LibScanbuild}) - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/${lib}) - list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/${lib}) - install(FILES lib/libscanbuild/${lib} -- DESTINATION lib/libscanbuild -+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/libscanbuild" - COMPONENT scan-build-py) - endforeach() - -@@ -106,7 +106,7 @@ foreach(resource ${LibScanbuildResources}) - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/resources/${resource}) - list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/resources/${resource}) - install(FILES lib/libscanbuild/resources/${resource} -- DESTINATION lib/libscanbuild/resources -+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/libscanbuild/resources" - COMPONENT scan-build-py) - endforeach() - -@@ -122,7 +122,7 @@ foreach(lib ${LibEar}) - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libear/${lib}) - list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libear/${lib}) - install(FILES lib/libear/${lib} -- DESTINATION lib/libear -+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/libear" - COMPONENT scan-build-py) - endforeach() - diff --git a/pkgs/development/compilers/lobster/default.nix b/pkgs/development/compilers/lobster/default.nix index 645e7019aa73..2ebe573cf513 100644 --- a/pkgs/development/compilers/lobster/default.nix +++ b/pkgs/development/compilers/lobster/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ cmake ]; - buildInputs = if stdenv.isDarwin + buildInputs = if stdenv.hostPlatform.isDarwin then [ CoreFoundation Cocoa @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests.can-run-hello-world = callPackage ./test-can-run-hello-world.nix {}; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://strlen.com/lobster/"; description = "Lobster programming language"; mainProgram = "lobster"; diff --git a/pkgs/development/compilers/lunarml/default.nix b/pkgs/development/compilers/lunarml/default.nix deleted file mode 100644 index 406589e05f44..000000000000 --- a/pkgs/development/compilers/lunarml/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ lib -, fetchFromGitHub -, stdenvNoCC -, mlton -, lua5_3 -}: - -let - version = "0.2.0"; -in -stdenvNoCC.mkDerivation { - inherit version; - - pname = "lunarml"; - - src = fetchFromGitHub { - owner = "minoki"; - repo = "LunarML"; - rev = "refs/tags/v${version}"; - hash = "sha256-w0DWvFegAdpJTab60cDLA+tketmMYeKApx1rCNr27i4="; - }; - - outputs = [ "out" "doc" ]; - - nativeBuildInputs = [ - mlton - ]; - - nativeCheckInputs = [ - lua5_3 - ]; - - postBuild = '' - make -C thirdparty install - ''; - - doCheck = true; - - installPhase = '' - runHook preInstall - - mkdir -p $doc/lunarml $out/{bin,lib} - cp -r bin $out - cp -r lib $out - cp -r example $doc/lunarml - - runHook postInstall - ''; - - meta = { - description = "Standard ML compiler that produces Lua/JavaScript"; - mainProgram = "lunarml"; - homepage = "https://github.com/minoki/LunarML"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ toastal ratsclub ]; - platforms = mlton.meta.platforms; - }; -} diff --git a/pkgs/development/compilers/manticore/default.nix b/pkgs/development/compilers/manticore/default.nix deleted file mode 100644 index d344ff4b726e..000000000000 --- a/pkgs/development/compilers/manticore/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ stdenv, fetchFromGitHub, coreutils, autoreconfHook, smlnj }: - -let - rev = "7376cb20ba5285a6b076a73c821e4743809c1d9d"; -in stdenv.mkDerivation { - pname = "manticore"; - version = "2019.12.03"; - - src = fetchFromGitHub { - owner = "ManticoreProject"; - repo = "manticore"; - sha256 = "17h3ar7d6145dyrm006r3gd5frk3v4apjk383n78dh4vlniv1ay2"; - inherit rev; - }; - - enableParallelBuilding = false; - - nativeBuildInputs = [ autoreconfHook ]; - - buildInputs = [ coreutils smlnj ]; - - autoreconfFlags = [ "-Iconfig" "-vfi" ]; - - unpackPhase = '' - mkdir -p $out - cd $out - unpackFile $src - mv source repo_checkout - cd repo_checkout - chmod u+w . -R - ''; - - postPatch = '' - patchShebangs . - substituteInPlace configure.ac --replace 'MANTICORE_ROOT=`pwd`' 'MANTICORE_ROOT=$out/repo_checkout' - ''; - - preInstall = "mkdir -p $out/bin"; - - meta = { - description = "Parallel, pure variant of Standard ML"; - mainProgram = "pmlc"; - - longDescription = '' - Manticore is a high-level parallel programming language aimed at - general-purpose applications running on multi-core - processors. Manticore supports parallelism at multiple levels: - explicit concurrency and coarse-grain parallelism via CML-style - constructs and fine-grain parallelism via various light-weight - notations, such as parallel tuple expressions and NESL/Nepal-style - parallel array comprehensions. - ''; - - homepage = "http://manticore.cs.uchicago.edu/"; - }; -} diff --git a/pkgs/development/compilers/meta-environment/meta-build-env/default.nix b/pkgs/development/compilers/meta-environment/meta-build-env/default.nix deleted file mode 100644 index 195f0c0e36f8..000000000000 --- a/pkgs/development/compilers/meta-environment/meta-build-env/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "meta-build-env"; - version = "0.1"; - - src = fetchurl { - url = "http://www.meta-environment.org/releases/meta-build-env-${version}.tar.gz"; - sha256 = "1imn1gaan4fv73v8w3k3lgyjzkcn7bdp69k6hlz0vqdg17ysd1x3"; - }; - - meta = { - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/compilers/microscheme/default.nix b/pkgs/development/compilers/microscheme/default.nix deleted file mode 100644 index d630082c76fb..000000000000 --- a/pkgs/development/compilers/microscheme/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, unixtools }: - -stdenv.mkDerivation rec { - pname = "microscheme"; - version = "0.9.3"; - - src = fetchFromGitHub { - owner = "ryansuchocki"; - repo = "microscheme"; - rev = "v${version}"; - sha256 = "5qTWsBCfj5DCZ3f9W1bdo6WAc1DZqVxg8D7pwC95duQ="; - }; - - postPatch = '' - substituteInPlace makefile --replace gcc ${stdenv.cc.targetPrefix}cc - ''; - - nativeBuildInputs = [ makeWrapper unixtools.xxd ]; - - makeFlags = [ "PREFIX=${placeholder "out"}" ]; - - meta = with lib; { - homepage = "https://ryansuchocki.github.io/microscheme/"; - description = "Scheme subset for Atmel microcontrollers"; - mainProgram = "microscheme"; - longDescription = '' - Microscheme is a Scheme subset/variant designed for Atmel - microcontrollers, especially as found on Arduino boards. - ''; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ ardumont ]; - }; -} diff --git a/pkgs/development/compilers/minimacy/default.nix b/pkgs/development/compilers/minimacy/default.nix deleted file mode 100644 index ae4da0d5b027..000000000000 --- a/pkgs/development/compilers/minimacy/default.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ lib -, stdenv -, alsa-lib -, fetchFromGitHub -, libGL -, libGLU -, libX11 -, libXext -, makeBinaryWrapper -}: - -stdenv.mkDerivation rec { - pname = "minimacy"; - version = "1.2.0"; - - src = fetchFromGitHub { - owner = "ambermind"; - repo = pname; - rev = version; - hash = "sha256-uA+4dnhOnv7qRE7nqew8a14DGaQblsMY2uBZ+iyLtFU="; - }; - - nativeBuildInputs = [ makeBinaryWrapper ]; - - buildInputs = [ libGL libGLU ] ++ lib.optionals stdenv.isLinux [ alsa-lib libX11 libXext ]; - - enableParallelBuilding = true; - - env.NIX_CFLAGS_COMPILE = "-Wno-unused-result"; - - preBuild = '' - pushd ${if stdenv.isDarwin then "macos/cmdline" else "unix"} - ''; - - # TODO: build graphic version for darwin - buildFlags = (if stdenv.isDarwin then [ "nox" ] else [ "all" ]) ++ [ "CC=${stdenv.cc.targetPrefix}cc" ]; - - postBuild = '' - popd - ''; - - doCheck = true; - - checkPhase = '' - runHook preCheck - - bin/${if stdenv.isDarwin then "minimacyMac" else "minimacy"} system/demo/demo.fun.mandelbrot.mcy - - runHook postCheck - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/lib/minimacy - cp -r {README.md,LICENSE,system,rom,topLevel.mcy} $out/lib/minimacy - install bin/minimacy* -Dt $out/bin - - runHook postInstall - ''; - - postFixup = '' - for prog in $out/bin/minimacy*; - do wrapProgram $prog \ - --set MINIMACY $out/lib/minimacy - done - ''; - - meta = { - description = "Open-source minimalist computing technology"; - longDescription = '' - Minimacy is an open-source minimalist computation system based on the principle "Less is more". - It is designed and programmed by Sylvain Huet. - ''; - maintainers = with lib.maintainers; [ jboy ]; - homepage = "https://minimacy.net"; - license = lib.licenses.gpl2; - platforms = lib.platforms.linux ++ lib.platforms.darwin; - }; -} diff --git a/pkgs/development/compilers/miranda/default.nix b/pkgs/development/compilers/miranda/default.nix deleted file mode 100644 index 8385f5063db9..000000000000 --- a/pkgs/development/compilers/miranda/default.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ stdenv, lib, fetchzip, fetchpatch }: - -stdenv.mkDerivation rec { - pname = "miranda"; - version = "2.066"; - - # The build generates object files (`.x`) from module files (`.m`). - # To be able to invalidate object file, it contains the `mtime` - # of the corresponding module file at the time of the build. - # When a file is installed to Nix store its `mtime` is set to `1`, - # so the `mtime` field in the object file would no longer match - # and Miranda would try to regenerate it at the runtime, - # even though it is up to date. - # Using `fetchzip` will make all the source files have `mtime=1` - # from the start so this mismatch cannot occur. - src = fetchzip { - url = "https://www.cs.kent.ac.uk/people/staff/dat/miranda/src/mira-${builtins.replaceStrings [ "." ] [ "" ] version}-src.tgz"; - sha256 = "KE/FTL9YW9l7VBAgkFZlqgSM1Bt/BXT6GkkONtyKJjQ="; - }; - - patches = [ - # Allow passing `PREFIX` to makeFlags. - # Sent upstream on 2020-10-10. - (fetchpatch { - name = "fix-makefile-variables.patch"; - url = "https://github.com/jtojnar/miranda/commit/be62d2150725a4c314aa7e3e1e75a165c90be65d.patch"; - sha256 = "0r8nnr7iyzp1a3w3n6y1xi0ralqhm1ifp75yhyj3h1g229vk51a6"; - }) - - # Create the installation directories. - # Sent upstream on 2020-10-10. - (fetchpatch { - name = "add-mkdirs-makefile.patch"; - url = "https://github.com/jtojnar/miranda/commit/048754606625975d5358e946549c41ae7b5d3428.patch"; - sha256 = "1n8xv679i7s789km2dxxrs2pphyyi7vr7rhafqvmkcdmhmxk9h2a"; - }) - - # Use correct installation path for finding the library. - # Sent upstream on 2020-10-10. - (fetchpatch { - name = "c-path-fixes.patch"; - url = "https://github.com/jtojnar/miranda/commit/aea0a118a802a0da6029b781f7cfd388224263cf.patch"; - sha256 = "1z3giv8fzc35a23ga9ahz9d1fbvya67kavnb8h4rv2icbzr5j5gd"; - }) - - # Make build reproducible. - # Sent upstream on 2020-10-10. - (fetchpatch { - name = "deterministic-build.patch"; - url = "https://github.com/jtojnar/miranda/commit/daf8abb8f30ec1cca21698e3fc355578b9f7c571.patch"; - sha256 = "TC/YrHrMzdlwicJ3oJ/TjwhkufmV3ypemgyqhMmVut4="; - }) - ]; - - # Workaround build failure on -fno-common toolchains like upstream - # gcc-10. Otherwise build fails as: - # ld: types.o:(.bss+0x11b0): multiple definition of `current_file'; y.tab.o:(.bss+0x70): first defined here - env.NIX_CFLAGS_COMPILE = toString ([ - "-fcommon" - ] ++ lib.optionals stdenv.cc.isClang [ - "-Wno-error=int-conversion" - ]); - - makeFlags = [ - "CC=${stdenv.cc.targetPrefix}cc" - "CFLAGS=-O2" - "PREFIX=${placeholder "out"}" - ]; - - enableParallelBuilding = true; - - postPatch = '' - patchShebangs quotehostinfo - substituteInPlace Makefile --replace strip '${stdenv.cc.targetPrefix}strip' - ''; - - meta = with lib; { - description = "Compiler for Miranda -- a pure, non-strict, polymorphic, higher order functional programming language"; - homepage = "https://www.cs.kent.ac.uk/people/staff/dat/miranda/"; - license = licenses.bsd2; - maintainers = with maintainers; [ siraben ]; - platforms = platforms.all; - mainProgram = "mira"; - }; -} diff --git a/pkgs/development/compilers/mit-scheme/default.nix b/pkgs/development/compilers/mit-scheme/default.nix index 1abbac512aa7..9b110b0a8b04 100644 --- a/pkgs/development/compilers/mit-scheme/default.nix +++ b/pkgs/development/compilers/mit-scheme/default.nix @@ -15,9 +15,9 @@ let version = "12.1"; - bootstrapFromC = ! ((stdenv.isLinux && stdenv.isAarch64) || stdenv.isx86_64); + bootstrapFromC = ! ((stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isx86_64); - arch = if stdenv.isLinux && stdenv.isAarch64 then + arch = if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64 then "-aarch64le" else "-x86-64"; @@ -31,7 +31,7 @@ stdenv.mkDerivation { # leads to more efficient code than when building the tarball that contains # generated C code instead of those binaries. src = - if stdenv.isLinux && stdenv.isAarch64 + if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64 then fetchurl { url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-${version}-aarch64le.tar.gz"; sha256 = "12ra9bc93x8g07impbd8jr6djjzwpb9qvh9zhxvvrba3332zx3vh"; @@ -93,13 +93,13 @@ stdenv.mkDerivation { meta = with lib; { description = "MIT/GNU Scheme, a native code Scheme compiler"; - longDescription = - '' MIT/GNU Scheme is an implementation of the Scheme programming - language, providing an interpreter, compiler, source-code debugger, - integrated Emacs-like editor, and a large runtime library. MIT/GNU - Scheme is best suited to programming large applications with a rapid - development cycle. - ''; + longDescription = '' + MIT/GNU Scheme is an implementation of the Scheme programming + language, providing an interpreter, compiler, source-code debugger, + integrated Emacs-like editor, and a large runtime library. MIT/GNU + Scheme is best suited to programming large applications with a rapid + development cycle. + ''; homepage = "https://www.gnu.org/software/mit-scheme/"; diff --git a/pkgs/development/compilers/mkcl/default.nix b/pkgs/development/compilers/mkcl/default.nix index 0b95f3e9b2a6..d5e297ae26ef 100644 --- a/pkgs/development/compilers/mkcl/default.nix +++ b/pkgs/development/compilers/mkcl/default.nix @@ -39,14 +39,16 @@ stdenv.mkDerivation rec { ]; # tinycc configure flags copied from the tinycc derivation. - postConfigure = ''( - cd contrib/tinycc - ./configure --cc=cc \ - --elfinterp=$(< $NIX_CC/nix-support/dynamic-linker) \ - --crtprefix=${lib.getLib stdenv.cc.libc}/lib \ - --sysincludepaths=${lib.getDev stdenv.cc.libc}/include:{B}/include \ - --libpaths=${lib.getLib stdenv.cc.libc}/lib - )''; + postConfigure = '' + ( + cd contrib/tinycc; + ./configure --cc=cc \ + --elfinterp=$(< $NIX_CC/nix-support/dynamic-linker) \ + --crtprefix=${lib.getLib stdenv.cc.libc}/lib \ + --sysincludepaths=${lib.getDev stdenv.cc.libc}/include:{B}/include \ + --libpaths=${lib.getLib stdenv.cc.libc}/lib + ) + ''; postInstall = '' wrapProgram $out/bin/mkcl --prefix PATH : "${gcc}/bin" @@ -55,7 +57,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "ANSI Common Lisp Implementation"; homepage = "https://common-lisp.net/project/mkcl/"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/compilers/mlkit/default.nix b/pkgs/development/compilers/mlkit/default.nix deleted file mode 100644 index c4dfa85b70c1..000000000000 --- a/pkgs/development/compilers/mlkit/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, mlton }: - -stdenv.mkDerivation rec { - pname = "mlkit"; - version = "4.7.11"; - - src = fetchFromGitHub { - owner = "melsman"; - repo = "mlkit"; - rev = "v${version}"; - sha256 = "sha256-awjinXegc8jLd6OAB8QLDoXnotZhKbyfMWckp2U3MjA="; - }; - - nativeBuildInputs = [ autoreconfHook mlton ]; - - buildFlags = [ "mlkit" "mlkit_libs" ]; - - doCheck = true; - - checkPhase = '' - runHook preCheck - echo ==== Running MLKit test suite: test ==== - make -C test_dev test - echo ==== Running MLKit test suite: test_prof ==== - make -C test_dev test_prof - runHook postCheck - ''; - - meta = with lib; { - description = "Standard ML Compiler and Toolkit"; - homepage = "https://elsman.com/mlkit/"; - changelog = "https://github.com/melsman/mlkit/blob/v${version}/NEWS.md"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ athas ]; - }; -} diff --git a/pkgs/development/compilers/mlton/20130715.nix b/pkgs/development/compilers/mlton/20130715.nix index 98b4aeda5516..90285bf08982 100644 --- a/pkgs/development/compilers/mlton/20130715.nix +++ b/pkgs/development/compilers/mlton/20130715.nix @@ -3,7 +3,7 @@ let version = "20130715"; - usr_prefix = if stdenv.isDarwin then "usr/local" else "usr"; + usr_prefix = if stdenv.hostPlatform.isDarwin then "usr/local" else "usr"; dynamic_linker = stdenv.cc.bintools.dynamicLinker; in @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { sourceRoot = "${pname}-${version}"; buildInputs = [ gmp ]; - nativeBuildInputs = lib.optional stdenv.isLinux patchelf; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux patchelf; makeFlags = [ "all-no-docs" ]; @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { substituteInPlace $(pwd)/../${usr_prefix}/bin/mlton --replace '/${usr_prefix}/lib/mlton' $(pwd)/../${usr_prefix}/lib/mlton '' + lib.optionalString stdenv.cc.isClang '' sed -i "s_ patch -s -p0 <gdtoa.hide-public-fns.patch_ patch -s -p0 <gdtoa.hide-public-fns.patch\n\tsed -i 's|printf(emptyfmt|printf(\"\"|g' ./gdtoa/arithchk.c_" ./runtime/Makefile - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i 's|XCFLAGS += -I/usr/local/include -I/sw/include -I/opt/local/include||' ./runtime/Makefile ''; @@ -79,13 +79,13 @@ stdenv.mkDerivation rec { # So the builder runs the binary compiler with gmp. export LD_LIBRARY_PATH=${gmp.out}/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' # Patch ELF interpreter. patchelf --set-interpreter ${dynamic_linker} $(pwd)/../${usr_prefix}/lib/mlton/mlton-compile for e in mllex mlyacc ; do patchelf --set-interpreter ${dynamic_linker} $(pwd)/../${usr_prefix}/bin/$e done - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # Patch libgmp linking install_name_tool -change /opt/local/lib/libgmp.10.dylib ${gmp}/lib/libgmp.10.dylib $(pwd)/../${usr_prefix}/lib/mlton/mlton-compile install_name_tool -change /opt/local/lib/libgmp.10.dylib ${gmp}/lib/libgmp.10.dylib $(pwd)/../${usr_prefix}/bin/mlyacc diff --git a/pkgs/development/compilers/mlton/20180207-binary.nix b/pkgs/development/compilers/mlton/20180207-binary.nix index 4846b58bf26b..2384122d70b6 100644 --- a/pkgs/development/compilers/mlton/20180207-binary.nix +++ b/pkgs/development/compilers/mlton/20180207-binary.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { throw "Architecture not supported"; buildInputs = [ gmp ]; - nativeBuildInputs = lib.optional stdenv.isLinux patchelf; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux patchelf; buildPhase = '' make update \ @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { make install PREFIX=$out ''; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf --set-interpreter ${dynamic-linker} $out/lib/mlton/mlton-compile patchelf --set-rpath ${gmp}/lib $out/lib/mlton/mlton-compile @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { patchelf --set-interpreter ${dynamic-linker} $out/bin/$e patchelf --set-rpath ${gmp}/lib $out/bin/$e done - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -change \ /opt/local/lib/libgmp.10.dylib \ ${gmp}/lib/libgmp.10.dylib \ diff --git a/pkgs/development/compilers/mlton/20210117-binary.nix b/pkgs/development/compilers/mlton/20210117-binary.nix index d4e55d47b94c..40e9482ba1fb 100644 --- a/pkgs/development/compilers/mlton/20210117-binary.nix +++ b/pkgs/development/compilers/mlton/20210117-binary.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { throw "Architecture not supported"; buildInputs = [ gmp ]; - nativeBuildInputs = lib.optional stdenv.isLinux patchelf; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux patchelf; buildPhase = '' make update \ @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { make install PREFIX=$out ''; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf --set-interpreter ${dynamic-linker} $out/lib/mlton/mlton-compile patchelf --set-rpath ${gmp}/lib $out/lib/mlton/mlton-compile @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { patchelf --set-interpreter ${dynamic-linker} $out/bin/$e patchelf --set-rpath ${gmp}/lib $out/bin/$e done - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -change \ /opt/local/lib/libgmp.10.dylib \ ${gmp}/lib/libgmp.10.dylib \ diff --git a/pkgs/development/compilers/mono/4.nix b/pkgs/development/compilers/mono/4.nix index 0b283d4f1778..8664cb3f7283 100644 --- a/pkgs/development/compilers/mono/4.nix +++ b/pkgs/development/compilers/mono/4.nix @@ -5,5 +5,5 @@ callPackage ./generic.nix ({ version = "4.8.1.0"; sha256 = "1vyvp2g28ihcgxgxr8nhzyzdmzicsh5djzk8dk1hj5p5f2k3ijqq"; enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65600645 - extraPatches = lib.optionals stdenv.isLinux [ ./mono4-glibc.patch ]; + extraPatches = lib.optionals stdenv.hostPlatform.isLinux [ ./mono4-glibc.patch ]; }) diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix index 42c519e5021c..44fb05329030 100644 --- a/pkgs/development/compilers/mono/generic.nix +++ b/pkgs/development/compilers/mono/generic.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ncurses zlib bash - ] ++ lib.optionals stdenv.isDarwin [ Foundation libobjc ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation libobjc ]; configureFlags = [ "--x-includes=${libX11.dev}/include" @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { meta = with lib; { # Per nixpkgs#151720 the build failures for aarch64-darwin are fixed since 6.12.0.129 - broken = stdenv.isDarwin && stdenv.isAarch64 && lib.versionOlder version "6.12.0.129"; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 && lib.versionOlder version "6.12.0.129"; homepage = "https://mono-project.com/"; description = "Cross platform, open source .NET development framework"; platforms = with platforms; darwin ++ linux; diff --git a/pkgs/development/compilers/mono/llvm.nix b/pkgs/development/compilers/mono/llvm.nix index c69a4021677e..a9b21845f46a 100644 --- a/pkgs/development/compilers/mono/llvm.nix +++ b/pkgs/development/compilers/mono/llvm.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ perl groff libxml2 python2 libffi ] ++ lib.optional stdenv.isLinux valgrind; + buildInputs = [ perl groff libxml2 python2 libffi ] ++ lib.optional stdenv.hostPlatform.isLinux valgrind; propagatedBuildInputs = [ ncurses zlib ]; diff --git a/pkgs/development/compilers/mosml/default.nix b/pkgs/development/compilers/mosml/default.nix deleted file mode 100644 index 26ce0365a6cd..000000000000 --- a/pkgs/development/compilers/mosml/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, gmp, perl }: - -stdenv.mkDerivation rec { - pname = "mosml"; - version = "2.10.1"; - - buildInputs = [ gmp perl ]; - - makeFlags = [ "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" ]; - - src = fetchFromGitHub { - owner = "kfl"; - repo = "mosml"; - rev = "ver-${version}"; - sha256 = "sha256-GK39WvM7NNhoC5f0Wjy4/5VWT+Rbh2qo+W71hWrbPso="; - }; - - setSourceRoot = ''export sourceRoot="$(echo */src)"''; - - # MosML needs a specific RPATH entry pointing to $(out)/lib (added - # by the build system), which patchelf will remove. - dontPatchELF = true; - - meta = with lib; { - description = "Light-weight implementation of Standard ML"; - longDescription = '' - Moscow ML is a light-weight implementation of Standard ML (SML), a strict - functional language used in teaching and research. - ''; - homepage = "https://mosml.org/"; - license = licenses.gpl2; - platforms = platforms.unix; - maintainers = with maintainers; [ vaibhavsagar ]; - }; -} diff --git a/pkgs/development/compilers/mozart/default.nix b/pkgs/development/compilers/mozart/default.nix index 8b66cbce688b..b82253d2b493 100644 --- a/pkgs/development/compilers/mozart/default.nix +++ b/pkgs/development/compilers/mozart/default.nix @@ -76,7 +76,7 @@ in stdenv.mkDerivation rec { homepage = "https://mozart.github.io"; platforms = platforms.all; # Trace/BPT trap: 5 - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/compilers/mruby/default.nix b/pkgs/development/compilers/mruby/default.nix deleted file mode 100644 index 0fc1af2d6676..000000000000 --- a/pkgs/development/compilers/mruby/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib, stdenv, ruby, rake, fetchFromGitHub, testers }: - -stdenv.mkDerivation (finalAttrs: { - pname = "mruby"; - version = "3.3.0"; - - src = fetchFromGitHub { - owner = "mruby"; - repo = "mruby"; - rev = finalAttrs.version; - sha256 = "sha256-rCoEC1ioX6bOocPoPi+Lsn4PM8gY0DjKja1/MJvJ1n8="; - }; - - nativeBuildInputs = [ rake ]; - - nativeCheckInputs = [ ruby ]; - - # Necessary so it uses `gcc` instead of `ld` for linking. - # https://github.com/mruby/mruby/blob/e502fd88b988b0a8d9f31b928eb322eae269c45a/tasks/toolchains/gcc.rake#L30 - preBuild = "unset LD"; - - installPhase = '' - mkdir $out - cp -R include build/host/{bin,lib} $out - ''; - - doCheck = true; - - checkTarget = "test"; - - passthru.tests = { - version = testers.testVersion { - package = finalAttrs.finalPackage; - }; - }; - - meta = with lib; { - description = "Embeddable implementation of the Ruby language"; - homepage = "https://mruby.org"; - maintainers = with maintainers; [ nicknovitski ]; - license = licenses.mit; - platforms = platforms.all; - mainProgram = "mruby"; - }; -}) diff --git a/pkgs/development/compilers/muonlang/default.nix b/pkgs/development/compilers/muonlang/default.nix deleted file mode 100644 index aef02bca970d..000000000000 --- a/pkgs/development/compilers/muonlang/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper }: - -stdenv.mkDerivation rec { - pname = "muon"; - version = "2019-11-27"; - - src = fetchFromGitHub { - owner = "nickmqb"; - repo = pname; - rev = "6d3a5054ae75b0e5a0ae633cf8cbc3e2a054f8b3"; - sha256 = "1sb1i08421jxlx791g8nh4l239syaj730hagkzc159g0z65614zz"; - }; - - nativeBuildInputs = [ makeWrapper ]; - - buildPhase = '' - mkdir -p $out/bin $out/share/mu - cp -r lib $out/share/mu - ${stdenv.cc.targetPrefix}cc -o $out/bin/mu-unwrapped bootstrap/mu64.c - ''; - - installPhase = '' - makeWrapper $out/bin/mu-unwrapped $out/bin/mu \ - --add-flags $out/share/mu/lib/core.mu - ''; - - meta = with lib; { - description = "Modern low-level programming language"; - homepage = "https://github.com/nickmqb/muon"; - license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/compilers/myrddin/default.nix b/pkgs/development/compilers/myrddin/default.nix deleted file mode 100644 index b682b1e0ac54..000000000000 --- a/pkgs/development/compilers/myrddin/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, pkg-config -, bison -, binutils -, makeWrapper -}: - -stdenv.mkDerivation rec { - pname = "myrddin"; - version = "0.3.1"; - - src = fetchFromGitHub { - repo = "mc"; - owner = "oridb"; - rev = "r${version}"; - sha256 = "7ImjiG/rIKGPHq3Vh/mftY7pqw/vfOxD3LJeT87HmCk="; - }; - - nativeBuildInputs = [ - bison - pkg-config - makeWrapper - ]; - - postPatch = '' - substituteInPlace mk/c.mk \ - --replace "-Werror" "" - ''; - - buildPhase = '' - make bootstrap -j$NIX_BUILD_CORES - make -j$NIX_BUILD_CORES - ''; - - postInstall = '' - for b in $out/bin/*; do - wrapProgram $b --prefix PATH : $out/bin:${lib.makeBinPath [ binutils ]} - done - ''; - - checkPhase = '' - make check - ''; - - doCheck = true; - - meta = with lib; { - description = "Systems language that is both powerful and fun to use"; - homepage = "https://myrlang.org/"; - license = licenses.mit; - maintainers = with maintainers; [ luc65r ]; - platforms = platforms.all; - # darwin: never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/myrddin.x86_64-darwin - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; - }; -} diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix deleted file mode 100644 index e839c21fca2b..000000000000 --- a/pkgs/development/compilers/nasm/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib -, stdenv -, fetchurl -, perl -, gitUpdater -}: - -stdenv.mkDerivation rec { - pname = "nasm"; - version = "2.16.03"; - - src = fetchurl { - url = "https://www.nasm.us/pub/nasm/releasebuilds/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-FBKhx2C70F2wJrbA0WV6/9ZjHNCmPN229zzG1KphYUg="; - }; - - nativeBuildInputs = [ perl ]; - - enableParallelBuilding = true; - - doCheck = true; - - checkPhase = '' - runHook preCheck - - make golden - make test - - runHook postCheck - ''; - - passthru.updateScript = gitUpdater { - url = "https://github.com/netwide-assembler/nasm.git"; - rev-prefix = "nasm-"; - ignoredVersions = "rc.*"; - }; - - meta = with lib; { - homepage = "https://www.nasm.us/"; - description = "80x86 and x86-64 assembler designed for portability and modularity"; - platforms = platforms.unix; - maintainers = with maintainers; [ pSub willibutz ]; - license = licenses.bsd2; - }; -} diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix deleted file mode 100644 index a0c888674016..000000000000 --- a/pkgs/development/compilers/neko/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, boehmgc, zlib, sqlite, pcre, cmake, pkg-config -, git, apacheHttpd, apr, aprutil, libmysqlclient, mbedtls_2, openssl, pkgs, gtk2, libpthreadstubs -}: - -stdenv.mkDerivation rec { - pname = "neko"; - version = "2.3.0"; - - src = fetchFromGitHub { - owner = "HaxeFoundation"; - repo = "neko"; - rev = "v${lib.replaceStrings [ "." ] [ "-" ] version}"; - sha256 = "19rc59cx7qqhcqlb0znwbnwbg04c1yq6xmvrwm1xi46k3vxa957g"; - }; - - patches = [ - # https://github.com/HaxeFoundation/neko/pull/224 - (fetchpatch { - url = "https://github.com/HaxeFoundation/neko/commit/ff5da9b0e96cc0eabc44ad2c10b7a92623ba49ee.patch"; - sha256 = "sha256-isM7QGPiyXgT2zpIGd+r12vKg7I1rOWYTTWxuECafro="; - }) - ]; - - nativeBuildInputs = [ cmake pkg-config git ]; - buildInputs = - [ boehmgc zlib sqlite pcre apacheHttpd apr aprutil - libmysqlclient mbedtls_2 openssl libpthreadstubs ] - ++ lib.optional stdenv.isLinux gtk2 - ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Security - pkgs.darwin.apple_sdk.frameworks.Carbon]; - cmakeFlags = [ "-DRUN_LDCONFIG=OFF" ]; - env = lib.optionalAttrs stdenv.cc.isClang { - NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; - }; - - installCheckPhase = '' - bin/neko bin/test.n - ''; - - # Called from tools/test.neko line 2 - # Uncaught exception - Segmentation fault - doInstallCheck = !stdenv.isDarwin; - dontPatchELF = true; - dontStrip = true; - - meta = with lib; { - description = "High-level dynamically typed programming language"; - homepage = "https://nekovm.org"; - license = [ - # list based on https://github.com/HaxeFoundation/neko/blob/v2-3-0/LICENSE - licenses.gpl2Plus # nekoc, nekoml - licenses.lgpl21Plus # mysql.ndll - licenses.bsd3 # regexp.ndll - licenses.zlib # zlib.ndll - licenses.asl20 # mod_neko, mod_tora, mbedTLS - licenses.mit # overall, other libs - "https://github.com/HaxeFoundation/neko/blob/v2-3-0/LICENSE#L24-L40" # boehm gc - ]; - maintainers = [ maintainers.marcweber maintainers.locallycompact ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/development/compilers/nim/NIM_CONFIG_DIR.patch b/pkgs/development/compilers/nim/NIM_CONFIG_DIR.patch deleted file mode 100644 index 61e05b791cf8..000000000000 --- a/pkgs/development/compilers/nim/NIM_CONFIG_DIR.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/compiler/nimconf.nim b/compiler/nimconf.nim -index a470179bd..73cfa1a23 100644 ---- a/compiler/nimconf.nim -+++ b/compiler/nimconf.nim -@@ -225,10 +225,15 @@ proc getUserConfigPath*(filename: RelativeFile): AbsoluteFile = - proc getSystemConfigPath*(conf: ConfigRef; filename: RelativeFile): AbsoluteFile = - # try standard configuration file (installation did not distribute files - # the UNIX way) -- let p = getPrefixDir(conf) -- result = p / RelativeDir"config" / filename -+ let -+ prefix = getPrefixDir(conf) -+ env = getEnv("NIM_CONFIG_PATH") -+ if env != "": -+ result = env.toAbsoluteDir / filename -+ else: -+ result = prefix / RelativeDir"config" / filename - when defined(unix): -- if not fileExists(result): result = p / RelativeDir"etc/nim" / filename -+ if not fileExists(result): result = prefix / RelativeDir"etc/nim" / filename - if not fileExists(result): result = AbsoluteDir"/etc/nim" / filename - - proc loadConfigs*(cfg: RelativeFile; cache: IdentCache; conf: ConfigRef) = diff --git a/pkgs/development/compilers/nim/build-nim-package.nix b/pkgs/development/compilers/nim/build-nim-package.nix deleted file mode 100644 index 2bff3bf8cc85..000000000000 --- a/pkgs/development/compilers/nim/build-nim-package.nix +++ /dev/null @@ -1,136 +0,0 @@ -{ lib -, buildPackages -, callPackage -, stdenv -, nim1 -, nim2 -, nim_builder -, defaultNimVersion ? 2 -, nimOverrides -, buildNimPackage -}: - -let - baseAttrs = { - strictDeps = true; - enableParallelBuilding = true; - doCheck = true; - configurePhase = '' - runHook preConfigure - export NIX_NIM_BUILD_INPUTS=''${pkgsHostTarget[@]} $NIX_NIM_BUILD_INPUTS - nim_builder --phase:configure - runHook postConfigure - ''; - buildPhase = '' - runHook preBuild - nim_builder --phase:build - runHook postBuild - ''; - checkPhase = '' - runHook preCheck - nim_builder --phase:check - runHook postCheck - ''; - installPhase = '' - runHook preInstall - nim_builder --phase:install - runHook postInstall - ''; - meta = { inherit (nim2.meta) maintainers platforms; }; - }; - - fodFromLockEntry = - let - methods = { - fetchzip = { url, sha256, ... }: - buildPackages.fetchzip { - name = "source"; - inherit url sha256; - }; - git = { fetchSubmodules, leaveDotGit, rev, sha256, url, ... }: - buildPackages.fetchgit { - inherit fetchSubmodules leaveDotGit rev sha256 url; - }; - }; - in - attrs@{ method, ... }: - let fod = methods.${method} attrs; - in ''--path:"${fod.outPath}/${attrs.srcDir}"''; - - asFunc = x: if builtins.isFunction x then x else (_: x); - -in -buildNimPackageArgs: -let - composition = finalAttrs: - let - postPkg = baseAttrs - // (asFunc ((asFunc buildNimPackageArgs) finalAttrs)) baseAttrs; - - lockAttrs = - lib.attrsets.optionalAttrs (builtins.hasAttr "lockFile" postPkg) - (builtins.fromJSON (builtins.readFile postPkg.lockFile)); - - lockDepends = lockAttrs.depends or [ ]; - - lockFileNimFlags = map fodFromLockEntry lockDepends; - - postNimOverrides = builtins.foldl' ( - prevAttrs: - { packages, ... }@lockAttrs: - builtins.foldl' ( - prevAttrs: name: - if (builtins.hasAttr name nimOverrides) then - (prevAttrs // (nimOverrides.${name} lockAttrs prevAttrs)) - else - prevAttrs - ) prevAttrs packages - ) postPkg lockDepends; - - finalOverride = - { depsBuildBuild ? [ ] - , nativeBuildInputs ? [ ] - , nimFlags ? [ ] - , requiredNimVersion ? defaultNimVersion - , passthru ? { } - , ... - }: - (if requiredNimVersion == 1 then { - depsBuildBuild = [ nim_builder ] ++ depsBuildBuild; - nativeBuildInputs = [ nim1 ] ++ nativeBuildInputs; - } else if requiredNimVersion == 2 then { - depsBuildBuild = [ nim_builder ] ++ depsBuildBuild; - nativeBuildInputs = [ nim2 ] ++ nativeBuildInputs; - } else - throw - "requiredNimVersion ${toString requiredNimVersion} is not valid") // { - nimFlags = lockFileNimFlags ++ nimFlags; - passthru = passthru // { - # allow overriding the result of buildNimPackageArgs before this composition is applied - # this allows overriding the lockFile for packages built using buildNimPackage - # this is adapted from mkDerivationExtensible in stdenv.mkDerivation - overrideNimAttrs = f0: - let - f = self: super: - let x = f0 super; - in - if builtins.isFunction x - then f0 self super - else x; - in - buildNimPackage - (self: - let super = (asFunc ((asFunc buildNimPackageArgs) self)) baseAttrs; - in - super // (if builtins.isFunction f0 || f0?__functor then f self super else f0)); - }; - }; - - attrs = postNimOverrides // finalOverride postNimOverrides; - in - lib.trivial.warnIf (builtins.hasAttr "nimBinOnly" attrs) - "the nimBinOnly attribute is deprecated for buildNimPackage" - attrs; - -in -stdenv.mkDerivation composition diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix deleted file mode 100644 index 4655cb03ad7b..000000000000 --- a/pkgs/development/compilers/nim/default.nix +++ /dev/null @@ -1,321 +0,0 @@ -# https://nim-lang.github.io/Nim/packaging.html -# https://nim-lang.org/docs/nimc.html - -{ lib, callPackage, buildPackages, stdenv, fetchurl, fetchgit -, makeWrapper, openssl, pcre, readline, boehmgc, sqlite, Security -, nim-unwrapped-2, nim-unwrapped-1, nim }: - -let - parseCpu = platform: - with platform; - # Derive a Nim CPU identifier - if isAarch32 then - "arm" - else if isAarch64 then - "arm64" - else if isAlpha then - "alpha" - else if isAvr then - "avr" - else if isMips && is32bit then - "mips" - else if isMips && is64bit then - "mips64" - else if isMsp430 then - "msp430" - else if isPower && is32bit then - "powerpc" - else if isPower && is64bit then - "powerpc64" - else if isRiscV && is64bit then - "riscv64" - else if isSparc then - "sparc" - else if isx86_32 then - "i386" - else if isx86_64 then - "amd64" - else - abort "no Nim CPU support known for ${config}"; - - parseOs = platform: - with platform; - # Derive a Nim OS identifier - if isAndroid then - "Android" - else if isDarwin then - "MacOSX" - else if isFreeBSD then - "FreeBSD" - else if isGenode then - "Genode" - else if isLinux then - "Linux" - else if isNetBSD then - "NetBSD" - else if isNone then - "Standalone" - else if isOpenBSD then - "OpenBSD" - else if isWindows then - "Windows" - else if isiOS then - "iOS" - else - abort "no Nim OS support known for ${config}"; - - parsePlatform = p: { - cpu = parseCpu p; - os = parseOs p; - }; - - nimHost = parsePlatform stdenv.hostPlatform; - nimTarget = parsePlatform stdenv.targetPlatform; - -in { - - nim-unwrapped-2 = stdenv.mkDerivation (finalAttrs: { - pname = "nim-unwrapped"; - version = "2.0.8"; - strictDeps = true; - - src = fetchurl { - url = "https://nim-lang.org/download/nim-${finalAttrs.version}.tar.xz"; - hash = "sha256-VwLahEcA0xKdtzFwtcYGrb37h+grgWwNkRB+ogpl3xY="; - }; - - buildInputs = [ boehmgc openssl pcre readline sqlite ] - ++ lib.optional stdenv.isDarwin Security; - - patches = [ - ./NIM_CONFIG_DIR.patch - # Override compiler configuration via an environmental variable - - ./nixbuild.patch - # Load libraries at runtime by absolute path - - ./extra-mangling.patch - # Mangle store paths of modules to prevent runtime dependence. - - ./openssl.patch - # dlopen is widely used by Python, Ruby, Perl, ... what you're really telling me here is that your OS is fundamentally broken. That might be news for you, but it isn't for me. - ]; - - configurePhase = let - bootstrapCompiler = stdenv.mkDerivation { - pname = "nim-bootstrap"; - inherit (finalAttrs) version src preBuild; - enableParallelBuilding = true; - installPhase = '' - runHook preInstall - install -Dt $out/bin bin/nim - runHook postInstall - ''; - }; - in '' - runHook preConfigure - cp ${bootstrapCompiler}/bin/nim bin/ - echo 'define:nixbuild' >> config/nim.cfg - runHook postConfigure - ''; - - kochArgs = [ - "--cpu:${nimHost.cpu}" - "--os:${nimHost.os}" - "-d:release" - "-d:useGnuReadline" - ] ++ lib.optional (stdenv.isDarwin || stdenv.isLinux) "-d:nativeStacktrace"; - - preBuild = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' - substituteInPlace makefile \ - --replace "aarch64" "arm64" - ''; - - buildPhase = '' - runHook preBuild - local HOME=$TMPDIR - ./bin/nim c --parallelBuild:$NIX_BUILD_CORES koch - ./koch boot $kochArgs --parallelBuild:$NIX_BUILD_CORES - ./koch toolsNoExternal $kochArgs --parallelBuild:$NIX_BUILD_CORES - ./bin/nim js -d:release tools/dochack/dochack.nim - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - install -Dt $out/bin bin/* - ln -sf $out/nim/bin/nim $out/bin/nim - ln -sf $out/nim/lib $out/lib - ./install.sh $out - cp -a tools dist $out/nim/ - runHook postInstall - ''; - - meta = with lib; { - description = "Statically typed, imperative programming language"; - homepage = "https://nim-lang.org/"; - license = licenses.mit; - mainProgram = "nim"; - maintainers = with maintainers; [ ehmry ]; - }; - }); - - nim-unwrapped-1 = nim-unwrapped-2.overrideAttrs (finalAttrs: prevAttrs: { - version = "1.6.20"; - src = fetchurl { - url = "https://nim-lang.org/download/nim-${finalAttrs.version}.tar.xz"; - hash = "sha256-/+0EdQTR/K9hDw3Xzz4Ce+kaKSsMnFEWFQTC87mE/7k="; - }; - - patches = [ - ./NIM_CONFIG_DIR.patch - # Override compiler configuration via an environmental variable - - ./nixbuild.patch - # Load libraries at runtime by absolute path - - ./extra-mangling.patch - # Mangle store paths of modules to prevent runtime dependence. - ] ++ lib.optional (!stdenv.hostPlatform.isWindows) ./toLocation.patch; - }); - -} // (let - wrapNim = { nim', patches }: - let targetPlatformConfig = stdenv.targetPlatform.config; - in stdenv.mkDerivation (finalAttrs: { - name = "${targetPlatformConfig}-nim-wrapper-${nim'.version}"; - inherit (nim') version; - preferLocalBuild = true; - strictDeps = true; - - nativeBuildInputs = [ makeWrapper ]; - - # Needed for any nim package that uses the standard library's - # 'std/sysrand' module. - depsTargetTargetPropagated = lib.optional stdenv.isDarwin Security; - - inherit patches; - - unpackPhase = '' - runHook preUnpack - tar xf ${nim'.src} nim-$version/config - cd nim-$version - runHook postUnpack - ''; - - dontConfigure = true; - - buildPhase = - # Configure the Nim compiler to use $CC and $CXX as backends - # The compiler is configured by two configuration files, each with - # a different DSL. The order of evaluation matters and that order - # is not documented, so duplicate the configuration across both files. - '' - runHook preBuild - cat >> config/config.nims << WTF - - switch("os", "${nimTarget.os}") - switch("cpu", "${nimTarget.cpu}") - switch("define", "nixbuild") - - # Configure the compiler using the $CC set by Nix at build time - import strutils - let cc = getEnv"CC" - if cc.contains("gcc"): - switch("cc", "gcc") - elif cc.contains("clang"): - switch("cc", "clang") - WTF - - mv config/nim.cfg config/nim.cfg.old - cat > config/nim.cfg << WTF - os = "${nimTarget.os}" - cpu = "${nimTarget.cpu}" - define:"nixbuild" - WTF - - cat >> config/nim.cfg < config/nim.cfg.old - rm config/nim.cfg.old - - cat >> config/nim.cfg << WTF - - clang.cpp.exe %= "\$CXX" - clang.cpp.linkerexe %= "\$CXX" - clang.exe %= "\$CC" - clang.linkerexe %= "\$CC" - gcc.cpp.exe %= "\$CXX" - gcc.cpp.linkerexe %= "\$CXX" - gcc.exe %= "\$CC" - gcc.linkerexe %= "\$CC" - WTF - - runHook postBuild - ''; - - wrapperArgs = lib.optionals (!(stdenv.isDarwin && stdenv.isAarch64)) [ - "--prefix PATH : ${lib.makeBinPath [ buildPackages.gdb ]}:${ - placeholder "out" - }/bin" - # Used by nim-gdb - - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ openssl pcre ]}" - # These libraries may be referred to by the standard library. - # This is broken for cross-compilation because the package - # set will be shifted back by nativeBuildInputs. - - "--set NIM_CONFIG_PATH ${placeholder "out"}/etc/nim" - # Use the custom configuration - ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin $out/etc - - cp -r config $out/etc/nim - - for binpath in ${nim'}/bin/nim?*; do - local binname=`basename $binpath` - makeWrapper \ - $binpath $out/bin/${targetPlatformConfig}-$binname \ - $wrapperArgs - ln -s $out/bin/${targetPlatformConfig}-$binname $out/bin/$binname - done - - makeWrapper \ - ${nim'}/nim/bin/nim $out/bin/${targetPlatformConfig}-nim \ - --set-default CC $(command -v $CC) \ - --set-default CXX $(command -v $CXX) \ - $wrapperArgs - ln -s $out/bin/${targetPlatformConfig}-nim $out/bin/nim - - makeWrapper \ - ${nim'}/bin/testament $out/bin/${targetPlatformConfig}-testament \ - $wrapperArgs - ln -s $out/bin/${targetPlatformConfig}-testament $out/bin/testament - - '' + '' - runHook postInstall - ''; - - passthru = { nim = nim'; }; - - meta = nim'.meta // { - description = nim'.meta.description - + " (${targetPlatformConfig} wrapper)"; - platforms = with lib.platforms; unix ++ genode ++ windows; - }; - }); -in { - - nim2 = wrapNim { - nim' = buildPackages.nim-unwrapped-2; - patches = [ ./nim2.cfg.patch ]; - }; - - nim1 = wrapNim { - nim' = buildPackages.nim-unwrapped-1; - patches = [ ./nim.cfg.patch ]; - }; - -}) diff --git a/pkgs/development/compilers/nim/extra-mangling.patch b/pkgs/development/compilers/nim/extra-mangling.patch deleted file mode 100644 index b68f7033994d..000000000000 --- a/pkgs/development/compilers/nim/extra-mangling.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/compiler/modulepaths.nim b/compiler/modulepaths.nim -index e80ea3fa6..8ecf27a85 100644 ---- a/compiler/modulepaths.nim -+++ b/compiler/modulepaths.nim -@@ -70,6 +70,13 @@ proc checkModuleName*(conf: ConfigRef; n: PNode; doLocalError=true): FileIndex = - else: - result = fileInfoIdx(conf, fullPath) - -+proc rot13(result: var string) = -+ for i, c in result: -+ case c -+ of 'a'..'m', 'A'..'M': result[i] = char(c.uint8 + 13) -+ of 'n'..'z', 'N'..'Z': result[i] = char(c.uint8 - 13) -+ else: discard -+ - proc mangleModuleName*(conf: ConfigRef; path: AbsoluteFile): string = - ## Mangle a relative module path to avoid path and symbol collisions. - ## -@@ -78,9 +85,11 @@ proc mangleModuleName*(conf: ConfigRef; path: AbsoluteFile): string = - ## - ## Example: - ## `foo-#head/../bar` becomes `@foo-@hhead@s..@sbar` -- "@m" & relativeTo(path, conf.projectPath).string.multiReplace( -+ result = "@m" & relativeTo(path, conf.projectPath).string.multiReplace( - {$os.DirSep: "@s", $os.AltSep: "@s", "#": "@h", "@": "@@", ":": "@c"}) -+ rot13(result) - - proc demangleModuleName*(path: string): string = - ## Demangle a relative module path. - result = path.multiReplace({"@@": "@", "@h": "#", "@s": "/", "@m": "", "@c": ":"}) -+ rot13(result) -diff --git a/compiler/msgs.nim b/compiler/msgs.nim -index 3f386cc61..054f7f647 100644 ---- a/compiler/msgs.nim -+++ b/compiler/msgs.nim -@@ -659,8 +659,10 @@ proc uniqueModuleName*(conf: ConfigRef; fid: FileIndex): string = - for i in 0..<trunc: - let c = rel[i] - case c -- of 'a'..'z': -- result.add c -+ of 'a'..'m': -+ result.add char(c.uint8 + 13) -+ of 'n'..'z': -+ result.add char(c.uint8 - 13) - of {os.DirSep, os.AltSep}: - result.add 'Z' # because it looks a bit like '/' - of '.': diff --git a/pkgs/development/compilers/nim/nim.cfg.patch b/pkgs/development/compilers/nim/nim.cfg.patch deleted file mode 100644 index 7195132e52f6..000000000000 --- a/pkgs/development/compilers/nim/nim.cfg.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/config/nim.cfg b/config/nim.cfg -index 3b964d124..850ed0ed9 100644 ---- a/config/nim.cfg -+++ b/config/nim.cfg -@@ -8,26 +8,12 @@ - # Environment variables can be accessed like so: - # gcc.path %= "$CC_PATH" - --cc = gcc -- - # additional options always passed to the compiler: - --parallel_build: "0" # 0 to auto-detect number of processors - - hint[LineTooLong]=off - #hint[XDeclaredButNotUsed]=off - --# Examples of how to setup a cross-compiler: -- --# Cross-compiling for Raspberry Pi. --# (This compiler is available in gcc-arm-linux-gnueabihf package on Ubuntu) --arm.linux.gcc.exe = "arm-linux-gnueabihf-gcc" --arm.linux.gcc.linkerexe = "arm-linux-gnueabihf-gcc" -- --# For OpenWRT, you will also need to adjust PATH to point to your toolchain. --mips.linux.gcc.exe = "mips-openwrt-linux-gcc" --mips.linux.gcc.linkerexe = "mips-openwrt-linux-gcc" -- -- - path="$lib/deprecated/core" - path="$lib/deprecated/pure" - path="$lib/pure/collections" diff --git a/pkgs/development/compilers/nim/nim2.cfg.patch b/pkgs/development/compilers/nim/nim2.cfg.patch deleted file mode 100644 index ef23d3a84623..000000000000 --- a/pkgs/development/compilers/nim/nim2.cfg.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/config/nim.cfg b/config/nim.cfg -index 1470de780..8a12f741a 100644 ---- a/config/nim.cfg -+++ b/config/nim.cfg -@@ -9,8 +9,6 @@ - # Environment variables can be accessed like so: - # gcc.path %= "$CC_PATH" - --cc = gcc -- - # additional options always passed to the compiler: - --parallel_build: "0" # 0 to auto-detect number of processors - -@@ -22,27 +20,6 @@ cc = gcc - - threads:on - --# Examples of how to setup a cross-compiler: --# Nim can target architectures and OSes different than the local host --# Syntax: <arch>.<os>.gcc.exe = "<compiler executable>" --# <arch>.<os>.gcc.linkerexe = "<linker executable>" -- --# ARM e.g. Raspberry Pi 2: gcc-arm-linux-gnueabihf package on Debian/Ubuntu --arm.linux.gcc.exe = "arm-linux-gnueabihf-gcc" --arm.linux.gcc.linkerexe = "arm-linux-gnueabihf-gcc" --# ARM64/aarch64 e.g. Raspberry Pi 3: gcc-aarch64-linux-gnu package on Debian/Ubuntu --arm64.linux.gcc.exe = "aarch64-linux-gnu-gcc" --arm64.linux.gcc.linkerexe = "aarch64-linux-gnu-gcc" --# RISC-V: gcc-riscv64-linux-gnu package on Debian/Ubuntu --riscv32.linux.gcc.exe = "riscv64-linux-gnu-gcc" --riscv32.linux.gcc.linkerexe = "riscv64-linux-gnu-gcc" --riscv64.linux.gcc.exe = "riscv64-linux-gnu-gcc" --riscv64.linux.gcc.linkerexe = "riscv64-linux-gnu-gcc" -- --# For OpenWRT, you will also need to adjust PATH to point to your toolchain. --mips.linux.gcc.exe = "mips-openwrt-linux-gcc" --mips.linux.gcc.linkerexe = "mips-openwrt-linux-gcc" -- - - path="$lib/deprecated/core" - path="$lib/deprecated/pure" diff --git a/pkgs/development/compilers/nim/nixbuild.patch b/pkgs/development/compilers/nim/nixbuild.patch deleted file mode 100644 index 59e54ca780c6..000000000000 --- a/pkgs/development/compilers/nim/nixbuild.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/lib/pure/dynlib.nim b/lib/pure/dynlib.nim -index f31ae94dd..debed9c07 100644 ---- a/lib/pure/dynlib.nim -+++ b/lib/pure/dynlib.nim -@@ -56,6 +56,9 @@ - - import strutils - -+when defined(nixbuild) and not defined(windows): -+ import os -+ - type - LibHandle* = pointer ## a handle to a dynamically loaded library - -@@ -95,6 +98,25 @@ proc libCandidates*(s: string, dest: var seq[string]) = - libCandidates(prefix & middle & suffix, dest) - else: - add(dest, s) -+ when defined(nixbuild) and not defined(windows): -+ # Nix doesn't have a global library directory so -+ # load libraries using an absolute path if one -+ # can be derived from NIX_LDFLAGS. -+ # -+ # During Nix/NixOS packaging the line "define:nixbuild" -+ # should be appended to the ../../config/nim.cfg file -+ # to enable this behavior by default. -+ # -+ var libDirs = split(getEnv("LD_LIBRARY_PATH"), ':') -+ for flag in split(replace(getEnv("NIX_LDFLAGS"), "\\ ", " ")): -+ if flag.startsWith("-L"): -+ libDirs.add(flag[2..flag.high]) -+ for lib in dest: -+ for dir in libDirs: -+ let abs = dir / lib -+ if existsFile(abs): -+ dest = @[abs] -+ return - - proc loadLibPattern*(pattern: string, globalSymbols = false): LibHandle = - ## loads a library with name matching `pattern`, similar to what `dlimport` diff --git a/pkgs/development/compilers/nim/openssl.patch b/pkgs/development/compilers/nim/openssl.patch deleted file mode 100644 index 8cbc2a4cf26e..000000000000 --- a/pkgs/development/compilers/nim/openssl.patch +++ /dev/null @@ -1,458 +0,0 @@ -commit 9d7d15533d52971601b738335c40a4f01353c369 -Author: Emery Hemingway <ehmry@posteo.net> -Date: 2023-09-30 11:11:05 +0100 - - Do not load openssl with dlopen - -diff --git a/lib/wrappers/openssl.nim b/lib/wrappers/openssl.nim -index e659746ee..dfb2d3cf2 100644 ---- a/lib/wrappers/openssl.nim -+++ b/lib/wrappers/openssl.nim -@@ -105,8 +105,11 @@ else: - - import dynlib - --{.pragma: lcrypto, cdecl, dynlib: DLLUtilName, importc.} --{.pragma: lssl, cdecl, dynlib: DLLSSLName, importc.} -+{.passL: "-lcrypto".} -+{.passL: "-lssl".} -+ -+{.pragma: lcrypto, cdecl, importc.} -+{.pragma: lssl, cdecl, importc.} - - type - SslStruct {.final, pure.} = object -@@ -274,7 +277,7 @@ const - BIO_C_DO_STATE_MACHINE = 101 - BIO_C_GET_SSL = 110 - --proc TLSv1_method*(): PSSL_METHOD{.cdecl, dynlib: DLLSSLName, importc.} -+proc TLSv1_method*(): PSSL_METHOD{.cdecl, importc.} - - # TLS_method(), TLS_server_method(), TLS_client_method() are introduced in 1.1.0 - # and support SSLv3, TLSv1, TLSv1.1 and TLSv1.2 -@@ -286,26 +289,26 @@ when useStaticLink: - # Static linking - - when defined(openssl10): -- proc SSL_library_init*(): cint {.cdecl, dynlib: DLLSSLName, importc, discardable.} -- proc SSL_load_error_strings*() {.cdecl, dynlib: DLLSSLName, importc.} -- proc SSLv23_method*(): PSSL_METHOD {.cdecl, dynlib: DLLSSLName, importc.} -- proc SSLeay(): culong {.cdecl, dynlib: DLLUtilName, importc.} -+ proc SSL_library_init*(): cint {.cdecl, importc, discardable.} -+ proc SSL_load_error_strings*() {.cdecl, importc.} -+ proc SSLv23_method*(): PSSL_METHOD {.cdecl, importc.} -+ proc SSLeay(): culong {.cdecl, importc.} - - proc getOpenSSLVersion*(): culong = - SSLeay() - -- proc ERR_load_BIO_strings*() {.cdecl, dynlib: DLLUtilName, importc.} -+ proc ERR_load_BIO_strings*() {.cdecl, gimportc.} - else: -- proc OPENSSL_init_ssl*(opts: uint64, settings: uint8): cint {.cdecl, dynlib: DLLSSLName, importc, discardable.} -+ proc OPENSSL_init_ssl*(opts: uint64, settings: uint8): cint {.cdecl, gimportc, discardable.} - proc SSL_library_init*(): cint {.discardable.} = - ## Initialize SSL using OPENSSL_init_ssl for OpenSSL >= 1.1.0 - return OPENSSL_init_ssl(0.uint64, 0.uint8) - -- proc TLS_method*(): PSSL_METHOD {.cdecl, dynlib: DLLSSLName, importc.} -+ proc TLS_method*(): PSSL_METHOD {.cdecl, gimportc.} - proc SSLv23_method*(): PSSL_METHOD = - TLS_method() - -- proc OpenSSL_version_num(): culong {.cdecl, dynlib: DLLUtilName, importc.} -+ proc OpenSSL_version_num(): culong {.cdecl, gimportc.} - - proc getOpenSSLVersion*(): culong = - ## Return OpenSSL version as unsigned long -@@ -321,19 +324,19 @@ when useStaticLink: - discard - - when defined(libressl) or defined(openssl10): -- proc SSL_state(ssl: SslPtr): cint {.cdecl, dynlib: DLLSSLName, importc.} -+ proc SSL_state(ssl: SslPtr): cint {.cdecl, gimportc.} - proc SSL_in_init*(ssl: SslPtr): cint {.inline.} = - SSL_state(ssl) and SSL_ST_INIT - else: -- proc SSL_in_init*(ssl: SslPtr): cint {.cdecl, dynlib: DLLSSLName, importc.} -- proc SSL_CTX_set_ciphersuites*(ctx: SslCtx, str: cstring): cint {.cdecl, dynlib: DLLSSLName, importc.} -+ proc SSL_in_init*(ssl: SslPtr): cint {.cdecl, gimportc.} -+ proc SSL_CTX_set_ciphersuites*(ctx: SslCtx, str: cstring): cint {.cdecl, importc.} - - template OpenSSL_add_all_algorithms*() = discard - -- proc SSLv23_client_method*(): PSSL_METHOD {.cdecl, dynlib: DLLSSLName, importc.} -- proc SSLv2_method*(): PSSL_METHOD {.cdecl, dynlib: DLLSSLName, importc.} -- proc SSLv3_method*(): PSSL_METHOD {.cdecl, dynlib: DLLSSLName, importc.} -- proc CRYPTO_set_mem_functions(a,b,c: pointer){.cdecl, dynlib: DLLUtilName, importc.} -+ proc SSLv23_client_method*(): PSSL_METHOD {.cdecl, importc.} -+ proc SSLv2_method*(): PSSL_METHOD {.cdecl, importc.} -+ proc SSLv3_method*(): PSSL_METHOD {.cdecl, importc.} -+ proc CRYPTO_set_mem_functions(a,b,c: pointer){.cdecl, gimportc.} - - else: - # Here we're trying to stay compatible between openssl versions. Some -@@ -472,54 +475,52 @@ else: - theProc = cast[typeof(theProc)](sslSymThrows("SSL_CTX_set_ciphersuites")) - result = theProc(ctx, str) - --proc SSL_new*(context: SslCtx): SslPtr{.cdecl, dynlib: DLLSSLName, importc.} --proc SSL_free*(ssl: SslPtr){.cdecl, dynlib: DLLSSLName, importc.} --proc SSL_get_SSL_CTX*(ssl: SslPtr): SslCtx {.cdecl, dynlib: DLLSSLName, importc.} --proc SSL_set_SSL_CTX*(ssl: SslPtr, ctx: SslCtx): SslCtx {.cdecl, dynlib: DLLSSLName, importc.} --proc SSL_CTX_set_session_id_context*(context: SslCtx, sid_ctx: string, sid_ctx_len: int){.cdecl, dynlib: DLLSSLName, importc.} --proc SSL_get0_verified_chain*(ssl: SslPtr): PSTACK {.cdecl, dynlib: DLLSSLName, -+proc SSL_new*(context: SslCtx): SslPtr{.cdecl, importc.} -+proc SSL_free*(ssl: SslPtr){.cdecl, importc.} -+proc SSL_get_SSL_CTX*(ssl: SslPtr): SslCtx {.cdecl, importc.} -+proc SSL_set_SSL_CTX*(ssl: SslPtr, ctx: SslCtx): SslCtx {.cdecl, importc.} -+proc SSL_CTX_set_session_id_context*(context: SslCtx, sid_ctx: string, sid_ctx_len: int){.cdecl, importc.} -+proc SSL_get0_verified_chain*(ssl: SslPtr): PSTACK {.cdecl, - importc.} - proc SSL_CTX_new*(meth: PSSL_METHOD): SslCtx{.cdecl, -- dynlib: DLLSSLName, importc.} -+ importc.} - proc SSL_CTX_load_verify_locations*(ctx: SslCtx, CAfile: cstring, -- CApath: cstring): cint{.cdecl, dynlib: DLLSSLName, importc.} --proc SSL_CTX_free*(arg0: SslCtx){.cdecl, dynlib: DLLSSLName, importc.} --proc SSL_CTX_set_verify*(s: SslCtx, mode: int, cb: proc (a: int, b: pointer): int {.cdecl.}){.cdecl, dynlib: DLLSSLName, importc.} -+ CApath: cstring): cint{.cdecl, importc.} -+proc SSL_CTX_free*(arg0: SslCtx){.cdecl, importc.} -+proc SSL_CTX_set_verify*(s: SslCtx, mode: int, cb: proc (a: int, b: pointer): int {.cdecl.}){.cdecl, importc.} - proc SSL_get_verify_result*(ssl: SslPtr): int{.cdecl, -- dynlib: DLLSSLName, importc.} -+ importc.} - --proc SSL_CTX_set_cipher_list*(s: SslCtx, ciphers: cstring): cint{.cdecl, dynlib: DLLSSLName, importc.} --proc SSL_CTX_use_certificate_file*(ctx: SslCtx, filename: cstring, typ: cint): cint{. -- stdcall, dynlib: DLLSSLName, importc.} --proc SSL_CTX_use_certificate_chain_file*(ctx: SslCtx, filename: cstring): cint{. -- stdcall, dynlib: DLLSSLName, importc.} -+proc SSL_CTX_set_cipher_list*(s: SslCtx, ciphers: cstring): cint{.cdecl, importc.} -+proc SSL_CTX_use_certificate_file*(ctx: SslCtx, filename: cstring, typ: cint): cint{.stdcall, importc.} -+proc SSL_CTX_use_certificate_chain_file*(ctx: SslCtx, filename: cstring): cint{.stdcall, importc.} - proc SSL_CTX_use_PrivateKey_file*(ctx: SslCtx, -- filename: cstring, typ: cint): cint{.cdecl, dynlib: DLLSSLName, importc.} --proc SSL_CTX_check_private_key*(ctx: SslCtx): cint{.cdecl, dynlib: DLLSSLName, -+ filename: cstring, typ: cint): cint{.cdecl, importc.} -+proc SSL_CTX_check_private_key*(ctx: SslCtx): cint{.cdecl, - importc.} - --proc SSL_CTX_get_ex_new_index*(argl: clong, argp: pointer, new_func: pointer, dup_func: pointer, free_func: pointer): cint {.cdecl, dynlib: DLLSSLName, importc.} --proc SSL_CTX_set_ex_data*(ssl: SslCtx, idx: cint, arg: pointer): cint {.cdecl, dynlib: DLLSSLName, importc.} --proc SSL_CTX_get_ex_data*(ssl: SslCtx, idx: cint): pointer {.cdecl, dynlib: DLLSSLName, importc.} -+proc SSL_CTX_get_ex_new_index*(argl: clong, argp: pointer, new_func: pointer, dup_func: pointer, free_func: pointer): cint {.cdecl, importc.} -+proc SSL_CTX_set_ex_data*(ssl: SslCtx, idx: cint, arg: pointer): cint {.cdecl, importc.} -+proc SSL_CTX_get_ex_data*(ssl: SslCtx, idx: cint): pointer {.cdecl, importc.} - --proc SSL_set_fd*(ssl: SslPtr, fd: SocketHandle): cint{.cdecl, dynlib: DLLSSLName, importc.} -+proc SSL_set_fd*(ssl: SslPtr, fd: SocketHandle): cint{.cdecl, importc.} - --proc SSL_shutdown*(ssl: SslPtr): cint{.cdecl, dynlib: DLLSSLName, importc.} --proc SSL_set_shutdown*(ssl: SslPtr, mode: cint) {.cdecl, dynlib: DLLSSLName, importc: "SSL_set_shutdown".} --proc SSL_get_shutdown*(ssl: SslPtr): cint {.cdecl, dynlib: DLLSSLName, importc: "SSL_get_shutdown".} --proc SSL_connect*(ssl: SslPtr): cint{.cdecl, dynlib: DLLSSLName, importc.} --proc SSL_read*(ssl: SslPtr, buf: pointer, num: int): cint{.cdecl, dynlib: DLLSSLName, importc.} --proc SSL_write*(ssl: SslPtr, buf: cstring, num: int): cint{.cdecl, dynlib: DLLSSLName, importc.} --proc SSL_get_error*(s: SslPtr, ret_code: cint): cint{.cdecl, dynlib: DLLSSLName, importc.} --proc SSL_accept*(ssl: SslPtr): cint{.cdecl, dynlib: DLLSSLName, importc.} --proc SSL_pending*(ssl: SslPtr): cint{.cdecl, dynlib: DLLSSLName, importc.} -+proc SSL_shutdown*(ssl: SslPtr): cint{.cdecl, importc.} -+proc SSL_set_shutdown*(ssl: SslPtr, mode: cint) {.cdecl, importc: "SSL_set_shutdown".} -+proc SSL_get_shutdown*(ssl: SslPtr): cint {.cdecl, importc: "SSL_get_shutdown".} -+proc SSL_connect*(ssl: SslPtr): cint{.cdecl, importc.} -+proc SSL_read*(ssl: SslPtr, buf: pointer, num: int): cint{.cdecl, importc.} -+proc SSL_write*(ssl: SslPtr, buf: cstring, num: int): cint{.cdecl, importc.} -+proc SSL_get_error*(s: SslPtr, ret_code: cint): cint{.cdecl, importc.} -+proc SSL_accept*(ssl: SslPtr): cint{.cdecl, importc.} -+proc SSL_pending*(ssl: SslPtr): cint{.cdecl, importc.} - - proc BIO_new_mem_buf*(data: pointer, len: cint): BIO{.cdecl, -- dynlib: DLLUtilName, importc.} -+ importc.} - proc BIO_new_ssl_connect*(ctx: SslCtx): BIO{.cdecl, -- dynlib: DLLSSLName, importc.} -+ importc.} - proc BIO_ctrl*(bio: BIO, cmd: cint, larg: int, arg: cstring): int{.cdecl, -- dynlib: DLLUtilName, importc.} -+ importc.} - proc BIO_get_ssl*(bio: BIO, ssl: ptr SslPtr): int = - return BIO_ctrl(bio, BIO_C_GET_SSL, 0, cast[cstring](ssl)) - proc BIO_set_conn_hostname*(bio: BIO, name: cstring): int = -@@ -529,30 +530,30 @@ proc BIO_do_handshake*(bio: BIO): int = - proc BIO_do_connect*(bio: BIO): int = - return BIO_do_handshake(bio) - --proc BIO_read*(b: BIO, data: cstring, length: cint): cint{.cdecl, dynlib: DLLUtilName, importc.} --proc BIO_write*(b: BIO, data: cstring, length: cint): cint{.cdecl, dynlib: DLLUtilName, importc.} -+proc BIO_read*(b: BIO, data: cstring, length: cint): cint{.cdecl, importc.} -+proc BIO_write*(b: BIO, data: cstring, length: cint): cint{.cdecl, importc.} - --proc BIO_free*(b: BIO): cint{.cdecl, dynlib: DLLUtilName, importc.} -+proc BIO_free*(b: BIO): cint{.cdecl, importc.} - --proc ERR_print_errors_fp*(fp: File){.cdecl, dynlib: DLLUtilName, importc.} -+proc ERR_print_errors_fp*(fp: File){.cdecl, importc.} - - proc ERR_error_string*(e: culong, buf: cstring): cstring{.cdecl, -- dynlib: DLLUtilName, importc.} --proc ERR_get_error*(): culong{.cdecl, dynlib: DLLUtilName, importc.} --proc ERR_peek_last_error*(): culong{.cdecl, dynlib: DLLUtilName, importc.} -+ importc.} -+proc ERR_get_error*(): culong{.cdecl, importc.} -+proc ERR_peek_last_error*(): culong{.cdecl, importc.} - --proc OPENSSL_config*(configName: cstring){.cdecl, dynlib: DLLUtilName, importc.} -+proc OPENSSL_config*(configName: cstring){.cdecl, importc.} - --proc OPENSSL_sk_num*(stack: PSTACK): int {.cdecl, dynlib: DLLSSLName, importc.} -+proc OPENSSL_sk_num*(stack: PSTACK): int {.cdecl, importc.} - - proc OPENSSL_sk_value*(stack: PSTACK, index: int): pointer {.cdecl, -- dynlib: DLLSSLName, importc.} -+ importc.} - - proc d2i_X509*(px: ptr PX509, i: ptr ptr uint8, len: cint): PX509 {.cdecl, -- dynlib: DLLUtilName, importc.} -+ importc.} - - proc i2d_X509*(cert: PX509; o: ptr ptr uint8): cint {.cdecl, -- dynlib: DLLUtilName, importc.} -+ importc.} - - proc d2i_X509*(b: string): PX509 = - ## decode DER/BER bytestring into X.509 certificate struct -@@ -591,24 +592,21 @@ else: - proc CRYPTO_malloc_init*() = - discard - --proc SSL_CTX_ctrl*(ctx: SslCtx, cmd: cint, larg: clong, parg: pointer): clong{. -- cdecl, dynlib: DLLSSLName, importc.} -+proc SSL_CTX_ctrl*(ctx: SslCtx, cmd: cint, larg: clong, parg: pointer): clong{.cdecl, importc.} - --proc SSL_CTX_callback_ctrl(ctx: SslCtx, typ: cint, fp: PFunction): int{. -- cdecl, dynlib: DLLSSLName, importc.} -+proc SSL_CTX_callback_ctrl(ctx: SslCtx, typ: cint, fp: PFunction): int{.cdecl, importc.} - - proc SSLCTXSetMode*(ctx: SslCtx, mode: int): int = - result = SSL_CTX_ctrl(ctx, SSL_CTRL_MODE, clong mode, nil) - --proc SSL_ctrl*(ssl: SslPtr, cmd: cint, larg: int, parg: pointer): int{. -- cdecl, dynlib: DLLSSLName, importc.} -+proc SSL_ctrl*(ssl: SslPtr, cmd: cint, larg: int, parg: pointer): int{.cdecl, importc.} - - proc SSL_set_tlsext_host_name*(ssl: SslPtr, name: cstring): int = - ## Set the SNI server name extension to be used in a client hello. - ## Returns 1 if SNI was set, 0 if current SSL configuration doesn't support SNI. - result = SSL_ctrl(ssl, SSL_CTRL_SET_TLSEXT_HOSTNAME, TLSEXT_NAMETYPE_host_name, name) - --proc SSL_get_servername*(ssl: SslPtr, typ: cint = TLSEXT_NAMETYPE_host_name): cstring {.cdecl, dynlib: DLLSSLName, importc.} -+proc SSL_get_servername*(ssl: SslPtr, typ: cint = TLSEXT_NAMETYPE_host_name): cstring {.cdecl, importc.} - ## Retrieve the server name requested in the client hello. This can be used - ## in the callback set in `SSL_CTX_set_tlsext_servername_callback` to - ## implement virtual hosting. May return `nil`. -@@ -635,16 +633,16 @@ type - PskServerCallback* = proc (ssl: SslPtr; - identity: cstring; psk: ptr uint8; max_psk_len: cint): cuint {.cdecl.} - --proc SSL_CTX_set_psk_client_callback*(ctx: SslCtx; callback: PskClientCallback) {.cdecl, dynlib: DLLSSLName, importc.} -+proc SSL_CTX_set_psk_client_callback*(ctx: SslCtx; callback: PskClientCallback) {.cdecl, importc.} - ## Set callback called when OpenSSL needs PSK (for client). - --proc SSL_CTX_set_psk_server_callback*(ctx: SslCtx; callback: PskServerCallback) {.cdecl, dynlib: DLLSSLName, importc.} -+proc SSL_CTX_set_psk_server_callback*(ctx: SslCtx; callback: PskServerCallback) {.cdecl, importc.} - ## Set callback called when OpenSSL needs PSK (for server). - --proc SSL_CTX_use_psk_identity_hint*(ctx: SslCtx; hint: cstring): cint {.cdecl, dynlib: DLLSSLName, importc.} -+proc SSL_CTX_use_psk_identity_hint*(ctx: SslCtx; hint: cstring): cint {.cdecl, importc.} - ## Set PSK identity hint to use. - --proc SSL_get_psk_identity*(ssl: SslPtr): cstring {.cdecl, dynlib: DLLSSLName, importc.} -+proc SSL_get_psk_identity*(ssl: SslPtr): cstring {.cdecl, importc.} - ## Get PSK identity. - - proc SSL_CTX_set_ecdh_auto*(ctx: SslCtx, onoff: cint): cint {.inline.} = -@@ -656,62 +654,62 @@ proc SSL_CTX_set_ecdh_auto*(ctx: SslCtx, onoff: cint): cint {.inline.} = - else: - result = 1 - --proc bioNew*(b: PBIO_METHOD): BIO{.cdecl, dynlib: DLLUtilName, importc: "BIO_new".} --proc bioFreeAll*(b: BIO){.cdecl, dynlib: DLLUtilName, importc: "BIO_free_all".} --proc bioSMem*(): PBIO_METHOD{.cdecl, dynlib: DLLUtilName, importc: "BIO_s_mem".} --proc bioCtrlPending*(b: BIO): cint{.cdecl, dynlib: DLLUtilName, importc: "BIO_ctrl_pending".} -+proc bioNew*(b: PBIO_METHOD): BIO{.cdecl, importc: "BIO_new".} -+proc bioFreeAll*(b: BIO){.cdecl, importc: "BIO_free_all".} -+proc bioSMem*(): PBIO_METHOD{.cdecl, importc: "BIO_s_mem".} -+proc bioCtrlPending*(b: BIO): cint{.cdecl, importc: "BIO_ctrl_pending".} - proc bioRead*(b: BIO, Buf: cstring, length: cint): cint{.cdecl, -- dynlib: DLLUtilName, importc: "BIO_read".} -+ importc: "BIO_read".} - proc bioWrite*(b: BIO, Buf: cstring, length: cint): cint{.cdecl, -- dynlib: DLLUtilName, importc: "BIO_write".} -+ importc: "BIO_write".} - - proc sslSetConnectState*(s: SslPtr) {.cdecl, -- dynlib: DLLSSLName, importc: "SSL_set_connect_state".} -+ importc: "SSL_set_connect_state".} - proc sslSetAcceptState*(s: SslPtr) {.cdecl, -- dynlib: DLLSSLName, importc: "SSL_set_accept_state".} -+ importc: "SSL_set_accept_state".} - - proc sslRead*(ssl: SslPtr, buf: cstring, num: cint): cint{.cdecl, -- dynlib: DLLSSLName, importc: "SSL_read".} -+ importc: "SSL_read".} - proc sslPeek*(ssl: SslPtr, buf: cstring, num: cint): cint{.cdecl, -- dynlib: DLLSSLName, importc: "SSL_peek".} -+ importc: "SSL_peek".} - proc sslWrite*(ssl: SslPtr, buf: cstring, num: cint): cint{.cdecl, -- dynlib: DLLSSLName, importc: "SSL_write".} -+ importc: "SSL_write".} - - proc sslSetBio*(ssl: SslPtr, rbio, wbio: BIO) {.cdecl, -- dynlib: DLLSSLName, importc: "SSL_set_bio".} -+ importc: "SSL_set_bio".} - - proc sslDoHandshake*(ssl: SslPtr): cint {.cdecl, -- dynlib: DLLSSLName, importc: "SSL_do_handshake".} -+ importc: "SSL_do_handshake".} - - --proc ErrClearError*(){.cdecl, dynlib: DLLUtilName, importc: "ERR_clear_error".} --proc ErrFreeStrings*(){.cdecl, dynlib: DLLUtilName, importc: "ERR_free_strings".} --proc ErrRemoveState*(pid: cint){.cdecl, dynlib: DLLUtilName, importc: "ERR_remove_state".} -+proc ErrClearError*(){.cdecl, importc: "ERR_clear_error".} -+proc ErrFreeStrings*(){.cdecl, importc: "ERR_free_strings".} -+proc ErrRemoveState*(pid: cint){.cdecl, importc: "ERR_remove_state".} - - proc PEM_read_bio_RSA_PUBKEY*(bp: BIO, x: ptr PRSA, pw: pem_password_cb, u: pointer): PRSA {.cdecl, -- dynlib: DLLUtilName, importc.} -+ importc.} - proc PEM_read_RSA_PUBKEY*(fp: pointer; x: ptr PRSA; cb: pem_password_cb, u: pointer): PRSA {.cdecl, -- dynlib: DLLUtilName, importc.} -+ importc.} - proc RSA_verify*(kind: cint, origMsg: pointer, origMsgLen: cuint, signature: pointer, -- signatureLen: cuint, rsa: PRSA): cint {.cdecl, dynlib: DLLUtilName, importc.} -+ signatureLen: cuint, rsa: PRSA): cint {.cdecl, importc.} - proc PEM_read_RSAPrivateKey*(fp: pointer; x: ptr PRSA; cb: pem_password_cb, u: pointer): PRSA {.cdecl, -- dynlib: DLLUtilName, importc.} -+ importc.} - proc PEM_read_RSAPublicKey*(fp: pointer; x: ptr PRSA; cb: pem_password_cb, u: pointer): PRSA {.cdecl, -- dynlib: DLLUtilName, importc.} -+ importc.} - proc PEM_read_bio_RSAPublicKey*(bp: BIO, x: ptr PRSA, cb: pem_password_cb, u: pointer): PRSA {.cdecl, -- dynlib: DLLUtilName, importc.} -+ importc.} - proc PEM_read_bio_RSAPrivateKey*(bp: BIO, x: ptr PRSA, cb: pem_password_cb, u: pointer): PRSA {.cdecl, -- dynlib: DLLUtilName, importc.} -+ importc.} - proc RSA_private_encrypt*(flen: cint, fr: ptr uint8, to: ptr uint8, rsa: PRSA, padding: PaddingType): cint {.cdecl, -- dynlib: DLLUtilName, importc.} -+ importc.} - proc RSA_public_encrypt*(flen: cint, fr: ptr uint8, to: ptr uint8, rsa: PRSA, padding: PaddingType): cint {.cdecl, -- dynlib: DLLUtilName, importc.} -+ importc.} - proc RSA_private_decrypt*(flen: cint, fr: ptr uint8, to: ptr uint8, rsa: PRSA, padding: PaddingType): cint {.cdecl, -- dynlib: DLLUtilName, importc.} -+ importc.} - proc RSA_public_decrypt*(flen: cint, fr: ptr uint8, to: ptr uint8, rsa: PRSA, padding: PaddingType): cint {.cdecl, -- dynlib: DLLUtilName, importc.} --proc RSA_free*(rsa: PRSA) {.cdecl, dynlib: DLLUtilName, importc.} --proc RSA_size*(rsa: PRSA): cint {.cdecl, dynlib: DLLUtilName, importc.} -+ importc.} -+proc RSA_free*(rsa: PRSA) {.cdecl, importc.} -+proc RSA_size*(rsa: PRSA): cint {.cdecl, importc.} - - # sha types - proc EVP_md_null*(): EVP_MD {.lcrypto.} -@@ -753,9 +751,9 @@ when defined(macosx) or defined(windows): - proc EVP_MD_CTX_cleanup*(ctx: EVP_MD_CTX): cint {.lcrypto.} - else: - # some times you will need this instead: -- proc EVP_MD_CTX_create*(): EVP_MD_CTX {.cdecl, importc: "EVP_MD_CTX_new", dynlib: DLLUtilName.} -- proc EVP_MD_CTX_destroy*(ctx: EVP_MD_CTX) {.cdecl, importc: "EVP_MD_CTX_free", dynlib: DLLUtilName.} -- proc EVP_MD_CTX_cleanup*(ctx: EVP_MD_CTX): cint {.cdecl, importc: "EVP_MD_CTX_cleanup", dynlib: DLLUtilName.} -+ proc EVP_MD_CTX_create*(): EVP_MD_CTX {.cdecl, importc: "EVP_MD_CTX_new".} -+ proc EVP_MD_CTX_destroy*(ctx: EVP_MD_CTX) {.cdecl, importc: "EVP_MD_CTX_free".} -+ proc EVP_MD_CTX_cleanup*(ctx: EVP_MD_CTX): cint {.cdecl, importc: "EVP_MD_CTX_cleanup".} - - # <openssl/md5.h> - type -@@ -770,7 +768,7 @@ type - data: array[MD5_LBLOCK, MD5_LONG] - num: cuint - --{.push callconv:cdecl, dynlib:DLLUtilName.} -+{.push callconv:cdecl.} - proc md5_Init*(c: var MD5_CTX): cint{.importc: "MD5_Init".} - proc md5_Update*(c: var MD5_CTX; data: pointer; len: csize_t): cint{.importc: "MD5_Update".} - proc md5_Final*(md: cstring; c: var MD5_CTX): cint{.importc: "MD5_Final".} -@@ -835,11 +833,11 @@ when not defined(nimDisableCertificateValidation) and not defined(windows): - # SSL_get_peer_certificate removed in 3.0 - # SSL_get1_peer_certificate added in 3.0 - when useOpenssl3: -- proc SSL_get1_peer_certificate*(ssl: SslCtx): PX509 {.cdecl, dynlib: DLLSSLName, importc.} -+ proc SSL_get1_peer_certificate*(ssl: SslCtx): PX509 {.cdecl, importc.} - proc SSL_get_peer_certificate*(ssl: SslCtx): PX509 = - SSL_get1_peer_certificate(ssl) - elif useStaticLink: -- proc SSL_get_peer_certificate*(ssl: SslCtx): PX509 {.cdecl, dynlib: DLLSSLName, importc.} -+ proc SSL_get_peer_certificate*(ssl: SslCtx): PX509 {.cdecl, importc.} - else: - proc SSL_get_peer_certificate*(ssl: SslCtx): PX509 = - let methodSym = sslSymNullable("SSL_get_peer_certificate", "SSL_get1_peer_certificate") -@@ -848,26 +846,24 @@ when not defined(nimDisableCertificateValidation) and not defined(windows): - let method2Proc = cast[proc(ssl: SslCtx): PX509 {.cdecl, gcsafe, raises: [].}](methodSym) - return method2Proc(ssl) - -- proc X509_get_subject_name*(a: PX509): PX509_NAME{.cdecl, dynlib: DLLSSLName, importc.} -+ proc X509_get_subject_name*(a: PX509): PX509_NAME{.cdecl, importc.} - -- proc X509_get_issuer_name*(a: PX509): PX509_NAME{.cdecl, dynlib: DLLUtilName, importc.} -+ proc X509_get_issuer_name*(a: PX509): PX509_NAME{.cdecl, importc.} - -- proc X509_NAME_oneline*(a: PX509_NAME, buf: cstring, size: cint): cstring {. -- cdecl, dynlib:DLLSSLName, importc.} -+ proc X509_NAME_oneline*(a: PX509_NAME, buf: cstring, size: cint): cstring {.cdecl, importc.} - -- proc X509_NAME_get_text_by_NID*(subject:cstring, NID: cint, buf: cstring, size: cint): cint{. -- cdecl, dynlib:DLLSSLName, importc.} -+ proc X509_NAME_get_text_by_NID*(subject:cstring, NID: cint, buf: cstring, size: cint): cint{.cdecl, importc.} - -- proc X509_check_host*(cert: PX509, name: cstring, namelen: cint, flags:cuint, peername: cstring): cint {.cdecl, dynlib: DLLSSLName, importc.} -+ proc X509_check_host*(cert: PX509, name: cstring, namelen: cint, flags:cuint, peername: cstring): cint {.cdecl, importc.} - -- proc X509_free*(cert: PX509) {.cdecl, dynlib: DLLSSLName, importc.} -+ proc X509_free*(cert: PX509) {.cdecl, importc.} - - # Certificates store - - type PX509_STORE* = SslPtr - type PX509_OBJECT* = SslPtr - -- {.push callconv:cdecl, dynlib:DLLUtilName, importc.} -+ {.push callconv:cdecl, importc.} - - proc X509_OBJECT_new*(): PX509_OBJECT - proc X509_OBJECT_free*(a: PX509_OBJECT) -@@ -897,12 +893,12 @@ when not defined(nimDisableCertificateValidation) and not defined(windows): - # Available in at least OpenSSL 1.1.1 and later, not sure if earlier - # --Iced Quinn - --proc SSL_CTX_set_alpn_protos*(ctx: SslCtx; protos: cstring; protos_len: cuint): cint {.cdecl, dynlib: DLLSSLName, importc.} --proc SSL_set_alpn_protos*(ssl: SslPtr; protos: cstring; protos_len: cuint): cint {.cdecl, dynlib: DLLSSLName, importc.} --proc SSL_CTX_set_alpn_select_cb*(ctx: SslCtx; cb: proc(ssl: SslPtr; out_proto: ptr cstring; outlen: cstring; in_proto: cstring; inlen: cuint; arg: pointer): cint {.cdecl.}; arg: pointer): cint {.cdecl, dynlib: DLLSSLName, importc.} --proc SSL_get0_alpn_selected*(ssl: SslPtr; data: ptr cstring; len: ptr cuint) {.cdecl, dynlib: DLLSSLName, importc.} --proc SSL_CTX_set_next_protos_advertised_cb*(ctx: SslCtx; cb: proc(ssl: SslPtr; out_proto: ptr cstring; outlen: ptr cuint; arg: pointer): cint {.cdecl.}; arg: pointer) {.cdecl, dynlib: DLLSSLName, importc.} --proc SSL_CTX_set_next_proto_select_cb*(ctx: SslCtx; cb: proc(s: SslPtr; out_proto: cstring; outlen: cstring; in_proto: cstring; inlen: cuint; arg: pointer): cint {.cdecl.}; arg: pointer) {.cdecl, dynlib: DLLSSLName, importc.} --proc SSL_select_next_proto*(out_proto: ptr cstring; outlen: cstring; server: cstring; server_len: cuint; client: cstring; client_len: cuint): cint {.cdecl, dynlib: DLLSSLName, importc.} --proc SSL_get0_next_proto_negotiated*(s: SslPtr; data: ptr cstring; len: ptr cuint) {.cdecl, dynlib: DLLSSLName, importc.} -+proc SSL_CTX_set_alpn_protos*(ctx: SslCtx; protos: cstring; protos_len: cuint): cint {.cdecl, importc.} -+proc SSL_set_alpn_protos*(ssl: SslPtr; protos: cstring; protos_len: cuint): cint {.cdecl, importc.} -+proc SSL_CTX_set_alpn_select_cb*(ctx: SslCtx; cb: proc(ssl: SslPtr; out_proto: ptr cstring; outlen: cstring; in_proto: cstring; inlen: cuint; arg: pointer): cint {.cdecl.}; arg: pointer): cint {.cdecl, importc.} -+proc SSL_get0_alpn_selected*(ssl: SslPtr; data: ptr cstring; len: ptr cuint) {.cdecl, importc.} -+proc SSL_CTX_set_next_protos_advertised_cb*(ctx: SslCtx; cb: proc(ssl: SslPtr; out_proto: ptr cstring; outlen: ptr cuint; arg: pointer): cint {.cdecl.}; arg: pointer) {.cdecl, importc.} -+proc SSL_CTX_set_next_proto_select_cb*(ctx: SslCtx; cb: proc(s: SslPtr; out_proto: cstring; outlen: cstring; in_proto: cstring; inlen: cuint; arg: pointer): cint {.cdecl.}; arg: pointer) {.cdecl, importc.} -+proc SSL_select_next_proto*(out_proto: ptr cstring; outlen: cstring; server: cstring; server_len: cuint; client: cstring; client_len: cuint): cint {.cdecl, importc.} -+proc SSL_get0_next_proto_negotiated*(s: SslPtr; data: ptr cstring; len: ptr cuint) {.cdecl, importc.} - diff --git a/pkgs/development/compilers/nim/toLocation.patch b/pkgs/development/compilers/nim/toLocation.patch deleted file mode 100644 index a3db46044049..000000000000 --- a/pkgs/development/compilers/nim/toLocation.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/lib/std/private/miscdollars.nim b/lib/std/private/miscdollars.nim -index 840fedf54..6c3436308 100644 ---- a/lib/std/private/miscdollars.nim -+++ b/lib/std/private/miscdollars.nim -@@ -6,9 +6,8 @@ template toLocation*(result: var string, file: string | cstring, line: int, col: - # it can be done in a single place. - result.add file - if line > 0: -- result.add "(" -+ result.add ":" - addInt(result, line) - if col > 0: -- result.add ", " -+ result.add ":" - addInt(result, col) -- result.add ")" diff --git a/pkgs/development/compilers/nqc/default.nix b/pkgs/development/compilers/nqc/default.nix deleted file mode 100644 index a7d6cb5f2cdd..000000000000 --- a/pkgs/development/compilers/nqc/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch }: - -stdenv.mkDerivation rec { - pname = "nqc"; - version = "3.1.r6"; - - src = fetchurl { - url = "https://bricxcc.sourceforge.net/nqc/release/nqc-${version}.tgz"; - sha256 = "sha256-v9XmVPY5r3pYjP3vTSK9Xvz/9UexClbOvr3ljvK/52Y="; - }; - - sourceRoot = "."; - - patches = [ - ./nqc-unistd.patch - (fetchpatch { - url = "https://sourceforge.net/p/bricxcc/patches/_discuss/thread/00b427dc/b84b/attachment/nqc-01-Linux_usb_and_tcp.diff"; - sha256 = "sha256-UZmmhhhfLAUus36TOBhiDQ8KUeEdYhGHVFwqKqDIqII="; - }) - ]; - - makeFlags = [ "PREFIX=$(out)" ]; - - dontConfigure = true; - - meta = with lib; { - homepage = "https://bricxcc.sourceforge.net/nqc/"; - description = "Programming language for several LEGO MINDSTORMS products including the RCX, CyberMaster, and Scout"; - platforms = platforms.linux; - license = licenses.mpl10; - maintainers = with maintainers; [ christophcharles ]; - }; -} diff --git a/pkgs/development/compilers/nqc/nqc-unistd.patch b/pkgs/development/compilers/nqc/nqc-unistd.patch deleted file mode 100644 index 7abf37f93ca7..000000000000 --- a/pkgs/development/compilers/nqc/nqc-unistd.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ruN nqc-3.1.r6-old/compiler/lexer.cpp nqc-3.1.r6-new/compiler/lexer.cpp ---- nqc-3.1.r6-old/compiler/lexer.cpp 2007-06-06 20:19:10.000000000 +0200 -+++ nqc-3.1.r6-new/compiler/lexer.cpp 2022-10-13 07:57:08.247213954 +0200 -@@ -11,6 +11,7 @@ - #define YY_FLEX_MINOR_VERSION 5 - - #include <stdio.h> -+#include <unistd.h> - - #if defined(__MWERKS__) && !__MACH__ && !YY_NEVER_INTERACTIVE - #include <unix.h> diff --git a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix deleted file mode 100644 index d6d4fdd44810..000000000000 --- a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - version = "3.1"; - - date = "April2012"; - - pname = "nvidia-cg-toolkit"; - - src = - if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - url = "https://developer.download.nvidia.com/cg/Cg_${version}/Cg-${version}_${date}_x86_64.tgz"; - sha256 = "e8ff01e6cc38d1b3fd56a083f5860737dbd2f319a39037528fb1a74a89ae9878"; - } - else if stdenv.hostPlatform.system == "i686-linux" then - fetchurl { - url = "http://developer.download.nvidia.com/cg/Cg_${version}/Cg-${version}_${date}_x86.tgz"; - sha256 = "cef3591e436f528852db0e8c145d3842f920e0c89bcfb219c466797cb7b18879"; - } - else throw "nvidia-cg-toolkit does not support platform ${stdenv.hostPlatform.system}"; - - installPhase = '' - for b in cgc cgfxcat cginfo - do - patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux*.so.? "bin/$b" - done - # FIXME: cgfxcat and cginfo need more patchelf - mkdir -p "$out/bin/" - cp -v bin/* "$out/bin/" - mkdir -p "$out/include/" - cp -v -r include/Cg/ "$out/include/" - mkdir -p "$out/lib/" - [ "$system" == "x86_64-linux" ] && cp -v lib64/* "$out/lib/" - [ "$system" == "i686-linux" ] && cp -v lib/* "$out/lib/" - mkdir -p "$out/share/doc/$name/" - cp -v -r local/Cg/* "$out/share/doc/$name/" - ''; - - meta = { - homepage = "https://developer.nvidia.com/cg-toolkit"; - license = lib.licenses.unfreeRedistributable; - }; -} diff --git a/pkgs/development/compilers/ocaml/4.00.1.nix b/pkgs/development/compilers/ocaml/4.00.1.nix index e4a4ed0f9580..c9b94abd2964 100644 --- a/pkgs/development/compilers/ocaml/4.00.1.nix +++ b/pkgs/development/compilers/ocaml/4.00.1.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchurl, fetchpatch, ncurses, libX11 }: let - useX11 = !stdenv.isAarch32 && !stdenv.isMips; - useNativeCompilers = !stdenv.isMips; + useX11 = !stdenv.hostPlatform.isAarch32 && !stdenv.hostPlatform.isMips; + useNativeCompilers = !stdenv.hostPlatform.isMips; inherit (lib) optional optionals optionalString; in diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml.nix b/pkgs/development/compilers/ocaml/ber-metaocaml.nix index 5279fc7481b6..b3bf5038702f 100644 --- a/pkgs/development/compilers/ocaml/ber-metaocaml.nix +++ b/pkgs/development/compilers/ocaml/ber-metaocaml.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { branch = baseOcamlBranch; platforms = with platforms; linux ++ darwin; - broken = stdenv.isAarch64 || stdenv.isMips; + broken = stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isMips; longDescription = '' A simple extension of OCaml with the primitive type of code values, and diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index af07074eba1b..38795426bea2 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -3,7 +3,7 @@ let versionNoPatch = "${toString major_version}.${toString minor_version}"; version = "${versionNoPatch}.${toString patch_version}"; - safeX11 = stdenv: !(stdenv.isAarch32 || stdenv.isMips || stdenv.hostPlatform.isStatic); + safeX11 = stdenv: !(stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isMips || stdenv.hostPlatform.isStatic); in { lib, stdenv, fetchurl, ncurses, buildEnv, libunwind, fetchpatch @@ -30,7 +30,7 @@ let in let - useNativeCompilers = !stdenv.isMips; + useNativeCompilers = !stdenv.hostPlatform.isMips; inherit (lib) optional optionals optionalString strings concatStrings; pname = concatStrings [ "ocaml" (optionalString aflSupport "+afl") @@ -84,7 +84,7 @@ stdenv.mkDerivation (args // { # `aarch64-apple-darwin-clang` while using assembler. However, such binary # does not exist. So, disable these configure flags on `aarch64-darwin`. # See #144785 for details. - configurePlatforms = lib.optionals (lib.versionAtLeast version "4.08" && !(stdenv.isDarwin && stdenv.isAarch64)) [ "host" "target" ]; + configurePlatforms = lib.optionals (lib.versionAtLeast version "4.08" && !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) [ "host" "target" ]; # x86_64-unknown-linux-musl-ld: -r and -pie may not be used together hardeningDisable = lib.optional (lib.versionAtLeast version "4.09" && stdenv.hostPlatform.isMusl) "pie" ++ lib.optional (lib.versionAtLeast version "5.0" && stdenv.cc.isClang) "strictoverflow" @@ -105,7 +105,9 @@ stdenv.mkDerivation (args // { # sequential order among them as a single rule. makefile = ./Makefile.nixpkgs; buildFlags = if useNativeCompilers - then ["nixpkgs_world_bootstrap_world_opt"] + then [(if lib.versionOlder version "5.2" + then "nixpkgs_world_bootstrap_world_opt" + else "defaultentry")] else ["nixpkgs_world"]; buildInputs = optional (lib.versionOlder version "4.07") ncurses ++ optionals useX11 [ libX11 xorgproto ]; @@ -114,7 +116,7 @@ stdenv.mkDerivation (args // { preConfigure = optionalString (lib.versionOlder version "4.04") '' CAT=$(type -tp cat) sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang - '' + optionalString (stdenv.isDarwin) '' + '' + optionalString (stdenv.hostPlatform.isDarwin) '' # Do what upstream does by default now: https://github.com/ocaml/ocaml/pull/10176 # This is required for aarch64-darwin, everything else works as is. AS="${stdenv.cc}/bin/cc -c" ASPP="${stdenv.cc}/bin/cc -c" @@ -157,7 +159,7 @@ stdenv.mkDerivation (args // { ''; platforms = with platforms; linux ++ darwin; - broken = stdenv.isAarch64 && lib.versionOlder version (if stdenv.isDarwin then "4.10" else "4.02"); + broken = stdenv.hostPlatform.isAarch64 && lib.versionOlder version (if stdenv.hostPlatform.isDarwin then "4.10" else "4.02"); }; }) diff --git a/pkgs/development/compilers/open-watcom/bin.nix b/pkgs/development/compilers/open-watcom/bin.nix index 1f8079908999..5e7805a31b30 100644 --- a/pkgs/development/compilers/open-watcom/bin.nix +++ b/pkgs/development/compilers/open-watcom/bin.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, fetchurl, qemu, expect, writeScript, writeScriptBin, ncurses, bash, coreutils }: +{ lib, stdenvNoCC, fetchurl, qemu, writeScript, writeScriptBin, ncurses, bash, coreutils, unixtools }: let @@ -48,41 +48,6 @@ let exec ${wrapLegacyBinary} "$TARGET-unwrapped" "$TARGET" ''; - # Do a scripted installation of OpenWatcom with its original installer. - # - # If maintaining this expect script turns out to be too much of a - # hassle, we can switch to just using `unzip' on the installer and - # the correct file permissions manually. - performInstall = writeScriptBin "performInstall" '' - #!${expect}/bin/expect -f - - spawn [lindex $argv 0] - - # Wait for button saying "I agree" with escape sequences. - expect "gree" - - # Navigate to "I Agree!" and hit enter. - send "\t\t\n" - - expect "Install Open Watcom" - - # Where do we want to install to. - send "$env(out)\n" - - expect "will be installed" - - # Select Full Installation, Next - send "fn" - - expect "Setup will now copy" - - # Next - send "n" - - expect "completed successfully" - send "\n" - ''; - in stdenvNoCC.mkDerivation rec { pname = "${passthru.prettyName}-unwrapped"; @@ -93,7 +58,7 @@ stdenvNoCC.mkDerivation rec { sha256 = "1wzkvc6ija0cjj5mcyjng5b7hnnc5axidz030c0jh05pgvi4nj7p"; }; - nativeBuildInputs = [ wrapInPlace performInstall ]; + nativeBuildInputs = [ wrapInPlace unixtools.script ]; dontUnpack = true; dontConfigure = true; @@ -104,7 +69,9 @@ stdenvNoCC.mkDerivation rec { ''; installPhase = '' - performInstall ./install-bin-unwrapped + # Command line options to do an unattended install are documented in + # https://github.com/open-watcom/open-watcom-v2/blob/master/bld/setupgui/setup.txt + script -c "./install-bin-unwrapped -dDstDir=$out -dFullInstall=1 -i" for e in $(find $out/binl -type f -executable); do echo "Wrapping $e" diff --git a/pkgs/development/compilers/open-watcom/v2.nix b/pkgs/development/compilers/open-watcom/v2.nix index ddd62872d451..8ad74c00ec87 100644 --- a/pkgs/development/compilers/open-watcom/v2.nix +++ b/pkgs/development/compilers/open-watcom/v2.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "${passthru.prettyName}-unwrapped"; # nixpkgs-update: no auto update - version = "0-unstable-2024-05-14"; + version = "0-unstable-2024-10-13"; src = fetchFromGitHub { owner = "open-watcom"; repo = "open-watcom-v2"; - rev = "d3733a7fca1d02ad91b58b377ecb38e1293889db"; - hash = "sha256-gDrmm7hd07lv0KhkP7Bys5qCuCCH+t/XvlftCYlCyI8="; + rev = "f0a6465832643ba08b7f94fb814c552804fb395b"; + hash = "sha256-rT3z0KrkCZ78SbsK2CEHfvJa1TEnRH2kwhzZhi8fZDo="; }; postPatch = '' diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix deleted file mode 100644 index 089e8411210c..000000000000 --- a/pkgs/development/compilers/openjdk/11.nix +++ /dev/null @@ -1,181 +0,0 @@ -{ stdenv, lib, fetchpatch, fetchFromGitHub, bash, pkg-config, autoconf, cpio, file, which, unzip -, zip, perl, cups, freetype, harfbuzz, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2 -, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama -, libXcursor, libXrandr, fontconfig, openjdk11-bootstrap -, setJavaClassPath -, headless ? false -, enableJavaFX ? false, openjfx -, enableGtk ? true, gtk3, glib -}: - -let - major = "11"; - minor = "0"; - update = "23"; - build = "9"; - - # when building a headless jdk, also bootstrap it with a headless jdk - openjdk-bootstrap = openjdk11-bootstrap.override { gtkSupport = !headless; }; - - openjdk = stdenv.mkDerivation rec { - pname = "openjdk" + lib.optionalString headless "-headless"; - version = "${major}.${minor}.${update}+${build}"; - - src = fetchFromGitHub { - owner = "openjdk"; - repo = "jdk${major}u"; - rev = "jdk-${version}"; - sha256 = "sha256-6y6wge8ZuSKBpb5QNihvAlD4Pv/0d3AQCPOkxUm/sJk="; - }; - - nativeBuildInputs = [ pkg-config autoconf unzip ]; - buildInputs = [ - cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib - libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst - libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap - ] ++ lib.optionals (!headless && enableGtk) [ - gtk3 glib - ]; - - patches = [ - ./fix-java-home-jdk10.patch - ./read-truststore-from-env-jdk10.patch - ./currency-date-range-jdk10.patch - ./increase-javadoc-heap.patch - ./fix-library-path-jdk11.patch - - # Fix build for gnumake-4.4.1: - # https://github.com/openjdk/jdk/pull/12992 - (fetchpatch { - name = "gnumake-4.4.1"; - url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch"; - hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg="; - }) - ] ++ lib.optionals (!headless && enableGtk) [ - ./swing-use-gtk-jdk10.patch - ]; - - preConfigure = '' - chmod +x configure - substituteInPlace configure --replace /bin/bash "${bash}/bin/bash" - ''; - - configureFlags = [ - "--with-boot-jdk=${openjdk-bootstrap.home}" - "--with-version-pre=" - "--enable-unlimited-crypto" - "--with-native-debug-symbols=internal" - "--with-freetype=system" - "--with-harfbuzz=system" - "--with-libjpeg=system" - "--with-giflib=system" - "--with-libpng=system" - "--with-zlib=system" - "--with-lcms=system" - "--with-stdc++lib=dynamic" - "--disable-warnings-as-errors" - ] - # Cannot be built by recent versions of Clang, as far as I can tell (see - # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=260319). Known to - # compile with LLVM 12. - ++ lib.optionals stdenv.cc.isClang [ - "--with-toolchain-type=clang" - # Explicitly tell Clang to compile C++ files as C++, see - # https://github.com/NixOS/nixpkgs/issues/150655#issuecomment-1935304859 - "--with-extra-cxxflags=-xc++" - ] - ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc" - ++ lib.optional headless "--enable-headless-only" - ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; - - separateDebugInfo = true; - - # Workaround for - # `cc1plus: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security]` - # when building jtreg - env.NIX_CFLAGS_COMPILE = "-Wformat"; - - NIX_LDFLAGS = toString (lib.optionals (!headless) [ - "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" - ] ++ lib.optionals (!headless && enableGtk) [ - "-lgtk-3" "-lgio-2.0" - ]); - - # -j flag is explicitly rejected by the build system: - # Error: 'make -jN' is not supported, use 'make JOBS=N' - # Note: it does not make build sequential. Build system - # still runs in parallel. - enableParallelBuilding = false; - - buildFlags = [ "all" ]; - - installPhase = '' - mkdir -p $out/lib - - mv build/*/images/jdk $out/lib/openjdk - - # Remove some broken manpages. - rm -rf $out/lib/openjdk/man/ja* - - # Mirror some stuff in top-level. - mkdir -p $out/share - ln -s $out/lib/openjdk/include $out/include - ln -s $out/lib/openjdk/man $out/share/man - ln -s $out/lib/openjdk/lib/src.zip $out/lib/src.zip - - # jni.h expects jni_md.h to be in the header search path. - ln -s $out/include/linux/*_md.h $out/include/ - - # Remove crap from the installation. - rm -rf $out/lib/openjdk/demo - ${lib.optionalString headless '' - rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so - ''} - - ln -s $out/lib/openjdk/bin $out/bin - ''; - - preFixup = '' - # Propagate the setJavaClassPath setup hook so that any package - # that depends on the JDK has $CLASSPATH set up properly. - mkdir -p $out/nix-support - #TODO or printWords? cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040 - echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs - - # Set JAVA_HOME automatically. - mkdir -p $out/nix-support - cat <<EOF > $out/nix-support/setup-hook - if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi - EOF - ''; - - postFixup = '' - # Build the set of output library directories to rpath against - LIBDIRS="" - for output in $(getAllOutputNames); do - if [ "$output" = debug ]; then continue; fi - LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS" - done - # Add the local library paths to remove dependencies on the bootstrap - for output in $(getAllOutputNames); do - if [ "$output" = debug ]; then continue; fi - OUTPUTDIR=$(eval echo \$$output) - BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) - echo "$BINLIBS" | while read i; do - patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true - patchelf --shrink-rpath "$i" || true - done - done - ''; - - disallowedReferences = [ openjdk-bootstrap ]; - - meta = import ./meta.nix lib version; - - passthru = { - architecture = ""; - home = "${openjdk}/lib/openjdk"; - inherit gtk3; - }; - }; -in openjdk diff --git a/pkgs/development/compilers/openjdk/currency-date-range-jdk10.patch b/pkgs/development/compilers/openjdk/11/patches/currency-date-range-jdk10.patch index e058eff07466..e058eff07466 100644 --- a/pkgs/development/compilers/openjdk/currency-date-range-jdk10.patch +++ b/pkgs/development/compilers/openjdk/11/patches/currency-date-range-jdk10.patch diff --git a/pkgs/development/compilers/openjdk/fix-java-home-jdk10.patch b/pkgs/development/compilers/openjdk/11/patches/fix-java-home-jdk10.patch index c037fde29722..c037fde29722 100644 --- a/pkgs/development/compilers/openjdk/fix-java-home-jdk10.patch +++ b/pkgs/development/compilers/openjdk/11/patches/fix-java-home-jdk10.patch diff --git a/pkgs/development/compilers/openjdk/fix-library-path-jdk11.patch b/pkgs/development/compilers/openjdk/11/patches/fix-library-path-jdk11.patch index ce30edb7f1d9..ce30edb7f1d9 100644 --- a/pkgs/development/compilers/openjdk/fix-library-path-jdk11.patch +++ b/pkgs/development/compilers/openjdk/11/patches/fix-library-path-jdk11.patch diff --git a/pkgs/development/compilers/openjdk/increase-javadoc-heap.patch b/pkgs/development/compilers/openjdk/11/patches/increase-javadoc-heap.patch index 6a1b253f9132..6a1b253f9132 100644 --- a/pkgs/development/compilers/openjdk/increase-javadoc-heap.patch +++ b/pkgs/development/compilers/openjdk/11/patches/increase-javadoc-heap.patch diff --git a/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk10.patch b/pkgs/development/compilers/openjdk/11/patches/read-truststore-from-env-jdk10.patch index 6203064f5c06..6203064f5c06 100644 --- a/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk10.patch +++ b/pkgs/development/compilers/openjdk/11/patches/read-truststore-from-env-jdk10.patch diff --git a/pkgs/development/compilers/openjdk/swing-use-gtk-jdk10.patch b/pkgs/development/compilers/openjdk/11/patches/swing-use-gtk-jdk10.patch index b9258c500db4..b9258c500db4 100644 --- a/pkgs/development/compilers/openjdk/swing-use-gtk-jdk10.patch +++ b/pkgs/development/compilers/openjdk/11/patches/swing-use-gtk-jdk10.patch diff --git a/pkgs/development/compilers/openjdk/11/source.json b/pkgs/development/compilers/openjdk/11/source.json new file mode 100644 index 000000000000..68080694d667 --- /dev/null +++ b/pkgs/development/compilers/openjdk/11/source.json @@ -0,0 +1,6 @@ +{ + "hash": "sha256-HqFm4qESB5T4Y1FLgfHZxURi7l7NkLzx2w8GzmB1jSY=", + "owner": "openjdk", + "repo": "jdk11u", + "rev": "refs/tags/jdk-11.0.25+9" +} diff --git a/pkgs/development/compilers/openjdk/17.nix b/pkgs/development/compilers/openjdk/17.nix deleted file mode 100644 index d0c954d1b023..000000000000 --- a/pkgs/development/compilers/openjdk/17.nix +++ /dev/null @@ -1,209 +0,0 @@ -{ stdenv, lib, fetchurl, fetchpatch, fetchFromGitHub, bash, pkg-config, autoconf, cpio -, file, which, unzip, zip, perl, cups, freetype, harfbuzz, alsa-lib, libjpeg, giflib -, libpng, zlib, lcms2, libX11, libICE, libXrender, libXext, libXt, libXtst -, libXi, libXinerama, libXcursor, libXrandr, fontconfig, openjdk17-bootstrap -, setJavaClassPath -, headless ? false -, enableJavaFX ? false, openjfx -, enableGtk ? true, gtk3, glib -}: - -let - version = { - feature = "17"; - interim = ".0.11"; - build = "9"; - }; - - # when building a headless jdk, also bootstrap it with a headless jdk - openjdk-bootstrap = openjdk17-bootstrap.override { gtkSupport = !headless; }; - - openjdk = stdenv.mkDerivation { - pname = "openjdk" + lib.optionalString headless "-headless"; - version = "${version.feature}${version.interim}+${version.build}"; - - src = fetchFromGitHub { - owner = "openjdk"; - repo = "jdk${version.feature}u"; - rev = "jdk-${version.feature}${version.interim}+${version.build}"; - sha256 = "sha256-aO4iSc9MklW/4q9U86WEfiiWnlq6iZSbxzq2fbsqd0A="; - }; - - nativeBuildInputs = [ pkg-config autoconf unzip ]; - buildInputs = [ - cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib - libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst - libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap - ] ++ lib.optionals (!headless && enableGtk) [ - gtk3 glib - ]; - - patches = [ - ./fix-java-home-jdk10.patch - ./read-truststore-from-env-jdk10.patch - ./currency-date-range-jdk10.patch - ./increase-javadoc-heap-jdk13.patch - ./ignore-LegalNoticeFilePlugin-jdk17.patch - ./fix-library-path-jdk17.patch - - # -Wformat etc. are stricter in newer gccs, per - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677 - # so grab the work-around from - # https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24 - (fetchurl { - url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch"; - sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r"; - }) - - # Patch borrowed from Alpine to fix build errors with musl libc and recent gcc. - # This is applied anywhere to prevent patchrot. - (fetchurl { - url = "https://git.alpinelinux.org/aports/plain/community/openjdk17/FixNullPtrCast.patch?id=41e78a067953e0b13d062d632bae6c4f8028d91c"; - sha256 = "sha256-LzmSew51+DyqqGyyMw2fbXeBluCiCYsS1nCjt9hX6zo="; - }) - - # Fix build for gnumake-4.4.1: - # https://github.com/openjdk/jdk/pull/12992 - (fetchpatch { - name = "gnumake-4.4.1"; - url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch"; - hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg="; - }) - - # Backport fixes for musl 1.2.4 which are already applied in jdk21+ - # Fetching patch from chimera because they already went through the effort of rebasing it onto jdk17 - (fetchurl { - name = "lfs64.patch"; - url = "https://raw.githubusercontent.com/chimera-linux/cports/4614075d19e9c9636f3f7e476687247f63330a35/contrib/openjdk17/patches/lfs64.patch"; - hash = "sha256-t2mRbdEiumBAbIAC0zsJNwCn59WYWHsnRtuOSL6bWB4="; - }) - ] ++ lib.optionals (!headless && enableGtk) [ - ./swing-use-gtk-jdk13.patch - ]; - - postPatch = '' - chmod +x configure - patchShebangs --build configure - ''; - - # JDK's build system attempts to specifically detect - # and special-case WSL, and we don't want it to do that, - # so pass the correct platform names explicitly - configurePlatforms = ["build" "host"]; - - configureFlags = [ - "--with-boot-jdk=${openjdk-bootstrap.home}" - "--with-version-build=${version.build}" - "--with-version-opt=nixos" - "--with-version-pre=" - "--enable-unlimited-crypto" - "--with-native-debug-symbols=internal" - "--with-freetype=system" - "--with-harfbuzz=system" - "--with-libjpeg=system" - "--with-giflib=system" - "--with-libpng=system" - "--with-zlib=system" - "--with-lcms=system" - "--with-stdc++lib=dynamic" - ] - ++ lib.optionals stdenv.cc.isClang [ - "--with-toolchain-type=clang" - # Explicitly tell Clang to compile C++ files as C++, see - # https://github.com/NixOS/nixpkgs/issues/150655#issuecomment-1935304859 - "--with-extra-cxxflags=-xc++" - ] - ++ lib.optional headless "--enable-headless-only" - ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; - - separateDebugInfo = true; - - env.NIX_CFLAGS_COMPILE = "-Wno-error"; - - NIX_LDFLAGS = toString (lib.optionals (!headless) [ - "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" - ] ++ lib.optionals (!headless && enableGtk) [ - "-lgtk-3" "-lgio-2.0" - ]); - - # -j flag is explicitly rejected by the build system: - # Error: 'make -jN' is not supported, use 'make JOBS=N' - # Note: it does not make build sequential. Build system - # still runs in parallel. - enableParallelBuilding = false; - - buildFlags = [ "images" ]; - - installPhase = '' - mkdir -p $out/lib - - mv build/*/images/jdk $out/lib/openjdk - - # Remove some broken manpages. - rm -rf $out/lib/openjdk/man/ja* - - # Mirror some stuff in top-level. - mkdir -p $out/share - ln -s $out/lib/openjdk/include $out/include - ln -s $out/lib/openjdk/man $out/share/man - - # IDEs use the provided src.zip to navigate the Java codebase (https://github.com/NixOS/nixpkgs/pull/95081) - ln -s $out/lib/openjdk/lib/src.zip $out/lib/src.zip - - # jni.h expects jni_md.h to be in the header search path. - ln -s $out/include/linux/*_md.h $out/include/ - - # Remove crap from the installation. - rm -rf $out/lib/openjdk/demo - ${lib.optionalString headless '' - rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so - ''} - - ln -s $out/lib/openjdk/bin $out/bin - ''; - - preFixup = '' - # Propagate the setJavaClassPath setup hook so that any package - # that depends on the JDK has $CLASSPATH set up properly. - mkdir -p $out/nix-support - #TODO or printWords? cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040 - echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs - - # Set JAVA_HOME automatically. - mkdir -p $out/nix-support - cat <<EOF > $out/nix-support/setup-hook - if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi - EOF - ''; - - postFixup = '' - # Build the set of output library directories to rpath against - LIBDIRS="" - for output in $(getAllOutputNames); do - if [ "$output" = debug ]; then continue; fi - LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort -u | tr '\n' ':'):$LIBDIRS" - done - # Add the local library paths to remove dependencies on the bootstrap - for output in $(getAllOutputNames); do - if [ "$output" = debug ]; then continue; fi - OUTPUTDIR=$(eval echo \$$output) - BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) - echo "$BINLIBS" | while read i; do - patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true - patchelf --shrink-rpath "$i" || true - done - done - ''; - - disallowedReferences = [ openjdk-bootstrap ]; - - pos = builtins.unsafeGetAttrPos "feature" version; - meta = import ./meta.nix lib version.feature; - - passthru = { - architecture = ""; - home = "${openjdk}/lib/openjdk"; - inherit gtk3; - }; - }; -in openjdk diff --git a/pkgs/development/compilers/openjdk/fix-library-path-jdk17.patch b/pkgs/development/compilers/openjdk/17/patches/fix-library-path-jdk17.patch index 4c38aca2b48a..71d96631ef89 100644 --- a/pkgs/development/compilers/openjdk/fix-library-path-jdk17.patch +++ b/pkgs/development/compilers/openjdk/17/patches/fix-library-path-jdk17.patch @@ -1,6 +1,8 @@ +diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp +index 7c951cee51..bcc61ff43d 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp -@@ -412,18 +412,8 @@ void os::init_system_properties_values() { +@@ -416,18 +416,8 @@ // 1: ... // ... // 7: The default directories, normally /lib and /usr/lib. @@ -18,8 +20,8 @@ -#define SYS_EXT_DIR "/usr/java/packages" #define EXTENSIONS_DIR "/lib/ext" - // Buffer that fits several sprintfs. -@@ -431,7 +421,7 @@ void os::init_system_properties_values() { + // Buffer that fits several snprintfs. +@@ -435,7 +425,7 @@ // by the nulls included by the sizeof operator. const size_t bufsize = MAX2((size_t)MAXPATHLEN, // For dll_dir & friends. @@ -28,28 +30,26 @@ char *buf = NEW_C_HEAP_ARRAY(char, bufsize, mtInternal); // sysclasspath, java_home, dll_dir -@@ -478,26 +468,22 @@ void os::init_system_properties_values() { +@@ -482,24 +472,20 @@ // should always exist (until the legacy problem cited above is // addressed). const char *v = ::getenv("LD_LIBRARY_PATH"); - const char *v_colon = ":"; - if (v == NULL) { v = ""; v_colon = ""; } +- // That's +1 for the colon and +1 for the trailing '\0'. +- size_t pathsize = strlen(v) + 1 + sizeof(SYS_EXT_DIR) + sizeof("/lib/") + sizeof(DEFAULT_LIBPATH) + 1; + if (v == NULL) { v = ""; } - // That's +1 for the colon and +1 for the trailing '\0'. - char *ld_library_path = NEW_C_HEAP_ARRAY(char, -- strlen(v) + 1 + -- sizeof(SYS_EXT_DIR) + sizeof("/lib/") + sizeof(DEFAULT_LIBPATH) + 1, -+ strlen(v) + 1, - mtInternal); -- sprintf(ld_library_path, "%s%s" SYS_EXT_DIR "/lib:" DEFAULT_LIBPATH, v, v_colon); -+ sprintf(ld_library_path, "%s", v); ++ size_t pathsize = strlen(v) + 1; + char *ld_library_path = NEW_C_HEAP_ARRAY(char, pathsize, mtInternal); +- os::snprintf_checked(ld_library_path, pathsize, "%s%s" SYS_EXT_DIR "/lib:" DEFAULT_LIBPATH, v, v_colon); ++ os::snprintf_checked(ld_library_path, pathsize, "%s", v); Arguments::set_library_path(ld_library_path); FREE_C_HEAP_ARRAY(char, ld_library_path); } // Extensions directories. -- sprintf(buf, "%s" EXTENSIONS_DIR ":" SYS_EXT_DIR EXTENSIONS_DIR, Arguments::get_java_home()); -+ sprintf(buf, "%s" EXTENSIONS_DIR, Arguments::get_java_home()); +- os::snprintf_checked(buf, bufsize, "%s" EXTENSIONS_DIR ":" SYS_EXT_DIR EXTENSIONS_DIR, Arguments::get_java_home()); ++ os::snprintf_checked(buf, bufsize, "%s" EXTENSIONS_DIR, Arguments::get_java_home()); Arguments::set_ext_dirs(buf); FREE_C_HEAP_ARRAY(char, buf); @@ -57,4 +57,5 @@ -#undef DEFAULT_LIBPATH -#undef SYS_EXT_DIR #undef EXTENSIONS_DIR - } \ No newline at end of file + } + diff --git a/pkgs/development/compilers/openjdk/ignore-LegalNoticeFilePlugin-jdk17.patch b/pkgs/development/compilers/openjdk/17/patches/ignore-LegalNoticeFilePlugin-jdk17.patch index 3bb610ee35c0..3bb610ee35c0 100644 --- a/pkgs/development/compilers/openjdk/ignore-LegalNoticeFilePlugin-jdk17.patch +++ b/pkgs/development/compilers/openjdk/17/patches/ignore-LegalNoticeFilePlugin-jdk17.patch diff --git a/pkgs/development/compilers/openjdk/increase-javadoc-heap-jdk13.patch b/pkgs/development/compilers/openjdk/17/patches/increase-javadoc-heap-jdk13.patch index 6e48db6ac3b9..6e48db6ac3b9 100644 --- a/pkgs/development/compilers/openjdk/increase-javadoc-heap-jdk13.patch +++ b/pkgs/development/compilers/openjdk/17/patches/increase-javadoc-heap-jdk13.patch diff --git a/pkgs/development/compilers/openjdk/swing-use-gtk-jdk13.patch b/pkgs/development/compilers/openjdk/17/patches/swing-use-gtk-jdk13.patch index 8a1b9b6149bb..8a1b9b6149bb 100644 --- a/pkgs/development/compilers/openjdk/swing-use-gtk-jdk13.patch +++ b/pkgs/development/compilers/openjdk/17/patches/swing-use-gtk-jdk13.patch diff --git a/pkgs/development/compilers/openjdk/17/source.json b/pkgs/development/compilers/openjdk/17/source.json new file mode 100644 index 000000000000..c372853e70e0 --- /dev/null +++ b/pkgs/development/compilers/openjdk/17/source.json @@ -0,0 +1,6 @@ +{ + "hash": "sha256-wHJlCmaE8titkfcWb2WboqemekPBn3JWc4bGyWskmoY=", + "owner": "openjdk", + "repo": "jdk17u", + "rev": "refs/tags/jdk-17.0.13+11" +} diff --git a/pkgs/development/compilers/openjdk/21.nix b/pkgs/development/compilers/openjdk/21.nix deleted file mode 100644 index 9c403fb2755d..000000000000 --- a/pkgs/development/compilers/openjdk/21.nix +++ /dev/null @@ -1,195 +0,0 @@ -{ stdenv, lib, fetchurl, fetchpatch, fetchFromGitHub, bash, pkg-config, autoconf, cpio -, file, which, unzip, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib -, libpng, zlib, lcms2, libX11, libICE, libXrender, libXext, libXt, libXtst -, libXi, libXinerama, libXcursor, libXrandr, fontconfig, openjdk21-bootstrap -, ensureNewerSourcesForZipFilesHook -, setJavaClassPath -# TODO(@sternenseemann): gtk3 fails to evaluate in pkgsCross.ghcjs.buildPackages -# which should be fixable, this is a no-rebuild workaround for GHC. -, headless ? stdenv.targetPlatform.isGhcjs -, enableJavaFX ? false, openjfx -, enableGtk ? true, gtk3, glib -}: - -let - version = { - feature = "21"; - interim = ".0.3"; - build = "9"; - }; - - # when building a headless jdk, also bootstrap it with a headless jdk - openjdk-bootstrap = openjdk21-bootstrap.override { gtkSupport = !headless; }; - - openjdk = stdenv.mkDerivation { - pname = "openjdk" + lib.optionalString headless "-headless"; - version = "${version.feature}${version.interim}+${version.build}"; - - src = fetchFromGitHub { - owner = "openjdk"; - repo = "jdk${version.feature}u"; - rev = "jdk-${version.feature}${version.interim}+${version.build}"; - hash = "sha256-zRN16lrc5gtDlTVIQJRRx103w/VbRkatCLeEc9AXWPE="; - }; - - nativeBuildInputs = [ pkg-config autoconf unzip ensureNewerSourcesForZipFilesHook ]; - buildInputs = [ - cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib - libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst - libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap - ] ++ lib.optionals (!headless && enableGtk) [ - gtk3 glib - ]; - - patches = [ - ./fix-java-home-jdk21.patch - ./read-truststore-from-env-jdk10.patch - ./currency-date-range-jdk10.patch - ./increase-javadoc-heap-jdk13.patch - ./ignore-LegalNoticeFilePlugin-jdk18.patch - - # -Wformat etc. are stricter in newer gccs, per - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677 - # so grab the work-around from - # https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24 - (fetchurl { - url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch"; - sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r"; - }) - - # Fix build for gnumake-4.4.1: - # https://github.com/openjdk/jdk/pull/12992 - (fetchpatch { - name = "gnumake-4.4.1"; - url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch"; - hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg="; - }) - ] ++ lib.optionals (!headless && enableGtk) [ - ./swing-use-gtk-jdk13.patch - ]; - - postPatch = '' - chmod +x configure - patchShebangs --build configure - ''; - - # JDK's build system attempts to specifically detect - # and special-case WSL, and we don't want it to do that, - # so pass the correct platform names explicitly - configurePlatforms = ["build" "host"]; - - configureFlags = [ - "--with-boot-jdk=${openjdk-bootstrap.home}" - "--with-version-build=${version.build}" - "--with-version-opt=nixos" - "--with-version-pre=" - "--enable-unlimited-crypto" - "--with-native-debug-symbols=internal" - "--with-libjpeg=system" - "--with-giflib=system" - "--with-libpng=system" - "--with-zlib=system" - "--with-lcms=system" - "--with-stdc++lib=dynamic" - ] - ++ lib.optionals stdenv.cc.isClang [ - "--with-toolchain-type=clang" - # Explicitly tell Clang to compile C++ files as C++, see - # https://github.com/NixOS/nixpkgs/issues/150655#issuecomment-1935304859 - "--with-extra-cxxflags=-xc++" - ] - ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc" - ++ lib.optional headless "--enable-headless-only" - ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; - - separateDebugInfo = true; - - env.NIX_CFLAGS_COMPILE = "-Wno-error"; - - NIX_LDFLAGS = toString (lib.optionals (!headless) [ - "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" - ] ++ lib.optionals (!headless && enableGtk) [ - "-lgtk-3" "-lgio-2.0" - ]); - - # -j flag is explicitly rejected by the build system: - # Error: 'make -jN' is not supported, use 'make JOBS=N' - # Note: it does not make build sequential. Build system - # still runs in parallel. - enableParallelBuilding = false; - - buildFlags = [ "images" ]; - - installPhase = '' - mkdir -p $out/lib - - mv build/*/images/jdk $out/lib/openjdk - - # Remove some broken manpages. - rm -rf $out/lib/openjdk/man/ja* - - # Mirror some stuff in top-level. - mkdir -p $out/share - ln -s $out/lib/openjdk/include $out/include - ln -s $out/lib/openjdk/man $out/share/man - - # IDEs use the provided src.zip to navigate the Java codebase (https://github.com/NixOS/nixpkgs/pull/95081) - ln -s $out/lib/openjdk/lib/src.zip $out/lib/src.zip - - # jni.h expects jni_md.h to be in the header search path. - ln -s $out/include/linux/*_md.h $out/include/ - - # Remove crap from the installation. - rm -rf $out/lib/openjdk/demo - ${lib.optionalString headless '' - rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so - ''} - - ln -s $out/lib/openjdk/bin $out/bin - ''; - - preFixup = '' - # Propagate the setJavaClassPath setup hook so that any package - # that depends on the JDK has $CLASSPATH set up properly. - mkdir -p $out/nix-support - #TODO or printWords? cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040 - echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs - - # Set JAVA_HOME automatically. - mkdir -p $out/nix-support - cat <<EOF > $out/nix-support/setup-hook - if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi - EOF - ''; - - postFixup = '' - # Build the set of output library directories to rpath against - LIBDIRS="" - for output in $(getAllOutputNames); do - if [ "$output" = debug ]; then continue; fi - LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort -u | tr '\n' ':'):$LIBDIRS" - done - # Add the local library paths to remove dependencies on the bootstrap - for output in $(getAllOutputNames); do - if [ "$output" = debug ]; then continue; fi - OUTPUTDIR=$(eval echo \$$output) - BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) - echo "$BINLIBS" | while read i; do - patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true - patchelf --shrink-rpath "$i" || true - done - done - ''; - - disallowedReferences = [ openjdk-bootstrap ]; - - pos = builtins.unsafeGetAttrPos "feature" version; - meta = import ./meta.nix lib version.feature; - - passthru = { - architecture = ""; - home = "${openjdk}/lib/openjdk"; - inherit gtk3; - }; - }; -in openjdk diff --git a/pkgs/development/compilers/openjdk/fix-java-home-jdk21.patch b/pkgs/development/compilers/openjdk/21/patches/fix-java-home-jdk21.patch index ede201ed1ada..ede201ed1ada 100644 --- a/pkgs/development/compilers/openjdk/fix-java-home-jdk21.patch +++ b/pkgs/development/compilers/openjdk/21/patches/fix-java-home-jdk21.patch diff --git a/pkgs/development/compilers/openjdk/ignore-LegalNoticeFilePlugin-jdk18.patch b/pkgs/development/compilers/openjdk/21/patches/ignore-LegalNoticeFilePlugin-jdk18.patch index cda93580efb1..cda93580efb1 100644 --- a/pkgs/development/compilers/openjdk/ignore-LegalNoticeFilePlugin-jdk18.patch +++ b/pkgs/development/compilers/openjdk/21/patches/ignore-LegalNoticeFilePlugin-jdk18.patch diff --git a/pkgs/development/compilers/openjdk/21/source.json b/pkgs/development/compilers/openjdk/21/source.json new file mode 100644 index 000000000000..9808423ccff1 --- /dev/null +++ b/pkgs/development/compilers/openjdk/21/source.json @@ -0,0 +1,6 @@ +{ + "hash": "sha256-H28Hp1SzANkrgnC6xdkiSEcRK6bm8BcT/lbJDEUvRYY=", + "owner": "openjdk", + "repo": "jdk21u", + "rev": "refs/tags/jdk-21.0.5+11" +} diff --git a/pkgs/development/compilers/openjdk/22.nix b/pkgs/development/compilers/openjdk/22.nix deleted file mode 100644 index b022e492e3f9..000000000000 --- a/pkgs/development/compilers/openjdk/22.nix +++ /dev/null @@ -1,284 +0,0 @@ -{ stdenv -, lib -, fetchurl -, fetchpatch -, fetchFromGitHub -, pkg-config -, autoconf -, cpio -, file -, which -, unzip -, zip -, perl -, cups -, freetype -, alsa-lib -, libjpeg -, giflib -, libpng -, zlib -, lcms2 -, libX11 -, libICE -, libXrender -, libXext -, libXt -, libXtst -, libXi -, libXinerama -, libXcursor -, libXrandr -, fontconfig -, openjdk22-bootstrap -, ensureNewerSourcesForZipFilesHook -, setJavaClassPath - # TODO(@sternenseemann): gtk3 fails to evaluate in pkgsCross.ghcjs.buildPackages - # which should be fixable, this is a no-rebuild workaround for GHC. -, headless ? stdenv.targetPlatform.isGhcjs -, enableJavaFX ? false -, openjfx -, enableGtk ? true -, gtk3 -, glib -, writeShellScript -, versionCheckHook -}: - -let - - # Java version format: - # $FEATURE.$INTERIM.$UPDATE.$PATCH - # See - # https://openjdk.org/jeps/223 - # https://docs.oracle.com/en/java/javase/22/docs/api/java.base/java/lang/Runtime.Version.html - featureVersion = "22"; - info = builtins.getAttr featureVersion (lib.importJSON ./info.json); - version = info.version; - - # when building a headless jdk, also bootstrap it with a headless jdk - openjdk-bootstrap = openjdk22-bootstrap.override { gtkSupport = !headless; }; -in - -stdenv.mkDerivation (finalAttrs: { - pname = "openjdk" + lib.optionalString headless "-headless"; - inherit version; - - src = fetchFromGitHub { - owner = "openjdk"; - repo = info.repo; - rev = "jdk-${version}"; - hash = info.hash; - }; - - nativeBuildInputs = [ pkg-config autoconf unzip ensureNewerSourcesForZipFilesHook ]; - buildInputs = [ - cpio - file - which - zip - perl - zlib - cups - freetype - alsa-lib - libjpeg - giflib - libpng - zlib - lcms2 - libX11 - libICE - libXrender - libXext - libXtst - libXt - libXtst - libXi - libXinerama - libXcursor - libXrandr - fontconfig - openjdk-bootstrap - ] ++ lib.optionals (!headless && enableGtk) [ - gtk3 - glib - ]; - - patches = [ - ./fix-java-home-jdk21.patch - ./read-truststore-from-env-jdk10.patch - ./currency-date-range-jdk10.patch - ./increase-javadoc-heap-jdk13.patch - ./ignore-LegalNoticeFilePlugin-jdk18.patch - - # -Wformat etc. are stricter in newer gccs, per - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677 - # so grab the work-around from - # https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24 - (fetchurl { - url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch"; - sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r"; - }) - - # Fix build for gnumake-4.4.1: - # https://github.com/openjdk/jdk/pull/12992 - (fetchpatch { - name = "gnumake-4.4.1"; - url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch"; - hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg="; - }) - ] ++ lib.optionals (!headless && enableGtk) [ - ./swing-use-gtk-jdk13.patch - ]; - - postPatch = '' - chmod +x configure - patchShebangs --build configure - ''; - - # JDK's build system attempts to specifically detect - # and special-case WSL, and we don't want it to do that, - # so pass the correct platform names explicitly - configurePlatforms = [ "build" "host" ]; - - - # https://openjdk.org/groups/build/doc/building.html - configureFlags = [ - "--with-boot-jdk=${openjdk-bootstrap.home}" - "--with-version-string=${version}" - "--with-vendor-version-string=(nix)" - "--enable-unlimited-crypto" - "--with-native-debug-symbols=internal" - "--with-libjpeg=system" - "--with-giflib=system" - "--with-libpng=system" - "--with-zlib=system" - "--with-lcms=system" - "--with-stdc++lib=dynamic" - ] - ++ lib.optionals stdenv.cc.isClang [ - "--with-toolchain-type=clang" - # Explicitly tell Clang to compile C++ files as C++, see - # https://github.com/NixOS/nixpkgs/issues/150655#issuecomment-1935304859 - "--with-extra-cxxflags=-xc++" - ] - ++ lib.optional headless "--enable-headless-only" - ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; - - separateDebugInfo = true; - - env.NIX_CFLAGS_COMPILE = "-Wno-error"; - - NIX_LDFLAGS = toString (lib.optionals (!headless) [ - "-lfontconfig" - "-lcups" - "-lXinerama" - "-lXrandr" - "-lmagic" - ] ++ lib.optionals (!headless && enableGtk) [ - "-lgtk-3" - "-lgio-2.0" - ]); - - # -j flag is explicitly rejected by the build system: - # Error: 'make -jN' is not supported, use 'make JOBS=N' - # Note: it does not make build sequential. Build system - # still runs in parallel. - enableParallelBuilding = false; - - buildFlags = [ "images" ]; - - installPhase = '' - mkdir -p $out/lib - - mv build/*/images/jdk $out/lib/openjdk - - # Remove some broken manpages. - rm -rf $out/lib/openjdk/man/ja* - - # Mirror some stuff in top-level. - mkdir -p $out/share - ln -s $out/lib/openjdk/include $out/include - ln -s $out/lib/openjdk/man $out/share/man - - # IDEs use the provided src.zip to navigate the Java codebase (https://github.com/NixOS/nixpkgs/pull/95081) - ln -s $out/lib/openjdk/lib/src.zip $out/lib/src.zip - - # jni.h expects jni_md.h to be in the header search path. - ln -s $out/include/linux/*_md.h $out/include/ - - # Remove crap from the installation. - rm -rf $out/lib/openjdk/demo - ${lib.optionalString headless '' - rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so - ''} - - ln -s $out/lib/openjdk/bin $out/bin - ''; - - preFixup = '' - # Propagate the setJavaClassPath setup hook so that any package - # that depends on the JDK has $CLASSPATH set up properly. - mkdir -p $out/nix-support - #TODO or printWords? cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040 - echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs - - # Set JAVA_HOME automatically. - mkdir -p $out/nix-support - cat <<EOF > $out/nix-support/setup-hook - if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi - EOF - ''; - - postFixup = '' - # Build the set of output library directories to rpath against - LIBDIRS="" - for output in $(getAllOutputNames); do - if [ "$output" = debug ]; then continue; fi - LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort -u | tr '\n' ':'):$LIBDIRS" - done - # Add the local library paths to remove dependencies on the bootstrap - for output in $(getAllOutputNames); do - if [ "$output" = debug ]; then continue; fi - OUTPUTDIR=$(eval echo \$$output) - BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) - echo "$BINLIBS" | while read i; do - patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true - patchelf --shrink-rpath "$i" || true - done - done - ''; - - disallowedReferences = [ openjdk-bootstrap ]; - - pos = __curPos; - meta = import ./meta.nix lib featureVersion; - - nativeInstallCheckInputs = [ - versionCheckHook - ]; - versionCheckProgram = "${placeholder "out"}/bin/java"; - - doInstallCheck = true; - - passthru = { - updateScript = - let - java-json = fetchurl { - url = "https://search.maven.org/remotecontent?filepath=org/json/json/20240303/json-20240303.jar"; - hash = "sha256-PPbNaJLjLitMHDng9S9SSKL1s3ZG/fu3mma0a2GEFO0="; - }; - in - writeShellScript "update-java" '' - ${finalAttrs.finalPackage}/bin/java \ - -cp ${java-json} \ - ${./JavaUpdater.java} \ - 22 pkgs/development/compilers/openjdk/info.json - ''; - - home = "${finalAttrs.finalPackage}/lib/openjdk"; - - inherit gtk3; - }; -}) diff --git a/pkgs/development/compilers/openjdk/23/source.json b/pkgs/development/compilers/openjdk/23/source.json new file mode 100644 index 000000000000..d56aeb591498 --- /dev/null +++ b/pkgs/development/compilers/openjdk/23/source.json @@ -0,0 +1,6 @@ +{ + "hash": "sha256-Sl0aEtndzlyuwMtcjOeDe2CVls89ONzicP5IXhAU2FA=", + "owner": "openjdk", + "repo": "jdk23u", + "rev": "refs/tags/jdk-23.0.1+11" +} diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix deleted file mode 100644 index b77b058e2cac..000000000000 --- a/pkgs/development/compilers/openjdk/8.nix +++ /dev/null @@ -1,230 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, pkg-config, lndir, bash, cpio, file, which, unzip, zip -, cups, freetype, alsa-lib, cacert, perl, liberation_ttf, fontconfig, zlib -, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr -, libjpeg, giflib -, openjdk8-bootstrap -, setJavaClassPath -, headless ? false -, enableGtk ? true, gtk2, glib -}: - -let - - /** - * The JRE libraries are in directories that depend on the CPU. - */ - architecture = { - i686-linux = "i386"; - x86_64-linux = "amd64"; - aarch64-linux = "aarch64"; - powerpc64le-linux = "ppc64le"; - }.${stdenv.system} or (throw "Unsupported platform ${stdenv.system}"); - - update = "412"; - build = "ga"; - - # when building a headless jdk, also bootstrap it with a headless jdk - openjdk-bootstrap = openjdk8-bootstrap.override { gtkSupport = !headless; }; - - openjdk8 = stdenv.mkDerivation rec { - pname = "openjdk" + lib.optionalString headless "-headless"; - version = "8u${update}-${build}"; - - src = fetchFromGitHub { - owner = "openjdk"; - repo = "jdk8u"; - rev = "jdk${version}"; - sha256 = "sha256-o+H5n5p6JG1giJj9OADgMbQPaoKMzLMFquKH536SHhM="; - }; - outputs = [ "out" "jre" ]; - - nativeBuildInputs = [ pkg-config lndir unzip ]; - buildInputs = [ - cpio file which zip perl zlib cups freetype alsa-lib - libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst - libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap - ] ++ lib.optionals (!headless && enableGtk) [ - gtk2 glib - ]; - - patches = [ - ./fix-java-home-jdk8.patch - ./read-truststore-from-env-jdk8.patch - ./currency-date-range-jdk8.patch - ./fix-library-path-jdk8.patch - ] ++ lib.optionals (!headless && enableGtk) [ - ./swing-use-gtk-jdk8.patch - ]; - - # Hotspot cares about the host(!) version otherwise - DISABLE_HOTSPOT_OS_VERSION_CHECK = "ok"; - - preConfigure = '' - chmod +x configure - substituteInPlace configure --replace /bin/bash "${bash}/bin/bash" - substituteInPlace hotspot/make/linux/adlc_updater --replace /bin/sh "${stdenv.shell}" - substituteInPlace hotspot/make/linux/makefiles/dtrace.make --replace /usr/include/sys/sdt.h "/no-such-path" - ''; - - configureFlags = [ - "--with-boot-jdk=${openjdk-bootstrap.home}" - "--with-update-version=${update}" - "--with-build-number=${build}" - "--with-milestone=fcs" - "--enable-unlimited-crypto" - "--with-native-debug-symbols=internal" - "--disable-freetype-bundling" - "--with-zlib=system" - "--with-giflib=system" - "--with-stdc++lib=dynamic" - ] ++ lib.optional headless "--disable-headful"; - - separateDebugInfo = true; - - env.NIX_CFLAGS_COMPILE = toString ([ - # glibc 2.24 deprecated readdir_r so we need this - # See https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg49006.html - "-Wno-error=deprecated-declarations" - ] ++ lib.optionals stdenv.cc.isGNU [ - # https://bugzilla.redhat.com/show_bug.cgi?id=1306558 - # https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716 - "-fno-lifetime-dse" - "-fno-delete-null-pointer-checks" - "-std=gnu++98" - "-Wno-error" - ]); - - NIX_LDFLAGS= toString (lib.optionals (!headless) [ - "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" - ] ++ lib.optionals (!headless && enableGtk) [ - "-lgtk-x11-2.0" "-lgio-2.0" - ]); - - # -j flag is explicitly rejected by the build system: - # Error: 'make -jN' is not supported, use 'make JOBS=N' - # Note: it does not make build sequential. Build system - # still runs in parallel. - enableParallelBuilding = false; - - buildFlags = [ "all" ]; - - doCheck = false; # fails with "No rule to make target 'y'." - - installPhase = '' - mkdir -p $out/lib - - mv build/*/images/j2sdk-image $out/lib/openjdk - - # Remove some broken manpages. - rm -rf $out/lib/openjdk/man/ja* - - # Mirror some stuff in top-level. - mkdir -p $out/share - ln -s $out/lib/openjdk/include $out/include - ln -s $out/lib/openjdk/man $out/share/man - - # jni.h expects jni_md.h to be in the header search path. - ln -s $out/include/linux/*_md.h $out/include/ - - # Remove crap from the installation. - rm -rf $out/lib/openjdk/demo $out/lib/openjdk/sample - ${lib.optionalString headless '' - rm $out/lib/openjdk/jre/lib/${architecture}/{libjsound,libjsoundalsa,libsplashscreen,libawt*,libfontmanager}.so - rm $out/lib/openjdk/jre/bin/policytool - rm $out/lib/openjdk/bin/{policytool,appletviewer} - ''} - - # Move the JRE to a separate output - mkdir -p $jre/lib/openjdk - mv $out/lib/openjdk/jre $jre/lib/openjdk/jre - mkdir $out/lib/openjdk/jre - lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre - - # Make sure cmm/*.pf are not symlinks: - # https://youtrack.jetbrains.com/issue/IDEA-147272 - rm -rf $out/lib/openjdk/jre/lib/cmm - ln -s {$jre,$out}/lib/openjdk/jre/lib/cmm - - # Setup fallback fonts - ${lib.optionalString (!headless) '' - mkdir -p $jre/lib/openjdk/jre/lib/fonts - ln -s ${liberation_ttf}/share/fonts/truetype $jre/lib/openjdk/jre/lib/fonts/fallback - ''} - - # Remove duplicate binaries. - for i in $(cd $out/lib/openjdk/bin && echo *); do - if [ "$i" = java ]; then continue; fi - if cmp -s $out/lib/openjdk/bin/$i $jre/lib/openjdk/jre/bin/$i; then - ln -sfn $jre/lib/openjdk/jre/bin/$i $out/lib/openjdk/bin/$i - fi - done - - # Generate certificates. - ( - cd $jre/lib/openjdk/jre/lib/security - rm cacerts - perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/etc/ssl/certs/ca-bundle.crt - ) - - ln -s $out/lib/openjdk/bin $out/bin - ln -s $jre/lib/openjdk/jre/bin $jre/bin - ln -s $jre/lib/openjdk/jre $out/jre - ''; - - propagatedBuildInputs = [ setJavaClassPath ]; - - preFixup = '' - # Propagate the setJavaClassPath setup hook from the JRE so that - # any package that depends on the JRE has $CLASSPATH set up - # properly. - mkdir -p $jre/nix-support - printWords ${setJavaClassPath} > $jre/nix-support/propagated-build-inputs - - # Set JAVA_HOME automatically. - mkdir -p $out/nix-support - cat <<EOF > $out/nix-support/setup-hook - if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi - EOF - ''; - - postFixup = '' - # Build the set of output library directories to rpath against - LIBDIRS="" - for output in $(getAllOutputNames); do - if [ "$output" = debug ]; then continue; fi - LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS" - done - # Add the local library paths to remove dependencies on the bootstrap - for output in $(getAllOutputNames); do - if [ "$output" = debug ]; then continue; fi - OUTPUTDIR=$(eval echo \$$output) - BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) - echo "$BINLIBS" | while read i; do - patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true - patchelf --shrink-rpath "$i" || true - done - done - ''; - - disallowedReferences = [ openjdk8-bootstrap ]; - - meta = with lib; { - homepage = "http://openjdk.java.net/"; - license = licenses.gpl2; - description = "Open-source Java Development Kit"; - maintainers = with maintainers; [ edwtjo ]; - platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; - mainProgram = "java"; - # Broken for musl at 2024-01-17. Tracking issue: - # https://github.com/NixOS/nixpkgs/issues/281618 - # error: ‘isnanf’ was not declared in this scope - broken = stdenv.hostPlatform.isMusl; - }; - - passthru = { - inherit architecture; - home = "${openjdk8}/lib/openjdk"; - inherit gtk2; - }; - }; -in openjdk8 diff --git a/pkgs/development/compilers/openjdk/generate-cacerts.pl b/pkgs/development/compilers/openjdk/8/generate-cacerts.pl index 3bdd42f7274f..3bdd42f7274f 100644 --- a/pkgs/development/compilers/openjdk/generate-cacerts.pl +++ b/pkgs/development/compilers/openjdk/8/generate-cacerts.pl diff --git a/pkgs/development/compilers/openjdk/currency-date-range-jdk8.patch b/pkgs/development/compilers/openjdk/8/patches/currency-date-range-jdk8.patch index 2ff0fcc3d411..2ff0fcc3d411 100644 --- a/pkgs/development/compilers/openjdk/currency-date-range-jdk8.patch +++ b/pkgs/development/compilers/openjdk/8/patches/currency-date-range-jdk8.patch diff --git a/pkgs/development/compilers/openjdk/fix-java-home-jdk8.patch b/pkgs/development/compilers/openjdk/8/patches/fix-java-home-jdk8.patch index 6189412c999c..6189412c999c 100644 --- a/pkgs/development/compilers/openjdk/fix-java-home-jdk8.patch +++ b/pkgs/development/compilers/openjdk/8/patches/fix-java-home-jdk8.patch diff --git a/pkgs/development/compilers/openjdk/fix-library-path-jdk8.patch b/pkgs/development/compilers/openjdk/8/patches/fix-library-path-jdk8.patch index 3780e95ea5b6..3780e95ea5b6 100644 --- a/pkgs/development/compilers/openjdk/fix-library-path-jdk8.patch +++ b/pkgs/development/compilers/openjdk/8/patches/fix-library-path-jdk8.patch diff --git a/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk8.patch b/pkgs/development/compilers/openjdk/8/patches/read-truststore-from-env-jdk8.patch index 08cf554a18fe..08cf554a18fe 100644 --- a/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk8.patch +++ b/pkgs/development/compilers/openjdk/8/patches/read-truststore-from-env-jdk8.patch diff --git a/pkgs/development/compilers/openjdk/swing-use-gtk-jdk8.patch b/pkgs/development/compilers/openjdk/8/patches/swing-use-gtk-jdk8.patch index 9538aade6726..9538aade6726 100644 --- a/pkgs/development/compilers/openjdk/swing-use-gtk-jdk8.patch +++ b/pkgs/development/compilers/openjdk/8/patches/swing-use-gtk-jdk8.patch diff --git a/pkgs/development/compilers/openjdk/8/source.json b/pkgs/development/compilers/openjdk/8/source.json new file mode 100644 index 000000000000..6cedef5ccb7b --- /dev/null +++ b/pkgs/development/compilers/openjdk/8/source.json @@ -0,0 +1,6 @@ +{ + "hash": "sha256-48DyJXD7D28LFa+4ONeMgSddqrCLn6FLwEGWGeP4upM=", + "owner": "openjdk", + "repo": "jdk8u", + "rev": "refs/tags/jdk8u432-b06" +} diff --git a/pkgs/development/compilers/openjdk/JavaUpdater.java b/pkgs/development/compilers/openjdk/JavaUpdater.java deleted file mode 100644 index 32dddf2fabc7..000000000000 --- a/pkgs/development/compilers/openjdk/JavaUpdater.java +++ /dev/null @@ -1,181 +0,0 @@ -import org.json.JSONArray; -import org.json.JSONObject; - -import java.io.IOException; -import java.io.PrintWriter; -import java.net.URI; -import java.net.http.*; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.*; -import java.util.regex.Pattern; -import java.util.stream.Collectors; -import java.util.stream.Stream; -import java.util.stream.StreamSupport; - -public class JavaUpdater { - - record GitHubResult(Optional<String> latestVersion, Optional<String> next) { - } - - record JsonInfo(String repo, String version, String hash) { - public JsonInfo(JSONObject json) { - this(json.getString("repo"), json.getString("version"), json.getString("hash")); - } - - public String toJsonString(String featureVersion) { - return """ - \s "%s": { - \s "version": "%s", - \s "repo": "%s", - \s "hash": "%s" - \s }\ - """.formatted(featureVersion, version, repo, hash); - } - } - - // Parses the GitHub Link header - public static Optional<String> getNextLink(HttpHeaders headers) { - var linkHeader = headers.map().get("Link"); - if (linkHeader == null || linkHeader.isEmpty()) return null; - - var links = linkHeader.getFirst(); - var linksRegex = Pattern.compile("<(.+)>;\\s*rel=\"next\""); - return Pattern.compile(",") - .splitAsStream(links) - .map(x -> linksRegex.matcher(x).results() - .map(g -> g.group(1)) - .findFirst() - ) - .filter(Optional::isPresent) - .map(Optional::orElseThrow) - .findFirst(); - } - - // HTTP request helper, sets GITHUB_TOKEN if present - private static HttpRequest NewGithubRequest(String url) { - var token = System.getenv().get("GITHUB_TOKEN"); - var builder = HttpRequest.newBuilder() - .uri(URI.create(url)); - if (token != null) - builder.setHeader("Authorization", "Bearer " + token); - return builder.build(); - } - - private static GitHubResult getLatestTag(String url) { - var request = NewGithubRequest(url); - - var response = - HttpClient.newHttpClient().sendAsync(request, HttpResponse.BodyHandlers.ofString()) - .join(); - - var json = new JSONArray(response.body()); - - Optional<String> version = StreamSupport.stream(json.spliterator(), false) - .map(JSONObject.class::cast) - .map(x -> x.getString("name").replaceFirst("jdk-", "")) - .filter(x -> x.contains("-ga")) - .max(Comparator.comparing(Runtime.Version::parse)); - - return new GitHubResult(version, getNextLink(response.headers())); - } - - public String findNewerVersion() { - var url = Optional.of("https://api.github.com/repos/openjdk/" + getRepo() + "/tags?per_page=100"); - String version = getCurrentVersion(); - do { - GitHubResult response = getLatestTag(url.orElseThrow()); - if (response.latestVersion.isPresent() && response.latestVersion.orElseThrow().equals(version)) { - return null; - } - - String latestVersion = Stream.of(version, response.latestVersion.orElse(version)) - .max(Comparator.comparing(Runtime.Version::parse)).orElseThrow(); - - if (latestVersion != version) - return latestVersion; - - url = response.next; - } while (url.isPresent()); - return null; - } - - - private static String prettyPrint(JSONObject json) { - - Iterable<String> iterable = () -> json.keys(); - - return StreamSupport - .stream(iterable.spliterator(), false) - .sorted(Comparator.reverseOrder()) - .map(majorVersion -> (new JsonInfo(json.getJSONObject(majorVersion))).toJsonString(majorVersion)) - .collect( - Collectors.joining(",\n", "{\n", "\n}") - ); - } - - public void updateJsonInfo(String newVersion) { - try { - JSONObject json = getJsonInfo(); - var info = json.getJSONObject(featureNumber); - info.put("version", newVersion); - info.put("hash", nixHash(newVersion)); - - try (PrintWriter out = new PrintWriter(infoJsonPath)) { - out.println(prettyPrint(json)); - } - - } catch (Exception e) { - throw new RuntimeException(e); - } - } - - private String nixHash(String version) { - try { - var process = new ProcessBuilder("nix", "flake", "prefetch", - "--extra-experimental-features", "'nix-command flakes'", - "--json", "github:openjdk/" + getRepo() + "/jdk-" + version).start(); - - var json = new JSONObject(new String(process.getInputStream().readAllBytes())); - process.waitFor(); - return json.getString("hash"); - } catch (Exception e) { - throw new RuntimeException(e); - } - } - - private final String featureNumber; - private final String infoJsonPath; - private final JSONObject jsonInfo; - - public String getCurrentVersion() { - return this.jsonInfo.getJSONObject(this.featureNumber).getString("version"); - } - - public String getRepo() { - return this.jsonInfo.getJSONObject(this.featureNumber).getString("repo"); - } - - public JSONObject getJsonInfo() { - try { - String infoStr = Files.readString(Path.of(this.infoJsonPath)); - return new JSONObject(infoStr); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - - public JavaUpdater(String featureNumber, String infoJsonPath) { - this.featureNumber = featureNumber; - this.infoJsonPath = infoJsonPath; - this.jsonInfo = getJsonInfo(); - } - - public static void main(String[] args) { - var updater = new JavaUpdater(args[0], args[1]); - String newerVersion = updater.findNewerVersion(); - if (newerVersion != null) { - updater.updateJsonInfo(newerVersion); - } - } -} diff --git a/pkgs/development/compilers/openjdk/bootstrap.nix b/pkgs/development/compilers/openjdk/bootstrap.nix deleted file mode 100644 index e58888cc9ed8..000000000000 --- a/pkgs/development/compilers/openjdk/bootstrap.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv -, runCommand, fetchurl, zlib - -, version -}: - -assert stdenv.hostPlatform.libc == "glibc"; - -let - fetchboot = version: arch: sha256: fetchurl { - name = "openjdk${version}-bootstrap-${arch}-linux.tar.xz"; - url = "http://tarballs.nixos.org/openjdk/2018-03-31/${version}/${arch}-linux.tar.xz"; - inherit sha256; - }; - - src = if stdenv.hostPlatform.system == "x86_64-linux" then - (if version == "10" then fetchboot "10" "x86_64" "08085fsxc1qhqiv3yi38w8lrg3vm7s0m2yvnwr1c92v019806yq2" - else if version == "8" then fetchboot "8" "x86_64" "18zqx6jhm3lizn9hh6ryyqc9dz3i96pwaz8f6nxfllk70qi5gvks" - else throw "No bootstrap jdk for version ${version}") - else if stdenv.hostPlatform.system == "i686-linux" then - (if version == "10" then fetchboot "10" "i686" "1blb9gyzp8gfyggxvggqgpcgfcyi00ndnnskipwgdm031qva94p7" - else if version == "8" then fetchboot "8" "i686" "1yx04xh8bqz7amg12d13rw5vwa008rav59mxjw1b9s6ynkvfgqq9" - else throw "No bootstrap for version") - else throw "No bootstrap jdk for system ${stdenv.hostPlatform.system}"; - - bootstrap = runCommand "openjdk-bootstrap" { - passthru.home = "${bootstrap}/lib/openjdk"; - } '' - tar xvf ${src} - mv openjdk-bootstrap $out - - LIBDIRS="$(find $out -name \*.so\* -exec dirname {} \; | sort | uniq | tr '\n' ':')" - - find "$out" -type f -print0 | while IFS= read -r -d "" elf; do - isELF "$elf" || continue - patchelf --set-interpreter $(cat "${stdenv.cc}/nix-support/dynamic-linker") "$elf" || true - patchelf --set-rpath "${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib:${zlib}/lib:$LIBDIRS" "$elf" || true - done - ''; -in bootstrap diff --git a/pkgs/development/compilers/openjdk/fix-glibc-2.34.patch b/pkgs/development/compilers/openjdk/fix-glibc-2.34.patch deleted file mode 100644 index 7bf8b2b16744..000000000000 --- a/pkgs/development/compilers/openjdk/fix-glibc-2.34.patch +++ /dev/null @@ -1,24 +0,0 @@ -Taken from https://build.opensuse.org/package/view_file/Java:Factory/java-15-openjdk/openjdk-glibc234.patch - ---- openjdk/test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c 2021-04-09 11:36:58.000000000 +0200 -+++ openjdk/test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c 2021-08-26 15:42:52.326232581 +0200 -@@ -67,8 +67,17 @@ - longjmp(context, 1); - } - -+static char* altstack = NULL; -+ - void set_signal_handler() { -- static char altstack[SIGSTKSZ]; -+ if (altstack == NULL) { -+ // Dynamically allocated in case SIGSTKSZ is not constant -+ altstack = malloc(SIGSTKSZ); -+ if (altstack == NULL) { -+ fprintf(stderr, "Test ERROR. Unable to malloc altstack space\n"); -+ exit(7); -+ } -+ } - - stack_t ss = { - .ss_size = SIGSTKSZ, - diff --git a/pkgs/development/compilers/openjdk/generic.nix b/pkgs/development/compilers/openjdk/generic.nix new file mode 100644 index 000000000000..b18e9679c107 --- /dev/null +++ b/pkgs/development/compilers/openjdk/generic.nix @@ -0,0 +1,668 @@ +{ + featureVersion, + + lib, + stdenv, + + fetchurl, + fetchpatch, + + buildPackages, + pkg-config, + autoconf, + lndir, + unzip, + ensureNewerSourcesForZipFilesHook, + + cpio, + file, + which, + zip, + perl, + zlib, + cups, + freetype, + harfbuzz, + alsa-lib, + libjpeg, + giflib, + libpng, + lcms2, + libX11, + libICE, + libXext, + libXrender, + libXtst, + libXt, + libXi, + libXinerama, + libXcursor, + libXrandr, + fontconfig, + + setJavaClassPath, + + versionCheckHook, + + bash, + liberation_ttf, + cacert, + + nixpkgs-openjdk-updater, + + # TODO(@sternenseemann): gtk3 fails to evaluate in pkgsCross.ghcjs.buildPackages + # which should be fixable, this is a no-rebuild workaround for GHC. + headless ? lib.versionAtLeast featureVersion "21" && stdenv.targetPlatform.isGhcjs, + + enableJavaFX ? false, + openjfx17, + openjfx21, + openjfx23, + openjfx_jdk ? + { + "17" = openjfx17; + "21" = openjfx21; + "23" = openjfx23; + } + .${featureVersion} or (throw "JavaFX is not supported on OpenJDK ${featureVersion}"), + + enableGtk ? true, + gtk3, + gtk2, + glib, + + temurin-bin-8, + temurin-bin-11, + temurin-bin-17, + temurin-bin-21, + temurin-bin-23, + jdk-bootstrap ? + { + "8" = temurin-bin-8.__spliced.buildBuild or temurin-bin-8; + "11" = temurin-bin-11.__spliced.buildBuild or temurin-bin-11; + "17" = temurin-bin-17.__spliced.buildBuild or temurin-bin-17; + "21" = temurin-bin-21.__spliced.buildBuild or temurin-bin-21; + "23" = temurin-bin-23.__spliced.buildBuild or temurin-bin-23; + } + .${featureVersion}, +}: + +let + sourceFile = ./. + "/${featureVersion}/source.json"; + source = nixpkgs-openjdk-updater.openjdkSource { + inherit sourceFile; + featureVersionPrefix = tagPrefix + featureVersion; + }; + + atLeast11 = lib.versionAtLeast featureVersion "11"; + atLeast17 = lib.versionAtLeast featureVersion "17"; + atLeast21 = lib.versionAtLeast featureVersion "21"; + atLeast23 = lib.versionAtLeast featureVersion "23"; + + tagPrefix = if atLeast11 then "jdk-" else "jdk"; + version = lib.removePrefix "refs/tags/${tagPrefix}" source.src.rev; + versionSplit = builtins.match (if atLeast11 then "(.+)+(.+)" else "(.+)-b(.+)") version; + versionBuild = lib.elemAt versionSplit 1; + + # The JRE 8 libraries are in directories that depend on the CPU. + architecture = + if atLeast11 then + "" + else + { + i686-linux = "i386"; + x86_64-linux = "amd64"; + aarch64-linux = "aarch64"; + powerpc64le-linux = "ppc64le"; + } + .${stdenv.system} or (throw "Unsupported platform ${stdenv.system}"); + + jdk-bootstrap' = jdk-bootstrap.override { + # when building a headless jdk, also bootstrap it with a headless jdk + gtkSupport = !headless; + }; +in + +assert lib.assertMsg (lib.pathExists sourceFile) + "OpenJDK ${featureVersion} is not a supported version"; + +stdenv.mkDerivation (finalAttrs: { + pname = "openjdk" + lib.optionalString headless "-headless"; + inherit version; + + outputs = + [ + "out" + ] + ++ lib.optionals (!atLeast11) [ + "jre" + ]; + + inherit (source) src; + + patches = + [ + ( + if atLeast21 then + ./21/patches/fix-java-home-jdk21.patch + else if atLeast11 then + ./11/patches/fix-java-home-jdk10.patch + else + ./8/patches/fix-java-home-jdk8.patch + ) + ( + if atLeast11 then + ./11/patches/read-truststore-from-env-jdk10.patch + else + ./8/patches/read-truststore-from-env-jdk8.patch + ) + ] + ++ lib.optionals (!atLeast23) [ + ( + if atLeast11 then + ./11/patches/currency-date-range-jdk10.patch + else + ./8/patches/currency-date-range-jdk8.patch + ) + ] + ++ lib.optionals atLeast11 [ + ( + if atLeast17 then + ./17/patches/increase-javadoc-heap-jdk13.patch + else + ./11/patches/increase-javadoc-heap.patch + ) + ] + ++ lib.optionals atLeast17 [ + ( + if atLeast21 then + ./21/patches/ignore-LegalNoticeFilePlugin-jdk18.patch + else + ./17/patches/ignore-LegalNoticeFilePlugin-jdk17.patch + ) + ] + ++ lib.optionals (!atLeast21) [ + ( + if atLeast17 then + ./17/patches/fix-library-path-jdk17.patch + else if atLeast11 then + ./11/patches/fix-library-path-jdk11.patch + else + ./8/patches/fix-library-path-jdk8.patch + ) + ] + ++ lib.optionals (atLeast17 && !atLeast23) [ + # -Wformat etc. are stricter in newer gccs, per + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677 + # so grab the work-around from + # https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24 + (fetchurl { + url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch"; + sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r"; + }) + ] + ++ lib.optionals (featureVersion == "17") [ + # Patch borrowed from Alpine to fix build errors with musl libc and recent gcc. + # This is applied anywhere to prevent patchrot. + (fetchurl { + url = "https://git.alpinelinux.org/aports/plain/community/openjdk17/FixNullPtrCast.patch?id=41e78a067953e0b13d062d632bae6c4f8028d91c"; + sha256 = "sha256-LzmSew51+DyqqGyyMw2fbXeBluCiCYsS1nCjt9hX6zo="; + }) + ] + ++ lib.optionals atLeast11 [ + # Fix build for gnumake-4.4.1: + # https://github.com/openjdk/jdk/pull/12992 + (fetchpatch { + name = "gnumake-4.4.1"; + url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch"; + hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg="; + }) + ] + ++ lib.optionals (!headless && enableGtk) [ + ( + if atLeast17 then + ./17/patches/swing-use-gtk-jdk13.patch + else if atLeast11 then + ./11/patches/swing-use-gtk-jdk10.patch + else + ./8/patches/swing-use-gtk-jdk8.patch + ) + ]; + + strictDeps = true; + + depsBuildBuild = [ buildPackages.stdenv.cc ]; + + nativeBuildInputs = + [ + pkg-config + ] + ++ lib.optionals atLeast11 [ + autoconf + ] + ++ lib.optionals (!atLeast11) [ + lndir + # Certificates generated using perl in `installPhase` + perl + ] + ++ [ + unzip + zip + which + # Probably for BUILD_CC but not sure, not in closure. + zlib + ] + ++ lib.optionals atLeast21 [ + ensureNewerSourcesForZipFilesHook + ]; + + buildInputs = + [ + # TODO: Many of these should likely be in `nativeBuildInputs`. + cpio + # `-lmagic` in NIX_LDFLAGS + file + cups + freetype + ] + ++ lib.optionals (atLeast11 && !atLeast21) [ + harfbuzz + ] + ++ [ + alsa-lib + libjpeg + giflib + ] + ++ lib.optionals atLeast11 [ + libpng + zlib # duplicate + lcms2 + ] + ++ [ + libX11 + libICE + ] + ++ lib.optionals (!atLeast11) [ + libXext + ] + ++ [ + libXrender + ] + ++ lib.optionals atLeast11 [ + libXext + ] + ++ [ + libXtst + libXt + libXtst # duplicate + libXi + libXinerama + libXcursor + libXrandr + fontconfig + ] + ++ lib.optionals (!headless && enableGtk) [ + (if atLeast11 then gtk3 else gtk2) + glib + ]; + + propagatedBuildInputs = lib.optionals (!atLeast11) [ setJavaClassPath ]; + + nativeInstallCheckInputs = lib.optionals atLeast23 [ + versionCheckHook + ]; + + # JDK's build system attempts to specifically detect + # and special-case WSL, and we don't want it to do that, + # so pass the correct platform names explicitly + ${if atLeast17 then "configurePlatforms" else null} = [ + "build" + "host" + ]; + + # https://openjdk.org/groups/build/doc/building.html + configureFlags = + [ + "--with-boot-jdk=${jdk-bootstrap'.home}" + # https://github.com/openjdk/jdk/blob/471f112bca715d04304cbe35c6ed63df8c7b7fee/make/autoconf/util_paths.m4#L315 + # Ignoring value of READELF from the environment. Use command line variables instead. + "READELF=${stdenv.cc.targetPrefix}readelf" + "AR=${stdenv.cc.targetPrefix}ar" + "STRIP=${stdenv.cc.targetPrefix}strip" + "NM=${stdenv.cc.targetPrefix}nm" + "OBJDUMP=${stdenv.cc.targetPrefix}objdump" + "OBJCOPY=${stdenv.cc.targetPrefix}objcopy" + ] + ++ ( + if atLeast23 then + [ + "--with-version-string=${version}" + "--with-vendor-version-string=(nix)" + ] + else if atLeast11 then + lib.optionals atLeast17 [ + "--with-version-build=${versionBuild}" + "--with-version-opt=nixos" + ] + ++ [ + "--with-version-pre=" + ] + else + [ + "--with-update-version=${lib.removePrefix "${featureVersion}u" (lib.elemAt versionSplit 0)}" + "--with-build-number=${versionBuild}" + "--with-milestone=fcs" + ] + ) + ++ [ + "--enable-unlimited-crypto" + "--with-native-debug-symbols=internal" + ] + ++ lib.optionals (!atLeast21) ( + if atLeast11 then + [ + "--with-freetype=system" + "--with-harfbuzz=system" + ] + else + [ + "--disable-freetype-bundling" + ] + ) + ++ ( + if atLeast11 then + [ + "--with-libjpeg=system" + "--with-giflib=system" + "--with-libpng=system" + "--with-zlib=system" + "--with-lcms=system" + ] + else + [ + "--with-zlib=system" + "--with-giflib=system" + ] + ) + ++ [ + "--with-stdc++lib=dynamic" + ] + ++ lib.optionals (featureVersion == "11") [ + "--disable-warnings-as-errors" + ] + # OpenJDK 11 cannot be built by recent versions of Clang, as far as I can tell (see + # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=260319). Known to + # compile with LLVM 12. + ++ lib.optionals (atLeast11 && stdenv.cc.isClang) [ + "--with-toolchain-type=clang" + # Explicitly tell Clang to compile C++ files as C++, see + # https://github.com/NixOS/nixpkgs/issues/150655#issuecomment-1935304859 + "--with-extra-cxxflags=-xc++" + ] + # This probably shouldn’t apply to OpenJDK 21; see + # b7e68243306833845cbf92e2ea1e0cf782481a51 which removed it for + # versions 15 through 20. + ++ lib.optional ( + (featureVersion == "11" || featureVersion == "21") && stdenv.hostPlatform.isx86_64 + ) "--with-jvm-features=zgc" + ++ lib.optional headless (if atLeast11 then "--enable-headless-only" else "--disable-headful") + ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx_jdk}"; + + buildFlags = if atLeast17 then [ "images" ] else [ "all" ]; + + separateDebugInfo = true; + + # -j flag is explicitly rejected by the build system: + # Error: 'make -jN' is not supported, use 'make JOBS=N' + # Note: it does not make build sequential. Build system + # still runs in parallel. + enableParallelBuilding = false; + + env = + { + NIX_CFLAGS_COMPILE = + if atLeast17 then + "-Wno-error" + else if atLeast11 then + # Workaround for + # `cc1plus: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security]` + # when building jtreg + "-Wformat" + else + lib.concatStringsSep " " ( + [ + # glibc 2.24 deprecated readdir_r so we need this + # See https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg49006.html + "-Wno-error=deprecated-declarations" + ] + ++ lib.optionals stdenv.cc.isGNU [ + # https://bugzilla.redhat.com/show_bug.cgi?id=1306558 + # https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716 + "-fno-lifetime-dse" + "-fno-delete-null-pointer-checks" + "-std=gnu++98" + "-Wno-error" + ] + ); + + NIX_LDFLAGS = lib.concatStringsSep " " ( + lib.optionals (!headless) [ + "-lfontconfig" + "-lcups" + "-lXinerama" + "-lXrandr" + "-lmagic" + ] + ++ lib.optionals (!headless && enableGtk) [ + (if atLeast11 then "-lgtk-3" else "-lgtk-x11-2.0") + "-lgio-2.0" + ] + ); + } + // lib.optionalAttrs (!atLeast11) { + # OpenJDK 8 Hotspot cares about the host(!) version otherwise + DISABLE_HOTSPOT_OS_VERSION_CHECK = "ok"; + }; + + ${if atLeast23 then "versionCheckProgram" else null} = "${placeholder "out"}/bin/java"; + + ${if !atLeast11 then "doCheck" else null} = false; # fails with "No rule to make target 'y'." + + doInstallCheck = atLeast23; + + ${if atLeast17 then "postPatch" else null} = '' + chmod +x configure + patchShebangs --build configure + ''; + + ${if !atLeast17 then "preConfigure" else null} = + '' + chmod +x configure + substituteInPlace configure --replace /bin/bash "${bash}/bin/bash" + '' + + lib.optionalString (!atLeast11) '' + substituteInPlace hotspot/make/linux/adlc_updater --replace /bin/sh "${stdenv.shell}" + substituteInPlace hotspot/make/linux/makefiles/dtrace.make --replace /usr/include/sys/sdt.h "/no-such-path" + ''; + + installPhase = + '' + mkdir -p $out/lib + + mv build/*/images/${if atLeast11 then "jdk" else "j2sdk-image"} $out/lib/openjdk + + # Remove some broken manpages. + rm -rf $out/lib/openjdk/man/ja* + + # Mirror some stuff in top-level. + mkdir -p $out/share + ln -s $out/lib/openjdk/include $out/include + ln -s $out/lib/openjdk/man $out/share/man + '' + + lib.optionalString atLeast17 '' + + # IDEs use the provided src.zip to navigate the Java codebase (https://github.com/NixOS/nixpkgs/pull/95081) + '' + + lib.optionalString atLeast11 '' + ln -s $out/lib/openjdk/lib/src.zip $out/lib/src.zip + '' + + '' + + # jni.h expects jni_md.h to be in the header search path. + ln -s $out/include/linux/*_md.h $out/include/ + + # Remove crap from the installation. + rm -rf $out/lib/openjdk/demo${lib.optionalString (!atLeast11) " $out/lib/openjdk/sample"} + ${lib.optionalString headless ( + if atLeast11 then + '' + rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so + '' + else + '' + rm $out/lib/openjdk/jre/lib/${architecture}/{libjsound,libjsoundalsa,libsplashscreen,libawt*,libfontmanager}.so + rm $out/lib/openjdk/jre/bin/policytool + rm $out/lib/openjdk/bin/{policytool,appletviewer} + '' + )} + '' + + lib.optionalString (!atLeast11) '' + + # Move the JRE to a separate output + mkdir -p $jre/lib/openjdk + mv $out/lib/openjdk/jre $jre/lib/openjdk/jre + mkdir $out/lib/openjdk/jre + lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre + + # Make sure cmm/*.pf are not symlinks: + # https://youtrack.jetbrains.com/issue/IDEA-147272 + rm -rf $out/lib/openjdk/jre/lib/cmm + ln -s {$jre,$out}/lib/openjdk/jre/lib/cmm + + # Setup fallback fonts + ${lib.optionalString (!headless) '' + mkdir -p $jre/lib/openjdk/jre/lib/fonts + ln -s ${liberation_ttf}/share/fonts/truetype $jre/lib/openjdk/jre/lib/fonts/fallback + ''} + + # Remove duplicate binaries. + for i in $(cd $out/lib/openjdk/bin && echo *); do + if [ "$i" = java ]; then continue; fi + if cmp -s $out/lib/openjdk/bin/$i $jre/lib/openjdk/jre/bin/$i; then + ln -sfn $jre/lib/openjdk/jre/bin/$i $out/lib/openjdk/bin/$i + fi + done + + # Generate certificates. + ( + cd $jre/lib/openjdk/jre/lib/security + rm cacerts + perl ${./8/generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/etc/ssl/certs/ca-bundle.crt + ) + '' + + '' + + ln -s $out/lib/openjdk/bin $out/bin + '' + + lib.optionalString (!atLeast11) '' + ln -s $jre/lib/openjdk/jre/bin $jre/bin + ln -s $jre/lib/openjdk/jre $out/jre + ''; + + preFixup = + ( + if atLeast11 then + '' + # Propagate the setJavaClassPath setup hook so that any package + # that depends on the JDK has $CLASSPATH set up properly. + mkdir -p $out/nix-support + #TODO or printWords? cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040 + echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs + '' + else + '' + # Propagate the setJavaClassPath setup hook from the JRE so that + # any package that depends on the JRE has $CLASSPATH set up + # properly. + mkdir -p $jre/nix-support + printWords ${setJavaClassPath} > $jre/nix-support/propagated-build-inputs + '' + ) + + '' + + # Set JAVA_HOME automatically. + mkdir -p $out/nix-support + cat <<EOF > $out/nix-support/setup-hook + if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi + EOF + ''; + + postFixup = '' + # Build the set of output library directories to rpath against + LIBDIRS="" + for output in $(getAllOutputNames); do + if [ "$output" = debug ]; then continue; fi + LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | ${ + if atLeast17 then "sort -u" else "sort | uniq" + } | tr '\n' ':'):$LIBDIRS" + done + # Add the local library paths to remove dependencies on the bootstrap + for output in $(getAllOutputNames); do + if [ "$output" = debug ]; then continue; fi + OUTPUTDIR=$(eval echo \$$output) + BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) + echo "$BINLIBS" | while read i; do + patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true + patchelf --shrink-rpath "$i" || true + done + done + ''; + + # TODO: The OpenJDK 8 derivation got this wrong. + disallowedReferences = [ + (if atLeast11 then jdk-bootstrap' else jdk-bootstrap) + ]; + + passthru = + { + home = "${finalAttrs.finalPackage}/lib/openjdk"; + inherit jdk-bootstrap; + inherit (source) updateScript; + } + // (if atLeast11 then { inherit gtk3; } else { inherit gtk2; }) + // lib.optionalAttrs (!atLeast23) { + inherit architecture; + }; + + meta = { + description = "Open-source Java Development Kit"; + homepage = "https://openjdk.java.net/"; + license = lib.licenses.gpl2Only; + maintainers = + with lib.maintainers; + [ + edwtjo + infinidoge + ] + ++ lib.teams.java.members; + mainProgram = "java"; + platforms = + [ + "i686-linux" + "x86_64-linux" + "aarch64-linux" + ] + ++ lib.optionals atLeast11 [ + "armv7l-linux" + "armv6l-linux" + "powerpc64le-linux" + ] + ++ lib.optionals atLeast17 [ + "riscv64-linux" + ]; + # OpenJDK 8 was broken for musl at 2024-01-17. Tracking issue: + # https://github.com/NixOS/nixpkgs/issues/281618 + # error: ‘isnanf’ was not declared in this scope + broken = !atLeast11 && stdenv.hostPlatform.isMusl; + }; +}) diff --git a/pkgs/development/compilers/openjdk/info.json b/pkgs/development/compilers/openjdk/info.json deleted file mode 100644 index d55f95f799ae..000000000000 --- a/pkgs/development/compilers/openjdk/info.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "22": { - "version": "22.0.2-ga", - "repo": "jdk22u", - "hash": "sha256-Zo1LOumkt9zTaPqbDcRL8lVJMqVle0QqzThtIz0JRNo=" - }, - "21": { - "version": "21.0.3-ga", - "repo": "jdk21u", - "hash": "sha256-zRN16lrc5gtDlTVIQJRRx103w/VbRkatCLeEc9AXWPE=" - } -} diff --git a/pkgs/development/compilers/openjdk/make-bootstrap.nix b/pkgs/development/compilers/openjdk/make-bootstrap.nix deleted file mode 100644 index aac54417e2a8..000000000000 --- a/pkgs/development/compilers/openjdk/make-bootstrap.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ runCommand, openjdk, nukeReferences }: - -runCommand "${openjdk.name}-bootstrap.tar.xz" {} '' - mkdir -pv openjdk-bootstrap/lib - - # Do a deep copy of the openjdk - cp -vrL ${openjdk.home} openjdk-bootstrap/lib - - # Includes are needed for building the native jvm - cp -vrL ${openjdk}/include openjdk-bootstrap - - # The binaries are actually stored in the openjdk lib - ln -sv lib/openjdk/bin openjdk-bootstrap/bin - find . -name libjli.so - (cd openjdk-bootstrap/lib; find . -name libjli.so -exec ln -sfv {} libjli.so \;) - - chmod -R +w openjdk-bootstrap - - # Remove components we don't need - find openjdk-bootstrap -name \*.diz -exec rm {} \; - find openjdk-bootstrap -name \*.ttf -exec rm {} \; - find openjdk-bootstrap -name \*.gif -exec rm {} \; - find openjdk-bootstrap -name src.zip -exec rm {} \; - rm -rf openjdk-bootstrap/lib/openjdk/jre/bin - - # Remove all of the references to the native nix store - find openjdk-bootstrap -print0 | xargs -0 ${nukeReferences}/bin/nuke-refs - - # Create the output tarball - tar cv openjdk-bootstrap | xz > $out -'' diff --git a/pkgs/development/compilers/openjdk/meta.nix b/pkgs/development/compilers/openjdk/meta.nix deleted file mode 100644 index 04ed684eefab..000000000000 --- a/pkgs/development/compilers/openjdk/meta.nix +++ /dev/null @@ -1,11 +0,0 @@ -lib: version: with lib; { - homepage = "https://openjdk.java.net/"; - license = licenses.gpl2Only; - description = "Open-source Java Development Kit"; - maintainers = with maintainers; [ edwtjo infinidoge ]; - platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" "powerpc64le-linux" ]; - mainProgram = "java"; - knownVulnerabilities = optionals (builtins.elem (versions.major version) [ "12" "13" "14" "15" "16" "18" "19" "20" ]) [ - "This OpenJDK version has reached its end of life." - ]; -} diff --git a/pkgs/development/compilers/openjdk/openjfx/11/default.nix b/pkgs/development/compilers/openjdk/openjfx/11/default.nix deleted file mode 100644 index dcce1a2de6fc..000000000000 --- a/pkgs/development/compilers/openjdk/openjfx/11/default.nix +++ /dev/null @@ -1,103 +0,0 @@ -{ stdenv, lib, pkgs, fetchFromGitHub, writeText, gradle_7, pkg-config, perl, cmake -, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg_7-headless, python3, ruby -, openjdk11-bootstrap -, withMedia ? true -, withWebKit ? false -}: - -let - pname = "openjfx-modular-sdk"; - major = "11"; - update = ".0.20"; - build = "1"; - repover = "${major}${update}+${build}"; - jdk = openjdk11-bootstrap; - gradle = gradle_7; - -in stdenv.mkDerivation { - inherit pname; - version = "${major}${update}-${build}"; - - src = fetchFromGitHub { - owner = "openjdk"; - repo = "jfx${major}u"; - rev = repover; - sha256 = "sha256-BbBP2DiPZTSn1SBYMCgyiNdF9GD+NqR6YjeVNOQHHn4="; - }; - - patches = [ - ../backport-ffmpeg-6-support-jfx11.patch - ../backport-ffmpeg-7-support-jfx11.patch - ]; - - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_7-headless ]; - nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ]; - - dontUseCmakeConfigure = true; - - config = writeText "gradle.properties" '' - CONF = Release - JDK_HOME = ${jdk.home} - COMPILE_MEDIA = ${lib.boolToString withMedia} - COMPILE_WEBKIT = ${lib.boolToString withWebKit} - ''; - - postPatch = '' - substituteInPlace buildSrc/linux.gradle \ - --replace ', "-Werror=implicit-function-declaration"' "" - - # Add missing includes for gcc-13 for webkit build: - sed -e '1i #include <cstdio>' \ - -i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \ - modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h - - ln -s $config gradle.properties - ''; - - mitmCache = gradle.fetchDeps { - attrPath = "openjfx${major}"; - pkg = pkgs."openjfx${major}".override { withWebKit = true; }; - data = ./deps.json; - }; - - __darwinAllowLocalNetworking = true; - - preBuild = '' - export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES - export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" - ''; - - enableParallelBuilding = false; - - gradleBuildTask = "sdk"; - - installPhase = '' - cp -r build/modular-sdk $out - ''; - - stripDebugList = [ "." ]; - - postFixup = '' - # Remove references to bootstrap. - export openjdkOutPath='${jdk.outPath}' - find "$out" -name \*.so | while read lib; do - new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')" - patchelf --set-rpath "$new_refs" "$lib" - done - # Remove licenses, otherwise they may conflict with the ones included in the openjdk - rm -rf $out/modules_legal/* - ''; - - disallowedReferences = [ jdk gradle.jdk ]; - - # Uses a lot of RAM, OOMs otherwise - requiredSystemFeatures = [ "big-parallel" ]; - - meta = with lib; { - homepage = "http://openjdk.java.net/projects/openjfx/"; - license = licenses.gpl2; - description = "Next-generation Java client toolkit"; - maintainers = with maintainers; [ abbradar ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/development/compilers/openjdk/openjfx/11/deps.json b/pkgs/development/compilers/openjdk/openjfx/11/deps.json deleted file mode 100644 index 7c8167124430..000000000000 --- a/pkgs/development/compilers/openjdk/openjfx/11/deps.json +++ /dev/null @@ -1,152 +0,0 @@ -{ - "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", - "!version": 1, - "https://download.eclipse.org": { - "eclipse/updates/4.6/R-4.6.3-201703010400/plugins/org.eclipse.swt.gtk.linux.x86_64_3.105.3.v20170228-0512": { - "jar": "sha256-qWM1HV97griQxJlOFY2AVV2uOLAK87jXPzh1wh/zmLw=" - } - }, - "https://github.com": { - "unicode-org/icu/releases/download/release-71-1/icu4c-71_1-data-bin-l": { - "zip": "sha256-pVWIy0BkICsthA5mxhR9SJQHleMNnaEcGl/AaLi5qZM=" - } - }, - "https://repo.maven.apache.org/maven2": { - "com/ibm/icu#icu4j/61.1": { - "jar": "sha256-VcmOsYOLKku5oH3Da9N4Uy1k0M3LfO7pFCNoZqfeRGQ=", - "pom": "sha256-E7h6QHnOsFUVsZrHoVIDlHB1YB1JQj9xk1ikmACYBWs=" - }, - "junit#junit/4.13.2": { - "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=", - "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ=" - }, - "net/java#jvnet-parent/3": { - "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" - }, - "org/abego/treelayout#org.abego.treelayout.core/1.0.3": { - "jar": "sha256-+l4xOVw5wufUasoPgfcgYJMWB7L6Qb02A46yy2+5MyY=", - "pom": "sha256-o7KyI3lDcDVeeSQzrwEvyZNmfAMxviusrYTbwJrOSgw=" - }, - "org/antlr#ST4/4.1": { - "jar": "sha256-ixzK7Z7cVc0lXZwZxNjaR1bZtvy0NWcSkrQ0cLFtddg=", - "pom": "sha256-cz5r2XyjTMbfk6QkPlEeVnPLm4jHSxiETgQqRdUWmHw=" - }, - "org/antlr#antlr-master/3.5.2": { - "pom": "sha256-QtkaUx6lEA6wm1QaoALDuQjo8oK9c7bi9S83HvEzG9Y=" - }, - "org/antlr#antlr-runtime/3.5.2": { - "jar": "sha256-zj/I7LEPOemjzdy7LONQ0nLZzT0LHhjm/nPDuTichzQ=", - "pom": "sha256-RqnCIAu4sSvXEkqnpQl/9JCZkIMpyFGgTLIFFCCqfyU=" - }, - "org/antlr#antlr4-master/4.7.2": { - "pom": "sha256-upnLJdI5DzhoDHUChCoO4JWdHmQD4BPM/2mP1YVu6tE=" - }, - "org/antlr#antlr4-runtime/4.7.2": { - "jar": "sha256-TFGLh9S9/4tEzYy8GvgW6US2Kj/luAt4FQHPH0dZu8Q=", - "pom": "sha256-3AnLqYwl08BuSuxRaIXUw68DBiulX0/mKD/JzxdqYPs=" - }, - "org/antlr#antlr4/4.7.2": { - "pom": "sha256-z56zaUD6xEiBA4wb4/LFjgbmjRq/v9SmjTS72LrFV3E=" - }, - "org/antlr#antlr4/4.7.2/complete": { - "jar": "sha256-aFI4bXl17/KRcdrgAswiMlFRDTXyka4neUjzgaezgLQ=" - }, - "org/apache#apache/13": { - "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" - }, - "org/apache/lucene#lucene-core/7.1.0": { - "jar": "sha256-vG3+7tCrp0MCqSCBH/1snkVlvviTzMOvg2Iz36s8UTo=", - "pom": "sha256-d7ysnMSDKiKSGJgng2ASB8yYvldcyIRDNtWuBzkbPuE=" - }, - "org/apache/lucene#lucene-grouping/7.1.0": { - "jar": "sha256-5wh/sGDRWa1xvW7p6W8BYGpaM1OgxJofHQ49oPUaTlo=", - "pom": "sha256-738k/3YjlZSfxMiDl1npJhD8mx8Nifmbtw+haHNh2Ec=" - }, - "org/apache/lucene#lucene-parent/7.1.0": { - "pom": "sha256-l7M9mcedTRIoIuWDY0cGvGmfRCvp3tksZiKdEn+WoAc=" - }, - "org/apache/lucene#lucene-queries/7.1.0": { - "jar": "sha256-qamOR/ueclsDerV+wZts4QVBIoTLXl2aGs99Xv8TSTY=", - "pom": "sha256-pvMWrRvMdKy3f3mP/AIKy9aD3nx5OUrFNgAdE6vktVY=" - }, - "org/apache/lucene#lucene-queryparser/7.1.0": { - "jar": "sha256-HNuCsiqq3bGJW9OjSVinyaOgb/0NZ6sskNvDegRshlQ=", - "pom": "sha256-K7m67AcL6g3a5aj1rrDOZlJpBeA4THS+18OrIJ52hdM=" - }, - "org/apache/lucene#lucene-sandbox/7.1.0": { - "jar": "sha256-wZA9Xag+IIZp2NkzdJeeFAIUNYsq32c1sa488kkJW+E=", - "pom": "sha256-WL5E6wSMD0If6eul+30xhr7gk7g72F4w5EKbbctVZMU=" - }, - "org/apache/lucene#lucene-solr-grandparent/7.1.0": { - "pom": "sha256-3NW0Q/KK2QPk/wfTMigGxTF4BWuctNQU+2gMyArhGsU=" - }, - "org/apiguardian#apiguardian-api/1.1.2": { - "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", - "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", - "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" - }, - "org/glassfish#javax.json/1.0.4": { - "jar": "sha256-Dh3sQKHt6WWUElHtqWiu7gUsxPUDeLwxbMSOgVm9vrQ=", - "pom": "sha256-a6+Dg/+pi2bqls1b/B7H8teUY7uYrJgFKWSxIcIhLVQ=" - }, - "org/glassfish#json/1.0.4": { - "pom": "sha256-bXxoQjEV+SFxjZRPhZkktMaFIX7AOkn3BFWossqpcuY=" - }, - "org/hamcrest#hamcrest-core/1.3": { - "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", - "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" - }, - "org/hamcrest#hamcrest-parent/1.3": { - "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" - }, - "org/junit#junit-bom/5.8.1": { - "module": "sha256-a4LLpSoTSxPBmC8M+WIsbUhTcdQLmJJG8xJOOwpbGFQ=", - "pom": "sha256-733Ef45KFoZPR3lyjofteFOYGeT7iSdoqdprjvkD+GM=" - }, - "org/junit/jupiter#junit-jupiter-api/5.8.1": { - "jar": "sha256-zjN0p++6YF4tK2mj/vkBNAMrqz7MPthXmkhxscLEcpw=", - "module": "sha256-DWnbwja33Kq0ynNpqlYOmwqbvvf5WIgv+0hTPLunwJ0=", - "pom": "sha256-d61+1KYwutH8h0agpuZ1wj+2lAsnq2LMyzTk/Pz+Ob8=" - }, - "org/junit/jupiter#junit-jupiter-engine/5.8.1": { - "jar": "sha256-Rom8kCJVoZ/pgndoO6MjHAlNEHxUyNNfK2+cl9ImQY4=", - "module": "sha256-aHkP7DP5ew7IQM9HrEDuDHLgVvEiyg88ZkZ0M0mTdpk=", - "pom": "sha256-qjIKMYpyceMyYsSA/POZZbmobap2Zm63dTQrgOnN1F4=" - }, - "org/junit/jupiter#junit-jupiter-params/5.8.1": { - "jar": "sha256-OJuNE6jYhy/L1PDrp7LEavxihBn5obKjqfkyQaBqchg=", - "module": "sha256-Ek1gPG2AMzZtjKRxY2tEbji5zBvQEPMpVCNYGHr6hl4=", - "pom": "sha256-OrrKWfvfJTMg9yRCwQPjnOQDjcEf6MSJ28ScwjoHHws=" - }, - "org/junit/jupiter#junit-jupiter/5.8.1": { - "jar": "sha256-jxBJ7iSzShC2DNgQBICZ94HCZYzeIYHoMUlqswqYKYU=", - "module": "sha256-LjS6TIWMOM0KNlr//syTKnGWzpOF4utUBZQuWBwV/1w=", - "pom": "sha256-rssFDSMtOT9Az/EfjMMPUrZslQpB+IOSXIEULt7l9PU=" - }, - "org/junit/platform#junit-platform-commons/1.8.1": { - "jar": "sha256-+k+mjIvVTdDLScP8vpsuQvTaa+2+fnzPKgXxoeYJtZM=", - "module": "sha256-aY/QVBrLfv/GZZhI/Qx91QEKSfFfDBy6Q+U1gH+Q9ms=", - "pom": "sha256-4ZcoLlLnANEriJie3FSJh0aTUC5KqJB6zwgpgBq6bUQ=" - }, - "org/junit/platform#junit-platform-engine/1.8.1": { - "jar": "sha256-cCho7X6GubRnLt4PHhhekFusqa+rV3RqfGUL48e8oEc=", - "module": "sha256-2fQgpkU5o+32D4DfDG/XIrdQcldEx5ykD30lrlbKS6Q=", - "pom": "sha256-hqrU5ld1TkOgDfIm3VTIrsHsarZTP1ASGQfkZi3i5fI=" - }, - "org/junit/vintage#junit-vintage-engine/5.8.1": { - "jar": "sha256-F2tTzRvb+SM+lsiwx6nluGQoL7veukO1zq/e2ymkkVY=", - "module": "sha256-nOn6Lk7mp0DWEBAlMEYqcc4PqdLxQYUi5LK9tgcvZ5o=", - "pom": "sha256-Ndc3M08dvouMVnZ/oVCKwbVEsB1P5cmXl76QA+5YGxI=" - }, - "org/opentest4j#opentest4j/1.2.0": { - "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=", - "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ=" - }, - "org/sonatype/oss#oss-parent/7": { - "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" - }, - "org/sonatype/oss#oss-parent/9": { - "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" - } - } -} diff --git a/pkgs/development/compilers/openjdk/openjfx/17/default.nix b/pkgs/development/compilers/openjdk/openjfx/17/default.nix deleted file mode 100644 index de0f50dab7c7..000000000000 --- a/pkgs/development/compilers/openjdk/openjfx/17/default.nix +++ /dev/null @@ -1,95 +0,0 @@ -{ stdenv, lib, pkgs, fetchFromGitHub, writeText, openjdk17_headless, gradle_7 -, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib -, ffmpeg_7-headless, python3, ruby -, withMedia ? true -, withWebKit ? false -}: - -let - pname = "openjfx-modular-sdk"; - major = "17"; - update = ".0.11"; - build = "-ga"; - repover = "${major}${update}${build}"; - jdk = openjdk17_headless; - gradle = gradle_7; - -in stdenv.mkDerivation { - inherit pname; - version = "${major}${update}${build}"; - - src = fetchFromGitHub { - owner = "openjdk"; - repo = "jfx${major}u"; - rev = repover; - sha256 = "sha256-9VfXk2EfMebMyVKPohPRP2QXRFf8XemUtfY0JtBCHyw="; - }; - - patches = [ - ../backport-ffmpeg-6-support-jfx11.patch - ../backport-ffmpeg-7-support-jfx11.patch - ]; - - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_7-headless ]; - nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ]; - - dontUseCmakeConfigure = true; - - config = writeText "gradle.properties" '' - CONF = Release - JDK_HOME = ${jdk.home} - COMPILE_MEDIA = ${lib.boolToString withMedia} - COMPILE_WEBKIT = ${lib.boolToString withWebKit} - ''; - - postPatch = '' - # Add missing includes for gcc-13 for webkit build: - sed -e '1i #include <cstdio>' \ - -i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \ - modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h - - ln -s $config gradle.properties - ''; - - mitmCache = gradle.fetchDeps { - attrPath = "openjfx${major}"; - pkg = pkgs."openjfx${major}".override { withWebKit = true; }; - data = ./deps.json; - }; - - __darwinAllowLocalNetworking = true; - - preBuild = '' - export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES - export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" - ''; - - enableParallelBuilding = false; - - gradleBuildTask = "sdk"; - - installPhase = '' - cp -r build/modular-sdk $out - ''; - - stripDebugList = [ "." ]; - - postFixup = '' - # Remove references to bootstrap. - export openjdkOutPath='${jdk.outPath}' - find "$out" -name \*.so | while read lib; do - new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')" - patchelf --set-rpath "$new_refs" "$lib" - done - ''; - - disallowedReferences = [ jdk gradle.jdk ]; - - meta = with lib; { - homepage = "http://openjdk.java.net/projects/openjfx/"; - license = licenses.gpl2; - description = "Next-generation Java client toolkit"; - maintainers = with maintainers; [ abbradar ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/compilers/openjdk/openjfx/17/deps.json b/pkgs/development/compilers/openjdk/openjfx/17/deps.json deleted file mode 100644 index a9fa40a91be1..000000000000 --- a/pkgs/development/compilers/openjdk/openjfx/17/deps.json +++ /dev/null @@ -1,152 +0,0 @@ -{ - "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", - "!version": 1, - "https://download.eclipse.org": { - "eclipse/updates/4.6/R-4.6.3-201703010400/plugins/org.eclipse.swt.gtk.linux.x86_64_3.105.3.v20170228-0512": { - "jar": "sha256-qWM1HV97griQxJlOFY2AVV2uOLAK87jXPzh1wh/zmLw=" - } - }, - "https://github.com": { - "unicode-org/icu/releases/download/release-71-1/icu4c-71_1-data-bin-l": { - "zip": "sha256-pVWIy0BkICsthA5mxhR9SJQHleMNnaEcGl/AaLi5qZM=" - } - }, - "https://repo.maven.apache.org/maven2": { - "com/ibm/icu#icu4j/61.1": { - "jar": "sha256-VcmOsYOLKku5oH3Da9N4Uy1k0M3LfO7pFCNoZqfeRGQ=", - "pom": "sha256-E7h6QHnOsFUVsZrHoVIDlHB1YB1JQj9xk1ikmACYBWs=" - }, - "junit#junit/4.13.2": { - "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=", - "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ=" - }, - "net/java#jvnet-parent/3": { - "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" - }, - "org/abego/treelayout#org.abego.treelayout.core/1.0.3": { - "jar": "sha256-+l4xOVw5wufUasoPgfcgYJMWB7L6Qb02A46yy2+5MyY=", - "pom": "sha256-o7KyI3lDcDVeeSQzrwEvyZNmfAMxviusrYTbwJrOSgw=" - }, - "org/antlr#ST4/4.1": { - "jar": "sha256-ixzK7Z7cVc0lXZwZxNjaR1bZtvy0NWcSkrQ0cLFtddg=", - "pom": "sha256-cz5r2XyjTMbfk6QkPlEeVnPLm4jHSxiETgQqRdUWmHw=" - }, - "org/antlr#antlr-master/3.5.2": { - "pom": "sha256-QtkaUx6lEA6wm1QaoALDuQjo8oK9c7bi9S83HvEzG9Y=" - }, - "org/antlr#antlr-runtime/3.5.2": { - "jar": "sha256-zj/I7LEPOemjzdy7LONQ0nLZzT0LHhjm/nPDuTichzQ=", - "pom": "sha256-RqnCIAu4sSvXEkqnpQl/9JCZkIMpyFGgTLIFFCCqfyU=" - }, - "org/antlr#antlr4-master/4.7.2": { - "pom": "sha256-upnLJdI5DzhoDHUChCoO4JWdHmQD4BPM/2mP1YVu6tE=" - }, - "org/antlr#antlr4-runtime/4.7.2": { - "jar": "sha256-TFGLh9S9/4tEzYy8GvgW6US2Kj/luAt4FQHPH0dZu8Q=", - "pom": "sha256-3AnLqYwl08BuSuxRaIXUw68DBiulX0/mKD/JzxdqYPs=" - }, - "org/antlr#antlr4/4.7.2": { - "pom": "sha256-z56zaUD6xEiBA4wb4/LFjgbmjRq/v9SmjTS72LrFV3E=" - }, - "org/antlr#antlr4/4.7.2/complete": { - "jar": "sha256-aFI4bXl17/KRcdrgAswiMlFRDTXyka4neUjzgaezgLQ=" - }, - "org/apache#apache/13": { - "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" - }, - "org/apache/lucene#lucene-core/7.7.3": { - "jar": "sha256-jrAzNcGjxqixiN9012G6qDVplTWCq0QLU0yIRJ6o4N4=", - "pom": "sha256-gvilIoHGyLp5dKy6rESzLXbiYAgvP0u+FlwPbkuJFCo=" - }, - "org/apache/lucene#lucene-grouping/7.7.3": { - "jar": "sha256-L1vNY7JXQ9MMMTmGIk0Qf3XFKThxSVQlNRDFfT9nvrg=", - "pom": "sha256-HwStk+IETUCP2SXu4K6ktKHvjAdXe0Jme7U2BgKCImU=" - }, - "org/apache/lucene#lucene-parent/7.7.3": { - "pom": "sha256-6PrdU9XwBMQN3SNdQ4ZI5yxyVZn+4VQ+ViTV+1AQcwU=" - }, - "org/apache/lucene#lucene-queries/7.7.3": { - "jar": "sha256-PLWS2wpulWnGrMvbiKmtex2nQo28p5Ia0cWlhl1bQiY=", - "pom": "sha256-rkBsiiuw12SllERCefRiihl2vQlB551CzmTgmHxYnFA=" - }, - "org/apache/lucene#lucene-queryparser/7.7.3": { - "jar": "sha256-F3XJ/o7dlobTt6ZHd4+kTqqW8cwMSZMVCHEz4amDnoQ=", - "pom": "sha256-z2klkhWscjC5+tYKXInKDp9bm6rM7dFGlY/76Q9OsNI=" - }, - "org/apache/lucene#lucene-sandbox/7.7.3": { - "jar": "sha256-VfG38J2uKwytMhw00Vw8/FmgIRviM/Yp0EbEK/FwErc=", - "pom": "sha256-1vbdxsz1xvymRH1HD1BJ4WN6xje/HbWuDV8WaP34EiI=" - }, - "org/apache/lucene#lucene-solr-grandparent/7.7.3": { - "pom": "sha256-Oig3WAynavNq99/i3B0zT8b/XybRDySJnbd3CtfP2f4=" - }, - "org/apiguardian#apiguardian-api/1.1.2": { - "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", - "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", - "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" - }, - "org/glassfish#javax.json/1.0.4": { - "jar": "sha256-Dh3sQKHt6WWUElHtqWiu7gUsxPUDeLwxbMSOgVm9vrQ=", - "pom": "sha256-a6+Dg/+pi2bqls1b/B7H8teUY7uYrJgFKWSxIcIhLVQ=" - }, - "org/glassfish#json/1.0.4": { - "pom": "sha256-bXxoQjEV+SFxjZRPhZkktMaFIX7AOkn3BFWossqpcuY=" - }, - "org/hamcrest#hamcrest-core/1.3": { - "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", - "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" - }, - "org/hamcrest#hamcrest-parent/1.3": { - "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" - }, - "org/junit#junit-bom/5.8.1": { - "module": "sha256-a4LLpSoTSxPBmC8M+WIsbUhTcdQLmJJG8xJOOwpbGFQ=", - "pom": "sha256-733Ef45KFoZPR3lyjofteFOYGeT7iSdoqdprjvkD+GM=" - }, - "org/junit/jupiter#junit-jupiter-api/5.8.1": { - "jar": "sha256-zjN0p++6YF4tK2mj/vkBNAMrqz7MPthXmkhxscLEcpw=", - "module": "sha256-DWnbwja33Kq0ynNpqlYOmwqbvvf5WIgv+0hTPLunwJ0=", - "pom": "sha256-d61+1KYwutH8h0agpuZ1wj+2lAsnq2LMyzTk/Pz+Ob8=" - }, - "org/junit/jupiter#junit-jupiter-engine/5.8.1": { - "jar": "sha256-Rom8kCJVoZ/pgndoO6MjHAlNEHxUyNNfK2+cl9ImQY4=", - "module": "sha256-aHkP7DP5ew7IQM9HrEDuDHLgVvEiyg88ZkZ0M0mTdpk=", - "pom": "sha256-qjIKMYpyceMyYsSA/POZZbmobap2Zm63dTQrgOnN1F4=" - }, - "org/junit/jupiter#junit-jupiter-params/5.8.1": { - "jar": "sha256-OJuNE6jYhy/L1PDrp7LEavxihBn5obKjqfkyQaBqchg=", - "module": "sha256-Ek1gPG2AMzZtjKRxY2tEbji5zBvQEPMpVCNYGHr6hl4=", - "pom": "sha256-OrrKWfvfJTMg9yRCwQPjnOQDjcEf6MSJ28ScwjoHHws=" - }, - "org/junit/jupiter#junit-jupiter/5.8.1": { - "jar": "sha256-jxBJ7iSzShC2DNgQBICZ94HCZYzeIYHoMUlqswqYKYU=", - "module": "sha256-LjS6TIWMOM0KNlr//syTKnGWzpOF4utUBZQuWBwV/1w=", - "pom": "sha256-rssFDSMtOT9Az/EfjMMPUrZslQpB+IOSXIEULt7l9PU=" - }, - "org/junit/platform#junit-platform-commons/1.8.1": { - "jar": "sha256-+k+mjIvVTdDLScP8vpsuQvTaa+2+fnzPKgXxoeYJtZM=", - "module": "sha256-aY/QVBrLfv/GZZhI/Qx91QEKSfFfDBy6Q+U1gH+Q9ms=", - "pom": "sha256-4ZcoLlLnANEriJie3FSJh0aTUC5KqJB6zwgpgBq6bUQ=" - }, - "org/junit/platform#junit-platform-engine/1.8.1": { - "jar": "sha256-cCho7X6GubRnLt4PHhhekFusqa+rV3RqfGUL48e8oEc=", - "module": "sha256-2fQgpkU5o+32D4DfDG/XIrdQcldEx5ykD30lrlbKS6Q=", - "pom": "sha256-hqrU5ld1TkOgDfIm3VTIrsHsarZTP1ASGQfkZi3i5fI=" - }, - "org/junit/vintage#junit-vintage-engine/5.8.1": { - "jar": "sha256-F2tTzRvb+SM+lsiwx6nluGQoL7veukO1zq/e2ymkkVY=", - "module": "sha256-nOn6Lk7mp0DWEBAlMEYqcc4PqdLxQYUi5LK9tgcvZ5o=", - "pom": "sha256-Ndc3M08dvouMVnZ/oVCKwbVEsB1P5cmXl76QA+5YGxI=" - }, - "org/opentest4j#opentest4j/1.2.0": { - "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=", - "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ=" - }, - "org/sonatype/oss#oss-parent/7": { - "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" - }, - "org/sonatype/oss#oss-parent/9": { - "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" - } - } -} diff --git a/pkgs/development/compilers/openjdk/openjfx/21/default.nix b/pkgs/development/compilers/openjdk/openjfx/21/default.nix deleted file mode 100644 index 5eed503cad11..000000000000 --- a/pkgs/development/compilers/openjdk/openjfx/21/default.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ stdenv, lib, pkgs, fetchFromGitHub, writeText -, openjdk21_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst -, libXxf86vm, glib, alsa-lib, ffmpeg_7, python3, ruby -, withMedia ? true -, withWebKit ? false -}: - -let - pname = "openjfx-modular-sdk"; - major = "21"; - update = ".0.3"; - build = "-ga"; - repover = "${major}${update}${build}"; - jdk = openjdk21_headless; - gradle = gradle_7; - -in stdenv.mkDerivation { - inherit pname; - version = "${major}${update}${build}"; - - src = fetchFromGitHub { - owner = "openjdk"; - repo = "jfx21u"; - rev = repover; - hash = "sha256-7z0GIbkQwG9mXY9dssaicqaKpMo3FkNEpyAvkswoQQ4="; - }; - - patches = [ - ../backport-ffmpeg-7-support-jfx21.patch - ]; - - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_7 ]; - nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ]; - - dontUseCmakeConfigure = true; - - config = writeText "gradle.properties" '' - CONF = Release - JDK_HOME = ${jdk.home} - COMPILE_MEDIA = ${lib.boolToString withMedia} - COMPILE_WEBKIT = ${lib.boolToString withWebKit} - ''; - - postPatch = '' - # Add missing includes for gcc-13 for webkit build: - sed -e '1i #include <cstdio>' \ - -i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \ - modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h - - ln -s $config gradle.properties - ''; - - mitmCache = gradle.fetchDeps { - attrPath = "openjfx${major}"; - pkg = pkgs."openjfx${major}".override { withWebKit = true; }; - data = ./deps.json; - }; - - __darwinAllowLocalNetworking = true; - - preBuild = '' - export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES - export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" - ''; - - enableParallelBuilding = false; - - gradleBuildTask = "sdk"; - - installPhase = '' - cp -r build/modular-sdk $out - ''; - - stripDebugList = [ "." ]; - - postFixup = '' - # Remove references to bootstrap. - export openjdkOutPath='${jdk.outPath}' - find "$out" -name \*.so | while read lib; do - new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')" - patchelf --set-rpath "$new_refs" "$lib" - done - ''; - - disallowedReferences = [ jdk gradle.jdk ]; - - meta = with lib; { - homepage = "https://openjdk.org/projects/openjfx/"; - license = licenses.gpl2Classpath; - description = "Next-generation Java client toolkit"; - maintainers = with maintainers; [ abbradar ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/compilers/openjdk/openjfx/21/deps.json b/pkgs/development/compilers/openjdk/openjfx/21/deps.json deleted file mode 100644 index ec1816339f40..000000000000 --- a/pkgs/development/compilers/openjdk/openjfx/21/deps.json +++ /dev/null @@ -1,152 +0,0 @@ -{ - "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", - "!version": 1, - "https://download.eclipse.org": { - "eclipse/updates/4.6/R-4.6.3-201703010400/plugins/org.eclipse.swt.gtk.linux.x86_64_3.105.3.v20170228-0512": { - "jar": "sha256-qWM1HV97griQxJlOFY2AVV2uOLAK87jXPzh1wh/zmLw=" - } - }, - "https://github.com": { - "unicode-org/icu/releases/download/release-73-1/icu4c-73_1-data-bin-l": { - "zip": "sha256-QDgpjuAqDDiRcYXvj/Tr3pyLVSx3f9A+TfbGtLGCXiA=" - } - }, - "https://repo.maven.apache.org/maven2": { - "com/ibm/icu#icu4j/61.1": { - "jar": "sha256-VcmOsYOLKku5oH3Da9N4Uy1k0M3LfO7pFCNoZqfeRGQ=", - "pom": "sha256-E7h6QHnOsFUVsZrHoVIDlHB1YB1JQj9xk1ikmACYBWs=" - }, - "junit#junit/4.13.2": { - "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=", - "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ=" - }, - "net/java#jvnet-parent/3": { - "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" - }, - "org/abego/treelayout#org.abego.treelayout.core/1.0.3": { - "jar": "sha256-+l4xOVw5wufUasoPgfcgYJMWB7L6Qb02A46yy2+5MyY=", - "pom": "sha256-o7KyI3lDcDVeeSQzrwEvyZNmfAMxviusrYTbwJrOSgw=" - }, - "org/antlr#ST4/4.1": { - "jar": "sha256-ixzK7Z7cVc0lXZwZxNjaR1bZtvy0NWcSkrQ0cLFtddg=", - "pom": "sha256-cz5r2XyjTMbfk6QkPlEeVnPLm4jHSxiETgQqRdUWmHw=" - }, - "org/antlr#antlr-master/3.5.2": { - "pom": "sha256-QtkaUx6lEA6wm1QaoALDuQjo8oK9c7bi9S83HvEzG9Y=" - }, - "org/antlr#antlr-runtime/3.5.2": { - "jar": "sha256-zj/I7LEPOemjzdy7LONQ0nLZzT0LHhjm/nPDuTichzQ=", - "pom": "sha256-RqnCIAu4sSvXEkqnpQl/9JCZkIMpyFGgTLIFFCCqfyU=" - }, - "org/antlr#antlr4-master/4.7.2": { - "pom": "sha256-upnLJdI5DzhoDHUChCoO4JWdHmQD4BPM/2mP1YVu6tE=" - }, - "org/antlr#antlr4-runtime/4.7.2": { - "jar": "sha256-TFGLh9S9/4tEzYy8GvgW6US2Kj/luAt4FQHPH0dZu8Q=", - "pom": "sha256-3AnLqYwl08BuSuxRaIXUw68DBiulX0/mKD/JzxdqYPs=" - }, - "org/antlr#antlr4/4.7.2": { - "pom": "sha256-z56zaUD6xEiBA4wb4/LFjgbmjRq/v9SmjTS72LrFV3E=" - }, - "org/antlr#antlr4/4.7.2/complete": { - "jar": "sha256-aFI4bXl17/KRcdrgAswiMlFRDTXyka4neUjzgaezgLQ=" - }, - "org/apache#apache/13": { - "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" - }, - "org/apache/lucene#lucene-core/7.7.3": { - "jar": "sha256-jrAzNcGjxqixiN9012G6qDVplTWCq0QLU0yIRJ6o4N4=", - "pom": "sha256-gvilIoHGyLp5dKy6rESzLXbiYAgvP0u+FlwPbkuJFCo=" - }, - "org/apache/lucene#lucene-grouping/7.7.3": { - "jar": "sha256-L1vNY7JXQ9MMMTmGIk0Qf3XFKThxSVQlNRDFfT9nvrg=", - "pom": "sha256-HwStk+IETUCP2SXu4K6ktKHvjAdXe0Jme7U2BgKCImU=" - }, - "org/apache/lucene#lucene-parent/7.7.3": { - "pom": "sha256-6PrdU9XwBMQN3SNdQ4ZI5yxyVZn+4VQ+ViTV+1AQcwU=" - }, - "org/apache/lucene#lucene-queries/7.7.3": { - "jar": "sha256-PLWS2wpulWnGrMvbiKmtex2nQo28p5Ia0cWlhl1bQiY=", - "pom": "sha256-rkBsiiuw12SllERCefRiihl2vQlB551CzmTgmHxYnFA=" - }, - "org/apache/lucene#lucene-queryparser/7.7.3": { - "jar": "sha256-F3XJ/o7dlobTt6ZHd4+kTqqW8cwMSZMVCHEz4amDnoQ=", - "pom": "sha256-z2klkhWscjC5+tYKXInKDp9bm6rM7dFGlY/76Q9OsNI=" - }, - "org/apache/lucene#lucene-sandbox/7.7.3": { - "jar": "sha256-VfG38J2uKwytMhw00Vw8/FmgIRviM/Yp0EbEK/FwErc=", - "pom": "sha256-1vbdxsz1xvymRH1HD1BJ4WN6xje/HbWuDV8WaP34EiI=" - }, - "org/apache/lucene#lucene-solr-grandparent/7.7.3": { - "pom": "sha256-Oig3WAynavNq99/i3B0zT8b/XybRDySJnbd3CtfP2f4=" - }, - "org/apiguardian#apiguardian-api/1.1.2": { - "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", - "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", - "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" - }, - "org/glassfish#javax.json/1.0.4": { - "jar": "sha256-Dh3sQKHt6WWUElHtqWiu7gUsxPUDeLwxbMSOgVm9vrQ=", - "pom": "sha256-a6+Dg/+pi2bqls1b/B7H8teUY7uYrJgFKWSxIcIhLVQ=" - }, - "org/glassfish#json/1.0.4": { - "pom": "sha256-bXxoQjEV+SFxjZRPhZkktMaFIX7AOkn3BFWossqpcuY=" - }, - "org/hamcrest#hamcrest-core/1.3": { - "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", - "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" - }, - "org/hamcrest#hamcrest-parent/1.3": { - "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" - }, - "org/junit#junit-bom/5.8.1": { - "module": "sha256-a4LLpSoTSxPBmC8M+WIsbUhTcdQLmJJG8xJOOwpbGFQ=", - "pom": "sha256-733Ef45KFoZPR3lyjofteFOYGeT7iSdoqdprjvkD+GM=" - }, - "org/junit/jupiter#junit-jupiter-api/5.8.1": { - "jar": "sha256-zjN0p++6YF4tK2mj/vkBNAMrqz7MPthXmkhxscLEcpw=", - "module": "sha256-DWnbwja33Kq0ynNpqlYOmwqbvvf5WIgv+0hTPLunwJ0=", - "pom": "sha256-d61+1KYwutH8h0agpuZ1wj+2lAsnq2LMyzTk/Pz+Ob8=" - }, - "org/junit/jupiter#junit-jupiter-engine/5.8.1": { - "jar": "sha256-Rom8kCJVoZ/pgndoO6MjHAlNEHxUyNNfK2+cl9ImQY4=", - "module": "sha256-aHkP7DP5ew7IQM9HrEDuDHLgVvEiyg88ZkZ0M0mTdpk=", - "pom": "sha256-qjIKMYpyceMyYsSA/POZZbmobap2Zm63dTQrgOnN1F4=" - }, - "org/junit/jupiter#junit-jupiter-params/5.8.1": { - "jar": "sha256-OJuNE6jYhy/L1PDrp7LEavxihBn5obKjqfkyQaBqchg=", - "module": "sha256-Ek1gPG2AMzZtjKRxY2tEbji5zBvQEPMpVCNYGHr6hl4=", - "pom": "sha256-OrrKWfvfJTMg9yRCwQPjnOQDjcEf6MSJ28ScwjoHHws=" - }, - "org/junit/jupiter#junit-jupiter/5.8.1": { - "jar": "sha256-jxBJ7iSzShC2DNgQBICZ94HCZYzeIYHoMUlqswqYKYU=", - "module": "sha256-LjS6TIWMOM0KNlr//syTKnGWzpOF4utUBZQuWBwV/1w=", - "pom": "sha256-rssFDSMtOT9Az/EfjMMPUrZslQpB+IOSXIEULt7l9PU=" - }, - "org/junit/platform#junit-platform-commons/1.8.1": { - "jar": "sha256-+k+mjIvVTdDLScP8vpsuQvTaa+2+fnzPKgXxoeYJtZM=", - "module": "sha256-aY/QVBrLfv/GZZhI/Qx91QEKSfFfDBy6Q+U1gH+Q9ms=", - "pom": "sha256-4ZcoLlLnANEriJie3FSJh0aTUC5KqJB6zwgpgBq6bUQ=" - }, - "org/junit/platform#junit-platform-engine/1.8.1": { - "jar": "sha256-cCho7X6GubRnLt4PHhhekFusqa+rV3RqfGUL48e8oEc=", - "module": "sha256-2fQgpkU5o+32D4DfDG/XIrdQcldEx5ykD30lrlbKS6Q=", - "pom": "sha256-hqrU5ld1TkOgDfIm3VTIrsHsarZTP1ASGQfkZi3i5fI=" - }, - "org/junit/vintage#junit-vintage-engine/5.8.1": { - "jar": "sha256-F2tTzRvb+SM+lsiwx6nluGQoL7veukO1zq/e2ymkkVY=", - "module": "sha256-nOn6Lk7mp0DWEBAlMEYqcc4PqdLxQYUi5LK9tgcvZ5o=", - "pom": "sha256-Ndc3M08dvouMVnZ/oVCKwbVEsB1P5cmXl76QA+5YGxI=" - }, - "org/opentest4j#opentest4j/1.2.0": { - "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=", - "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ=" - }, - "org/sonatype/oss#oss-parent/7": { - "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" - }, - "org/sonatype/oss#oss-parent/9": { - "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" - } - } -} diff --git a/pkgs/development/compilers/openjdk/openjfx/22/default.nix b/pkgs/development/compilers/openjdk/openjfx/22/default.nix deleted file mode 100644 index a64cecb8c9b5..000000000000 --- a/pkgs/development/compilers/openjdk/openjfx/22/default.nix +++ /dev/null @@ -1,111 +0,0 @@ -{ stdenv -, lib -, pkgs -, fetchFromGitHub -, fetchpatch2 -, writeText -, openjdk21_headless -, gradle -, pkg-config -, perl -, cmake -, gperf -, gtk2 -, gtk3 -, libXtst -, libXxf86vm -, glib -, alsa-lib -, ffmpeg_7 -, python3 -, ruby -, withMedia ? true -, withWebKit ? false -}: - -let - pname = "openjfx-modular-sdk"; - major = "22"; - update = ".0.2"; - build = "-ga"; - repover = "${major}${update}${build}"; - jdk = openjdk21_headless; - -in stdenv.mkDerivation { - inherit pname; - version = "${major}${update}${build}"; - - src = fetchFromGitHub { - owner = "openjdk"; - repo = "jfx22u"; - rev = repover; - hash = "sha256-7Q9nZ2p3KfQPt1A2ULwk64OU/5/ghEkcsf9ECD6Ln2g="; - }; - - patches = [ - # 8338701: Provide media support for libavcodec version 61 - # <https://github.com/openjdk/jfx/pull/1552> - (fetchpatch2 { - url = "https://github.com/openjdk/jfx/commit/6115b396bacf62f39dcaa93c7c0adcd60b428b8c.patch?full_index=1"; - hash = "sha256-6EES4qsumFgXePZSDEetJC1Li65zquz3UjwRbq/6YJM="; - }) - ]; - - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_7 ]; - nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ]; - - dontUseCmakeConfigure = true; - - config = writeText "gradle.properties" '' - CONF = Release - JDK_HOME = ${jdk.home} - COMPILE_MEDIA = ${lib.boolToString withMedia} - COMPILE_WEBKIT = ${lib.boolToString withWebKit} - ''; - - postPatch = '' - ln -s $config gradle.properties - ''; - - mitmCache = gradle.fetchDeps { - attrPath = "openjfx${major}"; - pkg = pkgs."openjfx${major}".override { withWebKit = true; }; - data = ./deps.json; - }; - - __darwinAllowLocalNetworking = true; - - preBuild = '' - export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES - export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" - ''; - - enableParallelBuilding = false; - - gradleBuildTask = "sdk"; - - installPhase = '' - cp -r build/modular-sdk $out - ''; - - stripDebugList = [ "." ]; - - postFixup = '' - # Remove references to bootstrap. - export openjdkOutPath='${jdk.outPath}' - find "$out" -name \*.so | while read lib; do - new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')" - patchelf --set-rpath "$new_refs" "$lib" - done - ''; - - disallowedReferences = [ jdk gradle.jdk ]; - - meta = with lib; { - homepage = "https://openjdk.org/projects/openjfx/"; - license = licenses.gpl2Classpath; - description = "Next-generation Java client toolkit"; - maintainers = with maintainers; [ abbradar ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/compilers/openjdk/openjfx/22/deps.json b/pkgs/development/compilers/openjdk/openjfx/22/deps.json deleted file mode 100644 index a5b5a76852bf..000000000000 --- a/pkgs/development/compilers/openjdk/openjfx/22/deps.json +++ /dev/null @@ -1,152 +0,0 @@ -{ - "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", - "!version": 1, - "https://download.eclipse.org": { - "eclipse/updates/4.30/R-4.30-202312010110/plugins/org.eclipse.swt.gtk.linux.x86_64_3.124.200.v20231113-1355": { - "jar": "sha256-Q048o4oWnZ9Y33AxXiSxbxEeayfbWOf1HoxtoLS4SIs=" - } - }, - "https://github.com": { - "unicode-org/icu/releases/download/release-74-2/icu4c-74_2-data-bin-l": { - "zip": "sha256-Ks2xuYIigECWPRg7LdnTISUsYT4PTbIT1LvBBBfN5Wk=" - } - }, - "https://repo.maven.apache.org/maven2": { - "com/ibm/icu#icu4j/61.1": { - "jar": "sha256-VcmOsYOLKku5oH3Da9N4Uy1k0M3LfO7pFCNoZqfeRGQ=", - "pom": "sha256-E7h6QHnOsFUVsZrHoVIDlHB1YB1JQj9xk1ikmACYBWs=" - }, - "junit#junit/4.13.2": { - "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=", - "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ=" - }, - "net/java#jvnet-parent/3": { - "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" - }, - "org/abego/treelayout#org.abego.treelayout.core/1.0.3": { - "jar": "sha256-+l4xOVw5wufUasoPgfcgYJMWB7L6Qb02A46yy2+5MyY=", - "pom": "sha256-o7KyI3lDcDVeeSQzrwEvyZNmfAMxviusrYTbwJrOSgw=" - }, - "org/antlr#ST4/4.1": { - "jar": "sha256-ixzK7Z7cVc0lXZwZxNjaR1bZtvy0NWcSkrQ0cLFtddg=", - "pom": "sha256-cz5r2XyjTMbfk6QkPlEeVnPLm4jHSxiETgQqRdUWmHw=" - }, - "org/antlr#antlr-master/3.5.2": { - "pom": "sha256-QtkaUx6lEA6wm1QaoALDuQjo8oK9c7bi9S83HvEzG9Y=" - }, - "org/antlr#antlr-runtime/3.5.2": { - "jar": "sha256-zj/I7LEPOemjzdy7LONQ0nLZzT0LHhjm/nPDuTichzQ=", - "pom": "sha256-RqnCIAu4sSvXEkqnpQl/9JCZkIMpyFGgTLIFFCCqfyU=" - }, - "org/antlr#antlr4-master/4.7.2": { - "pom": "sha256-upnLJdI5DzhoDHUChCoO4JWdHmQD4BPM/2mP1YVu6tE=" - }, - "org/antlr#antlr4-runtime/4.7.2": { - "jar": "sha256-TFGLh9S9/4tEzYy8GvgW6US2Kj/luAt4FQHPH0dZu8Q=", - "pom": "sha256-3AnLqYwl08BuSuxRaIXUw68DBiulX0/mKD/JzxdqYPs=" - }, - "org/antlr#antlr4/4.7.2": { - "pom": "sha256-z56zaUD6xEiBA4wb4/LFjgbmjRq/v9SmjTS72LrFV3E=" - }, - "org/antlr#antlr4/4.7.2/complete": { - "jar": "sha256-aFI4bXl17/KRcdrgAswiMlFRDTXyka4neUjzgaezgLQ=" - }, - "org/apache#apache/13": { - "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" - }, - "org/apache/lucene#lucene-core/7.7.3": { - "jar": "sha256-jrAzNcGjxqixiN9012G6qDVplTWCq0QLU0yIRJ6o4N4=", - "pom": "sha256-gvilIoHGyLp5dKy6rESzLXbiYAgvP0u+FlwPbkuJFCo=" - }, - "org/apache/lucene#lucene-grouping/7.7.3": { - "jar": "sha256-L1vNY7JXQ9MMMTmGIk0Qf3XFKThxSVQlNRDFfT9nvrg=", - "pom": "sha256-HwStk+IETUCP2SXu4K6ktKHvjAdXe0Jme7U2BgKCImU=" - }, - "org/apache/lucene#lucene-parent/7.7.3": { - "pom": "sha256-6PrdU9XwBMQN3SNdQ4ZI5yxyVZn+4VQ+ViTV+1AQcwU=" - }, - "org/apache/lucene#lucene-queries/7.7.3": { - "jar": "sha256-PLWS2wpulWnGrMvbiKmtex2nQo28p5Ia0cWlhl1bQiY=", - "pom": "sha256-rkBsiiuw12SllERCefRiihl2vQlB551CzmTgmHxYnFA=" - }, - "org/apache/lucene#lucene-queryparser/7.7.3": { - "jar": "sha256-F3XJ/o7dlobTt6ZHd4+kTqqW8cwMSZMVCHEz4amDnoQ=", - "pom": "sha256-z2klkhWscjC5+tYKXInKDp9bm6rM7dFGlY/76Q9OsNI=" - }, - "org/apache/lucene#lucene-sandbox/7.7.3": { - "jar": "sha256-VfG38J2uKwytMhw00Vw8/FmgIRviM/Yp0EbEK/FwErc=", - "pom": "sha256-1vbdxsz1xvymRH1HD1BJ4WN6xje/HbWuDV8WaP34EiI=" - }, - "org/apache/lucene#lucene-solr-grandparent/7.7.3": { - "pom": "sha256-Oig3WAynavNq99/i3B0zT8b/XybRDySJnbd3CtfP2f4=" - }, - "org/apiguardian#apiguardian-api/1.1.2": { - "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", - "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", - "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" - }, - "org/glassfish#javax.json/1.0.4": { - "jar": "sha256-Dh3sQKHt6WWUElHtqWiu7gUsxPUDeLwxbMSOgVm9vrQ=", - "pom": "sha256-a6+Dg/+pi2bqls1b/B7H8teUY7uYrJgFKWSxIcIhLVQ=" - }, - "org/glassfish#json/1.0.4": { - "pom": "sha256-bXxoQjEV+SFxjZRPhZkktMaFIX7AOkn3BFWossqpcuY=" - }, - "org/hamcrest#hamcrest-core/1.3": { - "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", - "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" - }, - "org/hamcrest#hamcrest-parent/1.3": { - "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" - }, - "org/junit#junit-bom/5.8.1": { - "module": "sha256-a4LLpSoTSxPBmC8M+WIsbUhTcdQLmJJG8xJOOwpbGFQ=", - "pom": "sha256-733Ef45KFoZPR3lyjofteFOYGeT7iSdoqdprjvkD+GM=" - }, - "org/junit/jupiter#junit-jupiter-api/5.8.1": { - "jar": "sha256-zjN0p++6YF4tK2mj/vkBNAMrqz7MPthXmkhxscLEcpw=", - "module": "sha256-DWnbwja33Kq0ynNpqlYOmwqbvvf5WIgv+0hTPLunwJ0=", - "pom": "sha256-d61+1KYwutH8h0agpuZ1wj+2lAsnq2LMyzTk/Pz+Ob8=" - }, - "org/junit/jupiter#junit-jupiter-engine/5.8.1": { - "jar": "sha256-Rom8kCJVoZ/pgndoO6MjHAlNEHxUyNNfK2+cl9ImQY4=", - "module": "sha256-aHkP7DP5ew7IQM9HrEDuDHLgVvEiyg88ZkZ0M0mTdpk=", - "pom": "sha256-qjIKMYpyceMyYsSA/POZZbmobap2Zm63dTQrgOnN1F4=" - }, - "org/junit/jupiter#junit-jupiter-params/5.8.1": { - "jar": "sha256-OJuNE6jYhy/L1PDrp7LEavxihBn5obKjqfkyQaBqchg=", - "module": "sha256-Ek1gPG2AMzZtjKRxY2tEbji5zBvQEPMpVCNYGHr6hl4=", - "pom": "sha256-OrrKWfvfJTMg9yRCwQPjnOQDjcEf6MSJ28ScwjoHHws=" - }, - "org/junit/jupiter#junit-jupiter/5.8.1": { - "jar": "sha256-jxBJ7iSzShC2DNgQBICZ94HCZYzeIYHoMUlqswqYKYU=", - "module": "sha256-LjS6TIWMOM0KNlr//syTKnGWzpOF4utUBZQuWBwV/1w=", - "pom": "sha256-rssFDSMtOT9Az/EfjMMPUrZslQpB+IOSXIEULt7l9PU=" - }, - "org/junit/platform#junit-platform-commons/1.8.1": { - "jar": "sha256-+k+mjIvVTdDLScP8vpsuQvTaa+2+fnzPKgXxoeYJtZM=", - "module": "sha256-aY/QVBrLfv/GZZhI/Qx91QEKSfFfDBy6Q+U1gH+Q9ms=", - "pom": "sha256-4ZcoLlLnANEriJie3FSJh0aTUC5KqJB6zwgpgBq6bUQ=" - }, - "org/junit/platform#junit-platform-engine/1.8.1": { - "jar": "sha256-cCho7X6GubRnLt4PHhhekFusqa+rV3RqfGUL48e8oEc=", - "module": "sha256-2fQgpkU5o+32D4DfDG/XIrdQcldEx5ykD30lrlbKS6Q=", - "pom": "sha256-hqrU5ld1TkOgDfIm3VTIrsHsarZTP1ASGQfkZi3i5fI=" - }, - "org/junit/vintage#junit-vintage-engine/5.8.1": { - "jar": "sha256-F2tTzRvb+SM+lsiwx6nluGQoL7veukO1zq/e2ymkkVY=", - "module": "sha256-nOn6Lk7mp0DWEBAlMEYqcc4PqdLxQYUi5LK9tgcvZ5o=", - "pom": "sha256-Ndc3M08dvouMVnZ/oVCKwbVEsB1P5cmXl76QA+5YGxI=" - }, - "org/opentest4j#opentest4j/1.2.0": { - "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=", - "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ=" - }, - "org/sonatype/oss#oss-parent/7": { - "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" - }, - "org/sonatype/oss#oss-parent/9": { - "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" - } - } -} diff --git a/pkgs/development/compilers/openjdk/openjfx/backport-ffmpeg-6-support-jfx11.patch b/pkgs/development/compilers/openjdk/openjfx/backport-ffmpeg-6-support-jfx11.patch deleted file mode 100644 index 2d75ecb9562a..000000000000 --- a/pkgs/development/compilers/openjdk/openjfx/backport-ffmpeg-6-support-jfx11.patch +++ /dev/null @@ -1,70 +0,0 @@ -Backported from <https://github.com/openjdk/jfx/pull/1259>. - -Original author: Alexander Matveev <alexander.matveev@oracle.com> - -diff --git a/build.gradle b/build.gradle -index 82dc7a7fa9..d1ae3b401f 100644 ---- a/build.gradle -+++ b/build.gradle -@@ -3342,6 +3342,7 @@ - media name: "ffmpeg-3.3.3", ext: "tar.gz" - media name: "ffmpeg-4.0.2", ext: "tar.gz" - media name: "ffmpeg-5.1.2", ext: "tar.gz" -+ media name: "ffmpeg-6.0", ext: "tar.gz" - } - implementation project(":base") - implementation project(":graphics") -@@ -3484,7 +3485,7 @@ - if (t.name == "linux") { - // Pre-defined command line arguments - def cfgCMDArgs = ["sh", "configure"] -- def commonCfgArgs = ["--enable-shared", "--disable-debug", "--disable-static", "--disable-yasm", "--disable-doc", "--disable-programs", "--disable-everything"] -+ def commonCfgArgs = ["--enable-shared", "--disable-debug", "--disable-static", "--disable-asm", "--disable-doc", "--disable-programs", "--disable-everything"] - def codecsCfgArgs = ["--enable-decoder=aac,mp3,mp3float,h264", "--enable-parser=aac,h264", "--enable-demuxer=aac,h264,mpegts,mpegtsraw"] - - def copyLibAVStubs = {String fromDir, String toDir -> -@@ -3688,8 +3689,8 @@ - doLast { - project.ext.libav = [:] - project.ext.libav.basedir = "${buildDir}/native/linux/ffmpeg" -- project.ext.libav.versions = [ "3.3.3", "4.0.2", "5.1.2" ] -- project.ext.libav.versionmap = [ "3.3.3" : "57", "4.0.2" : "58", "5.1.2" : "59" ] -+ project.ext.libav.versions = [ "3.3.3", "4.0.2", "5.1.2", "6.0" ] -+ project.ext.libav.versionmap = [ "3.3.3" : "57", "4.0.2" : "58", "5.1.2" : "59", "6.0" : "60" ] - - libav.versions.each { version -> - def libavDir = "${libav.basedir}/ffmpeg-${version}" -@@ -3769,7 +3770,7 @@ - project.ext.libav.libavffmpeg.versions = [ "56" ] - project.ext.libav.ffmpeg = [:] - project.ext.libav.ffmpeg.basedir = "${buildDir}/native/linux/ffmpeg/ffmpeg" -- project.ext.libav.ffmpeg.versions = [ "57", "58", "59" ] -+ project.ext.libav.ffmpeg.versions = [ "57", "58", "59", "60" ] - - project.ext.libav.versions.each { version -> - def libavDir = "${project.ext.libav.basedir}-${version}" -diff --git a/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java b/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java -index 05f98ad3d1..b05bb68341 100644 ---- a/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java -+++ b/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java -@@ -125,6 +125,7 @@ - dependencies.add("avplugin-ffmpeg-57"); - dependencies.add("avplugin-ffmpeg-58"); - dependencies.add("avplugin-ffmpeg-59"); -+ dependencies.add("avplugin-ffmpeg-60"); - } - if (HostUtils.isMacOSX()) { - dependencies.add("fxplugins"); -diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c -index 9f67de9062..ee64e4bafd 100644 ---- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c -+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c -@@ -146,7 +146,7 @@ - // For ffmpeg (libavcodec-ffmpeg.so) - static const int AVCODEC_FFMPEG_EXPLICIT_VERSIONS[] = { 56 }; - // For libav or ffmpeg (libavcodec.so) --static const int AVCODEC_EXPLICIT_VERSIONS[] = { 57, 58, 59 }; -+static const int AVCODEC_EXPLICIT_VERSIONS[] = { 57, 58, 59, 60 }; - - /* - * Callback passed to dl_iterate_phdr(): finds the path of diff --git a/pkgs/development/compilers/openjdk/openjfx/backport-ffmpeg-7-support-jfx11.patch b/pkgs/development/compilers/openjdk/openjfx/backport-ffmpeg-7-support-jfx11.patch deleted file mode 100644 index edd49ddf4a99..000000000000 --- a/pkgs/development/compilers/openjdk/openjfx/backport-ffmpeg-7-support-jfx11.patch +++ /dev/null @@ -1,155 +0,0 @@ -Backported from <https://github.com/openjdk/jfx/pull/1552>. - -Original author: Alexander Matveev <alexander.matveev@oracle.com> - -diff --git a/build.gradle b/build.gradle -index d1ae3b401f..848a385f36 100644 ---- a/build.gradle -+++ b/build.gradle -@@ -3343,6 +3343,7 @@ - media name: "ffmpeg-4.0.2", ext: "tar.gz" - media name: "ffmpeg-5.1.2", ext: "tar.gz" - media name: "ffmpeg-6.0", ext: "tar.gz" -+ media name: "ffmpeg-7.0.2", ext: "tar.gz" - } - implementation project(":base") - implementation project(":graphics") -@@ -3689,8 +3690,8 @@ - doLast { - project.ext.libav = [:] - project.ext.libav.basedir = "${buildDir}/native/linux/ffmpeg" -- project.ext.libav.versions = [ "3.3.3", "4.0.2", "5.1.2", "6.0" ] -- project.ext.libav.versionmap = [ "3.3.3" : "57", "4.0.2" : "58", "5.1.2" : "59", "6.0" : "60" ] -+ project.ext.libav.versions = [ "3.3.3", "4.0.2", "5.1.2", "6.0", "7.0.2" ] -+ project.ext.libav.versionmap = [ "3.3.3" : "57", "4.0.2" : "58", "5.1.2" : "59", "6.0" : "60", "7.0.2" : "61" ] - - libav.versions.each { version -> - def libavDir = "${libav.basedir}/ffmpeg-${version}" -@@ -3770,7 +3771,7 @@ - project.ext.libav.libavffmpeg.versions = [ "56" ] - project.ext.libav.ffmpeg = [:] - project.ext.libav.ffmpeg.basedir = "${buildDir}/native/linux/ffmpeg/ffmpeg" -- project.ext.libav.ffmpeg.versions = [ "57", "58", "59", "60" ] -+ project.ext.libav.ffmpeg.versions = [ "57", "58", "59", "60", "61" ] - - project.ext.libav.versions.each { version -> - def libavDir = "${project.ext.libav.basedir}-${version}" -diff --git a/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java b/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java -index b05bb68341..2add519ed4 100644 ---- a/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java -+++ b/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -126,6 +126,7 @@ - dependencies.add("avplugin-ffmpeg-58"); - dependencies.add("avplugin-ffmpeg-59"); - dependencies.add("avplugin-ffmpeg-60"); -+ dependencies.add("avplugin-ffmpeg-61"); - } - if (HostUtils.isMacOSX()) { - dependencies.add("fxplugins"); -diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c -index ee64e4bafd..0204db4250 100644 ---- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c -+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c -@@ -146,7 +146,7 @@ - // For ffmpeg (libavcodec-ffmpeg.so) - static const int AVCODEC_FFMPEG_EXPLICIT_VERSIONS[] = { 56 }; - // For libav or ffmpeg (libavcodec.so) --static const int AVCODEC_EXPLICIT_VERSIONS[] = { 57, 58, 59, 60 }; -+static const int AVCODEC_EXPLICIT_VERSIONS[] = { 57, 58, 59, 60, 61 }; - - /* - * Callback passed to dl_iterate_phdr(): finds the path of -diff --git a/modules/javafx.media/src/main/native/gstreamer/plugins/av/avdefines.h b/modules/javafx.media/src/main/native/gstreamer/plugins/av/avdefines.h -index bb93df5f96..a09b954714 100644 ---- a/modules/javafx.media/src/main/native/gstreamer/plugins/av/avdefines.h -+++ b/modules/javafx.media/src/main/native/gstreamer/plugins/av/avdefines.h -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -50,5 +50,14 @@ - // Do not call avcodec_register_all() and av_register_all() - // Not required since 58 and removed in 59 - #define NO_REGISTER_ALL (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(59,0,0)) -+ -+// Do not use reordered_opaque to pass PTS. Use AVPacket.pts/AVFrame.pts instead. -+// reordered_opaque is removed since 61. -+#define NO_REORDERED_OPAQUE (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61,0,0)) -+ -+// Use AVCodecContext.frame_num instead of AVCodecContext.frame_number. They same -+// except frame_num is 64-bit and frame_number is 32-bit. Since 61. -+#define USE_FRAME_NUM (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61,0,0)) -+ - #endif /* AVDEFINES_H */ - -diff --git a/modules/javafx.media/src/main/native/gstreamer/plugins/av/videodecoder.c b/modules/javafx.media/src/main/native/gstreamer/plugins/av/videodecoder.c -index fe1f96b9cb..9179ef8b68 100644 ---- a/modules/javafx.media/src/main/native/gstreamer/plugins/av/videodecoder.c -+++ b/modules/javafx.media/src/main/native/gstreamer/plugins/av/videodecoder.c -@@ -397,10 +397,17 @@ - if (av_new_packet(&decoder->packet, info.size) == 0) - { - memcpy(decoder->packet.data, info.data, info.size); -+#if NO_REORDERED_OPAQUE -+ if (GST_BUFFER_TIMESTAMP_IS_VALID(buf)) -+ decoder->packet.pts = (int64_t)GST_BUFFER_TIMESTAMP(buf); -+ else -+ decoder->packet.pts = AV_NOPTS_VALUE; -+#else // NO_REORDERED_OPAQUE - if (GST_BUFFER_TIMESTAMP_IS_VALID(buf)) - base->context->reordered_opaque = GST_BUFFER_TIMESTAMP(buf); - else - base->context->reordered_opaque = AV_NOPTS_VALUE; -+#endif // NO_REORDERED_OPAQUE - #if USE_SEND_RECEIVE - num_dec = avcodec_send_packet(base->context, &decoder->packet); - if (num_dec == 0) -@@ -432,10 +439,17 @@ - av_init_packet(&decoder->packet); - decoder->packet.data = info.data; - decoder->packet.size = info.size; -+#if NO_REORDERED_OPAQUE -+ if (GST_BUFFER_TIMESTAMP_IS_VALID(buf)) -+ decoder->packet.pts = (int64_t)GST_BUFFER_TIMESTAMP(buf); -+ else -+ decoder->packet.pts = AV_NOPTS_VALUE; -+#else // NO_REORDERED_OPAQUE - if (GST_BUFFER_TIMESTAMP_IS_VALID(buf)) - base->context->reordered_opaque = GST_BUFFER_TIMESTAMP(buf); - else - base->context->reordered_opaque = AV_NOPTS_VALUE; -+#endif // NO_REORDERED_OPAQUE - - #if USE_SEND_RECEIVE - num_dec = avcodec_send_packet(base->context, &decoder->packet); -@@ -480,10 +494,20 @@ - } - else - { -+#if USE_FRAME_NUM -+ GST_BUFFER_OFFSET(outbuf) = base->context->frame_num; -+#else // USE_FRAME_NUM - GST_BUFFER_OFFSET(outbuf) = base->context->frame_number; -+#endif // USE_FRAME_NUM -+#if NO_REORDERED_OPAQUE -+ if (base->frame->pts != AV_NOPTS_VALUE) -+ { -+ GST_BUFFER_TIMESTAMP(outbuf) = base->frame->pts; -+#else // NO_REORDERED_OPAQUE - if (base->frame->reordered_opaque != AV_NOPTS_VALUE) - { - GST_BUFFER_TIMESTAMP(outbuf) = base->frame->reordered_opaque; -+#endif // NO_REORDERED_OPAQUE - GST_BUFFER_DURATION(outbuf) = GST_BUFFER_DURATION(buf); // Duration for video usually same - } - diff --git a/pkgs/development/compilers/openjdk/openjfx/backport-ffmpeg-7-support-jfx21.patch b/pkgs/development/compilers/openjdk/openjfx/backport-ffmpeg-7-support-jfx21.patch deleted file mode 100644 index 3e746b0cab8f..000000000000 --- a/pkgs/development/compilers/openjdk/openjfx/backport-ffmpeg-7-support-jfx21.patch +++ /dev/null @@ -1,213 +0,0 @@ -Backported from <https://github.com/openjdk/jfx/pull/1552>. - -Original author: Alexander Matveev <alexander.matveev@oracle.com> - -diff --git a/build.gradle b/build.gradle -index f9dbc53076..77856226a6 100644 ---- a/build.gradle -+++ b/build.gradle -@@ -2946,6 +2946,7 @@ - media name: "ffmpeg-4.0.2", ext: "tar.gz" - media name: "ffmpeg-5.1.2", ext: "tar.gz" - media name: "ffmpeg-6.0", ext: "tar.gz" -+ media name: "ffmpeg-7.0.2", ext: "tar.gz" - } - implementation project(":base") - implementation project(":graphics") -@@ -3292,8 +3293,8 @@ - doLast { - project.ext.libav = [:] - project.ext.libav.basedir = "${buildDir}/native/linux/ffmpeg" -- project.ext.libav.versions = [ "3.3.3", "4.0.2", "5.1.2", "6.0" ] -- project.ext.libav.versionmap = [ "3.3.3" : "57", "4.0.2" : "58", "5.1.2" : "59", "6.0" : "60" ] -+ project.ext.libav.versions = [ "3.3.3", "4.0.2", "5.1.2", "6.0", "7.0.2" ] -+ project.ext.libav.versionmap = [ "3.3.3" : "57", "4.0.2" : "58", "5.1.2" : "59", "6.0" : "60", "7.0.2" : "61" ] - - libav.versions.each { version -> - def libavDir = "${libav.basedir}/ffmpeg-${version}" -@@ -3373,7 +3374,7 @@ - project.ext.libav.libavffmpeg.versions = [ "56" ] - project.ext.libav.ffmpeg = [:] - project.ext.libav.ffmpeg.basedir = "${buildDir}/native/linux/ffmpeg/ffmpeg" -- project.ext.libav.ffmpeg.versions = [ "57", "58", "59", "60" ] -+ project.ext.libav.ffmpeg.versions = [ "57", "58", "59", "60", "61" ] - - project.ext.libav.versions.each { version -> - def libavDir = "${project.ext.libav.basedir}-${version}" -diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml -index 887b9d100c..a10610b0f5 100644 ---- a/gradle/verification-metadata.xml -+++ b/gradle/verification-metadata.xml -@@ -28,6 +28,11 @@ - <sha256 value="f4ccf961403752c93961927715f524576d1f4dd02cd76d8c76aed3bbe6686656" origin="Generated by Gradle"/> - </artifact> - </component> -+ <component group="" name="ffmpeg-7.0.2" version=""> -+ <artifact name="ffmpeg-7.0.2-.tar.gz"> -+ <sha256 value="1233b3a93dd7517cc3c56b72a67f64041c044848d981e3deff4bebffa25f1054" origin="Generated by Gradle"/> -+ </artifact> -+ </component> - <component group="" name="icu4c-73_1-data-bin-l" version=""> - <artifact name="icu4c-73_1-data-bin-l-.zip"> - <sha256 value="4038298ee02a0c38917185ef8ff4ebde9c8b552c777fd03e4df6c6b4b1825e20" origin="Generated by Gradle"/> -diff --git a/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java b/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java -index 097004bd17..0c2ae1ddbc 100644 ---- a/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java -+++ b/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2010, 2023, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -127,6 +127,7 @@ - dependencies.add("avplugin-ffmpeg-58"); - dependencies.add("avplugin-ffmpeg-59"); - dependencies.add("avplugin-ffmpeg-60"); -+ dependencies.add("avplugin-ffmpeg-61"); - } - if (PlatformUtil.isMac()) { - dependencies.add("fxplugins"); -diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c -index 22c8be9300..38bae197fe 100644 ---- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c -+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c -@@ -146,7 +146,7 @@ - // For ffmpeg (libavcodec-ffmpeg.so) - static const int AVCODEC_FFMPEG_EXPLICIT_VERSIONS[] = { 56 }; - // For libav or ffmpeg (libavcodec.so) --static const int AVCODEC_EXPLICIT_VERSIONS[] = { 57, 58, 59, 60 }; -+static const int AVCODEC_EXPLICIT_VERSIONS[] = { 57, 58, 59, 60, 61 }; - - /* - * Callback passed to dl_iterate_phdr(): finds the path of -diff --git a/modules/javafx.media/src/main/native/gstreamer/plugins/av/avdefines.h b/modules/javafx.media/src/main/native/gstreamer/plugins/av/avdefines.h -index 60fa7b631c..f49ad56e1e 100644 ---- a/modules/javafx.media/src/main/native/gstreamer/plugins/av/avdefines.h -+++ b/modules/javafx.media/src/main/native/gstreamer/plugins/av/avdefines.h -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -53,5 +53,13 @@ - // Not required since 58 and removed in 59 - #define NO_REGISTER_ALL (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(59,0,0)) - -+// Do not use reordered_opaque to pass PTS. Use AVPacket.pts/AVFrame.pts instead. -+// reordered_opaque is removed since 61. -+#define NO_REORDERED_OPAQUE (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61,0,0)) -+ -+// Use AVCodecContext.frame_num instead of AVCodecContext.frame_number. They same -+// except frame_num is 64-bit and frame_number is 32-bit. Since 61. -+#define USE_FRAME_NUM (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61,0,0)) -+ - #endif /* AVDEFINES_H */ - -diff --git a/modules/javafx.media/src/main/native/gstreamer/plugins/av/videodecoder.c b/modules/javafx.media/src/main/native/gstreamer/plugins/av/videodecoder.c -index c9fa787e63..8a5cd78f2d 100644 ---- a/modules/javafx.media/src/main/native/gstreamer/plugins/av/videodecoder.c -+++ b/modules/javafx.media/src/main/native/gstreamer/plugins/av/videodecoder.c -@@ -554,7 +554,11 @@ - if (ret < 0) - return FALSE; - -+#if NO_REORDERED_OPAQUE -+ decoder->dest_frame->pts = base->frame->pts; -+#else // NO_REORDERED_OPAQUE - decoder->dest_frame->reordered_opaque = base->frame->reordered_opaque; -+#endif // NO_REORDERED_OPAQUE - - return TRUE; - } -@@ -679,7 +683,7 @@ - GstMapInfo info2; - gboolean unmap_buf = FALSE; - gboolean set_frame_values = TRUE; -- int64_t reordered_opaque = AV_NOPTS_VALUE; -+ int64_t pts = AV_NOPTS_VALUE; - unsigned int out_buf_size = 0; - gboolean copy_error = FALSE; - uint8_t* data0 = NULL; -@@ -711,10 +715,17 @@ - if (av_new_packet(&decoder->packet, info.size) == 0) - { - memcpy(decoder->packet.data, info.data, info.size); -+#if NO_REORDERED_OPAQUE -+ if (GST_BUFFER_TIMESTAMP_IS_VALID(buf)) -+ decoder->packet.pts = (int64_t)GST_BUFFER_TIMESTAMP(buf); -+ else -+ decoder->packet.pts = AV_NOPTS_VALUE; -+#else // NO_REORDERED_OPAQUE - if (GST_BUFFER_TIMESTAMP_IS_VALID(buf)) - base->context->reordered_opaque = GST_BUFFER_TIMESTAMP(buf); - else - base->context->reordered_opaque = AV_NOPTS_VALUE; -+#endif // NO_REORDERED_OPAQUE - #if USE_SEND_RECEIVE - num_dec = avcodec_send_packet(base->context, &decoder->packet); - if (num_dec == 0) -@@ -746,10 +757,17 @@ - av_init_packet(&decoder->packet); - decoder->packet.data = info.data; - decoder->packet.size = info.size; -+#if NO_REORDERED_OPAQUE -+ if (GST_BUFFER_TIMESTAMP_IS_VALID(buf)) -+ decoder->packet.pts = (int64_t)GST_BUFFER_TIMESTAMP(buf); -+ else -+ decoder->packet.pts = AV_NOPTS_VALUE; -+#else // NO_REORDERED_OPAQUE - if (GST_BUFFER_TIMESTAMP_IS_VALID(buf)) - base->context->reordered_opaque = GST_BUFFER_TIMESTAMP(buf); - else - base->context->reordered_opaque = AV_NOPTS_VALUE; -+#endif // NO_REORDERED_OPAQUE - - #if USE_SEND_RECEIVE - num_dec = avcodec_send_packet(base->context, &decoder->packet); -@@ -796,7 +814,11 @@ - goto _exit; - } - -- reordered_opaque = decoder->dest_frame->reordered_opaque; -+#if NO_REORDERED_OPAQUE -+ pts = decoder->dest_frame->pts; -+#else // NO_REORDERED_OPAQUE -+ pts = decoder->dest_frame->reordered_opaque; -+#endif // NO_REORDERED_OPAQUE - data0 = decoder->dest_frame->data[0]; - data1 = decoder->dest_frame->data[1]; - data2 = decoder->dest_frame->data[2]; -@@ -806,7 +828,11 @@ - - if (set_frame_values) - { -- reordered_opaque = base->frame->reordered_opaque; -+#if NO_REORDERED_OPAQUE -+ pts = base->frame->pts; -+#else // NO_REORDERED_OPAQUE -+ pts = base->frame->reordered_opaque; -+#endif // NO_REORDERED_OPAQUE - data0 = base->frame->data[0]; - data1 = base->frame->data[1]; - data2 = base->frame->data[2]; -@@ -825,10 +851,14 @@ - } - else - { -+#if USE_FRAME_NUM -+ GST_BUFFER_OFFSET(outbuf) = base->context->frame_num; -+#else // USE_FRAME_NUM - GST_BUFFER_OFFSET(outbuf) = base->context->frame_number; -- if (reordered_opaque != AV_NOPTS_VALUE) -+#endif // USE_FRAME_NUM -+ if (pts != AV_NOPTS_VALUE) - { -- GST_BUFFER_TIMESTAMP(outbuf) = reordered_opaque; -+ GST_BUFFER_TIMESTAMP(outbuf) = pts; - GST_BUFFER_DURATION(outbuf) = GST_BUFFER_DURATION(buf); // Duration for video usually same - } - diff --git a/pkgs/development/compilers/opensmalltalk-vm/default.nix b/pkgs/development/compilers/opensmalltalk-vm/default.nix index ef238ebaf306..3ac761b42319 100644 --- a/pkgs/development/compilers/opensmalltalk-vm/default.nix +++ b/pkgs/development/compilers/opensmalltalk-vm/default.nix @@ -118,10 +118,12 @@ let platformDir = "linux64ARMv8"; vmName = "squeak.cog.spur"; scriptName = "squeak"; - configureFlagsArray = ''( - CFLAGS="-DNDEBUG -DDEBUGVM=0 -DMUSL -D_GNU_SOURCE -DUSEEVDEV -DCOGMTVM=0 -DDUAL_MAPPED_CODE_ZONE=1" - LIBS="-lrt" - )''; + configureFlagsArray = '' + ( + CFLAGS="-DNDEBUG -DDEBUGVM=0 -DMUSL -D_GNU_SOURCE -DUSEEVDEV -DCOGMTVM=0 -DDUAL_MAPPED_CODE_ZONE=1" + LIBS="-lrt" + ) + ''; configureFlags = [ "--with-vmversion=5.0" "--with-src=src/spur64.cog" @@ -134,9 +136,11 @@ let platformDir = "linux64ARMv8"; vmName = "squeak.stack.spur"; scriptName = "squeak"; - configureFlagsArray = ''( - CFLAGS="-DNDEBUG -DDEBUGVM=0 -DMUSL -D_GNU_SOURCE -DUSEEVDEV -D__ARM_ARCH_ISA_A64 -DARM64 -D__arm__ -D__arm64__ -D__aarch64__" - )''; + configureFlagsArray = '' + ( + CFLAGS="-DNDEBUG -DDEBUGVM=0 -DMUSL -D_GNU_SOURCE -DUSEEVDEV -D__ARM_ARCH_ISA_A64 -DARM64 -D__arm__ -D__arm64__ -D__aarch64__" + ) + ''; configureFlags = [ "--with-vmversion=5.0" "--with-src=src/spur64.stack" @@ -151,9 +155,11 @@ let platformDir = "linux64x64"; vmName = "newspeak.cog.spur"; scriptName = "newspeak"; - configureFlagsArray = ''( - CFLAGS="-DNDEBUG -DDEBUGVM=0" - )''; + configureFlagsArray = '' + ( + CFLAGS="-DNDEBUG -DDEBUGVM=0" + ) + ''; configureFlags = [ "--with-vmversion=5.0" "--with-src=src/spur64.cog.newspeak" @@ -166,9 +172,11 @@ let platformDir = "linux64x64"; vmName = "squeak.cog.spur"; scriptName = "squeak"; - configureFlagsArray = ''( - CFLAGS="-DNDEBUG -DDEBUGVM=0 -DCOGMTVM=0" - )''; + configureFlagsArray = '' + ( + CFLAGS="-DNDEBUG -DDEBUGVM=0 -DCOGMTVM=0" + ) + ''; configureFlags = [ "--with-vmversion=5.0" "--with-src=src/spur64.cog" diff --git a/pkgs/development/compilers/openspin/default.nix b/pkgs/development/compilers/openspin/default.nix deleted file mode 100644 index 5bf0ff64d354..000000000000 --- a/pkgs/development/compilers/openspin/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation { - pname = "openspin"; - version = "unstable-2018-10-02"; - - src = fetchFromGitHub { - owner = "parallaxinc"; - repo = "OpenSpin"; - rev = "f3a587ed3e4f6a50b3c8d2022bbec5676afecedb"; - sha256 = "1knkbzdanb60cwp7mggymkhd0167lh2sb1c00d1vhw7s0s1rj96n"; - }; - - installPhase = '' - mkdir -p $out/bin - mv build/openspin $out/bin/openspin - ''; - - meta = with lib; { - description = "Compiler for SPIN/PASM languages for Parallax Propeller MCU"; - mainProgram = "openspin"; - homepage = "https://github.com/parallaxinc/OpenSpin"; - license = licenses.mit; - maintainers = [ maintainers.redvers ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh b/pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh deleted file mode 100644 index 459bfce50988..000000000000 --- a/pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh +++ /dev/null @@ -1,60 +0,0 @@ -source $stdenv/setup - -echo "Unpacking distribution" -unzip ${src} || true - -# set the dynamic linker of unpack200, necessary for construct script -echo "patching unpack200" -patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "" */bin/unpack200 - -echo "constructing JDK and JRE installations" -if test -z "$installjdk"; then - sh ${construct} . tmp-linux-jdk tmp-linux-jre - mkdir -p $out - cp -R tmp-linux-jre/* $out -else - sh ${construct} . $out tmp-linux-jre -fi - -echo "removing files at top level of installation" -for file in $out/* -do - if test -f $file ; then - rm $file - fi -done -rm -rf $out/docs - -# construct the rpath -rpath= -for i in $libraries; do - rpath=$rpath${rpath:+:}$i/lib -done - -if test -z "$installjdk"; then - jrePath=$out -else - jrePath=$out/jre -fi - -if test -n "$jce"; then - unzip $jce - cp -v jce/*.jar $jrePath/lib/security -fi - -rpath=$rpath${rpath:+:}$jrePath/lib/$architecture/jli - -# set all the dynamic linkers -find $out -type f -perm -0100 \ - -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$rpath" {} \; - -find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \; - -if test -z "$pluginSupport"; then - rm -f $out/bin/javaws -fi - -mkdir $jrePath/lib/$architecture/plugins -ln -s $jrePath/lib/$architecture/libnpjp2.so $jrePath/lib/$architecture/plugins - diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix deleted file mode 100644 index d03419e96570..000000000000 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ /dev/null @@ -1,190 +0,0 @@ -{ productVersion -, patchVersion -, sha256 -, jceName -, sha256JCE -}: - -{ swingSupport ? true -, lib, stdenv -, requireFile -, makeWrapper -, unzip -, file -, xorg ? null -, installjdk ? true -, pluginSupport ? true -, installjce ? false -, config -, glib -, libxml2 -, ffmpeg -, libxslt -, libGL -, freetype -, fontconfig -, gtk2 -, pango -, cairo -, alsa-lib -, atk -, gdk-pixbuf -, setJavaClassPath -}: - -assert swingSupport -> xorg != null; - -let - - /** - * The JRE libraries are in directories that depend on the CPU. - */ - architecture = { - i686-linux = "i386"; - x86_64-linux = "amd64"; - armv7l-linux = "arm"; - aarch64-linux = "aarch64"; - }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); - - jce = - if installjce then - requireFile { - name = jceName; - url = "http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html"; - sha256 = sha256JCE; - } - else - ""; - - rSubPaths = [ - "lib/${architecture}/jli" - "lib/${architecture}/server" - "lib/${architecture}/xawt" - "lib/${architecture}" - ]; - -in - -let result = stdenv.mkDerivation rec { - pname = if installjdk then "oraclejdk" else "oraclejre" + lib.optionalString pluginSupport "-with-plugin"; - version = "${productVersion}u${patchVersion}"; - - src = - let - platformName = { - i686-linux = "linux-i586"; - x86_64-linux = "linux-x64"; - armv7l-linux = "linux-arm32-vfp-hflt"; - aarch64-linux = "linux-aarch64"; - }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); - in requireFile { - name = "jdk-${productVersion}u${patchVersion}-${platformName}.tar.gz"; - url = "http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html"; - sha256 = sha256.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); - }; - - nativeBuildInputs = [ file makeWrapper ] - ++ lib.optional installjce unzip; - - # See: https://github.com/NixOS/patchelf/issues/10 - dontStrip = 1; - - installPhase = '' - cd .. - - if test -z "$installjdk"; then - mv $sourceRoot/jre $out - else - mv $sourceRoot $out - fi - - shopt -s extglob - for file in $out/!(*src.zip) - do - if test -f $file ; then - rm $file - fi - done - - if test -n "$installjdk"; then - for file in $out/jre/* - do - if test -f $file ; then - rm $file - fi - done - fi - - if test -z "$installjdk"; then - jrePath=$out - else - jrePath=$out/jre - fi - - if test -n "${jce}"; then - unzip ${jce} - cp -v UnlimitedJCEPolicy*/*.jar $jrePath/lib/security - fi - - if test -z "$pluginSupport"; then - rm -f $out/bin/javaws - if test -n "$installjdk"; then - rm -f $out/jre/bin/javaws - fi - fi - - mkdir $jrePath/lib/${architecture}/plugins - ln -s $jrePath/lib/${architecture}/libnpjp2.so $jrePath/lib/${architecture}/plugins - - mkdir -p $out/nix-support - printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs - - # Set JAVA_HOME automatically. - cat <<EOF >> $out/nix-support/setup-hook - if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi - EOF - ''; - - postFixup = '' - rpath+="''${rpath:+:}${lib.concatStringsSep ":" (map (a: "$jrePath/${a}") rSubPaths)}" - - # set all the dynamic linkers - find $out -type f -perm -0100 \ - -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$rpath" {} \; - - find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \; - - # Oracle Java Mission Control needs to know where libgtk-x11 and related is - if test -n "$installjdk" -a -x $out/bin/jmc; then - wrapProgram "$out/bin/jmc" \ - --suffix-each LD_LIBRARY_PATH ':' "$rpath" - fi - ''; - - inherit installjdk pluginSupport; - - /** - * libXt is only needed on amd64 - */ - libraries = - [stdenv.cc.libc glib libxml2 ffmpeg libxslt libGL xorg.libXxf86vm alsa-lib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk] ++ - lib.optionals swingSupport [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc]; - - rpath = lib.strings.makeLibraryPath libraries; - - passthru.mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins"; - - passthru.jre = result; # FIXME: use multiple outputs or return actual JRE package - - passthru.home = result; - - passthru.architecture = architecture; - - meta = with lib; { - license = licenses.unfree; - platforms = [ "i686-linux" "x86_64-linux" "armv7l-linux" "aarch64-linux" ]; # some inherit jre.meta.platforms - mainProgram = "java"; - }; - -}; in result diff --git a/pkgs/development/compilers/oraclejdk/jdk11-linux.nix b/pkgs/development/compilers/oraclejdk/jdk11-linux.nix deleted file mode 100644 index a232b796a068..000000000000 --- a/pkgs/development/compilers/oraclejdk/jdk11-linux.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib, stdenv -, requireFile -, xorg -, zlib -, freetype -, alsa-lib -, setJavaClassPath -}: - -let result = stdenv.mkDerivation rec { - pname = "oraclejdk"; - version = "11.0.10"; - - src = requireFile { - name = "jdk-${version}_linux-x64_bin.tar.gz"; - url = "https://www.oracle.com/java/technologies/javase-jdk11-downloads.html"; - sha256 = "94bd34f85ee38d3ef59e5289ec7450b9443b924c55625661fffe66b03f2c8de2"; - }; - - installPhase = '' - mv ../$sourceRoot $out - - mkdir -p $out/nix-support - printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs - - # Set JAVA_HOME automatically. - cat <<EOF >> $out/nix-support/setup-hook - if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi - EOF - ''; - - postFixup = '' - rpath="$out/lib/jli:$out/lib/server:$out/lib:${lib.strings.makeLibraryPath [ zlib xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender freetype alsa-lib]}" - - for f in $(find $out -name "*.so") $(find $out -type f -perm -0100); do - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" || true - patchelf --set-rpath "$rpath" "$f" || true - done - - for f in $(find $out -name "*.so") $(find $out -type f -perm -0100); do - if ldd "$f" | fgrep 'not found'; then echo "in file $f"; fi - done - ''; - - passthru.jre = result; - passthru.home = result; - - dontStrip = true; # See: https://github.com/NixOS/patchelf/issues/10 - - meta = with lib; { - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; - }; -}; in result diff --git a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix deleted file mode 100644 index 206df75b9ebf..000000000000 --- a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix +++ /dev/null @@ -1,10 +0,0 @@ -import ./jdk-linux-base.nix { - productVersion = "8"; - patchVersion = "281"; - sha256.i686-linux = "/yEY5O6MYNyjS5YSGZtgydb8th6jHQLNvI9tNPIh3+0="; - sha256.x86_64-linux = "hejH2nJIx0UPsQVWeniEHQlzWXhQd2wkpSf+sC7z5YY="; - sha256.armv7l-linux = "oXbW8hZxesDqwV79ANB4SdnS71O51ZApKbQhqq4i/EM="; - sha256.aarch64-linux = "oFH3TeIzVsFk6IZcDEHVDVJC7dSbGcwhdUH/WUXSNDM="; - jceName = "jce_policy-8.zip"; - sha256JCE = "19n5wadargg3v8x76r7ayag6p2xz1bwhrgdzjs9f4i6fvxz9jr4w"; -} diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix deleted file mode 100644 index 18b99d5ba69a..000000000000 --- a/pkgs/development/compilers/orc/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ lib -, stdenv -, fetchurl -, meson -, ninja -, file -, docbook_xsl -, gtk-doc ? null -, buildDevDoc ? gtk-doc != null - -# for passthru.tests -, gnuradio -, gst_all_1 -, qt6 -, vips - -}: let - inherit (lib) optional optionals; -in stdenv.mkDerivation rec { - pname = "orc"; - version = "0.4.39"; - - src = fetchurl { - url = "https://gstreamer.freedesktop.org/src/orc/${pname}-${version}.tar.xz"; - sha256 = "sha256-M+0jh/Sbgl+hucOwBy4F8lkUG4lUdK0IWuURQ9MEDMA="; - }; - - postPatch = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' - # This benchmark times out on Hydra.nixos.org - sed -i '/memcpy_speed/d' testsuite/meson.build - ''; - - outputs = [ "out" "dev" ] - ++ optional buildDevDoc "devdoc" - ; - outputBin = "dev"; # compilation tools - - mesonFlags = - optionals (!buildDevDoc) [ "-Dgtk_doc=disabled" ] - ; - - nativeBuildInputs = [ meson ninja ] - ++ optionals buildDevDoc [ gtk-doc file docbook_xsl ] - ; - - # https://gitlab.freedesktop.org/gstreamer/orc/-/issues/41 - doCheck = !(stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12"); - - passthru.tests = { - inherit (gst_all_1) gst-plugins-good gst-plugins-bad gst-plugins-ugly; - inherit gnuradio vips; - qt6-qtmultimedia = qt6.qtmultimedia; - }; - - meta = with lib; { - description = "Oil Runtime Compiler"; - homepage = "https://gstreamer.freedesktop.org/projects/orc.html"; - changelog = "https://cgit.freedesktop.org/gstreamer/orc/plain/RELEASE?h=${version}"; - # The source code implementing the Marsenne Twister algorithm is licensed - # under the 3-clause BSD license. The rest is 2-clause BSD license. - license = with licenses; [ bsd3 bsd2 ]; - platforms = platforms.unix; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix index b7ad7537c7e1..f485998d1cfa 100644 --- a/pkgs/development/compilers/osl/default.nix +++ b/pkgs/development/compilers/osl/default.nix @@ -24,13 +24,13 @@ let in stdenv.mkDerivation rec { pname = "openshadinglanguage"; - version = "1.13.10.0"; + version = "1.13.11.0"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "OpenShadingLanguage"; rev = "v${version}"; - hash = "sha256-tjfg9cGbfL0D+KcxtWgQF6gY9sCjxEjyGNxFZyPhJ/U="; + hash = "sha256-E/LUTtT0ZU0SBuwtJPA0FznvOuc2a3aJn2/n3ru5l0s="; }; cmakeFlags = [ @@ -68,7 +68,7 @@ in stdenv.mkDerivation rec { python3.pkgs.pybind11 util-linux # needed just for hexdump zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libxml2 ]; diff --git a/pkgs/development/compilers/owl-lisp/default.nix b/pkgs/development/compilers/owl-lisp/default.nix deleted file mode 100644 index 86b7242c31dd..000000000000 --- a/pkgs/development/compilers/owl-lisp/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchFromGitLab, which }: - -stdenv.mkDerivation rec { - pname = "owl-lisp"; - version = "0.2.2"; - - src = fetchFromGitLab { - owner = "owl-lisp"; - repo = "owl"; - rev = "v${version}"; - hash = "sha256-GfvOkYLo8fgAvGuUa59hDy+sWJSwyntwqMO8TAK/lUo="; - }; - - nativeBuildInputs = [ which ]; - - makeFlags = [ "PREFIX=${placeholder "out"}" "CC=${stdenv.cc.targetPrefix}cc" ]; - - # tests are run as part of the compilation process - doCheck = false; - - meta = with lib; { - description = "Functional Scheme for world domination"; - homepage = "https://gitlab.com/owl-lisp/owl"; - license = licenses.mit; - maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/compilers/paco/default.nix b/pkgs/development/compilers/paco/default.nix deleted file mode 100644 index 8fa27994ec3d..000000000000 --- a/pkgs/development/compilers/paco/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: - -buildGoModule rec { - pname = "paco"; - version = "1.0"; - - src = fetchFromGitHub { - owner = "pacolang"; - repo = "paco"; - rev = "v${version}"; - hash = "sha256-sCU7cjmsUTrhf/7Lm3wBPKwk80SAhCfc4lrCBggspw8="; - }; - - vendorHash = "sha256-J0TKp1df5IWq3Irlzf1lvhWlXnP//MsVqs9M8TtEraw="; - - patches = [ - # Set correct package path in go.mod - (fetchpatch { - url = "https://github.com/pacolang/paco/pull/1/commits/886f0407e94418d34c7e062c6857834aea3c99ac.patch"; - hash = "sha256-HRNJSyWz1OY+kCV+eaRJbaDXkH4n1NaMpFxCuEhocK4="; - }) - ]; - - subPackages = [ "." ]; - - ldflags = [ "-s" "-w" ]; - - meta = with lib; { - description = "Simple compiled programming language"; - mainProgram = "paco"; - homepage = "https://github.com/pacolang/paco"; - license = licenses.mit; - maintainers = with maintainers; [ hugolgst ]; - }; -} diff --git a/pkgs/development/compilers/pakcs/default.nix b/pkgs/development/compilers/pakcs/default.nix index 768d125cfff4..625bab0cab31 100644 --- a/pkgs/development/compilers/pakcs/default.nix +++ b/pkgs/development/compilers/pakcs/default.nix @@ -1,32 +1,43 @@ -{ lib, stdenv, fetchurl, makeWrapper +{ lib, stdenv, fetchurl, fetchpatch2, makeWrapper , haskellPackages, haskell -, which, swiProlog, rlwrap, tk +, which, swi-prolog, rlwrap, tk , curl, git, unzip, gnutar, coreutils, sqlite }: let pname = "pakcs"; - version = "3.6.0"; + version = "3.7.2"; # Don't switch to "Current release" without a reason, because its # source updates without version bump. Prefer last from "Older releases" instead. src = fetchurl { url = "https://www.informatik.uni-kiel.de/~pakcs/download/pakcs-${version}-src.tar.gz"; - hash = "sha256-1r6jEY3eEGESKcAepiziVbxpIvQLtCS6l0trBU3SGGo="; + hash = "sha256-ZfQUgFqmPPCeDx/T5G/JdvYDq/7XbvsgxPcEX4y9HZ4="; }; curry-frontend = (haskellPackages.override { overrides = self: super: { - curry-frontend = haskell.lib.compose.overrideCabal (drv: { - inherit src; - postUnpack = "sourceRoot+=/frontend"; - }) (super.callPackage ./curry-frontend.nix { }); + curry-frontend = lib.pipe (super.callPackage ./curry-frontend.nix { }) + [ haskell.lib.doJailbreak + (haskell.lib.compose.overrideCabal (drv: { + inherit src; + postUnpack = "sourceRoot+=/frontend"; + })) + (haskell.lib.compose.appendPatch + # mtl 2.3 compatibility has been fixed upstream but it's not in + # the release yet + (fetchpatch2 { + name = "fix-mtl-2.3.patch"; + url = "https://git.ps.informatik.uni-kiel.de/curry/curry-frontend/-/commit/3b26d2826141fee676da07939c2929a049279b70.diff"; + hash = "sha256-R3XjoUzAwTvDoUEAIIjmrSh2r4RHMqe00RMIs+7jFPY="; + })) + ]; }; }).curry-frontend; in stdenv.mkDerivation { inherit pname version src; - buildInputs = [ swiProlog ]; + buildInputs = [ swi-prolog ]; nativeBuildInputs = [ which makeWrapper ]; makeFlags = [ diff --git a/pkgs/development/compilers/passerine/default.nix b/pkgs/development/compilers/passerine/default.nix deleted file mode 100644 index 990d6ff078b2..000000000000 --- a/pkgs/development/compilers/passerine/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, fetchFromGitHub, rustPlatform }: - -rustPlatform.buildRustPackage rec { - pname = "passerine"; - version = "0.9.3"; - - src = fetchFromGitHub { - owner = "vrtbl"; - repo = "passerine"; - rev = "v${version}"; - hash = "sha256-TrbcULIJ9+DgQ4QsLYD5okxHoIusGJDw1PqJQwq1zu0="; - }; - - cargoHash = "sha256-A+sOT0rloAktDdVXe2HEPK25euh9T7c0rXybZmZpqC0="; - - meta = with lib; { - description = "Small extensible programming language designed for concise expression with little code"; - mainProgram = "passerine"; - homepage = "https://www.passerine.io/"; - license = licenses.mit; - maintainers = with maintainers; [ siraben ]; - }; -} diff --git a/pkgs/development/compilers/picat/default.nix b/pkgs/development/compilers/picat/default.nix deleted file mode 100644 index 04c80884670d..000000000000 --- a/pkgs/development/compilers/picat/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib, stdenv, fetchurl, zlib }: - -let - ARCH = { - x86_64-linux = "linux64"; - aarch64-linux = "linux64"; - x86_64-cygwin = "cygwin64"; - x86_64-darwin = "mac64"; - aarch64-darwin = "mac64"; - }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); -in -stdenv.mkDerivation { - pname = "picat"; - version = "3.6#8"; - - src = fetchurl { - url = "http://picat-lang.org/download/picat368_src.tar.gz"; - hash = "sha256-eJxF5atvJq3fhFltcQCGTP/sgUmfsfCohUgm3x2U1n0="; - }; - - buildInputs = [ zlib ]; - - inherit ARCH; - - hardeningDisable = [ "format" ]; - enableParallelBuilding = true; - - buildPhase = '' - cd emu - make -j $NIX_BUILD_CORES -f Makefile.$ARCH - ''; - installPhase = '' - mkdir -p $out/bin $out/share - cp picat $out/bin/ - cp -r ../doc $out/share/doc - cp -r ../exs $out/share/examples - ''; - - meta = with lib; { - description = "Logic-based programming language"; - mainProgram = "picat"; - homepage = "http://picat-lang.org/"; - license = licenses.mpl20; - platforms = [ - "x86_64-linux" - "aarch64-linux" - "x86_64-cygwin" - "x86_64-darwin" - "aarch64-darwin" - ]; - maintainers = with maintainers; [ earldouglas thoughtpolice ]; - }; -} diff --git a/pkgs/development/compilers/polyml/5.6.nix b/pkgs/development/compilers/polyml/5.6.nix index bcd52380701a..ee841882833c 100644 --- a/pkgs/development/compilers/polyml/5.6.nix +++ b/pkgs/development/compilers/polyml/5.6.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { pname = "polyml"; inherit version; - prePatch = lib.optionalString stdenv.isDarwin '' + prePatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace configure.ac --replace stdc++ c++ ''; @@ -20,7 +20,7 @@ stdenv.mkDerivation { }) ]; - nativeBuildInputs = lib.optional stdenv.isDarwin autoreconfHook; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin autoreconfHook; src = fetchurl { url = "mirror://sourceforge/polyml/polyml.${version}.tar.gz"; diff --git a/pkgs/development/compilers/polyml/5.7.nix b/pkgs/development/compilers/polyml/5.7.nix index f48377e0e0ac..471e8b2fd9f1 100644 --- a/pkgs/development/compilers/polyml/5.7.nix +++ b/pkgs/development/compilers/polyml/5.7.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "polyml"; version = "5.7.1"; - prePatch = lib.optionalString stdenv.isDarwin '' + prePatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace configure.ac --replace stdc++ c++ ''; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ libffi gmp ]; - nativeBuildInputs = lib.optional stdenv.isDarwin autoreconfHook; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin autoreconfHook; configureFlags = [ "--enable-shared" @@ -45,6 +45,6 @@ stdenv.mkDerivation rec { platforms = with platforms; (linux ++ darwin); maintainers = with maintainers; [ maggesi ]; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix index c82a88bb2793..067bdd018f27 100644 --- a/pkgs/development/compilers/polyml/default.nix +++ b/pkgs/development/compilers/polyml/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-72wm8dt+Id59A5058mVE5P9TkXW5/LZRthZoxUustVA="; }; - prePatch = lib.optionalString stdenv.isDarwin '' + prePatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace configure.ac --replace stdc++ c++ ''; buildInputs = [ libffi gmp ]; - nativeBuildInputs = lib.optional stdenv.isDarwin autoreconfHook; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin autoreconfHook; configureFlags = [ "--enable-shared" diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index b10739ca3363..1b3b24b0abea 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (rec { }; nativeBuildInputs = [ cmake makeWrapper which python3 ] - ++ lib.optionals (stdenv.isDarwin) [ cctools ]; + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ cctools ]; buildInputs = [ libxml2 z3 ]; # Sandbox disallows network access, so disabling problematic networking tests @@ -53,7 +53,7 @@ stdenv.mkDerivation (rec { hash = "sha256-/FWBSxZESwj/QvdNK5BI2EfonT64DP1eGBZR4O8uJww="; }; }) - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ (substituteAll { src = ./fix-darwin-build.patch; libSystem = darwin.Libsystem; @@ -85,21 +85,22 @@ stdenv.mkDerivation (rec { makeFlags = [ "PONYC_VERSION=${version}" "prefix=${placeholder "out"}" - ] ++ lib.optionals stdenv.isDarwin ([ "bits=64" ] ++ lib.optional (!lto) "lto=no"); + ] ++ lib.optionals stdenv.hostPlatform.isDarwin ([ "bits=64" ] ++ lib.optional (!lto) "lto=no"); env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=redundant-move" "-Wno-error=implicit-fallthrough" ]; # make: *** [Makefile:222: test-full-programs-release] Killed: 9 - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; - installPhase = "make config=release prefix=$out " - + lib.optionalString stdenv.isDarwin ("bits=64 " + (lib.optionalString (!lto) "lto=no ")) - + '' install + installPhase = '' + make config=release prefix=$out ${ + lib.optionalString stdenv.hostPlatform.isDarwin ("bits=64 " + (lib.optionalString (!lto) "lto=no ")) + } install wrapProgram $out/bin/ponyc \ - --prefix PATH ":" "${stdenv.cc}/bin" \ - --set-default CC "$CC" \ - --prefix PONYPATH : "${lib.makeLibraryPath [ pcre2 openssl (placeholder "out") ]}" - ''; + --prefix PATH ":" "${stdenv.cc}/bin" \ + --set-default CC "$CC" \ + --prefix PONYPATH : "${lib.makeLibraryPath [ pcre2 openssl (placeholder "out") ]}" + ''; # Stripping breaks linking for ponyc dontStrip = true; diff --git a/pkgs/development/compilers/purescript/psc-package/default.nix b/pkgs/development/compilers/purescript/psc-package/default.nix deleted file mode 100644 index f0664df84dfe..000000000000 --- a/pkgs/development/compilers/purescript/psc-package/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -# Based on https://github.com/justinwoo/easy-purescript-nix/blob/master/psc-package-simple.nix -{ stdenv, lib, fetchurl, gmp, zlib, libiconv, darwin, installShellFiles }: - -let - dynamic-linker = stdenv.cc.bintools.dynamicLinker; - -in -stdenv.mkDerivation rec { - pname = "psc-package-simple"; - - version = "0.6.2"; - - src = if stdenv.isDarwin - then fetchurl { - url = "https://github.com/purescript/psc-package/releases/download/v0.6.2/macos.tar.gz"; - sha256 = "17dh3bc5b6ahfyx0pi6n9qnrhsyi83qdynnca6k1kamxwjimpcq1"; - } - else fetchurl { - url = "https://github.com/purescript/psc-package/releases/download/v0.6.2/linux64.tar.gz"; - sha256 = "1zvay9q3xj6yd76w6qyb9la4jaj9zvpf4dp78xcznfqbnbhm1a54"; - }; - - buildInputs = [ gmp zlib ]; - nativeBuildInputs = [ installShellFiles ]; - - libPath = lib.makeLibraryPath buildInputs; - - dontStrip = true; - - installPhase = '' - mkdir -p $out/bin - - PSC_PACKAGE=$out/bin/psc-package - - install -D -m555 -T psc-package $PSC_PACKAGE - chmod u+w $PSC_PACKAGE - '' + lib.optionalString stdenv.isDarwin '' - install_name_tool \ - -change /usr/lib/libSystem.B.dylib ${darwin.Libsystem}/lib/libSystem.B.dylib \ - -change /usr/lib/libiconv.2.dylib ${libiconv}/libiconv.2.dylib \ - $PSC_PACKAGE - '' + lib.optionalString (!stdenv.isDarwin) '' - patchelf --interpreter ${dynamic-linker} --set-rpath ${libPath} $PSC_PACKAGE - '' + '' - chmod u-w $PSC_PACKAGE - - installShellCompletion --cmd psc-package \ - --bash <($PSC_PACKAGE --bash-completion-script $PSC_PACKAGE) \ - --fish <($PSC_PACKAGE --fish-completion-script $PSC_PACKAGE) \ - --zsh <($PSC_PACKAGE --zsh-completion-script $PSC_PACKAGE) - ''; - - meta = with lib; { - description = "Package manager for PureScript based on package sets"; - mainProgram = "psc-package"; - license = licenses.bsd3; - maintainers = [ ]; - platforms = [ "x86_64-darwin" "x86_64-linux" ]; - }; -} diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix index 61a8c3a5c5bd..8f88fed052ee 100644 --- a/pkgs/development/compilers/purescript/purescript/default.nix +++ b/pkgs/development/compilers/purescript/purescript/default.nix @@ -7,7 +7,7 @@ let dynamic-linker = stdenv.cc.bintools.dynamicLinker; patchelf = libPath : - lib.optionalString (!stdenv.isDarwin) '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' chmod u+w $PURS patchelf --interpreter ${dynamic-linker} --set-rpath ${libPath} $PURS chmod u-w $PURS diff --git a/pkgs/development/compilers/qbe/001-dont-hardcode-tmp.patch b/pkgs/development/compilers/qbe/001-dont-hardcode-tmp.patch deleted file mode 100644 index 556dc5aab2a6..000000000000 --- a/pkgs/development/compilers/qbe/001-dont-hardcode-tmp.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/minic/mcc b/minic/mcc -index 492947e..5258aac 100755 ---- a/minic/mcc -+++ b/minic/mcc -@@ -31,9 +31,9 @@ then - fi - - --$DIR/minic < $file > /tmp/minic.ssa && --$QBE < /tmp/minic.ssa > /tmp/minic.s && --cc /tmp/minic.s $flags -+$DIR/minic < $file > ${TMPDIR:-/tmp}/minic.ssa && -+$QBE < ${TMPDIR:-/tmp}/minic.ssa > ${TMPDIR:-/tmp}/minic.s && -+cc ${TMPDIR:-/tmp}/minic.s $flags - - if test $? -ne 0 - then -diff --git a/tools/cra.sh b/tools/cra.sh -index 5988267..57a4b34 100755 ---- a/tools/cra.sh -+++ b/tools/cra.sh -@@ -2,7 +2,7 @@ - - DIR=`cd $(dirname "$0"); pwd` - QBE=$DIR/../qbe --BUGF=/tmp/bug.id -+BUGF=${TMPDIR:-/tmp}/bug.id - FIND=$1 - FIND=${FIND:-afl-find} - -diff --git a/tools/test.sh b/tools/test.sh -index 23c6663..fb36222 100755 ---- a/tools/test.sh -+++ b/tools/test.sh -@@ -4,7 +4,7 @@ dir=`dirname "$0"` - bin=$dir/../qbe - binref=$dir/../qbe.ref - --tmp=/tmp/qbe.zzzz -+tmp=${TMPDIR:-/tmp}/qbe.zzzz - - drv=$tmp.c - asm=$tmp.s diff --git a/pkgs/development/compilers/qbe/default.nix b/pkgs/development/compilers/qbe/default.nix deleted file mode 100644 index f37de57b535e..000000000000 --- a/pkgs/development/compilers/qbe/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, stdenv -, fetchzip -, callPackage -}: -stdenv.mkDerivation (finalAttrs: { - pname = "qbe"; - version = "1.2"; - - src = fetchzip { - url = "https://c9x.me/compile/release/qbe-${finalAttrs.version}.tar.xz"; - hash = "sha256-UgtJnZF/YtD54OBy9HzGRAEHx5tC9Wo2YcUidGwrv+s="; - }; - - makeFlags = [ - "PREFIX=$(out)" - "CC=${stdenv.cc.targetPrefix}cc" - ]; - - doCheck = true; - - enableParallelBuilding = true; - - patches = [ - # Use "${TMPDIR:-/tmp}" instead of the latter directly - # see <https://lists.sr.ht/~mpu/qbe/patches/49613> - ./001-dont-hardcode-tmp.patch - ]; - - passthru = { - tests.can-run-hello-world = callPackage ./test-can-run-hello-world.nix { }; - }; - - meta = with lib; { - homepage = "https://c9x.me/compile/"; - description = "Small compiler backend written in C"; - maintainers = with maintainers; [ fgaz ]; - license = licenses.mit; - platforms = platforms.all; - mainProgram = "qbe"; - }; -}) diff --git a/pkgs/development/compilers/qbe/test-can-run-hello-world.nix b/pkgs/development/compilers/qbe/test-can-run-hello-world.nix deleted file mode 100644 index 5192bb881f34..000000000000 --- a/pkgs/development/compilers/qbe/test-can-run-hello-world.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv -, writeText -, qbe -}: - -# The hello world program available at https://c9x.me/compile/ -let helloWorld = writeText "hello-world.ssa" '' - function w $add(w %a, w %b) { # Define a function add - @start - %c =w add %a, %b # Adds the 2 arguments - ret %c # Return the result - } - export function w $main() { # Main function - @start - %r =w call $add(w 1, w 1) # Call add(1, 1) - call $printf(l $fmt, w %r, ...) # Show the result - ret 0 - } - data $fmt = { b "One and one make %d!\n", b 0 } -''; - -in stdenv.mkDerivation { - name = "qbe-test-can-run-hello-world"; - meta.timeout = 10; - buildCommand = '' - ${qbe}/bin/qbe -o asm.s ${helloWorld} - cc -o out asm.s - ./out | grep 'One and one make 2!' - touch $out - ''; -} - diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index 19eec9d5db40..99c0b6a99a25 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-reason"; - version = "3.12.0"; + version = "3.13.0"; src = fetchurl { url = "https://github.com/reasonml/reason/releases/download/${version}/reason-${version}.tbz"; - hash = "sha256-Y9lQr/viA3AaPUwHaidQtWIRuucBfNj1naUI77CaGv4="; + hash = "sha256-3yVEYGvIJKZwguIBGCbnoc3nrwzLW6RX6Tf+AYw85+Q="; }; strictDeps = true; diff --git a/pkgs/development/compilers/rgbds/default.nix b/pkgs/development/compilers/rgbds/default.nix deleted file mode 100644 index 872dcae2e132..000000000000 --- a/pkgs/development/compilers/rgbds/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{lib, stdenv, fetchFromGitHub, bison, flex, pkg-config, libpng}: - -stdenv.mkDerivation rec { - pname = "rgbds"; - version = "0.8.0"; - src = fetchFromGitHub { - owner = "gbdev"; - repo = "rgbds"; - rev = "v${version}"; - hash = "sha256-rSPYnbZjCoAKJBNCJCKsLBenolOzS78Zm850BJ8mKhA="; - }; - nativeBuildInputs = [ bison flex pkg-config ]; - buildInputs = [ libpng ]; - postPatch = '' - patchShebangs --host src/bison.sh - ''; - installFlags = [ "PREFIX=${placeholder "out"}" ]; - - meta = with lib; { - homepage = "https://rgbds.gbdev.io/"; - description = "Free assembler/linker package for the Game Boy and Game Boy Color"; - license = licenses.mit; - longDescription = - ''RGBDS (Rednex Game Boy Development System) is a free assembler/linker package for the Game Boy and Game Boy Color. It consists of: - - - rgbasm (assembler) - - rgblink (linker) - - rgbfix (checksum/header fixer) - - rgbgfx (PNG‐to‐Game Boy graphics converter) - - This is a fork of the original RGBDS which aims to make the programs more like other UNIX tools. - ''; - maintainers = with maintainers; [ matthewbauer NieDzejkob ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/compilers/roslyn/default.nix b/pkgs/development/compilers/roslyn/default.nix deleted file mode 100644 index 6ab2799f46c4..000000000000 --- a/pkgs/development/compilers/roslyn/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ lib -, fetchFromGitHub -, mono -, buildDotnetModule -, dotnetCorePackages -, unzip -}: - -buildDotnetModule rec { - pname = "roslyn"; - version = "4.2.0"; - - src = fetchFromGitHub { - owner = "dotnet"; - repo = "roslyn"; - rev = "v${version}"; - hash = "sha256-4iXabFp0LqJ8TXOrqeD+oTAocg6ZTIfijfX3s3fMJuI="; - }; - - dotnet-sdk = dotnetCorePackages.sdk_6_0; - - projectFile = [ "src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj" ]; - - nugetDeps = ./deps.nix; - - dontDotnetFixup = true; - - nativeBuildInputs = [ unzip ]; - - postPatch = '' - sed -i 's/latestPatch/latestFeature/' global.json - ''; - - buildPhase = '' - runHook preBuild - - dotnet msbuild -v:m -t:pack \ - -p:Configuration=Release \ - -p:RepositoryUrl="${meta.homepage}" \ - -p:RepositoryCommit="v${version}" \ - src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj - - runHook postBuild - ''; - - installPhase = '' - pkg="$out/lib/dotnet/microsoft.net.compilers.toolset/${version}" - mkdir -p "$out/bin" "$pkg" - - unzip -q artifacts/packages/Release/Shipping/Microsoft.Net.Compilers.Toolset.${version}-dev.nupkg \ - -d "$pkg" - # nupkg has 0 permissions for a bunch of things - chmod -R +rw "$pkg" - - makeWrapper ${mono}/bin/mono $out/bin/csc \ - --add-flags "$pkg/tasks/net472/csc.exe" - makeWrapper ${mono}/bin/mono $out/bin/vbc \ - --add-flags "$pkg/tasks/net472/vbc.exe" - ''; - - meta = with lib; { - description = ".NET C# and Visual Basic compiler"; - homepage = "https://github.com/dotnet/roslyn"; - mainProgram = "csc"; - license = licenses.mit; - maintainers = with maintainers; [ corngood ]; - }; -} diff --git a/pkgs/development/compilers/roslyn/deps.nix b/pkgs/development/compilers/roslyn/deps.nix deleted file mode 100644 index 9362f8aab133..000000000000 --- a/pkgs/development/compilers/roslyn/deps.nix +++ /dev/null @@ -1,175 +0,0 @@ -# This file was automatically generated by passthru.fetch-deps. -# Please dont edit it manually, your changes might get overwritten! - -{ fetchNuGet }: [ - (fetchNuGet { pname = "dotnet-format"; version = "6.2.315104"; sha256 = "0b802r9xbxibds3dj57ywzl377kyi2h4cmy1iajp82kqbd4707cl"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/825db618-e3eb-4426-ba54-b1d6e6c944d8/nuget/v3/flat2/dotnet-format/6.2.315104/dotnet-format.6.2.315104.nupkg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "3.1.10"; sha256 = "0xn4zh7shvijqlr03fqsmps6gz856isd9bg9rk4z2c4599ggal77"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.ref/3.1.10/microsoft.aspnetcore.app.ref.3.1.10.nupkg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "3.1.32"; sha256 = "00ha2sl4gvqv68mbrsizd6ngqy0vv6vamngzjxr338k1w7a276dx"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.linux-arm64/3.1.32/microsoft.aspnetcore.app.runtime.linux-arm64.3.1.32.nupkg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "3.1.32"; sha256 = "0ywz63q8vrdp25ix2j9b7h2jp5grc68hqfl64c6lqk26q9xwhp9r"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.linux-x64/3.1.32/microsoft.aspnetcore.app.runtime.linux-x64.3.1.32.nupkg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "3.1.32"; sha256 = "1crk54a1wvj76s9gnh46pi7wk8ryympm9xh2jq4s4rpp329fqgic"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.osx-x64/3.1.32/microsoft.aspnetcore.app.runtime.osx-x64.3.1.32.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Build.Framework"; version = "16.5.0"; sha256 = "1xgr02r7s9i6s70n237hss4yi9zicssia3zd2ny6s8vyxb7jpdyb"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.framework/16.5.0/microsoft.build.framework.16.5.0.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Build.Tasks.Core"; version = "16.5.0"; sha256 = "08mpdcnjbjpsggfzb3plpmjg1jhx2j4zslm8m2p3icnrpw8swxz4"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.tasks.core/16.5.0/microsoft.build.tasks.core.16.5.0.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Build.Tasks.Git"; version = "1.2.0-beta-22167-02"; sha256 = "1zb5vhlc9kzqbw22hg84hakhqms0aa7ghy585229hsf278rfh2sy"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.build.tasks.git/1.2.0-beta-22167-02/microsoft.build.tasks.git.1.2.0-beta-22167-02.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Build.Utilities.Core"; version = "16.5.0"; sha256 = "127l700qqky1nfrljncrpk7y4f0qi0811kpk2j87659nnv81bxs7"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.utilities.core/16.5.0/microsoft.build.utilities.core.16.5.0.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.3"; sha256 = "09m4cpry8ivm9ga1abrxmvw16sslxhy2k5sl14zckhqb1j164im6"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.analyzers/3.3.3/microsoft.codeanalysis.analyzers.3.3.3.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.BannedApiAnalyzers"; version = "3.3.4-beta1.22160.2"; sha256 = "1g95w9jbwg74f04dif3wbdbcigrx5rwv1ng4g102970l1lbx898b"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/49e5305d-d845-4a14-9d69-6f5dbfb9570c/nuget/v3/flat2/microsoft.codeanalysis.bannedapianalyzers/3.3.4-beta1.22160.2/microsoft.codeanalysis.bannedapianalyzers.3.3.4-beta1.22160.2.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.8.0"; sha256 = "12n7rvr39bzkf2maw7zplw8rwpxpxss4ich3bb2pw770rx4nyvyw"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.common/3.8.0/microsoft.codeanalysis.common.3.8.0.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.NetAnalyzers"; version = "6.0.0-rc1.21366.2"; sha256 = "18svr40y7c0gv68hv9g9fzd9f8hm7bqwygrwvax3i8cajbfwmzp4"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/825db618-e3eb-4426-ba54-b1d6e6c944d8/nuget/v3/flat2/microsoft.codeanalysis.netanalyzers/6.0.0-rc1.21366.2/microsoft.codeanalysis.netanalyzers.6.0.0-rc1.21366.2.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.PerformanceSensitiveAnalyzers"; version = "3.3.4-beta1.22160.2"; sha256 = "01jaajr4qmc70dwixzrxyh638wkf5s33hm0km4lwrw4n5j1xivp1"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/e31c6eea-0277-49f3-8194-142be67a9f72/nuget/v3/flat2/microsoft.codeanalysis.performancesensitiveanalyzers/3.3.4-beta1.22160.2/microsoft.codeanalysis.performancesensitiveanalyzers.3.3.4-beta1.22160.2.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.PublicApiAnalyzers"; version = "3.3.4-beta1.22160.2"; sha256 = "0ih091ls51x5k9q998g14pfy4r3g1ygvzihj1gkrl79wydn7b0n3"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/49e5305d-d845-4a14-9d69-6f5dbfb9570c/nuget/v3/flat2/microsoft.codeanalysis.publicapianalyzers/3.3.4-beta1.22160.2/microsoft.codeanalysis.publicapianalyzers.3.3.4-beta1.22160.2.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.csharp/4.7.0/microsoft.csharp.4.7.0.nupkg"; }) - (fetchNuGet { pname = "Microsoft.DiaSymReader.Native"; version = "17.0.0-beta1.21524.1"; sha256 = "0gash3xgzvcb78w2xqv003l0cld199zpfilnjbagwbr5ikdh6f3s"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.diasymreader.native/17.0.0-beta1.21524.1/microsoft.diasymreader.native.17.0.0-beta1.21524.1.nupkg"; }) - (fetchNuGet { pname = "Microsoft.DotNet.Arcade.Sdk"; version = "7.0.0-beta.22171.2"; sha256 = "15y26skavivkwhnpfa984if3cnpnllbbwbdsjiyfdcalp32fhmjq"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/7.0.0-beta.22171.2/microsoft.dotnet.arcade.sdk.7.0.0-beta.22171.2.nupkg"; }) - (fetchNuGet { pname = "Microsoft.DotNet.XliffTasks"; version = "1.0.0-beta.22169.1"; sha256 = "12fcin3d4m0lawla9fflz9f2qispzgvzf1mwkpscmlk5lnvb0riw"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/1.0.0-beta.22169.1/microsoft.dotnet.xlifftasks.1.0.0-beta.22169.1.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Net.Compilers.Toolset"; version = "4.2.0-1.final"; sha256 = "02zas22hj29gv2w7h74q786i0cvxffgwqai21ri0zj41nb2hwhyq"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.compilers.toolset/4.2.0-1.final/microsoft.net.compilers.toolset.4.2.0-1.final.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "3.1.32"; sha256 = "1zygp70xrk5zggs3q4a6yc6jfdwzcsjjsapqpwn6qyx35m69b72p"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-arm64/3.1.32/microsoft.netcore.app.host.linux-arm64.3.1.32.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "3.1.32"; sha256 = "08sar3s7j6z1q5prjmz2jrbsq5ms81mrsi1c1zbfrkplkfjpld3a"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-x64/3.1.32/microsoft.netcore.app.host.linux-x64.3.1.32.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "3.1.32"; sha256 = "186gjn8sbhp4z6pq8fw4g8nqk9dwyaplwvdz2y3fbbvg36lggsh0"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.osx-x64/3.1.32/microsoft.netcore.app.host.osx-x64.3.1.32.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "3.1.0"; sha256 = "08svsiilx9spvjamcnjswv0dlpdrgryhr3asdz7cvnl914gjzq4y"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.ref/3.1.0/microsoft.netcore.app.ref.3.1.0.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "3.1.32"; sha256 = "13pcn74z1swz73s72zjl07f118j35wacnzgk7kbjqn83nwgqdgvq"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.linux-arm64/3.1.32/microsoft.netcore.app.runtime.linux-arm64.3.1.32.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "3.1.32"; sha256 = "0mmc57dl8plrspdxwb7209wz29vhiwqds4nfbdfws7zg35yy70c7"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.linux-x64/3.1.32/microsoft.netcore.app.runtime.linux-x64.3.1.32.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "3.1.32"; sha256 = "06bk39zcv27cwshjsxfg5d6wzkkzdhfk08sipdc7mr1s8pk7ihi1"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.osx-x64/3.1.32/microsoft.netcore.app.runtime.osx-x64.3.1.32.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.platforms/1.0.1/microsoft.netcore.platforms.1.0.1.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.platforms/1.1.0/microsoft.netcore.platforms.1.1.0.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.1"; sha256 = "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.platforms/1.1.1/microsoft.netcore.platforms.1.1.1.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.platforms/5.0.0/microsoft.netcore.platforms.5.0.0.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.targets/1.0.1/microsoft.netcore.targets.1.0.1.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.targets/1.1.0/microsoft.netcore.targets.1.1.0.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.2"; sha256 = "0i42rn8xmvhn08799manpym06kpw89qy9080myyy2ngy565pqh0a"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netframework.referenceassemblies/1.0.2/microsoft.netframework.referenceassemblies.1.0.2.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net472"; version = "1.0.2"; sha256 = "1dny43jksy6dm9zrkdm8j80gb25w6wdvjlxnphj7ngf0fbg3dd2c"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netframework.referenceassemblies.net472/1.0.2/microsoft.netframework.referenceassemblies.net472.1.0.2.nupkg"; }) - (fetchNuGet { pname = "Microsoft.SourceLink.AzureRepos.Git"; version = "1.2.0-beta-22167-02"; sha256 = "1mqzajvp0xa8smhilrakp9nr18r2lbqgn0jb79443srvjf93f6sl"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.sourcelink.azurerepos.git/1.2.0-beta-22167-02/microsoft.sourcelink.azurerepos.git.1.2.0-beta-22167-02.nupkg"; }) - (fetchNuGet { pname = "Microsoft.SourceLink.Common"; version = "1.2.0-beta-22167-02"; sha256 = "1s4x6syw1vfs0wrlyjvf5n7xiqgqnyv9cmmnaxzmx41f7zydirj6"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.sourcelink.common/1.2.0-beta-22167-02/microsoft.sourcelink.common.1.2.0-beta-22167-02.nupkg"; }) - (fetchNuGet { pname = "Microsoft.SourceLink.GitHub"; version = "1.2.0-beta-22167-02"; sha256 = "0zwc5sxvcz26rcyirrbd55cnz1v7s0njlj91jk3rdjxw6aw2bgnr"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.sourcelink.github/1.2.0-beta-22167-02/microsoft.sourcelink.github.1.2.0-beta-22167-02.nupkg"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Setup.Configuration.Interop"; version = "1.16.30"; sha256 = "14022lx03vdcqlvbbdmbsxg5pqfx1rfq2jywxlyaz9v68cvsb0g4"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.setup.configuration.interop/1.16.30/microsoft.visualstudio.setup.configuration.interop.1.16.30.nupkg"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.2.20-alpha"; sha256 = "199690hc75yb01npwjwb7mdch0syrczcxyx6mphm1hn2cm108qax"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.threading.analyzers/17.2.20-alpha/microsoft.visualstudio.threading.analyzers.17.2.20-alpha.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.win32.primitives/4.3.0/microsoft.win32.primitives.4.3.0.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.3.0"; sha256 = "1gxyzxam8163vk1kb6xzxjj4iwspjsz9zhgn1w9rjzciphaz0ig7"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.win32.registry/4.3.0/microsoft.win32.registry.4.3.0.nupkg"; }) - (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/netstandard.library/2.0.3/netstandard.library.2.0.3.nupkg"; }) - (fetchNuGet { pname = "PowerShell"; version = "7.0.0"; sha256 = "13jhnbh12rcmdrkmlxq45ard03lmfq7bg14xg7k108jlpnpsr1la"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/powershell/7.0.0/powershell.7.0.0.nupkg"; }) - (fetchNuGet { pname = "RichCodeNav.EnvVarDump"; version = "0.1.1643-alpha"; sha256 = "1pp1608xizvv0h9q01bqy7isd3yzb3lxb2yp27j4k25xsvw460vg"; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/58ca65bb-e6c1-4210-88ac-fa55c1cd7877/nuget/v3/flat2/richcodenav.envvardump/0.1.1643-alpha/richcodenav.envvardump.0.1.1643-alpha.nupkg"; }) - (fetchNuGet { pname = "Roslyn.Diagnostics.Analyzers"; version = "3.3.4-beta1.22160.2"; sha256 = "0rr7q46vc5lbywm3mf4ld1kjkg9w7fbmkkyka0bi8idrfib7kn0i"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/49e5305d-d845-4a14-9d69-6f5dbfb9570c/nuget/v3/flat2/roslyn.diagnostics.analyzers/3.3.4-beta1.22160.2/roslyn.diagnostics.analyzers.3.3.4-beta1.22160.2.nupkg"; }) - (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.collections/4.3.0/runtime.any.system.collections.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.diagnostics.tracing/4.3.0/runtime.any.system.diagnostics.tracing.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.globalization/4.3.0/runtime.any.system.globalization.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.globalization.calendars/4.3.0/runtime.any.system.globalization.calendars.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.io/4.3.0/runtime.any.system.io.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.reflection/4.3.0/runtime.any.system.reflection.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.reflection.primitives/4.3.0/runtime.any.system.reflection.primitives.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.resources.resourcemanager/4.3.0/runtime.any.system.resources.resourcemanager.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.runtime/4.3.0/runtime.any.system.runtime.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.runtime.handles/4.3.0/runtime.any.system.runtime.handles.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.runtime.interopservices/4.3.0/runtime.any.system.runtime.interopservices.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.text.encoding/4.3.0/runtime.any.system.text.encoding.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.text.encoding.extensions/4.3.0/runtime.any.system.text.encoding.extensions.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.threading.tasks/4.3.0/runtime.any.system.threading.tasks.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0rwpqngkqiapqc5c2cpkj7idhngrgss5qpnqg0yh40mbyflcxf8i"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl/4.3.2/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg"; }) - (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1n06gxwlinhs0w7s8a94r1q3lwqzvynxwd3mp10ws9bg6gck8n4r"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl/4.3.2/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg"; }) - (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0404wqrc7f2yc0wxv71y3nnybvqx8v4j9d47hlscxy759a525mc3"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl/4.3.2/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg"; }) - (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system/4.3.0/runtime.native.system.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system.net.http/4.3.0/runtime.native.system.net.http.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system.security.cryptography.apple/4.3.0/runtime.native.system.security.cryptography.apple.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system.security.cryptography.openssl/4.3.0/runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0zy5r25jppz48i2bkg8b9lfig24xixg6nm3xyr1379zdnqnpm8f6"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system.security.cryptography.openssl/4.3.2/runtime.native.system.security.cryptography.openssl.4.3.2.nupkg"; }) - (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "096ch4n4s8k82xga80lfmpimpzahd2ip1mgwdqgar0ywbbl6x438"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl/4.3.2/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg"; }) - (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1dm8fifl7rf1gy7lnwln78ch4rw54g0pl5g1c189vawavll7p6rj"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl/4.3.2/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple/4.3.0/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1m9z1k9kzva9n9kwinqxl97x2vgl79qhqjlv17k9s2ymcyv2bwr6"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl/4.3.2/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg"; }) - (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1cpx56mcfxz7cpn57wvj18sjisvzq8b5vd9rw16ihd2i6mcp3wa1"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl/4.3.2/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg"; }) - (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "15gsm1a8jdmgmf8j5v1slfz8ks124nfdhk2vxs2rw3asrxalg8hi"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl/4.3.2/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0q0n5q1r1wnqmr5i5idsrd9ywl33k0js4pngkwq9p368mbxp8x1w"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl/4.3.2/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1x0g58pbpjrmj2x2qw17rdwwnrcl0wvim2hdwz48lixvwvp22n9c"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl/4.3.2/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg"; }) - (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.microsoft.win32.primitives/4.3.0/runtime.unix.microsoft.win32.primitives.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.diagnostics.debug/4.3.0/runtime.unix.system.diagnostics.debug.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.io.filesystem/4.3.0/runtime.unix.system.io.filesystem.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.net.primitives/4.3.0/runtime.unix.system.net.primitives.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.private.uri/4.3.0/runtime.unix.system.private.uri.4.3.0.nupkg"; }) - (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.runtime.extensions/4.3.0/runtime.unix.system.runtime.extensions.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.buffers/4.3.0/system.buffers.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.buffers/4.5.1/system.buffers.4.5.1.nupkg"; }) - (fetchNuGet { pname = "System.CodeDom"; version = "4.4.0"; sha256 = "1zgbafm5p380r50ap5iddp11kzhr9khrf2pnai6k593wjar74p1g"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.codedom/4.4.0/system.codedom.4.4.0.nupkg"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections/4.0.11/system.collections.4.0.11.nupkg"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections/4.3.0/system.collections.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.0.12"; sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.concurrent/4.0.12/system.collections.concurrent.4.0.12.nupkg"; }) - (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.concurrent/4.3.0/system.collections.concurrent.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.5.0"; sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.immutable/1.5.0/system.collections.immutable.1.5.0.nupkg"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.immutable/5.0.0/system.collections.immutable.5.0.0.nupkg"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.debug/4.0.11/system.diagnostics.debug.4.0.11.nupkg"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.debug/4.3.0/system.diagnostics.debug.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.diagnosticsource/4.3.0/system.diagnostics.diagnosticsource.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.1.0"; sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.tracing/4.1.0/system.diagnostics.tracing.4.1.0.nupkg"; }) - (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.tracing/4.3.0/system.diagnostics.tracing.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.globalization/4.0.11/system.globalization.4.0.11.nupkg"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.globalization/4.3.0/system.globalization.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.globalization.calendars/4.3.0/system.globalization.calendars.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.globalization.extensions/4.3.0/system.globalization.extensions.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io/4.1.0/system.io.4.1.0.nupkg"; }) - (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io/4.3.0/system.io.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.filesystem/4.3.0/system.io.filesystem.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.filesystem.primitives/4.3.0/system.io.filesystem.primitives.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.IO.Pipes.AccessControl"; version = "5.0.0"; sha256 = "0jl5b95cy8biivi1kdn2wi0gy2m1a0gyj8fy88djybrg2705c8fz"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.pipes.accesscontrol/5.0.0/system.io.pipes.accesscontrol.5.0.0.nupkg"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.linq/4.1.0/system.linq.4.1.0.nupkg"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.linq/4.3.0/system.linq.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Linq.Parallel"; version = "4.0.1"; sha256 = "0i33x9f4h3yq26yvv6xnq4b0v51rl5z8v1bm7vk972h5lvf4apad"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.linq.parallel/4.0.1/system.linq.parallel.4.0.1.nupkg"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.memory/4.5.4/system.memory.4.5.4.nupkg"; }) - (fetchNuGet { pname = "System.Net.Http"; version = "4.3.4"; sha256 = "0kdp31b8819v88l719j6my0yas6myv9d1viql3qz5577mv819jhl"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.net.http/4.3.4/system.net.http.4.3.4.nupkg"; }) - (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.net.primitives/4.3.0/system.net.primitives.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.numerics.vectors/4.4.0/system.numerics.vectors.4.4.0.nupkg"; }) - (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.numerics.vectors/4.5.0/system.numerics.vectors.4.5.0.nupkg"; }) - (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.private.uri/4.3.0/system.private.uri.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection/4.1.0/system.reflection.4.1.0.nupkg"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection/4.3.0/system.reflection.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadata/1.6.0/system.reflection.metadata.1.6.0.nupkg"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadata/5.0.0/system.reflection.metadata.5.0.0.nupkg"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.primitives/4.0.1/system.reflection.primitives.4.0.1.nupkg"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.primitives/4.3.0/system.reflection.primitives.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.typeextensions/4.1.0/system.reflection.typeextensions.4.1.0.nupkg"; }) - (fetchNuGet { pname = "System.Resources.Extensions"; version = "4.6.0"; sha256 = "0inch9jgchgmsg3xjivbhh9mpin40mhdd8dgf4i1p3g42i0hzc0j"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.extensions/4.6.0/system.resources.extensions.4.6.0.nupkg"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.resourcemanager/4.0.1/system.resources.resourcemanager.4.0.1.nupkg"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.resourcemanager/4.3.0/system.resources.resourcemanager.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Resources.Writer"; version = "4.0.0"; sha256 = "07hp218kjdcvpl27djspnixgnacbp9apma61zz3wsca9fx5g3lmv"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.writer/4.0.0/system.resources.writer.4.0.0.nupkg"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime/4.1.0/system.runtime.4.1.0.nupkg"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime/4.3.0/system.runtime.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.compilerservices.unsafe/4.7.1/system.runtime.compilerservices.unsafe.4.7.1.nupkg"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.compilerservices.unsafe/6.0.0/system.runtime.compilerservices.unsafe.6.0.0.nupkg"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.extensions/4.1.0/system.runtime.extensions.4.1.0.nupkg"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.extensions/4.3.0/system.runtime.extensions.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.handles/4.0.1/system.runtime.handles.4.0.1.nupkg"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.handles/4.3.0/system.runtime.handles.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.interopservices/4.1.0/system.runtime.interopservices.4.1.0.nupkg"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.interopservices/4.3.0/system.runtime.interopservices.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Runtime.Loader"; version = "4.3.0"; sha256 = "07fgipa93g1xxgf7193a6vw677mpzgr0z0cfswbvqqb364cva8dk"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.loader/4.3.0/system.runtime.loader.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.numerics/4.3.0/system.runtime.numerics.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.serialization.primitives/4.1.1/system.runtime.serialization.primitives.4.1.1.nupkg"; }) - (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.accesscontrol/5.0.0/system.security.accesscontrol.5.0.0.nupkg"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.algorithms/4.3.0/system.security.cryptography.algorithms.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.cng/4.3.0/system.security.cryptography.cng.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.csp/4.3.0/system.security.cryptography.csp.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.encoding/4.3.0/system.security.cryptography.encoding.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.openssl/4.3.0/system.security.cryptography.openssl.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.primitives/4.3.0/system.security.cryptography.primitives.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.x509certificates/4.3.0/system.security.cryptography.x509certificates.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.principal.windows/5.0.0/system.security.principal.windows.5.0.0.nupkg"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding/4.0.11/system.text.encoding.4.0.11.nupkg"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding/4.3.0/system.text.encoding.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.0.1"; sha256 = "00wpm3b9y0k996rm9whxprngm8l500ajmzgy2ip9pgwk0icp06y3"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.codepages/4.0.1/system.text.encoding.codepages.4.0.1.nupkg"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.codepages/4.5.1/system.text.encoding.codepages.4.5.1.nupkg"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.codepages/6.0.0/system.text.encoding.codepages.6.0.0.nupkg"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.extensions/4.3.0/system.text.encoding.extensions.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading/4.0.11/system.threading.4.0.11.nupkg"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading/4.3.0/system.threading.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks/4.0.11/system.threading.tasks.4.0.11.nupkg"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks/4.3.0/system.threading.tasks.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "4.9.0"; sha256 = "1g6s9pjg4z8iy98df60y9a01imdqy59zd767vz74rrng78jl2dk5"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.dataflow/4.9.0/system.threading.tasks.dataflow.4.9.0.nupkg"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.extensions/4.5.4/system.threading.tasks.extensions.4.5.4.nupkg"; }) - (fetchNuGet { pname = "System.Threading.Thread"; version = "4.0.0"; sha256 = "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.thread/4.0.0/system.threading.thread.4.0.0.nupkg"; }) -] diff --git a/pkgs/development/compilers/rust/1_80.nix b/pkgs/development/compilers/rust/1_82.nix index 4c2efcc367f4..9d1281352ee1 100644 --- a/pkgs/development/compilers/rust/1_80.nix +++ b/pkgs/development/compilers/rust/1_82.nix @@ -20,6 +20,7 @@ pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost, + pkgsHostTarget, pkgsTargetTarget, makeRustPlatform, wrapRustcWith, @@ -27,6 +28,7 @@ llvm_18, wrapCCWith, overrideCC, + fetchpatch, }@args: let llvmSharedFor = @@ -39,22 +41,22 @@ let # Force LLVM to compile using clang + LLVM libs when targeting pkgsLLVM stdenv = pkgSet.stdenv.override { allowedRequisites = null; - cc = pkgSet.llvmPackages_18.clangUseLLVM; + cc = pkgSet.pkgsBuildHost.llvmPackages_18.clangUseLLVM; }; } ); in import ./default.nix { - rustcVersion = "1.80.1"; - rustcSha256 = "sha256-LAuPZDlC3LgQy8xQ8pJWSxtuRNtdX0UJEVOZbfldLcQ="; + rustcVersion = "1.82.0"; + rustcSha256 = "fFP0UJ7aGE4XTvprp9XutYZYVobOjt78eBorEafPUSo="; llvmSharedForBuild = llvmSharedFor pkgsBuildBuild; llvmSharedForHost = llvmSharedFor pkgsBuildHost; llvmSharedForTarget = llvmSharedFor pkgsBuildTarget; # For use at runtime - llvmShared = llvmSharedFor { inherit llvmPackages_18 stdenv; }; + llvmShared = llvmSharedFor pkgsHostTarget; # Expose llvmPackages used for rustc from rustc via passthru for LTO in Firefox llvmPackages = @@ -73,7 +75,7 @@ import ./default.nix pkg.override { stdenv = stdenv.override { allowedRequisites = null; - cc = llvmPackages.clangUseLLVM; + cc = pkgsBuildHost.llvmPackages_18.clangUseLLVM; }; }; in @@ -86,9 +88,9 @@ import ./default.nix libcxx = llvmPackages.libcxx.override { stdenv = stdenv.override { allowedRequisites = null; - cc = llvmPackages.clangNoLibcxx; + cc = pkgsBuildHost.llvmPackages_18.clangNoLibcxx; hostPlatform = stdenv.hostPlatform // { - useLLVM = !stdenv.isDarwin; + useLLVM = !stdenv.hostPlatform.isDarwin; }; }; inherit libunwind; @@ -102,30 +104,37 @@ import ./default.nix else llvmPackages_18; - # Note: the version MUST be one version prior to the version we're - # building - bootstrapVersion = "1.79.0"; + # Note: the version MUST be the same version that we are building. Upstream + # ensures that each released compiler can compile itself: + # https://github.com/NixOS/nixpkgs/pull/351028#issuecomment-2438244363 + bootstrapVersion = "1.82.0"; # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` bootstrapHashes = { - i686-unknown-linux-gnu = "0a1e371809446cd77dba7abce2afb4efac8d8b2e63483cfe19f1c98bf9ab7855"; - x86_64-unknown-linux-gnu = "628efa8ef0658a7c4199883ee132281f19931448d3cfee4ecfd768898fe74c18"; - x86_64-unknown-linux-musl = "2e4b0e40d027e2b31a40163986b4c04dfd0bce41c706a99f2e82ba473a4383de"; - arm-unknown-linux-gnueabihf = "ce8d8d296277a06e0d2f63a21a0586717e09be3df28c0d1a04bc2c6f85eecc15"; - armv7-unknown-linux-gnueabihf = "31968f88b22058e384dfb3cdf3efe7f60c03481d790300fcffc420d5ba3851f2"; - aarch64-unknown-linux-gnu = "f7d3b31581331b54af97cf3162e65b8c26c8aa14d42f71c1ce9adc1078ef54e5"; - aarch64-unknown-linux-musl = "f8100c806754cd21600ded26546467a1a242db9b9ab8a6a666656e3cc4edfa52"; - x86_64-apple-darwin = "62f018aad30bafa0ef8bff0ed60d5d45e6cadc799769aad9d945509203e9f921"; - aarch64-apple-darwin = "e70a9362975b94df7dbc6e2ed5ceab4254dd32f72ba497ff4a70440ace3f729f"; - powerpc64le-unknown-linux-gnu = "9865eeebb5bb20006367d3148d9116576499ec958d847e22b645f008a1bc4170"; - riscv64gc-unknown-linux-gnu = "c8d38e600ef4dea8b375df2d08153393816ffd3dcab18e4d081ddc19e28b5a40"; - s390x-unknown-linux-gnu = "1e9f1b27ce47d831108e1d1bb6ef7ab86f95bedfea843318292f821142fe1f6c"; - x86_64-unknown-freebsd = "3c8005f488b8dda0fc6d47928868200852106cac2b568934ae9a2e5c89d3a50d"; + i686-unknown-linux-gnu = "77b261fb3d9efa7fe39e87c024987495e03b647b6cb23a66b8e69aeb12a8be61"; + x86_64-unknown-linux-gnu = "0265c08ae997c4de965048a244605fb1f24a600bbe35047b811c638b8fcf676b"; + x86_64-unknown-linux-musl = "9dd781c64f71c1d3f854b0937eb751f19e8ebac1110e68e08b94223ad9b022ba"; + arm-unknown-linux-gnueabihf = "d6a2857d0ab8880c3bc691607b10b68fb2750eae35144e035a9a5eeef820b740"; + armv7-unknown-linux-gnueabihf = "eff9939c4b98c6ad91a759fa1a2ebdd81b4d05e47ac523218bf9d7093226589b"; + aarch64-unknown-linux-gnu = "d7db04fce65b5f73282941f3f1df5893be9810af17eb7c65b2e614461fe31a48"; + aarch64-unknown-linux-musl = "f061eabf0324805637c1e89e7d936365f705be1359699efbda59b637dbe9715f"; + x86_64-apple-darwin = "b1a289cabc523f259f65116a41374ac159d72fbbf6c373bd5e545c8e835ceb6a"; + aarch64-apple-darwin = "49b6d36b308addcfd21ae56c94957688338ba7b8985bff57fc626c8e1b32f62c"; + powerpc64le-unknown-linux-gnu = "44f3a1e70be33f91927ae8d89a11843a79b8b6124d62a9ddd9030a5275ebc923"; + riscv64gc-unknown-linux-gnu = "a72e8aa3fff374061ff90ada317a8d170c2a15eb079ddc828c97189179d3eebd"; + s390x-unknown-linux-gnu = "63760886a9b2de6cb38f75a236db358939d904e205e1e2bc9d96cec69e00ae83"; + x86_64-unknown-freebsd = "f7b51943dbed0af3387e3269c1767fee916fb22b8e7897b3594bf5e422403137"; }; - selectRustPackage = pkgs: pkgs.rust_1_80; + selectRustPackage = pkgs: pkgs.rust_1_82; - rustcPatches = [ ]; + rustcPatches = [ + (fetchpatch { + name = "fix-fastCross.patch"; + url = "https://github.com/rust-lang/rust/commit/c15469a7fec811d1a4f69ff26e18c6f383df41d2.patch"; + hash = "sha256-lFc48AMoGf4LCP65IsXS5rEB9eYacTP8ADftQkj8zkg="; + }) + ]; } ( @@ -134,5 +143,7 @@ import ./default.nix "llvm_18" "wrapCCWith" "overrideCC" + "fetchpatch" + "pkgsHostTarget" ] ) diff --git a/pkgs/development/compilers/rust/binary.nix b/pkgs/development/compilers/rust/binary.nix index 10e944515df7..df3b8f729f7f 100644 --- a/pkgs/development/compilers/rust/binary.nix +++ b/pkgs/development/compilers/rust/binary.nix @@ -33,11 +33,11 @@ rec { license = [ licenses.mit licenses.asl20 ]; }; - nativeBuildInputs = lib.optional (!stdenv.isDarwin) autoPatchelfHook; + nativeBuildInputs = lib.optional (!stdenv.hostPlatform.isDarwin) autoPatchelfHook; buildInputs = [ bash ] - ++ lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) gcc.cc.lib - ++ lib.optional (!stdenv.isDarwin) zlib - ++ lib.optional stdenv.isDarwin Security; + ++ lib.optional (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isFreeBSD) gcc.cc.lib + ++ lib.optional (!stdenv.hostPlatform.isDarwin) zlib + ++ lib.optional stdenv.hostPlatform.isDarwin Security; postPatch = '' patchShebangs . @@ -61,6 +61,37 @@ rec { dontStrip = true; setupHooks = ./setup-hook.sh; + + passthru = rec { + tier1TargetPlatforms = [ + # Platforms with host tools from + # https://doc.rust-lang.org/nightly/rustc/platform-support.html + "x86_64-darwin" "i686-darwin" "aarch64-darwin" + "i686-freebsd" "x86_64-freebsd" + "x86_64-solaris" + "aarch64-linux" "armv6l-linux" "armv7l-linux" "i686-linux" + "loongarch64-linux" "powerpc64-linux" "powerpc64le-linux" + "riscv64-linux" "s390x-linux" "x86_64-linux" + "aarch64-netbsd" "armv7l-netbsd" "i686-netbsd" "powerpc-netbsd" + "x86_64-netbsd" + "i686-openbsd" "x86_64-openbsd" + "i686-windows" "x86_64-windows" + ]; + targetPlatforms = tier1TargetPlatforms ++ [ + # Platforms without host tools from + # https://doc.rust-lang.org/nightly/rustc/platform-support.html + "armv7a-darwin" + "armv5tel-linux" "armv7a-linux" "m68k-linux" "mips-linux" + "mips64-linux" "mipsel-linux" "mips64el-linux" "riscv32-linux" + "armv6l-netbsd" "mipsel-netbsd" "riscv64-netbsd" + "x86_64-redox" + "wasm32-wasi" + ]; + badTargetPlatforms = [ + # Rust is currently unable to target the n32 ABI + lib.systems.inspect.patterns.isMips64n32 + ]; + }; }; rustc = wrapRustc rustc-unwrapped; @@ -80,10 +111,10 @@ rec { }; nativeBuildInputs = [ makeWrapper ] - ++ lib.optional (!stdenv.isDarwin) autoPatchelfHook; + ++ lib.optional (!stdenv.hostPlatform.isDarwin) autoPatchelfHook; buildInputs = [ bash ] - ++ lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) gcc.cc.lib - ++ lib.optional stdenv.isDarwin Security; + ++ lib.optional (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isFreeBSD) gcc.cc.lib + ++ lib.optional stdenv.hostPlatform.isDarwin Security; postPatch = '' patchShebangs . diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 9a12537f3e32..6ece7c304fc5 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage.override { zlib ]; buildInputs = [ file curl python3 openssl zlib ] - ++ lib.optionals stdenv.isDarwin [ CoreFoundation Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation Security ]; # cargo uses git-rs which is made for a version of libgit2 from recent master that # is not compatible with the current version in nixpkgs. diff --git a/pkgs/development/compilers/rust/clippy.nix b/pkgs/development/compilers/rust/clippy.nix index 640ea7908e25..6a233ffe1852 100644 --- a/pkgs/development/compilers/rust/clippy.nix +++ b/pkgs/development/compilers/rust/clippy.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage { dontUpdateAutotoolsGnuConfigScripts = true; buildInputs = [ rustc.llvm ] - ++ lib.optionals stdenv.isDarwin [ Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; # fixes: error: the option `Z` is only accepted on the nightly compiler RUSTC_BOOTSTRAP = 1; @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage { # # [0]: https://github.com/rust-lang/rust/blob/f77f4d55bdf9d8955d3292f709bd9830c2fdeca5/src/bootstrap/builder.rs#L1543 # [1]: https://github.com/rust-lang/rust/blob/f77f4d55bdf9d8955d3292f709bd9830c2fdeca5/compiler/rustc_codegen_ssa/src/back/linker.rs#L323-L331 - preFixup = lib.optionalString stdenv.isDarwin '' + preFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -add_rpath "${rustc.unwrapped}/lib" "$out/bin/clippy-driver" install_name_tool -add_rpath "${rustc.unwrapped}/lib" "$out/bin/cargo-clippy" ''; diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 1b8a3dbfba6b..0e999407c9d0 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -68,13 +68,13 @@ in stdenv.mkDerivation (finalAttrs: { # when linking stage1 libstd: cc: undefined reference to `__cxa_begin_catch' # This doesn't apply to cross-building for FreeBSD because the host # uses libstdc++, but the target (used for building std) uses libc++ - optional (stdenv.isLinux && !withBundledLLVM && !stdenv.targetPlatform.isFreeBSD && !useLLVM) + optional (stdenv.hostPlatform.isLinux && !withBundledLLVM && !stdenv.targetPlatform.isFreeBSD && !useLLVM) "--push-state --as-needed -lstdc++ --pop-state" - ++ optional (stdenv.isLinux && !withBundledLLVM && !stdenv.targetPlatform.isFreeBSD && useLLVM) + ++ optional (stdenv.hostPlatform.isLinux && !withBundledLLVM && !stdenv.targetPlatform.isFreeBSD && useLLVM) "--push-state --as-needed -L${llvmPackages.libcxx}/lib -lc++ -lc++abi -lLLVM-${lib.versions.major llvmPackages.llvm.version} --pop-state" - ++ optional (stdenv.isDarwin && !withBundledLLVM) "-lc++ -lc++abi" - ++ optional stdenv.isFreeBSD "-rpath ${llvmPackages.libunwind}/lib" - ++ optional stdenv.isDarwin "-rpath ${llvmSharedForHost.lib}/lib"); + ++ optional (stdenv.hostPlatform.isDarwin && !withBundledLLVM) "-lc++ -lc++abi" + ++ optional stdenv.hostPlatform.isFreeBSD "-rpath ${llvmPackages.libunwind}/lib" + ++ optional stdenv.hostPlatform.isDarwin "-rpath ${llvmSharedForHost.lib}/lib"); # Increase codegen units to introduce parallelism within the compiler. RUSTFLAGS = "-Ccodegen-units=10"; @@ -109,6 +109,9 @@ in stdenv.mkDerivation (finalAttrs: { "--tools=rustc,rustdoc,rust-analyzer-proc-macro-srv" "--enable-rpath" "--enable-vendor" + # For Nixpkgs it makes more sense to use stdenv's linker than + # letting rustc build its own. + "--disable-lld" "--build=${stdenv.buildPlatform.rust.rustcTargetSpec}" "--host=${stdenv.hostPlatform.rust.rustcTargetSpec}" # std is built for all platforms in --target. @@ -166,10 +169,10 @@ in stdenv.mkDerivation (finalAttrs: { "${setTarget}.musl-root=${pkgsBuildTarget.targetPackages.stdenv.cc.libc}" ] ++ optionals stdenv.targetPlatform.rust.isNoStdTarget [ "--disable-docs" - ] ++ optionals (stdenv.isDarwin && stdenv.isx86_64) [ + ] ++ optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ # https://github.com/rust-lang/rust/issues/92173 "--set rust.jemalloc" - ] ++ optionals useLLVM [ + ] ++ optionals (useLLVM && !stdenv.targetPlatform.isFreeBSD) [ # https://github.com/NixOS/nixpkgs/issues/311930 "--llvm-libunwind=${if withBundledLLVM then "in-tree" else "system"}" "--enable-use-libcxx" @@ -224,19 +227,19 @@ in stdenv.mkDerivation (finalAttrs: { # Useful debugging parameter # export VERBOSE=1 - '' + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' # See https://github.com/jemalloc/jemalloc/issues/1997 # Using a value of 48 should work on both emulated and native x86_64-darwin. export JEMALLOC_SYS_WITH_LG_VADDR=48 '' + lib.optionalString (!(finalAttrs.src.passthru.isReleaseTarball or false)) '' mkdir .cargo - cat > .cargo/config <<\EOF + cat > .cargo/config.toml <<\EOF [source.crates-io] replace-with = "vendored-sources" [source.vendored-sources] directory = "vendor" EOF - '' + lib.optionalString (stdenv.isFreeBSD) '' + '' + lib.optionalString (stdenv.hostPlatform.isFreeBSD) '' # lzma-sys bundles an old version of xz that doesn't build # on modern FreeBSD, use the system one instead substituteInPlace src/bootstrap/src/core/build_steps/tool.rs \ @@ -257,9 +260,9 @@ in stdenv.mkDerivation (finalAttrs: { ++ optionals fastCross [ lndir makeWrapper ]; buildInputs = [ openssl ] - ++ optionals stdenv.isDarwin [ libiconv Security zlib ] + ++ optionals stdenv.hostPlatform.isDarwin [ libiconv Security zlib ] ++ optional (!withBundledLLVM) llvmShared.lib - ++ optional (useLLVM && !withBundledLLVM) [ + ++ optional (useLLVM && !withBundledLLVM && !stdenv.targetPlatform.isFreeBSD) [ llvmPackages.libunwind # Hack which is used upstream https://github.com/gentoo/gentoo/blob/master/dev-lang/rust/rust-1.78.0.ebuild#L284 (runCommandLocal "libunwind-libgcc" {} '' @@ -303,6 +306,7 @@ in stdenv.mkDerivation (finalAttrs: { passthru = { llvm = llvmShared; inherit llvmPackages; + inherit (rustc) tier1TargetPlatforms targetPlatforms badTargetPlatforms; tests = { inherit fd ripgrep wezterm; } // lib.optionalAttrs stdenv.hostPlatform.isLinux { inherit firefox thunderbird; }; @@ -313,19 +317,9 @@ in stdenv.mkDerivation (finalAttrs: { description = "Safe, concurrent, practical language"; maintainers = with maintainers; [ havvy ] ++ teams.rust.members; license = [ licenses.mit licenses.asl20 ]; - platforms = [ - # Platforms with host tools from - # https://doc.rust-lang.org/nightly/rustc/platform-support.html - "x86_64-darwin" "i686-darwin" "aarch64-darwin" - "i686-freebsd" "x86_64-freebsd" - "x86_64-solaris" - "aarch64-linux" "armv6l-linux" "armv7l-linux" "i686-linux" - "loongarch64-linux" "powerpc64-linux" "powerpc64le-linux" - "riscv64-linux" "s390x-linux" "x86_64-linux" - "aarch64-netbsd" "armv7l-netbsd" "i686-netbsd" "powerpc-netbsd" - "x86_64-netbsd" - "i686-openbsd" "x86_64-openbsd" - "i686-windows" "x86_64-windows" - ]; + platforms = rustc.tier1TargetPlatforms; + # If rustc can't target a platform, we also can't build rustc for + # that platform. + badPlatforms = rustc.badTargetPlatforms; }; }) diff --git a/pkgs/development/compilers/rust/rustfmt.nix b/pkgs/development/compilers/rust/rustfmt.nix index ab58a172a6b2..42c71513151a 100644 --- a/pkgs/development/compilers/rust/rustfmt.nix +++ b/pkgs/development/compilers/rust/rustfmt.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ rustc.llvm - ] ++ lib.optional stdenv.isDarwin Security; + ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; # rustfmt uses the rustc_driver and std private libraries, and Rust's build process forces them to have # an install name of `@rpath/...` [0] [1] instead of the standard on macOS, which is an absolute path @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { # # [0]: https://github.com/rust-lang/rust/blob/f77f4d55bdf9d8955d3292f709bd9830c2fdeca5/src/bootstrap/builder.rs#L1543 # [1]: https://github.com/rust-lang/rust/blob/f77f4d55bdf9d8955d3292f709bd9830c2fdeca5/compiler/rustc_codegen_ssa/src/back/linker.rs#L323-L331 - preFixup = lib.optionalString stdenv.isDarwin '' + preFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -add_rpath "${rustc.unwrapped}/lib" "$out/bin/rustfmt" install_name_tool -add_rpath "${rustc.unwrapped}/lib" "$out/bin/git-rustfmt" ''; diff --git a/pkgs/development/compilers/sagittarius-scheme/default.nix b/pkgs/development/compilers/sagittarius-scheme/default.nix deleted file mode 100644 index 0b4cc240694c..000000000000 --- a/pkgs/development/compilers/sagittarius-scheme/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ lib, stdenv -, fetchurl -, cmake -, pkg-config -, libffi -, boehmgc -, openssl -, zlib -, odbcSupport ? !stdenv.isDarwin -, libiodbc -}: - -let platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" - else if (stdenv.isLinux or stdenv.isBSD) then "LD_LIBRARY_PATH" - else throw "unsupported platform"; -in -stdenv.mkDerivation rec { - pname = "sagittarius-scheme"; - version = "0.9.11"; - src = fetchurl { - url = "https://bitbucket.org/ktakashi/${pname}/downloads/sagittarius-${version}.tar.gz"; - hash = "sha256-LIF1EW8sMBMKycQnVAXk+5iEpKmRHMmzBILAg2tjk8c="; - }; - preBuild = '' - # since we lack rpath during build, need to explicitly add build path - # to LD_LIBRARY_PATH so we can load libsagittarius.so as required to - # build extensions - export ${platformLdLibraryPath}="$(pwd)/build" - ''; - nativeBuildInputs = [ pkg-config cmake ]; - - buildInputs = [ libffi boehmgc openssl zlib ] ++ lib.optional odbcSupport libiodbc; - - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ - "-Wno-error=int-conversion" - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ - # error: '__builtin_ia32_aeskeygenassist128' needs target feature aes - "-maes" - ]); - - meta = with lib; { - description = "R6RS/R7RS Scheme system"; - longDescription = '' - Sagittarius Scheme is a free Scheme implementation supporting - R6RS/R7RS specification. - - Features: - - - Builtin CLOS. - - Common Lisp like reader macro. - - Cryptographic libraries. - - Customisable cipher and hash algorithm. - - Custom codec mechanism. - - CL like keyword lambda syntax (taken from Gauche). - - Constant definition form. (define-constant form). - - Builtin regular expression - - mostly works O(n) - - Replaceable reader - ''; - homepage = "https://bitbucket.org/ktakashi/sagittarius-scheme"; - license = licenses.bsd2; - platforms = platforms.all; - maintainers = with maintainers; [ abbe ]; - }; -} diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix index d796b24e1d7e..6f9b75c1183c 100644 --- a/pkgs/development/compilers/sbcl/bootstrap.nix +++ b/pkgs/development/compilers/sbcl/bootstrap.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { --add-flags "--core $out/share/sbcl/sbcl.core" ''; - postFixup = lib.optionalString (!stdenv.isAarch32 && stdenv.isLinux) '' + postFixup = lib.optionalString (!stdenv.hostPlatform.isAarch32 && stdenv.hostPlatform.isLinux) '' patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/share/sbcl/sbcl ''; diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 5cc21ada71a1..34632bf4b50d 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -10,14 +10,17 @@ let versionMap = { + # Necessary for Nyxt "2.4.6" = { sha256 = "sha256-pImQeELa4JoXJtYphb96VmcKrqLz7KH7cCO8pnw/MJE="; }; - "2.4.7" = { - sha256 = "sha256-aFRNJQNjWs0BXVNMzJsq6faJltQptakGP9Iv8JJQEdI="; + # By unofficial and very loose convention we keep the latest version of + # SBCL, and the previous one in case someone quickly needs to roll back. + "2.4.9" = { + sha256 = "sha256-mXDk68XWlD3GTXyh9S2bXNn8lM75TSMyE9eOx182BeI="; }; - "2.4.8" = { - sha256 = "sha256-/G7NzFOOgKFKmY1TDMw4SkF5D09Pxs1//oyxJqZ3aUw="; + "2.4.10" = { + sha256 = "sha256-zus5a2nSkT7uBIQcKva+ylw0LOFGTD/j5FPy3hDF4vg="; }; }; # Collection of pre-built SBCL binaries for platforms that need them for @@ -167,7 +170,7 @@ stdenv.mkDerivation (self: { lib.optional self.threadSupport "sb-thread" ++ lib.optional self.linkableRuntime "sb-linkable-runtime" ++ lib.optional self.coreCompression "sb-core-compression" ++ - lib.optional stdenv.isAarch32 "arm" ++ + lib.optional stdenv.hostPlatform.isAarch32 "arm" ++ lib.optional self.markRegionGC "mark-region-gc"; disableFeatures = diff --git a/pkgs/development/compilers/scala/bare.nix b/pkgs/development/compilers/scala/bare.nix index bbbb573f2f5a..2588e3fd5aaf 100644 --- a/pkgs/development/compilers/scala/bare.nix +++ b/pkgs/development/compilers/scala/bare.nix @@ -1,15 +1,25 @@ -{ lib, stdenv, fetchurl, makeWrapper, jre, ncurses }: +{ + lib, + stdenv, + fetchurl, + makeWrapper, + jre, + ncurses, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "3.3.3"; pname = "scala-bare"; src = fetchurl { - url = "https://github.com/lampepfl/dotty/releases/download/${version}/scala3-${version}.tar.gz"; + url = "https://github.com/scala/scala3/releases/download/${finalAttrs.version}/scala3-${finalAttrs.version}.tar.gz"; hash = "sha256-61lAETEvqkEqr5pbDltFkh+Qvp+EnCDilXN9X67NFNE="; }; - propagatedBuildInputs = [ jre ncurses.dev ] ; + propagatedBuildInputs = [ + jre + ncurses.dev + ]; nativeBuildInputs = [ makeWrapper ]; installPhase = '' @@ -20,23 +30,25 @@ stdenv.mkDerivation rec { # Use preFixup instead of fixupPhase # because we want the default fixupPhase as well preFixup = '' - bin_files=$(find $out/bin -type f ! -name common) - for f in $bin_files ; do - wrapProgram $f --set JAVA_HOME ${jre} --prefix PATH : '${ncurses.dev}/bin' - done + bin_files=$(find $out/bin -type f ! -name "*common*" ! -name "scala-cli.jar") + for f in $bin_files ; do + wrapProgram $f --set JAVA_HOME ${jre} --prefix PATH : '${ncurses.dev}/bin' + done ''; meta = with lib; { - description = "Research platform for new language concepts and compiler technologies for Scala"; - longDescription = '' - Dotty is a platform to try out new language concepts and compiler technologies for Scala. - The focus is mainly on simplification. We remove extraneous syntax (e.g. no XML literals), - and try to boil down Scala’s types into a smaller set of more fundamental constructs. - The theory behind these constructs is researched in DOT, a calculus for dependent object types. - ''; - homepage = "http://dotty.epfl.ch/"; - license = licenses.bsd3; + description = "The Scala 3 compiler, also known as Dotty"; + homepage = "https://scala-lang.org/"; + license = licenses.asl20; platforms = platforms.all; - maintainers = with maintainers; [ karolchmist virusdave kashw2 ]; + mainProgram = "scala"; + maintainers = with maintainers; [ + karolchmist + virusdave + kashw2 + natsukagami + hamzaremmal + dottybot + ]; }; -} +}) diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index 2ad68ffec3b3..8d27707dff7f 100644 --- a/pkgs/development/compilers/scala/default.nix +++ b/pkgs/development/compilers/scala/default.nix @@ -1,8 +1,19 @@ -{ stdenv, fetchurl, makeWrapper, jre, callPackage }: +{ + stdenv, + fetchurl, + makeWrapper, + jre, + callPackage, +}: let bare = callPackage ./bare.nix { - inherit stdenv fetchurl makeWrapper jre; + inherit + stdenv + fetchurl + makeWrapper + jre + ; }; in @@ -21,4 +32,7 @@ stdenv.mkDerivation { ''; inherit (bare) meta; -} // { inherit bare; } +} +// { + inherit bare; +} diff --git a/pkgs/development/compilers/scryer-prolog/Cargo.lock b/pkgs/development/compilers/scryer-prolog/Cargo.lock deleted file mode 100644 index 315f61a73402..000000000000 --- a/pkgs/development/compilers/scryer-prolog/Cargo.lock +++ /dev/null @@ -1,3058 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "aho-corasick" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" -dependencies = [ - "memchr", -] - -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - -[[package]] -name = "assert_cmd" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c98233c6673d8601ab23e77eb38f999c51100d46c5703b17288c57fddf3a1ffe" -dependencies = [ - "bstr", - "doc-comment", - "predicates", - "predicates-core", - "predicates-tree", - "wait-timeout", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "backtrace" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" - -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "base64" -version = "0.21.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" - -[[package]] -name = "bit-set" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" -dependencies = [ - "bit-vec", -] - -[[package]] -name = "bit-vec" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" - -[[package]] -name = "bitvec" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" -dependencies = [ - "funty", - "radium", - "tap", - "wyz", -] - -[[package]] -name = "blake2" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94cb07b0da6a73955f8fb85d24c466778e70cda767a568229b104f0264089330" -dependencies = [ - "byte-tools", - "crypto-mac", - "digest 0.8.1", - "opaque-debug", -] - -[[package]] -name = "blake2" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" -dependencies = [ - "digest 0.10.7", -] - -[[package]] -name = "block-buffer" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" -dependencies = [ - "block-padding", - "byte-tools", - "byteorder", - "generic-array 0.12.4", -] - -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array 0.14.7", -] - -[[package]] -name = "block-padding" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" -dependencies = [ - "byte-tools", -] - -[[package]] -name = "bstr" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" -dependencies = [ - "lazy_static", - "memchr", - "regex-automata 0.1.10", -] - -[[package]] -name = "bumpalo" -version = "3.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" - -[[package]] -name = "byte-tools" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "bytes" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" - -[[package]] -name = "cc" -version = "1.0.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chrono" -version = "0.4.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "wasm-bindgen", - "windows-targets", -] - -[[package]] -name = "clipboard-win" -version = "4.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" -dependencies = [ - "error-code", - "str-buf", - "winapi", -] - -[[package]] -name = "console_error_panic_hook" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" -dependencies = [ - "cfg-if", - "wasm-bindgen", -] - -[[package]] -name = "console_log" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be8aed40e4edbf4d3b4431ab260b63fdc40f5780a4766824329ea0f1eefe3c0f" -dependencies = [ - "log", - "web-sys", -] - -[[package]] -name = "core-foundation" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" - -[[package]] -name = "cpu-time" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9e393a7668fe1fad3075085b86c781883000b4ede868f43627b34a87c8b7ded" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "cpufeatures" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" -dependencies = [ - "libc", -] - -[[package]] -name = "crossterm" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ebde6a9dd5e331cd6c6f48253254d117642c31653baa475e394657c59c1f7d" -dependencies = [ - "bitflags 1.3.2", - "crossterm_winapi", - "libc", - "mio 0.7.14", - "parking_lot 0.11.2", - "signal-hook", - "signal-hook-mio", - "winapi", -] - -[[package]] -name = "crossterm_winapi" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a6966607622438301997d3dac0d2f6e9a90c68bb6bc1785ea98456ab93c0507" -dependencies = [ - "winapi", -] - -[[package]] -name = "crrl" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b083214486dae00f49a2f21f32fc8bbc333d6048601bc89203a8ab92bfa691f0" -dependencies = [ - "blake2 0.10.6", - "rand_core", - "sha2", - "sha3 0.10.8", -] - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array 0.14.7", - "typenum", -] - -[[package]] -name = "crypto-mac" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5" -dependencies = [ - "generic-array 0.12.4", - "subtle 1.0.0", -] - -[[package]] -name = "ctrlc" -version = "3.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e95fbd621905b854affdc67943b043a0fbb6ed7385fd5a25650d19a8a6cfdf" -dependencies = [ - "nix 0.27.1", - "windows-sys", -] - -[[package]] -name = "dashmap" -version = "5.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" -dependencies = [ - "cfg-if", - "hashbrown 0.14.0", - "lock_api", - "once_cell", - "parking_lot_core 0.9.8", -] - -[[package]] -name = "dashu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b669b1473cc6b33aba72ab3ddfe1055ff8fc28accd85130c412c2cd922a7c4e" -dependencies = [ - "dashu-base", - "dashu-float", - "dashu-int", - "dashu-macros", - "dashu-ratio", -] - -[[package]] -name = "dashu-base" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e183fc153511989674ede304b5592c74683393ca09cf20391898c28d6ba04264" - -[[package]] -name = "dashu-float" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7696675af30ae057b1629d27b153bbafb06461826b7d0ef1858d06b801f355f" -dependencies = [ - "dashu-base", - "dashu-int", - "num-modular", - "num-order", - "static_assertions", -] - -[[package]] -name = "dashu-int" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc257a884b3e8c9a1a577ff7226dcb4d6bda0ff96dfa76975e2c9d7205e3b8ea" -dependencies = [ - "cfg-if", - "dashu-base", - "num-modular", - "num-order", - "static_assertions", -] - -[[package]] -name = "dashu-macros" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496c319e615b86b21d6b0ea9e2f96a4f5fb2eb4178293b04a51ffc30a6c3f54" -dependencies = [ - "dashu-base", - "dashu-float", - "dashu-int", - "dashu-ratio", - "proc-macro2", - "quote", -] - -[[package]] -name = "dashu-ratio" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f0f73f0ad6cbc94f52306455603e307b065af83bc61101968d53b6870127a05" -dependencies = [ - "dashu-base", - "dashu-float", - "dashu-int", - "num-modular", - "num-order", -] - -[[package]] -name = "derive_deref" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcdbcee2d9941369faba772587a565f4f534e42cb8d17e5295871de730163b2b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "difflib" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" - -[[package]] -name = "digest" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" -dependencies = [ - "generic-array 0.12.4", -] - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer 0.10.4", - "crypto-common", - "subtle 2.5.0", -] - -[[package]] -name = "dirs-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if", - "dirs-sys-next", -] - -[[package]] -name = "dirs-sys-next" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "divrem" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc9f8914dcb99891bdfee82536bbff8d9aa612b0dbe83872afbc66902bdec0b9" - -[[package]] -name = "doc-comment" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" - -[[package]] -name = "either" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" - -[[package]] -name = "encoding_rs" -version = "0.8.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "endian-type" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" - -[[package]] -name = "errno" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "error-code" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21" -dependencies = [ - "libc", - "str-buf", -] - -[[package]] -name = "fastrand" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" - -[[package]] -name = "fd-lock" -version = "3.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef033ed5e9bad94e55838ca0ca906db0e043f517adda0c8b79c7a8c66c93c1b5" -dependencies = [ - "cfg-if", - "rustix", - "windows-sys", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "form_urlencoded" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "funty" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" - -[[package]] -name = "futf" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" -dependencies = [ - "mac", - "new_debug_unreachable", -] - -[[package]] -name = "futures" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" - -[[package]] -name = "futures-executor" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" - -[[package]] -name = "futures-macro" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.37", -] - -[[package]] -name = "futures-sink" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" - -[[package]] -name = "futures-task" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" - -[[package]] -name = "futures-util" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - -[[package]] -name = "generic-array" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" -dependencies = [ - "typenum", -] - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "getrandom" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" -dependencies = [ - "cfg-if", - "js-sys", - "libc", - "wasi", - "wasm-bindgen", -] - -[[package]] -name = "gimli" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" - -[[package]] -name = "git-version" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6b0decc02f4636b9ccad390dcbe77b722a77efedfa393caf8379a51d5c61899" -dependencies = [ - "git-version-macro", - "proc-macro-hack", -] - -[[package]] -name = "git-version-macro" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe69f1cbdb6e28af2bac214e943b99ce8a0a06b447d15d3e61161b0423139f3f" -dependencies = [ - "proc-macro-hack", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "h2" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hashbrown" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" - -[[package]] -name = "headers" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" -dependencies = [ - "base64 0.21.4", - "bytes", - "headers-core", - "http", - "httpdate", - "mime", - "sha1", -] - -[[package]] -name = "headers-core" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" -dependencies = [ - "http", -] - -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "hermit-abi" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" - -[[package]] -name = "home" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" -dependencies = [ - "windows-sys", -] - -[[package]] -name = "hostname" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" -dependencies = [ - "libc", - "match_cfg", - "winapi", -] - -[[package]] -name = "html5ever" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7" -dependencies = [ - "log", - "mac", - "markup5ever", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "http" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" -dependencies = [ - "bytes", - "http", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" - -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - -[[package]] -name = "hyper" -version = "0.14.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2 0.4.9", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes", - "hyper", - "native-tls", - "tokio", - "tokio-native-tls", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - -[[package]] -name = "idna" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "ipnet" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" - -[[package]] -name = "js-sys" -version = "0.3.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "keccak" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" -dependencies = [ - "cpufeatures", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "lexical" -version = "5.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f404a90a744e32e8be729034fc33b90cf2a56418fbf594d69aa3c0214ad414e5" -dependencies = [ - "cfg-if", - "lexical-core", -] - -[[package]] -name = "lexical-core" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" -dependencies = [ - "arrayvec", - "bitflags 1.3.2", - "cfg-if", - "ryu", - "static_assertions", -] - -[[package]] -name = "libc" -version = "0.2.148" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" - -[[package]] -name = "libffi" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce826c243048e3d5cec441799724de52e2d42f820468431fc3fceee2341871e2" -dependencies = [ - "libc", - "libffi-sys", -] - -[[package]] -name = "libffi-sys" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36115160c57e8529781b4183c2bb51fdc1f6d6d1ed345591d84be7703befb3c" -dependencies = [ - "cc", -] - -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] - -[[package]] -name = "linux-raw-sys" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" - -[[package]] -name = "lock_api" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" - -[[package]] -name = "mac" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" - -[[package]] -name = "maplit" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" - -[[package]] -name = "markup5ever" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" -dependencies = [ - "log", - "phf 0.10.1", - "phf_codegen", - "string_cache", - "string_cache_codegen", - "tendril", -] - -[[package]] -name = "markup5ever_rcdom" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9521dd6750f8e80ee6c53d65e2e4656d7de37064f3a7a5d2d11d05df93839c2" -dependencies = [ - "html5ever", - "markup5ever", - "tendril", - "xml5ever", -] - -[[package]] -name = "match_cfg" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" - -[[package]] -name = "memchr" -version = "2.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "mime_guess" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" -dependencies = [ - "mime", - "unicase", -] - -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "0.7.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" -dependencies = [ - "libc", - "log", - "miow", - "ntapi", - "winapi", -] - -[[package]] -name = "mio" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" -dependencies = [ - "libc", - "wasi", - "windows-sys", -] - -[[package]] -name = "miow" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" -dependencies = [ - "winapi", -] - -[[package]] -name = "modular-bitfield" -version = "0.11.2" -source = "git+https://github.com/mthom/modular-bitfield#213535c684af277563678179d8496f11b84a283f" -dependencies = [ - "modular-bitfield-impl", - "static_assertions", -] - -[[package]] -name = "modular-bitfield-impl" -version = "0.11.2" -source = "git+https://github.com/mthom/modular-bitfield#213535c684af277563678179d8496f11b84a283f" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "multer" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01acbdc23469fd8fe07ab135923371d5f5a422fbf9c522158677c8eb15bc51c2" -dependencies = [ - "bytes", - "encoding_rs", - "futures-util", - "http", - "httparse", - "log", - "memchr", - "mime", - "spin 0.9.8", - "version_check", -] - -[[package]] -name = "native-tls" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" -dependencies = [ - "lazy_static", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "new_debug_unreachable" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" - -[[package]] -name = "nibble_vec" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43" -dependencies = [ - "smallvec", -] - -[[package]] -name = "nix" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", -] - -[[package]] -name = "nix" -version = "0.27.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" -dependencies = [ - "bitflags 2.4.0", - "cfg-if", - "libc", -] - -[[package]] -name = "ntapi" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" -dependencies = [ - "winapi", -] - -[[package]] -name = "num-modular" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17bb261bf36fa7d83f4c294f834e91256769097b3cb505d44831e0a179ac647f" - -[[package]] -name = "num-order" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "537b596b97c40fcf8056d153049eb22f481c17ebce72a513ec9286e4986d1bb6" -dependencies = [ - "num-modular", -] - -[[package]] -name = "num-traits" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "object" -version = "0.32.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" - -[[package]] -name = "opaque-debug" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" - -[[package]] -name = "openssl" -version = "0.10.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" -dependencies = [ - "bitflags 2.4.0", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.37", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-sys" -version = "0.9.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "ordered-float" -version = "2.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7940cf2ca942593318d07fcf2596cdca60a85c9e7fab408a5e21a4f9dcd40d87" -dependencies = [ - "num-traits", -] - -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core 0.9.8", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "winapi", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.3.5", - "smallvec", - "windows-targets", -] - -[[package]] -name = "percent-encoding" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" - -[[package]] -name = "phf" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ac8b67553a7ca9457ce0e526948cad581819238f4a9d1ea74545851fa24f37" -dependencies = [ - "phf_macros", - "phf_shared 0.9.0", - "proc-macro-hack", -] - -[[package]] -name = "phf" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" -dependencies = [ - "phf_shared 0.10.0", -] - -[[package]] -name = "phf_codegen" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", -] - -[[package]] -name = "phf_generator" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d43f3220d96e0080cc9ea234978ccd80d904eafb17be31bb0f76daaea6493082" -dependencies = [ - "phf_shared 0.9.0", - "rand", -] - -[[package]] -name = "phf_generator" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" -dependencies = [ - "phf_shared 0.10.0", - "rand", -] - -[[package]] -name = "phf_macros" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b706f5936eb50ed880ae3009395b43ed19db5bff2ebd459c95e7bf013a89ab86" -dependencies = [ - "phf_generator 0.9.1", - "phf_shared 0.9.0", - "proc-macro-hack", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "phf_shared" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a68318426de33640f02be62b4ae8eb1261be2efbc337b60c54d845bf4484e0d9" -dependencies = [ - "siphasher", -] - -[[package]] -name = "phf_shared" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" -dependencies = [ - "siphasher", -] - -[[package]] -name = "pin-project" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.37", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkg-config" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "precomputed-hash" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" - -[[package]] -name = "predicates" -version = "2.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" -dependencies = [ - "difflib", - "itertools", - "predicates-core", -] - -[[package]] -name = "predicates-core" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" - -[[package]] -name = "predicates-tree" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" -dependencies = [ - "predicates-core", - "termtree", -] - -[[package]] -name = "proc-macro-hack" -version = "0.5.20+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" - -[[package]] -name = "proc-macro2" -version = "1.0.67" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "radium" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" - -[[package]] -name = "radix_trie" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd" -dependencies = [ - "endian-type", - "nibble_vec", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_users" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" -dependencies = [ - "getrandom", - "redox_syscall 0.2.16", - "thiserror", -] - -[[package]] -name = "ref_thread_local" -version = "0.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d813022b2e00774a48eaf43caaa3c20b45f040ba8cbf398e2e8911a06668dbe6" - -[[package]] -name = "regex" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata 0.3.3", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" - -[[package]] -name = "regex-automata" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" - -[[package]] -name = "reqwest" -version = "0.11.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" -dependencies = [ - "base64 0.21.4", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-tls", - "ipnet", - "js-sys", - "log", - "mime", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "serde", - "serde_json", - "serde_urlencoded", - "tokio", - "tokio-native-tls", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "winreg", -] - -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted", - "web-sys", - "winapi", -] - -[[package]] -name = "ring-wasi" -version = "0.16.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db1418b2535ed5e71a9fc73d3fede8596792fd7cb4b4a0f8ecf412cfddaaedd4" -dependencies = [ - "cc", - "getrandom", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted", - "web-sys", - "winapi", -] - -[[package]] -name = "ripemd160" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad5112e0dbbb87577bfbc56c42450235e3012ce336e29c5befd7807bd626da4a" -dependencies = [ - "block-buffer 0.7.3", - "digest 0.8.1", - "opaque-debug", -] - -[[package]] -name = "roxmltree" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5001f134077069d87f77c8b9452b690df2445f7a43f1c7ca4a1af8dd505789d" -dependencies = [ - "xmlparser", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[package]] -name = "rustix" -version = "0.38.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747c788e9ce8e92b12cd485c49ddf90723550b654b32508f979b71a7b1ecda4f" -dependencies = [ - "bitflags 2.4.0", - "errno", - "libc", - "linux-raw-sys", - "windows-sys", -] - -[[package]] -name = "rustls" -version = "0.20.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" -dependencies = [ - "log", - "ring", - "sct", - "webpki", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" -dependencies = [ - "base64 0.21.4", -] - -[[package]] -name = "rustversion" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" - -[[package]] -name = "rustyline" -version = "12.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "994eca4bca05c87e86e15d90fc7a91d1be64b4482b38cb2d27474568fe7c9db9" -dependencies = [ - "bitflags 2.4.0", - "cfg-if", - "clipboard-win", - "fd-lock", - "home", - "libc", - "log", - "memchr", - "nix 0.26.4", - "radix_trie", - "scopeguard", - "unicode-segmentation", - "unicode-width", - "utf8parse", - "winapi", -] - -[[package]] -name = "ryu" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "schannel" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" -dependencies = [ - "windows-sys", -] - -[[package]] -name = "scoped-tls" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "scryer-prolog" -version = "0.9.3" -dependencies = [ - "assert_cmd", - "base64 0.12.3", - "bit-set", - "bitvec", - "blake2 0.8.1", - "bytes", - "chrono", - "console_error_panic_hook", - "console_log", - "cpu-time", - "crossterm", - "crrl", - "ctrlc", - "dashu", - "derive_deref", - "dirs-next", - "divrem", - "futures", - "fxhash", - "getrandom", - "git-version", - "hostname", - "indexmap", - "lazy_static", - "lexical", - "libc", - "libffi", - "libloading", - "maplit", - "modular-bitfield", - "native-tls", - "num-order", - "ordered-float", - "phf 0.9.0", - "predicates-core", - "proc-macro2", - "quote", - "rand", - "ref_thread_local", - "regex", - "reqwest", - "ring", - "ring-wasi", - "ripemd160", - "roxmltree", - "rustyline", - "ryu", - "select", - "serde-wasm-bindgen", - "serial_test", - "sha3 0.8.2", - "smallvec", - "static_assertions", - "strum", - "strum_macros", - "syn 2.0.37", - "to-syn-value", - "to-syn-value_derive", - "tokio", - "walkdir", - "warp", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "sct" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "security-framework" -version = "2.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "select" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f9da09dc3f4dfdb6374cbffff7a2cffcec316874d4429899eefdc97b3b94dcd" -dependencies = [ - "bit-set", - "html5ever", - "markup5ever_rcdom", -] - -[[package]] -name = "serde" -version = "1.0.188" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde-wasm-bindgen" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3b143e2833c57ab9ad3ea280d21fd34e285a42837aeb0ee301f4f41890fa00e" -dependencies = [ - "js-sys", - "serde", - "wasm-bindgen", -] - -[[package]] -name = "serde_derive" -version = "1.0.188" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.37", -] - -[[package]] -name = "serde_json" -version = "1.0.107" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serial_test" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e56dd856803e253c8f298af3f4d7eb0ae5e23a737252cd90bb4f3b435033b2d" -dependencies = [ - "dashmap", - "futures", - "lazy_static", - "log", - "parking_lot 0.12.1", - "serial_test_derive", -] - -[[package]] -name = "serial_test_derive" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.37", -] - -[[package]] -name = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest 0.10.7", -] - -[[package]] -name = "sha2" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest 0.10.7", -] - -[[package]] -name = "sha3" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd26bc0e7a2e3a7c959bc494caf58b72ee0c71d67704e9520f736ca7e4853ecf" -dependencies = [ - "block-buffer 0.7.3", - "byte-tools", - "digest 0.8.1", - "keccak", - "opaque-debug", -] - -[[package]] -name = "sha3" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" -dependencies = [ - "digest 0.10.7", - "keccak", -] - -[[package]] -name = "signal-hook" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" -dependencies = [ - "libc", - "signal-hook-registry", -] - -[[package]] -name = "signal-hook-mio" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" -dependencies = [ - "libc", - "mio 0.7.14", - "signal-hook", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - -[[package]] -name = "siphasher" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" - -[[package]] -name = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" - -[[package]] -name = "socket2" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "socket2" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" -dependencies = [ - "libc", - "windows-sys", -] - -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "str-buf" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" - -[[package]] -name = "string_cache" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" -dependencies = [ - "new_debug_unreachable", - "once_cell", - "parking_lot 0.12.1", - "phf_shared 0.10.0", - "precomputed-hash", - "serde", -] - -[[package]] -name = "string_cache_codegen" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", - "proc-macro2", - "quote", -] - -[[package]] -name = "strum" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cae14b91c7d11c9a851d3fbc80a963198998c2a64eec840477fa92d8ce9b70bb" - -[[package]] -name = "strum_macros" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bb0dc7ee9c15cea6199cde9a127fa16a4c5819af85395457ad72d68edc85a38" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "rustversion", - "syn 1.0.109", -] - -[[package]] -name = "subtle" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" - -[[package]] -name = "subtle" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - -[[package]] -name = "tempfile" -version = "3.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" -dependencies = [ - "cfg-if", - "fastrand", - "redox_syscall 0.3.5", - "rustix", - "windows-sys", -] - -[[package]] -name = "tendril" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" -dependencies = [ - "futf", - "mac", - "utf-8", -] - -[[package]] -name = "termtree" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" - -[[package]] -name = "thiserror" -version = "1.0.48" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.48" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.37", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "to-syn-value" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfcc684f2ceaec3b4e8689657c9e0944b07bf5e34563e0bd758c4d42c05c82ed" -dependencies = [ - "syn 2.0.37", - "to-syn-value_derive", -] - -[[package]] -name = "to-syn-value_derive" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dfffda778de8443144ff3b042ddf14e8bc5445f0fd9fe937c3d252535dc9212" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.37", -] - -[[package]] -name = "tokio" -version = "1.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio 0.8.8", - "num_cpus", - "parking_lot 0.12.1", - "pin-project-lite", - "signal-hook-registry", - "socket2 0.5.4", - "tokio-macros", - "windows-sys", -] - -[[package]] -name = "tokio-macros" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.37", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-rustls" -version = "0.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" -dependencies = [ - "rustls", - "tokio", - "webpki", -] - -[[package]] -name = "tokio-stream" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-tungstenite" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54319c93411147bced34cb5609a80e0a8e44c5999c93903a81cd866630ec0bfd" -dependencies = [ - "futures-util", - "log", - "tokio", - "tungstenite", -] - -[[package]] -name = "tokio-util" -version = "0.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", - "tracing", -] - -[[package]] -name = "tower-service" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - -[[package]] -name = "tracing" -version = "0.1.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" -dependencies = [ - "cfg-if", - "log", - "pin-project-lite", - "tracing-core", -] - -[[package]] -name = "tracing-core" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" -dependencies = [ - "once_cell", -] - -[[package]] -name = "try-lock" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" - -[[package]] -name = "tungstenite" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30ee6ab729cd4cf0fd55218530c4522ed30b7b6081752839b68fcec8d0960788" -dependencies = [ - "base64 0.13.1", - "byteorder", - "bytes", - "http", - "httparse", - "log", - "rand", - "sha1", - "thiserror", - "url", - "utf-8", -] - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] -name = "unicase" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" -dependencies = [ - "version_check", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" - -[[package]] -name = "unicode-width" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" - -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "url" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "wait-timeout" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" -dependencies = [ - "libc", -] - -[[package]] -name = "walkdir" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" -dependencies = [ - "same-file", - "winapi-util", -] - -[[package]] -name = "want" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" -dependencies = [ - "try-lock", -] - -[[package]] -name = "warp" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba431ef570df1287f7f8b07e376491ad54f84d26ac473489427231e1718e1f69" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "headers", - "http", - "hyper", - "log", - "mime", - "mime_guess", - "multer", - "percent-encoding", - "pin-project", - "rustls-pemfile", - "scoped-tls", - "serde", - "serde_json", - "serde_urlencoded", - "tokio", - "tokio-rustls", - "tokio-stream", - "tokio-tungstenite", - "tokio-util", - "tower-service", - "tracing", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.37", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.37", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" - -[[package]] -name = "web-sys" -version = "0.3.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0e74f82d49d545ad128049b7e88f6576df2da6b02e9ce565c6f533be576957e" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "winreg" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" -dependencies = [ - "cfg-if", - "windows-sys", -] - -[[package]] -name = "wyz" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" -dependencies = [ - "tap", -] - -[[package]] -name = "xml5ever" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4034e1d05af98b51ad7214527730626f019682d797ba38b51689212118d8e650" -dependencies = [ - "log", - "mac", - "markup5ever", -] - -[[package]] -name = "xmlparser" -version = "0.13.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d25c75bf9ea12c4040a97f829154768bbbce366287e2dc044af160cd79a13fd" diff --git a/pkgs/development/compilers/scryer-prolog/default.nix b/pkgs/development/compilers/scryer-prolog/default.nix deleted file mode 100644 index 245d48d1a595..000000000000 --- a/pkgs/development/compilers/scryer-prolog/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, openssl -, stdenv -, darwin -}: - -rustPlatform.buildRustPackage rec { - pname = "scryer-prolog"; - version = "0.9.4"; - - src = fetchFromGitHub { - owner = "mthom"; - repo = "scryer-prolog"; - rev = "v${version}"; - hash = "sha256-0c0MsjrHRitg+5VEHB9/iSuiqcPztF+2inDZa9fQpwU="; - }; - - cargoHash = "sha256-q8s6HAJhKnMhsgZk5plR+ar3CpLKNqjrD14roDWLwfo="; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - - CARGO_FEATURE_USE_SYSTEM_LIBS = true; - - meta = with lib; { - description = "Modern Prolog implementation written mostly in Rust"; - mainProgram = "scryer-prolog"; - homepage = "https://github.com/mthom/scryer-prolog"; - license = with licenses; [ bsd3 ]; - maintainers = with maintainers; [ malbarbo wkral ]; - }; -} diff --git a/pkgs/development/compilers/serpent/default.nix b/pkgs/development/compilers/serpent/default.nix deleted file mode 100644 index 670986b3ffc5..000000000000 --- a/pkgs/development/compilers/serpent/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, ... }: - -stdenv.mkDerivation { - pname = "serpent"; - - # I can't find any version numbers, so we're just using the date - # of the last commit. - version = "2016-03-05"; - - src = fetchFromGitHub { - owner = "ethereum"; - repo = "serpent"; - rev = "51ee60857fe53c871fa916ef66fc1b4255bb9433"; - sha256 = "1bns9wgn5i1ahj19qx7v1wwdy8ca3q3pigxwznm5nywsw7s7lqxs"; - }; - - postPatch = '' - substituteInPlace Makefile --replace 'g++' '${stdenv.cc.targetPrefix}c++' - ''; - - installPhase = '' - mkdir -p $out/bin - mv serpent $out/bin - ''; - - meta = with lib; { - description = "Compiler for the Serpent language for Ethereum"; - mainProgram = "serpent"; - longDescription = '' - Serpent is one of the high-level programming languages used to - write Ethereum contracts. The language, as suggested by its name, - is designed to be very similar to Python; it is intended to be - maximally clean and simple, combining many of the efficiency - benefits of a low-level language with ease-of-use in programming - style, and at the same time adding special domain-specific - features for contract programming. - ''; - homepage = "https://github.com/ethereum/wiki/wiki/Serpent"; - license = with licenses; [ wtfpl ]; - maintainers = [ ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/compilers/shaderc/default.nix b/pkgs/development/compilers/shaderc/default.nix index 968a3014fa40..97c50cde91e7 100644 --- a/pkgs/development/compilers/shaderc/default.nix +++ b/pkgs/development/compilers/shaderc/default.nix @@ -45,8 +45,8 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ cmake python3 ] - ++ lib.optionals stdenv.isDarwin [ cctools ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ]; postInstall = '' moveToOutput "lib/*.a" $static diff --git a/pkgs/development/compilers/silice/default.nix b/pkgs/development/compilers/silice/default.nix deleted file mode 100644 index 4dfc83f9944b..000000000000 --- a/pkgs/development/compilers/silice/default.nix +++ /dev/null @@ -1,111 +0,0 @@ -{ stdenv, fetchFromGitHub, lib -, cmake, pkg-config, openjdk -, libuuid, python3 -, glfw -, yosys, nextpnr, verilator -, dfu-util, icestorm, trellis -, unstableGitUpdater -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "silice"; - version = "0-unstable-2024-07-22"; - - src = fetchFromGitHub { - owner = "sylefeb"; - repo = "silice"; - rev = "8f56349f8b143d5a4b9686b1782f1ae66e011be4"; - hash = "sha256-1y2q41XyQLxjUkWKh8Ky/t3uaQXkm0IgMk9r06vKcRg="; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ - cmake - pkg-config - openjdk - glfw - ]; - buildInputs = [ - libuuid - ]; - propagatedBuildInputs = [ - (python3.withPackages (p: [ - p.edalize - p.termcolor - ])) - ]; - - postPatch = '' - patchShebangs antlr/antlr.sh - # use nixpkgs version - rm -r python/pybind11 - ''; - - installPhase = '' - runHook preInstall - - make install - mkdir -p $out - cp -ar ../{bin,frameworks,lib} $out/ - - runHook postInstall - ''; - - passthru.tests = - let - silice = finalAttrs.finalPackage; - testProject = project: stdenv.mkDerivation { - name = "${silice.name}-test-${project}"; - nativeBuildInputs = [ - silice - yosys - nextpnr - verilator - dfu-util - icestorm - trellis - ]; - src = "${silice.src}/projects"; - sourceRoot = "projects/${project}"; - buildPhase = '' - targets=() - for target in $(cat configs | tr -d '\r') ; do - [[ $target != Makefile* ]] || continue - make $target ARGS="--no_program" - targets+=($target) - done - if test "''${#targets[@]}" -eq 0; then - >&2 echo "ERROR: no target found!" - false - fi - ''; - installPhase = '' - mkdir $out - for target in "''${targets[@]}" ; do - [[ $target != Makefile* ]] || continue - done - ''; - }; - in { - # a selection of test projects that build with the FPGA tools in - # nixpkgs - audio_sdcard_streamer = testProject "audio_sdcard_streamer"; - bram_interface = testProject "bram_interface"; - blinky = testProject "blinky"; - pipeline_sort = testProject "pipeline_sort"; - }; - - passthru.updateScript = unstableGitUpdater { }; - - meta = { - description = "Open source language that simplifies prototyping and writing algorithms on FPGA architectures"; - homepage = "https://github.com/sylefeb/Silice"; - license = lib.licenses.bsd2; - mainProgram = "silice"; - maintainers = with lib.maintainers; [ - astro - pbsds - ]; - platforms = lib.platforms.all; - }; -}) diff --git a/pkgs/development/compilers/sjasmplus/default.nix b/pkgs/development/compilers/sjasmplus/default.nix deleted file mode 100644 index b9c6a4b171ea..000000000000 --- a/pkgs/development/compilers/sjasmplus/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "sjasmplus"; - version = "1.18.3"; - - src = fetchFromGitHub { - owner = "z00m128"; - repo = "sjasmplus"; - rev = "v${version}"; - sha256 = "sha256-+FvNYfJ5I91RfuJTiOPhj5KW8HoOq8OgnnpFEgefSGc="; - }; - - buildFlags = [ - "CC=${stdenv.cc.targetPrefix}cc" - "CXX=${stdenv.cc.targetPrefix}c++" - ]; - - installPhase = '' - runHook preInstall - install -D sjasmplus $out/bin/sjasmplus - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://z00m128.github.io/sjasmplus/"; - description = "Z80 assembly language cross compiler. It is based on the SjASM source code by Sjoerd Mastijn"; - mainProgram = "sjasmplus"; - license = licenses.bsd3; - platforms = platforms.all; - maintainers = with maintainers; [ electrified ]; - }; -} diff --git a/pkgs/development/compilers/smlnj/default.nix b/pkgs/development/compilers/smlnj/default.nix index 26efb81e1686..17a43f50f7cd 100644 --- a/pkgs/development/compilers/smlnj/default.nix +++ b/pkgs/development/compilers/smlnj/default.nix @@ -1,61 +1,49 @@ { lib, stdenv, fetchurl, Libsystem }: let - version = "110.95"; + version = "110.99.6.1"; baseurl = "http://smlnj.cs.uchicago.edu/dist/working/${version}"; - arch = if stdenv.is64bit + arch = if stdenv.hostPlatform.is64bit then "64" else "32"; boot32 = { url = "${baseurl}/boot.x86-unix.tgz"; - sha256 = "07bcrvjphyin1ygjbymcqhd1mbfk4hff82wmxcllh77lr28l5dxf"; }; + hash = "sha256-2yBY0wGZ8B1jYC5os9SfH6eKJoWlQ4rAclBC3Pnacoc="; }; boot64 = { url = "${baseurl}/boot.amd64-unix.tgz"; - sha256 = "1zn96a83kb6bn6228yfjsvb58m2qxw9k4j3qz0p9c8za479w4ch6"; }; + hash = "sha256-kUabK03MdSYVRWhWKl3kS32SExUYpM3MtLU0mCxhiaQ="; }; - bootBinary = if stdenv.is64bit + bootBinary = if stdenv.hostPlatform.is64bit then boot64 else boot32; sources = map fetchurl [ bootBinary - { url = "${baseurl}/config.tgz"; sha256 = "09srqxkxl86iaz6l6dz83c1apsac0pxpfq6b74i6l0nfl261jibw"; } - { url = "${baseurl}/cm.tgz"; sha256 = "0gh8inrb07z597axw8qipwyx52m8nac5d5r0rvgzvdnnjg9nr9zy"; } - { url = "${baseurl}/compiler.tgz"; sha256 = "1kk6jwzyc261l5nii3n8rwccmgvcj1mg5fgycfsfsiyyy1v8xfx7"; } - { url = "${baseurl}/runtime.tgz"; sha256 = "17i069h5cv411sgzx3ynlf4v3wlrxiba9bwy1b0x0cyhs879kppc"; } - { url = "${baseurl}/system.tgz"; sha256 = "0s8ij3wfxpjrmrwxrgrirfxjj8vkda6l32j88al5q1ic3ncwc58s"; } - { url = "${baseurl}/MLRISC.tgz"; sha256 = "1v2d3gjxrcgc95x5glqcw0nfp13aapkcw03fyi70m3k1yc61izmz"; } - { url = "${baseurl}/smlnj-lib.tgz"; sha256 = "04i11ki8v9s7yz3lg6b0djhi03zzkzav0b5cr81ypxlkmf4hh6bp"; } - { url = "${baseurl}/old-basis.tgz"; sha256 = "1ryqpy0n7c9gd995ndmjvaci74f95nr8n1jjgm28yd1sn7hnavhi"; } - { url = "${baseurl}/ckit.tgz"; sha256 = "18mcs3j8c5gq9cmck7r175am60blaznqmhzyir622yfc8fpw1map"; } - { url = "${baseurl}/nlffi.tgz"; sha256 = "16mrl5aqbgsgljxa3z8kj5max9drddml34bq7rn1i78594jfvkwk"; } - { url = "${baseurl}/cml.tgz"; sha256 = "00x784nv1pi6534k3vva26i9qx84cvw242vgwbs5020zkm6gvrmn"; } - { url = "${baseurl}/eXene.tgz"; sha256 = "143825h36v6z77kwvrvpszgwnhmjs3yldb18i9z4lwkqfb4kn7f7"; } - { url = "${baseurl}/ml-lpt.tgz"; sha256 = "17ly9h9ry8r94dx6lkas6w2cxknwkpma4z9pj8rgzmd3w6qm7j1z"; } - { url = "${baseurl}/ml-lex.tgz"; sha256 = "1ja3l2kiq17754c58mwdiqi25f7ax0cji2wk0vq4872iwwxc22px"; } - { url = "${baseurl}/ml-yacc.tgz"; sha256 = "1m48nkwvw87yg39sjihlw8na5m34bzz3d4zpfbjaj2f75fkjy3jf"; } - { url = "${baseurl}/ml-burg.tgz"; sha256 = "13nbvbah7bn8gjm4gi41m412vpl69wd6d3x3wzbb6xpia9vm4z4j"; } - { url = "${baseurl}/pgraph.tgz"; sha256 = "1aizkl8avz01kx221xy5z7a1a1b5xqn2hrk66wr8d0iav2nh5c98"; } - { url = "${baseurl}/trace-debug-profile.tgz"; sha256 = "1c80xgck9sb2rm554nfg4f5mpjkdbrwkcx88pj120056225l10vx"; } - { url = "${baseurl}/heap2asm.tgz"; sha256 = "1n68drd7as5dy20ccfvgd9cmnhfpfvz7g3f0gc8kpaqaz3vpy36g"; } - { url = "${baseurl}/smlnj-c.tgz"; sha256 = "1b6svh2kk5211rq73fdwx3sf80d2rshf0dmkkrq5mw4852nzqz3p"; } - { url = "${baseurl}/doc.tgz"; sha256 = "021yzhy9maypq4ahz0d0qpr601spndg583fn9mapv6rl42kwhjq6"; } - { url = "${baseurl}/asdl.tgz"; sha256 = "0nqavqcbidwnphbbwjrxhpy8glbyad51wy0cpqimbsw3sgns0zkd"; } + { url = "${baseurl}/config.tgz"; hash = "sha256-9BJPpa/xouqi3j39WsfzlRys4z1yxTdbYttHF5VwCVw="; } + { url = "${baseurl}/cm.tgz"; hash = "sha256-A3crC5EWX4kEB6olwdaObglQgkBBNqcBSCi/pQR5Wdw="; } + { url = "${baseurl}/compiler.tgz"; hash = "sha256-cTgkc5opaEXskdzt5yYsdjyF5m9846t2SyEiwY6W3HU="; } + { url = "${baseurl}/runtime.tgz"; hash = "sha256-JiNzfuZnp1eWQPNZBb9SPmQXtwgknpoGl+38iqUU3W4="; } + { url = "${baseurl}/system.tgz"; hash = "sha256-HUn8YCxlLe6+e5H9oMJjIoG23GBF3thMlHEkSGLZTus="; } + { url = "${baseurl}/MLRISC.tgz"; hash = "sha256-MPNpYhrbsIbVEOzJ7GIEQCm/7F/Jnxj0UXS7FeTp+7o="; } + { url = "${baseurl}/smlnj-lib.tgz"; hash = "sha256-1tp5waPl7MCWS4kIUFm/woQeeRfCjkpgSxHpGb+ymTM="; } + { url = "${baseurl}/old-basis.tgz"; hash = "sha256-I6DJRfIx+09ynFKXZ63dDWRpv0pEljWciAarK/EhQ/s="; } + { url = "${baseurl}/ckit.tgz"; hash = "sha256-vi6dSZISL+KWkpp/jxLPCNBno+qTYThvbExZ5R5L7Wc="; } + { url = "${baseurl}/nlffi.tgz"; hash = "sha256-WfYmX7dhrBqtE4juDVNyjuFtsJ1H+B7rJY2BXJYtKNM="; } + { url = "${baseurl}/cml.tgz"; hash = "sha256-5rZzp5IUj/xZX0fyeoNMohyTz1ifdY6Anu/Hg0spDQw="; } + { url = "${baseurl}/eXene.tgz"; hash = "sha256-c5QnjAQTtlBgYE6DGFMNDbu9ILSEVZgzs/u0bIowfHc="; } + { url = "${baseurl}/ml-lpt.tgz"; hash = "sha256-aRYFTEEl4td7LQ0LhsXGLtJ/ptwCDV1m9GeDtM7+vlo="; } + { url = "${baseurl}/ml-lex.tgz"; hash = "sha256-ZwO3xQUDaD2f7Tsro6kkahT7vSN1JvQbLkwY/m7xSIs="; } + { url = "${baseurl}/ml-yacc.tgz"; hash = "sha256-DBR4xmKiSA5on7+YDz7Zr8qBA6aD1fS64+g69ukSprc="; } + { url = "${baseurl}/ml-burg.tgz"; hash = "sha256-4ruWhGjxny97eUD9Gk4FakqEZzNHwJp7uSa97ET20p0="; } + { url = "${baseurl}/pgraph.tgz"; hash = "sha256-kDyaAMB6Pt3CdAna+V8aLfTx8Tj6a5vPfuSxtpga08w="; } + { url = "${baseurl}/trace-debug-profile.tgz"; hash = "sha256-AD9KWsskRkjTFYiRCIm0qj02sIBHG6HtBM5wKMBqeXY="; } + { url = "${baseurl}/heap2asm.tgz"; hash = "sha256-OHNPMErNoLpYuatgbgYlU/mMB4JXQ4aA50WZ2BHtt3I="; } + { url = "${baseurl}/smlnj-c.tgz"; hash = "sha256-Vure6h0TKqne5+5MJBX9cRkBgmrJ/kKVLUzrIIiH7lE="; } + { url = "${baseurl}/doc.tgz"; hash = "sha256-PliWxCffISPrAO7Zan33recFLRmGoqZLKHOzSEP0PEk="; } + { url = "${baseurl}/asdl.tgz"; hash = "sha256-O6/g20/hsMTG3CvMA59btjG+4UdUbGhMHkizESKJDEA="; } ]; in stdenv.mkDerivation { pname = "smlnj"; - inherit version; - - inherit sources; - - patchPhase = '' - sed -i '/PATH=/d' config/_arch-n-opsys base/runtime/config/gen-posix-names.sh - echo SRCARCHIVEURL="file:/$TMP" > config/srcarchiveurl - patch --verbose config/_heap2exec ${./heap2exec.diff} - '' + lib.optionalString stdenv.isDarwin '' - # Locate standard headers like <unistd.h> - substituteInPlace base/runtime/config/gen-posix-names.sh \ - --replace "\$SDK_PATH/usr" "${Libsystem}" - ''; + inherit version sources; unpackPhase = '' for s in $sources; do @@ -67,6 +55,15 @@ in stdenv.mkDerivation { ./config/unpack $TMP runtime ''; + patchPhase = '' + sed -i '/^PATH=/d' config/_arch-n-opsys base/runtime/config/gen-posix-names.sh + echo SRCARCHIVEURL="file:/$TMP" > config/srcarchiveurl + '' + lib.optionalString stdenv.isDarwin '' + # Locate standard headers like <unistd.h> + substituteInPlace base/runtime/config/gen-posix-names.sh \ + --replace "\$SDK_PATH/usr" "${Libsystem}" + ''; + buildPhase = '' ./config/install.sh -default ${arch} ''; @@ -81,14 +78,14 @@ in stdenv.mkDerivation { done ''; - meta = with lib; { + meta = { description = "Standard ML of New Jersey, a compiler"; homepage = "http://smlnj.org"; - license = licenses.bsd3; + license = lib.licenses.bsd3; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; - maintainers = with maintainers; [ thoughtpolice ]; + maintainers = with lib.maintainers; [ skyesoss thoughtpolice ]; mainProgram = "sml"; # never built on x86_64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isx86_64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; }; } diff --git a/pkgs/development/compilers/smlnj/heap2exec.diff b/pkgs/development/compilers/smlnj/heap2exec.diff deleted file mode 100644 index ef21a8e7f072..000000000000 --- a/pkgs/development/compilers/smlnj/heap2exec.diff +++ /dev/null @@ -1,9 +0,0 @@ -@@ -35,7 +35,7 @@ - BIN_DIR=${SMLNJ_HOME}/bin - fi - --ARCH_N_OPSYS=`"$BIN_DIR/.arch-n-opsys $SIZE_OPT"` -+ARCH_N_OPSYS=`$BIN_DIR/.arch-n-opsys $SIZE_OPT` - if [ "$?" != "0" ]; then - die "unable to determine architecture/operating system" - fi diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix deleted file mode 100644 index 2147d59ffd93..000000000000 --- a/pkgs/development/compilers/solc/default.nix +++ /dev/null @@ -1,133 +0,0 @@ -{ lib, gccStdenv, fetchzip -, pkgs -, boost -, cmake -, coreutils -, jq -, ncurses -, python3 -, z3Support ? true -, z3_4_11 ? null -, cvc4Support ? gccStdenv.isLinux -, cvc4 ? null -, cln ? null -, gmp ? null -}: - -# compiling source/libsmtutil/CVC4Interface.cpp breaks on clang on Darwin, -# general commandline tests fail at abiencoderv2_no_warning/ on clang on NixOS -let z3 = z3_4_11; in - -assert z3Support -> z3 != null && lib.versionAtLeast z3.version "4.11.0"; -assert cvc4Support -> cvc4 != null && cln != null && gmp != null; - -let - jsoncppVersion = "1.9.3"; - jsoncppUrl = "https://github.com/open-source-parsers/jsoncpp/archive/${jsoncppVersion}.tar.gz"; - jsoncpp = fetchzip { - url = jsoncppUrl; - sha256 = "1vbhi503rgwarf275ajfdb8vpdcbn1f7917wjkf8jghqwb1c24lq"; - }; - - range3Version = "0.12.0"; - range3Url = "https://github.com/ericniebler/range-v3/archive/${range3Version}.tar.gz"; - range3 = fetchzip { - url = range3Url; - sha256 = "sha256-bRSX91+ROqG1C3nB9HSQaKgLzOHEFy9mrD2WW3PRBWU="; - }; - - fmtlibVersion = "8.0.1"; - fmtlibUrl = "https://github.com/fmtlib/fmt/archive/${fmtlibVersion}.tar.gz"; - fmtlib = fetchzip { - url = fmtlibUrl; - sha256 = "1mnvxqsan034d2jiqnw2yvkljl7lwvhakmj5bscwp1fpkn655bbw"; - }; - - pname = "solc"; - version = "0.8.21"; - meta = with lib; { - description = "Compiler for Ethereum smart contract language Solidity"; - homepage = "https://github.com/ethereum/solidity"; - license = licenses.gpl3; - maintainers = with maintainers; [ dbrock akru lionello sifmelcara ]; - }; - - solc = if gccStdenv.isLinux then gccStdenv.mkDerivation rec { - inherit pname version meta; - - # upstream suggests avoid using archive generated by github - src = fetchzip { - url = "https://github.com/ethereum/solidity/releases/download/v${version}/solidity_${version}.tar.gz"; - sha256 = "sha256-6EeRmxAmb1nCQ2FTNtWfQ7HCH0g9nJXC3jnhV0KEOwk="; - }; - - postPatch = '' - substituteInPlace cmake/jsoncpp.cmake \ - --replace "${jsoncppUrl}" ${jsoncpp} - substituteInPlace cmake/range-v3.cmake \ - --replace "${range3Url}" ${range3} - substituteInPlace cmake/fmtlib.cmake \ - --replace "${fmtlibUrl}" ${fmtlib} - ''; - - cmakeFlags = [ - "-DBoost_USE_STATIC_LIBS=OFF" - - ] ++ (if z3Support then [ - "-DSTRICT_Z3_VERSION=OFF" - ] else [ - "-DUSE_Z3=OFF" - ]) ++ lib.optionals (!cvc4Support) [ - "-DUSE_CVC4=OFF" - ]; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ boost ] - ++ lib.optionals z3Support [ z3 ] - ++ lib.optionals cvc4Support [ cvc4 cln gmp ]; - nativeCheckInputs = [ jq ncurses (python3.withPackages (ps: with ps; [ colorama deepdiff devtools docopt docutils requests sphinx tabulate z3-solver ])) ]; # contextlib2 glob2 textwrap3 traceback2 urllib3 - - # tests take 60+ minutes to complete, only run as part of passthru tests - doCheck = false; - - checkPhase = '' - pushd .. - # IPC tests need aleth avaliable, so we disable it - sed -i "s/IPC_ENABLED=true/IPC_ENABLED=false\nIPC_FLAGS=\"--no-ipc\"/" ./scripts/tests.sh - for i in ./scripts/*.sh ./scripts/*.py ./test/*.sh ./test/*.py; do - patchShebangs "$i" - done - ## TODO: reenable tests below after adding evmone and hera and their dependencies to nixpkgs - #TERM=xterm ./scripts/tests.sh ${lib.optionalString z3Support "--no-smt"} - popd - ''; - - doInstallCheck = true; - installCheckPhase = '' - $out/bin/solc --version > /dev/null - ''; - - passthru.tests = { - solcWithTests = solc.overrideAttrs (attrs: { doCheck = true; }); - }; - } else gccStdenv.mkDerivation rec { - inherit pname version meta; - - src = pkgs.fetchurl { - url = "https://github.com/ethereum/solidity/releases/download/v${version}/solc-macos"; - sha256 = "sha256-GdBldJ+wjL/097RShKxVhTBjhl9q6GIeTe+l2Ti5pQI="; - }; - dontUnpack = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - cp ${src} $out/bin/solc - chmod +x $out/bin/solc - - runHook postInstall - ''; - }; -in - solc diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix deleted file mode 100644 index b851ac2c1403..000000000000 --- a/pkgs/development/compilers/souffle/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib, stdenv, fetchFromGitHub -, bash-completion, perl, ncurses, zlib, sqlite, libffi -, mcpp, cmake, bison, flex, doxygen, graphviz -, makeWrapper, python3, callPackage -}: - - -let - toolsPath = lib.makeBinPath [ mcpp python3 ]; -in -stdenv.mkDerivation rec { - pname = "souffle"; - version = "2.4.1"; - - src = fetchFromGitHub { - owner = "souffle-lang"; - repo = "souffle"; - rev = version; - sha256 = "sha256-U3/1iNOLFzuXiBsVDAc5AXnK4F982Uifp18jjFNUv2o="; - }; - - patches = [ - ./threads.patch - ./includes.patch - ]; - - hardeningDisable = lib.optionals stdenv.isDarwin [ "strictoverflow" ]; - - nativeBuildInputs = [ bison cmake flex mcpp doxygen graphviz makeWrapper perl ]; - buildInputs = [ bash-completion ncurses zlib sqlite libffi python3 ]; - # these propagated inputs are needed for the compiled Souffle mode to work, - # since generated compiler code uses them. TODO: maybe write a g++ wrapper - # that adds these so we can keep the propagated inputs clean? - propagatedBuildInputs = [ ncurses zlib sqlite libffi ]; - - cmakeFlags = [ "-DSOUFFLE_GIT=OFF" ]; - - env = lib.optionalAttrs stdenv.cc.isClang { - NIX_CFLAGS_COMPILE = "-Wno-error=unused-but-set-variable"; - }; - - postInstall = '' - wrapProgram "$out/bin/souffle" --prefix PATH : "${toolsPath}" - ''; - - postFixup = '' - substituteInPlace "$out/bin/souffle-compile.py" \ - --replace "-IPLACEHOLDER_FOR_INCLUDES_THAT_ARE_SET_BY_NIXPKGS" \ - "-I${ncurses.dev}/include -I${zlib.dev}/include -I${sqlite.dev}/include -I${libffi.dev}/include -I$out/include" - ''; - - outputs = [ "out" ]; - - passthru.tests = callPackage ./tests.nix { }; - - meta = with lib; { - description = "Translator of declarative Datalog programs into the C++ language"; - homepage = "https://souffle-lang.github.io/"; - platforms = platforms.unix; - maintainers = with maintainers; [ thoughtpolice copumpkin wchresta markusscherer ]; - license = licenses.upl; - }; -} diff --git a/pkgs/development/compilers/souffle/includes.patch b/pkgs/development/compilers/souffle/includes.patch deleted file mode 100644 index 3e37641a6cab..000000000000 --- a/pkgs/development/compilers/souffle/includes.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 946a1f8..bc60339 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -428,7 +428,7 @@ set(SOUFFLE_COMPILED_RELEASE_CXX_FLAGS ${CMAKE_CXX_FLAGS_RELEASE}) - set(SOUFFLE_COMPILED_DEBUG_CXX_FLAGS ${CMAKE_CXX_FLAGS_DEBUG}) - get_target_property(SOUFFLE_COMPILED_DEFS compiled COMPILE_DEFINITIONS) - get_target_property(SOUFFLE_COMPILED_OPTS compiled COMPILE_OPTIONS) --get_target_property(SOUFFLE_COMPILED_INCS compiled INCLUDE_DIRECTORIES) -+set(SOUFFLE_COMPILED_INCS PLACEHOLDER_FOR_INCLUDES_THAT_ARE_SET_BY_NIXPKGS) - - set(SOUFFLE_COMPILED_LIBS "") - set(SOUFFLE_COMPILED_RPATHS "") diff --git a/pkgs/development/compilers/souffle/tests.nix b/pkgs/development/compilers/souffle/tests.nix deleted file mode 100644 index 82b4fa489dae..000000000000 --- a/pkgs/development/compilers/souffle/tests.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, lib, souffle, runCommand }: -let - simpleTest = { name, commands }: - stdenv.mkDerivation { - inherit name; - meta.timeout = 60; - buildCommand = '' - echo -e '.decl A(X: number)\n.output A\nA(1).' > A.dl - ${commands} - [ "$(cat A.csv)" = "1" ] - touch $out - ''; - }; -in { - interpret = simpleTest { - name = "souffle-test-interpret"; - commands = "${souffle}/bin/souffle A.dl"; - }; - - compile-in-one-step = simpleTest { - name = "souffle-test-compile-in-one-step"; - commands = '' - ${souffle}/bin/souffle -o A A.dl - ./A - ''; - }; - - compile-in-two-steps = simpleTest { - name = "souffle-test-compile-in-two-steps"; - commands = '' - ${souffle}/bin/souffle -g A.cpp A.dl - ${souffle}/bin/souffle-compile.py A.cpp -o A - ./A - ''; - }; -} diff --git a/pkgs/development/compilers/souffle/threads.patch b/pkgs/development/compilers/souffle/threads.patch deleted file mode 100644 index cf23baa1550d..000000000000 --- a/pkgs/development/compilers/souffle/threads.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 73d5c3c84..e4b0dbfd1 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -104,13 +104,6 @@ option(SOUFFLE_CUSTOM_GETOPTLONG "Enable/Disable custom getopt_long implementati - cmake_dependent_option(SOUFFLE_USE_LIBCPP "Link to libc++ instead of libstdc++" ON - "CMAKE_CXX_COMPILER_ID STREQUAL Clang" OFF) - --# Using Clang? Likely want to use `lld` too. --if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") -- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=lld") -- set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -fuse-ld=lld") -- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fuse-ld=lld") --endif() -- - # Add aditional modules to CMake - set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) - -@@ -247,7 +240,11 @@ endif() - # pthreads - # -------------------------------------------------- - set(THREADS_PREFER_PTHREAD_FLAG ON) --find_package(Threads REQUIRED) -+set(CMAKE_THREAD_LIBS_INIT "-lpthread") -+set(CMAKE_HAVE_THREADS_LIBRARY 1) -+set(CMAKE_USE_WIN32_THREADS_INIT 0) -+set(CMAKE_USE_PTHREADS_INIT 1) -+set(THREADS_PREFER_PTHREAD_FLAG ON) - - # -------------------------------------------------- - # OpenMP diff --git a/pkgs/development/compilers/spasm-ng/default.nix b/pkgs/development/compilers/spasm-ng/default.nix deleted file mode 100644 index fac19ce6cd32..000000000000 --- a/pkgs/development/compilers/spasm-ng/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, gmp, gcc, openssl, zlib }: - -stdenv.mkDerivation rec { - pname = "spasm-ng"; - - version = "unstable-2022-07-05"; - - src = fetchFromGitHub { - owner = "alberthdev"; - repo = "spasm-ng"; - rev = "5f0786d38f064835be674d4b7df42969967bb73c"; - sha256 = "sha256-j7Z3oI+J0wZF4EG5OMMjuDe2o69KKGuJvfyHNPTLrXM="; - }; - - # GCC is needed for Darwin - nativeBuildInputs = [ makeWrapper gcc ]; - buildInputs = [ gmp openssl zlib ]; - - enableParallelBuilding = true; - - installPhase = '' - runHook preInstall - - install -Dm755 spasm -t $out/bin - install -Dm555 inc/*.inc -t $out/include - - runHook postInstall - ''; - - postFixup = '' - wrapProgram $out/bin/spasm --add-flags "-I $out/include" - ''; - - meta = with lib; { - homepage = "https://github.com/alberthdev/spasm-ng"; - description = "Z80 assembler with extra features to support development for TI calculators"; - mainProgram = "spasm"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ siraben ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/compilers/spirv-llvm-translator/default.nix b/pkgs/development/compilers/spirv-llvm-translator/default.nix deleted file mode 100644 index 20adaf5f559b..000000000000 --- a/pkgs/development/compilers/spirv-llvm-translator/default.nix +++ /dev/null @@ -1,121 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, fetchpatch -, cmake -, pkg-config -, lit -, llvm -, spirv-headers -, spirv-tools -}: - -let - llvmMajor = lib.versions.major llvm.version; - isROCm = lib.hasPrefix "rocm" llvm.pname; - - # ROCm, if actively updated will always be at the latest version - branch = - if llvmMajor == "18" then rec { - version = "18.1.0"; - rev = "v${version}"; - hash = "sha256-64guZiuO7VpaX01wNIjV7cnjEAe6ineMdY44S6sA33k="; - } else if llvmMajor == "17" || isROCm then rec { - version = "17.0.0"; - rev = "v${version}"; - hash = "sha256-Rzm5Py9IPFtS9G7kME+uSwZ/0gPGW6MlL35ZWk4LfHM="; - } else if llvmMajor == "16" then rec { - version = "16.0.0"; - rev = "v${version}"; - hash = "sha256-EUabcYqSjXshbPmcs1DRLvCSL1nd9rEdpqELBrItCW8="; - } else if llvmMajor == "15" then rec { - version = "15.0.0"; - rev = "v${version}"; - hash = "sha256-OsDohXRxovtEXaWiRGp8gJ0dXmoALyO+ZimeSO8aPVI="; - } else if llvmMajor == "14" then { - version = "14.0.0+unstable-2024-07-15"; - rev = "2823e7052b7999c10fff63bc8089e5aa205716f4"; - hash = "sha256-8/4B74hYge6WiH7PzRGEgE3W7f9IkQ4VMmfkWKYA/l4="; - } else if llvmMajor == "11" then { - version = "11.0.0+unstable-2022-05-04"; - rev = "4ef524240833abfeee1c5b9fff6b1bd53f4806b3"; # 267 commits ahead of v11.0.0 - hash = "sha256-NoIoa20+2sH41rEnr8lsMhtfesrtdPINiXtUnxYVm8s="; - } else throw "Incompatible LLVM version."; -in -stdenv.mkDerivation { - pname = "SPIRV-LLVM-Translator"; - inherit (branch) version; - - src = fetchFromGitHub { - owner = "KhronosGroup"; - repo = "SPIRV-LLVM-Translator"; - inherit (branch) rev hash; - }; - - patches = lib.optionals (llvmMajor == "18") [ - # Fixes build after SPV_INTEL_maximum_registers breaking change - # TODO: remove on next spirv-headers release - (fetchpatch { - url = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator/commit/d970c9126c033ebcbb7187bc705eae2e54726b74.patch"; - revert = true; - hash = "sha256-71sJuGqVjTcB549eIiCO0LoqAgxkdEHCoxh8Pd/Qzz8="; - }) - ] ++ lib.optionals (lib.versionAtLeast llvmMajor "15" && lib.versionOlder llvmMajor "18") [ - # Fixes build after spirv-headers breaking change - (fetchpatch { - url = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator/commit/0166a0fb86dc6c0e8903436bbc3a89bc3273ebc0.patch"; - excludes = ["spirv-headers-tag.conf"]; - hash = "sha256-17JJG8eCFVphElY5fVT/79hj0bByWxo8mVp1ZNjQk/M="; - }) - ] ++ lib.optionals (llvmMajor == "16") [ - # Fixes builds that link against external LLVM dynamic library - (fetchpatch { - url = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator/commit/f3b9b604d7eda18d0d1029d94a6eebd33aa3a3fe.patch"; - hash = "sha256-opDjyZcy7O4wcSfm/A51NCIiDyIvbcmbv9ns1njdJbc="; - }) - ] ++ lib.optionals (llvmMajor == "14") [ - (fetchpatch { - # tries to install llvm-spirv into llvm nix store path - url = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator/commit/cce9a2f130070d799000cac42fe24789d2b777ab.patch"; - revert = true; - hash = "sha256-GbFacttZRDCgA0jkUoFA4/B3EDn3etweKvM09OwICJ8="; - }) - ]; - - nativeBuildInputs = [ pkg-config cmake ] - ++ (if isROCm then [ llvm ] else [ llvm.dev ]); - - buildInputs = [ spirv-headers spirv-tools ] - ++ lib.optionals (!isROCm) [ llvm ]; - - nativeCheckInputs = [ lit ]; - - cmakeFlags = [ - "-DLLVM_INCLUDE_TESTS=ON" - "-DLLVM_DIR=${(if isROCm then llvm else llvm.dev)}" - "-DBUILD_SHARED_LIBS=YES" - "-DLLVM_SPIRV_BUILD_EXTERNAL=YES" - # RPATH of binary /nix/store/.../bin/llvm-spirv contains a forbidden reference to /build/ - "-DCMAKE_SKIP_BUILD_RPATH=ON" - ] ++ lib.optional (llvmMajor != "11") "-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=${spirv-headers.src}"; - - # FIXME: CMake tries to run "/llvm-lit" which of course doesn't exist - doCheck = false; - - makeFlags = [ "all" "llvm-spirv" ]; - - postInstall = '' - install -D tools/llvm-spirv/llvm-spirv $out/bin/llvm-spirv - '' + lib.optionalString stdenv.isDarwin '' - install_name_tool $out/bin/llvm-spirv \ - -change @rpath/libLLVMSPIRVLib.dylib $out/lib/libLLVMSPIRVLib.dylib - ''; - - meta = with lib; { - homepage = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator"; - description = "Tool and a library for bi-directional translation between SPIR-V and LLVM IR"; - mainProgram = "llvm-spirv"; - license = licenses.ncsa; - platforms = platforms.unix; - maintainers = with maintainers; [ gloaming ]; - }; -} diff --git a/pkgs/development/compilers/stalin/default.nix b/pkgs/development/compilers/stalin/default.nix deleted file mode 100644 index 245ebdb0c6cb..000000000000 --- a/pkgs/development/compilers/stalin/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ fetchurl, lib, stdenv, ncompress, libX11 }: - -stdenv.mkDerivation rec { - pname = "stalin"; - version = "0.11"; - - src = fetchurl { - url = "ftp://ftp.ecn.purdue.edu/qobi/stalin.tar.Z"; - sha256 = "0lz8riccpigdixwf6dswwva6s4kxaz3dzxhkqhcxgwmffy30vw8s"; - }; - - buildInputs = [ ncompress libX11 ]; - - buildPhase = "./build "; - - installPhase = '' - mkdir -p "$out/bin" - cp stalin "$out/bin" - - mkdir -p "$out/man/man1" - cp stalin.1 "$out/man/man1" - - mkdir -p "$out/share/emacs/site-lisp" - cp stalin.el "$out/share/emacs/site-lisp" - - mkdir -p "$out/doc/stalin-${version}" - cp README "$out/doc/stalin-${version}" - - mkdir -p "$out/share/stalin-${version}/include" - cp "include/"* "$out/share/stalin-${version}/include" - - substituteInPlace "$out/bin/stalin" \ - --replace "$PWD/include/stalin" "$out/share/stalin-${version}/include/stalin" - substituteInPlace "$out/bin/stalin" \ - --replace "$PWD/include" "$out/share/stalin-${version}/include" - ''; - - meta = { - homepage = "http://www.ece.purdue.edu/~qobi/software.html"; - license = lib.licenses.gpl2Plus; - description = "Optimizing Scheme compiler"; - - maintainers = [ ]; - platforms = ["i686-linux"]; # doesn't want to work on 64-bit platforms - }; -} diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix index 628e69eb5bc9..9336adb1cd76 100644 --- a/pkgs/development/compilers/swi-prolog/default.nix +++ b/pkgs/development/compilers/swi-prolog/default.nix @@ -54,7 +54,7 @@ # url = "https://raw.githubusercontent.com/samer--/prolog/master/typedef/release/typedef-0.1.9.tgz"; # sha256 = "056nqjn01g18fb1b2qivv9s7hb4azk24nx2d4kvkbmm1k91f44p3"; # }; -# swiProlog = pkgs.swiProlog.override { extraPacks = map (dep-path: "'file://${dep-path}'") [ +# swi-prolog = pkgs.swi-prolog.override { extraPacks = map (dep-path: "'file://${dep-path}'") [ # julian delay list_util typedef # ]; }; , extraPacks ? [] @@ -63,7 +63,7 @@ let # minorVersion is even for stable, odd for unstable - version = "9.2.6"; + version = "9.2.7"; # This package provides several with* options, which replaces the old extraLibraries option. # This error should help users that still use this option find their way to these flags. @@ -71,10 +71,10 @@ let extraLibraries' = if extraLibraries == [] then [] else throw "option 'extraLibraries' removed - use 'with*' options (e.g., 'withJava'), or overrideAttrs to inject extra build dependencies"; - packInstall = swiplPath: pack: - ''${swiplPath}/bin/swipl -g "pack_install(${pack}, [package_directory(\"${swiplPath}/lib/swipl/extra-pack\"), silent(true), interactive(false)])." -t "halt." - ''; - withGui' = withGui && !stdenv.isDarwin; + packInstall = swiplPath: pack: '' + ${swiplPath}/bin/swipl -g "pack_install(${pack}, [package_directory(\"${swiplPath}/lib/swipl/extra-pack\"), silent(true), interactive(false), git(false)])." -t "halt." + ''; + withGui' = withGui && !stdenv.hostPlatform.isDarwin; optionalDependencies = [] ++ (lib.optional withDb db) ++ (lib.optional withJava jdk) @@ -85,7 +85,7 @@ let ++ (lib.optionals withGui' [ libXt libXext libXpm libXft libXinerama libjpeg libSM freetype fontconfig ]) - ++ (lib.optional stdenv.isDarwin Security) + ++ (lib.optional stdenv.hostPlatform.isDarwin Security) ++ extraLibraries'; in stdenv.mkDerivation { @@ -99,7 +99,7 @@ stdenv.mkDerivation { owner = "SWI-Prolog"; repo = "swipl"; rev = "V${version}"; - hash = "sha256-FgEn+Ht45++GFpfcdaJ5In5x+NyIOopSlSAs+t7sPDE="; + hash = "sha256-O9ogltcbBST111FA85jEVW6jGOLJSt/5PeBABtMu2Ws="; fetchSubmodules = true; }; @@ -126,8 +126,8 @@ stdenv.mkDerivation { cmakeFlags = [ "-DSWIPL_INSTALL_IN_LIB=ON" ] ++ lib.optionals (!withNativeCompiler) [ # without these options, the build will embed full compiler paths - "-DSWIPL_CC=${if stdenv.isDarwin then "clang" else "gcc"}" - "-DSWIPL_CXX=${if stdenv.isDarwin then "clang++" else "g++"}" + "-DSWIPL_CC=${if stdenv.hostPlatform.isDarwin then "clang" else "gcc"}" + "-DSWIPL_CXX=${if stdenv.hostPlatform.isDarwin then "clang++" else "g++"}" ]; preInstall = '' diff --git a/pkgs/development/compilers/swift/compiler/default.nix b/pkgs/development/compilers/swift/compiler/default.nix index d3e2017958fd..8e8cf798db4f 100644 --- a/pkgs/development/compilers/swift/compiler/default.nix +++ b/pkgs/development/compilers/swift/compiler/default.nix @@ -6,7 +6,7 @@ , coreutils , gnugrep , perl -, ninja +, ninja_1_11 , pkg-config , clang , bintools @@ -30,38 +30,29 @@ # Darwin-specific , substituteAll , fixDarwinDylibNames -, runCommandLocal , xcbuild , cctools # libtool , sigtool , DarwinTools -, CoreServices -, Foundation -, Combine -, MacOSX-SDK -, CLTools_Executables +, apple-sdk_13 +, darwinMinVersionHook }: let + apple-sdk_swift = apple-sdk_13; # Use the SDK that was available when Swift shipped. + + deploymentVersion = + if lib.versionOlder (targetPlatform.darwinMinVersion or "0") "10.15" then + "10.15" + else + targetPlatform.darwinMinVersion; + python3 = python3Packages.python.withPackages (p: [ p.setuptools ]); # python 3.12 compat. inherit (stdenv) hostPlatform targetPlatform; sources = callPackage ../sources.nix { }; - # Tools invoked by swift at run-time. - runtimeDeps = lib.optionals stdenv.isDarwin [ - # libtool is used for static linking. This is part of cctools, but adding - # that as a build input puts an unwrapped linker in PATH, and breaks - # builds. This small derivation exposes just libtool. - # NOTE: The same applies to swift-driver, but that is currently always - # invoked via the old `swift` / `swiftc`. May change in the future. - (runCommandLocal "libtool" { } '' - mkdir -p $out/bin - ln -s ${cctools}/bin/libtool $out/bin/libtool - '') - ]; - # There are apparently multiple naming conventions on Darwin. Swift uses the # xcrun naming convention. See `configure_sdk_darwin` calls in CMake files. swiftOs = if targetPlatform.isDarwin @@ -78,7 +69,7 @@ let else targetPlatform.parsed.kernel.name; # Apple Silicon uses a different CPU name in the target triple. - swiftArch = if stdenv.isDarwin && stdenv.isAarch64 then "arm64" + swiftArch = if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then "arm64" else targetPlatform.parsed.cpu.name; # On Darwin, a `.swiftmodule` is a subdirectory in `lib/swift/<OS>`, @@ -109,7 +100,7 @@ let "toolchain-tools" "toolchain-dev-tools" "license" - (if stdenv.isDarwin then "sourcekit-xpc-service" else "sourcekit-inproc") + (if stdenv.hostPlatform.isDarwin then "sourcekit-xpc-service" else "sourcekit-inproc") "swift-remote-mirror" "swift-remote-mirror-headers" ]; @@ -158,7 +149,9 @@ let # NOTE: @prog@ needs to be filled elsewhere. }; swiftWrapper = runCommand "swift-wrapper.sh" wrapperParams '' - substituteAll '${../wrapper/wrapper.sh}' "$out" + # Make empty to avoid adding the SDK’s modules in the bootstrap wrapper. Otherwise, the SDK conflicts with the + # shims the wrapper tries to build. + darwinMinVersion="" substituteAll '${../wrapper/wrapper.sh}' "$out" ''; makeSwiftcWrapper = writeShellScriptBin "nix-swift-make-swift-wrapper" '' set -euo pipefail @@ -179,15 +172,32 @@ let name = "apple-swift-core"; dontUnpack = true; + buildInputs = [ apple-sdk_swift ]; + installPhase = '' mkdir -p $out/lib/swift cp -r \ - "${MacOSX-SDK}/usr/lib/swift/Swift.swiftmodule" \ - "${MacOSX-SDK}/usr/lib/swift/libswiftCore.tbd" \ + "$SDKROOT/usr/lib/swift/Swift.swiftmodule" \ + "$SDKROOT/usr/lib/swift/CoreFoundation.swiftmodule" \ + "$SDKROOT/usr/lib/swift/Dispatch.swiftmodule" \ + "$SDKROOT/usr/lib/swift/ObjectiveC.swiftmodule" \ + "$SDKROOT/usr/lib/swift/libswiftCore.tbd" \ + "$SDKROOT/usr/lib/swift/libswiftCoreFoundation.tbd" \ + "$SDKROOT/usr/lib/swift/libswiftDispatch.tbd" \ + "$SDKROOT/usr/lib/swift/libswiftFoundation.tbd" \ + "$SDKROOT/usr/lib/swift/libswiftObjectiveC.tbd" \ $out/lib/swift/ ''; }; + # https://github.com/NixOS/nixpkgs/issues/327836 + # Fail to build with ninja 1.12 when NIX_BUILD_CORES is low (Hydra or Github Actions). + # Can reproduce using `nix --option cores 2 build -f . swiftPackages.swift-unwrapped`. + # Until we find out the exact cause, follow [swift upstream][1], pin ninja to version + # 1.11.1. + # [1]: https://github.com/swiftlang/swift/pull/72989 + ninja = ninja_1_11; + in stdenv.mkDerivation { pname = "swift"; inherit (sources) version; @@ -205,11 +215,12 @@ in stdenv.mkDerivation { makeClangWrapper makeSwiftcWrapper ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild sigtool # codesign DarwinTools # sw_vers fixDarwinDylibNames + cctools.libtool ]; buildInputs = [ @@ -218,15 +229,20 @@ in stdenv.mkDerivation { swig libxml2 ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ libuuid ] - ++ lib.optionals stdenv.isDarwin [ - CoreServices - Foundation - Combine + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + apple-sdk_swift + (darwinMinVersionHook deploymentVersion) ]; + # Will effectively be `buildInputs` when swift is put in `nativeBuildInputs`. + depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ + apple-sdk_swift + (darwinMinVersionHook deploymentVersion) + ]; + # This is a partial reimplementation of our setup hook. Because we reuse # the Swift wrapper for the Swift build itself, we need to do some of the # same preparation. @@ -262,7 +278,7 @@ in stdenv.mkDerivation { ${copySource "swift-experimental-string-processing"} ${copySource "swift-syntax"} ${lib.optionalString - (!stdenv.isDarwin) + (!stdenv.hostPlatform.isDarwin) (copySource "swift-corelibs-libdispatch")} chmod -R u+w . @@ -272,7 +288,7 @@ in stdenv.mkDerivation { # Just patch all the things for now, we can focus this later. # TODO: eliminate use of env. find -type f -print0 | xargs -0 sed -i \ - ${lib.optionalString stdenv.isDarwin + ${lib.optionalString stdenv.hostPlatform.isDarwin "-e 's|/usr/libexec/PlistBuddy|${xcbuild}/bin/PlistBuddy|g'"} \ -e 's|/usr/bin/env|${coreutils}/bin/env|g' \ -e 's|/usr/bin/make|${gnumake}/bin/make|g' \ @@ -345,7 +361,7 @@ in stdenv.mkDerivation { hash = "sha256-nkRPWx8gNvYr7mlvEUiOAb1rTrf+skCZjAydJVUHrcI="; }} - ${lib.optionalString stdenv.isLinux '' + ${lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace llvm-project/clang/lib/Driver/ToolChains/Linux.cpp \ --replace 'SysRoot + "/lib' '"${glibc}/lib" "' \ --replace 'SysRoot + "/usr/lib' '"${glibc}/lib" "' \ @@ -384,7 +400,7 @@ in stdenv.mkDerivation { patchShebangs . - ${lib.optionalString (!stdenv.isDarwin) '' + ${lib.optionalString (!stdenv.hostPlatform.isDarwin) '' # NOTE: This interferes with ABI stability on Darwin, which uses the system # libraries in the hardcoded path /usr/lib/swift. fixCmakeFiles . @@ -392,16 +408,13 @@ in stdenv.mkDerivation { ''; # > clang-15-unwrapped: error: unsupported option '-fzero-call-used-regs=used-gpr' for target 'arm64-apple-macosx10.9.0' - hardeningDisable = lib.optional stdenv.isAarch64 "zerocallusedregs"; + hardeningDisable = lib.optional stdenv.hostPlatform.isAarch64 "zerocallusedregs"; configurePhase = '' export SWIFT_SOURCE_ROOT="$PWD" mkdir -p ../build cd ../build export SWIFT_BUILD_ROOT="$PWD" - - # Most builds set a target, but LLDB doesn't. Harmless on non-Darwin. - export MACOSX_DEPLOYMENT_TARGET=10.15 ''; # These steps are derived from doing a normal build with. @@ -451,15 +464,11 @@ in stdenv.mkDerivation { " buildProject llvm llvm-project/llvm - '' + lib.optionalString stdenv.isDarwin '' - # Add appleSwiftCore to the search paths. We can't simply add it to - # buildInputs, because it is potentially an older stdlib than the one we're - # building. We have to remove it again after the main Swift build, or later - # build steps may fail. (Specific case: Concurrency backdeploy uses the - # Sendable protocol, which appears to not be present in the macOS 11 SDK.) + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' + # Add appleSwiftCore to the search paths. Adding the whole SDK results in build failures. OLD_NIX_SWIFTFLAGS_COMPILE="$NIX_SWIFTFLAGS_COMPILE" OLD_NIX_LDFLAGS="$NIX_LDFLAGS" - export NIX_SWIFTFLAGS_COMPILE+=" -I ${appleSwiftCore}/lib/swift" + export NIX_SWIFTFLAGS_COMPILE=" -I ${appleSwiftCore}/lib/swift" export NIX_LDFLAGS+=" -L ${appleSwiftCore}/lib/swift" '' + '' @@ -477,7 +486,7 @@ in stdenv.mkDerivation { # Fixed in: https://github.com/apple/swift/commit/84083afef1de5931904d5c815d53856cdb3fb232 cmakeFlags=" -GNinja - -DBOOTSTRAPPING_MODE=BOOTSTRAPPING${lib.optionalString stdenv.isDarwin "-WITH-HOSTLIBS"} + -DBOOTSTRAPPING_MODE=BOOTSTRAPPING${lib.optionalString stdenv.hostPlatform.isDarwin "-WITH-HOSTLIBS"} -DSWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING=ON -DSWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY=ON -DSWIFT_ENABLE_EXPERIMENTAL_DISTRIBUTED=ON @@ -490,11 +499,12 @@ in stdenv.mkDerivation { -DSWIFT_PATH_TO_SWIFT_SYNTAX_SOURCE=$SWIFT_SOURCE_ROOT/swift-syntax -DSWIFT_PATH_TO_STRING_PROCESSING_SOURCE=$SWIFT_SOURCE_ROOT/swift-experimental-string-processing -DSWIFT_INSTALL_COMPONENTS=${lib.concatStringsSep ";" swiftInstallComponents} - -DSWIFT_STDLIB_ENABLE_OBJC_INTEROP=${if stdenv.isDarwin then "ON" else "OFF"} + -DSWIFT_STDLIB_ENABLE_OBJC_INTEROP=${if stdenv.hostPlatform.isDarwin then "ON" else "OFF"} + -DSWIFT_DARWIN_DEPLOYMENT_VERSION_OSX=${deploymentVersion} " buildProject swift - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # Restore search paths to remove appleSwiftCore. export NIX_SWIFTFLAGS_COMPILE="$OLD_NIX_SWIFTFLAGS_COMPILE" export NIX_LDFLAGS="$OLD_NIX_LDFLAGS" @@ -506,12 +516,6 @@ in stdenv.mkDerivation { # which requires a special signature. # # CMAKE_BUILD_WITH_INSTALL_NAME_DIR ensures we don't use rpath on Darwin. - # - # NOTE: On Darwin, we only want ncurses in the linker search path, because - # headers are part of libsystem. Adding its headers to the search path - # causes strange mixing and errors. Note that libedit propagates ncurses, - # so we add both manually here, instead of relying on setup hooks. - # TODO: Find a better way to prevent this conflict. cmakeFlags=" -GNinja -DLLDB_SWIFTC=$SWIFT_BUILD_ROOT/swift/bin/swiftc @@ -526,18 +530,18 @@ in stdenv.mkDerivation { -DLLDB_ENABLE_LUA=OFF -DLLDB_INCLUDE_TESTS=OFF -DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' -DLLDB_USE_SYSTEM_DEBUGSERVER=ON ''} - -DLibEdit_INCLUDE_DIRS=${libedit.dev}/include - -DLibEdit_LIBRARIES=${libedit}/lib/libedit${stdenv.hostPlatform.extensions.sharedLibrary} - -DCURSES_INCLUDE_DIRS=${if stdenv.isDarwin then "/var/empty" else ncurses.dev}/include - -DCURSES_LIBRARIES=${ncurses}/lib/libncurses${stdenv.hostPlatform.extensions.sharedLibrary} - -DPANEL_LIBRARIES=${ncurses}/lib/libpanel${stdenv.hostPlatform.extensions.sharedLibrary} + -DLibEdit_INCLUDE_DIRS=${lib.getInclude libedit}/include + -DLibEdit_LIBRARIES=${lib.getLib libedit}/lib/libedit${stdenv.hostPlatform.extensions.sharedLibrary} + -DCURSES_INCLUDE_DIRS=${lib.getInclude ncurses}/include + -DCURSES_LIBRARIES=${lib.getLib ncurses}/lib/libncurses${stdenv.hostPlatform.extensions.sharedLibrary} + -DPANEL_LIBRARIES=${lib.getLib ncurses}/lib/libpanel${stdenv.hostPlatform.extensions.sharedLibrary} "; buildProject lldb llvm-project/lldb - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' # Need to do a standalone build of concurrency for Darwin back deployment. # Based on: utils/swift_build_support/swift_build_support/products/backdeployconcurrency.py cmakeFlags=" @@ -586,7 +590,7 @@ in stdenv.mkDerivation { -DSWIFT_DEST_ROOT=$out -DSWIFT_HOST_VARIANT_SDK=OSX - -DSWIFT_DARWIN_DEPLOYMENT_VERSION_OSX=10.15 + -DSWIFT_DARWIN_DEPLOYMENT_VERSION_OSX=${deploymentVersion} -DSWIFT_DARWIN_DEPLOYMENT_VERSION_IOS=13.0 -DSWIFT_DARWIN_DEPLOYMENT_VERSION_MACCATALYST=13.0 -DSWIFT_DARWIN_DEPLOYMENT_VERSION_TVOS=13.0 @@ -641,7 +645,7 @@ in stdenv.mkDerivation { cd $SWIFT_BUILD_ROOT/swift ninjaInstallPhase - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' cd $SWIFT_BUILD_ROOT/swift-concurrency-backdeploy installTargets=install-back-deployment ninjaInstallPhase @@ -668,21 +672,15 @@ in stdenv.mkDerivation { # just copying the 3 symlinks inside to smaller closures. mkdir $lib/lib/swift/clang cp -P ${clang}/resource-root/* $lib/lib/swift/clang/ - - ${lib.optionalString stdenv.isDarwin '' - # Install required library for ObjC interop. - # TODO: Is there no source code for this available? - cp -r ${CLTools_Executables}/usr/lib/arc $out/lib/arc - ''} ''; - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' # This is cheesy, but helps the patchelf hook remove /build from RPATH. cd $SWIFT_BUILD_ROOT/.. mv build buildx ''; - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' # These libraries need to use the system install name. The official SDK # does the same (as opposed to using rpath). Presumably, they are part of # the stable ABI. Not using the system libraries at run-time is known to @@ -713,7 +711,10 @@ in stdenv.mkDerivation { done wrapProgram $out/bin/swift-frontend \ - --prefix PATH : ${lib.makeBinPath runtimeDeps} + --prefix PATH : ${lib.makeBinPath [ cctools.libtool ]} + + # Needs to be propagated by the compiler not by its dev output. + moveToOutput nix-support/propagated-target-target-deps "$out" ''; passthru = { diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index e55465e952d5..3ddd48399b1a 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -5,6 +5,7 @@ , llvmPackages , llvmPackages_15 , overrideCC +, overrideLibcxx }: let @@ -15,7 +16,11 @@ let callPackage = newScope self; # Current versions of Swift on Darwin require macOS SDK 10.15 at least. - # Re-export this so we can rely on the minimum Swift SDK elsewhere. + # The Swift compiler propagates the 13.3 SDK and a 10.15 deployment target. + # Packages that need a newer version can add it to their build inputs + # to use it (as normal). + + # This SDK is included for compatibility with existing packages. apple_sdk = pkgs.darwin.apple_sdk_11_0; # Swift builds its own Clang for internal use. We wrap that clang with a @@ -24,43 +29,24 @@ let # we'll often run into compilation errors. # # The following selects the correct Clang version, matching the version - # used in Swift, and applies the same libc overrides as `apple_sdk.stdenv`. - clang = if pkgs.stdenv.isDarwin - then - swiftLlvmPackages.clang.override rec { - libc = apple_sdk.Libsystem; - bintools = pkgs.bintools.override { inherit libc; }; - # Ensure that Swift’s internal clang uses the same libc++ and libc++abi as the - # default Darwin stdenv. Using the default libc++ avoids issues (such as crashes) - # that can happen when a Swift application dynamically links different versions - # of libc++ and libc++abi than libraries it links are using. - inherit (llvmPackages) libcxx; - } - else - swiftLlvmPackages.clang; + # used in Swift. + inherit (swiftLlvmPackages) clang; # Overrides that create a useful environment for swift packages, allowing - # packaging with `swiftPackages.callPackage`. These are similar to - # `apple_sdk_11_0.callPackage`, with our clang on top. + # packaging with `swiftPackages.callPackage`. inherit (clang) bintools; - stdenv = overrideCC pkgs.stdenv clang; - darwin = pkgs.darwin.overrideScope (_: prev: { - inherit apple_sdk; - inherit (apple_sdk) Libsystem LibsystemCross libcharset libunwind objc4 configd IOKit Security; - CF = apple_sdk.CoreFoundation // { __attrsFailEvaluation = true; }; - __attrsFailEvaluation = true; - }); - xcodebuild = pkgs.xcbuild.override { - inherit (apple_sdk.frameworks) CoreServices CoreGraphics ImageIO; - inherit stdenv; - sdkVer = "10.15"; - }; - xcbuild = xcodebuild; + stdenv = + let + stdenv' = overrideCC pkgs.stdenv clang; + in + # Ensure that Swift’s internal clang uses the same libc++ and libc++abi as the + # default clang’s stdenv. Using the default libc++ avoids issues (such as crashes) + # that can happen when a Swift application dynamically links different versions + # of libc++ and libc++abi than libraries it links are using. + if stdenv'.cc.libcxx != null then overrideLibcxx stdenv' else stdenv'; swift-unwrapped = callPackage ./compiler { inherit (darwin) DarwinTools sigtool; - inherit (apple_sdk) MacOSX-SDK CLTools_Executables; - inherit (apple_sdk.frameworks) CoreServices Foundation Combine; }; swiftNoSwiftDriver = callPackage ./wrapper { @@ -68,12 +54,12 @@ let useSwiftDriver = false; }; - Dispatch = if stdenv.isDarwin - then null # part of libsystem + Dispatch = if stdenv.hostPlatform.isDarwin + then null # part of apple-sdk else callPackage ./libdispatch { swift = swiftNoSwiftDriver; }; - Foundation = if stdenv.isDarwin - then apple_sdk.frameworks.Foundation + Foundation = if stdenv.hostPlatform.isDarwin + then null # part of apple-sdk else callPackage ./foundation { swift = swiftNoSwiftDriver; }; # TODO: Apple distributes a binary XCTest with Xcode, but it is not part of diff --git a/pkgs/development/compilers/swift/sourcekit-lsp/default.nix b/pkgs/development/compilers/swift/sourcekit-lsp/default.nix index f0c08a41e43e..2d1cd6dd0440 100644 --- a/pkgs/development/compilers/swift/sourcekit-lsp/default.nix +++ b/pkgs/development/compilers/swift/sourcekit-lsp/default.nix @@ -21,7 +21,7 @@ let # are part of libsystem. Adding its headers to the search path causes strange # mixing and errors. # TODO: Find a better way to prevent this conflict. - ncursesInput = if stdenv.isDarwin then ncurses.out else ncurses; + ncursesInput = if stdenv.hostPlatform.isDarwin then ncurses.out else ncurses; in stdenv.mkDerivation { pname = "sourcekit-lsp"; @@ -35,7 +35,7 @@ stdenv.mkDerivation { XCTest sqlite ncursesInput - ] ++ lib.optionals stdenv.isDarwin [ CryptoKit LocalAuthentication ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CryptoKit LocalAuthentication ]; configurePhase = generated.configure + '' swiftpmMakeMutable indexstore-db diff --git a/pkgs/development/compilers/swift/swift-docc/default.nix b/pkgs/development/compilers/swift/swift-docc/default.nix index 2645f07aa4ec..13595882241b 100644 --- a/pkgs/development/compilers/swift/swift-docc/default.nix +++ b/pkgs/development/compilers/swift/swift-docc/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ swift swiftpm ]; buildInputs = [ Foundation XCTest ] - ++ lib.optionals stdenv.isDarwin [ CryptoKit LocalAuthentication ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CryptoKit LocalAuthentication ]; configurePhase = generated.configure; diff --git a/pkgs/development/compilers/swift/swift-driver/default.nix b/pkgs/development/compilers/swift/swift-driver/default.nix index ca2b88046c86..03c7898fe112 100644 --- a/pkgs/development/compilers/swift/swift-driver/default.nix +++ b/pkgs/development/compilers/swift/swift-driver/default.nix @@ -19,7 +19,7 @@ let # are part of libsystem. Adding its headers to the search path causes strange # mixing and errors. # TODO: Find a better way to prevent this conflict. - ncursesInput = if stdenv.isDarwin then ncurses.out else ncurses; + ncursesInput = if stdenv.hostPlatform.isDarwin then ncurses.out else ncurses; in stdenv.mkDerivation { pname = "swift-driver"; diff --git a/pkgs/development/compilers/swift/swiftpm/default.nix b/pkgs/development/compilers/swift/swiftpm/default.nix index 712bc01777a5..48718527965c 100644 --- a/pkgs/development/compilers/swift/swiftpm/default.nix +++ b/pkgs/development/compilers/swift/swiftpm/default.nix @@ -17,6 +17,7 @@ , makeWrapper , DarwinTools # sw_vers , cctools # vtool +, darwinMinVersionHook , xcbuild , CryptoKit , LocalAuthentication @@ -81,7 +82,7 @@ let # Tools invoked by swiftpm at run-time. runtimeDeps = [ git ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild.xcrun # These tools are part of cctools, but adding that as a build input puts # an unwrapped linker in PATH, and breaks builds. This small derivation @@ -99,13 +100,13 @@ let mkBootstrapDerivation = attrs: stdenv.mkDerivation (attrs // { nativeBuildInputs = (attrs.nativeBuildInputs or [ ]) ++ [ cmake ninja swift ] - ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools ]; buildInputs = (attrs.buildInputs or [ ]) ++ [ Foundation ]; postPatch = (attrs.postPatch or "") - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # On Darwin only, Swift uses arm64 as cpu arch. if [ -e cmake/modules/SwiftSupport.cmake ]; then substituteInPlace cmake/modules/SwiftSupport.cmake \ @@ -113,15 +114,8 @@ let fi ''; - preConfigure = (attrs.preConfigure or "") - + '' - # Builds often don't set a target, and our default minimum macOS deployment - # target on x86_64-darwin is too low. Harmless on non-Darwin. - export MACOSX_DEPLOYMENT_TARGET=10.15.4 - ''; - postInstall = (attrs.postInstall or "") - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # The install name of libraries is incorrectly set to lib/ (via our # CMake setup hook) instead of lib/swift/. This'd be easily fixed by # fixDarwinDylibNames, but some builds create libraries that reference @@ -149,7 +143,7 @@ let # are part of libsystem. Adding its headers to the search path causes strange # mixing and errors. # TODO: Find a better way to prevent this conflict. - ncursesInput = if stdenv.isDarwin then ncurses.out else ncurses; + ncursesInput = if stdenv.hostPlatform.isDarwin then ncurses.out else ncurses; # Derivations for bootstrapping dependencies using CMake. # This is based on the `swiftpm/Utilities/bootstrap` script. @@ -168,7 +162,7 @@ let src = generated.sources.swift-system; postInstall = cmakeGlue.SwiftSystem - + lib.optionalString (!stdenv.isDarwin) '' + + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' # The cmake rules apparently only use the Darwin install convention. # Fix up the installation so the module can be found on non-Darwin. mkdir -p $out/${swiftStaticModuleSubdir} @@ -188,7 +182,7 @@ let ''; postInstall = cmakeGlue.SwiftCollections - + lib.optionalString (!stdenv.isDarwin) '' + + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' # The cmake rules apparently only use the Darwin install convention. # Fix up the installation so the module can be found on non-Darwin. mkdir -p $out/${swiftStaticModuleSubdir} @@ -245,7 +239,7 @@ let ]; postInstall = cmakeGlue.ArgumentParser - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' # Fix rpath so ArgumentParserToolInfo can be found. patchelf --add-rpath "$out/lib/swift/${swiftOs}" \ $out/lib/swift/${swiftOs}/libArgumentParser.so @@ -266,7 +260,7 @@ let name = "llbuild"; src = generated.sources.swift-llbuild; - nativeBuildInputs = lib.optional stdenv.isDarwin xcbuild; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin xcbuild; buildInputs = [ ncursesInput sqlite ]; patches = [ @@ -362,7 +356,7 @@ let swift-driver swift-system swift-tools-support-core - ]; + ] ++ lib.optionals stdenv.isDarwin [ (darwinMinVersionHook "10.15.4") ]; cmakeFlags = [ "-DUSE_CMAKE_INSTALL=ON" @@ -389,10 +383,10 @@ in stdenv.mkDerivation (commonAttrs // { sqlite XCTest ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CryptoKit LocalAuthentication - ]; + ] ++ lib.optionals stdenv.isDarwin [ (darwinMinVersionHook "10.15.4") ]; configurePhase = generated.configure + '' # Functionality provided by Xcode XCTest, but not available in @@ -411,9 +405,6 @@ in stdenv.mkDerivation (commonAttrs // { ''; buildPhase = '' - # Required to link with swift-corelibs-xctest on Darwin. - export SWIFTTSC_MACOS_DEPLOYMENT_TARGET=10.12 - TERM=dumb swift-build -c release ''; diff --git a/pkgs/development/compilers/swift/swiftpm/setup-hook.sh b/pkgs/development/compilers/swift/swiftpm/setup-hook.sh index 160fbb1ccca3..260d874ebfd7 100644 --- a/pkgs/development/compilers/swift/swiftpm/setup-hook.sh +++ b/pkgs/development/compilers/swift/swiftpm/setup-hook.sh @@ -1,3 +1,5 @@ +# shellcheck shell=bash + # Build using 'swift-build'. swiftpmBuildPhase() { runHook preBuild @@ -8,10 +10,10 @@ swiftpmBuildPhase() { fi local flagsArray=( - -j $buildCores + -j "$buildCores" -c "${swiftpmBuildConfig-release}" - $swiftpmFlags "${swiftpmFlagsArray[@]}" ) + concatTo flagsArray swiftpmFlags swiftpmFlagsArray echoCmd 'build flags' "${flagsArray[@]}" TERM=dumb swift-build "${flagsArray[@]}" @@ -33,10 +35,10 @@ swiftpmCheckPhase() { fi local flagsArray=( - -j $buildCores + -j "$buildCores" -c "${swiftpmBuildConfig-release}" - $swiftpmFlags "${swiftpmFlagsArray[@]}" ) + concatTo flagsArray swiftpmFlags swiftpmFlagsArray echoCmd 'check flags' "${flagsArray[@]}" TERM=dumb swift-test "${flagsArray[@]}" @@ -53,8 +55,8 @@ fi swiftpmBinPath() { local flagsArray=( -c "${swiftpmBuildConfig-release}" - $swiftpmFlags "${swiftpmFlagsArray[@]}" ) + concatTo flagsArray swiftpmFlags swiftpmFlagsArray swift-build --show-bin-path "${flagsArray[@]}" } diff --git a/pkgs/development/compilers/swift/wrapper/default.nix b/pkgs/development/compilers/swift/wrapper/default.nix index 0c7e0f8cbcf8..2bf8ef60ebf3 100644 --- a/pkgs/development/compilers/swift/wrapper/default.nix +++ b/pkgs/development/compilers/swift/wrapper/default.nix @@ -18,6 +18,10 @@ stdenv.mkDerivation (swift._wrapperParams // { swiftStaticModuleSubdir swiftStaticLibSubdir; swiftDriver = lib.optionalString useSwiftDriver "${swift-driver}/bin/swift-driver"; + env.darwinMinVersion = lib.optionalString stdenv.targetPlatform.isDarwin ( + stdenv.targetPlatform.darwinMinVersion + ); + passAsFile = [ "buildCommand" ]; buildCommand = '' mkdir -p $out/bin $out/nix-support @@ -48,6 +52,13 @@ stdenv.mkDerivation (swift._wrapperParams // { ln -s ${swift.lib}/lib $out/lib substituteAll ${./setup-hook.sh} $out/nix-support/setup-hook + + # Propagate any propagated inputs from the unwrapped Swift compiler, if any. + if [ -e "$swift/nix-support" ]; then + for input in "$swift/nix-support/"*propagated*; do + cp "$input" "$out/nix-support/$(basename "$input")" + done + fi ''; passthru = { diff --git a/pkgs/development/compilers/swift/wrapper/wrapper.sh b/pkgs/development/compilers/swift/wrapper/wrapper.sh index 5cd5d8da8819..3079bb182b1a 100644 --- a/pkgs/development/compilers/swift/wrapper/wrapper.sh +++ b/pkgs/development/compilers/swift/wrapper/wrapper.sh @@ -156,6 +156,14 @@ if [ -z "${NIX_CC_WRAPPER_FLAGS_SET_@suffixSalt@:-}" ]; then source $cc_wrapper/nix-support/add-flags.sh fi +# Only add darwin min version flag and set up `DEVELOPER_DIR` if a default darwin min version is set, +# which is a signal that we're targeting darwin. (Copied from add-flags in libc but tailored for Swift). +if [ "@darwinMinVersion@" ]; then + # Make sure the wrapped Swift compiler can find the overlays in the SDK. + NIX_SWIFTFLAGS_COMPILE+=" -I $SDKROOT/usr/lib/swift" + NIX_LDFLAGS_@suffixSalt@+=" -L $SDKROOT/usr/lib/swift" +fi + if [[ "$isCxx" = 1 ]]; then if [[ "$cxxInclude" = 1 ]]; then NIX_CFLAGS_COMPILE_@suffixSalt@+=" $NIX_CXXSTDLIB_COMPILE_@suffixSalt@" diff --git a/pkgs/development/compilers/swift/xctest/default.nix b/pkgs/development/compilers/swift/xctest/default.nix index d50d11706cbd..f6f4cdacaed1 100644 --- a/pkgs/development/compilers/swift/xctest/default.nix +++ b/pkgs/development/compilers/swift/xctest/default.nix @@ -19,10 +19,10 @@ in stdenv.mkDerivation { outputs = [ "out" ]; nativeBuildInputs = [ cmake ninja swift ] - ++ lib.optional stdenv.isDarwin DarwinTools; # sw_vers + ++ lib.optional stdenv.hostPlatform.isDarwin DarwinTools; # sw_vers buildInputs = [ Foundation ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' # On Darwin only, Swift uses arm64 as cpu arch. substituteInPlace cmake/modules/SwiftSupport.cmake \ --replace '"aarch64" PARENT_SCOPE' '"arm64" PARENT_SCOPE' @@ -34,9 +34,9 @@ in stdenv.mkDerivation { export MACOSX_DEPLOYMENT_TARGET=10.12 ''; - cmakeFlags = lib.optional stdenv.isDarwin "-DUSE_FOUNDATION_FRAMEWORK=ON"; + cmakeFlags = lib.optional stdenv.hostPlatform.isDarwin "-DUSE_FOUNDATION_FRAMEWORK=ON"; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' # Darwin normally uses the Xcode version of XCTest. Installing # swift-corelibs-xctest is probably not officially supported, but we have # no alternative. Fix up the installation here. diff --git a/pkgs/development/compilers/temurin-bin/generate-sources.py b/pkgs/development/compilers/temurin-bin/generate-sources.py index adeca0b73326..a5c5d6f9ffb8 100755 --- a/pkgs/development/compilers/temurin-bin/generate-sources.py +++ b/pkgs/development/compilers/temurin-bin/generate-sources.py @@ -6,7 +6,7 @@ import re import requests import sys -feature_versions = (8, 11, 17, 21, 22) +feature_versions = (8, 11, 17, 21, 23) oses = ("mac", "linux", "alpine-linux") types = ("jre", "jdk") impls = ("hotspot",) diff --git a/pkgs/development/compilers/temurin-bin/jdk-darwin-base.nix b/pkgs/development/compilers/temurin-bin/jdk-darwin-base.nix index 886c92ba2e38..836b282b0e49 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-darwin-base.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-darwin-base.nix @@ -69,7 +69,7 @@ let sourceProvenance = with sourceTypes; [ binaryNativeCode binaryBytecode ]; description = "${brand-name}, prebuilt OpenJDK binary"; platforms = builtins.map (arch: arch + "-darwin") providedCpuTypes; # some inherit jre.meta.platforms - maintainers = with maintainers; [ taku0 ]; + maintainers = with maintainers; [ taku0 ] ++ lib.teams.java.members; inherit knownVulnerabilities; mainProgram = "java"; }; diff --git a/pkgs/development/compilers/temurin-bin/jdk-darwin.nix b/pkgs/development/compilers/temurin-bin/jdk-darwin.nix index 6f591a7e86f5..8363905118f8 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-darwin.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-darwin.nix @@ -19,6 +19,6 @@ in jdk-21 = common { sourcePerArch = sources.jdk.openjdk21; }; jre-21 = common { sourcePerArch = sources.jre.openjdk21; }; - jdk-22 = common { sourcePerArch = sources.jdk.openjdk22; }; - jre-22 = common { sourcePerArch = sources.jre.openjdk22; }; + jdk-23 = common { sourcePerArch = sources.jdk.openjdk23; }; + jre-23 = common { sourcePerArch = sources.jre.openjdk23; }; } diff --git a/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix b/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix index 9da96aee8d5a..b166d3c0738b 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix @@ -59,14 +59,14 @@ let alsa-lib # libasound.so wanted by lib/libjsound.so fontconfig freetype - stdenv.cc.cc.lib # libstdc++.so.6 + (lib.getLib stdenv.cc.cc) # libstdc++.so.6 xorg.libX11 xorg.libXext xorg.libXi xorg.libXrender xorg.libXtst zlib - ] ++ lib.optional stdenv.isAarch32 libffi; + ] ++ lib.optional stdenv.hostPlatform.isAarch32 libffi; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; @@ -127,7 +127,7 @@ let sourceProvenance = with sourceTypes; [ binaryNativeCode binaryBytecode ]; description = "${brand-name}, prebuilt OpenJDK binary"; platforms = builtins.map (arch: arch + "-linux") providedCpuTypes; # some inherit jre.meta.platforms - maintainers = with maintainers; [ taku0 ]; + maintainers = with maintainers; [ taku0 ] ++ lib.teams.java.members; inherit knownVulnerabilities; mainProgram = "java"; }; diff --git a/pkgs/development/compilers/temurin-bin/jdk-linux.nix b/pkgs/development/compilers/temurin-bin/jdk-linux.nix index e05c5d40ae08..2c633f150fdb 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-linux.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-linux.nix @@ -20,6 +20,6 @@ in jdk-21 = common { sourcePerArch = sources.jdk.openjdk21; }; jre-21 = common { sourcePerArch = sources.jre.openjdk21; }; - jdk-22 = common { sourcePerArch = sources.jdk.openjdk22; }; - jre-22 = common { sourcePerArch = sources.jre.openjdk22; }; + jdk-23 = common { sourcePerArch = sources.jdk.openjdk23; }; + jre-23 = common { sourcePerArch = sources.jre.openjdk23; }; } diff --git a/pkgs/development/compilers/temurin-bin/sources.json b/pkgs/development/compilers/temurin-bin/sources.json index 23d7305ea774..9443eb45f401 100644 --- a/pkgs/development/compilers/temurin-bin/sources.json +++ b/pkgs/development/compilers/temurin-bin/sources.json @@ -6,102 +6,62 @@ "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "b45c467be52fe11ffd9bf69b3a035068134b305053874de4f3b3c5e5e1419659", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.23_9.tar.gz", - "version": "11.0.23" - } - }, - "openjdk16": { - "packageType": "jdk", - "vmType": "hotspot", - "x86_64": { - "build": "7", - "sha256": "85788b1a1f470ca7ddc576028f29abbc3bc3b08f82dd811a3e24371689d7dc0f", - "url": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_alpine-linux_hotspot_16.0.2_7.tar.gz", - "version": "16.0.2" + "build": "8", + "sha256": "ae988c72eeb2d78bb729a3387601ce0ea84305734ebdbe95d276f39952a8e019", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.24_8.tar.gz", + "version": "11.0.24" } }, "openjdk17": { "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "839326b5b4b3e4ac2edc3b685c8ab550f9b6d267eddf966323c801cb21e3e018", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.11_9.tar.gz", - "version": "17.0.11" - } - }, - "openjdk18": { - "packageType": "jdk", - "vmType": "hotspot", - "x86_64": { - "build": "1", - "sha256": "478c8f56dec7378ed8c687e8d7d0fbf729973c62c497cfc8cf58bd621849d764", - "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jdk_x64_alpine-linux_hotspot_18.0.2.1_1.tar.gz", - "version": "18.0.2" - } - }, - "openjdk19": { - "packageType": "jdk", - "vmType": "hotspot", - "x86_64": { "build": "7", - "sha256": "e2d971400ad2db25ad43ea6fa2058b269c0236e3977986dcdee2097da301beb2", - "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_x64_alpine-linux_hotspot_19.0.2_7.tar.gz", - "version": "19.0.2" - } - }, - "openjdk20": { - "packageType": "jdk", - "vmType": "hotspot", - "x86_64": { - "build": "9", - "sha256": "b03aced4b7a1c49bc00297e35e45480fd03818862b93e17e1551a3b721e89306", - "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jdk_x64_alpine-linux_hotspot_20.0.2_9.tar.gz", - "version": "20.0.2" + "sha256": "6d274a292a717a6f8d00a3ed0695497405c5c634c27fec1692dd13784f6ff6fa", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.12_7.tar.gz", + "version": "17.0.12" } }, "openjdk21": { "aarch64": { - "build": "9", - "sha256": "0f68a9122054149861f6ce9d1b1c176bbe30dd76b36b74c916ba897c12e9d970", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jdk_aarch64_alpine-linux_hotspot_21.0.3_9.tar.gz", - "version": "21.0.3" + "build": "7", + "sha256": "849c6d5a62a1f3dc2a3d2d7be07ffda089d35b862f6160b2a288c0408c2d8be8", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_aarch64_alpine-linux_hotspot_21.0.4_7.tar.gz", + "version": "21.0.4" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "8e861638bf6b08c6d5837de6dc929930550928ec5fcc81b9fa7e8296afd0f9c0", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jdk_x64_alpine-linux_hotspot_21.0.3_9.tar.gz", - "version": "21.0.3" + "build": "7", + "sha256": "8fa232fc9de5a861c1a6b0cbdc861d0b0a2bdbdd27da53d991802a460a7f0973", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_x64_alpine-linux_hotspot_21.0.4_7.tar.gz", + "version": "21.0.4" } }, - "openjdk22": { + "openjdk23": { "aarch64": { - "build": "8", - "sha256": "86a7b47c9277f2fd063ec910616b3676d86553ab7d23aa3bd365e51a57be1dc5", - "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jdk_aarch64_alpine-linux_hotspot_22.0.1_8.tar.gz", - "version": "22.0.1" + "build": "37", + "sha256": "7e842c9b8a44a5a21d83a3e38ae3b141cfbdb429dde70ff264d3da4bff44e1c7", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jdk_aarch64_alpine-linux_hotspot_23_37.tar.gz", + "version": "23.0.0" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "d226e44b3513942db855df9a8737d848f64069848970d4cfd35ee3c38f2525c1", - "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jdk_x64_alpine-linux_hotspot_22.0.1_8.tar.gz", - "version": "22.0.1" + "build": "37", + "sha256": "bff4c78f30d8d173e622bf2f40c36113df47337fc6d1ee5105ed2459841165aa", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jdk_x64_alpine-linux_hotspot_23_37.tar.gz", + "version": "23.0.0" } }, "openjdk8": { "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "409091665e5f8cf678938bbbc0d377122ef8bad7b1c97a0f809da054db956e51", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u412b08.tar.gz", - "version": "8.0.412" + "build": "5", + "sha256": "525a7731331cad502b9293ccb4ac2b13e85516736e98a57cb27c2767005188e1", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u422b05.tar.gz", + "version": "8.0.422" } } }, @@ -110,92 +70,62 @@ "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "6972a6251bc88d6fbb64a188557cf165f1c415ded550d2a280bbcbc4272caff1", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jre_x64_alpine-linux_hotspot_11.0.23_9.tar.gz", - "version": "11.0.23" + "build": "8", + "sha256": "0ac795729cc11f47323a71713eac2a5b22d4615fd9b66c8766f964c03fb6e160", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_x64_alpine-linux_hotspot_11.0.24_8.tar.gz", + "version": "11.0.24" } }, "openjdk17": { "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "b5dffd0be08c464d9c3903e2947508c1a5c21804ea1cff5556991a2a47d617d8", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jre_x64_alpine-linux_hotspot_17.0.11_9.tar.gz", - "version": "17.0.11" - } - }, - "openjdk18": { - "packageType": "jre", - "vmType": "hotspot", - "x86_64": { - "build": "1", - "sha256": "ad23309a82e690f769037b1e6417022f588702d214da533289f116bba0f61f4e", - "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jre_x64_alpine-linux_hotspot_18.0.2.1_1.tar.gz", - "version": "18.0.2" - } - }, - "openjdk19": { - "packageType": "jre", - "vmType": "hotspot", - "x86_64": { "build": "7", - "sha256": "6c0ce0ead2e7ce3e0f06b9578447499c8bd0509306c95fcd81dbecb634228933", - "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jre_x64_alpine-linux_hotspot_19.0.2_7.tar.gz", - "version": "19.0.2" - } - }, - "openjdk20": { - "packageType": "jre", - "vmType": "hotspot", - "x86_64": { - "build": "9", - "sha256": "53b34747a3c042a4cccb2b8b78fba3330b105bc523f0861237baa9143dc39115", - "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jre_x64_alpine-linux_hotspot_20.0.2_9.tar.gz", - "version": "20.0.2" + "sha256": "63bae276cc322532b451ae7473127c92a75db16cc95473577f133cd09349822a", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_x64_alpine-linux_hotspot_17.0.12_7.tar.gz", + "version": "17.0.12" } }, "openjdk21": { "aarch64": { - "build": "9", - "sha256": "54e8618da373258654fe788d509f087d3612de9e080eb6831601069dbc8a4b2b", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jre_aarch64_alpine-linux_hotspot_21.0.3_9.tar.gz", - "version": "21.0.3" + "build": "7", + "sha256": "f9410264235861deaf30f97bec80870cf3bc38b1d8e57d897d8bb1f706ae6705", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_aarch64_alpine-linux_hotspot_21.0.4_7.tar.gz", + "version": "21.0.4" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "b3e7170deab11a7089fe8e14f9f398424fd86db085f745dad212f6cfc4121df6", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jre_x64_alpine-linux_hotspot_21.0.3_9.tar.gz", - "version": "21.0.3" + "build": "7", + "sha256": "0dfd0ebab44d777f65bceaff7f79e8e0b9deb74a5eb166922483f1864bcf2052", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_x64_alpine-linux_hotspot_21.0.4_7.tar.gz", + "version": "21.0.4" } }, - "openjdk22": { + "openjdk23": { "aarch64": { - "build": "8", - "sha256": "6cac56dde6793d887deea101cfff283dc5f285e1118c21cbd1c4cb69f1072e55", - "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jre_aarch64_alpine-linux_hotspot_22.0.1_8.tar.gz", - "version": "22.0.1" + "build": "37", + "sha256": "858aa6b255164e535e2fd6cc8dfbf129327a9126ebb9e8f24115c2089efd36f3", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jre_aarch64_alpine-linux_hotspot_23_37.tar.gz", + "version": "23.0.0" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "e7c26ad00e3ded356b8c4b20b184ccf5bd63ccdccabde8d4a892389f178f1d5b", - "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jre_x64_alpine-linux_hotspot_22.0.1_8.tar.gz", - "version": "22.0.1" + "build": "37", + "sha256": "7acbc972b0dd84ca10ec6f192b20e76445a22f4c5558e1657ff393e4868e9343", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jre_x64_alpine-linux_hotspot_23_37.tar.gz", + "version": "23.0.0" } }, "openjdk8": { "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "c82962d7378d1fd415db594fce6ec047939e9fab5301fa4407cd7faea9ea7e31", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jre_x64_alpine-linux_hotspot_8u412b08.tar.gz", - "version": "8.0.412" + "build": "5", + "sha256": "9a7a939638b9cdaa8e1a119b8f21bfdd4cb2390b8a47cc27ccf9effc90f4b437", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jre_x64_alpine-linux_hotspot_8u422b05.tar.gz", + "version": "8.0.422" } } } @@ -204,546 +134,332 @@ "jdk": { "openjdk11": { "aarch64": { - "build": "9", - "sha256": "e00476a7be3c4adfa9b3d55d30768967fd246a8352e518894e183fa444d4d3ce", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.23_9.tar.gz", - "version": "11.0.23" + "build": "8", + "sha256": "04e21301fedc76841fb03929ac6cacfbbda30b5693acfd515a8f34d4a0cdeb28", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.24_8.tar.gz", + "version": "11.0.24" }, "armv6l": { - "build": "9", - "sha256": "8077edc07a57d846c3d11286a7caf05ed6ca6d6c1234bf0e03611f18e187f075", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.23_9.tar.gz", - "version": "11.0.23" + "build": "8", + "sha256": "9d14a076d1440161ab4c9736644e8e9f4719eb8e9f44c03470640960c3cd5e00", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_arm_linux_hotspot_11.0.24_8.tar.gz", + "version": "11.0.24" }, "armv7l": { - "build": "9", - "sha256": "8077edc07a57d846c3d11286a7caf05ed6ca6d6c1234bf0e03611f18e187f075", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.23_9.tar.gz", - "version": "11.0.23" + "build": "8", + "sha256": "9d14a076d1440161ab4c9736644e8e9f4719eb8e9f44c03470640960c3cd5e00", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_arm_linux_hotspot_11.0.24_8.tar.gz", + "version": "11.0.24" }, "packageType": "jdk", "powerpc64le": { - "build": "9", - "sha256": "f56068bb64c6bf858894f75c2bc261f54db32932422eb07527f36ae40046e9a0", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.23_9.tar.gz", - "version": "11.0.23" + "build": "8", + "sha256": "4dfdc498938a159c592a2f094576f09c94999e17327c1f5ff81794694992054d", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.24_8.tar.gz", + "version": "11.0.24" }, "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "23e47ea7a3015be3240f21185fd902adebdcf76530757c9b482c7eb5bd3417c2", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.23_9.tar.gz", - "version": "11.0.23" + "build": "8", + "sha256": "0e71a01563a5c7b9988a168b0c4ce720a6dff966b3c27bb29d1ded461ff71d0e", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_x64_linux_hotspot_11.0.24_8.tar.gz", + "version": "11.0.24" } }, - "openjdk16": { + "openjdk17": { "aarch64": { "build": "7", - "sha256": "cb77d9d126f97898dfdc8b5fb694d1e0e5d93d13a0a6cb2aeda76f8635384340", - "url": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_aarch64_linux_hotspot_16.0.2_7.tar.gz", - "version": "16.0.2" + "sha256": "8257de06bf37f0c8f19f8d542e2ab5a4e17db3ca5f29d041bd0b02ab265db021", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.12_7.tar.gz", + "version": "17.0.12" }, "armv6l": { "build": "7", - "sha256": "7721ef81416af8122a28448f3d661eb4bda40a9f78d400e4ecc55b58e627a00c", - "url": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_arm_linux_hotspot_16.0.2_7.tar.gz", - "version": "16.0.2" + "sha256": "ce7873ebf40ed0eb1089941ead4d3af79a205b1264f3162860d26ae957572b74", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_arm_linux_hotspot_17.0.12_7.tar.gz", + "version": "17.0.12" }, "armv7l": { "build": "7", - "sha256": "7721ef81416af8122a28448f3d661eb4bda40a9f78d400e4ecc55b58e627a00c", - "url": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_arm_linux_hotspot_16.0.2_7.tar.gz", - "version": "16.0.2" + "sha256": "ce7873ebf40ed0eb1089941ead4d3af79a205b1264f3162860d26ae957572b74", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_arm_linux_hotspot_17.0.12_7.tar.gz", + "version": "17.0.12" }, "packageType": "jdk", "powerpc64le": { "build": "7", - "sha256": "36ebe6c72f2fc19b8b17371f731390e15fa3aab08c28b55b9a8b71d0a578adc9", - "url": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_ppc64le_linux_hotspot_16.0.2_7.tar.gz", - "version": "16.0.2" - }, - "vmType": "hotspot", - "x86_64": { - "build": "7", - "sha256": "323d6d7474a359a28eff7ddd0df8e65bd61554a8ed12ef42fd9365349e573c2c", - "url": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz", - "version": "16.0.2" - } - }, - "openjdk17": { - "aarch64": { - "build": "9", - "sha256": "a900acf3ae56b000afc35468a083b6d6fd695abec87a8abdb02743d5c72f6d6d", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.11_9.tar.gz", - "version": "17.0.11" - }, - "armv6l": { - "build": "9", - "sha256": "9b5c375ed7ce654083c6c1137d8daadebaf8657650576115f0deafab00d0f1d7", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jdk_arm_linux_hotspot_17.0.11_9.tar.gz", - "version": "17.0.11" - }, - "armv7l": { - "build": "9", - "sha256": "9b5c375ed7ce654083c6c1137d8daadebaf8657650576115f0deafab00d0f1d7", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jdk_arm_linux_hotspot_17.0.11_9.tar.gz", - "version": "17.0.11" - }, - "packageType": "jdk", - "powerpc64le": { - "build": "9", - "sha256": "44bdd662c3b832cfe0b808362866b8d7a700dd60e6e39716dee97211d35c230f", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.11_9.tar.gz", - "version": "17.0.11" - }, - "vmType": "hotspot", - "x86_64": { - "build": "9", - "sha256": "aa7fb6bb342319d227a838af5c363bfa1b4a670c209372f9e6585bd79da6220c", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jdk_x64_linux_hotspot_17.0.11_9.tar.gz", - "version": "17.0.11" + "sha256": "c97988e5a99b8ae0c47ba330b0883398c7433312db0051d8c5ff97911bae1605", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.12_7.tar.gz", + "version": "17.0.12" }, "riscv64": { "build": "7", "sha256": "d024c100eba4709970716ddcac757ba5e3122a8ff9c6f539ff8bac5b47f51f3a", "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_riscv64_linux_hotspot_17.0.12_7.tar.gz", "version": "17.0.12" - } - }, - "openjdk18": { - "aarch64": { - "build": "1", - "sha256": "262be608e266fd76d7496af83b2832be853c3aaf7460d6a4da198cd40db74553", - "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jdk_aarch64_linux_hotspot_18.0.2.1_1.tar.gz", - "version": "18.0.2" - }, - "armv6l": { - "build": "1", - "sha256": "4cd49b92d13847bfad7b3bf635cca349e2c89c7641748c5288bc40d612cdbbd6", - "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jdk_arm_linux_hotspot_18.0.2.1_1.tar.gz", - "version": "18.0.2" - }, - "armv7l": { - "build": "1", - "sha256": "4cd49b92d13847bfad7b3bf635cca349e2c89c7641748c5288bc40d612cdbbd6", - "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jdk_arm_linux_hotspot_18.0.2.1_1.tar.gz", - "version": "18.0.2" - }, - "packageType": "jdk", - "powerpc64le": { - "build": "1", - "sha256": "030261a2189a8f773fda543a85ab9beb4c430bf81ca5be37cf6cb970b5ccbb03", - "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jdk_ppc64le_linux_hotspot_18.0.2.1_1.tar.gz", - "version": "18.0.2" }, "vmType": "hotspot", "x86_64": { - "build": "1", - "sha256": "7d6beba8cfc0a8347f278f7414351191a95a707d46b6586e9a786f2669af0f8b", - "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jdk_x64_linux_hotspot_18.0.2.1_1.tar.gz", - "version": "18.0.2" + "build": "7", + "sha256": "9d4dd339bf7e6a9dcba8347661603b74c61ab2a5083ae67bf76da6285da8a778", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.12_7.tar.gz", + "version": "17.0.12" } }, - "openjdk19": { + "openjdk21": { "aarch64": { "build": "7", - "sha256": "1c4be9aa173cb0deb0d215643d9509c8900e5497290b29eee4bee335fa57984f", - "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_aarch64_linux_hotspot_19.0.2_7.tar.gz", - "version": "19.0.2" - }, - "armv6l": { - "build": "7", - "sha256": "6a51cb3868b5a3b81848a0d276267230ff3f8639f20ba9ae9ef1d386440bf1fd", - "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_arm_linux_hotspot_19.0.2_7.tar.gz", - "version": "19.0.2" - }, - "armv7l": { - "build": "7", - "sha256": "6a51cb3868b5a3b81848a0d276267230ff3f8639f20ba9ae9ef1d386440bf1fd", - "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_arm_linux_hotspot_19.0.2_7.tar.gz", - "version": "19.0.2" + "sha256": "d768eecddd7a515711659e02caef8516b7b7177fa34880a56398fd9822593a79", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.4_7.tar.gz", + "version": "21.0.4" }, "packageType": "jdk", "powerpc64le": { "build": "7", - "sha256": "173d1256dfb9d13d309b5390e6bdf72d143b512201b0868f9d349d5ed3d64072", - "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_ppc64le_linux_hotspot_19.0.2_7.tar.gz", - "version": "19.0.2" + "sha256": "c208cd0fb90560644a90f928667d2f53bfe408c957a5e36206585ad874427761", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.4_7.tar.gz", + "version": "21.0.4" }, - "vmType": "hotspot", - "x86_64": { + "riscv64": { "build": "7", - "sha256": "3a3ba7a3f8c3a5999e2c91ea1dca843435a0d1c43737bd2f6822b2f02fc52165", - "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_x64_linux_hotspot_19.0.2_7.tar.gz", - "version": "19.0.2" - } - }, - "openjdk20": { - "aarch64": { - "build": "9", - "sha256": "b475bcc23db0bd618c815bb8f11d8e084dc58288ea3bcdf4e7f389ed41c89f56", - "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jdk_aarch64_linux_hotspot_20.0.2_9.tar.gz", - "version": "20.0.2" - }, - "packageType": "jdk", - "powerpc64le": { - "build": "36", - "sha256": "45dde71faf8cbb78fab3c976894259655c8d3de827347f23e0ebe5710921dded", - "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20%2B36/OpenJDK20U-jdk_ppc64le_linux_hotspot_20_36.tar.gz", - "version": "20.0.0" - }, - "vmType": "hotspot", - "x86_64": { - "build": "9", - "sha256": "3d91842e9c172967ac397076523249d05a82ead51b0006838f5f0315ad52222c", - "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jdk_x64_linux_hotspot_20.0.2_9.tar.gz", - "version": "20.0.2" - } - }, - "openjdk21": { - "aarch64": { - "build": "9", - "sha256": "7d3ab0e8eba95bd682cfda8041c6cb6fa21e09d0d9131316fd7c96c78969de31", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.3_9.tar.gz", - "version": "21.0.3" - }, - "packageType": "jdk", - "powerpc64le": { - "build": "9", - "sha256": "9a1079d7f0fc72951fdc9a0029e49a15f6ba114683aee626f882ee2c761f1d57", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.3_9.tar.gz", - "version": "21.0.3" + "sha256": "b04fd7f52d18268a935f1a7144dae802b25db600ec97156ddd46b3100cbd13da", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.4_7.tar.gz", + "version": "21.0.4" }, "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "fffa52c22d797b715a962e6c8d11ec7d79b90dd819b5bc51d62137ea4b22a340", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jdk_x64_linux_hotspot_21.0.3_9.tar.gz", - "version": "21.0.3" - }, - "riscv64": { "build": "7", - "sha256": "b04fd7f52d18268a935f1a7144dae802b25db600ec97156ddd46b3100cbd13da", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.4_7.tar.gz", + "sha256": "51fb4d03a4429c39d397d3a03a779077159317616550e4e71624c9843083e7b9", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_x64_linux_hotspot_21.0.4_7.tar.gz", "version": "21.0.4" } }, - "openjdk22": { + "openjdk23": { "aarch64": { - "build": "8", - "sha256": "d8488fa1e4e8c1e318cef4c0fc3842a7f15a4cf52b27054663bb94471f54b3fa", - "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jdk_aarch64_linux_hotspot_22.0.1_8.tar.gz", - "version": "22.0.1" + "build": "37", + "sha256": "e8043d1bd9c4f42c5cf7883aca1fc3ef6bcccf4a664f378818ac0fd4fb987b7e", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jdk_aarch64_linux_hotspot_23_37.tar.gz", + "version": "23.0.0" }, "packageType": "jdk", "powerpc64le": { - "build": "8", - "sha256": "4113606ba65044a3cbd7678e1c0d41881d24a2441c8ab8b658b4ac58da624de5", - "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jdk_ppc64le_linux_hotspot_22.0.1_8.tar.gz", - "version": "22.0.1" + "build": "37", + "sha256": "4d3b0609c783dea1f6a899bfc8c84b4000d1f48f39e2489d70050bbf2c7f7d9c", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jdk_ppc64le_linux_hotspot_23_37.tar.gz", + "version": "23.0.0" + }, + "riscv64": { + "build": "37", + "sha256": "d401699a92469de7bfb72909c1d11019537a0a2c21af01a8dce1831f09ef5165", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jdk_riscv64_linux_hotspot_23_37.tar.gz", + "version": "23.0.0" }, "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "e59c6bf801cc023a1ea78eceb5e6756277f1564cd0a421ea984efe6cb96cfcf8", - "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jdk_x64_linux_hotspot_22.0.1_8.tar.gz", - "version": "22.0.1" - }, - "riscv64": { - "build": "9", - "sha256": "830a0d006c2dae95c0855aa70e193dba637831b491ccd67333322dea31bcf389", - "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jdk_riscv64_linux_hotspot_22.0.2_9.tar.gz", - "version": "22.0.2" + "build": "37", + "sha256": "630c4f3870056e7e005736ec1edc34ee63a9b45e2027582c52f53a9bf44314b8", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jdk_x64_linux_hotspot_23_37.tar.gz", + "version": "23.0.0" } }, "openjdk8": { "aarch64": { - "build": "8", - "sha256": "3504d748a93f23cac8c060bd33231bd51e90dcb620f38dadc6239b6cd2a5011c", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_8u412b08.tar.gz", - "version": "8.0.412" + "build": "5", + "sha256": "af98a839ec238106078bd360af9e405dc6665c05ee837178ed13b92193681923", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jdk_aarch64_linux_hotspot_8u422b05.tar.gz", + "version": "8.0.422" }, "armv6l": { - "build": "8", - "sha256": "be4aff6fa7bf6515f16f93dcaf9fdc61853fe1ef0d25b08a1bb1cf6e3d047391", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jdk_arm_linux_hotspot_8u412b08.tar.gz", - "version": "8.0.412" + "build": "5", + "sha256": "5bd0203b2b09b033e3a762299a4975939d7571b433eab8b59340cc966102bef1", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jdk_arm_linux_hotspot_8u422b05.tar.gz", + "version": "8.0.422" }, "armv7l": { - "build": "8", - "sha256": "be4aff6fa7bf6515f16f93dcaf9fdc61853fe1ef0d25b08a1bb1cf6e3d047391", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jdk_arm_linux_hotspot_8u412b08.tar.gz", - "version": "8.0.412" + "build": "5", + "sha256": "5bd0203b2b09b033e3a762299a4975939d7571b433eab8b59340cc966102bef1", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jdk_arm_linux_hotspot_8u422b05.tar.gz", + "version": "8.0.422" }, "packageType": "jdk", "powerpc64le": { - "build": "8", - "sha256": "6b7ed7996788075e182dd33349288346240fbce540e50fd77aecfc309a5ada19", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u412b08.tar.gz", - "version": "8.0.412" + "build": "5", + "sha256": "78fbd7b01204cdf90bcb3f9fe6a8e9432bdaa75776fa333aa9cbcb5a79de34cd", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u422b05.tar.gz", + "version": "8.0.422" }, "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "b9884a96f78543276a6399c3eb8c2fd8a80e6b432ea50e87d3d12d495d1d2808", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u412b08.tar.gz", - "version": "8.0.412" + "build": "5", + "sha256": "4c6056f6167fae73ace7c3080b78940be5c87d54f5b08894b3517eed1cbb2c06", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jdk_x64_linux_hotspot_8u422b05.tar.gz", + "version": "8.0.422" } } }, "jre": { "openjdk11": { "aarch64": { - "build": "9", - "sha256": "7290ace47a030d89ea023c28e7aa555c9da72b4194f73b39ec9d058011bf06dd", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.23_9.tar.gz", - "version": "11.0.23" + "build": "8", + "sha256": "1fe97cdaad47d7d108f329c6e4560b46748ef7f2948a1027812ade0bbc2a3597", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.24_8.tar.gz", + "version": "11.0.24" }, "armv6l": { - "build": "9", - "sha256": "025f994549708f7291ce3b0fa7c41f7e78ec3af3eae3f85fffe9c5fa4a54889f", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.23_9.tar.gz", - "version": "11.0.23" + "build": "8", + "sha256": "bf893085627c6ec484e63aa1290276b23bcfee547459da6b0432ae9c5c1be22a", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_arm_linux_hotspot_11.0.24_8.tar.gz", + "version": "11.0.24" }, "armv7l": { - "build": "9", - "sha256": "025f994549708f7291ce3b0fa7c41f7e78ec3af3eae3f85fffe9c5fa4a54889f", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.23_9.tar.gz", - "version": "11.0.23" + "build": "8", + "sha256": "bf893085627c6ec484e63aa1290276b23bcfee547459da6b0432ae9c5c1be22a", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_arm_linux_hotspot_11.0.24_8.tar.gz", + "version": "11.0.24" }, "packageType": "jre", "powerpc64le": { - "build": "9", - "sha256": "3b3fbd324620fd914bd8462e292124493fcf846fd69195c4b9a231131dc68d5f", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.23_9.tar.gz", - "version": "11.0.23" + "build": "8", + "sha256": "8ee351314182df93fbad96139bb74b97814944d66197896e388404a1ecfa06b3", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.24_8.tar.gz", + "version": "11.0.24" }, "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "786a72296189ba8e43999532aa73730d87ec1fce558eb3c4e98b611b423375e3", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jre_x64_linux_hotspot_11.0.23_9.tar.gz", - "version": "11.0.23" + "build": "8", + "sha256": "e0c1938093da3780e4494d366a4e6b75584dde8d46a19acea6691ae11df4cda5", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_x64_linux_hotspot_11.0.24_8.tar.gz", + "version": "11.0.24" } }, "openjdk17": { "aarch64": { - "build": "9", - "sha256": "ccfa23c25790475c84df983cc5f729b94c04d9ea9863912deb15c6266782cf16", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.11_9.tar.gz", - "version": "17.0.11" + "build": "7", + "sha256": "9dfe4c56463690ae67d22268980d8861eb46b907d7914f8f2e6fc7b25778c8ec", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.12_7.tar.gz", + "version": "17.0.12" }, "armv6l": { - "build": "9", - "sha256": "2e06401aa3aa7a825d73a6af8e9462449b1a86e7705b793dc8ec90423b602ee2", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jre_arm_linux_hotspot_17.0.11_9.tar.gz", - "version": "17.0.11" + "build": "7", + "sha256": "f093094abe0cb2bb5a255d8180810030321073520541f289926c4682eda76136", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_arm_linux_hotspot_17.0.12_7.tar.gz", + "version": "17.0.12" }, "armv7l": { - "build": "9", - "sha256": "2e06401aa3aa7a825d73a6af8e9462449b1a86e7705b793dc8ec90423b602ee2", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jre_arm_linux_hotspot_17.0.11_9.tar.gz", - "version": "17.0.11" + "build": "7", + "sha256": "f093094abe0cb2bb5a255d8180810030321073520541f289926c4682eda76136", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_arm_linux_hotspot_17.0.12_7.tar.gz", + "version": "17.0.12" }, "packageType": "jre", "powerpc64le": { - "build": "9", - "sha256": "884b5cb817e50010b4d0a3252afb6a80db18995af19bbd16a37348b2c37949bc", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jre_ppc64le_linux_hotspot_17.0.11_9.tar.gz", - "version": "17.0.11" - }, - "vmType": "hotspot", - "x86_64": { - "build": "9", - "sha256": "bcb1b7b8ad68c93093f09b591b7cb17161d39891f7d29d33a586f5a328603707", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jre_x64_linux_hotspot_17.0.11_9.tar.gz", - "version": "17.0.11" + "build": "7", + "sha256": "2759c48e1e56117871b04c851af18b92b6992cf67590f602949b96c3cff15c73", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_ppc64le_linux_hotspot_17.0.12_7.tar.gz", + "version": "17.0.12" }, "riscv64": { "build": "7", "sha256": "2d1ed42918305a1a0754a6e1e9294c7d4d7fda4bff6dba7bc5682037d860dbc9", "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_riscv64_linux_hotspot_17.0.12_7.tar.gz", "version": "17.0.12" - } - }, - "openjdk18": { - "aarch64": { - "build": "1", - "sha256": "e11e00438c2f6f79f86ff1ca2b015913b0e16bd9491953a082d5c786402cb50a", - "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jre_aarch64_linux_hotspot_18.0.2.1_1.tar.gz", - "version": "18.0.2" - }, - "armv6l": { - "build": "1", - "sha256": "0ae7281fa883de0d39a75b39bfbbcec1d2a5f8ed8691af12226962ce1a761cd7", - "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jre_arm_linux_hotspot_18.0.2.1_1.tar.gz", - "version": "18.0.2" - }, - "armv7l": { - "build": "1", - "sha256": "0ae7281fa883de0d39a75b39bfbbcec1d2a5f8ed8691af12226962ce1a761cd7", - "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jre_arm_linux_hotspot_18.0.2.1_1.tar.gz", - "version": "18.0.2" - }, - "packageType": "jre", - "powerpc64le": { - "build": "1", - "sha256": "2298504c99b4c15f620f70415215e481766d2b2f784d066206eed8c583922f8f", - "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jre_ppc64le_linux_hotspot_18.0.2.1_1.tar.gz", - "version": "18.0.2" }, "vmType": "hotspot", "x86_64": { - "build": "1", - "sha256": "74f602ab5abaa554859a5e92a65e5bb6e23c2d4165228299c7f54ed56dbc5959", - "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jre_x64_linux_hotspot_18.0.2.1_1.tar.gz", - "version": "18.0.2" + "build": "7", + "sha256": "0e8088d7a3a7496faba7ac8787db09dc0264c2bc6f568ea8024fd775a783e13c", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_x64_linux_hotspot_17.0.12_7.tar.gz", + "version": "17.0.12" } }, - "openjdk19": { + "openjdk21": { "aarch64": { "build": "7", - "sha256": "3653f9e5ad21e4744e5a655e243fba2895651029bee23f3d2366d5debc41a736", - "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jre_aarch64_linux_hotspot_19.0.2_7.tar.gz", - "version": "19.0.2" - }, - "armv6l": { - "build": "7", - "sha256": "d4588e8c01ca60da2ceed68b7d43d2fd9ec3350b93043f0dabd0eb6cb03cb23d", - "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jre_arm_linux_hotspot_19.0.2_7.tar.gz", - "version": "19.0.2" - }, - "armv7l": { - "build": "7", - "sha256": "d4588e8c01ca60da2ceed68b7d43d2fd9ec3350b93043f0dabd0eb6cb03cb23d", - "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jre_arm_linux_hotspot_19.0.2_7.tar.gz", - "version": "19.0.2" + "sha256": "58845ce4275f3ec74fba075597c8216bb201773da036c4703be8b7b7b457355d", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_aarch64_linux_hotspot_21.0.4_7.tar.gz", + "version": "21.0.4" }, "packageType": "jre", "powerpc64le": { "build": "7", - "sha256": "a30203431c7c21602227d39368c5af6e7abd19000d6da5562de7f3f5c57cbad5", - "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jre_ppc64le_linux_hotspot_19.0.2_7.tar.gz", - "version": "19.0.2" + "sha256": "46cf93653e2b553fb1c91760cfe2ff20999ba358d648d2df69e5948784768440", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_ppc64le_linux_hotspot_21.0.4_7.tar.gz", + "version": "21.0.4" }, - "vmType": "hotspot", - "x86_64": { + "riscv64": { "build": "7", - "sha256": "7386e10c74f00a4382be0540bc0494854804ad79427d8a50ac77a4c7208ff348", - "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jre_x64_linux_hotspot_19.0.2_7.tar.gz", - "version": "19.0.2" - } - }, - "openjdk20": { - "aarch64": { - "build": "9", - "sha256": "63a730d5a3b6d21d31f7cba15dc44b019a8a4d8652e13acec45040f98584112c", - "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jre_aarch64_linux_hotspot_20.0.2_9.tar.gz", - "version": "20.0.2" - }, - "packageType": "jre", - "powerpc64le": { - "build": "36", - "sha256": "a1c5a16d5a438ce7da4563cd51ff6778cdf62331c00a3096ab2388a916e076d2", - "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20%2B36/OpenJDK20U-jre_ppc64le_linux_hotspot_20_36.tar.gz", - "version": "20.0.0" - }, - "vmType": "hotspot", - "x86_64": { - "build": "9", - "sha256": "e3592e86290c192804d9c6b5035d42cc32cf04141d1c0b9d1ecb67739826c8c5", - "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jre_x64_linux_hotspot_20.0.2_9.tar.gz", - "version": "20.0.2" - } - }, - "openjdk21": { - "aarch64": { - "build": "9", - "sha256": "c7c31bc6f5ab4c4b6f4559e11c2fa9541ae6757ab8da6dd85c29163913bd9238", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jre_aarch64_linux_hotspot_21.0.3_9.tar.gz", - "version": "21.0.3" - }, - "packageType": "jre", - "powerpc64le": { - "build": "9", - "sha256": "aa628c6accc9d075b7b0f2bff6487f8ca0b8f057af31842a85fc8b363e1e10f3", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jre_ppc64le_linux_hotspot_21.0.3_9.tar.gz", - "version": "21.0.3" + "sha256": "bf814344429f53d11f8aace14d326e2580ea6e66dd81b109c79160bd41735237", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_riscv64_linux_hotspot_21.0.4_7.tar.gz", + "version": "21.0.4" }, "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "f1af100c4afca2035f446967323230150cfe5872b5a664d98c86963e5c066e0d", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jre_x64_linux_hotspot_21.0.3_9.tar.gz", - "version": "21.0.3" - }, - "riscv64": { "build": "7", - "sha256": "bf814344429f53d11f8aace14d326e2580ea6e66dd81b109c79160bd41735237", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_riscv64_linux_hotspot_21.0.4_7.tar.gz", + "sha256": "d3affbb011ca6c722948f6345d15eba09bded33f9947d4d67e09723e2518c12a", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_x64_linux_hotspot_21.0.4_7.tar.gz", "version": "21.0.4" } }, - "openjdk22": { + "openjdk23": { "aarch64": { - "build": "8", - "sha256": "8e5996a2bbae2da9797cff5a62cb2080965e08fd66de24673b29a8e481ec769e", - "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jre_aarch64_linux_hotspot_22.0.1_8.tar.gz", - "version": "22.0.1" + "build": "37", + "sha256": "ec45f4f9a4a98d8a0af24b508ca84a411ea88fac8abb8ad2cfca85cb3902ab5d", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jre_aarch64_linux_hotspot_23_37.tar.gz", + "version": "23.0.0" }, "packageType": "jre", "powerpc64le": { - "build": "8", - "sha256": "7df4a10fab324181a6c9e8b1e2a45042b8d30490f0fdb937a536f6cd17c907ef", - "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jre_ppc64le_linux_hotspot_22.0.1_8.tar.gz", - "version": "22.0.1" + "build": "37", + "sha256": "9120876c35b904ac041c5a021330a6f11d4e6c7537ce28bdbb7170b944673435", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jre_ppc64le_linux_hotspot_23_37.tar.gz", + "version": "23.0.0" + }, + "riscv64": { + "build": "37", + "sha256": "ca32d942ef5357fb948604cd8aea5c597130cf7fdf6ddee267b4aa99406ee471", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jre_riscv64_linux_hotspot_23_37.tar.gz", + "version": "23.0.0" }, "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "154dbc7975cf765c59bdaa1e693d6c8b009635c9a182d6d6d9f0cfbec5317b4c", - "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jre_x64_linux_hotspot_22.0.1_8.tar.gz", - "version": "22.0.1" - }, - "riscv64": { - "build": "9", - "sha256": "81aacc0ae75e65846e6207edf41b8c5927673eba5588eebc5ba8076ca9a6041c", - "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jre_riscv64_linux_hotspot_22.0.2_9.tar.gz", - "version": "22.0.2" + "build": "37", + "sha256": "9c3c3d42ffb2603b328b7154fc9eb449ef87488b3cbeb24a497d46677c7fd44d", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jre_x64_linux_hotspot_23_37.tar.gz", + "version": "23.0.0" } }, "openjdk8": { "aarch64": { - "build": "8", - "sha256": "17550a6a4ddf71ac81ba8f276467bc58f036c123c0f1bafcafd69f70e3e49cf5", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jre_aarch64_linux_hotspot_8u412b08.tar.gz", - "version": "8.0.412" + "build": "5", + "sha256": "8fbefff2c578f73d95118d830347589ddc9aa84510200a5a5001901c2dea4810", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jre_aarch64_linux_hotspot_8u422b05.tar.gz", + "version": "8.0.422" }, "armv6l": { - "build": "8", - "sha256": "1a6b470ac83b241223447a1e6cb55c4a8f78af0146b9387e9842625041226654", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jre_arm_linux_hotspot_8u412b08.tar.gz", - "version": "8.0.412" + "build": "5", + "sha256": "13bdefdeae6f18bc9c87bba18c853b8b12c5442ce07ff0a3956ce28776d695ff", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jre_arm_linux_hotspot_8u422b05.tar.gz", + "version": "8.0.422" }, "armv7l": { - "build": "8", - "sha256": "1a6b470ac83b241223447a1e6cb55c4a8f78af0146b9387e9842625041226654", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jre_arm_linux_hotspot_8u412b08.tar.gz", - "version": "8.0.412" + "build": "5", + "sha256": "13bdefdeae6f18bc9c87bba18c853b8b12c5442ce07ff0a3956ce28776d695ff", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jre_arm_linux_hotspot_8u422b05.tar.gz", + "version": "8.0.422" }, "packageType": "jre", "powerpc64le": { - "build": "8", - "sha256": "d3157230c01b320e47ad6df650e83b15f8f76294d0df9f1c03867d07fe2883c9", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jre_ppc64le_linux_hotspot_8u412b08.tar.gz", - "version": "8.0.412" + "build": "5", + "sha256": "2991edbedee448c0f1edf131beca84b415dac64ea97365b9bfd85bc2f39893bb", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jre_ppc64le_linux_hotspot_8u422b05.tar.gz", + "version": "8.0.422" }, "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "a8d994332a2ff15d48bf04405c3b2f6bd331a928dd96639b15e62891f7172363", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jre_x64_linux_hotspot_8u412b08.tar.gz", - "version": "8.0.412" + "build": "5", + "sha256": "0ac516cc1eadffb4cd3cfc9736a33d58ea6a396bf85729036c973482f7c063d9", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jre_x64_linux_hotspot_8u422b05.tar.gz", + "version": "8.0.422" } } } @@ -752,258 +468,152 @@ "jdk": { "openjdk11": { "aarch64": { - "build": "9", - "sha256": "49122443bdeab2c9f468bd400f58f85a9ea462846faa79084fd6fd786d9b492d", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jdk_aarch64_mac_hotspot_11.0.23_9.tar.gz", - "version": "11.0.23" + "build": "8", + "sha256": "8bcbb98e293fb3c4d5cae3539f240ed478fae85962311fccd4c628ebad3a90e4", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_aarch64_mac_hotspot_11.0.24_8.tar.gz", + "version": "11.0.24" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "4dbd21d9a0311d321f5886eda50c3086026ed61d02e1a85f7b8c2e9ad557bf03", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jdk_x64_mac_hotspot_11.0.23_9.tar.gz", - "version": "11.0.23" - } - }, - "openjdk16": { - "packageType": "jdk", - "vmType": "hotspot", - "x86_64": { - "build": "7", - "sha256": "27975d9e695cfbb93861540926f9f7bcac973a254ceecbee549706a99cbbdf95", - "url": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_mac_hotspot_16.0.2_7.tar.gz", - "version": "16.0.2" + "build": "8", + "sha256": "07a1be21f45f0951db05516e57602c414295c51a920f7e9b6ddeaa325d619b28", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_x64_mac_hotspot_11.0.24_8.tar.gz", + "version": "11.0.24" } }, "openjdk17": { "aarch64": { - "build": "9", - "sha256": "09a162c58dd801f7cfacd87e99703ed11fb439adc71cfa14ceb2d3194eaca01c", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.11_9.tar.gz", - "version": "17.0.11" - }, - "packageType": "jdk", - "vmType": "hotspot", - "x86_64": { - "build": "9", - "sha256": "f8b96724618f4df557c47f11048d1084e98ed3eb87f0dbd5b84f768a80c3348e", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jdk_x64_mac_hotspot_17.0.11_9.tar.gz", - "version": "17.0.11" - } - }, - "openjdk18": { - "aarch64": { - "build": "1", - "sha256": "c5ec423f52d8f3aa632941f29fd289f2e31dce5fe6f3abed9b72bd374f54cd41", - "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jdk_aarch64_mac_hotspot_18.0.2.1_1.tar.gz", - "version": "18.0.2" - }, - "packageType": "jdk", - "vmType": "hotspot", - "x86_64": { - "build": "1", - "sha256": "2ed916b0c9d197a6bf71b76e84d94125023c2609e0a9b22c64553eff5c9c29c1", - "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jdk_x64_mac_hotspot_18.0.2.1_1.tar.gz", - "version": "18.0.2" - } - }, - "openjdk19": { - "aarch64": { "build": "7", - "sha256": "c419330cc8d6b9974d3bf1937f8f0e747c34c469afd5c546831d35aa19e03d49", - "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_aarch64_mac_hotspot_19.0.2_7.tar.gz", - "version": "19.0.2" + "sha256": "d7910b1acaeb290c5c5da21811d2b2b8635f806612a2d6e8d1953b2f77580f78", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.12_7.tar.gz", + "version": "17.0.12" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { "build": "7", - "sha256": "f59d4157b3b53a35e72db283659d47f14aecae0ff5936d5f8078000504299da6", - "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_x64_mac_hotspot_19.0.2_7.tar.gz", - "version": "19.0.2" - } - }, - "openjdk20": { - "aarch64": { - "build": "9", - "sha256": "6ef42b63581c0265c5a6b734e203bb922ee720571a8de46532ecca50a804c596", - "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jdk_aarch64_mac_hotspot_20.0.2_9.tar.gz", - "version": "20.0.2" - }, - "packageType": "jdk", - "vmType": "hotspot", - "x86_64": { - "build": "9", - "sha256": "bdeb37322a7c9292434e417d4db9f5debd7477cf413335d3a653a4e5e50a2473", - "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jdk_x64_mac_hotspot_20.0.2_9.tar.gz", - "version": "20.0.2" + "sha256": "d5230eeec88739aa7133e4c8635bbd4ab226708c12deaafa13cf26b02bc8e8c4", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_x64_mac_hotspot_17.0.12_7.tar.gz", + "version": "17.0.12" } }, "openjdk21": { "aarch64": { - "build": "9", - "sha256": "b6be6a9568be83695ec6b7cb977f4902f7be47d74494c290bc2a5c3c951e254f", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jdk_aarch64_mac_hotspot_21.0.3_9.tar.gz", - "version": "21.0.3" + "build": "7", + "sha256": "dcf69a21601d9b1b25454bbad4f0f32784bb42cdbe4063492e15a851b74cb61e", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_aarch64_mac_hotspot_21.0.4_7.tar.gz", + "version": "21.0.4" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "f777103aab94330d14a29bd99f3a26d60abbab8e2c375cec9602746096721a7c", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jdk_x64_mac_hotspot_21.0.3_9.tar.gz", - "version": "21.0.3" + "build": "7", + "sha256": "e368e5de7111aa88e6bbabeff6f4c040772b57fb279cc4e197b51654085bbc18", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_x64_mac_hotspot_21.0.4_7.tar.gz", + "version": "21.0.4" } }, - "openjdk22": { + "openjdk23": { "aarch64": { - "build": "8", - "sha256": "80d6fa75e87280202ae7660139870fe50f07fca9dc6c4fbd3f2837cbd70ec902", - "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jdk_aarch64_mac_hotspot_22.0.1_8.tar.gz", - "version": "22.0.1" + "build": "37", + "sha256": "411934ca9ede95671afc1e7e1d9c8912c43247c7e4fba97730f20c0875287d44", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jdk_aarch64_mac_hotspot_23_37.tar.gz", + "version": "23.0.0" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "9445952d4487451af024a9a3f56373df76fbd928d9ff9186988aa27be2e4f10c", - "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jdk_x64_mac_hotspot_22.0.1_8.tar.gz", - "version": "22.0.1" + "build": "37", + "sha256": "0b4b14f7cb44cab89083fb72beafa6d4f12ee6722bf682e5dd026dab12cc8d23", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jdk_x64_mac_hotspot_23_37.tar.gz", + "version": "23.0.0" } }, "openjdk8": { "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "fd62491f7634c1cbed7557d6b21db7ef4818fbc0e63e678110d9d92cbea4ad8c", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jdk_x64_mac_hotspot_8u412b08.tar.gz", - "version": "8.0.412" + "build": "5", + "sha256": "14e93cac142c4e7734aab53d1e9f44ef2851cf1cc4657918abccdf99e78c8bad", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05.1/OpenJDK8U-jdk_x64_mac_hotspot_8u422b05.tar.gz", + "version": "8.0.422" } } }, "jre": { "openjdk11": { "aarch64": { - "build": "9", - "sha256": "8ecc59f0bda845717cecbc6025c4c7fcc26d6ffe48824b8f7a5db024216c5fb4", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jre_aarch64_mac_hotspot_11.0.23_9.tar.gz", - "version": "11.0.23" + "build": "8", + "sha256": "809c13c1c3abefe09c8396b18d6dd64837f30bf7bda7cbe317c6567bcd161d7a", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_aarch64_mac_hotspot_11.0.24_8.tar.gz", + "version": "11.0.24" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "9855769dddc3f3b5a1fb530ce953025b1f7b3fac861628849b417676b1310b1f", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jre_x64_mac_hotspot_11.0.23_9.tar.gz", - "version": "11.0.23" + "build": "8", + "sha256": "764d30489541ae088d2d0a75d46524ec35797dcdbe4a11b6bfbaee7957d8f77e", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_x64_mac_hotspot_11.0.24_8.tar.gz", + "version": "11.0.24" } }, "openjdk17": { "aarch64": { - "build": "9", - "sha256": "003d3e0a65a2f0633b8bfed42be133724b490acb323c174c708d3a446d5fc660", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jre_aarch64_mac_hotspot_17.0.11_9.tar.gz", - "version": "17.0.11" - }, - "packageType": "jre", - "vmType": "hotspot", - "x86_64": { - "build": "9", - "sha256": "232c40bebd6ddbb673862e86e7e6e09bcfe399e5a53c8a6b77bf1ceab8edefd0", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jre_x64_mac_hotspot_17.0.11_9.tar.gz", - "version": "17.0.11" - } - }, - "openjdk18": { - "aarch64": { - "build": "1", - "sha256": "071f073efb9550838bc02e429ef972f9450b477360f803dd1cf19096ca41182e", - "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jre_aarch64_mac_hotspot_18.0.2.1_1.tar.gz", - "version": "18.0.2" - }, - "packageType": "jre", - "vmType": "hotspot", - "x86_64": { - "build": "1", - "sha256": "3629e3dc9dbab7ed13070fbea3a827030acdd62afa557496e88a6d01f9300474", - "url": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jre_x64_mac_hotspot_18.0.2.1_1.tar.gz", - "version": "18.0.2" - } - }, - "openjdk19": { - "aarch64": { "build": "7", - "sha256": "1cd53e60478912fe5f2095313821e90c4926e74ff60a4aa9d99fc2ec912411c1", - "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jre_aarch64_mac_hotspot_19.0.2_7.tar.gz", - "version": "19.0.2" + "sha256": "5c1cb2cbd2ef3f2b529e2733d0ab55381e10c4c3607f4d62f2bf12f0942198bf", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_aarch64_mac_hotspot_17.0.12_7.tar.gz", + "version": "17.0.12" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { "build": "7", - "sha256": "33a37be7a5d7a6003595eeee6d09e47abfa1a1065a4da9a6f592b4b09cfcea19", - "url": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jre_x64_mac_hotspot_19.0.2_7.tar.gz", - "version": "19.0.2" - } - }, - "openjdk20": { - "aarch64": { - "build": "9", - "sha256": "81b475ab029ab224b2c711ccdfa9c25e0300539faad342a4ceefd33772fb38b4", - "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jre_aarch64_mac_hotspot_20.0.2_9.tar.gz", - "version": "20.0.2" - }, - "packageType": "jre", - "vmType": "hotspot", - "x86_64": { - "build": "9", - "sha256": "565d62faac325c098670705fb26a5cc3d4af0a25e86444ddd643f779ad2a3417", - "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jre_x64_mac_hotspot_20.0.2_9.tar.gz", - "version": "20.0.2" + "sha256": "331aceddc402263c5e47529234965927573ead684ea2b7a0358fbb6c279c1510", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_x64_mac_hotspot_17.0.12_7.tar.gz", + "version": "17.0.12" } }, "openjdk21": { "aarch64": { - "build": "9", - "sha256": "8df56361b834c4681ef304ae9dc8406ce3d79c8572d2d6c2fefcbea55be7d86b", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jre_aarch64_mac_hotspot_21.0.3_9.tar.gz", - "version": "21.0.3" + "build": "7", + "sha256": "14b39c00ec0ec6e0c465f784261449d0a1c4256b3b15c63c222397ccb31758aa", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_aarch64_mac_hotspot_21.0.4_7.tar.gz", + "version": "21.0.4" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "d7fc89c196ed03deb8a98f6599e1b2e78859ec8ec752142549cd3710f3e1a025", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jre_x64_mac_hotspot_21.0.3_9.tar.gz", - "version": "21.0.3" + "build": "7", + "sha256": "f67f17413d012672da11163dd73600e0d92eef6f6ff27c6ae25523bd9df74222", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_x64_mac_hotspot_21.0.4_7.tar.gz", + "version": "21.0.4" } }, - "openjdk22": { + "openjdk23": { "aarch64": { - "build": "8", - "sha256": "73a8a0270534db7b4760399f41c573fd1cff5f86f4e68b08988afee0df814889", - "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jre_aarch64_mac_hotspot_22.0.1_8.tar.gz", - "version": "22.0.1" + "build": "37", + "sha256": "2c96b006080906951fb0ddae8e23ca3ef2bd327b77cac84b4302b8d84c7014f5", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jre_aarch64_mac_hotspot_23_37.tar.gz", + "version": "23.0.0" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "d21e84edc1d7cc58fc04bcd9a214b71bf85e8ea348f8659197be3383afcb2b9a", - "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jre_x64_mac_hotspot_22.0.1_8.tar.gz", - "version": "22.0.1" + "build": "37", + "sha256": "1f41755494c45a8a88dfed926251f478544c0e51a71a011314fc282e915f804f", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jre_x64_mac_hotspot_23_37.tar.gz", + "version": "23.0.0" } }, "openjdk8": { "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "1237e4f4238211d9137eec838e5d7cabdc9d93d41001cf41f6de3a4eb90884ef", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jre_x64_mac_hotspot_8u412b08.tar.gz", - "version": "8.0.412" + "build": "5", + "sha256": "814a1e262c10cb3f056adbdb20396564fe9ea0f039a863bae6b648f7680b30cc", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05.1/OpenJDK8U-jre_x64_mac_hotspot_8u422b05.tar.gz", + "version": "8.0.422" } } } diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix index 1d50d6e23ddb..4193ab53164c 100644 --- a/pkgs/development/compilers/terra/default.nix +++ b/pkgs/development/compilers/terra/default.nix @@ -45,8 +45,8 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ llvmMerged ncurses libffi libxml2 ] ++ lib.optionals enableCUDA [ cuda ] - ++ lib.optional (!stdenv.isDarwin) libpfm - ++ lib.optionals stdenv.isDarwin [ libobjc Cocoa Foundation ]; + ++ lib.optional (!stdenv.hostPlatform.isDarwin) libpfm + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc Cocoa Foundation ]; cmakeFlags = let resourceDir = "${llvmMerged}/lib/clang/" + ( @@ -100,6 +100,6 @@ in stdenv.mkDerivation rec { # never built on aarch64-darwin since first introduction in nixpkgs # Linux Aarch64 broken above LLVM11 # https://github.com/terralang/terra/issues/597 - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index b36eb44229d1..65eea0a48e46 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { builtins.match "^[0-9]\\.+[0-9]+\\.[0-9]+" version != null; in '' ${ - if stdenv.isDarwin && ! versionIsClean finalAttrs.version + if stdenv.hostPlatform.isDarwin && ! versionIsClean finalAttrs.version then "echo 'not overwriting VERSION since it would upset ld'" else "echo ${finalAttrs.version} > VERSION" } @@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { checkTarget = "test"; # https://www.mail-archive.com/tinycc-devel@nongnu.org/msg10142.html - preCheck = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + preCheck = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' rm tests/tests2/{108,114}* ''; @@ -122,7 +122,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ joachifm AndersonTorres ]; platforms = lib.platforms.unix; # https://www.mail-archive.com/tinycc-devel@nongnu.org/msg10199.html - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; }) # TODO: more multiple outputs diff --git a/pkgs/development/compilers/tinygo/default.nix b/pkgs/development/compilers/tinygo/default.nix index a32e516633a8..339a2abb7fa5 100644 --- a/pkgs/development/compilers/tinygo/default.nix +++ b/pkgs/development/compilers/tinygo/default.nix @@ -28,13 +28,13 @@ in buildGoModule rec { pname = "tinygo"; - version = "0.33.0"; + version = "0.34.0"; src = fetchFromGitHub { owner = "tinygo-org"; repo = "tinygo"; rev = "v${version}"; - hash = "sha256-YqjMk7EF/fyOhsMLcG56FGHfOZSdaFhUbiiHk+SXajY="; + hash = "sha256-jntixwHGg9buWQuu9I47DHUxK1xJbDRHxRMEwKoOhHo="; fetchSubmodules = true; # The public hydra server on `hydra.nixos.org` is configured with # `max_output_size` of 3GB. The purpose of this `postFetch` step @@ -45,7 +45,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-cTqrvh0w3KQg3P1lCfAez0kqAMBJHQbqS3sx8uqGvEs="; + vendorHash = "sha256-aY1gX++Dc5/G6VFXnP7sBdekk2IKHlenOC0erlB/Quw="; patches = [ ./0001-GNUmakefile.patch @@ -54,7 +54,7 @@ buildGoModule rec { nativeCheckInputs = [ binaryen ]; nativeBuildInputs = [ makeWrapper lld ]; buildInputs = [ llvm clang.cc ] - ++ lib.optionals stdenv.isDarwin [ xar ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ xar ]; doCheck = (stdenv.buildPlatform.canExecute stdenv.hostPlatform); inherit tinygoTests; @@ -112,7 +112,7 @@ buildGoModule rec { # GDB upstream does not support ARM darwin runtimeDeps = [ go clang.cc lld avrdude openocd binaryen ] - ++ lib.optionals (!(stdenv.isDarwin && stdenv.isAarch64)) [ gdb ]; + ++ lib.optionals (!(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) [ gdb ]; installPhase = '' runHook preInstall diff --git a/pkgs/development/compilers/tvm/default.nix b/pkgs/development/compilers/tvm/default.nix deleted file mode 100644 index 45579ad8f16a..000000000000 --- a/pkgs/development/compilers/tvm/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - pname = "tvm"; - version = "0.17.0"; - - src = fetchFromGitHub { - owner = "apache"; - repo = "incubator-tvm"; - rev = "v${version}"; - fetchSubmodules = true; - hash = "sha256-5Jr+xubQoASNgy/UR/K5pvzMs4szP9LidFOLs3h+KSY="; - }; - - nativeBuildInputs = [ cmake ]; - # TVM CMake build uses some sources in the project's ./src/target/opt/ - # directory which errneously gets mangled by the eager `fixCmakeFiles` - # function in Nix's CMake setup-hook.sh to ./src/target/var/empty/, - # which then breaks the build. Toggling this flag instructs Nix to - # not mangle the legitimate use of the opt/ folder. - dontFixCmake = true; - - meta = with lib; { - homepage = "https://tvm.apache.org/"; - description = "End to End Deep Learning Compiler Stack for CPUs, GPUs and accelerators"; - license = licenses.asl20; - platforms = platforms.all; - maintainers = with maintainers; [ adelbertc ]; - }; -} diff --git a/pkgs/development/compilers/typescript/default.nix b/pkgs/development/compilers/typescript/default.nix deleted file mode 100644 index 513f8a99180f..000000000000 --- a/pkgs/development/compilers/typescript/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, buildNpmPackage, fetchFromGitHub, testers, typescript }: - -buildNpmPackage rec { - pname = "typescript"; - version = "5.6.2"; - - src = fetchFromGitHub { - owner = "microsoft"; - repo = "TypeScript"; - rev = "v${version}"; - hash = "sha256-aomoO/1E7zdhRNTCKqbA7ktor03zjg5HZXPxhH8iris="; - }; - - patches = [ - ./disable-dprint-dstBundler.patch - ]; - - npmDepsHash = "sha256-I44XhQzUsbf6Q4r2o40l9qBU8FMRZuYhb7dLVvFDyJc="; - - passthru.tests = { - version = testers.testVersion { - package = typescript; - }; - }; - - meta = with lib; { - description = "Superset of JavaScript that compiles to clean JavaScript output"; - homepage = "https://www.typescriptlang.org/"; - changelog = "https://github.com/microsoft/TypeScript/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = [ ]; - mainProgram = "tsc"; - }; -} diff --git a/pkgs/development/compilers/typescript/disable-dprint-dstBundler.patch b/pkgs/development/compilers/typescript/disable-dprint-dstBundler.patch deleted file mode 100644 index 95ccf411a93e..000000000000 --- a/pkgs/development/compilers/typescript/disable-dprint-dstBundler.patch +++ /dev/null @@ -1,15 +0,0 @@ -Disable dprint on dstBundler - -dprint fails on sandbox, because it requires internet access to install its -plugins. - ---- a/scripts/dtsBundler.mjs -+++ b/scripts/dtsBundler.mjs -@@ -430,5 +430,5 @@ - return result.replace(/\r\n/g, "\n"); - } - --fs.writeFileSync(output, dprint(publicContents)); --fs.writeFileSync(internalOutput, dprint(internalContents)); -+fs.writeFileSync(output, publicContents); -+fs.writeFileSync(internalOutput, internalContents); diff --git a/pkgs/development/compilers/uasm/default.nix b/pkgs/development/compilers/uasm/default.nix deleted file mode 100644 index 21d9a2bf5d48..000000000000 --- a/pkgs/development/compilers/uasm/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, testers -, uasm -}: - -stdenv.mkDerivation rec { - pname = "uasm"; - version = "2.56.2"; - - src = fetchFromGitHub { - owner = "Terraspace"; - repo = pname; - # Specifying only the tag results in the following error during download: - # the given path has multiple possibilities: #<Git::Ref:0x00007f618689c378>, #<Git::Ref:0x00007f618689c1e8> - # Probably because upstream has both a tag and a branch with the same name - rev = "refs/tags/v${version}"; - hash = "sha256-QiRBscY6zefeLDDVhS/+j9yIJ+5QhgkDQh1CLl/CslM="; - }; - - patches = [ - (fetchpatch { - name = "fix-v2_55-compilation-on-macos.patch"; - url = "https://github.com/Terraspace/UASM/commit/b50c430cc3083c7f32e288a9f64fe1cafb03091d.patch"; - sha256 = "sha256-FGFB282LSEKtGD1cIRH+Qi5bye5Gx4xb0Ty4J03xjCU"; - }) - ]; - - enableParallelBuilding = true; - - makefile = - if stdenv.isDarwin then - "ClangOSX64.mak" - else - "gccLinux64.mak"; - - makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; - - installPhase = '' - runHook preInstall - - install -Dt "$out/bin" -m0755 GccUnixR/uasm - install -Dt "$out/share/doc/${pname}" -m0644 {Readme,History}.txt Doc/* - - runHook postInstall - ''; - - passthru.tests.version = testers.testVersion { - package = uasm; - command = "uasm -h"; - version = "v${version}"; - }; - - meta = with lib; { - homepage = "https://www.terraspace.co.uk/uasm.html"; - description = "Free MASM-compatible assembler based on JWasm"; - mainProgram = "uasm"; - platforms = platforms.unix; - maintainers = with maintainers; [ thiagokokada ]; - license = licenses.watcom; - }; -} diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/development/compilers/unison/default.nix deleted file mode 100644 index 2dd2b7a15897..000000000000 --- a/pkgs/development/compilers/unison/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib -, autoPatchelfHook -, fetchurl -, gmp -, less -, makeWrapper -, libb2 -, ncurses6 -, openssl -, stdenv -, zlib -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "unison-code-manager"; - version = "0.5.26"; - - src = if stdenv.isDarwin then - fetchurl { - url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos.tar.gz"; - hash = "sha256-RF2Q5sCxT9F3IGM/8UP6bEe9sOjtpMVYHREuAPOzh8g="; - } - else - fetchurl { - url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-linux.tar.gz"; - hash = "sha256-t0rc1f4PfjHRu/tzoW8sJ/6R0KBbYQPiWHqsIaqc+SY="; - }; - - # The tarball is just the prebuilt binary, in the archive root. - sourceRoot = "."; - dontBuild = true; - dontConfigure = true; - - nativeBuildInputs = [ makeWrapper ] - ++ lib.optional (!stdenv.isDarwin) autoPatchelfHook; - buildInputs = lib.optionals (!stdenv.isDarwin) [ gmp ncurses6 zlib ]; - - installPhase = '' - mkdir -p $out/{bin,lib} - mv runtime $out/lib/runtime - mv ui $out/ui - mv unison $out/unison - makeWrapper $out/unison/unison $out/bin/ucm \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libb2 openssl ]} \ - --prefix PATH ":" "${lib.makeBinPath [ less ]}" \ - --add-flags "--runtime-path $out/lib/runtime/bin/unison-runtime" \ - --set UCM_WEB_UI "$out/ui" - ''; - - meta = with lib; { - description = "Modern, statically-typed purely functional language"; - homepage = "https://unisonweb.org/"; - license = with licenses; [ mit bsd3 ]; - mainProgram = "ucm"; - maintainers = with maintainers; [ ceedubs sellout virusdave ]; - platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-darwin" ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - }; -}) diff --git a/pkgs/development/compilers/urn/default.nix b/pkgs/development/compilers/urn/default.nix deleted file mode 100644 index 87e28d9672da..000000000000 --- a/pkgs/development/compilers/urn/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib, stdenv, fetchFromGitLab, buildEnv, makeWrapper, lua, luajit, readline -, useLuaJit ? false -, extraLibraries ? [] -}: - -let - version = "0.7.2"; - # Build a sort of "union package" with all the native dependencies we - # have: Lua (or LuaJIT), readline, etc. Then, we can depend on this - # and refer to ${urn-rt} instead of ${lua}, ${readline}, etc. - urn-rt = buildEnv { - name = "urn-rt-${version}"; - ignoreCollisions = true; - paths = if useLuaJit then - [ luajit readline ] - else - [ lua ]; - }; - - inherit (lib) optionalString concatMapStringsSep; -in - -stdenv.mkDerivation { - pname = "urn${optionalString (extraLibraries != []) "-with-libraries"}"; - inherit version; - - src = fetchFromGitLab { - owner = "urn"; - repo = "urn"; - rev = "v${version}"; - sha256 = "0nclr3d8ap0y5cg36i7g4ggdqci6m5q27y9f26b57km8p266kcpy"; - }; - - nativeBuildInputs = [ makeWrapper ]; - # Any packages that depend on the compiler have a transitive - # dependency on the Urn runtime support. - propagatedBuildInputs = [ urn-rt ]; - - makeFlags = ["-B"]; - - installPhase = '' - mkdir -p $out/bin $out/lib - install -m 0755 bin/urn.lua $out/bin/urn - cp -r lib $out/lib/urn - wrapProgram $out/bin/urn \ - --add-flags "-i $out/lib/urn --prelude $out/lib/urn/prelude.lisp" \ - --add-flags "${concatMapStringsSep " " (x: "-i ${x.libraryPath}") extraLibraries}" \ - --prefix PATH : ${urn-rt}/bin/ \ - --prefix LD_LIBRARY_PATH : ${urn-rt}/lib/ - ''; - - meta = with lib; { - homepage = "https://urn-lang.com"; - description = "Yet another Lisp variant which compiles to Lua"; - mainProgram = "urn"; - license = licenses.bsd3; - maintainers = with maintainers; [ CrazedProgrammer ]; - platforms = platforms.all; - }; - - passthru = { - inherit urn-rt; - }; -} diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 1b880b61a05a..96b995d64b6c 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -50,7 +50,7 @@ let nativeBuildInputs = [ pkg-config flex bison libxslt gobject-introspection - ] ++ lib.optional (stdenv.isDarwin) expat + ] ++ lib.optional (stdenv.hostPlatform.isDarwin) expat ++ lib.optional disableGraphviz autoreconfHook # if we changed our ./configure script, need to reconfigure ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ vala ] ++ extraNativeBuildInputs; diff --git a/pkgs/development/compilers/vlang/default.nix b/pkgs/development/compilers/vlang/default.nix deleted file mode 100644 index a0acfd263474..000000000000 --- a/pkgs/development/compilers/vlang/default.nix +++ /dev/null @@ -1,109 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, glfw, freetype, openssl, makeWrapper, upx, boehmgc, xorg, binaryen, darwin }: - -let - version = "0.4.4"; - ptraceSubstitution = '' - #include <sys/types.h> - #include <sys/ptrace.h> - ''; - # vc is the V compiler's source translated to C (needed for boostrap). - # So we fix its rev to correspond to the V version. - vc = stdenv.mkDerivation { - pname = "v.c"; - version = "0.4.4"; - src = fetchFromGitHub { - owner = "vlang"; - repo = "vc"; - rev = "66eb8eae253d31fa5622e35a69580d9ad8efcccb"; - hash = "sha256-YGlzr0Qq7+NtrnbaFPBuclzjOZBOnTe3BOhsuwdsQ5c="; - }; - - # patch the ptrace reference for darwin - installPhase = lib.optionalString stdenv.isDarwin '' - substituteInPlace v.c \ - --replace "#include <sys/ptrace.h>" "${ptraceSubstitution}" - '' + '' - mkdir -p $out - cp v.c $out/ - ''; - }; - # Required for vdoc. - markdown = fetchFromGitHub { - owner = "vlang"; - repo = "markdown"; - rev = "0c280130cb7ec410b7d21810d1247956c15b72fc"; - hash = "sha256-Fmhkrg9DBiWxInostNp+WfA3V5GgEIs5+KIYrqZosqY="; - }; - boehmgcStatic = boehmgc.override { - enableStatic = true; - }; -in -stdenv.mkDerivation { - pname = "vlang"; - inherit version; - - src = fetchFromGitHub { - owner = "vlang"; - repo = "v"; - rev = version; - hash = "sha256-Aqecw8K+igHx5R34lQiWtdNfeGn+umcjcS4w0vXgpLM="; - }; - - propagatedBuildInputs = [ glfw freetype openssl ] - ++ lib.optional stdenv.hostPlatform.isUnix upx; - - nativeBuildInputs = [ makeWrapper ]; - - buildInputs = [ - binaryen - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - ] ++ lib.optionals stdenv.isLinux [ - xorg.libX11 - xorg.libXau - xorg.libXdmcp - xorg.xorgproto - ]; - - makeFlags = [ - "local=1" - ]; - - env.VC = vc; - - preBuild = '' - export HOME=$(mktemp -d) - mkdir -p ./thirdparty/tcc/lib - cp -r ${boehmgcStatic}/lib/* ./thirdparty/tcc/lib - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/{bin,lib,share} - cp -r examples $out/share - cp -r {cmd,vlib,thirdparty} $out/lib - cp v $out/lib - ln -s $out/lib/v $out/bin/v - wrapProgram $out/bin/v --prefix PATH : ${lib.makeBinPath [ stdenv.cc ]} - - mkdir -p $HOME/.vmodules; - ln -sf ${markdown} $HOME/.vmodules/markdown - $out/lib/v -v build-tools - $out/lib/v -v $out/lib/cmd/tools/vdoc - $out/lib/v -v $out/lib/cmd/tools/vast - $out/lib/v -v $out/lib/cmd/tools/vvet - $out/lib/v -v $out/lib/cmd/tools/vcreate - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://vlang.io/"; - description = "Simple, fast, safe, compiled language for developing maintainable software"; - license = licenses.mit; - maintainers = with maintainers; [ Madouura delta231 ]; - mainProgram = "v"; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/compilers/wcc/default.nix b/pkgs/development/compilers/wcc/default.nix deleted file mode 100644 index 644e9ad646a8..000000000000 --- a/pkgs/development/compilers/wcc/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, capstone, libbfd, libelf, libiberty, readline }: - -stdenv.mkDerivation { - pname = "wcc-unstable"; - version = "2018-04-05"; - - src = fetchFromGitHub { - owner = "endrazine"; - repo = "wcc"; - rev = "f141963ff193d7e1931d41acde36d20d7221e74f"; - sha256 = "1f0w869x0176n5nsq7m70r344gv5qvfmk7b58syc0jls8ghmjvb4"; - fetchSubmodules = true; - }; - - buildInputs = [ capstone libbfd libelf libiberty readline ]; - - postPatch = '' - sed -i src/wsh/include/libwitch/wsh.h src/wsh/scripts/INDEX \ - -e "s#/usr/share/wcc#$out/share/wcc#" - - sed -i -e '/stropts.h>/d' src/wsh/include/libwitch/wsh.h - ''; - - installFlags = [ "DESTDIR=$(out)" ]; - - preInstall = '' - mkdir -p $out/usr/bin - ''; - - postInstall = '' - mv $out/usr/* $out - rmdir $out/usr - mkdir -p $out/share/man/man1 - cp doc/manpages/*.1 $out/share/man/man1/ - ''; - - preFixup = '' - # Let patchShebangs rewrite shebangs with wsh. - PATH+=:$out/bin - ''; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = "https://github.com/endrazine/wcc"; - description = "Witchcraft compiler collection: tools to convert and script ELF files"; - license = licenses.mit; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ orivej ]; - }; -} diff --git a/pkgs/development/compilers/wla-dx/default.nix b/pkgs/development/compilers/wla-dx/default.nix deleted file mode 100644 index b80b460d4def..000000000000 --- a/pkgs/development/compilers/wla-dx/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{lib, stdenv, fetchFromGitHub, cmake}: - -stdenv.mkDerivation rec { - pname = "wla-dx"; - version = "9.11"; - - src = fetchFromGitHub { - owner = "vhelin"; - repo = "wla-dx"; - rev = "v${version}-fix"; - sha256 = "0sz1vqafl7ii3z1710sk0ilvczv8pb4b6lkmg9pr7hqj3kaxndii"; - }; - - installPhase = '' - mkdir -p $out/bin - install binaries/* $out/bin - ''; - - nativeBuildInputs = [ cmake ]; - - meta = with lib; { - homepage = "https://www.villehelin.com/wla.html"; - description = "Yet Another GB-Z80/Z80/6502/65C02/6510/65816/HUC6280/SPC-700 Multi Platform Cross Assembler Package"; - license = licenses.gpl2; - maintainers = with maintainers; [ matthewbauer ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/development/compilers/yap/default.nix deleted file mode 100644 index db7d9b05b7fb..000000000000 --- a/pkgs/development/compilers/yap/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchurl, readline, gmp, zlib }: - -stdenv.mkDerivation rec { - version = "6.3.3"; - pname = "yap"; - - src = fetchurl { - url = "https://www.dcc.fc.up.pt/~vsc/Yap/${pname}-${version}.tar.gz"; - sha256 = "0y7sjwimadqsvgx9daz28c9mxcx9n1znxklih9xg16k6n54v9qxf"; - }; - - buildInputs = [ readline gmp zlib ]; - - configureFlags = [ "--enable-tabling=yes" ]; - - # -fcommon: workaround build failure on -fno-common toolchains like upstream - # gcc-10. Otherwise build fails as: - # ld: libYap.a(pl-dtoa.o):/build/yap-6.3.3/H/pl-yap.h:230: multiple definition of `ATOM_'; - # libYap.a(pl-buffer.o):/build/yap-6.3.3/H/pl-yap.h:230: first defined here - env.NIX_CFLAGS_COMPILE = "-fpermissive -fcommon"; - - meta = { - # the linux 32 bit build fails. - broken = (stdenv.isLinux && stdenv.isAarch64) || !stdenv.is64bit; - homepage = "http://www.dcc.fc.up.pt/~vsc/Yap/"; - description = "ISO-compatible high-performance Prolog compiler"; - license = lib.licenses.artistic2; - - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/compilers/yasm/default.nix b/pkgs/development/compilers/yasm/default.nix deleted file mode 100644 index 58b8252729a7..000000000000 --- a/pkgs/development/compilers/yasm/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{lib, stdenv, fetchurl, buildPackages}: - -stdenv.mkDerivation rec { - pname = "yasm"; - version = "1.3.0"; - - src = fetchurl { - url = "https://www.tortall.net/projects/yasm/releases/yasm-${version}.tar.gz"; - sha256 = "0gv0slmm0qpq91za3v2v9glff3il594x5xsrbgab7xcmnh0ndkix"; - }; - - depsBuildBuild = [ buildPackages.stdenv.cc ]; - - meta = with lib; { - homepage = "http://www.tortall.net/projects/yasm/"; - description = "Complete rewrite of the NASM assembler"; - license = licenses.bsd2; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 43e941824fa7..617e6b862fb5 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -75,13 +75,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "yosys"; - version = "0.45"; + version = "0.47"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-NF4NQ7mCfARuMsMTJVBbJk39puJ8+D41woYEPgthfUI="; + hash = "sha256-9u9aAPTZyt9vzZwryor3GRCGzs/mu2/XtM0XzV7uHfk="; fetchSubmodules = true; leaveDotGit = true; postFetch = '' diff --git a/pkgs/development/compilers/yosys/plugins/synlig.nix b/pkgs/development/compilers/yosys/plugins/synlig.nix index 0cfaac22122f..079c22aedbce 100644 --- a/pkgs/development/compilers/yosys/plugins/synlig.nix +++ b/pkgs/development/compilers/yosys/plugins/synlig.nix @@ -87,5 +87,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.asl20; maintainers = with maintainers; [ hzeller ]; platforms = platforms.all; + broken = versionAtLeast yosys.version "0.47"; }; }) diff --git a/pkgs/development/compilers/z88dk/default.nix b/pkgs/development/compilers/z88dk/default.nix deleted file mode 100644 index ea5582375abd..000000000000 --- a/pkgs/development/compilers/z88dk/default.nix +++ /dev/null @@ -1,199 +0,0 @@ -{ - fetchFromGitHub, - lib, - stdenv, - unzip, - libxml2, - gmp, - m4, - uthash, - which, - pkg-config, - perl, - perlPackages, - fetchurl, -}: - -let - # Perl packages used by this project. - # TODO: put these into global perl-packages.nix once this is submitted. - ObjectTinyRW = perlPackages.buildPerlPackage { - pname = "Object-Tiny-RW"; - version = "1.07"; - src = fetchurl { - url = "mirror://cpan/authors/id/S/SC/SCHWIGON/object-tiny-rw/Object-Tiny-RW-1.07.tar.gz"; - hash = "sha256-NbQIy9d4ZcMnRJJApPBSej+W6e/aJ8rkb5E7rD7GVgs="; - }; - meta = { - description = "A date object with as little code as possible (and rw accessors)"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; - - IteratorSimple = perlPackages.buildPerlPackage { - pname = "Iterator-Simple"; - version = "0.07"; - src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MICHAEL/Iterator-Simple-0.07.tar.gz"; - hash = "sha256-y1dNBju0gcj7nLV4GkZFiWqg4e5xW6lHz3ZvH/Tp60Q="; - }; - meta = { - description = "Simple iterator and utilities"; - license = with lib.licenses; [ artistic1 gpl2Only ]; - }; - }; - - IteratorSimpleLookahead = perlPackages.buildPerlPackage { - pname = "Iterator-Simple-Lookahead"; - version = "0.09"; - src = fetchurl { - url = "mirror://cpan/authors/id/P/PS/PSCUST/Iterator-Simple-Lookahead-0.09.tar.gz"; - hash = "sha256-FmPE1xdU8LAXS21+H4DJaQ87qDi4Q4UkLawsUAqseZw="; - }; - propagatedBuildInputs = [ IteratorSimple ] ++ (with perlPackages; [ - ClassAccessor - ]); - meta = { - description = "Simple iterator with lookahead and unget"; - license = with lib.licenses; [ artistic1 gpl2Only ]; - }; - }; - - AsmPreproc = perlPackages.buildPerlPackage { - pname = "Asm-Preproc"; - version = "1.03"; - src = fetchurl { - url = "mirror://cpan/authors/id/P/PS/PSCUST/Asm-Preproc-1.03.tar.gz"; - hash = "sha256-pVTpIqGxZpBxZlAbXuGDapuOxsp3uM/AM5dKUxlej1M="; - }; - propagatedBuildInputs = [ - IteratorSimple - IteratorSimpleLookahead - ] ++ (with perlPackages; [ - TextTemplate - DataDump - FileSlurp - ]); - meta = { - description = "Preprocessor to be called from an assembler"; - license = with lib.licenses; [ artistic1 gpl2Only ]; - }; - }; - - CPUZ80Assembler = perlPackages.buildPerlPackage { - pname = "CPU-Z80-Assembler"; - version = "2.25"; - src = fetchurl { - url = "mirror://cpan/authors/id/P/PS/PSCUST/CPU-Z80-Assembler-2.25.tar.gz"; - hash = "sha256-cJ8Fl2KZw9/bnBDUzFuwwdw9x23OUvcftk78kw7abdU="; - }; - buildInputs = [ AsmPreproc ] ++ (with perlPackages; [ - CaptureTiny - RegexpTrie - PathTiny - ClassAccessor - ]); - meta = { - description = "Functions to assemble a set of Z80 assembly instructions"; - license = with lib.licenses; [ artistic1 gpl2Only ]; - }; - }; -in -stdenv.mkDerivation (finalAttrs: { - pname = "z88dk"; - version = "2.3"; - - src = fetchFromGitHub { - owner = "z88dk"; - repo = "z88dk"; - rev = "v${finalAttrs.version}"; - hash = "sha256-CHTORgK6FYIO6n+cvTUX4huY2Ek5FuHrs40QN5NZX44="; - fetchSubmodules = true; - }; - - postPatch = '' - # we dont rely on build.sh : - export PATH="$PWD/bin:$PATH" # needed to have zcc in testsuite - export ZCCCFG=$PWD/lib/config/ - - # we don't want to build zsdcc since it required network (svn) - # we test in checkPhase - substituteInPlace Makefile \ - --replace 'testsuite bin/z88dk-lib$(EXESUFFIX)' 'bin/z88dk-lib$(EXESUFFIX)'\ - --replace 'ALL_EXT = bin/zsdcc$(EXESUFFIX)' 'ALL_EXT =' - - # rc2014.lib not created, making corresponding tests fail. Comment out. - substituteInPlace test/suites/make.config \ - --replace 'zcc +rc2014' '#zcc +rc2014' \ - --replace '@$(MACHINE) -pc 0x9000' '#@$(MACHINE) -pc 0x9000' - - # The following tests don't pass. - rm src/z80asm/t/issue_0341.t - rm src/z80asm/t/z80asm_lib.t - ''; - - # Parallel building is not working yet with the upstream Makefiles. - # Explicitly switch this off for now. - enableParallelBuilding = false; - - doCheck = true; - checkPhase = '' - # Need to build libs first, Makefile deps not fully defined - make libs $makeFlags - make testsuite $makeFlags - make -k test $makeFlags - ''; - - short_rev = builtins.substring 0 7 finalAttrs.src.rev; - makeFlags = [ - "git_rev=${finalAttrs.short_rev}" - "version=${finalAttrs.version}" - "PREFIX=$(out)" - "git_count=0" - ]; - - nativeBuildInputs = [ - which - unzip - m4 - perl - pkg-config - - # Local perl packages - AsmPreproc - CPUZ80Assembler - ObjectTinyRW - ] ++ (with perlPackages; [ - CaptureTiny - DataHexDump - ModernPerl - PathTiny - RegexpCommon - TestHexDifferences - TextDiff - RegexpTrie - ]); - - buildInputs = [ - libxml2 - uthash - gmp - ]; - - preInstall = '' - mkdir -p $out/{bin,share} - ''; - - installTargets = [ - "libs" - "install" - ]; - - meta = with lib; { - homepage = "https://www.z88dk.org"; - description = "z80 Development Kit"; - license = licenses.clArtistic; - maintainers = [ maintainers.siraben ]; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/development/compilers/zasm/default.nix b/pkgs/development/compilers/zasm/default.nix deleted file mode 100644 index bd98622edf3f..000000000000 --- a/pkgs/development/compilers/zasm/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, zlib }: -let - libs-src = fetchFromGitHub { - owner = "megatokio"; - repo = "Libraries"; - # 2021-02-02 - rev = "c5cb3ed512c677db6f33e2d3539dfbb6e547030b"; - sha256 = "sha256-GiplhZf640uScVdKL6E/fegOgtC9SE1xgBqcX86XADk="; - }; -in -stdenv.mkDerivation rec { - pname = "zasm"; - version = "4.4.7"; - - src = fetchFromGitHub { - owner = "megatokio"; - repo = "zasm"; - rev = version; - sha256 = "sha256-Zbno8kmzss1H2FjwzHB4U7UXxa6oDfsPV80MVVFfM68="; - postFetch = '' - # remove folder containing files with weird names (causes the hash to turn out differently under macOS vs. Linux) - rm -rv $out/Test - ''; - }; - - buildInputs = [ zlib ]; - - configurePhase = '' - ln -sf ${libs-src} Libraries - ''; - - makeFlags = [ - "CC=${stdenv.cc.targetPrefix}cc" - "CXX=${stdenv.cc.targetPrefix}c++" - "LINK=${stdenv.cc.targetPrefix}c++" - "STRIP=${stdenv.cc.targetPrefix}strip" - ]; - - installPhase = '' - install -Dm755 -t $out/bin zasm - ''; - - meta = with lib; { - description = "Z80 / 8080 / Z180 assembler (for unix-style OS)"; - mainProgram = "zasm"; - homepage = "https://k1.spdns.de/Develop/Projects/zasm/Distributions/"; - license = licenses.bsd2; - maintainers = [ maintainers.turbomack ]; - platforms = platforms.unix; - badPlatforms = platforms.aarch64; - }; -} diff --git a/pkgs/development/compilers/zig/0.12/default.nix b/pkgs/development/compilers/zig/0.12/default.nix index 1a730d4c0ce7..f359140df234 100644 --- a/pkgs/development/compilers/zig/0.12/default.nix +++ b/pkgs/development/compilers/zig/0.12/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { # /System/Library/CoreServices/.SystemVersionPlatform.plist to determine the # OS version. This causes the build to fail during stage 3 with # OSVersionDetectionFail when the sandbox is enabled. - __impureHostDeps = lib.optionals stdenv.isDarwin [ + __impureHostDeps = lib.optionals stdenv.hostPlatform.isDarwin [ "/System/Library/CoreServices/.SystemVersionPlatform.plist" "/System/Library/CoreServices/SystemVersion.plist" ]; diff --git a/pkgs/development/compilers/zig/0.13/default.nix b/pkgs/development/compilers/zig/0.13/default.nix index 43093c822f02..8ec68f20260f 100644 --- a/pkgs/development/compilers/zig/0.13/default.nix +++ b/pkgs/development/compilers/zig/0.13/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { # /System/Library/CoreServices/.SystemVersionPlatform.plist to determine the # OS version. This causes the build to fail during stage 3 with # OSVersionDetectionFail when the sandbox is enabled. - __impureHostDeps = lib.optionals stdenv.isDarwin [ + __impureHostDeps = lib.optionals stdenv.hostPlatform.isDarwin [ "/System/Library/CoreServices/.SystemVersionPlatform.plist" "/System/Library/CoreServices/SystemVersion.plist" ]; diff --git a/pkgs/development/compilers/zig/cc.nix b/pkgs/development/compilers/zig/cc.nix index dc94e918814d..115a71ca4900 100644 --- a/pkgs/development/compilers/zig/cc.nix +++ b/pkgs/development/compilers/zig/cc.nix @@ -3,7 +3,7 @@ wrapCCWith, makeWrapper, runCommand, - targetPlatform, + stdenv, targetPackages, zig, }: @@ -34,9 +34,9 @@ wrapCCWith { nixSupport.cc-cflags = [ "-target" - "${targetPlatform.parsed.cpu.name}-${targetPlatform.parsed.kernel.name}-${targetPlatform.parsed.abi.name}" + "${stdenv.targetPlatform.parsed.cpu.name}-${stdenv.targetPlatform.parsed.kernel.name}-${stdenv.targetPlatform.parsed.abi.name}" ] ++ lib.optional ( - targetPlatform.isLinux && !(targetPackages.isStatic or false) + stdenv.targetPlatform.isLinux && !(targetPackages.isStatic or false) ) "-Wl,-dynamic-linker=${targetPackages.stdenv.cc.bintools.dynamicLinker}"; } diff --git a/pkgs/development/compilers/zig/generic.nix b/pkgs/development/compilers/zig/generic.nix index cde1a61e3583..3da36c083bd3 100644 --- a/pkgs/development/compilers/zig/generic.nix +++ b/pkgs/development/compilers/zig/generic.nix @@ -41,12 +41,14 @@ stdenv.mkDerivation (finalAttrs: { # /System/Library/CoreServices/.SystemVersionPlatform.plist to determine the # OS version. This causes the build to fail during stage 3 with # OSVersionDetectionFail when the sandbox is enabled. - __impureHostDeps = lib.optionals stdenv.isDarwin [ + __impureHostDeps = lib.optionals stdenv.hostPlatform.isDarwin [ "/System/Library/CoreServices/.SystemVersionPlatform.plist" "/System/Library/CoreServices/SystemVersion.plist" ]; - env.ZIG_GLOBAL_CACHE_DIR = "$TMPDIR/zig-cache"; + preBuild = '' + export ZIG_GLOBAL_CACHE_DIR="$TMPDIR/zig-cache"; + ''; # Zig's build looks at /usr/bin/env to find dynamic linking info. This doesn't # work in Nix's sandbox. Use env from our coreutils instead. @@ -55,14 +57,14 @@ stdenv.mkDerivation (finalAttrs: { --replace "/usr/bin/env" "${coreutils}/bin/env" '' else '' substituteInPlace lib/std/zig/system/NativeTargetInfo.zig \ - --replace "/usr/bin/env" "${coreutils}/bin/env" + --replace-fail "/usr/bin/env" "${coreutils}/bin/env" ''; doInstallCheck = true; installCheckPhase = '' runHook preInstallCheck - $out/bin/zig test --cache-dir "$TMPDIR/zig-test-cache" -I $src/test $src/test/behavior.zig + $out/bin/zig test -I $src/test $src/test/behavior.zig runHook postInstallCheck ''; diff --git a/pkgs/development/compilers/zulu/11.nix b/pkgs/development/compilers/zulu/11.nix index afe33634820c..ce4d15629b81 100644 --- a/pkgs/development/compilers/zulu/11.nix +++ b/pkgs/development/compilers/zulu/11.nix @@ -8,35 +8,35 @@ callPackage ./common.nix ({ # Note that the latest build may differ by platform dists = { x86_64-linux = { - zuluVersion = "11.70.15"; - jdkVersion = "11.0.22"; + zuluVersion = "11.74.15"; + jdkVersion = "11.0.24"; hash = - if enableJavaFX then "sha256-FxTHgng7/oDY3n3qy8j1ztbpBQeoGcEBJbEXqaE4Zr4=" - else "sha256-V41ZRrJtkle3joKhwoID5bvWkN5I4gFjmbEnTD7no8U="; + if enableJavaFX then "sha256-eP2BCD77uRmukd48+pDlIlhos9RjL9VYx8tpQdq2uNo=" + else "sha256-p6rA5pqZv2Sho+yW8IFJrAaaW72q766SLuOnRl/ZGLM="; }; aarch64-linux = { - zuluVersion = "11.70.15"; - jdkVersion = "11.0.22"; + zuluVersion = "11.74.15"; + jdkVersion = "11.0.24"; hash = - if enableJavaFX then throw "JavaFX is not available for aarch64-linux" - else "sha256-u6XWMXAArUhMMb6j3KFOhkIxpVYR1oYLF0Wde7/tI0k="; + if enableJavaFX then "sha256-nAUjPk9gktO0UJk7gAKygq+ztSJY5wk+EoG1LgJidJ8=" + else "sha256-T0c+YwfEZcA3iJmBriyzxBM2SECcczG25XVApIlgM+E="; }; x86_64-darwin = { - zuluVersion = "11.70.15"; - jdkVersion = "11.0.22"; + zuluVersion = "11.74.15"; + jdkVersion = "11.0.24"; hash = - if enableJavaFX then "sha256-JkJZwk+D28wHWqwUoLo7WW5ypwTrT5biSoP+70YI3eQ=" - else "sha256-ca/ttkPe2tbcm1ruguDgPsxKWbEdKcICsKCDXaup9N4="; + if enableJavaFX then "sha256-hanQw2FWbqsmGR1WixbM0BNWGeXmS2vt9tbaaEY7D1c=" + else "sha256-CH6pVui0PInHMt+AJOE0T2hrAmEcLFRJvmR4KZuanaw="; }; aarch64-darwin = { - zuluVersion = "11.70.15"; - jdkVersion = "11.0.22"; + zuluVersion = "11.74.15"; + jdkVersion = "11.0.24"; hash = - if enableJavaFX then "sha256-bAgH4lCxPvvFOeif5gI2aoLt1aC4EXPzb2YmiS9bQsU=" - else "sha256-PWQOF+P9djZarjAJaE3I0tuI1E4H/9584VN04BMzmvM="; + if enableJavaFX then "sha256-WbzpfPgoT3CTazKBnI1Fg+q+YQP6MwCWkon6VOeLZsA=" + else "sha256-+KxFgHbBDxN1O3NCAzqqBztxXveYAjrPFVuoFL/2dRQ="; }; }; } // builtins.removeAttrs args [ "callPackage" ]) diff --git a/pkgs/development/compilers/zulu/17.nix b/pkgs/development/compilers/zulu/17.nix index 74e00df88c68..3e94e824d55d 100644 --- a/pkgs/development/compilers/zulu/17.nix +++ b/pkgs/development/compilers/zulu/17.nix @@ -8,35 +8,35 @@ callPackage ./common.nix ({ # Note that the latest build may differ by platform dists = { x86_64-linux = { - zuluVersion = "17.48.15"; - jdkVersion = "17.0.10"; + zuluVersion = "17.52.17"; + jdkVersion = "17.0.12"; hash = - if enableJavaFX then "sha256-YvuD/n84+DARPm+38TxIUB727SIhASFo+WX9+PtJqyw=" - else "sha256-VyhNob2G1Tq/WCKT0g0Y//f+JD2hWgj6QU9idfvUj+I="; + if enableJavaFX then "sha256-qKpkvk7/IEnlOJoy7An0AVGUXWkWeuuiQzqKKE/+Ec4=" + else "sha256-JCRcjQzkkV2G5wsoi13psbTHjxCtuw5rqT4pEAOarRk="; }; aarch64-linux = { - zuluVersion = "17.48.15"; - jdkVersion = "17.0.10"; + zuluVersion = "17.52.17"; + jdkVersion = "17.0.12"; hash = - if enableJavaFX then throw "JavaFX is not available for aarch64-linux" - else "sha256-9OZl8ruaLvjdpg42fC3IM5mC/9lmshCppNfUuz/Sf8E="; + if enableJavaFX then "sha256-mpTM/43oyDsOnoZM8AW1Z7EFTznnPAnYoC+T6csc8Fw=" + else "sha256-uIz2D5WjqySy5lobuvWp3kFTGsBKhXzT56QgCGyXwSY="; }; x86_64-darwin = { - zuluVersion = "17.48.15"; - jdkVersion = "17.0.10"; + zuluVersion = "17.52.17"; + jdkVersion = "17.0.12"; hash = - if enableJavaFX then "sha256-VOIcFtjQiYsA4AiP1TCa0Q76Ew5FdeJCICwsYGU+Dnw=" - else "sha256-huSKGvOnrEUAiE2MJbdHWtF2saeLGaQkZllXzDo8o+g="; + if enableJavaFX then "sha256-jb1oPmRzlYUMONovdsHowlC44X3/PFZ8KilxSsR924U=" + else "sha256-8VlGFUhCn3NE2A42xi69KzZqu0RoGOV1ZYj8oaqCnTc="; }; aarch64-darwin = { - zuluVersion = "17.48.15"; - jdkVersion = "17.0.10"; + zuluVersion = "17.52.17"; + jdkVersion = "17.0.12"; hash = - if enableJavaFX then "sha256-fxBDhHMeL5IP4eRw9ykXrRRh7Nl9DnvDB1YLaQwFHLg=" - else "sha256-kuEiHSkb4WFtPB3m0A968LPZw7Wl0sKquhbzDF8vQS8="; + if enableJavaFX then "sha256-rEILTKTpX8DEoOGhlrhbxpcCyF2+QrjW92h0ox9ezp0=" + else "sha256-RZ3hNQQFE+spTT9lFHLjmkolSkpHDg2Hvro6xi7uNww="; }; }; } // builtins.removeAttrs args [ "callPackage" ]) diff --git a/pkgs/development/compilers/zulu/21.nix b/pkgs/development/compilers/zulu/21.nix index db2d3a397871..9e86e0bc748b 100644 --- a/pkgs/development/compilers/zulu/21.nix +++ b/pkgs/development/compilers/zulu/21.nix @@ -8,35 +8,35 @@ callPackage ./common.nix ({ # Note that the latest build may differ by platform dists = { x86_64-linux = { - zuluVersion = "21.32.17"; - jdkVersion = "21.0.2"; + zuluVersion = "21.36.17"; + jdkVersion = "21.0.4"; hash = - if enableJavaFX then "sha256-CEM2lMjyZLWS1tBcS1tBTUxBwAyzW3vrpRWFVVSFVGY=" - else "sha256-Wtcw++5rtJv/8QvznoQ5LnKNiRA9NHSn5d7w/RNLMAo="; + if enableJavaFX then "sha256-Q2bdM0/a2t5aBRCIzXBlhXamf8N7wdSUsK5VhaU9DcY=" + else "sha256-MY0MLtPIdvt+oslSlFzc997PtSZMpRrs4VnmNaxT1UQ="; }; aarch64-linux = { - zuluVersion = "21.32.17"; - jdkVersion = "21.0.2"; + zuluVersion = "21.36.17"; + jdkVersion = "21.0.4"; hash = - if enableJavaFX then throw "JavaFX is not available for aarch64-linux" - else "sha256-zn3xr11EqfRVYXxLiJFEP74+Syacd32Lgu1m93Fnz+A="; + if enableJavaFX then "sha256-BzNEcDrQo5yOWnEsJxw9JfXYdZGN6/wxnTDB0qC1i/0=" + else "sha256-2jwtfbM2cLz2ZTJEGut/M9zw0ifI2v5841zuZ/aCnEw="; }; x86_64-darwin = { - zuluVersion = "21.32.17"; - jdkVersion = "21.0.2"; + zuluVersion = "21.36.17"; + jdkVersion = "21.0.4"; hash = - if enableJavaFX then "sha256-CbEKa9Z/ItFqVM4BqsWXyRf5ejQZXPK8OqkULr9Cpqk=" - else "sha256-Otj+KI61fZdcJ4auRToDaqRuR6sqw9gVOOuuKlTTwCU="; + if enableJavaFX then "sha256-H3gM2XCCcuUxlAEzX6IO7Cp6NtH85PYHlH54k5XvNAc=" + else "sha256-XOdaaiR8cCm3TEynz29g/SstaM4eiVb7RI0phDFrX+o="; }; aarch64-darwin = { - zuluVersion = "21.32.17"; - jdkVersion = "21.0.2"; + zuluVersion = "21.36.17"; + jdkVersion = "21.0.4"; hash = - if enableJavaFX then "sha256-PK+cafgQsnK6acuQxun4IUiyYHQJsBfUawwfGV8OCfQ=" - else "sha256-6CYFFt6LYGYUIqcl8d8sNu+Ij2+zU5NWawDnMl2z0E4="; + if enableJavaFX then "sha256-lLAb8MABo95A5WcayBLNvsBSdVFptnO4EmhX2gjo6r8=" + else "sha256-vCdQ+BoWbMbpwwroqrpU8lOoyOydjPwEpVX+IHEse/8="; }; }; } // builtins.removeAttrs args [ "callPackage" ]) diff --git a/pkgs/development/compilers/zulu/22.nix b/pkgs/development/compilers/zulu/22.nix deleted file mode 100644 index 93891d6511c7..000000000000 --- a/pkgs/development/compilers/zulu/22.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ callPackage -, enableJavaFX ? false -, ... -}@args: - -callPackage ./common.nix ({ - # Details from https://www.azul.com/downloads/?version=java-22-lts&package=jdk - # Note that the latest build may differ by platform - dists = { - x86_64-linux = { - zuluVersion = "22.28.91"; - jdkVersion = "22.0.0"; - hash = - if enableJavaFX then "sha256-+qUrZ+GlspSP3RLTAbgEtFm0B0fzX/VD1WUl6mk2c/0=" - else "sha256-HvMiODsz+puu1xtxG2RRXH/PWCk91PGNZ7UcOd9orqQ="; - }; - - aarch64-linux = { - zuluVersion = "22.28.91"; - jdkVersion = "22.0.0"; - hash = - if enableJavaFX then throw "JavaFX is not available for aarch64-linux" - else "sha256-3RLNNEbMk5wAZsQmbQj/jpx9iTL/yr9N3wL4t7m6c+s="; - }; - - x86_64-darwin = { - zuluVersion = "22.28.91"; - jdkVersion = "22.0.0"; - hash = - if enableJavaFX then "sha256-QkFwbc2YFEWb5rddhH4a+zmtsrXxUBSuS8yg9qUb728=" - else "sha256-Y6PSNQjHRXukwux2sVbvpTIqT+Cg+KeG1C0iSEwyKZw="; - }; - - aarch64-darwin = { - zuluVersion = "22.28.91"; - jdkVersion = "22.0.0"; - hash = - if enableJavaFX then "sha256-256UP6MtUReQYqCKVt0ThN9BVDyKLAMXQTdpcDB9t24=" - else "sha256-o0VkWB4+PzBmNNWy+FZlyjTgukBTe6owfydb3YNfEE0="; - }; - }; -} // builtins.removeAttrs args [ "callPackage" ]) diff --git a/pkgs/development/compilers/zulu/23.nix b/pkgs/development/compilers/zulu/23.nix new file mode 100644 index 000000000000..3208944f981f --- /dev/null +++ b/pkgs/development/compilers/zulu/23.nix @@ -0,0 +1,42 @@ +{ callPackage +, enableJavaFX ? false +, ... +}@args: + +callPackage ./common.nix ({ + # Details from https://www.azul.com/downloads/?version=java-23-lts&package=jdk + # Note that the latest build may differ by platform + dists = { + x86_64-linux = { + zuluVersion = "23.28.85"; + jdkVersion = "23.0.0"; + hash = + if enableJavaFX then "sha256-HEQ0lxHsoyHG+ZWIlWsbkqMf/rauARafzWoiElRwekA=" + else "sha256-a1YPqBMaWkoruNFoSckLyx00LCOZNsowlSn2L3XCDJA="; + }; + + aarch64-linux = { + zuluVersion = "23.28.85"; + jdkVersion = "23.0.0"; + hash = + if enableJavaFX then throw "JavaFX is not available for aarch64-linux" + else "sha256-/i+ch7BMAwMQ1C4e3shp9BHuQ67vVXfmIK1YKs7L24M="; + }; + + x86_64-darwin = { + zuluVersion = "23.28.85"; + jdkVersion = "23.0.0"; + hash = + if enableJavaFX then "sha256-1/YmLWA/men8jMjnhkZVMf2irf6Tc/5x7UECxqKJcL4=" + else "sha256-rEr8M3KF9Z95gV8sHqi5lQD2RJjtssZx8Q8goy6danw="; + }; + + aarch64-darwin = { + zuluVersion = "23.28.85"; + jdkVersion = "23.0.0"; + hash = + if enableJavaFX then "sha256-TumPJoHmvklMlcpF4PFY/Arcdc5fkX5z0xeIuNFxluQ=" + else "sha256-gFvfJL0RQgIOATLTMdfa+fStUCrdHYC3rxy0j5eNVDc="; + }; + }; +} // builtins.removeAttrs args [ "callPackage" ]) diff --git a/pkgs/development/compilers/zulu/8.nix b/pkgs/development/compilers/zulu/8.nix index 05411149da68..175519bb8ab4 100644 --- a/pkgs/development/compilers/zulu/8.nix +++ b/pkgs/development/compilers/zulu/8.nix @@ -8,35 +8,35 @@ callPackage ./common.nix ({ # Note that the latest build may differ by platform dists = { x86_64-linux = { - zuluVersion = "8.76.0.17"; - jdkVersion = "8.0.402"; + zuluVersion = "8.80.0.17"; + jdkVersion = "8.0.422"; hash = - if enableJavaFX then "sha256-29aDAu8WVYQFSpMUFq4gG64BBz/ei/VDMg72xrpB9w4=" - else "sha256-34DI6O7T8iqDHsX63S3xk+BKDu8IHRRWNvtxpsnUJEk="; + if enableJavaFX then "sha256-Ls2sHCtP9htBIDwq5fNDRA3/bGN0bzaMp6nNkjU1zx8=" + else "sha256-YNxnNOFvTc0S3jt4F3UREi2196W7wSBmwieNJl7qamo="; }; aarch64-linux = { - zuluVersion = "8.74.0.17"; - jdkVersion = "8.0.392"; + zuluVersion = "8.80.0.17"; + jdkVersion = "8.0.422"; hash = - if enableJavaFX then throw "JavaFX is not available for aarch64-linux" - else "sha256-xESdKEmfkiE657X/xclwsJR5M+P72BpWErtAcYMcK0Y="; + if enableJavaFX then "sha256-aVBleFrj4OpUJh82rM8XQGy9SzGqjaeOBo20nAbtpJo=" + else "sha256-C5ebWtKAyKexOuEf4yM1y5tQZ2ICxREObwvMrcz5TXE="; }; x86_64-darwin = { - zuluVersion = "8.76.0.17"; - jdkVersion = "8.0.402"; + zuluVersion = "8.80.0.17"; + jdkVersion = "8.0.422"; hash = - if enableJavaFX then "sha256-oqFpKeWwfiXr3oX78LGvAyDGAAS2GON2gAm6fHGH7Ow=" - else "sha256-edZqDEsydQCDEwC1ZCDF/MjWVTnuQNWcKR2k/RjaIEI="; + if enableJavaFX then "sha256-7NB0OH194nZdpIGyX8gLxJzjJdi2UIxmGsGI5M0yqJ4=" + else "sha256-vyB1Fepnpwsi9KjwFjEF+YbiCgmqZcirZu0zmRAp8PA="; }; aarch64-darwin = { - zuluVersion = "8.76.0.17"; - jdkVersion = "8.0.402"; + zuluVersion = "8.80.0.17"; + jdkVersion = "8.0.422"; hash = - if enableJavaFX then "sha256-UCWRXCz4v381IWzWPDYzwJwbhsmZOYxKPLGJBQGjPmc=" - else "sha256-0VPlOuNB39gDnU+pK0DGTSUjTHTtYoxaRg3YD2LyLXg="; + if enableJavaFX then "sha256-JuQkY923tizx5HQo4WC3YCk75a4qHJYNRFKpZ8XES58=" + else "sha256-Q/hU2ICVwmJehrXmACm4/X48ULTqM6WSc55JDVgkBvM="; }; }; } // builtins.removeAttrs args [ "callPackage" ]) diff --git a/pkgs/development/compilers/zulu/common.nix b/pkgs/development/compilers/zulu/common.nix index c9056236ea6a..6b20c71c5438 100644 --- a/pkgs/development/compilers/zulu/common.nix +++ b/pkgs/development/compilers/zulu/common.nix @@ -16,7 +16,7 @@ # runtime dependencies , cups # runtime dependencies for GTK+ Look and Feel -, gtkSupport ? stdenv.isLinux +, gtkSupport ? stdenv.hostPlatform.isLinux , cairo , glib , gtk2 @@ -48,7 +48,7 @@ let gtk3 ] ++ lib.optionals (gtkSupport && lib.versionOlder dist.jdkVersion "17") [ gtk2 - ] ++ lib.optionals (stdenv.isLinux && enableJavaFX) [ + ] ++ lib.optionals (stdenv.hostPlatform.isLinux && enableJavaFX) [ ffmpeg.lib ]; @@ -75,12 +75,12 @@ let nativeBuildInputs = [ unzip - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook makeWrapper ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib # libasound.so wanted by lib/libjsound.so fontconfig freetype @@ -92,9 +92,9 @@ let xorg.libXtst xorg.libXxf86vm zlib - ] ++ lib.optionals (stdenv.isLinux && enableJavaFX) runtimeDependencies; + ] ++ lib.optionals (stdenv.hostPlatform.isLinux && enableJavaFX) runtimeDependencies; - autoPatchelfIgnoreMissingDeps = if (stdenv.isLinux && enableJavaFX) then [ + autoPatchelfIgnoreMissingDeps = if (stdenv.hostPlatform.isLinux && enableJavaFX) then [ "libavcodec*.so.*" "libavformat*.so.*" ] else null; @@ -126,7 +126,7 @@ let cat <<EOF >> $out/nix-support/setup-hook if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi EOF - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' # We cannot use -exec since wrapProgram is a function but not a command. # # jspawnhelper is executed from JVM, so it doesn't need to wrap it, and it @@ -138,14 +138,14 @@ let done '' # FIXME: move all of the above to installPhase. - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' find "$out" -name libfontmanager.so -exec \ patchelf --add-needed libfontconfig.so {} \; ''; # fixupPhase is moving the man to share/man which breaks it because it's a # relative symlink. - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' ln -nsf ../zulu-${lib.versions.major version}.jdk/Contents/Home/man $out/share/man ''; @@ -155,15 +155,16 @@ let home = jdk; }; - meta = (import ../openjdk/meta.nix lib version) // { + meta = { description = "Certified builds of OpenJDK"; longDescription = '' Certified builds of OpenJDK that can be deployed across multiple operating systems, containers, hypervisors and Cloud platforms. ''; homepage = "https://www.azul.com/products/zulu/"; + license = lib.licenses.gpl2Only; mainProgram = "java"; - maintainers = [ ]; + maintainers = [ ] ++ lib.teams.java.members; platforms = builtins.attrNames dists; sourceProvenance = with lib.sourceTypes; [ binaryBytecode binaryNativeCode ]; }; |