Commit 280a9f86 authored by K900's avatar K900
Browse files

Merge remote-tracking branch 'origin/master' into staging-next

parents 50ef4f65 3e32c07b

.git-blame-ignore-revs

+3 −0
Original line number Diff line number Diff line
@@ -40,6 +40,9 @@ d1c1a0c656ccd8bd3b25d3c4287f2d075faf3cf3 
# fix indentation in meteor default.nix

a37a6de881ec4c6708e6b88fd16256bbc7f26bbd



# pkgs/stdenv/make-derivation: Reindent

b4cc2a2479a7ab0f6440b2e1319221920ef72699



# treewide: automatically md-convert option descriptions

2e751c0772b9d48ff6923569adfa661b030ab6a2

maintainers/maintainer-list.nix

+23 −0
Original line number Diff line number Diff line
@@ -6265,6 +6265,12 @@ 
    github = "elliottslaughter";

    githubId = 3129;

  };

  ElliottSullingeFarrall = {

    name = "Elliott Sullinge-Farrall";

    email = "elliott.chalford@gmail.com";

    github = "ElliottSullingeFarrall";

    githubId = 108588212;

  };

  elliottvillars = {

    email = "elliottvillars@gmail.com";

    github = "elliottvillars";
@@ -16361,6 +16367,11 @@ 
    githubId = 33182938;

    name = "Pankaj";

  };

  PapayaJackal = {

    github = "PapayaJackal";

    githubId = 145766029;

    name = "PapayaJackal";

  };

  paperdigits = {

    email = "mica@silentumbrella.com";

    github = "paperdigits";
@@ -19740,6 +19751,12 @@ 
    github = "shikanime";

    githubId = 22115108;

  };

  shiphan = {

    email = "timlin940511@gmail.com";

    name = "Shiphan";

    github = "Shiphan";

    githubId = 140245703;

  };

  shiryel = {

    email = "contact@shiryel.com";

    name = "Shiryel";
@@ -23282,6 +23299,12 @@ 
    githubId = 28888242;

    name = "WORLDofPEACE";

  };

  WoutSwinkels = {

    name = "Wout Swinkels";

    email = "nixpkgs@woutswinkels.com";

    github = "WoutSwinkels";

    githubId = 113464111;

  };

  wozeparrot = {

    email = "wozeparrot@gmail.com";

    github = "wozeparrot";

pkgs/applications/editors/tijolo/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -53,5 +53,6 @@ crystal.buildCrystalPackage rec { 
    license = licenses.mit;

    mainProgram = "tijolo";

    maintainers = with maintainers; [ sund3RRR ];

    broken = true;

  };

}

pkgs/applications/editors/vim/plugins/blink-cmp/Cargo.lock

+217 −124
Original line number Diff line number Diff line 
# This file is automatically @generated by Cargo.

# It is not intended for manual editing.

version = 3

version = 4



[[package]]

name = "aho-corasick"
@@ -11,6 +11,12 @@ dependencies = [ 
 "memchr",

]



[[package]]

name = "autocfg"

version = "1.4.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"



[[package]]

name = "bincode"

