Skip to content

ncurses: fix splicing#265060

Closed
kjeremy wants to merge 641 commits intoNixOS:stagingfrom
kjeremy:ncurses-fix-cross
Closed

ncurses: fix splicing#265060
kjeremy wants to merge 641 commits intoNixOS:stagingfrom
kjeremy:ncurses-fix-cross

Conversation

@kjeremy
Copy link
Contributor

@kjeremy kjeremy commented Nov 2, 2023

Fixes warnings with #263082 applied

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@kjeremy kjeremy requested a review from a user November 2, 2023 17:16
@kjeremy kjeremy mentioned this pull request Nov 2, 2023
Open
@ofborg ofborg bot added 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Nov 2, 2023
alyssais
alyssais reviewed Nov 2, 2023
View reviewed changes
pkgs/development/libraries/ncurses/default.nix Outdated
Copy link
Member

@alyssais alyssais Nov 2, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't this be the host C compiler? The build compiler would be just cc. (Or is this a terminology mismatch between Nixpkgs and ncurses?)

Copy link
Contributor Author

@kjeremy kjeremy Nov 2, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's definitely confusing. See https://github.com/mirror/ncurses/blob/master/INSTALL#L2421.

Without this change the internal tools don't build. I actually had it set to cc and it failed during configure.

Copy link
Member

@alyssais alyssais Nov 2, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could maybe use a comment then.

Copy link
Member

@Artturin Artturin Nov 2, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

actually had it set to cc and it failed during configure

because there's no cc unless the for build cc is in depsBuildBuild, I doubt this works as it is now.

Copy link
Member

@Artturin Artturin Nov 2, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and indeed pkgsCross.aarch64-multiplatform.ncurses fails

ncurses-aarch64-unknown-linux-gnu> checking if the build-compiler "aarch64-unknown-linux-gnu-cc" works... no

Copy link
Contributor Author

@kjeremy kjeremy Nov 3, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I pulled that out of depsBuildBuild to get rid of the mismatch warning so I'm not sure what the fix would be.

Copy link
Contributor Author

@kjeremy kjeremy Nov 3, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and indeed pkgsCross.aarch64-multiplatform.ncurses fails

ncurses-aarch64-unknown-linux-gnu> checking if the build-compiler "aarch64-unknown-linux-gnu-cc" works... no

@Artturin: with this PR I get checking if the build-compiler "aarch64-unknown-linux-gnu-cc" works... yes and it successfully cross compiles.

Copy link
Contributor Author

@kjeremy kjeremy Nov 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh! My nixos install had binfmt enabled and that's why it succeeded for me.

Artturin
Artturin reviewed Nov 2, 2023
View reviewed changes
@kjeremy kjeremy changed the base branch from master to staging November 3, 2023 13:19
@kjeremy
Copy link
Contributor Author

kjeremy commented Nov 3, 2023

Changed to target staging

@kjeremy kjeremy added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label Nov 3, 2023
fabaff and others added 17 commits November 5, 2023 12:15
@fabaff
python311Packages.debianbts: refactor
f226c9f
@fabaff
python310Packages.derpconf: add changelog to meta
3be3df0
@Kranzes
Merge pull request NixOS#265601 from r-ryantm/auto-update/python310Pa…
53e3e02 
…ckages.cryptolyzer

python310Packages.cryptolyzer: 0.10.0 -> 0.10.3
@r-ryantm @Mic92
numcpp: 2.12.0 -> 2.12.1
eb25d5a
@fabaff
python310Packages.derpconf: add pythonImportsCheck
7473be8
@Kranzes
Merge pull request NixOS#265600 from r-ryantm/auto-update/python310Pa…
d95fe6c 
…ckages.cryptoparser

python310Packages.cryptoparser: 0.10.3 -> 0.11.0
@pluiedev @Mic92
nixos/greetd: autostart GNOME Keyring when enabled
30f2f95 
The PAM service `greetd` creates now autostarts GNOME Keyring when it is
enabled via `services.gnome.gnome-keyring.enable`.

Should cause a lot fewer headaches for people like me who didn't know
why GNOME Keyring was complaining that it was never supplied with login details.

Fixes NixOS#246197
@fabaff
python310Packages.derpconf: add format
5bc96d1 
- disable on unsupported Python releases
@r-ryantm
python310Packages.diffsync: 1.8.0 -> 1.9.0
e3ec82d
vencord: 1.6.2 -> 1.6.3
15a468d
@marsam
Merge pull request NixOS#264925 from marsam/update-docker-slim
71b988d 
docker-slim: 1.40.4 -> 1.40.5
@marsam
Merge pull request NixOS#265492 from r-ryantm/auto-update/postgresql1…
d0f73fd 
…2JitPackages.plpgsql_check

postgresql12JitPackages.plpgsql_check: 2.5.4 -> 2.6.0
@marsam
Merge pull request NixOS#265586 from marsam/update-gallery-dl
eb8ec7c 
gallery-dl: 1.26.1 -> 1.26.2
@marsam
Merge pull request NixOS#265567 from r-ryantm/auto-update/nerdctl
fa6f493 
nerdctl: 1.6.2 -> 1.7.0
@marsam
Merge pull request NixOS#265456 from foo-dogsquared/update-decker
127edb7 
decker: 1.31 -> 1.32
@RaitoBezarius
Merge pull request NixOS#265281 from JulienMalka/systemd-boot-maintainer
0020a3f
@marsam
Merge pull request NixOS#265305 from r-ryantm/auto-update/procs
67f14b6 
procs: 0.14.0 -> 0.14.3
@github-actions github-actions bot added 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: qt/kde Object-oriented framework for GUI creation 6.topic: kernel The Linux kernel 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: emacs Text editor 6.topic: printing Drivers, CUPS & Co. 6.topic: vim Advanced text editor 6.topic: ocaml OCaml is a general-purpose, high-level, multi-paradigm programming language. 6.topic: fetch Fetchers (e.g. fetchgit, fetchsvn, ...) 6.topic: steam Steam game store/launcher (store.steampowered.com) 6.topic: lua Lua is a powerful, efficient, lightweight, embeddable scripting language. 6.topic: systemd Software suite that provides an array of system components for Linux operating systems. 6.topic: vscode A free and versatile code editor that supports almost every major programming language. 6.topic: lib The Nixpkgs function library labels Nov 6, 2023
@kjeremy
Copy link
Contributor Author

kjeremy commented Nov 6, 2023

oops

@kjeremy kjeremy closed this Nov 6, 2023
@kjeremy kjeremy deleted the ncurses-fix-cross branch November 6, 2023 18:20
@kjeremy kjeremy mentioned this pull request Nov 6, 2023
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@alyssais alyssais alyssais left review comments

@Artturin Artturin Artturin left review comments

@ulrikstrid ulrikstrid Awaiting requested review from ulrikstrid

@mmahut mmahut Awaiting requested review from mmahut

@RaghavSood RaghavSood Awaiting requested review from RaghavSood

@jonringer jonringer Awaiting requested review from jonringer

@figsoda figsoda Awaiting requested review from figsoda

@adisbladis adisbladis Awaiting requested review from adisbladis

@mweinelt mweinelt Awaiting requested review from mweinelt

@thoughtpolice thoughtpolice Awaiting requested review from thoughtpolice

@marsam marsam Awaiting requested review from marsam

@ttuegel ttuegel Awaiting requested review from ttuegel

@edwtjo edwtjo Awaiting requested review from edwtjo

@FRidh FRidh Awaiting requested review from FRidh

@dasJ dasJ Awaiting requested review from dasJ

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

@edolstra edolstra Awaiting requested review from edolstra

@infinisil infinisil Awaiting requested review from infinisil

+1 more reviewer
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

6.topic: cross-compilation Building packages on a different platform than they will be used on 6.topic: emacs Text editor 6.topic: fetch Fetchers (e.g. fetchgit, fetchsvn, ...) 6.topic: kernel The Linux kernel 6.topic: lib The Nixpkgs function library 6.topic: lua Lua is a powerful, efficient, lightweight, embeddable scripting language. 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: ocaml OCaml is a general-purpose, high-level, multi-paradigm programming language. 6.topic: printing Drivers, CUPS & Co. 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: qt/kde Object-oriented framework for GUI creation 6.topic: steam Steam game store/launcher (store.steampowered.com) 6.topic: systemd Software suite that provides an array of system components for Linux operating systems. 6.topic: vim Advanced text editor 6.topic: vscode A free and versatile code editor that supports almost every major programming language. 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.