pkgs: simplify

flake.nix

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

pkgs/e11sync-backend.nix

@@ -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 =
+  pythonEnv = python3.withPackages (ps: [ps.django ps.geoip2]);
-    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 = [
+        buildInputs = [pythonEnv];
-          pythonEnv
-          dart-sass
-        ];
       } ''
         unpackPhase
         patchShebangs --build app/manage.py

pkgs/e11sync-static.nix

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