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

claws-mail: do not use fetchgit; upstream has force-pushed #189951

Merged
merged 2 commits into from Sep 7, 2022
Merged

claws-mail: do not use fetchgit; upstream has force-pushed #189951

merged 2 commits into from Sep 7, 2022

Conversation

ghost
Copy link

@ghost ghost commented Sep 6, 2022

Description of changes

Our claws-mail expression no longer builds without substituters; apparently upstream has force-pushed the 4.1.0 tag to a different commit. The current 4.1.0 tag is at a commit whose date (Fri May 6 11:01:22 2022 +0100) is almost a month later than the nixpkgs commit.

Unfortuantely the fetchgit expression we're using doesn't have any kind of git commit hash in it, so I'm unable to rescue it. Hydra strips out the .git directory before creating the cache, so I can't get it from there either.

I think we should probably avoid using fetchgit here unless we're including the git commit-hash.

Even better: let's use released tarballs.

claws> exporting git://git.claws-mail.org/claws.git (rev 4.1.0) into /nix/store/w616jnh09024djrgx4j3s93dnn6dvwl5-claws
claws> Initialized empty Git repository in /nix/store/w616jnh09024djrgx4j3s93dnn6dvwl5-claws/.git/
claws> remote: Enumerating objects: 1491, done.
claws> remote: Counting objects: 100% (1491/1491), done.
claws> remote: Compressing objects: 100% (1415/1415), done.
claws> remote: Total 1491 (delta 352), reused 505 (delta 67)/s
claws> Receiving objects: 100% (1491/1491), 6.88 MiB | 2.28 MiB/s, done.
claws> Resolving deltas: 100% (352/352), done.
claws> From git://git.claws-mail.org/claws
claws>  * tag               4.1.0      -> FETCH_HEAD
claws> Switched to a new branch 'fetchgit'
claws> removing `.git'...
error: hash mismatch in fixed-output derivation '/nix/store/9rw91mgplypm6yh8bnawr9x7qj5vpik6-claws.drv':
         specified: sha256-II2+dnju6ffznO+klfI8awM4aGUJf3UD1HNofNA/9N0=
            got:    sha256-5S2FuM8sOG8//lrWFUTS/o1eZ/hrKSVgfyKpfaBfO1k=
note: keeping build directory '/tmp/nix-build-claws.drv-0'
Things done
  • Built on platform(s)
    • powerpc64le-linux
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

Our claws-mail expression no longer builds without substituters; apparently
upstream has force-pushed the 4.1.0 tag to a different commit.  The current
4.1.0 tag is at a commit whose date (Fri May 6 11:01:22 2022 +0100) is almost a
month later than the nixpkgs commit.

Unfortuantely the `fetchgit` expression we're using doesn't have any kind of git
commit hash in it, so I'm unable to rescue it.  Hydra strips out the .git
directory before creating the cache, so I can't get it from there either.

I think we should probably avoid using `fetchgit` here unless we're including
the git commit-hash.  Even better, let's use released tarballs.

```
claws> exporting git://git.claws-mail.org/claws.git (rev 4.1.0) into /nix/store/w616jnh09024djrgx4j3s93dnn6dvwl5-claws
claws> Initialized empty Git repository in /nix/store/w616jnh09024djrgx4j3s93dnn6dvwl5-claws/.git/
claws> remote: Enumerating objects: 1491, done.
claws> remote: Counting objects: 100% (1491/1491), done.
claws> remote: Compressing objects: 100% (1415/1415), done.
claws> remote: Total 1491 (delta 352), reused 505 (delta 67)/s
claws> Receiving objects: 100% (1491/1491), 6.88 MiB | 2.28 MiB/s, done.
claws> Resolving deltas: 100% (352/352), done.
claws> From git://git.claws-mail.org/claws
claws>  * tag               4.1.0      -> FETCH_HEAD
claws> Switched to a new branch 'fetchgit'
claws> removing `.git'...
error: hash mismatch in fixed-output derivation '/nix/store/9rw91mgplypm6yh8bnawr9x7qj5vpik6-claws.drv':
         specified: sha256-II2+dnju6ffznO+klfI8awM4aGUJf3UD1HNofNA/9N0=
            got:    sha256-5S2FuM8sOG8//lrWFUTS/o1eZ/hrKSVgfyKpfaBfO1k=
note: keeping build directory '/tmp/nix-build-claws.drv-0'
```
@ofborg ofborg bot requested review from oxzi, globin, fpletz and ajs124 September 6, 2022 03:40
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Sep 6, 2022
Copy link
Member

@ajs124 ajs124 left a comment

Choose a reason for hiding this comment

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

LGTM

you might want to remove the fetchgit input from the first line of the expression

@bobby285271 bobby285271 added 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package labels Sep 6, 2022
@bobby285271 bobby285271 removed the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Sep 6, 2022
@fpletz fpletz merged commit 0230710 into NixOS:master Sep 7, 2022
@ghost ghost deleted the pr/claws-mail/unbreak/fetchgit branch September 7, 2022 18:54
RaitoBezarius pushed a commit to RaitoBezarius/nixpkgs that referenced this pull request Sep 17, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild 10.rebuild-linux: 1-10 10.rebuild-linux: 1 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants