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

Commits on Mar 11, 2019

  1. libcmis: 0.5.0 -> 0.5.2, new home, fix and enable tests + man 

    https://github.com/tdf/libcmis/releases/tag/v0.5.2
https://github.com/tdf/libcmis/releases/tag/v0.5.1
    @dtzWill
    dtzWill committed Mar 11, 2019
    Copy the full SHA
    af15ad9 View commit details

Commits on Mar 14, 2019

  1. Merge pull request #57349 from dtzWill/update/libcmis-0.5.2 

    libcmis: 0.5.0 -> 0.5.2, new home, fix and enable tests + man
    @dtzWill
    dtzWill authored Mar 14, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4c024d6 View commit details
Showing with 17 additions and 51 deletions.
  1. +17 −12 pkgs/development/libraries/libcmis/default.nix
  2. +0 −39 pkgs/development/libraries/libcmis/gcc5.patch
29 changes: 17 additions & 12 deletions pkgs/development/libraries/libcmis/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,27 @@
{ stdenv, fetchurl, boost, libxml2, pkgconfig, curl, autoreconfHook }:
{ stdenv, fetchFromGitHub, boost, libxml2, pkgconfig, docbook2x, curl, autoreconfHook, cppunit }:

stdenv.mkDerivation rec {
name = "libcmis-${version}";
version = "0.5.0";
pname = "libcmis";
version = "0.5.2";

src = fetchurl {
url = "mirror://sourceforge/libcmis/${name}.tar.gz";
sha256 = "1dprvk4fibylv24l7gr49gfqbkfgmxynvgssvdcycgpf7n8h4zm8";
src = fetchFromGitHub {
owner = "tdf";
repo = pname;
rev = "v${version}";
sha256 = "0s6prfh55hn11vrs72ph1gs01v0vngly81pvyjm5v1sgwymdxx57";
};

patches = [ ./gcc5.patch ];
nativeBuildInputs = [ autoreconfHook pkgconfig docbook2x ];
buildInputs = [ boost libxml2 curl cppunit ];

nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ boost libxml2 curl ];
configureFlags = [ "--without-man" "--with-boost=${boost.dev}" "--disable-werror" "--disable-tests" ];
configureFlags = [
"--disable-werror"
"DOCBOOK2MAN=${docbook2x}/bin/docbook2man"
];

# Cppcheck cannot find all the include files (use --check-config for details)
doCheck = false;
doCheck = true;

enableParallelBuilding = true;

meta = with stdenv.lib; {
description = "C++ client library for the CMIS interface";
39 changes: 0 additions & 39 deletions pkgs/development/libraries/libcmis/gcc5.patch
View file

This file was deleted.