treewide: fetchCargoVendor: inherit pname+version

This commit is contained in:
Peder Bergebakken Sundt 2025-05-30 04:18:04 +02:00 committed by Alyssa Ross
parent 728fa078d4
commit 5b38d1d2a6
70 changed files with 85 additions and 141 deletions

View file

@ -40,8 +40,7 @@ clangStdenv.mkDerivation rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-USfC7HSL1TtjP1SmBRTKkPyKE4DkSn6xeH4mzfIBQWg=";
};

View file

@ -31,8 +31,7 @@ buildPythonApplication rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-hZQfzaLvHSN/hGR5vn+/2TRH6GwDTTp+UcnePXY7JlM=";
};

View file

@ -33,8 +33,7 @@ stdenv.mkDerivation rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-Nj5MkYDeYUzgqegCbPt/XofSCw8ULFXAD7XHNecPznc=";
};

View file

@ -42,8 +42,7 @@ stdenv.mkDerivation rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
name = "${pname}-${version}";
inherit src;
inherit pname version src;
hash = "sha256-VKGc4LQjt2FHbELLBKtV8rKpxjGBrzlA3m9BSdZ/6Z0=";
};

View file

@ -33,8 +33,7 @@ stdenv.mkDerivation rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-zZc2+0oskptpWZE4fyVcR4QHxqzpj71GXMXNXMK4an0=";
};

View file

@ -31,8 +31,7 @@ stdenv.mkDerivation rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-yEpaQa9hKOq0k9MurihbFM4tDB//TPCJdOgKA9tyqVc=";
};

View file

@ -30,8 +30,7 @@ stdenv.mkDerivation rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-CsISaVlRGtVVEna1jyGZo/IdWcJdwHJv6LXcXYha2UE=";
};

View file

@ -25,8 +25,7 @@ stdenv.mkDerivation rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-g6PRGHrkHA0JTekKaQs+8mtyOCj99m0zPbgP8AnP7GU=";
};

View file

@ -39,8 +39,7 @@ stdenv.mkDerivation rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-H8sv7faI/qbmcP7ir++/vIpN+cvRQ254rXmAvGyjdsY=";
};

View file

@ -35,8 +35,7 @@ stdenv.mkDerivation rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-i77LHbaAURxWrEpuR40jRkUGPk8wZR+q3DB+rzH3sEc=";
};

View file

@ -28,8 +28,7 @@ stdenv.mkDerivation rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-5cohhm8/QP+vYzVf8iz3hLtu0ej7lQiHpDAC9I52+ME=";
};

View file

@ -29,8 +29,7 @@ stdenv.mkDerivation rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-eR1ZGtTZQNhofFUEjI7IX16sMKPJmAl7aIFfPJukecg=";
};

View file

@ -29,8 +29,7 @@ stdenv.mkDerivation rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-rwhhbEaUg7IiszmJUFh4vQV7cYyyh3tqr1z4QgmwIDY=";
};

View file

@ -25,8 +25,7 @@ stdenv.mkDerivation rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-ATEm7RYfW9nYtTDAx580tvokVUIS7BL9mA65aEeJJvk=";
};

View file

@ -33,8 +33,7 @@ stdenv.mkDerivation rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-3LYoNQquYbyiEd9ZXRr4UPIcl3gultsBYWCWaCYshwQ=";
};

View file

@ -38,8 +38,7 @@ mkYarnPackage rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = data.cargoHash;
};

View file

@ -28,8 +28,7 @@ python3.pkgs.buildPythonApplication rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-Gq3QvQSRfxRovzuvdboLCheNuMW58GFO9x2N2os+p38=";
};

View file

@ -30,8 +30,7 @@ stdenv.mkDerivation rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-hnv4XXsx/kmhH4YUTdTvvxxjbguHBx3TnUKacGwnCTw=";
};

View file

@ -28,8 +28,7 @@ stdenv.mkDerivation rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-RuzqU06iyK+IN7aO+Lq/IaRLh2oFpWM1rz69Koiicgg=";
};

View file

@ -31,8 +31,7 @@ stdenv.mkDerivation rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-mn3Jl5XEHYbCCFjLd8TBqtZKEdevH95IWKdgHwAtXk0=";
};

View file

@ -39,8 +39,7 @@ stdenv.mkDerivation rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-DBWg9Xss1ChbPyI3MiN7eTXhSUG37ZaYS/HFxou9d/w=";
};

View file

@ -36,8 +36,7 @@ stdenv.mkDerivation rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "squeekboard-${version}";
inherit pname version src;
hash = "sha256-3K1heokPYxYbiAGha9TrrjQXguzGv/djIB4eWa8dVjg=";
};

View file

@ -30,8 +30,12 @@ stdenv.mkDerivation {
;
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src sourceRoot;
name = "${pname}-${version}";
inherit
pname
version
src
sourceRoot
;
hash = "sha256-9jMy23VD+C87hg/TMXGbzAoqx76dhVOkWcQNudSwsYA=";
};

View file

@ -29,8 +29,7 @@ stdenv.mkDerivation rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-D9gchFS5zrD1cttq/gveT7wY2Y/5hfiUrwBa7qHD9cs=";
};

View file

@ -32,8 +32,7 @@ stdenv.mkDerivation rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-j0A6HlApV0l7LuB7ISHp+k/bSH5Icdv+aNQ9juCCO9I=";
};

View file

@ -29,8 +29,7 @@ stdenv.mkDerivation rec {
useFetchCargoVendor = true;
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-S+JW6OvmB9vj9cR9/qnw5EIECjpD8JPhxfgwDEEtlC0=";
};

View file

@ -37,9 +37,8 @@ buildPythonPackage rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
inherit pname version src;
sourceRoot = "${src.name}/aardwolf/utils/rlers";
name = "${pname}-${version}";
hash = "sha256-doBraJQtekrO/ZZV9KFz7BdIgBVVWtQztUS2Gz8dDdA=";
};

View file

@ -44,8 +44,7 @@ buildPythonPackage rec {
'';
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-fetJX6HQxRZ/Az7rJeU9S+s8ttgNPnJEvTLfzGt4xjk=";
};

View file

@ -24,8 +24,7 @@ buildPythonPackage rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-uB3r6+Ewpi4dVke/TsCZltfc+ZABYLOLKuNxw+Jfu/M=";
};

View file

@ -33,9 +33,8 @@ buildPythonPackage rec {
cargoRoot = "src/_bcrypt";
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
inherit pname version src;
sourceRoot = "${pname}-${version}/${cargoRoot}";
name = "${pname}-${version}";
hash = "sha256-HgHvfMBspPsSYhllnKBg5XZB6zxFIqJj+4//xKG8HwA=";
};

View file

@ -64,8 +64,7 @@ buildPythonPackage rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-ZtCTg8qNCiqlH7RsZxaWUNAoazdgmXP2GtpjDpRdvbk=";
};

View file

@ -21,8 +21,7 @@ buildPythonPackage rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-Ohbeavkayl6vMyYX9kVVLRddvVB9gWOxfzdWAOg+gac=";
};

View file

@ -35,12 +35,11 @@ buildPythonPackage rec {
# call `cargo build --release` in bindings/python and copy the
# resulting lock file
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
inherit pname version src;
postPatch = ''
cd bindings/python
ln -s ${./Cargo.lock} Cargo.lock
'';
name = "${pname}-${version}";
hash = "sha256-4zi29ZdALummwcWxYqDDEPAjKptmLqyYUJzWMrEK4os=";
};

View file

@ -40,8 +40,7 @@ buildPythonPackage rec {
];
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-tFOZJFrNge3N+ux2Hp4Mlm9K/AXYxuuBzEQdQYGGDjg=";
inherit patches;
};

View file

@ -24,8 +24,7 @@ buildPythonPackage rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-IqV4BsLE+5Dk3ey4M+h5wxR/SToZTLf8vU0BlWU5e8c=";
};

View file

