federez/nix
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

indico: use upstream qTip2

Browse source 
See https://github.com/indico/qTip2/pull/1

Signed-off-by: Jeltz <jeltz@federez.net>
This commit is contained in:
jeltz 2025-03-08 15:38:35 +01:00
parent 5d32735063
commit dfc05aad4a
Signed by: jeltz
GPG key ID: 800882B66C0C3326
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
pkgs/indico/default.nix
View file

@ -50,7 +50,7 @@ let
}; };
# TODO PR # TODO PR
qTipUpstreamUrl = "git+https://indico@github.com/indico/qTip2.git#8951e5538a5c0833021b2d2b5d8a587a2c24faae"; qTipUpstreamUrl = "git+https://indico@github.com/indico/qTip2.git#8951e5538a5c0833021b2d2b5d8a587a2c24faae";
qTipLocalUrl = "git+https://github.com/federez-tba/qTip2.git#8d1d579c0aac94333e390f19aa0489c57bf74cf7"; qTipWithLockUrl = "git+https://indico@github.com/indico/qTip2.git#95a42a3be49767a631310a5a8bd924f386220799";
in in
python.pkgs.buildPythonApplication rec { python.pkgs.buildPythonApplication rec {
pname = "indico"; pname = "indico";
@ -90,7 +90,7 @@ python.pkgs.buildPythonApplication rec {
npmDeps = fetchNpmDeps { npmDeps = fetchNpmDeps {
inherit src patches postPatch; inherit src patches postPatch;
pname = "${pname}-${version}-npm-deps"; pname = "${pname}-${version}-npm-deps";
hash = "sha256-OeeA2NyRnhlQuSryTmqsLcNNkXde0Vnk21pHddV3aco="; hash = "sha256-sM+ey/Lu5pJdAFA+k6FvP+apEy/yIRohuZC7kj/tnd8=";
}; };
# FIXME *why* is it required? # FIXME *why* is it required?
@ -127,9 +127,9 @@ python.pkgs.buildPythonApplication rec {
--replace-fail "babel==2.16.0" "babel" \ --replace-fail "babel==2.16.0" "babel" \
--replace-fail "hatchling==1.25.0" "hatchling" --replace-fail "hatchling==1.25.0" "hatchling"
substituteInPlace package.json \ substituteInPlace package.json \
--replace-fail ${qTipUpstreamUrl} ${qTipLocalUrl} --replace-fail ${qTipUpstreamUrl} ${qTipWithLockUrl}
substituteInPlace package-lock.json \ substituteInPlace package-lock.json \
--replace-fail ${qTipUpstreamUrl} ${qTipLocalUrl} --replace-fail ${qTipUpstreamUrl} ${qTipWithLockUrl}
# Make the WSGI module importable by Gunicorn # Make the WSGI module importable by Gunicorn
# (TODO is there a way to use Gunicorn with a path?) # (TODO is there a way to use Gunicorn with a path?)
mv indico/web/indico.wsgi indico/web/wsgi.py mv indico/web/indico.wsgi indico/web/wsgi.py