diff options
Diffstat (limited to 'pkgs/development/tools')
58 files changed, 1205 insertions, 122 deletions
diff --git a/pkgs/development/tools/analysis/nix-linter/default.nix b/pkgs/development/tools/analysis/nix-linter/default.nix index cd33742623709..aa60f5aa757d0 100644 --- a/pkgs/development/tools/analysis/nix-linter/default.nix +++ b/pkgs/development/tools/analysis/nix-linter/default.nix @@ -40,4 +40,8 @@ mkDerivation rec { homepage = "https://github.com/Synthetica9/nix-linter"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.marsam ]; + + # doesn't build on ghc92 + hydraPlatforms = lib.platforms.none; + broken = true; } diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index cd03eb0bab80a..72562d4935bdc 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -30,7 +30,7 @@ let # FIXME: Compare revision with - # https://github.com/radareorg/radare2/blob/master/libr/asm/arch/arm/v35arm64/Makefile#L26-L27 + # https://github.com/radareorg/radare2/blob/master/libr/arch/p/arm/v35arm64/Makefile#L26-L27 arm64 = fetchFromGitHub { owner = "radareorg"; repo = "vector35-arch-arm64"; @@ -47,21 +47,23 @@ let in stdenv.mkDerivation rec { pname = "radare2"; - version = "5.7.8"; + version = "5.8.0"; src = fetchFromGitHub { owner = "radare"; repo = "radare2"; rev = version; - hash = "sha256-+/9SeILuDCUaYwPhhN6z3vQFicd1Bh8N/yicZTybR5o="; + hash = "sha256-9bDwtMNru7tG0L735y+Vrcg7Htk/TV9SVZn7WP4Ap4c="; }; preBuild = '' - cp -r ${arm64} ../libr/asm/arch/arm/v35arm64/arch-arm64 - chmod -R +w ../libr/asm/arch/arm/v35arm64/arch-arm64 + pushd ../libr/arch/p/arm/v35arm64 + cp -r ${arm64} arch-arm64 + chmod -R +w arch-arm64 - cp -r ${armv7} ../libr/asm/arch/arm/v35arm64/arch-armv7 - chmod -R +w ../libr/asm/arch/arm/v35arm64/arch-armv7 + cp -r ${armv7} arch-armv7 + chmod -R +w arch-armv7 + popd ''; postFixup = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/tools/analysis/svlint/Cargo.lock b/pkgs/development/tools/analysis/svlint/Cargo.lock new file mode 100644 index 0000000000000..60378bcc0575f --- /dev/null +++ b/pkgs/development/tools/analysis/svlint/Cargo.lock @@ -0,0 +1,784 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "aho-corasick" +version = "0.7.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" +dependencies = [ + "memchr", +] + +[[package]] +name = "anyhow" +version = "1.0.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" + +[[package]] +name = "arrayvec" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" + +[[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.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitvec" +version = "0.19.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55f93d0ef3363c364d5976646a38f04cf67cfe1d4c8d160cdea02cab2c116b33" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + +[[package]] +name = "bytecount" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f861d9ce359f56dbcb6e0c2a1cb84e52ad732cadb57b806adeb3c7668caccbd8" + +[[package]] +name = "bytecount" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clap" +version = "3.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" +dependencies = [ + "atty", + "bitflags", + "clap_derive", + "clap_lex", + "indexmap", + "once_cell", + "strsim", + "termcolor", + "textwrap", +] + +[[package]] +name = "clap_derive" +version = "3.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +dependencies = [ + "os_str_bytes", +] + +[[package]] +name = "colored" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd" +dependencies = [ + "atty", + "lazy_static", + "winapi", +] + +[[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 = "enquote" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06c36cb11dbde389f4096111698d8b567c0720e3452fd5ac3e6b4e47e1939932" +dependencies = [ + "thiserror", +] + +[[package]] +name = "funty" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" + +[[package]] +name = "getrandom" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "heck" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "indexmap" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" +dependencies = [ + "autocfg", + "hashbrown", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lexical-core" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" +dependencies = [ + "arrayvec", + "bitflags", + "cfg-if", + "ryu", + "static_assertions", +] + +[[package]] +name = "libc" +version = "0.2.137" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" + +[[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 = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "nom" +version = "5.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" +dependencies = [ + "lexical-core", + "memchr", + "version_check", +] + +[[package]] +name = "nom" +version = "6.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2" +dependencies = [ + "bitvec", + "funty", + "lexical-core", + "memchr", + "version_check", +] + +[[package]] +name = "nom-greedyerror" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "133e5024c0b65c4235e3200a3b6e30f3875475f1e452525e1a421b7f2a997c52" +dependencies = [ + "nom 5.1.2", + "nom 6.1.2", + "nom_locate 1.0.0", + "nom_locate 2.1.0", + "nom_locate 3.0.2", +] + +[[package]] +name = "nom-packrat" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5c5a5a7eae83c3c9d53bdfd94e8bb1d700c6bb78f00d25af71263fc07cf477b" +dependencies = [ + "nom-packrat-macros", + "nom_locate 1.0.0", + "nom_locate 3.0.2", +] + +[[package]] +name = "nom-packrat-macros" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fccdfb4771d14a08918cd7b7352de2797ade66a2df9920cee13793e943c3d09" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "nom-recursive" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0de2967d4f9065b08596dcfa9be631abc4997951b9e0a93e2279b052370bacc" +dependencies = [ + "nom-recursive-macros", + "nom_locate 1.0.0", + "nom_locate 3.0.2", +] + +[[package]] +name = "nom-recursive-macros" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07744fc6b7423baf7198f9e1200305f27eafe7395289fa7462b63dacd4eac78d" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "nom-tracable" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "128b58b88f084359e18858edde832830041e0a561d23bb214e656e00972de316" +dependencies = [ + "nom 6.1.2", + "nom-tracable-macros", + "nom_locate 1.0.0", + "nom_locate 3.0.2", +] + +[[package]] +name = "nom-tracable-macros" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8416fc5553b00d217b0381929fbce7368935d609afdee46c844e09f962b379e6" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "nom_locate" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f932834fd8e391fc7710e2ba17e8f9f8645d846b55aa63207e17e110a1e1ce35" +dependencies = [ + "bytecount 0.3.2", + "memchr", + "nom 5.1.2", +] + +[[package]] +name = "nom_locate" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a67484adf5711f94f2f28b653bf231bff8e438be33bf5b0f35935a0db4f618a2" +dependencies = [ + "bytecount 0.6.3", + "memchr", + "nom 5.1.2", +] + +[[package]] +name = "nom_locate" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4689294073dda8a54e484212171efdcb6b12b1908fd70c3dc3eec15b8833b06d" +dependencies = [ + "bytecount 0.6.3", + "memchr", + "nom 6.1.2", +] + +[[package]] +name = "once_cell" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" + +[[package]] +name = "os_str_bytes" +version = "6.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3baf96e39c5359d2eb0dd6ccb42c62b91d9678aa68160d261b9e0ccbf9e9dea9" + +[[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.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "radium" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags", +] + +[[package]] +name = "redox_users" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +dependencies = [ + "getrandom", + "redox_syscall", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" + +[[package]] +name = "rustversion" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" + +[[package]] +name = "ryu" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "serde" +version = "1.0.147" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" + +[[package]] +name = "serde_derive" +version = "1.0.147" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_regex" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8136f1a4ea815d7eac4101cfd0b16dc0cb5e1fe1b8609dfd728058656b7badf" +dependencies = [ + "regex", + "serde", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "str-concat" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3468939e48401c4fe3cdf5e5cef50951c2808ed549d1467fde249f1fcb602634" + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "sv-filelist-parser" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d0f9e489371e30a263649576eb16c695084e37f7e6be2cb636422069a5208f8" +dependencies = [ + "regex", +] + +[[package]] +name = "sv-parser" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "172a5b3cb5516198bb3511c0f5b25c7f9911cd46189f4d07c8245d0488ad7c93" +dependencies = [ + "nom 6.1.2", + "nom-greedyerror", + "sv-parser-error", + "sv-parser-parser", + "sv-parser-pp", + "sv-parser-syntaxtree", +] + +[[package]] +name = "sv-parser-error" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31d940ac5717eab14042763f6c67ef2c9e0bcf381b726694eb92c32b96c21b9f" +dependencies = [ + "thiserror", +] + +[[package]] +name = "sv-parser-macros" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed5b1dbf2209da2f4aa7f623ad0e9a941844ec586b2c2ca9747a9a4de815065" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "sv-parser-parser" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44acd0cd81361b2be53349e5e612b08e58f8e4175d1a3484b05828da53135adf" +dependencies = [ + "nom 6.1.2", + "nom-greedyerror", + "nom-packrat", + "nom-recursive", + "nom-tracable", + "nom_locate 3.0.2", + "str-concat", + "sv-parser-macros", + "sv-parser-syntaxtree", +] + +[[package]] +name = "sv-parser-pp" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e7d2da3c2ace6950bc7d9d88f9bd5ddc37b85af9bd28f75eca511264c687953" +dependencies = [ + "nom 6.1.2", + "nom-greedyerror", + "sv-parser-error", + "sv-parser-parser", + "sv-parser-syntaxtree", +] + +[[package]] +name = "sv-parser-syntaxtree" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57964e3fb7332344b6d9e38919f4a417f9dc4ac44dcac15d1b6c3cd194b4bb61" +dependencies = [ + "regex", + "sv-parser-macros", + "walkdir", +] + +[[package]] +name = "svlint" +version = "0.6.0" +dependencies = [ + "anyhow", + "clap", + "colored", + "enquote", + "libloading", + "regex", + "serde", + "serde_derive", + "serde_regex", + "sv-filelist-parser", + "sv-parser", + "term", + "toml", + "walkdir", +] + +[[package]] +name = "syn" +version = "1.0.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d" +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 = "term" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" +dependencies = [ + "dirs-next", + "rustversion", + "winapi", +] + +[[package]] +name = "termcolor" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "textwrap" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" + +[[package]] +name = "thiserror" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "toml" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" +dependencies = [ + "serde", +] + +[[package]] +name = "unicode-ident" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "walkdir" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +dependencies = [ + "same-file", + "winapi", + "winapi-util", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "wyz" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" diff --git a/pkgs/development/tools/analysis/svlint/default.nix b/pkgs/development/tools/analysis/svlint/default.nix index ef4e31e9481f3..757eb56a3bf7d 100644 --- a/pkgs/development/tools/analysis/svlint/default.nix +++ b/pkgs/development/tools/analysis/svlint/default.nix @@ -5,16 +5,21 @@ rustPlatform.buildRustPackage rec { pname = "svlint"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "dalance"; repo = "svlint"; rev = "v${version}"; - sha256 = "sha256-BgkzbKRcZkot3qkwPqSE9QkH3A3HNDuLjpFzKsU+Wb0="; + sha256 = "sha256-dtfOSj0WnNyQLimXkSK+L8pWL/oc0nIugDyUmGaBP3w="; }; - cargoSha256 = "sha256-HeFh8H7IN3m4HiEH1QbCBROslzVCzYxGIaeyM4K7gcs="; + cargoLock.lockFile = ./Cargo.lock; + postPatch = '' + cp ${./Cargo.lock} Cargo.lock + ''; + + cargoSha256 = "sha256-A9cL5veliWDNp1RbhOzR1e2X7c7mTAnl1qMATaMhhT8="; meta = with lib; { description = "SystemVerilog linter"; diff --git a/pkgs/development/tools/azure-static-sites-client/default.nix b/pkgs/development/tools/azure-static-sites-client/default.nix new file mode 100644 index 0000000000000..60d1511472515 --- /dev/null +++ b/pkgs/development/tools/azure-static-sites-client/default.nix @@ -0,0 +1,97 @@ +{ lib +, stdenv +, fetchurl +, autoPatchelfHook +, curl +, icu70 +, libkrb5 +, lttng-ust +, openssl_1_1 +, zlib +, azure-static-sites-client + # "latest", "stable" or "backup" +, versionFlavor ? "stable" +}: +let + versions = lib.importJSON ./versions.json; + flavor = with lib; head (filter (x: x.version == versionFlavor) versions); + fetchBinary = runtimeId: fetchurl { + url = flavor.files.${runtimeId}.url; + sha256 = flavor.files.${runtimeId}.sha; + }; + sources = { + "x86_64-linux" = fetchBinary "linux-x64"; + "x86_64-darwin" = fetchBinary "macOS"; + }; +in +stdenv.mkDerivation { + pname = "StaticSitesClient-${versionFlavor}"; + version = flavor.buildId; + + src = sources.${stdenv.targetPlatform.system} or (throw "Unsupported platform"); + + nativeBuildInputs = [ + autoPatchelfHook + ]; + + buildInputs = [ + curl + icu70 + openssl_1_1 + libkrb5 + lttng-ust + stdenv.cc.cc.lib + zlib + ]; + + dontUnpack = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + install -m755 "$src" -D "$out/bin/StaticSitesClient" + + for icu_lib in 'icui18n' 'icuuc' 'icudata'; do + patchelf --add-needed "lib''${icu_lib}.so.${with lib; head (splitVersion (getVersion icu70.name))}" "$out/bin/StaticSitesClient" + done + + patchelf --add-needed 'libgssapi_krb5.so' \ + --add-needed 'liblttng-ust.so' \ + --add-needed 'libssl.so.1.1' \ + "$out/bin/StaticSitesClient" + + runHook postInstall + ''; + + # Stripping kills the binary + dontStrip = true; + + # Just make sure the binary executes sucessfully + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + $out/bin/StaticSitesClient version + + runHook postInstallCheck + ''; + + passthru = { + # Create tests for all flavors + tests = with lib; genAttrs (map (x: x.version) versions) (versionFlavor: + azure-static-sites-client.override { inherit versionFlavor; } + ); + updateScript = ./update.sh; + }; + + meta = with lib; { + description = "Azure static sites client"; + homepage = "https://github.com/Azure/static-web-apps-cli"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + mainProgram = "StaticSitesClient"; + maintainers = with maintainers; [ veehaitch ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/tools/azure-static-sites-client/update.sh b/pkgs/development/tools/azure-static-sites-client/update.sh new file mode 100755 index 0000000000000..156771e7f12bc --- /dev/null +++ b/pkgs/development/tools/azure-static-sites-client/update.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl + +set -euo pipefail + +dirname="$(dirname "$0")" + +curl -O --silent --output-dir "$dirname" 'https://swalocaldeploy.azureedge.net/downloads/versions.json' +echo "" >> "$dirname/versions.json" diff --git a/pkgs/development/tools/azure-static-sites-client/versions.json b/pkgs/development/tools/azure-static-sites-client/versions.json new file mode 100644 index 0000000000000..0cb5de0902691 --- /dev/null +++ b/pkgs/development/tools/azure-static-sites-client/versions.json @@ -0,0 +1,59 @@ +[ + { + "version": "latest", + "buildId": "1.0.021731", + "publishDate": "2022-12-14T02:22:20.0230853Z", + "files": { + "linux-x64": { + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.021731/linux/StaticSitesClient", + "sha": "d2f88cf8b855169534c7e330dd95385b993b1c0f83331306e685faa8468a82b5" + }, + "win-x64": { + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.021731/windows/StaticSitesClient.exe", + "sha": "525d13ebffd79ea9663a15a4bd2e6d49bca72d20aa44838aa4b83133943d450c" + }, + "osx-x64": { + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.021731/macOS/StaticSitesClient", + "sha": "5de3ac4b205d3871e7a8ff3b5869f2a57002277ac7fa6317032239d114e25ab8" + } + } + }, + { + "version": "stable", + "buildId": "1.0.021731", + "publishDate": "2022-12-14T02:22:20.0230853Z", + "files": { + "linux-x64": { + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.021731/linux/StaticSitesClient", + "sha": "d2f88cf8b855169534c7e330dd95385b993b1c0f83331306e685faa8468a82b5" + }, + "win-x64": { + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.021731/windows/StaticSitesClient.exe", + "sha": "525d13ebffd79ea9663a15a4bd2e6d49bca72d20aa44838aa4b83133943d450c" + }, + "osx-x64": { + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.021731/macOS/StaticSitesClient", + "sha": "5de3ac4b205d3871e7a8ff3b5869f2a57002277ac7fa6317032239d114e25ab8" + } + } + }, + { + "version": "backup", + "buildId": "1.0.021671", + "publishDate": "2022-12-08T00:34:47.6310685Z", + "files": { + "linux-x64": { + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.021671/linux/StaticSitesClient", + "sha": "306c2d24cbc6461cdf1fe29e9206ccb9d452ba3514ee9d67a1d7e0f8edbc036f" + }, + "win-x64": { + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.021671/windows/StaticSitesClient.exe", + "sha": "ee868ca5e73a6ad8758698c168bb01d07b66288d353813fefe41d441f82b9f1f" + }, + "osx-x64": { + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.021671/macOS/StaticSitesClient", + "sha": "5ef513530a45d4b8e135e272f7e7112e900fbb8c8137c19e645a694e71b98c74" + } + } + } +] diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index 56859969708e9..8a0ff951b9da3 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -94,7 +94,11 @@ let fi ''; }; - rebar3WithPlugins = { plugins ? [ ], globalPlugins ? [ ] }: + + # Alias rebar3 so we can use it as default parameter below + _rebar3 = rebar3; + + rebar3WithPlugins = { plugins ? [ ], globalPlugins ? [ ], rebar3 ? _rebar3 }: let pluginLibDirs = map (p: "${p}/lib/erlang/lib") (lib.unique (plugins ++ globalPlugins)); globalPluginNames = lib.unique (map (p: p.packageName) globalPlugins); diff --git a/pkgs/development/tools/build-managers/scala-cli/sources.json b/pkgs/development/tools/build-managers/scala-cli/sources.json index a32d824d6d9e4..f2d895598f642 100644 --- a/pkgs/development/tools/build-managers/scala-cli/sources.json +++ b/pkgs/development/tools/build-managers/scala-cli/sources.json @@ -1,17 +1,21 @@ { - "version": "0.1.18", + "version": "0.1.19", "assets": { "aarch64-darwin": { "asset": "scala-cli-aarch64-apple-darwin.gz", - "sha256": "10aygxlhm579yb4rzdissw3a41vq1sh78zlfpl2qphfc6zj7jlg2" + "sha256": "1n5x07n3g7r8cx22mv9prfq1gs9sjj41xdj615lbs4dbfjp8z66d" + }, + "aarch64-linux": { + "asset": "scala-cli-aarch64-pc-linux.gz", + "sha256": "02mwinm4ggpqr9j6c0ap1nsa4bgad5h3xgkplamwrzqa2kvqxx2i" }, "x86_64-darwin": { "asset": "scala-cli-x86_64-apple-darwin.gz", - "sha256": "1bm6wnnln1f7z5hgkdjqqhkwf7wljlgdw5m6f16k8y9nii1cad0y" + "sha256": "0cz5dd6f3j6czrbjiz9l6bf0ycfrba9h2wjpa6l80nn86yyr7i4r" }, "x86_64-linux": { "asset": "scala-cli-x86_64-pc-linux.gz", - "sha256": "1h8s8w1qi0y1psgaqpjwd206g39ljs7qyifng08dpb2a6f37hba8" + "sha256": "19fcj631gwg6cjx3q5rqywgdafw18bdjkan52jj2awh2vxpikgdm" } } } diff --git a/pkgs/development/tools/bundletool/default.nix b/pkgs/development/tools/bundletool/default.nix index 6e683e09391a8..6863ef9e0fd29 100644 --- a/pkgs/development/tools/bundletool/default.nix +++ b/pkgs/development/tools/bundletool/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "bundletool"; - version = "1.13.1"; + version = "1.13.2"; src = fetchurl { url = "https://github.com/google/bundletool/releases/download/${version}/bundletool-all-${version}.jar"; - sha256 = "sha256-owXj7FSR98IPuaWkUGpv4e6c4c6XIYFsxZZH0OWYcu8="; + sha256 = "sha256-sbX7IYFcU9gwKzHKC8xtmZKVE2XImeNT4RYOx+cSI2Y="; }; dontUnpack = true; diff --git a/pkgs/development/tools/checkmate/default.nix b/pkgs/development/tools/checkmate/default.nix index 3cefae1bfffcf..b14079c749dd5 100644 --- a/pkgs/development/tools/checkmate/default.nix +++ b/pkgs/development/tools/checkmate/default.nix @@ -5,22 +5,23 @@ buildGoModule rec { pname = "checkmate"; - version = "0.8.2"; + version = "0.8.4"; src = fetchFromGitHub { owner = "adedayo"; repo = pname; rev = "v${version}"; - sha256 = "sha256-v9xVJFX3YJQU9z9L7dhy0S1FvpWoDad36Lq3w4VW0xA="; + hash = "sha256-tgiZDTPIAYirPX6nGPEAt6BoYEC8uUJwT6zuHJqPF1w="; }; - vendorSha256 = "sha256-8/EGoY3+th34gAACDoEHgwhUFmyyKecnQP/WTe56iCQ="; + vendorHash = "sha256-eL1fLJwzVpU9NqaAl5R/fbaqI3AnEkl6EuPkMTuY86w="; subPackages = [ "." ]; meta = with lib; { description = "Pluggable code security analysis tool"; homepage = "https://github.com/adedayo/checkmate"; + changelog = "https://github.com/adedayo/checkmate/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix index 37b36ff3ed5b8..2a7111b352ecc 100644 --- a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.93.0"; + version = "0.94.4"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-exGOCBKPHuVBaFXd+/jbjAid7ZDodtZ/h/OWp/NBOhE="; + sha256 = "sha256-PnO9M3CQQnZotzCuE2rlGsoBzNO0PdsoMLlY3tNyEyk="; }; vendorSha256 = "sha256-gotc9M2UkRJtE4LZPCpqDTXQ/cnN4tk+3HG243tFoss="; diff --git a/pkgs/development/tools/database/clickhouse-backup/default.nix b/pkgs/development/tools/database/clickhouse-backup/default.nix index 4db8dbe263ffc..81c53082b7ec3 100644 --- a/pkgs/development/tools/database/clickhouse-backup/default.nix +++ b/pkgs/development/tools/database/clickhouse-backup/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "clickhouse-backup"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = "AlexAkulov"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Vc9zPERRF6AWSOGSiOe6n33Ioc3uOtHQEehfMhPkSFk="; + sha256 = "sha256-RaThNBTRBECSeSeJOQ2UsrkBHjSjrS91vIRF/4MGek4="; }; - vendorSha256 = "sha256-kbIztD0g+92gxxBYhWILudgFRFCshagmAUs8bY/Z8yg="; + vendorSha256 = "sha256-sSN+HAUC9rJc9XMTG8H+Zg7mzZSVxn6Z7dixJ10mOuM="; ldflags = [ "-X main.version=${version}" diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index 1a94a3791d624..3c87fe5d01487 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.90.0"; + version = "1.91.0"; vendorSha256 = null; @@ -31,7 +31,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "sha256-b6Tj1A2kF5dZ/dPSGAq9Bd0PB7zQ61RIKTKhFv422tw="; + sha256 = "sha256-hX9doUNxqkJujts9yYNvGSTq3nkaan1HqTHZBcO1hCs="; }; meta = with lib; { diff --git a/pkgs/development/tools/fq/default.nix b/pkgs/development/tools/fq/default.nix index 293e165082765..2145a3ab74c1d 100644 --- a/pkgs/development/tools/fq/default.nix +++ b/pkgs/development/tools/fq/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "fq"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "wader"; repo = "fq"; rev = "v${version}"; - sha256 = "sha256-ZUbeAZGHG7I4NwJZjI92isIMX8M675oI833v3uKZE7U="; + sha256 = "sha256-OAdKt5RgLVoTmccN50TUwUAU7VLiTU9hEnDAKxKBRzI="; }; - vendorSha256 = "sha256-GGbKoLj8CyfqB90QnOsomZBVd6KwJCTp/MeyKvRopSQ="; + vendorSha256 = "sha256-Y9wfeAX0jt3KrpRa5kJi8V8WN/hp4jTcPCbvy0RDGRk="; ldflags = [ "-s" diff --git a/pkgs/development/tools/go-swag/default.nix b/pkgs/development/tools/go-swag/default.nix index 49ffef19f779a..0417f8d567def 100644 --- a/pkgs/development/tools/go-swag/default.nix +++ b/pkgs/development/tools/go-swag/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-swag"; - version = "1.8.8"; + version = "1.8.9"; src = fetchFromGitHub { owner = "swaggo"; repo = "swag"; rev = "v${version}"; - sha256 = "sha256-xERuD15NEmBqosNAUmWEGqWVXc9jLA9HrbZrqmzhLFA="; + sha256 = "sha256-8UnDrWZ0gQlhPQLDqA5DLBBeHqQFlNxK7+y4qlUk/fI="; }; vendorSha256 = "sha256-iu4rSgB7Gu5n1Sgu0jU9QwdwvuZ5rAqysvKuBnJd2jQ="; diff --git a/pkgs/development/tools/gojq/default.nix b/pkgs/development/tools/gojq/default.nix index b70801d0228e9..177d838ff0932 100644 --- a/pkgs/development/tools/gojq/default.nix +++ b/pkgs/development/tools/gojq/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gojq"; - version = "0.12.10"; + version = "0.12.11"; src = fetchFromGitHub { owner = "itchyny"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JlxxfazVNJzQzG2p8L+5MoevSNNWf5mi14n3f/Q+MZU="; + sha256 = "sha256-xJx3ge+8cIGL1j5vnU4JhCcwmXIRhJ66PYnEG223Fbc="; }; vendorSha256 = "sha256-BnDtHqqU/kFJyeG1g4UZ51eSnUlbQ6eRKTFoz6kxl0s="; diff --git a/pkgs/development/tools/grpc-gateway/default.nix b/pkgs/development/tools/grpc-gateway/default.nix index 3870e87dcb453..54e6ccd471dcf 100644 --- a/pkgs/development/tools/grpc-gateway/default.nix +++ b/pkgs/development/tools/grpc-gateway/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "grpc-gateway"; - version = "2.14.0"; + version = "2.15.0"; src = fetchFromGitHub { owner = "grpc-ecosystem"; repo = "grpc-gateway"; rev = "v${version}"; - sha256 = "sha256-lnNdsDCpeSHtl2lC1IhUw11t3cnGF+37qSM7HDvKLls="; + sha256 = "sha256-NOcV3XrSFeb/LYzeZQ0M1l1l4TkC+fVqAXCDUTaMN3c="; }; - vendorSha256 = "sha256-dGdnDuRbwg8fU7uB5GaHEWa/zI3w06onqjturvooJQA="; + vendorSha256 = "sha256-zYKRWJ09SnE0Y9iahTyODas/04an8x9w+rsY0x4/NRM="; meta = with lib; { description = diff --git a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix index e7ba49fa68dc0..48a473be169b3 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix @@ -1,6 +1,6 @@ { lib , stdenv -, supportedGhcVersions ? [ "90" ] +, supportedGhcVersions ? [ "92" ] , dynamic ? true , haskellPackages , haskell @@ -40,23 +40,21 @@ let "ln -s ${ tunedHls (getPackages version) }/bin/haskell-language-server $out/bin/${x}") (targets version); - pkg = tunedHls haskellPackages; -in stdenv.mkDerivation { +in assert supportedGhcVersions != []; stdenv.mkDerivation { pname = "haskell-language-server"; version = haskellPackages.haskell-language-server.version; buildCommand = '' mkdir -p $out/bin - ln -s ${pkg}/bin/haskell-language-server $out/bin/haskell-language-server - ln -s ${pkg}/bin/haskell-language-server-wrapper $out/bin/haskell-language-server-wrapper + ln -s ${tunedHls (getPackages (builtins.head supportedGhcVersions))}/bin/haskell-language-server-wrapper $out/bin/haskell-language-server-wrapper ${concatMapStringsSep "\n" makeSymlinks supportedGhcVersions} ''; meta = haskellPackages.haskell-language-server.meta // { maintainers = [ lib.maintainers.maralorn ]; longDescription = '' - This package provides haskell-language-server, haskell-language-server-wrapper, ${ + This package provides the executables ${ concatMapStringsSep ", " (x: concatStringsSep ", " (targets x)) supportedGhcVersions - }. + } and haskell-language-server-wrapper. You can choose for which ghc versions to install hls with pkgs.haskell-language-server.override { supportedGhcVersions = [ "90" "92" ]; }. ''; }; diff --git a/pkgs/development/tools/haskell/vaultenv/default.nix b/pkgs/development/tools/haskell/vaultenv/default.nix index 4f51c8238ce05..b0810d33b50aa 100644 --- a/pkgs/development/tools/haskell/vaultenv/default.nix +++ b/pkgs/development/tools/haskell/vaultenv/default.nix @@ -96,4 +96,8 @@ mkDerivation rec { description = "Runs processes with secrets from HashiCorp Vault"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ lnl7 manveru ]; + + # Does not compile on ghc92 + hydraPlatforms = lib.platforms.none; + broken = true; } diff --git a/pkgs/development/tools/jql/default.nix b/pkgs/development/tools/jql/default.nix index d7d65a4eda2c4..071f944a82f3b 100644 --- a/pkgs/development/tools/jql/default.nix +++ b/pkgs/development/tools/jql/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "jql"; - version = "5.1.3"; + version = "5.1.4"; src = fetchFromGitHub { owner = "yamafaktory"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xCtTa2CLLhdflcjjqxiOgRRuxlIHhcHo8gsdLMVuxvQ="; + sha256 = "sha256-D6Y3I5UPChdLlTZ49iToQpE8CrHh3VjWV6PI7fRhU/A="; }; - cargoSha256 = "sha256-yB9PemmX69bDkLTasroX3tTNzd13o7mu/fdSptsEMgM="; + cargoSha256 = "sha256-GqfQD8NK/HYODEGUmfo+MMVsWg2CabZFLfBTp4UXV2Q="; meta = with lib; { description = "A JSON Query Language CLI tool built with Rust"; diff --git a/pkgs/development/tools/karate/default.nix b/pkgs/development/tools/karate/default.nix index cda508c9df362..a374a4590fa57 100644 --- a/pkgs/development/tools/karate/default.nix +++ b/pkgs/development/tools/karate/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "karate"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { url = "https://github.com/karatelabs/karate/releases/download/v${version}/karate-${version}.jar"; - sha256 = "sha256-uQHE8Mf70t7gtALdxO1tltUkwEKx0emWWliZEzwGW+Q="; + sha256 = "sha256-d0MIiMxENBPFM0Kv8vhtn/je1i650Z7+6PoV6ZZCsFY="; }; dontUnpack = true; diff --git a/pkgs/development/tools/ansible-language-server/default.nix b/pkgs/development/tools/language-servers/ansible-language-server/default.nix index a1547675dc083..a1547675dc083 100644 --- a/pkgs/development/tools/ansible-language-server/default.nix +++ b/pkgs/development/tools/language-servers/ansible-language-server/default.nix diff --git a/pkgs/development/tools/beancount-language-server/default.nix b/pkgs/development/tools/language-servers/beancount-language-server/default.nix index b415906eead76..b415906eead76 100644 --- a/pkgs/development/tools/beancount-language-server/default.nix +++ b/pkgs/development/tools/language-servers/beancount-language-server/default.nix diff --git a/pkgs/development/tools/buf-language-server/default.nix b/pkgs/development/tools/language-servers/buf-language-server/default.nix index 88da6eb944827..88da6eb944827 100644 --- a/pkgs/development/tools/buf-language-server/default.nix +++ b/pkgs/development/tools/language-servers/buf-language-server/default.nix diff --git a/pkgs/development/tools/misc/ccls/default.nix b/pkgs/development/tools/language-servers/ccls/default.nix index a401fc47eac9e..a401fc47eac9e 100644 --- a/pkgs/development/tools/misc/ccls/default.nix +++ b/pkgs/development/tools/language-servers/ccls/default.nix diff --git a/pkgs/development/tools/misc/ccls/wrapper b/pkgs/development/tools/language-servers/ccls/wrapper index 294b60893a3f8..294b60893a3f8 100644 --- a/pkgs/development/tools/misc/ccls/wrapper +++ b/pkgs/development/tools/language-servers/ccls/wrapper diff --git a/pkgs/development/tools/language-servers/fortls/default.nix b/pkgs/development/tools/language-servers/fortls/default.nix new file mode 100644 index 0000000000000..9aed276a63fa5 --- /dev/null +++ b/pkgs/development/tools/language-servers/fortls/default.nix @@ -0,0 +1,35 @@ +{ buildPythonApplication +, lib +, fetchFromGitHub +, setuptools-scm +, json5 +, packaging +}: + +buildPythonApplication rec { + pname = "fortls"; + version = "2.13.0"; + + src = fetchFromGitHub { + owner = "fortran-lang"; + repo = pname; + rev = "v${version}"; + hash = "sha256-kFk2Dlnb0FXM3Ysvsy+g2AAMgpWmwzxuyJPovDm/FJU="; + }; + + nativeBuildInputs = [ setuptools-scm ]; + + propagatedBuildInputs = [ json5 packaging ]; + + preBuild = "export SETUPTOOLS_SCM_PRETEND_VERSION=${version}"; + + doCheck = true; + checkPhase = "$out/bin/fortls --help 1>/dev/null"; + + meta = with lib; { + description = "Fortran Language Server "; + homepage = "https://github.com/fortran-lang/fortls"; + license = [ licenses.mit ]; + maintainers = [ maintainers.sheepforce ]; + }; +} diff --git a/pkgs/development/tools/fortran-language-server/default.nix b/pkgs/development/tools/language-servers/fortran-language-server/default.nix index 2c606ab715b51..2c606ab715b51 100644 --- a/pkgs/development/tools/fortran-language-server/default.nix +++ b/pkgs/development/tools/language-servers/fortran-language-server/default.nix diff --git a/pkgs/development/tools/gopls/default.nix b/pkgs/development/tools/language-servers/gopls/default.nix index ca0a0b5638fe9..ca0a0b5638fe9 100644 --- a/pkgs/development/tools/gopls/default.nix +++ b/pkgs/development/tools/language-servers/gopls/default.nix diff --git a/pkgs/development/tools/jdt-language-server/default.nix b/pkgs/development/tools/language-servers/jdt-language-server/default.nix index 1af69700152d2..1af69700152d2 100644 --- a/pkgs/development/tools/jdt-language-server/default.nix +++ b/pkgs/development/tools/language-servers/jdt-language-server/default.nix diff --git a/pkgs/development/tools/jsonnet-language-server/default.nix b/pkgs/development/tools/language-servers/jsonnet-language-server/default.nix index f35900ec41ad5..f35900ec41ad5 100644 --- a/pkgs/development/tools/jsonnet-language-server/default.nix +++ b/pkgs/development/tools/language-servers/jsonnet-language-server/default.nix diff --git a/pkgs/development/tools/kotlin-language-server/default.nix b/pkgs/development/tools/language-servers/kotlin-language-server/default.nix index b3b1085273d10..b3b1085273d10 100644 --- a/pkgs/development/tools/kotlin-language-server/default.nix +++ b/pkgs/development/tools/language-servers/kotlin-language-server/default.nix diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/language-servers/metals/default.nix index 5b275f82346b8..5b275f82346b8 100644 --- a/pkgs/development/tools/metals/default.nix +++ b/pkgs/development/tools/language-servers/metals/default.nix diff --git a/pkgs/development/tools/millet/default.nix b/pkgs/development/tools/language-servers/millet/default.nix index ccc895b895694..ccc895b895694 100644 --- a/pkgs/development/tools/millet/default.nix +++ b/pkgs/development/tools/language-servers/millet/default.nix diff --git a/pkgs/development/tools/nil/default.nix b/pkgs/development/tools/language-servers/nil/default.nix index de87838105bfa..de87838105bfa 100644 --- a/pkgs/development/tools/nil/default.nix +++ b/pkgs/development/tools/language-servers/nil/default.nix diff --git a/pkgs/development/tools/rnix-lsp/default.nix b/pkgs/development/tools/language-servers/rnix-lsp/default.nix index a587f87b3da74..a587f87b3da74 100644 --- a/pkgs/development/tools/rnix-lsp/default.nix +++ b/pkgs/development/tools/language-servers/rnix-lsp/default.nix diff --git a/pkgs/development/tools/sumneko-lua-language-server/default.nix b/pkgs/development/tools/language-servers/sumneko-lua-language-server/default.nix index bd9e704eef329..bd9e704eef329 100644 --- a/pkgs/development/tools/sumneko-lua-language-server/default.nix +++ b/pkgs/development/tools/language-servers/sumneko-lua-language-server/default.nix diff --git a/pkgs/development/tools/misc/svls/default.nix b/pkgs/development/tools/language-servers/svls/default.nix index 5b5b87b0392f6..5b5b87b0392f6 100644 --- a/pkgs/development/tools/misc/svls/default.nix +++ b/pkgs/development/tools/language-servers/svls/default.nix diff --git a/pkgs/development/tools/vala-language-server/default.nix b/pkgs/development/tools/language-servers/vala-language-server/default.nix index 52e33fee6b608..52e33fee6b608 100644 --- a/pkgs/development/tools/vala-language-server/default.nix +++ b/pkgs/development/tools/language-servers/vala-language-server/default.nix diff --git a/pkgs/development/tools/verible/default.nix b/pkgs/development/tools/language-servers/verible/default.nix index d39b91180f98a..d39b91180f98a 100644 --- a/pkgs/development/tools/verible/default.nix +++ b/pkgs/development/tools/language-servers/verible/default.nix diff --git a/pkgs/development/tools/verible/remove-unused-deps.patch b/pkgs/development/tools/language-servers/verible/remove-unused-deps.patch index 19d20309c106b..19d20309c106b 100644 --- a/pkgs/development/tools/verible/remove-unused-deps.patch +++ b/pkgs/development/tools/language-servers/verible/remove-unused-deps.patch diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index c4e0a47257ebb..29be3fe3edad8 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.22770"; + version = "0.1.22924"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3IQSI2cG+wEH7IgV8nEWvQRdfsSap8wQCniMWL/khOg="; + sha256 = "sha256-zfkvSfwjh3HUE0aKvBLQuNnT+GBWCOWM+mwrAdZUJ9U="; }; - vendorSha256 = "sha256-tTG2i6ZEck0arKfCiFK7pGg9SE4n7FrF16US67Wj1gY="; + vendorSha256 = "sha256-qnn55C9ZK80gd/ZOtPvAGNJs0d96KqwruU4bZD6TQzY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/misc/cvise/default.nix b/pkgs/development/tools/misc/cvise/default.nix index ae0846f479cad..3dc84ad5991d1 100644 --- a/pkgs/development/tools/misc/cvise/default.nix +++ b/pkgs/development/tools/misc/cvise/default.nix @@ -16,14 +16,14 @@ buildPythonApplication rec { pname = "cvise"; - version = "2.6.0"; + version = "2.7.0"; format = "other"; src = fetchFromGitHub { owner = "marxin"; repo = "cvise"; rev = "refs/tags/v${version}"; - sha256 = "sha256-yREdWrGiH8Bb2bIxvlg4okGbkIM5XqC039Fj0rrsJos="; + sha256 = "sha256-j4s1xH0vO+/NNafQf1Jei7fgebSQ53WJKA+kYxuG2zQ="; }; patches = [ diff --git a/pkgs/development/tools/misc/highlight-assertions/default.nix b/pkgs/development/tools/misc/highlight-assertions/default.nix new file mode 100644 index 0000000000000..8d2aabe4bf5c6 --- /dev/null +++ b/pkgs/development/tools/misc/highlight-assertions/default.nix @@ -0,0 +1,25 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "highlight-assertions"; + version = "unstable-2022-11-24"; + + src = fetchFromGitHub { + owner = "thehamsta"; + repo = pname; + rev = "c738a51513285ded4fc16d68afcdb77761543f92"; + sha256 = "sha256-vYXr0xFwRUwSEP++834A/4M1QB14Wx+qWwB9PUtn3uA="; + }; + + cargoSha256 = "sha256-sezjd7tmVVDoRsrsTK2zKjHmrBcAQDHyHd/dR1q1za0="; + + # requires nightly features + RUSTC_BOOTSTRAP = 1; + + meta = with lib; { + description = "A tool for unit testing tree sitter highlights for nvim-treesitter"; + homepage = "https://github.com/thehamsta/highlight-assertions"; + license = licenses.asl20; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/development/tools/misc/hydra/unstable.nix b/pkgs/development/tools/misc/hydra/unstable.nix index 3afc807b07470..17ed1328d0bc7 100644 --- a/pkgs/development/tools/misc/hydra/unstable.nix +++ b/pkgs/development/tools/misc/hydra/unstable.nix @@ -126,35 +126,34 @@ let in stdenv.mkDerivation rec { pname = "hydra"; - version = "2022-11-24"; + version = "unstable-2022-12-05"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "14d4624dc20956ec9ff54882e70c5c0bc377921a"; - sha256 = "sha256-xY3CDFjLG3po2tdaTZToqZmLCQnSwsUqAn8sIXFrybw="; + rev = "d1fac69c213002721971cd983e2576b784677d40"; + sha256 = "sha256-HVsp+BPjEDS1lR7sjplWNrNljHvYcaUiaAn8gGNAMxU="; }; - buildInputs = - [ - libpqxx - top-git - mercurial - darcs - subversion - breezy - openssl - bzip2 - libxslt - nix - perlDeps - perl - pixz - boost - postgresql - nlohmann_json - prometheus-cpp - ]; + buildInputs = [ + libpqxx + top-git + mercurial + darcs + subversion + breezy + openssl + bzip2 + libxslt + nix + perlDeps + perl + pixz + boost + postgresql + nlohmann_json + prometheus-cpp + ]; hydraPath = lib.makeBinPath ( [ diff --git a/pkgs/development/tools/ocaml/omake/default.nix b/pkgs/development/tools/ocaml/omake/default.nix index bcfd86a2d4dec..f6c7955c68633 100644 --- a/pkgs/development/tools/ocaml/omake/default.nix +++ b/pkgs/development/tools/ocaml/omake/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "omake"; - version = "0.10.3"; + version = "0.10.5"; src = fetchurl { url = "http://download.camlcity.org/download/${pname}-${version}.tar.gz"; - sha256 = "07bdg1h5i7qnlv9xq81ad5hfypl10hxm771h4rjyl5cn8plhfcgz"; + sha256 = "sha256-VOFq2KLBbmZCRgHzfpD7p0iyF8yU1tTbyvTiOcpm98Q="; }; buildInputs = [ ocaml ncurses ]; diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/development/tools/open-policy-agent/default.nix index fcf749a988d3f..f7f0eca56cadf 100644 --- a/pkgs/development/tools/open-policy-agent/default.nix +++ b/pkgs/development/tools/open-policy-agent/default.nix @@ -11,13 +11,13 @@ assert enableWasmEval && stdenv.isDarwin -> builtins.throw "building with wasm o buildGoModule rec { pname = "open-policy-agent"; - version = "0.47.3"; + version = "0.47.4"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; rev = "v${version}"; - sha256 = "sha256-c82v/4+HdBLNsJM1kO6A6rfywU4J7a3h5LW/T731vxw="; + sha256 = "sha256-EHDSil077g/K8XCWQ9Pry/oyh0Bs3ckS/5Co1z/+Yes="; }; vendorSha256 = null; diff --git a/pkgs/development/tools/purescript/spago/default.nix b/pkgs/development/tools/purescript/spago/default.nix index 51516ed5b2564..8006147e2dd1d 100644 --- a/pkgs/development/tools/purescript/spago/default.nix +++ b/pkgs/development/tools/purescript/spago/default.nix @@ -1,5 +1,4 @@ { haskell -, haskellPackages , lib # The following are only needed for the passthru.tests: @@ -12,14 +11,16 @@ let spago = - haskell.lib.compose.justStaticExecutables - (haskell.lib.compose.overrideCabal (oldAttrs: { - maintainers = (oldAttrs.maintainers or []) ++ [ - lib.maintainers.cdepillabout - ]; - changelog = - "https://github.com/purescript/spago/releases/tag/${oldAttrs.version}"; - }) haskellPackages.spago); + lib.pipe + haskell.packages.ghc90.spago + [ haskell.lib.compose.justStaticExecutables + (haskell.lib.compose.overrideCabal (oldAttrs: { + maintainers = (oldAttrs.maintainers or []) ++ [ lib.maintainers.cdepillabout ]; + changelog = "https://github.com/purescript/spago/releases/tag/${oldAttrs.version}"; + })) + haskell.lib.compose.unmarkBroken + haskell.lib.compose.doDistribute + ]; in spago.overrideAttrs (oldAttrs: { @@ -58,4 +59,3 @@ spago.overrideAttrs (oldAttrs: { ''; }; }) - diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix index 967c5541991c2..6909c59a92b39 100644 --- a/pkgs/development/tools/react-native-debugger/default.nix +++ b/pkgs/development/tools/react-native-debugger/default.nix @@ -1,5 +1,31 @@ -{ lib, stdenv, fetchurl, unzip, cairo, xorg, gdk-pixbuf, fontconfig, pango, gnome, atk, at-spi2-atk, at-spi2-core -, gtk3, glib, freetype, dbus, nss, nspr, alsa-lib, cups, expat, udev, makeDesktopItem +{ lib +, stdenv +, fetchurl +, unzip +, cairo +, xorg +, gdk-pixbuf +, fontconfig +, pango +, gnome +, atk +, at-spi2-atk +, at-spi2-core +, gtk3 +, glib +, freetype +, dbus +, nss +, nspr +, alsa-lib +, cups +, expat +, udev +, makeDesktopItem +, libdrm +, libxkbcommon +, mesa +, makeWrapper }: let @@ -22,6 +48,9 @@ let udev at-spi2-atk at-spi2-core + libdrm + libxkbcommon + mesa xorg.libX11 xorg.libXcursor @@ -36,7 +65,8 @@ let xorg.libXrender xorg.libXScrnSaver ]; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "react-native-debugger"; version = "0.13.0"; src = fetchurl { @@ -44,7 +74,7 @@ in stdenv.mkDerivation rec { sha256 = "sha256-/uVXMVrVS7n4/mqz6IlKkk63hy67fn9KRjZ1wP5MHB0="; }; - nativeBuildInputs = [ unzip ]; + nativeBuildInputs = [ makeWrapper unzip ]; buildCommand = '' shopt -s extglob mkdir -p $out @@ -59,6 +89,9 @@ in stdenv.mkDerivation rec { --set-rpath ${rpath}:$out/lib \ $out/share/react-native-debugger + wrapProgram $out/share/react-native-debugger \ + --add-flags --no-sandbox + ln -s $out/share/react-native-debugger $out/bin/react-native-debugger install -Dm644 "${desktopItem}/share/applications/"* \ diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 4930b87e9458a..4da5922a46536 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.189"; + version = "0.0.193"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KyYQD9Ieg15ZT5JN4EGRusYqBkANw23ao2Of7A9tFE0="; + sha256 = "sha256-OsK5RUaUTuIvB5DZAbzazbeCqHTZbA2v+xIZHWsls8c="; }; - cargoSha256 = "sha256-v++DabAqhcvVhKnbVtsiX8empbkDp7oTfUdYTNLpYO8="; + cargoSha256 = "sha256-GyINYYNcYuTRPrM9W0/09xqFxe5CezBIsprUiEgF2MA="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/pkgs/development/tools/rust/cargo-edit/default.nix b/pkgs/development/tools/rust/cargo-edit/default.nix index 11886b06d257f..f5ccafc4815de 100644 --- a/pkgs/development/tools/rust/cargo-edit/default.nix +++ b/pkgs/development/tools/rust/cargo-edit/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-edit"; - version = "0.11.6"; + version = "0.11.7"; src = fetchFromGitHub { owner = "killercup"; repo = pname; rev = "v${version}"; - hash = "sha256-EGClr2HQ11bX6WTvu9ZxPo4hA0Q5Sl9t0Gw8/SltxDI="; + hash = "sha256-u0t/Zh427ZWN1wJ1LISEWa/2r0gAnpWUf8C8eLGA7wc="; }; - cargoSha256 = "sha256-Ph6W2RyNjVfnkon4YyAi4VvQWt/McKelUzlRD15Yysk="; + cargoSha256 = "sha256-hQvxcS3DXY4SZiEKQSST5GQ40BMNDKSkwi3AqQstJvc="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix index 07fb95f8729cd..d087f0b856cb4 100644 --- a/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/pkgs/development/tools/rust/cargo-expand/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "1.0.35"; + version = "1.0.36"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "sha256-hJb4FLL3+AMNLL05eQc7Mkhp0KEGxmHg8/ETDoZiLV4="; + sha256 = "sha256-8h20Cnu72ychSdtKlAz6US0wXMIcn1ZUWMgF6a0K4uI="; }; - cargoSha256 = "sha256-wKVlmO2/ugAb7vUSIGMz0WGnjEVEsm459DV9FaM28Mk="; + cargoSha256 = "sha256-xIVoEIyp8NygfNu/aola1pM6KokjrPQ5v55eBc7zPZc="; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/pkgs/development/tools/rust/cargo-hack/default.nix b/pkgs/development/tools/rust/cargo-hack/default.nix index e17d16c4b5520..85015e713d521 100644 --- a/pkgs/development/tools/rust/cargo-hack/default.nix +++ b/pkgs/development/tools/rust/cargo-hack/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-hack"; - version = "0.5.24"; + version = "0.5.25"; src = fetchCrate { inherit pname version; - sha256 = "sha256-brzefn9Nfb4+OnO0gCH5mPbXDdqaFSoqB6phFPwQXoY="; + sha256 = "sha256-1X2/C9JNTuRWY9nke3c7S1x5HuomDs0Em+v0P1HU4aQ="; }; - cargoSha256 = "sha256-RPQgZoIPFxZGP3Bpwp/VdTYPi5+IdfY3Zy+rYnYev3g="; + cargoSha256 = "sha256-Ylo0HeIlXEJg6g93u4QMGTbzBtU2EpHW5BWIBDCX+EU="; # some necessary files are absent in the crate version doCheck = false; diff --git a/pkgs/development/tools/rust/cargo-mommy/default.nix b/pkgs/development/tools/rust/cargo-mommy/default.nix new file mode 100644 index 0000000000000..b05282f4f779c --- /dev/null +++ b/pkgs/development/tools/rust/cargo-mommy/default.nix @@ -0,0 +1,20 @@ +{ lib, rustPlatform, fetchCrate }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-mommy"; + version = "0.1.1"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-p1SAYUQu1HpYJ6TbLJ3lfA9VlKHvB7z5yiFXmTQOCXA="; + }; + + cargoSha256 = "sha256-5RidY+6EF23UNzz1suSdA4LL59FalipaJ+ISSsmiCXM="; + + meta = with lib; { + description = "Cargo wrapper that encourages you after running commands"; + homepage = "https://github.com/Gankra/cargo-mommy"; + license = with licenses; [ mit asl20 ]; + maintainers = with maintainers; [ GoldsteinE ]; + }; +} diff --git a/pkgs/development/tools/rust/cargo-semver-checks/default.nix b/pkgs/development/tools/rust/cargo-semver-checks/default.nix index 19c487368e785..ab86d41d7c53b 100644 --- a/pkgs/development/tools/rust/cargo-semver-checks/default.nix +++ b/pkgs/development/tools/rust/cargo-semver-checks/default.nix @@ -5,38 +5,38 @@ , libgit2 , openssl , stdenv -, Security +, darwin }: rustPlatform.buildRustPackage rec { pname = "cargo-semver-checks"; - version = "0.12.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "obi1kenobi"; - repo = "cargo-semver-check"; + repo = pname; rev = "v${version}"; - sha256 = "sha256-gB8W/u/Yb/rMMB+654N3Mj4QbTMWGK6cgQKM0lld/10="; + sha256 = "sha256-upGVWCK3gEPH6BZ7W410AnQPIWOCeD4sawQqPLRowfw="; }; - cargoSha256 = "sha256-ML4cTNtCvaLFkt1QdA34QvAGhrFTO90xw7fsUD2weqQ="; + cargoSha256 = "sha256-PYZe7OO/cevictnWGc+NHVpJXctU2XyejF8jPjSNp3M="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libgit2 openssl ] ++ lib.optionals stdenv.isDarwin [ - Security + darwin.apple_sdk.frameworks.Security ]; checkFlags = [ # requires nightly version of cargo-rustdoc - "--skip=adapter::tests" + "--skip=dump::tests" "--skip=query::tests" ]; meta = with lib; { description = "A tool to scan your Rust crate for semver violations"; - homepage = "https://github.com/obi1kenobi/cargo-semver-check"; - license = licenses.asl20; + homepage = "https://github.com/obi1kenobi/cargo-semver-checks"; + license = with licenses; [ mit /* or */ asl20 ]; maintainers = with maintainers; [ figsoda matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-tauri/default.nix b/pkgs/development/tools/rust/cargo-tauri/default.nix index 45e4a2b2e7848..9c863e09efdd9 100644 --- a/pkgs/development/tools/rust/cargo-tauri/default.nix +++ b/pkgs/development/tools/rust/cargo-tauri/default.nix @@ -11,20 +11,20 @@ rustPlatform.buildRustPackage rec { pname = "tauri"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { owner = "tauri-apps"; repo = pname; rev = "tauri-v${version}"; - sha256 = "sha256-RBaIF9vWQwQAdqN3p3JS1WO6u3IMxi8CuCkrwQbd2gI="; + sha256 = "sha256-4v0ZlFBVBB+0xWbTRncVwELaZWLKyCmIceTfseXvS8s="; }; # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202 sourceRoot = "source/tooling/cli"; - cargoSha256 = "sha256-8sdCVOtPwIjW2x1yh1B0oybVi2kz3LQoK3OcaJvUsxQ="; + cargoSha256 = "sha256-Hp6+T2CN0CsXaGnCVqAYaOjZNDkmI+MXDfHIgbU1S0g="; buildInputs = [ glibc libsoup cairo gtk3 webkitgtk ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 0cd55e1f820b1..32f29c5ef016f 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -12,14 +12,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2022-12-12"; - cargoSha256 = "sha256-YTakd4qRwXUoxzFWXCj8l9nA3wjJtfVmKbhX9XlaEbE="; + version = "2022-12-19"; + cargoSha256 = "sha256-/Ep/YELl1eA6HzZ/a7pi2a1XSlYB36VZJJPLZKnx4J0="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-QLKX/JhK+jRE61teK+Cr4f2KuAzgYuawStxOgJymqRg="; + sha256 = "sha256-sGZNmkUwHt7FmuwDyYjnTAyo8ZMkH9iOdCOyU+2Vcos="; }; cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ]; |