diff options
| author | Robin Gloster <mail@glob.in> | 2018-03-22 14:12:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-22 14:12:57 +0100 |
| commit | 76ea0e1b2e0f5b4fd7ab6c43ae5704918bf3413c (patch) | |
| tree | 9794c7f9833dac879a538e22daf0b67d0943785d /pkgs/top-level | |
| parent | 7b539c06297f1ca84e475fb1018fe50114f2447e (diff) | |
| parent | faaf32a0ee3ed3693e87def1fabd6b8a89e29a41 (diff) | |
| download | nixpkgs-76ea0e1b2e0f5b4fd7ab6c43ae5704918bf3413c.tar nixpkgs-76ea0e1b2e0f5b4fd7ab6c43ae5704918bf3413c.tar.gz nixpkgs-76ea0e1b2e0f5b4fd7ab6c43ae5704918bf3413c.tar.bz2 nixpkgs-76ea0e1b2e0f5b4fd7ab6c43ae5704918bf3413c.tar.lz nixpkgs-76ea0e1b2e0f5b4fd7ab6c43ae5704918bf3413c.tar.xz nixpkgs-76ea0e1b2e0f5b4fd7ab6c43ae5704918bf3413c.tar.zst nixpkgs-76ea0e1b2e0f5b4fd7ab6c43ae5704918bf3413c.zip | |
Merge pull request #32960 from florianjacob/prosody-0.10
Prosody 0.10.0
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/lua-packages.nix | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae0d11474b6..1936a57dded 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12269,8 +12269,9 @@ with pkgs; hyp = callPackage ../servers/http/hyp/default.nix { }; prosody = callPackage ../servers/xmpp/prosody { - lua5 = lua5_1; - inherit (lua51Packages) luasocket luasec luaexpat luafilesystem luabitop luaevent luazlib luadbi; + # _compat can probably be removed on next minor version after 0.10.0 + lua5 = lua5_2_compat; + inherit (lua52Packages) luasocket luasec luaexpat luafilesystem luabitop luaevent luadbi; }; biboumi = callPackage ../servers/xmpp/biboumi { }; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 0cc4482f402..a23de670836 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -167,15 +167,14 @@ let }; luaevent = buildLuaPackage rec { - version = "0.4.3"; + version = "0.4.4"; name = "luaevent-${version}"; - disabled = isLua52; src = fetchFromGitHub { owner = "harningt"; repo = "luaevent"; rev = "v${version}"; - sha256 = "1c1n2zqx5rwfwkqaq1jj8gvx1vswvbihj2sy445w28icz1xfhpik"; + sha256 = "1krzxr0jkv3gmhpckp02byhdd9s5dd0hpyqc8irc8i79dd8x0p53"; }; preBuild = '' |