diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix index 95aa85019412..310ffdc66674 100644 --- a/pkgs/by-name/pr/pretix/package.nix +++ b/pkgs/by-name/pr/pretix/package.nix @@ -266,8 +266,9 @@ python.pkgs.buildPythonApplication rec { python ; plugins = lib.recurseIntoAttrs ( - python.pkgs.callPackage ./plugins { + lib.packagesFromDirectoryRecursive { inherit (python.pkgs) callPackage; + directory = ./plugins; } ); tests = { diff --git a/pkgs/by-name/pr/pretix/plugins/default.nix b/pkgs/by-name/pr/pretix/plugins/default.nix deleted file mode 100644 index 12c9b6fa02bf..000000000000 --- a/pkgs/by-name/pr/pretix/plugins/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ - callPackage, - ... -}: - -{ - mollie = callPackage ./mollie.nix { }; - - pages = callPackage ./pages.nix { }; - - passbook = callPackage ./passbook.nix { }; - - reluctant-stripe = callPackage ./reluctant-stripe.nix { }; - - stretchgoals = callPackage ./stretchgoals.nix { }; - - zugferd = callPackage ./zugferd.nix { }; -} diff --git a/pkgs/by-name/pr/pretix/plugins/mollie.nix b/pkgs/by-name/pr/pretix/plugins/mollie/package.nix similarity index 100% rename from pkgs/by-name/pr/pretix/plugins/mollie.nix rename to pkgs/by-name/pr/pretix/plugins/mollie/package.nix diff --git a/pkgs/by-name/pr/pretix/plugins/pages.nix b/pkgs/by-name/pr/pretix/plugins/pages/package.nix similarity index 100% rename from pkgs/by-name/pr/pretix/plugins/pages.nix rename to pkgs/by-name/pr/pretix/plugins/pages/package.nix diff --git a/pkgs/by-name/pr/pretix/plugins/passbook-openssl.patch b/pkgs/by-name/pr/pretix/plugins/passbook/openssl.patch similarity index 100% rename from pkgs/by-name/pr/pretix/plugins/passbook-openssl.patch rename to pkgs/by-name/pr/pretix/plugins/passbook/openssl.patch diff --git a/pkgs/by-name/pr/pretix/plugins/passbook.nix b/pkgs/by-name/pr/pretix/plugins/passbook/package.nix similarity index 96% rename from pkgs/by-name/pr/pretix/plugins/passbook.nix rename to pkgs/by-name/pr/pretix/plugins/passbook/package.nix index d5ca08315f18..ad0ae3febf62 100644 --- a/pkgs/by-name/pr/pretix/plugins/passbook.nix +++ b/pkgs/by-name/pr/pretix/plugins/passbook/package.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { patches = [ (substituteAll { - src = ./passbook-openssl.patch; + src = ./openssl.patch; openssl = lib.getExe openssl; }) ]; diff --git a/pkgs/by-name/pr/pretix/plugins/reluctant-stripe.nix b/pkgs/by-name/pr/pretix/plugins/reluctant-stripe/package.nix similarity index 100% rename from pkgs/by-name/pr/pretix/plugins/reluctant-stripe.nix rename to pkgs/by-name/pr/pretix/plugins/reluctant-stripe/package.nix diff --git a/pkgs/by-name/pr/pretix/plugins/stretchgoals.nix b/pkgs/by-name/pr/pretix/plugins/stretchgoals/package.nix similarity index 100% rename from pkgs/by-name/pr/pretix/plugins/stretchgoals.nix rename to pkgs/by-name/pr/pretix/plugins/stretchgoals/package.nix diff --git a/pkgs/by-name/pr/pretix/plugins/zugferd.nix b/pkgs/by-name/pr/pretix/plugins/zugferd/package.nix similarity index 100% rename from pkgs/by-name/pr/pretix/plugins/zugferd.nix rename to pkgs/by-name/pr/pretix/plugins/zugferd/package.nix