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

Commits on Aug 5, 2019

  1. lua*Packages.cqueues: 20171014.52-0 -> 20190731.52-0 

    My main aim is to fix it on aarch64 NixOS.
The patch was included in the release.
    @vcunat
    vcunat committed Aug 5, 2019
    Copy the full SHA
    265692f View commit details

  2. lua*Packages.luaossl: 20190612-0 -> 20190731-0 

    My main aim is to fix it on aarch64 NixOS.
    @vcunat
    vcunat committed Aug 5, 2019
    Copy the full SHA
    81b91fe View commit details

  3. knot-resolver: 4.1.0 -> 4.2.0 

    No really significant changes, I'd say:
https://gitlab.labs.nic.cz/knot/knot-resolver/tags/v4.2.0
    @vcunat
    vcunat committed Aug 5, 2019
    Copy the full SHA
    577508e View commit details
Showing with 8 additions and 17 deletions.
  1. +6 −6 pkgs/development/lua-modules/generated-packages.nix
  2. +0 −9 pkgs/development/lua-modules/overrides.nix
  3. +2 −2 pkgs/servers/dns/knot-resolver/default.nix
12 changes: 6 additions & 6 deletions pkgs/development/lua-modules/generated-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -196,11 +196,11 @@ coxpcall = buildLuarocksPackage {
};
cqueues = buildLuarocksPackage {
pname = "cqueues";
version = "20171014.52-0";
version = "20190731.52-0";

src = fetchurl {
url = https://luarocks.org/cqueues-20171014.52-0.src.rock;
sha256 = "0q3iy1ja20nq2sn2n6badzhjq5kni86pfc09n5g2c46q9ja3vfzx";
url = https://luarocks.org/cqueues-20190731.52-0.src.rock;
sha256 = "07rs34amsxf2bc5ccqdad0c63c70737r54316cbd9qh1a2wbvz8s";
};
disabled = (lua.luaversion != "5.2");
propagatedBuildInputs = [ lua ];
@@ -926,11 +926,11 @@ luafilesystem = buildLuarocksPackage {
};
luaossl = buildLuarocksPackage {
pname = "luaossl";
version = "20190612-0";
version = "20190731-0";

src = fetchurl {
url = https://luarocks.org/luaossl-20190612-0.src.rock;
sha256 = "0q47rsfjnx3rbbr9jl2j5nlj56c6mwmnnma9m4rrbsza2p98wb4s";
url = https://luarocks.org/luaossl-20190731-0.src.rock;
sha256 = "0gardlh547hah5w4kfsdg05jmxzrxr21macqigcmp5hw1l67jn5m";
};
propagatedBuildInputs = [ lua ];

9 changes: 0 additions & 9 deletions pkgs/development/lua-modules/overrides.nix
View file
Original file line number Diff line number Diff line change
@@ -40,15 +40,6 @@ with super;
{ name = "CRYPTO"; dep = pkgs.openssl; }
{ name = "OPENSSL"; dep = pkgs.openssl; }
];
patches = [
# https://github.com/wahern/cqueues/issues/216 &
# https://github.com/wahern/cqueues/issues/217
(pkgs.fetchpatch {
name = "find-version-fix.patch";
url = "https://github.com/wahern/cqueues/pull/217.patch";
sha256 = "0068ql0jlxmjkvhzydyy52sjd0k4vad6b8w4y5szpbv4vb2lzcsc";
})
];
disabled = luaOlder "5.1" || luaAtLeast "5.4";
# Upstream rockspec is pointlessly broken into separate rockspecs, per Lua
# version, which doesn't work well for us, so modify it
4 changes: 2 additions & 2 deletions pkgs/servers/dns/knot-resolver/default.nix
View file
Original file line number Diff line number Diff line change
@@ -23,11 +23,11 @@ exportLuaPathsFor = luaPkgs: ''

unwrapped = stdenv.mkDerivation rec {
name = "knot-resolver-${version}";
version = "4.1.0";
version = "4.2.0";

src = fetchurl {
url = "https://secure.nic.cz/files/knot-resolver/${name}.tar.xz";
sha256 = "2fe470f9bb1007667cdd448f758087244b7195a0234c2b100a9beeed0a2d3e68";
sha256 = "b37ff9ceefbaa4e4527d183fb1bbb63e641d34d9889ce92715128bc1423c7ef4";
};

outputs = [ "out" "dev" ];