@ -31,8 +31,7 @@ buildPythonPackage {
];
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-9Vap8E71TkBIf4eIB2lapUqcMukdsHX4LR7U8AD77SU=";
};

View file

@ -21,8 +21,12 @@ buildPythonPackage rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src sourceRoot;
name = "${pname}-${version}";
inherit
pname
version
src
sourceRoot
;
hash = "sha256-97aEuXdq9oEqYJs6sgQU5a0vAMJmWJzu2WGjOqzxZ4c=";
};

View file

@ -28,9 +28,7 @@ buildPythonPackage rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-cUv0CT8d6Nxjzh/S/hY9jcpeFX/5KvBxSkqOkt4htyU=";
};

View file

@ -24,8 +24,7 @@ buildPythonPackage rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-Ppc+6ex3yLC4xuhbZGZDKLqxDjSdGpgrLDpbbbqMgPY=";
};

View file

@ -28,8 +28,7 @@ buildPythonPackage rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-O4aKqVSShFpt8mdZkY3WV55j9CIczRSRkIMC7dJoGv0=";
};

View file

@ -26,8 +26,7 @@ buildPythonPackage rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-CW95omstpWm76TTSKsb04iChU0EW1Vl+OA3QXxfZAX0=";
};

View file

@ -29,8 +29,7 @@ buildPythonPackage rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-V1z16GKaSQVjp+stWir7kAO2wsnOYPdhKi4KzIKmKx8=";
};

View file

@ -25,8 +25,7 @@ buildPythonPackage rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-LNT2wQnOaVMBrI+fW6wbIRaTYPvw3ESinI5KY8wjp1o=";
};

View file

@ -24,8 +24,7 @@ buildPythonPackage rec {
];
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-51qJAcJvolYCW3XWeymc2xd2QHiKLd7MdRdDedEH8QY=";
};

View file

@ -20,8 +20,7 @@ buildPythonPackage rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-2AR9slC/vWv5Ump1DLE2em8LLSTXHVkI/PBW5PxCXXg=";
};

View file

@ -19,8 +19,7 @@ buildPythonPackage rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-NLPei6ajR55mLyFhsjzUpXB/TsqqeDvP8yKE74t0ufk=";
};

View file

@ -23,8 +23,7 @@ buildPythonPackage {
disabled = pythonOlder "3.8";
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-1Ytca/GiHidR8JOcz+DydN6N/iguLchbP8Wnrd/0NTk=";
};

View file

@ -25,8 +25,7 @@ buildPythonPackage rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
name = "${pname}-${version}";
inherit src;
inherit pname version src;
hash = "sha256-3UBQJfMPVo37V7mJnN9loF1+vKh3JxFJWgynwsOnAg4=";
};

View file

@ -42,8 +42,7 @@ buildPythonPackage rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-ZUBrZqdesy0qKaxuD5gSlq7qOoXWn0aZNOidUb0grMM=";
};

View file

@ -21,8 +21,7 @@ buildPythonPackage rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-91p0eoVRzc9S8pHRhAlRey4k4jW9IMttiH+9Joh91IQ=";
};

View file

@ -72,8 +72,7 @@ buildPythonPackage rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-iPf25DMGNHrWYByNTylB6bPpLfzs0ADwgkjfhVxiiXA=";
};

View file

@ -22,8 +22,7 @@ buildPythonPackage rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-OSnPGRZwuAzcvu80GgTXdc740SfhDIsXrQZq9a/BCdE=";
};

View file

@ -40,8 +40,7 @@ buildPythonPackage rec {
'';
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-Qep5YD4LQ+r118L5H+hUqeS00SibyvsbtLWDrJJBNc0=";
};

View file

@ -22,8 +22,7 @@ buildPythonPackage rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-9kKHLYD0tXMGJFhsCBgO/NpWB4J5QZh0qKIuI3PFn2c=";
};

View file

@ -17,8 +17,7 @@ buildPythonPackage rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-cq55j3wNcV8CRbnqZPV8zrRzvUud5RXJDX1oh7WZoiU=";
};

View file

@ -20,8 +20,7 @@ buildPythonPackage rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-Oqtva9cTHAcuOXr/uPbqZczDbPVr0zeIEr5p6PoJ610=";
};

View file

@ -26,8 +26,7 @@ buildPythonPackage rec {
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-B652Bfanw51e+U6rHukWtfdr7bjoWDUx/nUczDwyzZk=";
};

View file

@ -25,8 +25,7 @@ buildPythonPackage rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-/elui0Rf3XwvD2jX+NGoJgf9S3XSp16qzdwkGZbKaZg=";
};

View file

@ -24,8 +24,7 @@ buildPythonPackage rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-9OgUuuMuo2l4YsZMhBZJBqKqbNwj1W4yidoogjcNgm8=";
};

View file

@ -31,8 +31,7 @@ buildPythonPackage rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-DnJ0RFc03+rBg7yNdezgb/YuoQr3RKj+NeMyin/kSRk=";
};

View file

@ -24,8 +24,7 @@ buildPythonPackage rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-0U1ELUMh4YV6M+zrrZGuzvY8SdgyN66F7bJ6sMhOdXs=";
};

View file

@ -42,8 +42,12 @@ buildPythonPackage {
];
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src postPatch;
name = "${pname}-${version}";
inherit
pname
version
src
postPatch
;
hash = "sha256-MfTTRbSM+KgrYrWHYlJkGDc1qn3oulalDJM+huTaJ0g=";
};

View file

@ -21,8 +21,7 @@ buildPythonPackage rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-75jtur5rmG4zpNXSE3OpPVR+/lf4SICsh+kgzIKfbd4=";
};

View file

@ -26,8 +26,7 @@ buildPythonPackage rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-bcO+irLT4Sy8IZ/YQZFD2jVjZAUCO0j+TitigHo4xbM=";
};

View file

@ -38,8 +38,7 @@ let
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = cargoHash;
};

View file

@ -22,8 +22,7 @@ buildPythonPackage rec {
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
inherit pname version src;
hash = "sha256-Wh25tLOVhAYFLqjOrKSu4klB1hGSOMconC1xZG31Dbw=";
};

View file

@ -27,8 +27,7 @@ buildPythonPackage rec {
];
cargoDeps = rustPlatform.fetchCargoVendor {
name = "${pname}-${version}";
inherit src;
inherit pname version src;
hash = "sha256-WkaTEoVQVOwxcTyOIG5oHEvcv65fBEpokl3/6SxqiUw=";
};

View file

@ -14,8 +14,7 @@ mkKdeDerivation rec {
cargoRoot = "agent/rs/htmlparser";
cargoDeps = rustPlatform.fetchCargoVendor {
# include version in the name so we invalidate the FOD
name = "${pname}-${version}";
inherit pname version;
src = sources.${pname};
sourceRoot = "${pname}-${version}/${cargoRoot}";
hash = "sha256-hdm4LfQcs4TTfBLzlZYJ0uzqfLxMXuYQExLGJg81W2U=";

View file

@ -14,8 +14,7 @@ mkKdeDerivation rec {
inherit (sources.${pname}) version;
cargoDeps = rustPlatform.fetchCargoVendor {
# include version in the name so we invalidate the FOD
name = "${pname}-${version}";
inherit pname version;
src = sources.${pname};
hash = "sha256-FgzmWw8FZb+DNSf2n6H14Rq07+x1LzG9hX4hFetuqDw=";
};

View file

@ -17,8 +17,7 @@ mkKdeDerivation rec {
cargoRoot = "plugins/webengineurlinterceptor/adblock";
cargoDeps = rustPlatform.fetchCargoVendor {
# include version in the name so we invalidate the FOD
name = "${pname}-${version}";
inherit pname version;
src = sources.${pname};
sourceRoot = "${pname}-${version}/${cargoRoot}";
hash = "sha256-66FqoD3JoPbtg6zc32uaPYaTo4zHxywiN8wPI2jtcjc=";