Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge master into staging-next | Frederik Rietdijk | 2020-03-12 |
|\ | |||
| * | meson: add jtojnar to maintainers | Jan Tojnar | 2020-03-11 |
| | | |||
* | | Merge pull request #81869 from r-ryantm/auto-update/cmake | Thomas Tuegel | 2020-03-08 |
|\ \ | |/ |/| | cmake: 3.16.4 -> 3.16.5 | ||
| * | cmake: 3.16.4 -> 3.16.5 | R. RyanTM | 2020-03-06 |
| | | |||
* | | Merge staging-next into staging | Frederik Rietdijk | 2020-03-06 |
|\ \ | |||
| * | | waf: move binary to $out/bin/ | Matthew Bauer | 2020-03-06 |
| | | | | | | | | | | | | | | | | | | | | | Originally this was just the executable, but this breaks nix-shell usage. Instead, just do a normal directory. Fixes #79909 | ||
| * | | bazel_0: init at 0.26.0 | Andreas Rammhold | 2020-03-04 |
| |/ | |||
* | | Merge branch 'staging-next' into staging | Jan Tojnar | 2020-03-04 |
|\| | |||
| * | bazel-remote: fix fixed output derivation hash | Andreas Rammhold | 2020-03-03 |
| | | |||
| * | Merge pull request #80953 from andir/bazel-poison | Andreas Rammhold | 2020-03-03 |
| |\ | | | | | | | buildBazelPackage: poison all the fixed output derivations | ||
| | * | bazel-remote: update fixed output hash | Andreas Rammhold | 2020-03-03 |
| | | | |||
| * | | pkgs/bazel*: Fix path to update-srcDeps.py | Janne Heß | 2020-03-02 |
| |/ | | | | | | | Otherwise, the -small channel fails on the tarball output. | ||
| * | Add bazel 1.2.1 | Michael Lingelbach | 2020-03-02 |
| | | |||
* | | Merge staging-next into staging | Frederik Rietdijk | 2020-02-29 |
|\| | |||
| * | bazel: output correct binary name | Joao Neves | 2020-02-28 |
| | | | | | | | | | | | | | | | | | | | | From Bazel 2.0.0 onwards, Bazel looks for a binary named `bazel-${version}-${os_arch}` if the project root contains a `.bazelversion` file or the USE_BAZEL_VERSION environment variable is set. This change ensures we output a binary with the correct name for the current version and OS/arch combination. | ||
| * | bazel: 2.0.0 -> 2.1.0 | Joao Neves | 2020-02-28 |
| | | |||
| * | Revert "meson: 0.52.1 -> 0.53.2" | Jan Tojnar | 2020-02-28 |
| | | | | | | | | | | | | This reverts commit d607564d6824612f3c9f8a4e7d5477981a1b1193. should go to staging | ||
| * | Merge pull request #80797 from mpoquet/meson-0.52.1-to-0.53.1 | Jan Tojnar | 2020-02-28 |
| |\ | | | | | | | meson: 0.52.1 -> 0.53.1 | ||
| | * | meson: 0.52.1 -> 0.53.2 | Millian Poquet | 2020-02-27 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||
* | | | meson: 0.52.1 -> 0.53.2 | Millian Poquet | 2020-02-28 |
|/ / | | | | | | | | | | | | | | | 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 | ||
* / | mill: 0.6.0 -> 0.6.1 (#81017) | R. RyanTM | 2020-02-26 |
|/ | |||
* | Merge pull request #80635 from marsam/fix-bazel-darwin | Daiderd Jordan | 2020-02-22 |
|\ | | | | | bazel: fix build on darwin | ||
| * | bazel: fix linker flags for darwin | Mario Rodas | 2020-02-20 |
| | | |||
* | | Merge pull request #80627 from marsam/update-bazel-buildtools | Mario Rodas | 2020-02-21 |
|\ \ | | | | | | | bazel-buildtools: 0.29.0 -> 1.0.0 | ||
| * | | bazel-buildtools: add marsam to maintainers | Mario Rodas | 2020-02-20 |
| | | | |||
| * | | bazel-buildtools: 0.29.0 -> 1.0.0 | Mario Rodas | 2020-02-20 |
| |/ | |||
* | | Merge pull request #80645 from xfix/cmake_2_8-fix-build | Silvan Mosberger | 2020-02-21 |
|\ \ | | | | | | | cmake_2_8: fix build | ||
| * | | cmake_2_8: fix build | Konrad Borowski | 2020-02-20 |
| |/ | |||
* | | Merge pull request #80728 from timokau/maven-jdk-overridable | Timo Kaufmann | 2020-02-21 |
|\ \ | |/ |/| | maven: make jdk overridable | ||
| * | maven: make jdk overridable | Timo Kaufmann | 2020-02-21 |
| | | | | | | | | | | | | This makes it possible to use maven with different (newer) jdks. Fixes #75630 | ||
* | | Merge pull request #80527 from marsam/update-bazel-remote | Mario Rodas | 2020-02-19 |
|\ \ | | | | | | | bazel-remote: 2020-01-29 -> 1.0.0 | ||
| * | | bazel-remote: 2020-01-29 -> 1.0.0 | Mario Rodas | 2020-02-14 |
| | | | |||
* | | | bmake: 20181221 -> 20200212 | R. RyanTM | 2020-02-19 |
|/ / | |||
* | | Merge master into staging | Frederik Rietdijk | 2020-02-16 |
|\| | |||
| * | Merge pull request #77140 from dtzWill/feature/samurai | Will Dietz | 2020-02-13 |
| |\ | | | | | | | samurai: init at 1.0 | ||
| | * | samurai: init at 1.0 | Will Dietz | 2020-01-06 |
| | | | |||
* | | | cmake: 3.16.3 -> 3.16.4 | R. RyanTM | 2020-02-12 |
|/ / | |||
* | | Merge staging into staging-next | Frederik Rietdijk | 2020-02-11 |
|\ \ | |||
| * | | ninja: 1.9.0 -> 1.10.0 | Tobias Mayer | 2020-02-09 |
| | | | |||
* | | | mage: 1.8.0 -> 1.9.0 | R. RyanTM | 2020-02-10 |
|/ / | |||
* | | sbt: 1.3.7 -> 1.3.8 | R. RyanTM | 2020-02-07 |
| | | |||
* | | Merge master into staging-next | Frederik Rietdijk | 2020-02-05 |
|\ \ | |||
| * | | bazel-deps: remove | Uri Baghin | 2020-02-04 |
| | | | |||
| * | | bazel-remote: 2019-01-12 -> 2020-01-29 | Uri Baghin | 2020-02-04 |
| | | | |||
* | | | waf: 2.0.18 -> 2.0.19 | Benjamin Hipple | 2020-02-02 |
| | | | | | | | | | | | | | | | The patch for sorting files in `tar` is no longer needed, as it has been fixed upstream: https://gitlab.com/ita1024/waf/-/merge_requests/2227 | ||
* | | | cmake: move CMAKE_OSX_ARCHITECTURES out of the stdenv | Daiderd Jordan | 2020-01-31 |
| | | | | | | | | | | | | | | | | | | This was initially introduced in 92188d9d1751892ddbf8913da73dfc150d18fadb, not clear how relevant this still is but i686 isn't supported anymore so disable it explicitly. | ||
* | | | cmake: remove CMAKE_OSX_DEPLOYMENT_TARGET overrides | Daiderd Jordan | 2020-01-31 |
|/ / | | | | | | | We _do_ want minimum versions in our packages. | ||
* | | Merge staging into staging-next | Frederik Rietdijk | 2020-01-31 |
|\ \ | |||
| * | | cmake: 3.16.2 -> 3.16.3 | R. RyanTM | 2020-01-29 |
| | | | |||
* | | | build-rebar3: restore rebar3-nix-bootstrap path (#78418) | Jörg Thalheim | 2020-01-30 |
|\ \ \ | |/ / |/| | | build-rebar3: restore rebar3-nix-bootstrap path |