Skip to content

libgit2, http-parser: Fix Windows Build #269326

Merged
Ericson2314 merged 2 commits intoNixOS:stagingfrom
obsidiansystems:libgit-windows
Nov 24, 2023
Merged

libgit2, http-parser: Fix Windows Build #269326
Ericson2314 merged 2 commits intoNixOS:stagingfrom
obsidiansystems:libgit-windows

Conversation

@Ericson2314
Copy link
Member

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.

Priorities

Add a 👍 reaction to pull requests you find important.

@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely 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: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. labels Nov 23, 2023
Copy link
Member

@SuperSandro2000 SuperSandro2000 left a comment

Choose a reason for hiding this comment

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

otherwise fine for me

It actually does without modification, but what it installs isn't quite
right. This fixes that.

Specifying `uname` is in general more robust for cross, and specifying
those other variables always (when we just need to for Windows) helps
keep cross/native more similar for maintainability's sake.

The package is no longer maintained, so there isn't really anything to
upstream here.
@Ericson2314
Copy link
Member Author

I think this is a spurious failure because staging? At least it looks like a timeout and the backport I already made (to try out, and because conflicts will prevent the automatic one from working) passed CI fine.

@Ericson2314
Copy link
Member Author

In fact, the packages I changed don't appear in the log; it's definitely spurious.

@Ericson2314 Ericson2314 merged commit 281f0e6 into NixOS:staging Nov 24, 2023
@Ericson2314 Ericson2314 deleted the libgit-windows branch November 24, 2023 14:14
@github-actions
Copy link
Contributor

Successfully created backport PR for staging-23.11:

@SuperSandro2000
Copy link
Member

Yeah, otherwise we fix it along staging-next. Shouldn't be to hard I hope.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely 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: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants