Commit Graph

8499 Commits

Author SHA1 Message Date
Martin Weinelt
2203d3bf20
Merge pull request #267669 from mweinelt/catch-python2-conflicts
python/hooks: restore catchConflictHook for python<3.10
2023-11-19 00:04:05 +01:00
Stig
b6805176f0
Merge pull request #267883 from r-ryantm/auto-update/zef
zef: 0.20.0 -> 0.21.0
2023-11-18 23:31:22 +01:00
Mario Rodas
965f3a22ad
Merge pull request #268011 from figsoda/cel
cel-go: 0.18.1 -> 0.18.2
2023-11-18 16:19:26 -05:00
Mario Rodas
bc3e1d1788
Merge pull request #268007 from figsoda/expr
expr: 1.15.3 -> 1.15.4
2023-11-18 16:17:00 -05:00
Martin Weinelt
d9327a53de Revert "python2/mk-python-derivation: disable catchConflictsHook"
This reverts commit 397a8fd06b.

The hook now uses the old implementation based on the deprecated
pkg_resources library provided by setuptools again.
2023-11-18 12:58:15 +01:00
Martin Weinelt
f292ef4958
python/hooks: restore catchConflictHook for python<3.10
By restoring and diverting to the old version.

Previously the newer language features and use of more modern stdlib
imports broke the hook on Python<3.10.
2023-11-18 12:57:18 +01:00
Ryan Lahfa
5dcbaf3cc3
Merge pull request #264361 from RaitoBezarius/drop-ruby3 2023-11-17 18:43:35 +01:00
Ryan Lahfa
80063d0194
Merge pull request #268027 from K900/py2-hack 2023-11-17 17:18:55 +01:00
Raito Bezarius
529892d918 ruby_3_0: drop
Ruby EOL is 31 March 2024, that is, during NixOS 23.11.
We drop it early now to avoid any problem during the release time.
2023-11-17 16:03:00 +01:00
Adam Joseph
c7e0f6b905 treewide: s_targetPlatform_hostPlatform_ in non-compiler packages
stdenv.targetPlatform really shouldn't be used by software that
doesn't generate or manipulate binaries.  I reviewed all uses of
targetPlatform outside of pkgs/development/compilers and pkgs/stdenv
and replaced those which weren't involved in something which fits
these criteria.
2023-11-17 08:07:34 +00:00
K900
397a8fd06b python2/mk-python-derivation: disable catchConflictsHook
It's broken on Py2. Hopefully people still using 2 know what they're doing?
2023-11-17 07:48:13 +03:00
figsoda
a2d464f9d4 cel-go: 0.18.1 -> 0.18.2
Diff: https://github.com/google/cel-go/compare/v0.18.1...v0.18.2

Changelog: https://github.com/google/cel-go/releases/tag/v0.18.2
2023-11-16 22:31:35 -05:00
figsoda
5b5d69b659 expr: 1.15.3 -> 1.15.4
Diff: https://github.com/antonmedv/expr/compare/v1.15.3...v1.15.4

Changelog: https://github.com/antonmedv/expr/releases/tag/v1.15.4
2023-11-16 22:12:38 -05:00
github-actions[bot]
dba5c9ef4e
Merge master into staging-next 2023-11-16 18:01:17 +00:00
Thiago Kenji Okada
d0e729bc26
Merge pull request #267861 from thiagokokada/graalvm-fixes
buildGraalvmNativeImage: fix Unicode issue by setting encoding explicitly
2023-11-16 13:48:13 +00:00
R. Ryantm
7fa79d1d24 zef: 0.20.0 -> 0.21.0 2023-11-16 12:43:05 +00:00
Thiago Kenji Okada
acd0e25562 babashka: add installCheckPhase to check for proper Unicode support 2023-11-16 10:14:38 +00:00
Vladimír Čunát
0fe5300699
Merge branch 'master' into staging-next 2023-11-16 09:49:24 +01:00
Mario Rodas
aba830385b
Merge pull request #267782 from kirillrdy/ruby_3_3
ruby_3_3: preview2 -> preview3
2023-11-15 23:55:49 -05:00
Kirill Radzikhovskyy
8f5b0899c5 ruby_3_3: preview2 -> preview3 2023-11-16 13:39:21 +11:00
Martin Weinelt
3c336a1647
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/development/libraries/gdcm/default.nix
2023-11-14 13:16:34 +01:00
Pol Dellaiera
599fefe03a
Merge pull request #267305 from drupol/php/bumps-php83rc6
php83: 8.3.0RC5 -> 8.3.0RC6
2023-11-14 08:16:17 +01:00
github-actions[bot]
6a7c026ba7
Merge master into staging-next 2023-11-14 06:01:03 +00:00
Silvan Mosberger
7eddbf5690
Merge pull request #265710 from ShamrockLee/lib-copy-function-args
lib.mirrorFunctionArgs: init
2023-11-14 05:33:40 +01:00
Mario Rodas
d5c364011f zuo: unstable-2023-10-17 -> unstable-2023-11-10
Diff: 493e9cd081...9e2aa26b05
2023-11-14 04:20:00 +00:00
Pol Dellaiera
e455148e44
php83: 8.3.0RC5 -> 8.3.0RC6 2023-11-13 22:26:55 +01:00
github-actions[bot]
9776723357
Merge master into staging-next 2023-11-11 18:00:58 +00:00
Mario Rodas
911ad1e67f
Merge pull request #266767 from marsam/update-luau
luau: 0.601 -> 0.603
2023-11-11 12:51:48 -05:00
Lily Foster
1234b66590
Merge pull request #266546 from zeuner/supercollider-shell
supercollider: use bash from nixpkgs for popen
2023-11-11 12:48:02 -05:00
Isidor Zeuner
6d9c572be2 supercollider: use bash from nixpkgs for popen 2023-11-11 16:45:04 +01:00
Anthony Roussel
e30f48be94
treewide: fix redirected and broken URLs
Using the script in maintainers/scripts/update-redirected-urls.sh
2023-11-11 10:49:01 +01:00
github-actions[bot]
dbecb018c5
Merge staging-next into staging 2023-11-11 06:01:25 +00:00
github-actions[bot]
46679c6a02
Merge master into staging-next 2023-11-11 06:01:00 +00:00
Mario Rodas
bb3f029a87
Merge pull request #257492 from wackbyte/bump-lune
lune: 0.7.4 -> 0.7.11
2023-11-10 21:49:37 -05:00
github-actions[bot]
e8096ee1e1
Merge staging-next into staging 2023-11-10 18:01:34 +00:00
Weijia Wang
d8ebb73023 Merge branch 'master' into staging-next 2023-11-10 16:25:02 +01:00
7c6f434c
9da6f812b1
Merge pull request #266023 from r-ryantm/auto-update/octave
octave: 8.3.0 -> 8.4.0
2023-11-10 15:12:03 +00:00
Alyssa Ross
afabc4a15d
Merge remote-tracking branch 'origin/master' into HEAD
Conflicts:
	pkgs/development/libraries/SDL2/default.nix
