Skip to content

Conversation

@Ericson2314
Copy link
Member

@Ericson2314 Ericson2314 commented Jan 11, 2024

Description of changes

Companion to #280145 reverting it on staging-23.11. On staging staging-23.11 we are on readline-8.2p7, not readline-8.2p1, and we can use the never version of the patch.

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/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 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.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: kernel The Linux kernel 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: vscode A free and versatile code editor that supports almost every major programming language. labels Jan 11, 2024
d6162d7 did the "proper" work of fixing
the MinGW readline build, but won't work without
9cc3559 which adds upstream-provided
patches but is only `staging-23.11`.

The older version of this patch however doesn't rely on p2-p7 so it will
work for now. `staging-23.11` will revert this because it does have
those patches.

The urgency is because this blocks Nix Windows development.
…g-23.11

Companion to NixOS#280145 reverting it on `staging-23.11`. On staging
`staging-23.11` we are on `readline-8.2p7`, not `readline-8.2p1`, and we
can use the never version of the patch.

This reverts commit cd76713.
@Ericson2314 Ericson2314 force-pushed the readline-windows-stopgap-staging branch from 4aa6a72 to 0d807a5 Compare January 11, 2024 00:28
@Ericson2314 Ericson2314 changed the title readline: Get rid of temporary hack #280145 on staging-23.11 readline: Get rid of temporary patch downgrade #280145 on staging-23.11 Jan 11, 2024
@Ericson2314 Ericson2314 changed the title readline: Get rid of temporary patch downgrade #280145 on staging-23.11 [staging-23.11] readline: Get rid of temporary patch downgrade #280145 Jan 11, 2024
@mweinelt
Copy link
Member

The diff is empty.

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Jan 11, 2024
@Ericson2314
Copy link
Member Author

That is intentional, the first commit from #280145 is now on release-23.11; this prevents that PR from modifying staging-23.11.

@Ericson2314 Ericson2314 merged commit d66d5de into NixOS:staging-23.11 Jan 11, 2024
@Ericson2314 Ericson2314 deleted the readline-windows-stopgap-staging branch January 11, 2024 14:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: kernel The Linux kernel 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 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: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants