Unverified Commit 6653a5a9 authored by figsoda's avatar figsoda Committed by GitHub
Browse files

Merge pull request #206810 from SuperSandro2000/lua-modules 

 luaPlugins: cleanups
parents 42ad7722 2ffe90fd

pkgs/development/lua-modules/overrides.nix

+4 −5
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ with prev; 
    ];

  });



  lush-nvim = prev.luaLib.overrideLuarocks prev.lush-nvim (drv: rec {

  lush-nvim = prev.luaLib.overrideLuarocks prev.lush-nvim (drv: {

    doCheck = false;

  });
@@ -398,8 +398,7 @@ with prev; 
    patches = [

      ./luuid.patch

    ];

    postConfigure = let inherit (prev.luuid) version pname; in

      ''

    postConfigure =  ''

      sed -Ei ''${rockspecFilename} -e 's|lua >= 5.2|lua >= 5.1,|'

    '';

  });

pkgs/top-level/lua-packages.nix

+7 −8
Original line number Diff line number Diff line
@@ -59,19 +59,19 @@ in 
  # a fork of luarocks used to generate nix lua derivations from rockspecs

  luarocks-nix = callPackage ../development/tools/misc/luarocks/luarocks-nix.nix { };



  luxio = callPackage ({ fetchurl, which, pkg-config }: buildLuaPackage {

  luxio = callPackage ({ fetchurl, which, pkg-config }: buildLuaPackage rec {

    pname = "luxio";

    version = "13";



    src = fetchurl {

      url = "https://git.gitano.org.uk/luxio.git/snapshot/luxio-luxio-13.tar.bz2";

      url = "https://git.gitano.org.uk/luxio.git/snapshot/luxio-luxio-${version}.tar.bz2";

      sha256 = "1hvwslc25q7k82rxk461zr1a2041nxg7sn3sw3w0y5jxf0giz2pz";

    };



    nativeBuildInputs = [ which pkg-config ];



    postPatch = ''

      patchShebangs .

      patchShebangs const-proc.lua

    '';



    preBuild = ''
@@ -91,14 +91,14 @@ in 
      maintainers = with maintainers; [ richardipsum ];

      platforms = platforms.unix;

    };

  });

  }) {};



  nfd = callPackage ../development/lua-modules/nfd {

    inherit (pkgs.gnome) zenity;

    inherit (pkgs.darwin.apple_sdk.frameworks) AppKit;

  };



  vicious = (callPackage ({ fetchFromGitHub }: stdenv.mkDerivation rec {

  vicious = callPackage ({ fetchFromGitHub }: stdenv.mkDerivation rec {

    pname = "vicious";

    version = "2.5.1";
@@ -124,6 +124,5 @@ in 
      maintainers = with maintainers; [ makefu mic92 McSinyx ];

      platforms = platforms.linux;

    };

  }) {});



  }) {};

}