Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f2aa671ad784
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3ca771cdc37d
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Jun 24, 2019

  1. luaPackages.luaexpat: Downgrade to fix issue and match typical distros 

    Matches version used on most distros. Fixes an issue with prosody.
Detailed reasoning behind this can be found
[here](#63108 (comment)).
    @Shados
    Shados authored and Matthieu Coudron committed Jun 24, 2019
    Copy the full SHA
    3ca771c View commit details
Showing with 6 additions and 6 deletions.
  1. +1 −1 maintainers/scripts/luarocks-packages.csv
  2. +5 −5 pkgs/development/lua-modules/generated-packages.nix
2 changes: 1 addition & 1 deletion maintainers/scripts/luarocks-packages.csv
View file
Original file line number Diff line number Diff line change
@@ -40,7 +40,7 @@ luadbi-mysql,,,,,
luadbi-postgresql,,,,,
luadbi-sqlite3,,,,,
luaevent,,,,,
luaexpat,,,,,flosse
luaexpat,,,1.3.0-1,,arobyn flosse
luaffi,,http://luarocks.org/dev,,,
luafilesystem,,,1.7.0-2,,flosse vcunat
luaossl,,,,lua5_1,vcunat
10 changes: 5 additions & 5 deletions pkgs/development/lua-modules/generated-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -867,19 +867,19 @@ luaevent = buildLuarocksPackage {
};
luaexpat = buildLuarocksPackage {
pname = "luaexpat";
version = "1.3.3-1";
version = "1.3.0-1";

src = fetchurl {
url = https://luarocks.org/luaexpat-1.3.3-1.src.rock;
sha256 = "0ahpfnby9qqgj22bajmrqvqq70nx19388lmjm9chljfzszy0hndm";
url = https://luarocks.org/luaexpat-1.3.0-1.src.rock;
sha256 = "15jqz5q12i9zvjyagzwz2lrpzya64mih8v1hxwr0wl2gsjh86y5a";
};
disabled = (luaOlder "5.0");
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua ];

meta = with stdenv.lib; {
homepage = "http://www.keplerproject.org/luaexpat/";
description = "XML Expat parsing";
maintainers = with maintainers; [ flosse ];
maintainers = with maintainers; [ arobyn flosse ];
license = {
fullName = "MIT/X11";
};