Commit Graph

7288 Commits

Author SHA1 Message Date
github-actions[bot]
f876e1f1e9
Merge master into staging-next 2023-02-06 18:01:37 +00:00
Thiago Kenji Okada
b5cff429fa
Merge pull request #214898 from r-ryantm/auto-update/babashka
babashka: 1.1.172 -> 1.1.173
2023-02-06 12:11:08 +00:00
github-actions[bot]
5b5def96bc
Merge master into staging-next 2023-02-06 12:01:38 +00:00
R. Ryantm
acb7674546 babashka: 1.1.172 -> 1.1.173 2023-02-06 08:49:32 +00:00
Austin Seipp
29464cd170 racket: wrap with LOCALE_ARCHIVE iff Linux
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2023-02-06 01:27:43 -06:00
Elis Hirwing
17e1b6963c
Merge pull request #214034 from drupol/php/bumps-february-2023
PHP: February 2023 bumps
2023-02-06 07:22:04 +01:00
github-actions[bot]
bc833a50cc
Merge master into staging-next 2023-02-05 00:02:31 +00:00
superherointj
a411b337d6
Merge pull request #209622 from NickCao/python311-cross
python311: fix cross compilation
2023-02-04 18:04:43 -03:00
Vladimír Čunát
d0d8c15bad
Merge branch 'master' into staging-next
pkgs/development/web/nodejs/v18.nix conflict:
  the fetched patch was already included in this release.
2023-02-03 23:02:19 +01:00
Ulrik Strid
376e9ceead treewide: add strictDeps = true to most packages depending on ocaml 2023-02-03 08:59:34 +01:00
github-actions[bot]
41d7ce1517
Merge master into staging-next 2023-02-03 06:01:30 +00:00
Weijia Wang
b062ec5b83 rustpython: unbreak on x86_64-darwin 2023-02-03 00:02:17 +01:00
github-actions[bot]
6d7be19afb
Merge master into staging-next 2023-02-02 18:01:08 +00:00
Alyssa Ross
d608fbb9f6 buildPython*: allow overriding disabled packages
Previously:

	nix-repl> python3.pkgs.WSME
	error: WSME-0.11.0 not supported for interpreter python3.10

	nix-repl> python3.pkgs.WSME.overridePythonAttrs (_: { disabled = false; })
	error: WSME-0.11.0 not supported for interpreter python3.10

Now:

	nix-repl> python3.pkgs.WSME
	error: WSME-0.11.0 not supported for interpreter python3.10
	«derivation

	nix-repl> python3.pkgs.WSME.overridePythonAttrs (_: { disabled = false; })
	«derivation /nix/store/cxkiwdfm146zvl573s2hahlbjd1wfrrp-python3.10-WSME-0.11.0.drv»
2023-02-02 16:49:27 +01:00
github-actions[bot]
ffbbb55ee2
Merge master into staging-next 2023-02-02 06:01:28 +00:00
Weijia Wang
97b3ca8685 nextflow: 22.04.5 -> 22.10.6 2023-02-02 03:00:33 +01:00
Pol Dellaiera
fb528f2237
php82: 8.2.1 -> 8.2.2 2023-02-01 21:40:01 +01:00
Pol Dellaiera
806e263d6a
php81: 8.1.14 -> 8.1.15 2023-02-01 20:25:51 +01:00
github-actions[bot]
b74764e3d4
Merge master into staging-next 2023-02-01 18:01:25 +00:00
Vladimír Čunát
9e2af38827
Merge branch 'staging' into staging-next 2023-02-01 17:05:25 +01:00
Vladimír Čunát
9287f4461d
Merge #206907: stdenv: gcc11 -> gcc12 2023-02-01 16:54:44 +01:00
R. Ryantm
245bee6ef5 erlang: 25.2.1 -> 25.2.2 2023-02-01 08:33:56 -05:00
Vladimír Čunát
4782601857
Merge #211410: ruby: 2.7.6 -> 2.7.7, 3.0.4 -> 3.0.5
...into staging
2023-02-01 10:19:18 +01:00
Nick Cao
4f1caea482
wasmer: 3.1.0 -> 3.1.1
Diff: https://github.com/wasmerio/wasmer/compare/v3.1.0...v3.1.1
2023-02-01 11:23:32 +08:00
github-actions[bot]
82c24e442d
Merge staging-next into staging 2023-01-31 06:01:59 +00:00
github-actions[bot]
66bb8338fc
Merge master into staging-next 2023-01-31 06:01:26 +00:00
logo4poop
94edb149a5 hashlink: 1.12 -> 1.13 2023-01-30 21:53:43 -05:00
Nick Cao
2603076d9a
Merge pull request #212760 from Cynerd/luajit-crossbuild
luajit: fix cross build for 32 bit architectures
2023-01-31 09:14:56 +08:00
Francesco Gazzetta
6ad639f20a
Merge pull request #211550 from fgaz/pikchr/tcl
pikchr: enable tcl support (and related stuff)
2023-01-30 10:36:37 +00:00
Karel Kočí
af2839518e
luajit: fix cross build for 32 bit architectures
The 32bit compiler has to be used when building on 64bit system.
2023-01-30 09:54:34 +01:00
github-actions[bot]
2019d6632b
Merge master into staging-next 2023-01-29 12:01:20 +00:00
github-actions[bot]
d7f991bb53
Merge master into staging-next 2023-01-29 00:02:27 +00:00
Alyssa Ross
b682fef8e9 python3.pkgs: fix splice through unsupported hosts
Previously, unless unsupported platforms were allowed, the following
would fail to evaluate (from an "x86_64-linux" system):

    pkgsCross.x86_64-freebsd.__splicedPackages.docutils.__spliced.buildHost

It shouldn't have, because the buildHost package ends up being for
Linux.  This broke evaluation of e.g. pkgsCross.x86_64-freebsd.libdrm,
because it has docutils in nativeBuildInputs.  mkDerivation would try
to go through __spliced.buildHost on docutils to get to the Linux
version, but the check in ensurePythonModules would kick in first,
triggering the meta check because of the equality check in the
implementation of hasPythonModule, which would fail because Python is
not marked as supported on FreeBSD in Nixpkgs at the moment.  Thus,
even though they're not supposed to be, the meta checks would be
triggered even though the only attribute being accessed on the
unsupported derivation was __spliced.

We can fix this by using the same mechanism used to implement the meta
checks themselves: lib.extendDerivation.  Now, attempting to access
drvPath or outPath on an attribute that fails the validity check will
produce the same error as before, but other accesses will be allowed
through, fixing splicing.

I've tested evaluation of packages that pass and fail the validity
check, and confirmed that the behaviour is still correct.
2023-01-28 21:08:50 +00:00
Alyssa Ross
02ee33a5c1 python3.pkgs: simplify ensurePythonModules logic
It wasn't clear before, but it turns out that this is just four
separate conditions, and an attribute is valid if any of the
conditions is true, so we don't need a sea of parentheses to express
it.
2023-01-28 21:08:50 +00:00
github-actions[bot]
edb59645f2
Merge master into staging-next 2023-01-28 18:01:11 +00:00
Fabián Heredia Montiel
0cf5d85f0c treewide: add gcc12 flags 2023-01-27 21:20:52 -06:00
Martin Weinelt
52029b8e00 Merge remote-tracking branch 'origin/master' into staging-next 2023-01-27 23:50:36 +01:00
Vladimír Čunát
8a77ed60ac
Merge branch 'master' into staging-next 2023-01-27 09:36:55 +01:00
Mario Rodas
686ad19923 nelua: 2022-11-20 -> 2023-01-21 2023-01-27 04:20:00 +00:00
Mario Rodas
43e5897f70 zuo: 2022-11-15 -> 2023-01-02 2023-01-27 04:20:00 +00:00
Mario Rodas
b6779f09d7 luau: 0.558 -> 0.560
https://github.com/Roblox/luau/releases/tag/0.560
2023-01-27 04:20:00 +00:00
github-actions[bot]
578f1ba854
Merge master into staging-next 2023-01-26 18:01:29 +00:00
Shawn8901
a59dda942c treewide: remove global with lib; statements in pkgs/development 2023-01-26 18:31:02 +01:00
Weijia Wang
dcd69bc308
Merge pull request #212714 from wegank/aarch64-gcc-comments
treewide: mark #201254
2023-01-26 15:38:04 +01:00
Weijia Wang
52a28708b8 treewide: mark #201254 2023-01-26 15:11:41 +01:00
Francesco Gazzetta
9d9eceb7e0 tcl.tclPackageHook: add dontWrapTclBinaries parameter 2023-01-26 14:46:46 +01:00
github-actions[bot]
d7e7d75f99
Merge master into staging-next 2023-01-26 06:01:24 +00:00
Sergei Trofimovich
c82cfa8bc0 guile_3_0: 3.0.8 -> 3.0.9
Changes: https://www.gnu.org/software/guile/news/gnu-guile-309-released.html
2023-01-25 21:42:30 +00:00
github-actions[bot]
a1c257a1c6
Merge master into staging-next 2023-01-25 18:01:20 +00:00
Anderson Torres
ff6d32d09b
Merge pull request #210194 from sternenseemann/cbqn-fix-extra-outputs
cbqn: tie outputs for library to library config option
2023-01-25 13:38:26 -03:00