Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ncurses: fix splicing #265060

Closed
wants to merge 641 commits into from
Closed

ncurses: fix splicing #265060

wants to merge 641 commits into from

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.

@@ -48,20 +48,17 @@ stdenv.mkDerivation (finalAttrs: {
"/usr/share/terminfo" # upstream default, probably all FHS-based distros
"/run/current-system/sw/share/terminfo" # NixOS
]}"
];
] ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--with-build-cc=${stdenv.cc.targetPrefix}cc";
Copy link
Member

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

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

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

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

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

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

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

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.

@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 sort platform than than they will be run on label Nov 3, 2023
fabaff and others added 17 commits November 5, 2023 12:15
…ckages.cryptolyzer

python310Packages.cryptolyzer: 0.10.0 -> 0.10.3
…ckages.cryptoparser

python310Packages.cryptoparser: 0.10.3 -> 0.11.0
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
- disable on unsupported Python releases
…2JitPackages.plpgsql_check

postgresql12JitPackages.plpgsql_check: 2.5.4 -> 2.6.0
@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
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.