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: 79083b4b75da
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 66c04a191ec6
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Apr 26, 2020

  1. libmpack: fix source url 

    Repository was moved to an organization.
    @teto
    teto committed Apr 26, 2020
    Copy the full SHA
    a5e6e5c View commit details

  2. luaPackages.mpack: use system mpack 

    the luarocks package uses the builtin command and discards the Makefile.
While using the makefile one needs to set some more flags.
    @teto
    teto committed Apr 26, 2020
    Copy the full SHA
    9a3d12e View commit details

Commits on May 17, 2020

  1. Merge pull request #86075 from teto/mpack 

    minor tweaks to develop on luaPackages.mpack
    @teto
    teto authored May 17, 2020
    Copy the full SHA
    66c04a1 View commit details
Showing with 7 additions and 1 deletion.
  1. +1 −1 pkgs/development/libraries/libmpack/default.nix
  2. +6 −0 pkgs/development/lua-modules/overrides.nix
2 changes: 1 addition & 1 deletion pkgs/development/libraries/libmpack/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
pname = "libmpack";
version = "1.0.5";
src = fetchFromGitHub {
owner = "tarruda";
owner = "libmpack";
repo = "libmpack";
rev = version;
sha256 = "0rai5djdkjz7bsn025k5489in7r1amagw1pib0z4qns6b52kiar2";
6 changes: 6 additions & 0 deletions pkgs/development/lua-modules/overrides.nix
View file
Original file line number Diff line number Diff line change
@@ -294,6 +294,12 @@ with super;
};
});

mpack = super.mpack.override({
buildInputs = [ pkgs.libmpack ];
# the rockspec doesn't use the makefile so you may need to export more flags
USE_SYSTEM_LUA = "yes";
USE_SYSTEM_MPACK = "yes";
});

rapidjson = super.rapidjson.override({
preBuild = ''