JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
265,508 Commits 2 Branches 0 Tags 13 GiB
c522fec274
Commit Graph

152 Commits

Author SHA1 Message Date
Jonathan Ringer
9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix 
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
 2021-01-19 01:16:25 -08:00
Linus Heckemann
dfb2a526e3 cmake: 3.19.1 -> 3.19.2 2020-12-25 18:31:09 +01:00
Jonathan Ringer
8f02cddf30 cmake: patch namelink regression 
see:
 - https://github.com/NixOS/nixpkgs/issues/106329
 - https://github.com/awslabs/aws-c-common/issues/734
 2020-12-11 07:23:28 -08:00
Luke Granger-Brown
31dfbca2d7 cmake: 3.19.0 -> 3.19.1 
This fixes issues with building LibreSSL, which is required for the
NixOS tests: https://cmake.org/cmake/help/latest/release/3.19.html#id1

> CMake 3.19.0 compiles source files with the `LANGUAGE` property by
> passing an explicit language flag such as -x c. This is consistent
> with the property’s documented meaning that the source file is written
> in the specified language. However, it can break projects that were
> using the property only to cause the specified language’s compiler to
> be used. This has been reverted to restore behavior from CMake 3.18
> and below.
 2020-11-29 13:49:07 +01:00
R. RyanTM
91c6eb509b cmake: 3.18.4 -> 3.19.0 2020-11-26 12:28:45 -08:00
R. RyanTM
fad425cfbb cmake: 3.18.2 -> 3.18.4 2020-11-11 15:58:37 +01:00
Vladimír Čunát
336bc8283b
Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2" 
This reverts commit c778945806.

I believe this is exactly what brings the staging branch into
the right shape after the last merge from master (through staging-next);
otherwise part of staging changes would be lost
(due to being already reachable from master but reverted).
 2020-10-26 08:19:17 +01:00
Vladimír Čunát
c778945806
Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2" 
I'm sorry; I didn't notice it contained staging commits.

This reverts commit 17f5305b6c, reversing
changes made to a8a018ddc0.
 2020-10-25 09:41:51 +01:00
