Commit Graph
835234 Commits
Author SHA1 Message Date
Kamil ZaripovandAlyssa Ross 859c24dfc8 rustc: Fix cross-compilation for the targets with dot in name
When you are trying to cross-compile rustc to the target platform with
the dot in name, e.g. "thumb8vm.main-none-eabi", rustc compilation fails
with this error during configuration:

    armv8m-unknown-none-eabi-rustc> Running phase: configurePhase
    armv8m-unknown-none-eabi-rustc> patching script interpreter paths in ./configure
    armv8m-unknown-none-eabi-rustc> ./configure: interpreter directive changed from "#!/bin/sh" to "/nix/store/ih68ar79msmj0496pgld4r3vqfr7bbin-bash-5.2p37/bin/sh"
    armv8m-unknown-none-eabi-rustc> configure flags: --prefix=/nix/store/wscr78z0s5v2hxx3p1n4qjgjnds8dm0g-armv8m-unknown-none-eabi-rustc-1.86.0 --sysconfdir=/nix/store/wscr78z0s5v2hxx3p1n4qjgjnds8dm0g-armv8m-unknown-none-eabi-rustc-1.86.0/etc --release-channel=stable --set=build.rustc=/nix/store/f9zdz15l2zd408yq7a3bgrj593kpwjqx-rustc-wrapper-1.86.0/bin/rustc --set=build.cargo=/nix/store/ygri5mmqmril5ll9lhawa01faa2qhdvd-cargo-1.86.0/bin/cargo --tools=rustc\,rustdoc\,rust-analyzer-proc-macro-srv --enable-rpath --enable-vendor --disable-lld --build=x86_64-unknown-linux-gnu --host=x86_64-unknown-linux-gnu --target=thumbv8m.main-none-eabi --set=target.x86_64-unknown-linux-gnu.cc=/nix/store/a0d7m3zn9p2dfa1h7ag9h2wzzr2w25sn-gcc-wrapper-14.2.1.20250322/bin/cc --set=target.x86_64-unknown-linux-gnu.cc=/nix/store/a0d7m3zn9p2dfa1h7ag9h2wzzr2w25sn-gcc-wrapper-14.2.1.20250322/bin/cc --set=target.thumbv8m.main-none-eabi.cc=/nix/store/wnnwk5vknch7d8jy3cdykbsnn5qrmjj3-armv8m-unknown-none-eabi-gcc-wrapper-14.2.1.20250322/bin/armv8m-unknown-none-eabi-cc --set=target.thumbv8m.main-none-eabi.linker=/nix/store/wnnwk5vknch7d8jy3cdykbsnn5qrmjj3-armv8m-unknown-none-eabi-gcc-wrapper-14.2.1.20250322/bin/armv8m-unknown-none-eabi-cc --set=target.x86_64-unknown-linux-gnu.linker=/nix/store/a0d7m3zn9p2dfa1h7ag9h2wzzr2w25sn-gcc-wrapper-14.2.1.20250322/bin/cc --set=target.x86_64-unknown-linux-gnu.linker=/nix/store/a0d7m3zn9p2dfa1h7ag9h2wzzr2w25sn-gcc-wrapper-14.2.1.20250322/bin/cc --set=target.x86_64-unknown-linux-gnu.cxx=/nix/store/a0d7m3zn9p2dfa1h7ag9h2wzzr2w25sn-gcc-wrapper-14.2.1.20250322/bin/c++ --set=target.x86_64-unknown-linux-gnu.cxx=/nix/store/a0d7m3zn9p2dfa1h7ag9h2wzzr2w25sn-gcc-wrapper-14.2.1.20250322/bin/c++ --set=target.thumbv8m.main-none-eabi.cxx=/nix/store/wnnwk5vknch7d8jy3cdykbsnn5qrmjj3-armv8m-unknown-none-eabi-gcc-wrapper-14.2.1.20250322/bin/armv8m-unknown-none-eabi-c++ --set=target.x86_64-unknown-linux-gnu.crt-static=false --set=target.x86_64-unknown-linux-gnu.crt-static=false --set=target.thumbv8m.main-none-eabi.crt-static=false --enable-llvm-link-shared --set=target.x86_64-unknown-linux-gnu.llvm-config=/nix/store/bw1i8r1ilp79xyybr2n633aq3jj1wrrd-llvm-19.1.7-dev/bin/llvm-config --set=target.x86_64-unknown-linux-gnu.llvm-config=/nix/store/bw1i8r1ilp79xyybr2n633aq3jj1wrrd-llvm-19.1.7-dev/bin/llvm-config --set=target.thumbv8m.main-none-eabi.llvm-config=/nix/store/bw1i8r1ilp79xyybr2n633aq3jj1wrrd-llvm-19.1.7-dev/bin/llvm-config --disable-llvm-bitcode-linker --disable-docs
    armv8m-unknown-none-eabi-rustc> configure: processing command line
    armv8m-unknown-none-eabi-rustc> configure:
    armv8m-unknown-none-eabi-rustc> configure: build.configure-args := ['--prefix=/nix/store/wscr78z0s5v2hxx3p1n4qjgj ...
    armv8m-unknown-none-eabi-rustc> configure: install.prefix       := /nix/store/wscr78z0s5v2hxx3p1n4qjgjnds8dm0g-ar ...
    armv8m-unknown-none-eabi-rustc> configure: install.sysconfdir   := /nix/store/wscr78z0s5v2hxx3p1n4qjgjnds8dm0g-ar ...
    armv8m-unknown-none-eabi-rustc> configure: rust.channel         := stable
    armv8m-unknown-none-eabi-rustc> configure: build.rustc          := /nix/store/f9zdz15l2zd408yq7a3bgrj593kpwjqx-ru ...
    armv8m-unknown-none-eabi-rustc> configure: build.cargo          := /nix/store/ygri5mmqmril5ll9lhawa01faa2qhdvd-ca ...
    armv8m-unknown-none-eabi-rustc> configure: target.x86_64-unknown-linux-gnu.cc := /nix/store/a0d7m3zn9p2dfa1h7ag9h ...
    armv8m-unknown-none-eabi-rustc> configure: target.x86_64-unknown-linux-gnu.cc := /nix/store/a0d7m3zn9p2dfa1h7ag9h ...
    armv8m-unknown-none-eabi-rustc> configure: target.thumbv8m.main-none-eabi.cc := /nix/store/wnnwk5vknch7d8jy3cdykb ...
    armv8m-unknown-none-eabi-rustc> configure: target.thumbv8m.main-none-eabi.linker := /nix/store/wnnwk5vknch7d8jy3c ...
    armv8m-unknown-none-eabi-rustc> configure: target.x86_64-unknown-linux-gnu.linker := /nix/store/a0d7m3zn9p2dfa1h7 ...
    armv8m-unknown-none-eabi-rustc> configure: target.x86_64-unknown-linux-gnu.linker := /nix/store/a0d7m3zn9p2dfa1h7 ...
    armv8m-unknown-none-eabi-rustc> configure: target.x86_64-unknown-linux-gnu.cxx := /nix/store/a0d7m3zn9p2dfa1h7ag9 ...
    armv8m-unknown-none-eabi-rustc> configure: target.x86_64-unknown-linux-gnu.cxx := /nix/store/a0d7m3zn9p2dfa1h7ag9 ...
    armv8m-unknown-none-eabi-rustc> configure: target.thumbv8m.main-none-eabi.cxx := /nix/store/wnnwk5vknch7d8jy3cdyk ...
    armv8m-unknown-none-eabi-rustc> configure: target.x86_64-unknown-linux-gnu.crt-static := False
    armv8m-unknown-none-eabi-rustc> configure: target.x86_64-unknown-linux-gnu.crt-static := False
    armv8m-unknown-none-eabi-rustc> configure: target.thumbv8m.main-none-eabi.crt-static := False
    armv8m-unknown-none-eabi-rustc> configure: target.x86_64-unknown-linux-gnu.llvm-config := /nix/store/bw1i8r1ilp79 ...
    armv8m-unknown-none-eabi-rustc> configure: target.x86_64-unknown-linux-gnu.llvm-config := /nix/store/bw1i8r1ilp79 ...
    armv8m-unknown-none-eabi-rustc> configure: target.thumbv8m.main-none-eabi.llvm-config := /nix/store/bw1i8r1ilp79x ...
    armv8m-unknown-none-eabi-rustc> configure: build.tools          := ['rustc', 'rustdoc', 'rust-analyzer-proc-macro ...
    armv8m-unknown-none-eabi-rustc> configure: rust.rpath           := True
    armv8m-unknown-none-eabi-rustc> configure: build.vendor         := True
    armv8m-unknown-none-eabi-rustc> configure: rust.lld             := False
    armv8m-unknown-none-eabi-rustc> configure: build.build          := x86_64-unknown-linux-gnu
    armv8m-unknown-none-eabi-rustc> configure: build.host           := ['x86_64-unknown-linux-gnu']
    armv8m-unknown-none-eabi-rustc> configure: build.target         := ['thumbv8m.main-none-eabi']
    armv8m-unknown-none-eabi-rustc> configure: llvm.link-shared     := True
    armv8m-unknown-none-eabi-rustc> configure: rust.llvm-bitcode-linker := False
    armv8m-unknown-none-eabi-rustc> configure: build.docs           := False
    armv8m-unknown-none-eabi-rustc> configure: profile              := dist
    armv8m-unknown-none-eabi-rustc> Traceback (most recent call last):
    armv8m-unknown-none-eabi-rustc>   File "/build/rustc-1.86.0-src/./src/bootstrap/configure.py", line 762, in <module>
    armv8m-unknown-none-eabi-rustc>     section_order, sections, targets = parse_args(sys.argv[1:])
    armv8m-unknown-none-eabi-rustc>                                        ^^^^^^^^^^^^^^^^^^^^^^^^
    armv8m-unknown-none-eabi-rustc>   File "/build/rustc-1.86.0-src/./src/bootstrap/configure.py", line 446, in parse_args
    armv8m-unknown-none-eabi-rustc>     return parse_example_config(known_args, config)
    armv8m-unknown-none-eabi-rustc>            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    armv8m-unknown-none-eabi-rustc>   File "/build/rustc-1.86.0-src/./src/bootstrap/configure.py", line 622, in parse_example_config
    armv8m-unknown-none-eabi-rustc>     configure_file(sections, top_level_keys, targets, config)
    armv8m-unknown-none-eabi-rustc>   File "/build/rustc-1.86.0-src/./src/bootstrap/configure.py", line 709, in configure_file
    armv8m-unknown-none-eabi-rustc>     configure_section(targets[target], section_config[target])
    armv8m-unknown-none-eabi-rustc>   File "/build/rustc-1.86.0-src/./src/bootstrap/configure.py", line 683, in configure_section
    armv8m-unknown-none-eabi-rustc>     raise RuntimeError("failed to find config line for {}".format(key))
    armv8m-unknown-none-eabi-rustc> RuntimeError: failed to find config line for main-none-eabi

This is probably related to
https://github.com/rust-lang/rust/issues/130602 and thus target string
should be double-quotted so bootstrap/configure.py can parse it
correctly.

Changes tested on x86_64-linux build machine with rustc built for
"thumb8vm.main-none-eabi" target.
2025-07-25 15:49:40 +02:00
nixpkgs-ci[bot]andGitHub 549bcf5bbc Merge staging-next into staging 2025-07-25 12:07:49 +00:00
nixpkgs-ci[bot]andGitHub 41c256abca Merge master into staging-next 2025-07-25 12:07:12 +00:00
Paul MeyerandGitHub f2b808eb48 rymdport: 3.8.0 -> 3.9.0 (#423573) 2025-07-25 13:53:35 +02:00
Paul MeyerandGitHub 6187a8c181 mieru: 3.16.1 -> 3.16.2 (#423240) 2025-07-25 13:52:11 +02:00
Doron BeharandGitHub 44550d19f4 openmpi: build on platform without ucx (#427890) 2025-07-25 14:51:10 +03:00
Vladimír Čunát 4a230e29b1 systemd.disallowedReferences: avoid null, really (#428280) 2025-07-25 13:45:24 +02:00
evolveandAnthony Roussel 322ba378e5 maintainers : update e-v-o-l-v-e 2025-07-25 13:40:24 +02:00
Paul MeyerandGitHub 231e16be00 hermitcli: 0.44.9 -> 0.44.12 (#423188) 2025-07-25 13:36:21 +02:00
Gaétan LepageandGitHub b93d238301 python3Packages.stable-baselines3: 2.6.0 -> 2.7.0 (#428274) 2025-07-25 13:30:40 +02:00
Vincent LaporteandVincent Laporte beead10842 ocamlPackages.ctypes_stubs_js: remove at 0.1 2025-07-25 13:28:44 +02:00
Gaétan LepageandGitHub 3f0825255c nvitop: 1.5.1 -> 1.5.2 (#428272) 2025-07-25 13:27:49 +02:00
Paul MeyerandGitHub b42160ac81 azure-cli-extensions.azure-devops: 1.0.1 -> 1.0.2 (#428243) 2025-07-25 13:14:42 +02:00
7c6f434candGitHub 88375b27fa debian-devscripts: 2.25.15 -> 2.25.16 (#428230) 2025-07-25 11:06:57 +00:00
7c6f434candGitHub a891080d2f io: 2017.09.06 -> 2019.05.22-alpha (#427865) 2025-07-25 11:06:24 +00:00
7c6f434candGitHub 661b8c9736 lisp-modules: Fetch systems over HTTPS (#427484) 2025-07-25 11:05:28 +00:00
Paul MeyerandGitHub 96887fed6a roxctl: 4.7.4 -> 4.8.0 (#423371) 2025-07-25 13:01:48 +02:00
01b882af15 qownnotes: 25.7.7 -> 25.7.8 (#428277)
Co-authored-by: matthiasbeyer <mail@beyermatthias.de>
2025-07-25 10:55:58 +00:00
qbisi 26d9aac347 openmpi: disable ucx support when not available 2025-07-25 18:46:13 +08:00
qbisi 41d9acc3f7 ucx: mark loongarch64 badPlatform 2025-07-25 18:46:12 +08:00
qbisi 41108ad5e6 ucx: no with lib; in meta 2025-07-25 18:46:02 +08:00
Peter SimonsandGitHub 7666598aaa Configuration fixes for ghc-9.12.x (#427726) 2025-07-25 12:43:11 +02:00
Paul MeyerandGitHub eb7cdc8f1e kics: 2.1.10 -> 2.1.11 (#423216) 2025-07-25 12:37:05 +02:00
Vladimír Čunát 059cdd0c79 systemd.disallowedReferences: avoid null values, really
I made a mistake and apparently I incorrectly tested
the commit 40df6d5813
Now with swapping these layers it evaluates again; easiest to try by
nix-build pkgs/top-level/release-cross.nix -A rpi.mpg123.aarch64-darwin --dry-run
2025-07-25 12:34:44 +02:00
8e5a2374fe pyright: 1.1.402 -> 1.1.403 (#428275)
Co-authored-by: kalekseev <mail@kalekseev.com>
2025-07-25 10:31:28 +00:00
YtandGitHub 271804dca8 worker-build: 0.6.0 -> 0.6.1 (#428231) 2025-07-25 06:26:55 -04:00
R. Ryantm 936b1cc72d qownnotes: 25.7.7 -> 25.7.8 2025-07-25 10:14:42 +00:00
R. Ryantm 1c3b5fdb92 pyright: 1.1.402 -> 1.1.403 2025-07-25 09:59:06 +00:00
Weijia WangandGitHub 7d123199cc torque: unpin autotools (#427887) 2025-07-25 11:59:03 +02:00
53d477eaf8 release-plz: 0.3.138 -> 0.3.139 (#428194)
Co-authored-by: DanNixon <dan@dan-nixon.com>
2025-07-25 09:58:05 +00:00
Gaetan Lepage bfc472a672 python3Packages.stable-baselines3: 2.6.0 -> 2.7.0
Diff: https://github.com/DLR-RM/stable-baselines3/compare/refs/tags/v2.6.0...refs/tags/v2.7.0

Changelog: https://github.com/DLR-RM/stable-baselines3/releases/tag/v2.7.0
2025-07-25 11:56:49 +02:00
6d6aedd1d0 laze: 0.1.37 -> 0.1.38 (#428225)
Co-authored-by: DanNixon <dan@dan-nixon.com>
2025-07-25 09:56:37 +00:00
Gaétan LepageandGitHub 232e18178e python3Packages.databricks-sdk: 0.58.0 -> 0.59.0 (#428012) 2025-07-25 11:55:51 +02:00
Weijia WangandGitHub f557a16292 elinks: unpin autotools (#427881) 2025-07-25 11:55:40 +02:00
Gaétan LepageandGitHub 56148c6144 python3Packages.pymc: 5.25.0 -> 5.25.1 (#428142) 2025-07-25 11:55:30 +02:00
Doron BeharandGitHub 6feb072b80 beets: chroma plugin needs chromaprint (#428173) 2025-07-25 12:53:53 +03:00
Weijia WangandGitHub 78682b57a2 parcellite: unpin autotools (#427766) 2025-07-25 11:53:26 +02:00
Gaétan LepageandGitHub e60c6223f6 vimPlugins: update on 2025-07-24 (#428144) 2025-07-25 11:48:22 +02:00
Doron BeharandGitHub d37be72bc2 lammps-mpi: 29Aug2024_update3 -> 29Aug2024_update4 (#428060) 2025-07-25 12:48:07 +03:00
Gaetan Lepage 813fabe8da nvitop: 1.5.1 -> 1.5.2
Diff: https://github.com/XuehaiPan/nvitop/compare/refs/tags/v1.5.1...refs/tags/v1.5.2

Changelog: https://github.com/XuehaiPan/nvitop/releases/tag/v1.5.2
2025-07-25 11:42:04 +02:00
André SilvaandGitHub d1ad94c091 ledger-live-desktop: 2.120.1 -> 2.122.1 (#428237) 2025-07-25 10:24:22 +01:00
83bd88bf17 cargo-expand: 1.0.113 -> 1.0.114 (#428264)
Co-authored-by: xrelkd <xrelkd@users.noreply.github.com>
2025-07-25 09:13:37 +00:00
7ed82955bf api-linter: 1.70.0 -> 1.70.1 (#428252)
Co-authored-by: xrelkd <xrelkd@users.noreply.github.com>
2025-07-25 09:12:28 +00:00
Thiago Kenji OkadaandGitHub 78d7ffc7aa libretro.beetle-pce-fast: 0-unstable-2025-06-27 -> 0-unstable-2025-07-18 (#428174) 2025-07-25 10:02:35 +01:00
AleksanaandGitHub 6027c30c8e alsa-plugins: clean up & provide update script (#428074) 2025-07-25 16:26:56 +08:00
AleksanaandGitHub 5ff293c400 alsa-firmware: clean up & provide update script (#428071) 2025-07-25 16:26:39 +08:00
AleksanaandGitHub 02109e62cb pilipalax: remove (#428253) 2025-07-25 16:14:31 +08:00
R. Ryantm d92da56618 cargo-expand: 1.0.113 -> 1.0.114 2025-07-25 08:13:34 +00:00
AleksanaandGitHub 08485848be flow-control: 0.3.2 > 0.4.0 (#426453) 2025-07-25 16:12:16 +08:00
AleksanaandGitHub f418cef5bb python3Packages.rustworkx: properly add numpy as a dependency (#426921) 2025-07-25 16:05:37 +08:00