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

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

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.
version = "0.6.2";
sha256 = "05niv9rivd3j3cwcx3n3vjr85wr0l5i76giq9n54d2vdwmn8qjib";
version = "0.6.3";
hash = "sha256-brEjr7lhmKDCIDeLq+XP+ZTxv1RvwoUlszMSEYygxv8=";
Copy link
Member

@mweinelt mweinelt Oct 11, 2020

Any particular reason those two are outside stdenv.mkDerivation?

Copy link
Contributor Author

@priegger priegger Oct 12, 2020

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

@priegger priegger Oct 12, 2020

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

@mweinelt
Copy link
Member

@mweinelt mweinelt commented Oct 11, 2020

Result of nixpkgs-review pr 100257 1

1 package built:
  • bees

Copy link
Member

@mweinelt mweinelt left a comment

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
@priegger priegger force-pushed the feature/update-bees branch from 2ed459a to a636683 Oct 12, 2020
@@ -58,7 +55,7 @@ let

in

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

@mweinelt mweinelt Oct 12, 2020

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

Copy link
Contributor Author

@priegger priegger Nov 20, 2020

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 Oct 13, 2020
@priegger priegger force-pushed the feature/update-bees branch from 322e798 to 104322f Nov 20, 2020
@priegger priegger requested a review from mweinelt Nov 20, 2020
@mweinelt mweinelt requested a review from charles-dyfis-net Nov 20, 2020
@mweinelt
Copy link
Member

@mweinelt mweinelt commented Nov 20, 2020

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

@charles-dyfis-net charles-dyfis-net commented Nov 21, 2020

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
19 checks passed
19 checks passed
@github-actions[bot]
tests tests
Details
@github-actions[bot]
action action
Details
@ofborg[bot]
Evaluation Performance Report Evaluator Performance Report
Details
@github-actions[bot]
Wait for ofborg
Details
@ofborg[bot]
bees, bees.passthru.tests on aarch64-linux Success
Details
@ofborg[bot]
bees, bees.passthru.tests on x86_64-linux Success
Details
@ofborg[bot]
grahamcofborg-eval ^.^!
Details
@ofborg[bot]
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
@ofborg[bot]
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
@ofborg[bot]
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="104322f"; rev="104322f04d311eaed6ee69c2a022abc4a18a4db1"; } ./pkgs/t
Details
@ofborg[bot]
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
@ofborg[bot]
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="104322f"; rev="104322f04d311eaed6ee69c2a022abc4a18a4db1"; } ./nixos/
Details
@ofborg[bot]
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="104322f"; rev="104322f04d311eaed6ee69c2a022abc4a18a4db1"; } ./nixos/
Details
@ofborg[bot]
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="104322f"; rev="104322f04d311eaed6ee69c2a022abc4a18a4db1"; } ./nixos/
Details
@ofborg[bot]
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="104322f"; rev="104322f04d311eaed6ee69c2a022abc4a18a4db1"; } ./pkgs/t
Details
@ofborg[bot]
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="104322f"; rev="104322f04d311eaed6ee69c2a022abc4a18a4db1"; } ./pkgs/t
Details
@ofborg[bot]
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="104322f"; rev="104322f04d311eaed6ee69c2a022abc4a18a4db1"; } ./pkgs/t
Details
@ofborg[bot]
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
@ofborg[bot]
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants