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.

Sign up for GitHub

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

Jump to bottom

libtool: 2.4.7 -> 2.5.4 #363684

Merged
merged 1 commit into from
Dec 19, 2024
Merged

libtool: 2.4.7 -> 2.5.4 #363684

merged 1 commit into from
Dec 19, 2024

Conversation

s1syph0s
Copy link

@s1syph0s s1syph0s commented Dec 9, 2024 •
edited
Loading

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

Add a 👍 reaction to pull requests you find important.

@NixOSInfra NixOSInfra added the 12. first-time contribution This PR is the author's first one; please be gentle! label Dec 9, 2024
getchoo
getchoo requested changes Dec 9, 2024
View reviewed changes
Copy link
Member

@getchoo getchoo left a comment

Choose a reason for hiding this comment

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

It seems this update will cause a lot of rebuilds, meaning it should be targeting our staging branch rather than master. Our Contributing guide describes how to rebase pull requests onto staging here

Let me know if you need any help, any welcome to Nixpkgs!

@github-actions github-actions bot added 6.topic: python 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: haskell 6.topic: qt/kde 8.has: documentation This PR adds or changes documentation 8.has: changelog 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: emacs Text editor 6.topic: rust 6.topic: golang 6.topic: ruby 6.topic: vim 6.topic: ocaml 6.topic: stdenv Standard environment 6.topic: nodejs 6.topic: TeX Issues regarding texlive and TeX in general 6.topic: lua 6.topic: testing Tooling for automated testing of packages and modules 6.topic: cinnamon Desktop environment 6.topic: java Including JDK, tooling, other languages, other VMs 6.topic: Enlightenment DE The Enlightenment Desktop Environment 6.topic: cuda Parallel computing platform and API 6.topic: vscode 6.topic: lib The Nixpkgs function library labels Dec 10, 2024
@github-actions github-actions bot removed 6.topic: vscode 6.topic: lib The Nixpkgs function library 6.topic: games 6.topic: php 6.topic: deepin Desktop environment and its components 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related 6.topic: dotnet Language: .NET 6.topic: flutter 6.topic: nvidia 6.topic: tcl labels Dec 10, 2024
@s1syph0s
Copy link
Author

Running git rebase --onto upstream/staging... upstream/master didn't work for me. In the end, I run this command: git rebase --onto upstream/staging $(git merge-base upstream/staging upstream/master) bump-libtool and git notifies me Successfully rebased and updated refs/heads/bump-libtool.. Would this be right?

getchoo
getchoo approved these changes Dec 10, 2024
View reviewed changes
Copy link
Member

@getchoo getchoo left a comment

Choose a reason for hiding this comment

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

Would this be right?

Yep, that seems to have worked just as well

I'll try to build this tomorrow if CI doesn't. Diff LGTM, and welcome again to Nixpkgs :)

@getchoo getchoo added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Dec 10, 2024
@s1syph0s
Copy link
Author

thank you :)

@ofborg ofborg bot added 2.status: merge conflict This PR has merge conflicts with the target branch 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild 10.rebuild-linux-stdenv This PR causes stdenv to rebuild 10.rebuild-darwin: 501+ 10.rebuild-linux: 501+ and removed 2.status: merge conflict This PR has merge conflicts with the target branch labels Dec 11, 2024
@s1syph0s
Copy link
Author

