diff options
107 files changed, 1330 insertions, 940 deletions
diff --git a/.github/workflows/basic-eval.yml b/.github/workflows/basic-eval.yml index c12999e8d0c0c..fcc07b633b3e7 100644 --- a/.github/workflows/basic-eval.yml +++ b/.github/workflows/basic-eval.yml @@ -19,7 +19,7 @@ jobs: # we don't limit this action to only NixOS repo since the checks are cheap and useful developer feedback steps: - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v18 + - uses: cachix/install-nix-action@v19 - uses: cachix/cachix-action@v12 with: # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml index ae411fefbe47d..549563d4ec26d 100644 --- a/.github/workflows/editorconfig.yml +++ b/.github/workflows/editorconfig.yml @@ -28,7 +28,7 @@ jobs: with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@v18 + - uses: cachix/install-nix-action@v19 with: # nixpkgs commit is pinned so that it doesn't break # editorconfig-checker 2.4.0 diff --git a/.github/workflows/manual-nixos.yml b/.github/workflows/manual-nixos.yml index 08af28fcfb4c4..99f14562d50e1 100644 --- a/.github/workflows/manual-nixos.yml +++ b/.github/workflows/manual-nixos.yml @@ -18,7 +18,7 @@ jobs: with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@v18 + - uses: cachix/install-nix-action@v19 with: # explicitly enable sandbox extra_nix_config: sandbox = true diff --git a/.github/workflows/manual-nixpkgs.yml b/.github/workflows/manual-nixpkgs.yml index 23f2caf021b89..63b504f670f89 100644 --- a/.github/workflows/manual-nixpkgs.yml +++ b/.github/workflows/manual-nixpkgs.yml @@ -18,7 +18,7 @@ jobs: with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@v18 + - uses: cachix/install-nix-action@v19 with: # explicitly enable sandbox extra_nix_config: sandbox = true diff --git a/.github/workflows/manual-rendering.yml b/.github/workflows/manual-rendering.yml index c9f77c191c66d..5534d23416eb7 100644 --- a/.github/workflows/manual-rendering.yml +++ b/.github/workflows/manual-rendering.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v18 + - uses: cachix/install-nix-action@v19 with: # explicitly enable sandbox extra_nix_config: sandbox = true diff --git a/.github/workflows/update-terraform-providers.yml b/.github/workflows/update-terraform-providers.yml index 079147f7d7247..c57102b0aa0c7 100644 --- a/.github/workflows/update-terraform-providers.yml +++ b/.github/workflows/update-terraform-providers.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v18 + - uses: cachix/install-nix-action@v19 with: nix_path: nixpkgs=channel:nixpkgs-unstable - name: setup diff --git a/doc/languages-frameworks/beam.section.md b/doc/languages-frameworks/beam.section.md index 6b3a369c291ff..707da43e9dd73 100644 --- a/doc/languages-frameworks/beam.section.md +++ b/doc/languages-frameworks/beam.section.md @@ -171,6 +171,7 @@ let inherit src version; # nix will complain and tell you the right value to replace this with hash = lib.fakeHash; + mixEnv = ""; # default is "prod", when empty includes all dependencies, such as "dev", "test". # if you have build time environment variables add them here MY_ENV_VAR="my_value"; }; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4726f1be727ef..1caefb21948fb 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -932,6 +932,12 @@ githubId = 106511; name = "Andrew Kelley"; }; + andrewsmith = { + email = "andrew@velvet.software"; + github = "andrewsmith"; + githubId = 29887; + name = "Andrew Smith"; + }; andsild = { email = "andsild@gmail.com"; github = "andsild"; @@ -2382,6 +2388,12 @@ github = "CaptainJawZ"; githubId = 43111068; }; + CardboardTurkey = { + name = "Kiran Ostrolenk"; + email = "kostrolenk@gmail.com"; + github = "CardboardTurkey"; + githubId = 34030186; + }; carlosdagos = { email = "m@cdagostino.io"; github = "carlosdagos"; @@ -12827,6 +12839,12 @@ githubId = 5236428; name = "Gaëtan André"; }; + rvnstn = { + email = "github@rvnstn.de"; + github = "rvnstn"; + githubId = 2364742; + name = "Tobias Ravenstein"; + }; rvolosatovs = { email = "rvolosatovs@riseup.net"; github = "rvolosatovs"; diff --git a/nixos/modules/virtualisation/podman/default.nix b/nixos/modules/virtualisation/podman/default.nix index 6c00fabaa1858..2e2190e4188c3 100644 --- a/nixos/modules/virtualisation/podman/default.nix +++ b/nixos/modules/virtualisation/podman/default.nix @@ -7,7 +7,10 @@ let podmanPackage = (pkgs.podman.override { extraPackages = cfg.extraPackages - ++ lib.optional (builtins.elem "zfs" config.boot.supportedFilesystems) config.boot.zfs.package; + # setuid shadow + ++ [ "/run/wrappers" ] + # include pkgs.zfs by default in the wrapped podman used by the module so it is cached + ++ (if (builtins.elem "zfs" config.boot.supportedFilesystems) then [ config.boot.zfs.package ] else [ pkgs.zfs ]); }); # Provides a fake "docker" binary mapping to podman @@ -181,10 +184,6 @@ in systemd.packages = [ cfg.package ]; - systemd.services.podman.serviceConfig = { - ExecStart = [ "" "${cfg.package}/bin/podman $LOGGING system service" ]; - }; - systemd.services.podman-prune = { description = "Prune podman resources"; @@ -205,10 +204,6 @@ in systemd.sockets.podman.wantedBy = [ "sockets.target" ]; systemd.sockets.podman.socketConfig.SocketGroup = "podman"; - systemd.user.services.podman.serviceConfig = { - ExecStart = [ "" "${cfg.package}/bin/podman $LOGGING system service" ]; - }; - systemd.user.sockets.podman.wantedBy = [ "sockets.target" ]; systemd.tmpfiles.packages = [ diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index 98b280f332de8..f7af762069767 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.183.0"; + version = "1.184.0"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - hash = "sha256-hfOEL1Qkf8Sk6cNWUBwZXH/DSuo/ObyA5sRLOj9Iw3M="; + hash = "sha256-bRe9yS9CMsBH04oefImSYkd1jUe3SnJU6JZETLwow/0="; }; postPatch = '' diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index 2c6dcdf291354..7cbb440491efb 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -16,8 +16,8 @@ }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2023.02.05", - "hash": "sha256-V0mvSuiO5dTztXZ4uvteF0e7B21Ll1uq6o0UHPcZm1o=" + "rev": "2023.02.12", + "hash": "sha256-PSRKxKJkX9GlV8JUACYzDZguv8M8jKVxlW7U4Mmla9o=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 91425fe0b18d6..739342fc2a451 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 = buildVimPluginFrom2Nix { pname = "ChatGPT.nvim"; - version = "2023-01-19"; + version = "2023-02-08"; src = fetchFromGitHub { owner = "jackMort"; repo = "ChatGPT.nvim"; - rev = "dac83f630fc6aafd256b149a2c2ae0d4466ec85e"; - sha256 = "1ny56csbrk2kzfqr9a3m858j4vi4iwpmx8w71fr9k6ncychk9pip"; + rev = "ee7f528702bc7199f322b605cca76a2ae34717c9"; + sha256 = "0r7lyjmx238qdnlflwqw95q6j40spa0fvykh9pc0vaxjj1xiqymv"; }; meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/"; }; @@ -65,12 +65,12 @@ final: prev: Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2023-01-27"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "564a64651578164b5c7f2503e306bc436beb88da"; - sha256 = "151w10p8w7ml9v7h18y3zzgbr48ffpxsxj3lnxl8lm44dab76qp1"; + rev = "9aefe2af9230e8e5aa43ed1faade069da0721b66"; + sha256 = "0pl7qnzxxnzlyzvjwa0p828wx1m69b3qmixdzl18ix4c3g1wakf4"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -173,12 +173,12 @@ final: prev: LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2022-12-18"; + version = "2023-02-05"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "43433aa8dad1601acf923d3c25fa3325799508aa"; - sha256 = "111nhw85v6hkyjzfs8jx566s44i89mihvlcnwdgwc08pnmnm7fci"; + rev = "e48b140fb9132cc26cc82c7464e473b8f0af65db"; + sha256 = "17wkfx268j2lpwirw70fb6j4x8b96j9zsv36d3sbcz7dw1d68xqq"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -257,12 +257,12 @@ final: prev: Recover-vim = buildVimPluginFrom2Nix { pname = "Recover.vim"; - version = "2015-08-14"; + version = "2022-09-07"; src = fetchFromGitHub { owner = "chrisbra"; repo = "Recover.vim"; - rev = "efa491f6121f65e025f42d79a93081abb8db69d4"; - sha256 = "17szim82bwnhf9q4n0n4jfmqkmhq6p0lh0j4y77a2x6lkn0pns5s"; + rev = "e61319bce3cd1004e5b695933296d8f267dd65a3"; + sha256 = "0hnww4a0vffgpj72qdhhsr28xdh219haldr6jd6my8mqy1rg3yq4"; }; meta.homepage = "https://github.com/chrisbra/Recover.vim/"; }; @@ -293,12 +293,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2023-02-04"; + version = "2023-02-09"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "5c5723bd464fd048f5d62fcf20c41495d3386a33"; - sha256 = "1vpay869faixkxpvxlwpk44pidjgnrhkchnchfsbd6c2brhgzz11"; + rev = "b37874a63ceac681a15b83d5c8e67f58fe571341"; + sha256 = "0s7r600g9g8zkrjglapargsgda4pss5s4wdj7jsfa1a84825iisp"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -449,12 +449,12 @@ final: prev: YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2023-01-17"; + version = "2023-02-07"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "50379d35ddc38ee3651f568d080442d5e4cb4a3a"; - sha256 = "0s830zxirqbw880xv7ddza8m988i4ljrd4vgdk1yxaifid2zx8yg"; + rev = "9a5eb4443e8a990698daa99da512d0fd7aed0f32"; + sha256 = "1fazaiax65fgijm1i5k6n0zazbwhr35bwlagafcv5l4hydrxidqx"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -498,12 +498,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2023-02-03"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "4428a478e70f6a6b52e86d16ced677020267f409"; - sha256 = "18dvm2k6h0xvzhf6wr317b9j85qq46gkh2scxmi8b20p8d3kfi52"; + rev = "a467e9a06aa92db81812f4c2c26364877bbafb80"; + sha256 = "0r746hlr1y50fn7g6161mpk1nnbi21q5n1wv3f7h2hi3kfc86l4x"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -559,12 +559,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2023-02-03"; + version = "2023-02-09"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "45a3e3f574172028338de70ce8f8f606dec0a1b0"; - sha256 = "0xyglfdqr8bq4s5mqq7wvj8czl1n9pgs16368q2zjj9j35x6m8xr"; + rev = "f78e9d634f9c1177031d4bdeda93f98d63b6bc12"; + sha256 = "15bpbm0w9crw8pgxfynlvp9ccqzbjibgk4p1pj5fix7vzlhchh2w"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -583,12 +583,12 @@ final: prev: alpha-nvim = buildVimPluginFrom2Nix { pname = "alpha-nvim"; - version = "2022-11-29"; + version = "2023-02-11"; src = fetchFromGitHub { owner = "goolord"; repo = "alpha-nvim"; - rev = "21a0f2520ad3a7c32c0822f943368dc063a569fb"; - sha256 = "1s9ywy69kap0gngpm5xnfkwlrb2apci9xv2ahs2xhhkjncqm38mq"; + rev = "1c903fd40b1d51e7740b4d90e9f18e83f2916586"; + sha256 = "1lnmik6853akgxqpadgz6wclfwgmcsj84zi91yycfxkri52mbizy"; }; meta.homepage = "https://github.com/goolord/alpha-nvim/"; }; @@ -727,12 +727,12 @@ final: prev: aurora = buildVimPluginFrom2Nix { pname = "aurora"; - version = "2023-02-04"; + version = "2023-02-09"; src = fetchFromGitHub { owner = "ray-x"; repo = "aurora"; - rev = "f7b2df980aa0518a1a208974dfcbc51ff91b531e"; - sha256 = "1d0p7d7kicqy4bbh3kaxn9as71afjljp38lhcc595l2b8nlaf2hc"; + rev = "624d065f1c3f88438839dba79b995bc858a4642a"; + sha256 = "01y84kzfjnjrd34m9j9gx5d0gj7sd2vby5vmpiddh9skz8pb26f6"; }; meta.homepage = "https://github.com/ray-x/aurora/"; }; @@ -775,12 +775,12 @@ final: prev: auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; - version = "2022-12-13"; + version = "2023-02-11"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "c8b2f4048f846387361bd04cc185bf1aa7d2e3d1"; - sha256 = "0z02981n9gd5migx774cs4gnwpq9ksd4ava53f4xn973gc8jf4jn"; + rev = "04ccdac802200ecc363b251cf922b2b022bb515c"; + sha256 = "02xvdvy0jakpbgkp33ll21rcqpiybngwgxjsvvw6wg4wqg8dzykv"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -847,24 +847,24 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar.nvim"; - version = "2023-01-30"; + version = "2023-02-09"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "065c6d792a2a3aaf67a754ccd46800c8d1964812"; - sha256 = "1y04sfcnzw4hnygbgg91bfsn7jas5xbcsxrhp7766whd22rl6dsh"; + rev = "2d53f49c21327da48f0447841027848f49e1fea4"; + sha256 = "1fm845zjw08pzcql7ikk8qz87wrffl4w2jwgqvrqx5207qlafcbn"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; barbecue-nvim = buildVimPluginFrom2Nix { pname = "barbecue.nvim"; - version = "2023-02-04"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "utilyre"; repo = "barbecue.nvim"; - rev = "572e4070d1f26ce7252570823598a656e828a9ec"; - sha256 = "0k8mh345m8xxmss04zwscmpyfwxsa8pwd8pjklgv8njgxr5hk1hr"; + rev = "f616376a453c32489e594e0bc71916d314baeaf8"; + sha256 = "1hpfvvadxhf6njr186y1nk0b5czfkd3igdrn89vp9vxjjbqyi1ik"; }; meta.homepage = "https://github.com/utilyre/barbecue.nvim/"; }; @@ -919,12 +919,12 @@ final: prev: better-escape-nvim = buildVimPluginFrom2Nix { pname = "better-escape.nvim"; - version = "2023-01-09"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "max397574"; repo = "better-escape.nvim"; - rev = "6fed33809cde3b416087fc540ad9eb17ec470193"; - sha256 = "1wqps75qkr7rqdvrsn6f8m02nkqap9g6cca1jqf53y9476jsbml7"; + rev = "5cd64c0afb82688748d415710d0187df5bdb96f9"; + sha256 = "0l7nrvk9v1ky0nx1raxmp1ah1qh54glwg18grv6mdg4iksd27kib"; }; meta.homepage = "https://github.com/max397574/better-escape.nvim/"; }; @@ -1027,12 +1027,12 @@ final: prev: bufferline-nvim = buildVimPluginFrom2Nix { pname = "bufferline.nvim"; - version = "2022-12-24"; + version = "2023-02-11"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "c7492a76ce8218e3335f027af44930576b561013"; - sha256 = "18vfx8mq2gsv2hqy0c0vgbmx5mhr63bb8ixrmzmjgvbx2djz1jdb"; + rev = "84b0822b2af478d0b4f7b0f9249ca218855331db"; + sha256 = "0q6y91wpg0znzmr188hk20llaz6cdpbsw0fiazacfj0y5pkgid6w"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -1051,12 +1051,12 @@ final: prev: calendar-vim = buildVimPluginFrom2Nix { pname = "calendar.vim"; - version = "2023-02-02"; + version = "2023-02-08"; src = fetchFromGitHub { owner = "itchyny"; repo = "calendar.vim"; - rev = "6004885c90fd0239b84ce242babbcfe7cd379535"; - sha256 = "0avpcl9y718xldlhc6ip8hq6y6wp50k4hqdfrm3zg1z6l7iladwh"; + rev = "691d7d9eeed574bbc6ee70bf5329ccb55a5e1f81"; + sha256 = "0mkcyaxzfjbzm7lnkfv2wwy5wg1jaaalfdnzng7q47yld4gabijn"; }; meta.homepage = "https://github.com/itchyny/calendar.vim/"; }; @@ -1231,12 +1231,12 @@ final: prev: cmp-clippy = buildVimPluginFrom2Nix { pname = "cmp-clippy"; - version = "2021-10-24"; + version = "2023-02-08"; src = fetchFromGitHub { owner = "vappolinario"; repo = "cmp-clippy"; - rev = "9f8dd021f7b9326407a439105b0c646983191a49"; - sha256 = "02k0zwjbd98f76f3v46lvd8wfm8wibkh703g8vxr26yv1fwghs4n"; + rev = "eb501c9fa429c5852f8f420e71a9f565f4852c8f"; + sha256 = "1l07fvfc37sp531rjzpajf90dprcnylrkj9prr6qrgr1xlxqsvwh"; }; meta.homepage = "https://github.com/vappolinario/cmp-clippy/"; }; @@ -1315,12 +1315,12 @@ final: prev: cmp-dictionary = buildVimPluginFrom2Nix { pname = "cmp-dictionary"; - version = "2023-02-04"; + version = "2023-02-09"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "cmp-dictionary"; - rev = "5662ec89119c49a806b77b5df7517017abe47f8e"; - sha256 = "0md3msnkyw2dgkpgp12iskrdv7p4sywmdg4ifdmbcl56qn1dv5zr"; + rev = "26522d209f5661c94f3a8bad8145160983d2252b"; + sha256 = "12iqfbcrwh2bq9p8pxv7fwivfb07jvrvhqwal1kydfhwhzfxiswl"; }; meta.homepage = "https://github.com/uga-rosa/cmp-dictionary/"; }; @@ -1387,12 +1387,12 @@ final: prev: cmp-git = buildVimPluginFrom2Nix { pname = "cmp-git"; - version = "2023-01-09"; + version = "2023-02-10"; src = fetchFromGitHub { owner = "petertriho"; repo = "cmp-git"; - rev = "6bcb61c0a5ec2e0d522ece7c8fb3e009f1c79261"; - sha256 = "0n00apdpm920hjddmyhzynqxzdqz1scmqays9p4c4b6dq06jblbr"; + rev = "414e6aefbc0f416ad1c83e5417455a861159e3b8"; + sha256 = "0ps4fsv98g2j98lx1dgx2g2d0znxk9ibs5pwv8bpy0v2ggdvfpg5"; }; meta.homepage = "https://github.com/petertriho/cmp-git/"; }; @@ -1459,12 +1459,12 @@ final: prev: cmp-nvim-lsp = buildVimPluginFrom2Nix { pname = "cmp-nvim-lsp"; - version = "2022-11-16"; + version = "2023-02-06"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-nvim-lsp"; - rev = "59224771f91b86d1de12570b4070fe4ad7cd1eeb"; - sha256 = "1m8xs7fznf4kk6d96f2fxgwd7i5scd04pfy2s4qsb5gzh7q2ka9j"; + rev = "0e6b2ed705ddcff9738ec4ea838141654f12eeef"; + sha256 = "0gpwwc3rhfckaava83hpl7pw4rspicblxs7hy3y57gb560ymq6hg"; }; meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp/"; }; @@ -1759,12 +1759,12 @@ final: prev: coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2023-02-04"; + version = "2023-02-07"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "9f702344b9550800e9ca928cd21fd6dcc8dffaef"; - sha256 = "10s0nqhybry6m6p13gvmchmc6in7zn7pgi1930svy7czqblcg6rw"; + rev = "3a4f4ebfdc4f22aeec7dc1e2a10c5376c08b3c8e"; + sha256 = "1n48shihdhm73mrcg10px9mmlmf9kkjaskvv98d4s67ws223xdfy"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -1963,12 +1963,12 @@ final: prev: compiler-explorer-nvim = buildVimPluginFrom2Nix { pname = "compiler-explorer.nvim"; - version = "2023-01-25"; + version = "2023-02-06"; src = fetchFromGitHub { owner = "krady21"; repo = "compiler-explorer.nvim"; - rev = "1528b525d17a98dfc6f7b07aa28672106df9cde7"; - sha256 = "1mv844ijirg9vv8klphrdka3qyji9hvgfqcwf2v2a3c4h2vd78rf"; + rev = "26009c1d6265a6b6e86d8e74a81a235892f67e87"; + sha256 = "0g2b0mxssx6sjmn2iqlipwj50jmw8hfq648xcg3f78phmn03b4s4"; }; meta.homepage = "https://github.com/krady21/compiler-explorer.nvim/"; }; @@ -2095,12 +2095,12 @@ final: prev: copilot-lua = buildVimPluginFrom2Nix { pname = "copilot.lua"; - version = "2023-02-02"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot.lua"; - rev = "a54e7b11a2c6efc9ddd3f42e56cf7d9eed1a9683"; - sha256 = "05bpgrq11zcp9flqp0gm0xjcaq622z46yjxlf6iliv8a4pmbrbgr"; + rev = "a998e15d4221e5189958c8c9366045a6e53431cc"; + sha256 = "0xkzpvhfbsr7f037ipbqqjr5pxwkjkqzpj8fwkz8sfr24pljl5dv"; }; meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; }; @@ -2119,24 +2119,24 @@ final: prev: coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2023-01-29"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "53513efa7cc878ae7929ec6a389028effa569441"; - sha256 = "0syix30ag4fda8hzpraijm0v6s64gr4vwz4i9c3lvcwssd4q6dfw"; + rev = "6acfe02d3b8057ed9ed5bbd02b1ecc426eb9d97d"; + sha256 = "16rmmmh34y2pz1iwk8mnk88vs5cdqrm0sw52fnsmg5r82wy1i7y7"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2023-01-29"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "5b9fb4da049d48a1e8872f92c180a3646f610a14"; - sha256 = "0bplxcdv3yxls893myc6a6kpq01wfypw2sgnd61pc8k78xkhmdps"; + rev = "0b93c482acfc0bcdd760ff431b4d338e19395776"; + sha256 = "0hns2zvxlxd9wpdkr5cvcgzms6vkcw3h9p8ck1zj6msh0w1pmg67"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2155,12 +2155,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2023-02-04"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "d11f4eb12d73c5dcf5d6691378b18447446ec919"; - sha256 = "08kkp57k4138cb4jgv3q3x3h2qx7f29kr914lzqzrb7q4ybzm6b8"; + rev = "49189b020236002bae41f823da9ac0f73dca873f"; + sha256 = "17rmg7b9ibx1d8bb8s9r9zxqxxh206hkb5avykrdbngrg1sy64y6"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2191,12 +2191,12 @@ final: prev: crates-nvim = buildVimPluginFrom2Nix { pname = "crates.nvim"; - version = "2023-02-02"; + version = "2023-02-10"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "1bca9122ddc4bf4c6573402bf6686fc084470a7e"; - sha256 = "0isvyph3lpqpijxpfj5rjfh1w1mh3629jpyahy5sj2g8hn46mj08"; + rev = "3fc7ddac13ddf65914a733ef074317c4c72ef05b"; + sha256 = "1gyhh32v40c9cndyg3jxpyhaaxh392xl93la3aplpl4xwaphhzbv"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -2299,12 +2299,12 @@ final: prev: dashboard-nvim = buildVimPluginFrom2Nix { pname = "dashboard-nvim"; - version = "2023-02-04"; + version = "2023-02-11"; src = fetchFromGitHub { owner = "glepnir"; repo = "dashboard-nvim"; - rev = "d69d20170e12a20fa305e90870d6016e636cc328"; - sha256 = "18i9rjjv7g5hr1gyb98w3mh50m1iwk643rb93z1n7f38ln55xzw8"; + rev = "3af6176d41cad32ffc63d026bf522d6135b53a3b"; + sha256 = "12lbparhv65b1cj3a9gx6pg475mc2kcl1ql61v0774vsiah6p7p1"; }; meta.homepage = "https://github.com/glepnir/dashboard-nvim/"; }; @@ -2685,12 +2685,12 @@ final: prev: diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview.nvim"; - version = "2023-01-30"; + version = "2023-02-06"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "ab3757c1ea1b84ef59f7dda54f11d10022e0e3b7"; - sha256 = "1rbcf3llcq542533l0cxqf3bwnzk99x76k9yclfdy12zfdcjx4fv"; + rev = "11827d46e939b4748dbdb7e0df4982a63bd59d26"; + sha256 = "101l5v8a0ya7cz230rd85gwc06b4hxnilbydf0zcxy85dq5j8wq7"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -2733,24 +2733,24 @@ final: prev: dracula-nvim = buildVimPluginFrom2Nix { pname = "dracula.nvim"; - version = "2023-01-19"; + version = "2023-02-05"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "dracula.nvim"; - rev = "a0b129d7dea51b317fa8064f13b29f68004839c4"; - sha256 = "0q7ly95hp123z9z8qh4sih5a53dnbxv0jxa80b1s7d6h1wpr2w5j"; + rev = "798274ba3c454a9aa3cd71f95a86ea55cbbbb142"; + sha256 = "156g08ab9jghi580b1k88si3bc6h72d77avlpn34dnnn5481anvh"; }; meta.homepage = "https://github.com/Mofiqul/dracula.nvim/"; }; dressing-nvim = buildVimPluginFrom2Nix { pname = "dressing.nvim"; - version = "2022-12-13"; + version = "2023-02-05"; src = fetchFromGitHub { owner = "stevearc"; repo = "dressing.nvim"; - rev = "4436d6f41e2f6b8ada57588acd1a9f8b3d21453c"; - sha256 = "1iwxqfqp3x09wz3rnvli3y80n38rw149cmjj9pmbkhiqgsm9p461"; + rev = "db716a0f1279f79a886c0e0b6ab3c3d5ffdb42fe"; + sha256 = "00k2gpmikkp2bcpg8jg6pcjwvd806garficbjiv2k9ibzpbvc4xl"; }; meta.homepage = "https://github.com/stevearc/dressing.nvim/"; }; @@ -2781,12 +2781,12 @@ final: prev: editorconfig-vim = buildVimPluginFrom2Nix { pname = "editorconfig-vim"; - version = "2023-01-25"; + version = "2023-02-07"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "ee6e91ca09d59043d365bd96a32e989bd75abe84"; - sha256 = "068af4iznkvkafxnyj54clwalmzcywlfxphlzas4psg6qxzcdj13"; + rev = "1d54632f7fcad38df8e428f349bc58b15af4b206"; + sha256 = "1692rzbv64332wi0cmyf0g5m8k039vvrijxmryrqnxaf15493mbw"; fetchSubmodules = true; }; meta.homepage = "https://github.com/editorconfig/editorconfig-vim/"; @@ -2939,12 +2939,12 @@ final: prev: fern-vim = buildVimPluginFrom2Nix { pname = "fern.vim"; - version = "2023-01-15"; + version = "2023-02-08"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "4841c8830f0354808952fd4f64869383413c194f"; - sha256 = "0jmv0wqx0234dz0xlqjf1rhn7y4hnd4vxxqfr0f166nz678fld05"; + rev = "1856f0390b1ae15d446b94dc47ccf5b967537ad1"; + sha256 = "06c54lhn30ibn721l6vh5gx4kdyrk39w2kkcwrlhskpx6dipava5"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; @@ -2963,12 +2963,12 @@ final: prev: fidget-nvim = buildVimPluginFrom2Nix { pname = "fidget.nvim"; - version = "2022-11-27"; + version = "2023-02-06"; src = fetchFromGitHub { owner = "j-hui"; repo = "fidget.nvim"; - rev = "44585a0c0085765195e6961c15529ba6c5a2a13b"; - sha256 = "112mjmy2nrqwj3l9dp3gzxsygaidcdrz2l6vzn27k1a57a7jyb8l"; + rev = "9dc6d15fdb877b2fb09ea0ba2dfde9beccb5965a"; + sha256 = "1xgb6ichs52qlzks3rlwx1v03q1yh2phl9papwd0h71mmns0plb1"; }; meta.homepage = "https://github.com/j-hui/fidget.nvim/"; }; @@ -2987,12 +2987,12 @@ final: prev: firenvim = buildVimPluginFrom2Nix { pname = "firenvim"; - version = "2023-01-31"; + version = "2023-02-09"; src = fetchFromGitHub { owner = "glacambre"; repo = "firenvim"; - rev = "35b34ba566d9d9f6761cde3574f668d505c5137f"; - sha256 = "06lrhk7xladf9vf5d3qk06ffh4fw3s1wzpckwrk285lqz3mqc2gm"; + rev = "2ff7e2df6b1ffe8935d24ae90f5c173ea4cd8b1b"; + sha256 = "049jfhbbn899xahidgx2qwca98140wiymw678x6930b0cvf16w0r"; }; meta.homepage = "https://github.com/glacambre/firenvim/"; }; @@ -3060,12 +3060,12 @@ final: prev: flutter-tools-nvim = buildVimPluginFrom2Nix { pname = "flutter-tools.nvim"; - version = "2023-02-02"; + version = "2023-02-05"; src = fetchFromGitHub { owner = "akinsho"; repo = "flutter-tools.nvim"; - rev = "f84836a906fac21e9fb096ce15478051cd7df589"; - sha256 = "1j725v2cf9k1dlxnpmzcz1ys7v9iyj0vyvjw9bkmjvy17hqcrxaw"; + rev = "d67caa7dd17eccb89bfda1c0657d0723e339ef60"; + sha256 = "1rgl6kaa0rv7hx6fslrmm8glw9gfpl7yqpf31zj5lazw82k5wk1c"; }; meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/"; }; @@ -3096,12 +3096,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2023-01-26"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "a6f7a1609addb4e57daa6bedc300f77f8d225ab7"; - sha256 = "1rw4r8g4hblmlddbddd5skf5x8i4zaba8ncmzbr26svdmayk1c16"; + rev = "1645e7cd98ed99e766c84ab3cf13a1612c77dcee"; + sha256 = "13zvkv7vnfrj0xs31s1gv74amxpdyvc2m2x8br58vxfscy3wbaa4"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -3204,12 +3204,12 @@ final: prev: fzf-lua = buildVimPluginFrom2Nix { pname = "fzf-lua"; - version = "2023-02-02"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "5ad5771eb77d233ec7a4352240d2780dde8034d1"; - sha256 = "0fkwsi9f2qymgavfpgxzrbga1z0z0024sri1wslsp66g1512x92f"; + rev = "f4fe61067e20c7fb7ffc83c849d638dbdc38a2af"; + sha256 = "0jvrac6m0wcn114a4gqyxrag90ivbdffypjdpf19qyqlykicpk6y"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -3252,12 +3252,12 @@ final: prev: gentoo-syntax = buildVimPluginFrom2Nix { pname = "gentoo-syntax"; - version = "2023-02-01"; + version = "2023-02-08"; src = fetchFromGitHub { owner = "gentoo"; repo = "gentoo-syntax"; - rev = "8abf42d2035374df1c87cb1b26039393c807ddd5"; - sha256 = "1vka4b9qs54wrs2wzk8msbpadc01wc5b1py0zng8hq67dplcg9yx"; + rev = "8340095e5a8263494abadf5a81970ff92091e004"; + sha256 = "0glp8nnj9jsps465srn59bdc6g5pnyrs3n9kxghp0wzf8hrx2zic"; }; meta.homepage = "https://github.com/gentoo/gentoo-syntax/"; }; @@ -3300,12 +3300,12 @@ final: prev: git-blame-nvim = buildVimPluginFrom2Nix { pname = "git-blame.nvim"; - version = "2023-01-14"; + version = "2023-02-07"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "5ddf157139ecfc0d2161f00c2cce4874578dc355"; - sha256 = "0d4caahrnqgy06mvqvxhhcr2li2hvk44hwqvw9dkxh9g6hyfjj87"; + rev = "17840d01f42ee308e1dbbcc2cde991297aee36c9"; + sha256 = "1ldc2lnabz5hr18xgiwrr83w93rnqidhycwkkhi4bc0hmabacsix"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; @@ -3360,12 +3360,12 @@ final: prev: gitsigns-nvim = buildNeovimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2023-02-03"; + version = "2023-02-10"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "ec4742a7eebf68bec663041d359b95637242b5c3"; - sha256 = "18bwp15m2v4mrxp9i2vz061cfpv3ah08c8il3fx24aqhfbmaq6lz"; + rev = "f29f0b22fd66c910b892aae3bc18a4872c002738"; + sha256 = "0cizfyivvfgv72wxw543l6h2giais7bsgmvxrpcks8zmgmvlq0zq"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -3384,12 +3384,12 @@ final: prev: glance-nvim = buildVimPluginFrom2Nix { pname = "glance.nvim"; - version = "2023-01-30"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "DNLHC"; repo = "glance.nvim"; - rev = "3b7fbbe4e785bedbdaa1a9573dcd800261a7e32b"; - sha256 = "09jcq6315njcw0khasnv41vi0lscbxk07cajzxqbm5pgjzww26fq"; + rev = "7a0ad2d169b5a76734e9ba6cb7774e76cdd948dd"; + sha256 = "0scn5jrqjdaigxfxif48andfa4frp9csy2ijsbm708bxw67myxm1"; }; meta.homepage = "https://github.com/DNLHC/glance.nvim/"; }; @@ -3408,12 +3408,12 @@ final: prev: glow-nvim = buildVimPluginFrom2Nix { pname = "glow.nvim"; - version = "2023-01-29"; + version = "2023-02-10"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "glow.nvim"; - rev = "c87b1120b618577e64d910a7493a26829044a8a2"; - sha256 = "1i5d249jga0slnwnk6as1zqlc03x8nxd0vbrxr43qg6vw322sj7k"; + rev = "2bb4afb6e9dbc93993a1d7d4168dac08c74590ac"; + sha256 = "0k6wrlzn5i7c1gfhs077aivvgy1qbjrjr79j1m6y3n8jgdzk1f6z"; }; meta.homepage = "https://github.com/ellisonleao/glow.nvim/"; }; @@ -3540,12 +3540,12 @@ final: prev: gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox.nvim"; - version = "2023-01-26"; + version = "2023-02-11"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "2e93ac50b3e95d650e62729f8810a005861e77ad"; - sha256 = "0ahgpgjazrwsvqpvsgbgwzhiglzb291d1ww20f8grakdhppvas3h"; + rev = "73f009df5ed929a853244c413bb52c1d02c117ce"; + sha256 = "1q8lxhw9fcvgx6km4l32571c2qq7fid460h69c8j4wxz3a16y1n4"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; @@ -3588,11 +3588,11 @@ final: prev: hare-vim = buildVimPluginFrom2Nix { pname = "hare.vim"; - version = "2023-01-30"; + version = "2023-02-10"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/hare.vim"; - rev = "92e8a80edc11ad5df6fdcfccee567515027682eb"; - sha256 = "10fl95n5c2yk8v00hr4r4zbbi4rrdhbz6jg7r86d8jw6qjxl6c1b"; + rev = "75874719e1aee0171a0f06d1508ff9a116f6ac75"; + sha256 = "0n2rh59nnp0fv4jxvx30arrrqpfbagix6a94rxq3100n8kszr218"; }; meta.homepage = "https://git.sr.ht/~sircmpwn/hare.vim"; }; @@ -3611,12 +3611,12 @@ final: prev: haskell-tools-nvim = buildVimPluginFrom2Nix { pname = "haskell-tools.nvim"; - version = "2023-02-03"; + version = "2023-02-10"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "03dfa7fa3d08a34cdef09ca05a6da166a1ba22a2"; - sha256 = "166ar0qy3pl2jvw7y6im7v7gmrsji44ph1aahxqdpgbf170xx6pa"; + rev = "f676cfd95f76db50d746a3ab863b4d0dda0a55df"; + sha256 = "1f25cdk47qmg4pf16s6mnrcscg5cb945hxr9hsiwy2hik2b05ygs"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -3683,11 +3683,11 @@ final: prev: himalaya-vim = buildVimPluginFrom2Nix { pname = "himalaya-vim"; - version = "2022-10-09"; + version = "2023-02-09"; src = fetchgit { url = "https://git.sr.ht/~soywod/himalaya-vim"; - rev = "747ff2a6055839cb5b403b540883515af37b7117"; - sha256 = "05d8nfzqp96s05agj4fd5r2fckdsxacl0qvlk9dhxz4dh8kgsqyi"; + rev = "a2fdf319dbdf0fda1b2f27c706f96a13b8077e58"; + sha256 = "1bw399danjzprixd4mnrmsr3idspm2d7a9hkfpy4xra97hfnalii"; }; meta.homepage = "https://git.sr.ht/~soywod/himalaya-vim"; }; @@ -3766,12 +3766,12 @@ final: prev: hydra-nvim = buildVimPluginFrom2Nix { pname = "hydra.nvim"; - version = "2023-01-16"; + version = "2023-02-06"; src = fetchFromGitHub { owner = "anuvyklack"; repo = "hydra.nvim"; - rev = "d00274f05363c13f29ed1fa571026a066a634cce"; - sha256 = "1scf9pmwch081l2rvfm0np6cjd4kj3kzpzkjlbc7zjw4gbbrbr9s"; + rev = "3ced42c0b6a6c85583ff0f221635a7f4c1ab0dd0"; + sha256 = "1dwhi2543drbncrqx80nsi5hw48d6my4wbsp71gx6m0clkp4469h"; }; meta.homepage = "https://github.com/anuvyklack/hydra.nvim/"; }; @@ -4175,12 +4175,12 @@ final: prev: lazy-nvim = buildVimPluginFrom2Nix { pname = "lazy.nvim"; - version = "2023-02-01"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "3d2dcb2d5ef99106c5ff412da88c6f59a9f8a693"; - sha256 = "0gac6zw7zp53szjd8rfhb5ysgnhrsn01gb759pczmkayp2b2x4fd"; + rev = "06f835d0b4b62d9d26fe0ec4190b981f2f5632d2"; + sha256 = "0lm68yim0af06im3sd9lpmj7k5v333m5sd3wva35pdh0lr0l3q7f"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; @@ -4235,12 +4235,12 @@ final: prev: leap-nvim = buildVimPluginFrom2Nix { pname = "leap.nvim"; - version = "2023-02-04"; + version = "2023-02-10"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "f565a9c4d92245d8b619235bebeaa73cc38aa40e"; - sha256 = "1i40bi18wn7vg6mdcg0xp5zxk960lzj4kzda3syj51sv1pgdq802"; + rev = "7140feed70a5911b8c8a7eb9c218d198772f69cf"; + sha256 = "0k5g95nlawv3r9farc7qgfdbvyvsy3w3rfysjfhrc37jvdz5ykhv"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; @@ -4319,12 +4319,12 @@ final: prev: lh-vim-lib = buildVimPluginFrom2Nix { pname = "lh-vim-lib"; - version = "2021-08-18"; + version = "2023-02-07"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-vim-lib"; - rev = "aa8e8f270c1d3be4fbe6b153827a191a5fcaa0d7"; - sha256 = "0lgpxgg2696pbfdgnr2zcapvhfk6d1qwvci223h69rvg0fh853rz"; + rev = "02764e0e87f85fa13e0d6a0e38ac6605f806d560"; + sha256 = "0d4hs4qh4fm393f1k6085l1f8yvqjpr2wdh7ia26k9839s4k2pn0"; }; meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/"; }; @@ -4547,12 +4547,12 @@ final: prev: lsp-overloads-nvim = buildVimPluginFrom2Nix { pname = "lsp-overloads.nvim"; - version = "2022-12-04"; + version = "2023-02-06"; src = fetchFromGitHub { owner = "Issafalcon"; repo = "lsp-overloads.nvim"; - rev = "12f5468781d2d1d3feb6ad7459de764fc33898fe"; - sha256 = "1lxsg05qv87v2imhsfwa9mqfib4332cvhflivpzkamg1acs6bc9j"; + rev = "d371137c6d2c942c1ad4fe400f536c2ebf0792bd"; + sha256 = "184ybjs9c6xn6079i4gw411j06kxsmf3gqxz8c6rcj0hiv87wsn2"; }; meta.homepage = "https://github.com/Issafalcon/lsp-overloads.nvim/"; }; @@ -4583,12 +4583,12 @@ final: prev: lsp-zero-nvim = buildVimPluginFrom2Nix { pname = "lsp-zero.nvim"; - version = "2023-01-31"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "VonHeikemen"; repo = "lsp-zero.nvim"; - rev = "42bc5a1081666098a7154532e6ff5e3edc483b39"; - sha256 = "1y6jv9sldap59466v8jivbd5w6xs31anr8iqg3zyapdmr6pwflck"; + rev = "7a598977074f62ebe958d8f3e927084be486788b"; + sha256 = "1sh1xvfh88nm61qd0kaa7vxxv4h4h7xba577br85rc7imwh002x7"; }; meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/"; }; @@ -4690,12 +4690,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2023-02-02"; + version = "2023-02-11"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "d404ec306bfa4cdb0c3605dbb17e8a93a9597337"; - sha256 = "1m6dmfplyln4xvc09srqxby93ksq1a62qai09j9msnd5pv4yqniy"; + rev = "58fbfc627a93281a77f7d161d4ff702e639677b1"; + sha256 = "0vxqy0m1kvd4xfadv6pmx9l9h2pjrk7dsr43av6nf6xn2yrr7sin"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -4763,12 +4763,12 @@ final: prev: mason-lspconfig-nvim = buildVimPluginFrom2Nix { pname = "mason-lspconfig.nvim"; - version = "2023-01-31"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "53f3a8bdcb77d4a95b082fd57e12173f353c6c3e"; - sha256 = "0588rpf28fk922nmj44nl5m74a9762g2xx8y72b61k5iwpi2vp3h"; + rev = "e2b82cf4c68b453eeab5833d90c042ed4b49d0e1"; + sha256 = "0lyfqhf7w3d5chpl6rrigkd8a6r4y16sgzv0p3ihw0zgqfqfksmv"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; @@ -4787,12 +4787,12 @@ final: prev: mason-nvim = buildVimPluginFrom2Nix { pname = "mason.nvim"; - version = "2023-02-04"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason.nvim"; - rev = "9ec92c1945b11ba7e7e6730fd60fd44525f24a25"; - sha256 = "0snf7j4x4cmwrw81bwm3fj8k07l8iriqwzc5c47bl2w94fpbynyc"; + rev = "f557094c77c4fa91c3613cfbd22cbcdbe0569793"; + sha256 = "1dw0lr0jhhsjqdml31qk7vkzw53myq838r3zhax1ifd1l40igihm"; }; meta.homepage = "https://github.com/williamboman/mason.nvim/"; }; @@ -4823,12 +4823,12 @@ final: prev: material-vim = buildVimPluginFrom2Nix { pname = "material.vim"; - version = "2023-01-12"; + version = "2023-02-09"; src = fetchFromGitHub { owner = "kaicataldo"; repo = "material.vim"; - rev = "ec5a2cecee50ea2074e6f19bd1c98e7d868a52c7"; - sha256 = "08s8k9nwnmyqzlpvfz2pp1j8dhip1syhkilrrzbj723xknclxyzf"; + rev = "b47e7f884cb606c19a20e8e520dfa10c3b3a52f9"; + sha256 = "1abhf71ap9cs03ibi3qm8lw8kdynb86x85didnhlhb673xg0kbcz"; }; meta.homepage = "https://github.com/kaicataldo/material.vim/"; }; @@ -4859,12 +4859,12 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2023-02-04"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "33e76b0c22465de03906ebd00c01b64a04e495b3"; - sha256 = "0kxfwmvp7pgvqr6cqs6zf5dklq6n7vcgzr1dj435f8yg6zh90aah"; + rev = "8a248b3b2cf26bf450299cd715b770668c6b5d2d"; + sha256 = "1fndvikaqz8b9mh51b0l27k2gwll9ivk6krqqjiyn5rsc6rjchc5"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -5219,12 +5219,12 @@ final: prev: neoconf-nvim = buildVimPluginFrom2Nix { pname = "neoconf.nvim"; - version = "2023-02-04"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "de8dbd4ba6583619ed02323dbde737d586ba572f"; - sha256 = "1ms7chmmilq8slf659m8d45i39pllgng7a95fc20ykwbakhi8m9b"; + rev = "8067d2dc3196f1a7ad98b6e93e92ec52d01b0f48"; + sha256 = "0r1l1bqdq97cc4691k83zg5k23qi87p61h5v4wfrxffvfpnhkgbd"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -5243,12 +5243,12 @@ final: prev: neodev-nvim = buildVimPluginFrom2Nix { pname = "neodev.nvim"; - version = "2023-02-04"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "70cab52c9d19e982f306716534e90c37a254b046"; - sha256 = "13xrc45s5fx8y2dl1ds155r5w0yrivq2b1aqvqjk7ywgyyq2wr5l"; + rev = "1b21ea60f5b67946282b0b0312773e85fc6f9b05"; + sha256 = "02crx7q6zwx1p6wjsbra7v0lbhi80mav2imys6klvabsz6246rlc"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; @@ -5339,12 +5339,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2023-02-04"; + version = "2023-02-11"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "ac8828369cb2a4b2e1e17e6b495645585ed2a37b"; - sha256 = "1ljyzvk3ff876sp4idfqq3ziqm7c6wc63kii3nsvh9i4m0w5i5af"; + rev = "9766bef893ec993af9408ea0d44a8f13adbd1e80"; + sha256 = "0wjiy1z19wgqn2jk419cm5545i3mp75zl6sq1srr5bfv8scvls2q"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -5399,12 +5399,12 @@ final: prev: neotest = buildVimPluginFrom2Nix { pname = "neotest"; - version = "2023-01-25"; + version = "2023-02-07"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest"; - rev = "392808a91d6ee28d27cbfb93c9fd9781759b5d00"; - sha256 = "03s8kkj386i77vryss1br3033azmbjhf4wzaqnrm9238951hls5w"; + rev = "568feb5e9c7c5b7386886ecd4520389153aa7c7d"; + sha256 = "1066pwyvl2b05qq3z4mszm1b1aipc6mifdcxy43p5fg4n4kc0gzh"; }; meta.homepage = "https://github.com/nvim-neotest/neotest/"; }; @@ -5423,12 +5423,12 @@ final: prev: neovim-ayu = buildVimPluginFrom2Nix { pname = "neovim-ayu"; - version = "2023-01-07"; + version = "2023-02-10"; src = fetchFromGitHub { owner = "Shatur"; repo = "neovim-ayu"; - rev = "ba749799e48a8c5065106989eb8bf9915b51081d"; - sha256 = "0xqdz4qb0sdb9g2hdgm5c2ry0m3ar78hyp0n93k92dwd1v575996"; + rev = "0eb91afe11f1763a477655965684269a545012e1"; + sha256 = "1nhayyl8lr22j0qrf64h1sjq9z650sxwgcqi8an1b6g6nhqwc329"; }; meta.homepage = "https://github.com/Shatur/neovim-ayu/"; }; @@ -5471,12 +5471,12 @@ final: prev: nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2023-01-27"; + version = "2023-02-05"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdcommenter"; - rev = "06f6166e5dfcf78eb0d055c21274cafc3927d461"; - sha256 = "0h340y2v4bb1wfqa8015skd7yb694iwqgq3v42mqpcsa3ssnvh70"; + rev = "d069f7fb562fb9eb6911fe23cda7aca2a387043e"; + sha256 = "0ir2cghjcz3wr1sp1fzvdjnwqrjy82n3zlhrcz7cs41n8f2wich7"; }; meta.homepage = "https://github.com/preservim/nerdcommenter/"; }; @@ -5579,12 +5579,12 @@ final: prev: nlsp-settings-nvim = buildVimPluginFrom2Nix { pname = "nlsp-settings.nvim"; - version = "2023-02-04"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "c2db6cfd687df2fba323ba31ad0d862d6129f62c"; - sha256 = "0k7mhz2k05qwyrx9iyc9psjfshxzw8p1618fiyr7cck9aphzwqlf"; + rev = "b84ec546206bb8a6c8b99b8ac5824879d1181a4b"; + sha256 = "0yyb8kfkj32dkz19a6n105hs503ccwsc1ajbyb2rqpya717bi86j"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -5615,12 +5615,12 @@ final: prev: noice-nvim = buildVimPluginFrom2Nix { pname = "noice.nvim"; - version = "2023-01-29"; + version = "2023-02-07"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "34f7cf628666c6eb0c93fbe8a0490e977ac78b7b"; - sha256 = "0nkk0zji3fdjzjhd5l2lmqb5208mkw08xkgvvxbddsjwgxx3jbg4"; + rev = "d8a1f3056ad713b5d471048f8d029264828e22c0"; + sha256 = "0m6058yy4bn66bdr47na91g4pnm27y3msr386hj0hss975iaicwq"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; @@ -5687,12 +5687,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2023-02-03"; + version = "2023-02-10"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "8f5d730021497233c39d3adbf4b8043d4be163f8"; - sha256 = "0isrsbba9clpjjx5z37p4d0s8fasd7gxr1gxxjsvgkp2yn7blvi0"; + rev = "ab4e9261843236d773f49a23fcfb3d2167a3c500"; + sha256 = "0lf0xiz0f9lnnix3ajdcczp2x1wd1316jaf0vbn5w2b8pmc32rgv"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -5747,12 +5747,12 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2023-01-30"; + version = "2023-02-07"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "5a3523ddb573804752de6c021c5cb82e267b79ca"; - sha256 = "1s17rmxgnadz6wbcd21x8504ra8crbxf27qjdxh6b4a1g0w75hy1"; + rev = "45ae3122a4c7744db41298b41f9f5a3f092123e6"; + sha256 = "16zryzm0ng0f8zl13jpkhjmqya0rbs4vy2zdm9zhd2qsnnpbb6rh"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -5783,12 +5783,12 @@ final: prev: nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2023-02-01"; + version = "2023-02-08"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "da1cd2557a16386829a213330e0fd46b61db7632"; - sha256 = "0ws45yilaq9kyssm5s1rj65k0xsiflg8fivjgggb3g3fvr6286p3"; + rev = "7a278012efb0a12bc49ecc3e16ec5591c41fae88"; + sha256 = "1wykg4d6rx6grfb69svwwhk7f28g2cf87bdb13pwlbxyl7cxw908"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; @@ -5819,12 +5819,12 @@ final: prev: nvim-cmp = buildNeovimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2023-02-03"; + version = "2023-02-11"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "cfafe0a1ca8933f7b7968a287d39904156f2c57d"; - sha256 = "1qgvlvjwah6581vppsb8racgkfjpjx2xqbk2ji1fmczc3rsk80h6"; + rev = "aae0c3e4e778ca4be6fabc52e388cbd5b844b7a5"; + sha256 = "015liiv48dg1yangmfjvbnqiv8gkzl9b8y5c3f0x2ppax2a3hp8y"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -5927,24 +5927,24 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2023-01-29"; + version = "2023-02-10"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "0e376f00e7fac143e29e1017d2ac2cc3df13d185"; - sha256 = "0xdbvbah2zxy27irc4dn9kz7ga5jv88d0z5vsbdgnqpnvv7gzc1c"; + rev = "401f5f22b2d7f9bdbb9294d0235136091458816a"; + sha256 = "086vy7vfsvdjrfl0m45s7cz0lakvrynb3lyzyh9p04m5y0g5h5mz"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; nvim-dap-go = buildVimPluginFrom2Nix { pname = "nvim-dap-go"; - version = "2023-01-04"; + version = "2023-02-08"; src = fetchFromGitHub { owner = "leoluz"; repo = "nvim-dap-go"; - rev = "6f045a72a05a78e4071dd0880f08214a2bb1461b"; - sha256 = "153dxjwq93wg1079485hqpvq81mai1yzqjmc9qybda09zra5wlk9"; + rev = "b4ded7de579b4e2a85c203388233b54bf1028816"; + sha256 = "188w0n42gzvc4c1j6i5i48j60zxx9lrc3nq2z8ly0m7l6lc88vx9"; }; meta.homepage = "https://github.com/leoluz/nvim-dap-go/"; }; @@ -5963,12 +5963,12 @@ final: prev: nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2023-01-31"; + version = "2023-02-09"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "885e958ff9de30cfbc359259eccf28cc493ad46b"; - sha256 = "1j7nbrilk63vdmnr1dp3gdzhdpa2m001jzd6ch6i8j8dzjjnbyss"; + rev = "100c67dd63c870819fb998fec4867b17d02db4b7"; + sha256 = "1036psvcn28xm5phg4w4l2pkszjcpa7c5ma7ry9x82wy5844zf50"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; @@ -6095,24 +6095,24 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2023-02-02"; + version = "2023-02-09"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "1f640d14d17f20cfc63c1acc26a10f9466e66a75"; - sha256 = "1cfl5cjjfcijdsnbh1f23vp3msjlpkvr81am6lpkhx5as2dfws67"; + rev = "8fe3be1c08ab0bb55f2998fbc02f1a08f87a44bc"; + sha256 = "08nkbwzby8j156n3s89aj3nbhy99pb0nkpdj3rqqvrbyqyia5jbn"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; nvim-jqx = buildVimPluginFrom2Nix { pname = "nvim-jqx"; - version = "2022-09-21"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "gennaro-tedesco"; repo = "nvim-jqx"; - rev = "24d3e0228aec27280e091d09ff65593e99d4d564"; - sha256 = "06zp3hffwjgq3c30d7h3a3bnx7vw77xwz4g3kcb54rxffvhjwwvj"; + rev = "a4ff0404d0fdd5213a9804c74c4a5ca40a1e4364"; + sha256 = "0zdzfrsn751ff34lbqjnr6m2pis0fij20d10dpjidy3dbrgzc34d"; }; meta.homepage = "https://github.com/gennaro-tedesco/nvim-jqx/"; }; @@ -6179,12 +6179,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2023-01-31"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "902d6aa31450d26e11bedcbef8af5b6fe2e1ffe8"; - sha256 = "1hmkm3znqm7c6fi0qai1i424qjm5b9dh9l0srzyy7cax3629yyfr"; + rev = "1712672e4da3003a0dd9f771d30389600b360f42"; + sha256 = "18dpijknw3w82rag39acw60vwc6q0apc8hm82x6103gqsimcs3as"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -6359,12 +6359,12 @@ final: prev: nvim-snippy = buildVimPluginFrom2Nix { pname = "nvim-snippy"; - version = "2023-02-01"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "dcampos"; repo = "nvim-snippy"; - rev = "a5580956e2c1841a248fae6ba88e21f72df9f04d"; - sha256 = "1607d7igrhrzhfaypnf20awgi1l32w57i5g1jdz4d5dpch1wi6wn"; + rev = "108ce49e8de5986ab94f20c8a5d50f823d6450e5"; + sha256 = "1q15xfp7aw40if3myn9x2zdj66kjdirgcxhij86vpgnvbbjk5n2k"; }; meta.homepage = "https://github.com/dcampos/nvim-snippy/"; }; @@ -6383,24 +6383,24 @@ final: prev: nvim-spectre = buildVimPluginFrom2Nix { pname = "nvim-spectre"; - version = "2023-02-02"; + version = "2023-02-07"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "17b7c84ea8884bfec8e71b8021e924cb3a39c180"; - sha256 = "1r6jran2nqyzjgxmwnykd53k38iz8pdc5x9ndcqd8w88ybg3bbpd"; + rev = "1d8b7a40677fd87da7648d246c4675c3612a7582"; + sha256 = "1bcxyq8jglkpfkhrj0zq5gj74sivws00zavl5py37xrmqp0948a8"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; nvim-surround = buildVimPluginFrom2Nix { pname = "nvim-surround"; - version = "2023-01-01"; + version = "2023-02-09"; src = fetchFromGitHub { owner = "kylechui"; repo = "nvim-surround"; - rev = "ad56e6234bf42fb7f7e4dccc7752e25abd5ec80e"; - sha256 = "1fi5lk3iacjdbq1p4wm0bia93awwqfn7jiy019vpg4gngi41azrz"; + rev = "90821ad682aac189cd0a38fd83fc96f0cbcc5d29"; + sha256 = "0lirvmb9yc2yc8an2x0wll1vwlpc4fh95x3r5wh21s8m0nqvv577"; }; meta.homepage = "https://github.com/kylechui/nvim-surround/"; }; @@ -6431,24 +6431,24 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2023-02-04"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "7eb33d2a6d5d574a43159da90e0eac2445367393"; - sha256 = "0x6lji8s86vgih7fv9yvvjkyh9bqlzrsmn04im1zif087wa1dcw1"; + rev = "36e29c3a95ae606449f6616a0d8ab7247af807dc"; + sha256 = "198b97d1vc9lx5b7ww0dl07wyq2vjg2z6hq2arch8489qaaamqwm"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-02-04"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "bd7b4b6eff2dcb4a8a65f55d51398e79fa3d4ec6"; - sha256 = "08amxr13yfqi2301lrdb0swl6wfjkbi3i7cq5r5ypyw7xaj1nbqb"; + rev = "2c2430d42f30d1aef8715aed933272c9a6898f4e"; + sha256 = "0ypwcgkm1igk5flc5hf1rsf6ckz76pks33c562s8478ppbicnlwy"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -6491,12 +6491,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2023-01-31"; + version = "2023-02-10"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "249d90a84df63f3ffff65fcc06a45d58415672de"; - sha256 = "01wm4gnwimsxgvdhjgn15d23nq6d1304jjvkr1wdjz7xk5g0xvaz"; + rev = "13edf91f47c91b390bb00e1df2f7cc1ca250af3a"; + sha256 = "19c140aw8ksak2k0s6ww2dk7qh3p2rjhwbi56wjaf2282x4g9181"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -6539,23 +6539,23 @@ final: prev: nvim-ts-rainbow2 = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow2"; - version = "2023-02-04"; + version = "2023-02-06"; src = fetchgit { url = "https://gitlab.com/HiPhish/nvim-ts-rainbow2"; - rev = "7d33fb4402676723b0d7ca4d95717f5e020cd123"; - sha256 = "0h4kfmh75p6c00f1xa6609y7zq9nm3p0r8yj17bwy30hpi51vnqv"; + rev = "7b797cc0d50231089b81362237abc14fc085ba5b"; + sha256 = "0c4yyl10g8m84is7n9kzgsqndf1k4bq5xd4va1zwkzia0hjrfrfr"; }; meta.homepage = "https://gitlab.com/HiPhish/nvim-ts-rainbow2"; }; nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2023-02-04"; + version = "2023-02-11"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "2b96193abe4372e18e4f4533895a42a466d53c17"; - sha256 = "18vh5xpyzlmfwdz2n30fi7a6v7w5mnami857cczqy2bk5bc1xdvd"; + rev = "bd7a222287c5828cd0607cd0a5605e52f0460074"; + sha256 = "0yfik58mixrlhjla7aw4di61yzxkk79s9fvz6ly2vg5vdacf40bl"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -6586,12 +6586,12 @@ final: prev: nvim_context_vt = buildVimPluginFrom2Nix { pname = "nvim_context_vt"; - version = "2022-09-14"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "haringsrob"; repo = "nvim_context_vt"; - rev = "31436f34f3f95e4e70853cd653fdf78246cb0e85"; - sha256 = "1i018fmglfyqd8q762vks8yhh2kwg754ysf7d6d3hq2sb7w7kzwn"; + rev = "e592a9142fbfe0878ce886cd0d745963604c61d2"; + sha256 = "00gwdnmsc0dlc0p8j6b6jld1vh78zf57dmk2arw3f0xpwirgkkxx"; }; meta.homepage = "https://github.com/haringsrob/nvim_context_vt/"; }; @@ -6646,12 +6646,12 @@ final: prev: oil-nvim = buildVimPluginFrom2Nix { pname = "oil.nvim"; - version = "2023-02-03"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "7371dd220f1d08789cc225846d8cafed938777e9"; - sha256 = "0rcx62q9vrx0w6qgkpz39173r0fba6xk9ja212s93l3zwqp49wwb"; + rev = "f1ea6e0ad03e1d7b1acad4d0796d39c4a82b3463"; + sha256 = "0s9c7cdqs8rf8pzrw68ynh9q76rqzwq5kc96dlgip4273s38x25j"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -6683,12 +6683,12 @@ final: prev: onedark-nvim = buildVimPluginFrom2Nix { pname = "onedark.nvim"; - version = "2023-01-19"; + version = "2023-02-10"; src = fetchFromGitHub { owner = "navarasu"; repo = "onedark.nvim"; - rev = "f0a70e0993acbb348c32a52a88058cc60c160992"; - sha256 = "0mscpy6949zvcwfdp18nn4bkzrp9r5iyw4h2v310p5mr8gd3fjpv"; + rev = "76b2b1ff819f70466f4e75c83cad64892f78ad8d"; + sha256 = "15gq6ax1r3pf75y5l7bylxgk1ginf6q7ighggrwzq0ddmki2ma7i"; }; meta.homepage = "https://github.com/navarasu/onedark.nvim/"; }; @@ -6707,12 +6707,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2023-02-02"; + version = "2023-02-10"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "64d5c6d75c9769f8edca674138cf63e71efcf65b"; - sha256 = "1zacxqgrmbpnmx7xp99b9g1s348874i5vmf4dj3f9hxzawlqq351"; + rev = "39e24f92f8029262759e897ce5331a65d8c47a3c"; + sha256 = "0srapnscm874sfnqkqcfdpwa17v3p6p2r0bna0g9djsmsl3ari4c"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -6731,12 +6731,12 @@ final: prev: onenord-nvim = buildVimPluginFrom2Nix { pname = "onenord.nvim"; - version = "2023-02-01"; + version = "2023-02-06"; src = fetchFromGitHub { owner = "rmehri01"; repo = "onenord.nvim"; - rev = "09aab5d7ea230c9c4829e44698020b642e00d840"; - sha256 = "07hrppbj1njnjdyq4v6vxx3nfycr4dx45my23h0ix2kwqhw8f4ad"; + rev = "71bdcdf105a8feb16cd5248b40e44c88832f75ca"; + sha256 = "0pflq1p48rd3s5vfi2bk04ick2iyl8fg1a25qpawm8wb1ds10ln4"; }; meta.homepage = "https://github.com/rmehri01/onenord.nvim/"; }; @@ -6767,24 +6767,24 @@ final: prev: orgmode = buildVimPluginFrom2Nix { pname = "orgmode"; - version = "2023-02-01"; + version = "2023-02-11"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "7ddbdc0741fdc90f73faa17fb332bc8700acadbf"; - sha256 = "01pf6pi9mm88slf7667np60a7x9zk0rwxz40cyxrfc4d012ivs3a"; + rev = "313ce5a04e7fc3d677ad906a94fc49c1f54d1572"; + sha256 = "1d9a7ddyd09ym53nvijiy5z67mj79a93fqsm35jxfv4wkcraq9xd"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; oxocarbon-nvim = buildVimPluginFrom2Nix { pname = "oxocarbon.nvim"; - version = "2023-02-02"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "nyoom-engineering"; repo = "oxocarbon.nvim"; - rev = "f7b05feadc985f39639650067f1a333285cb4085"; - sha256 = "0pwk7g59cmfpnqvvflbxxknmy3hnp6g9rz5la1gs00n7391gmcqq"; + rev = "f93de9b8589eda0d1d766cbe3c76ed1e1abc0a71"; + sha256 = "11yp33398vya0b4ncf2whf5rj42h16kyd2h4xglyl77dixawmvgf"; }; meta.homepage = "https://github.com/nyoom-engineering/oxocarbon.nvim/"; }; @@ -7032,12 +7032,12 @@ final: prev: purescript-vim = buildVimPluginFrom2Nix { pname = "purescript-vim"; - version = "2023-02-04"; + version = "2023-02-06"; src = fetchFromGitHub { owner = "purescript-contrib"; repo = "purescript-vim"; - rev = "9a01f01991ca52ae835da09f483aeeeb79639739"; - sha256 = "0ix3gxh1d3iw9zjmw41yc3fk2dxz5xi5j0l7bn4xv7shbdpki1la"; + rev = "82348352e6568fcc0385bd7c99a8ead3a479feea"; + sha256 = "14729v7rndi3l8fpnbzapgwb4dj7537fik54g6frm1r1724f5cr2"; }; meta.homepage = "https://github.com/purescript-contrib/purescript-vim/"; }; @@ -7321,12 +7321,12 @@ final: prev: rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools.nvim"; - version = "2023-01-25"; + version = "2023-02-05"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "b297167d9e01accc9b9afe872ce91e791df2dde0"; - sha256 = "1fwjykp6gaafniflb3816z2nkfkpwa9pkxdcs6l2ka06ngr3xdih"; + rev = "bd1aa99ffb911a1cf99b3fcf3b44c0391c57e3ef"; + sha256 = "0sja04sgpaa30v3ndnffh8n2lx0igicjpmddc7h5v2n62il5z1a8"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -7598,12 +7598,12 @@ final: prev: solarized-nvim = buildVimPluginFrom2Nix { pname = "solarized.nvim"; - version = "2022-12-02"; + version = "2023-02-09"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "solarized.nvim"; - rev = "36615f1e4d16b87def801a75132f4aab5944e9fc"; - sha256 = "1nn12zpsgiq9idsa93s04m8l2mpb2aq7f7n11cs2yhv2kbb9krlf"; + rev = "fe02ed49cc017cc93657bd6306a2624394611c69"; + sha256 = "185drqdf6qcwbjvs2f5gnz660w45d4pwqal40mbf1p3gd32il6qa"; }; meta.homepage = "https://github.com/shaunsingh/solarized.nvim/"; }; @@ -8165,12 +8165,12 @@ final: prev: telescope-file-browser-nvim = buildVimPluginFrom2Nix { pname = "telescope-file-browser.nvim"; - version = "2022-12-31"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "304508fb7bea78e3c0eeddd88c4837501e403ae8"; - sha256 = "0hyy1fwp06748qy7rs7gf27p7904xfrr53v1sbrmqhlxinlsyp0m"; + rev = "a18f78121d74c4fae9edd29e138a918a8ede2a70"; + sha256 = "0x6vgnzh1zd4si95swc47v301c1dyd6say9fkdpnzjl4plzj507f"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; @@ -8189,12 +8189,12 @@ final: prev: telescope-fzf-native-nvim = buildVimPluginFrom2Nix { pname = "telescope-fzf-native.nvim"; - version = "2022-12-18"; + version = "2023-02-05"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-fzf-native.nvim"; - rev = "fab3e2212e206f4f8b3bbaa656e129443c9b802e"; - sha256 = "0paiaag3aazfv8rr0i43maq34pn3iga3lkjyllhfysqvdm8jk50f"; + rev = "580b6c48651cabb63455e97d7e131ed557b8c7e2"; + sha256 = "1yjdn4729syz80radl90f2bsh7jl73rxq5ss0yp2qjj7aj8hkhm6"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-native.nvim/"; }; @@ -8332,6 +8332,18 @@ final: prev: meta.homepage = "https://github.com/fhill2/telescope-ultisnips.nvim/"; }; + telescope-undo-nvim = buildVimPluginFrom2Nix { + pname = "telescope-undo.nvim"; + version = "2023-01-29"; + src = fetchFromGitHub { + owner = "debugloop"; + repo = "telescope-undo.nvim"; + rev = "b5e31b358095074b60d87690bd1dc0a020a2afab"; + sha256 = "1hpqd0dgb01in5dbqs2ps3wr12iqnf0pd0xdnaalvq7rmvsmvz7a"; + }; + meta.homepage = "https://github.com/debugloop/telescope-undo.nvim/"; + }; + telescope-vim-bookmarks-nvim = buildVimPluginFrom2Nix { pname = "telescope-vim-bookmarks.nvim"; version = "2022-07-17"; @@ -8358,12 +8370,12 @@ final: prev: telescope-zoxide = buildVimPluginFrom2Nix { pname = "telescope-zoxide"; - version = "2022-09-12"; + version = "2023-02-08"; src = fetchFromGitHub { owner = "jvgrootveld"; repo = "telescope-zoxide"; - rev = "856af0d83d2e167b5efa080567456c1578647abe"; - sha256 = "10cybnf6lzi3vqbigphjgx45naqfg9b3sz6sbmf8hb960h6f8jz8"; + rev = "68966349aa1b8e9ade403e18479ecf79447389a7"; + sha256 = "1ryc14kggh1qa6qcv5d0zfsxpfzf6jypf4c842cj5c9dm5385jqn"; }; meta.homepage = "https://github.com/jvgrootveld/telescope-zoxide/"; }; @@ -8611,12 +8623,12 @@ final: prev: tokyonight-nvim = buildVimPluginFrom2Nix { pname = "tokyonight.nvim"; - version = "2023-01-23"; + version = "2023-02-09"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "affb21a81e6d7de073378eb86d02864c594104d9"; - sha256 = "0q37ldqajhp46g0ikc3yfnq9bgmghqdb8884rc56sraql9g0nwmi"; + rev = "a0abe53df53616d13da327636cb0bcac3ea7f5af"; + sha256 = "1laa7fwg9sy6d83j7p8izij677d29iq6ih2x9jg2blhsc9bp6ds6"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -8647,12 +8659,12 @@ final: prev: treesj = buildVimPluginFrom2Nix { pname = "treesj"; - version = "2023-01-30"; + version = "2023-02-10"; src = fetchFromGitHub { owner = "Wansmer"; repo = "treesj"; - rev = "2723d63aed0ca4564565cc2949e0d6d2bc2b8287"; - sha256 = "1bxzww9qxb442ch3i7m4bw58hn3l9lzckr0vnqp9hh55vqh7c3xk"; + rev = "7d397fddf9eb15e5d8e8cb0539beb6f6312a768e"; + sha256 = "14mp801plz90yhf3cdpwhlpndgz724b4a9lykawdnc02jaw5vs5w"; }; meta.homepage = "https://github.com/Wansmer/treesj/"; }; @@ -8683,12 +8695,12 @@ final: prev: trouble-nvim = buildVimPluginFrom2Nix { pname = "trouble.nvim"; - version = "2023-01-23"; + version = "2023-02-10"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "490f7fe6d227f4f7a64f00be8c7dcd7a508ed271"; - sha256 = "1bdhn3y4zs5m66bj009lqyn5spdn36vr8yc04k35xv5434011p0i"; + rev = "556ef3089709a6e253df1e500381fec5eb48e48a"; + sha256 = "0ragk770zibpqggvz8l78is0zr839r2py6k5261wmn1qwslagz06"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; }; @@ -8791,12 +8803,12 @@ final: prev: unison = buildVimPluginFrom2Nix { pname = "unison"; - version = "2023-02-03"; + version = "2023-02-10"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "59acc0cbe429492a99bfebf2b783fc2fa3967f75"; - sha256 = "1nrpxprq1f2pp269nrx18avv7ghngqlr7rjahib91rgkvhw6k1x7"; + rev = "f61b16e5926b71400014a372ea617a9fdb3e6780"; + sha256 = "1kcabzhvkay30nmilkr7nxv5jcza4c8gf87w8pkmpw40ql0xqv2v"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -8887,12 +8899,12 @@ final: prev: vifm-vim = buildVimPluginFrom2Nix { pname = "vifm.vim"; - version = "2023-01-30"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "13a24c0a09d29db4a1683ef950f929d97c57ef90"; - sha256 = "044s9di41cif3d7ij349v135vnxqhrl10fnagq6lyn364jw3lad1"; + rev = "e18bec4733c9d70e63183ed76a21fb0ae9645e1e"; + sha256 = "0nv0m7a27prn5zrb4ws13c3ar37nzfy197jcq2p3cp9pnfawd9mj"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -9079,12 +9091,12 @@ final: prev: vim-addon-manager = buildVimPluginFrom2Nix { pname = "vim-addon-manager"; - version = "2022-06-29"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "MarcWeber"; repo = "vim-addon-manager"; - rev = "984320ed46ef6612a1c232bb44f5e51f92d12e7e"; - sha256 = "1p7ads4rg2rcgh4rf2p5qy7bf5yrnvnx6nri90bfinzfsyddb00l"; + rev = "8c970107391ca8d879b60ce3d02538b6573fc95f"; + sha256 = "05d5z5lwaa83sff37kdwiflisk9q1597f8xlwk60z1sasdp1630q"; }; meta.homepage = "https://github.com/MarcWeber/vim-addon-manager/"; }; @@ -9619,12 +9631,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2023-01-30"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "6a90a1db48569814e73d201c95d90f38ae4aa27f"; - sha256 = "0svshn3g4w86wizxc7nybqgwkbr5nfs454vanr8q1z7ypgqax99h"; + rev = "860483e57b4efde000b3cac682ef813f2d7b5b6d"; + sha256 = "1sij1ijils2n0hyi8pw56dnw62hvrs1q1a2sbp3cgfh09vsqb9c5"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -9679,12 +9691,12 @@ final: prev: vim-code-dark = buildVimPluginFrom2Nix { pname = "vim-code-dark"; - version = "2022-12-16"; + version = "2023-02-08"; src = fetchFromGitHub { owner = "tomasiser"; repo = "vim-code-dark"; - rev = "48d44707a821f962f56c3d0553144c77211749fa"; - sha256 = "0pgrmcq79jbj68zw1s9wfa5lq133xn34gx3zd2r1dllp2ybqf62a"; + rev = "080b38a0fd14d14e21cf85fc26b18415303c3c5e"; + sha256 = "10734wy3j3ffkrc5ifm04kh4vk0axpl1isxdryak1ai90wxr3xhz"; }; meta.homepage = "https://github.com/tomasiser/vim-code-dark/"; }; @@ -9883,12 +9895,12 @@ final: prev: vim-dadbod = buildVimPluginFrom2Nix { pname = "vim-dadbod"; - version = "2022-12-27"; + version = "2023-02-10"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dadbod"; - rev = "a09e40664e9cd30cd2b3f8866b796598302070f6"; - sha256 = "0fhbb5yq6ll58gc2wyai7h4c889lfdmvhwzidw1gw529jpgwvc67"; + rev = "389a2b0120f82b13d51ff7c07f5c13f9bc9f412f"; + sha256 = "09ly10yclzkg8p4p0d50bznss76h3252jvpi9wj3qar48jgpmng1"; }; meta.homepage = "https://github.com/tpope/vim-dadbod/"; }; @@ -9907,12 +9919,12 @@ final: prev: vim-dadbod-ui = buildVimPluginFrom2Nix { pname = "vim-dadbod-ui"; - version = "2023-01-06"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-ui"; - rev = "f4ead480930a37dd2b0cf917a8c387ed36c2d86a"; - sha256 = "00nmcsna4z1p8i5k74jykzci16by2ga2lf904f1aya0yhwpwrjg2"; + rev = "caf45f54dad6150970331ac115e531524e418c7c"; + sha256 = "1x1qvn245lz8q0a7v6l0s6fr9pjrm8ar9gf72hd1iiskzly28ax0"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/"; }; @@ -10003,12 +10015,12 @@ final: prev: vim-dispatch = buildVimPluginFrom2Nix { pname = "vim-dispatch"; - version = "2022-01-14"; + version = "2023-02-05"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dispatch"; - rev = "00e77d90452e3c710014b26dc61ea919bc895e92"; - sha256 = "1ind8lyghdizgs0q59k3svwdmnq8l88b8ns1qq1xvz47rh836c6w"; + rev = "6cc2691576f97d43f8751664d1a1a908b99927e5"; + sha256 = "151fxvhz6pi021rg9bc2g564a13lvbcwh3lpa4vl3g5w9j95pmv3"; }; meta.homepage = "https://github.com/tpope/vim-dispatch/"; }; @@ -10411,12 +10423,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2023-01-17"; + version = "2023-02-09"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "2febbe1f00be04f16daa6464cb39214a8566ec4b"; - sha256 = "0njzhsn5xlwjcgr6nkm8pds4rby46dldl0b25dwj2bj6nyydaa23"; + rev = "62f42f013d866139fa23068ac2651b3f7e05a56f"; + sha256 = "1hbkhdfrg18zzxn2hqz070ns0nzydjj853i2dkz9d59s23bcyrql"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -10555,12 +10567,12 @@ final: prev: vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2023-02-04"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "58437d8250cc3355b565725073f51ff0ff77cea6"; - sha256 = "1fsrhyawry2m4dq7lrh1zvanxn2qi35lqg1al92w065sf62mds9z"; + rev = "582ceb4b14d1aaf9b0a52c7f4ede68ea29c85416"; + sha256 = "0k2bl6f7xh21wmyzwasl6ifkl7blbjmv25bsb9w74rcq1gx92nma"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -10856,12 +10868,12 @@ final: prev: vim-illuminate = buildVimPluginFrom2Nix { pname = "vim-illuminate"; - version = "2023-02-01"; + version = "2023-02-10"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "d6ca7f77eeaf61b3e6ce9f0e5a978d606df44298"; - sha256 = "02sgnp9yr0bdg8r5w24cxdvy01vw2whkh0fx11d9vfg0gqshi2hh"; + rev = "49062ab1dd8fec91833a69f0a1344223dd59d643"; + sha256 = "15456qlblskafaq3x92kp8n8hdfzdfv1hzs9yb4k4aqps1bj2plf"; }; meta.homepage = "https://github.com/RRethy/vim-illuminate/"; }; @@ -10940,12 +10952,12 @@ final: prev: vim-jack-in = buildVimPluginFrom2Nix { pname = "vim-jack-in"; - version = "2023-01-29"; + version = "2023-01-31"; src = fetchFromGitHub { owner = "clojure-vim"; repo = "vim-jack-in"; - rev = "c7f73e6788b5a97ac700f6c1fe09c26ebfa324d0"; - sha256 = "1f95877cgv9mvln6v78sgccwdfgvbaga9wbyckxw8rrbnrikwxam"; + rev = "8ca306a9484d6d184de8921a9cab03c63ee9aa79"; + sha256 = "0hrvsq95rqwp0kfsdiid5qv0bfx1i7wc5yn7qmdqc660s7abwqxs"; }; meta.homepage = "https://github.com/clojure-vim/vim-jack-in/"; }; @@ -11169,12 +11181,12 @@ final: prev: vim-ledger = buildVimPluginFrom2Nix { pname = "vim-ledger"; - version = "2023-02-04"; + version = "2023-02-05"; src = fetchFromGitHub { owner = "ledger"; repo = "vim-ledger"; - rev = "9b18bd548ec1fd6e94b262b3af0d9fb337c0b1df"; - sha256 = "1paqjvvrcgngpggwa2a57d85xzvz5g5mk43bzn5fkgc1xfd77yv1"; + rev = "6990fa243b684d91bd7386af3f378cdf6ed7c536"; + sha256 = "0zw3zwp9lywdxm47pngqfw5j39d9vkpzfjcckcqkgzzrm7579dcl"; }; meta.homepage = "https://github.com/ledger/vim-ledger/"; }; @@ -11289,12 +11301,12 @@ final: prev: vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2023-02-01"; + version = "2023-02-06"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "25337623cf11e2ac9c73dcba1a48b86fe103d887"; - sha256 = "020c8m76yp0ddwln4iajy231ifia2bxvly0b4ibfn5sgnqqf2cxm"; + rev = "65628c3b0affacd0f36a6e294b1c1f96c6fe2455"; + sha256 = "0qkxw3n59a9w74vawyp7b288pfvkjww1d61ipcg3z9bvcv2xf0gz"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -11398,12 +11410,12 @@ final: prev: vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2023-01-18"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "959e0e79ea240cdee29efbdd0d2e2e718931ccec"; - sha256 = "0fyh7894fwnf8hxp8y9016blzmw7qv99izhy62bg11rhdjcgz4n8"; + rev = "945e01e39fc137bd74bb3aa8c4f40e6ffb5be2dd"; + sha256 = "04lzlz7y72nw5in3r46xc8xb1f4avdcjbwl1sic9v0gbr4w3g2hb"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -11878,12 +11890,12 @@ final: prev: vim-pandoc = buildVimPluginFrom2Nix { pname = "vim-pandoc"; - version = "2022-08-18"; + version = "2023-02-05"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc"; - rev = "7dbda1c885c4c5dd3f865aa29e1b82167663aeec"; - sha256 = "0f4bkz619lp0fr1966njm3m5587vq2mbmahy2ya5d8nnqs5f770p"; + rev = "9f406d964ca70d959b7867f1b5cee3d4884d4d3c"; + sha256 = "0r0w4pr6jdh7ww08301h69xfih2gsqqbswfx4fzm10xx8y4csrfv"; }; meta.homepage = "https://github.com/vim-pandoc/vim-pandoc/"; }; @@ -13091,12 +13103,12 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2023-02-02"; + version = "2023-02-06"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "0dfb1bf84bf8899dc57ae1102605336b929898e7"; - sha256 = "1pyk4bf3mrmhylmmrxj0wlq145ilanmkiblyjmdl0imwn8m5jyl9"; + rev = "9d1dd5116c13b6d850a81291422a4a9818622b6c"; + sha256 = "00n2lq23m9b050ianbr5b655c23qasspvc5kf56dzpkjxgza56am"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -13163,12 +13175,12 @@ final: prev: vim-ultest = buildVimPluginFrom2Nix { pname = "vim-ultest"; - version = "2022-06-18"; + version = "2023-02-09"; src = fetchFromGitHub { owner = "rcarriga"; repo = "vim-ultest"; - rev = "c93eb128332f8245776b753407ab6c4432c4c556"; - sha256 = "1y686xrcvkwqmc263syh84a396xanqka39axc460ibl9zav7z4nn"; + rev = "b06bc8715cbcb4aa0444abfd85fb705b659ba055"; + sha256 = "0k69hqaxgbhjwq7wf30l8i1b6xv5qhzm4mbg6hydil5rj6zwf7xv"; }; meta.homepage = "https://github.com/rcarriga/vim-ultest/"; }; @@ -13319,12 +13331,12 @@ final: prev: vim-wakatime = buildVimPluginFrom2Nix { pname = "vim-wakatime"; - version = "2023-02-01"; + version = "2023-02-06"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "b67957731086466ed5d967cd1dac7f6981603156"; - sha256 = "0s35cx7yxx6rc7qs88c4j0109y7b9lgwd15p0a33pwbwj0h3x6ap"; + rev = "ee4ab57adf62a309aeef383a2da23b6e48e5ae50"; + sha256 = "1k5nhwcn7ckn44pzy49fn7i116lydarzn9ks1cczwh9nkmwwwsks"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; @@ -13619,12 +13631,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2023-01-31"; + version = "2023-02-07"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "ecf0c51b07ffedeca054581623bdda0d458e39d2"; - sha256 = "0xvpfsbglr65zjs26slwms9n8ibjy4s93vny2p5s2q5f5mgnlsd7"; + rev = "4deaffdec34508621934fa4532748ee9deb1f55c"; + sha256 = "014kcjwab8jy89r0rcgci5ih8isbyz4v29q5nv6d2prld100p72f"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -13632,12 +13644,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2023-02-02"; + version = "2023-02-09"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "8ef5b0d9b85e7bb57b00b4571db4804aec0e10eb"; - sha256 = "1nk85v06s4kybvnmh8raxcmj49snph4nsbfyizwcixwr592amcs1"; + rev = "3a9180f1d2cc984fe24bc7afaf9d4d00b3e4c20a"; + sha256 = "01bciy0vcx2fqqw6rpxvvi272hr8867blh1992w9b1232pglx5di"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -13740,12 +13752,12 @@ final: prev: which-key-nvim = buildVimPluginFrom2Nix { pname = "which-key.nvim"; - version = "2023-01-23"; + version = "2023-02-10"; src = fetchFromGitHub { owner = "folke"; repo = "which-key.nvim"; - rev = "684e96c5e8477f1ee9b3f2e9a12d802fd12c5531"; - sha256 = "0kdmv1jkkfcrhrvc6mcdy173cx39mwq5nwq3yni46zgcn5iyxiq3"; + rev = "5224c261825263f46f6771f1b644cae33cd06995"; + sha256 = "1r16iz5yhp56bb2rqi40qsis5yqnfkdq7x5ibwafv5xsmk7nrlgj"; }; meta.homepage = "https://github.com/folke/which-key.nvim/"; }; @@ -13921,12 +13933,12 @@ final: prev: zen-mode-nvim = buildVimPluginFrom2Nix { pname = "zen-mode.nvim"; - version = "2023-02-01"; + version = "2023-02-08"; src = fetchFromGitHub { owner = "folke"; repo = "zen-mode.nvim"; - rev = "136dda65769cee45119f16e4bc3d3f13a7aecb28"; - sha256 = "0bsnvcixvk2vrimbyhxblj9anhig69jwxscyd2l05pp1njpzb424"; + rev = "3c92f503823088862ca2a7809d1c7edc90fb92fa"; + sha256 = "1l4dg11bdnkncdscmz3j1wsx9qnllwpsz5pm1a1c96v3s4wlmw0p"; }; meta.homepage = "https://github.com/folke/zen-mode.nvim/"; }; @@ -13981,12 +13993,12 @@ final: prev: zk-nvim = buildVimPluginFrom2Nix { pname = "zk-nvim"; - version = "2022-12-19"; + version = "2023-02-06"; src = fetchFromGitHub { owner = "mickael-menu"; repo = "zk-nvim"; - rev = "2fd9f9f29270bb28477e000100625276ec2a2377"; - sha256 = "1b8w280yivsb34547y7kdcsvgcil41sfj8kvyvs6d24yrxbqs20w"; + rev = "0413c52500cd0133b0cd8e7e7d43084855ac1760"; + sha256 = "0yw7fi9z4rlb2vpm2qp6sm118hjz5vzix6nl7h654vp12zzqrs0g"; }; meta.homepage = "https://github.com/mickael-menu/zk-nvim/"; }; @@ -14017,12 +14029,12 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2023-02-01"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "8769e767f12f5bf0b7d1250ee067088e7054809a"; - sha256 = "1k57sb89abypkiwx94w0dadbg5qc73q5lfragmnvm81hhikdbf5p"; + rev = "a5f3ed5d3b1d9ea21183718a8a89a6653bd6ea48"; + sha256 = "1vx7p3f8339v1w9ww9l1lg3s6wf699q2bp762aqkmwmh88ykhi8i"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -14041,12 +14053,12 @@ final: prev: chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2023-02-03"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "baae8d0a8afb062f5be6d83189e626dd74f41f98"; - sha256 = "024iis733yvvkqil2m0wxh7lpkz0j7ij2if4yds07izbyyrpdxg6"; + rev = "cb53c2a463aada65080eb40aa2cd03f18cadc5fb"; + sha256 = "00wkr7n57py6dbw295mpr2ac4hi5flgb2qbq4qw4jd032gmw054r"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -14065,12 +14077,12 @@ final: prev: embark-vim = buildVimPluginFrom2Nix { pname = "embark-vim"; - version = "2023-02-03"; + version = "2023-02-05"; src = fetchFromGitHub { owner = "embark-theme"; repo = "vim"; - rev = "89a044730bf5402c49db03475a9fa56782ca9d1c"; - sha256 = "0d7956wi0lcbimxbn5cmghw11vb8gfsg2pd6yr4xja6bb4ldlbrk"; + rev = "ebcbf51e13a5fea046c784906c149a057ba9d8b6"; + sha256 = "1hbjwv2chrj310nvikb0pbs5wjj0bicx2874vjn2qh0rfypzqr1b"; }; meta.homepage = "https://github.com/embark-theme/vim/"; }; @@ -14089,12 +14101,12 @@ final: prev: lspsaga-nvim-original = buildVimPluginFrom2Nix { pname = "lspsaga-nvim-original"; - version = "2023-02-04"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "glepnir"; repo = "lspsaga.nvim"; - rev = "9a7013874a9d5e0413039fc9ded613fcdbd59cbd"; - sha256 = "1n9dkd6wlghw1b011xnja2h36l68x5pi3cf7f4khw7zfk0f49r1k"; + rev = "215b0a71cc8b98662b56eb95731f897b59bd7869"; + sha256 = "1fvd9z97rh295h72zrk8p97v29rp2n7pl961f5pi5wdfjv2ablva"; }; meta.homepage = "https://github.com/glepnir/lspsaga.nvim/"; }; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 80e960b640a4b..0c47122ba77f7 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 @@ }; arduino = buildGrammar { language = "arduino"; - version = "c473c09"; + version = "257efff"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-arduino"; - rev = "c473c09f23b13d9404ec5208fad3eddea89d70f8"; - hash = "sha256-aAw1ZgKuMWozQzmENUhkdkHV0BjSGmTdH4Bna7EfDaQ="; + rev = "257efffa387da3283a37816b71dedfecf4af5222"; + hash = "sha256-Yc3oFzOMyQwW2URyEzSIe6wBNAu9J2vPFIXk43sVUv8="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-arduino"; }; @@ -115,23 +115,23 @@ }; c_sharp = buildGrammar { language = "c_sharp"; - version = "a29bac0"; + version = "18e4343"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c-sharp"; - rev = "a29bac0681802139710b4d3875540901504d15cb"; - hash = "sha256-TpOaxR0Do7oGjAZ8IrbXJAP6//Kt7VxhkrWEz7yNiLY="; + rev = "18e434383a4582b4fd183a30e55022c2923764e1"; + hash = "sha256-ggvCj2yGDINuGr8Jb+aOoRxlKa5LaXCoiQC/Y5Hrcn0="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp"; }; capnp = buildGrammar { language = "capnp"; - version = "740c757"; + version = "cb85cdd"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-capnp"; - rev = "740c757b9585925b1ed27cef7d61ac39b7824304"; - hash = "sha256-0zCSWV3afsEIhN6XavMnn4LrLenjerhdnTfQ/EaL4aA="; + rev = "cb85cddfdf398530110c807ba046822dbaee6afb"; + hash = "sha256-VB8fNF8EtTAkKBLIAByazczPHJYdBULCeoGQ1ZLLRhI="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-capnp"; }; @@ -159,12 +159,12 @@ }; cmake = buildGrammar { language = "cmake"; - version = "a322653"; + version = "399605a"; src = fetchFromGitHub { owner = "uyha"; repo = "tree-sitter-cmake"; - rev = "a32265307aa2d31941056d69e8b6633e61750b2f"; - hash = "sha256-LBd3SMem1dxZr/dOdJdEFTQxI6d+H8uYE46yN02E/6Y="; + rev = "399605a02bcd5daa309ce63a6459c600dce3473f"; + hash = "sha256-7pzKyfR9RmfgzuX9/elUesmsdbLlwgrfiRP73YQu+gM="; }; meta.homepage = "https://github.com/uyha/tree-sitter-cmake"; }; @@ -304,12 +304,12 @@ }; ebnf = buildGrammar { language = "ebnf"; - version = "ef241bc"; + version = "8e635b0"; src = fetchFromGitHub { owner = "RubixDev"; repo = "ebnf"; - rev = "ef241bc09f2f105c35f5e4f2ccd8a522dd99071c"; - hash = "sha256-N5TGYJnYNjYIdFXspGn+dDRm0wmJymXHY+Io43wSKlI="; + rev = "8e635b0b723c620774dfb8abf382a7f531894b40"; + hash = "sha256-Cch6WCYq9bsWGypzDGapxBLJ0ZB432uAl6YjEjBJ5yg="; }; location = "crates/tree-sitter-ebnf"; meta.homepage = "https://github.com/RubixDev/ebnf.git"; @@ -371,12 +371,12 @@ }; embedded_template = buildGrammar { language = "embedded_template"; - version = "a130858"; + version = "203f7bd"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-embedded-template"; - rev = "a13085849cf69e2401ec44e38cffc3d73f22f3df"; - hash = "sha256-JNyLOW/na8J0WEsLDv3BuC+UXxGpYMYvAlywq4z6Wzo="; + rev = "203f7bd3c1bbfbd98fc19add4b8fcb213c059205"; + hash = "sha256-SaZkyy2wKYoK0+pdHLVpQrdXjEeX/uR5XxgahcAdwz0="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-embedded-template"; }; @@ -426,12 +426,12 @@ }; fortran = buildGrammar { language = "fortran"; - version = "edcb337"; + version = "bfa6fd4"; src = fetchFromGitHub { owner = "stadelmanma"; repo = "tree-sitter-fortran"; - rev = "edcb3374f4698aaedf24bc572f6b2f5ef0e89ac7"; - hash = "sha256-xZfWtRHWy3MQtkzN9jSwx+sAwLlcRiVLTJjYXyWEIs8="; + rev = "bfa6fd4c4aa0bb9b39ad33daa004ad4637a91d20"; + hash = "sha256-5Lf/6jhgRPgSPNCHqiYT8OeI7UUnTfQqH8rzf8ggHj0="; }; meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran"; }; @@ -448,12 +448,12 @@ }; func = buildGrammar { language = "func"; - version = "88ee7d0"; + version = "f161cfe"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-func"; - rev = "88ee7d0f569af10ab8c78a12f37217a8d15a0ffa"; - hash = "sha256-SLI59AtprfCQr6VccCVr+2sazEtUSXnAwHcclWrkXxA="; + rev = "f161cfe22452b386eeeab29ba0d2c14893f1a31f"; + hash = "sha256-Swyg5EdBWVT6P9vgS7h/fmK0ySRwiFlynJEZT9I10qg="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-func"; }; @@ -470,12 +470,12 @@ }; gdscript = buildGrammar { language = "gdscript"; - version = "4849e65"; + version = "5d43d78"; src = fetchFromGitHub { owner = "PrestonKnopp"; repo = "tree-sitter-gdscript"; - rev = "4849e657b98945cd040ffa7fd833d6130259dbab"; - hash = "sha256-Rs1W2jahp+J42JzICi+QLAqfHYXth47g4LjejJnJypo="; + rev = "5d43d78c276570f76773685f08baf9e4ada09639"; + hash = "sha256-SNyZutgab3T1UaD/D6jnhF3QmAR/UVtlXTpNjYlf2+Y="; }; meta.homepage = "https://github.com/PrestonKnopp/tree-sitter-gdscript"; }; @@ -537,12 +537,12 @@ }; glimmer = buildGrammar { language = "glimmer"; - version = "c0bfd26"; + version = "40cfb72"; src = fetchFromGitHub { owner = "alexlafroscia"; repo = "tree-sitter-glimmer"; - rev = "c0bfd260cdcbe2976f4633547c218f09f7222a89"; - hash = "sha256-Goj900MJxO44KYkzD0UpGFEGHAwr6qhe2bmCzpx5BhE="; + rev = "40cfb72a53654cbd666451ca04ffd500257c7b73"; + hash = "sha256-h9ZZz6mbkErLIG/BamNRRoRdqmuBO3v17W0uvmpbm7A="; }; meta.homepage = "https://github.com/alexlafroscia/tree-sitter-glimmer"; }; @@ -637,12 +637,12 @@ }; haskell = buildGrammar { language = "haskell"; - version = "aee3725"; + version = "3bdba07"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-haskell"; - rev = "aee3725d02cf3bca5f307b35dd3a96a97e109b4e"; - hash = "sha256-DmrrRht3g0hG+OsJCHRL+xW4jflLqtG57AuFf7zd26c="; + rev = "3bdba07c7a8eec23f87fa59ce9eb2ea4823348b3"; + hash = "sha256-/aGUdyVxXqXCvjruI8rqiKzfTsyxzOKaXSAUG5xK4cE="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-haskell"; }; @@ -835,12 +835,12 @@ }; jsonnet = buildGrammar { language = "jsonnet"; - version = "505f5bd"; + version = "fdc7757"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "tree-sitter-jsonnet"; - rev = "505f5bd90053ae895aa3d6f2bac8071dd9abd8b2"; - hash = "sha256-XZqywAzM+UCKto/OFn50hhRpEyFVLpFV7Q1Z0NKoPsI="; + rev = "fdc775714afa27fdef823adbaba6ab98f5ae66f2"; + hash = "sha256-KVpSB3LiC1qpF05Y1ScIglaXWIrAL+m7G4Q4/EVn0U8="; }; meta.homepage = "https://github.com/sourcegraph/tree-sitter-jsonnet"; }; @@ -857,12 +857,12 @@ }; kdl = buildGrammar { language = "kdl"; - version = "f83f394"; + version = "b50d6c8"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-kdl"; - rev = "f83f3943568c7e7b4f5e0de1b04d722223bd4d80"; - hash = "sha256-BakY6V4A2N/ZZCkyr7KU04/DWeGTAkkJua5TyZ6uNW4="; + rev = "b50d6c8b77d311639ecbf2b803ffb720c2b4cee2"; + hash = "sha256-dE2SqRSjy05Un3DPkrVDN0+na1ahddY57RYPMtaWynA="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-kdl"; }; @@ -956,24 +956,24 @@ }; markdown = buildGrammar { language = "markdown"; - version = "abea13b"; + version = "7e7aa9a"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "abea13b86c404564991244b69b7afc4ca362d0c0"; - hash = "sha256-gdRl+jTSGlijc3/hn1BYClAlpYljzSRVpRoi9Q446PU="; + rev = "7e7aa9a25ca9729db9fe22912f8f47bdb403a979"; + hash = "sha256-KsE9oYzD+vVqgR35JdL0NmPfNGJqpC12sEsZVIs7NX0="; }; location = "tree-sitter-markdown"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; }; markdown_inline = buildGrammar { language = "markdown_inline"; - version = "abea13b"; + version = "7e7aa9a"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "abea13b86c404564991244b69b7afc4ca362d0c0"; - hash = "sha256-gdRl+jTSGlijc3/hn1BYClAlpYljzSRVpRoi9Q446PU="; + rev = "7e7aa9a25ca9729db9fe22912f8f47bdb403a979"; + hash = "sha256-KsE9oYzD+vVqgR35JdL0NmPfNGJqpC12sEsZVIs7NX0="; }; location = "tree-sitter-markdown-inline"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; @@ -1126,12 +1126,12 @@ }; php = buildGrammar { language = "php"; - version = "973694f"; + version = "f860e59"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "973694ffcdeebca245b7ecf0d7c4cadd4f41b3c9"; - hash = "sha256-upJ8WwosOe4Xv/H9LUFVUVThLSLS+5Htr71Lyc/ZTJo="; + rev = "f860e598194f4a71747f91789bf536b393ad4a56"; + hash = "sha256-j4RJUBbp2zvCHsZwnz62t2Tf6Cy1LOKrhg/pi8cqzAs="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; }; @@ -1192,12 +1192,12 @@ }; pug = buildGrammar { language = "pug"; - version = "26f6ac8"; + version = "884e225"; src = fetchFromGitHub { owner = "zealot128"; repo = "tree-sitter-pug"; - rev = "26f6ac805e11e19c4492089f24aa44fe71be7c1f"; - hash = "sha256-KUIjt8p4B3LrU9vRQGL9Pf3ZYMfdDrazC2kNwTpRAgg="; + rev = "884e225b5ecca5d885ae627275f16ef648acd42e"; + hash = "sha256-qPfVSnsw9bDznq7rhzftGyv9cGi2OiF6DCh55Lxk8xA="; }; meta.homepage = "https://github.com/zealot128/tree-sitter-pug"; }; @@ -1311,6 +1311,17 @@ }; meta.homepage = "https://github.com/bamonroe/tree-sitter-rnoweb"; }; + ron = buildGrammar { + language = "ron"; + version = "049a3ef"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-ron"; + rev = "049a3ef4e271089107dd08e4aeb195abd1f77103"; + hash = "sha256-ITWls8kp/UvwWOBE19v1UWQ1/BEiDhsK5VIFHicJM84="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-ron"; + }; rst = buildGrammar { language = "rst"; version = "25e6328"; @@ -1434,12 +1445,12 @@ }; sql = buildGrammar { language = "sql"; - version = "c508e60"; + version = "7be06f4"; src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "c508e6044adf4298d7b321f966c90cbe32d75d23"; - hash = "sha256-Ed+6pwxwvwLKOVB9XVHF+IftEiO4bG0yZAe77xBcazI="; + rev = "7be06f4d5eabace883dd45959c13dc740f1f1b98"; + hash = "sha256-Hi/4/Aou85MYCMMFqf5xqAyKECTzfeiaksJxdv9MVCU="; }; generate = true; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; @@ -1538,12 +1549,12 @@ }; thrift = buildGrammar { language = "thrift"; - version = "634a73f"; + version = "763ae3d"; src = fetchFromGitHub { owner = "duskmoon314"; repo = "tree-sitter-thrift"; - rev = "634a73fd2c80e169f302917ba665c07ec0b6ff7b"; - hash = "sha256-pB7zd48aonYYKdvD3+35zsD76+F/lqBYveFBxBQISvA="; + rev = "763ae3d760b7a7719b57568bdf9ffae2d896680f"; + hash = "sha256-LXHXCaD76H9kWjOwCPfrpO2ZEv3mlq0IpWnwzV/qr2M="; }; meta.homepage = "https://github.com/duskmoon314/tree-sitter-thrift"; }; @@ -1560,12 +1571,12 @@ }; tlaplus = buildGrammar { language = "tlaplus"; - version = "6fd16d8"; + version = "6d2ec89"; src = fetchFromGitHub { owner = "tlaplus-community"; repo = "tree-sitter-tlaplus"; - rev = "6fd16d8469c6898317423d61738d97e2b3f5caf7"; - hash = "sha256-s5mYc/kPZ4wHhm1ZeC5WBjBfzTFnANPRAZeE8UOVE1I="; + rev = "6d2ec894aef843fc89312c904e20c5f555aec4e3"; + hash = "sha256-5V4sMnjVsdSJdeYspxn0nYqq73lVHvz7eGRfD/orqo4="; }; meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus"; }; @@ -1639,12 +1650,12 @@ }; v = buildGrammar { language = "v"; - version = "719cf0c"; + version = "136f3a0"; src = fetchFromGitHub { owner = "vlang"; repo = "vls"; - rev = "719cf0cd297f9b2f45ecfbeb0115379fb8cfa9c3"; - hash = "sha256-4xb5x/JZN1pFvPVqazcZMdZm8DTpBb5nW5AgOrB3YHc="; + rev = "136f3a0ad91ab8a781c2d4eb419df0a981839f69"; + hash = "sha256-zmbR2Of/XEJuGvNmXAJ+C4aAMem51LVS3e1rSqjaSb0="; }; location = "tree_sitter_v"; meta.homepage = "https://github.com/vlang/vls"; @@ -1684,12 +1695,12 @@ }; vim = buildGrammar { language = "vim"; - version = "55ff1b0"; + version = "e39a7bb"; src = fetchFromGitHub { owner = "vigoux"; repo = "tree-sitter-viml"; - rev = "55ff1b080c09edeced9b748cf4c16d0b49d17fb9"; - hash = "sha256-bMh6RPP0+zpNkMS/mpbKTaug9EL6u4kTcztnEXaNGyA="; + rev = "e39a7bbcfdcfc7900629962b785c7e14503ae590"; + hash = "sha256-f3UAHwCL5yerEjmuDp+guzX4/ik4h7ProH5P8AmdO10="; }; meta.homepage = "https://github.com/vigoux/tree-sitter-viml"; }; @@ -1750,12 +1761,12 @@ }; zig = buildGrammar { language = "zig"; - version = "b0693dd"; + version = "6b3f578"; src = fetchFromGitHub { owner = "maxxnino"; repo = "tree-sitter-zig"; - rev = "b0693dd473efd91d6085acd8e0ff9c627d37e077"; - hash = "sha256-Jmz2XDI+mrBYE2TEhxPJZbICbhs5AOC0tyC4OOgT61U="; + rev = "6b3f5788f38be900b45f5af5a753bf6a37d614b8"; + hash = "sha256-KwMo1gwre8/AXkXXwQqPHZIEPXM26PK8SI0p3tmkt24="; }; meta.homepage = "https://github.com/maxxnino/tree-sitter-zig"; }; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 0b02b1d9d8070..b50058799696d 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -941,6 +941,10 @@ self: super: { dependencies = with self; [ telescope-nvim ]; }); + telescope-undo-nvim = super.telescope-undo-nvim.overrideAttrs (old: { + dependencies = with self; [ telescope-nvim ]; + }); + telescope-z-nvim = super.telescope-z-nvim.overrideAttrs (old: { dependencies = with self; [ telescope-nvim ]; }); @@ -1088,7 +1092,7 @@ self: super: { libiconv ]; - cargoSha256 = "sha256-jpO26OXaYcWirQ5tTKIwlva7dHIfdmnruF4WdwSq0nI="; + cargoSha256 = "sha256-JQwT7IFYC/K+t3YO34hoalxdt1TEsmEcBXtDKFVdles="; }; in '' diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index a1cf1dd374d97..08b63e40389c4 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -699,6 +699,7 @@ https://github.com/nvim-telescope/telescope-project.nvim/,, https://github.com/nvim-telescope/telescope-symbols.nvim/,, https://github.com/nvim-telescope/telescope-ui-select.nvim/,, https://github.com/fhill2/telescope-ultisnips.nvim/,, +https://github.com/debugloop/telescope-undo.nvim/,HEAD, https://github.com/tom-anders/telescope-vim-bookmarks.nvim/,, https://github.com/nvim-telescope/telescope-z.nvim/,, https://github.com/jvgrootveld/telescope-zoxide/,, diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 41666183ce22d..a8e91494b7e7c 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -927,8 +927,8 @@ let mktplcRef = { name = "gitlens"; publisher = "eamodio"; - version = "2022.12.604"; - sha256 = "sha256-yfqGITviASp5ZDEJA+zyVz1LpPWV4FM/4fU4eq52Xng="; + version = "2023.2.1204"; + sha256 = "sha256-FurYfkw+mOjyymR1VCGf0jJ2JCZJ8eGb1J7zD2peBjw="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog"; @@ -3089,6 +3089,22 @@ let }; }; + zhwu95.riscv = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "riscv"; + publisher = "zhwu95"; + version = "0.0.8"; + sha256 = "sha256-PXaHSEXoN0ZboHIoDg37tZ+Gv6xFXP4wGBS3YS/53TY="; + }; + meta = with lib; { + description = "Basic RISC-V colorization and snippets support."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=zhwu95.riscv"; + homepage = "https://github.com/zhuanhao-wu/vscode-riscv-support"; + license = licenses.mit; + maintainers = [ maintainers.CardboardTurkey ]; + }; + }; + zxh404.vscode-proto3 = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-proto3"; diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index ae44b47643cd6..5f75d2770ac6b 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -109,7 +109,9 @@ in /* menu: Video */ - name = "gap-2.6.0"; + pname = "gap"; + version = "2.6.0"; + src = fetchurl { url = "https://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/gimp-gap-2.6.0.tar.bz2"; sha256 = "1jic7ixcmsn4kx2cn32nc5087rk6g8xsrz022xy11yfmgvhzb0ql"; @@ -228,7 +230,9 @@ in /* menu: Filters/Enhance/Wavelet sharpen */ - name = "wavelet-sharpen-0.1.2"; + pname = "wavelet-sharpen"; + version = "0.1.2"; + # Workaround build failure on -fno-common toolchains like upstream # gcc-10. Otherwise build fails as: # ld: interface.o:(.bss+0xe0): multiple definition of `fimg'; plugin.o:(.bss+0x40): first defined here @@ -271,7 +275,7 @@ in gimplensfun = pluginDerivation rec { version = "unstable-2018-10-21"; - name = "gimplensfun-${version}"; + pname = "gimplensfun"; src = fetchFromGitHub { owner = "seebk"; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 6200416436763..25e3cb6590863 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,9 +19,9 @@ } }, "beta": { - "version": "110.0.5481.77", - "sha256": "1kl1k29sr5qw8pg7shvizw4b37fxjlgah56p57kq641iqhnsnj73", - "sha256bin64": "0wnzgvwbpmb5ja4ba5mjk4bk0aaxzbw4zi509vw96q6mbqmr4iwr", + "version": "111.0.5563.19", + "sha256": "0hrapzi45jpkb1b87nzlb896jd2h2jbz1mq91md5r2y6ag6fc55w", + "sha256bin64": "1mjrp13xf913xhm9hz6yg595g0jg2afmwvzxzpw79y4snaf2ihza", "deps": { "gn": { "version": "2022-12-12", @@ -32,15 +32,15 @@ } }, "dev": { - "version": "111.0.5563.19", - "sha256": "0hrapzi45jpkb1b87nzlb896jd2h2jbz1mq91md5r2y6ag6fc55w", - "sha256bin64": "02aaqny23dcdp611n6jr7swkjnx1wd0lb8dgxq53b806f0s374cp", + "version": "112.0.5582.0", + "sha256": "139g5cpqxvh6bf2x3aqs4md379rwrx143f8lcsym8hgpqdwq5sfk", + "sha256bin64": "1npksnnxcni62wx517xy64ysk3ja868gw48vgx4q8xc93g15n89c", "deps": { "gn": { - "version": "2022-12-12", + "version": "2023-01-30", "url": "https://gn.googlesource.com/gn", - "rev": "5e19d2fb166fbd4f6f32147fbb2f497091a54ad8", - "sha256": "1b5fwldfmkkbpp5x63n1dxv0nc965hphc8rm8ah7zg44zscm9z30" + "rev": "84c8431f3e03cc6226c59dd49637c15ea31169a1", + "sha256": "15dqiy1bf1cixqg23bqpfb8mrlcxqbarjwzajc5hjmivykrjn2s3" } } }, diff --git a/pkgs/applications/networking/circumflex/default.nix b/pkgs/applications/networking/circumflex/default.nix index 0afe9466b4cb5..4dab874fd8484 100644 --- a/pkgs/applications/networking/circumflex/default.nix +++ b/pkgs/applications/networking/circumflex/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "circumflex"; - version = "2.8"; + version = "2.8.1"; src = fetchFromGitHub { owner = "bensadeh"; repo = "circumflex"; rev = version; - hash = "sha256-knN+T/dmIwHLqT3MJBjQhGlSeAu0lE2ZOv6tLqkcwS0="; + hash = "sha256-hFhK1/ck37lfZJ2wpk1MGCfYEANhh8qzTb8m1t7EoBo="; }; - vendorHash = "sha256-Xwek2xlvdGO6C/T0a96RGuMcX7jCbvntEYBf10tvmAo="; + vendorHash = "sha256-rwqY6illp5+h/oHOnVg6QfZ6tRFJOamwqJxQx/zlpyI="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/cluster/kluctl/default.nix b/pkgs/applications/networking/cluster/kluctl/default.nix index aefcef2bacccb..6a02127405d3a 100644 --- a/pkgs/applications/networking/cluster/kluctl/default.nix +++ b/pkgs/applications/networking/cluster/kluctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kluctl"; - version = "2.18.4"; + version = "2.19.0"; src = fetchFromGitHub { owner = "kluctl"; repo = "kluctl"; rev = "v${version}"; - hash = "sha256-nHfJ7Dt9nAY4fY+U7W46cPRwWSgtGvwdbUjQAynOQdw="; + hash = "sha256-2nAgJj/cMDiE5rw/YixNYQNCWnuC/8EX4BrnXN4Npao="; }; - vendorHash = "sha256-ADYXLcCYmlQim9KvqkXGdEXJ9cACBsRCb3emcmrL0kg="; + vendorHash = "sha256-xBUrY8v4yHtWGaaRXHxQRGdZHzMGoJX2hFLL+0Vb1QY="; ldflags = [ "-s" "-w" "-X main.version=v${version}" ]; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 8961434212984..e3fae245ee4f6 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -364,11 +364,11 @@ "vendorHash": "sha256-Zi2e/Vg9iKTrU8Mb37Y8xHYIBL+IfDnWMUUg5Vqrbfo=" }, "exoscale": { - "hash": "sha256-48msmXj7SFmi5TA0/QYm66oIETymWi5ayF+yExyp+hk=", + "hash": "sha256-nkCpgreQ8mOLfGAlCDQYYA14Df1Lr6RzDCBWgQNVi6k=", "homepage": "https://registry.terraform.io/providers/exoscale/exoscale", "owner": "exoscale", "repo": "terraform-provider-exoscale", - "rev": "v0.44.0", + "rev": "v0.45.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -438,24 +438,24 @@ "vendorHash": "sha256-aVbJT31IIgW0GYzwVX7kT4j7E+dadSbnttThh2lzGyE=" }, "google": { - "hash": "sha256-B/eXf31mRtWpl6TCv/hukPWfbb7Ne4W2FUMxiAbfsfI=", + "hash": "sha256-z5Fi+ac7dcDr/eTTJWWfsIm9tJJ+NgcY2L08h317G7g=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.52.0", + "rev": "v4.53.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-oModEw/gaQCDHLf+2EKf1O1HQSGWnqEReXowE6F7W0o=" + "vendorHash": "sha256-glxBI4e5BN28GMGeixUSiCaDTIlr+8e4QHnzaDagyno=" }, "google-beta": { - "hash": "sha256-ISOhZqc6/RMqG4n63RjQluy0odkKATcCa52YpQW89xQ=", + "hash": "sha256-0NCndgGz/xrYNvWjs49u//VXvndw0RFyAINnGUTKQ4s=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.52.0", + "rev": "v4.53.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-oModEw/gaQCDHLf+2EKf1O1HQSGWnqEReXowE6F7W0o=" + "vendorHash": "sha256-glxBI4e5BN28GMGeixUSiCaDTIlr+8e4QHnzaDagyno=" }, "googleworkspace": { "hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=", diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 5a71b1acfcc3e..dca8f277867ae 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -5,7 +5,7 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.5.22"; + version = "3.5.23"; format = "pyproject"; # Fetch from GitHub in order to use `requirements.in` @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { owner = "flexget"; repo = "flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-I+7fTSyw5oKrad6HMxhex2wI4JLXDtoxHL4pxO3w2l8="; + hash = "sha256-VWpcXwiQHpQ3X/rmm6fWfPfuUoUmWQMfOq5A87nED3A="; }; postPatch = '' diff --git a/pkgs/applications/radio/qdmr/default.nix b/pkgs/applications/radio/qdmr/default.nix index 6d0d71e867330..aa89d88197510 100644 --- a/pkgs/applications/radio/qdmr/default.nix +++ b/pkgs/applications/radio/qdmr/default.nix @@ -9,11 +9,11 @@ docbook_xsl_ns, wrapQtAppsHook, libusb1, - libyamlcpp, qtlocation, qtserialport, qttools, qtbase, + yaml-cpp, }: let @@ -39,12 +39,12 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - libyamlcpp libusb1 qtlocation qtserialport qttools qtbase + yaml-cpp ]; postPatch = lib.optionalString isLinux '' diff --git a/pkgs/applications/science/biology/inormalize/default.nix b/pkgs/applications/science/biology/inormalize/default.nix index 8ea115c6b25df..b4999193e177e 100644 --- a/pkgs/applications/science/biology/inormalize/default.nix +++ b/pkgs/applications/science/biology/inormalize/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "inormalize"; - name = "${pname}-2014-10-21"; + version = "unstable-2014-10-21"; src = fetchFromGitHub { owner = "BIC-MNI"; diff --git a/pkgs/applications/science/biology/minc-widgets/default.nix b/pkgs/applications/science/biology/minc-widgets/default.nix index e8aef4138b05e..42178722b5517 100644 --- a/pkgs/applications/science/biology/minc-widgets/default.nix +++ b/pkgs/applications/science/biology/minc-widgets/default.nix @@ -4,8 +4,7 @@ stdenv.mkDerivation rec { pname = "minc-widgets"; - name = "${pname}-2016-04-20"; - + version = "unstable-2016-04-20"; src = fetchFromGitHub { owner = "BIC-MNI"; diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 83acfcfe9c37d..580de87bdb23f 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -8,15 +8,18 @@ # R as of writing does not support outputting both .so and .a files; it outputs: # --enable-R-static-lib conflicts with --enable-R-shlib and will be ignored , static ? false +, testers }: assert (!blas.isILP64) && (!lapack.isILP64); -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "R"; version = "4.2.2"; - src = fetchurl { + src = let + inherit (finalAttrs) pname version; + in fetchurl { url = "https://cran.r-project.org/src/base/R-${lib.versions.major version}/${pname}-${version}.tar.gz"; sha256 = "sha256-D/YrQuxRr6VxPK7nxP3noMRZQLo5vvjFyUh/7wyVPfU="; }; @@ -97,6 +100,8 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { homepage = "http://www.r-project.org/"; description = "Free software environment for statistical computing and graphics"; @@ -121,8 +126,9 @@ stdenv.mkDerivation rec { user-defined recursive functions and input and output facilities. ''; + pkgConfigModules = [ "libR" ]; platforms = platforms.all; maintainers = with maintainers; [ jbedo ] ++ teams.sage.members; }; -} +}) diff --git a/pkgs/applications/version-management/radicle-cli/default.nix b/pkgs/applications/version-management/radicle-cli/default.nix index f74ae1cf37a3b..213243f1851ca 100644 --- a/pkgs/applications/version-management/radicle-cli/default.nix +++ b/pkgs/applications/version-management/radicle-cli/default.nix @@ -10,7 +10,10 @@ , openssl , libusb1 , AppKit +, git , openssh +, testers +, radicle-cli }: rustPlatform.buildRustPackage rec { @@ -50,11 +53,18 @@ rustPlatform.buildRustPackage rec { done ''; - nativeCheckInputs = [ openssh ]; + nativeCheckInputs = [ + git + openssh + ]; preCheck = '' eval $(ssh-agent) ''; + passthru.tests = { + version = testers.testVersion { package = radicle-cli; }; + }; + meta = { description = "Command-line tooling for Radicle, a decentralized code collaboration network"; homepage = "https://radicle.xyz"; diff --git a/pkgs/applications/video/jellyfin-media-player/default.nix b/pkgs/applications/video/jellyfin-media-player/default.nix index 4f2b4ef440f76..d6379550e884f 100644 --- a/pkgs/applications/video/jellyfin-media-player/default.nix +++ b/pkgs/applications/video/jellyfin-media-player/default.nix @@ -28,13 +28,13 @@ mkDerivation rec { pname = "jellyfin-media-player"; - version = "1.7.1"; + version = "1.8.1"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-media-player"; rev = "v${version}"; - sha256 = "sha256-piMqI4qxcNUSNC+0JE2KZ/cvlNgtxUOnSfrcWnBVzC0="; + sha256 = "sha256-/FqxZd0cFSfkeBQmZ2gU+5FUZZ+WbQ8c2IjaZ4/uGt8="; }; patches = [ diff --git a/pkgs/applications/video/jellyfin-mpv-shim/default.nix b/pkgs/applications/video/jellyfin-mpv-shim/default.nix index 02c58925558e6..b1bf0dac39baf 100644 --- a/pkgs/applications/video/jellyfin-mpv-shim/default.nix +++ b/pkgs/applications/video/jellyfin-mpv-shim/default.nix @@ -18,11 +18,11 @@ buildPythonApplication rec { pname = "jellyfin-mpv-shim"; - version = "2.2.0"; + version = "2.3.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-JiSC6WjrLsWk3/m/EHq7KNXaJ6rqT2fG9TT1jPvYlK0="; + sha256 = "sha256-v5enaNcZ0aoyEcOFfkAsOIwEpVZ2oqYGMkLlDepBY7c="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 0ac55e0bec24e..766a9fd1de50d 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -14,8 +14,52 @@ , go-md2man , nixosTests , python3 +, makeWrapper +, symlinkJoin +, extraPackages ? [ ] +, runc +, crun +, conmon +, slirp4netns +, fuse-overlayfs +, util-linux +, iptables +, iproute2 +, catatonit +, gvproxy +, aardvark-dns +, netavark +, testers +, podman }: +let + # do not add qemu to this wrapper, store paths get written to the podman vm config and break when GCed + binPath = lib.makeBinPath ([ + ] ++ lib.optionals stdenv.isLinux [ + runc + crun + conmon + slirp4netns + fuse-overlayfs + util-linux + iptables + iproute2 + ] ++ extraPackages); + + helpersBin = symlinkJoin { + name = "podman-helper-binary-wrapper"; + + # this only works for some binaries, others may need to be be added to `binPath` or in the modules + paths = [ + gvproxy + ] ++ lib.optionals stdenv.isLinux [ + aardvark-dns + catatonit # added here for the pause image and also set in `containersConf` for `init_path` + netavark + ]; + }; +in buildGoModule rec { pname = "podman"; version = "4.4.1"; @@ -36,9 +80,9 @@ buildGoModule rec { doCheck = false; - outputs = [ "out" "man" ] ++ lib.optionals stdenv.isLinux [ "rootlessport" ]; + outputs = [ "out" "man" ]; - nativeBuildInputs = [ pkg-config go-md2man installShellFiles python3 ]; + nativeBuildInputs = [ pkg-config go-md2man installShellFiles makeWrapper python3 ]; buildInputs = lib.optionals stdenv.isLinux [ btrfs-progs @@ -50,13 +94,16 @@ buildGoModule rec { systemd ]; + HELPER_BINARIES_DIR = "${helpersBin}/bin"; + PREFIX = "${placeholder "out"}"; + buildPhase = '' runHook preBuild patchShebangs . ${if stdenv.isDarwin then '' make podman-remote # podman-mac-helper uses FHS paths '' else '' - make bin/podman bin/rootlessport + make bin/podman bin/rootlessport bin/quadlet ''} make docs runHook postBuild @@ -64,29 +111,28 @@ buildGoModule rec { installPhase = '' runHook preInstall - mkdir -p {$out/{bin,etc,lib,share},$man} # ensure paths exist for the wrapper ${if stdenv.isDarwin then '' - mv bin/{darwin/podman,podman} + install bin/darwin/podman -Dt $out/bin '' else '' - install -Dm644 contrib/tmpfile/podman.conf -t $out/lib/tmpfiles.d - for s in contrib/systemd/**/*.in; do - substituteInPlace "$s" --replace "@@PODMAN@@" "podman" # don't use unwrapped binary - done - PREFIX=$out make install.systemd - install -Dm555 bin/rootlessport -t $rootlessport/bin + make install.bin install.systemd ''} - install -Dm555 bin/podman -t $out/bin - PREFIX=$out make install.completions - MANDIR=$man/share/man make install.man + make install.completions install.man + wrapProgram $out/bin/podman \ + --prefix PATH : ${lib.escapeShellArg binPath} runHook postInstall ''; postFixup = lib.optionalString stdenv.isLinux '' - RPATH=$(patchelf --print-rpath $out/bin/podman) - patchelf --set-rpath "${lib.makeLibraryPath [ systemd ]}":$RPATH $out/bin/podman + RPATH=$(patchelf --print-rpath $out/bin/.podman-wrapped) + patchelf --set-rpath "${lib.makeLibraryPath [ systemd ]}":$RPATH $out/bin/.podman-wrapped ''; passthru.tests = { + version = testers.testVersion { + package = podman; + command = "HOME=$TMPDIR podman --version"; + }; + } // lib.optionalAttrs stdenv.isLinux { inherit (nixosTests) podman; # related modules inherit (nixosTests) diff --git a/pkgs/applications/virtualization/podman/wrapper.nix b/pkgs/applications/virtualization/podman/wrapper.nix deleted file mode 100644 index 7fe483a7079e5..0000000000000 --- a/pkgs/applications/virtualization/podman/wrapper.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ podman-unwrapped -, runCommand -, makeWrapper -, symlinkJoin -, lib -, stdenv -, extraPackages ? [] -, runc # Default container runtime -, crun # Container runtime (default with cgroups v2 for podman/buildah) -, conmon # Container runtime monitor -, slirp4netns # User-mode networking for unprivileged namespaces -, fuse-overlayfs # CoW for images, much faster than default vfs -, util-linux # nsenter -, iptables -, iproute2 -, catatonit -, gvproxy -, aardvark-dns -, netavark -}: - -# do not add qemu to this wrapper, store paths get written to the podman vm config and break when GCed - -let - binPath = lib.makeBinPath ([ - ] ++ lib.optionals stdenv.isLinux [ - runc - crun - conmon - slirp4netns - fuse-overlayfs - util-linux - iptables - iproute2 - ] ++ extraPackages); - - helpersBin = symlinkJoin { - name = "${podman-unwrapped.pname}-helper-binary-wrapper-${podman-unwrapped.version}"; - - # this only works for some binaries, others may need to be be added to `binPath` or in the modules - paths = [ - gvproxy - ] ++ lib.optionals stdenv.isLinux [ - aardvark-dns - catatonit # added here for the pause image and also set in `containersConf` for `init_path` - netavark - podman-unwrapped.rootlessport - ]; - }; - -in runCommand podman-unwrapped.name { - name = "${podman-unwrapped.pname}-wrapper-${podman-unwrapped.version}"; - inherit (podman-unwrapped) pname version passthru; - - preferLocalBuild = true; - - meta = builtins.removeAttrs podman-unwrapped.meta [ "outputsToInstall" ]; - - outputs = [ - "out" - "man" - ]; - - nativeBuildInputs = [ - makeWrapper - ]; - -} '' - ln -s ${podman-unwrapped.man} $man - - mkdir -p $out/bin - ln -s ${podman-unwrapped}/etc $out/etc - ln -s ${podman-unwrapped}/lib $out/lib - ln -s ${podman-unwrapped}/share $out/share - makeWrapper ${podman-unwrapped}/bin/podman $out/bin/podman \ - --set CONTAINERS_HELPER_BINARY_DIR ${helpersBin}/bin \ - --prefix PATH : ${lib.escapeShellArg binPath} -'' diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 6cfc55240222a..32c8cf1b86a38 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -22,13 +22,13 @@ let sd-bus-provider = if systemdSupport then "libsystemd" else "basu"; in stdenv.mkDerivation rec { pname = "sway-unwrapped"; - version = "1.8"; + version = "1.8.1"; src = fetchFromGitHub { owner = "swaywm"; repo = "sway"; rev = version; - hash = "sha256-r5qf50YK0Wl0gFiFdSE/J6ZU+D/Cz32u1mKzOqnIuJ0="; + hash = "sha256-WxnT+le9vneQLFPz2KoBduOI+zfZPhn1fKlaqbPL6/g="; }; patches = [ diff --git a/pkgs/data/themes/whitesur/default.nix b/pkgs/data/themes/whitesur/default.nix index 1073fd8f2505b..c01c8e08166e7 100644 --- a/pkgs/data/themes/whitesur/default.nix +++ b/pkgs/data/themes/whitesur/default.nix @@ -33,13 +33,13 @@ lib.checkListOfEnum "${pname}: panel size" [ "default" "smaller" "bigger" ] (sin stdenv.mkDerivation rec { pname = "whitesur-gtk-theme"; - version = "2022-10-27"; + version = "2023-02-07"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "sha256-jOrTasnkNExCgvST+09JOQ0iosjoEu3aoj3C1pNHTgY="; + sha256 = "sha256-RGYD2+ZTUTPyFbaHvXU9VD3W6WTNeg3ifY+DAR3MmtI="; }; nativeBuildInputs = [ @@ -61,10 +61,10 @@ stdenv.mkDerivation rec { done # Do not provide `sudo`, as it is not needed in our use case of the install script - substituteInPlace lib-core.sh --replace '$(which sudo)' false + substituteInPlace shell/lib-core.sh --replace '$(which sudo)' false # Provides a dummy home directory - substituteInPlace lib-core.sh --replace 'MY_HOME=$(getent passwd "''${MY_USERNAME}" | cut -d: -f6)' 'MY_HOME=/tmp' + substituteInPlace shell/lib-core.sh --replace 'MY_HOME=$(getent passwd "''${MY_USERNAME}" | cut -d: -f6)' 'MY_HOME=/tmp' ''; dontBuild = true; diff --git a/pkgs/development/beam-modules/fetch-mix-deps.nix b/pkgs/development/beam-modules/fetch-mix-deps.nix index ac6d5f3c8b92b..2bba3a93c2947 100644 --- a/pkgs/development/beam-modules/fetch-mix-deps.nix +++ b/pkgs/development/beam-modules/fetch-mix-deps.nix @@ -45,7 +45,7 @@ stdenvNoCC.mkDerivation (attrs // { installPhase = attrs.installPhase or '' runHook preInstall - mix deps.get --only ${mixEnv} + mix deps.get ''${mixEnv:+--only $mixEnv} find "$TEMPDIR/deps" -path '*/.git/*' -a ! -name HEAD -exec rm -rf {} + cp -r --no-preserve=mode,ownership,timestamps $TEMPDIR/deps $out runHook postInstall diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 76e117e57ce9b..4bebd827145f9 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -262,7 +262,7 @@ stdenv.mkDerivation rec { description = "A cross-language development platform for in-memory data"; homepage = "https://arrow.apache.org/docs/cpp/"; license = licenses.asl20; - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; # waiting on gtest changes in staging + broken = stdenv.isLinux && stdenv.isAarch64; # waiting on gtest changes in staging platforms = platforms.unix; maintainers = with maintainers; [ tobim veprbl cpcloud ]; }; diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index dceada0f7f8f4..d0374c74901ec 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -266,6 +266,10 @@ , MediaToolbox , VideoDecodeAcceleration , VideoToolbox +/* + * Testing + */ +, testers }: /* Maintainer notes: @@ -321,13 +325,13 @@ assert buildAvformat -> buildAvcodec && buildAvutil; # configure flag since 0.6 assert buildPostproc -> buildAvutil; assert buildSwscale -> buildAvutil; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ffmpeg" + (if ffmpegVariant == "small" then "" else "-${ffmpegVariant}"); inherit version; src = fetchgit { url = "https://git.ffmpeg.org/ffmpeg.git"; - rev = "n${version}"; + rev = "n${finalAttrs.version}"; inherit sha256; }; @@ -522,7 +526,7 @@ stdenv.mkDerivation rec { # outputs where we don't want them. Patch the generated config.h to remove all # such references except for data. postConfigure = let - toStrip = lib.remove "data" outputs; # We want to keep references to the data dir. + toStrip = lib.remove "data" finalAttrs.outputs; # We want to keep references to the data dir. in "remove-references-to ${lib.concatStringsSep " " (map (o: "-t ${placeholder o}") toStrip)} config.h"; @@ -656,6 +660,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "A complete, cross-platform solution to record, convert and stream audio and video"; homepage = "https://www.ffmpeg.org/"; @@ -671,7 +677,8 @@ stdenv.mkDerivation rec { ++ optional withGPL gpl2Plus ++ optional withGPLv3 gpl3Plus ++ optional withUnfree unfreeRedistributable; + pkgConfigModules = [ "libavutil" ]; platforms = platforms.all; maintainers = with maintainers; [ atemu ]; }; -} +}) diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix index 8e60c08d36009..1dd68b077b206 100644 --- a/pkgs/development/libraries/gtest/default.nix +++ b/pkgs/development/libraries/gtest/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, cmake, ninja, fetchFromGitHub }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, ninja +, static ? stdenv.hostPlatform.isStatic, +}: stdenv.mkDerivation rec { pname = "gtest"; @@ -20,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja ]; cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" + "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" ] ++ lib.optionals (stdenv.cc.isClang && (lib.versionOlder stdenv.cc.version "16.0")) [ # Enable C++17 support # https://github.com/google/googletest/issues/3081 diff --git a/pkgs/development/libraries/hidapi/default.nix b/pkgs/development/libraries/hidapi/default.nix index b29b64c2a7577..e9bfe33e9f482 100644 --- a/pkgs/development/libraries/hidapi/default.nix +++ b/pkgs/development/libraries/hidapi/default.nix @@ -7,16 +7,17 @@ , udev , Cocoa , IOKit +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hidapi"; version = "0.12.0"; src = fetchFromGitHub { owner = "libusb"; repo = "hidapi"; - rev = "${pname}-${version}"; + rev = "${finalAttrs.pname}-${finalAttrs.version}"; sha256 = "sha256-SMhlcB7LcViC6UFVYACjunxsGkvSOKC3mbLBH4XQSzM="; }; @@ -28,12 +29,20 @@ stdenv.mkDerivation rec { propagatedBuildInputs = lib.optionals stdenv.isDarwin [ Cocoa IOKit ]; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "Library for communicating with USB and Bluetooth HID devices"; homepage = "https://github.com/libusb/hidapi"; maintainers = with maintainers; [ prusnak ]; # You can choose between GPLv3, BSD or HIDAPI license (even more liberal) license = with licenses; [ bsd3 /* or */ gpl3Only ] ; + pkgConfigModules = lib.optionals stdenv.isDarwin [ + "hidapi" + ] ++ lib.optionals stdenv.isLinux [ + "hidapi-hidraw" + "hidapi-libusb" + ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/development/libraries/icu/63.nix b/pkgs/development/libraries/icu/63.nix index 19838763f5b41..a83e2cd5f5ebe 100644 --- a/pkgs/development/libraries/icu/63.nix +++ b/pkgs/development/libraries/icu/63.nix @@ -1,4 +1,6 @@ -{ stdenv, lib, fetchurl, fetchpatch, fixDarwinDylibNames, nativeBuildRoot, buildRootOnly ? false }: +{ stdenv, lib, fetchurl, fetchpatch, fixDarwinDylibNames, nativeBuildRoot, testers +, buildRootOnly ? false +}: import ./base.nix { version = "63.1"; @@ -11,4 +13,4 @@ import ./base.nix { }) ]; patchFlags = [ "-p3" ]; -} { inherit stdenv lib fetchurl fixDarwinDylibNames nativeBuildRoot buildRootOnly; } +} { inherit stdenv lib fetchurl fixDarwinDylibNames nativeBuildRoot testers buildRootOnly; } diff --git a/pkgs/development/libraries/icu/base.nix b/pkgs/development/libraries/icu/base.nix index a714e758bd883..c5e46fa4530d6 100644 --- a/pkgs/development/libraries/icu/base.nix +++ b/pkgs/development/libraries/icu/base.nix @@ -2,6 +2,7 @@ { stdenv, lib, fetchurl, fixDarwinDylibNames # Cross-compiled icu4c requires a build-root of a native compile , buildRootOnly ? false, nativeBuildRoot +, testers }: let @@ -45,6 +46,11 @@ let description = "Unicode and globalization support library"; homepage = "https://icu.unicode.org/"; maintainers = with maintainers; [ raskin ]; + pkgConfigModules = [ + "icu-i18n" + "icu-io" + "icu-uc" + ]; platforms = platforms.all; }; }; @@ -97,4 +103,6 @@ let then buildRootOnlyAttrs else realAttrs; in -stdenv.mkDerivation attrs +stdenv.mkDerivation (finalAttrs: attrs // { + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; +}) diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index 66092f4365098..02707c750c06b 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -21,17 +21,18 @@ , fluxbox , enlightenment , xorg +, testers }: let inherit (lib) optional optionals; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "imlib2"; version = "1.9.1"; src = fetchurl { - url = "mirror://sourceforge/enlightenment/${pname}-${version}.tar.xz"; + url = "mirror://sourceforge/enlightenment/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; hash = "sha256-SiJAOL//vl1NJQxE4F9O5a4k3P74OVsWd8cVxY92TUM="; }; @@ -69,6 +70,8 @@ stdenv.mkDerivation rec { enlightenment; }; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "Image manipulation library"; @@ -83,7 +86,8 @@ stdenv.mkDerivation rec { homepage = "https://docs.enlightenment.org/api/imlib2/html"; changelog = "https://git.enlightenment.org/legacy/imlib2.git/plain/ChangeLog?h=v${version}"; license = licenses.imlib2; + pkgConfigModules = [ "imlib2" ]; platforms = platforms.unix; maintainers = with maintainers; [ spwhitt ]; }; -} +}) diff --git a/pkgs/development/libraries/libb2/default.nix b/pkgs/development/libraries/libb2/default.nix index a461f5039aa7e..9e507188aad39 100644 --- a/pkgs/development/libraries/libb2/default.nix +++ b/pkgs/development/libraries/libb2/default.nix @@ -4,16 +4,17 @@ , autoreconfHook , libtool , pkg-config +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libb2"; version = "0.98.1"; src = fetchFromGitHub { owner = "BLAKE2"; repo = "libb2"; - rev = "refs/tags/v${version}"; + rev = "refs/tags/v${finalAttrs.version}"; sha256 = "0qj8aaqvfcavj1vj5asm4pqm03ap7q8x4c2fy83cqggvky0frgya"; }; @@ -29,11 +30,14 @@ stdenv.mkDerivation rec { doCheck = true; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "The BLAKE2 family of cryptographic hash functions"; homepage = "https://blake2.net/"; + pkgConfigModules = [ "libb2" ]; platforms = platforms.all; maintainers = with maintainers; [ dfoxfranke dotlambda ]; license = licenses.cc0; }; -} +}) diff --git a/pkgs/development/libraries/liburing/default.nix b/pkgs/development/libraries/liburing/default.nix index c95ea31b3bfb8..7a5fa8a34a121 100644 --- a/pkgs/development/libraries/liburing/default.nix +++ b/pkgs/development/libraries/liburing/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { pname = "liburing"; - version = "2.2"; + version = "2.3"; src = fetchgit { url = "http://git.kernel.dk/${pname}"; rev = "liburing-${version}"; - sha256 = "sha256-M/jfxZ+5DmFvlAt8sbXrjBTPf2gLd9UyTNymtjD+55g"; + sha256 = "sha256-vN6lLb5kpgHTKDxwibJPS61sdelILETVtJE2BYgp79k="; }; separateDebugInfo = true; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 488613fd489ae..75ffe5ae06a6d 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -10,6 +10,7 @@ # path to openssl.cnf file. will be placed in $etc/etc/ssl/openssl.cnf to replace the default , conf ? null , removeReferencesTo +, testers }: # Note: this package is used for bootstrapping fetchurl, and thus @@ -19,12 +20,12 @@ let common = { version, sha256, patches ? [], withDocs ? false, extraMeta ? {} }: - stdenv.mkDerivation rec { + stdenv.mkDerivation (finalAttrs: { pname = "openssl"; inherit version; src = fetchurl { - url = "https://www.openssl.org/source/${pname}-${version}.tar.gz"; + url = "https://www.openssl.org/source/${finalAttrs.pname}-${version}.tar.gz"; inherit sha256; }; @@ -204,13 +205,20 @@ let fi ''; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { homepage = "https://www.openssl.org/"; description = "A cryptographic library that implements the SSL and TLS protocols"; license = licenses.openssl; + pkgConfigModules = [ + "libcrypto" + "libssl" + "openssl" + ]; platforms = platforms.all; } // extraMeta; - }; + }); in { diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix index b52837aa17056..1c39c004447e6 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qtstyleplugin-kvantum-qt4"; - version = "1.0.7"; + version = "1.0.9"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${version}"; - hash = "sha256-Ys77z5BoeQEOYe1h5ITEuVtVn6Uug9zQjrCBxLQOrSs="; + hash = "sha256-5/cScJpi5Z5Z/SjizKfMTGytuEo2uUT6QtpMnn7JhKc="; }; nativeBuildInputs = [ qmake4Hook ]; diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index b9563346ada4c..3bf16057f835f 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -6,16 +6,17 @@ , shared ? true # Compile with ILP64 interface , blas64 ? false +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "liblapack"; version = "3.11"; src = fetchFromGitHub { owner = "Reference-LAPACK"; repo = "lapack"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-AYD78u70y8cY19hmM/aDjQEzxO8u9lPWhCFxRe5cqXI="; }; @@ -40,7 +41,7 @@ stdenv.mkDerivation rec { postInstall = let canonicalExtension = if stdenv.hostPlatform.isLinux - then "${stdenv.hostPlatform.extensions.sharedLibrary}.${lib.versions.major version}" + then "${stdenv.hostPlatform.extensions.sharedLibrary}.${lib.versions.major finalAttrs.version}" else stdenv.hostPlatform.extensions.sharedLibrary; in lib.optionalString blas64 '' ln -s $out/lib/liblapack64${canonicalExtension} $out/lib/liblapack${canonicalExtension} @@ -65,15 +66,18 @@ stdenv.mkDerivation rec { checkPhase = '' runHook preCheck - ctest ${ctestArgs} + ctest ${finalAttrs.ctestArgs} runHook postCheck ''; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "Linear Algebra PACKage"; homepage = "http://www.netlib.org/lapack/"; maintainers = with maintainers; [ markuskowa ]; license = licenses.bsd3; + pkgConfigModules = [ "lapack" ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 99ee89edcac3e..fdefeb86a0464 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -64,6 +64,7 @@ , enableGeoLocation ? true , withLibsecret ? true , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd +, testers }: stdenv.mkDerivation (finalAttrs: { @@ -232,10 +233,17 @@ stdenv.mkDerivation (finalAttrs: { requiredSystemFeatures = [ "big-parallel" ]; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "Web content rendering engine, GTK port"; homepage = "https://webkitgtk.org/"; license = licenses.bsd2; + pkgConfigModules = [ + "javascriptcoregtk-4.0" + "webkit2gtk-4.0" + "webkit2gtk-web-extension-4.0" + ]; platforms = platforms.linux ++ platforms.darwin; maintainers = teams.gnome.members; broken = stdenv.isDarwin; diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix index bf2825b5967ec..4370a27012dc3 100644 --- a/pkgs/development/libraries/xgboost/default.nix +++ b/pkgs/development/libraries/xgboost/default.nix @@ -1,69 +1,110 @@ -{ config -, stdenv -, lib -, fetchFromGitHub -, cmake -, gtest -, doCheck ? true -, cudaSupport ? config.cudaSupport or false -, ncclSupport ? false -, cudaPackages -, llvmPackages -}: +{ config, stdenv, lib, fetchFromGitHub, cmake, gtest, doCheck ? true +, cudaSupport ? config.cudaSupport or false, ncclSupport ? false +, rLibrary ? false, cudaPackages, llvmPackages, R, rPackages }: assert ncclSupport -> cudaSupport; +# Disable regular tests when building the R package +# because 1) the R package runs its own tests and +# 2) the R package creates a different binary shared +# object that isn't compatible with the regular CLI +# tests. +assert rLibrary -> doCheck != true; stdenv.mkDerivation rec { - pname = "xgboost"; + pnameBase = "xgboost"; + # prefix with r when building the R library + # The R package build results in a special xgboost.so file + # that contains a subset of the .so file use for the CLI + # and python version. In general, the CRAN version from + # nixpkgs's r-modules should be used, but this non-standard + # build allows for enabling CUDA and NCCL support which aren't + # included in the CRAN release. Build with: + # nix-build -E "with (import $NIXPKGS{}); \ + # let \ + # xgb = xgboost.override{rLibrary = true; doCheck = false;}; \ + # in \ + # rWrapper.override{ packages = [ xgb ]; }" + pname = lib.optionalString rLibrary "r-" + pnameBase; version = "1.7.3"; src = fetchFromGitHub { owner = "dmlc"; - repo = pname; + repo = pnameBase; rev = "v${version}"; fetchSubmodules = true; hash = "sha256-unTss2byytG8KUQfg5s34YpRuHHDLo7D/ZickHhz1AE="; }; - nativeBuildInputs = [ - cmake - ] ++ lib.optionals stdenv.isDarwin [ - llvmPackages.openmp - ] ++ lib.optionals cudaSupport [ - cudaPackages.autoAddOpenGLRunpathHook - ]; + nativeBuildInputs = [ cmake ] + ++ lib.optionals stdenv.isDarwin [ llvmPackages.openmp ] + ++ lib.optionals cudaSupport [ cudaPackages.autoAddOpenGLRunpathHook ] + ++ lib.optionals rLibrary [ R ]; buildInputs = [ gtest ] ++ lib.optional cudaSupport cudaPackages.cudatoolkit - ++ lib.optional ncclSupport cudaPackages.nccl; + ++ lib.optional ncclSupport cudaPackages.nccl; + + propagatedBuildInputs = lib.optionals rLibrary [ + rPackages.data_table + rPackages.jsonlite + rPackages.Matrix + ]; cmakeFlags = lib.optionals doCheck [ "-DGOOGLE_TEST=ON" ] - ++ lib.optionals cudaSupport [ "-DUSE_CUDA=ON" "-DCUDA_HOST_COMPILER=${cudaPackages.cudatoolkit.cc}/bin/cc" ] - ++ lib.optionals (cudaSupport && lib.versionAtLeast cudaPackages.cudatoolkit.version "11.4.0") [ "-DBUILD_WITH_CUDA_CUB=ON" ] - ++ lib.optionals ncclSupport [ "-DUSE_NCCL=ON" ]; + ++ lib.optionals cudaSupport [ + "-DUSE_CUDA=ON" + "-DCUDA_HOST_COMPILER=${cudaPackages.cudatoolkit.cc}/bin/cc" + ] ++ lib.optionals (cudaSupport + && lib.versionAtLeast cudaPackages.cudatoolkit.version "11.4.0") + [ "-DBUILD_WITH_CUDA_CUB=ON" ] + ++ lib.optionals ncclSupport [ "-DUSE_NCCL=ON" ] + ++ lib.optionals rLibrary [ "-DR_LIB=ON" ]; + + preConfigure = lib.optionals rLibrary '' + substituteInPlace cmake/RPackageInstall.cmake.in --replace "CMD INSTALL" "CMD INSTALL -l $out/library" + export R_LIBS_SITE="$R_LIBS_SITE''${R_LIBS_SITE:+:}$out/library" + ''; inherit doCheck; # By default, cmake build will run ctests with all checks enabled # If we're building with cuda, we run ctest manually so that we can skip the GPU tests checkPhase = lib.optionalString cudaSupport '' - ctest --force-new-ctest-process ${lib.optionalString cudaSupport "-E TestXGBoostLib"} + ctest --force-new-ctest-process ${ + lib.optionalString cudaSupport "-E TestXGBoostLib" + } ''; - installPhase = let - libname = "libxgboost${stdenv.hostPlatform.extensions.sharedLibrary}"; - in '' - runHook preInstall - mkdir -p $out - cp -r ../include $out - cp -r ../dmlc-core/include/dmlc $out/include - cp -r ../rabit/include/rabit $out/include - install -Dm755 ../lib/${libname} $out/lib/${libname} - install -Dm755 ../xgboost $out/bin/xgboost - runHook postInstall + installPhase = + let libname = "libxgboost${stdenv.hostPlatform.extensions.sharedLibrary}"; + in '' + runHook preInstall + mkdir -p $out + cp -r ../include $out + cp -r ../dmlc-core/include/dmlc $out/include + cp -r ../rabit/include/rabit $out/include + '' + lib.optionalString (!rLibrary) '' + install -Dm755 ../lib/${libname} $out/lib/${libname} + install -Dm755 ../xgboost $out/bin/xgboost + '' + # the R library option builds a completely different binary xgboost.so instead of + # libxgboost.so, which isn't full featured for python and CLI + + lib.optionalString rLibrary '' + mkdir $out/library + export R_LIBS_SITE="$out/library:$R_LIBS_SITE''${R_LIBS_SITE:+:}" + make install -l $out/library + '' + '' + runHook postInstall + ''; + + postFixup = lib.optionalString rLibrary '' + if test -e $out/nix-support/propagated-build-inputs; then + ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages + fi ''; meta = with lib; { - description = "Scalable, Portable and Distributed Gradient Boosting (GBDT, GBRT or GBM) Library"; + description = + "Scalable, Portable and Distributed Gradient Boosting (GBDT, GBRT or GBM) Library"; homepage = "https://github.com/dmlc/xgboost"; license = licenses.asl20; platforms = platforms.unix; diff --git a/pkgs/development/misc/brev-cli/default.nix b/pkgs/development/misc/brev-cli/default.nix index 3c4dc5194e065..fd972aabceb66 100644 --- a/pkgs/development/misc/brev-cli/default.nix +++ b/pkgs/development/misc/brev-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "brev-cli"; - version = "0.6.204"; + version = "0.6.206"; src = fetchFromGitHub { owner = "brevdev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MQF0mU1cpvkJ6VZE6A8J4W6DMS8RXhjLisrPkKParl4="; + sha256 = "sha256-9NyZaoZgHl0qyiJG2ZiarsXQy1o8fsbKGCpPBO/A1hY="; }; vendorHash = "sha256-IR/tgqh8rS4uN5jSOcopCutbHCKHSU9icUfRhOgu4t8="; diff --git a/pkgs/development/python-modules/aio-geojson-generic-client/default.nix b/pkgs/development/python-modules/aio-geojson-generic-client/default.nix index 9a302f5af088a..56e5f8475cbc4 100644 --- a/pkgs/development/python-modules/aio-geojson-generic-client/default.nix +++ b/pkgs/development/python-modules/aio-geojson-generic-client/default.nix @@ -1,7 +1,6 @@ { lib , aiohttp , aresponses -, asynctest , buildPythonPackage , aio-geojson-client , fetchFromGitHub @@ -33,7 +32,6 @@ buildPythonPackage rec { nativeCheckInputs = [ aresponses - asynctest pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix b/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix index 728a666447d3a..1cb1125839354 100644 --- a/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix +++ b/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix @@ -2,7 +2,6 @@ , aio-geojson-client , aiohttp , aresponses -, asynctest , buildPythonPackage , fetchFromGitHub , pytest-asyncio @@ -32,10 +31,12 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + pytestCheckHook + ]; + + checkInputs = [ aresponses - asynctest pytest-asyncio - pytestCheckHook ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/asana/default.nix b/pkgs/development/python-modules/asana/default.nix index 5f27e8c131b55..6be8a76dece2b 100644 --- a/pkgs/development/python-modules/asana/default.nix +++ b/pkgs/development/python-modules/asana/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "asana"; - version = "3.0.0"; + version = "3.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "asana"; repo = "python-asana"; rev = "refs/tags/v${version}"; - hash = "sha256-+lktPFCL2c79dNGgbsaFJRELmV6sJ2kiBSb8kd9XPIQ="; + hash = "sha256-aYWojS+SeAnFvSqyb9ceyRKhG1Hpn6/eK9xrXxQbVeA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cot/default.nix b/pkgs/development/python-modules/cot/default.nix index 9b7914e5b9c15..ed40735a20639 100644 --- a/pkgs/development/python-modules/cot/default.nix +++ b/pkgs/development/python-modules/cot/default.nix @@ -66,6 +66,10 @@ buildPythonPackage rec { "TestVMDKConversion" # CLI test fails with AssertionError "test_help" + # Failing TestCOTDeployESXi tests + "test_serial_fixup_stubbed" + "test_serial_fixup_stubbed_create" + "test_serial_fixup_stubbed_vm_not_found" ] ++ lib.optionals stdenv.isDarwin [ "test_serial_fixup_invalid_host" ]; diff --git a/pkgs/development/python-modules/hangups/default.nix b/pkgs/development/python-modules/hangups/default.nix deleted file mode 100644 index aa61baa1b4897..0000000000000 --- a/pkgs/development/python-modules/hangups/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ lib -, buildPythonPackage -, pythonOlder -, fetchFromGitHub -, configargparse -, aiohttp -, async-timeout -, appdirs -, readlike -, requests -, reparser -, protobuf -, urwid -, mechanicalsoup -, httpretty -, pytestCheckHook -}: - -buildPythonPackage rec { - pname = "hangups"; - version = "0.4.18"; - - disabled = pythonOlder "3.6"; - - src = fetchFromGitHub { - owner = "tdryer"; - repo = "hangups"; - rev = "v${version}"; - hash = "sha256-vq1OrOUPMQtezBFlisP2f/bvvYprDjhOuwUcT8rmIvw="; - }; - - postPatch = '' - substituteInPlace setup.py \ - --replace "protobuf>=3.1.0,<4" "protobuf" \ - --replace "MechanicalSoup>=0.6.0,<0.13" "MechanicalSoup" - ''; - - propagatedBuildInputs = [ - configargparse - aiohttp - async-timeout - appdirs - readlike - requests - reparser - protobuf - urwid - mechanicalsoup - ]; - - nativeCheckInputs = [ - httpretty - pytestCheckHook - ]; - - pythonImportsCheck = [ - "hangups" - "hangups.client" - "hangups.event" - "hangups.parsers" - "hangups.user" - ]; - - meta = with lib; { - description = "The first third-party instant messaging client for Google Hangouts"; - homepage = "https://github.com/tdryer/hangups"; - license = licenses.mit; - maintainers = with maintainers; [ dotlambda ]; - }; -} diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index 2d705352d1b3e..061b20a835dad 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "identify"; - version = "2.5.17"; + version = "2.5.18"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-urviMomTJdbublr2nCj25R/xbs/pEsRKWxmklneTjOQ="; + sha256 = "sha256-Pf9/mjbyC859WT8ZreFq5u6YER/tRgsQuqIgt6mdPqE="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/mox3/default.nix b/pkgs/development/python-modules/mox3/default.nix index 3aa8b02dc1014..2cdfd2c0c7462 100644 --- a/pkgs/development/python-modules/mox3/default.nix +++ b/pkgs/development/python-modules/mox3/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pythonOlder +, pythonAtLeast , subunit , testrepository , testtools @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "mox3"; version = "1.1.0"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.6" || pythonAtLeast "3.11"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/nipy/default.nix b/pkgs/development/python-modules/nipy/default.nix index d5e399701dc86..9f600bdf86ac1 100644 --- a/pkgs/development/python-modules/nipy/default.nix +++ b/pkgs/development/python-modules/nipy/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pythonOlder +, cython , nose , matplotlib , nibabel @@ -21,9 +22,14 @@ buildPythonPackage rec { sha256 = "a8a2c97ce854fece4aced5a6394b9fdca5846150ad6d2a36b86590924af3c848"; }; + nativeBuildInputs = [ cython ]; buildInputs = lib.optionals doCheck [ nose ]; propagatedBuildInputs = [ matplotlib nibabel numpy scipy sympy ]; + preBuild = '' + make recythonize + ''; + checkPhase = '' # wants to be run in a different directory mkdir nosetests cd nosetests diff --git a/pkgs/development/python-modules/onnx/default.nix b/pkgs/development/python-modules/onnx/default.nix index b21f343db32a1..e3cd5bb09239d 100644 --- a/pkgs/development/python-modules/onnx/default.nix +++ b/pkgs/development/python-modules/onnx/default.nix @@ -1,35 +1,42 @@ { lib , buildPythonPackage +, python3 , bash , cmake -, fetchPypi +, fetchFromGitHub +, gtest , isPy27 , nbval , numpy , protobuf +, pybind11 , pytestCheckHook , six , tabulate , typing-extensions , pythonRelaxDepsHook -, pytest-runner }: -buildPythonPackage rec { +let + gtestStatic = gtest.override { static = true; }; +in buildPythonPackage rec { pname = "onnx"; version = "1.13.0"; format = "setuptools"; disabled = isPy27; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-QQs5lQNnhX+XtlCTaB/iSVouI9Y3d6is6vlsVqFtFm4="; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "refs/tags/v${version}"; + sha256 = "sha256-D8POBAkZVr0O5i4qsSuYRkDfL8WsDTqzgNACmmkFwGs="; }; nativeBuildInputs = [ cmake pythonRelaxDepsHook + pybind11 ]; pythonRelaxDeps = [ "protobuf" ]; @@ -44,30 +51,36 @@ buildPythonPackage rec { nativeCheckInputs = [ nbval pytestCheckHook - pytest-runner tabulate ]; postPatch = '' chmod +x tools/protoc-gen-mypy.sh.in patchShebangs tools/protoc-gen-mypy.sh.in + + substituteInPlace setup.py \ + --replace 'setup_requires.append("pytest-runner")' "" + + # prevent from fetching & building own gtest + substituteInPlace CMakeLists.txt \ + --replace 'include(googletest)' "" + substituteInPlace cmake/unittest.cmake \ + --replace 'googletest)' ')' ''; - # Set CMAKE_INSTALL_LIBDIR to lib explicitly, because otherwise it gets set - # to lib64 and cmake incorrectly looks for the protobuf library in lib64 preConfigure = '' + # Set CMAKE_INSTALL_LIBDIR to lib explicitly, because otherwise it gets set + # to lib64 and cmake incorrectly looks for the protobuf library in lib64 export CMAKE_ARGS="-DCMAKE_INSTALL_LIBDIR=lib -DONNX_USE_PROTOBUF_SHARED_LIBS=ON" + '' + lib.optionalString doCheck '' + export CMAKE_ARGS+=" -Dgoogletest_STATIC_LIBRARIES=${gtestStatic}/lib/libgtest.a -Dgoogletest_INCLUDE_DIRS=${lib.getDev gtestStatic}/include" + export ONNX_BUILD_TESTS=1 ''; preBuild = '' export MAX_JOBS=$NIX_BUILD_CORES ''; - disabledTestPaths = [ - # Unexpected output fields from running code: {'stderr'} - "onnx/examples/np_array_tensorproto.ipynb" - ]; - # The executables are just utility scripts that aren't too important postInstall = '' rm -r $out/bin @@ -76,6 +89,35 @@ buildPythonPackage rec { # The setup.py does all the configuration dontUseCmakeConfigure = true; + doCheck = true; + preCheck = '' + export HOME=$(mktemp -d) + + # detecting source dir as a python package confuses pytest + mv onnx/__init__.py onnx/__init__.py.hidden + ''; + pytestFlagsArray = [ "onnx/test" "onnx/examples" ]; + disabledTests = [ + # attempts to fetch data from web + "test_bvlc_alexnet_cpu" + "test_densenet121_cpu" + "test_inception_v1_cpu" + "test_inception_v2_cpu" + "test_resnet50_cpu" + "test_shufflenet_cpu" + "test_squeezenet_cpu" + "test_vgg19_cpu" + "test_zfnet512_cpu" + ]; + disabledTestPaths = [ + # Unexpected output fields from running code: {'stderr'} + "onnx/examples/np_array_tensorproto.ipynb" + ]; + postCheck = '' + # run "cpp" tests + .setuptools-cmake-build/onnx_gtests + ''; + pythonImportsCheck = [ "onnx" ]; diff --git a/pkgs/development/python-modules/pefile/default.nix b/pkgs/development/python-modules/pefile/default.nix index b1707670e7689..55bd8c0cc07d3 100644 --- a/pkgs/development/python-modules/pefile/default.nix +++ b/pkgs/development/python-modules/pefile/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pefile"; - version = "2022.5.30"; + version = "2023.2.7"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "erocarrera"; repo = pname; - rev = "v${version}"; - hash = "sha256-Cv20hJsErHFSuS5Q1kqLNp4DAsPXv/eFhaU9oYECSeI="; + rev = "refs/tags/v${version}"; + hash = "sha256-lD8GpNl+cVNYTZUKFRF1/2kDwEbn/ekRBNBTYuFmFW0="; }; nativeBuildInputs = [ @@ -38,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Multi-platform Python module to parse and work with Portable Executable (aka PE) files"; homepage = "https://github.com/erocarrera/pefile"; + changelog = "https://github.com/erocarrera/pefile/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ pamplemousse ]; }; diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix index 49e6abffd54ad..5cf5dd7910331 100644 --- a/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyoverkiz"; - version = "1.7.3"; + version = "1.7.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "iMicknl"; repo = "python-overkiz-api"; rev = "refs/tags/v${version}"; - hash = "sha256-hmi6cOBHbcxzA10vQt6fxB8qHrr4My5JFmucV5QCUVg="; + hash = "sha256-I115lMEg/baWuUZThfisNYSck/QdiYecjhhRqgSkLB8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-mpv-jsonipc/default.nix b/pkgs/development/python-modules/python-mpv-jsonipc/default.nix index 8c43d7a4ca275..ade6acd85d46d 100644 --- a/pkgs/development/python-modules/python-mpv-jsonipc/default.nix +++ b/pkgs/development/python-modules/python-mpv-jsonipc/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "python-mpv-jsonipc"; - version = "1.1.11"; + version = "1.1.14"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "iwalton3"; repo = "python-mpv-jsonipc"; rev = "v${version}"; - sha256 = "034vc2j54dciiq80k7jn6kx4g7i58sjk0ykma039k5rihj2rblpk"; + sha256 = "sha256-kOC6FsLYTVx/cCL8AZuGkKarHqAESjJA+2BUagbiy3A="; }; # 'mpv-jsonipc' does not have any tests diff --git a/pkgs/development/python-modules/python-utils/default.nix b/pkgs/development/python-modules/python-utils/default.nix index 5a5ac9f772a6b..ac69e15ec77d2 100644 --- a/pkgs/development/python-modules/python-utils/default.nix +++ b/pkgs/development/python-modules/python-utils/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , loguru @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "python-utils"; - version = "3.4.5"; + version = "3.5.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +20,7 @@ buildPythonPackage rec { owner = "WoLpH"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-O/+jvdzzxUFaQdAfUM9p40fPPDNN+stTauCD993HH6Y="; + hash = "sha256-FFBWkq7ct4JWSTH4Ldg+pbG/BAiW33puB7lqFPBjptw="; }; postPatch = '' @@ -47,6 +48,11 @@ buildPythonPackage rec { "_python_utils_tests" ]; + disabledTests = lib.optionals stdenv.isDarwin [ + # Flaky tests on darwin + "test_timeout_generator" + ]; + meta = with lib; { description = "Module with some convenient utilities"; homepage = "https://github.com/WoLpH/python-utils"; diff --git a/pkgs/development/python-modules/pyvo/default.nix b/pkgs/development/python-modules/pyvo/default.nix index 634db03a3a227..64798acad2eec 100644 --- a/pkgs/development/python-modules/pyvo/default.nix +++ b/pkgs/development/python-modules/pyvo/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , astropy , pillow , pythonOlder @@ -22,6 +23,14 @@ buildPythonPackage rec { sha256 = "sha256-R2ttLoFd6Ic0KZl49dzN5NtWAqPpXRaeki6X8CRGsCw="; }; + patches = [ + # Backport Python 3.11 support. + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/astropy/pyvo/pull/385.patch"; + sha256 = "IHf3W9fIT8XFvyM41PUiJkt1j+B3RkX3TS4FOnRUMDk="; + }) + ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/validobj/default.nix b/pkgs/development/python-modules/validobj/default.nix index ee3ff3fb39502..b50cd5eb83109 100644 --- a/pkgs/development/python-modules/validobj/default.nix +++ b/pkgs/development/python-modules/validobj/default.nix @@ -1,6 +1,5 @@ { lib , buildPythonPackage -, pythonAtLeast , fetchPypi , flit , hypothesis @@ -9,15 +8,12 @@ buildPythonPackage rec { pname = "validobj"; - version = "0.6"; + version = "0.7"; format = "pyproject"; - # https://github.com/Zaharid/validobj/issues/8 - disabled = pythonAtLeast "3.11"; - src = fetchPypi { inherit pname version; - sha256 = "sha256-BvnHn0Erk87Ce3tYwYf0tBwRJMrG19Af/Y568VJ02uo="; + sha256 = "cbij55HZKVLO3MLoDTtFT2YYNVZwbNaYEk+35gIcGdo="; }; nativeBuildInputs = [ flit ]; diff --git a/pkgs/development/python-modules/versioningit/default.nix b/pkgs/development/python-modules/versioningit/default.nix index 480b72e2e5df3..74a29ae175e9c 100644 --- a/pkgs/development/python-modules/versioningit/default.nix +++ b/pkgs/development/python-modules/versioningit/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "versioningit"; - version = "2.1.0"; + version = "2.2.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-c/KWXjDS6/1/+ra/JjaPIjdXBiLdKknH+8GZXenGdtY="; + hash = "sha256-6xjnunJoqIC/HM/pLlNOlqs04Dl/KNy8s/wNpPaltr0="; }; postPatch = '' diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 0df5d285ff18d..c204e91b27639 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.17.7"; + version = "0.17.8"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-dfXDGXn8Az6JRTcYB/gZgHLxQUKgsWhRXl2h0RqVZ4w="; + hash = "sha256-UJIbx0UkpHYMgDr+1dbNoMLrY5hWs0E2Ehu3txG/80E="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; diff --git a/pkgs/development/tools/konstraint/default.nix b/pkgs/development/tools/konstraint/default.nix index cbb8b38d80d79..61fe400586cfb 100644 --- a/pkgs/development/tools/konstraint/default.nix +++ b/pkgs/development/tools/konstraint/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "konstraint"; - version = "0.24.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "plexsystems"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mNritx2YY6x5lwnOWrraHzddRZqEySDOWGOqdmqUyIs="; + sha256 = "sha256-GDHpITuDdZBphkjQGcnhN7H6yHA9CsyVBkinFsM2RrA="; }; - vendorSha256 = "sha256-pqGayeo4JkleZaoZfZW6agbMrK+57tYriKCWXGveoUs="; + vendorHash = "sha256-Ou73kXEcyxXW6u0dUBvx9alJrloc/CUm1VWKphCUPCg="; # Exclude go within .github folder excludedPackages = ".github"; diff --git a/pkgs/development/tools/language-servers/lua-language-server/default.nix b/pkgs/development/tools/language-servers/lua-language-server/default.nix index d260e7601e2f7..04b5fd6e1e024 100644 --- a/pkgs/development/tools/language-servers/lua-language-server/default.nix +++ b/pkgs/development/tools/language-servers/lua-language-server/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lua-language-server"; - version = "3.6.10"; + version = "3.6.11"; src = fetchFromGitHub { owner = "luals"; repo = "lua-language-server"; rev = version; - sha256 = "sha256-QnkWEf1Uv+CZwEyv1b3WMPvaOZEn+mKH5w3CPyw02CQ="; + sha256 = "sha256-NMybClvpTLad7xnd8uPhUHmv6fvaYIKkFHsv7SSDi2M="; fetchSubmodules = true; }; @@ -77,6 +77,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A language server that offers Lua language support"; homepage = "https://github.com/luals/lua-language-server"; + changelog = "https://github.com/LuaLS/lua-language-server/blob/${version}/changelog.md"; license = licenses.mit; maintainers = with maintainers; [ figsoda sei40kr ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/tools/lightningcss/default.nix b/pkgs/development/tools/lightningcss/default.nix index c2bb6828bc2ac..132faaa4aeeee 100644 --- a/pkgs/development/tools/lightningcss/default.nix +++ b/pkgs/development/tools/lightningcss/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "lightningcss"; - version = "1.18.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = "parcel-bundler"; repo = "lightningcss"; rev = "refs/tags/v${version}"; - sha256 = "sha256-JULVX5gyMJhnBwGQxmMObtUaenu37rIE5yDbA5fHsCY="; + sha256 = "sha256-ncZ1tof8InP+8KLTQ2YOwaD/liwU1LNZkllBm53VYNo="; }; - cargoHash = "sha256-PQbN0qsCf4eia5sD71ltP7Y955smZPwkof+uEQATvNQ="; + cargoHash = "sha256-xxR80iizEej1vAzItaoqQnJDZ62dxPOeEdaUpgqhG7I="; buildFeatures = [ "cli" diff --git a/pkgs/development/tools/rust/cargo-semver-checks/default.nix b/pkgs/development/tools/rust/cargo-semver-checks/default.nix index 359f5dbe64d22..1f26f23e15c32 100644 --- a/pkgs/development/tools/rust/cargo-semver-checks/default.nix +++ b/pkgs/development/tools/rust/cargo-semver-checks/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-semver-checks"; - version = "0.17.1"; + version = "0.18.0"; src = fetchFromGitHub { owner = "obi1kenobi"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zObflf9BKq24km54LW7It4Lvff0OKYNDb02uatdX7g4="; + sha256 = "sha256-ugcmsm1j2a1wOnUe9u70yoRXALCmtXSnb80N4B4IUWE="; }; - cargoSha256 = "sha256-itL6WpM4OLn4mzdB0ytM2J7F1fRDrXwCaI/8WdLo6y0="; + cargoSha256 = "sha256-PxnPCevjVvmFMlmYv6qwIBZk2MThz65hgUyVhm2tzlc="; nativeBuildInputs = [ pkg-config ]; @@ -29,9 +29,9 @@ rustPlatform.buildRustPackage rec { checkFlags = [ # requires nightly version of cargo-rustdoc - "--skip=dump::tests" "--skip=query::tests" "--skip=verify_binary_contains_lints" + "--skip=rustdoc_cmd::tests" ]; # use system openssl diff --git a/pkgs/development/tools/squawk/correct-Cargo.lock.patch b/pkgs/development/tools/squawk/correct-Cargo.lock.patch new file mode 100644 index 0000000000000..431f004d2d752 --- /dev/null +++ b/pkgs/development/tools/squawk/correct-Cargo.lock.patch @@ -0,0 +1,13 @@ +diff --git a/Cargo.lock b/Cargo.lock +index d5803a8..384224d 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1585,7 +1585,7 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + + [[package]] + name = "squawk" +-version = "0.19.0" ++version = "0.20.0" + dependencies = [ + "atty", + "base64 0.12.3", diff --git a/pkgs/development/tools/squawk/default.nix b/pkgs/development/tools/squawk/default.nix new file mode 100644 index 0000000000000..9649625c1737d --- /dev/null +++ b/pkgs/development/tools/squawk/default.nix @@ -0,0 +1,67 @@ +{ darwin +, fetchFromGitHub +, lib +, libiconv +, libpg_query +, openssl +, pkg-config +, rustPlatform +, stdenv +}: +let + # The query parser produces a slightly different AST between major versions + # and Squawk is not capable of handling >=14 correctly yet. + libpg_query13 = libpg_query.overrideAttrs (_: rec { + version = "13-2.2.0"; + src = fetchFromGitHub { + owner = "pganalyze"; + repo = "libpg_query"; + rev = version; + hash = "sha256-gEkcv/j8ySUYmM9lx1hRF/SmuQMYVHwZAIYOaCQWAFs="; + }; + }); +in +rustPlatform.buildRustPackage rec { + pname = "squawk"; + version = "0.20.0"; + + src = fetchFromGitHub { + owner = "sbdchd"; + repo = pname; + rev = "v${version}"; + hash = "sha256-v9F+HfscX4dIExIP1YvxOldZPPtmxh8lO3SREu6M+C0="; + }; + + cargoHash = "sha256-kSaQxqom8LSCOQBoIZ1iv+q2+Ih8l61L97xXv5c4a0k="; + + cargoPatches = [ + ./correct-Cargo.lock.patch + ]; + + patches = [ + ./fix-postgresql-version-in-snapshot-test.patch + ]; + + nativeBuildInputs = [ + pkg-config + rustPlatform.bindgenHook + ]; + + buildInputs = lib.optionals (!stdenv.isDarwin) [ + libiconv + openssl + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + CoreFoundation + Security + ]); + + LIBPG_QUERY_PATH = libpg_query13; + + meta = with lib; { + description = "Linter for PostgreSQL, focused on migrations"; + homepage = "https://squawkhq.com/"; + changelog = "https://github.com/sbdchd/squawk/blob/v${version}/CHANGELOG.md"; + license = licenses.gpl3Only; + maintainers = with lib.maintainers; [ andrewsmith ]; + }; +} diff --git a/pkgs/development/tools/squawk/fix-postgresql-version-in-snapshot-test.patch b/pkgs/development/tools/squawk/fix-postgresql-version-in-snapshot-test.patch new file mode 100644 index 0000000000000..205fd3dba9731 --- /dev/null +++ b/pkgs/development/tools/squawk/fix-postgresql-version-in-snapshot-test.patch @@ -0,0 +1,13 @@ +diff --git a/parser/src/snapshots/squawk_parser__parse__tests__parse_sql_query_json.snap b/parser/src/snapshots/squawk_parser__parse__tests__parse_sql_query_json.snap +index 7273b74..ae94927 100644 +--- a/parser/src/snapshots/squawk_parser__parse__tests__parse_sql_query_json.snap ++++ b/parser/src/snapshots/squawk_parser__parse__tests__parse_sql_query_json.snap +@@ -133,7 +133,7 @@ Ok( + }), + ]), + "version": Number( +- 130003, ++ 130008, + ), + }), + ) diff --git a/pkgs/development/tools/wgo/default.nix b/pkgs/development/tools/wgo/default.nix new file mode 100644 index 0000000000000..3440c0f947e80 --- /dev/null +++ b/pkgs/development/tools/wgo/default.nix @@ -0,0 +1,27 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "wgo"; + version = "0.5.1"; + + src = fetchFromGitHub { + owner = "bokwoon95"; + repo = "wgo"; + rev = "v${version}"; + hash = "sha256-kfa3Lm2oJomhoHbtSPLylRr+BFGV/y7xqSIv3xHHg3Q="; + }; + + vendorSha256 = "sha256-jxyO3MGrC+y/jJuwur/+tLIsbxGnT57ZXYzaf1lCv7A="; + + ldflags = [ "-s" "-w" ]; + + subPackages = [ "." ]; + + meta = with lib; { + description = "Live reload for Go apps"; + homepage = "https://github.com/bokwoon95/wgo"; + license = licenses.mit; + maintainers = with maintainers; [ bokwoon95 ]; + }; +} + diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 441f3ccb37f4e..fce51aabd263b 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -10,6 +10,8 @@ # Extra options , prefix ? "" + +, testers }: with lib; @@ -25,7 +27,7 @@ let optAlsaLib = if libOnly then null else shouldUsePkg alsa-lib; optLibopus = shouldUsePkg libopus; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "${prefix}jack2"; version = "1.9.19"; @@ -63,11 +65,14 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/jack_control --set PYTHONPATH $PYTHONPATH ''); + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { description = "JACK audio connection kit, version 2 with jackdbus"; homepage = "https://jackaudio.org"; license = licenses.gpl2Plus; + pkgConfigModules = [ "jack" ]; platforms = platforms.unix; maintainers = with maintainers; [ goibhniu ]; }; -} +}) diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix index ba77e9c3c91ad..4e7375a269168 100644 --- a/pkgs/misc/jackaudio/jack1.nix +++ b/pkgs/misc/jackaudio/jack1.nix @@ -2,6 +2,8 @@ # Optional Dependencies , alsa-lib ? null, db ? null, libuuid ? null, libffado ? null, celt ? null + +, testers }: let @@ -13,12 +15,12 @@ let optLibffado = shouldUsePkg libffado; optCelt = shouldUsePkg celt; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jack1"; version = "0.125.0"; src = fetchurl { - url = "https://jackaudio.org/downloads/jack-audio-connection-kit-${version}.tar.gz"; + url = "https://jackaudio.org/downloads/jack-audio-connection-kit-${finalAttrs.version}.tar.gz"; sha256 = "0i6l25dmfk2ji2lrakqq9icnwjxklgcjzzk65dmsff91z2zva5rm"; }; @@ -30,11 +32,14 @@ stdenv.mkDerivation rec { buildInputs = [ optAlsaLib optDb optLibffado optCelt ]; propagatedBuildInputs = [ optLibuuid ]; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { broken = stdenv.isDarwin; description = "JACK audio connection kit"; homepage = "https://jackaudio.org"; license = with licenses; [ gpl2 lgpl21 ]; + pkgConfigModules = [ "jack" ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/os-specific/linux/firmware/linux-firmware/default.nix b/pkgs/os-specific/linux/firmware/linux-firmware/default.nix index e882ddd69b436..a2229a0a60ce4 100644 --- a/pkgs/os-specific/linux/firmware/linux-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/linux-firmware/default.nix @@ -33,5 +33,8 @@ stdenvNoCC.mkDerivation rec { priority = 6; # give precedence to kernel firmware }; - passthru = { inherit version; }; + passthru = { + inherit version; + updateScript = ./update.sh; + }; } diff --git a/pkgs/servers/mail/vsmtp/default.nix b/pkgs/servers/mail/vsmtp/default.nix index 93b85cee6bb95..63447dffb3093 100644 --- a/pkgs/servers/mail/vsmtp/default.nix +++ b/pkgs/servers/mail/vsmtp/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "vsmtp"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "viridIT"; repo = "vsmtp"; rev = "v${version}"; - hash = "sha256-FI4BvU+83nTzRLJQZ1l1eOn41ZeA62Db+p3d//5o0Wk="; + hash = "sha256-iyjtSeus1gctylYfXAEqpwZNPg/KU/lXv82Wi0h5mAM="; }; - cargoHash = "sha256-Qhhh0riM1qeD3/JZINvY0t5fEOj+prI0fyXagdR43sc="; + cargoHash = "sha256-N4cxAFAFtYnd1/wdomm0VYosDY5uy+0z9pRGThSMbG4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/servers/monitoring/uptime-kuma/default.nix b/pkgs/servers/monitoring/uptime-kuma/default.nix index fa1b4dc266980..a5e11ac8a10b5 100644 --- a/pkgs/servers/monitoring/uptime-kuma/default.nix +++ b/pkgs/servers/monitoring/uptime-kuma/default.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "uptime-kuma"; - version = "1.19.6"; + version = "1.20.0"; src = fetchFromGitHub { owner = "louislam"; repo = "uptime-kuma"; rev = version; - sha256 = "sha256-Hk0me4VPP8vKp4IhzQKjjhM2BWLGSHnN7JiDJu2WlE8="; + sha256 = "sha256-dMjhCsTjXOwxhvJeL25KNkFhRCbCuxG7Ccz8mP7P38A="; }; - npmDepsHash = "sha256-lVMPxUe+W/FlFQS2L+/UfpC21pIKJE89clmJywSv7w4="; + npmDepsHash = "sha256-Ks6KYHP6+ym9PGJ1a5nMxT7JXZyknHeaCmAkjJuCTXU="; patches = [ # Fixes the permissions of the database being not set correctly diff --git a/pkgs/servers/web-apps/wordpress/packages/thirdparty.nix b/pkgs/servers/web-apps/wordpress/packages/thirdparty.nix index 19d23531f6b02..a60c06854183d 100644 --- a/pkgs/servers/web-apps/wordpress/packages/thirdparty.nix +++ b/pkgs/servers/web-apps/wordpress/packages/thirdparty.nix @@ -5,4 +5,10 @@ url = "https://storage.googleapis.com/${name}/${name}-stable/${version}/${name}-${version}-wordpress.zip"; hash = "sha256-XsNFxVL0LF+OHlsqjjTV41x9ERLwMDq9BnKKP3Px2aI="; }; + themes.geist = fetchzip rec { + name = "geist"; + version = "2.0.3"; + url = "https://github.com/christophery/geist/archive/refs/tags/${version}.zip"; + hash = "sha256-c85oRhqu5E5IJlpgqKJRQITur1W7x40obOvHZbPevzU="; + }; } diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix index dfac5af0980be..3d15cbd395c40 100644 --- a/pkgs/tools/compression/brotli/default.nix +++ b/pkgs/tools/compression/brotli/default.nix @@ -4,18 +4,19 @@ , cmake , fetchpatch , staticOnly ? stdenv.hostPlatform.isStatic +, testers }: # ?TODO: there's also python lib in there -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "brotli"; version = "1.0.9"; src = fetchFromGitHub { owner = "google"; repo = "brotli"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "z6Dhrabav1MDQ4rAcXaDv0aN+qOoh9cvoXZqEWBB13c="; }; @@ -55,6 +56,8 @@ stdenv.mkDerivation rec { cp ../docs/*.3 $out/share/man/man3/ ''; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { homepage = "https://github.com/google/brotli"; description = "A generic-purpose lossless compression algorithm and tool"; @@ -72,6 +75,10 @@ stdenv.mkDerivation rec { ''; license = licenses.mit; maintainers = with maintainers; [ freezeboy ]; + pkgConfigModules = [ + "libbrotlidec" + "libbrotlienc" + ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/tools/graphics/vulkan-cts/default.nix b/pkgs/tools/graphics/vulkan-cts/default.nix index a5581e7d6f1dd..003a3c18bfbf6 100644 --- a/pkgs/tools/graphics/vulkan-cts/default.nix +++ b/pkgs/tools/graphics/vulkan-cts/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , fetchurl , cmake +, ffmpeg , libdrm , libglvnd , libffi @@ -29,6 +30,7 @@ let # does not search for system-wide installations. # It also expects the version specified in the repository, which can be incompatible # with the version in nixpkgs (e.g. for SPIRV-Headers), so we don't want to patch in our packages. + # The revisions are extracted from https://github.com/KhronosGroup/VK-GL-CTS/blob/main/external/fetch_sources.py#L290 amber = fetchFromGitHub { owner = "google"; repo = "amber"; @@ -44,43 +46,49 @@ let glslang = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "22d39cd684d136a81778cc17a0226ffad40d1cee"; - hash = "sha256-6LplxN7HOMK1NfeD32P5JAMpCBlouttxLEOT/XTVpLw="; + rev = "a0ad0d7067521fff880e36acfb8ce453421c3f25"; + hash = "sha256-ZKkFHGitLjw5LPJW1TswIJ+KulkrS8C4G3dUF5U/F2c="; }; spirv-tools = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "b930e734ea198b7aabbbf04ee1562cf6f57962f0"; - hash = "sha256-NWpFSRoxtYWi+hLUt9gpw0YScM3shcUwv9yUmbivRb0="; + rev = "f98473ceeb1d33700d01e20910433583e5256030"; + hash = "sha256-RSUmfp9QZ7yRbLdFygz9mDfrgUUT8og+ZD9/6VkghMo="; }; spirv-headers = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "36c0c1596225e728bd49abb7ef56a3953e7ed468"; - hash = "sha256-t1UMJnYONWOtOxc9zUgxr901QFNvqkgurjpFA8UzhYc="; + rev = "87d5b782bec60822aa878941e6b13c0a9a954c9b"; + hash = "sha256-Bv10LM6YXaH2V64oqAcrps23higHzCjlIYYBob5zS4A="; + }; + video-parser = fetchFromGitHub { + owner = "nvpro-samples"; + repo = "vk_video_samples"; + rev = "7d68747d3524842afaf050c5e00a10f5b8c07904"; + hash = "sha256-L5IYDm0bLq+NlNrzozu0VQx8zL1na6AhrkjZKxOWSnU="; }; vulkan-docs = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Docs"; - rev = "135da3a538263ef0d194cab25e2bb091119bdc42"; - hash = "sha256-VZ8JxIuOEG7IjsVcsJOcC+EQeZbd16/+czLcO9t7dY4="; + rev = "9a2e576a052a1e65a5d41b593e693ff02745604b"; + hash = "sha256-DBA2FeV0G/HI8GUMtGYO52jk7wM4HMlKLDA4b+Wmo+k="; }; in stdenv.mkDerivation (finalAttrs: { pname = "vulkan-cts"; - version = "1.3.4.1"; + version = "1.3.5.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "VK-GL-CTS"; rev = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-XUFlYdudyRqa6iupB8N5QkUpumasyLLQEWcr4M4uP1g="; + hash = "sha256-RPuhcLJ5Ad41SFPjJBdghcNBPIGzZBeVWTjySWOp0KA="; }; outputs = [ "out" "lib" ]; prePatch = '' - mkdir -p external/renderdoc/src external/spirv-headers external/vulkan-docs + mkdir -p external/renderdoc/src external/spirv-headers external/video-parser external/vulkan-docs cp -r ${renderdoc} external/renderdoc/src/renderdoc_app.h @@ -89,11 +97,13 @@ stdenv.mkDerivation (finalAttrs: { cp -r ${glslang} external/glslang/src cp -r ${spirv-tools} external/spirv-tools/src cp -r ${spirv-headers} external/spirv-headers/src + cp -r ${video-parser} external/video-parser/src cp -r ${vulkan-docs} external/vulkan-docs/src chmod u+w -R external ''; buildInputs = [ + ffmpeg libdrm libffi libglvnd diff --git a/pkgs/tools/misc/hoard/default.nix b/pkgs/tools/misc/hoard/default.nix index 1eb1080c16b86..f44787924d94c 100644 --- a/pkgs/tools/misc/hoard/default.nix +++ b/pkgs/tools/misc/hoard/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "hoard"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "Hyde46"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WCyu6vW0l8J2Xh8OGXMXVDBs287m2nPlRHeA0j8uvlk="; + sha256 = "sha256-Gm3X6/g5JQJEl7wRvWcO4j5XpROhtfRJ72LNaUeZRGc="; }; buildInputs = [ ncurses openssl ] @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - cargoSha256 = "sha256-Cku9NnrjWT7VmOCryb0sbCQibG+iU9CHT3Cvd6M/9f4="; + cargoHash = "sha256-ZNhUqnsme1rczl3FdFBGGs+vBDFcFEELkPp0/udTfR4="; meta = with lib; { description = "CLI command organizer written in rust"; diff --git a/pkgs/tools/misc/noti/default.nix b/pkgs/tools/misc/noti/default.nix index bebe77faaa7d4..40c060b631551 100644 --- a/pkgs/tools/misc/noti/default.nix +++ b/pkgs/tools/misc/noti/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "noti"; - version = "3.6.0"; + version = "3.7.0"; src = fetchFromGitHub { owner = "variadico"; repo = "noti"; rev = version; - sha256 = "sha256-FhVpw6PJcm0aYQBlN7AUjOkJgCzleOHXIXumSegtxfA="; + hash = "sha256-8CHSbKOiWNYqKBU1kqQm5t02DJq0JfoIaPsU6Ylc46E="; }; - vendorSha256 = null; + vendorHash = null; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix index f2a2adca4c7eb..7bfa19a285580 100644 --- a/pkgs/tools/misc/pspg/default.nix +++ b/pkgs/tools/misc/pspg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pspg"; - version = "5.7.2"; + version = "5.7.4"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = version; - sha256 = "sha256-IwkvQ3zKdnZ0lefmRQCxD5aeMw7aFbUzfFQZG7GtXlo="; + sha256 = "sha256-HZ771Q1UXnRds6o3EnZMyeu7Lt3IDFVFiUTc5snU0Bo="; }; nativeBuildInputs = [ pkg-config installShellFiles ]; @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" ]; postInstall = '' + installManPage pspg.1 installShellCompletion --bash --cmd pspg bash-completion.sh ''; diff --git a/pkgs/tools/misc/vtm/default.nix b/pkgs/tools/misc/vtm/default.nix index 5b6e6efff367b..c3b5ae21f9f49 100644 --- a/pkgs/tools/misc/vtm/default.nix +++ b/pkgs/tools/misc/vtm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "vtm"; - version = "0.9.8r"; + version = "0.9.8t"; src = fetchFromGitHub { owner = "netxs-group"; repo = "vtm"; rev = "v${version}"; - sha256 = "sha256-1nCO8wtARnRCanIEH1XAJBjEnW18Bhm+pcr/EeiRrzY="; + sha256 = "sha256-Q6kwGmxDThsaGIzSPhxd/kKz0nORf6K9lUJMU9CdIXU="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/networking/burpsuite/default.nix b/pkgs/tools/networking/burpsuite/default.nix index 87808b4a2233f..5d8ab54b16243 100644 --- a/pkgs/tools/networking/burpsuite/default.nix +++ b/pkgs/tools/networking/burpsuite/default.nix @@ -1,6 +1,6 @@ { lib, fetchurl, jdk, buildFHSUserEnv, unzip, makeDesktopItem }: let - version = "2022.12.7"; + version = "2023.1.2"; src = fetchurl { name = "burpsuite.jar"; @@ -8,7 +8,7 @@ let "https://portswigger.net/burp/releases/download?productId=100&version=${version}&type=Jar" "https://web.archive.org/web/https://portswigger.net/burp/releases/download?productId=100&version=${version}&type=Jar" ]; - sha256 = "2e354c2aadc58267bc282dde462d20b3aca7108077eb141d49f89a16172763cf"; + sha256 = "620829b1a7bf9228e8671273d2f56f6dee4f16662712bcb4370923cb9d9a7540"; }; name = "burpsuite-${version}"; diff --git a/pkgs/tools/networking/mozillavpn/default.nix b/pkgs/tools/networking/mozillavpn/default.nix index 3763f2ce19461..2702c740dda2c 100644 --- a/pkgs/tools/networking/mozillavpn/default.nix +++ b/pkgs/tools/networking/mozillavpn/default.nix @@ -21,13 +21,13 @@ let pname = "mozillavpn"; - version = "2.13.0"; + version = "2.13.1"; src = fetchFromGitHub { owner = "mozilla-mobile"; repo = "mozilla-vpn-client"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-EwHuNJZpTb7oFOKKDv0zWgklUe95Th97KP9G5DqRokA="; + hash = "sha256-moXCtAFJyNkotYxBZSRP24tNHy5Rb6YW7mSKHDn9oXk="; }; netfilter-go-modules = (buildGoModule { @@ -40,19 +40,19 @@ let inherit src; name = "${pname}-${version}-extension-bridge"; preBuild = "cd extension/bridge"; - hash = "sha256-q6Wf+jrGjGMiDEmnErnDau6Li64Dyq8t2SN1I4rspBY="; + hash = "sha256-/gRP7Th2HnoEQU8psf0797Tq6md4+P5zR13z3U9xlrI="; }; signatureDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}-signature"; preBuild = "cd signature"; - hash = "sha256-Dbu4WX2u3uDDUuZzS/hczypSFkQNnvuj2Su2X0QvSN4="; + hash = "sha256-IBT7qTNbGVutR90wUhm7+9tLehDfrYDHTDkBz8hD6G0="; }; vpngleanDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}-vpnglean"; preBuild = "cd vpnglean"; - hash = "sha256-FDkziDDup+D7Bh+Wclqxn8Dhm/T2DanhjKXIAEFDhzc="; + hash = "sha256-vQDXsoKyawdVFIQZfH8LD+ehGk692ZcAwtou4OoqLNI="; }; in diff --git a/pkgs/tools/networking/openconnect/common.nix b/pkgs/tools/networking/openconnect/common.nix index 146a2fc6ea503..e35c8d71cce9d 100644 --- a/pkgs/tools/networking/openconnect/common.nix +++ b/pkgs/tools/networking/openconnect/common.nix @@ -15,7 +15,7 @@ , zlib , vpnc-scripts , PCSC -, useDefaultExternalBrowser ? true +, useDefaultExternalBrowser ? stdenv.isLinux && stdenv.buildPlatform == stdenv.hostPlatform # xdg-utils doesn't cross-compile , xdg-utils , autoreconfHook }: @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { buildInputs = [ gmp libxml2 stoken zlib (if useOpenSSL then openssl else gnutls) ] ++ lib.optional stdenv.isDarwin PCSC ++ lib.optional stdenv.isLinux p11-kit - ++ lib.optional (stdenv.isLinux && useDefaultExternalBrowser) xdg-utils; + ++ lib.optional useDefaultExternalBrowser xdg-utils; nativeBuildInputs = [ pkg-config autoreconfHook ]; meta = with lib; { diff --git a/pkgs/tools/networking/pingu/default.nix b/pkgs/tools/networking/pingu/default.nix index 87b20daf97953..ca33e4862478c 100644 --- a/pkgs/tools/networking/pingu/default.nix +++ b/pkgs/tools/networking/pingu/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pingu"; - version = "0.0.3"; + version = "0.0.5"; src = fetchFromGitHub { owner = "sheepla"; repo = "pingu"; rev = "v${version}"; - sha256 = "sha256-KYCG3L5x0ZdcyseffB0GoKpLZ/VG/qjMDh10qrLn62Y="; + sha256 = "sha256-iAHj6/qaZgpTfrUZZ9qdsjiNMJ2zH0CzhR4TVSC9oLE="; }; - vendorSha256 = "sha256-HkESF/aADGPixOeh+osFnjzhpz+/4NIsJOjpyyFF9Eg="; + vendorHash = "sha256-xn6la6E0C5QASXxNee1Py/rBs4ls9X/ePeg4Q1e2UyU="; meta = with lib; { description = "Ping command implementation in Go but with colorful output and pingu ascii art"; diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index b0bc3346526cc..6d19aea8040d9 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -7,6 +7,7 @@ , makeWrapper , openresolv , procps +, bash }: stdenv.mkDerivation rec { @@ -24,6 +25,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ bash ]; + makeFlags = [ "DESTDIR=$(out)" "PREFIX=/" diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix index 8771411262166..246e7c9c98100 100644 --- a/pkgs/tools/package-management/nix-index/default.nix +++ b/pkgs/tools/package-management/nix-index/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "nix-index"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "bennofs"; repo = "nix-index"; rev = "v${version}"; - sha256 = "sha256-TDGtnSgY897fRm1BWLlQZQa8v6Wu5/JIF4UH+1CZm4U="; + sha256 = "sha256-/btQP7I4zpIA0MWEQJVYnR1XhyudPnYD5Qx4vrW+Uq8="; }; - cargoSha256 = "sha256-z1lLpZBD4HjO6gLw96wbucfchRgZs26Q8Gl+hpUB1xo="; + cargoSha256 = "sha256-CzLBOLtzIYqdWjTDKHVnc1YXXyj1HqvXzoFYHS0qxog="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl curl sqlite ] diff --git a/pkgs/tools/security/enc/default.nix b/pkgs/tools/security/enc/default.nix new file mode 100644 index 0000000000000..00d6d0211f80c --- /dev/null +++ b/pkgs/tools/security/enc/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, git +, installShellFiles +}: + +buildGoModule rec { + pname = "enc"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "life4"; + repo = "enc"; + rev = "v${version}"; + sha256 = "Tt+J/MnYJNewSl5UeewS0b47NGW2yzfcVHA5+9UQWSs="; + }; + vendorSha256 = "lB6GkE6prfBG7OCOJ1gm23Ee5+nAgmJg8I9Nqe1fsRw="; + + proxyVendor = true; + + nativeBuildInputs = [ installShellFiles ]; + + subPackages = "."; + + ldflags = [ + "-s" + "-w" + "-X github.com/life4/enc/version.GitCommit=${version}" + ]; + + nativeCheckInputs = [ git ]; + + postInstall = '' + installShellCompletion --cmd enc \ + --bash <($out/bin/enc completion bash) \ + --fish <($out/bin/enc completion fish) \ + --zsh <($out/bin/enc completion zsh) + ''; + + meta = with lib; { + homepage = "https://github.com/life4/enc"; + changelog = "https://github.com/life4/enc/releases/tag/v${version}"; + description = "A modern and friendly alternative to GnuPG"; + longDescription = '' + Enc is a CLI tool for encryption, a modern and friendly alternative to GnuPG. + It is easy to use, secure by default and can encrypt and decrypt files using password or encryption keys, + manage and download keys, and sign data. + Our goal was to make encryption available to all engineers without the need to learn a lot of new words, concepts, + and commands. It is the most beginner-friendly CLI tool for encryption, and keeping it that way is our top priority. + ''; + license = licenses.mit; + maintainers = with maintainers; [ rvnstn ]; + }; +} diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index c4e910aa0352f..7f7a18534734e 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -13,18 +13,18 @@ buildGoModule rec { pname = "gopass"; - version = "1.15.3"; + version = "1.15.4"; nativeBuildInputs = [ installShellFiles makeWrapper ]; src = fetchFromGitHub { owner = "gopasspw"; - repo = pname; + repo = "gopass"; rev = "v${version}"; - hash = "sha256-xXXlpr+qwks+hWTPMu9xJVIamLriipzm0XQqOpg8Ipw="; + hash = "sha256-Jm5H36DI6Mqdnm34+GUMEYxEefXLxgnwWo4fhKOayxY="; }; - vendorHash = "sha256-Tb7eIv2G/VfRP1J6taJjAOtZQakA2pcocZ9kZemcZo0="; + vendorHash = "sha256-IJSEU6a3AhA/cVTWXhVtNtvA/D0hyRlqL7pec1Tlyio="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/gopass/git-credential.nix b/pkgs/tools/security/gopass/git-credential.nix index 9e585e27dc278..f0632291a9a48 100644 --- a/pkgs/tools/security/gopass/git-credential.nix +++ b/pkgs/tools/security/gopass/git-credential.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "git-credential-gopass"; - version = "1.15.3"; + version = "1.15.4"; src = fetchFromGitHub { owner = "gopasspw"; - repo = pname; + repo = "git-credential-gopass"; rev = "v${version}"; - hash = "sha256-x8hf1cZw+Hhizp8/vA8qJ+A6ERJUenjMeiuW8IFb/N0="; + hash = "sha256-S97KQ/yCyE1wBDao5KBKWPvoH+DmwpEJRiB6uJCGyFA="; }; - vendorHash = "sha256-YZoz7B12/VhWZRTDEVs2P36FrZoZs4OdPJMkR9H7D5I="; + vendorHash = "sha256-MLnfTdYR4/1qtnNCUs0TwGf5wMqE+V8jNCefeClQKfw="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/gopass/hibp.nix b/pkgs/tools/security/gopass/hibp.nix index c6db9a1d652a3..d28db3bca2e30 100644 --- a/pkgs/tools/security/gopass/hibp.nix +++ b/pkgs/tools/security/gopass/hibp.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gopass-hibp"; - version = "1.15.3"; + version = "1.15.4"; src = fetchFromGitHub { owner = "gopasspw"; - repo = pname; + repo = "gopass-hibp"; rev = "v${version}"; - hash = "sha256-KqW1q3CnniNeQFypeZ6x/ov58SOMfAX5P2MMDKjMYBg="; + hash = "sha256-tqZVzYO3yKyUxfC+pxG+QuW9GBoPBteOdJMchepZ1jo="; }; - vendorHash = "sha256-w1Kxocrwcgn0g6ZBJ7obHraHK397bJltUFkm+/p4H5Y="; + vendorHash = "sha256-48KwEcB5KRUwrKCuyNhhuSVRXE3U5/yVYE2xO05AeF8="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/gopass/jsonapi.nix b/pkgs/tools/security/gopass/jsonapi.nix index f82b00fd201be..7ce9c4cc87095 100644 --- a/pkgs/tools/security/gopass/jsonapi.nix +++ b/pkgs/tools/security/gopass/jsonapi.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "gopass-jsonapi"; - version = "1.15.3"; + version = "1.15.4"; src = fetchFromGitHub { owner = "gopasspw"; - repo = pname; + repo = "gopass-jsonapi"; rev = "v${version}"; - hash = "sha256-5thMhZr/ZlMHMKS2ZOyuua1ZfQ2od7QGSDBQsVsf9Os="; + hash = "sha256-gizUFoe+oAmEKHMlua/zsR+fUltGw2cp98XAgXzCm0U="; }; - vendorHash = "sha256-Gt5nd+3BkNQrdcq5+a70rdBXvCang/2ayZuyyZWON64="; + vendorHash = "sha256-vMrP6rC0uPsRyFZdU2E9mPp031eob+36NcGueNP1Y7o="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/gopass/summon.nix b/pkgs/tools/security/gopass/summon.nix index dc9646ce91dd8..abb8eb653c5bd 100644 --- a/pkgs/tools/security/gopass/summon.nix +++ b/pkgs/tools/security/gopass/summon.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gopass-summon-provider"; - version = "1.15.3"; + version = "1.15.4"; src = fetchFromGitHub { owner = "gopasspw"; - repo = pname; + repo = "gopass-summon-provider"; rev = "v${version}"; - hash = "sha256-YnCX+DDZoKbiwbT8lNvAh0ANNCtEPvaLr9LCvLX8nwo="; + hash = "sha256-gwvrwLJTh58PiRsEC3juhnA/q6cX3nRh/hiunKnPvDQ="; }; - vendorHash = "sha256-YZoz7B12/VhWZRTDEVs2P36FrZoZs4OdPJMkR9H7D5I="; + vendorHash = "sha256-MLnfTdYR4/1qtnNCUs0TwGf5wMqE+V8jNCefeClQKfw="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/opencryptoki/default.nix b/pkgs/tools/security/opencryptoki/default.nix index 140f032a5fde8..dcb1c0bb0cbe8 100644 --- a/pkgs/tools/security/opencryptoki/default.nix +++ b/pkgs/tools/security/opencryptoki/default.nix @@ -1,18 +1,36 @@ -{ lib, stdenv, fetchFromGitHub, openssl, trousers, autoreconfHook, libtool, bison, flex }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, bison +, flex +, openldap +, openssl +, trousers +}: stdenv.mkDerivation rec { pname = "opencryptoki"; - version = "3.8.2"; + version = "3.19.0"; src = fetchFromGitHub { owner = "opencryptoki"; repo = "opencryptoki"; rev = "v${version}"; - sha256 = "1rf7cmibmx636vzv7p54g212478a8wim2lfjf2861hfd0m96nv4l"; + hash = "sha256-ym13I34H3d1JuVBnItkceUbqpjYFhD+mPgWYHPetF7Y="; }; - nativeBuildInputs = [ autoreconfHook libtool bison flex ]; - buildInputs = [ openssl trousers ]; + nativeBuildInputs = [ + autoreconfHook + bison + flex + ]; + + buildInputs = [ + openldap + openssl + trousers + ]; postPatch = '' substituteInPlace configure.ac \ @@ -20,18 +38,22 @@ stdenv.mkDerivation rec { --replace "groupadd" "true" \ --replace "chmod" "true" \ --replace "chgrp" "true" - substituteInPlace usr/lib/Makefile.am --replace "DESTDIR" "out" ''; configureFlags = [ - "--prefix=$(out)" + "--prefix=" "--disable-ccatok" "--disable-icatok" ]; enableParallelBuilding = true; + installFlags = [ + "DESTDIR=${placeholder "out"}" + ]; + meta = with lib; { + changelog = "https://github.com/opencryptoki/opencryptoki/blob/${src.rev}/ChangeLog"; description = "PKCS#11 implementation for Linux"; homepage = "https://github.com/opencryptoki/opencryptoki"; license = licenses.cpl10; diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 42a4e1ccb7559..5c2a2e9b0d898 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "vault"; - version = "1.12.2"; + version = "1.12.3"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "sha256-P/mQoW4lG6U83WEjn5urpFa7q5mN+XOrIOkzf2pslwQ="; + sha256 = "sha256-ZNk9bmZwD1aUY3fYT5Qngoq+9qXgvH/nWSWc30st7nE="; }; - vendorSha256 = "sha256-Z1iwJXbnSqIu/zo7iKLnh0yy1Dh0e5HwXoBkkt9xaqA="; + vendorHash = "sha256-sPpTB3N1w0JppHcwdyLYwSxjzzUAJcBJ5zJ2u4rXXkQ="; subPackages = [ "." ]; diff --git a/pkgs/tools/text/d2/default.nix b/pkgs/tools/text/d2/default.nix index 53cb9b876f42f..27614de6b281f 100644 --- a/pkgs/tools/text/d2/default.nix +++ b/pkgs/tools/text/d2/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "d2"; - version = "0.1.6"; + version = "0.2.0"; src = fetchFromGitHub { owner = "terrastruct"; repo = pname; rev = "v${version}"; - hash = "sha256-bPEEL4t5R/2DnO1IKaTV5NIfT+RL9MVRuoBLlsSPJgM="; + hash = "sha256-1AFioXDIh+qQYhhIaQky2SkGd+amnYdOeoNDU+1+poI="; }; - vendorHash = "sha256-IKISxtAo9zKV6nLGAUNjtNb/YzRK2QO7Wa4RSNthzPU="; + vendorHash = "sha256-PtKKGHzxshahecbfvvo1nGCseap4o8r8raBpFDUSbx4="; ldflags = [ "-s" diff --git a/pkgs/tools/text/mdbook-katex/default.nix b/pkgs/tools/text/mdbook-katex/default.nix index ded440fb79c6c..7b7062a7526af 100644 --- a/pkgs/tools/text/mdbook-katex/default.nix +++ b/pkgs/tools/text/mdbook-katex/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-katex"; - version = "0.3.7"; + version = "0.3.8"; src = fetchCrate { inherit pname version; - hash = "sha256-DZ+5rYRHS5m4Alw6/Ak98UH2FD3EPBGDtB+vD0v8EMk="; + hash = "sha256-LeI46x5M2ZYUOIxuj9bCNwwucRLvoOkdRhsowmVxS68="; }; - cargoHash = "sha256-i6u7kriLFgMSJDfA6JRjTLc3Oi8GfHjE7wEJbTLnMN8="; + cargoHash = "sha256-pEwPnE2EpS+0bw3/SSKOCy8R5xUiG6mBMoup6wbrf+0="; OPENSSL_DIR = "${lib.getDev openssl}"; OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib"; diff --git a/pkgs/tools/text/mdbook-pdf/default.nix b/pkgs/tools/text/mdbook-pdf/default.nix index 020ebdc0ca3dc..d94382524b91e 100644 --- a/pkgs/tools/text/mdbook-pdf/default.nix +++ b/pkgs/tools/text/mdbook-pdf/default.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-pdf"; - version = "0.1.4"; + version = "0.1.5"; src = fetchCrate { inherit pname version; - hash = "sha256-v57Geqd1YCzR9oM97K+Y9OdeokzNc4Kbh0sDP0+vxjU="; + hash = "sha256-822RQKgedxQ+VFNDv20tFUc2Xl56Ivub+/EXNrLRfGM="; }; - cargoHash = "sha256-mZUif1qBREM/5GYJU9m20p3rC3fnbZELcEKatwhoQEU="; + cargoHash = "sha256-mX2EKjuWM1KW8DXFdYFKQfASjdqZCW78F1twZNQQr7o="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/typesetting/tex/texlive/tl2nix.sed b/pkgs/tools/typesetting/tex/texlive/tl2nix.sed index 61150fa8b7cf3..c02ca35296ecc 100644 --- a/pkgs/tools/typesetting/tex/texlive/tl2nix.sed +++ b/pkgs/tools/typesetting/tex/texlive/tl2nix.sed @@ -2,37 +2,47 @@ 1itl: { # no indentation $a} -# trash packages we don't want -/^name .*\./,/^$/d - -# quote package names, as some start with a number :-/ -s/^name (.*)/name "\1"/ - -# extract revision -s/^revision ([0-9]*)$/ revision = \1;/p - # form an attrmap per package -/^name /s/^name (.*)/\1 = {/p -/^$/,1i}; - -# extract hashes of *.tar.xz -s/^containerchecksum (.*)/ sha512.run = "\1";/p -s/^doccontainerchecksum (.*)/ sha512.doc = "\1";/p -s/^srccontainerchecksum (.*)/ sha512.source = "\1";/p -/^runfiles /i\ hasRunfiles = true; - -# number of path components to strip, defaulting to 1 ("texmf-dist/") -/^relocated 1/i\ stripPrefix = 0; - -# extract version and clean unwanted chars from it -/^catalogue-version/y/ \/~/_--/ -/^catalogue-version/s/[\#,:\(\)]//g -s/^catalogue-version_(.*)/ version = "\1";/p - -# extract deps -s/^depend ([^.]*)$/ deps."\1" = tl."\1";/p - -# extract hyphenation patterns and formats -# (this may create duplicate lines, use uniq to remove them) -/^execute\sAddHyphen/i\ hasHyphens = true; -/^execute\sAddFormat/i\ hasFormats = true; +# ignore packages whose name contains "." (such as binaries) +/^name ([^.]+)$/,/^$/{ + # quote package names, as some start with a number :-/ + s/^name (.*)$/"\1" = {/p + /^$/,1i}; + + # extract revision + s/^revision ([0-9]*)$/ revision = \1;/p + + # extract hashes of *.tar.xz + s/^containerchecksum (.*)/ sha512.run = "\1";/p + s/^doccontainerchecksum (.*)/ sha512.doc = "\1";/p + s/^srccontainerchecksum (.*)/ sha512.source = "\1";/p + /^runfiles /i\ hasRunfiles = true; + + # number of path components to strip, defaulting to 1 ("texmf-dist/") + /^relocated 1/i\ stripPrefix = 0; + + # extract version and clean unwanted chars from it + /^catalogue-version/y/ \/~/_--/ + /^catalogue-version/s/[\#,:\(\)]//g + s/^catalogue-version_(.*)/ version = "\1";/p + + # extract deps + /^depend [^.]+$/{ + s/^depend (.+)$/ deps."\1" = tl."\1";/ + + # loop through following depend lines + :next + h ; N # save & read next line + s/\ndepend (.+)\.(.+)$// + s/\ndepend (.+)$/\n deps."\1" = tl."\1";/ + t next # loop if the previous lines matched + + x; p; x # print saved deps + s/^.*\n// # remove deps, resume processing + } + + # extract hyphenation patterns and formats + # (this may create duplicate lines, use uniq to remove them) + /^execute\sAddHyphen/i\ hasHyphens = true; + /^execute\sAddFormat/i\ hasFormats = true; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0ee84cd2bbd16..6a37c7580a0a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5664,6 +5664,8 @@ with pkgs; sqlint = callPackage ../development/tools/sqlint { }; + squawk = callPackage ../development/tools/squawk { }; + antibody = callPackage ../shells/zsh/antibody { }; antigen = callPackage ../shells/zsh/antigen { }; @@ -7040,6 +7042,8 @@ with pkgs; boost = boost172; }; + enc = callPackage ../tools/security/enc { }; + endlessh = callPackage ../servers/endlessh { }; endlessh-go = callPackage ../servers/endlessh-go { }; @@ -10999,8 +11003,7 @@ with pkgs; pocketbase = callPackage ../servers/pocketbase { }; - podman = callPackage ../applications/virtualization/podman/wrapper.nix { }; - podman-unwrapped = callPackage ../applications/virtualization/podman { }; + podman = callPackage ../applications/virtualization/podman { }; podman-compose = python3Packages.callPackage ../applications/virtualization/podman-compose {}; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 542d8414f9121..adf13052e9968 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -102,6 +102,7 @@ mapAliases ({ grpc_google_iam_v1 = grpc-google-iam-v1; # added 2021-08-21 ha-av = throw "ha-av was removed, because it is no longer maintained"; # added 2022-04-06 HAP-python = hap-python; # added 2021-06-01 + hangups = throw "hangups was removed because Google Hangouts has been shut down"; # added 2023-02-13 hbmqtt = throw "hbmqtt was removed because it is no longer maintained"; # added 2021-11-07 hdlparse = throw "hdlparse has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 hyperkitty = throw "Please use pkgs.mailmanPackages.hyperkitty"; # added 2022-04-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index beec1b459dc7e..c3dbf0490d33c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4242,8 +4242,6 @@ self: super: with self; { handout = callPackage ../development/python-modules/handout { }; - hangups = callPackage ../development/python-modules/hangups { }; - hap-python = callPackage ../development/python-modules/hap-python { }; hass-nabucasa = callPackage ../development/python-modules/hass-nabucasa { }; |