Commit Graph

2593 Commits

Author SHA1 Message Date
sternenseemann
edfba44b90 gprbuild, gprbuild-boot: bump gprconfig_kb to 22.0.0
gprconfig_kb finally also saw a new release, so it matches the gprbuild
version again.
2021-11-16 00:25:34 +01:00
sternenseemann
7f96c6f037 gprbuild, gprbuild-boot: 21.0.0 -> 22.0.0 2021-11-15 22:41:56 +01:00
Lorenz Leutgeb
5153a6cf19 gradle: Clean up 2021-11-15 19:19:50 +01:00
Victor Engmark
57b496ea98 misc: Replace tab indentation with spaces
I've tried to be consistent, using four or eight spaces to line up
with existing code.
2021-11-14 16:04:46 +13:00
github-actions[bot]
9b5a105856
Merge master into staging-next 2021-11-14 00:01:47 +00:00
Jörg Thalheim
324d5b3ee8
Merge pull request #145709 from winterqt/bazel-md5sum
bazel: replace additional usages of md5sum
2021-11-13 22:51:21 +00:00
Winter
21727e4915 bazel: replace additional usages of md5sum 2021-11-12 21:50:32 -05:00
github-actions[bot]
699560194d
Merge master into staging-next 2021-11-12 18:01:08 +00:00
github-actions[bot]
4535cfe0ab
Merge master into staging-next 2021-11-12 12:01:10 +00:00
Uri Baghin
61c121424d
bazel_4: link to issue about aarch64-darwin 2021-11-12 21:58:45 +11:00
Uri Baghin
64144e80df bazel_4: disable install check on aarch64-darwin 2021-11-12 10:32:59 +01:00
github-actions[bot]
026e6c328a
Merge master into staging-next 2021-11-12 00:01:22 +00:00
Lionello Lunesu
7da895a43a dub: enable aarch64-darwin 2021-11-11 08:30:44 -08:00
github-actions[bot]
259e08cd22
Merge master into staging-next 2021-11-10 18:01:21 +00:00
Lorenz Leutgeb
bfd4f21603 gradle: 7.2 -> 7.3 2021-11-10 15:54:55 +01:00
github-actions[bot]
707b006bf7
Merge master into staging-next 2021-11-09 00:01:30 +00:00
Jakub Kozłowski
e128f089ee scala-cli: 0.0.7 -> 0.0.8 2021-11-08 18:23:00 +01:00
github-actions[bot]
cb91ac99e0
Merge master into staging-next 2021-11-08 00:01:53 +00:00
Sandro
f2c9cf39e5
Merge pull request #145006 from Artturin/spdlogupd 2021-11-07 23:04:28 +01:00
Artturin
b4fab0a98b treewide: remove fmt from buildInputs where spdlog is used
spdlog_1 has fmt_8 in propagatedBuildInputs and having fmt which points
to fmt_7 in buildInputs makes the builds use wrong fmt
2021-11-07 22:05:08 +02:00
github-actions[bot]
89ec09c858
Merge master into staging-next 2021-11-06 12:01:12 +00:00
Kevin Cox
cc8db4bc81
Merge pull request #143152 from lorenzleutgeb/gradle-upgrade
gradle: add 7.3-rc-3, 6.8 -> 6.9.1
2021-11-06 06:57:19 -04:00
github-actions[bot]
20bee66ec8
Merge staging-next into staging 2021-11-04 18:01:44 +00:00
Jakub Kozłowski
49193f4ad3 scala-cli: init at 0.0.7 2021-11-04 15:16:30 +01:00
Anderson Torres
be4a3509fa
Merge pull request #144507 from AndersonTorres/new-misc
Misc modifications
2021-11-04 10:04:31 -03:00
github-actions[bot]
cca97be2f0
Merge staging-next into staging 2021-11-04 12:01:39 +00:00
AndersonTorres
bd0b227bc9 go-mk: init at 0.pre+date=2015-03-24 2021-11-03 16:14:39 -03:00
AndersonTorres
76041cb768 mk: remove
The fetch fails because the tarball is no longer saved on nixos servers.
2021-11-03 15:34:40 -03:00
Sandro Jäckel
8547db919a
treewide: switch `builtins.fromJSON(builtins.readFile ./file.json)` to lib.importJSON ./file.json 2021-11-03 14:43:52 +01:00
Martin Weinelt
8f5da907b0 Merge remote-tracking branch 'origin/staging-next' into staging 2021-11-02 23:31:28 +01:00
Lorenz Leutgeb
580951d4e2 gradle: Add update.sh maintenance script 2021-11-02 09:43:24 +01:00
Lorenz Leutgeb
43750fb958 gradle: add 7.3-rc-3, 6.8 -> 6.9.1 2021-11-02 09:39:36 +01:00
R. Ryantm
c01320b3f6 sbt-extras: 2021-09-24 -> 2021-10-21 2021-11-01 02:27:20 +00:00
github-actions[bot]
fdcee2eb3b
Merge staging-next into staging 2021-10-31 00:02:05 +00:00
Felix Buehler
18664585ac rebar: switch to fetchFromGitHub 2021-10-30 13:10:23 -07:00
github-actions[bot]
9a002bac35
Merge staging-next into staging 2021-10-29 18:01:38 +00:00
Sandro
87695e30bb
Merge pull request #143512 from LibreCybernetics/treewide-coursier 2021-10-29 16:33:34 +02:00
github-actions[bot]
853a47c140
Merge staging-next into staging 2021-10-29 12:01:53 +00:00
Ellie Hermaszewska
b0bbd5ba4e
Merge pull request #143579 from r-ryantm/auto-update/qbs
qbs: 1.20.0 -> 1.20.1
2021-10-29 14:34:29 +08:00
R. Ryantm
f9b615c9ff qbs: 1.20.0 -> 1.20.1 2021-10-29 06:20:44 +00:00
github-actions[bot]
d9aba51052
Merge staging-next into staging 2021-10-29 06:01:42 +00:00
Bobby Rong
6bd0720270
Merge pull request #143538 from r-ryantm/auto-update/bazel-remote
bazel-remote: 2.1.3 -> 2.2.0
2021-10-29 12:43:38 +08:00
R. Ryantm
74df451f60 bazel-remote: 2.1.3 -> 2.2.0 2021-10-29 02:38:39 +00:00
R. Ryantm
5f33ec4892 bazel-buildtools: 4.2.0 -> 4.2.3 2021-10-29 02:28:57 +00:00
Fabián Heredia Montiel
fc6ccc25cc treewide: fix /bin/coursier references
After https://github.com/NixOS/nixpkgs/pull/142254 coursier provides its
binary as /bin/cs rather than /bin/coursier
2021-10-28 19:48:29 -05:00
Alyssa Ross
3f01b576af
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
	nixos/doc/manual/release-notes/rl-2111.section.md
