Commit Graph

7950 Commits

Author SHA1 Message Date
github-actions[bot]
88c2e66d47
Merge master into staging-next 2023-07-31 00:02:09 +00:00
figsoda
aacc8f2b2d
Merge pull request #246149 from marsam/update-luau
luau: 0.584 -> 0.588
2023-07-30 15:58:17 -04:00
github-actions[bot]
4168b4005a
Merge master into staging-next 2023-07-30 18:01:01 +00:00
Kirill Radzikhovskyy
f633f5965a ruby_3_3: init at 3.3.0.preview1 2023-07-30 20:25:49 +10:00
Mario Rodas
7e7165d966 luau: 0.584 -> 0.588
Diff: https://github.com/Roblox/luau/compare/0.584...0.588

Changelog: https://github.com/Roblox/luau/releases/tag/0.588
2023-07-30 04:20:00 +00:00
Martin Weinelt
167f6dfee4
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/development/libraries/science/astronomy/cfitsio/default.nix
2023-07-30 03:54:27 +02:00
Anderson Torres
88e78b6a97 trealla: 2.21.33 -> 2.23.35 2023-07-29 18:21:24 -03:00
Silvan Mosberger
a0b8caf3bc
Revert "lib.customisation: uncurry makeScopeWithSplicing" 2023-07-28 23:04:09 +02:00
Artturin
3716ef19d8 lib.makeScopeWithSplicing: provide default for keep,extra
These are often unneeded by the user.
2023-07-28 17:41:01 +03:00
Doron Behar
6560d0086c python3.pkgs.pypaBuildHook: init 2023-07-28 12:13:25 +02:00
Doron Behar
1298c367b1 pip-build-hook.sh: Support $pipBuildFlags 2023-07-28 12:13:25 +02:00
Adam Joseph
52d3944057
Merge pull request #212795 from Cynerd/setuptools-rust-hook
Setuptools rust hook for cross compilation
2023-07-28 06:53:09 +00:00
github-actions[bot]
e913a05c06
Merge staging-next into staging 2023-07-28 06:01:52 +00:00
Adam Joseph
cb13669b00 lib.customisation: uncurry makeScopeWithSplicing
Deeply-curried functions are pretty error-prone in untyped languages
like Nix.  This is a particularly bad case because
`top-level/splice.nix` *also* declares a makeScopeWithSplicing, but
it takes *two fewer arguments*.

Let's switch to attrset-passing form, to provide some minimal level
of sanity-checking.
2023-07-27 21:31:59 -07:00
Rafael Fernández López
47f75ef1bf
wasmtime: 11.0.0 -> 11.0.1 2023-07-27 23:07:35 +02:00
github-actions[bot]
d1b1f7fda7
Merge staging-next into staging 2023-07-27 06:01:53 +00:00
Adam Joseph
2ffca30cde
Revert "python3: splice python within python3Packages.callPackage" 2023-07-27 01:42:35 +00:00
Martin Weinelt
fd5d0300b4
Merge pull request #241848 from stigtsp/perl/5.38.0
[staging] perl: 5.36.0 -> 5.38.0
2023-07-27 02:05:42 +02:00
github-actions[bot]
dc058faf6b
Merge staging-next into staging 2023-07-27 00:02:38 +00:00
Artturi
906f999a2f
Merge pull request #245475 from Artturin/splicepython1 2023-07-26 22:43:37 +03:00
github-actions[bot]
24182c8911
Merge staging-next into staging 2023-07-26 18:01:41 +00:00
Pol Dellaiera
98a1fc3a1f
Merge pull request #239298 from r-ryantm/auto-update/janet
janet: 1.28.0 -> 1.29.1
2023-07-26 15:01:32 +02:00
github-actions[bot]
bbfd40bb37
Merge staging-next into staging 2023-07-26 06:01:54 +00:00
Artturin
793cc9d982 python3: splice python within python3Packages.callPackage
`lib.extends hooks pythonPackagesFun` includes python which we want to
splice

what this fixes:
```
nix-repl> lib.elemAt pkgsCross.aarch64-multiplatform.python3Packages.xpybutil.nativeBuildInputs 0
«derivation /nix/store/39dkb51rciw6zwg0c2c44gpmpjapddxc-python3-aarch64-unknown-linux-gnu-3.10.12.drv»
```
to
```
nix-repl> lib.elemAt pkgsCross.aarch64-multiplatform.python3Packages.xpybutil.nativeBuildInputs 0
«derivation /nix/store/21ldw2dp26xvv9iyxn9x77a8yh4waqz5-python3-3.10.12.drv»
```

Before https://github.com/NixOS/nixpkgs/pull/194205 The keep python used to work by accident because self was passed from
__splicedPackages https://github.com/NixOS/nixpkgs/pull/196052/files#diff-44ce3495c4f983ce64dd47c86a9d3e77bad210b2709c098a3806998dcd9b000bR213
But now it does not work because overrideAttrs is used on python in
python-packages-base.nix

Preferably we would [ splice the hooks too ](https://github.com/NixOS/nixpkgs/pull/228139) but we cannot do that until [Package sets within derivations (i.e. python3.pkgs) are not spliced](https://github.com/NixOS/nixpkgs/issues/211340) is fixed, because people often use `python3.pkgs.wrapPython` in `nativeBuildInputs` (it's correct but python3.pkgs should be python3Packages to get splicing.
2023-07-26 06:15:26 +03:00
Nick Cao
4570f7fc58
Merge pull request #243074 from mweinelt/cpython-3.12.0b4
python312: 3.12.0b3 -> 3.12.0b4
2023-07-25 19:03:08 -06:00
github-actions[bot]
48c72f00ba
Merge staging-next into staging 2023-07-24 18:03:03 +00:00
figsoda
df8d064819 wazero: 1.3.0 -> 1.3.1
Diff: https://github.com/tetratelabs/wazero/compare/v1.3.0...v1.3.1

Changelog: https://github.com/tetratelabs/wazero/releases/tag/v1.3.1
2023-07-24 09:39:25 -04:00
github-actions[bot]
dd978826f9
Merge staging-next into staging 2023-07-23 12:02:06 +00:00
github-actions[bot]
10af23a180
Merge master into staging-next 2023-07-23 12:01:27 +00:00
Pol Dellaiera
26b91e73c7
php83: 8.3.0alpha3 -> 8.3.0beta1 2023-07-23 09:47:44 +02:00
github-actions[bot]
d5ba15544a
Merge staging-next into staging 2023-07-23 06:01:49 +00:00
github-actions[bot]
a0c327d315
Merge master into staging-next 2023-07-23 06:01:17 +00:00
figsoda
cc6636b935
Merge pull request #244922 from r-ryantm/auto-update/joker
joker: 1.1.0 -> 1.2.0
2023-07-22 21:20:20 -04:00
github-actions[bot]
5765a9fbc3
Merge staging-next into staging 2023-07-23 00:03:03 +00:00
github-actions[bot]
86a73bdb86
Merge master into staging-next 2023-07-23 00:02:31 +00:00
R. Ryantm
49b7304aa6 joker: 1.1.0 -> 1.2.0 2023-07-22 22:19:48 +00:00
Rafael Fernández López
03049a56e0
wasmtime: 10.0.1 -> 11.0.0 2023-07-22 17:36:33 +02:00
github-actions[bot]
941ae3102b
Merge staging-next into staging 2023-07-22 12:02:07 +00:00
github-actions[bot]
045f0259fe
Merge master into staging-next 2023-07-22 12:01:28 +00:00
Felix Bühler
0a2745684e
Merge pull request #239624 from Stunkymonkey/use-optionalString-then
treewide: use optionalString instead of 'then ""'
2023-07-22 13:02:47 +02:00
github-actions[bot]
6689e744ea
Merge staging-next into staging 2023-07-21 06:01:41 +00:00
github-actions[bot]
17a15a50ab
Merge master into staging-next 2023-07-21 06:01:05 +00:00
meppu
12ecdc253b elixir_1_15: 1.15.2 -> 1.15.4 2023-07-21 11:45:11 +09:00
Sandro
ae6388356f
Merge pull request #153527 from andersk/python3-symlinks
python3: Add manpage symlink to fix ‘man python’
2023-07-20 22:07:42 +02:00
github-actions[bot]
37df58121d
Merge master into staging-next 2023-07-20 12:01:16 +00:00
Daniel Kempkens
c118bb4f9a elixir: make mix interpreter path absolute
Remove the implicit dependency on `elixir` being somewhere in `PATH`.

Before:

```
$ nix build '.#elixir_1_15'
$ ./result/bin/mix --version
env: ‘elixir’: No such file or directory
```

After:

```
$ nix build '.#elixir_1_15'
$ ./result/bin/mix --version
Erlang/OTP 25 [erts-13.2.2.2] [source] [64-bit] [smp:10:10] [ds:10:10:10] [async-threads:1] [jit]

Mix 1.15.2 (compiled with Erlang/OTP 25)
```

This was caused by the shebang interpreter directive being set to
`${coreutils}/bin/env elixir`, whereas now the `elixir` part is replaced
with the full path to the interpreter.

We can't get rid of the `${coreutils}/bin/env` part, because without it
all scripts are interpreted as shell scripts.
2023-07-20 20:52:55 +09:00
Anders Kaseorg
9c55f23e53
python3: Add manpage symlink to fix ‘man python’
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2023-07-19 15:33:47 +02:00
github-actions[bot]
b110c513b2
Merge master into staging-next 2023-07-19 12:01:12 +00:00
Nick Cao
77ee39a4be
Merge pull request #244294 from r-ryantm/auto-update/trealla
trealla: 2.22.11 -> 2.22.17
2023-07-19 04:36:32 -06:00
Nick Cao
cdeb3be2d6
Merge pull request #244260 from r-ryantm/auto-update/evcxr
evcxr: 0.15.0 -> 0.15.1
2023-07-19 04:09:34 -06:00