Commit Graph

7397 Commits

Author SHA1 Message Date
github-actions[bot]
bf5abe92d4
Merge master into staging-next 2023-02-15 18:01:14 +00:00
Martin Weinelt
05fe3be949
Merge pull request #216356 from mweinelt/spidermonkeys
spidermonkey_102: 102.1.0 -> 102.8.0; spidermonkey_91: 91.12.0 0 -> 91.13.0
2023-02-15 15:25:12 +00:00
github-actions[bot]
c4fe2133de
Merge staging-next into staging 2023-02-15 06:01:44 +00:00
github-actions[bot]
58cfebde3e
Merge staging-next into staging 2023-02-15 00:02:50 +00:00
Martin Weinelt
2b4f446ee8
spidermonkey_91: 91.12.0 -> 91.13.0
Bringing the 91 release series to its final version. Did not check for
changes, but this gives me closure.
2023-02-14 19:31:55 +01:00
Martin Weinelt
f7eba3716c
spidermonkey_102: 102.1.0 -> 102.8.0
https://www.mozilla.org/en-US/security/advisories/mfsa2023-06/#CVE-2023-25735

Fixes: CVE-2023-25735
2023-02-14 19:30:20 +01:00
Felix Buehler
bc3d5934d7 treewide: use lib.optionals 2023-02-14 19:11:59 +01:00
Felix Bühler
b025cb11c5
Merge pull request #214996 from Stunkymonkey/optionalString-1
treewide: use optionalString
2023-02-14 19:09:46 +01:00
github-actions[bot]
f123085ae9
Merge staging-next into staging 2023-02-14 18:01:45 +00:00
Martin Weinelt
5eb6139626
Merge pull request #216332 from GaetanLepage/ffmpeg
spotify, renpy: fix wrong ffmpeg references
2023-02-14 16:26:45 +00:00
Gaetan Lepage
a51f9c5c1c spotify, renpy: fix wrong ffmpeg references
The ffmpeg library derivation output is ffmpeg.lib and no more ffmpeg.out.
This PR updates the remaining references to ffmpeg.out.
2023-02-14 17:26:05 +01:00
R. Ryantm
5517737e6e clojure: 1.11.1.1208 -> 1.11.1.1224 2023-02-14 15:23:51 +00:00
Felix Buehler
cdb39a86e0 treewide: use optionalString 2023-02-13 21:52:34 +01:00
Alyssa Ross
b4f74e334e
python2: fix eval
Fixes: ee90eca180 ("cpython: Migrate sha256 occurences to hash")
2023-02-13 17:14:19 +00:00
Martin Weinelt
d87b0e29ff
Merge pull request #215401 from mweinelt/python-3.10.10-3.11.2
python310: 3.10.9 -> 3.10.10; python311: 3.11.1 -> 3.11.2
2023-02-13 13:26:00 +00:00
github-actions[bot]
8e2a123807
Merge staging-next into staging 2023-02-12 18:01:40 +00:00
github-actions[bot]
a55c80886c
Merge master into staging-next 2023-02-12 18:01:09 +00:00
Martin Weinelt
d704ee72c9
python3.tests.nixenv-virtualenv: Fix on darwin
The virtualenv mode is trying to be smart and checks whether it can
write to $out, which for some reason fails on darwin.

> virtualenv: error: argument dest: the destination . is not write-able at /nix/store

But what does work is creating it in the pwd and moving it to $out,
because mv just does what it is told.
2023-02-12 03:03:31 +01:00
Martin Weinelt
20c723dd07
python3.tests.condaExamplePackage: Exclude on non-linux
Allow python3.tests to eval on other platforms than linux, by excluding
conda tests when not on linux, because they include alsa-lib, which is
linux-only.
2023-02-11 23:22:09 +01:00
Martin Weinelt
ee90eca180
cpython: Migrate sha256 occurences to hash 2023-02-11 17:50:53 +01:00
Martin Weinelt
f0b8e02958
python311: 3.11.1 -> 3.11.2
https://docs.python.org/release/3.11.2/whatsnew/changelog.html
2023-02-11 17:50:10 +01:00
Martin Weinelt
f228b9368b
python310: 3.10.9 -> 3.10.10
https://docs.python.org/release/3.10.10/whatsnew/changelog.html
2023-02-11 17:50:10 +01:00
Martin Weinelt
a94804c451
python39: Move out of sources attrset 2023-02-11 17:50:08 +01:00
github-actions[bot]
c2e38ff7b6
Merge staging-next into staging 2023-02-11 06:01:49 +00:00
github-actions[bot]
63655bdaea
Merge master into staging-next 2023-02-11 06:01:15 +00:00
Mario Rodas
d12bb3e4a5 luau: 0.560 -> 0.563
https://github.com/Roblox/luau/releases/tag/0.563
2023-02-11 04:20:00 +00:00
R. Ryantm
ada4e200ee zef: 0.15.0 -> 0.16.0 2023-02-10 20:32:11 +00:00
Artturi
aaa9ea8ec6
Merge pull request #208537 from Artturin/makesetuphooksupportstrictdeps 2023-02-10 20:08:32 +02:00
Vladimír Čunát
13e8ec1f2d
Merge branch 'staging-next' into staging 2023-02-10 13:46:44 +01:00
github-actions[bot]
9be52f693f
Merge master into staging-next 2023-02-10 12:01:38 +00:00
Pol Dellaiera
a344af4c24
php: add meta.mainProgram 2023-02-10 09:12:32 +01:00
github-actions[bot]
0417b0e54f
Merge staging-next into staging 2023-02-10 00:03:00 +00:00
github-actions[bot]
71c0c6d984
Merge master into staging-next 2023-02-10 00:02:27 +00:00
Austin Seipp
d53177da93 trealla: 2.2.6 -> 2.8.4
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2023-02-09 16:21:34 -06:00
github-actions[bot]
87e315024e
Merge staging-next into staging 2023-02-09 18:01:44 +00:00
github-actions[bot]
b5d4dad2b8
Merge master into staging-next 2023-02-09 18:01:11 +00:00
Martin Weinelt
39af68a70b
Merge pull request #215383 from mweinelt/python-3.12a4
python312: 3.12.0a3 -> 3.12.0a5
2023-02-09 14:40:19 +00:00
github-actions[bot]
bd14a95898
Merge staging-next into staging 2023-02-09 06:01:47 +00:00
github-actions[bot]
73fe6149d4
Merge master into staging-next 2023-02-09 06:01:10 +00:00
github-actions[bot]
bece38afcc
Merge staging-next into staging 2023-02-09 00:02:56 +00:00
Martin Weinelt
21d200b26d
python312: 3.12.0a3 -> 3.12.0a5
https://docs.python.org/3.12/whatsnew/changelog.html#python-3-12-0-alpha-4
https://docs.python.org/3.12/whatsnew/changelog.html#python-3-12-0-alpha-5
2023-02-08 21:38:13 +00:00
Vladimír Čunát
1e42908aa7
Merge branch 'master' into staging-next 2023-02-08 21:50:23 +01:00
Mario Rodas
c1c4149c0f racket,racket-minimal: 8.7 -> 8.8
https://github.com/racket/racket/releases/tag/v8.8
2023-02-08 04:20:00 +00:00
R. Ryantm
d32f1286ce zef: 0.14.6 -> 0.15.0 2023-02-08 00:33:54 +00:00
Artturin
4e3dcf364e treewide: makeSetupHook deps -> propagatedBuildInputs 2023-02-07 21:02:00 +02:00
Artturin
9a9c42e19f makeSetupHook: support depsTargetTargetPropagated 2023-02-07 21:00:18 +02:00
github-actions[bot]
d3648def80
Merge staging-next into staging 2023-02-07 00:02:46 +00:00
github-actions[bot]
b30088fc3f
Merge master into staging-next 2023-02-07 00:02:12 +00:00
Rafael Fernández López
f329e5f506
wasmtime: 4.0.0 -> 5.0.0 2023-02-06 22:39:23 +01:00
github-actions[bot]
36822caa75
Merge staging-next into staging 2023-02-06 18:02:09 +00:00
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]
8702f45128
Merge staging-next into staging 2023-02-06 12:02:09 +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]
dfee1a3150
Merge staging-next into staging 2023-02-05 00:03:15 +00: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
github-actions[bot]
7c824bb1b1
Merge staging-next into staging 2023-02-04 00:02:42 +00: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
Artturi
dcc7df7fe6
Merge pull request #211685 from Artturin/splicingstuff1-split 2023-02-03 12:49:08 +02: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]
931f54ceff
Merge staging-next into staging 2023-02-03 06:02:05 +00: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
Weijia Wang
0437df79ed
Merge pull request #214223 from Mic92/ruby-fix
ruby: fix default CC not beeing set
2023-02-02 23:37:17 +01:00
github-actions[bot]
6d7be19afb
Merge master into staging-next 2023-02-02 18:01:08 +00:00
Jörg Thalheim
42a4f2fd0a ruby: fix default CC not beeing set
This is a regression introduced in https://github.com/NixOS/nixpkgs/pull/202041
2023-02-02 18:41:53 +01: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