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

Commits on Nov 7, 2019

  1. bibletime: 2.10.1 -> 2.11.2

    @fpletz
    fpletz committed Nov 7, 2019
    Copy the full SHA
    8162d6c View commit details

  2. qpid-cpp: 1.37.0 -> 1.39.0, fix build with gcc9

    @fpletz
    fpletz committed Nov 7, 2019
    Copy the full SHA
    602bccd View commit details
Showing with 14 additions and 16 deletions.
  1. +11 −14 pkgs/applications/misc/bibletime/default.nix
  2. +3 −2 pkgs/servers/amqp/qpid-cpp/default.nix
25 changes: 11 additions & 14 deletions pkgs/applications/misc/bibletime/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,25 @@
{stdenv, fetchurl, cmake, sword, qt4, boost, clucene_core}:
{ stdenv, fetchurl, cmake, pkgconfig, sword, boost, clucene_core
, qtbase, qttools, qtsvg, qtwebkit
}:

stdenv.mkDerivation rec {

version = "2.10.1";
version = "2.11.2";

pname = "bibletime";

src = fetchurl {
url = "mirror://sourceforge/bibletime/${pname}-${version}.tar.xz";
sha256 = "14fayy5h1ffjxin669q56fflxn4ij1irgn60cygwx2y02cwxbll6";
sha256 = "1s5bvmwbz1gyp3ml8sghpc00h8nhdvx2iyq96iri30kwx1y1jy6i";
};

prePatch = ''
patchShebangs .;
'';
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [
sword boost clucene_core
qtbase qttools qtsvg qtwebkit
];

preConfigure = ''
export CLUCENE_HOME=${clucene_core};
export SWORD_HOME=${sword};
'';

buildInputs = [ cmake sword qt4 boost clucene_core ];

cmakeFlags = "-DUSE_QT_WEBKIT=ON -DCMAKE_BUILD_TYPE=Debug";
cmakeFlags = [ "-DUSE_QT_WEBKIT=ON" ];

meta = {
description = "A Qt4 Bible study tool";
5 changes: 3 additions & 2 deletions pkgs/servers/amqp/qpid-cpp/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

let
name = "qpid-cpp-${version}";
version = "1.37.0";
version = "1.39.0";

src = fetchurl {
url = "mirror://apache/qpid/cpp/${version}/${name}.tar.gz";
sha256 = "1s4hyi867i0lqn81c1crrk6fga1gmsv61675vjv5v41skz56lrsb";
sha256 = "088dx1l6myrksbhpr15bs09j6qm8vdliqwjp2ja5amym47md103r";
};

meta = with stdenv.lib; {
@@ -40,6 +40,7 @@ let
"-Wno-error=unused-function"
"-Wno-error=ignored-qualifiers"
"-Wno-error=catch-value"
"-Wno-error=deprecated-copy"
];
};