Commit Graph

24752 Commits

Author SHA1 Message Date
Martin Weinelt
106b1418bc Revert "Merge remote-tracking branch 'origin/master' into staging-next"
This reverts commit 28cafe5795, reversing
changes made to 281c9189d4.

Broken merge due to mergiraf removing many newlines from
python-packages.nix.
2025-08-15 13:58:54 +02:00
Martin Weinelt
28cafe5795 Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/python-modules/dependency-groups/default.nix
	pkgs/development/python-modules/nox/default.nix
2025-08-15 12:42:37 +02:00
rina
00793d7613 llvmPackages: export versions from llvm/default.nix
this will allow users of `/pkgs/development/compilers/llvm/default.nix`
to introspect the current version of each llvm version. note that this
is only exported from this default.nix, and will only be accessible to
users who callPackage this directly. this new field will not be
reachable from any llvmPackages in nixpkgs's exported packages.
2025-08-15 09:37:20 +02:00
nixpkgs-ci[bot]
f0e7cc4cfe Merge staging-next into staging 2025-08-15 06:07:14 +00:00
nixpkgs-ci[bot]
2c009120f7 Merge master into staging-next 2025-08-15 06:06:29 +00:00
nixpkgs-ci[bot]
bb71dfa5c1 Merge ee11c0fef4 into haskell-updates 2025-08-15 00:23:03 +00:00
nixpkgs-ci[bot]
664c1d7072 Merge staging-next into staging 2025-08-15 00:18:56 +00:00
nixpkgs-ci[bot]
c0e9e1afcf Merge master into staging-next 2025-08-15 00:18:09 +00:00
qzylinra
b87e875449 flutter335: 3.35.0-0.3.pre -> 3.35.1 2025-08-15 06:41:12 +08:00
David McFarland
a885d5af08 chickenPackages.chickenEggs: Preserve version info (#433689) 2025-08-14 18:44:50 -03:00
K900
b5531da4b1 Merge remote-tracking branch 'origin/master' into staging-next 2025-08-14 21:21:33 +03:00
Moritz Heidkamp
ea3f73b15d chickenPackages.chickenEggs.magic-pipes: add missing dependency 2025-08-14 20:12:07 +02:00
Moritz Heidkamp
0a6ed1128e chickenPackages.chickenEggs.allegro: mark broken 2025-08-14 20:12:07 +02:00
Moritz Heidkamp
a49ee8d7de chickenPackages.chickenEggs: Preserve version info
Most eggs in the canonical repository don't declare a `version` property in their `.egg` files. This
is because it's provided implicitly when using `chicken-install` to retrieve them. Quoting from [the
manual](https://wiki.call-cc.org/man/5/Egg%20specification%20format#version):

> Eggs from remote egg servers are automatically versioned - the version is part of the protocol to
retrieve the egg and does not have to be specified in the .egg file.

Since we don't use `chicken-install` to retrieve eggs, this leaves us with a version of "unknown" in
most cases, e.g.:

    $ nix-shell -p chickenPackages.chickenEggs.json-abnf chickenPackages.chicken --run chicken-status
    abnf ...................................................... version: unknown
    iset ...................................................... version: unknown
    json-abnf ................................................. version: unknown
    lexgen .................................................... version: unknown
    regex ......................................................... version: 2.0
    srfi-1 .................................................... version: unknown
    srfi-127 .................................................. version: unknown
    srfi-69 ................................................... version: unknown
    utf8 ...................................................... version: unknown

This is usually not an issue unless another egg declares a minimum required version dependency on an
egg with missing version info. In this case, `chicken-install` will fill in "0.0.0" as a fallback
and the check will fail. This has so far been worked around patches (see e.g. #346004 or #358455).

This patch addresses the root cause by following the documentation's recommendation:

> Eggs installed from local directories (see below) should explicitly specify a version.

To do that, `eggDerivation` now simply always adds the version to the generated `.egg-info`
file. This has the added benefit of correcting potentially inconsistent version declarations in
`.egg` files. Note that we cannot patch the original `.egg` file because not all released egg
versions match [the stricter version format validation which currently applies
there](https://bugs.call-cc.org/ticket/1855).

The patch also changes the signature of `eggDerivation` to allow passing in `pname` and `version`
instead of `name` to allow for easy access to the egg version. However, for backwards compatibility,
the old `name` argument is also still supported.

As a result, the aforementioned overrides are removed again and some additional eggs can be marked
as unbroken again.

And finally, this is the output of the above `chicken-status` call with the patch applied:

    $ nix-shell -p chickenPackages.chickenEggs.json-abnf chickenPackages.chicken --run chicken-status
    abnf .......................................................... version: 8.3
    iset .......................................................... version: 2.2
    json-abnf ..................................................... version: 7.0
    lexgen ........................................................ version: 8.2
    regex ......................................................... version: 2.0
    srfi-1 ...................................................... version: 0.5.1
    srfi-127 ...................................................... version: 1.3
    srfi-69 ..................................................... version: 0.4.3
    utf8 ........................................................ version: 3.6.3
2025-08-14 20:12:06 +02:00
nixpkgs-ci[bot]
6be5b2521e Merge staging-next into staging 2025-08-14 18:06:37 +00:00
Marie Ramlow
7f494c2b23 rustc: also symlink libexec when doing fastCross
We also need to symlink libexec when doing fastCross.
It contains rust-analyzer-proc-macro-srv which rust-analyzer needs for proc macro expansion to work.
2025-08-14 18:39:24 +02:00
Sean Gilligan
f3151796cc graalvm-oracle_25-ea: 25-ea-32 -> 25-ea-33
Update graalvm-oracle_25-ea to 25-ea-33, currently the latest version
available at: https://github.com/graalvm/oracle-graalvm-ea-builds/releases
2025-08-14 08:56:55 -07:00
Fabián Heredia Montiel
675812fca5 Merge remote-tracking branch 'origin/master' into staging-next 2025-08-14 09:23:01 -06:00
Wolfgang Walther
a7a0568a11 jdk24: 24.0.1+9 -> 24.0.2+12 (#426171) 2025-08-14 13:17:34 +00:00
Wolfgang Walther
560601e1da jdk8: 8u442-b06 -> 8u462-b08 (#406572) 2025-08-14 13:07:58 +00:00
Jakub Okoński
7011644443 graalvm-oracle_24: init at 24.0.2 2025-08-14 15:03:31 +02:00
Sandro
6d447f5c01 graalvm-oracle_25-ea: init at 25-ea-32 (#430508) 2025-08-14 14:51:45 +02:00
Sandro
6c3610fafc dotnetCorePackages.dotnet_{8..10}.vmr: enable separateDebugInfo (#432003) 2025-08-14 14:08:36 +02:00
Yohann Boniface
d32ba1a0cc flutter: remove with lib and rec (#433311) 2025-08-14 10:52:27 +02:00
nixpkgs-ci[bot]
0962d886bb Merge 27473e9a5e into haskell-updates 2025-08-14 00:21:59 +00:00
nixpkgs-ci[bot]
cb60966cae Merge staging-next into staging 2025-08-14 00:18:07 +00:00
K900
40539042b8 Merge remote-tracking branch 'origin/master' into staging-next 2025-08-13 21:30:19 +03:00
dramforever
39aef90642 rustc: Fix configure flags for custom target JSON
For custom target JSON, rustc bootstrap expects config to be set for
target."/path/to/target.json", so use that.
2025-08-13 16:13:10 +02:00
Tristan Ross
bcf94dd3f0 llvmPackages_21: 21.1.0-rc2 -> 21.1.0-rc3 2025-08-13 15:07:19 +02:00
nixpkgs-ci[bot]
555eba864d Merge staging-next into staging 2025-08-13 12:08:02 +00:00
nixpkgs-ci[bot]
d060c7e4de Merge master into staging-next 2025-08-13 12:07:08 +00:00
sternenseemann
e0268b1bc1 haskell.compiler.ghcHEAD: 9.15.20250805 -> 9.15.20250811
We can now force terminfo to be built, making the
configuration-ghc-*.nix file for ghcHEAD free of conditionals. Of
course, certain packages won't exist on every platform, e.g. terminfo
won't be available when cross-compiling to Windows. In such situations,
however, depending on the package doesn't make sense anyways so having
it set to `null` should be fine.

Fix version number for the ghc specific configuration. We'll have to
create a new one upon release of GHC 9.14, but there aren't any
overrides beyond core packages in there anyways.
2025-08-13 13:34:33 +02:00
qzylinra
02a40a83de flutter: remove rec 2025-08-13 16:26:50 +08:00
qzylinra
086140219e flutter: remove with lib 2025-08-13 16:21:52 +08:00
Paul Meyer
0e70078296 go_1_25: 1.25rc3 -> 1.25.0 (#433239) 2025-08-13 09:55:15 +02:00
nixpkgs-ci[bot]
d7c729fd61 Merge staging-next into staging 2025-08-13 06:53:41 +00:00
K900
d0338fac64 Merge remote-tracking branch 'origin/master' into staging-next 2025-08-13 09:51:59 +03:00
Sean Gilligan
b586b8f6e9 graalvm-oracle_25-ea: init at 25-ea-32 2025-08-12 23:32:29 -07:00
Tristan Ross
d4df8d6cc1 flutter335: init at 3.35.0-0.3.pre (#432951) 2025-08-12 22:01:40 -07:00
Morgan Jones
33ce2b0efa zulu24: 24.0.1 -> 24.0.2 (#425621) 2025-08-13 04:56:54 +00:00
Alvaro Aleman
eae238e32a go_1_25: 1.25rc3 -> 1.25.0 2025-08-12 19:52:39 -04:00
sternenseemann
906105ed78 Revert "haskell.compiler.ghc981: build stage 2 compiler for “native cross”"
This reverts commit 1dc7345389.

Reason for revert: The change doesn't work as in intended, i.e. hadrian
refuses to build a Stage2 compiler as requested in the “native cross”
case. Thus the canExecute condition only served to confuse
2025-08-12 19:33:12 +02:00
sternenseemann
26dc439eb4 haskell.compiler.ghcHEAD: 9.13.20250428 -> 9.15.20250805
We can safely drop the upper bound for the jailbreak workaround for
directory >= 1.3.9.0 since all GHCs will probably have this constraint
going forward.
2025-08-12 14:33:01 +02:00
qzylinra
1647956667 flutter335: init at 3.35.0-0.3.pre 2025-08-12 09:46:03 +08:00
nixpkgs-ci[bot]
ba1e259dc8 Merge a2a025b8f3 into haskell-updates 2025-08-12 00:21:47 +00:00
nixpkgs-ci[bot]
bb99871cb5 Merge staging-next into staging 2025-08-11 19:04:04 +00:00
nixpkgs-ci[bot]
33ae536a17 Merge master into staging-next 2025-08-11 19:03:22 +00:00
Pavol Rusnak
6e6efe1dbb treewide: remove prusnak from maintainers for packages i don't use 2025-08-11 20:22:58 +02:00
nixpkgs-ci[bot]
cef654221c Merge staging-next into staging 2025-08-10 12:07:14 +00:00
Valentine Briese
dc402c1fc6 rust: 1.88.0 -> 1.89.0 2025-08-10 12:58:52 +02:00