John Ericson
5235a1e1fc Merge remote-tracking branch 'obsidian/cmake-nativeBuildInputs' into cmake-optional-openssl 2020-10-13 19:23:14 -04:00
John Ericson
e6294cfb7e cmake: Tighten deps 
- OpenSSL is evidentally an optional dep. I guess pkg-config found it
   before because it was a transitive dep?

 - `zstd` and cross-built CMake can get by with a `cmakeMinimal that we
   use during bootstrapping, so let's restrict to that.
 2020-10-02 15:52:11 +00:00
John Ericson
54b7d5266b cmake: Don't be target sensative 
pkg-config now has a target-sensative wrapper. We shouldn't rebuild
CMake because that wrapper changes. The setup hook should also be a
build time dep.

Fix #99325
 2020-10-02 15:02:58 +00:00
Michael Weiss
b730ef35f1 cmake: 3.18.1 -> 3.18.2 2020-08-27 08:48:09 +02:00
R. RyanTM
4005fe7f55 cmake: 3.18.0 -> 3.18.1 2020-08-15 08:33:21 +02:00
Michael Weiss
57f0574595
cmake: Add a patch to fix a regression since CMake 3.18 
This fixes all CMake builds that use target_precompile_headers() and
as a result fail since CMake 3.18 with e.g.:
g++: error: unrecognized command line option '-Xarch_x86_64'; did you mean '-march=x86-64'?

Fix #94905.

CMake references:
- https://gitlab.kitware.com/cmake/cmake/-/issues/21072
- https://gitlab.kitware.com/cmake/cmake/-/merge_requests/5118
 2020-08-13 12:50:12 +02:00
Ryan Burns
3a57356721 cmake: 3.17.3 -> 3.18.0 2020-07-26 18:57:06 +02:00
R. RyanTM
9757111825 cmake: 3.17.2 -> 3.17.3 2020-06-19 10:54:01 +02:00
Orivej Desh
16d7f7edae Merge branch 'master' into staging 2020-05-22 09:13:23 +00:00
Thomas Tuegel
694d80b170
Merge pull request #87704 from veprbl/pr/cmake_32bit_workaround 
pkgsi686Linux.cmake: compile with _FILE_OFFSET_BITS=64 for 32-bit targets
 2020-05-19 06:13:58 -05:00
Dmitry Kalinkin
467a87ba1d
cmake: compile with _FILE_OFFSET_BITS=64 for 32-bit targets 2020-05-12 18:16:03 -04:00
John Ericson
1ac5398589 *-wrapper; Switch from infixSalt to suffixSalt 
I hate the thing too even though I made it, and rather just get rid of
it. But we can't do that yet. In the meantime, this brings us more
inline with autoconf and will make it slightly easier for me to write a
pkg-config wrapper, which we need.
 2020-05-12 00:44:44 -04:00
R. RyanTM
27752d41e6 cmake: 3.17.0 -> 3.17.2 2020-05-08 06:56:59 +02:00
Daniel Șerbănescu
b18e7e5b6a
cmake: 3.16.5 -> 3.17.0 2020-04-01 11:00:43 -05:00
R. RyanTM
b3793e1181 cmake: 3.16.4 -> 3.16.5 2020-03-06 06:14:36 +00:00
R. RyanTM
f00bda0148 cmake: 3.16.3 -> 3.16.4 2020-02-12 09:07:49 +01:00
R. RyanTM
6e6615dfcc cmake: 3.16.2 -> 3.16.3 2020-01-29 08:57:00 +01:00
Tobias Mayer
dfee92cd2e cmake: 3.15.4 -> 3.16.2 2019-12-20 15:59:32 +01:00
Dima
fea6b5f3e0 cmake: patching for harfbuzz location 
a patch to cmake to correctly locate harfbuzz:
https://gitlab.kitware.com/cmake/cmake/issues/19531,
needed for more recent pango.
 2019-12-02 02:30:04 +01:00
R. RyanTM
40a357a67e cmakeWithGui: 3.15.4 -> 3.15.5 2019-12-01 18:27:33 +01:00
R. RyanTM
60024b53d7 cmakeWithGui: 3.15.1 -> 3.15.4 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/cmake-cursesui-qt5ui/versions
 2019-11-03 10:42:27 +01:00
R. RyanTM
5c0cdcfad2 cmakeWithGui: 3.14.5 -> 3.15.1 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/cmake-cursesui-qt5ui/versions
 2019-08-03 20:19:16 -07:00
Tobias Mayer
d87c843b6f Integrate review suggestions 2019-07-03 08:50:18 +02:00
Tobias Mayer
2608669904 cmake: 3.13.4 -> 3.14.5 2019-07-03 08:50:18 +02:00
volth
f3282c8d1e treewide: remove unused variables (#63177) 
* treewide: remove unused variables

* making ofborg happy
 2019-06-16 19:59:05 +00:00
Matthew Bauer
eaadbdf1c3 cmake: don’t use cf-private 
cf-private is not necessary here. cmake just needs the CoreFoundation
framework to be used. swift-corefoundation seems to work fine in this case.

/cc @lnl7
 2019-04-26 21:54:49 -04:00
Daiderd Jordan
cb8e6f73f5
cmake: add cf-private on darwin 2019-02-24 11:32:47 +01:00
Daiderd Jordan
c8aaadcc9d
cmake: disable ApplicationServices and CoreServices on darwin 2019-02-24 11:30:48 +01:00
Vladimír Čunát
052e34a66f
Merge #56059: cmake: 3.12.1 -> 3.13.4 (into staging) 2019-02-22 07:23:08 +01:00
Sam Stites
9b38f6f09f
bump cmake to 3.13.4 2019-02-19 13:21:30 -05:00
Michael Eden
cbbde55382 cmake: add ability to cross-compile cmake 2019-02-18 17:41:03 -05:00
Vladimír Čunát
b71b222b4c
Merge #44910: cmake: 3.11.2 -> 3.12.1 2018-08-30 16:04:52 +02:00
Andrew Childs
68ac282f8e cmake: patch internal libuv to remove dependency on macOS Frameworks 2018-08-13 11:05:54 +09:00
Andrew Childs
e8144a30bb cmake: remove additional versions 2018-08-13 11:05:54 +09:00
Andrew Childs
32cc3eb899 cmake: 3.11.2 -> 3.12.1 2018-08-13 11:05:54 +09:00
Matthew Bauer
e62996f65c cmake: add bsd3 license 2018-08-06 10:15:55 -04:00
Orivej Desh
e7facc718e cmake: fix build with libuv 1.21 (#43052) 2018-07-04 23:03:59 +00: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
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