Unverified Commit cde0926a authored by Gaétan Lepage's avatar Gaétan Lepage Committed by GitHub
Browse files

luaPackages.image-nvim: 1.3.0-1 -> 1.4.0 (#484742)

parents 822b129b 6fda8678

maintainers/scripts/luarocks-packages.csv

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ gitsigns.nvim,,,,,5.1, 
grug-far.nvim,,,,,5.1,teto

haskell-tools.nvim,,,,,5.1,mrcjkb

http,,,,0.4-0,,vcunat

image.nvim,,,,,5.1,teto

inspect,,,,,,

jsregexp,,,,0.0.7-2,,

ldbus,,,https://luarocks.org/dev,,,

pkgs/development/lua-modules/generated-packages.nix

+0 −33
Original line number Diff line number Diff line
@@ -1010,39 +1010,6 @@ final: prev: { 
    }

  ) { };



  image-nvim = callPackage (

    {

      buildLuarocksPackage,

      fetchurl,

      fetchzip,

      luaOlder,

      magick,

    }:

    buildLuarocksPackage {

      pname = "image.nvim";

      version = "1.3.0-1";

      knownRockspec =

        (fetchurl {

          url = "mirror://luarocks/image.nvim-1.3.0-1.rockspec";

          sha256 = "1ls3v5xcgmqmscqk5prpj0q9sy0946rfb2dfva5f1axb5x4jbvj9";

        }).outPath;

      src = fetchzip {

        url = "https://github.com/3rd/image.nvim/archive/v1.3.0.zip";

        sha256 = "0fbc3wvzsck8bbz8jz5piy68w1xmq5cnhaj1lw91d8hkyjryrznr";

      };



      disabled = luaOlder "5.1";

      propagatedBuildInputs = [ magick ];



      meta = {

        homepage = "https://github.com/3rd/image.nvim";

        description = "🖼️ Bringing images to Neovim.";

        maintainers = with lib.maintainers; [ teto ];

        license.fullName = "MIT";

      };

    }

  ) { };



  inspect = callPackage (

    {

      buildLuarocksPackage,

pkgs/development/lua-modules/image-nvim/default.nix

0 → 100644
+35 −0
Original line number Diff line number Diff line 
{

  buildLuarocksPackage,

  fetchFromGitHub,

  lib,

  lua,

  luaOlder,

  luajitPackages,

}:

buildLuarocksPackage rec {

  pname = "image.nvim";

  version = "1.4.0";



  disabled = luaOlder "5.1";

  knownRockspec = "image.nvim-scm-1.rockspec";

  rockspecVersion = "scm-1";



  src = fetchFromGitHub {

    owner = "3rd";

    repo = "image.nvim";

    tag = "v${version}";

    hash = "sha256-EaDeY8aP41xHTw5epqYjaBqPYs6Z2DABzSaVOnG6D6I=";

  };



  propagatedBuildInputs = [

    lua

    luajitPackages.magick

  ];



  meta = {

    homepage = "https://github.com/3rd/image.nvim";

    description = "🖼️ Bringing images to Neovim.";

    maintainers = with lib.maintainers; [ SuperSandro2000 ];

    license.fullName = "MIT";

  };

}

pkgs/development/lua-modules/overrides.nix

+0 −55
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
  libxcrypt,

  libyaml,

  lua-language-server,

  luajitPackages,

  mariadb,

  mpfr,

  neovim-unwrapped,
@@ -251,13 +250,6 @@ in 
    '';

  };



  image-nvim = prev.image-nvim.overrideAttrs {

    propagatedBuildInputs = [

      lua

      luajitPackages.magick

    ];

  };



  ldbus = prev.ldbus.overrideAttrs (old: {

    luarocksConfig = old.luarocksConfig // {

      variables = {
@@ -952,53 +944,6 @@ in 
    '';

  };



  readline = final.callPackage (

    {

      buildLuarocksPackage,

      fetchurl,

      luaAtLeast,

      luaOlder,

      luaposix,

    }:

    # upstream broken, can't be generated, so moved out from the generated set

    buildLuarocksPackage {

      pname = "readline";

      version = "3.2-0";

      knownRockspec =

        (fetchurl {

          url = "mirror://luarocks/readline-3.2-0.rockspec";

          sha256 = "1r0sgisxm4xd1r6i053iibxh30j7j3rcj4wwkd8rzkj8nln20z24";

        }).outPath;

      src = fetchurl {

        # the rockspec url doesn't work because 'www.' is not covered by the certificate so

        # I manually removed the 'www' prefix here

        url = "http://pjb.com.au/comp/lua/readline-3.2.tar.gz";

        sha256 = "1mk9algpsvyqwhnq7jlw4cgmfzj30l7n2r6ak4qxgdxgc39f48k4";

      };



      luarocksConfig.variables = rec {

        READLINE_INCDIR = "${readline.dev}/include";

        HISTORY_INCDIR = READLINE_INCDIR;

      };

      unpackCmd = ''

        unzip "$curSrc"

        tar xf *.tar.gz

      '';



      propagatedBuildInputs = [

        luaposix

        readline.out

      ];



      meta = {

        homepage = "https://pjb.com.au/comp/lua/readline.html";

        description = "Interface to the readline library";

        license.fullName = "MIT/X11";

        broken = (luaOlder "5.1") || (luaAtLeast "5.5");

      };

    }

  ) { };



  rocks-dev-nvim = prev.rocks-dev-nvim.overrideAttrs {



    # E5113: Error while calling lua chunk [...] pl.path requires LuaFileSystem

pkgs/development/lua-modules/readline/default.nix

0 → 100644
+45 −0
Original line number Diff line number Diff line 
{

  buildLuarocksPackage,

  fetchurl,

  luaAtLeast,

  luaOlder,

  luaposix,

  readline,

}:

# upstream broken, can't be generated, so moved out from the generated set

buildLuarocksPackage {

  pname = "readline";

  version = "3.2-0";

  knownRockspec =

    (fetchurl {

      url = "mirror://luarocks/readline-3.2-0.rockspec";

      sha256 = "1r0sgisxm4xd1r6i053iibxh30j7j3rcj4wwkd8rzkj8nln20z24";

    }).outPath;

  src = fetchurl {

    # the rockspec url doesn't work because 'www.' is not covered by the certificate so

    # I manually removed the 'www' prefix here

    url = "http://pjb.com.au/comp/lua/readline-3.2.tar.gz";

    sha256 = "1mk9algpsvyqwhnq7jlw4cgmfzj30l7n2r6ak4qxgdxgc39f48k4";

  };



  luarocksConfig.variables = rec {

    READLINE_INCDIR = "${readline.dev}/include";

    HISTORY_INCDIR = READLINE_INCDIR;

  };

  unpackCmd = ''

    unzip "$curSrc"

    tar xf *.tar.gz

  '';



  propagatedBuildInputs = [

    luaposix

    readline.out

  ];



  meta = {

    homepage = "https://pjb.com.au/comp/lua/readline.html";

    description = "Interface to the readline library";

    license.fullName = "MIT/X11";

    broken = (luaOlder "5.1") || (luaAtLeast "5.5");

  };

}