mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-22 14:47:06 +00:00
Code Issues Wiki Activity
144936 commits 171 branches 125 tags 9.5 GiB
Commit graph

182 commits

Author SHA1 Message Date
Vladimír Čunát 31530c185e
Merge a subset of staging (security) 
In particular, this contains Firefox-related and libgcrypt updates.
Other larger rebuilds would apparently need lots of time to catch up
on Hydra, due to nontrivial rebuilds in other branches than staging.
 2018-06-15 08:48:02 +02:00
Ben Gamari 5962d0d5f3 cmake: Only apply application-services.patch with 3.11 
The patch doesn't apply with earlier versions. Fixes #41816.
 2018-06-10 21:32:49 -04:00
Matthieu Coudron a6809c0dd0 cmake: don't override cmakeDir when set (#40687) 
When dontUseCmakeBuildDir is true (aka the default), it overrides
cmakeDir regardless of the package configuration.

While packaging netbee, I needed to both keep dontUseCmakeBuildDir to
true (some hardcoded paths expect the build folder) and set cmakeDir
(since CMakeList.txt was in a subfolder) which proved impossible.
Here is the fix.
 2018-06-03 12:28:28 +00:00
Orivej Desh 83c98f3656 cmake_2_8: fix build after #28029 2018-05-29 14:16:06 +00:00
Daiderd Jordan 02dcc8d734
cmake: fix darwin build 
HAVE_APPLICATION_SERVICES always gets set if cmake is available.
 2018-05-28 13:46:45 +02:00
Thomas Tuegel 75e78eda1f
cmake: 3.10.2 -> 3.11.2 
Fixes #40751.
 2018-05-19 18:28:01 -05:00
John Ericson ce018be2d6
Merge pull request #40566 from obsidiansystems/strictDeps-for-18.03 
cmake: Fix build and setup hook
 2018-05-15 16:31:17 -04:00
John Ericson 0ff650a392 cmake: Fix build and setup hook 
I screwed this up in 330ca731e8. I'm
sorry.
 2018-05-15 15:24:22 -04:00
John Ericson 5e17335bd7 Merge remote-tracking branch 'upstream/staging' into strictDeps 2018-05-14 23:33:03 -04:00
John Ericson 330ca731e8 treewide: Get rid of all uses of crossConfig 
The hack of using `crossConfig` to enforce stricter handling of
dependencies is replaced with a dedicated `strictDeps` for that purpose.
(Experience has shown that my punning was a terrible idea that made more
difficult and embarrising to teach teach.)

Now that is is clear, a few packages now use `strictDeps`, to fix
various bugs:

 - bintools-wrapper and cc-wrapper
 2018-05-14 23:30:37 -04:00
Matthew Justin Bauer eeb016e8f0
Merge branch 'staging' into fix-ncurses-darwin-extensions 2018-05-02 15:40:38 -05:00
Ryan Mulligan 038a0c9a60 treewide: http to https 2018-04-30 21:39:20 -07:00
Jan Malakhovski 7438083a4d tree-wide: disable doCheck and doInstallCheck where it fails (the trivial part) 2018-04-25 04:18:46 +00:00
Matthew Justin Bauer 75616ceb49
Merge pull request #37840 from matthewbauer/unixtools 
Cross-platform "unixtools"
 2018-03-27 18:43:03 -05:00
Matthew Bauer 49455d7bae treewide: replace utillinux refs of {u,}mount 
umount and mount are now provided top-level
 2018-03-27 18:17:46 -05:00
Matthew Bauer 11f0e07d4f unixtools: replace darwin.ps 2018-03-27 18:17:46 -05:00
Matthew Justin Bauer 92a5b1b055
Merge pull request #37015 from matthewbauer/cmake-mac-flags 
cmake: Setup default macOS flags
 2018-03-22 11:16:03 -05:00
Matthew Bauer 4cc1cd8516 cmake-2.8: supports darwin 
builds fine, just need to enable to
 2018-03-19 05:42:15 -05:00
Matthew Bauer bd9b17f762 cmake: correctly detect clang compiler on macOS 2018-03-14 14:36:27 -05:00
Matthew Bauer 8beb809fd1 cmake: don't detect macOS deployment target 2018-03-14 14:31:53 -05:00
Matthew Bauer acbf439fef cmake: disable detecting global macOS sdk 2018-03-14 14:30:10 -05:00
Matthew Bauer b99cae3931 cmake: set CMAKE_FIND_FRAMEWORK=last 2018-03-14 14:20:07 -05:00
Will Dietz e25a343716 cmake: don't force gcc, use more general cc/c++ 2018-02-13 12:39:34 -06:00
Will Dietz 37c2ac90e6 cmake: fix cross 
TODO: toolchain file instead?
 2018-02-13 09:44:29 -06:00
Vladimír Čunát ef60e41145
cmake: bring back 3.9 for Darwin bootstrap 
Broken by ba6e0ae33df36; see e.g. https://hydra.nixos.org/build/68223628
 2018-01-27 09:11:37 +01:00
Vladimír Čunát ba6e0ae33d
cmake: 3.9.6 -> 3.10.2 
Close #33435 (superseded).
 2018-01-21 11:59:12 +01:00
Frederik Rietdijk 27f6f9409b
Merge pull request #33967 from yegortimoshenko/20180117.050213/mornfall 
maintainers: remove mornfall from packages
 2018-01-18 11:27:31 +01:00
Yegor Timoshenko 506c89c30a maintainers: remove mornfall from packages 2018-01-17 05:17:33 +00:00
Daiderd Jordan 6f10cfc777
cmake: fix INSTALL_NAME_DIR for darwin libraries 
When there's a lib output libraries won't be intalled to $prefix causing
output cycles.
 2018-01-07 09:45:25 +01:00
John Ericson 046f091e0d treewide: Don't use envHook anymore 
This commits needs a MAJOR audit as I oftentimes just guessed which of
`$hostOffset`, `$targetOffset`, or a fixed offset should be used.
 2017-12-30 22:04:22 -05:00
Orivej Desh 031138b7f0 cmake: enable parallel building of cmake projects by default 2017-12-07 08:52:42 +00:00
Orivej Desh da516f0404 cmake: generate for Ninja when the build phase is Ninja 
This is overridable by providing a custom build phase or setting
dontUseNinjaBuild = true.
 2017-12-07 08:52:42 +00:00
Vladimír Čunát c465185bb7
cmake: maintenance 3.9.4 -> 3.9.6 2017-11-27 13:36:14 +01:00
Matthew Bauer 24eb665695 cmake: setup CMAKE_FRAMEWORK_PATH 
This tells cmake how to find macOS frameworks.

Fixes #26197
 2017-10-21 02:27:09 -05:00
Vladimír Čunát 2aca029ed2
cmake: maintenance 3.9.2 -> 3.9.4 2017-10-08 18:24:12 +02:00
Vladimír Čunát cea9a52dac
cmake: maintenance 3.9.1 -> 3.9.2 2017-09-24 11:28:30 +02:00
Bernd Amend b49b9da3ce
cmake: add withQt5 option and make it the default 2017-09-06 08:02:08 -05:00
Bernd Amend f3ac052f24
cmake: 3.8.2 -> 3.9.1 2017-09-06 08:02:05 -05:00
hsloan 3e69864717 cmake 2.8: Don't use stdenv ? cross 2017-06-28 19:42:46 -04:00
Vladimír Čunát d74d871f52
cmake: 3.7.2 -> 3.8.2 
Tested several cmake-built packages, and all seems OK;
hopefully there won't be many problems.
 2017-06-11 17:10:49 +02:00
Daiderd Jordan 9e2aba3572
darwin-stdenv: remove python-sphinx and a bunch of other dependencies from the stdenv 2017-06-01 23:23:56 +02:00
Linus Heckemann 28154f45a6 cmake setup hook: allow other build types 2017-05-10 14:33:20 +01:00
David Grayson 934ed02750 cmake: Prevent it from looking for packages in / 
when cross-compiling for Windows.
 2017-04-29 09:55:37 -07:00
Vladimír Čunát 96d41e393d
treewide: purge maintainers.urkud 
It's sad, but he's been inactive for the last five years.
Keeping such people in meta.maintainers is counter-productive.
 2017-03-27 19:52:29 +02:00
Vladimír Čunát 5cf7b7c109
cmake: 3.7.1 -> 3.7.2 2017-02-20 21:29:52 +01:00
Daiderd Jordan 538d1b688a stdenv: bootstrap cmake and python on darwin 2017-01-03 18:01:47 +01:00
Aristid Breitkreuz 76c4b5fcca cmake: 3.6.2 -> 3.7.1 2016-12-20 16:20:08 +01:00
Vladimír Čunát 31f0fdef32
cmake: minor update 3.6.0 -> 3.6.2 2016-10-29 22:08:25 +02:00
Will Dietz 48d7c7751a cmake: bootstrap in parallel 
Builds on previous commit so this happens without needing stdenv.glibc.
 2016-10-13 08:07:58 -05:00
Will Dietz 07849e749a cmake: When there is no stdenv.glibc, still fix search paths. 
Apply all of the fixups from preConfigure as well!

For testing purposes I added the following assert:

assert (stdenv ? glibc) -> (stdenv.glibc == stdenv.cc.libc);

To ensure behavior in the case there is a 'stdenv.glibc' (linux-only?)
wasn't changed, which passes in the configurations I could think of.

Not including that since it seems like a bad requirement moving forward.
 2016-10-13 08:05:37 -05:00