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

broot: 0.10.2 -> 0.11.8 #77415

Merged
merged 3 commits into from Jan 13, 2020
Merged

broot: 0.10.2 -> 0.11.8 #77415

merged 3 commits into from Jan 13, 2020

Conversation

@evanjs
Copy link
Member

@evanjs evanjs commented Jan 10, 2020

Motivation for this change

Changes from 0.10.2 -> 0.11.8

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.
Notify maintainers

cc @magnetophon

@veprbl
Copy link
Member

@veprbl veprbl commented Jan 10, 2020

@GrahamcOfBorg build broot

@teh
Copy link
Contributor

@teh teh commented Jan 10, 2020

It looks like this tool has some hardcoded /bin paths [1] which don't work on NixOS.

[1]
https://github.com/Canop/broot/blob/d6d3face3677b133e04a515ef0816603733cf111/src/verb_store.rs#L94

@manveru
Copy link
Contributor

@manveru manveru commented Jan 10, 2020

0.11.5 is out already :)

@evanjs
Copy link
Member Author

@evanjs evanjs commented Jan 10, 2020

0.11.5 is out already :)

Gah. I'll bump this then.


Before that, @teh (or anybody with input), what about something like this?

+  postPatch = ''
+    substituteInPlace src/verb_store.rs \
+      --replace '/bin/cp' "${coreutils}/bin/cp" \
+      --replace '/bin/mkdir' "${coreutils}/bin/mkdir" \
+      --replace '/bin/mv' "${coreutils}/bin/mv" \
+      --replace '/bin/rm' "${coreutils}/bin/rm"
+  '';

There are hardlinks in the docs as well, but I don't know if we need to worry about those.

@manveru
Copy link
Contributor

@manveru manveru commented Jan 10, 2020

I'd recommend something like this:

  postPatch = ''
    substituteInPlace src/verb_store.rs --replace '"/bin/' '"${coreutils}/bin/'
  '';
@evanjs
Copy link
Member Author

@evanjs evanjs commented Jan 10, 2020

I'd recommend something like this:

  postPatch = ''
    substituteInPlace src/verb_store.rs --replace '"/bin/' '"${coreutils}/bin/'
  '';

Derp. Good call.

Just the additional version bump and hardlinks for now, then?

@manveru
Copy link
Contributor

@manveru manveru commented Jan 10, 2020

Yeah, it works fine for me so far with this patch.

@evanjs evanjs changed the title broot: 0.10.2 -> 0.11.4 broot: 0.10.2 -> 0.11.5 Jan 10, 2020
@magnetophon
Copy link
Member

@magnetophon magnetophon commented Jan 11, 2020

lol, we're up to 0.11.6 now!

@evanjs evanjs changed the title broot: 0.10.2 -> 0.11.5 broot: 0.10.2 -> 0.11.6 Jan 11, 2020
@evanjs
Copy link
Member Author

@evanjs evanjs commented Jan 11, 2020

lol, we're up to 0.11.6 now!

That had better be the last update for now 😜

@magnetophon
Copy link
Member

@magnetophon magnetophon commented Jan 11, 2020

No such luck.
This version fixes the dangerous bug #104. People using a previous version must upgrade.

@evanjs evanjs force-pushed the evanjs:feature/broot-0.11.4 branch 2 times, most recently from 5b0666f to 84ecd8a Jan 11, 2020
@evanjs evanjs changed the title broot: 0.10.2 -> 0.11.6 broot: 0.10.2 -> 0.11.7 Jan 11, 2020
@evanjs
Copy link
Member Author

@evanjs evanjs commented Jan 11, 2020

Cleaned, squased, rebased, etc.
Let me know if you guys can think of anything else.
Thanks for keeping me up to date!

@marsam marsam mentioned this pull request Jan 12, 2020
evanjs added 3 commits Jan 11, 2020
- add installShellFiles dependency
@evanjs evanjs force-pushed the evanjs:feature/broot-0.11.4 branch from 84ecd8a to ba820a4 Jan 12, 2020
@evanjs evanjs changed the title broot: 0.10.2 -> 0.11.7 broot: 0.10.2 -> 0.11.8 Jan 12, 2020
@evanjs
Copy link
Member Author

@evanjs evanjs commented Jan 12, 2020

Added shell completion scripts per Canop/broot@16a9cba and bumped to v0.11.8.
Feel free to let me know if there's a cleaner way to determine $OUT_DIR.

@marsam marsam merged commit 118da86 into NixOS:master Jan 13, 2020
15 checks passed
15 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
broot on aarch64-linux Success
Details
broot on x86_64-linux Success
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@evanjs evanjs deleted the evanjs:feature/broot-0.11.4 branch Feb 13, 2020
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

6 participants
You can’t perform that action at this time.