mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-25 03:17:13 +00:00
Code Issues Wiki Activity
258933 commits 204 branches 125 tags 10 GiB
Commit graph

96 commits

Author SHA1 Message Date
John Ericson 5bafec36ef
Merge pull request #99176 from Ericson2314/meson-remove-extra-cc 
meson: Remove propagated native C compiler
 2020-11-15 14:18:15 -05:00
Jan Tojnar f80fb9cb87
meson: 0.55.3 → 0.56.0 
https://mesonbuild.com/Release-notes-for-0-56-0.html
https://github.com/mesonbuild/meson/releases/tag/0.56.0
 2020-10-30 10:27:51 +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
Niklas Hambüchen 70a924fa80 meson: Patch out default boost search paths. See #86131. 
Avoids impure builds on unsandboxed non-NixOS builds, see:
https://github.com/NixOS/nixpkgs/issues/86131#issuecomment-711051774
 2020-10-20 21:02:43 +02:00
John Ericson f60fc7f61f meson: Remove propagated native C compiler 
Now that we have a Meson release containting [1], Meson will work fine
without a native compiler, so we don't need this trick anymore.

Fixes #58831

[1]: https://github.com/mesonbuild/meson/pull/6512
 2020-09-30 10:31:39 -04:00
Jan Tojnar 87a69dafa3
meson: 0.55.1 → 0.55.3 2020-09-18 20:05:56 +02:00
Jan Tojnar c6acf50360 meson: 0.55.0 → 0.55.1 
https://github.com/mesonbuild/meson/compare/0.55.0...0.55.1

setuptools have been removed from runtime dependencies:
https://github.com/mesonbuild/meson/pull/7461
 2020-08-16 19:48:32 +02:00
Anders Kaseorg dbac38cf0e meson: Add upstream patch to stop failing on skipped tests 
https://github.com/mesonbuild/meson/pull/7525

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
 2020-08-14 08:23:53 +02:00
Jan Tojnar e8bfa708c4 meson: Fix rpath clearing 
Meson allows projects to set `build_rpath` property, containing paths
that will be added during build but will be removed when installing.

When Meson removes build_rpath from `DT_RUNPATH` entry, it just writes
the shorter ␀-terminated new rpath over the old one to reduce
the risk of potentially breaking the ELF files
(when the linker does string de-duplication or something).
But this can cause much bigger problem for Nix, as it can produce
cut-in-half-by-␀ store path references.

For example, in systemd’s libudev, it was removing three `$ORIGIN`-relative paths from

    $ORIGIN/../libsystemd:$ORIGIN/../basic:$ORIGIN/../shared:…␀

resulting in the following `DT_RUNPATH` entry:

    …␀store/v589pqjhvxrj73g3r0xb41yr84z5pwb7-gcc-9.3.0-lib/lib␀

We previously handled this in `fix-rpath.patch` but the method we prevent
Meson from removing paths added to rpath through `NIX_LDFLAGS` was changed
during 0.55.0 update and I forgot about this second purpose of the patch.

Let’s re-add this clearing code, as it worked without issues for a long time.
 2020-08-11 17:48:18 +02:00
Jan Tojnar d8ac41f863
meson: 0.54.2 → 0.55.0 
https://mesonbuild.com/Release-notes-for-0-55-0.html
https://github.com/mesonbuild/meson/releases/tag/0.55.0
https://github.com/mesonbuild/meson/compare/0.54.2...0.55.0
 2020-07-12 19:56:33 +02:00
Jan Tojnar c19222143e
meson: clean up 2020-07-12 19:56:24 +02:00
Frederik Rietdijk f9af74e75a meson: fix hash after incorrect merge 2020-06-04 17:53:31 +02:00
Frederik Rietdijk 08900c0554 Merge master into staging-next 2020-06-04 15:25:54 +02:00
Daiderd Jordan 7b3a2963d1
treewide: replace base64 encoded hashes 2020-06-03 18:35:19 +02:00
Jan Tojnar 282cb2f8d6
meson: 0.54.1 → 0.54.2 
https://github.com/mesonbuild/meson/compare/0.54.1...0.54.2
 2020-05-15 16:58:41 +02:00
Jan Tojnar 1a9c35d051
meson: 0.54.0 → 0.54.1 
https://github.com/mesonbuild/meson/compare/0.54.0...0.54.1
 2020-05-05 06:56:55 +02:00
Frederik Rietdijk 484ee79050 Merge staging-next into staging 2020-05-01 08:57:10 +02:00
Alexey Shmalko 2364d98c60
meson: remove rasendubi from maintainers 
I lagged behind meson changes and I can't provide good reviews or fix
meson issues. I am therefore resigning from meson maintainership.
 2020-04-29 16:52:29 +03:00
John Ericson 38b084f621 meson: Fix cross 
The old `CC=.. CXX= .. meson ...` env var hack I removed in
3c00ca03a2 had a side effect of ensuring
that Meson always had access to a native C compiler, which unforunately
it expects in most cases. Thankfully, that will be fixed soon.
 2020-04-28 22:54:48 -04:00
John Ericson 8245230753 meson: Make target-agnostic 
The cross file is added in the `mkDerivation`. It isn't nice putting
build tool-specific stuff here, but our current architecture gives us
little alternative.
 2020-04-28 10:55:33 -04:00
John Ericson 128b93e061 meson: Patch to ingest env vars like autoconf 
See comment in code and the PR it references,
https://github.com/mesonbuild/meson/pull/6827, for details.