@getchoo Is there an update regarding this PR? The CI failed for several reasons. The nixpkgs-lib-tests failed because it could find the release.nix, and the other jobs failed because the operation was cancelled (in nixpkgs-manual-build I found the cancelled entry in the log, and I couldn't download the log from nixos-manual-build).

@getchoo
Copy link
Member

getchoo commented Dec 19, 2024

The CI failed for several reasons. The nixpkgs-lib-tests failed because it could find the release.nix, and the other jobs failed because the operation was cancelled (in nixpkgs-manual-build I found the cancelled entry in the log, and I couldn't download the log from nixos-manual-build).

This was just bad luck with the commit on staging that was rebased onto, and not related to this PR

Is there an update regarding this PR?

I was waiting for other reviews to come around, but as those haven't come and builds finished on Linux (and Darwin failures appear to be unrelated), I'll merge now. Thanks again!

@getchoo getchoo merged commit cb94570 into NixOS:staging Dec 19, 2024
48 of 52 checks passed
@mweinelt
Copy link
Member

mweinelt commented Dec 30, 2024 •
edited
Loading

I'm seeing a hash mismatch on staging for libtool on x86_64-linux right now.

error: hash mismatch in fixed-output derivation '/nix/store/izbfj3rckm6lyip0y99dw9hyyap52kg6-libtool-2.5.4.tar.gz.drv':
        likely URL: https://ftpmirror.gnu.org/libtool/libtool-2.5.4.tar.gz
         specified: sha256-2o67LOTc9GuQCY2vliz/po9LT2LqYPeY0O8Skp7eat8=
            got:    sha256-DFroQ6osZmBT/jtl6vdid+Pae3Fz3zCouS8N8e239DY=

@paparodeo
Copy link
Contributor

I get the same one as the PR

$ nix-build -E '(import <nixpkgs>{}).fetchurl { url = "mirror://gnu/libtool/libtool-2.5.4.tar.gz"; }'
warning: found empty hash, assuming 'sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA='
this derivation will be built:
  /nix/store/ycz5g17wc5v5zzldb1vwnl8vn0avdkwj-libtool-2.5.4.tar.gz.drv
building '/nix/store/ycz5g17wc5v5zzldb1vwnl8vn0avdkwj-libtool-2.5.4.tar.gz.drv'...

trying https://ftpmirror.gnu.org/libtool/libtool-2.5.4.tar.gz
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
100 1969k  100 1969k    0     0  3136k      0 --:--:-- --:--:-- --:--:-- 15.1M
error: hash mismatch in fixed-output derivation '/nix/store/ycz5g17wc5v5zzldb1vwnl8vn0avdkwj-libtool-2.5.4.tar.gz.drv':
         specified: sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
            got:    sha256-2o67LOTc9GuQCY2vliz/po9LT2LqYPeY0O8Skp7eat8=

@mweinelt
Copy link
Member

Indeed, cannot reproduce the hash mismatch anymore, so nvm.

@wolfgangwalther
Copy link
Contributor

I'm seeing a hash mismatch on staging for libtool on x86_64-linux right now.

error: hash mismatch in fixed-output derivation '/nix/store/izbfj3rckm6lyip0y99dw9hyyap52kg6-libtool-2.5.4.tar.gz.drv':
        likely URL: https://ftpmirror.gnu.org/libtool/libtool-2.5.4.tar.gz
         specified: sha256-2o67LOTc9GuQCY2vliz/po9LT2LqYPeY0O8Skp7eat8=
            got:    sha256-DFroQ6osZmBT/jtl6vdid+Pae3Fz3zCouS8N8e239DY=

I get the same hash mismatch.

@wolfgangwalther
Copy link
Contributor

When running this:

nix-build -E '(import <nixpkgs>{}).fetchurl { url = "mirror://gnu/libtool/libtool-2.5.4.tar.gz"; }'

I get the same hash as in the PR.

And now the hash mismatch I got at first is suddenly gone, too...

What's going on there?

@mweinelt
Copy link
Member

mweinelt commented Jan 1, 2025

If you have both sources, can you do a recursive diff?

@wolfgangwalther
Copy link
Contributor

If you have both sources, can you do a recursive diff?

I compared the two source files: The working one is a gzipped tar achive as expected. The broken one is the exact same tar archive, but not gzipped.

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

@getchoo getchoo getchoo approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+ 10.rebuild-linux-stdenv This PR causes stdenv to rebuild 12.approvals: 1 This PR was reviewed and approved by one reputable person 12. first-time contribution This PR is the author's first one; please be gentle!
Projects
CUDA Team
Status: ✅ Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@s1syph0s @getchoo @mweinelt @paparodeo @wolfgangwalther @NixOSInfra