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

charles: init at 4.2.6 #43502

Merged
merged 7 commits into from Jul 14, 2018
Merged

charles: init at 4.2.6 #43502

merged 7 commits into from Jul 14, 2018

Conversation

kalbasit
Copy link
Member

Motivation for this change

Charles is an HTTP proxy / HTTP monitor / Reverse Proxy that enables a developer to view all of the HTTP and SSL / HTTPS traffic between their machine and the Internet. This includes requests, responses and the HTTP headers (which contain the cookies and caching information).

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

@@ -3718,7 +3720,7 @@ with pkgs;
lzip = callPackage ../tools/compression/lzip { };

luxcorerender = callPackage ../tools/graphics/luxcorerender { };

Copy link
Member

Choose a reason for hiding this comment

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

While I hate trailing whitespace could you remove these changes from this PR?

Copy link
Member Author

Choose a reason for hiding this comment

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

@adisbladis done, PTAL.

done
done

install -D -m644 doc/licenses/bounce-license.txt \
Copy link
Member

Choose a reason for hiding this comment

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

Are licenses really required in the output?

Copy link
Member Author

@kalbasit kalbasit Jul 14, 2018

Choose a reason for hiding this comment

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

I was not sure how NixOS deals with licenses, so I removed it.

mkdir -p $out/share/applications
ln -s ${desktopItem}/share/applications/* $out/share/applications/

for dim in 16x16 32x32 64x64 128x128 256x256 512x512; do
Copy link
Member

Choose a reason for hiding this comment

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

Why not something like:

for dim in icon/*; do
  dim=$(basename $dim)
done

Then we don't have to track resolutions in the nix expression.

Copy link
Member Author

Choose a reason for hiding this comment

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

My bad, I did not go through the details much, copied this from AUR. I'll clean it up right away.

};

installPhase = ''
set -e
Copy link
Member

Choose a reason for hiding this comment

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

-e is already implicit in nix builds

for dim in 16x16 32x32 64x64 128x128 256x256 512x512; do
install -D -m644 icon/$dim/apps/charles-proxy.png \
$out/share/icons/hicolor/$dim/apps/charles.png
for mimetype in application-har+json.png application-vnd.tcpdump.pcap.png application-x-charles-savedsession.png application-x-charles-trace.png; do
Copy link
Member

Choose a reason for hiding this comment

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

Can we do something similar here? It seems brittle to manually track these files.

@kalbasit
Copy link
Member Author

@adisbladis PTAL.

Also, the icons are named charles-proxy, but the binary is named charles. I was at odds with the derivation name and decided to go with charles to avoid the dash. Do you have an opinion on the name?

@kalbasit
Copy link
Member Author

@volth PTAL

@adisbladis
Copy link
Member

Hmm.. I just noticed that this is trialware. I don't know what the stance on such packages is within nixpkgs?

@adisbladis
Copy link
Member

Ok then I guess it's fine.

@adisbladis adisbladis merged commit e8ec91b into NixOS:master Jul 14, 2018
@kalbasit kalbasit deleted the add-charles branch July 14, 2018 17:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants