Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6cffb5072f9a
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bad2bed08cee
Choose a head ref
  • 6 commits
  • 5 files changed
  • 5 contributors

Commits on Nov 20, 2019

  1. routinator: 0.6.1 -> 0.6.2

    @0x4A6F
    0x4A6F committed Nov 20, 2019
    Copy the full SHA
    3ef31af View commit details

Commits on Nov 21, 2019

  1. libreoffice: add dev output with headers

    @mmilata
    mmilata committed Nov 21, 2019
    Copy the full SHA
    879c47c View commit details

  2. lua-5.3: add patch for CVE-2019-6706 

    Taken from
http://launchpadlibrarian.net/417853567/lua5.3_5.3.3-1_5.3.3-1ubuntu0.18.10.1.diff.gz
and adapted to our needs.

Re #54799
    Christian Kauhaus committed Nov 21, 2019
    Copy the full SHA
    9a1e925 View commit details

  3. Merge pull request #73831 from 0x4A6F/master-routinator 

    routinator: 0.6.1 -> 0.6.2
    @mmahut
    mmahut authored Nov 21, 2019
    Copy the full SHA
    689900c View commit details

  4. Merge pull request #73848 from mmilata/libreoffice-headers 

    libreoffice: add dev output with headers
    @7c6f434c
    7c6f434c authored Nov 21, 2019
    Copy the full SHA
    403b208 View commit details

  5. Merge pull request #73859 from ckauhaus/lua-5.3-CVE-2019-6706 

    lua-5.3: add patch for CVE-2019-6706
    @7c6f434c
    7c6f434c authored Nov 21, 2019
    Copy the full SHA
    bad2bed View commit details
5 changes: 5 additions & 0 deletions pkgs/applications/office/libreoffice/default.nix
View file
Original file line number Diff line number Diff line change
@@ -65,6 +65,8 @@ in stdenv.mkDerivation rec {

inherit (primary-src) src;

outputs = [ "out" "dev" ];

# For some reason librdf_redland sometimes refers to rasqal.h instead
# of rasqal/rasqal.h
NIX_CFLAGS_COMPILE = [ "-I${librdf_rasqal}/include/rasqal" ] ++ lib.optional stdenv.isx86_64 "-mno-fma";
@@ -276,6 +278,9 @@ in stdenv.mkDerivation rec {
cp -r sysui/desktop/icons "$out/share"
sed -re 's@Icon=libreoffice(dev)?[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop
mkdir -p $dev
cp -r include $dev
'';

configureFlags = [
5 changes: 5 additions & 0 deletions pkgs/applications/office/libreoffice/still.nix
View file
Original file line number Diff line number Diff line change
@@ -65,6 +65,8 @@ in stdenv.mkDerivation rec {

inherit (primary-src) src;

outputs = [ "out" "dev" ];

# For some reason librdf_redland sometimes refers to rasqal.h instead
# of rasqal/rasqal.h
NIX_CFLAGS_COMPILE = [ "-I${librdf_rasqal}/include/rasqal" ];
@@ -276,6 +278,9 @@ in stdenv.mkDerivation rec {
cp -r sysui/desktop/icons "$out/share"
sed -re 's@Icon=libreoffice(dev)?[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop
mkdir -p $dev
cp -r include $dev
'';

configureFlags = [
22 changes: 22 additions & 0 deletions pkgs/development/interpreters/lua-5/CVE-2019-6706.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
--- a/src/lapi.c
+++ b/src/lapi.c
@@ -1285,14 +1285,14 @@ LUA_API void *lua_upvalueid (lua_State *

LUA_API void lua_upvaluejoin (lua_State *L, int fidx1, int n1,
int fidx2, int n2) {
- LClosure *f1;
- UpVal **up1 = getupvalref(L, fidx1, n1, &f1);
+ UpVal **up1 = getupvalref(L, fidx1, n1, NULL); /* the last parameter not needed */
UpVal **up2 = getupvalref(L, fidx2, n2, NULL);
+ if (*up1 == *up2) return; /* Already joined */
+ (*up2)->refcount++;
+ if (upisopen(*up2)) (*up2)->u.open.touched = 1;
+ luaC_upvalbarrier(L, *up2);
luaC_upvdeccount(L, *up1);
*up1 = *up2;
- (*up1)->refcount++;
- if (upisopen(*up1)) (*up1)->u.open.touched = 1;
- luaC_upvalbarrier(L, *up1);
}


7 changes: 5 additions & 2 deletions pkgs/development/interpreters/lua-5/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# similar to interpreters/python/default.nix
{ stdenv, lib, callPackage, fetchurl }:
{ stdenv, lib, callPackage, fetchurl, fetchpatch }:
let
dsoPatch51 = fetchurl {
url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/lua-arch.patch?h=packages/lua51";
@@ -18,7 +18,10 @@ in rec {
lua5_3 = callPackage ./interpreter.nix {
sourceVersion = { major = "5"; minor = "3"; patch = "5"; };
hash = "0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac";
patches = lib.optionals stdenv.isDarwin [ ./5.2.darwin.patch ] ;
patches =
lib.optionals stdenv.isDarwin [ ./5.2.darwin.patch ] ++ [
./CVE-2019-6706.patch
];
postConfigure = lib.optionalString (!stdenv.isDarwin) ''
cat ${./lua-5.3-dso.make} >> src/Makefile
sed -e 's/ALL_T *= */& $(LUA_SO)/' -i src/Makefile
6 changes: 3 additions & 3 deletions pkgs/servers/routinator/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,16 +2,16 @@

rustPlatform.buildRustPackage rec {
pname = "routinator";
version = "0.6.1";
version = "0.6.2";

src = fetchFromGitHub {
owner = "NLnetLabs";
repo = pname;
rev = "v${version}";
sha256 = "1knqgq8xrlvwfc3y2hki6p0zr4dblm7max37y01p3bf641gs748z";
sha256 = "0v0j8lv1l7mxxwv7ycissya0rrvjqidb37dylqqy4zvirmk1b2av";
};

cargoSha256 = "13sx7mbirhrd0is7gvnk0mir5qizbhrlvsn0v55ibf3bybjsb644";
cargoSha256 = "19333br2r27s0rsv7imsv2y1j9gmljy4v8bqybvblrw1vc5961kq";

meta = with stdenv.lib; {
description = "An RPKI Validator written in Rust";