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

Commits on Nov 6, 2019

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    34a69b9 View commit details
  2. hybridreverb2: build with gcc8

    The bundled JUCE library fails to build with gcc9.
    fpletz committed Nov 6, 2019
    Copy the full SHA
    00c0eb0 View commit details
  3. adlplug: fix build with gcc9

    fpletz committed Nov 6, 2019
    Copy the full SHA
    cf824d6 View commit details

Commits on Nov 7, 2019

  1. Copy the full SHA
    f254791 View commit details
  2. Copy the full SHA
    e9eb9eb View commit details
  3. helm: build with gcc8

    fpletz committed Nov 7, 2019
    Copy the full SHA
    095f2b9 View commit details
  4. Copy the full SHA
    ef4c3a3 View commit details
10 changes: 10 additions & 0 deletions pkgs/applications/audio/adlplug/default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, libjack2, alsaLib
, freetype, libX11, libXrandr, libXinerama, libXext, libXcursor
, fetchpatch
, adlplugChip ? "-DADLplug_CHIP=OPL3"
, pname ? "ADLplug" }:

@@ -15,6 +16,15 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};

patches = [
(fetchpatch {
url = "https://raw.githubusercontent.com/jpcima/ADLplug/83636c55bec1b86cabf634b9a6d56d07f00ecc61/resources/patch/juce-gcc9.patch";
sha256 = "15hkdb76n9lgjsrpczj27ld9b4804bzrgw89g95cj4sc8wwkplyy";
extraPrefix = "thirdparty/JUCE/";
stripLen = 1;
})
];

cmakeFlags = [ adlplugChip ];

buildInputs = [
2 changes: 2 additions & 0 deletions pkgs/development/libraries/mediastreamer/default.nix
Original file line number Diff line number Diff line change
@@ -38,6 +38,8 @@ stdenv.mkDerivation rec {
"-DGIT_VERSION=\"v2.14.0\""
"-Wno-error=deprecated-declarations"
"-Wno-error=cast-function-type"
"-Wno-error=stringop-truncation"
"-Wno-error=stringop-overflow"
];
NIX_LDFLAGS = "-lXext -lssl";

2 changes: 1 addition & 1 deletion pkgs/development/libraries/zookeeper_mt/default.nix
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {

setSourceRoot = "export sourceRoot=${zookeeper.name}/src/c";

NIX_CFLAGS_COMPILE = [ "-Wno-error=format-overflow" ];
NIX_CFLAGS_COMPILE = [ "-Wno-error=format-overflow" "-Wno-error=stringop-truncation" ];

buildInputs = [ zookeeper bash ];

2 changes: 2 additions & 0 deletions pkgs/development/python-modules/numcodecs/default.nix
Original file line number Diff line number Diff line change
@@ -7,6 +7,7 @@
, msgpack
, pytest
, python
, gcc8
}:

buildPythonPackage rec {
@@ -21,6 +22,7 @@ buildPythonPackage rec {
nativeBuildInputs = [
setuptools_scm
cython
gcc8
];

propagatedBuildInputs = [
1 change: 1 addition & 0 deletions pkgs/tools/graphics/appleseed/default.nix
Original file line number Diff line number Diff line change
@@ -33,6 +33,7 @@ in stdenv.mkDerivation rec {
"-Wno-error=class-memaccess"
"-Wno-error=maybe-uninitialized"
"-Wno-error=catch-value"
"-Wno-error=stringop-truncation"
];

cmakeFlags = [
8 changes: 6 additions & 2 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
@@ -3961,7 +3961,9 @@ in

hwinfo = callPackage ../tools/system/hwinfo { };

hybridreverb2 = callPackage ../applications/audio/hybridreverb2 { };
hybridreverb2 = callPackage ../applications/audio/hybridreverb2 {
stdenv = gcc8Stdenv;
};

hylafaxplus = callPackage ../servers/hylafaxplus { };

@@ -24304,7 +24306,9 @@ in

hatari = callPackage ../misc/emulators/hatari { };

helm = callPackage ../applications/audio/helm { };
helm = callPackage ../applications/audio/helm {
stdenv = gcc8Stdenv;
};

helmfile = callPackage ../applications/networking/cluster/helmfile { };

4 changes: 3 additions & 1 deletion pkgs/top-level/python-packages.nix
Original file line number Diff line number Diff line change
@@ -4075,7 +4075,9 @@ in {

numba = callPackage ../development/python-modules/numba { };

numcodecs = callPackage ../development/python-modules/numcodecs { };
numcodecs = callPackage ../development/python-modules/numcodecs {
inherit (pkgs) gcc8;
};

numexpr = callPackage ../development/python-modules/numexpr { };