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: 3108f741fe67
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: c922e20b5d39
Choose a head ref
  • 4 commits
  • 4 files changed
  • 2 contributors

Commits on Sep 28, 2018

  1. fox: mark broken on darwin 

        Undefined symbols for architecture x86_64:
      "_MPCreateSemaphore", referenced from:
          FX::FXSemaphore::FXSemaphore(int) in FXThread.o
          FX::FXSemaphore::FXSemaphore(int) in FXThread.o
      "_MPDeleteSemaphore", referenced from:
          FX::FXSemaphore::~FXSemaphore() in FXThread.o
          FX::FXSemaphore::~FXSemaphore() in FXThread.o
      "_MPSignalSemaphore", referenced from:
          FX::FXSemaphore::post() in FXThread.o
      "_MPWaitOnSemaphore", referenced from:
          FX::FXSemaphore::wait() in FXThread.o
          FX::FXSemaphore::trywait() in FXThread.o
    ld: symbol(s) not found for architecture x86_64

/cc ZHF #45961

(cherry picked from commit 6390b8b)
    @LnL7 @xeji
    LnL7 authored and xeji committed Sep 28, 2018
    Copy the full SHA
    c1f9ffc View commit details

  2. flpsed: mark linux only 

    Doesn't build on darwin and probably other platforms.

    GsWidget.H:26:3: error: 'Atom' does not name a type; did you mean 'tm'?
       Atom atoms[5];
       ^~~~
       tm
    GsWidget.cxx: In member function 'void GsWidget::setProps()':
    GsWidget.cxx:47:2: error: 'atoms' was not declared in this scope
      atoms[0] = XInternAtom(fl_display,"GHOSTVIEW" , false);
      ^~~~~

/cc ZHF #45961

(cherry picked from commit cd78d0c)
    @LnL7 @xeji
    LnL7 authored and xeji committed Sep 28, 2018
    Copy the full SHA
    e087e20 View commit details

  3. freedroidrpg: don't build on hydra 

    Similar to some other builds, sdl-config gets stuck and times out.

    checking for sdl-config... /nix/store/q2hm1ka0qxs2gv5bmrxj7j80lygk4b5z-SDL-1.2.15-dev/bin/sdl-config
    building of '/nix/store/m2d7v0n5hd2498vfxp18i37p7r1lf76p-freedroidrpg-0.16.1' timed out after 7200 seconds of silence

/cc ZHF #45961

(cherry picked from commit 9b99819)
    @LnL7 @xeji
    LnL7 authored and xeji committed Sep 28, 2018
    Copy the full SHA
    f5db056 View commit details

  4. exempi: patch CVE-2018-12648, enable tests on linux (#47496) 

    (cherry picked from commit e502c72)
    @symphorien @xeji
    symphorien authored and xeji committed Sep 28, 2018
    Copy the full SHA
    c922e20 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/editors/flpsed/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{stdenv, fetchurl, fltk13, ghostscript}:
{ stdenv, fetchurl, fltk13, ghostscript, xlibs }:

stdenv.mkDerivation rec {
name = "flpsed-${version}";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
description = "WYSIWYG PostScript annotator";
homepage = http://flpsed.org/flpsed.html;
license = licenses.gpl3;
platforms = platforms.mesaPlatforms;
platforms = platforms.linux;
maintainers = with maintainers; [ fuuzetsu ];
};
}
15 changes: 14 additions & 1 deletion pkgs/development/libraries/exempi/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, expat, zlib, boost, libiconv, darwin }:
{ stdenv, fetchurl, fetchpatch, expat, zlib, boost, libiconv, darwin }:

stdenv.mkDerivation rec {
name = "exempi-2.4.5";
@@ -8,13 +8,26 @@ stdenv.mkDerivation rec {
sha256 = "07i29xmg8bqriviaf4vi1mwha4lrw85kfla29cfym14fp3z8aqa0";
};

patches = [
# CVE-2018-12648
# https://gitlab.freedesktop.org/libopenraw/exempi/issues/9
# remove with exempi > 2.4.5
(fetchpatch {
name = "CVE-2018-12648.patch";
url = https://gitlab.freedesktop.org/libopenraw/exempi/commit/8ed2f034705fd2d032c81383eee8208fd4eee0ac.patch;
sha256 = "1nh8irk5p26868875wq5n8g92xp4crfb8fdd8gyna76ldyzqqx9q";
})
];

configureFlags = [
"--with-boost=${boost.dev}"
];

buildInputs = [ expat zlib boost ]
++ stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.CoreServices ];

doCheck = stdenv.isLinux;

meta = with stdenv.lib; {
homepage = https://libopenraw.freedesktop.org/wiki/Exempi/;
platforms = platforms.linux ++ platforms.darwin;
1 change: 1 addition & 0 deletions pkgs/development/libraries/fox/default.nix
View file
Original file line number Diff line number Diff line change
@@ -32,6 +32,7 @@ stdenv.mkDerivation rec {
homepage = http://fox-toolkit.org;
license = licenses.lgpl3;
maintainers = [];
broken = stdenv.isDarwin;
platforms = platforms.all;
};
}
1 change: 1 addition & 0 deletions pkgs/games/freedroidrpg/default.nix
View file
Original file line number Diff line number Diff line change
@@ -58,5 +58,6 @@ in stdenv.mkDerivation rec {

maintainers = with maintainers; [ jtojnar ];
platforms = platforms.unix;
hydraPlatforms = platforms.linux; # sdl-config times out on darwin
};
}