We can remove entries from the cross file because they will be gotten
from env vars now.
 2020-04-28 10:11:41 -04:00
John Ericson 3c00ca03a2 meson: Don't set CC and CXX 
I've since convinced upstream to not use such vars for the build
platform during cross. Finally!
 2020-04-26 16:50:06 -04:00
Jan Tojnar 9073a0cb8b meson: 0.53.2 → 0.54.0 
https://mesonbuild.com/Release-notes-for-0-54-0.html
 2020-04-21 08:32:39 +02:00
Michael Reilly 84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Jan Tojnar 9c4f24a63e
meson: add jtojnar to maintainers 2020-03-11 13:53:15 +01:00
Millian Poquet 65336dc3cf
meson: 0.52.1 -> 0.53.2 
https://mesonbuild.com/Release-notes-for-0-53-0.html

https://github.com/mesonbuild/meson/releases/tag/0.53.0
https://github.com/mesonbuild/meson/releases/tag/0.53.1
https://github.com/mesonbuild/meson/releases/tag/0.53.2
 2020-02-28 11:10:06 +01:00
Andrew Childs 63c9e4ee9d meson: add armv5tel cpu family 2019-12-30 17:21:39 +01:00
Jan Tojnar cb7da0944e
meson: 0.51.2 → 0.52.1 
https://mesonbuild.com/Release-notes-for-0-52-0.html
https://github.com/mesonbuild/meson/compare/0.52.0...0.52.1
 2019-12-02 00:23:09 +01:00
Frederik Rietdijk 5f8b0d7d99 Merge staging-next into staging 2019-11-19 14:53:29 +01:00
Frederik Rietdijk be7125dde7 Merge master into staging-next 2019-11-16 11:45:07 +01:00
c0bw3b 9367367dfd Treewide: fix URL permanent redirects 
Permanent redirects on homepages and/or source URLs
as reported by Repology
 2019-11-16 01:41:23 +01:00
Jan Tojnar 94d4fe8546
Merge branch 'staging-next' into staging 2019-11-14 23:25:55 +01:00
Jan Tojnar da76deffd1
Merge branch 'master' into staging-next 2019-11-14 23:25:36 +01:00
Jan Tojnar 3108c4dd15
meson: fix unknown compiler error 2019-11-14 22:54:37 +01:00
Jan Tojnar 21f3586b03
meson: fix patch URL 
Hopefully commits will be more stable.
 2019-11-14 22:39:34 +01:00
Jan Tojnar c846ede763
gstreamer 1.16.1 (#70690) 
gstreamer 1.16.1
 2019-11-14 21:33:25 +01:00
Jan Tojnar 071d25afc7
meson: fix darwin framework lookup 
Fixes building gst_all_1.gst-plugins-good.

Patch backported from 0.52.0.
 2019-11-14 12:22:46 +01:00
John Ericson b7f4bda282 treewide: *Phase(s)? variables are optional 
If these aren't defined, the stdenv defaults are used in the `*Phase`
case, or no extra phases are done, in the `*Phases` case.
 2019-11-01 14:44:44 -04:00
John Ericson 1290e532ea treewide: Make more dont* variables OK to be undefined in setup hooks 2019-11-01 14:44:44 -04:00
Jan Tojnar 1be03500d5
meson: fix darwin patch 
Somehow I missed this in https://github.com/NixOS/nixpkgs/pull/67596
 2019-09-04 16:10:56 +02:00
Jan Tojnar 2d00fed978
Merge pull request #67596 from jtojnar/meson-0.51.2 
meson: 0.50.1 → 0.51.2
 2019-08-29 00:31:45 +02:00
Jan Tojnar b03016bf66
meson: 0.50.1 → 0.51.2 
https://mesonbuild.com/Release-notes-for-0-51-0.html
 2019-08-28 22:22:35 +02:00
volth 35d68ef143 treewide: remove redundant quotes 2019-08-26 21:40:19 +00:00
Jan Tojnar 41c575b6fc
meson: use plain buildtype 
This should allow us to inherit optimization/striping from stdenv
 2019-06-25 18:24:51 +02:00
Jan Tojnar 0fd5abb213
meson: do not download wraps 2019-06-25 18:24:51 +02:00
Jan Tojnar e529ec3263
meson: enable auto_features by default 
We disabled them by default when they were introduced in

https://github.com/NixOS/nixpkgs/pull/42994

but enabling them probably makes more sense:

https://github.com/NixOS/nixpkgs/pull/54398
https://github.com/NixOS/nixpkgs/pull/63491
 2019-06-25 18:24:51 +02:00
Jan Tojnar 8de795e22f
meson: 0.49.1 → 0.50.1 2019-06-18 03:26:46 +02:00
Samuel Dionne-Riel 418c3e1123 meson: Adds more binaries, needed for systemd-boot 2019-05-28 19:26:57 -04:00
Samuel Dionne-Riel 858076ef56 meson: fix cpu_family for aarch64 
As documented, it should be `aarch64` for AArch64.

 * https://mesonbuild.com/Reference-tables.html#cpu-families

```
 $ nix eval '((import <nixpkgs> {}).pkgsCross.aarch64-multiplatform.stdenv.targetPlatform.parsed.cpu.family)'
"arm"
```

The lookup table will ensure that, at any point, meson does not pick the
wrong family.
 2019-05-28 19:26:56 -04:00