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

charles: made charles 4.x/3.x available (#56159) 

Charles proxy requires a license and each license is bound to the major release version. Therefore it makes sense to make the previous version available to the users. This change provides two new packages `charles3` and `charles4` and `charles` is now an alias for `charles4`.
This commit is contained in:
eyJhb 2019-02-23 22:33:22 +01:00 committed by Wael Nasreddine
parent 161122ffee
commit fae3c6fb9e
2 changed files with 67 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,13 @@
{ stdenv, fetchurl, makeDesktopItem, jre, makeWrapper }: {
stdenv
, makeWrapper
, makeDesktopItem
, fetchurl
, jre
}:
let
generic = { version, sha256, ... }@attrs:
let let
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
categories = "Network;Development;WebDevelopment;Java;"; categories = "Network;Development;WebDevelopment;Java;";
@ -12,15 +20,15 @@ let
startupNotify = "true"; startupNotify = "true";
}; };
attrs' = builtins.removeAttrs attrs ["version" "sha256"];
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "charles-${version}"; name = "charles-${version}";
version = "4.2.7"; 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}.tar.gz";
sha256 = "1nycw3wpbfwj4ijjaq5k0f4xipj8j605fs0yjzgl66gmv7r583rd"; inherit sha256;
}; };
buildInputs = [ makeWrapper ]; buildInputs = [ makeWrapper ];
installPhase = '' installPhase = ''
@ -45,4 +53,16 @@ in stdenv.mkDerivation rec {
license = stdenv.lib.licenses.unfree; license = stdenv.lib.licenses.unfree;
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
}; };
};
in rec {
charles4 = (generic {
version = "4.2.7";
sha256 = "1nycw3wpbfwj4ijjaq5k0f4xipj8j605fs0yjzgl66gmv7r583rd";
});
charles3 = (generic {
version = "3.12.3";
sha256 = "13zk82ny1w5zd9qcs9qkq0kdb22ni5byzajyshpxdfm4zv6p32ss";
});
} }

6
pkgs/top-level/all-packages.nix
View File

@ -958,7 +958,11 @@ in
bluemix-cli = callPackage ../tools/admin/bluemix-cli { }; bluemix-cli = callPackage ../tools/admin/bluemix-cli { };
charles = callPackage ../applications/networking/charles { }; charles = charles4;
inherit (callPackage ../applications/networking/charles {})
charles3
charles4
;
libqmatrixclient = libsForQt5.callPackage ../development/libraries/libqmatrixclient { }; libqmatrixclient = libsForQt5.callPackage ../development/libraries/libqmatrixclient { };