public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #117939 from victorluft/charlesupg

Browse Source 
charles: 4.2.8 -> 4.6.1
This commit is contained in:
Sandro 2021-04-02 18:47:34 +02:00 committed by GitHub
commit caf1b4f3b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/applications/networking/charles/default.nix
View File

@ -3,11 +3,12 @@ lib, stdenv
, makeWrapper , makeWrapper
, makeDesktopItem , makeDesktopItem
, fetchurl , fetchurl
, jdk11
, jdk8 , jdk8
}: }:
let let
generic = { version, sha256, ... }@attrs: generic = { version, sha256, platform ? "", jdk, ... }@attrs:
let let
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
categories = "Network;Development;WebDevelopment;Java;"; categories = "Network;Development;WebDevelopment;Java;";
@ -25,13 +26,13 @@ let
inherit version; inherit version;
src = fetchurl { src = fetchurl {
url = "https://www.charlesproxy.com/assets/release/${version}/charles-proxy-${version}.tar.gz"; url = "https://www.charlesproxy.com/assets/release/${version}/charles-proxy-${version}${platform}.tar.gz";
inherit sha256; inherit sha256;
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
installPhase = '' installPhase = ''
makeWrapper ${jdk8.jre}/bin/java $out/bin/charles \ makeWrapper ${jdk}/bin/java $out/bin/charles \
--add-flags "-Xmx1024M -Dcharles.config='~/.charles.config' -jar $out/share/java/charles.jar" --add-flags "-Xmx1024M -Dcharles.config='~/.charles.config' -jar $out/share/java/charles.jar"
for fn in lib/*.jar; do for fn in lib/*.jar; do
@ -56,12 +57,15 @@ let
in { in {
charles4 = (generic { charles4 = (generic {
version = "4.2.8"; version = "4.6.1";
sha256 = "1jzjdhzxgrq7pdfryfkg0hsjpyni14ma4x8jbdk1rqll78ccr080"; sha256 = "1kl83jjj5wjhdpj34gcj04vf1asxlqlfx9zi91ln4v90swlaaclv";
platform = "_amd64";
jdk = jdk11;
}); });
charles3 = (generic { charles3 = (generic {
version = "3.12.3"; version = "3.12.3";
sha256 = "13zk82ny1w5zd9qcs9qkq0kdb22ni5byzajyshpxdfm4zv6p32ss"; sha256 = "13zk82ny1w5zd9qcs9qkq0kdb22ni5byzajyshpxdfm4zv6p32ss";
jdk = jdk8.jre;
}); });
} }