Commit Graph

33757 Commits

Author SHA1 Message Date
Anthony Cowley
7a9400d338 qt5.6: darwin compatibility
- qtbase builds on darwin
- Downstream qmake and cmake build configurations supported

Darwin-specific changes:

Prevent `qmake -project` from adding build support files in the temp
directory to the project.

Shrink the temp directory used for building with qmake.

The issue here is that `lndir` recreates the entire directory structure
of the module we are merging into the temporary build environment. On
darwin, the framework directory structures mean that this shadow
directory tree is 17MB even though the file contents are all symlinks
into the store.

To address this, we symlink the framework directories explicitly and
use `lndir` for everything else.
2016-12-08 18:28:30 -05:00
Eric Bailey
6a86b603f9 lfe: 1.1.1 -> 1.2.1
- Use buildRebar3 instead of mkDerivation, obviating the need for setup-hook.sh
- Manually build proper and patch rebar.config s.t. it doesn't try to fetch it
- Set checkTarget = "travis" and actually run the tests
2016-12-08 00:36:38 +02:00
Eric Bailey
ab9688a63a rebar3: Fix typos and support name-version-tag
The fixup_app_name/1 change notably supports packages like proper-1.1.1-beta.
2016-12-08 00:11:41 +02:00
Eric Bailey
fe727a19c1 rebar3: 3.1.0 -> 3.3.2 2016-12-08 00:11:41 +02:00
Vladimír Čunát
49187304d8
libdwarf: security 20161021 -> 20161124
/cc #20972.  It seems safe API+ABI-wise:
https://abi-laboratory.pro/tracker/timeline/libdwarf/

Also nitpicks: meta.homepage, etc.

