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

Jump to bottom

bees: 0.6.2 -> 0.6.3 #100257

Merged
merged 2 commits into from Nov 21, 2020
Merged

bees: 0.6.2 -> 0.6.3 #100257

merged 2 commits into from Nov 21, 2020

Conversation

priegger
Copy link
Contributor

@priegger priegger commented Oct 11, 2020 •
edited

Motivation for this change

Update bees to the latest version: https://github.com/Zygo/bees/releases

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/)
  • 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.

mweinelt
mweinelt reviewed Oct 11, 2020
View reviewed changes
pkgs/tools/filesystems/bees/default.nix Outdated
version = "0.6.2";
sha256 = "05niv9rivd3j3cwcx3n3vjr85wr0l5i76giq9n54d2vdwmn8qjib";
version = "0.6.3";
hash = "sha256-brEjr7lhmKDCIDeLq+XP+ZTxv1RvwoUlszMSEYygxv8=";
Copy link
Member

Choose a reason for hiding this comment

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

Any particular reason those two are outside stdenv.mkDerivation?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I guess it's to have the "moving parts" together and at the file (it was like this before). What's your recommendation/preference?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I added a second commit fixing this. I can squash the commits, if that's preferred.

@mweinelt
Copy link
Member

Result of nixpkgs-review pr 100257 1

1 package built:
  • bees

mweinelt
mweinelt reviewed Oct 12, 2020
View reviewed changes
Copy link
Member

@mweinelt mweinelt left a comment

Choose a reason for hiding this comment

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

This is how I usually see it done.

pkgs/tools/filesystems/bees/default.nix Outdated Show resolved Hide resolved
pkgs/tools/filesystems/bees/default.nix Show resolved Hide resolved
mweinelt
mweinelt reviewed Oct 12, 2020
View reviewed changes
pkgs/tools/filesystems/bees/default.nix
@@ -58,7 +55,7 @@ let

in

runCommand "bees-service-${version}" {
Copy link
Member

Choose a reason for hiding this comment

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

Hm, I wonder what the point of this was. This would explain why it was outside of stdenv.mkDerivation.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes. I dropped the version here in a separate commit. I'd rather drop it from the PR and keep version and hash outside of stdenv.mkDerivation, but both is perfectly fine for me.

@priegger priegger force-pushed the feature/update-bees branch 2 times, most recently from 1e73599 to 322e798 Compare October 13, 2020 20:30
@mweinelt
Copy link
Member

I'm rolling out that change locally to test it. Meanwhile the actual maintainer @charles-dyfis-net should do a review.

@charles-dyfis-net
Copy link
Contributor

I'm rolling out that change locally to test it. Meanwhile the actual maintainer @charles-dyfis-net should do a review.

LGTM! (Thank you for taking care of this -- my apologies for not catching the release and doing the update myself; I've been running a build off master, and thus wasn't watching the stable branch closely).

@mweinelt mweinelt merged commit 65c4e25 into NixOS:master Nov 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@charles-dyfis-net charles-dyfis-net charles-dyfis-net approved these changes

@mweinelt mweinelt Awaiting requested review from mweinelt

Assignees
No one assigned
Labels
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
3 participants
@priegger @mweinelt @charles-dyfis-net