Commit Graph

2666 Commits

Author SHA1 Message Date
Vladimír Čunát
d5d94127fd
Merge branch 'staging-next' into staging
Minor conflicts; I hope I didn't mess up:
	pkgs/development/tools/misc/binutils/default.nix
	pkgs/games/openjk/default.nix
2022-04-14 09:53:21 +02:00
Anderson Torres
ce932dbcf1
Merge pull request #168435 from AndersonTorres/new-muon
Small rewrites
2022-04-14 02:15:45 -03:00
betaboon
8c5ed979be bazel_5: 5.0.0 -> 5.1.1 2022-04-13 12:53:42 +02:00
AndersonTorres
7eb6efcb4e samurai: rewrite 2022-04-12 22:39:09 -03:00
ajs124
382bf73983
Merge pull request #164689 from r-ryantm/auto-update/apache-maven
maven: 3.8.4 -> 3.8.5
2022-04-11 19:58:38 +01:00
Marek Fajkus
89b195e922
Merge pull request #166874 from svalaskevicius/bloop-fix-hashes
bloop: fix hashes for the v1.4.13
2022-04-11 08:27:36 +02:00
Rick van Schijndel
a2f91d1831 wafHook: export PKGCONFIG if needed
This is useful for cross-compilation, where nixpkgs sets PKG_CONFIG.
waf decided to use PKGCONFIG instead, so we'll set it when necessary.
2022-04-10 17:12:10 +02:00
github-actions[bot]
a36cec68d4
Merge staging-next into staging 2022-04-08 12:02:01 +00:00
Jakub Kozłowski
eed1123ed1 scala-cli: 0.1.2 -> 0.1.3 2022-04-08 02:01:13 +02:00
github-actions[bot]
a5b67b42a4
Merge staging-next into staging 2022-04-06 06:01:49 +00:00
Ellie Hermaszewska
7be1531c91
Merge pull request #167043 from r-ryantm/auto-update/qbs 2022-04-06 11:46:21 +08:00
Martin Weinelt
f95a3d1140 Merge remote-tracking branch 'origin/staging-next' into staging 2022-04-04 00:46:25 +02:00
github-actions[bot]
c46200d454
Merge master into staging-next 2022-04-03 18:01:07 +00:00
R. Ryantm
106ac75a9c qbs: 1.21.0 -> 1.22.0 2022-04-03 15:17:51 +00:00
Lorenz Leutgeb
e09bece8a8 gradle: 7.4 -> 7.4.2 2022-04-03 12:07:01 +02:00
Sarunas Valaskevicius
f9b9a473c6
bloop: add output hash for Darwin (thanks to @kubukoz)
Co-authored-by: Jakub Kozłowski <kubukoz@gmail.com>
2022-04-02 15:35:08 +01:00
Sarunas Valaskevicius
5fa538ed88 bloop: fix hashes for the v1.4.13 2022-04-01 21:56:26 +01:00
github-actions[bot]
9aa014c46a
Merge staging-next into staging 2022-03-31 12:02:10 +00:00
Alyssa Ross
22c23dbb8d
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	pkgs/development/python-modules/google-auth-oauthlib/default.nix
2022-03-31 11:42:24 +00:00
Martin Weinelt
d0bfb3ccbb Merge remote-tracking branch 'origin/master' into staging-next 2022-03-31 03:49:37 +02:00
Peter Hoeg
4ceda5853f drop shards_0_15 2022-03-30 17:41:51 +08:00
Peter Hoeg
37463c21cc shards: 0.16 -> 0.17 2022-03-30 17:41:51 +08:00
Martin Weinelt
630d5e1d0d Merge remote-tracking branch 'origin/master' into staging-next 2022-03-29 18:17:36 +02:00
Ben Siraphob
9ec6f8fc9b
fac-build: fix darwin build 2022-03-29 00:40:37 -05:00
Ben Siraphob
ed863440b8
Merge pull request #163924 from OPNA2608/fix/autoPatchelfHook_isLinux 2022-03-26 16:01:56 -05:00
Jan Tojnar
a6fcd7b301 glib: Fix conflicts in Meson patch on Darwin
Now based onto 0.61.2.
2022-03-26 09:50:05 +01:00
Vladimír Čunát
a42ca0678b
Merge branch 'master' into staging-next 2022-03-26 09:20:38 +01:00
Jan Tojnar
0e78d578e6 glib: Fix docs on Darwin
They are failing due to a Meson bug.

Doing it this hacky way to avoid rebuilding the world.
2022-03-26 03:50:26 +01:00
OPNA2608
d2f268745a treewide: autoPatchelfHook only on Linux 2022-03-23 21:37:39 +01:00
Martin Weinelt
f4f3622cb1 Merge remote-tracking branch 'origin/staging-next' into staging 2022-03-20 00:00:32 +01:00
Zenithal
87168a2e64 mill: 0.10.1 -> 0.10.2 2022-03-19 03:03:51 +08:00
R. Ryantm
84bbe973cc maven: 3.8.4 -> 3.8.5 2022-03-18 08:37:56 +00:00
github-actions[bot]
abc8ee49e5
Merge staging-next into staging 2022-03-17 06:01:51 +00:00
R. Ryantm
03aee6a526 bazel-remote: 2.3.5 -> 2.3.6 2022-03-17 03:09:27 +00:00
zowoq
6431086967 Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
	pkgs/development/python-modules/symengine/default.nix
2022-03-16 16:03:43 +10:00
Uri Baghin
350731a856
Merge pull request #164335 from r-ryantm/auto-update/bazel-remote
bazel-remote: 2.3.4 -> 2.3.5
2022-03-16 16:07:39 +11:00
R. Ryantm
8977f6379b bazel-remote: 2.3.4 -> 2.3.5 2022-03-16 00:01:05 +00:00
Bernardo Meurer
c2cecad6e2
Merge pull request #164098 from mweinelt/rocm
rocm-*: 5.0.2
2022-03-14 11:47:13 -07:00
R. Ryantm
8df0f8bcef sbt-extras: 2021-11-08 -> 2022-02-01 2022-03-14 09:02:04 -04:00
Martin Weinelt
35a3108fae rocm-cmake: 4.5.2 -> 5.0.2 2022-03-14 11:58:09 +01:00
Nick Cao
b5fde728ee
meson: 0.60.3 -> 0.61.2 2022-03-12 22:41:14 +08:00
github-actions[bot]
ed2c56a3c5
Merge staging-next into staging 2022-03-11 12:01:55 +00:00
Fabián Heredia Montiel
2727b660cc mill: 0.10.0 → 0.10.1 2022-03-10 10:48:54 -06:00
R. Ryantm
28b3e0a8a0 cmake: 3.22.2 -> 3.22.3 2022-03-05 15:48:05 +00:00
Vandr0iy
393c9f1ebb leiningen: 2.9.7 -> 2.9.8 2022-03-02 14:56:32 +01:00
Bobby Rong
6822d48580
Merge pull request #157592 from dtzWill/fix/samurai-cves-2021-30218-and-30219
samurai: apply upstream CVE fixes (security)
2022-02-28 16:49:07 +08:00
R. Ryantm
0a4f8a4984 bazel-remote: 2.3.3 -> 2.3.4 2022-02-24 02:08:19 +00:00
José Romildo Malaquias
f1143cb501
Merge pull request #161144 from romildo/new.git-updater
gitUpdater: init
2022-02-23 18:48:24 -03:00
Jakub Kozłowski
a175e4e16b scala-cli: 0.1.1 -> 0.1.2 2022-02-22 16:58:19 +01:00
José Romildo
ba59355e81 gitUpdater: init
- Add the 'gitUpdater' helper function to update git based packages, using the
'genericUpdater' function.
- Rework argument passing to the `list-git-tags' and 'list-archive-two-level-versions' scripts.
- Replace 'genericUpdater' plus 'list-git-tags' by 'gitUpdater'
2022-02-21 13:01:49 -03:00