diff options
63 files changed, 1293 insertions, 713 deletions
diff --git a/.github/workflows/check-by-name.yml b/.github/workflows/check-by-name.yml index 9c46ecea691..c6cd142bfa6 100644 --- a/.github/workflows/check-by-name.yml +++ b/.github/workflows/check-by-name.yml @@ -18,14 +18,34 @@ jobs: runs-on: ubuntu-latest steps: - name: Resolving the merge commit + env: + GH_TOKEN: ${{ github.token }} run: | - if result=$(git ls-remote --exit-code ${{ github.event.pull_request.base.repo.clone_url }} refs/pull/${{ github.event.pull_request.number }}/merge 2>&1); then - mergedSha=$(cut -f1 <<< "$result") - echo "The PR appears to not have any conflicts, checking the merge commit $mergedSha" + # This checks for mergeability of a pull request as recommended in + # https://docs.github.com/en/rest/guides/using-the-rest-api-to-interact-with-your-git-database?apiVersion=2022-11-28#checking-mergeability-of-pull-requests + while true; do + echo "Checking whether the pull request can be merged" + prInfo=$(gh api \ + -H "Accept: application/vnd.github+json" \ + -H "X-GitHub-Api-Version: 2022-11-28" \ + /repos/"$GITHUB_REPOSITORY"/pulls/${{ github.event.pull_request.number }}) + mergeable=$(jq -r .mergeable <<< "$prInfo") + mergedSha=$(jq -r .merge_commit_sha <<< "$prInfo") + + if [[ "$mergeable" == "null" ]]; then + # null indicates that GitHub is still computing whether it's mergeable + # Wait a couple seconds before trying again + echo "GitHub is still computing whether this PR can be merged, waiting 5 seconds before trying again" + sleep 5 + else + break + fi + done + + if [[ "$mergeable" == "true" ]]; then + echo "The PR can be merged, checking the merge commit $mergedSha" else - echo "The PR may have a merge conflict" - echo "'git ls-remote' output was:" - echo "$result" + echo "The PR cannot be merged, it has a merge conflict" exit 1 fi echo "mergedSha=$mergedSha" >> "$GITHUB_ENV" diff --git a/doc/builders/fetchers.chapter.md b/doc/builders/fetchers.chapter.md index 75a261db8dc..ba7b1b19012 100644 --- a/doc/builders/fetchers.chapter.md +++ b/doc/builders/fetchers.chapter.md @@ -243,3 +243,26 @@ or *** ``` +## `fetchFromBittorrent` {#fetchfrombittorrent} + +`fetchFromBittorrent` expects two arguments. `url` which can either be a Magnet URI (Magnet Link) such as `magnet:?xt=urn:btih:dd8255ecdc7ca55fb0bbf81323d87062db1f6d1c` or an HTTP URL pointing to a `.torrent` file. It can also take a `config` argument which will craft a `settings.json` configuration file and give it to `transmission`, the underlying program that is performing the fetch. The available config options for `transmission` can be found [here](https://github.com/transmission/transmission/blob/main/docs/Editing-Configuration-Files.md#options) + +``` +{ fetchFromBittorrent }: + +fetchFromBittorrent { + config = { peer-limit-global = 100; }; + url = "magnet:?xt=urn:btih:dd8255ecdc7ca55fb0bbf81323d87062db1f6d1c"; + sha256 = ""; +} +``` + +### Parameters {#fetchfrombittorrent-parameters} + +- `url`: Magnet URI (Magnet Link) such as `magnet:?xt=urn:btih:dd8255ecdc7ca55fb0bbf81323d87062db1f6d1c` or an HTTP URL pointing to a `.torrent` file. + +- `backend`: Which bittorrent program to use. Default: `"transmission"`. Valid values are `"rqbit"` or `"transmission"`. These are the two most suitable torrent clients for fetching in a fixed-output derivation at the time of writing, as they can be easily exited after usage. `rqbit` is written in Rust and has a smaller closure size than `transmission`, and the performance and peer discovery properties differs between these clients, requiring experimentation to decide upon which is the best. + +- `config`: When using `transmission` as the `backend`, a json configuration can + be supplied to transmission. Refer to the [upstream documentation](https://github.com/transmission/transmission/blob/main/docs/Editing-Configuration-Files.md) for information on how to configure. + diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index e293b95900e..5d8afdc291a 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -250,6 +250,8 @@ - The binary of the package `cloud-sql-proxy` has changed from `cloud_sql_proxy` to `cloud-sql-proxy`. +- Garage has been upgraded to 0.9.x. `services.garage.package` now needs to be explicitly set, so version upgrades can be done in a controlled fashion. For this, we expose `garage_x_y` attributes which can be set here. + - The `woodpecker-*` CI packages have been updated to 1.0.0. This release is wildly incompatible with the 0.15.X versions that were previously packaged. Please read [upstream's documentation](https://woodpecker-ci.org/docs/next/migrations#100) to learn how to update your CI configurations. - The Caddy module gained a new option named `services.caddy.enableReload` which is enabled by default. It allows reloading the service instead of restarting it, if only a config file has changed. This option must be disabled if you have turned off the [Caddy admin API](https://caddyserver.com/docs/caddyfile/options#admin). If you keep this option enabled, you should consider setting [`grace_period`](https://caddyserver.com/docs/caddyfile/options#grace-period) to a non-infinite value to prevent Caddy from delaying the reload indefinitely. diff --git a/nixos/modules/programs/regreet.nix b/nixos/modules/programs/regreet.nix index 640bc259573..0fd9cf23298 100644 --- a/nixos/modules/programs/regreet.nix +++ b/nixos/modules/programs/regreet.nix @@ -36,6 +36,19 @@ in ''; }; + cageArgs = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ "-s" ]; + example = lib.literalExpression + '' + [ "-s" "-m" "last" ] + ''; + description = lib.mdDoc '' + Additional arguments to be passed to + [cage](https://github.com/cage-kiosk/cage). + ''; + }; + extraCss = lib.mkOption { type = lib.types.either lib.types.path lib.types.lines; default = ""; @@ -50,7 +63,7 @@ in config = lib.mkIf cfg.enable { services.greetd = { enable = lib.mkDefault true; - settings.default_session.command = lib.mkDefault "${pkgs.dbus}/bin/dbus-run-session ${lib.getExe pkgs.cage} -s -- ${lib.getExe cfg.package}"; + settings.default_session.command = lib.mkDefault "${pkgs.dbus}/bin/dbus-run-session ${lib.getExe pkgs.cage} ${lib.escapeShellArgs cfg.cageArgs} -- ${lib.getExe cfg.package}"; }; environment.etc = { diff --git a/nixos/modules/services/web-servers/garage.nix b/nixos/modules/services/web-servers/garage.nix index 80fb24fe2c5..731d5315f23 100644 --- a/nixos/modules/services/web-servers/garage.nix +++ b/nixos/modules/services/web-servers/garage.nix @@ -4,7 +4,7 @@ with lib; let cfg = config.services.garage; - toml = pkgs.formats.toml {}; + toml = pkgs.formats.toml { }; configFile = toml.generate "garage.toml" cfg.settings; in { @@ -19,8 +19,8 @@ in extraEnvironment = mkOption { type = types.attrsOf types.str; description = lib.mdDoc "Extra environment variables to pass to the Garage server."; - default = {}; - example = { RUST_BACKTRACE="yes"; }; + default = { }; + example = { RUST_BACKTRACE = "yes"; }; }; environmentFile = mkOption { @@ -30,7 +30,7 @@ in }; logLevel = mkOption { - type = types.enum (["info" "debug" "trace"]); + type = types.enum ([ "info" "debug" "trace" ]); default = "info"; example = "debug"; description = lib.mdDoc "Garage log level, see <https://garagehq.deuxfleurs.fr/documentation/quick-start/#launching-the-garage-server> for examples."; @@ -65,12 +65,8 @@ in }; package = mkOption { - # TODO: when 23.05 is released and if Garage 0.9 is the default, put a stateVersion check. - default = if versionAtLeast config.system.stateVersion "23.05" then pkgs.garage_0_8 - else pkgs.garage_0_7; - defaultText = literalExpression "pkgs.garage_0_7"; type = types.package; - description = lib.mdDoc "Garage package to use, if you are upgrading from a major version, please read NixOS and Garage release notes for upgrade instructions."; + description = lib.mdDoc "Garage package to use, needs to be set explicitly. If you are upgrading from a major version, please read NixOS and Garage release notes for upgrade instructions."; }; }; diff --git a/nixos/tests/garage/basic.nix b/nixos/tests/garage/basic.nix index b6df1e72af9..88d747ea33b 100644 --- a/nixos/tests/garage/basic.nix +++ b/nixos/tests/garage/basic.nix @@ -1,4 +1,4 @@ -args@{ mkNode, ... }: +args@{ mkNode, ver, ... }: (import ../make-test-python.nix ({ pkgs, ...} : { name = "garage-basic"; meta = { @@ -52,7 +52,7 @@ args@{ mkNode, ... }: machine.succeed(f"garage layout apply --version {version}") def create_api_key(machine: Machine, key_name: str) -> S3Key: - output = machine.succeed(f"garage key new --name {key_name}") + output = machine.succeed(f"garage key ${if ver == "0_8" then "new --name" else "create"} {key_name}") m = key_creation_regex.match(output) if not m or not m.group('key_id') or not m.group('secret_key'): raise ValueError('Cannot parse API key data') @@ -90,7 +90,7 @@ args@{ mkNode, ... }: single_node.wait_for_open_port(3900) # Now Garage is initialized. single_node_id = get_node_id(single_node) - apply_garage_layout(single_node, [f'-z qemutest -c 1 "{single_node_id}"']) + apply_garage_layout(single_node, [f'-z qemutest -c ${if ver == "0_8" then "1" else "1G"} "{single_node_id}"']) # Now Garage is operational. test_bucket_writes(single_node) test_bucket_over_http(single_node) diff --git a/nixos/tests/garage/default.nix b/nixos/tests/garage/default.nix index 0a1ccde056b..a42236e9a5b 100644 --- a/nixos/tests/garage/default.nix +++ b/nixos/tests/garage/default.nix @@ -44,10 +44,11 @@ let in foldl (matrix: ver: matrix // { - "basic${toString ver}" = import ./basic.nix { inherit system pkgs; mkNode = mkNode pkgs."garage_${ver}"; }; - "with-3node-replication${toString ver}" = import ./with-3node-replication.nix { inherit system pkgs; mkNode = mkNode pkgs."garage_${ver}"; }; + "basic${toString ver}" = import ./basic.nix { inherit system pkgs ver; mkNode = mkNode pkgs."garage_${ver}"; }; + "with-3node-replication${toString ver}" = import ./with-3node-replication.nix { inherit system pkgs ver; mkNode = mkNode pkgs."garage_${ver}"; }; }) {} [ "0_8" + "0_9" ] diff --git a/nixos/tests/garage/with-3node-replication.nix b/nixos/tests/garage/with-3node-replication.nix index d372ad1aa00..d4387b198d9 100644 --- a/nixos/tests/garage/with-3node-replication.nix +++ b/nixos/tests/garage/with-3node-replication.nix @@ -1,4 +1,4 @@ -args@{ mkNode, ... }: +args@{ mkNode, ver, ... }: (import ../make-test-python.nix ({ pkgs, ...} : { name = "garage-3node-replication"; @@ -55,7 +55,7 @@ args@{ mkNode, ... }: machine.succeed(f"garage layout apply --version {version}") def create_api_key(machine: Machine, key_name: str) -> S3Key: - output = machine.succeed(f"garage key new --name {key_name}") + output = machine.succeed(f"garage key ${if ver == "0_8" then "new --name" else "create"} {key_name}") m = key_creation_regex.match(output) if not m or not m.group('key_id') or not m.group('secret_key'): raise ValueError('Cannot parse API key data') @@ -110,7 +110,7 @@ args@{ mkNode, ... }: zones = ["nixcon", "nixcon", "paris_meetup", "fosdem"] apply_garage_layout(node1, [ - f'{ndata.node_id} -z {zones[index]} -c 1' + f'{ndata.node_id} -z {zones[index]} -c ${if ver == "0_8" then "1" else "1G"}' for index, ndata in enumerate(node_ids.values()) ]) # Now Garage is operational. diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 332a3fdd6a7..ecd22ae6102 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -29,12 +29,12 @@ final: prev: ChatGPT-nvim = buildVimPlugin { pname = "ChatGPT.nvim"; - version = "2023-10-10"; + version = "2023-10-16"; src = fetchFromGitHub { owner = "jackMort"; repo = "ChatGPT.nvim"; - rev = "aa8a96901662199857e93dd9a93e262e0d36be4c"; - sha256 = "0cpvm62cg8k6pa6zp6jvjsam5af0kvfn1y223kar5a0n13mckzd1"; + rev = "9f8062c7c40ec082c49f10e20818333a972b8063"; + sha256 = "0k8y48rrzqf8r1mbyi370grgxa28612qwm67mwsk3zhnm3496060"; }; meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/"; }; @@ -173,24 +173,24 @@ final: prev: LazyVim = buildVimPlugin { pname = "LazyVim"; - version = "2023-10-10"; + version = "2023-10-17"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "e8c26c70e27d468cec11926890105d61f99f9218"; - sha256 = "0mlh9yrp0f7w5fmrhb37fh63kmnz9pfp56r6wc0wzydjidlda6sc"; + rev = "c711309a673a755652a90a080fd23dbab5dd61d5"; + sha256 = "1cyv4mhvysv8yrfp80kjnr56jd35rg4sb8bf72s1p8sx81ma3lc9"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; }; LeaderF = buildVimPlugin { pname = "LeaderF"; - version = "2023-09-25"; + version = "2023-10-17"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "a77f45791edeaa82fa75c5959ca73a59d7549549"; - sha256 = "1pw6jk6qlgba87gcdr7iawmbyfa48qy5zf63ghrrddfh1850gxsj"; + rev = "2c85c8b160fb13d8af4fac3efbd6d48badf146cf"; + sha256 = "1z2y7pzk0fl8yphwsbfbdhhwcj2xlzn9bwfmrdqhjs9p722mqgjn"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -305,12 +305,12 @@ final: prev: SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "2023-10-10"; + version = "2023-10-17"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "854b38820036d81c5e6af1cae8797776ae5df56a"; - sha256 = "05dm3in9ic7n1p9hfw7dfc78zflf9a9ycvxfwgcl4czivxpvbn62"; + rev = "847f69b4bd50ad09c7d66943bc690682a3e35573"; + sha256 = "0jg3hdw26s8bmfirdi2nbchkmkakmggl0h5x2jx7hn5d9yn3ps4h"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -522,12 +522,12 @@ final: prev: aerial-nvim = buildVimPlugin { pname = "aerial.nvim"; - version = "2023-10-11"; + version = "2023-10-16"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "c383f45ec061031635488079f52f765c6986b7de"; - sha256 = "1dkinrbppxgz0n0cvbcfj7n64l6w5lhi01627c1k0ylmiracpjrc"; + rev = "ffdda791c0d739154a73af09e4ed14c9147a354b"; + sha256 = "0v9p62znlk17jx0i9c65dcz651q0p4a7fkfriv96hjqxih560sl6"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -811,12 +811,12 @@ final: prev: aurora = buildVimPlugin { pname = "aurora"; - version = "2023-09-09"; + version = "2023-10-12"; src = fetchFromGitHub { owner = "ray-x"; repo = "aurora"; - rev = "2ff7e8d4f7fcf8bfb4e05280049c390d71371869"; - sha256 = "0g7k0r1lfkw3km6drcv6zy29yjhc0szqlhjxrp5zdps186fx50hj"; + rev = "3fc8e5a30e7cdbabb34f5e18865c4d1c38755308"; + sha256 = "1jjjf4zy3mgmcfpjddjdf1c1vy3w0hz7akjk7m08wvclq16l8773"; }; meta.homepage = "https://github.com/ray-x/aurora/"; }; @@ -1327,12 +1327,12 @@ final: prev: clangd_extensions-nvim = buildVimPlugin { pname = "clangd_extensions.nvim"; - version = "2023-09-08"; + version = "2023-10-15"; src = fetchFromGitHub { owner = "p00f"; repo = "clangd_extensions.nvim"; - rev = "bafed83f79b5779f5b43e8e015e13ca99dcd8b3a"; - sha256 = "0v703kl34a6cx863m1ah347bg3fk06mr0780cxnz547dpc8dddbm"; + rev = "34c8eaa12be192e83cd4865ce2375e9f53e728f2"; + sha256 = "0jfbx2a8yfnp8k1x1c003f1mpvi05kaydla8y07h0lm3nlkdbvr3"; }; meta.homepage = "https://github.com/p00f/clangd_extensions.nvim/"; }; @@ -1807,12 +1807,12 @@ final: prev: cmp-snippy = buildVimPlugin { pname = "cmp-snippy"; - version = "2023-06-15"; + version = "2023-10-12"; src = fetchFromGitHub { owner = "dcampos"; repo = "cmp-snippy"; - rev = "c4dc31232c510cd32d4708701e6f06746d46df90"; - sha256 = "1713shiq0cdm2igy3wf5ryjv4wfvbnvrg9xf17klw3hjhdknvyax"; + rev = "6e39210aa3a74e2bf6462f492eaf0d436cd2b7d3"; + sha256 = "1l4wrgkxwmw7vyjxl2y30f3xng7qaacvas4g0whqz2ybcl03rv5j"; }; meta.homepage = "https://github.com/dcampos/cmp-snippy/"; }; @@ -2047,12 +2047,12 @@ final: prev: codeium-vim = buildVimPlugin { pname = "codeium.vim"; - version = "2023-10-11"; + version = "2023-10-14"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.vim"; - rev = "77940bd77d55ddc858e44aa21b1741b5cc37fcc5"; - sha256 = "1rvb9vrzl453znxs18kfi9c3xf850lry1l3i76k9ansq7n1ly6xa"; + rev = "6b0f2bbbbd7669af50775ad27eff0077858aa9b8"; + sha256 = "0i4y0nl9ncmsz4sal33mnah99gp8v67adl5rpqrwzami4ms1ji4g"; }; meta.homepage = "https://github.com/Exafunction/codeium.vim/"; }; @@ -2551,12 +2551,12 @@ final: prev: dashboard-nvim = buildVimPlugin { pname = "dashboard-nvim"; - version = "2023-10-11"; + version = "2023-10-16"; src = fetchFromGitHub { owner = "nvimdev"; repo = "dashboard-nvim"; - rev = "8721edccead31c07c2cda0bc5ac75b0491b5adcd"; - sha256 = "1g6fhig46bgw8zq13r0f4h6hbsakkvwqn7jlq8iagxp79ga0cwzh"; + rev = "fd68b9d05aedc57e5d97a6b66a4e3db877872f64"; + sha256 = "1rdljb9kpr45dpapjxx2msw3v721bai6icf0xj22dd128z05ivzg"; }; meta.homepage = "https://github.com/nvimdev/dashboard-nvim/"; }; @@ -2949,12 +2949,12 @@ final: prev: diffview-nvim = buildVimPlugin { pname = "diffview.nvim"; - version = "2023-10-05"; + version = "2023-10-11"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "0437ef8bfdd67156d87140d692840a3c2824fa20"; - sha256 = "09qkfxiqw9ql0imvqqvvpk9pkdjrzyyj7aglljy9y4y4s57d8lgp"; + rev = "d38c1b5266850f77f75e006bcc26213684e1e141"; + sha256 = "1byqdh3x2yy1rj3gq0hyxpxwzlipvhv07ni9gz4644ssavjhalb6"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -3081,12 +3081,12 @@ final: prev: edgy-nvim = buildVimPlugin { pname = "edgy.nvim"; - version = "2023-09-30"; + version = "2023-10-14"; src = fetchFromGitHub { owner = "folke"; repo = "edgy.nvim"; - rev = "70e334c9cd7915aedde3255ade01ceeebe735b53"; - sha256 = "0zcm2p3qwiz2vkj4h4jy30dvphb6j6j8kyl3pzaxkiwlqlslsfma"; + rev = "8355be45610afdf79a0bab32b91ee297997455b4"; + sha256 = "0hjlxkyhi5aw6b157i9hr2cdcz63r0qag0l3hf2hcmjzvjjb51ls"; }; meta.homepage = "https://github.com/folke/edgy.nvim/"; }; @@ -3384,24 +3384,24 @@ final: prev: flash-nvim = buildVimPlugin { pname = "flash.nvim"; - version = "2023-10-05"; + version = "2023-10-17"; src = fetchFromGitHub { owner = "folke"; repo = "flash.nvim"; - rev = "6d76c5dee65181ab55cbdfb0760260e800d643f4"; - sha256 = "05dcjfp51h5fpwaprpb9azrfljxjvw48cs4xc41ih5jnn4rfcj8i"; + rev = "48817af25f51c0590653bbc290866e4890fe1cbe"; + sha256 = "0cf1ll91mhqw73p3y366fxylrq0y222jl2kb8sxf2s4gisxpppcg"; }; meta.homepage = "https://github.com/folke/flash.nvim/"; }; flatten-nvim = buildVimPlugin { pname = "flatten.nvim"; - version = "2023-10-03"; + version = "2023-10-11"; src = fetchFromGitHub { owner = "willothy"; repo = "flatten.nvim"; - rev = "6386dce660798e662084ad7acee14522c37df708"; - sha256 = "12b5n6lyynzsyxwz80hpiv9v21p7dn07zl949ypvrk1gqbfwzk52"; + rev = "f75bd1eae9aa826dda5ddc3a8cf5a0efa6df046b"; + sha256 = "094cmx9k03lh0ak8wnfc70s2ca81r0qddgcraja8px04c2fm5ln1"; }; meta.homepage = "https://github.com/willothy/flatten.nvim/"; }; @@ -3624,24 +3624,24 @@ final: prev: fzf-lua = buildVimPlugin { pname = "fzf-lua"; - version = "2023-10-07"; + version = "2023-10-17"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "c1de84f9c9cb227d2bef65643625f1fb8207bf8f"; - sha256 = "1bhv0h2is49xfbrgj8p4is8nav47bq3rf1cs6mv9bfxi5law7ad7"; + rev = "aeab02f60cab6c6caf8060eb183796a0dc030576"; + sha256 = "1cqk1fmm84c80x2x637bdgzawm02r67ipbc0m5mrzpn9rbbg52hi"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; fzf-vim = buildVimPlugin { pname = "fzf.vim"; - version = "2023-10-06"; + version = "2023-10-14"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "f3b82091a651a643ef18b220cd3e154d76a54462"; - sha256 = "13ny6wl9qcqkzxpd8q3izrqa37xlvzk2jkf24nfzxaacrh9yvic9"; + rev = "d1016dbd7cec2d2a3bb5863776c84b4034e4b85e"; + sha256 = "1l4m20s2iqz6dcphqpp5xnvrbh0dl0mkchs2fmr4vjz9nw7sl1mi"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -3684,12 +3684,12 @@ final: prev: ghcid = buildVimPlugin { pname = "ghcid"; - version = "2023-07-02"; + version = "2023-10-15"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "19b0e912da74341993a005aa53a0c57fd2afc800"; - sha256 = "0vczhvbm62cac3vz9zbxhgimcgyqd5g33mc2sa46f45migcmvikz"; + rev = "b7dc5c4ee640b6c8137ecfd0a2b50df278015221"; + sha256 = "0cp6m8w9pmx3pzw1qyh0gm4c2z8akg1mwh27k9m0jgw1w00yqd87"; }; meta.homepage = "https://github.com/ndmitchell/ghcid/"; }; @@ -3720,12 +3720,12 @@ final: prev: git-blame-nvim = buildVimPlugin { pname = "git-blame.nvim"; - version = "2023-09-29"; + version = "2023-10-12"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "39df33dad2cbf4eb9d17264bcda0c12e670ef1c2"; - sha256 = "0faaqj4a0nz005gl1r3hp07zrckq00v9ik0g04wwzbr0phccka8q"; + rev = "e4dafc79cc7dcf4eec0547dbc6f3f3821b2f2b14"; + sha256 = "004l5kd4q4cfpinp9i5p7c7mv3jm5bcaybq7kiwmpw2d6adp5hg8"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; @@ -3852,12 +3852,12 @@ final: prev: go-nvim = buildVimPlugin { pname = "go.nvim"; - version = "2023-10-11"; + version = "2023-10-16"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "2f0c71162972833f48827d27fb96d96d19a8e698"; - sha256 = "0wbs6g46w6gl502jpndahhx7adpq3cqbfdmn94cnzgn2zsmfr40y"; + rev = "d73ea5bc00f0d7b726b0ddfc29cea17a544459ba"; + sha256 = "1qaav736d4k70bixwc5qrf4pi9983b3i92bwnnvairg69b3fwa59"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; }; @@ -4067,12 +4067,12 @@ final: prev: haskell-tools-nvim = buildNeovimPlugin { pname = "haskell-tools.nvim"; - version = "2023-10-08"; + version = "2023-10-15"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "ce1025ac4a1bae816de82232c783faadb172a028"; - sha256 = "10cfx19vg5za2y5ikjpnk6lcn4991yjl5kgbzidxknr6bp7z2jfr"; + rev = "f8c13fd41c09df18a25b20c44db85fcdfa8e04d9"; + sha256 = "0nb75d1hrgx555sh5pq9f4znk8kqkb51g4l6wfv2fqy5masn1zkr"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -4342,12 +4342,12 @@ final: prev: image-nvim = buildVimPlugin { pname = "image.nvim"; - version = "2023-10-09"; + version = "2023-10-12"; src = fetchFromGitHub { owner = "3rd"; repo = "image.nvim"; - rev = "5394e0b552221f2e1c149a01a47a69efcbe07258"; - sha256 = "03n61315zvl7pydiagw77hm7pdlhx5hvbvws75swdv14bg9ajg7n"; + rev = "4033806015457cc4fe4a6706a21949d9c0fb4c14"; + sha256 = "0hawknjgqsjjnzyixlj1946rpvav4xf6bfisria6vnf1pgqga40r"; }; meta.homepage = "https://github.com/3rd/image.nvim/"; }; @@ -4414,12 +4414,12 @@ final: prev: indent-blankline-nvim = buildVimPlugin { pname = "indent-blankline.nvim"; - version = "2023-10-11"; + version = "2023-10-17"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "1bee85e1789f61e5ee54e5a18f8fa193099dca99"; - sha256 = "053hyz6fncp19j8lp09c0kkdlaabjq44zz0wrvqyzlx4kd141jdd"; + rev = "9301e434dd41154ffe5c3d5b8a5c9acd075ebeff"; + sha256 = "1m27krw7zdlbnnip046acnndkniif2a6kg7aj61mf6l1ikbzy9x2"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -4619,12 +4619,12 @@ final: prev: jq-vim = buildVimPlugin { pname = "jq.vim"; - version = "2023-10-06"; + version = "2023-10-17"; src = fetchFromGitHub { owner = "vito-c"; repo = "jq.vim"; - rev = "a6d49bd87d9b1382a574cb8b2532242cddafb20c"; - sha256 = "0ycfrgpa3y6c04c9a935b6gf79ck1fspppmxddfz12myp23g9895"; + rev = "6f10c6977d46cbb3b3d0f2170e726f36af588bc2"; + sha256 = "0fzzqixnzhv2k8dhznn9yzx6h4ivc960dbj7qlbp3czs9fvs8x76"; }; meta.homepage = "https://github.com/vito-c/jq.vim/"; }; @@ -4775,12 +4775,12 @@ final: prev: lazy-nvim = buildVimPlugin { pname = "lazy.nvim"; - version = "2023-10-10"; + version = "2023-10-17"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "73fbf5ccabd0233653bdeb4bb2b07fcfa97b57e0"; - sha256 = "0x4rhy18jhmjm6k6p8v6m5wahrhhin4djc8ags4yg206vgf2z3fi"; + rev = "7613ab2abb1bd99e039ae02030bc2c48b7626925"; + sha256 = "0n2xzi8n8ywn7w3zkmp7sx9di46m1k2ym6072awbi2wlknlxxxxs"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; @@ -4799,12 +4799,12 @@ final: prev: lean-nvim = buildVimPlugin { pname = "lean.nvim"; - version = "2023-10-10"; + version = "2023-10-15"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "485a0853094f78e41bd8c73b4297c6856dede5cb"; - sha256 = "1mw572dfdj7y3d4hyvy1i18669ca9spxxpxmcdj3fmfpzrlrhsln"; + rev = "811730250fb2a1aba424dbbdde528d9087807feb"; + sha256 = "0ddn7s5kvkfjpj896al22il1sjjr1c3xzby353y1g3bvcjrli1ji"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -4847,12 +4847,12 @@ final: prev: legendary-nvim = buildVimPlugin { pname = "legendary.nvim"; - version = "2023-10-10"; + version = "2023-10-17"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "935b9153ca3f634c94667f4d025c0d0707174fd9"; - sha256 = "1wj7mkm0sxs38g9dy4y8hl12pcvwha9ck7vircychlbr3nxzkxmw"; + rev = "bf39c4a792fb12dc29d825f072cb72aea5bce61b"; + sha256 = "03pjgi2bkkycadpwh7grmrl7lchgfg3g79q7iplw6s4p8rxvizs2"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -5147,12 +5147,12 @@ final: prev: lsp-overloads-nvim = buildVimPlugin { pname = "lsp-overloads.nvim"; - version = "2023-08-13"; + version = "2023-10-17"; src = fetchFromGitHub { owner = "Issafalcon"; repo = "lsp-overloads.nvim"; - rev = "42d68e9f33dcda67591f0c406d98b480915f94ad"; - sha256 = "096z4wz51492qgbq7yazxpsbkzcb49acx9y4ifnwlb9zl1h6xsjj"; + rev = "f7afc7a66b5319036e84487240283fa7d8e1100d"; + sha256 = "15a6mnh5ivnllgiwvcs2qc9rrg1alh345yv129417rl0brf0n438"; }; meta.homepage = "https://github.com/Issafalcon/lsp-overloads.nvim/"; }; @@ -5218,12 +5218,12 @@ final: prev: lsp_signature-nvim = buildVimPlugin { pname = "lsp_signature.nvim"; - version = "2023-10-09"; + version = "2023-10-12"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "e371ff6369a8928e704d0758983ceed7dc84b628"; - sha256 = "14r7lwpmz05ii5b7kqyj42s3mafkfjkpqy1b4d0a7h485k09h236"; + rev = "33250c84c7a552daf28ac607d9d9e82f88cd0907"; + sha256 = "0cgfr6caj309r8qn8dclk1ql2wxkijqkfciwp8r5f306c8i04j2h"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -5254,12 +5254,12 @@ final: prev: lspsaga-nvim = buildVimPlugin { pname = "lspsaga.nvim"; - version = "2023-10-11"; + version = "2023-10-16"; src = fetchFromGitHub { owner = "nvimdev"; repo = "lspsaga.nvim"; - rev = "96d9a35305bd5b1f1b3af64d9f71969034c1f25b"; - sha256 = "1cnmfh22klp7xd98fd7qsx0vjkqd7qgm2hlqqsra9lfagb45wf5k"; + rev = "8c7e03e2851cd16219b3b2d05192473ac07025a7"; + sha256 = "1m53dkr2wbf914jrbcpc8b9gj7grq5nnvlw6qq9gbsy98xf1l58j"; }; meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/"; }; @@ -5290,24 +5290,24 @@ final: prev: lualine-nvim = buildVimPlugin { pname = "lualine.nvim"; - version = "2023-08-03"; + version = "2023-10-17"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "45e27ca739c7be6c49e5496d14fcf45a303c3a63"; - sha256 = "1ixzh61d0rd8223qagd1k4bidv8jw4hsafy02idb7c1yg6fy5ixz"; + rev = "1a3f6bba410aff5a51bf8c84287aaa3a8ba30d0d"; + sha256 = "19p6fqwsg1z92k8g1rhrb3qxj4158nm5g124pla1a7ik7sr356mg"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; luasnip = buildVimPlugin { pname = "luasnip"; - version = "2023-10-06"; + version = "2023-10-12"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "cdbf6f41381e5ee4810b4b09284b603d8f18365d"; - sha256 = "13lfmmfyhwvp6w1n68sg4p8alxi7kq1rga6a0w957v1xn7gc8p0g"; + rev = "0df29db3543837f8b41597f2640397c5ec792b7b"; + sha256 = "05rczq2mj1bc1v8bdgj5pb0064f0lcmdl0fjkza5fijmsn082423"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -5375,12 +5375,12 @@ final: prev: markdown-preview-nvim = buildVimPlugin { pname = "markdown-preview.nvim"; - version = "2022-05-13"; + version = "2023-10-17"; src = fetchFromGitHub { owner = "iamcco"; repo = "markdown-preview.nvim"; - rev = "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96"; - sha256 = "0hd51c7n8hr5bdhd8xl4gr4jgasdjr90rmcjaxylp475xyz6wl3v"; + rev = "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee"; + sha256 = "06187wxcj2ramhimkrgwq1q8fnndzdywljc606n3pr11y8dxs5ac"; }; meta.homepage = "https://github.com/iamcco/markdown-preview.nvim/"; }; @@ -5411,12 +5411,12 @@ final: prev: mason-lspconfig-nvim = buildVimPlugin { pname = "mason-lspconfig.nvim"; - version = "2023-10-10"; + version = "2023-10-14"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "ddefe5ab051e7ca6a7b374754f0920c44668b54f"; - sha256 = "0jx8djgkdd5pizm5r0aq8h770rin1mg51p33fg1jsrlmxajrhb8h"; + rev = "e7b64c11035aa924f87385b72145e0ccf68a7e0a"; + sha256 = "1khd5kicxm7dz5bv8jq9kqrmwp55xycf19v9scn4s30ym9cjm1r8"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; @@ -5459,12 +5459,12 @@ final: prev: material-nvim = buildVimPlugin { pname = "material.nvim"; - version = "2023-10-09"; + version = "2023-10-15"; src = fetchFromGitHub { owner = "marko-cerovac"; repo = "material.nvim"; - rev = "6989f7e0076f4fa4e01056bd62c785cf0fef4caf"; - sha256 = "084ygd4zfmlv0yi1jrla2my1di1iqm8gr6snf0rlnvdchz2g41ir"; + rev = "dfa4bc5340a0f0d2dd5b1bf6c2ebd5bb570a9d71"; + sha256 = "16rj09fv7hjp17ni9xdg7v6qvc149sb6kkmdza6p2wkalpsnc8a2"; }; meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; }; @@ -5531,12 +5531,12 @@ final: prev: mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2023-10-10"; + version = "2023-10-16"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "8b43796d93b09c9f63076c69664e585d7ef28b62"; - sha256 = "1qnxv138j1ai58h7nzk4x422ymvxgbfag8bc2f9xygnnbkj37ja1"; + rev = "22f3f4396b4ec90c4c83b69f47e14d71b4c6c69f"; + sha256 = "1gvdzljf74ji9q8x0ach0rsp1c5a93lp3i6dx9g9gca94m5phwbq"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -5567,24 +5567,24 @@ final: prev: mkdnflow-nvim = buildVimPlugin { pname = "mkdnflow.nvim"; - version = "2023-07-05"; + version = "2023-10-11"; src = fetchFromGitHub { owner = "jakewvincent"; repo = "mkdnflow.nvim"; - rev = "a728a3533bb57502fdfd6fdb4e5839fc87430edc"; - sha256 = "18zzwij973ar8jqmxvv9rv8r3lhvvjy2i61x1052jkkm3d9j59jk"; + rev = "f7e513a521f5926df034cf40ddd54b43ba73a013"; + sha256 = "1kc832ngkmzkzq4zzc910claf71f1brb71ypip2y5xjwmpqb90n1"; }; meta.homepage = "https://github.com/jakewvincent/mkdnflow.nvim/"; }; mkdx = buildVimPlugin { pname = "mkdx"; - version = "2023-08-23"; + version = "2023-10-16"; src = fetchFromGitHub { owner = "SidOfc"; repo = "mkdx"; - rev = "4a8067468b4372d58f519eb55708b524a893d67d"; - sha256 = "19x472gv6x7pz3ln91s2n4r31b0s435g5rzwrdvzv5dmairgxxiq"; + rev = "ee667cad506954b706c3fa972fbaaad46b1bf028"; + sha256 = "1yl7ch7ylgjm1fpk7kc5260lk58922bg9ygg2x8a7r5k1glxx71j"; }; meta.homepage = "https://github.com/SidOfc/mkdx/"; }; @@ -5651,12 +5651,12 @@ final: prev: multicursors-nvim = buildVimPlugin { pname = "multicursors.nvim"; - version = "2023-10-11"; + version = "2023-10-16"; src = fetchFromGitHub { owner = "smoka7"; repo = "multicursors.nvim"; - rev = "c75d0f2594f8faa766682afecd4a6d6fa26b3974"; - sha256 = "13z6k04h2677glcgilw59hlc6fv5nqckgraj01q6ikhrwmbi5zac"; + rev = "38b06771cc6e867092a7d161096ab4e11bec182d"; + sha256 = "04b4h4b4m5dd2r9srym4zs6myd70f43hwxd4zpwnia5l24b52m06"; }; meta.homepage = "https://github.com/smoka7/multicursors.nvim/"; }; @@ -5915,12 +5915,12 @@ final: prev: neo-tree-nvim = buildVimPlugin { pname = "neo-tree.nvim"; - version = "2023-10-08"; + version = "2023-10-14"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "6f8c49956c89e9fefae6acdfe1d57c6293b0a03d"; - sha256 = "1p3v262gng8dbhxxcpfy3mk72lkv50idm0sgjcyx3bwhs3rrcpxn"; + rev = "63ebe879ad4798b66d29c0b2c8d04942389d438e"; + sha256 = "1cn944l0mi7jvvrnybc4cs16gxqvqwyxxmjgc4wbmgw75q0867zp"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; }; @@ -5939,12 +5939,12 @@ final: prev: neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "2023-10-10"; + version = "2023-10-16"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "89fdbc02266d714413b805084a1b44d3cc8ce103"; - sha256 = "1yjmiikjr4s6w8y80ky0jx939rjzrnps7gf4biwa6yjc18gvgg2n"; + rev = "c87c862a14a4c8c0e2bc823d304e4da472fd7180"; + sha256 = "0cs33366wylq4k88hhqpxq69kj5pm3hwbi89gf0y6w3q0491rjkh"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -5963,12 +5963,12 @@ final: prev: neodev-nvim = buildVimPlugin { pname = "neodev.nvim"; - version = "2023-10-11"; + version = "2023-10-16"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "a4b6e7ca11ff5be2264d5c169fcedd97d8699ec4"; - sha256 = "0z7lmnhr8sx5s8zyb7ajngkdmlfh4nqbw07pnfvp5c4zh5xzc6dk"; + rev = "24b403eabde652904077f84fd55441744e77a109"; + sha256 = "06jvqmdzs5g83fhkymbqmf0kxgia36m6h8x35idz41h4y3mlnzw5"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; @@ -5999,12 +5999,12 @@ final: prev: neogit = buildVimPlugin { pname = "neogit"; - version = "2023-10-11"; + version = "2023-10-17"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "d3fbf8b48f4f8bc406eb23f8b06eb912776f8cb0"; - sha256 = "0czznf4n24aaw0l45qy7dlb4sx2c3gmdb2q4z3wqmw7525n2lik6"; + rev = "eb9d6b8f0840e4f2fa775bca7ec4a5df8b42ed6d"; + sha256 = "0pf6fq5xbai7lq451y8mmkiab1zhr15g5w9kyz9kd46xk7rcmx8a"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; @@ -6071,12 +6071,12 @@ final: prev: neorg = buildVimPlugin { pname = "neorg"; - version = "2023-10-09"; + version = "2023-10-15"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "7d507d4fdd1c4a3cb8a8299a469d22190ebaf7f0"; - sha256 = "19z1pk2x686d9jx6vhz876xiarmhw65ra11bilhqbnqjv5dwhbrr"; + rev = "7c4e09d39d6be4494e8c2980a55837d982c8ef4b"; + sha256 = "1kws0xgqsqnw8iz9gb1r9h30z97p1sglmxzh1jrf27m9qcirm49w"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -6179,12 +6179,12 @@ final: prev: neotest-dotnet = buildVimPlugin { pname = "neotest-dotnet"; - version = "2023-08-13"; + version = "2023-10-13"; src = fetchFromGitHub { owner = "Issafalcon"; repo = "neotest-dotnet"; - rev = "6528e761e4528aed3f4b60aff4c9f3406beb3cdd"; - sha256 = "0xp4bgsk3kh2bbyq67l7kvflzjbkxkzhdzq34pvbmjvhhsrrifz9"; + rev = "cee23e39d941b2deb14182d5a890144be6aa6164"; + sha256 = "14glp3pifjjfgppcgiw7fpcr7s9y40ffc0wxmgpg07gk2wy6qb4r"; }; meta.homepage = "https://github.com/Issafalcon/neotest-dotnet/"; }; @@ -6216,24 +6216,24 @@ final: prev: neotest-haskell = buildVimPlugin { pname = "neotest-haskell"; - version = "2023-10-09"; + version = "2023-10-15"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "eed95bb4f68b5fd443595868580db53317e406e9"; - sha256 = "0zvg90kqzllcr564zylyrc2h87x7zza17plx8f8nvhq4p9ah3m8h"; + rev = "d3ef9c96c4e4355383a83abd56255c2086feae65"; + sha256 = "01rnfbl8n08dblxkz2yvy7lbffpg8134fvp4iii5v32rk73i4zsr"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; neotest-jest = buildVimPlugin { pname = "neotest-jest"; - version = "2023-09-03"; + version = "2023-10-11"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest-jest"; - rev = "ae559fbd405084ee38dd711eede6d74f3dc1d463"; - sha256 = "032q6cm470y64y3crb7p35ap1r6p8dqh6wgwk5aq5xyfr8c07vbj"; + rev = "65ab61c77aa1c245f16982ffe1a4d31589e18023"; + sha256 = "168597vm0645c3n6lijw18308kn6lhjp5k9jcnlc0jg640znczsf"; }; meta.homepage = "https://github.com/nvim-neotest/neotest-jest/"; }; @@ -6480,12 +6480,12 @@ final: prev: nightfox-nvim = buildVimPlugin { pname = "nightfox.nvim"; - version = "2023-09-27"; + version = "2023-10-16"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "fe2fc7b93d66349eff2c5baa6cec922ee3958f56"; - sha256 = "1paipf7phkkr66xnfsi9hwxlqpj339nza8ni42hc5lg12c4h0p14"; + rev = "6a6076bd678f825ffbe16ec97807793c3167f1a7"; + sha256 = "1p1gp2p08mh0z7ckr63lw76ac91pssv0k2jczwpkibqmpp4imwnx"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -6552,36 +6552,36 @@ final: prev: no-neck-pain-nvim = buildVimPlugin { pname = "no-neck-pain.nvim"; - version = "2023-09-30"; + version = "2023-10-15"; src = fetchFromGitHub { owner = "shortcuts"; repo = "no-neck-pain.nvim"; - rev = "a3a76540533909aa42b4f9430c5b1976a6508f81"; - sha256 = "1yrni32ailamah5rbf6haypvik2wm4ywxrlrk3d12wl2hd9g7yxq"; + rev = "b4ed648483f96f6f212de3b9e38a8bb0d8c5255f"; + sha256 = "0xk759df6mczz013igiv0n5g8g8w426zk12l7b9kgrsl3bwf9hrw"; }; meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/"; }; noice-nvim = buildVimPlugin { pname = "noice.nvim"; - version = "2023-10-07"; + version = "2023-10-15"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "fcd01710ff6918d4d3ef90c8e36f3addacba13bf"; - sha256 = "0dhcx7xr57wwiyvcvlh79pgjj6mpdmn6mhmgj89cjphqi2jr862c"; + rev = "e50fc6de68333633fa9eaaa54cb4cdfe7de5f25a"; + sha256 = "018cmk4ypx02z1574jp7w4ja4q1qvhbnv392yjgqlqfdkijr2man"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; none-ls-nvim = buildVimPlugin { pname = "none-ls.nvim"; - version = "2023-10-01"; + version = "2023-10-07"; src = fetchFromGitHub { owner = "nvimtools"; repo = "none-ls.nvim"; - rev = "f39f627bbdfb33cc4ae4a95b4708e7dba7b9aafc"; - sha256 = "1qh9bdxhs0c5mxyyv3dkmiyr03qi8g4rsbjcgzkprk4v5pz04g1v"; + rev = "ae339f45590cc421a68de885fc5a3261cc247362"; + sha256 = "1ymhga4pv1xjvzlpxqc6knzr58h5w94b6ljqbvm68ybhhqbpdq73"; }; meta.homepage = "https://github.com/nvimtools/none-ls.nvim/"; }; @@ -6634,7 +6634,7 @@ final: prev: meta.homepage = "https://github.com/jlesquembre/nterm.nvim/"; }; - nui-nvim = buildVimPlugin { + nui-nvim = buildNeovimPlugin { pname = "nui.nvim"; version = "2023-10-09"; src = fetchFromGitHub { @@ -6672,12 +6672,12 @@ final: prev: nvchad = buildVimPlugin { pname = "nvchad"; - version = "2023-10-02"; + version = "2023-10-16"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvchad"; - rev = "13e9b0f458c3e5e95ac05a10822f26dbb1aa03cb"; - sha256 = "06k21p4w856ms405yg6qypj2sxh8jd4f606cr318qdpgrrb98n3y"; + rev = "c56f1242dfc9c1fbba71fc3a22448d5d563703e0"; + sha256 = "0vkk8d9v3x7m7612z8r3nrmwxj25vwbv67wc2vjn0yfahmagf0fy"; }; meta.homepage = "https://github.com/nvchad/nvchad/"; }; @@ -6720,12 +6720,12 @@ final: prev: nvim-autopairs = buildVimPlugin { pname = "nvim-autopairs"; - version = "2023-10-07"; + version = "2023-10-15"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "748e72c05495a3d30e88a6ef04b21697019a9aa9"; - sha256 = "11hf5j4khafg1gddkd98xb94077vswlwxdm077gyrwa4pifc7cnw"; + rev = "f6c71641f6f183427a651c0ce4ba3fb89404fa9e"; + sha256 = "0hi0p2036w23sins0aldiws1rq0zhgz0xa8bpf49gb37ryz02385"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -6816,12 +6816,12 @@ final: prev: nvim-cokeline = buildVimPlugin { pname = "nvim-cokeline"; - version = "2023-10-08"; + version = "2023-10-13"; src = fetchFromGitHub { owner = "willothy"; repo = "nvim-cokeline"; - rev = "62b2b69d97ab17cddf6381b4a2d37a441a7b9fd0"; - sha256 = "089pkd849lj5jvxd5vsvwzyfd98kskr955bbx410qbipjpv3007q"; + rev = "857549678b426259af8e6fba52505e6a0f4f8e25"; + sha256 = "14x79mwnsr0vinhacv3ll06jsylqaq2ybw231acmq0vnz3cmkxiv"; }; meta.homepage = "https://github.com/willothy/nvim-cokeline/"; }; @@ -6912,12 +6912,12 @@ final: prev: nvim-dap = buildVimPlugin { pname = "nvim-dap"; - version = "2023-10-08"; + version = "2023-10-12"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "e79007c6d7a24db3ad19ea9196f1f0b2840e8ae7"; - sha256 = "08kb1k0xi3ns62hrzpm0hnw9abz8khc8aic15xjkd0km1w162wpm"; + rev = "92dc531eea2c9a3ef504a5c8ac0decd1fa59a6a3"; + sha256 = "17lsa94if1j630spn2nia4bjync4ng2nsp0ld215z17fss0gg6fv"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -7008,12 +7008,12 @@ final: prev: nvim-gdb = buildVimPlugin { pname = "nvim-gdb"; - version = "2023-10-02"; + version = "2023-10-14"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "69d055aad50adb80a5f0b1ddeeef05dce92871c2"; - sha256 = "1cnrnfvwap84fys2l6gl02wb0x9pafi2rrsfkg04qwqh9ivxxr5c"; + rev = "c0328e23b815bbe55935945332c5e5dc88092792"; + sha256 = "154vry38gq0kv2ya23pgnbby9hizivyamnv0vcag3g27nj7xk2a4"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; @@ -7044,12 +7044,12 @@ final: prev: nvim-highlite = buildVimPlugin { pname = "nvim-highlite"; - version = "2023-10-08"; + version = "2023-10-16"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "50882b41d87b387d44633521606d544f1a9d64b9"; - sha256 = "094yapizxvswdz30crgj8liv82nnap4ajahfdkvbwp0nm10v62kp"; + rev = "5dfa7701c586b7ddba4152e512563c377e031b49"; + sha256 = "1yxcd6xl5zjbsz6x34fnslhpaqs1liyvwqwkk0sdsiyzb6iv7wvw"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -7080,12 +7080,12 @@ final: prev: nvim-jdtls = buildVimPlugin { pname = "nvim-jdtls"; - version = "2023-09-19"; + version = "2023-10-13"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "3ca419c52a7c20a2565237db2c110ed68fc7e6f1"; - sha256 = "1jy5yklfc3fvajy5mqwfi4h6p5bxb71ar1hnck8k8hciggrijhrq"; + rev = "a09f8cdd75c546eb024d0f0b5b3ad185f05b738f"; + sha256 = "1ck1f55y19m049bqwb3j77sq5glwafy48w7b01z324qdj68vhy6n"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -7163,12 +7163,12 @@ final: prev: nvim-lint = buildVimPlugin { pname = "nvim-lint"; - version = "2023-10-10"; + version = "2023-10-14"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "7d273c3963c923a194bfd31ab498dfd6c0b2cae8"; - sha256 = "1xmfbfp6a69fz0k4mh84ysm4rzkzp84zdf6cjdh6y5xbd890fd7x"; + rev = "6d596b87862909370f4d1e6535cc9fad80c89fe6"; + sha256 = "17c16fc94lzi04q7r6yfz50cycq6pbih884gkvlgkyyy92b6bcqn"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -7199,12 +7199,12 @@ final: prev: nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2023-10-06"; + version = "2023-10-16"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "2b361e043810d5587d9af0787f8ce40da92ec5e9"; - sha256 = "15i3vxdvd3cblnh01dxv3b5n2fzqcdqvff2j6xlxfc98bjq46ycb"; + rev = "e49b1e90c1781ce372013de3fa93a91ea29fc34a"; + sha256 = "0pb33c3dgv6pvn6avc6zrbfrzr63wd9hxkz5rz6y05w633d61mc8"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -7355,12 +7355,12 @@ final: prev: nvim-osc52 = buildVimPlugin { pname = "nvim-osc52"; - version = "2023-05-15"; + version = "2023-10-15"; src = fetchFromGitHub { owner = "ojroques"; repo = "nvim-osc52"; - rev = "3e96035d62290183fe7a11418db2b254fcfcaee3"; - sha256 = "12zdrwjlrvzlpwqi757llfvr7ir6ww949i85da385n2crj3jfd8i"; + rev = "5689dc08ee1ade3feb7f74bdd6e539fba70f3064"; + sha256 = "0pq68f0rfvvxw3y9kkwhqxrlvyk8gjfn8i8a06pb7m9k91r2qm5s"; }; meta.homepage = "https://github.com/ojroques/nvim-osc52/"; }; @@ -7427,12 +7427,12 @@ final: prev: nvim-scrollview = buildVimPlugin { pname = "nvim-scrollview"; - version = "2023-10-04"; + version = "2023-10-11"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "4a14332861f674b6f77cb5b0c84717935999a53e"; - sha256 = "1p6h1ma54izqbql3h8d98vijcs4z6wrnaxd127007ydh13c4b0ql"; + rev = "e8befc94ea66194700495d2f71419ba112634b0b"; + sha256 = "0015w0f55xfzbnf0f6pbipdg3k2zbvdcimw34qjbcf86cyllbr90"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -7547,36 +7547,36 @@ final: prev: nvim-tree-lua = buildVimPlugin { pname = "nvim-tree.lua"; - version = "2023-10-08"; + version = "2023-10-16"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "53b0bcaadaffb505acff230578b56a86ec1ab38a"; - sha256 = "1p7cbavspncs3129aqi07r84fk9cyv3062wcvcgqkgrqhrs73wpk"; + rev = "40b9b887d090d5da89a84689b4ca0304a9649f62"; + sha256 = "018fnw95vlhac7y5ai1wzpd69b3qjxji57yyrg7gw4ccvj97dvqj"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2023-10-11"; + version = "2023-10-17"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "e5198778dbefa14823099dd6d8fba3819a5e7b8a"; - sha256 = "1qf1c4yn6fi56a1i3lh9y6flfyjh6il5a3yldama74kdznjk4g6n"; + rev = "9c4fc86b67c1d68141cef57846d24cbee9b74fb0"; + sha256 = "1ydmsvhl01s76qx0a10ipp7fkqazm1p19hspwj7cwlxvls952xfm"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPlugin { pname = "nvim-treesitter-context"; - version = "2023-10-10"; + version = "2023-10-15"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "4cf64264c049c55f256550ad247b606f3e53bc77"; - sha256 = "1pm6p6wx3v126ha16ad01wl0f89mrg7154pxp31k4nhc45n29lw2"; + rev = "82c695951612911421e8e21068ba5fc2c2e2c212"; + sha256 = "1q0s84h15dkadjln27nmxfnviqilfn9y7py8nk7cmgk9djcx933c"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -7619,12 +7619,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPlugin { pname = "nvim-treesitter-textobjects"; - version = "2023-10-07"; + version = "2023-10-16"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "76c7a89b41de77a4f83fb77fa072c5ad7605fe3b"; - sha256 = "0438xz3k77xfmnvi210sxn4wda89nnw63a45ab2c5hvnhny9m0vm"; + rev = "78c49ca7d2f7ccba2115c11422c037713c978ad1"; + sha256 = "00z4adcq70j981a2v17xjx1izcqh716cqjp2vf8dsibplxbv4aja"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -7655,12 +7655,12 @@ final: prev: nvim-ts-context-commentstring = buildVimPlugin { pname = "nvim-ts-context-commentstring"; - version = "2023-10-05"; + version = "2023-10-12"; src = fetchFromGitHub { owner = "joosepalviste"; repo = "nvim-ts-context-commentstring"; - rev = "7241635869b7a8115893ffa67bab3907756caf4f"; - sha256 = "1rxjm97pgjbaf2wpq0q474r0hal69k1s7hmip2232hgpxzbrc6c4"; + rev = "92e688f013c69f90c9bbd596019ec10235bc51de"; + sha256 = "1wfaqq7gfkpf8jf8calin0ycy3hjvylh945bvlacv4zjnq9c3n2m"; }; meta.homepage = "https://github.com/joosepalviste/nvim-ts-context-commentstring/"; }; @@ -7690,12 +7690,12 @@ final: prev: nvim-ufo = buildVimPlugin { pname = "nvim-ufo"; - version = "2023-09-22"; + version = "2023-10-12"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-ufo"; - rev = "6f2ccdf2da390d62f8f9e15fc5ddbcbd312e1e66"; - sha256 = "05k9f2zxk1kkzp8xzsyc6j5szvvd8znjim10sj27jc0rmg5qldam"; + rev = "f7eea53e88456403212df074b9aa3148a3908435"; + sha256 = "0vba56iij1hw9jby4zlqvz6msav0sy25pkgfsvb5lkmw8c4hrvi9"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-ufo/"; }; @@ -7714,12 +7714,12 @@ final: prev: nvim-web-devicons = buildVimPlugin { pname = "nvim-web-devicons"; - version = "2023-10-09"; + version = "2023-10-14"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "a1e6268779411048a87f767a27380089362a0ce2"; - sha256 = "019i9iy9zri12whq5kdpfia8zbpp7x5p5snk4j6bb0p7hb7caljp"; + rev = "3af745113ea537f58c4b1573b64a429fefad9e07"; + sha256 = "103spgpvwm4pv32h954sv68p6qjizkm4fdvyzndjgw9x9bah5ksh"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -7822,24 +7822,24 @@ final: prev: octo-nvim = buildVimPlugin { pname = "octo.nvim"; - version = "2023-10-09"; + version = "2023-10-17"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "15e1c949bdc6f77b1296977a6a7dde5d06c6c004"; - sha256 = "0g3ywv6xf5w23nvy2mywj6b5mg888lgbjyiw806cy06pqxrll8l6"; + rev = "e933611c74cb735c00d0db8ca94533bec1444bf0"; + sha256 = "06rp3fnh4v7kpssirp6jnas9ch4vf0iap05m78vr0ackdsgs6gxm"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; oil-nvim = buildVimPlugin { pname = "oil.nvim"; - version = "2023-10-11"; + version = "2023-10-16"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "6cbc8d725d3964cb08d679774db67d41fa002647"; - sha256 = "1hanj8fjgvmr8v0f9avglimqy0w145zavgd6h1n1j50mdpxryqyi"; + rev = "3275996ce65f142d0e96b9fc2658f94e5bd43ad5"; + sha256 = "08j4f2i4wqkz37nnbf8jmp8lvvz3v3fzgg3ap3pm5paa724bjf0b"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -8015,12 +8015,12 @@ final: prev: overseer-nvim = buildVimPlugin { pname = "overseer.nvim"; - version = "2023-10-11"; + version = "2023-10-13"; src = fetchFromGitHub { owner = "stevearc"; repo = "overseer.nvim"; - rev = "ffd7be72399715112e1a4908d6587fa7ea805a26"; - sha256 = "0mk3l28q611v6ia4ii5q170q9h8i19akmg9kmr2hg47j05phv1in"; + rev = "400e762648b70397d0d315e5acaf0ff3597f2d8b"; + sha256 = "04ixcnnls7jhdxsfm5s33c59vwgz5b8ni0ygvgsf4i3bdv6sxa66"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/overseer.nvim/"; @@ -8112,12 +8112,12 @@ final: prev: persistence-nvim = buildVimPlugin { pname = "persistence.nvim"; - version = "2023-05-22"; + version = "2023-10-15"; src = fetchFromGitHub { owner = "folke"; repo = "persistence.nvim"; - rev = "4b8051c01f696d8849a5cb8afa9767be8db16e40"; - sha256 = "1nzsv0rvv1jn6lqjbjrd7zcfnn74ckhng5aya3wb1q1qrnd557v6"; + rev = "ad538bfd5336f1335cdb6fd4e0b0eebfa6e12f32"; + sha256 = "0817bx2x7pshxxvdp3njq1q19xv84lxga2vdanx9zijfs8pid2y0"; }; meta.homepage = "https://github.com/folke/persistence.nvim/"; }; @@ -8208,12 +8208,12 @@ final: prev: plenary-nvim = buildNeovimPlugin { pname = "plenary.nvim"; - version = "2023-09-12"; + version = "2023-10-11"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "9ce85b0f7dcfe5358c0be937ad23e456907d410b"; - sha256 = "0772bqmfkx27b6kfn8x28v8ll0qr2zvdclynansraprrzllsqymk"; + rev = "50012918b2fc8357b87cff2a7f7f0446e47da174"; + sha256 = "1sn7vpsbwpyndsjyxb4af8fvz4sfhlbavvw6jjsv3h18sdvkh7nd"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -8414,12 +8414,12 @@ final: prev: quarto-nvim = buildVimPlugin { pname = "quarto-nvim"; - version = "2023-10-06"; + version = "2023-10-17"; src = fetchFromGitHub { owner = "quarto-dev"; repo = "quarto-nvim"; - rev = "031ebe632c308f63dae65bc06bcbb258508361db"; - sha256 = "0nb2dbkrbrk5ff13djp09a36bg8f22xidbpbzw3xqsd866xz46qi"; + rev = "9b5abed75493aac46dd2c423f72bdfcda9e521b2"; + sha256 = "12p3malaqpl2r9151s59sn0i975didkjrvfdcnk5jg16vng85dsf"; }; meta.homepage = "https://github.com/quarto-dev/quarto-nvim/"; }; @@ -8486,11 +8486,11 @@ final: prev: rainbow-delimiters-nvim = buildVimPlugin { pname = "rainbow-delimiters.nvim"; - version = "2023-10-03"; + version = "2023-10-15"; src = fetchgit { url = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; - rev = "652345bd1aa333f60c9cbb1259f77155786e5514"; - sha256 = "0zw1q7nj76dvvnrb539xc11pymhjbgdjd54m2z64qxbi4n5qwryr"; + rev = "f1ce55edcbd2c25a544c93357c66d4172a870766"; + sha256 = "0lfnpkf4cah217p1dp8306yy550h2xj0ll1zq0g4nbq4pw2yg149"; }; meta.homepage = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; }; @@ -8893,12 +8893,12 @@ final: prev: sg-nvim = buildVimPlugin { pname = "sg.nvim"; - version = "2023-10-10"; + version = "2023-10-16"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "sg.nvim"; - rev = "acdc88fb410762828797e8816fa790b96b71bb97"; - sha256 = "0ss2yjpgbp11zbc2bh7ald5v48nkfnvipa3bjzjw3a1g4zl2i1gb"; + rev = "6185fcb842082b6871e1ee48b1c6444c1efdc681"; + sha256 = "0ifmzlg97i2jlajhyvi76a6m5zzlqg4zkr13sd829mf079yhxdjj"; }; meta.homepage = "https://github.com/sourcegraph/sg.nvim/"; }; @@ -9231,12 +9231,12 @@ final: prev: ssr-nvim = buildVimPlugin { pname = "ssr.nvim"; - version = "2023-08-20"; + version = "2023-10-14"; src = fetchFromGitHub { owner = "cshuaimin"; repo = "ssr.nvim"; - rev = "b2f35df231c6b090f6eb023ddf2ad0cb88d90eb4"; - sha256 = "1zkpzf82ln9ymwrrm3zyy763idmm3bqg6vswbgh2sac8xsdfnj56"; + rev = "10d51ddaaba0cd03ccf9ae51620d6e8cad27f1e4"; + sha256 = "01g0jzlzxys67f0nvyscy7r03cvfpsx70qjxbzlbfmjakcvi3q7p"; }; meta.homepage = "https://github.com/cshuaimin/ssr.nvim/"; }; @@ -9617,12 +9617,12 @@ final: prev: telekasten-nvim = buildVimPlugin { pname = "telekasten.nvim"; - version = "2023-09-08"; + version = "2023-10-12"; src = fetchFromGitHub { owner = "renerocksai"; repo = "telekasten.nvim"; - rev = "bd5d323581f24ee124b33688287e6a22244c6f2a"; - sha256 = "0bp554glsjfhl1rbz4xfl536g5x962bqw8ss134j3cjpr5q4bf8d"; + rev = "3fd50c62c1ed2f973ce8639c1218445e4e91a962"; + sha256 = "0r7fcl8w93amzi4i30mp2amqnv3xahi62djzalfj11w6p3fbrg4l"; fetchSubmodules = true; }; meta.homepage = "https://github.com/renerocksai/telekasten.nvim/"; @@ -9835,12 +9835,12 @@ final: prev: telescope-ui-select-nvim = buildVimPlugin { pname = "telescope-ui-select.nvim"; - version = "2022-04-30"; + version = "2023-10-11"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-ui-select.nvim"; - rev = "62ea5e58c7bbe191297b983a9e7e89420f581369"; - sha256 = "09mbi1x2r2xsbgfmmpb7113jppjmfwym4sr7nfvpc9glgqlkd4zw"; + rev = "b0015e6e4b46a64192c64b68dec9a9ac5a4e5690"; + sha256 = "1r8c29c6gd870ch7iyiln83y01hp73sgyh2rzq3cfzj4nx7fvgg2"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-ui-select.nvim/"; }; @@ -9924,8 +9924,8 @@ final: prev: src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "550055e640fd6eea88430ba5da3a3bc08679cf94"; - sha256 = "1ia7nwb80bdi7y7vvpsrxgcii8b1z6y9v58cqd6ldygzi4jjlqzw"; + rev = "74ce793a60759e3db0d265174f137fb627430355"; + sha256 = "1m4v097y8ypjm572k1qqii3z56w4x1dsjxd6gp0z24xqyvd4kpa4"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -10173,12 +10173,12 @@ final: prev: tokyonight-nvim = buildVimPlugin { pname = "tokyonight.nvim"; - version = "2023-10-10"; + version = "2023-10-16"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "76a5283b8612d5e7db48db4f341ea0c189b07295"; - sha256 = "1cchjs5p86dlq3bq370aj5hpy711gsiq11xh0if7c63xxfkan4br"; + rev = "633039585dff7fd2b9b62fb190bf768702609d95"; + sha256 = "0akdw3v3xkzy5x3i684171haj93symddicjcr9mv631yqrgb7qil"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -10209,12 +10209,12 @@ final: prev: treesj = buildVimPlugin { pname = "treesj"; - version = "2023-09-28"; + version = "2023-10-14"; src = fetchFromGitHub { owner = "Wansmer"; repo = "treesj"; - rev = "81d0ae51b84143e228d27b6cf79d09012d2021cb"; - sha256 = "0pk3zvz982gfdfwz4a1c8zr9ilqsip42l8bfc0vmnd7gc1r096w8"; + rev = "070e6761d0b11a55446d988a69908f7a0928dbab"; + sha256 = "0svwk7gzvz48xj7rwbda8j2zkw3ymm1ah9m2cvibvi34kx5qg8j2"; }; meta.homepage = "https://github.com/Wansmer/treesj/"; }; @@ -10233,12 +10233,12 @@ final: prev: trim-nvim = buildVimPlugin { pname = "trim.nvim"; - version = "2023-03-22"; + version = "2023-10-12"; src = fetchFromGitHub { owner = "cappyzawa"; repo = "trim.nvim"; - rev = "2df124c2c2844d3143091ebd3ae8b49bbe06bc5e"; - sha256 = "1r4p93siid35q1r9kj8cgyin6i8zg033ifvamf19052mpnwli824"; + rev = "629b96a303a3a0bb5fd050e6cd9d627ca7831cc7"; + sha256 = "1qm4n2biqqiwa0jqf60al969nz135i5pgn2pk123lxprb9q49wq5"; }; meta.homepage = "https://github.com/cappyzawa/trim.nvim/"; }; @@ -10305,12 +10305,12 @@ final: prev: typescript-tools-nvim = buildVimPlugin { pname = "typescript-tools.nvim"; - version = "2023-10-04"; + version = "2023-10-13"; src = fetchFromGitHub { owner = "pmizio"; repo = "typescript-tools.nvim"; - rev = "ebddb35900bbf5fa41fffa0463b676bf08e474e6"; - sha256 = "13npmhilg10hrhlbywxc9y1cxz4mmgch8m80jffshrfw7q14nbal"; + rev = "47c0461f652b90bc088bcaf6481d488d3b86291e"; + sha256 = "035973311zh2kl6gag0xp6wp5zjq96r2z0358ynw4sc2p07xsvrf"; }; meta.homepage = "https://github.com/pmizio/typescript-tools.nvim/"; }; @@ -10341,12 +10341,12 @@ final: prev: typst-vim = buildVimPlugin { pname = "typst.vim"; - version = "2023-10-05"; + version = "2023-10-16"; src = fetchFromGitHub { owner = "kaarmu"; repo = "typst.vim"; - rev = "8101539d6b1e4a9ae071f26ac7602cd3866ec4de"; - sha256 = "1s0qvpbfidb0233v2avn7ikn19dh5xjhynhfrazkr1xsk05mph4z"; + rev = "a48691aff95240b7199fbabb82d28b4ca7ccbc3e"; + sha256 = "1l8hldprdknq2bmsliph2ayhkfkwzn11d2wj0cnhjhd0s6dmfn3i"; }; meta.homepage = "https://github.com/kaarmu/typst.vim/"; }; @@ -10389,12 +10389,12 @@ final: prev: unison = buildVimPlugin { pname = "unison"; - version = "2023-10-05"; + version = "2023-10-15"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "f15816cb348fbbe449e4cf632ec9c02a36c8929f"; - sha256 = "177k1v91h0cvfy9rdnspkihz2ac69x5rh28qx4vvq5zcxsh0xlms"; + rev = "d5e809b87f154c07d511cb1f164fdfad1c7926b1"; + sha256 = "0z0s94lp1xvy8wnh5y5g0ww5i8q6j5pp1xm2nkkx95cki0p65n1n"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -10485,12 +10485,12 @@ final: prev: vifm-vim = buildVimPlugin { pname = "vifm.vim"; - version = "2023-10-06"; + version = "2023-10-15"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "537069856241ff50d696822879c29d67efe39200"; - sha256 = "1qai78m1h93ypxh1h6zjr5iszv78zhjaiz44pi0iqjnngpg0cjiz"; + rev = "840fa94041f432c7fb72ff60081913742eb7551f"; + sha256 = "0ijgp6ka1rd5mdbrs79kpyh7dn87y8y097hmyb8a9fn05lpp632p"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -10833,12 +10833,12 @@ final: prev: vim-airline = buildVimPlugin { pname = "vim-airline"; - version = "2023-10-10"; + version = "2023-10-11"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "4757756ae077575372625c3bd61997baa8129091"; - sha256 = "0z4n9c0fkn75vnkdil6wn7cwlyk51yvadnaa2n5s5plfrkvclmxc"; + rev = "3b9e149e19ed58dee66e4842626751e329e1bd96"; + sha256 = "03jycan9s1r02hg7irscd4kr094vhk555znqj1a4is3b7i6iwrbk"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -11553,12 +11553,12 @@ final: prev: vim-dadbod-completion = buildVimPlugin { pname = "vim-dadbod-completion"; - version = "2023-04-25"; + version = "2023-10-15"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-completion"; - rev = "fc7321a17f4c55db11fae89a884ddf4724020bae"; - sha256 = "1y3yx8zzlca47b3yswsyj3z9zx43xnx6nrvxjabm6wxl2dhgxhqw"; + rev = "bcdf3ff768cc7e544a0f78b0383d8719c2116569"; + sha256 = "1dnmm54inx7qbwk5dbng1g4448hfcls2fzld36i7dgv3calplg9z"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-completion/"; }; @@ -12839,12 +12839,12 @@ final: prev: vim-just = buildVimPlugin { pname = "vim-just"; - version = "2023-10-06"; + version = "2023-10-13"; src = fetchFromGitHub { owner = "NoahTheDuke"; repo = "vim-just"; - rev = "b2113d846c1f5a400ac9c2f5ef762de8f99dc745"; - sha256 = "14nqxx0lmqbydcxxjxy2jw0nkgawlkcl4bjnm38wvyj5vibhmy8v"; + rev = "3038ffac026a13edaf1bbb898f25d808b6b0c92a"; + sha256 = "1dh3jhfvv0vk1khxi3hfy80xnvk021vj3rrlmj3jjgarda06psmv"; }; meta.homepage = "https://github.com/NoahTheDuke/vim-just/"; }; @@ -13055,11 +13055,11 @@ final: prev: vim-lsp = buildVimPlugin { pname = "vim-lsp"; - version = "2023-10-10"; + version = "2023-10-16"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "9649d3f848d0c06b70a661362451dd592f2e3651"; + rev = "c58edb98f09a650612adaaf8c47995c9e2b7ffb1"; sha256 = "0y839rrk5i3f6wmk94p28yy3alq5jnh8124v51prmzirzyhirhh1"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; @@ -13980,12 +13980,12 @@ final: prev: vim-ps1 = buildVimPlugin { pname = "vim-ps1"; - version = "2023-01-11"; + version = "2023-10-13"; src = fetchFromGitHub { owner = "PProvost"; repo = "vim-ps1"; - rev = "502590f90a21f0de2b7664d6d0dcc90e5bb28a9c"; - sha256 = "0v335bgbf1a6ry8dvphfqwmlhlz8x94cj4x6z7ssz16hpasrlhx6"; + rev = "7d0c8581e774cab8198bafa936e231b6f4c634e6"; + sha256 = "07ac71a09qcl1flavkwazd4df6n8v56cqj3phff3f12p5sfkmy1y"; }; meta.homepage = "https://github.com/PProvost/vim-ps1/"; }; @@ -14400,12 +14400,12 @@ final: prev: vim-slime = buildVimPlugin { pname = "vim-slime"; - version = "2023-10-09"; + version = "2023-10-15"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "9a42b3282e459aac75a745acb1b1f0269622cd06"; - sha256 = "1ypxsl94q281gl8gbfygmkhjsbnhdk6h9vlsmcy4q138bav98wq9"; + rev = "c65472ec9a7f5b59b39b8a453e409df28a61f19c"; + sha256 = "0m8ydin934k3x156vwy80lxdih5nqc5lyz9m3vkvwykrksjpln63"; }; meta.homepage = "https://github.com/jpalardy/vim-slime/"; }; @@ -14965,12 +14965,12 @@ final: prev: vim-tpipeline = buildVimPlugin { pname = "vim-tpipeline"; - version = "2023-09-10"; + version = "2023-10-13"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "2889cbdbe756324e1e21716a34b3d36b058f959e"; - sha256 = "105zmflfvqf6wllm26gwnh7am3g98aywq1d034lpr1c7zm5ln0pv"; + rev = "bff212497e0873ef7c97bd1e3d59cf57d6627581"; + sha256 = "1zpn2l7lzi03glmficfs1jwk7d9c5jn2pp63m818h8810dhicalr"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -15205,12 +15205,12 @@ final: prev: vim-wakatime = buildVimPlugin { pname = "vim-wakatime"; - version = "2023-10-09"; + version = "2023-10-17"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "e872e78f5f7de8c8aeeeb8f8daba635f2c60c9a3"; - sha256 = "0sz3aimfyxk37nlcia871ijzcrdkp3kpdlwvb7lmlir4yj89cnbg"; + rev = "945a441b83e48c7bafdd227ef8e2eb826f72ab90"; + sha256 = "13qrc8hgp944r819w3sxqva1knpy7m6y2ni9pvpwnf3vykq74l9r"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; @@ -15530,12 +15530,12 @@ final: prev: vimtex = buildVimPlugin { pname = "vimtex"; - version = "2023-10-09"; + version = "2023-10-11"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "03c83443108a6984bf90100f6d00ec270b84a339"; - sha256 = "0v4yz6y44n6sini30ahhpw5ddl2ndryasncdf0pk4b4ij0lpqxyj"; + rev = "cbb20643b7bfe721902dac5760bf0d4889fb5f7e"; + sha256 = "1zj03aq6yvd8mbfxihha426cipf02x7lg3hcbv5kl6kzk7ckiac3"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -15554,12 +15554,12 @@ final: prev: vimwiki = buildVimPlugin { pname = "vimwiki"; - version = "2023-07-31"; + version = "2023-10-16"; src = fetchFromGitHub { owner = "vimwiki"; repo = "vimwiki"; - rev = "f0fe154ede6b11e3db9b058b930005a056a3d1c6"; - sha256 = "1bkhlvr9y22wdl3cgwcfw591d4d0n7hsmfp2y7az4qjnxbk9pkf4"; + rev = "5d86b625f52e80476cb73c0a14ac62d51e7eb36f"; + sha256 = "1b0953d9cjhl9ycbnr38irzrynypjyvczs2ax7wr1zg478pw2aly"; }; meta.homepage = "https://github.com/vimwiki/vimwiki/"; }; @@ -15650,12 +15650,12 @@ final: prev: which-key-nvim = buildVimPlugin { pname = "which-key.nvim"; - version = "2023-07-28"; + version = "2023-10-13"; src = fetchFromGitHub { owner = "folke"; repo = "which-key.nvim"; - rev = "7ccf476ebe0445a741b64e36c78a682c1c6118b7"; - sha256 = "173gxysxw68xnfmkx468cz4g5lw5vz9sg8lj1wdz27wyvlfq8pq7"; + rev = "6962dae3565369363b59dd51fb206051555fcb4d"; + sha256 = "1fcwd2cv9qlfhpdxza2syrqzdhhy672jwqbr8kl3mafg15wpkxaa"; }; meta.homepage = "https://github.com/folke/which-key.nvim/"; }; @@ -15987,12 +15987,12 @@ final: prev: catppuccin-nvim = buildVimPlugin { pname = "catppuccin-nvim"; - version = "2023-10-05"; + version = "2023-10-16"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "fc537040147f0374a22b88142a20eb6781141f0b"; - sha256 = "04xh6qibbqhwf2nqszzhb4f0i5rzlliym8zp9h9jwpwr9ys3q01m"; + rev = "dcef0a062de380885193fb0f919217d58b979753"; + sha256 = "1c0ci2h6b3y89rz3hd5ql885qw3hn3p23m4anbh5a9hppcyxcrli"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -16059,12 +16059,12 @@ final: prev: nightfly = buildVimPlugin { pname = "nightfly"; - version = "2023-10-05"; + version = "2023-10-17"; src = fetchFromGitHub { owner = "bluz71"; repo = "vim-nightfly-colors"; - rev = "776f6ba8b9324838a250f55937ce7d957f820eeb"; - sha256 = "189m603bh7b4ln0glgvz23m4f0940c2hzxl03zj2xfhvc52zbs4n"; + rev = "9053e99131731f268258ab4d35d4841c3126ff9a"; + sha256 = "02d6b3qwylz6dg56rkccmpn5nipyg1d6capplbzz5pwv3y9g6bsw"; }; meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/"; }; @@ -16083,12 +16083,12 @@ final: prev: nvchad-ui = buildVimPlugin { pname = "nvchad-ui"; - version = "2023-10-06"; + version = "2023-10-15"; src = fetchFromGitHub { owner = "nvchad"; repo = "ui"; - rev = "0d45d6053455b017f951251b693b6666975c0ebd"; - sha256 = "1vhamsnyz5yg4wvh7mrc6pv6s326k5rk4bvwd46ybiigi1bh95zd"; + rev = "f4f2197e704b52c0e12f2d03899e9de7f810a170"; + sha256 = "0k0w6i1ska0nc0p47a3jxms058q3pd2k8fhqf7c2qd9dg16r6mb1"; }; meta.homepage = "https://github.com/nvchad/ui/"; }; diff --git a/pkgs/applications/editors/vim/plugins/markdown-preview-nvim/fix-node-paths.patch b/pkgs/applications/editors/vim/plugins/markdown-preview-nvim/fix-node-paths.patch index abc37992cb3..ec2408d6f4a 100644 --- a/pkgs/applications/editors/vim/plugins/markdown-preview-nvim/fix-node-paths.patch +++ b/pkgs/applications/editors/vim/plugins/markdown-preview-nvim/fix-node-paths.patch @@ -1,18 +1,18 @@ diff --git a/autoload/health/mkdp.vim b/autoload/health/mkdp.vim -index 9eebb56..3a0b069 100644 +index 323b57b..8053ea8 100644 --- a/autoload/health/mkdp.vim +++ b/autoload/health/mkdp.vim -@@ -9,8 +9,8 @@ function! health#mkdp#check() abort - call health#report_info('Pre build: ' . l:mkdp_server_script) - call health#report_info('Pre build version: ' . mkdp#util#pre_build_version()) - call health#report_ok('Using pre build') +@@ -8,8 +8,8 @@ function! health#mkdp#check() abort + lua vim.health.info('Pre build: ' .. vim.api.nvim_eval('l:mkdp_server_script')) + lua vim.health.info('Pre build version: ' .. vim.fn['mkdp#util#pre_build_version']()) + lua vim.health.ok('Using pre build') - elseif executable('node') -- call health#report_info('Node version: ' . system('node --version')) +- lua vim.health.info('Node version: ' .. string.gsub(vim.fn.system('node --version'), '^%s*(.-)%s*$', '%1')) + else -+ call health#report_info('Node version: ' . system('@node@ --version')) - let l:mkdp_server_script = s:mkdp_root_dir . '/app/server.js' - call health#report_info('Script: ' . l:mkdp_server_script) - call health#report_info('Script exists: ' . filereadable(l:mkdp_server_script)) ++ lua vim.health.info('Node version: ' .. string.gsub(vim.fn.system('@node@ --version'), '^%s*(.-)%s*$', '%1')) + let l:mkdp_server_script = s:mkdp_root_dir .. '/app/server.js' + lua vim.health.info('Script: ' .. vim.api.nvim_eval('l:mkdp_server_script')) + lua vim.health.info('Script exists: ' .. vim.fn.filereadable(vim.api.nvim_eval('l:mkdp_server_script'))) diff --git a/autoload/mkdp/rpc.vim b/autoload/mkdp/rpc.vim index b257571..57f04e7 100644 --- a/autoload/mkdp/rpc.vim diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index dfda03ac5a3..9990af5145d 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -27,12 +27,12 @@ }; apex = buildGrammar { language = "apex"; - version = "0.0.0+rev=e63bcdc"; + version = "0.0.0+rev=a768c95"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "e63bcdcc26ae808b3fe79dfb8fa61bebdb95bda4"; - hash = "sha256-7kfg8oqi39sExBuuKxmUgg5m9g22TW94rccas/7/5zE="; + rev = "a768c956b6aee72ffebb5df7f7c0b3702eaa2fbd"; + hash = "sha256-bfW7uox0/4bW5J5hXcKDfNXtKSI4BFk7f5J0bhMDpbw="; }; location = "apex"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; @@ -59,25 +59,36 @@ }; meta.homepage = "https://github.com/virchau13/tree-sitter-astro"; }; + authzed = buildGrammar { + language = "authzed"; + version = "0.0.0+rev=1dec7e1"; + src = fetchFromGitHub { + owner = "mleonidas"; + repo = "tree-sitter-authzed"; + rev = "1dec7e1af96c56924e3322cd85fdce15d0a31d00"; + hash = "sha256-qPSQF95DO7WByVy9YXEOus3q3U4QfWuUFbJGVXd4EtQ="; + }; + meta.homepage = "https://github.com/mleonidas/tree-sitter-authzed"; + }; awk = buildGrammar { language = "awk"; - version = "0.0.0+rev=374da90"; + version = "0.0.0+rev=90c8d9b"; src = fetchFromGitHub { owner = "Beaglefoot"; repo = "tree-sitter-awk"; - rev = "374da90decaa60fea7a22490a77440ece6d4161d"; - hash = "sha256-gbA6VyhPh2lH9FqYKj9sL8uhuMizCmV0U42s5gvk7AE="; + rev = "90c8d9b47edcf7e2d67680c6649d5f6358d2ce06"; + hash = "sha256-XbjZtEkJLaecp+j8xgYOVC3ESC1o/rNAZgePsmDdgps="; }; meta.homepage = "https://github.com/Beaglefoot/tree-sitter-awk"; }; bash = buildGrammar { language = "bash"; - version = "0.0.0+rev=fd4e40d"; + version = "0.0.0+rev=7331995"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-bash"; - rev = "fd4e40dab883d6456da4d847de8321aee9c80805"; - hash = "sha256-dJUJGrpBWBLjcqiqxCnJ/MENwa2+uxAmQD71aYloxsw="; + rev = "7331995b19b8f8aba2d5e26deb51d2195c18bc94"; + hash = "sha256-VP7rJfE/k8KV1XN1w5f0YKjCnDMYU1go/up0zj1mabM="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-bash"; }; @@ -94,12 +105,12 @@ }; beancount = buildGrammar { language = "beancount"; - version = "0.0.0+rev=358e5ec"; + version = "0.0.0+rev=484f508"; src = fetchFromGitHub { owner = "polarmutex"; repo = "tree-sitter-beancount"; - rev = "358e5ecbb87109eef7fd596ea518a4ff74cb9b31"; - hash = "sha256-vz8FU+asnMqF6J4UZer4iecw8uFFiYVpz4Fs/ds4Rt0="; + rev = "484f50849bcce887c86451f532bf778689ca8523"; + hash = "sha256-5k5sHW9xabbCFJXHJfs8oBlCjIBa6L3OtDdKEVXLgOc="; }; meta.homepage = "https://github.com/polarmutex/tree-sitter-beancount"; }; @@ -149,12 +160,12 @@ }; c = buildGrammar { language = "c"; - version = "0.0.0+rev=a2b7bac"; + version = "0.0.0+rev=25371f9"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c"; - rev = "a2b7bac3b313efbaa683d9a276ff63cdc544d960"; - hash = "sha256-39i06oXMQemfq3Y4TTXai6HFXvURVOif1v2i9LP4sAI="; + rev = "25371f9448b97c55b853a6ee8bb0bfb1bca6da9f"; + hash = "sha256-6o5D9rOYZ8qTSslTrkK2+7f6WWXF50u5tbxYEaEUbkc="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c"; }; @@ -226,12 +237,12 @@ }; comment = buildGrammar { language = "comment"; - version = "0.0.0+rev=c9a7e2d"; + version = "0.0.0+rev=aefcc28"; src = fetchFromGitHub { owner = "stsewd"; repo = "tree-sitter-comment"; - rev = "c9a7e2df7cac2dfb730f766a4f343308f84ff346"; - hash = "sha256-7k2LkfzlY+UxQvB1dPP6KQM2UTwThaj5NoAIKDVYAhA="; + rev = "aefcc2813392eb6ffe509aa0fc8b4e9b57413ee1"; + hash = "sha256-ihkBqdYVulTlysb9J8yg4c5XVktJw8jIwzhqybBw8Ug="; }; meta.homepage = "https://github.com/stsewd/tree-sitter-comment"; }; @@ -315,12 +326,12 @@ }; cuda = buildGrammar { language = "cuda"; - version = "0.0.0+rev=275cfb9"; + version = "0.0.0+rev=3161aed"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-cuda"; - rev = "275cfb95013b88382e11490aef1e7c9b17a95ef7"; - hash = "sha256-3sb9YLPRPjafSLGvyjLSuu+vqvolF63CI0MWZzvEGJw="; + rev = "3161aed045130c900f870ef53fad93a574317769"; + hash = "sha256-Eo92hl3mT2qV2L4hfmUNXdAleRKeyGUQuV6VE/Cg6nw="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda"; }; @@ -393,12 +404,12 @@ }; dockerfile = buildGrammar { language = "dockerfile"; - version = "0.0.0+rev=1800d5a"; + version = "0.0.0+rev=33e22c3"; src = fetchFromGitHub { owner = "camdencheek"; repo = "tree-sitter-dockerfile"; - rev = "1800d5a06789797065ba5e7d80712b6bbf5483d7"; - hash = "sha256-qt626fHCZkHkl8yrEtDbJ+l7wwmU0XMcP0oPwrCYNgI="; + rev = "33e22c33bcdbfc33d42806ee84cfd0b1248cc392"; + hash = "sha256-uCKzTTbJL9Ans3lCQbt2zApF+ERLbbu5D1WcyWJ6Gf4="; }; meta.homepage = "https://github.com/camdencheek/tree-sitter-dockerfile"; }; @@ -483,12 +494,12 @@ }; elm = buildGrammar { language = "elm"; - version = "0.0.0+rev=0694058"; + version = "0.0.0+rev=debe14f"; src = fetchFromGitHub { owner = "elm-tooling"; repo = "tree-sitter-elm"; - rev = "0694058bf0555adbf5f700ce4868d18e463cb824"; - hash = "sha256-xalcXMXRHcpwhKLMF6p9y5lzC0ek/ljRq2Vnb1VwXBo="; + rev = "debe14fad40a8100c679d95c66f599b48111742c"; + hash = "sha256-tB03/AqoYIMyWFGv3nKlGY/EjNV1/IQyXQsC+0M51V8="; }; meta.homepage = "https://github.com/elm-tooling/tree-sitter-elm"; }; @@ -527,12 +538,12 @@ }; erlang = buildGrammar { language = "erlang"; - version = "0.0.0+rev=4a0ec79"; + version = "0.0.0+rev=bb06a83"; src = fetchFromGitHub { owner = "WhatsApp"; repo = "tree-sitter-erlang"; - rev = "4a0ec79b7eb7671efe935cd97967430c34598c7d"; - hash = "sha256-q1V5lJsSQyx7ji4T+leIfSH9wAZRHW0XeLnY3Rc9WWI="; + rev = "bb06a83db4f0c176875d9d49756b760d15211134"; + hash = "sha256-IAUX5wrVpAj50cG0hrclhCx9x1hjSKdjqvEUYpe5a+g="; }; meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang"; }; @@ -714,23 +725,23 @@ }; glimmer = buildGrammar { language = "glimmer"; - version = "0.0.0+rev=d3031a8"; + version = "0.0.0+rev=f9746dc"; src = fetchFromGitHub { owner = "alexlafroscia"; repo = "tree-sitter-glimmer"; - rev = "d3031a8294bf331600d5046b1d14e690a0d8ba0c"; - hash = "sha256-YvftQHEwYxRyRIYHrnAjIqgx6O0FlFrnF9TwUE+RiqI="; + rev = "f9746dc1d0707717fbba84cb5c22a71586af23e1"; + hash = "sha256-57Sp4LrvyNNuOc+8ZiHl6cwvGg1tmXZemRsWeW+Kzys="; }; meta.homepage = "https://github.com/alexlafroscia/tree-sitter-glimmer"; }; glsl = buildGrammar { language = "glsl"; - version = "0.0.0+rev=ec6100d"; + version = "0.0.0+rev=952739a"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-glsl"; - rev = "ec6100d2bdf22363ca8a711a212f2144ea49233f"; - hash = "sha256-QFsOq/1GH40XgnBT9V3Eb7aQabtBGOtxHp65FdugOz8="; + rev = "952739a25a7c014882aa777f1a32da8950f31f58"; + hash = "sha256-f68bObZPZuPvzyLYP/PeZKbtG0YqbX8BhsLyviBfRY4="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl"; }; @@ -813,15 +824,26 @@ }; groovy = buildGrammar { language = "groovy"; - version = "0.0.0+rev=76e02db"; + version = "0.0.0+rev=ae8aa51"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "tree-sitter-groovy"; - rev = "76e02db5866dd2b096512103ed4d8f630cc32980"; - hash = "sha256-H6Gp7MqGxU1oONq/w8p8pNR3Vhi68dvO+2aHw8anBTs="; + rev = "ae8aa51ec3275afb567a4a67df1a26d89feb135f"; + hash = "sha256-K9XoSVuAWXJCTxclod4pfxnGHhsbtdE7Xi60wfuCE8M="; }; meta.homepage = "https://github.com/Decodetalkers/tree-sitter-groovy"; }; + gstlaunch = buildGrammar { + language = "gstlaunch"; + version = "0.0.0+rev=2c0d9c9"; + src = fetchFromGitHub { + owner = "theHamsta"; + repo = "tree-sitter-gstlaunch"; + rev = "2c0d9c94d35e37aa63fa5002163c8480985b3e5b"; + hash = "sha256-H5H1v4xJSPHW0oaTY/JczhfVmYExbrdfdugYkMJktPY="; + }; + meta.homepage = "https://github.com/theHamsta/tree-sitter-gstlaunch"; + }; hack = buildGrammar { language = "hack"; version = "0.0.0+rev=fca1e29"; @@ -901,12 +923,12 @@ }; hlsl = buildGrammar { language = "hlsl"; - version = "0.0.0+rev=d698c21"; + version = "0.0.0+rev=f2902bd"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-hlsl"; - rev = "d698c21dbfcfa1df84cdaaf9dba32cba1e4f92b4"; - hash = "sha256-oFpoErrhr83yG5c3IksjL/XjmsCrZGTP6+Sfu5fvOZM="; + rev = "f2902bd614e3916bdf65e1bc9ad45ebd08417bba"; + hash = "sha256-tuie4Yzauejf+5Par2qnWfaQgOLhROL2le1+UTq5cSY="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl"; }; @@ -934,12 +956,12 @@ }; html = buildGrammar { language = "html"; - version = "0.0.0+rev=e5d7d7d"; + version = "0.0.0+rev=d742025"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-html"; - rev = "e5d7d7decbbdec5a4c90bbc69436b3828f5646e7"; - hash = "sha256-jNAPumz8JdrGwSMow1xZqz3n2CHj60qUaivhJ8LZDz4="; + rev = "d742025fa2d8e6100f134a6ea990443aa1f074b3"; + hash = "sha256-ZpUruxwi9S+gUy/k0DkhDGWLc65XppUhD0NeVVItYg4="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-html"; }; @@ -1011,12 +1033,12 @@ }; java = buildGrammar { language = "java"; - version = "0.0.0+rev=83044af"; + version = "0.0.0+rev=2b57cd9"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-java"; - rev = "83044af4950e9f1adb46a20f616d10934930ce7e"; - hash = "sha256-i3j55vAQV5TaMR7IsUkh0OrLCP95Xos0UCI0SoY5phI="; + rev = "2b57cd9541f9fd3a89207d054ce8fbe72657c444"; + hash = "sha256-Zo+KQ6TOjdJODNppTkt8XPE+WroNB5M6+n2XF+OrD8o="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-java"; }; @@ -1055,23 +1077,23 @@ }; json = buildGrammar { language = "json"; - version = "0.0.0+rev=ca3f891"; + version = "0.0.0+rev=3fef30d"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-json"; - rev = "ca3f8919800e3c1ad4508de3bfd7b0b860ce434f"; - hash = "sha256-cyrea0Y13OVGkXbYE0Cwc7nUsDGEZyoQmPAS9wVuHw0="; + rev = "3fef30de8aee74600f25ec2e319b62a1a870d51e"; + hash = "sha256-Msnct7JzPBIR9+PIBZCJTRdVMUzhaDTKkl3JaDUKAgo="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-json"; }; json5 = buildGrammar { language = "json5"; - version = "0.0.0+rev=5dd5cdc"; + version = "0.0.0+rev=c23f7a9"; src = fetchFromGitHub { owner = "Joakker"; repo = "tree-sitter-json5"; - rev = "5dd5cdc418d9659682556b6adca2dd9ace0ac6d2"; - hash = "sha256-B3wZS/OtW4hKOHsoYdYK2zsJGID8fuIm8C+IuAteR9E="; + rev = "c23f7a9b1ee7d45f516496b1e0e4be067264fa0d"; + hash = "sha256-16gDgbPUyhSo3PJD9+zz6QLVd6G/W1afjyuCJbDUSIY="; }; meta.homepage = "https://github.com/Joakker/tree-sitter-json5"; }; @@ -1132,12 +1154,12 @@ }; kotlin = buildGrammar { language = "kotlin"; - version = "0.0.0+rev=06a2f6e"; + version = "0.0.0+rev=5baa0fe"; src = fetchFromGitHub { owner = "fwcd"; repo = "tree-sitter-kotlin"; - rev = "06a2f6e71c7fcac34addcbf2a4667adad1b9c5a7"; - hash = "sha256-HF3wp4nNwgP0LhZvxQKMnPqMPhwu8Xc9khgiQoy6DeA="; + rev = "5baa0fe2288830f88bd38e328b08d829f3914164"; + hash = "sha256-e2X8Hl8N8iTL0JUJhyyeebNPZ63QAq9C+R5F2lOYZKk="; }; meta.homepage = "https://github.com/fwcd/tree-sitter-kotlin"; }; @@ -1174,6 +1196,17 @@ }; meta.homepage = "https://github.com/cbarrete/tree-sitter-ledger"; }; + liquidsoap = buildGrammar { + language = "liquidsoap"; + version = "0.0.0+rev=bbef4df"; + src = fetchFromGitHub { + owner = "savonet"; + repo = "tree-sitter-liquidsoap"; + rev = "bbef4df4dc5b324455ad1ea4770bbed0df5130ea"; + hash = "sha256-SGWO/sQ022atbX8qTXWeSnrYlSX13N03LhXJoc9YgPQ="; + }; + meta.homepage = "https://github.com/savonet/tree-sitter-liquidsoap"; + }; llvm = buildGrammar { language = "llvm"; version = "0.0.0+rev=1b96e58"; @@ -1331,6 +1364,17 @@ generate = true; meta.homepage = "https://github.com/artagnon/tree-sitter-mlir"; }; + nasm = buildGrammar { + language = "nasm"; + version = "0.0.0+rev=3bc691d"; + src = fetchFromGitHub { + owner = "naclsn"; + repo = "tree-sitter-nasm"; + rev = "3bc691d2cfba44bea339a775ad496c8bc552c60d"; + hash = "sha256-o4aXvPhXSYMc1oaagIbnFhpqcbWdN8dhMa3QRE/iRMM="; + }; + meta.homepage = "https://github.com/naclsn/tree-sitter-nasm"; + }; nickel = buildGrammar { language = "nickel"; version = "0.0.0+rev=b759233"; @@ -1366,12 +1410,12 @@ }; norg = buildGrammar { language = "norg"; - version = "0.0.0+rev=1a30509"; + version = "0.0.0+rev=014073f"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "tree-sitter-norg"; - rev = "1a305093569632de50f9a316ff843dcda25b4ef5"; - hash = "sha256-dfdykz5DnbuJvRdY3rYehzphIJgDl1efrsEgG2+BhvI="; + rev = "014073fe8016d1ac440c51d22c77e3765d8f6855"; + hash = "sha256-0wL3Pby7e4nbeVHCRfWwxZfEcAF9/s8e6Njva+lj+Rc="; }; meta.homepage = "https://github.com/nvim-neorg/tree-sitter-norg"; }; @@ -1501,12 +1545,12 @@ }; php = buildGrammar { language = "php"; - version = "0.0.0+rev=a05c611"; + version = "0.0.0+rev=92a98ad"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "a05c6112a1dfdd9e586cb275700931e68d3c7c85"; - hash = "sha256-9t+9TnyBVkQVrxHhCzoBkfIjHoKw3HW4gTJjNv+DpPw="; + rev = "92a98adaa534957b9a70b03e9acb9ccf9345033a"; + hash = "sha256-/JI1eyf1UZmtQ7bhfBLpA+8mMfIc8jRncri8Mz2mf5M="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; }; @@ -1656,12 +1700,12 @@ }; python = buildGrammar { language = "python"; - version = "0.0.0+rev=a901729"; + version = "0.0.0+rev=82f5c99"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-python"; - rev = "a901729099257aac932d79c60adb5e8a53fa7e6c"; - hash = "sha256-gRhD3M1DkmwYQDDnyRq6QMTWUJUY0vbetGnN+pBTd84="; + rev = "82f5c9937fe4300b4bec3ee0e788d642c77aab2c"; + hash = "sha256-nQ4HU5ysQjht9USFGRmW/+PLFTzPgi+6G68/uupMMRk="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-python"; }; @@ -1821,12 +1865,12 @@ }; rst = buildGrammar { language = "rst"; - version = "0.0.0+rev=2ca8c12"; + version = "0.0.0+rev=3c03a4b"; src = fetchFromGitHub { owner = "stsewd"; repo = "tree-sitter-rst"; - rev = "2ca8c123c82ca41f41b66b5d13d403cff0204b78"; - hash = "sha256-aCeKxuBRLPYM8CjVLP5cBUhtuAezzZpGfCE2UaJj1E4="; + rev = "3c03a4bb2c27f1fa76f1ca5563c1fc10187e4028"; + hash = "sha256-WEerUDni10WpXKXX9r6pMwKn3Z9xqIKnlkQDxJiXxxY="; }; meta.homepage = "https://github.com/stsewd/tree-sitter-rst"; }; @@ -1954,24 +1998,24 @@ }; soql = buildGrammar { language = "soql"; - version = "0.0.0+rev=e63bcdc"; + version = "0.0.0+rev=a768c95"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "e63bcdcc26ae808b3fe79dfb8fa61bebdb95bda4"; - hash = "sha256-7kfg8oqi39sExBuuKxmUgg5m9g22TW94rccas/7/5zE="; + rev = "a768c956b6aee72ffebb5df7f7c0b3702eaa2fbd"; + hash = "sha256-bfW7uox0/4bW5J5hXcKDfNXtKSI4BFk7f5J0bhMDpbw="; }; location = "soql"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; }; sosl = buildGrammar { language = "sosl"; - version = "0.0.0+rev=e63bcdc"; + version = "0.0.0+rev=a768c95"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "e63bcdcc26ae808b3fe79dfb8fa61bebdb95bda4"; - hash = "sha256-7kfg8oqi39sExBuuKxmUgg5m9g22TW94rccas/7/5zE="; + rev = "a768c956b6aee72ffebb5df7f7c0b3702eaa2fbd"; + hash = "sha256-bfW7uox0/4bW5J5hXcKDfNXtKSI4BFk7f5J0bhMDpbw="; }; location = "sosl"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; @@ -1989,12 +2033,12 @@ }; sql = buildGrammar { language = "sql"; - version = "0.0.0+rev=39750c4"; + version = "0.0.0+rev=36c4de3"; src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "39750c48bf9ad63bcc1399554355b0aa0aaa1c33"; - hash = "sha256-33GpCN9qdCvCcYvE60HMzFM2QzUDbf2QxJDZ6L+q27Y="; + rev = "36c4de35f76dfa732493aae606feb69dce4b1daa"; + hash = "sha256-D8gt0shaEU1zPjLHe+h/cCk6Z1xx5Va17A/0XDB1rvo="; }; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; }; @@ -2077,12 +2121,12 @@ }; swift = buildGrammar { language = "swift"; - version = "0.0.0+rev=10eb01d"; + version = "0.0.0+rev=7e4ccc9"; src = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; - rev = "10eb01d29827f24b1271672e89790661d94da9e1"; - hash = "sha256-5oHc2mGxOuvFQ1h1FEK0oJ7PYnKayoJSVHeuYleVE8o="; + rev = "7e4ccc97a25315022a70b730085deccd5680a39b"; + hash = "sha256-1Uln7GHlgtNd7/3+FSBNDlTCqYodRbUyytPZYf660Nk="; }; generate = true; meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift"; @@ -2111,12 +2155,12 @@ }; t32 = buildGrammar { language = "t32"; - version = "0.0.0+rev=c544082"; + version = "0.0.0+rev=b075f2f"; src = fetchFromGitLab { owner = "xasc"; repo = "tree-sitter-t32"; - rev = "c544082904fd1d27da5493857bd3fc278bae2a1a"; - hash = "sha256-0iH5zEe5/BD2Wi4jb67grCXafmHhJkSD/NkjqGZZ3pY="; + rev = "b075f2f55ba29edce51b6b6b9f234ce3988dbb0a"; + hash = "sha256-NoJLMzyQmE4XpI1KKyq5GkkotOl8MU/zniTnP2nkjes="; }; meta.homepage = "https://gitlab.com/xasc/tree-sitter-t32.git"; }; @@ -2235,12 +2279,12 @@ }; tsx = buildGrammar { language = "tsx"; - version = "0.0.0+rev=b1bf482"; + version = "0.0.0+rev=d847898"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "b1bf4825d9eaa0f3bdeb1e52f099533328acfbdf"; - hash = "sha256-oZKit8kScXcOptmT2ckywL5JlAVe+wuwhuj6ThEI5OQ="; + rev = "d847898fec3fe596798c9fda55cb8c05a799001a"; + hash = "sha256-q8vJnJZdWzsiHHJSPGoM938U5AxuOIuGrx1r6F+cdK4="; }; location = "tsx"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; @@ -2269,12 +2313,12 @@ }; typescript = buildGrammar { language = "typescript"; - version = "0.0.0+rev=b1bf482"; + version = "0.0.0+rev=d847898"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "b1bf4825d9eaa0f3bdeb1e52f099533328acfbdf"; - hash = "sha256-oZKit8kScXcOptmT2ckywL5JlAVe+wuwhuj6ThEI5OQ="; + rev = "d847898fec3fe596798c9fda55cb8c05a799001a"; + hash = "sha256-q8vJnJZdWzsiHHJSPGoM938U5AxuOIuGrx1r6F+cdK4="; }; location = "typescript"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; @@ -2304,12 +2348,12 @@ }; usd = buildGrammar { language = "usd"; - version = "0.0.0+rev=718a6b3"; + version = "0.0.0+rev=ab8c30b"; src = fetchFromGitHub { owner = "ColinKennedy"; repo = "tree-sitter-usd"; - rev = "718a6b3e939904e0b4fe7cff6742e96af4781f4b"; - hash = "sha256-6U4TreAeAGB7WRUtTXdxQvNa6Sl6E+f329/SZ6DOQ+0="; + rev = "ab8c30bde2df0e58c4b3f01f220fb0125ecb57a7"; + hash = "sha256-Y7AYRpiblBd8xun73UohIf8FFkbNIqSXv44bM3L5uDc="; }; meta.homepage = "https://github.com/ColinKennedy/tree-sitter-usd"; }; @@ -2371,23 +2415,23 @@ }; vim = buildGrammar { language = "vim"; - version = "0.0.0+rev=77e9e96"; + version = "0.0.0+rev=32c76f1"; src = fetchFromGitHub { owner = "neovim"; repo = "tree-sitter-vim"; - rev = "77e9e96c2ae5cff7343ce3dced263483acf95793"; - hash = "sha256-YGE/up7TE1+a6FrN8iEeHbAJr6kEMcWLMPaeyQRRVLs="; + rev = "32c76f150347c1cd044e90b8e2bc73c00677fa55"; + hash = "sha256-14lkrGZ5JpbPvb5Pm2UzLodhO1IEz5rBETTU0RZDFc4="; }; meta.homepage = "https://github.com/neovim/tree-sitter-vim"; }; vimdoc = buildGrammar { language = "vimdoc"; - version = "0.0.0+rev=c0f8580"; + version = "0.0.0+rev=60045f7"; src = fetchFromGitHub { owner = "neovim"; repo = "tree-sitter-vimdoc"; - rev = "c0f85802485afe4d15e65bbf995ae864bb8ed7c4"; - hash = "sha256-pBdfFeJbZJy6pjr2a0SgFyjEZKvajKOfrqoRAMB66V8="; + rev = "60045f7d717eba85fa8abd996e0bb50eed5a3d8e"; + hash = "sha256-FW+sPrzFQxKkWkyX2q+s+RBIMCOUWOt38vj2DzAaJ4I="; }; meta.homepage = "https://github.com/neovim/tree-sitter-vimdoc"; }; @@ -2426,12 +2470,12 @@ }; wing = buildGrammar { language = "wing"; - version = "0.0.0+rev=fac3f72"; + version = "0.0.0+rev=bde9356"; src = fetchFromGitHub { owner = "winglang"; repo = "wing"; - rev = "fac3f72d80d379fea61d1eca782cb99ac6d78b62"; - hash = "sha256-/PIqwqG5h2iFVzpTTlXOrAKEDNctcxRHIhGyv5jlkIw="; + rev = "bde93562c6dae6aaffd641cb367356386da412d0"; + hash = "sha256-Fv2tc7KmY9Hn5TqO5JKjbj33rYQvLQwpzBYO+W0bySU="; }; location = "libs/tree-sitter-wing"; generate = true; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index a4ac18ea101..b597fbeb6e9 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -999,14 +999,21 @@ self: super: { pname = "sg-nvim-rust"; inherit (old) version src; - cargoHash = "sha256-HdewCCraJ2jj2KAVnjzND+4O52jqfABonFU6ybWWAWY="; + cargoHash = "sha256-wJpJELVgzixzu8T9EHACur3LNm/sqfkkbGn+AkApzW4="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration ]; + prePatch = '' + rm .cargo/config.toml + ''; + + env.OPENSSL_NO_VENDOR = true; + cargoBuildFlags = [ "--workspace" ]; # tests are broken @@ -1033,23 +1040,27 @@ self: super: { sniprun = let - version = "1.3.6"; + version = "1.3.7"; src = fetchFromGitHub { owner = "michaelb"; repo = "sniprun"; rev = "v${version}"; - hash = "sha256-1xvB/YhpHlOhxbkIGlgQyTlO5ljWPHfOm+tuhKRTXAw="; + hash = "sha256-Lh4S7n+bNbdzjDt4lAL271VeYO3cotMD/kbAbV20C0U="; }; sniprun-bin = rustPlatform.buildRustPackage { pname = "sniprun-bin"; inherit version src; + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + # Cargo.lock is outdated preBuild = '' cargo update --offline ''; - cargoHash = "sha256-pML4ZJYivC/tu/7yvbB/VHfXTT+UpLZuS1Y3iNXt2Ks="; + cargoHash = "sha256-N+Okln3irqevUHC+ZUDQgQXhJ767peKMmsnt/sT77o8="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/crow-translate/default.nix b/pkgs/applications/misc/crow-translate/default.nix index 9c207dcd77c..6c70d49fdd6 100644 --- a/pkgs/applications/misc/crow-translate/default.nix +++ b/pkgs/applications/misc/crow-translate/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "crow-translate"; - version = "2.10.10"; + version = "2.11.0"; src = fetchzip { url = "https://github.com/${pname}/${pname}/releases/download/${version}/${pname}-${version}-source.tar.gz"; - hash = "sha256-PvfruCqmTBFLWLeIL9NV6+H2AifXcY97ImHzD1zEs28="; + hash = "sha256-e0zfbfRNzAiNvlWO84YbMApUXXzMcZG1MckTGMZm2ik="; }; postPatch = '' diff --git a/pkgs/applications/misc/pgmodeler/default.nix b/pkgs/applications/misc/pgmodeler/default.nix index 87847e32f6c..ba12738c2e1 100644 --- a/pkgs/applications/misc/pgmodeler/default.nix +++ b/pkgs/applications/misc/pgmodeler/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "pgmodeler"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "pgmodeler"; repo = "pgmodeler"; rev = "v${version}"; - sha256 = "sha256-Wl4MKsZhn5FKEhsezt+j8qpZs+KNHaQrWQ8x7y51MNE="; + sha256 = "sha256-Km4PWvbIzgc1Kxsp26HYLCA4OkCfOsGWsdWYLmWf/NA="; }; nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ]; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index c527731bb69..e3bb552d57c 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -331,7 +331,7 @@ let # Link to our own Node.js and Java (required during the build): mkdir -p third_party/node/linux/node-linux-x64/bin ln -s "${pkgsBuildHost.nodejs}/bin/node" third_party/node/linux/node-linux-x64/bin/node - ln -s "${pkgsBuildHost.jre8_headless}/bin/java" third_party/jdk/current/bin/ + ln -s "${pkgsBuildHost.jdk17_headless}/bin/java" third_party/jdk/current/bin/ # Allow building against system libraries in official builds sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' tools/generate_shim_headers/generate_shim_headers.py diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index a45b86ba55d..821921d418b 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,9 +1,15 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles, stdenv }: +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +, fetchzip +, installShellFiles +}: let - version = "2.1.1"; - sha256 = "11g7zkzx28xi81qk00frpxn9qsp4m0pr7m1zm61p2in3i9qxrqjn"; - manifestsSha256 = "1zpw9yh5j9ymhj771ccr7a3zm37h3igcrl0xnzyzzrkg754wdv9s"; + version = "2.1.2"; + sha256 = "1k47wjfyhkfn4v5cpfwfgb8ypcsiaml2cxwbwasis926wda37gzk"; + manifestsSha256 = "1imwvm85p5m9s05vmjvqql2hbkrj4m5cy87212ghybaricklcx6a"; manifests = fetchzip { url = @@ -23,7 +29,7 @@ in buildGoModule rec { inherit sha256; }; - vendorHash = "sha256-CQt8GbUUUOLUExysZK2H6YZzMx+pXEroGj30BXAhPRY="; + vendorHash = "sha256-4srEYBI/Qay9F0JxEIT0HyOtF29V9dzdB1ei4tZYJbs="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests @@ -65,6 +71,7 @@ in buildGoModule rec { updates to configuration when there is new code to deploy. ''; homepage = "https://fluxcd.io"; + downloadPage = "https://github.com/fluxcd/flux2/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ bryanasdev000 jlesquembre ]; mainProgram = "flux"; diff --git a/pkgs/applications/networking/cluster/kn/default.nix b/pkgs/applications/networking/cluster/kn/default.nix index ce4a5e83c6f..8d8c41cde77 100644 --- a/pkgs/applications/networking/cluster/kn/default.nix +++ b/pkgs/applications/networking/cluster/kn/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kn"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "knative"; repo = "client"; rev = "knative-v${version}"; - sha256 = "sha256-Aiu8SedWCP2yIw51+aVEFcskJKee8RvUcW6yGtagSnI="; + sha256 = "sha256-tVUe/EHraPVxikzGilmX2fDCX81lPGPy+Sa9OoVmpYM="; }; vendorHash = null; diff --git a/pkgs/applications/networking/netmaker/default.nix b/pkgs/applications/networking/netmaker/default.nix index fe90b8a8111..5b493e5460b 100644 --- a/pkgs/applications/networking/netmaker/default.nix +++ b/pkgs/applications/networking/netmaker/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "netmaker"; - version = "0.21.0"; + version = "0.21.1"; src = fetchFromGitHub { owner = "gravitl"; repo = pname; rev = "v${version}"; - hash = "sha256-RL0tGhtndahTezQFz/twyLh36h2RXFy7EUnPiLAxP4U="; + hash = "sha256-LfvO95jqzJzB44JxzB00GubTKJkvK/NR42eGYipirbM="; }; - vendorHash = "sha256-4Wxutkg9OdKs6B8z/P6JMgcE3cGS+6W4V7sKzVBwRJc="; + vendorHash = "sha256-BRgzPH7uiUHcouEw0KNpM5k0/kZMImvI9MFn4ahXIRM="; inherit subPackages; diff --git a/pkgs/applications/networking/pcloud/default.nix b/pkgs/applications/networking/pcloud/default.nix index ff0d808e8f1..97207d569f9 100644 --- a/pkgs/applications/networking/pcloud/default.nix +++ b/pkgs/applications/networking/pcloud/default.nix @@ -38,13 +38,13 @@ let pname = "pcloud"; - version = "1.14.0"; - code = "XZpL8AVZAqfCXz5TebJ2gcvAiHi15pYFKPey"; + version = "1.14.1"; + code = "XZ5iuiVZQsuexQaMmmLAS7FGWNh1TkXRWJR7"; # Archive link's codes: https://www.pcloud.com/release-notes/linux.html src = fetchzip { url = "https://api.pcloud.com/getpubzip?code=${code}&filename=${pname}-${version}.zip"; - hash = "sha256-uirj/ASOrJyE728q+SB7zq0O9O58XDNzhokvNyca+2c="; + hash = "sha256-6IHt9qxMuDe9f1T+t8JXfPXLUCVe865Od8/ixPR3gso="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/build-support/fetchbittorrent/default.nix b/pkgs/build-support/fetchbittorrent/default.nix new file mode 100644 index 00000000000..916c7e7d8c9 --- /dev/null +++ b/pkgs/build-support/fetchbittorrent/default.nix @@ -0,0 +1,60 @@ +{ lib, runCommand, transmission_noSystemd, rqbit, writeShellScript, formats, cacert, rsync }: +let + urlRegexp = ''.*xt=urn:bt[im]h:([^&]{64}|[^&]{40}).*''; +in +{ url +, name ? + if (builtins.match urlRegexp url) == null then + "bittorrent" + else + "bittorrent-" + builtins.head (builtins.match urlRegexp url) +, config ? if (backend == "transmission") then { } else throw "json config for configuring fetchFromBitorrent only works with the transmission backend" +, hash +, backend ? "transmission" +, recursiveHash ? true +, postFetch ? "" +, postUnpack ? "" +}: +let + afterSuccess = writeShellScript "fetch-bittorrent-done.sh" '' + ${postUnpack} + # Flatten the directory, so that only the torrent contents are in $out, not + # the folder name + shopt -s dotglob + mv -v $downloadedDirectory/*/* $out + rm -v -rf $downloadedDirectory + unset downloadedDirectory + ${postFetch} + kill $PPID + ''; + jsonConfig = (formats.json {}).generate "jsonConfig" config; +in +runCommand name { + nativeBuildInputs = [ cacert ] ++ (if (backend == "transmission" ) then [ transmission_noSystemd ] else if (backend == "rqbit") then [ rqbit ] else throw "rqbit or transmission are the only available backends for fetchbittorrent"); + outputHashAlgo = if hash != "" then null else "sha256"; + outputHash = hash; + outputHashMode = if recursiveHash then "recursive" else "flat"; + + # url will be written to the derivation, meaning it can be parsed and utilized + # by external tools, such as tools that may want to seed fetchBittorrent calls + # in nixpkgs + inherit url; +} +(if (backend == "transmission") then '' + export HOME=$TMP + export downloadedDirectory=$out/downloadedDirectory + mkdir -p $downloadedDirectory + mkdir -p $HOME/.config/transmission + cp ${jsonConfig} $HOME/.config/transmission/settings.json + function handleChild { + # This detects failures and logs the contents of the transmission fetch + find $out + exit 0 + } + trap handleChild CHLD + transmission-cli --port $(shuf -n 1 -i 49152-65535) --portmap --finish ${afterSuccess} --download-dir $downloadedDirectory --config-dir "$HOME"/.config/transmission "$url" +'' else +'' + export HOME=$TMP + rqbit --disable-dht-persistence --http-api-listen-addr "127.0.0.1:$(shuf -n 1 -i 49152-65535)" download -o $out --exit-on-finish "$url" +'') diff --git a/pkgs/build-support/fetchbittorrent/tests.nix b/pkgs/build-support/fetchbittorrent/tests.nix new file mode 100644 index 00000000000..fce1b3933a7 --- /dev/null +++ b/pkgs/build-support/fetchbittorrent/tests.nix @@ -0,0 +1,25 @@ +{ testers, fetchFromBittorrent, ... }: + +{ + http-link = testers.invalidateFetcherByDrvHash fetchFromBittorrent { + url = "https://webtorrent.io/torrents/wired-cd.torrent"; + hash = "sha256-OCsC22WuanqoN6lPv5wDT5ZxPcEHDpZ1EgXGvz1SDYo="; + backend = "transmission"; + }; + magnet-link = testers.invalidateFetcherByDrvHash fetchFromBittorrent { + url = "magnet:?xt=urn:btih:a88fda5954e89178c372716a6a78b8180ed4dad3&dn=The+WIRED+CD+-+Rip.+Sample.+Mash.+Share&tr=udp%3A%2F%2Fexplodie.org%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.empire-js.us%3A1337&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337&tr=wss%3A%2F%2Ftracker.btorrent.xyz&tr=wss%3A%2F%2Ftracker.fastcast.nz&tr=wss%3A%2F%2Ftracker.openwebtorrent.com&ws=https%3A%2F%2Fwebtorrent.io%2Ftorrents%2F&xs=https%3A%2F%2Fwebtorrent.io%2Ftorrents%2Fwired-cd.torrent"; + hash = "sha256-OCsC22WuanqoN6lPv5wDT5ZxPcEHDpZ1EgXGvz1SDYo="; + backend = "transmission"; + }; + http-link-rqbit = testers.invalidateFetcherByDrvHash fetchFromBittorrent { + url = "https://webtorrent.io/torrents/wired-cd.torrent"; + hash = "sha256-OCsC22WuanqoN6lPv5wDT5ZxPcEHDpZ1EgXGvz1SDYo="; + backend = "rqbit"; + }; + magnet-link-rqbit = testers.invalidateFetcherByDrvHash fetchFromBittorrent { + url = "magnet:?xt=urn:btih:a88fda5954e89178c372716a6a78b8180ed4dad3&dn=The+WIRED+CD+-+Rip.+Sample.+Mash.+Share&tr=udp%3A%2F%2Fexplodie.org%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.empire-js.us%3A1337&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337&tr=wss%3A%2F%2Ftracker.btorrent.xyz&tr=wss%3A%2F%2Ftracker.fastcast.nz&tr=wss%3A%2F%2Ftracker.openwebtorrent.com&ws=https%3A%2F%2Fwebtorrent.io%2Ftorrents%2F&xs=https%3A%2F%2Fwebtorrent.io%2Ftorrents%2Fwired-cd.torrent"; + hash = "sha256-OCsC22WuanqoN6lPv5wDT5ZxPcEHDpZ1EgXGvz1SDYo="; + backend = "rqbit"; + }; +} + diff --git a/pkgs/by-name/gi/git-get/package.nix b/pkgs/by-name/gi/git-get/package.nix new file mode 100644 index 00000000000..8cd852c5d75 --- /dev/null +++ b/pkgs/by-name/gi/git-get/package.nix @@ -0,0 +1,52 @@ +{ lib, fetchFromGitHub, git, buildGoModule }: + +let config-module = "git-get/pkg/cfg"; +in +buildGoModule rec { + pname = "git-get"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "grdl"; + repo = pname; + rev = "v${version}"; + hash = "sha256-v98Ff7io7j1LLzciHNWJBU3LcdSr+lhwYrvON7QjyCI="; + # populate values that require us to use git. By doing this in postFetch we + # can delete .git afterwards and maintain better reproducibility of the src. + leaveDotGit = true; + postFetch = '' + git -C $out rev-parse HEAD > $out/COMMIT + # in format of 0000-00-00T00:00:00Z + date -u -d "@$(git -C $out log -1 --pretty=%ct)" "+%Y-%m-%dT%H:%M:%SZ" > $out/SOURCE_DATE_EPOCH + find "$out" -name .git -print0 | xargs -0 rm -rf + ''; + }; + + vendorHash = "sha256-C+XOjMDMFneKJNeBh0KWPx8yM7XiiIpTlc2daSfhZhY="; + + doCheck = false; + + # ldflags based on metadata from git and source + preBuild = '' + ldflags+=" -X ${config-module}.commit=$(cat COMMIT)" + ldflags+=" -X ${config-module}.date=$(cat SOURCE_DATE_EPOCH)" + ''; + + ldflags = [ + "-s" + "-w" + "-X ${config-module}.version=v${version}" + ]; + + preInstall = '' + mv "$GOPATH/bin/get" "$GOPATH/bin/git-get" + mv "$GOPATH/bin/list" "$GOPATH/bin/git-list" + ''; + + meta = with lib; { + description = "A better way to clone, organize and manage multiple git repositories"; + homepage = "https://github.com/grdl/git-get"; + license = licenses.mit; + maintainers = with maintainers; [ sumnerevans ]; + }; +} diff --git a/pkgs/by-name/li/lint-staged/package.nix b/pkgs/by-name/li/lint-staged/package.nix new file mode 100644 index 00000000000..c93044c71a9 --- /dev/null +++ b/pkgs/by-name/li/lint-staged/package.nix @@ -0,0 +1,37 @@ +{ lib, buildNpmPackage, fetchFromGitHub, testers, lint-staged }: + +buildNpmPackage rec { + pname = "lint-staged"; + version = "14.0.1"; + + src = fetchFromGitHub { + owner = "okonet"; + repo = "lint-staged"; + rev = "v${version}"; + hash = "sha256-xuHrxi/1zfeY2dd625iLDNJFoNO28JJrPvmECdqeZXk="; + }; + + npmDepsHash = "sha256-4lyTBmcX5k//kbFHmzbOQJp+Jd9TPY7bzm51QuiXUzE="; + + dontNpmBuild = true; + + # Fixes `lint-staged --version` output + postPatch = '' + substituteInPlace package.json --replace \ + '"version": "0.0.0-development"' \ + '"version": "${version}"' + ''; + + passthru.tests.version = testers.testVersion { package = lint-staged; }; + + meta = with lib; { + description = "Run linters on git staged files"; + longDescription = '' + Run linters against staged git files and don't let 💩 slip into your code base! + ''; + homepage = src.meta.homepage; + license = licenses.mit; + maintainers = with maintainers; [ DamienCassou ]; + mainProgram = "lint-staged"; + }; +} diff --git a/pkgs/by-name/li/litmus/package.nix b/pkgs/by-name/li/litmus/package.nix new file mode 100644 index 00000000000..11068ea39fb --- /dev/null +++ b/pkgs/by-name/li/litmus/package.nix @@ -0,0 +1,55 @@ +{ stdenv +, lib +, fetchFromGitHub +, autoreconfHook +, pkg-config +, expat +, libproxy +, neon +, zlib +}: + +stdenv.mkDerivation rec { + version = "0.14"; + pname = "litmus"; + + src = fetchFromGitHub { + owner = "notroj"; + repo = "litmus"; + rev = version; + # Required for neon m4 macros, bundled neon not used + fetchSubmodules = true; + hash = "sha256-jWz0cnytgn7px3vvB9/ilWBNALQiW5/QvgguM27I3yQ="; + }; + + postPatch = '' + # neon version requirements are broken, remove them: + # configure: incompatible neon library version 0.32.5: wanted 0.27 28 29 30 31 32 + # configure: using bundled neon (0.32.5) + sed -i /NE_REQUIRE_VERSIONS/d configure.ac + ''; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + expat + libproxy + neon + zlib + ]; + + autoreconfFlags = [ "-I" "neon/macros" ]; + + meta = with lib; { + description = "WebDAV server protocol compliance test suite"; + homepage = "http://www.webdav.org/neon/litmus/"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.lorenz ]; + mainProgram = "litmus"; + }; +} + diff --git a/pkgs/by-name/pi/pid1/package.nix b/pkgs/by-name/pi/pid1/package.nix new file mode 100644 index 00000000000..76e4d3044ce --- /dev/null +++ b/pkgs/by-name/pi/pid1/package.nix @@ -0,0 +1,23 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "pid1"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "fpco"; + repo = "pid1-rs"; + rev = "v${version}"; + hash = "sha256-BljIa+4BKI7WHlOhXfN/3VKMzs5G5E4tNlQ2oPpJV2g="; + }; + + cargoHash = "sha256-7PANlw/SKxyAqymfXIXFT/v3U0GCiGfgStguSr0lrqQ="; + + meta = with lib; { + description = "Signal handling and zombie reaping for PID1 process"; + homepage = "https://github.com/fpco/pid1-rs"; + license = licenses.mit; + maintainers = with maintainers; [ psibi ]; + mainProgram = "pid1"; + }; +} diff --git a/pkgs/by-name/sy/synthesia/package.nix b/pkgs/by-name/sy/synthesia/package.nix new file mode 100644 index 00000000000..44c48bb59b0 --- /dev/null +++ b/pkgs/by-name/sy/synthesia/package.nix @@ -0,0 +1,76 @@ +{ lib +, fetchurl +, stdenvNoCC +, runtimeShell +, copyDesktopItems +, makeDesktopItem +, wineWowPackages +}: + +let + icon = fetchurl { + name = "synthesia.png"; + url = "https://cdn.synthesia.app/images/headerIcon.png"; + hash = "sha256-M9cQqHwwjko5pchdNtIMjYwd4joIvBphAYnpw73qYzM="; + }; +in +stdenvNoCC.mkDerivation rec { + pname = "synthesia"; + version = "10.9"; + + desktopItems = [ + (makeDesktopItem { + name = pname; + desktopName = "Synthesia"; + comment = meta.description; + exec = pname; + icon = pname; + categories = [ "Game" "Audio" ]; + startupWMClass = "synthesia.exe"; + }) + ]; + + nativeBuildInputs = [ + copyDesktopItems + wineWowPackages.stable + ]; + + src = fetchurl { + url = "https://cdn.synthesia.app/files/Synthesia-${version}-installer.exe"; + hash = "sha256-BFTsbesfMqxY1731ss6S0w8BcUaoqjVrr62VeU1BfrU="; + }; + + dontUnpack = true; + + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cat <<'EOF' > $out/bin/${pname} + #!${runtimeShell} + export PATH=${wineWowPackages.stable}/bin:$PATH + export WINEARCH=win64 + export WINEPREFIX="''${SYNTHESIA_HOME:-"''${XDG_DATA_HOME:-"''${HOME}/.local/share"}/${pname}"}/wine" + export WINEDLLOVERRIDES="mscoree=" # disable mono + if [ ! -d "$WINEPREFIX" ] ; then + mkdir -p "$WINEPREFIX" + wine ${src} /S + fi + wine "$WINEPREFIX/drive_c/Program Files (x86)/Synthesia/Synthesia.exe" + EOF + chmod +x $out/bin/${pname} + install -Dm644 ${icon} $out/share/icons/hicolor/48x48/apps/${pname}.png + runHook postInstall + ''; + + meta = with lib; { + description = "A fun way to learn how to play the piano"; + homepage = "https://synthesiagame.com/"; + downloadPage = "https://synthesiagame.com/download"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + maintainers = with maintainers; [ ners ]; + platforms = wineWowPackages.stable.meta.platforms; + }; +} diff --git a/pkgs/desktops/xfce/core/xfconf/default.nix b/pkgs/desktops/xfce/core/xfconf/default.nix index a25b76f7e02..169efcb2c32 100644 --- a/pkgs/desktops/xfce/core/xfconf/default.nix +++ b/pkgs/desktops/xfce/core/xfconf/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfconf"; - version = "4.18.1"; + version = "4.18.2"; - sha256 = "sha256-HS+FzzTTAH8lzBBai3ESdnuvvvZW/vAVSmGe57mwcoo="; + sha256 = "sha256-FVNkcwOS4feMocx3vYhuWNs1EkXDrM1FaKkMhIOuPHI="; nativeBuildInputs = [ gobject-introspection vala ]; diff --git a/pkgs/development/embedded/fpga/openfpgaloader/default.nix b/pkgs/development/embedded/fpga/openfpgaloader/default.nix index eb44e39c49a..615000e6eec 100644 --- a/pkgs/development/embedded/fpga/openfpgaloader/default.nix +++ b/pkgs/development/embedded/fpga/openfpgaloader/default.nix @@ -31,16 +31,16 @@ stdenv.mkDerivation (finalAttrs: { hidapi libftdi1 libusb1 - udev zlib + ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform udev) [ + udev ]; meta = { - broken = stdenv.isDarwin; # error: Package ‘systemd-253.6’ is not available on the requested Darwin platform. description = "Universal utility for programming FPGAs"; homepage = "https://github.com/trabucayre/openFPGALoader"; license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ danderson ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; }) diff --git a/pkgs/development/libraries/fplll/default.nix b/pkgs/development/libraries/fplll/default.nix index 8d1c19a48ac..ab74a09d079 100644 --- a/pkgs/development/libraries/fplll/default.nix +++ b/pkgs/development/libraries/fplll/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "fplll"; - version = "5.4.4"; + version = "5.4.5"; src = fetchFromGitHub { owner = "fplll"; repo = "fplll"; rev = version; - sha256 = "sha256-+1EdNdmEk5tQDd1DXklPbEKC/Dr2yV2gwbtwBtZxpNM="; + sha256 = "sha256-taSS7jpVyjVfNe6kSuUDXMD2PgKmtG64V5MjZyQzorI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index 4bae576bd18..8c6eeb3f3fb 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "leatherman"; - version = "1.12.9"; + version = "1.12.10"; src = fetchFromGitHub { - sha256 = "sha256-TuiOAinJsQWJVJiaS8kWk4Pl+hn521f4ooJ2p+eR6mk="; + sha256 = "sha256-0AHChU96LOVCsd+b77nKV4lOt1FtbVfv+OSNvGjekYo="; rev = version; repo = "leatherman"; owner = "puppetlabs"; diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix index fc55f14f118..7f2c12a9dea 100644 --- a/pkgs/development/libraries/libLAS/default.nix +++ b/pkgs/development/libraries/libLAS/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, boost, cmake, gdal, libgeotiff, libtiff, LASzip2, fixDarwinDylibNames }: +{ lib, stdenv, fetchurl, fetchpatch, boost, cmake, libgeotiff, libtiff, LASzip2, fixDarwinDylibNames }: stdenv.mkDerivation rec { pname = "libLAS"; @@ -28,10 +28,9 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ boost gdal libgeotiff libtiff LASzip2 ]; + buildInputs = [ boost libgeotiff libtiff LASzip2 ]; cmakeFlags = [ - "-DGDAL_CONFIG=${gdal}/bin/gdal-config" "-DWITH_LASZIP=ON" # libLAS is currently not compatible with LASzip 3, # see https://github.com/libLAS/libLAS/issues/144. diff --git a/pkgs/development/libraries/libbytesize/default.nix b/pkgs/development/libraries/libbytesize/default.nix index fd5a18f8548..6604bb32229 100644 --- a/pkgs/development/libraries/libbytesize/default.nix +++ b/pkgs/development/libraries/libbytesize/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libbytesize"; - version = "2.9"; + version = "2.10"; src = fetchFromGitHub { owner = "storaged-project"; repo = "libbytesize"; rev = finalAttrs.version; - hash = "sha256-4jbu8Hmc4I1IYKiWlCQq7ob98HsgDTqJdghj3ZzOuN8="; + hash = "sha256-IPBoYcnSQ1/ws3mzPUXxgbetZkXRWrGhtakXaVVFb6U="; }; outputs = [ "out" "dev" "devdoc" "man" ]; diff --git a/pkgs/development/libraries/science/math/magma/generic.nix b/pkgs/development/libraries/science/math/magma/generic.nix index e9712ffb62a..27509ee9933 100644 --- a/pkgs/development/libraries/science/math/magma/generic.nix +++ b/pkgs/development/libraries/science/math/magma/generic.nix @@ -121,6 +121,8 @@ stdenv.mkDerivation { cuda_nvprof.dev # <cuda_profiler_api.h> ] ++ lists.optionals (strings.versionAtLeast cudaVersion "11.8") [ cuda_profiler_api.dev # <cuda_profiler_api.h> + ] ++ lists.optionals (strings.versionAtLeast cudaVersion "12.0") [ + cuda_cccl.dev # <nv/target> ]) ++ lists.optionals rocmSupport [ rocmPackages.clr rocmPackages.hipblas diff --git a/pkgs/development/python-modules/mmcv/default.nix b/pkgs/development/python-modules/mmcv/default.nix index 661c93a70d5..923e40d02fc 100644 --- a/pkgs/development/python-modules/mmcv/default.nix +++ b/pkgs/development/python-modules/mmcv/default.nix @@ -50,7 +50,7 @@ let in buildPythonPackage rec { pname = "mmcv"; - version = "2.0.1"; + version = "2.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -59,7 +59,7 @@ buildPythonPackage rec { owner = "open-mmlab"; repo = "mmcv"; rev = "refs/tags/v${version}"; - hash = "sha256-w40R8ftLQIu66F2EtXFAqvLGxR/6wvxLhxxIdsQLZhI="; + hash = "sha256-an78tRvx18zQ5Q0ca74r4Oe2gJ9F9OfWXLbuP2+rL68="; }; preConfigure = '' diff --git a/pkgs/development/python-modules/openai-triton/llvm.nix b/pkgs/development/python-modules/openai-triton/llvm.nix index 6ac0d9f5738..70ea69a9b15 100644 --- a/pkgs/development/python-modules/openai-triton/llvm.nix +++ b/pkgs/development/python-modules/openai-triton/llvm.nix @@ -1,4 +1,5 @@ -{ lib +{ config +, lib , stdenv , fetchFromGitHub , pkg-config @@ -68,7 +69,17 @@ stdenv.mkDerivation (finalAttrs: { sourceRoot = "${finalAttrs.src.name}/llvm"; cmakeFlags = [ - "-DLLVM_TARGETS_TO_BUILD=X86;AMDGPU;NVPTX" + "-DLLVM_TARGETS_TO_BUILD=${ + let + # Targets can be found in + # https://github.com/llvm/llvm-project/tree/f28c006a5895fc0e329fe15fead81e37457cb1d1/clang/lib/Basic/Targets + # NOTE: Unsure of how "host" would function, especially given that we might be cross-compiling. + llvmTargets = [ "AMDGPU" "NVPTX" ] + ++ lib.optionals stdenv.isAarch64 [ "AArch64" ] + ++ lib.optionals stdenv.isx86_64 [ "X86" ]; + in + lib.concatStringsSep ";" llvmTargets + }" "-DLLVM_ENABLE_PROJECTS=llvm;mlir" "-DLLVM_INSTALL_UTILS=ON" ] ++ lib.optionals (buildDocs || buildMan) [ @@ -107,6 +118,8 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ ncsa ]; maintainers = with maintainers; [ SomeoneSerge Madouura ]; platforms = platforms.linux; - broken = stdenv.isAarch64; # https://github.com/RadeonOpenCompute/ROCm/issues/1831#issuecomment-1278205344 + # Consider the derivation broken if we're not building for CUDA or ROCm, or if we're building for aarch64 + # and ROCm is enabled. See https://github.com/RadeonOpenCompute/ROCm/issues/1831#issuecomment-1278205344. + broken = stdenv.isAarch64 && !config.cudaSupport; }; }) diff --git a/pkgs/development/python-modules/paste/default.nix b/pkgs/development/python-modules/paste/default.nix index 2388e2d15c6..7b436c697d8 100644 --- a/pkgs/development/python-modules/paste/default.nix +++ b/pkgs/development/python-modules/paste/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "paste"; - version = "3.5.3"; + version = "3.6.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "cdent"; repo = "paste"; rev = "refs/tags/${version}"; - hash = "sha256-W02UY9P3qjIFhR/DCpQZyvjEmJYl0MvMcGt9N4xgbaY="; + hash = "sha256-vVCJn8PhLNw0fj+/tTigTEodn9SEKv0VASJf4LKJy20="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyorthanc/default.nix b/pkgs/development/python-modules/pyorthanc/default.nix index edeb63a2245..458cd0afb27 100644 --- a/pkgs/development/python-modules/pyorthanc/default.nix +++ b/pkgs/development/python-modules/pyorthanc/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyorthanc"; - version = "1.12.2"; + version = "1.12.3"; disabled = pythonOlder "3.8"; format = "pyproject"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "gacou54"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-kgCHPp0nsbhzNw/bKwDeDc1mMcmdJUBmZExTZ01nlZY="; + hash = "sha256-9+HP95OsJIXsLy+6m6fWECU3jXxY++C3wQJBcqnC+H0="; }; nativeBuildInputs = [ pythonRelaxDepsHook poetry-core ]; diff --git a/pkgs/development/python-modules/pytest-md-report/default.nix b/pkgs/development/python-modules/pytest-md-report/default.nix index be52de50f41..0b0f892c7f6 100644 --- a/pkgs/development/python-modules/pytest-md-report/default.nix +++ b/pkgs/development/python-modules/pytest-md-report/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pytest-md-report"; - version = "0.4.1"; + version = "0.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4946iE+VYaPndJtQLQE7Q7VSs4aXxrg3wL4p84oT5to="; + hash = "sha256-8qLcbMhD+mTLH5veweAg56G067H4AnDQIjywINwJaCE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-testmon/default.nix b/pkgs/development/python-modules/pytest-testmon/default.nix index 4f9b9bd5d63..28f45c02dd8 100644 --- a/pkgs/development/python-modules/pytest-testmon/default.nix +++ b/pkgs/development/python-modules/pytest-testmon/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pytest-testmon"; - version = "2.0.12"; + version = "2.0.13"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tarpas"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-hv5sgWSbMk13h+nFTcy4aEMJvTyaLbXFhg6ZOKYEvVQ="; + hash = "sha256-WJ0Br8O7p5Zru4Fr9+adXp5qjR7sZxBZVtBJghecm9E="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-efl/default.nix b/pkgs/development/python-modules/python-efl/default.nix index 8df6ee96e7d..972bbca9c41 100644 --- a/pkgs/development/python-modules/python-efl/default.nix +++ b/pkgs/development/python-modules/python-efl/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "python-efl"; - version = "1.26.0"; + version = "1.26.1"; src = fetchurl { url = "http://download.enlightenment.org/rel/bindings/python/${pname}-${version}.tar.xz"; - sha256 = "0dj6f24n33hkpy0bkdclnzpxhvs8vpaxqaf7hkw0di19pjwrq25h"; + hash = "sha256-3Ns5fhIHihnpDYDnxvPP00WIZL/o1UWLzgNott4GKNc="; }; nativeBuildInputs = [ pkg-config ]; @@ -48,8 +48,5 @@ buildPythonPackage rec { platforms = platforms.linux; license = with licenses; [ gpl3 lgpl3 ]; maintainers = with maintainers; [ matejc ftrvxmtrx ] ++ teams.enlightenment.members; - # The generated files in the tarball aren't compatible with python 3.11 - # See https://sourceforge.net/p/enlightenment/mailman/message/37794291/ - broken = python.pythonAtLeast "3.11"; }; } diff --git a/pkgs/development/python-modules/sphinx-sitemap/default.nix b/pkgs/development/python-modules/sphinx-sitemap/default.nix new file mode 100644 index 00000000000..ecb477980c1 --- /dev/null +++ b/pkgs/development/python-modules/sphinx-sitemap/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, sphinx +}: +let + pname = "sphinx-sitemap"; + version = "2.5.1"; +in +buildPythonPackage { + inherit pname version; + pyproject = true; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-mEvvBou9vCbPriCai2E5LpaBq8kZG0d80w2kBuOmDuU="; + }; + + propagatedBuildInputs = [ + sphinx + ]; + + # Latest tests do not pass on Sphinx5, although it is supported + # Ref: https://github.com/jdillard/sphinx-sitemap/blob/ce244e9e1e05f09c566432f6a89bcd6f6ebe83bf/tox.ini#L18C25-L18C25 + doCheck = false; + + meta = with lib; { + changelog = "https://github.com/jdillard/sphinx-sitemap/releases/tag/v${version}"; + description = "Sitemap generator for Sphinx"; + homepage = "https://github.com/jdillard/sphinx-sitemap"; + maintainers = with maintainers; [ alejandrosame ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix index 65131548e5d..9efb0facaff 100644 --- a/pkgs/development/python-modules/torch/default.nix +++ b/pkgs/development/python-modules/torch/default.nix @@ -111,7 +111,7 @@ let brokenConditions = attrsets.filterAttrs (_: cond: cond) { "CUDA and ROCm are not mutually exclusive" = cudaSupport && rocmSupport; "CUDA is not targeting Linux" = cudaSupport && !stdenv.isLinux; - "Unsupported CUDA version" = cudaSupport && (cudaPackages.cudaMajorVersion != "11"); + "Unsupported CUDA version" = cudaSupport && !(builtins.elem cudaPackages.cudaMajorVersion [ "11" "12" ]); "MPI cudatoolkit does not match cudaPackages.cudatoolkit" = MPISupport && cudaSupport && (mpi.cudatoolkit != cudaPackages.cudatoolkit); "Magma cudaPackages does not match cudaPackages" = cudaSupport && (magma.cudaPackages != cudaPackages); }; diff --git a/pkgs/development/python-modules/unstructured/default.nix b/pkgs/development/python-modules/unstructured/default.nix index 8b8ad812170..acadf65a752 100644 --- a/pkgs/development/python-modules/unstructured/default.nix +++ b/pkgs/development/python-modules/unstructured/default.nix @@ -56,7 +56,7 @@ , grpcio }: let - version = "0.10.23"; + version = "0.10.24"; optional-dependencies = { huggingflace = [ langdetect @@ -90,7 +90,7 @@ buildPythonPackage { owner = "Unstructured-IO"; repo = "unstructured"; rev = "refs/tags/${version}"; - hash = "sha256-MfnMu7YW8G1G0sKNvum4k6hvNMRmpXp9YwaDHEj/mYE="; + hash = "sha256-C1rjZRNXFr3syPnq7uhKRYz9Xydmunc/0uQcLxfN6tU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/whois-api/default.nix b/pkgs/development/python-modules/whois-api/default.nix new file mode 100644 index 00000000000..775fb633569 --- /dev/null +++ b/pkgs/development/python-modules/whois-api/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, requests +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "whois-api"; + version = "1.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "whois-api-llc"; + repo = "whois-api-py"; + rev = "v${version}"; + hash = "sha256-SeBeJ6k2R53LxHov+8t70geqUosk/yBJQCi6GaVteMM="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + requests + ]; + + # all tests touch internet + doCheck = false; + + pythonImportsCheck = [ "whoisapi" ]; + + meta = with lib; { + description = "Whois API client library for Python"; + homepage = "https://github.com/whois-api-llc/whois-api-py"; + changelog = "https://github.com/whois-api-llc/whois-api-py/blob/${src.rev}/CHANGELOG.rst"; + license = licenses.mit; + maintainers = with maintainers; [ mbalatsko ]; + }; +} diff --git a/pkgs/development/tools/espup/default.nix b/pkgs/development/tools/espup/default.nix index 927f002e547..97efd1939ee 100644 --- a/pkgs/development/tools/espup/default.nix +++ b/pkgs/development/tools/espup/default.nix @@ -39,6 +39,7 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration ]; env = { diff --git a/pkgs/development/tools/rust/cargo-crev/default.nix b/pkgs/development/tools/rust/cargo-crev/default.nix index fa824ae613d..cbfa86c69ef 100644 --- a/pkgs/development/tools/rust/cargo-crev/default.nix +++ b/pkgs/development/tools/rust/cargo-crev/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-crev"; - version = "0.25.0"; + version = "0.25.3"; src = fetchFromGitHub { owner = "crev-dev"; repo = "cargo-crev"; rev = "v${version}"; - sha256 = "sha256-Lt8ubK96ntcQJEnQ37nF8N4gJ8nmphwkbM6KJor13lo="; + sha256 = "sha256-tyNbBG2okxoLmu8mwoeR3Ud0nIpqkwVmFHT0Gi1Pibs="; }; - cargoHash = "sha256-cYhzEVHpi7qMCU9fe3wxOQGX6YssJIeo4onLUBtqN6A="; + cargoHash = "sha256-sKQw4Bak3JY07TYKkThKTFhh3H5GB2lDcfcGE4cRHDY="; preCheck = '' export HOME=$(mktemp -d) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index b99cb8860df..c116c605300 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -54,12 +54,12 @@ rec { }); beta = selectHighestVersion latest (generic { - version = "535.43.02"; - sha256_64bit = "sha256-4KTdk4kGDmBGyHntMIzWRivUpEpzmra+p7RBsTL8mYM="; - sha256_aarch64 = "sha256-0blD8R+xpOVlitWefIbtw1d3KAnmWHBy7hkxGZHBrE4="; - openSha256 = "sha256-W1fwbbEEM7Z/S3J0djxGTtVTewbSALqX1G1OSpdajCM="; - settingsSha256 = "sha256-j0sSEbtF2fapv4GSthVTkmJga+ycmrGc1OnGpV6jEkc="; - persistencedSha256 = "sha256-M0ovNaJo8SZwLW4CQz9accNK79Z5JtTJ9kKwOzicRZ4="; + version = "545.23.06"; + sha256_64bit = "sha256-QTnTKAGfcvKvKHik0BgAemV3PrRqRlM3B9jjZeupCC8="; + sha256_aarch64 = "sha256-qkVP6AiXNoRTqgqPvs/AfErEq8BTQw25rtJ6GS06JTM="; + openSha256 = "sha256-m7D5LZdhFCZYAIbhrgZ0pN2z19LsU3I3Q7qsKX7Z6mM="; + settingsSha256 = "sha256-+X6gDeU8Qlvprb05aB2quM55y0zEcBXtb65e3Rq9gKg="; + persistencedSha256 = "sha256-RQJAIwPqOUI5FB3uf0/Y4K/iwFfoLpU1/+BOK/KF5VA="; }); # Vulkan developer beta driver diff --git a/pkgs/os-specific/linux/qmk-udev-rules/default.nix b/pkgs/os-specific/linux/qmk-udev-rules/default.nix index 6fc6e0012b3..5b627ea9033 100644 --- a/pkgs/os-specific/linux/qmk-udev-rules/default.nix +++ b/pkgs/os-specific/linux/qmk-udev-rules/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "qmk-udev-rules"; - version = "0.19.11"; + version = "0.22.3"; src = fetchFromGitHub { owner = "qmk"; repo = "qmk_firmware"; rev = version; - hash = "sha256-RevCj+tFlleH08VGRwJjKhZdXwU6VlMsSCR9090pgRI="; + hash = "sha256-HLQxmBlzTdsOAMqfc4taoMM+V2G5novMsbc1drZlNGg="; }; dontBuild = true; diff --git a/pkgs/servers/bazarr/default.nix b/pkgs/servers/bazarr/default.nix index 5b7bea8034e..ac9bdf70815 100644 --- a/pkgs/servers/bazarr/default.nix +++ b/pkgs/servers/bazarr/default.nix @@ -8,13 +8,13 @@ let in stdenv.mkDerivation rec { pname = "bazarr"; - version = "1.3.0"; + version = "1.3.1"; sourceRoot = "."; src = fetchurl { url = "https://github.com/morpheus65535/bazarr/releases/download/v${version}/bazarr.zip"; - sha256 = "sha256-f9LKJZX+dZRUGq+g/PHvCzN8UpDiBpEVvqEO6CZPoAE="; + sha256 = "sha256-AhUMrvnZoo0XMfJ6F9Bi4mC0hk5T3EkQPX/s4tHWcic="; }; nativeBuildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/servers/geospatial/geoserver/default.nix b/pkgs/servers/geospatial/geoserver/default.nix index 88aa9c140b7..4f0b657fda6 100644 --- a/pkgs/servers/geospatial/geoserver/default.nix +++ b/pkgs/servers/geospatial/geoserver/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "geoserver"; - version = "2.23.2"; + version = "2.24.0"; src = fetchurl { url = "mirror://sourceforge/geoserver/GeoServer/${version}/geoserver-${version}-bin.zip"; - sha256 = "sha256-4zOtcUWeb/zubEY3wNCYBeStRSga2bm1BnBa+qcyeCw="; + sha256 = "sha256-xX1rAONMh5XSWGPXkVMemAvG34DDNmu2018HsTvY7G0="; }; sourceRoot = "."; diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix index 26dab595381..a7e71c722fb 100644 --- a/pkgs/servers/roundcube/default.nix +++ b/pkgs/servers/roundcube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "roundcube"; - version = "1.6.3"; + version = "1.6.4"; src = fetchurl { url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; - sha256 = "sha256-XmDM1Q9i+wDEPTNewIqb2vvyvdAlUiVsxACZCLOa2Y8="; + sha256 = "sha256-peq8fggo4CYYea7JCp1KbcAgPpiOFN4vk9bAYeZIkcg="; }; patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ]; diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 2b1768515ba..4cc9ecc0db3 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -104,6 +104,7 @@ with pkgs; cc-multilib-clang = callPackage ./cc-wrapper/multilib.nix { stdenv = clangMultiStdenv; }; fetchurl = callPackages ../build-support/fetchurl/tests.nix { }; + fetchFromBittorrent = callPackages ../build-support/fetchbittorrent/tests.nix { }; fetchpatch = callPackages ../build-support/fetchpatch/tests.nix { }; fetchpatch2 = callPackages ../build-support/fetchpatch/tests.nix { fetchpatch = fetchpatch2; }; fetchDebianPatch = callPackages ../build-support/fetchdebianpatch/tests.nix { }; diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix index c16da204f2f..ac232f917bd 100644 --- a/pkgs/tools/X11/xnee/default.nix +++ b/pkgs/tools/X11/xnee/default.nix @@ -1,13 +1,25 @@ -{ fetchurl, fetchpatch, lib, stdenv, libX11, xorgproto, libXext, libXtst -, gtk2, libXi, pkg-config, texinfo }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, autoreconfHook +, pkg-config +, gtk2 +, libX11 +, libXext +, libXi +, libXtst +, texinfo +, xorgproto +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "3.19"; pname = "xnee"; src = fetchurl { - url = "mirror://gnu/xnee/${pname}-${version}.tar.gz"; - sha256 = "04n2lac0vgpv8zsn7nmb50hf3qb56pmj90dmwnivg09gyrf1x92j"; + url = "mirror://gnu/xnee/xnee-${finalAttrs.version}.tar.gz"; + hash = "sha256-UqQeXPYvgbej5bWBJOs1ZeHhICir2mP1R/u+DZiiwhI="; }; patches = [ @@ -16,57 +28,67 @@ stdenv.mkDerivation rec { (fetchpatch { name = "fno-common.patch"; url = "https://savannah.gnu.org/bugs/download.php?file_id=49534"; - sha256 = "04j2cjy2yaiigg31a6k01vw0fq19yj3zpriikkjcz9q4ab4m5gh2"; + hash = "sha256-Ar5SyVIEp8/knDHm+4f0KWAH+A5gGhXGezEqL7xkQhI="; }) ]; - postPatch = - '' for i in `find cnee/test -name \*.sh` - do - sed -i "$i" -e's|/bin/bash|${stdenv.shell}|g ; s|/usr/bin/env bash|${stdenv.shell}|g' - done + postPatch = '' + for i in `find cnee/test -name \*.sh`; do + sed -i "$i" -e's|/bin/bash|${stdenv.shell}|g ; s|/usr/bin/env bash|${stdenv.shell}|g' + done + '' + # Fix for glibc-2.34. For some reason, `LIBSEMA="CCC"` is added + # if `sem_init` is part of libc which causes errors like + # `gcc: error: CCC: No such file or directory` during the build. + + '' + substituteInPlace configure* \ + --replace 'LIBSEMA="CCC"' 'LIBSEMA=""' + ''; - # Fix for glibc-2.34. For some reason, `LIBSEMA="CCC"` is added - # if `sem_init` is part of libc which causes errors like - # `gcc: error: CCC: No such file or directory` during the build. - substituteInPlace configure \ - --replace 'LIBSEMA="CCC"' 'LIBSEMA=""' - ''; + strictDeps = true; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ libX11 xorgproto libXext libXtst gtk2 - libXi - texinfo - ]; + buildInputs = [ + gtk2 + libX11 + libXext + libXi + libXtst + texinfo + xorgproto + ]; - configureFlags = + configureFlags = [ + "--disable-gnome-applet" # Do a static build because `libxnee' doesn't get installed anyway. - [ "--disable-gnome-applet" "--enable-static" ]; + "--enable-static" + ]; - # `cnee' is linked without `-lXi' and as a consequence has a RUNPATH that - # lacks libXi. - makeFlags = [ "LDFLAGS=-lXi" ]; + makeFlags = [ + # `cnee' is linked without `-lXi' and as a consequence has a RUNPATH that + # lacks libXi. + "LDFLAGS=-lXi" + ]; # XXX: Actually tests require an X server. doCheck = true; meta = { description = "X11 event recording and replay tool"; - - longDescription = - '' Xnee is a suite of programs that can record, replay and distribute - user actions under the X11 environment. Think of it as a robot that - can imitate the job you just did. Xnee can be used to automate - tests, demonstrate programs, distribute actions, record & replay - "macros", retype a file. - ''; - - license = lib.licenses.gpl3Plus; - + longDescription = '' + Xnee is a suite of programs that can record, replay and distribute + user actions under the X11 environment. Think of it as a robot that + can imitate the job you just did. Xnee can be used to automate + tests, demonstrate programs, distribute actions, record & replay + "macros", retype a file. + ''; homepage = "https://www.gnu.org/software/xnee/"; - - maintainers = with lib.maintainers; [ ]; - platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ wegank ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix index f80b5f1f134..e01f156a0b1 100644 --- a/pkgs/tools/admin/pulumi-bin/data.nix +++ b/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,12 +1,12 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.88.0"; + version = "3.89.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.88.0-linux-x64.tar.gz"; - sha256 = "040rcmrrc8sgxsx1isgbz5pmd67kvks6sqyr7m27f7ccdi0kri8s"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.89.0-linux-x64.tar.gz"; + sha256 = "1difz8nnfhqmjsmcfdk8d8pdwjflzx339rbn3rhg8rh78hr8nld4"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.7.1-linux-amd64.tar.gz"; @@ -21,20 +21,16 @@ sha256 = "0nbrfqh79hp17mp6f9yb9j6dxfa6n0xf17ks8rkbivzbxq9kqijv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v5.1.0-linux-amd64.tar.gz"; - sha256 = "04gmbpq1vjw6jbr0d6032hx923abck9czjkljfj2ksz2bagall7q"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v5.2.0-linux-amd64.tar.gz"; + sha256 = "0aacw3c63xnl4hgnrh8z2yvpccpj3qfc9hvirwagsnjwd43lvvld"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.0.0-linux-amd64.tar.gz"; sha256 = "0vyhmdyln0cpcf1fgc0v641c78a66dzx97i7xq6isspl6zx9njn5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.4.1-linux-amd64.tar.gz"; - sha256 = "1b88zmn0qnrjvbvllr8hxs1f8pyvyc79mq0knvvpcb2akl48zm07"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.52.0-linux-amd64.tar.gz"; - sha256 = "0dm7qid20yq490yfls0qg8c9cwxm30qgvg581lwk312pk5zc7l6b"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.5.0-linux-amd64.tar.gz"; + sha256 = "177bfrjfs6r42mhvscp0rpb7ypqmyxc5vj4cyggb7wbhhmvlw66q"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.42.0-linux-amd64.tar.gz"; @@ -45,6 +41,10 @@ sha256 = "1hz2xavx3h19dgq8j7x9wfa3p93ki60z6vrkgxgj0x2ws606wqb3"; } { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.52.0-linux-amd64.tar.gz"; + sha256 = "0dm7qid20yq490yfls0qg8c9cwxm30qgvg581lwk312pk5zc7l6b"; + } + { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.12.0-linux-amd64.tar.gz"; sha256 = "06k14jcz2z9p28wllq9kaxmqrhx0dxa2pq1zjbgbiym4w2zi4bbi"; } @@ -77,8 +77,8 @@ sha256 = "148sg0jsm05qqgi10m8y4b7ib1miyvs1346h36mg1pf8hykg3psb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.20.0-linux-amd64.tar.gz"; - sha256 = "1papw5a9i4s0iw21f52p45gy6s7rlpb53drk5rkaracw8jm5522j"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.21.0-linux-amd64.tar.gz"; + sha256 = "03qwzqq90l3z7yp7nb0zx34pgrhi2a0aljlxzdfhyaji4h1mkpz6"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v6.4.0-linux-amd64.tar.gz"; @@ -93,12 +93,12 @@ sha256 = "00vvb17q05r5yn2i7yv3163gxvnakxkjl6a7n1dyb8yzr39ic7ff"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.3.0-linux-amd64.tar.gz"; - sha256 = "1vp9p59qwlpr79bkr4zqhysg6rpiydl029r47fkn53wr43w3x0ga"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.4.0-linux-amd64.tar.gz"; + sha256 = "0h3529s7szbhn309h1xksjprwv2pf512kqwzslfdmlvnmvidivsm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.8.0-linux-amd64.tar.gz"; - sha256 = "04a29q7irg0rvlbgin1q0s84db86sn5d0hfi1cdlh388jq3fri7c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.8.1-linux-amd64.tar.gz"; + sha256 = "15y992kidym9ca4w4bl36riq462cb78n36s4giwfnm4h2cmv1mrp"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.1-linux-amd64.tar.gz"; @@ -125,13 +125,10 @@ sha256 = "0sf2bxlqv98xyhq213gfkh3cd59mbgc21b07kii1j0465xl78jmp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.55.0-linux-amd64.tar.gz"; - sha256 = "156h4b0a6af02z2xad9kv3zipvnh4l98lmb38a5mp65f4pm5yzd3"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.19.0-linux-amd64.tar.gz"; - sha256 = "1knsb0ha7xbgvlna67nhxmmrr6rw3h52va3dh4ra47b7r8ii7dca"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.56.0-linux-amd64.tar.gz"; + sha256 = "0bsjlv07lzkx53wi34wc2xz2qlz8yilack3qd3zys8d53qz5yv55"; } + # pulumi-resource-sumologic skipped (does not exist on remote) { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.13.2-linux-amd64.tar.gz"; sha256 = "06gvx51nl93rj244yximp6059yiyxh4jcdqqcrjic8r7wabzsiiw"; @@ -141,20 +138,20 @@ sha256 = "1mjnfpkk8w13m5p2rkymmyd1nw0sdvg5izjfxpfs71nvy1xp9yxf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.15.1-linux-amd64.tar.gz"; - sha256 = "1kffzf37gprgh82iyvir2ls5s11bgj5mhl8jww8symlr15pxlhnm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.16.1-linux-amd64.tar.gz"; + sha256 = "1jwiidxbfg6r0nm4l6p09n5yqaybxdl300s88jxppjn7dwn9dgwq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.6.0-linux-amd64.tar.gz"; - sha256 = "0rakxw8h2121p1sdvqvp3y4bzzjs8ppsx58iqp0qv57k3ihdww85"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.6.1-linux-amd64.tar.gz"; + sha256 = "12d8zs3j1ilbs840hwlmnch1jqahr44w668f012mypdl5cgm6mai"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.7.0-linux-amd64.tar.gz"; - sha256 = "0qggmhvy0ghgynvaaj6yi7gg3k3gry60japmr987iwhm1knvgndq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.8.0-linux-amd64.tar.gz"; + sha256 = "0av9vs3l5jpmwxcgjaxp5jlnz4v0kdc4fr0fxqz0rdxsakd51lrs"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.0.1-linux-amd64.tar.gz"; - sha256 = "1b1lx6c4lyphb8qlhk03gw81di11c77l5c4kj6a0jpac5zwksynr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.0.2-linux-amd64.tar.gz"; + sha256 = "1fgchr4psb42abfg5xbwqbs8y73s59q5z1l7p5zlrsfqsbmxa3wi"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-linux-amd64.tar.gz"; @@ -163,8 +160,8 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.88.0-darwin-x64.tar.gz"; - sha256 = "0rfknh9v5r8y3zgh4m035qn0ixycv933qjzdbkkfa8fp1zq9wn3q"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.89.0-darwin-x64.tar.gz"; + sha256 = "0w8lmglfi9200lkqi4gjw18qrnqalpkq23ysvjhzrywr52pkcscd"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.7.1-darwin-amd64.tar.gz"; @@ -179,20 +176,16 @@ sha256 = "1mb8xr16h156yj10mzfsprflbv72ldk9ap9w2cw40l8fvbq33lm4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v5.1.0-darwin-amd64.tar.gz"; - sha256 = "1pqn2ymbf0i20micxdk3bh436231b58m0l2iabkjsashhf37qlwk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v5.2.0-darwin-amd64.tar.gz"; + sha256 = "0bl50wavpimlf16z6k5mxzq9m2cbvhiypznklgs0avkidyjiiix9"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.0.0-darwin-amd64.tar.gz"; sha256 = "04imkdrj388nk88r734f0p0a6z1hffzmplwgmx55kfwqz3zpz4y5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.4.1-darwin-amd64.tar.gz"; - sha256 = "0qa5ynrsbw1fca9nlf403r2h4k683w3d3yp902wz2bjlsx6m4i0f"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.52.0-darwin-amd64.tar.gz"; - sha256 = "0x4zcfbp7vy349q1cj5phlikfx95n9fcmq74h9ihdgr0xbavbbn2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.5.0-darwin-amd64.tar.gz"; + sha256 = "0fyi3im07a1fxziip6g73z7aqv8hjsqk5g67l3b2mcnz0myzmqwn"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.42.0-darwin-amd64.tar.gz"; @@ -203,6 +196,10 @@ sha256 = "0rzwkwrjm5p59maz371ndf9mcsdlz98n756k125wylxbp5xygcyv"; } { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.52.0-darwin-amd64.tar.gz"; + sha256 = "0x4zcfbp7vy349q1cj5phlikfx95n9fcmq74h9ihdgr0xbavbbn2"; + } + { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.12.0-darwin-amd64.tar.gz"; sha256 = "014hi8zxrnf30q4nfxxpc19wf8ip8487h2wspl1rwa6mpwfn34ss"; } @@ -235,8 +232,8 @@ sha256 = "0p30xhj6k46cdy84c7zr4hgdpi3rqvdjqjx8kr8a1ky29569ji4j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.20.0-darwin-amd64.tar.gz"; - sha256 = "0kxfv7hf1nric2z6cv3c2b36anifbc8xz4z0mg4phx3jhy7xm545"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.21.0-darwin-amd64.tar.gz"; + sha256 = "0q5bzk5z3qd1mifv1m44cfbcv8bvipd4sxrgqpk71gsanslz72jk"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v6.4.0-darwin-amd64.tar.gz"; @@ -251,12 +248,12 @@ sha256 = "1mpx6355bvp3dp8w6x9hrrswfid592jzp1srsv0acd4ypzskm8zv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.3.0-darwin-amd64.tar.gz"; - sha256 = "07zmhqd2zc2394c3ag5f868as7miv6f1q1l6s7p717gz54d6y6wz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.4.0-darwin-amd64.tar.gz"; + sha256 = "1xp48f3h8zkbvi5jasw9ax0pcz1z0awz5ssm1sms2s6wglmklrja"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.8.0-darwin-amd64.tar.gz"; - sha256 = "04l1yifmbc59ivglnphwhcx5b889v2jd9bgk10ykmcl7v50gwlqm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.8.1-darwin-amd64.tar.gz"; + sha256 = "1s5zphspan0wyz74hqv4156msx60mjkrbpvgy7f4mkhwl9wygjk1"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.1-darwin-amd64.tar.gz"; @@ -283,13 +280,10 @@ sha256 = "1h96dih1pi95066kmk4whbds0w0lzal5pyxwwl1prxpr4w8yb6sd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.55.0-darwin-amd64.tar.gz"; - sha256 = "1hyggh10w8zxb6dkva36dl7z1bdb3j9pnrdlapy591c0gbhan0rc"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.19.0-darwin-amd64.tar.gz"; - sha256 = "0xgihb099s99qb5bk6wavwm9227z73jgqrysmvjrqkn83kh7942v"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.56.0-darwin-amd64.tar.gz"; + sha256 = "0m8hb602zgkvqis2sl033ajz85sk3yjbksbb5r6vqd6y7w9xi7k1"; } + # pulumi-resource-sumologic skipped (does not exist on remote) { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.13.2-darwin-amd64.tar.gz"; sha256 = "1pm5j9q4kvv70c6paficcfb664df6666mq559zvdklf5ndjpw5z9"; @@ -299,20 +293,20 @@ sha256 = "0122mpbgc2d4yhdvm1j45niz07d68drj80hxa3d1sa9pqzyllbky"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.15.1-darwin-amd64.tar.gz"; - sha256 = "0ipfx8x0zq5qxmbivjndqb1ijc2130gnv7ygs7ln5qcnzrhbjx2a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.16.1-darwin-amd64.tar.gz"; + sha256 = "0wph3f11dkvn956nmx9r57ynjaal6kj7qb08rwfiv792dlk5d5bc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.6.0-darwin-amd64.tar.gz"; - sha256 = "0803vk8iy0xf7rbpgq1a0jjcjbn3jwia8hqf2mj696i9iiij2r3x"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.6.1-darwin-amd64.tar.gz"; + sha256 = "1ghzm11lvbvglfbxdc4bkhp390cs3pd2jgj9k8xka1gffy8cm1m7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.7.0-darwin-amd64.tar.gz"; - sha256 = "0f21v5claqq3cbrh809fy8ffv4v4whdjpqb0d6zgrxif2vczm86p"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.8.0-darwin-amd64.tar.gz"; + sha256 = "1i6igx9yz0pa5brb056w0vzdp945xs723qmmmm84px06qd3przf2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.0.1-darwin-amd64.tar.gz"; - sha256 = "01fv7brag4c573408655kq8xcq5r0wgcjrfwn5z9wfpbcqg0blhb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.0.2-darwin-amd64.tar.gz"; + sha256 = "1bawapsj1xngiigbwwwin7xmz138s6fd71qdcrcax0pnfw1dycix"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-darwin-amd64.tar.gz"; @@ -321,8 +315,8 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.88.0-linux-arm64.tar.gz"; - sha256 = "1ifmqnai52pyn11w38f8lfk7v8bv0919vpg8c9y8fn7ag5qb9vn4"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.89.0-linux-arm64.tar.gz"; + sha256 = "0bdlppjxy92ffl5rgka8pqx07xh4m0x1cnqi2hnkpizmrfzxlfkl"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.7.1-linux-arm64.tar.gz"; @@ -337,20 +331,16 @@ sha256 = "1g2bnrmzs9lyzrz7jn7hn6c1chzvg4bdxvza8kzafqrrynsqpisl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v5.1.0-linux-arm64.tar.gz"; - sha256 = "18s2bh3gwg4jby9frdx8z0cldyz1g1sspgdba4mawb6m7p5f6290"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v5.2.0-linux-arm64.tar.gz"; + sha256 = "03f32qvwlvblg5qb1fpy0cy0aifk0n2w0vqra3fqw1v3pmk5d7ar"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.0.0-linux-arm64.tar.gz"; sha256 = "11ph5yjy754sb55sncdlgibrmijg2jsylrjfpvy4mclrwg64cari"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.4.1-linux-arm64.tar.gz"; - sha256 = "1cgl36srg5idd2cfr2v7h9ymnmfjqrhj81zh1f6qxfhjdj9gyzci"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.52.0-linux-arm64.tar.gz"; - sha256 = "18d3xgjha67i3qln1n6wg5fzhr8jwc1x2fh3zg630y4wdw3jsqix"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.5.0-linux-arm64.tar.gz"; + sha256 = "1a22i6b3xcps8wj4hjg5sfcmglkl40njx5d25874yrzqvlarvlpq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.42.0-linux-arm64.tar.gz"; @@ -361,6 +351,10 @@ sha256 = "0c4m9y4hh6k4f9v4xidijpwyc2650v4180zkdy5cpl7shfdk3n75"; } { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.52.0-linux-arm64.tar.gz"; + sha256 = "18d3xgjha67i3qln1n6wg5fzhr8jwc1x2fh3zg630y4wdw3jsqix"; + } + { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.12.0-linux-arm64.tar.gz"; sha256 = "1j8ab4m9jr7q0k89pinr93izdyvq0jk0nm2gr5rjrq5wrwirly9i"; } @@ -393,8 +387,8 @@ sha256 = "14xpg193qf332sa9x4iw39i71k158f5393bqcqrjfccpkk1adwli"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.20.0-linux-arm64.tar.gz"; - sha256 = "13jq9vrv1pkg6g2711v53fgy14yb8zw1q1jrr1ndmlyxgk84qy98"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.21.0-linux-arm64.tar.gz"; + sha256 = "0fxvivpscjlmcp4jdzvg4zhiah8g4zs5sa0ra0yxc9shs0v669p6"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v6.4.0-linux-arm64.tar.gz"; @@ -409,12 +403,12 @@ sha256 = "17zpwizdsavsnhq179hw67wppdm61hzl6qrycl4anf074h5fy9rw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.3.0-linux-arm64.tar.gz"; - sha256 = "1xdr0yhck5ji40rf40pdax9qihnvyd39d6rjiyl8ydlpw9w9ma5i"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.4.0-linux-arm64.tar.gz"; + sha256 = "190mi8sbwn6g4ggx3j3mbpwpp61kazpcj9qwmbb35x14miqppc2a"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.8.0-linux-arm64.tar.gz"; - sha256 = "0mqakfimh58vvmcsf0m0knazxymgg1zi87h3scj6lgj11m3lqrdv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.8.1-linux-arm64.tar.gz"; + sha256 = "07h3a5h86vcxv5qwgfc34knh640s8ynws0pc39sps5rhd90rdsyj"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.1-linux-arm64.tar.gz"; @@ -441,13 +435,10 @@ sha256 = "09j6cw9m1aa60n0gq68dmpk70gyh69qqkm98djrcn6134j2xf555"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.55.0-linux-arm64.tar.gz"; - sha256 = "07qh2d542rshixmdyk0rl7381gq81spc0fhn2cwcw0j7cvq01z6q"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.19.0-linux-arm64.tar.gz"; - sha256 = "1kqv70w3d84a9a0kj0w2hmd88h50zlfc35xkf57kgd43l948wcin"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.56.0-linux-arm64.tar.gz"; + sha256 = "0kfavb72qw4bdnj7q6n248vzpkgghi07dsjq6k0p51zs0spsm5mx"; } + # pulumi-resource-sumologic skipped (does not exist on remote) { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.13.2-linux-arm64.tar.gz"; sha256 = "1rlf5gl7a7ym8zl4h0v7i42a9830zi401axw032h0v4q6w4zki3n"; @@ -457,20 +448,20 @@ sha256 = "104lp8pxm3z6dshz3jvn6bsniskw665jmnmfnr410kgx60hk4wip"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.15.1-linux-arm64.tar.gz"; - sha256 = "1pbb47vh7lwh729y1c9aky3nhyd6ijyknpb3w4grxfkdhiyyid9y"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.16.1-linux-arm64.tar.gz"; + sha256 = "0cq2mmzsjk4il1brqp1i8jjl9771krjiir5fk0bhhrzj08jvi0l3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.6.0-linux-arm64.tar.gz"; - sha256 = "1qp184fqwlm3r1lvk9qjhddfj9hmzsv4hjgc0jp1bylnmycqc81c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.6.1-linux-arm64.tar.gz"; + sha256 = "15y18s4p9py16gzcb6l69g3qj857kr3jafjdhhafxjfzfi2rlvd7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.7.0-linux-arm64.tar.gz"; - sha256 = "1q492lykggvnxnzlnw95iysnjw3zs6j6rj24yqr9kxqbsavlcld6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.8.0-linux-arm64.tar.gz"; + sha256 = "0ifzw0az0xglk599f5kzyrss1lkk622lclpzqcvm89rl5ad6hglr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.0.1-linux-arm64.tar.gz"; - sha256 = "00ggsw1czdmr742jp18snnfdbm7682srf62nz9rvsb1w7lnjs4yq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.0.2-linux-arm64.tar.gz"; + sha256 = "0cykvh8zzsdzlp4nqsphhn4is8nm1sqcmc0hhgi4lq7wppgf1w9h"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-linux-arm64.tar.gz"; @@ -479,8 +470,8 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.88.0-darwin-arm64.tar.gz"; - sha256 = "0z0gpxrihxwx1a3njvhr9rc3p4pv6yqw6a6xnf2ssn4pqck6rl5q"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.89.0-darwin-arm64.tar.gz"; + sha256 = "02phzva1f0y8zhdaghb80q1axb1drlkyrbw1ndi5cq6fvdr4pd3b"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.7.1-darwin-arm64.tar.gz"; @@ -495,20 +486,16 @@ sha256 = "0ma5n4mcilnqmhxyr2pn1j6xxm25hd52f7sxs7y8h38a87a54xfq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v5.1.0-darwin-arm64.tar.gz"; - sha256 = "1gzy86d860nv4amg2wvpk7qj94x2v929bflh6vszyfi29r68k2z0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v5.2.0-darwin-arm64.tar.gz"; + sha256 = "1n67diprsfwwas5qlb7krlbf22x5kg2cmrjhf7x39my5ysak6l9f"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.0.0-darwin-arm64.tar.gz"; sha256 = "07f30h74hyg3j9dj78a0al5v9i5n105y52yn362mlyvfh807blml"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.4.1-darwin-arm64.tar.gz"; - sha256 = "0x4ri61ppj9shhx17rxlavs347fsy4bqpq489y0g13dy51xzsgh7"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.52.0-darwin-arm64.tar.gz"; - sha256 = "03x2h0nivi5ygn8lk57g4xky29256hczgmf0qwfrb9lb49qnvrss"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.5.0-darwin-arm64.tar.gz"; + sha256 = "1qinp5qqb2ab9d8nwwllrsz1q007hhnjc6m5x4b1m7ffvhjbxmyy"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.42.0-darwin-arm64.tar.gz"; @@ -519,6 +506,10 @@ sha256 = "18gzy9kpz74ycdl988r3mxzxakbd74vn2rl5y3hzlhgyd03vqmfm"; } { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.52.0-darwin-arm64.tar.gz"; + sha256 = "03x2h0nivi5ygn8lk57g4xky29256hczgmf0qwfrb9lb49qnvrss"; + } + { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.12.0-darwin-arm64.tar.gz"; sha256 = "1kmy7krwbgyxlk4f83nw6npll3svymbigzdr9kaj3ab8bcbj0wpn"; } @@ -551,8 +542,8 @@ sha256 = "0x6ispcwkx15x753zy6awwlykh66qfk5phwdzsy8gw3j1g033a85"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.20.0-darwin-arm64.tar.gz"; - sha256 = "0lhc76q4x126dcjbnsz5a4r414y94sp70dhr702fh24zn9v4f9gd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.21.0-darwin-arm64.tar.gz"; + sha256 = "0sg0wmfmn2ldcfmlwbwlpdqrp5ngzfyj5liz30n6xqhsm7jfifvp"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v6.4.0-darwin-arm64.tar.gz"; @@ -567,12 +558,12 @@ sha256 = "1f4xnjwbp1qbx0hcym4gxynb4j1vxlj7iqh1naays3ypc4mgnms1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.3.0-darwin-arm64.tar.gz"; - sha256 = "0vjl1yd3wgpn99qphkamd6mfwqg671zrdd2121ydprk9v60jq8c5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.4.0-darwin-arm64.tar.gz"; + sha256 = "1ngrba277225i8c7vyx90w71p8w6lh0y8d108sba738b2kjxrr9h"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.8.0-darwin-arm64.tar.gz"; - sha256 = "1x0rpyy3hg3wna6w273zy9dhd0mvgqvqd8lj406nwwir9pbq2xw1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.8.1-darwin-arm64.tar.gz"; + sha256 = "0hkyf0m1s63l0c5f84a6jafcxdyqvxi92597m01bd3zp3938qv1b"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.1-darwin-arm64.tar.gz"; @@ -599,13 +590,10 @@ sha256 = "1v0k309w96f9s9nvslh7dx6mhk5prxcbd83fgrcfhsk784hrrzqi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.55.0-darwin-arm64.tar.gz"; - sha256 = "1598kg5w639fdp8cdsaxm0jcn1p3q1mmfyfci3gn8s0ck2xfnbnm"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.19.0-darwin-arm64.tar.gz"; - sha256 = "17ngmwyh6z1g6x3lrd77pxa9wwwarh4mqdcq7aiwf57plx4a4l6j"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.56.0-darwin-arm64.tar.gz"; + sha256 = "0d6xhmdisafpspycqfh6p4d42d6331lkspwmizzdvqwq96awd6pn"; } + # pulumi-resource-sumologic skipped (does not exist on remote) { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.13.2-darwin-arm64.tar.gz"; sha256 = "09agrp3sb7mzhwaja4rvz0p25rpsb2n4v3s2kyzcx3pyfyhigvfn"; @@ -615,20 +603,20 @@ sha256 = "00svwn4p6gmmk9y53w9k4zl425lv13wmm7v86y627fq7nv8pwkd0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.15.1-darwin-arm64.tar.gz"; - sha256 = "065imbfc3h96dhrjfs6qqcr5ha3hyy5q2gh0904ghda9dk8v1xhn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.16.1-darwin-arm64.tar.gz"; + sha256 = "1mk1034lp6x9gnal12gbmkfpvjv67a7lqfm38nd4slcnvc5p9x8w"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.6.0-darwin-arm64.tar.gz"; - sha256 = "0wm3ldvhg6xhnblfwxccjqqw0q0mpl7s92cckzrzhdr5rwddcgbf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.6.1-darwin-arm64.tar.gz"; + sha256 = "05z2z3kp68qv513rvva0zifkwx0440dbdsp87ip84gx7qc5ibs1h"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.7.0-darwin-arm64.tar.gz"; - sha256 = "08qgbqxdc8z1mbhnl6jh6jsb79dlb9jf43inyrlr6mxcf2gnv7kx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.8.0-darwin-arm64.tar.gz"; + sha256 = "1fvdbw76ax20z9dx3amlmr5b0r28i9d09khbpgdhl83d1j54z15s"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.0.1-darwin-arm64.tar.gz"; - sha256 = "01s1lr79qcwz28xl5ckp81jg1hgypagcxxjv2c9mcvljxana291v"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.0.2-darwin-arm64.tar.gz"; + sha256 = "1wq7b4r7abjzxcawybwi7v2pdc6sm429mvs6hm0mixxbbqynn07c"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-darwin-arm64.tar.gz"; diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix index 4accc34b624..fe72905d0fb 100644 --- a/pkgs/tools/filesystems/garage/default.nix +++ b/pkgs/tools/filesystems/garage/default.nix @@ -1,5 +1,16 @@ -{ lib, stdenv, rustPlatform, fetchFromGitea, openssl, pkg-config, protobuf -, cacert, Security, garage, nixosTests }: +{ lib +, stdenv +, rustPlatform +, fetchFromGitea +, fetchpatch +, openssl +, pkg-config +, protobuf +, cacert +, Security +, garage +, nixosTests +}: let generic = { version, sha256, cargoSha256, eol ? false, broken ? false }: rustPlatform.buildRustPackage { pname = "garage"; @@ -31,8 +42,6 @@ let # on version changes for checking if changes are required here buildFeatures = [ "kubernetes-discovery" - ] ++ - (lib.optionals (lib.versionAtLeast version "0.8") [ "bundled-libs" "sled" "metrics" @@ -41,7 +50,7 @@ let "lmdb" "sqlite" "consul-discovery" - ]); + ]; # To make integration tests pass, we include the optional k2v feature here, # but in buildFeatures only for version 0.8+, where it's enabled by default. @@ -49,13 +58,11 @@ let checkFeatures = [ "k2v" "kubernetes-discovery" - ] ++ - (lib.optionals (lib.versionAtLeast version "0.8") [ "bundled-libs" "sled" "lmdb" "sqlite" - ]); + ]; passthru.tests = nixosTests.garage; @@ -69,27 +76,33 @@ let }; }; in - rec { - # Until Garage hits 1.0, 0.7.3 is equivalent to 7.3.0 for now, therefore - # we have to keep all the numbers in the version to handle major/minor/patch level. - # for <1.0. +rec { + # Until Garage hits 1.0, 0.7.3 is equivalent to 7.3.0 for now, therefore + # we have to keep all the numbers in the version to handle major/minor/patch level. + # for <1.0. - garage_0_7_3 = generic { - version = "0.7.3"; - sha256 = "sha256-WDhe2L+NalMoIy2rhfmv8KCNDMkcqBC9ezEKKocihJg="; - cargoSha256 = "sha256-5m4c8/upBYN8nuysDhGKEnNVJjEGC+yLrraicrAQOfI="; - eol = true; # Confirmed with upstream maintainers over Matrix. - }; + garage_0_8_4 = generic { + version = "0.8.4"; + sha256 = "sha256-YgMw41ofM59h7OnHK1H8+Se5mZEdYypPIdkqbyX9qfs="; + cargoSha256 = "sha256-dEtksOVqy5wAPoqCuXJj3c4TB6UbR8PTaB70fbL6iR8="; + }; - garage_0_7 = garage_0_7_3; + garage_0_8 = garage_0_8_4; - garage_0_8_4 = generic { - version = "0.8.4"; - sha256 = "sha256-YgMw41ofM59h7OnHK1H8+Se5mZEdYypPIdkqbyX9qfs="; - cargoSha256 = "sha256-dEtksOVqy5wAPoqCuXJj3c4TB6UbR8PTaB70fbL6iR8="; - }; + garage_0_9_0 = (generic { + version = "0.9.0"; + sha256 = "sha256-Bw7ohMAfnbkhl43k8KxYu2OJd5689PqDS0vAcgU09W8="; + cargoSha256 = "sha256-JqCt/8p24suQMRzEyTE2OkbzZCGUDLuGq32kCq3eZ7o="; + }).overrideAttrs (oldAttrs: { + patches = oldAttrs.patches or [ ] ++ [ + (fetchpatch { + url = "https://git.deuxfleurs.fr/Deuxfleurs/garage/commit/c7f5dcd953ff1fdfa002a8bccfb43eafcc6fddd4.patch"; + sha256 = "sha256-q7E6gtPjnj5O/K837LMP6LPEFcgdkifxRFrYzBuqkk0="; + }) + ]; + }); - garage_0_8 = garage_0_8_4; + garage_0_9 = garage_0_9_0; - garage = garage_0_8; - } + garage = garage_0_9; +} diff --git a/pkgs/tools/misc/enumer/default.nix b/pkgs/tools/misc/enumer/default.nix index 1eea3c69941..67b49b299f7 100644 --- a/pkgs/tools/misc/enumer/default.nix +++ b/pkgs/tools/misc/enumer/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "enumer"; - version = "1.5.8"; + version = "1.5.9"; src = fetchFromGitHub { owner = "dmarkham"; repo = "enumer"; rev = "refs/tags/v${version}"; - hash = "sha256-+YTsXYWVmJ32V/Eptip3WAiqIYv+6nqbdph0K2XzLdc="; + hash = "sha256-NYL36GBogFM48IgIWhFa1OLZNUeEi0ppS6KXybnPQks="; }; - vendorHash = "sha256-+dCitvPz2JUbybXVJxUOo1N6+SUPCSjlacL8bTSlb7w="; + vendorHash = "sha256-CJCay24FlzDmLjfZ1VBxih0f+bgBNu+Xn57QgWT13TA="; meta = with lib; { description = "Go tool to auto generate methods for enums"; diff --git a/pkgs/tools/misc/moar/default.nix b/pkgs/tools/misc/moar/default.nix index cce2da5a70d..76b8b8f8f52 100644 --- a/pkgs/tools/misc/moar/default.nix +++ b/pkgs/tools/misc/moar/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "moar"; - version = "1.18.1"; + version = "1.18.2"; src = fetchFromGitHub { owner = "walles"; repo = pname; rev = "v${version}"; - hash = "sha256-E0wJ0P4ofkfKU6HKEZ+D6fT7EMKlHrGioEMJPi9T+9E="; + hash = "sha256-bYrn1Ok1yyhiKPUBdvUvTKVeAwsWAwbNoK3IburOAuU="; }; - vendorHash = "sha256-aFCv6VxHD1bOLhCHXhy4ubik8Z9uvU6AeqcMqIZI2Oo="; + vendorHash = "sha256-x6BeU6JDayCOi8T8+NvXZe59QmTaO9RAYwSiFlDPL/c="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/networking/whois/clang.patch b/pkgs/tools/networking/whois/clang.patch new file mode 100644 index 00000000000..3091b9a3eee --- /dev/null +++ b/pkgs/tools/networking/whois/clang.patch @@ -0,0 +1,11 @@ +--- a/utils.h ++++ b/utils.h +@@ -15,7 +15,7 @@ + #endif + + /* Portability macros */ +-#ifdef __GNUC__ ++#if defined __GNUC__ && ! defined __clang__ + # define NORETURN __attribute__((noreturn)) + # define MALLOC_FREE __attribute__((malloc(free))) + # define NONNULL __attribute__((returns_nonnull)) diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix index f9d2e90b58e..465ab765013 100644 --- a/pkgs/tools/networking/whois/default.nix +++ b/pkgs/tools/networking/whois/default.nix @@ -11,6 +11,10 @@ stdenv.mkDerivation rec { hash = "sha256-4mFn5cY7ipAU4vOiHC2s69fxYJwShQEQ1eA8t5JvOP0="; }; + patches = [ + ./clang.patch + ]; + nativeBuildInputs = [ perl gettext pkg-config ]; buildInputs = [ libidn2 libiconv ]; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 6a2b2948ff9..f1db0c60eee 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -187,8 +187,8 @@ in lib.makeExtensible (self: ({ }; nix_2_17 = common { - version = "2.17.0"; - hash = "sha256-QMYAkdtU+g9HlZKtoJ+AI6TbWzzovKGnPZJHfZdclc8="; + version = "2.17.1"; + hash = "sha256-Q5L+rHzjp0bYuR2ogg+YPCn6isjmlQ4CJVT0zpn/hFc="; }; nix_2_18 = common { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 12e7b72bc0c..2dc4834a5fd 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -263,6 +263,8 @@ mapAliases ({ ### G ### g4py = python3Packages.geant4; # Added 2020-06-06 + garage_0_7 = throw "garage 0.7.x has been removed as it is EOL. Please upgrade to 0.8 series."; # Added 2023-10-10 + garage_0_7_3 = throw "garage 0.7.x has been removed as it is EOL. Please upgrade to 0.8 series."; # Added 2023-10-10 garmindev = throw "'garmindev' has been removed as the dependent software 'qlandkartegt' has been removed"; # Added 2023-04-17 geekbench4 = throw "'geekbench4' has been renamed to 'geekbench_4'"; # Added 2023-03-10 geekbench5 = throw "'geekbench5' has been renamed to 'geekbench_5'"; # Added 2023-03-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c02c2f9957d..61121a6c6a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1116,6 +1116,8 @@ with pkgs; fetchs3 = callPackage ../build-support/fetchs3 { }; + fetchFromBittorrent = callPackage ../build-support/fetchbittorrent { }; + fetchsvn = if stdenv.buildPlatform != stdenv.hostPlatform # hack around splicing being crummy with things that (correctly) don't eval. then buildPackages.fetchsvn @@ -8454,8 +8456,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }) garage - garage_0_7 garage_0_8 - garage_0_7_3 garage_0_8_4; + garage_0_8 garage_0_9 + garage_0_8_4 garage_0_9_0; garmin-plugin = callPackage ../applications/misc/garmin-plugin { }; @@ -35945,6 +35947,7 @@ with pkgs; }; transmission-gtk = transmission.override { enableGTK3 = true; }; transmission-qt = transmission.override { enableQt = true; }; + transmission_noSystemd = transmission.override { enableSystemd = false; }; # Needs macOS >= 10.14.6 transmission_4 = darwin.apple_sdk_11_0.callPackage ../applications/networking/p2p/transmission/4.nix { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 17d9127d90e..f8bd6c1e345 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13130,6 +13130,8 @@ self: super: with self; { sphinx-prompt = callPackage ../development/python-modules/sphinx-prompt { }; + sphinx-sitemap = callPackage ../development/python-modules/sphinx-sitemap { }; + sphinx-thebe = callPackage ../development/python-modules/sphinx-thebe { }; sphinx-tabs = callPackage ../development/python-modules/sphinx-tabs { }; @@ -15543,6 +15545,8 @@ self: super: with self; { whois = callPackage ../development/python-modules/whois { }; + whois-api = callPackage ../development/python-modules/whois-api { }; + whoosh = callPackage ../development/python-modules/whoosh { }; widgetsnbextension = callPackage ../development/python-modules/widgetsnbextension { }; |