2021-10-28 16:07:38 +00:00
Sandro
83219e47af
Merge pull request #142627 from r-burns/build2 2021-10-27 20:47:16 +02:00
Rohan
ab3b762460 maven: 3.8.2 -> 3.8.3 2021-10-26 14:25:12 +13:00
Ryan Burns
1f6d7365a9 build2: enable on all platforms
These are working on darwin, and the upstream developers
even use them on windows.
2021-10-24 13:03:56 -07:00
Ryan Burns
1c6b48a423 build2: 0.13.0 -> 0.14.0
This is a breaking update (at least for the internal C++ APIs) so the
packages all need to be updated in lockstep.

Misc notes:

* build2
  * Remove unnecessary pkg-config patch
  * Trivially refresh remove-config-store-paths.patch
* libbutl
  * Enable tests now that they work with NDEBUG
* libodb
  * update 2.5.0-b.19 -> 2.5.0-b.21
2021-10-24 13:03:48 -07:00
github-actions[bot]
f79dcf6535
Merge staging-next into staging 2021-10-23 06:01:39 +00:00
Ryan Burns
5739ba1a27 build2.bootstrap: 0.13.0 -> 0.14.0 2021-10-22 17:53:38 -07:00
Ryan Burns
8b5982c9a7
Merge pull request #139347 from r-burns/build2
build2: split out dependencies
2021-10-22 17:31:31 -07:00
github-actions[bot]
2564b3d967
Merge staging-next into staging 2021-10-19 18:01:48 +00:00
Pavol Rusnak
d31c9bd3f0
Merge pull request #139571 from prusnak/dotnet-cleanup
dotnet: cleanup; point dotnet-sdk alias to 5.0; remove unsupported SDKs
2021-10-19 09:16:11 +02:00
Pavol Rusnak
eca667180b
dotnet: cleanup; point dotnet-sdk alias to 5_0; remove unsupported SDKs 2021-10-18 23:46:17 +02:00
Jim Garrison
07644a1733
ekam: init at 2021-09-18 (#141064)
Co-authored-by: Ian Denhardt <ian@zenhack.net>
Co-authored-by: Artturi <Artturin@artturin.com>
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-10-18 22:45:19 +02:00
Artturi
2736cee9ae
waf: fix cross-compiling by not overriding python in all-packages.nix (#141821)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-10-16 19:11:28 +02:00
Fabián Heredia Montiel
4e2085f338 shards: 0.15 → 0.16 2021-10-14 14:28:50 -05:00
figsoda
842c49708e fac-build: 0.5.3 -> 0.5.4, switch to fetchCrate, remove patch 2021-10-07 08:39:22 -04:00
Tim Steinbach
34f9123fa1
sbt-extras: 2021-09-15 → 2021-09-24 2021-10-05 08:24:25 +00:00
David Morgan
62d2fc1cca leiningen: 2.9.6 -> 2.9.7 2021-09-30 16:43:37 +01:00
Artturin
9bd941c5d2 crystal,shards: remove old versions 2021-09-27 00:15:11 +03:00
Artturin
0f55588885 shards: 0.14 -> 0.15 2021-09-27 00:15:10 +03:00
Ryan Burns
3332be9a8b build2: split out dependencies
Build2's dependency libraries and helper programs
bpkg/bdep are all built and installed separately.

Adds a build2 setup hook for packaging purposes,
based on those of cmake and ninja.

Two small patches are applied to build2's source:
one to remove store references from the stored config,
and one to help build2 detect library dirs from NIX_LDFLAGS.
2021-09-24 17:01:18 -07:00
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
Andreas Rammhold
218df5159c
sconsPackages: expose the python version used with scons
This allows users of scons to pick the correct version of python.
Previously we had issues with some build systems not picking the right
python3 version when adding additional python modules to the build
environment. A famous example of this is mongodb where additional python
modules are required to run the scons build.

This is change doesn't introduce rebuilds (to the best of my knowledge)
as it only adds a passthru argument and changes how we pass the python
version around.
2021-08-14 13:27:15 +02:00
Tobias Mayer
4aac491f18 cmake: Fix on darwin-arm64
Adds the SystemConfiguration framework to buildInputs unless we're
bootstrapping.

For the bootstrap version, we revert
31f631a142
instead so CMake builds without SystemConfiguration.
2021-08-12 11:26:13 +02:00
tobim
12da67f0c6 cmake: 3.21.0 -> 3.21.1 2021-08-12 11:26:13 +02:00
Tobias Mayer
3c7fbeaf4a Revert "Revert "cmake: 3.19.7 -> 3.21.0""
This reverts commit bd57a30d1b.
2021-08-11 14:31:11 +02:00
github-actions[bot]
c47bdfa71a
Merge staging-next into staging 2021-08-08 06:01:51 +00:00
Artturi
fcc7cd5554
Merge pull request #132165 from corngood/msbuild 2021-08-08 08:23:32 +03:00
Vladimír Čunát
8ab6ba6b1c
Merge branch 'staging-next' into staging 2021-08-06 09:14:57 +02:00
JesusMtnez
a752a1c897
sbt: 1.5.4 -> 1.5.5 2021-08-05 05:19:45 +02:00
zimbatm
59091b7787
gradle_7: 7.1 -> 7.1.1 2021-08-04 18:06:18 +02:00
zimbatm
8c0d0fcf86
gradle: fmt 2021-08-04 18:06:18 +02:00
github-actions[bot]
2427da39ca
Merge staging-next into staging 2021-08-03 18:01:44 +00:00
sternenseemann
c3c4ef859a gprbuild, xmlada: init at 21.0.0
GPRbuild is a multi language build system developed by AdaCore which
is mostly used for build Ada-related projects using GNAT.

Since GPRbuild is used to build itself and its dependency library
XML/Ada we first build a bootstrap version of it using the provided
bash build script bootstrap.sh as the gprbuild-boot derivation.
gprbuild-boot is then used to build xmlada and the proper gprbuild
derivation.

GPRbuild has its own search path mechanism via GPR_PROJECT_PATH which
we address via a setupHook. It currently works quite similar to the
pkg-config one: It accumulates all inputs into GPR_PROJECT_PATH,
GPR_PROJECT_PATH_FOR_BUILD etc. However this is quite limited at the
moment as we don't have a gprbuild wrapper yet which understands the
_FOR_BUILD suffix. However, we'll need to address this in the future
as it is currently basically impossible to test since the distinction
only affects cross-compilation, but it is not possible to build a GNAT
cross-compiler in nixpkgs at the moment (I'm working on changing that,
however).

Another issue we had to solve was GPRbuild not finding the right GNAT
via its gprconfig tool: GPRbuild has a knowledge base with compiler
definitions which run some checks and collect info about binaries
which are in PATH. In the end the first compiler in PATH that supports
the desired language is selected.

We want GPRbuild to discover our wrapped GNAT since the unwrapped one
is incapable of producing working binaries since it won't find the
crt*.o objects distributed with libc. GPRbuild however needs to find
the Ada runtime distributed with GNAT which is not part of the wrapper
derivation, so it will skip the wrapper and select the unwrapped GNAT.
Symlinking the unwrapped's lib directory into the wrapper fixes this
problem, but breaks linking in some cases (e. g. when linking against
OMP from gcc, the runtime variant will shadow the problem dynamic lib
from buildInputs). Additionally it uses gnatls as an indicator it has
found GNAT which is not part of the wrapper.

The solution we opted to adopt here is to install a custom compiler
description into gprbuild's knowledge base which properly detects the
nixpkgs GNAT wrapper: It uses gnatmake to detect GNAT instead of
gnatls and discovers the runtime via a symlink we add to
`$out/nix-support`. This additional definition is enough to properly
detect GNAT, since the plain wrapped gcc detection works out of the
box. It may, however, be necessary to add special definitions for
other languages in the future where gprbuild also needs to discover
the runtime.

One future improvement would be to install libgpr into a separate
output or split it into a separate derivation (which would require to
link gprbuild statically always since otherwise we end up with a
cyclical dependency).
2021-08-03 14:58:49 +02:00
Sandro
65989410c7
Merge pull request #132034 from SuperSandro2000/cmake
cmake: format
2021-08-02 08:23:28 +00:00
David McFarland
3672c0a33f msbuild: 16.8 -> 16.10.1 2021-07-30 17:10:03 -03:00
Sandro Jäckel
9e3ca9d8ee
cmake: format, cleanup 2021-07-30 14:35:01 +02:00
David
c160267002 rebar3: apply tmpdir patch from upstream 2021-07-30 21:24:57 +09:00
Frederik Rietdijk
bd57a30d1b Revert "cmake: 3.19.7 -> 3.21.0"
cmake on darwin now depends on the SystemConfiguration framework.
Support for this has not yet been added to our bootstrapping.

We need to decide how to go further. As this is blocking staging-next
it is reverted.

This reverts commit 29bbaa1489.
2021-07-30 10:21:40 +02:00
Tobias Mayer
29bbaa1489 cmake: 3.19.7 -> 3.21.0
Also removing a comment that instructs maintainers to cross-check
the hash with one that is posted upstream, because as @lilyball
reasoned:

"I'm not really sure what the benefit of comparing the hash is; if the
download is tampered with, the hash is served from the same site and
would presumably be tampered with as well, and the download is done over
https and declares its Content-Length so there's no risk of truncation
(which would cause the file to fail to unpack anyway)"
2021-07-29 10:52:18 +02:00
github-actions[bot]
3087a2d2e9
Merge staging-next into staging 2021-07-21 12:02:00 +00:00
Sandro
5b4522838c
Merge pull request #130874 from SuperSandro2000/SuperSandro2000-patch-1
cmake: don't use meta.homepage in fetchurl
2021-07-21 13:12:27 +02:00
github-actions[bot]
94a7cf0dcd
Merge staging-next into staging 2021-07-21 00:02:24 +00:00
Sandro
f32f7553c5
cmake: don't use meta.homepage in fetchurl 2021-07-20 23:57:01 +02:00
Vladimír Čunát
586a9e6bff
Merge #129506: 'staging-next' branch 2021-07-20 22:07:53 +02:00
Jonathan Ringer
1916bd8717 mill: 0.9.8 -> 0.9.9
Use the `${version}-assembly` artifact, which avoids
having to download it using the release script
2021-07-20 13:07:35 -07:00
Ben Siraphob
4ce8c34049 treewide: remove unnecessary enableParallelBuilding when using qmake 2021-07-20 10:32:58 +07:00
github-actions[bot]
f2eada4ab8
Merge master into staging-next 2021-07-18 06:01:33 +00:00
github-actions[bot]
382fdc7ad3
Merge master into staging-next 2021-07-18 00:01:24 +00:00
Felix Buehler
87316d778b various: cleanup of "inherit version;" 2021-07-18 00:19:24 +02:00
Sandro
a314be4b4d
Merge pull request #130439 from LeSuisse/ant-CVE-2021-36373-CVE-2021-36374 2021-07-18 00:15:04 +02:00
Sandro Jäckel
ad1e9c3a27
gnumake: remove ? null from inputs 2021-07-17 21:20:21 +02:00
Thomas Gerbet
1e1e536488 apacheAnt_1_9: 1.9.15 -> 1.9.16
Fixes CVE-2021-36373 and CVE-2021-36374.
2021-07-17 11:13:06 +02:00
Thomas Gerbet
c83fdf9a36 ant: 1.10.9 -> 1.10.11
Fixes CVE-2021-36373 and CVE-2021-36374.
2021-07-17 11:11:08 +02:00
github-actions[bot]
f0bb8c9a78
Merge master into staging-next 2021-07-14 18:01:12 +00:00
Tomek Mańko
d75b67bfa4 rebar3: skip failing tests on M1 chip 2021-07-15 02:34:04 +09:00
github-actions[bot]
958dc88d65
Merge master into staging-next 2021-07-08 12:01:23 +00:00
Sandro
76ba43e445
Merge pull request #127743 from Artturin/fix-cmake-gui
cmake: add wrapQtAppsHook
2021-07-08 11:12:31 +02:00
Vladimír Čunát
7c25c1fd88
Merge branch 'glibc-2.33' into staging 2021-07-06 16:17:13 +02:00
Maximilian Bosch
3f5336e15b
gnumake42: fix build w/glibc-2.33 2021-07-06 16:02:34 +02:00
github-actions[bot]
2a0536535d
Merge staging-next into staging 2021-07-06 06:01:39 +00:00
Sandro
3f7ea1d7d5
Merge pull request #129370 from Anduh/boot-update-homepage 2021-07-06 02:21:30 +02:00
github-actions[bot]
3ddb8d5a79
Merge staging-next into staging 2021-07-06 00:02:03 +00:00
Sandro
b0977358e1
Merge pull request #128882 from liff/gradle/v7.1 2021-07-05 23:27:24 +02:00
Andreas J
108521d406
update homepage link 2021-07-05 23:36:42 +03:00
Sandro
5daf2b8e90
Merge pull request #126993 from Stunkymonkey/2pname&name 2021-07-05 18:51:19 +02:00
github-actions[bot]
b194783294
Merge staging-next into staging 2021-07-05 00:02:23 +00:00
Guillaume Girol
8148ffc930
Merge pull request #129263 from ck3d/redo-c-0.3
redo-c: 0.2 -> 0.3
2021-07-04 18:38:12 +00:00
sternenseemann
2019f82e3e bmake: enable ksh test on non musl platforms
bmake runs the ksh test if /bin/ksh exists. This is never a good
indication on platforms where we can sandbox and causes problems on
darwin where this path may exist, but never would be in PATH.

We solve this problem by always enabling the test and adding ksh to
checkInputs.

ksh doesn't seem to compile with musl, so we disable it on that
platform.
2021-07-04 20:20:42 +02:00
sternenseemann
32c42d37ab bmake: test musl build
Since we do some additional patching to make it work with musl, we
should also test that, so we can _keep_ it working.
2021-07-04 20:20:42 +02:00
sternenseemann
30200ce8e1 bmake: 20210420 -> 20210621 2021-07-04 20:20:42 +02:00
Christian Kögler
b07b9e81bc redo: Set CFLAGS only if not defined 2021-07-04 19:39:05 +02:00
github-actions[bot]
5a31e44bd3
Merge staging-next into staging 2021-07-04 12:01:40 +00:00
Robert Schütz
a5de6179cb
Merge pull request #129137 from bjornfor/fix-conan
conan: fix build after python3Packages updates
2021-07-04 13:12:03 +02:00
Christian Kögler
8f34bdf93a redo-c: 0.2 -> 0.3 2021-07-04 10:25:37 +02:00
github-actions[bot]
c852543c1f
Merge staging-next into staging 2021-07-04 06:01:43 +00:00
Sandro
8723bd8119
Merge pull request #129122 from dotlambda/dateutil-alias 2021-07-04 02:53:34 +02:00
Bjørn Forsman
9b16b5e381 conan: fix build after python3Packages updates
conan needs jinja2<3 and six<=1.15.0. Adding six to packageOverrides
results in this build error:

  $ nix-build -A conan
  ...
  Found duplicated packages in closure for dependency 'six':
    six 1.16.0 (/nix/store/zn4haxpv5j9ilccvw7vxxwbfb84vhl5i-python3.8-six-1.16.0/lib/python3.8/site-packages)
    six 1.15.0 (/nix/store/8nkfc88xal8g91hfjsxq93b6pfydq2d7-python3.8-six-1.15.0/lib/python3.8/site-packages)

As the changes in six-1.16.0 look harmless, work around the above issue
by allowing conan to use six-1.16.0.
2021-07-03 20:45:13 +02:00
github-actions[bot]
0957b61eaa
Merge staging-next into staging 2021-07-03 18:01:40 +00:00
Jörg Thalheim
65f0732422
Merge pull request #128988 from KireinaHoro/master
mill: 0.9.6 -> 0.9.8
2021-07-03 13:48:29 +01:00
github-actions[bot]
eaa5839643
Merge staging-next into staging 2021-07-03 12:01:53 +00:00
Robert Schütz
1ec5651913 treewide: use pythonPackages.python-dateutil instead of pythonPackages.dateutil 2021-07-03 13:45:57 +02:00
Daniël de Kok
017aa88470 Remove danieldk as a maintainer for some packages
- AMD GPU packages: AMD removed support for the RX5x0 GPUs from ROCm, so
  I cannot test these packages anymore.
- A small number of GUI packages: I switched back to macOS on the
  desktop for work reasons, so I cannot easily test these.
- broot: I took over maintainership from someone else, but do not really
  use broot.
2021-07-03 12:14:20 +02:00
KireinaHoro
330f8a1629 mill: 0.9.6 -> 0.9.8 2021-07-02 19:56:39 +08:00
Olli Helenius
ce426ba28d gradle: 7.0 -> 7.1 2021-07-01 15:01:43 +03:00
Felix Buehler
3c12e95ad1 development: /s/name/pname&version/ 2021-06-30 09:45:11 +02:00
github-actions[bot]
ff0a0c28da
Merge staging-next into staging 2021-06-29 00:10:57 +00:00
Ryan Mulligan
e87001bbc0
Merge pull request #128321 from r-ryantm/auto-update/bear
bear: 3.0.12 -> 3.0.13
2021-06-28 12:38:44 -07:00
github-actions[bot]
1bce4703aa
Merge staging-next into staging 2021-06-28 18:12:05 +00:00
Jörg Thalheim
41902c2f7d
Merge pull request #120501 from Mic92/gnumake
gnumake: use sh instead of /bin/sh by default
2021-06-28 07:19:00 +01:00
R. RyanTM
ada25b1a98 bear: 3.0.12 -> 3.0.13 2021-06-27 14:52:45 +00:00
R. RyanTM
db961ec5bc bazel-remote: 2.1.0 -> 2.1.1 2021-06-24 05:12:00 +00:00
Sandro
3d544b4d5b
Merge pull request #127713 from musfay/qbs-1.19.1
qbs: 1.18.0 -> 1.19.1
2021-06-22 15:08:34 +02:00
Artturin
ac01728725 cmake: add wrapQtAppsHook 2021-06-22 06:06:27 +03:00
Mustafa Çalışkan
5beb11788a qbs: 1.18.0 -> 1.19.1 2021-06-21 21:58:25 +03:00
R. RyanTM
818201e4b5 bazel-remote: 2.0.1 -> 2.1.0 2021-06-17 17:21:34 +02:00
Sandro
df4ffccc5c
Merge pull request #126863 from alyssais/bear
bear: 3.0.9 -> 3.0.12
2021-06-16 03:33:22 +02:00
Sandro
f7521e2abd
Merge pull request #126059 from timbertson/gup
gup: 0.7.0 -> 0.8.0
2021-06-15 16:50:11 +02:00
JesusMtnez
43d1855378
sbt: 1.5.3 -> 1.5.4 2021-06-15 06:12:50 +02:00
Alyssa Ross
5d08999385
bear: 3.0.9 -> 3.0.12
Fixes: https://github.com/NixOS/nixpkgs/pull/117413
2021-06-14 18:12:02 +00:00
Tim Cuthbertson
9012ed2a80
reuse version variable
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-06-11 21:49:20 +10:00
Alyssa Ross
4de8cbfb16 bmake.passthru.setupHook: set some defaults
These are all read from the environment by the default bmake
stdlib (e.g. <bsd.prog.mk>, <bsd.own.mk>).  Some of the default
values (like building cat pages instead of man pages, or stripping
binaries when installing) don't really make sense for Nixpkgs, so we
override them here for every build using bmake.

Eventually I'd like to unify the bmake setupHook and the NetBSD make
setupHook, but not today.
2021-06-09 12:44:43 +00:00
Sandro
26923b2f5c
Merge pull request #125337 from wentasah/cmake-more-docs 2021-06-09 14:32:22 +02:00
David
00ee61b3cc rebar3: add checkPhase 2021-06-09 12:14:12 +09:00
David
ae2f75ef89 rebar3WithPlugins: add ability to ignore dependencies 2021-06-09 12:14:12 +09:00
Timothy Klim
8582f4cd83 sbt: 1.5.1 -> 1.5.3 2021-06-08 14:13:31 -04:00
Tim Cuthbertson
e3cf1c63ef gup: 0.7.0 -> 0.8.0 2021-06-07 22:03:08 +10:00