version = "1.3.3"
@@ -33,41 +39,45 @@ dependencies = [ 
name = "blink-cmp-fuzzy"

version = "0.1.0"

dependencies = [

 "c-marshalling",

 "frizbee",

 "generator",

 "heed",

 "lazy_static",

 "libc",

 "lua-marshalling",

 "mlua",

 "regex",

 "serde",

]



[[package]]

name = "bstr"

version = "1.10.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c"

dependencies = [

 "memchr",

 "serde",

]



[[package]]

name = "byteorder"

version = "1.5.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"



[[package]]

name = "c-marshalling"

version = "0.2.0"

source = "git+https://github.com/distil/rust_lua_ffi#30820cdc9282c938dbf8e7bb0a1ea31cf56b25a6"

dependencies = [

 "libc",

 "quick-error",

]



[[package]]

name = "cc"

version = "1.1.29"

version = "1.1.31"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "58e804ac3194a48bb129643eb1d62fcc20d18c6b8c181704489353d13120bcd1"

checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f"

dependencies = [

 "shlex",

]



[[package]]

name = "cfg-if"

version = "1.0.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"



[[package]]

name = "crossbeam-queue"

version = "0.3.11"
@@ -83,27 +93,6 @@ version = "0.8.20" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"



[[package]]

name = "derive-c-marshalling-library"

version = "0.1.0"

source = "git+https://github.com/distil/rust_lua_ffi#30820cdc9282c938dbf8e7bb0a1ea31cf56b25a6"

dependencies = [

 "libc",

 "quote 0.4.2",

 "syn 0.12.15",

]



[[package]]

name = "derive-lua-marshalling"

version = "0.2.0"

source = "git+https://github.com/distil/rust_lua_ffi#30820cdc9282c938dbf8e7bb0a1ea31cf56b25a6"

dependencies = [

 "derive-c-marshalling-library",

 "libc",

 "quote 0.4.2",

 "syn 0.12.15",

]



[[package]]

name = "doxygen-rs"

version = "0.4.2"
@@ -125,22 +114,12 @@ dependencies = [ 
[[package]]

name = "frizbee"

version = "0.1.0"

source = "git+https://github.com/saghen/frizbee#d910bec53b867ce06702520c7e05f9862bf78dd9"

source = "git+https://github.com/saghen/frizbee#cc186f587fd2e844ab5c3b8f164e5e3b1f846605"

dependencies = [

 "memchr",

 "smith_waterman_macro",

]



[[package]]

name = "generator"

version = "2.0.0"

source = "git+https://github.com/distil/rust_lua_ffi#30820cdc9282c938dbf8e7bb0a1ea31cf56b25a6"

dependencies = [

 "parser",

 "quote 0.4.2",

 "syn 0.12.15",

]



[[package]]

name = "heed"

version = "0.20.5"
@@ -203,9 +182,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" 


[[package]]

name = "libc"

version = "0.2.159"

version = "0.2.161"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"

checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"



[[package]]

name = "lmdb-master-sys"
@@ -219,14 +198,13 @@ dependencies = [ 
]



[[package]]

name = "lua-marshalling"

version = "0.3.0"

source = "git+https://github.com/distil/rust_lua_ffi#30820cdc9282c938dbf8e7bb0a1ea31cf56b25a6"

name = "lock_api"

version = "0.4.12"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"

dependencies = [

 "c-marshalling",

 "derive-lua-marshalling",

 "lazy_static",

 "libc",

 "autocfg",

 "scopeguard",

]



[[package]]
@@ -235,6 +213,51 @@ version = "2.7.4" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"



[[package]]

name = "mlua"

version = "0.10.0-rc.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "7928e85ce39d4ea4d11dc850fde2acb503fc114a76f53e8606dd9ed237a491e9"

dependencies = [

 "bstr",

 "mlua-sys",

 "mlua_derive",

 "num-traits",

 "parking_lot",

 "rustc-hash",

]



[[package]]

name = "mlua-sys"

version = "0.6.3"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "ebe026d6bd1583a9cf9080e189030ddaea7e6f5f0deb366a8e26f8a26c4135b8"

dependencies = [

 "cc",

 "cfg-if",

 "pkg-config",

]



[[package]]

name = "mlua_derive"

version = "0.10.0-rc.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "e110f0addea6b8d2f2378717e94f63b36a74274760b4895943b3a5650fa7513e"

dependencies = [

 "proc-macro2",

 "quote",

 "syn 2.0.85",

]



[[package]]

name = "num-traits"

version = "0.2.19"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"

dependencies = [

 "autocfg",

]



[[package]]

name = "once_cell"

version = "1.20.2"
@@ -252,12 +275,26 @@ dependencies = [ 
]



[[package]]

name = "parser"

version = "0.2.0"

source = "git+https://github.com/distil/rust_lua_ffi#30820cdc9282c938dbf8e7bb0a1ea31cf56b25a6"

name = "parking_lot"

version = "0.12.3"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"

dependencies = [

 "lock_api",

 "parking_lot_core",

]



[[package]]

name = "parking_lot_core"

version = "0.9.10"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"

dependencies = [

 "quote 0.4.2",

 "syn 0.12.15",

 "cfg-if",

 "libc",

 "redox_syscall",

 "smallvec",

 "windows-targets",

]



[[package]]
@@ -294,9 +331,9 @@ checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" 
dependencies = [

 "phf_generator",

 "phf_shared",

 "proc-macro2 1.0.87",

 "quote 1.0.37",

 "syn 2.0.79",

 "proc-macro2",

 "quote",

 "syn 2.0.85",

]



[[package]]
@@ -309,45 +346,27 @@ dependencies = [ 
]



[[package]]

name = "proc-macro2"

version = "0.2.3"

name = "pkg-config"

version = "0.3.31"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "cd07deb3c6d1d9ff827999c7f9b04cdfd66b1b17ae508e14fe47b620f2282ae0"

dependencies = [

 "unicode-xid",

]

checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"



[[package]]

name = "proc-macro2"

version = "1.0.87"

version = "1.0.89"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a"

checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"

dependencies = [

 "unicode-ident",

]



[[package]]

name = "quick-error"

version = "1.2.3"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"



[[package]]

name = "quote"

version = "0.4.2"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "1eca14c727ad12702eb4b6bfb5a232287dcf8385cb8ca83a3eeaf6519c44c408"

dependencies = [

 "proc-macro2 0.2.3",

]



[[package]]

name = "quote"

version = "1.0.37"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"

dependencies = [

 "proc-macro2 1.0.87",

 "proc-macro2",

]



[[package]]
@@ -365,6 +384,15 @@ version = "0.6.4" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"



[[package]]

name = "redox_syscall"

version = "0.5.7"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"

dependencies = [

 "bitflags",

]



[[package]]

name = "regex"

version = "1.11.0"
@@ -394,37 +422,49 @@ version = "0.8.5" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"



[[package]]

name = "rustc-hash"

version = "2.0.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"



[[package]]

name = "ryu"

version = "1.0.18"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"



[[package]]

name = "scopeguard"

version = "1.2.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"



[[package]]

name = "serde"

version = "1.0.210"

version = "1.0.213"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"

checksum = "3ea7893ff5e2466df8d720bb615088341b295f849602c6956047f8f80f0e9bc1"

dependencies = [

 "serde_derive",

]



[[package]]

name = "serde_derive"

version = "1.0.210"

version = "1.0.213"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"

checksum = "7e85ad2009c50b58e87caa8cd6dac16bdf511bbfb7af6c33df902396aa480fa5"

dependencies = [

 "proc-macro2 1.0.87",

 "quote 1.0.37",

 "syn 2.0.79",

 "proc-macro2",

 "quote",

 "syn 2.0.85",

]



[[package]]

name = "serde_json"

version = "1.0.128"

version = "1.0.132"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"

checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"

dependencies = [

 "itoa",

 "memchr",
@@ -444,46 +484,41 @@ version = "0.3.11" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"



[[package]]

name = "smallvec"

version = "1.13.2"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"



[[package]]

name = "smith_waterman_macro"

version = "0.1.0"

source = "git+https://github.com/saghen/frizbee#d910bec53b867ce06702520c7e05f9862bf78dd9"

source = "git+https://github.com/saghen/frizbee#cc186f587fd2e844ab5c3b8f164e5e3b1f846605"

dependencies = [

 "proc-macro2 1.0.87",

 "quote 1.0.37",

 "proc-macro2",

 "quote",

 "syn 1.0.109",

]



[[package]]

name = "syn"

version = "0.12.15"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "c97c05b8ebc34ddd6b967994d5c6e9852fa92f8b82b3858c39451f97346dcce5"

dependencies = [

 "proc-macro2 0.2.3",

 "quote 0.4.2",

 "unicode-xid",

]



[[package]]

name = "syn"

version = "1.0.109"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"

dependencies = [

 "proc-macro2 1.0.87",

 "quote 1.0.37",

 "proc-macro2",

 "quote",

 "unicode-ident",

]



[[package]]

name = "syn"

version = "2.0.79"

version = "2.0.85"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"

checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56"

dependencies = [

 "proc-macro2 1.0.87",

 "quote 1.0.37",

 "proc-macro2",

 "quote",

 "unicode-ident",

]
@@ -532,12 +567,6 @@ dependencies = [ 
 "tinyvec",

]



[[package]]

name = "unicode-xid"

version = "0.1.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"



[[package]]

name = "url"

version = "2.5.2"
@@ -570,3 +599,67 @@ name = "winapi-x86_64-pc-windows-gnu" 
version = "0.4.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"



[[package]]

name = "windows-targets"

version = "0.52.6"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"

dependencies = [

 "windows_aarch64_gnullvm",

 "windows_aarch64_msvc",

 "windows_i686_gnu",

 "windows_i686_gnullvm",

 "windows_i686_msvc",

 "windows_x86_64_gnu",

 "windows_x86_64_gnullvm",

 "windows_x86_64_msvc",

]



[[package]]

name = "windows_aarch64_gnullvm"

version = "0.52.6"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"



[[package]]

name = "windows_aarch64_msvc"

version = "0.52.6"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"



[[package]]

name = "windows_i686_gnu"

version = "0.52.6"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"



[[package]]

name = "windows_i686_gnullvm"

version = "0.52.6"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"



[[package]]

name = "windows_i686_msvc"

version = "0.52.6"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"



[[package]]

name = "windows_x86_64_gnu"

version = "0.52.6"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"



[[package]]

name = "windows_x86_64_gnullvm"

version = "0.52.6"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"



[[package]]

name = "windows_x86_64_msvc"

version = "0.52.6"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"

pkgs/applications/editors/vim/plugins/blink-cmp/default.nix

+3 −4
Original line number Diff line number Diff line
@@ -6,12 +6,12 @@ 
  vimUtils,

}:

let

  version = "0.3.1";

  version = "0.4.1";

  src = fetchFromGitHub {

    owner = "Saghen";

    repo = "blink.cmp";

    rev = "refs/tags/v${version}";

    hash = "sha256-bvhLOM0NMx5S069uX2OecEpzYaR3hV4r8nCIPD0f0XQ=";

    hash = "sha256-jWRXrFh83lTRsgm0gSZuRORltqo147BAg1zVcd7rIMg=";

  };

  libExt = if stdenv.hostPlatform.isDarwin then "dylib" else "so";

  blink-fuzzy-lib = rustPlatform.buildRustPackage {
@@ -24,8 +24,7 @@ let 
    cargoLock = {

      lockFile = ./Cargo.lock;

      outputHashes = {

        "c-marshalling-0.2.0" = "sha256-eL6nkZOtuLLQ0r31X7uroUUDYZsWOJ9KNXl4NCVNRuw=";

        "frizbee-0.1.0" = "sha256-zO2S282DVCjnALMXu3GxmAfjCXsPNUZ7+xgiqITfGmU=";

        "frizbee-0.1.0" = "sha256-eYth+xOIqwGPkH39OxNCMA9zE+5CTNpsuX8Ue/mySIA=";

      };

    };

  };