Merge pull request #178 from ngi-nix/update-inputs

Update Inputs

configs/pretalx/mysql.nix

@@ -4,7 +4,7 @@
   ...
 }: {
   services = {
-    pretalx.database = {
+    ngi-pretalx.database = {
       backend = "mysql";
       host = "/var/run/mysqld/mysqld.sock";
     };
@@ -14,11 +14,11 @@
       package = pkgs.mysql;
       ensureUsers = [
         {
-          name = config.services.pretalx.database.user;
-          ensurePermissions."${config.services.pretalx.database.name}.*" = "ALL PRIVILEGES";
+          name = config.services.ngi-pretalx.database.user;
+          ensurePermissions."${config.services.ngi-pretalx.database.name}.*" = "ALL PRIVILEGES";
         }
       ];
-      ensureDatabases = [config.services.pretalx.database.name];
+      ensureDatabases = [config.services.ngi-pretalx.database.name];
     };
   };
 }

configs/pretalx/postgresql.nix

@@ -1,17 +1,17 @@
 {config, ...}: {
   services = {
-    pretalx.database.backend = "postgresql";
+    ngi-pretalx.database.backend = "postgresql";
 
     postgresql = {
       enable = true;
       authentication = "local all all trust";
       ensureUsers = [
         {
-          name = config.services.pretalx.database.user;
-          ensurePermissions."DATABASE \"${config.services.pretalx.database.name}\"" = "ALL PRIVILEGES";
+          name = config.services.ngi-pretalx.database.user;
+          ensureDBOwnership = true;
         }
       ];
-      ensureDatabases = [config.services.pretalx.database.name];
+      ensureDatabases = [config.services.ngi-pretalx.database.name];
     };
   };
 }

configs/pretalx/pretalx.nix

@@ -31,7 +31,7 @@
   };
 
   services = {
-    pretalx = {
+    ngi-pretalx = {
       enable = true;
       package = pkgs.pretalx-full;
       nginx = {

modules/pretalx.nix

@@ -27,12 +27,13 @@
     optional
     escapeShellArgs
     generators
+    getExe
     filterAttrs
     filterAttrsRecursive
     ;
 
-  cfg = config.services.pretalx;
-  opt = options.services.pretalx;
+  cfg = config.services.ngi-pretalx;
+  opt = options.services.ngi-pretalx;
   gunicorn = pkgs.python3Packages.gunicorn;
   libDir = "/var/lib/pretalx";
   gunicornSocketPath = "/var/run/pretalx.sock";
@@ -48,15 +49,18 @@
 
   pretalxWrapped =
     pkgs.runCommand "pretalx-wrapper"
-    {nativeBuildInputs = [pkgs.makeWrapper pkgs.python3Packages.wrapPython];}
+    {
+      nativeBuildInputs = [pkgs.makeWrapper pkgs.python3Packages.wrapPython];
+      meta.mainProgram = cfg.package.meta.mainProgram;
+    }
     ''
-      makeWrapper ${cfg.package}/bin/pretalx \
-        $out/bin/pretalx --prefix PYTHONPATH : "${PYTHONPATH}"
+      makeWrapper ${getExe cfg.package} \
+        $out/bin/${cfg.package.meta.mainProgram} --prefix PYTHONPATH : "${PYTHONPATH}"
     '';
 
   secretRecommendation = "Consider using a secret managing scheme such as `agenix` or `sops-nix` to generate this file.";
 in {
-  options.services.pretalx = with types; {
+  options.services.ngi-pretalx = with types; {
     enable = mkEnableOption "Enable pretalx server.";
 
     package = mkPackageOption pkgs "pretalx" {};
@@ -496,7 +500,7 @@ in {
             };
             script = ''
               ${exportPasswordEnv}
-              ${pretalxWrapped}/bin/pretalx ${command}
+              ${getExe pretalxWrapped} ${command}
             '';
           };
       in {
@@ -526,7 +530,7 @@ in {
           script = ''
             ${exportPasswordEnv}
             export DJANGO_SUPERUSER_PASSWORD=$(cat ${cfg.init.admin.passwordFile})
-            ${pretalxWrapped}/bin/pretalx init --noinput
+            ${getExe pretalxWrapped} init --noinput
             touch ${libDir}/init-will-not-run-again-if-this-file-exists
           '';
           requires = ["pretalx-migrate.service"];

pkgs/by-name/kikit/package.nix

@@ -1,8 +1,8 @@
 {
   lib,
-  pcbnew-transition,
   pybars3,
   python3,
+  openscad,
   fetchFromGitHub,
   bats,
   callPackage,
@@ -15,12 +15,11 @@
 
   properCaseName = "KiKit";
 
-  shapely = callPackage ./shapely {};
   solidpython = callPackage ./solidpython {};
 in
   python3.pkgs.buildPythonPackage rec {
     pname = toLower properCaseName;
-    version = "1.3.0";
+    version = "1.5.1";
     format = "setuptools";
 
     disabled = python3.pythonOlder "3.7";
@@ -29,7 +28,7 @@ in
       owner = "yaqwsx";
       repo = properCaseName;
       rev = "v${version}";
-      hash = "sha256-kDTPk/R3eZtm4DjoUV4tSQzjGQ9k8MKQedX4oUXYzeo=";
+      hash = "sha256-iehA6FthNTJq+lDTL4eSUIIlYDJj86LMOyv/L2/ybyc=";
     };
 
     propagatedBuildInputs = with python3.pkgs;
@@ -41,13 +40,14 @@ in
         commentjson
         # https://github.com/yaqwsx/KiKit/issues/575
         wxPython_4_2
+        shapely
+        pcbnew-transition
       ]
       ++ [
-        pcbnew-transition
-        shapely
         pybars3
         # https://github.com/yaqwsx/KiKit/issues/576
         solidpython
+        openscad
       ];
 
     nativeBuildInputs = with python3.pkgs; [