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: e4966591ef6c
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: 3cee0ce5b870
Choose a head ref
  • 5 commits
  • 5 files changed
  • 4 contributors

Commits on Sep 23, 2018

  1. nvidia-x11: Fix vulkan VK_KHR_xcb_surface 

    Fixes the issue: NixOS/nixpkgs#39149

Problem was that the Nvidia driver did not find the libxcb-glx at runtime.

(cherry picked from commit bda072c)
    @danme
    danme committed Sep 23, 2018
    Copy the full SHA
    3ab740a View commit details

Commits on Sep 24, 2018

  1. Revert "python: ldappool: 2.2.0 -> 2.3.0" 

    This reverts commit 29acc83.

(cherry picked from commit fbeb94d)
    @Ma27 @Mic92
    Ma27 authored and Mic92 committed Sep 24, 2018
    Copy the full SHA
    34cafee View commit details

  2. Merge pull request #47247 from danme/release-18.09 

    nvidia-x11: Fix vulkan VK_KHR_xcb_surface
    @Mic92
    Mic92 authored Sep 24, 2018
    Copy the full SHA
    ea48d53 View commit details

  3. python3Packages.py3exiv2: fix build 

    Recent boost versions name their `python3` shared objects
`boost_python3x` rather than `boost_python3`.

See https://hydra.nixos.org/build/80712295
Addresses #45960

(cherry picked from commit 50f23da)
    @Ma27 @Mic92
    Ma27 authored and Mic92 committed Sep 24, 2018
    Copy the full SHA
    20d144b View commit details

  4. eiskaltdcpp: mark linux only 

    The darwin build fails and other platforms will probably run into
similar issues.

    Determining if the Q_WS_QWS exist failed with the following output:
    Change Dir: /tmp/nix-build-eiskaltdcpp-2.2.10.drv-0/source/build/CMakeFiles/CMakeTmp

    Run Build Command:"/nix/store/qfag24z6xsr6jkyi8gb4cv62rp945rbk-gnumake-4.2.1/bin/make" "cmTC_14e67/fast"
    /nix/store/qfag24z6xsr6jkyi8gb4cv62rp945rbk-gnumake-4.2.1/bin/make -f CMakeFiles/cmTC_14e67.dir/build.make CMakeFiles/cmTC_14e67.dir/build
    make[1]: Entering directory '/private/tmp/nix-build-eiskaltdcpp-2.2.10.drv-0/source/build/CMakeFiles/CMakeTmp'
    Building CXX object CMakeFiles/cmTC_14e67.dir/CheckSymbolExists.cxx.o
    /nix/store/2gdwhdzhy4iwkp7fh8v6gy6nxj1zi9pv-clang-wrapper-5.0.2/bin/clang++   -I/nix/store/8dzqilmdr0p3qmmrxh51xk7wli6grm0i-qt-4.8.7/include -F/nix/store/8dzqilmdr0p3qmmrxh51xk7wli6grm0i-qt-4.8.7/lib  -std=c++0x -pipe -Wformat -Werror=format-security  -arch x86_64   -o CMakeFiles/cmTC_14e67.dir/CheckSymbolExists.cxx.o -c /tmp/nix-build-eiskaltdcpp-2.2.10.drv-0/source/build/CMakeFiles/CMakeTmp/CheckSymbolExists.cxx
    /tmp/nix-build-eiskaltdcpp-2.2.10.drv-0/source/build/CMakeFiles/CMakeTmp/CheckSymbolExists.cxx:8:19: error: use of undeclared identifier 'Q_WS_QWS'
      return ((int*)(&Q_WS_QWS))[argc];
                  ^

/cc ZHF #45961

(cherry picked from commit 52ad963)
    @LnL7 @Mic92
    LnL7 authored and Mic92 committed Sep 24, 2018
    Copy the full SHA
    3cee0ce View commit details
9 changes: 5 additions & 4 deletions pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt4, boost, bzip2, libX11
, fetchpatch, pcre-cpp, libidn, lua5, miniupnpc, aspell, gettext }:
, fetchpatch, libiconv, pcre-cpp, libidn, lua5, miniupnpc, aspell, gettext }:

stdenv.mkDerivation rec {
name = "eiskaltdcpp-${version}";
@@ -12,8 +12,9 @@ stdenv.mkDerivation rec {
sha256 = "1mqz0g69njmlghcra3izarjxbxi1jrhiwn4ww94b8jv8xb9cv682";
};

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake qt4 boost bzip2 libX11 pcre-cpp libidn lua5 miniupnpc aspell gettext ];
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ qt4 boost bzip2 libX11 pcre-cpp libidn lua5 miniupnpc aspell gettext ]
++ stdenv.lib.optional stdenv.isDarwin libiconv;

patches = [
(fetchpatch {
@@ -59,6 +60,6 @@ stdenv.mkDerivation rec {
description = "A cross-platform program that uses the Direct Connect and ADC protocols";
homepage = https://github.com/eiskaltdcpp/eiskaltdcpp;
license = licenses.gpl3Plus;
platforms = platforms.all;
platforms = platforms.linux;
};
}
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/ldappool/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,12 +3,12 @@

buildPythonPackage rec {
name = "ldappool-${version}";
version = "2.3.0";
version = "2.2.0";

src = fetchPypi {
pname = "ldappool";
inherit version;
sha256 = "899d38e891372981166350c813ff5ce2ad8ac383311edccda8102362c1d60952";
sha256 = "1akmzf51cjfvmd0nvvm562z1w9vq45zsx6fa72kraqgsgxhnrhqz";
};

nativeBuildInputs = [ pbr ];
9 changes: 7 additions & 2 deletions pkgs/development/python-modules/py3exiv2/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ buildPythonPackage, isPy3k, fetchPypi, stdenv, exiv2, boost, libcxx }:
{ buildPythonPackage, isPy3k, fetchPypi, stdenv, exiv2, boost, libcxx, substituteAll, python }:

buildPythonPackage rec {
pname = "py3exiv2";
@@ -16,7 +16,12 @@ buildPythonPackage rec {
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";

# fix broken libboost_python3 detection
patches = [ ./setup.patch ];
patches = [
(substituteAll {
src = ./setup.patch;
version = "3${stdenv.lib.versions.minor python.version}";
})
];

meta = {
homepage = "https://launchpad.net/py3exiv2";
2 changes: 1 addition & 1 deletion pkgs/development/python-modules/py3exiv2/setup.patch
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
return l.replace('libboost', 'boost')

-libboost = get_libboost_name()
+libboost = 'boost_python3'
+libboost = 'boost_python@version@'

setup(
name='py3exiv2',
2 changes: 1 addition & 1 deletion pkgs/os-specific/linux/nvidia-x11/generic.nix
View file
Original file line number Diff line number Diff line change
@@ -62,7 +62,7 @@ let
dontStrip = true;
dontPatchELF = true;

libPath = makeLibraryPath [ xorg.libXext xorg.libX11 xorg.libXv xorg.libXrandr zlib stdenv.cc.cc ];
libPath = makeLibraryPath [ xorg.libXext xorg.libX11 xorg.libXv xorg.libXrandr xorg.libxcb zlib stdenv.cc.cc ];

nativeBuildInputs = [ perl nukeReferences ]
++ optionals (!libsOnly) kernel.moduleBuildDependencies;