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

1430 Commits

Author SHA1 Message Date
Matthew Bauer
73061742af Merge remote-tracking branch 'NixOS/master' into staging 2019-02-24 18:54:32 -05: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
Benjamin Hipple
9953a68c80 waf: 2.0.13 -> 2.0.14 2019-02-24 10:28:36 +01:00
Vladimír Čunát
71f4ba29a3
Merge branch 'master' into staging-next 
Hydra nixpkgs: ?compare=1506218
 2019-02-22 17:51:01 +01:00
Dmitry Kalinkin
f96d4d555b
Merge pull request #55998 from ThomasMader/dlang-update 
Dlang update
 2019-02-22 02:29:41 -05: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
Thomas Mader
0e88d17fb1 dub: Disable network tests because they add impurities 2019-02-22 07:22:11 +01:00
Frederik Rietdijk
5871da418f Merge staging into python-unstable 2019-02-21 08:02:10 +01:00
Matthew Bauer
ae3e8355ab
Merge pull request #56021 from illegalprime/fix/cmake-cross 
cmake: add ability to cross-compile cmake
 2019-02-19 22:34:15 -05:00
Sam Stites
9b38f6f09f
bump cmake to 3.13.4 2019-02-19 13:21:30 -05:00
Matthew Bauer
b1bbd94bb6 Merge remote-tracking branch 'NixOS/master' into staging 2019-02-18 20:36:48 -05:00
Michael Eden
cbbde55382 cmake: add ability to cross-compile cmake 2019-02-18 17:41:03 -05:00
Frederik Rietdijk
815b77cbe6 Merge master into staging-next 2019-02-18 14:18:04 +01:00
Carlos Morera de la Chica
9c406336f1 bazel: fix bash completion 2019-02-18 11:34:35 +01:00
Ryan Mulligan
0a0f0b355b
Merge pull request #55714 from mpisanko/leiningen-2.9.0 
upgrade leiningen to latest (2.9.0)
 2019-02-17 14:20:26 -08:00
Michal Pisanko
e53ea1fb01 leiningen: 2.8.3 -> 2.9.0 2019-02-18 08:12:39 +11:00
Ryan Mulligan
a954ca52e5
Merge pull request #55035 from uri-canva/bazel-deps 
bazel-deps: 2018-11-01 -> 2019-02-01
 2019-02-17 06:49:31 -08:00