2023-11-10 15:18:19 +01:00
Mario Rodas
33d50bf2e3
Merge pull request #266189 from aaronjheng/starlark
starlark: unstable-2023-03-02 -> unstable-2023-11-01
2023-11-10 07:47:36 -05:00
Mario Rodas
1c3cf1cac0 luau: 0.601 -> 0.603
Diff: https://github.com/luau-lang/luau/compare/0.601...0.603

Changelog: https://github.com/luau-lang/luau/releases/tag/0.603
2023-11-10 04:20:00 +00:00
Anthony Roussel
205a2a11bb
ruby.rubygems: add meta.mainProgram 2023-11-09 21:06:28 +01:00
Anthony Roussel
7d1c95fc68
ruby.rubygems: 3.4.21 -> 3.4.22
https://github.com/rubygems/rubygems/releases/tag/v3.4.22
2023-11-09 21:06:16 +01:00
github-actions[bot]
6a669d1ab2
Merge staging-next into staging 2023-11-09 18:01:27 +00:00
github-actions[bot]
e112f9b8bb
Merge master into staging-next 2023-11-09 18:00:56 +00:00
Lassulus
d4cd00c651
Merge pull request #266446 from Sohalt/update-babashka
babashka-unwrapped: 1.3.185 -> 1.3.186
2023-11-09 17:10:30 +00:00
Thiago Kenji Okada
a75a35caa8
Merge pull request #262232 from Sohalt/babashka-completions
babashka: Install shell completions
2023-11-09 13:03:01 +00:00
github-actions[bot]
5725d489f3
Merge staging-next into staging 2023-11-09 12:01:36 +00:00
sohalt
808b05db11 babashka: Install shell completions 2023-11-09 11:33:19 +01:00
sohalt
5f58cc4917 babashka-unwrapped: 1.3.185 -> 1.3.186 2023-11-09 11:28:28 +01:00
Alyssa Ross
e3e57b8f18 lib.systems: elaborate Rust metadata
We need this stuff to be available in lib so make-derivation.nix can
access it to construct the Meson cross file.

This has a couple of other advantages:

 - It makes Rust less special.  Now figuring out what Rust calls a
   platform is the same as figuring out what Linux or QEMU call it.

 - We can unify the schema used to define Rust targets, and the schema
   used to access those values later.  Just like you can set "config"
   or "system" in a platform definition, and then access those same
   keys on the elaborated platform, you can now set "rustcTarget" in
   your crossSystem, and then access "stdenv.hostPlatform.rustcTarget"
   in your code.

"rustcTarget", "rustcTargetSpec", "cargoShortTarget", and
"cargoEnvVarTarget" have the "rustc" and "cargo" prefixes because
these are not exposed to code by the compiler, and are not
standardized.  The arch/os/etc. variables are all named to match the
forms in the Rust target spec JSON.

The new rust.target-family only takes a list, since we don't need to
worry about backwards compatibility when that name is used.

The old APIs are all still functional with no warning for now, so that
it's possible for external code to use a single API on both 23.05 and
23.11.  We can introduce the warnings once 23.05 is EOL, and make them
hard errors when 23.11 is EOL.
2023-11-09 10:02:24 +01:00