mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-20 12:59:25 +00:00
Code Issues Wiki Activity
230063 commits 180 branches 125 tags 9 GiB
Commit graph

84 commits

Author SHA1 Message Date
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
Jan Tojnar 103bf0cf1d
meson: 0.49.1 → 0.49.2 2019-04-05 12:13:58 +02:00
Will Dietz 5aaf597df3 meson: 0.49.0 -> 0.49.1 
https://groups.google.com/d/msg/mesonbuild/xRXQatmXIwo/-2lqsOIXGAAJ

https://github.com/mesonbuild/meson/milestone/33
 2019-01-27 15:28:01 -06:00
Jan Tojnar 2f4e167156
meson: Fix linking ObjC objects on Darwin 
https://github.com/NixOS/nixpkgs/pull/54007#issuecomment-454693658
 2019-01-16 13:21:40 +01:00
Jan Tojnar 414ea0a10e
meson: 0.48.2 → 0.49.0 2018-12-12 00:22:02 +01:00
Matthew Bauer d492f53faf
Merge pull request #50527 from matthewbauer/ninja-check-phase 
Add check phase to ninja setup hook
 2018-11-20 16:55:12 -06:00
Tor Hedin Brønner 7a48c7ccf8 meson: remove obsolete and blocking patch 
meson is now upgraded to 0.48.2 which includes the patch causing the build to
fail.
 2018-11-19 12:11:06 +01:00
Matthew Bauer f6f7283e69 meson: remove check phase 
This is now handled in ninja.
 2018-11-18 19:31:01 -06:00
Jan Tojnar 85bd2a7acb
Merge pull request #46020 from jtojnar/meson-0.47 
meson: 0.46.1 → 0.48.2
 2018-11-18 22:17:49 +01:00
Jan Tojnar 340dd80175
meson: 0.46.1 → 0.48.2 2018-11-13 14:39:34 +01:00
Frederik Rietdijk 53d00c3351 Merge master into staging-next 2018-11-10 11:08:54 +01:00
volth 9e1b883144 meson: fix cross compilation of systemd 
Co-authored-by: Robin Gloster <mail@glob.in>
 2018-11-05 14:39:30 -05:00
Frederik Rietdijk 64d50a0099 meson: fix building with python 3.7 2018-11-04 08:46:30 +01:00