Skip to content

Commit

Permalink
cmake: 3.7.2 -> 3.8.2
Browse files Browse the repository at this point in the history 
Tested several cmake-built packages, and all seems OK;
hopefully there won't be many problems.
  • Loading branch information
@vcunat
vcunat committed Jun 11, 2017
1 parent 8779c10 commit d74d871
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions pkgs/development/tools/build-managers/cmake/default.nix
View file
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig
, bzip2, curl, expat, libarchive, xz, zlib, libuv
, bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash
# darwin attributes
, ps
, isBootstrap ? false
Expand All @@ -12,7 +12,7 @@ with stdenv.lib;

let
os = stdenv.lib.optionalString;
majorVersion = "3.7";
majorVersion = "3.8";
minorVersion = "2";
version = "${majorVersion}.${minorVersion}";
in
Expand All @@ -24,8 +24,8 @@ stdenv.mkDerivation rec {

src = fetchurl {
url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
# from https://cmake.org/files/v3.7/cmake-3.7.2-SHA-256.txt
sha256 = "dc1246c4e6d168ea4d6e042cfba577c1acd65feea27e56f5ff37df920c30cae0";
# from https://cmake.org/files/v3.8/cmake-3.8.2-SHA-256.txt
sha256 = "da3072794eb4c09f2d782fcee043847b99bb4cf8d4573978d9b2024214d6e92d";
};

prePatch = optionalString (!useSharedLibraries) ''
Expand All @@ -44,7 +44,7 @@ stdenv.mkDerivation rec {

buildInputs =
[ setupHook pkgconfig ]
++ optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv ]
++ optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv rhash ]
++ optional useNcurses ncurses
++ optional useQt4 qt4;

Expand Down

12 comments on commit d74d871

@joachifm
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rhash fails eval on macos

@vcunat
Copy link
Member Author

@vcunat vcunat commented on d74d871 Jun 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, I had tested the tarball job, but newly broken packages wouldn't be shown by that.

I see no reason why rhash shouldn't work; can you/someone try building cmake with ALLOW_BROKEN or changing rhash's meta.platforms?

@joachifm
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was about to simply push a change setting platforms = unix but noticed that homebrew does some patching in their rhash recipe.

@joachifm
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That said, it might still be an improvement, as it'd unbreak eval at least :)

@vcunat
Copy link
Member Author

@vcunat vcunat commented on d74d871 Jun 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If cmake failed to build with it, it wouldn't be much of an improvement.

@joachifm
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not for macos users, but it would fix our github ci ... not that anybody cares about that.

@vcunat
Copy link
Member Author

@vcunat vcunat commented on d74d871 Jun 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, let me try it on Hydra when noone else is fast enough. cmake is a very important package.

@vcunat
Copy link
Member Author

@vcunat vcunat commented on d74d871 Jun 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pushed 90cf4cf

@vcunat
Copy link
Member Author

@vcunat vcunat commented on d74d871 Jun 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/cc rhash maintainer @andrewrk, just in case.

@andrewrk
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should be good. we can patch rhash if it breaks

@lo1tuma
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rhash still fails to build on macos:

these derivations will be built:
  /nix/store/fply3cirgrn6bjppm88dipv3nswcllhd-rhash-1.3.3.drv
building path(s) ‘/nix/store/cd28i80w3sjzsrka3hi0nn3z5rviijkb-rhash-1.3.3’
unpacking sources
unpacking source archive /nix/store/9ajcl4xqlzk6vb7ak4n2p0xsyb7qhw5k-rhash-1.3.3-src.tar.gz
source root is rhash-1.3.3
setting SOURCE_DATE_EPOCH to timestamp 1407178662 of file rhash-1.3.3/dist/rhash.spec
patching sources
configuring
no configure script, doing nothing
building
make -C librhash lib-shared
make[1]: Entering directory '/private/var/folders/kf/pl3_kvpj29vdlr6bqwyr9lqm9ttcd_/T/nix-build-rhash-1.3.3.drv-0/rhash-1.3.3/librhash'
sed -n '1s/.*/{ global:/p; s/^RHASH_API.* \([a-z0-9_]\+\)(.*/  \1;/p; $s/.*/local: *; };/p' rhash.h rhash_torrent.h rhash_timing.h > exports.sym
gcc -fpic  -pipe -DIN_RHASH  -O2 -DNDEBUG -fomit-frame-pointer -ffunction-sections -fdata-sections -Wall -W -Wstrict-prototypes -Wnested-externs -Winline -Wpointer-arith -Wbad-function-cast -Wmissing-prototypes -Wmissing-declarations -shared algorithms.c byte_order.c plug_openssl.c rhash.c rhash_timing.c rhash_torrent.c util.c aich.c crc32.c ed2k.c edonr.c hex.c md4.c md5.c sha1.c sha256.c sha512.c sha3.c ripemd-160.c gost.c has160.c snefru.c tiger.c tiger_sbox.c tth.c torrent.c whirlpool.c whirlpool_sbox.c -Wl,--version-script,exports.sym,-soname,librhash.so.0   -o librhash.so.0
make[1]: gcc: Command not found
make[1]: *** [Makefile:186: librhash.so.0] Error 127
make[1]: Leaving directory '/private/var/folders/kf/pl3_kvpj29vdlr6bqwyr9lqm9ttcd_/T/nix-build-rhash-1.3.3.drv-0/rhash-1.3.3/librhash'
make: *** [Makefile:133: librhash/librhash.so.0] Error 2
builder for ‘/nix/store/fply3cirgrn6bjppm88dipv3nswcllhd-rhash-1.3.3.drv’ failed with exit code 2
error: build of ‘/nix/store/fply3cirgrn6bjppm88dipv3nswcllhd-rhash-1.3.3.drv’ failed

I was able to make it build after updating rhash to 1.3.4 and applying this patch: https://github.com/Homebrew/formula-patches/blob/master/rhash/1.3.4.patch
but cmake still fails because it can’t find librhash:

-- Could NOT find LibRHash (missing:  LibRHash_LIBRARY)
CMake Error at CMakeLists.txt:309 (message):
  CMAKE_USE_SYSTEM_LIBRHASH is ON but LibRHash is not found!

@LnL7
Copy link
Member

@LnL7 LnL7 commented on d74d871 Jun 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed rhash and cmake in 30412f9.

Please sign in to comment.