diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index d2f360e97a1d..710712b845ca 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,11 +2,11 @@ let pname = "ledger-live-desktop"; - version = "2.58.0"; + version = "2.60.0"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-y9D+RKAB/woYmnu8X0armsVaxu0CWbqZpRiEFcN7rYM="; + hash = "sha256-dR6F6elUxZW3EuH71d5P9SOSDq5f5lAsYnrfWrsj2KA="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/editors/helix/default.nix b/pkgs/applications/editors/helix/default.nix index 1000b700a3e3..53d9728ef004 100644 --- a/pkgs/applications/editors/helix/default.nix +++ b/pkgs/applications/editors/helix/default.nix @@ -1,33 +1,27 @@ -{ fetchFromGitHub, lib, rustPlatform, installShellFiles, makeWrapper, callPackage }: +{ fetchzip, lib, rustPlatform, git, installShellFiles, makeWrapper }: -let +rustPlatform.buildRustPackage rec { + pname = "helix"; version = "23.05"; - src = fetchFromGitHub { - owner = "helix-editor"; - repo = "helix"; - rev = "${version}"; - hash = "sha256-Ws9uWtZLvTwL5HNonFr4YwyPoTU8QlCvhs6IJ92aLDw="; - }; - - grammars = callPackage ./grammars.nix { }; -in rustPlatform.buildRustPackage { - inherit src version; - - pname = "helix"; # This release tarball includes source code for the tree-sitter grammars, # which is not ordinarily part of the repository. - cargoSha256 = "sha256-/LCtfyDAA2JuioBD/CDMv6OOxM0B9A3PpuVP/YY5oF0="; + src = fetchzip { + url = "https://github.com/helix-editor/helix/releases/download/${version}/helix-${version}-source.tar.xz"; + hash = "sha256-3ZEToXwW569P7IFLqz6Un8rClnWrW5RiYKmRVFt7My8="; + stripRoot = false; + }; - nativeBuildInputs = [ installShellFiles makeWrapper ]; + cargoHash = "sha256-/LCtfyDAA2JuioBD/CDMv6OOxM0B9A3PpuVP/YY5oF0="; + + nativeBuildInputs = [ git installShellFiles makeWrapper ]; postInstall = '' - # We self build the grammar files - rm -r runtime/grammars + # not needed at runtime + rm -r runtime/grammars/sources mkdir -p $out/lib cp -r runtime $out/lib - ln -s ${grammars} $out/lib/runtime/grammars installShellCompletion contrib/completion/hx.{bash,fish,zsh} mkdir -p $out/share/{applications,icons/hicolor/256x256/apps} cp contrib/Helix.desktop $out/share/applications @@ -37,11 +31,6 @@ in rustPlatform.buildRustPackage { wrapProgram $out/bin/hx --set HELIX_RUNTIME $out/lib/runtime ''; - # disable fetching and building of tree-sitter grammars in favor of the custom build process in ./grammars.nix - env.HELIX_DISABLE_AUTO_GRAMMAR_BUILD = "1"; - - passthru.updateScript = ./update.py; - meta = with lib; { description = "A post-modern modal text editor"; homepage = "https://helix-editor.com"; diff --git a/pkgs/applications/editors/helix/grammars.nix b/pkgs/applications/editors/helix/grammars.nix deleted file mode 100644 index 2f5f97970c4c..000000000000 --- a/pkgs/applications/editors/helix/grammars.nix +++ /dev/null @@ -1,106 +0,0 @@ -{ - stdenv, - lib, - runCommand, - includeGrammarIf ? _: true, - fetchFromGitHub, - fetchgit, - ... -}: let - # similiar to https://github.com/helix-editor/helix/blob/23.05/grammars.nix - grammars = builtins.fromJSON (builtins.readFile ./language-grammars.json); - isGitGrammar = grammar: - builtins.hasAttr "source" grammar - && builtins.hasAttr "git" grammar.source - && builtins.hasAttr "rev" grammar.source; - isGitHubGrammar = grammar: lib.hasPrefix "https://github.com" grammar.source.git; - toGitHubFetcher = url: let - match = builtins.match "https://github\.com/([^/]*)/([^/]*)/?" url; - in { - owner = builtins.elemAt match 0; - repo = builtins.elemAt match 1; - }; - gitGrammars = builtins.filter isGitGrammar grammars; - buildGrammar = grammar: let - gh = toGitHubFetcher grammar.source.git; - sourceGit = fetchgit { - url = grammar.source.git; - inherit (grammar.source) rev sha256; - }; - sourceGitHub = fetchFromGitHub { - owner = gh.owner; - repo = gh.repo; - inherit (grammar.source) rev sha256; - }; - source = - if isGitHubGrammar grammar - then sourceGitHub - else sourceGit; - in - stdenv.mkDerivation rec { - # similar to tree-sitter grammar generation - pname = "helix-tree-sitter-grammar-${grammar.name}"; - version = grammar.source.rev; - - src = - if builtins.hasAttr "subpath" grammar.source - then "${source}/${grammar.source.subpath}" - else source; - - dontConfigure = true; - - FLAGS = [ - "-I${src}/src" - "-g" - "-O3" - "-fPIC" - "-fno-exceptions" - "-Wl,-z,relro,-z,now" - ]; - - NAME = grammar.name; - - buildPhase = '' - runHook preBuild - - if [[ -e "src/scanner.cc" ]]; then - $CXX -c "src/scanner.cc" -o scanner.o $FLAGS - elif [[ -e "src/scanner.c" ]]; then - $CC -c "src/scanner.c" -o scanner.o $FLAGS - fi - - $CC -c "src/parser.c" -o parser.o $FLAGS - $CXX -shared -o $NAME.so *.o - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - mkdir $out - mv $NAME.so $out/ - runHook postInstall - ''; - - # Strip failed on darwin: strip: error: symbols referenced by indirect symbol table entries that can't be stripped - fixupPhase = lib.optionalString stdenv.isLinux '' - runHook preFixup - $STRIP $out/$NAME.so - runHook postFixup - ''; - }; - grammarsToBuild = builtins.filter includeGrammarIf gitGrammars; - builtGrammars = - builtins.map (grammar: { - inherit (grammar) name; - artifact = buildGrammar grammar; - }) - grammarsToBuild; - grammarLinks = - builtins.map (grammar: "ln -s ${grammar.artifact}/${grammar.name}.so $out/${grammar.name}.so") - builtGrammars; -in - runCommand "helix-tree-sitter-grammars" {} '' - mkdir -p $out - ${builtins.concatStringsSep "\n" grammarLinks} - '' diff --git a/pkgs/applications/editors/helix/language-grammars.json b/pkgs/applications/editors/helix/language-grammars.json deleted file mode 100644 index 31d4eb620a7c..000000000000 --- a/pkgs/applications/editors/helix/language-grammars.json +++ /dev/null @@ -1 +0,0 @@ -[{"name": "rust", "source": {"git": "https://github.com/tree-sitter/tree-sitter-rust", "rev": "0431a2c60828731f27491ee9fdefe25e250ce9c9", "sha256": "149jhy01mqvavwa8jlxb8bnn7sxpfq2x1w35si6zn60b7kqjlx8f"}}, {"name": "sway", "source": {"git": "https://github.com/FuelLabs/tree-sitter-sway", "rev": "e491a005ee1d310f4c138bf215afd44cfebf959c", "sha256": "0d9qszx7iy8dk68ic24gwdm9xm2636ig7nb3n76l5a1jnsk0i03d"}}, {"name": "toml", "source": {"git": "https://github.com/ikatyang/tree-sitter-toml", "rev": "7cff70bbcbbc62001b465603ca1ea88edd668704", "sha256": "001pjz32v1b3sawlab68fdqz4xwk0v65wj5cdbcav2w1d9n9rhcd"}}, {"name": "awk", "source": {"git": "https://github.com/Beaglefoot/tree-sitter-awk", "rev": "a799bc5da7c2a84bc9a06ba5f3540cf1191e4ee3", "sha256": "0rw9p60vf2119vvjqnr4an85bryr8nq7jh0pkhzwpy7xh0nszy83"}}, {"name": "protobuf", "source": {"git": "https://github.com/yusdacra/tree-sitter-protobuf", "rev": "19c211a01434d9f03efff99f85e19f967591b175", "sha256": "04gxmrc0xf6x96sv347i1p00jcai31ml0s1csj1iz5mjdzgsllhh"}}, {"name": "elixir", "source": {"git": "https://github.com/elixir-lang/tree-sitter-elixir", "rev": "b20eaa75565243c50be5e35e253d8beb58f45d56", "sha256": "1i0c0xki3sv24649p0ws7xs2jagbwg7z7baz1960239bj94nl487"}}, {"name": "fish", "source": {"git": "https://github.com/ram02z/tree-sitter-fish", "rev": "84436cf24c2b3176bfbb220922a0fdbd0141e406", "sha256": "12s3db2mg9qa8l1i4a5h59kd7kl5j83wyl5kzq7j2k56xmvq56x0"}}, {"name": "json", "source": {"git": "https://github.com/tree-sitter/tree-sitter-json", "rev": "73076754005a460947cafe8e03a8cf5fa4fa2938", "sha256": "1npf2hrx33jhjpmzcyi7aszg436m4d80sa6h4mhhkmx51q4kpcf1"}}, {"name": "c", "source": {"git": "https://github.com/tree-sitter/tree-sitter-c", "rev": "7175a6dd5fc1cee660dce6fe23f6043d75af424a", "sha256": "1w03r4l773ki4iq2xxsc2pqxf3pjsbybq3xq4glmnsihgylibn8v"}}, {"name": "cpp", "source": {"git": "https://github.com/tree-sitter/tree-sitter-cpp", "rev": "2d2c4aee8672af4c7c8edff68e7dd4c07e88d2b1", "sha256": "1fv87f5ba8gxqxaf5ykhgjvkilml920rbxhdcf9d7jkh794mccq6"}}, {"name": "c-sharp", "source": {"git": "https://github.com/tree-sitter/tree-sitter-c-sharp", "rev": "5b60f99545fea00a33bbfae5be956f684c4c69e2", "sha256": "1dzfnj9b5xgx0av4xyvd71i8bj3hxaq97s91np5jzd2vjvbvw7p1"}}, {"name": "go", "source": {"git": "https://github.com/tree-sitter/tree-sitter-go", "rev": "64457ea6b73ef5422ed1687178d4545c3e91334a", "sha256": "16d32m78y8jricba9xav35c9y0k2r29irj5xyqgq24323yln9jnz"}}, {"name": "gomod", "source": {"git": "https://github.com/camdencheek/tree-sitter-go-mod", "rev": "e8f51f8e4363a3d9a427e8f63f4c1bbc5ef5d8d0", "sha256": "09rkqwdwhsm41nrz73rqbajap4bc0spjcld9k9fr8xmlmqa67j2b"}}, {"name": "gotmpl", "source": {"git": "https://github.com/dannylongeuay/tree-sitter-go-template", "rev": "395a33e08e69f4155156f0b90138a6c86764c979", "sha256": "0v1ciqdr9zj3hrzg9rrikr6v72yjs25sk631kd32r024igpxflv2"}}, {"name": "gowork", "source": {"git": "https://github.com/omertuc/tree-sitter-go-work", "rev": "6dd9dd79fb51e9f2abc829d5e97b15015b6a8ae2", "sha256": "1kzrs4rpby3b0h87rbr02k55k3mmkmdy7rvl11q95b3ym0smmyqb"}}, {"name": "javascript", "source": {"git": "https://github.com/tree-sitter/tree-sitter-javascript", "rev": "4a95461c4761c624f2263725aca79eeaefd36cad", "sha256": "0za77agy25pj14hi93rjc1ib79l4q43lc5crgwnsc9d72pr8cwwm"}}, {"name": "typescript", "source": {"git": "https://github.com/tree-sitter/tree-sitter-typescript", "rev": "6aac031ad88dd6317f02ac0bb27d099a553a7d8c", "subpath": "typescript", "sha256": "012fyvk95pr11anypsi1cyxgj3has8zqlj74fwmcxd9f8pk7c595"}}, {"name": "tsx", "source": {"git": "https://github.com/tree-sitter/tree-sitter-typescript", "rev": "6aac031ad88dd6317f02ac0bb27d099a553a7d8c", "subpath": "tsx", "sha256": "012fyvk95pr11anypsi1cyxgj3has8zqlj74fwmcxd9f8pk7c595"}}, {"name": "css", "source": {"git": "https://github.com/tree-sitter/tree-sitter-css", "rev": "769203d0f9abe1a9a691ac2b9fe4bb4397a73c51", "sha256": "05875jmkkklx0b5g1h4qc8cbgcj8mr1n8slw7hsn0wssn7yn42z5"}}, {"name": "scss", "source": {"git": "https://github.com/serenadeai/tree-sitter-scss", "rev": "c478c6868648eff49eb04a4df90d703dc45b312a", "sha256": "15r3jiv36hzx2pmjmp63am3pbc01s52z36xfraa1aw4wlx7lqnq4"}}, {"name": "html", "source": {"git": "https://github.com/tree-sitter/tree-sitter-html", "rev": "29f53d8f4f2335e61bf6418ab8958dac3282077a", "sha256": "0wadphmgndj4vq9mg258624pj0klspbpcx8qlc6f8by5xbshvkmz"}}, {"name": "python", "source": {"git": "https://github.com/tree-sitter/tree-sitter-python", "rev": "de221eccf9a221f5b85474a553474a69b4b5784d", "sha256": "1mp2rqv6p2nla0sh1s5hprq32b9nkwbj2q21dcpvdcg6gack1sdf"}}, {"name": "nickel", "source": {"git": "https://github.com/nickel-lang/tree-sitter-nickel", "rev": "9d83db400b6c11260b9106f131f93ddda8131933", "sha256": "0rm63fnxja59zzkm7gz4vbzics8mdf7d6ijazcy9394kdqrcdzi6"}}, {"name": "nix", "source": {"git": "https://github.com/nix-community/tree-sitter-nix", "rev": "1b69cf1fa92366eefbe6863c184e5d2ece5f187d", "sha256": "0ls9djhpbbnjvd6b3166zjy92di0927f70720b57j2d3925538i5"}}, {"name": "ruby", "source": {"git": "https://github.com/tree-sitter/tree-sitter-ruby", "rev": "206c7077164372c596ffa8eaadb9435c28941364", "sha256": "1pqr24bj68lgi1w2cblr8asfby681l3032jrppq4n9x5zm23fi6n"}}, {"name": "bash", "source": {"git": "https://github.com/tree-sitter/tree-sitter-bash", "rev": "275effdfc0edce774acf7d481f9ea195c6c403cd", "sha256": "14ficjp82cdamylgx090z3rkr5b2q04i2w3854yavli9zf57lwpr"}}, {"name": "php", "source": {"git": "https://github.com/tree-sitter/tree-sitter-php", "rev": "f860e598194f4a71747f91789bf536b393ad4a56", "sha256": "02yc5b3qps8ghsmy4b5m5kldyr5pnqz9yw663v13pnz92r84k14g"}}, {"name": "twig", "source": {"git": "https://github.com/gbprod/tree-sitter-twig", "rev": "807b293fec3fead64f54c64fdf6fb05516c032b9", "sha256": "17ifa0k4z8gcs54b0hvaibdhnfpa6r54qr82c8j5p1fzahrsdb3i"}}, {"name": "latex", "source": {"git": "https://github.com/latex-lsp/tree-sitter-latex", "rev": "8c75e93cd08ccb7ce1ccab22c1fbd6360e3bcea6", "sha256": "0lc42x604f04x3kkp88vyqa5dx90wqyisiwl7nn861lyxl6phjnf"}}, {"name": "bibtex", "source": {"git": "https://github.com/latex-lsp/tree-sitter-bibtex", "rev": "ccfd77db0ed799b6c22c214fe9d2937f47bc8b34", "sha256": "0m7f3dkqbmy8x1bhl11m8f4p6n76wfvh99rp46zrqv39355nw1y2"}}, {"name": "lean", "source": {"git": "https://github.com/Julian/tree-sitter-lean", "rev": "d98426109258b266e1e92358c5f11716d2e8f638", "sha256": "0sc5h0fan8cmpxxf2jizky0ynmr81qs9q7xgh9zrmdi69r59p0sk"}}, {"name": "julia", "source": {"git": "https://github.com/tree-sitter/tree-sitter-julia", "rev": "8fb38abff74652c4faddbf04d2d5bbbc6b4bae25", "sha256": "06h5nyxw72z3w5a62y59332w2xg90sm3c2j6na7vvf7nark7vb8v"}}, {"name": "java", "source": {"git": "https://github.com/tree-sitter/tree-sitter-java", "rev": "09d650def6cdf7f479f4b78f595e9ef5b58ce31e", "sha256": "0440xh8x8rkbdlc1f1ail9wzl4583l29ic43x9lzl8290bm64q5l"}}, {"name": "ledger", "source": {"git": "https://github.com/cbarrete/tree-sitter-ledger", "rev": "1f864fb2bf6a87fe1b48545cc6adc6d23090adf7", "sha256": "1qxdad40nladdnq6d2s1z7fxlwjz8llpj85da792pv7p7dwh95vd"}}, {"name": "beancount", "source": {"git": "https://github.com/polarmutex/tree-sitter-beancount", "rev": "4cbd1f09cd07c1f1fabf867c2cf354f9da53cc4c", "sha256": "0igv4nal56d4ppj9zpdjc9i49r755dcvz3csfrps0d0p2v47y7sj"}}, {"name": "ocaml", "source": {"git": "https://github.com/tree-sitter/tree-sitter-ocaml", "rev": "23d419ba45789c5a47d31448061557716b02750a", "subpath": "ocaml", "sha256": "1bh3afd3iix0gf6ldjngf2c65nyfdwvbmsq25gcxm04jwbg9c6k8"}}, {"name": "ocaml-interface", "source": {"git": "https://github.com/tree-sitter/tree-sitter-ocaml", "rev": "23d419ba45789c5a47d31448061557716b02750a", "subpath": "interface", "sha256": "1bh3afd3iix0gf6ldjngf2c65nyfdwvbmsq25gcxm04jwbg9c6k8"}}, {"name": "lua", "source": {"git": "https://github.com/MunifTanjim/tree-sitter-lua", "rev": "887dfd4e83c469300c279314ff1619b1d0b85b91", "sha256": "1lv3mp0xm5ac9440gcskcxy0hzsnddvcysix1k5axy1cl4vr8bz6"}}, {"name": "svelte", "source": {"git": "https://github.com/Himujjal/tree-sitter-svelte", "rev": "349a5984513b4a4a9e143a6e746120c6ff6cf6ed", "sha256": "0yyzp836c2q4k5dpywb5m5dxh8h53f3l5gcm5qi5bb8qisvccm6n"}}, {"name": "vue", "source": {"git": "https://github.com/ikatyang/tree-sitter-vue", "rev": "91fe2754796cd8fba5f229505a23fa08f3546c06", "sha256": "0l0kqy9ajm5izqcywd39aavgmc281s8qrhmjkbwl6r8arfj8vsrm"}}, {"name": "yaml", "source": {"git": "https://github.com/ikatyang/tree-sitter-yaml", "rev": "0e36bed171768908f331ff7dff9d956bae016efb", "sha256": "0wyvjh62zdp5bhd2y8k7k7x4wz952l55i1c8d94rhffsbbf9763f"}}, {"name": "haskell", "source": {"git": "https://github.com/tree-sitter/tree-sitter-haskell", "rev": "98fc7f59049aeb713ab9b72a8ff25dcaaef81087", "sha256": "15b2xypg7npa6q1w8nhd5jrcpwyy52z8n6s5b1j1n006aacg6fq4"}}, {"name": "zig", "source": {"git": "https://github.com/maxxnino/tree-sitter-zig", "rev": "8d3224c3bd0890fe08358886ebf54fca2ed448a6", "sha256": "0mw4s92qmxkh9a13h9hg6kv9b704vzx3kr4j6dap0c80dffvfjhk"}}, {"name": "tsq", "source": {"git": "https://github.com/the-mikedavis/tree-sitter-tsq", "rev": "48b5e9f82ae0a4727201626f33a17f69f8e0ff86", "sha256": "015zsvwwm58b5yzk6dl3kzdpg142qpvbb3fv7804jbjqwi1xy8di"}}, {"name": "cmake", "source": {"git": "https://github.com/uyha/tree-sitter-cmake", "rev": "6e51463ef3052dd3b328322c22172eda093727ad", "sha256": "14l7l6cc9pdqinff9hjda7rakzfvwk0qcbv6djl0s9f21875l4nv"}}, {"name": "make", "source": {"git": "https://github.com/alemuller/tree-sitter-make", "rev": "a4b9187417d6be349ee5fd4b6e77b4172c6827dd", "sha256": "07gz4x12xhigar2plr3jgazb2z4f9xp68nscmvy9a7wafak9l2m9"}}, {"name": "glsl", "source": {"git": "https://github.com/theHamsta/tree-sitter-glsl", "rev": "88408ffc5e27abcffced7010fc77396ae3636d7e", "sha256": "1zsj20xxv8mcj991gyp2gi2h31p16znkjxgbw5lpymj3nz7w22ld"}}, {"name": "perl", "source": {"git": "https://github.com/ganezdragon/tree-sitter-perl", "rev": "0ac2c6da562c7a2c26ed7e8691d4a590f7e8b90a", "sha256": "184zaicrl9i4cywhyc2cxpghw7daz9pi0fhwkkgpv7j6kvp1ig2w"}}, {"name": "comment", "source": {"git": "https://github.com/stsewd/tree-sitter-comment", "rev": "5dd3c62f1bbe378b220fe16b317b85247898639e", "sha256": "1wk6lxzndaikbrn72pa54y59qs0xnfaffc8mxmm6c5v5x16l8vb3"}}, {"name": "wgsl", "source": {"git": "https://github.com/szebniok/tree-sitter-wgsl", "rev": "272e89ef2aeac74178edb9db4a83c1ffef80a463", "sha256": "02nrgw6ypblr226r3d2wh6nn8x6bb3f16ix8anbppgrkzhfam3f7"}}, {"name": "llvm", "source": {"git": "https://github.com/benwilliamgraham/tree-sitter-llvm", "rev": "3b213925b9c4f42c1acfe2e10bfbb438d9c6834d", "sha256": "0ymrdcajji11852c158w67mgcsycphwj9mh777q3n4jn8pp37y8j"}}, {"name": "llvm-mir", "source": {"git": "https://github.com/Flakebi/tree-sitter-llvm-mir", "rev": "06fabca19454b2dc00c1b211a7cb7ad0bc2585f1", "sha256": "1a3ymx9baspxcjvgb0i7369zg42ikl5nf61f9b1y18azs940l35r"}}, {"name": "tablegen", "source": {"git": "https://github.com/Flakebi/tree-sitter-tablegen", "rev": "568dd8a937347175fd58db83d4c4cdaeb6069bd2", "sha256": "1w03navfgpgg4db9x0xvr2z0l8m07nma4icv0fwdgin4nk59lp4l"}}, {"name": "markdown", "source": {"git": "https://github.com/MDeiml/tree-sitter-markdown", "rev": "fa6bfd51727e4bef99f7eec5f43947f73d64ea7d", "subpath": "tree-sitter-markdown", "sha256": "0wryvq7153a3jx9qs1plm5crlgd88sm1ymlqc3gs09mr2n456z9z"}}, {"name": "markdown_inline", "source": {"git": "https://github.com/MDeiml/tree-sitter-markdown", "rev": "fa6bfd51727e4bef99f7eec5f43947f73d64ea7d", "subpath": "tree-sitter-markdown-inline", "sha256": "0wryvq7153a3jx9qs1plm5crlgd88sm1ymlqc3gs09mr2n456z9z"}}, {"name": "dart", "source": {"git": "https://github.com/UserNobody14/tree-sitter-dart", "rev": "2d7f66651c9319c1a0e4dda226cc2628fbb66528", "sha256": "16shxpm2jbq2qscr2pxjh5kzqf9cw6p8k1divg91nnbqhxkghfbs"}}, {"name": "scala", "source": {"git": "https://github.com/tree-sitter/tree-sitter-scala", "rev": "f6bbf35de41653b409ca9a3537a154f2b095ef64", "sha256": "09nhmil016nqdh389ral30ymmaap07vzvab0di899khg8bjq7l8q"}}, {"name": "dockerfile", "source": {"git": "https://github.com/camdencheek/tree-sitter-dockerfile", "rev": "8ee3a0f7587b2bd8c45c8cb7d28bd414604aec62", "sha256": "0izv8fryh7vivh9nbpzqpxb74fanrnd21bbq8xzazz4dvgfd7g93"}}, {"name": "git-commit", "source": {"git": "https://github.com/the-mikedavis/tree-sitter-git-commit", "rev": "db88cffa3952dd2328b741af5d0fc69bdb76704f", "sha256": "08w9kkmarm5g6hi5yxk4nspkq0k0vxk7kjwvbzdifiphrs5pzf5g"}}, {"name": "diff", "source": {"git": "https://github.com/the-mikedavis/tree-sitter-diff", "rev": "fd74c78fa88a20085dbc7bbeaba066f4d1692b63", "sha256": "0lbadj3657yk6r46sffbzkmm1kp47rydhsn1bj1w1mnyr27bfvrf"}}, {"name": "git-rebase", "source": {"git": "https://github.com/the-mikedavis/tree-sitter-git-rebase", "rev": "d8a4207ebbc47bd78bacdf48f883db58283f9fd8", "sha256": "16g3i69jxq7fm2nis2d61bcj1r84sbr1drbmjd6zwm8rxkdnxd4r"}}, {"name": "regex", "source": {"git": "https://github.com/tree-sitter/tree-sitter-regex", "rev": "e1cfca3c79896ff79842f057ea13e529b66af636", "sha256": "0j6j0h8ciyhgmcq9iy3843anyfvd7s0biqzgbsqgwbgbqbg2nfwl"}}, {"name": "git-config", "source": {"git": "https://github.com/the-mikedavis/tree-sitter-git-config", "rev": "0e4f0baf90b57e5aeb62dcdbf03062c6315d43ea", "sha256": "0hp45mvzbnpzjzxikwzyb7jzv4fyz19jllj78qm35sba4yc942ym"}}, {"name": "gitattributes", "source": {"git": "https://github.com/mtoohey31/tree-sitter-gitattributes", "rev": "3dd50808e3096f93dccd5e9dc7dc3dba2eb12dc4", "sha256": "1idi1hrpkc17y5vi2h0vfwzw64w6wy4cz4yk08avqnms6mxkxq94"}}, {"name": "gitignore", "source": {"git": "https://github.com/shunsambongi/tree-sitter-gitignore", "rev": "f4685bf11ac466dd278449bcfe5fd014e94aa504", "sha256": "17rar33y4dngmx69kjiw6wgrsd6kc0c8w4xa4rx06rjmv7b1hfij"}}, {"name": "graphql", "source": {"git": "https://github.com/bkegley/tree-sitter-graphql", "rev": "5e66e961eee421786bdda8495ed1db045e06b5fe", "sha256": "0xvrd6p9rxdjpqfq575ap6hpl2f7dad5i4d4m05w1qk9jx33vw9n"}}, {"name": "elm", "source": {"git": "https://github.com/elm-tooling/tree-sitter-elm", "rev": "df4cb639c01b76bc9ac9cc66788709a6da20002c", "sha256": "14il4yv65w7l29s84ilp3w3v9hy7x8j2bg73wwjyazava6n0f41y"}}, {"name": "iex", "source": {"git": "https://github.com/elixir-lang/tree-sitter-iex", "rev": "39f20bb51f502e32058684e893c0c0b00bb2332c", "sha256": "10lwwh3v2cc39hcydz5p899grzy50gr46bbddhs9vaam7wrp25b1"}}, {"name": "rescript", "source": {"git": "https://github.com/jaredramirez/tree-sitter-rescript", "rev": "65609807c628477f3b94052e7ef895885ac51c3c", "sha256": "0d8whkyyvjf270m6zr3jhc1s5zdwsf05dfnzs5r3jzb6qmm52x2k"}}, {"name": "erlang", "source": {"git": "https://github.com/the-mikedavis/tree-sitter-erlang", "rev": "ce0ed253d72c199ab93caba7542b6f62075339c4", "sha256": "04l9svgmk8z5vgb2mvcfwijdl7jmyqi9cgfzzyak0z011f4f9zhi"}}, {"name": "kotlin", "source": {"git": "https://github.com/fwcd/tree-sitter-kotlin", "rev": "a4f71eb9b8c9b19ded3e0e9470be4b1b77c2b569", "sha256": "051x0p02dkx0rz83sy70wczm6k5b938q4knhh8halv2acs32l4v9"}}, {"name": "hcl", "source": {"git": "https://github.com/MichaHoffmann/tree-sitter-hcl", "rev": "3cb7fc28247efbcb2973b97e71c78838ad98a583", "sha256": "0hg7w3hsvxjwz1rb1izknn46msm4mkjx2cnq603lzn7i9mb1pbyr"}}, {"name": "org", "source": {"git": "https://github.com/milisims/tree-sitter-org", "rev": "698bb1a34331e68f83fc24bdd1b6f97016bb30de", "sha256": "0adzb2kw8k3w75p5f3ax9lal64k8n2fwrmrqak2z2w8jl8cgagl6"}}, {"name": "solidity", "source": {"git": "https://github.com/JoranHonig/tree-sitter-solidity", "rev": "9004b86531cb424bd379424cf7266a4585f2af7d", "sha256": "056srr5z0fz9pz3fwrbzx095jj7f5zsm20qb8y8pdar5lkzy5ipw"}}, {"name": "gleam", "source": {"git": "https://github.com/gleam-lang/tree-sitter-gleam", "rev": "ae79782c00656945db69641378e688cdb78d52c1", "sha256": "10lzz5jw7vh3laa721x7312y9irgi88w147cj7fj3g6q14wlsg7k"}}, {"name": "robot", "source": {"git": "https://github.com/Hubro/tree-sitter-robot", "rev": "f1142bfaa6acfce95e25d2c6d18d218f4f533927", "sha256": "1pnrycxsx5hapxfdj2n3nrjym550yb4ppfml8zvllj3cjqagrp9m"}}, {"name": "r", "source": {"git": "https://github.com/r-lib/tree-sitter-r", "rev": "cc04302e1bff76fa02e129f332f44636813b0c3c", "sha256": "0adq1qng3ghb4wvglplj73q8c95hzpfiqb2q8bqnms81i7p2xma7"}}, {"name": "swift", "source": {"git": "https://github.com/alex-pinkus/tree-sitter-swift", "rev": "77c6312c8438f4dbaa0350cec92b3d6dd3d74a66", "sha256": "1fblqm8hyd6hbydzpcpm3lmlhfcifsq31r3ibvhgckfl64afhckv"}}, {"name": "embedded-template", "source": {"git": "https://github.com/tree-sitter/tree-sitter-embedded-template", "rev": "d21df11b0ecc6fd211dbe11278e92ef67bd17e97", "sha256": "0h3nj6fz512riyx2b65pg9pjprkpkasnglwljlzi6s1in9fdig3x"}}, {"name": "eex", "source": {"git": "https://github.com/connorlay/tree-sitter-eex", "rev": "f742f2fe327463335e8671a87c0b9b396905d1d1", "sha256": "19n07ywavwkh4p189d18wxhch45qgn094b7mkdymh60zr7cbmyjh"}}, {"name": "heex", "source": {"git": "https://github.com/phoenixframework/tree-sitter-heex", "rev": "2e1348c3cf2c9323e87c2744796cf3f3868aa82a", "sha256": "04yzzqfxinsh62l7750grflxg809m8y3qlbmc1vknk2xk34l9d78"}}, {"name": "sql", "source": {"git": "https://github.com/DerekStride/tree-sitter-sql", "rev": "3a3f92b29c880488a08bc2baaf1aca6432ec3380", "sha256": "1jy9c553b2fzv7q9n8b0hs0yr00xd5mhd1v2lbbcfrk7x9jfrnsi"}}, {"name": "gdscript", "source": {"git": "https://github.com/PrestonKnopp/tree-sitter-gdscript", "rev": "a4b57cc3bcbfc24550e858159647e9238e7ad1ac", "sha256": "0mppjapxsdch9wwqklnfb0cs7xwja333w6wzygykzrb7nna50lfz"}}, {"name": "godot-resource", "source": {"git": "https://github.com/PrestonKnopp/tree-sitter-godot-resource", "rev": "b6ef0768711086a86b3297056f9ffb5cc1d77b4a", "sha256": "0agnvg95fx60xkr5fivl1x3yhcw6ca58f7bpx3dq6fl7pyfgrky2"}}, {"name": "nu", "source": {"git": "https://github.com/LhKipp/tree-sitter-nu", "rev": "eb95bdac3abd73ef47e53f19c63e74a31405ebd2", "sha256": "06rhwprkyr0snkynq3ialgycynp8b4i95sxyqfbj7qvj49vnc6nq"}}, {"name": "vala", "source": {"git": "https://github.com/vala-lang/tree-sitter-vala", "rev": "c9eea93ba2ec4ec1485392db11945819779745b3", "sha256": "0xzszj8c5nkk8nccspbiz68aw3ki6pi75ngwrrfqdipxy7ncd70j"}}, {"name": "hare", "source": {"git": "https://git.sr.ht/~ecmma/tree-sitter-hare", "rev": "bc26a6a949f2e0d98b7bfc437d459b250900a165", "sha256": "0hlir7xw14xdm7jxchqr228zln8ag73lv45b0x8a2v9iac2smjdv"}}, {"name": "devicetree", "source": {"git": "https://github.com/joelspadin/tree-sitter-devicetree", "rev": "877adbfa0174d25894c40fa75ad52d4515a36368", "sha256": "1ds7pa4x1yd54xa2mba37vp8lbi8n4l975lps0249x8xw35r0jrl"}}, {"name": "cairo", "source": {"git": "https://github.com/archseer/tree-sitter-cairo", "rev": "b249662a1eefeb4d71c9529cdd971e74fecc10fe", "sha256": "1vgwr3qm1y1ajrma3wlnkwrwg5466mkm35pqzb39vlcgh1575xrv"}}, {"name": "cpon", "source": {"git": "https://github.com/fvacek/tree-sitter-cpon", "rev": "0d01fcdae5a53191df5b1349f9bce053833270e7", "sha256": "1ar8dfjjg1pp9i403jm21d4b70xi2w4kjdmwnxlc597582jkjx56"}}, {"name": "odin", "source": {"git": "https://github.com/ap29600/tree-sitter-odin", "rev": "b219207e49ffca2952529d33e94ed63b1b75c4f1", "sha256": "1wj8fb0dk1c5dzkn165pbk4qky77bzqnpvv30981zgjszl508r1l"}}, {"name": "meson", "source": {"git": "https://github.com/staysail/tree-sitter-meson", "rev": "32a83e8f200c347232fa795636cfe60dde22957a", "sha256": "0g1kc1hidva3ipi4nsi64r9pm8jc48nmhffqshwvbiss0fdf8ac9"}}, {"name": "sshclientconfig", "source": {"git": "https://github.com/metio/tree-sitter-ssh-client-config", "rev": "e45c6d5c71657344d4ecaf87dafae7736f776c57", "sha256": "1gbvzdysdz2gri7k2bxjchn34cdh0l7y4rfxgs0s8nxz73fpyfaj"}}, {"name": "scheme", "source": {"git": "https://github.com/6cdh/tree-sitter-scheme", "rev": "c0741320bfca6b7b5b7a13b5171275951e96a842", "sha256": "12knvhmayck9da3zj2w55al4yjhkkr9gxmfdmrjiz7vn9wc1dxr9"}}, {"name": "v", "source": {"git": "https://github.com/vlang/vls", "subpath": "tree_sitter_v", "rev": "66cf9d3086fb5ecc827cb32c64c5d812ab17d2c6", "sha256": "11g9wxvia39f5sik7zxl1v06kks8s9rqp5ip6g6z26wz1585vlzx"}}, {"name": "verilog", "source": {"git": "https://github.com/andreytkachenko/tree-sitter-verilog", "rev": "514d8d70593d29ef3ef667fa6b0e504ae7c977e3", "sha256": "0abnfll1kl7kn0sg8bpmhahszgfyh2s2ld930pb5z6706lsg07pp"}}, {"name": "edoc", "source": {"git": "https://github.com/the-mikedavis/tree-sitter-edoc", "rev": "74774af7b45dd9cefbf9510328fc6ff2374afc50", "sha256": "1qz6hghnyhrgm23793hyw84zxzrhb3jc1prih806hirzybbapc80"}}, {"name": "jsdoc", "source": {"git": "https://github.com/tree-sitter/tree-sitter-jsdoc", "rev": "189a6a4829beb9cdbe837260653b4a3dfb0cc3db", "sha256": "0qpsy234p30j6955wpjlaqwbr21bi56p0ln5vhrd84s99ac7s6b6"}}, {"name": "openscad", "source": {"git": "https://github.com/bollian/tree-sitter-openscad", "rev": "5c3ce93df0ac1da7197cf6ae125aade26d6b8972", "sha256": "1bimdd71899i454k9638jg5m97scxcvqsn4szy1i9d0lwx8wp05p"}}, {"name": "prisma", "source": {"git": "https://github.com/victorhqc/tree-sitter-prisma", "rev": "eca2596a355b1a9952b4f80f8f9caed300a272b5", "sha256": "19zb3dkwp2kpyivygqxk8yph0jpl7hn9zzcry15mshn2n0rs9sih"}}, {"name": "clojure", "source": {"git": "https://github.com/sogaiu/tree-sitter-clojure", "rev": "e57c569ae332ca365da623712ae1f50f84daeae2", "sha256": "0hq8rv4s0gzbfv3qj4gsrm87baiy6k1hyfbhbbpwbrcpd8jl7gdn"}}, {"name": "elvish", "source": {"git": "https://github.com/ckafi/tree-sitter-elvish", "rev": "e50787cadd3bc54f6d9c0704493a79078bb8a4e5", "sha256": "1xw9mqq3p64lgli6nvlavrrlg29nfj2fbg7rr2jw1jcjk8lgxv1p"}}, {"name": "fortran", "source": {"git": "https://github.com/stadelmanma/tree-sitter-fortran", "rev": "f0f2f100952a353e64e26b0fa710b4c296d7af13", "sha256": "17iiz38s7adkzv9rw97nn5nd9kvn1vyccm7r6ywipaa5aim0nm6a"}}, {"name": "ungrammar", "source": {"git": "https://github.com/Philipp-M/tree-sitter-ungrammar", "rev": "0113de880a58ea14f2a75802e9b99fcc25003d9c", "sha256": "1lbrnsqmfhgwad78c6r8dxv1d9g2dgpbdd6qyj7sgmx43khv2vw4"}}, {"name": "dot", "source": {"git": "https://github.com/rydesun/tree-sitter-dot", "rev": "917230743aa10f45a408fea2ddb54bbbf5fbe7b7", "sha256": "1q2rbv16dihlmrbxlpn0x03na7xp8rdhf58vwm3lryn3nfcjckn2"}}, {"name": "cue", "source": {"git": "https://github.com/eonpatapon/tree-sitter-cue", "rev": "61843e3beebf19417e4fede4e8be4df1084317ad", "sha256": "15cmlkip9nl6yxkbkv0lp7prfyrhri94szqg3vn7a90s4zjkfx99"}}, {"name": "slint", "source": {"git": "https://github.com/jrmoulton/tree-sitter-slint", "rev": "0d4dda94f96623302dfc234e06be62a5717f47da", "sha256": "0pvzm0zir1zf1pv4mjzcy95irdcs9ypj9m8i204szb7d3sfzkybz"}}, {"name": "task", "source": {"git": "https://github.com/alexanderbrevig/tree-sitter-task", "rev": "f2cb435c5dbf3ee19493e224485d977cb2d36d8b", "sha256": "0zg27cs6naj2laf2fa0xmxzg4xpkqpgj10f0va3ay7wzwm2004fc"}}, {"name": "xit", "source": {"git": "https://github.com/synaptiko/tree-sitter-xit", "rev": "7d7902456061bc2ad21c64c44054f67b5515734c", "sha256": "0lj3p8grbb8527k23mibn2cfxzrikpgwv4qmlcfnvsqqhqfc83w7"}}, {"name": "esdl", "source": {"git": "https://github.com/greym0uth/tree-sitter-esdl", "rev": "b840c8a8028127e0a7c6e6c45141adade2bd75cf", "sha256": "1dyqqjawnmd4xzs22c9agh9n40f636hjd5nbvrr17abphy52z349"}}, {"name": "pascal", "source": {"git": "https://github.com/Isopod/tree-sitter-pascal", "rev": "2fd40f477d3e2794af152618ccfac8d92eb72a66", "sha256": "11zjwk8wpx2b565sf82mh02bp5iswhmfykzdqfk0qwasr9ka2w7y"}}, {"name": "sml", "source": {"git": "https://github.com/Giorbo/tree-sitter-sml", "rev": "bd4055d5554614520d4a0706b34dc0c317c6b608", "sha256": "0yx0yb7cr0v2w8y8zi8nxsvwnwbbaj4fwaqffgky58pd665gvsbw"}}, {"name": "jsonnet", "source": {"git": "https://github.com/sourcegraph/tree-sitter-jsonnet", "rev": "0475a5017ad7dc84845d1d33187f2321abcb261d", "sha256": "1dh8wqi8mnsapzicrdjg6cj6skj9f2ia4ijg08pl45bcxc1lidzc"}}, {"name": "astro", "source": {"git": "https://github.com/virchau13/tree-sitter-astro", "rev": "5f5c3e73c45967df9aa42f861fad2d77cd4e0900", "sha256": "06nj6yzkmh0bl6whqazlx0a554h0zxk9zgrlkv4vmphvd714bc7y"}}, {"name": "bass", "source": {"git": "https://github.com/vito/tree-sitter-bass", "rev": "501133e260d768ed4e1fd7374912ed5c86d6fd90", "sha256": "14zs56rb53qzkx9l9hgpn41q2nycrrdh2jdbybq55w34gcgg6sh2"}}, {"name": "wat", "source": {"git": "https://github.com/wasm-lsp/tree-sitter-wasm", "rev": "2ca28a9f9d709847bf7a3de0942a84e912f59088", "subpath": "wat", "sha256": "02v08hs9wirdzfx9a7c3kpn0cpc9i867pw28qka0fid9q537hnbb"}}, {"name": "wast", "source": {"git": "https://github.com/wasm-lsp/tree-sitter-wasm", "rev": "2ca28a9f9d709847bf7a3de0942a84e912f59088", "subpath": "wast", "sha256": "02v08hs9wirdzfx9a7c3kpn0cpc9i867pw28qka0fid9q537hnbb"}}, {"name": "d", "source": {"git": "https://github.com/gdamore/tree-sitter-d", "rev": "601c4a1e8310fb2f3c43fa8a923d0d27497f3c04", "sha256": "1ml1589pjb2sknsmz770ywfw37dvypnf1576qs9473r6cj4ng496"}}, {"name": "vhs", "source": {"git": "https://github.com/charmbracelet/tree-sitter-vhs", "rev": "c6d81f34c011c29ee86dd73b45a8ecc9f2e2bdaf", "sha256": "1pdz99rdvjf82vyfsp7g6dsgjjibfj5w37rdyix41lvwiyh9nkgr"}}, {"name": "kdl", "source": {"git": "https://github.com/Unoqwy/tree-sitter-kdl", "rev": "e1cd292c6d15df6610484e1d4b5c987ecad52373", "sha256": "13gj38j0lplnvf432smr50z84brfz2ld28qvqvhy6j6hd09b9xk3"}}, {"name": "xml", "source": {"git": "https://github.com/RenjiSann/tree-sitter-xml", "rev": "48a7c2b6fb9d515577e115e6788937e837815651", "sha256": "04jpcxmb9pwam5q6l6s5kvmkzfcnar8yvl3xm5i5rjnzfyvdgkzi"}}, {"name": "dtd", "source": {"git": "https://github.com/KMikeeU/tree-sitter-dtd", "rev": "6116becb02a6b8e9588ef73d300a9ba4622e156f", "sha256": "1gs1gkk20khmvz10ikhym9yqkcn5km5hq4hz4jyxdz67jzpbbbls"}}, {"name": "wit", "source": {"git": "https://github.com/hh9527/tree-sitter-wit", "rev": "c917790ab9aec50c5fd664cbfad8dd45110cfff3", "sha256": "08bpcmg2hdc8fyglhy311cx5i1brc798h8aicaxk52wgypv31rz7"}}, {"name": "ini", "source": {"git": "https://github.com/justinmk/tree-sitter-ini", "rev": "4d247fb876b4ae6b347687de4a179511bf67fcbc", "sha256": "08z3281q9vq3lr3mcj4cm6zh2bsg9jhyrxfqfann9ixklvzglkn6"}}, {"name": "bicep", "source": {"git": "https://github.com/the-mikedavis/tree-sitter-bicep", "rev": "d8e097fcfa143854861ef737161163a09cc2916b", "sha256": "1zm5i4723afmd95lg1xlrh0v2rdy116l87m4jcdfzzynls57zdhp"}}, {"name": "qmljs", "source": {"git": "https://github.com/yuja/tree-sitter-qmljs", "rev": "0b2b25bcaa7d4925d5f0dda16f6a99c588a437f1", "sha256": "0sgylcj8bfsiyjh11cfzpzywk66xi9clvbcihryk6qkpndz0pzqx"}}, {"name": "mermaid", "source": {"git": "https://github.com/monaqa/tree-sitter-mermaid", "rev": "d787c66276e7e95899230539f556e8b83ee16f6d", "sha256": "106w00y6l1fnjakaz9biqk546h2xy0yzr3wmg0yz6fihzj6kf117"}}, {"name": "matlab", "source": {"git": "https://github.com/mstanciu552/tree-sitter-matlab", "rev": "2d5d3d5193718a86477d4335aba5b34e79147326", "sha256": "1iab96dkf4zbcza4xpai76y7fy5kvgmv4ibjpa3ij588fcbvz5j6"}}, {"name": "ponylang", "source": {"git": "https://github.com/mfelsche/tree-sitter-ponylang", "rev": "ef66b151bc2604f431b5668fcec4747db4290e11", "sha256": "08g0a3kmv71rq86sizyikzsv5h2bdg8vcdiln7vrl482dczgxaky"}}, {"name": "dhall", "source": {"git": "https://github.com/jbellerb/tree-sitter-dhall", "rev": "affb6ee38d629c9296749767ab832d69bb0d9ea8", "sha256": "0r4f4w2jhm2hyvh3r3phdjhigsh0an8g4p21cbz8ldkld8ma9lxb"}}, {"name": "pem", "source": {"git": "https://github.com/mtoohey31/tree-sitter-pem", "rev": "be67a4330a1aa507c7297bc322204f936ec1132c", "sha256": "144gsh1cw3vzrgy95fvx7ld6gp0fq1v0mzmll0liiqgyrjsxda3h"}}, {"name": "passwd", "source": {"git": "https://github.com/ath3/tree-sitter-passwd", "rev": "20239395eacdc2e0923a7e5683ad3605aee7b716", "sha256": "03j18mx4g901q70kpy39hayh4snwis62svx6ir5015cvjz4fwiyx"}}, {"name": "hosts", "source": {"git": "https://github.com/ath3/tree-sitter-hosts", "rev": "301b9379ce7dfc8bdbe2c2699a6887dcb73953f9", "sha256": "0sgpybvwrvpw0lvk2s96ppyh8132g2vfjyif43yg08zlj06mvjbz"}}, {"name": "uxntal", "source": {"git": "https://github.com/Jummit/tree-sitter-uxntal", "rev": "9297e95ef74380b0ad84c4fd98f91e9f6e4319e6", "sha256": "1y6iws0z8likm8n1v6mi2jma5c7jvga04d9k30xqifpln8hm4qad"}}, {"name": "yuck", "source": {"git": "https://github.com/Philipp-M/tree-sitter-yuck", "rev": "e3d91a3c65decdea467adebe4127b8366fa47919", "sha256": "12zf5zqxh6farah2michxjhaxf97bal3x2pgrzfcp0wxz6fkns4z"}}, {"name": "prql", "source": {"git": "https://github.com/PRQL/tree-sitter-prql", "rev": "3f27cac466f030ee7d985d91eba5470e01dd21ea", "sha256": "0gp7z7ymqf15wagbik480hxm8p9xxlzkbnk7204742hdrl111zl6"}}, {"name": "po", "source": {"git": "https://github.com/erasin/tree-sitter-po", "rev": "417cee9abb2053ed26b19e7de972398f2da9b29e", "sha256": "1sm6hcyma29rw6shim4h27s0pmyby1yy4bjn9dcv9362xvanhacb"}}, {"name": "nasm", "source": {"git": "https://github.com/naclsn/tree-sitter-nasm", "rev": "a0db15db6fcfb1bf2cc8702500e55e558825c48b", "sha256": "1q4xcl0ypf0als770zpg0vv0pfxr2ysxl2vqxhc3m84s3id31sav"}}, {"name": "rst", "source": {"git": "https://github.com/stsewd/tree-sitter-rst", "rev": "25e6328872ac3a764ba8b926aea12719741103f1", "sha256": "0f53jmpjh2kcl9srwwwb7a5k24729ig96m87qjj99myqfnzahw43"}}, {"name": "capnp", "source": {"git": "https://github.com/amaanq/tree-sitter-capnp", "rev": "fc6e2addf103861b9b3dffb82c543eb6b71061aa", "sha256": "1gcz5v7i1imdsd7vxzj41iflsxx77zvvy9ngn95l8kg6rz8y3b0l"}}, {"name": "smithy", "source": {"git": "https://github.com/indoorvivants/tree-sitter-smithy", "rev": "cf8c7eb9faf7c7049839585eac19c94af231e6a0", "sha256": "0k7gfpa3pcj1ji34k0kwk1xbadkgjadfg36xfwns1fmlwzmr7jnx"}}, {"name": "vhdl", "source": {"git": "https://github.com/teburd/tree-sitter-vhdl", "rev": "c57313adee2231100db0a7880033f6865deeadb2", "sha256": "142flxd5yqg5aqx507wgqfkmgykjw5kwjq44s1g2gdgscjq4bm64"}}, {"name": "rego", "source": {"git": "https://github.com/FallenAngel97/tree-sitter-rego", "rev": "b2667c975f07b33be3ceb83bea5cfbad88095866", "sha256": "18qw5ahx6qcfq9gs6gcakl178gnnryksv6gyamyd6vypz20kwz6b"}}, {"name": "nim", "source": {"git": "https://github.com/aMOPel/tree-sitter-nim", "rev": "240239b232550e431d67de250d1b5856209e7f06", "sha256": "0gryfjqm2x9biqipzjqhasizm0zlg4b3lykcf2w8bv6wc0q0mbsh"}}, {"name": "hurl", "source": {"git": "https://github.com/pfeiferj/tree-sitter-hurl", "rev": "264c42064b61ee21abe88d0061f29a0523352e22", "sha256": "1figdv60w1a8nyfkqih1rsyzd9xq2dpcyv9l75ddja7k09p0rzsz"}}, {"name": "markdoc", "source": {"git": "https://github.com/markdoc-extra/tree-sitter-markdoc", "rev": "5ffe71b29e8a3f94823913ea9cea51fcfa7e3bf8", "sha256": "0xrrkxjbchbaj04z94l91d79jrrwx6zkafcbwig5851lfzsjbadc"}}, {"name": "opencl", "source": {"git": "https://github.com/lefp/tree-sitter-opencl", "rev": "8e1d24a57066b3cd1bb9685bbc1ca9de5c1b78fb", "sha256": "0pqfjd3sn1m8pqkj5hc3bf235jk8v7llh0xmw4470v8v2hw8ladp"}}, {"name": "just", "source": {"git": "https://github.com/IndianBoy42/tree-sitter-just", "rev": "8af0aab79854aaf25b620a52c39485849922f766", "sha256": "15hl3dsr5kxjl1kl9md2gb9bwj0ni54d9k6jv1h74b3psf4qb0l5"}}] diff --git a/pkgs/applications/editors/helix/update.py b/pkgs/applications/editors/helix/update.py deleted file mode 100755 index 196a393ae83c..000000000000 --- a/pkgs/applications/editors/helix/update.py +++ /dev/null @@ -1,47 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -i python3 -p nix-update python3 python3Packages.requests python3.pkgs.tomlkit nix-prefetch-git -import tomlkit -import json -import requests -import subprocess -from pathlib import Path - -latest_release_url = "https://api.github.com/repos/helix-editor/helix/releases/latest" - - -def get_latest_release(): - res = requests.get(latest_release_url) - res.raise_for_status() - return res.json()["tag_name"] - - -def get_grammar_config(): - res = requests.get(f"https://raw.githubusercontent.com/helix-editor/helix/{version}/languages.toml") - res.raise_for_status() - return tomlkit.parse(res.text)["grammar"] - - -def calculate_sha256(url, rev): - out = subprocess.check_output([ - "nix-prefetch-git", "--quiet", - "--url", url, - "--rev", rev]) - return json.loads(out)["sha256"] - - -version = get_latest_release() -grammars = get_grammar_config() -for grammar in grammars: - if grammar["source"].get("git") is not None: - grammar["source"]["sha256"] = calculate_sha256( - grammar["source"]["git"], grammar["source"]["rev"]) - -json_grammars = json.dumps(grammars) - -with open(Path(__file__).parent / "language-grammars.json", "w") as file: - file.write(json_grammars + "\n") - -subprocess.run([ - "nix-update", "helix", - "--version", version, -]) diff --git a/pkgs/applications/emulators/yuzu/sources.nix b/pkgs/applications/emulators/yuzu/sources.nix index 96a1039266aa..2f9b70b40767 100644 --- a/pkgs/applications/emulators/yuzu/sources.nix +++ b/pkgs/applications/emulators/yuzu/sources.nix @@ -1,19 +1,19 @@ # Generated by ./update.sh - do not update manually! -# Last updated: 2023-05-18 +# Last updated: 2023-05-30 { compatList = { - rev = "5f812033d64da3b70973463b8b160b7fa8aff61d"; + rev = "a6be5914e4e5891aafdd5dd55e84649b893cbeac"; hash = "sha256:1hdsza3wf9a0yvj6h55gsl7xqvhafvbz1i8paz9kg7l49b0gnlh1"; }; mainline = { - version = "1437"; - hash = "sha256:1yhr4kh4dq78cx2r655xrzb1mr7s85vcmwy731rng8q7v6w8j76p"; + version = "1452"; + hash = "sha256:1dmk0asrhvkd3cnng4bw294shcy9j3dd4kcsycam2vdvr08v5yb8"; }; ea = { - version = "3596"; - distHash = "sha256:0wi0rk7i7xdh52sawr52pkzhq2k63alk1xan1pkwgy5ybcqymr78"; - fullHash = "sha256:1x374y17hniada2hbs04295crb0wxxvl9lmy3h9cwwbx1jjax8y8"; + version = "3621"; + distHash = "sha256:0p8rxpwn9f269008skj7dy6qinpax93jhp33769akrprbh7f22if"; + fullHash = "sha256:1ph8frqifk42ypa0fw604k1z4kjisl35cai830cg4zhvd0vv7rn5"; }; } diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index a54ac99b362b..6a1fc89a1811 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -37,13 +37,13 @@ "vendorHash": "sha256-5m2ZZ/tuLz8zTt8B1TiokDZeQ9qJYeaVEhqMU04zV2s=" }, "akamai": { - "hash": "sha256-P/5tLtcPqhf48DqqMKKNCOrvT+I60N9rC1W/4RdFXqY=", + "hash": "sha256-IbftoN1fnnl6Z4SkW2DsPvlaNTSLc+oskJBnAM2afpg=", "homepage": "https://registry.terraform.io/providers/akamai/akamai", "owner": "akamai", "repo": "terraform-provider-akamai", - "rev": "v3.6.0", + "rev": "v4.0.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-nwl8GvS/hc07xSzM+wEwOAkT9oQcAuguHaEcM1nWjwg=" + "vendorHash": "sha256-Z7HlUJ5VuQ7rBhoprmvS6HwNZ53iUoBnfXzKTV43bzE=" }, "alicloud": { "hash": "sha256-mwYwZObU2WadA1X3EiCVh5T1iHYfPzluEHSUZtrMz98=", @@ -218,13 +218,13 @@ "vendorHash": "sha256-qIgr+ynaNSfNx1iW5RJrNHvEnlr46dBzIi+5IXYn+3Q=" }, "cloudflare": { - "hash": "sha256-vVVwWZAkTzEQ+toZOblEoq1Xg4zC4zZD4Eoi1ocU6Rc=", + "hash": "sha256-IzxNaYobiQcvXFW+Gd7XQUoo3uI4KI2jdfd9JAMw5Cw=", "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare", "owner": "cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v4.6.0", + "rev": "v4.7.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-NuvPhARQucbVEmO6iLWPZDe9VF/xROCbmC7jM7srUmE=" + "vendorHash": "sha256-jAdeCVr1hWVPwWFbxiaVP1aF8LeJFi2ua2vM9r65mKI=" }, "cloudfoundry": { "hash": "sha256-SFA0rG80BWaJHwvAWEugdVd3nR+YGflyYONOuoS++P8=", @@ -437,22 +437,22 @@ "vendorHash": "sha256-KD9X7EOH1btgLtssuz1FFOGtmfNao8HBcKJDty1wtpY=" }, "google": { - "hash": "sha256-lsI1hR9bhzFuepDDNKV761DXbdPJHOvm4OeHg4eVlgU=", + "hash": "sha256-fOgHJ7fTuMYTEO0GfYkuNRumA++geAx4UiVFMjVq3c8=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.66.0", + "rev": "v4.67.0", "spdx": "MPL-2.0", "vendorHash": "sha256-O7lg3O54PedUEwWL34H49SvSBXuGH1l5joqEXgkew5Q=" }, "google-beta": { - "hash": "sha256-iSHTFT+AbTOn+DoaMnkw3oiU4IDMEZOsj0S5TPX8800=", + "hash": "sha256-keX6FMqAaWJS8qZ1TjHye94hJ532voVp6atwDuy3u5g=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.66.0", + "rev": "v4.67.0", "spdx": "MPL-2.0", "vendorHash": "sha256-O7lg3O54PedUEwWL34H49SvSBXuGH1l5joqEXgkew5Q=" }, @@ -764,11 +764,11 @@ "vendorHash": null }, "newrelic": { - "hash": "sha256-GTjrbA1IX2OxHDdxyTprWH/ctvjlXJUvqdxqcvDA1ug=", + "hash": "sha256-Dz+aVO6RpGcgo9LCPHFdYCiJ3ja+ftJFii5wWQm0/jc=", "homepage": "https://registry.terraform.io/providers/newrelic/newrelic", "owner": "newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.23.0", + "rev": "v3.24.0", "spdx": "MPL-2.0", "vendorHash": "sha256-WjiTfHs+MEc06aNstblGKvd3cTj49JF1fvm+tuR2WH8=" }, @@ -882,11 +882,11 @@ "vendorHash": null }, "pagerduty": { - "hash": "sha256-78DCzzGya9BKzzY4DXG/H+JidqPHObKmxlDCgG08cb8=", + "hash": "sha256-nQy0LYiYoj+d8LaCRJflMwBA9obBD4XUG0oP/9nq/jY=", "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty", "owner": "PagerDuty", "repo": "terraform-provider-pagerduty", - "rev": "v2.14.6", + "rev": "v2.15.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1026,13 +1026,13 @@ "vendorHash": null }, "snowflake": { - "hash": "sha256-2eS56WAEVz1nYiYmfthharyX9giEQ/8kufAwyHCG6PM=", + "hash": "sha256-uHcmAcH2LSypfUFPhB6WmDJL00Oq6andSYSI37s/gJM=", "homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake", "owner": "Snowflake-Labs", "repo": "terraform-provider-snowflake", - "rev": "v0.64.0", + "rev": "v0.65.0", "spdx": "MIT", - "vendorHash": "sha256-lJUkSd3v8VVoOI9ywiUh7wEPyvhF9Ip2v9kJ43hCwsI=" + "vendorHash": "sha256-ZNkZ2GMSBZHz+L626VqT7pTeb8fSYkaCi84O5ggd1FM=" }, "sops": { "hash": "sha256-D1Yzs8hDimMP9y8ZRbizEhic3vGtLcZjOVSuSMUAqPk=", diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix index 75288b5ff80b..ce084c1f4a73 100644 --- a/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/pkgs/applications/science/logic/alt-ergo/default.nix @@ -2,7 +2,7 @@ let pname = "alt-ergo"; - version = "2.4.2"; + version = "2.4.3"; configureScript = "ocaml unix.cma configure.ml"; @@ -10,7 +10,7 @@ let owner = "OCamlPro"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-8pJ/1UAbheQaLFs5Uubmmf5D0oFJiPxF6e2WTZgRyAc="; + hash = "sha256-2XARGr8rLiPMOM0rBBoRv5tZvKYtkLkJctGqLYkMe7Q="; }; in @@ -20,7 +20,7 @@ let alt-ergo-lib = ocamlPackages.buildDunePackage rec { configureFlags = [ pname ]; nativeBuildInputs = [ which ]; buildInputs = with ocamlPackages; [ dune-configurator ]; - propagatedBuildInputs = with ocamlPackages; [ num ocplib-simplex seq stdlib-shims zarith ]; + propagatedBuildInputs = with ocamlPackages; [ dune-build-info num ocplib-simplex seq stdlib-shims zarith ]; preBuild = '' substituteInPlace src/lib/util/version.ml --replace 'version="dev"' 'version="${version}"' ''; diff --git a/pkgs/development/interpreters/erlang/25.nix b/pkgs/development/interpreters/erlang/25.nix index 8539738575e2..500995a8a2a3 100644 --- a/pkgs/development/interpreters/erlang/25.nix +++ b/pkgs/development/interpreters/erlang/25.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "25.3.2"; - sha256 = "cuFeHwyAyS8R7rXcJJxzE7LTZGgDr4x3qMZx63PIowM="; + version = "25.3.2.1"; + sha256 = "4PDK18/tekJHgNGECG5hv/HvwvteR+FeN6hlpB9FC9o="; } diff --git a/pkgs/development/interpreters/ruby/dev.nix b/pkgs/development/interpreters/ruby/dev.nix index 62d561fbc142..dea21118b200 100644 --- a/pkgs/development/interpreters/ruby/dev.nix +++ b/pkgs/development/interpreters/ruby/dev.nix @@ -1,5 +1,5 @@ /* An environment for development that bundles ruby, bundler and bundix - together. This avoids version conflicts where each is using a diferent + together. This avoids version conflicts where each is using a different version of each-other. */ { buildEnv, ruby, bundler, bundix }: diff --git a/pkgs/development/libraries/libcyaml/default.nix b/pkgs/development/libraries/libcyaml/default.nix index 645187368e11..99ad390896f6 100644 --- a/pkgs/development/libraries/libcyaml/default.nix +++ b/pkgs/development/libraries/libcyaml/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libcyaml"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "tlsa"; repo = "libcyaml"; rev = "v${version}"; - sha256 = "sha256-UENh8oxZm7uukCr448Nrf7devDK4SIT3DVhvXbwfjw8="; + sha256 = "sha256-iS1T8R0SW+qu0TlP5FVlDzUfQitiZMUkbJUigbxeW0Y="; }; buildInputs = [ libyaml ]; diff --git a/pkgs/development/ocaml-modules/iter/default.nix b/pkgs/development/ocaml-modules/iter/default.nix index 7d0f9366a554..167f3739d269 100644 --- a/pkgs/development/ocaml-modules/iter/default.nix +++ b/pkgs/development/ocaml-modules/iter/default.nix @@ -1,25 +1,19 @@ -{ lib, fetchFromGitHub, buildDunePackage, ocaml, dune-configurator -, result, seq +{ lib, fetchurl, buildDunePackage , mdx, ounit2, qcheck-core }: buildDunePackage rec { pname = "iter"; - version = "1.6"; + version = "1.7"; - duneVersion = "3"; + minimalOCamlVersion = "4.08"; - src = fetchFromGitHub { - owner = "c-cube"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-FbM/Vk/h4wkrBjyf9/QXTvTOA0nNqsdHP1mDnVkg1is="; + src = fetchurl { + url = "https://github.com/c-cube/iter/releases/download/v${version}/iter-${version}.tbz"; + hash = "sha256-vtcSnPMxpBwDve1zsR6cEnUsyu3JELPt2Kwu4OEEtzA="; }; - buildInputs = [ dune-configurator ]; - propagatedBuildInputs = [ result seq ]; - - doCheck = lib.versionAtLeast ocaml.version "4.08"; + doCheck = true; nativeCheckInputs = [ mdx.bin ]; checkInputs = [ ounit2 qcheck-core ]; diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index cf631fd08e41..4033336ae119 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -16,6 +16,8 @@ buildDunePackage rec { }; postPatch = lib.optionalString (lib.versionAtLeast ocaml.version "5.0") '' + substituteInPlace src/core/dune \ + --replace "(libraries bytes)" "" substituteInPlace src/unix/dune \ --replace "libraries bigarray lwt" "libraries lwt" ''; diff --git a/pkgs/development/ocaml-modules/ocplib-endian/default.nix b/pkgs/development/ocaml-modules/ocplib-endian/default.nix index 285e8de84b39..c7fa14a291d7 100644 --- a/pkgs/development/ocaml-modules/ocplib-endian/default.nix +++ b/pkgs/development/ocaml-modules/ocplib-endian/default.nix @@ -13,7 +13,8 @@ buildDunePackage rec { postPatch = lib.optionalString (lib.versionAtLeast ocaml.version "5.0") '' substituteInPlace src/dune \ - --replace "libraries ocplib_endian bigarray" "libraries ocplib_endian" + --replace "(libraries bytes)" "" \ + --replace "libraries ocplib_endian bigarray bytes" "libraries ocplib_endian" ''; minimalOCamlVersion = "4.03"; diff --git a/pkgs/development/python-modules/aesedb/default.nix b/pkgs/development/python-modules/aesedb/default.nix index 95e953e1f5a1..5dd95fe9eae5 100644 --- a/pkgs/development/python-modules/aesedb/default.nix +++ b/pkgs/development/python-modules/aesedb/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aesedb"; - version = "0.1.3"; + version = "0.1.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "skelsec"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-TXGRXo3754dEgRotDO5vSl9vj119Xday/176yem3cqk="; + hash = "sha256-QqPy68rWabRY0Y98W+odwP/10gMtLAQ0Ah2+ZLkqHPI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index f2fa360494e4..3b3ab95777d7 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.52"; + version = "9.2.53"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-F5KEoxvGkop2mcAYHYt1flWKrtJ7oPLaRhhGGaXCTAc="; + hash = "sha256-tOrnY+wCqG0gif6zo6QQS+iPszCY4LYBCMHRtRRXFf8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiosmb/default.nix b/pkgs/development/python-modules/aiosmb/default.nix index 97cbd60db1ab..b0655e0dabc3 100644 --- a/pkgs/development/python-modules/aiosmb/default.nix +++ b/pkgs/development/python-modules/aiosmb/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "aiosmb"; - version = "0.4.4"; + version = "0.4.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-IGIEmM9eZ5T+op3ctGr72oy/cU48+OHaFJaZ8DRTY38="; + hash = "sha256-Y0Z76YP1cWcfMKZOn2L6z4B+hAdibxJOYBzT3WV6FcY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiowinreg/default.nix b/pkgs/development/python-modules/aiowinreg/default.nix index 54c0f9132ef6..19959b7accd4 100644 --- a/pkgs/development/python-modules/aiowinreg/default.nix +++ b/pkgs/development/python-modules/aiowinreg/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aiowinreg"; - version = "0.0.9"; + version = "0.0.10"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "skelsec"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-FyrYqNqp0PTEHHit3Rn00jtvPOvgVy+lz3jDRJnsobI="; + hash = "sha256-PkrBjH+yeSLpwL9kH242xQKBsjv6a11k2c26qBwR6Fw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index a95a7ded9a66..e680274b3061 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.52"; + version = "9.2.53"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-EjCy8p4rqhoZx2W+8VutZj9o1WsMuH7ftfuKr1pw6YM="; + hash = "sha256-6WNzsojnYoxiykE5Jv7sw13u+L6i0NpRuE50+hV0G5Q="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index afe4ddb25965..a7671ead4fba 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.52"; + version = "9.2.53"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-cPlRbtesG7QWxoeBm8bPXkN5yZGwiSreM3zayLWerfE="; + hash = "sha256-DBUeT8E4acOHVuOmt1vlM9m3UeJwmybhZzG0Pvj5MgM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/asyauth/default.nix b/pkgs/development/python-modules/asyauth/default.nix index ab74cf9666c1..f546540c94d4 100644 --- a/pkgs/development/python-modules/asyauth/default.nix +++ b/pkgs/development/python-modules/asyauth/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "asyauth"; - version = "0.0.13"; + version = "0.0.14"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-tVvqzKsCvvSgKB3xRBMnIQLEDzCaPO/h8cM8WMpzi6M="; + hash = "sha256-EJLuSvkJrQBIrSM/dODhTtwPpnz67lmg4ZEwI4TPOVc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/asysocks/default.nix b/pkgs/development/python-modules/asysocks/default.nix index c8d8f6afbf9b..0d052fa188dd 100644 --- a/pkgs/development/python-modules/asysocks/default.nix +++ b/pkgs/development/python-modules/asysocks/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "asysocks"; - version = "0.2.5"; + version = "0.2.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-A8m6WA1SjD5awRdHtXsZNaG5vzSrtH2C23lzA1FhWlo="; + hash = "sha256-Kf2KDonjb+t7sA4jnC8mTh7fWoEDfRPhDkggb9A5E0Q="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index e3348080da02..3ba2907e9ac7 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.52"; + version = "9.2.53"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-tAEYoYj7fcXQw6MN8q5vA0eGXop83dGDiPuoADwpteU="; + hash = "sha256-ufS/xGEnyXOzFevONsaFHyHNvPnEKvkJ5NkDpnWuMT8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 970e19c9e6a6..2f8867085309 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -16,7 +16,7 @@ let # The binaries are following the argr projects release cycle - version = "9.2.52"; + version = "9.2.53"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-01NFCADCGo/frM2EKlkq4wpJ4lJeNoFoP1my+2PK73g="; + hash = "sha256-qQPWSCKhiZ5RBR2OShwc+W7QZn+Lh7487PJEnJpUOnU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/edk2-pytool-library/default.nix b/pkgs/development/python-modules/edk2-pytool-library/default.nix index 2506c5411fb9..89b81be86ac6 100644 --- a/pkgs/development/python-modules/edk2-pytool-library/default.nix +++ b/pkgs/development/python-modules/edk2-pytool-library/default.nix @@ -3,19 +3,22 @@ , fetchFromGitHub , setuptools , setuptools-scm +, pyasn1 +, pyasn1-modules +, cryptography , pytestCheckHook }: buildPythonPackage rec { pname = "edk2-pytool-library"; - version = "0.15.0"; + version = "0.15.1"; format = "pyproject"; src = fetchFromGitHub { owner = "tianocore"; repo = "edk2-pytool-library"; rev = "v${version}"; - hash = "sha256-YNXaptzsIlMXaZu8mFihsaQfmPALUcL47BFn4m8GMfY="; + hash = "sha256-25P5EASn0nU58Vs9rlVLjXZ0ZovhR5pnClZfAwjMzBQ="; }; nativeBuildInputs = [ @@ -23,6 +26,12 @@ buildPythonPackage rec { setuptools-scm ]; + propagatedBuildInputs = [ + pyasn1 + pyasn1-modules + cryptography + ]; + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/minikerberos/default.nix b/pkgs/development/python-modules/minikerberos/default.nix index c29a75377d8b..d451c52283eb 100644 --- a/pkgs/development/python-modules/minikerberos/default.nix +++ b/pkgs/development/python-modules/minikerberos/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "minikerberos"; - version = "0.4.0"; + version = "0.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-uB3J9DRZ23Hf31EkAUyxNTV7Ftgt0yjhEOiiv+Aft+w="; + hash = "sha256-WgH+VQfPe//X03SoXwC817GCMlB5Zw37w9Ol58N5yVI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/msldap/default.nix b/pkgs/development/python-modules/msldap/default.nix index 4afd120430b8..472ff27efc96 100644 --- a/pkgs/development/python-modules/msldap/default.nix +++ b/pkgs/development/python-modules/msldap/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "msldap"; - version = "0.4.7"; + version = "0.5.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-WMMqNSRDBwPQ/1ACgtuSvA50j+xNyjnxl7rTbx3uQ1w="; + hash = "sha256-ewE3rECsydNFgfh53X/oB/VyXd54nSpVsxMRZPGuR3I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/openstacksdk/default.nix b/pkgs/development/python-modules/openstacksdk/default.nix index 211dcad19252..8969fc97bf8d 100644 --- a/pkgs/development/python-modules/openstacksdk/default.nix +++ b/pkgs/development/python-modules/openstacksdk/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "openstacksdk"; - version = "1.1.0"; + version = "1.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-zU0fxSMijgy5MIAA80vnwgTqsUvSeN3BFu76R9aNdJY="; + hash = "sha256-vEs0D96AUDuDm9pyoy631jDM3lwsH/SVKEDXn8pbzn8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pypykatz/default.nix b/pkgs/development/python-modules/pypykatz/default.nix index 59253178661c..429373b47a36 100644 --- a/pkgs/development/python-modules/pypykatz/default.nix +++ b/pkgs/development/python-modules/pypykatz/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pypykatz"; - version = "0.6.6"; + version = "0.6.8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fPeEKTfRL142RIMSQxpByIAy09sXlmDjIATikc82Iuw="; + hash = "sha256-uOOPDVlx8EKgkCJmZOQxIlI0UBMNzuh/ESoIoa2TmNM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index f4acd846c3a7..e6fe051dbf96 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.52"; + version = "9.2.53"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-6cC+dr0ViHOSwgf9ubpTNIJbGFIYxWmxkPXFAKvQh0I="; + hash = "sha256-CDxy0YSGxSfugkgPvuK8CbmEFAs5DYd5bCHtuvQwrxM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/cocoapods/Gemfile-beta.lock b/pkgs/development/tools/cocoapods/Gemfile-beta.lock index 164f32125dc4..bfc2b4c58baf 100644 --- a/pkgs/development/tools/cocoapods/Gemfile-beta.lock +++ b/pkgs/development/tools/cocoapods/Gemfile-beta.lock @@ -3,7 +3,7 @@ GEM specs: CFPropertyList (3.0.6) rexml - activesupport (7.0.4.3) + activesupport (7.0.5) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -15,10 +15,10 @@ GEM json (>= 1.5.1) atomos (0.1.3) claide (1.1.0) - cocoapods (1.12.0) + cocoapods (1.12.1) addressable (~> 2.8) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.12.0) + cocoapods-core (= 1.12.1) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.6.0, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -33,7 +33,7 @@ GEM nap (~> 1.0) ruby-macho (>= 2.3.0, < 3.0) xcodeproj (>= 1.21.0, < 2.0) - cocoapods-core (1.12.0) + cocoapods-core (1.12.1) activesupport (>= 5.0, < 8) addressable (~> 2.8) algoliasearch (~> 1.0) @@ -62,7 +62,7 @@ GEM fuzzy_match (2.0.4) gh_inspector (1.1.3) httpclient (2.8.3) - i18n (1.12.0) + i18n (1.13.0) concurrent-ruby (~> 1.0) json (2.6.3) minitest (5.18.0) diff --git a/pkgs/development/tools/cocoapods/Gemfile.lock b/pkgs/development/tools/cocoapods/Gemfile.lock index 2e2ffbf4e29a..4c842e36c1ac 100644 --- a/pkgs/development/tools/cocoapods/Gemfile.lock +++ b/pkgs/development/tools/cocoapods/Gemfile.lock @@ -3,7 +3,7 @@ GEM specs: CFPropertyList (3.0.6) rexml - activesupport (7.0.4.3) + activesupport (7.0.5) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -15,10 +15,10 @@ GEM json (>= 1.5.1) atomos (0.1.3) claide (1.1.0) - cocoapods (1.12.0) + cocoapods (1.12.1) addressable (~> 2.8) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.12.0) + cocoapods-core (= 1.12.1) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.6.0, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -33,7 +33,7 @@ GEM nap (~> 1.0) ruby-macho (>= 2.3.0, < 3.0) xcodeproj (>= 1.21.0, < 2.0) - cocoapods-core (1.12.0) + cocoapods-core (1.12.1) activesupport (>= 5.0, < 8) addressable (~> 2.8) algoliasearch (~> 1.0) @@ -62,7 +62,7 @@ GEM fuzzy_match (2.0.4) gh_inspector (1.1.3) httpclient (2.8.3) - i18n (1.12.0) + i18n (1.13.0) concurrent-ruby (~> 1.0) json (2.6.3) minitest (5.18.0) diff --git a/pkgs/development/tools/cocoapods/gemset-beta.nix b/pkgs/development/tools/cocoapods/gemset-beta.nix index 3d1b7f393a77..8862a620a833 100644 --- a/pkgs/development/tools/cocoapods/gemset-beta.nix +++ b/pkgs/development/tools/cocoapods/gemset-beta.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15m0b1im6i401ab51vzr7f8nk8kys1qa0snnl741y3sir3xd07jp"; + sha256 = "1c7k5i6531z5il4q1jnbrv7x7zcl3bgnxp5fzl71rzigk6zn53ym"; type = "gem"; }; - version = "7.0.4.3"; + version = "7.0.5"; }; addressable = { dependencies = ["public_suffix"]; @@ -69,10 +69,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "071kl1d0wi0v3w4gqjh9hzf8jclk59m2xn5dynmr0waammmm1yhw"; + sha256 = "0c25gpi6vrv4fvhwfqscjq5pqqg3g3s3vjm6z8xmgbi9bl9m7ws8"; type = "gem"; }; - version = "1.12.0"; + version = "1.12.1"; }; cocoapods-core = { dependencies = ["activesupport" "addressable" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "public_suffix" "typhoeus"]; @@ -80,10 +80,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gz84agvxbcp7ngkixkgyj9dcjd3q4q8qffx0b75kzg8p31ywl5b"; + sha256 = "03hz6i56603j3zlxy9is74bgs88isrnj9y7xc6wakr4c0m238hv9"; type = "gem"; }; - version = "1.12.0"; + version = "1.12.1"; }; cocoapods-deintegrate = { groups = ["default"]; @@ -244,10 +244,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi"; + sha256 = "1yk33slipi3i1kydzrrchbi7cgisaxym6pgwlzx7ir8vjk6wl90x"; type = "gem"; }; - version = "1.12.0"; + version = "1.13.0"; }; json = { groups = ["default"]; diff --git a/pkgs/development/tools/cocoapods/gemset.nix b/pkgs/development/tools/cocoapods/gemset.nix index 1e12c69fc6bd..2a4f3e62890e 100644 --- a/pkgs/development/tools/cocoapods/gemset.nix +++ b/pkgs/development/tools/cocoapods/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15m0b1im6i401ab51vzr7f8nk8kys1qa0snnl741y3sir3xd07jp"; + sha256 = "1c7k5i6531z5il4q1jnbrv7x7zcl3bgnxp5fzl71rzigk6zn53ym"; type = "gem"; }; - version = "7.0.4.3"; + version = "7.0.5"; }; addressable = { dependencies = ["public_suffix"]; @@ -67,10 +67,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "071kl1d0wi0v3w4gqjh9hzf8jclk59m2xn5dynmr0waammmm1yhw"; + sha256 = "0c25gpi6vrv4fvhwfqscjq5pqqg3g3s3vjm6z8xmgbi9bl9m7ws8"; type = "gem"; }; - version = "1.12.0"; + version = "1.12.1"; }; cocoapods-core = { dependencies = ["activesupport" "addressable" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "public_suffix" "typhoeus"]; @@ -78,10 +78,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gz84agvxbcp7ngkixkgyj9dcjd3q4q8qffx0b75kzg8p31ywl5b"; + sha256 = "03hz6i56603j3zlxy9is74bgs88isrnj9y7xc6wakr4c0m238hv9"; type = "gem"; }; - version = "1.12.0"; + version = "1.12.1"; }; cocoapods-deintegrate = { groups = ["default"]; @@ -232,10 +232,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi"; + sha256 = "1yk33slipi3i1kydzrrchbi7cgisaxym6pgwlzx7ir8vjk6wl90x"; type = "gem"; }; - version = "1.12.0"; + version = "1.13.0"; }; json = { groups = ["default"]; diff --git a/pkgs/development/tools/database/sleek/Cargo.lock b/pkgs/development/tools/database/sleek/Cargo.lock new file mode 100644 index 000000000000..b7f385d76c7c --- /dev/null +++ b/pkgs/development/tools/database/sleek/Cargo.lock @@ -0,0 +1,470 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "anstream" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e579a7752471abc2a8268df8b20005e3eadd975f585398f17efcfd8d4927371" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is-terminal", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" + +[[package]] +name = "anstyle-parse" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "anstyle-wincon" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bcd8291a340dd8ac70e18878bc4501dd7b4ff970cfa21c207d36ece51ea88fd" +dependencies = [ + "anstyle", + "windows-sys 0.48.0", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "cc" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" + +[[package]] +name = "clap" +version = "4.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93aae7a4192245f70fe75dd9157fc7b4a5bf53e88d30bd4396f7d8f9284d5acc" +dependencies = [ + "clap_builder", + "clap_derive", + "once_cell", +] + +[[package]] +name = "clap_builder" +version = "4.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f423e341edefb78c9caba2d9c7f7687d0e72e89df3ce3394554754393ac3990" +dependencies = [ + "anstream", + "anstyle", + "bitflags", + "clap_lex", + "once_cell", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "191d9573962933b4027f932c600cd252ce27a8ad5979418fe78e43c07996f27b" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "either" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" + +[[package]] +name = "errno" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys 0.45.0", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + +[[package]] +name = "io-lifetimes" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "is-terminal" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +dependencies = [ + "hermit-abi", + "io-lifetimes", + "rustix", + "windows-sys 0.48.0", +] + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "libc" +version = "0.2.141" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" + +[[package]] +name = "linux-raw-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "once_cell" +version = "1.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" + +[[package]] +name = "proc-macro2" +version = "1.0.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rustix" +version = "0.37.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aef160324be24d31a62147fae491c14d2204a3865c7ca8c3b0d7f7bcb3ea635" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys 0.48.0", +] + +[[package]] +name = "sleek" +version = "0.3.0" +dependencies = [ + "clap", + "glob", + "sqlformat", + "thiserror", +] + +[[package]] +name = "sqlformat" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c12bc9199d1db8234678b7051747c07f517cdcf019262d1847b94ec8b1aee3e" +dependencies = [ + "itertools", + "nom", + "unicode_categories", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "syn" +version = "2.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "thiserror" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "unicode-ident" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" + +[[package]] +name = "unicode_categories" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.0", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" diff --git a/pkgs/development/tools/database/sleek/default.nix b/pkgs/development/tools/database/sleek/default.nix new file mode 100644 index 000000000000..6efaef86a105 --- /dev/null +++ b/pkgs/development/tools/database/sleek/default.nix @@ -0,0 +1,32 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "sleek"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "nrempel"; + repo = "sleek"; + rev = "v${version}"; + hash = "sha256-VQ0LmKhFsC12qoXCFHxtV5E+J7eRvZMVH0j+5r8pDk8="; + }; + + # 0.3.0 has been tagged before the actual Cargo.lock bump, resulting in an inconsitent lock file. + # To work around this, the Cargo.lock below is from the commit right after the tag: + # https://github.com/nrempel/sleek/commit/18c5457a813a16e3eebfc1c6f512131e6e8daa02 + postPatch = '' + ln -s --force ${./Cargo.lock} Cargo.lock + ''; + + cargoLock.lockFile = ./Cargo.lock; + + meta = with lib; { + description = "A CLI tool for formatting SQL"; + homepage = "https://github.com/nrempel/sleek"; + license = licenses.mit; + maintainers = with maintainers; [ xrelkd ]; + }; +} diff --git a/pkgs/servers/rustypaste/default.nix b/pkgs/servers/rustypaste/default.nix index 24fd1f4d2eed..aa520533f9e4 100644 --- a/pkgs/servers/rustypaste/default.nix +++ b/pkgs/servers/rustypaste/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rustypaste"; - version = "0.9.1"; + version = "0.10.0"; - src = fetchFromGitHub{ + src = fetchFromGitHub { owner = "orhun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-e7GZlR3P0Jk8JNIHvEi1EWlyw6o+MeYNG+2uDKgo9Z8="; + sha256 = "sha256-qzSrxkq63SFcP/sQeORqG9+c+ct/n29jdIFUL9jut0w="; }; - cargoHash = "sha256-QFRZyJFZNg/IqEBAuBPE+hzKV4A6TVVU5Knhsgz279E="; + cargoHash = "sha256-EDnc3P4sIpUyCDSozvaVeWI3y2KWDXKVcnkZ7M3Xx4w="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices @@ -19,10 +19,10 @@ rustPlatform.buildRustPackage rec { # Some tests need network checkFlags = [ - "--skip paste::tests::test_paste_data" - "--skip server::tests::test_upload_file" - "--skip server::tests::test_upload_remote_file" - "--skip util::tests::test_get_expired_files" + "--skip=paste::tests::test_paste_data" + "--skip=server::tests::test_upload_file" + "--skip=server::tests::test_upload_remote_file" + "--skip=util::tests::test_get_expired_files" ]; meta = with lib; { diff --git a/pkgs/tools/bluetooth/blueberry/default.nix b/pkgs/tools/bluetooth/blueberry/default.nix index a9c45f27abcd..ac64242fe646 100644 --- a/pkgs/tools/bluetooth/blueberry/default.nix +++ b/pkgs/tools/bluetooth/blueberry/default.nix @@ -6,6 +6,7 @@ , gnome , gobject-introspection , intltool +, libnotify , pavucontrol , python3Packages , util-linux @@ -33,6 +34,7 @@ stdenv.mkDerivation rec { bluez-tools cinnamon.xapp gnome.gnome-bluetooth_1_0 + libnotify python3Packages.python util-linux ]; diff --git a/pkgs/tools/misc/shell_gpt/default.nix b/pkgs/tools/misc/shell_gpt/default.nix index b43a6fd9d165..03fdefb7a526 100644 --- a/pkgs/tools/misc/shell_gpt/default.nix +++ b/pkgs/tools/misc/shell_gpt/default.nix @@ -6,12 +6,12 @@ python3.pkgs.buildPythonApplication rec { pname = "shell_gpt"; - version = "0.9.0"; + version = "0.9.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-KzW9yI1TGG2hFKeXHFqqYCLw/PB9+lJoTgyWrXxCHpo="; + sha256 = "sha256-k57oPqUpBuqoJFJ2JU3O4d4ESqb1DqJam/L+lJgBWIQ="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/security/dontgo403/default.nix b/pkgs/tools/security/dontgo403/default.nix index 4588d6a2d94a..2fdd35e68fe8 100644 --- a/pkgs/tools/security/dontgo403/default.nix +++ b/pkgs/tools/security/dontgo403/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dontgo403"; - version = "0.9.1"; + version = "0.9.3"; src = fetchFromGitHub { owner = "devploit"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-FmC+VEVZVpKEDV8IH8D+lt0oHulu2AOD8uUrHxno/Bk="; + hash = "sha256-WGI98IUyvcPGD9IbIF1ZWa72Dnork6xE+XoVYUx1zAc="; }; - vendorHash = "sha256-WzTen78m/CZypdswwncuVzU3iChBDS26URWGSWQCdfk="; + vendorHash = "sha256-IGnTbuaQH8A6aKyahHMd2RyFRh4WxZ3Vx/A9V3uelRg="; meta = with lib; { description = "Tool to bypass 40X response codes"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dfc406263119..fa879730673d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16635,6 +16635,8 @@ with pkgs; shmig = callPackage ../development/tools/database/shmig { }; + sleek = callPackage ../development/tools/database/sleek { }; + smlfmt = callPackage ../development/tools/smlfmt { }; # smlnjBootstrap should be redundant, now that smlnj works on Darwin natively