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

rescuetime: 2.16.2.1 -> 2.16.3.1 #95883

Merged
merged 1 commit into from Aug 22, 2020
Merged

rescuetime: 2.16.2.1 -> 2.16.3.1 #95883

merged 1 commit into from Aug 22, 2020

Conversation

steshaw
Copy link
Member

@steshaw steshaw commented Aug 21, 2020 •
edited

Motivation for this change

I am trying to upgrade NixOS 20.03 but I can't because rescuetime is broken. See #87226. i.e. the following fails with a sha256 error:

$ sudo nixos-rebuild switch --upgrade

I previously raised the PR #95860 to patch nixos-20.03 but I think the process is to patch master first and then cherry-pick to backport.

The shas were broken for 2.14.5.2 on nixos-20.03 because the urls where pointing directly at the current version of rescuetime. The same is the case on master which has shas for the 2.16.2.1 .deb files. e.g.

https://www.rescuetime.com/installers/rescuetime_current_amd64.deb

So, I've upgraded to the latest version, fixed the urls, and changed the sha256s.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/).
    NOTE: only able to test amd64 platform.
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot requested a review from cstrahan August 21, 2020 15:12
@danieldk
Copy link
Contributor

The hashes seem to be incorrect?

hash mismatch in fixed-output derivation '/nix/store/l80wmnhz5j1rxvppr944hl02bj2brjxb-rescuetime-installer.deb':
  wanted: sha256:05qs6wbc3705z8w9c3n83m4j8xfmzm673lyh5j95x1ak5czkrphk
  got:    sha256:1fjvbhqvjg36l0ywfyjpsnr077l8igspffn43d3b2i90q8inxwbp

@danieldk
Copy link
Contributor

The hashes seem to be incorrect?

Not sure what is happening. Seems fine now.

danieldk
danieldk suggested changes Aug 21, 2020
View reviewed changes
Copy link
Contributor

@danieldk danieldk left a comment

Choose a reason for hiding this comment

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

One small suggested change.

pkgs/applications/misc/rescuetime/default.nix Outdated Show resolved Hide resolved
@steshaw
Copy link
Member Author

steshaw commented Aug 22, 2020

@danieldk any idea how I can ensure that this gets backported to nixos-20.03? Should I raise another PR for that by cherry-picking these commits?

@steshaw
Copy link
Member Author

steshaw commented Aug 22, 2020

@danieldk I retested after applying your suggestion and discovered that I'd goofed the url. Essentially,

https://www.rescuetime.com/installers/rescuetime_2.16.3.1_amb64.deb # was this
https://www.rescuetime.com/installers/rescuetime_2.16.3.1_amd64.deb # now this

No doubt that was causing the issue with the hashes that you were seeing.

I've rebased the 3 commits to tidy up.

@danieldk
Copy link
Contributor

Seems like something went wrong with the rebase. rebased again ;).

danieldk
danieldk approved these changes Aug 22, 2020
View reviewed changes
Copy link
Contributor

@danieldk danieldk left a comment •
edited

Choose a reason for hiding this comment

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

Result of nixpkgs-review pr 95883 1

1 package built:
- rescuetime

Binary works.

@danieldk danieldk merged commit f93157a into NixOS:master Aug 22, 2020
@danieldk
Copy link
Contributor

@danieldk any idea how I can ensure that this gets backported to nixos-20.03? Should I raise another PR for that by cherry-picking these commits?

Made a PR for the backport #95964. Usually one of the release maintainers will pick it up in a couple of days. General procedure for backports: (1) get the change merged in master first; (2) create a new branch from the release-20.03 branch; (3) git cherry-pick -x the commit from master; (4) create a PR with release-20.03 as the target, prepend the PR decscription by the release (e.g. [20.03]).

@steshaw steshaw deleted the rescuetime-2.16.3.1 branch August 22, 2020 22:18
@steshaw
Copy link
Member Author

steshaw commented Aug 22, 2020

Result of nixpkgs-review pr 95883 1

@steshaw
Copy link
Member Author

steshaw commented Aug 22, 2020

Many thanks for your help, @danieldk 👍.

Any idea what happened with the rebase? What wrongness did you experience?

BTW, when I run

$ nix run nixpkgs.nixpkgs-review -c nixpkgs-review pr --post-result 95883

The only comment posted is as above. That's a bit barer than the comment you posted. I presume you used --post-result as well? You may have a later version of nixpkgs-review than me. Was the "package built... binary works" comment automatically generated?

When I previously ran the following according to the PR template, I didn't realise that I shouldn't have used wip as I'd already committed the change (as you would when you are raising a PR).

nix-shell -p nixpkgs-review --run "nixpkgs-review wip"

Perhaps the PR template may benefit from updating to recommend one of the following:

$ nix run nixpkgs.nixpkgs-review -c nixpkgs-review pr --post-result 95883

or

$ nix run nixpkgs.nixpkgs-review -c nixpkgs-review rev HEAD

Neither was I aware that I was dropped into a shell. Even after reading the nixpkgs-review documentation, I'm not sure what kind of testing I can do in that shell. There's no result soft-link and the rescuetime in PATH is just my system one /run/current-system/sw/bin/rescuetime.

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

@danieldk danieldk danieldk approved these changes

Assignees
No one assigned
Labels
6.topic: emacs 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: golang 6.topic: haskell 6.topic: nixos 6.topic: printing 6.topic: python 6.topic: qt/kde 6.topic: TeX Issues regarding texlive and TeX in general 6.topic: vim 8.has: changelog 8.has: documentation 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@steshaw @danieldk