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:
parent
161122ffee
commit
fae3c6fb9e
|
@ -1,5 +1,13 @@
|
|||
{ stdenv, fetchurl, makeDesktopItem, jre, makeWrapper }:
|
||||
{
|
||||
stdenv
|
||||
, makeWrapper
|
||||
, makeDesktopItem
|
||||
, fetchurl
|
||||
, jre
|
||||
}:
|
||||
|
||||
let
|
||||
generic = { version, sha256, ... }@attrs:
|
||||
let
|
||||
desktopItem = makeDesktopItem {
|
||||
categories = "Network;Development;WebDevelopment;Java;";
|
||||
|
@ -12,15 +20,15 @@ let
|
|||
startupNotify = "true";
|
||||
};
|
||||
|
||||
attrs' = builtins.removeAttrs attrs ["version" "sha256"];
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "charles-${version}";
|
||||
version = "4.2.7";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.charlesproxy.com/assets/release/${version}/charles-proxy-${version}.tar.gz";
|
||||
sha256 = "1nycw3wpbfwj4ijjaq5k0f4xipj8j605fs0yjzgl66gmv7r583rd";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
|
@ -45,4 +53,16 @@ in stdenv.mkDerivation rec {
|
|||
license = stdenv.lib.licenses.unfree;
|
||||
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";
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
@ -958,7 +958,11 @@ in
|
|||
|
||||
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 { };
|
||||
|
||||
|
|
Loading…
Reference in New Issue