1
Fork 0

pkgs: simplify

This commit is contained in:
Motiejus Jakštys 2024-01-26 17:02:21 +02:00
parent d54da85c56
commit a01d07c533
3 changed files with 10 additions and 26 deletions

View File

@ -94,19 +94,13 @@
};
devShells.default = pkgs.mkShellNoCC {
packages = with pkgs; [
(python3.withPackages
(ps: [
ps.django
ps.geoip2
ps.django-debug-toolbar
ps.flake8
# TODO: vim integration via EXITINT? See make check
ps.autopep8
]))
libmaxminddb
dart-sass
packages = [
(
pkgs.python3.withPackages
(p: with p; [django geoip2 django-debug-toolbar flake8 autopep8])
)
pkgs.libmaxminddb
pkgs.dart-sass
];
GEOIP_PATH = "${pkgs.geoip-mmdb}";
E11SYNC_DEBUG = "1";

View File

@ -5,7 +5,6 @@
makeWrapper,
python3,
libmaxminddb,
dart-sass,
uwsgi,
backendPort ? 8002,
databasePath ? null,
@ -13,12 +12,7 @@
e11sync-static,
}: let
uwsgi-python = uwsgi.override {plugins = ["python3"];};
pythonEnv =
python3.withPackages
(ps: [
ps.django
ps.geoip2
]);
pythonEnv = python3.withPackages (ps: [ps.django ps.geoip2]);
in
stdenv.mkDerivation {
name = "e11sync-backend";
@ -56,10 +50,7 @@ in
passthru.tests.unit =
runCommand "e11sync-test" {
srcs = ../app;
buildInputs = [
pythonEnv
dart-sass
];
buildInputs = [pythonEnv];
} ''
unpackPhase
patchShebangs --build app/manage.py

View File

@ -24,8 +24,7 @@
# remove unversioned files
(cd app/_static;
${jq}/bin/jq -r '.paths | keys[]' staticfiles.json | \
xargs rm
${jq}/bin/jq -r '.paths | keys[]' staticfiles.json | xargs rm
)
find app/_static \