Frederik Rietdijk
9dc262c659 pants: mark as broken 2019-02-17 14:40:55 +01:00
Frederik Rietdijk
fd48a94b62 Merge staging-next into staging 2019-02-16 09:30:46 +01:00
Frederik Rietdijk
6fe10d2779 Merge master into staging-next 2019-02-16 09:29:54 +01:00
R. RyanTM
7c860b5fd8 conan: 1.11.2 -> 1.12.0 (#55335) 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/conan/versions
 2019-02-14 21:53:05 +01:00
Will Dietz
0f14c9cd8f ninja: patch to fix w/musl, see upstream issue 2019-02-11 22:41:45 -06:00
Vladimír Čunát
c40f211499
Merge branch 'staging-next' 
It's not completely without regressions, but ATM it seems to bring more
upsides than downsides and the iteration is too long already.
 2019-02-10 14:20:49 +01:00
Matthew Bauer
5c09d977c7 Merge remote-tracking branch 'origin/master' into staging 2019-02-09 12:14:06 -05:00
Silvan Mosberger
18d059a4ac
Merge pull request #54115 from k32/master 
rebar3: 3.6.1 -> 3.9.0
 2019-02-09 17:29:59 +01:00
Vladimír Čunát
7f9e3b8206
Merge branch 'master' into staging-next 
Hydra nixpkgs: ?compare=1504357
 2019-02-09 10:15:17 +01:00
worldofpeace
3abe344987
ninja: Add comment explaining the consistent ID patch 
Co-Authored-By: grahamc <graham@grahamc.com>
 2019-02-07 18:26:51 -05:00
Graham Christensen
21cdf28a83
ninja: make reproducible 
See https://github.com/ninja-build/ninja/pull/1529
 2019-02-07 18:04:59 -05:00
k32
d4b243905f rebar3: 3.6.1 -> 3.9.0 
Remove hermetic patch (make it compatible with the upstream)
(Mostly) eliminate the need for hex package registry
 2019-02-06 19:45:40 +01:00
Tim Steinbach
c7fda39fc2
sbt-extras: 2018-12-04 -> 2019-01-30 2019-02-06 08:53:41 -05:00
Franz Pletz
97507ffc8b
Merge pull request #55046 from FlorianFranzen/cmake_no_pkg_reg 
cmake: disable package registry
 2019-02-03 08:32:43 +00:00
Vladimír Čunát
bd9f835bf6
Merge branch 'master' into staging-next 
Larger rebuild, probably mainly haskell.
Hydra nixpkgs: ?compare=1503325
 2019-02-02 17:13:11 +01:00
Vladyslav M
c7e1e48657
Merge pull request #54773 from r-ryantm/auto-update/mill 
mill: 0.3.5 -> 0.3.6
 2019-02-02 12:32:14 +02:00
Will Dietz
b6e50b3a3c
Merge pull request #55008 from dtzWill/update/ninja-1.9.0 
ninja: 1.8.2 -> 1.9.0
 2019-02-02 00:58:59 -06:00
Vladimír Čunát
8ba516664b
Merge branch 'staging-next' into staging 2019-02-01 09:42:53 +01:00
Vladimír Čunát
5effa4e0f9
Merge branch 'master' into staging-next 
Comments on conflicts:
- llvm: d6f401e1 vs. 469ecc70 - docs for 6 and 7 say the default is
  to build all targets, so we should be fine
- some pypi hashes: they were equivalent, just base16 vs. base32
 2019-02-01 09:22:29 +01:00
Uri Baghin
2b2854e522 bazel-deps: 2018-11-01 -> 2019-02-01 2019-02-01 17:30:36 +11:00
Will Dietz
d4cd52e503 ninja: 1.8.2 -> 1.9.0 
https://groups.google.com/forum/#!topic/ninja-build/nY5Kb7zUvcg
 2019-01-31 12:25:13 -06:00
Florian Franzen
e0e4577c0f cmake: disable package registry 2019-01-31 10:17:55 +01:00
Kévin Rauscher
e925ec27ba bloop: 1.2.3 -> 1.2.5 (#54427) 2019-01-31 01:20:55 +02:00
Félix Baylac-Jacqué
a5aca72f93 bazel: 0.21.0 -> 0.22.0 2019-01-30 14:57:32 +01:00
Philip Patsch
5c6892e1a2 bazel: fix java toolchain regression 
By changing the default toolchain to JDK8, we broke the default Java
toolchain, which assumes JDK9.

Instead, set `host_java_toolchain` manually for our build of bazel,
and set `java_toolchain` to run the java tests with the build JDK as
well.

Fixes https://github.com/NixOS/nixpkgs/issues/54289
 2019-01-29 14:03:54 +01:00
R. RyanTM
0f490eab3e mill: 0.3.5 -> 0.3.6 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mill/versions
 2019-01-28 01:04:08 -08: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
Matthew Bauer
92f0f8dd68 Merge remote-tracking branch 'NixOS/master' into staging 2019-01-27 00:01:13 -05:00
Robin Palotai
566539ff55 Add test and docs. 2019-01-26 22:22:34 +01:00
Robin Palotai
d3199ddaa7 Add gzip and gnutar to default bazel-bash tools. These are often used by rules, mostly due to Bazel's one-output rule. 2019-01-26 22:22:34 +01:00
Michael Weiss
f561acc48e
scons.src: Update the hash (tarball was modified) 
Unfortunately the tarball was modified for the official release and
"nix-store -r --check $(nix-instantiate -A scons.src)" did not catch
this (not sure why ATM).

Thanks @pbogdan for noticing this :)
 2019-01-23 21:21:46 +01:00
Michael Weiss
c2b8270fb8
Merge pull request #54461 from primeos/scons 
scons: 3.0.3 -> 3.0.4
 2019-01-23 19:05:44 +01:00
Michael Weiss
32e7f391fc
scons: 3.0.3 -> 3.0.4 
Announcement:
https://scons.org/scons-304-is-available.html

Changelog:
https://raw.githubusercontent.com/SConsProject/scons/rel_3.0.4/src/CHANGES.txt

There where no regressions and no deprecations in this release (at least
it does not break any additional builds in nixpkgs).
 2019-01-23 18:46:53 +01:00
Frederik Rietdijk
01efca4a54
Merge pull request #54462 from dotlambda/python-pkgs-remove 
pythonPackages: remove some packages representing outdated versions
 2019-01-23 09:38:40 +01:00
Profpatsch
88fa235e63 bazel: camel-case python_bin_path 2019-01-22 21:28:24 +01:00
Philip Patsch
25cd44063f bazel: add python to the runtime closure 2019-01-22 21:28:24 +01:00
Vladimír Čunát
3fe32b675e
Merge branch 'master' into staging 2019-01-22 15:59:42 +01:00
Robert Schütz
8c57113e14 python.pkgs.argparse: remove 
argparse is part of stdlib in 2.7 and 3.2+
 2019-01-22 12:43:07 +01:00
Linus Heckemann
4c651d1647 bam: 0.4.0 -> 0.5.1, fix licence 2019-01-21 11:34:28 +01:00
Frederik Rietdijk
ca2edf79f7 Merge master into staging-next 2019-01-20 18:22:17 +01:00
Jan Tojnar
ef14a225bb
Merge pull request #54007 from jtojnar/darwin-gsettings 
Darwin GSettings support
 2019-01-20 13:53:47 +01:00
Léo Gaspard
cf8383810e gn: use python2 as gn is incompatible with python3 2019-01-19 14:17:22 +01:00
Robin Palotai
68436aec2c Add awk as a default tool for Bazel shell commands. 
Apparently
e292e0452f/bazel/gflags.bzl (L8)
assumes it should be accessible. Normally we could ask them to fix, but
I would expect awk to be a commonly assumed.

The rough search
https://github.com/search?q=filename%3ABUILD+genrule+awk&type=Code
brings ~1K hits.
 2019-01-19 11:07:00 +01:00
Frederik Rietdijk
f8b45e2d84 Merge staging-next into staging 2019-01-19 09:24:01 +01:00
Kevin Rauscher
26e2eb3a9d bloop: 1.2.1 -> 1.2.3 2019-01-18 09:29:41 +01:00
Frederik Rietdijk
9cfae76fc5 Merge staging-next into staging 2019-01-17 09:21:29 +01:00
Jörg Thalheim
2eaadfa5be
conan: fix distro package version 2019-01-16 12:23:59 +00: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
Jörg Thalheim
fd5b4eeb19
Merge pull request #53380 from HaoZeke/updateConan 
conan: 1.6.0 -> 1.11.2
 2019-01-16 08:15:14 +00:00
Orivej Desh
052db93d8f bazel: fix patches after #53988 2019-01-16 00:54:56 +00:00
Félix Baylac-Jacqué
57004738b1 bazel: fix python stub paths. 
Since the 0.21 upgrade, the host `$PATH` is not forwarded anymore by
default to the sandboxes in charge to realize Bazel actions. This
default change broke the `py_binary` rule among other things.

Every python binary is wrapped in a stub in charge to setup the
execution environment. Currently, this stub's shebang points to a
`/usr/bin/env python` which cannot be resolved with the current
`$PATH`.
This results in breaking any build pipeline requiring the use of
python at some point. On top of the incorrect shebang, the stub
template is unable to find the actual python binary using
`SearchPath`.

This PR fixes those two things by re-writing the stub template shebang
to the actual python binary and by substituting the faulty default
python binary lookup to the right one.
 2019-01-15 19:25:24 +01:00
Frederik Rietdijk
42d276c6b8 Merge staging-next into staging 2019-01-15 16:59:03 +01:00
Kévin Rauscher
d6fc1163e8 bloop: 1.1.2 -> 1.2.1 (#53093) 2019-01-13 23:17:16 +01:00
Frederik Rietdijk
bb9581cd88 Merge staging-next into staging 2019-01-13 14:46:43 +01:00
volth
a4faf59aa1 ninja: re2c is not for building docs 
ninja sources include re2c's output files, so unless we change the sources by applying a patch, re2c is not even launched
anyway, it is not relevant to building docs
 2019-01-13 13:42:06 +01:00
Michael Weiss
768d876394
scons: Remove version 2.5.1 2019-01-12 10:44:33 +01:00
Jörg Thalheim
831ffbdc96
Merge pull request #53737 from dpetranek/update-leiningen 
leiningen: 2.8.1 -> 2.8.3
 2019-01-11 12:06:36 +00:00
Dmitry Kalinkin
9fac2254b2
Merge pull request #53666 from ThomasMader/dlang-update 
dmd: 2.083.1 -> 2.084.0, dub: 1.12.1 -> 1.13.0, dtools: 2.083.1 -> 2.084.0, Literate: 2018-12-23 -> 2019-01-08
 2019-01-10 13:54:44 -05:00
Profpatsch
9e9fec640e bazel: 0.20.0 -> 0.21.0 
0.21 removed the bundled openjdk-distribution. Instead, tries to fetch
the “right” distribution on-the-fly when building.
So we need to provide our own openjdk.

According to
https://github.com/bazelbuild/bazel/issues/6865#issuecomment-447261288
we should set `--host_javabase="@local_jdk//:jdk` if we want to do
that. This uses the jdk that is currently in the environment, which is
openjdk 8 in our case. 0.21 defaulted to a toolchain for JDK9, which
we don’t package in nixpkgs, so we use the JDK8 toolchain.

This commit also replaces the line-number-based sed invocations with
something more stable.
 2019-01-10 18:46:25 +01:00
Will Dietz
7e31406886 bazel: greatly reduce time spent substituting, be smart which files 
Files inspected: 2756 -> 40
Total size of inspected files: 20M -> 1016K
 2019-01-10 18:46:25 +01:00
dpetranek
7c19fba9f6 leiningen: 2.8.1 -> 2.8.3 2019-01-10 01:04:21 -06:00
Olli Helenius
4cb889f166 bear: fix wrapper detection patch by checking result of find_executable 
With the wrapper detection patch, if a build invokes an executable that cannot
be found in PATH by `find_executable`, bear will fail with an `AttributeError`
in `os.path.realpath`.

This can happen if the build invokes some project-local tool or command, like
`./build-something`.

Instead of calling using the result of `find_executable` directly, first check
whether the executable was found and fall back to original Bear behavior if
it was not.
 2019-01-09 23:00:16 +02:00
HaoZeke
efe4a6d205
conan: 1.6.0 -> 1.11.2 2019-01-09 19:33:29 +05:30
Thomas Mader
5041439421 dub: 1.12.1 -> 1.13.0 2019-01-09 08:05:51 +01:00
Will Dietz
e69d494033 scons: 3.0.2 -> 3.0.3 
https://scons.org/scons-303-is-available.html

cc e1d9854816
 2019-01-08 21:34:55 -06:00
Michael Weiss
a684ae6e53
scons: Remove version 3.0.0 2019-01-06 20:31:16 +01:00
Michael Weiss
d376ffe767
scons: Add version 3.0.2 
"SCons release 3.0.2 now available from the download page at
SourceForge. This release should be used instead of 3.0.1. This release
fixes several issues. This release supports Python versions 2.7.* as
well as 3.5+." [0]

Details can be found in the changelog [1].

I'll update the default after running additional tests.

[0]: https://scons.org/scons-302-is-available.html
[1]: https://raw.githubusercontent.com/SConsProject/scons/rel_3.0.2/src/CHANGES.txt
 2019-01-06 20:31:16 +01:00
Frederik Rietdijk
092e3b50a8 Merge master into staging-next 2019-01-02 21:08:27 +01:00
xeji
6056319934
Merge pull request #52964 from ThomasMader/dlang-update 
Dlang update 2018-12
 2019-01-01 23:49:46 +01:00
Tim Steinbach
711a74c65a
sbt: 1.2.7 -> 1.2.8 2019-01-01 12:38:06 -05:00
Frederik Rietdijk
070290bda7 Merge master into staging-next 2018-12-31 12:00:36 +01:00
Dmitry Bogatov
d77bab14ab tup: 0.7.5 -> 0.7.8 2018-12-29 13:04:54 +01:00
Thomas Mader
0bee7282c1 dub: 1.10.0 -> 1.12.1 2018-12-27 13:40:51 +01:00
Jan Tojnar
ef935fa101
Merge branch 'master' into staging 2018-12-24 15:02:29 +01:00
Mathieu Boespflug
53e8258a45 bazel: fix sandbox execution 
Bazel runs actions in a sandbox by default on Darwin and Linux.
However, the sandboxing was always and *silently* disabled previously,
because a Bazel feature test was always failing. The feature test
involved running `/bin/true` inside a sandbox. But on NixOS,
`/bin/true` does not exist...
 2018-12-20 15:18:34 +01:00
Frederik Rietdijk
9ab61ab8e2 Merge staging-next into staging 2018-12-19 09:00:36 +01:00
Frederik Rietdijk
826ab7026e Merge master into staging-next 2018-12-18 09:22:17 +01:00
Maximilian Bosch
b72dc8c2f2
Merge pull request #52189 from r-ryantm/auto-update/apache-maven 
maven: 3.5.4 -> 3.6.0
 2018-12-18 00:59:30 +01:00
Renaud
df1ec28ac9
Merge pull request #52076 from r-ryantm/auto-update/qbs 
qbs: 1.12.1 -> 1.12.2
 2018-12-17 17:59:51 +01:00
Jan Tojnar
aead6e12f9
Merge remote-tracking branch 'upstream/master' into staging 2018-12-16 22:55:06 +01:00
Dmitry Kalinkin
468a1d7aba
Merge pull request #49601 from dtzWill/update/gn-20181031 
gn: 20180830 -> 20181031
 2018-12-15 09:35:10 -05:00
Kevin Rauscher
297535be8e bloop: 1.1.1 -> 1.1.2 2018-12-15 13:11:12 +01:00
R. RyanTM
ff294a7162 maven: 3.5.4 -> 3.6.0 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/apache-maven/versions
 2018-12-15 00:51:43 -08:00
R. RyanTM
b98926d55a qbs: 1.12.1 -> 1.12.2 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/qbs/versions
 2018-12-14 08:14:10 -08:00
Jörg Thalheim
2874bacdec
Merge pull request #52045 from r-ryantm/auto-update/redo 
redo: 1.3 -> 1.4
 2018-12-14 13:49:56 +00:00
R. RyanTM
df42e8a636 redo: 1.3 -> 1.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/redo/versions
 2018-12-14 05:24:37 -08:00
Mathieu Boespflug
6f5014e0ae bazel: 0.18.0 -> 0.20.0 2018-12-14 11:02:25 +01:00
Mathieu Boespflug
463498e3fa bazel: Don't perform the checkPhase, since it's redundant with installCheckPhase. 
This change is going to be required when upgrading to Bazel 0.20.0,
because in the checkPhase we're not wrapping the Bazel binary yet to
set some necessary default arguments.
 2018-12-14 11:02:25 +01:00
Jan Tojnar
414ea0a10e
meson: 0.48.2 → 0.49.0 2018-12-12 00:22:02 +01:00
Tim Steinbach
475d653afd
sbt-extras: 2018-09-27 -> 2018-12-04 2018-12-10 12:56:39 -05:00
Frederik Rietdijk
747aa4cc93 Merge staging-next into staging 2018-12-07 15:31:52 +01:00
Frederik Rietdijk
5f554279ec Merge master into staging-next 2018-12-07 15:22:35 +01:00
Kevin Rauscher
0fc90852d9 bloop: 1.1.0 -> 1.1.1 2018-12-07 11:41:42 +01:00
Sarah Brofeldt
01389f1ad6
Merge pull request #51440 from Tomahna/bloop 
bloop: 1.0.0 -> 1.1.0
 2018-12-06 12:30:49 +01:00
Benjamin Hipple
72c059fad6 waf: 2.0.10 -> 2.0.13 2018-12-06 00:14:53 +00:00
Herwig Hochleitner
da511852c1 leiningen: move leiningen-x.x-standalone.jar out of share/java 
fixes #51448
 2018-12-04 02:58:58 +01:00
Matthew Bauer
f1a111bbc5
Merge pull request #51408 from matthewbauer/disable-subsecond-gnumake 
gnumake: disable subsecond mtime on darwin
 2018-12-03 08:32:59 -06:00
Matthew Bauer
26de2d1780 gnumake: disable subsecond mtime on darwin 
gnumake can support subsecond mtimes if it is available. But Darwin
doesn’t support setting subsecond mtimes until 10.13! So we can just
disable this check to avoid the issue where most of our built tools
use seconds but make uses nanoseconds. Might fix some parallel issues
along the way.

Fixes #51221
 2018-12-03 08:31:57 -06:00
Frederik Rietdijk
a510aa2672 Merge master into staging-next 2018-12-03 12:18:43 +01:00
Kevin Rauscher
57ec5d0edc bloop: 1.0.0 -> 1.1.0 2018-12-03 12:01:58 +01:00
Dmitry Kalinkin
62b4b790b7
mill-bin: nitpicks 2018-12-02 23:45:58 -05:00
scalavision
e0e8486a06 mill-bin: init at 0.3.5 2018-12-02 23:15:52 -05:00
markuskowa
506d4c7e44
Merge pull request #51329 from c0bw3b/cleanup/gnu-https 
Favor HTTPS URLs - the GNU edition
 2018-12-02 16:52:33 +01:00
c0bw3b
0498ccd076 Treewide: use HTTPS on GNU domains 
HTTP -> HTTPS for :
- http://gnu.org/
- http://www.gnu.org/
- http://elpa.gnu.org/
- http://lists.gnu.org/
- http://gcc.gnu.org/
- http://ftp.gnu.org/ (except in fetchurl mirrors)
- http://bugs.gnu.org/
 2018-12-02 15:51:59 +01:00
Jan Tojnar
4920f0c0ad
Merge pull request #50977 from jtojnar/parallel-update.nix 
update.nix: Run update scripts in parallel
 2018-12-02 01:23:39 +01:00
Jan Tojnar
59a94b57f0
update.nix: Run update scripts in parallel 
To make updating large attribute sets faster, the update scripts
are now run in parallel.

Please note the following changes in semantics:

- The string passed to updateScript needs to be a path to an executable file.
- The updateScript can also be a list: the tail elements will then be passed
  to the head as command line arguments.
 2018-12-01 19:17:13 +01:00
Tim Steinbach
813e74a2bf
sbt: 1.2.6 -> 1.2.7 2018-12-01 11:20:37 -05:00
Frederik Rietdijk
9b81c7e455 Merge staging-next into staging 2018-11-29 09:18:35 +01:00
Frederik Rietdijk
9db2421d1f Merge master into staging-next 2018-11-29 08:12:56 +01:00
Tim Steinbach
dc1a0df1bb
gradle: Add 5.0 2018-11-27 16:37:19 -05:00
Alyssa Ross
3ec6262cca
rake: 12.0.0 -> 12.3.1 
Fixes https://github.com/NixOS/nixpkgs/issues/36912.
 2018-11-25 18:56:52 +00: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
Matthew Bauer
70e2b0bef0 cmake: also set CTEST_PARALLEL_LEVEL 2018-11-19 18:14:44 -06:00
Matthew Bauer
285eb9a894 cmake: set CTEST_OUTPUT_ON_FAILURE globally 
We should always use this.
 2018-11-19 16:16:16 -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
Frederik Rietdijk
e343a85cfb Merge master into staging-next 2018-11-19 09:55:32 +01:00
Matthew Bauer
b75d5adb33 ninja: restore old -l flag value 
This can be set unconditionally to $NIX_BUILD_CORES according to
@orivej.
 2018-11-18 19:31:03 -06:00
Matthew Bauer
a16c04c9d3 ninja: don’t use build/install/check flags in setup-hook 
These don’t have much use in ninja, so easiest to leave them out.
 2018-11-18 19:31:02 -06:00
Matthew Bauer
4ebab3de1e ninja: use -t query to find test target 2018-11-18 19:31:02 -06:00
Matthew Bauer
f6f7283e69 meson: remove check phase 
This is now handled in ninja.
 2018-11-18 19:31:01 -06:00
Matthew Bauer
9433a3882b ninja: fix mistake in setup-hook 2018-11-18 19:31:01 -06:00
Matthew Bauer
69d1151bfa ninja: make setup-hook.sh closer to setup.sh 
Things changed in the Ninja setup-hook:
- Respect installFlags
- Automatically add checkPhase (can be disabled with dontUseNinjaCheck
  in the same way as dontUseNinjaBuild and dontUseNinjaInstall). Tests
  are only run when "ninja test" exists.
- Error in build phase when build.ninja is missing. We don’t have a
  way to fall back to other build methods, so it’s best to be very
  clear when we aren’t able to build with ninja
- Set -l flag to 1 when enableParallelBuilding is disabled
 2018-11-18 19:31:01 -06:00
Matthew Bauer
2c1d3a9a82 Merge remote-tracking branch 'upstream/master' into staging 2018-11-18 19:02:09 -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
Scott Dunlop
611ef59485 mage: init at 1.7.1 
(#46407)
* mage: init at 1.2.4

* mage: init at 1.7.1
 2018-11-18 17:35:41 +01:00
xeji
a292829e58
Merge pull request #50491 from oxij/pkgs/tiny-fixes 
trivial: random fixes
 2018-11-18 16:58:55 +01:00
Frederik Rietdijk
63c6875f26 Merge master into staging-next 2018-11-18 10:32:12 +01:00
Guillaume Maudoux
de8fe66ba0 buck: use upstream version convention 
Changes added in 4d1fd3775d break
automated updates by moving to a custom version scheme.

This switches back to upstream versioning, while maintaining version
schema convention of `builtins.parseDrvName`.

See issue #43717
 2018-11-18 09:56:23 +01:00
Jan Malakhovski
fe50c0c096 cmake_2_8: fix fetchpatch src 
Old link no longer works. There're other broken patches in that file,
but I was too lazy to investigate where one can download them now.
 2018-11-17 10:16:30 +00:00
Piotr Bogdan
2c60a41d0a gnumake3: remove 2018-11-15 17:41:25 +00:00
Matthew Bauer
b6fce7201e xboxdrv: add dontUseSconsInstall flag 
xboxdrv doesn’t use scons for installing, but instead using a
makefile! Everything else is in scons so we have to keep that. I’ve
added a dontUseSconsInstall flag to the scons setup-hook to skip the
automatic overwrite of default “make install” call.
 2018-11-14 13:57:41 -06:00
Matthew Bauer
73951bc0c8
Merge pull request #50293 from matthewbauer/cleanups2 
Add setup-hooks for scons and waf
 2018-11-13 19:17:00 -06:00