diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-12-15 19:32:38 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-12-15 19:32:38 +0100 |
commit | 6b8e2555ef013b579cda57025b17d662e0f1fe1f (patch) | |
tree | 5a83c673af26c9976acd5a5dfa20e09e06898047 /nixpkgs/pkgs/development/lua-modules | |
parent | 66ca7a150b5c051f0728f13134e6265cc46f370c (diff) | |
parent | 02357adddd0889782362d999628de9d309d202dc (diff) | |
download | nixlib-6b8e2555ef013b579cda57025b17d662e0f1fe1f.tar nixlib-6b8e2555ef013b579cda57025b17d662e0f1fe1f.tar.gz nixlib-6b8e2555ef013b579cda57025b17d662e0f1fe1f.tar.bz2 nixlib-6b8e2555ef013b579cda57025b17d662e0f1fe1f.tar.lz nixlib-6b8e2555ef013b579cda57025b17d662e0f1fe1f.tar.xz nixlib-6b8e2555ef013b579cda57025b17d662e0f1fe1f.tar.zst nixlib-6b8e2555ef013b579cda57025b17d662e0f1fe1f.zip |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/development/lua-modules')
-rw-r--r-- | nixpkgs/pkgs/development/lua-modules/generated-packages.nix | 33 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/lua-modules/overrides.nix | 10 |
2 files changed, 43 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/lua-modules/generated-packages.nix b/nixpkgs/pkgs/development/lua-modules/generated-packages.nix index 0bd4d885504e..b1d016ba7dca 100644 --- a/nixpkgs/pkgs/development/lua-modules/generated-packages.nix +++ b/nixpkgs/pkgs/development/lua-modules/generated-packages.nix @@ -514,6 +514,39 @@ buildLuarocksPackage { }; }) {}; +fzy = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: +buildLuarocksPackage { + pname = "fzy"; + version = "1.0-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/fzy-1.0-1.rockspec"; + sha256 = "1v050lm3rn1k5wwi2nimlbp1b7j6b8vkwvhc1npyqzj8jv7w9w9n"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/swarn/fzy-lua", + "rev": "2d018a56e3a240bca4b3142a723b2f56392f3e4a", + "date": "2023-01-29T07:05:02-06:00", + "path": "/nix/store/nz19glmy52jbz46wl7xf0jd8m441klf0-fzy-lua", + "sha256": "0xknm5513a6nlariwxgqndf3wj8xals26swjsv06hx133ihna01x", + "hash": "sha256-PQBlYRwjdGjA1pJrIzRVHUk+XLP4dR6zotaoEUqpdnY=", + "fetchLFS": false, + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path" "sha256"]) ; + + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = { + homepage = "https://github.com/swarn/fzy-lua"; + description = "A fuzzy string-matching algorithm"; + maintainers = with lib.maintainers; [ mrcjkb ]; + license.fullName = "MIT"; + }; +}) {}; + gitsigns-nvim = callPackage({ buildLuarocksPackage, fetchgit, lua }: buildLuarocksPackage { pname = "gitsigns.nvim"; diff --git a/nixpkgs/pkgs/development/lua-modules/overrides.nix b/nixpkgs/pkgs/development/lua-modules/overrides.nix index d6b95eb6593d..72334f6d0ff0 100644 --- a/nixpkgs/pkgs/development/lua-modules/overrides.nix +++ b/nixpkgs/pkgs/development/lua-modules/overrides.nix @@ -126,6 +126,16 @@ with prev; ''; }); + # Until https://github.com/swarn/fzy-lua/pull/8 is merged, + # we have to invoke busted manually + fzy = prev.fzy.overrideAttrs(oa: { + doCheck = true; + nativeCheckInputs = [ prev.busted ]; + checkPhase = '' + busted test/test.lua + ''; + }); + http = prev.http.overrideAttrs (oa: { patches = [ (fetchpatch { |