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

onionshare: init at 2.2 #85765

Merged
merged 2 commits into from May 4, 2020
Merged

onionshare: init at 2.2 #85765

merged 2 commits into from May 4, 2020

Conversation

@lourkeur
Copy link
Contributor

lourkeur commented Apr 22, 2020

Motivation for this change

Meet #83029

Things done
  • Add derivation
  • Add myself as maintainer
  • Link derivation in pkgs/top-level
  • 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.
patches = [ ./fix-paths.patch ];

# replace @tor@, @obfs4@, @geoip@ w/ store paths.
inherit tor obfs4;
inherit (tor) geoip;
postPatch = "substituteAllInPlace onionshare/common.py";
Comment on lines 72 to 77

This comment has been minimized.

Copy link
@cole-h

cole-h Apr 22, 2020

Member

This should work as-is, but please test first... I've been known to make mistakes.

Suggested change
patches = [ ./fix-paths.patch ];
# replace @tor@, @obfs4@, @geoip@ w/ store paths.
inherit tor obfs4;
inherit (tor) geoip;
postPatch = "substituteAllInPlace onionshare/common.py";
patches = [
(substituteAll {
src = ./fix-paths.patch;
inherit tor obfs4;
inherit (tor) geoip;
})
];

This comment has been minimized.

Copy link
@lourkeur

lourkeur Apr 22, 2020

Author Contributor

That breaks my code: the patch references @out@.

This comment has been minimized.

Copy link
@lourkeur

lourkeur Apr 22, 2020

Author Contributor

What is the goal of your requested change?

This comment has been minimized.

Copy link
@cole-h

cole-h Apr 22, 2020

Member

The goal is to make it look less cluttered and follow the soft standard of what happens in most other packages.

To deal with @out@, the best way would be to keep postPatch, but change it to substituteInPlace onionshare/common.py --subst-var out.

This comment has been minimized.

Copy link
@lourkeur

lourkeur Apr 22, 2020

Author Contributor

gotcha

@lourkeur lourkeur force-pushed the lourkeur:init_onionshare branch from 21f7deb to ffb41f8 Apr 22, 2020
@emmanuelrosa
Copy link
Contributor

emmanuelrosa commented Apr 23, 2020

It worked for me.

@lourkeur lourkeur requested a review from cole-h Apr 23, 2020
@filalex77
Copy link
Contributor

filalex77 commented Apr 23, 2020

Successfully shared a file. Didn't test GUI.

Result of nixpkgs-review pr 85765 1

2 packages built:
- onionshare
- onionshare-gui
@cole-h
cole-h approved these changes Apr 23, 2020
Copy link
Member

cole-h left a comment

Result of nixpkgs-review pr 85765 1

2 packages built:
- onionshare
- onionshare-gui

I ran onionshare-gui, which connected me to Tor. Clicking the Test connection to Tor button did what it says on the tin.

@ehmry ehmry merged commit dd5d696 into NixOS:master May 4, 2020
16 checks passed
16 checks passed
Evaluation Performance Report Evaluator Performance Report
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="ffb41f8"; rev="ffb41f8cf9ca4e45714fe84e12799e88c36f2e2f"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ffb41f8"; rev="ffb41f8cf9ca4e45714fe84e12799e88c36f2e2f"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ffb41f8"; rev="ffb41f8cf9ca4e45714fe84e12799e88c36f2e2f"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ffb41f8"; rev="ffb41f8cf9ca4e45714fe84e12799e88c36f2e2f"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ffb41f8"; rev="ffb41f8cf9ca4e45714fe84e12799e88c36f2e2f"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ffb41f8"; rev="ffb41f8cf9ca4e45714fe84e12799e88c36f2e2f"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ffb41f8"; rev="ffb41f8cf9ca4e45714fe84e12799e88c36f2e2f"; } ./pkgs/t
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
onionshare, onionshare.passthru.tests on aarch64-linux Success
Details
onionshare, onionshare.passthru.tests on x86_64-linux Success
Details
@lourkeur lourkeur deleted the lourkeur:init_onionshare branch May 4, 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

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