Note: `darwin.dtrace` probably contains an embedded copy of libdwarf,
which I didn't (attempt to) fix.
2016-12-07 18:27:37 +01:00
Jörg Thalheim
0df00d66d5 Merge pull request #20916 from montag451/corosync
corosync: 2.4.1 -> 2.4.2
2016-12-07 12:50:23 +01:00
Jörg Thalheim
a65deea6c6 Merge pull request #20953 from joelmo/master
portaudio: remove old version portaudioSVN
2016-12-07 09:14:23 +01:00
Joachim F
bf574f33cb Merge pull request #20955 from savannidgerinel/bugfix-icu-version
icu4c: fix #20954: icu_54_1 package does not compile
2016-12-07 01:25:06 +01:00
Savanni D'Gerinel
705e29046d icu: remove icu4c-54.1
Only zoom-us depends on icu4c-54.1. Since we know that version has some vulnerabilities, and zoom-us appears to work with icu4c-57.1, I remove the icu/54.1.nix file, remove icu_54_1 from all-packages.nix, and have zoom-us depend on icu (i.e., icu4c-57.1)
2016-12-06 17:51:11 -06:00
Profpatsch
5373ca9712 haskell/ghcjs: fix ghcjs-ffiqq, add ghcjs-vdom (#20614)
Both experimental libraries that are in the ghcjs GitHub organization, but are
not yet officially released on hackage.
2016-12-06 23:24:42 +01:00
Joel Moberg
b165b5e924 portaudio: remove old version portaudioSVN
The project is now using git and the sha for the source is wrong. Can
not find other derivations using this.
2016-12-06 22:26:41 +01:00
Tim Steinbach
1e00f3fef0 Merge pull request #20936 from NeQuissimus/scala_2_12_1
scala: 2.12.0 -> 2.12.1
2016-12-06 12:14:45 -05:00
Frederik Rietdijk
736169d01d buildPythonPackage: yet another fix, fixes #20943
I didn't copy the old behaviour correctly with
c1d98d959b
2016-12-06 16:48:55 +01:00
Tim Steinbach
200715b022
scala: 2.12.0 -> 2.12.1 2016-12-05 19:38:26 -05:00
Frederik Rietdijk
47d4575255 pythonPackages.setuptools: 28.8.0 -> 30.2.0 2016-12-05 17:33:21 +01:00
Frederik Rietdijk
c1d98d959b buildPythonPackage: add configurePhase, fixes #20926
I had removed the configurePhase in
https://github.com/NixOS/nixpkgs/pull/20894 because it was empty. This
seemed to break packages that use cmake.
2016-12-05 17:33:17 +01:00
Nikolay Amiantov
497e6d2f1d haskellPackages.haskell-src-exts-simple: build against new haskell-src-exts 2016-12-05 16:39:23 +03:00
Shea Levy
b6fe3994be Merge branch 'heist-pandoc' of git://github.com/imalsogreg/nixpkgs 2016-12-05 08:04:24 -05:00
Joachim F
546eba73e1 Merge pull request #20910 from peterhoeg/wp
wp-cli: 0.24.1 -> 1.0.0
2016-12-05 13:26:50 +01:00
montag451
e797cfaeb6 librdmacm: add pkg-config support 2016-12-05 11:45:13 +01:00
montag451
3798da2c41 libibverbs: add pkg-config support 2016-12-05 11:44:28 +01:00
Frederik Rietdijk
42bad32e13 buildPythonPackage: refactor 2016-12-05 10:29:22 +01:00
Frederik Rietdijk
5ba37dfc7a Merge pull request #20893 from FRidh/fixed3
Python: use fixed-point combinator, add pkgs to interpreter
2016-12-05 09:47:43 +01:00
Frederik Rietdijk
31e32b6d9e Python interpreters: add pkgs attribute
A package set is constructed for a specific interpreter. Therefore, we add the
possibility to override the package set to the interpreter. This should make it
easier to override the interpreter and the package set at the same time.
2016-12-05 09:43:44 +01:00
Greg Hale
ad489cec10 Add pandoc dependency to heist to restore working heist tests 2016-12-05 01:53:44 +00:00
Tuomas Tynkkynen
571cf4f209 uisp: Fix build 2016-12-05 02:40:04 +02:00
Tuomas Tynkkynen
a7c31ce165 snack: Mark broken
Besides the hardeningDisable I added, something else is broken.

gcc -c -O -fPIC -DUSE_TCL_STUBS -DUSE_TK_STUBS -DOSS  -I/nix/store/q2k3anmbnwklaxih3brk9g6mxzjv155z-tcl-8.6.6/include -I/tmp/nix-build-tcl-8.6.6.drv-0/tcl8.6.6/generic -I/tmp/nix-build-tk-8.6.6.drv-0/tk8.6.6/generic   -DTCL_81_API -I./../generic -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1  ./../generic/jkFormatMP3.c
./../generic/jkFormatMP3.c:34:26: error: expected declaration specifiers or '...' before '(' token
 #define roundf(x) (floor((x)+(float )0.5f))
                          ^
2016-12-05 02:09:18 +02:00
Tomas Hlavaty
9adbe60c81 sbcl: 1.3.11 -> 1.3.12 2016-12-05 00:15:55 +01:00
Vladimír Čunát
ae0bfae810
cairomm: fixup url
I've got no idea why there are two tarballs with same name but different
hash.
2016-12-04 20:21:25 +01:00
Vladimír Čunát
ad0d7f6a05
Merge branch 'staging' 2016-12-04 19:22:36 +01:00
Vladimír Čunát
6e91b74839
Revert "cairomm: maintenance 1.12.0 -> 1.12.2"
This reverts commit d652b2cbee.
Some packages got broken by this (rawtherapee*, ardour*).
2016-12-04 19:20:47 +01:00
Frederik Rietdijk
e4f44475a6 Merge pull request #20899 from elitak/libxslt
libxslt: fixed crossDrv, where no python is available
2016-12-04 16:19:02 +01:00
Eric Litak
605f923e92 libxslt: fixed crossDrv, where no python is available 2016-12-04 07:11:23 -08:00
Jos van den Oever
bb84c688f6 rustfmt: 0.6.2 -> 0.6.3 2016-12-04 15:56:26 +02:00
Peter Hoeg
9471411a3c wp-cli: 0.24.1 -> 1.0.0 2016-12-04 21:45:42 +08:00
Michael Raskin
18eb185591 sbclBootstrap: list something for Solaris 2016-12-04 14:26:30 +01:00
Tomas Hlavaty
c410dc75f2 sbcl: avoid using wrong options 2016-12-04 14:26:30 +01:00
Tomas Hlavaty
194a2ae86a sbcl: fix disabling threadSupport 2016-12-04 14:26:30 +01:00
Tomas Hlavaty
13f82b0445 picolisp: 15.11 -> 16.6 2016-12-04 14:26:30 +01:00
Tomas Hlavaty
d281a93960 sbcl: 1.3.10 -> 1.3.11 2016-12-04 14:26:30 +01:00
Vladimír Čunát
61aa9cb9b2
guile: doCheck = false, as it causes problems sometimes
... and I don't feel like digging into the exact cause.
It's made worse by the fact that guile is quite a mass rebuild.
2016-12-04 10:12:13 +01:00
Vladimír Čunát
3dd219f071
Merge "forked" staging branches together 2016-12-04 10:07:19 +01:00
Vladimír Čunát
84d737cfe9
clisp: remove Darwin from meta.platforms for now
It's problematic.  See #20062.
2016-12-04 10:01:08 +01:00
Daiderd Jordan
ef080c9df4 Merge pull request #20860 from mdaiter/correctBashoErlangVersion
erlang_basho_R16: B03-1 -> B02-8
2016-12-04 09:57:29 +01:00
Frederik Rietdijk
ab39c29293 Merge pull request #20879 from mguentner/cpp_ipfs_api
cpp-ipfs-api: init at 2016-11-09
2016-12-04 08:54:31 +01:00
Aristid Breitkreuz
e3dcf5da1d rq: init at 0.9.2 (broken because our v8 is too old, and I'm too weak to update v8) 2016-12-03 23:36:48 +01:00
Graham Christensen
cdafc8e70d Merge pull request #20882 from lsix/update_libunistring
libunistring: 0.9.6 -> 0.9.7
2016-12-03 13:37:37 -05:00
Graham Christensen
3e617930e5
Merge branch 'staging' 2016-12-03 13:36:32 -05:00
Thomas Tuegel
7b05efb90d
qt5: factor out common makeQtWrapper setup hook 2016-12-03 09:57:17 -06:00
Thomas Tuegel
2c4995c013
qt5: factor out common qmake setup hook 2016-12-03 09:55:39 -06:00