Commit Graph

2378 Commits

Author SHA1 Message Date
github-actions[bot]
00e2bbfcff
Merge staging-next into staging 2021-09-17 06:02:03 +00:00
Bobby Rong
a3c4956cf9
Merge pull request #136004 from timothyklim/bazel-4.2.0
bazel_4: 4.1.0 -> 4.2.1
2021-09-17 10:45:20 +08:00
github-actions[bot]
2ad7b248e6
Merge staging-next into staging 2021-09-17 00:02:15 +00:00
Sandro
70866ce86a
Merge pull request #138141 from NeQuissimus/sbtextras 2021-09-16 20:59:07 +02:00
Tim Steinbach
2182da1de8
bloop: 1.4.8 -> 1.4.9 2021-09-16 13:35:43 -04:00
Tim Steinbach
b5cdae3f9b
sbt-extras: 2021-08-04 → 2021-09-15 2021-09-16 09:18:26 +00:00
github-actions[bot]
52ebc93c96
Merge staging-next into staging 2021-09-16 06:01:54 +00:00
Bobby Rong
e67fa985c8
Merge pull request #136230 from liff/gradle/v7.2
gradle: 7.1.1 -> 7.2
2021-09-16 11:48:08 +08:00
R. RyanTM
2d7ee6ac56 bazel-remote: 2.1.1 -> 2.1.3 2021-09-15 06:51:53 +00:00
github-actions[bot]
91c89490cc
Merge master into staging-next 2021-09-14 18:01:05 +00:00
R. RyanTM
a9a2bb2677 qbs: 1.19.1 -> 1.20.0 2021-09-14 14:42:56 +00:00
github-actions[bot]
38520726fc
Merge master into staging-next 2021-09-14 06:01:28 +00:00
R. RyanTM
c9e42a65d2 bazel-buildtools: 4.0.1 -> 4.2.0 2021-09-14 01:53:07 +00:00
Luke Granger-Brown
a8be3a74cc cmake: revert cmake support for 10.4 Tiger
This is a reversed patch of https://gitlab.kitware.com/cmake/cmake/-/merge_requests/6426.

_CURRENT_OSX_VERSION isn't set properly, which causes this condition to fail,
which means we don't get CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG which means
we can't compile libcxx. Ugh.
2021-09-11 15:12:21 +01:00
github-actions[bot]
4170ee273c
Merge master into staging-next 2021-09-11 12:01:12 +00:00
Sandro
9d464af4c1
Merge pull request #136103 from vale981/init_build2 2021-09-11 13:00:23 +02:00
Alyssa Ross
56314db098
Merge remote-tracking branch 'nixpkgs/master' into staging-next
Conflicts:
	pkgs/development/compilers/ghc/8.10.7.nix
	pkgs/development/compilers/ghc/8.8.4.nix

I've removed the isWindows check from useLdGold in ghc, since that should
be covered by the new hasGold check.
2021-09-11 10:49:13 +00:00
Valentin Boettcher
b3fd09e93b build2: init at 0.13.0
Update pkgs/development/tools/build-managers/build2/default.nix

Co-authored-by: figsoda <figsoda@pm.me>

Update pkgs/development/tools/build-managers/build2/default.nix

Co-authored-by: figsoda <figsoda@pm.me>

Update pkgs/development/tools/build-managers/build2/default.nix

Co-authored-by: Bobby Rong <rjl931189261@126.com>

fix mac build and skip phases properly

Update pkgs/development/tools/build-managers/build2/default.nix

Co-authored-by: r-burns <52847440+r-burns@users.noreply.github.com>

Update pkgs/development/tools/build-managers/build2/default.nix

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

Update pkgs/development/tools/build-managers/build2/default.nix

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

Update pkgs/development/tools/build-managers/build2/default.nix

Co-authored-by: r-burns <52847440+r-burns@users.noreply.github.com>

Update pkgs/development/tools/build-managers/build2/default.nix

Co-authored-by: r-burns <52847440+r-burns@users.noreply.github.com>

Update pkgs/development/tools/build-managers/build2/default.nix

Co-authored-by: r-burns <52847440+r-burns@users.noreply.github.com>

Update pkgs/development/tools/build-managers/build2/default.nix

Co-authored-by: r-burns <52847440+r-burns@users.noreply.github.com>
2021-09-11 10:34:10 +02:00
Luke Granger-Brown
daa1175255 cmake: 3.21.1 -> 3.21.2
3.21.1 has a bug which causes darktable to fail to compile (passes weird
  arguments to ar in the ninja-generated files), which is fixed in
  3.21.2.
2021-09-11 03:24:26 +00:00
Luke Granger-Brown
fc77b402c0 conan: 1.35.0 -> 1.40.0 2021-09-11 03:24:26 +00:00
David
dfd8733a76 rebar3: 3.16.1 -> 3.17.0 2021-09-11 11:11:57 +09:00
github-actions[bot]
dbebaeb8ba
Merge master into staging-next 2021-09-09 18:01:06 +00:00
Sebastian Neubauer
f73811932b rocm-cmake: add update script 2021-09-09 13:38:03 +02:00
github-actions[bot]
31efc58eb0
Merge master into staging-next 2021-09-08 18:01:03 +00:00
Bernardo Meurer
739c25621f
Merge pull request #136445 from lovesegfault/rocm-hip
hip: init at 4.3.1
2021-09-08 10:45:57 -07:00
Alyssa Ross
071a7a4583
Merge remote-tracking branch 'nixpkgs/master' into staging-next 2021-09-03 18:23:45 +00:00
Alyssa Ross
ee94d2f392
bear: 3.0.13 -> 3.0.14 2021-09-03 13:32:26 +00:00
Bernardo Meurer
bd698dbd7e
rocm-cmake: 4.1.0 -> 4.3.1 2021-09-02 13:04:15 -07:00
Olli Helenius
e6e71a137d
gradle: 7.1.1 -> 7.2 2021-08-30 23:11:17 +03:00
Timothy
4b8c664c7e bazel_4: 4.1.0 -> 4.2.1 2021-08-31 02:23:16 +07:00
github-actions[bot]
dbad333a72
Merge master into staging-next 2021-08-28 12:01:06 +00:00
Dmitry Kalinkin
e2e44d9b5c
bear: fix on x86_64-darwin 2021-08-27 20:22:27 -04:00
github-actions[bot]
b7f2a7d1ba
Merge master into staging-next 2021-08-28 00:01:34 +00:00
Pavol Rusnak
999f55ee01
bear: unbreak on aarch64-darwin
we have recent macOS SDK on aarch64-darwin, only x86_64-darwin is broken
2021-08-27 23:30:51 +02:00
github-actions[bot]
10ce8bb753
Merge master into staging-next 2021-08-27 00:01:31 +00:00
Sandro
1c34482153
Merge pull request #134150 from Kranzes/auto-update/apache-maven
maven: 3.8.1 -> 3.8.2
2021-08-26 22:26:27 +02:00
github-actions[bot]
b13b005f0e
Merge master into staging-next 2021-08-26 12:01:09 +00:00
zowoq
13ea123c74 treewide: buildFlagsArray -> ldflags 2021-08-26 21:35:06 +10:00
Jan Tojnar
7a04c2ad68 Merge branch 'staging-next' into staging
- boost 171 removed on staging-next
- re-generated node-packages.nix

; Conflicts:
;	pkgs/development/java-modules/m2install.nix
;	pkgs/development/node-packages/node-packages.nix
;	pkgs/top-level/all-packages.nix
2021-08-22 01:13:41 +02:00
Sebastián Mancilla
8f94a33b38 treewide: ensure pre/post phase hooks are strings
Some derivations use lib.optional or lib.optionals when setting pre/post
phase hooks. Ensure the proper lib.optionalString is used.
2021-08-20 19:08:42 -04:00
Tim Steinbach
af771ae6a0
sbt-extras: 2021-04-26 → 2021-08-04 2021-08-19 16:03:13 +00:00
Dmitry Kalinkin
9528fbb483
Merge pull request #133601 from tobim/pkgs/cmake-3.21.1
cmake: 3.19.7 -> 3.21.1
2021-08-18 20:23:00 -04:00
github-actions[bot]
2341511023
Merge staging-next into staging 2021-08-18 00:01:59 +00:00
Andreas Rammhold
c99da90beb
Merge pull request #134322 from andir/scons-fixup
scons: use python2 for all scons versions <4
2021-08-17 23:58:43 +02:00
Jan Tojnar
e286e1cfa0 Merge branch 'staging-next' into staging
- boost 167 removed on staging-next (7915d1e03f) × boost attributes are inherited on staging (d20aa4955d)

- linux kernels were moved to linux-kernels.nix on staging-next (c62f911507) × hardened kernels are versioned on staging (a5341beb78) + removed linux_5_12 (e55554491d)

- conflict in node-packages – I regenerated it using node2nix from nixos-unstable (does not build on staging)
2021-08-17 18:52:37 +02:00
Sandro
dfa58ab147
Merge pull request #134288 from fufexan/arpa2cm 2021-08-16 15:43:34 +02:00
Andreas Rammhold
f680248169
scons: use python2 for all scons versions <4
While refactoring this file in a previous PR I accideintially ported
scons 3.0.1 to Python3 which doesn't work. Only Scons >=4 supports
Python3.
2021-08-16 15:18:38 +02:00
Mihai Fufezan
569a0b6063
arpa2cm: 0.5 -> 0.9.0 2021-08-16 09:20:34 +03:00
github-actions[bot]
4dfde9ac8e
Merge staging-next into staging 2021-08-15 18:01:33 +00:00
Ilan Joselevich
faf977b292 maven: 3.8.1 -> 3.8.2 2021-08-15 12:17:08 +03:00