Merge pull request #1375 from nix-community/flake-cleanups

cleanup: reorganize flake a bit, export lib.mkPoetry2Nix as a function
nix-community · Oct 26, 2023 · 43a7430 · 43a7430
2 parents 2d34ce9 + cfc8686
commit 43a7430
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 19 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -70,6 +70,10 @@ jobs:
         working-directory: ${{ env.TESTDIR }}
         run: nix flake init --template "$GITHUB_WORKSPACE"
 
+      - name: force flake to our poetry2nix version
+        working-directory: ${{ env.TESTDIR }}
+        run: nix flake lock --override-input poetry2nix "$GITHUB_WORKSPACE"
+
       - name: generate pyproject.toml
         working-directory: ${{ env.TESTDIR }}
         run: nix develop -c poetry init --name=poetry2nix-template-test --quiet

diff --git a/flake.nix b/flake.nix
@@ -22,6 +22,7 @@
 
     {
       overlay = import ./overlay.nix;
+      lib.mkPoetry2Nix = { pkgs }: import ./default.nix { inherit pkgs; };
 
       githubActions =
         let
@@ -71,27 +72,11 @@
       let
         pkgs = import nixpkgs {
           inherit system;
-          overlays = [
-            (_: _: {
-              p2nix-tools = pkgs.callPackage ./tools { };
-            })
-          ];
-          config = {
-            allowAliases = false;
-            permittedInsecurePackages = [
-              "python3.8-requests-2.29.0"
-              "python3.8-cryptography-40.0.2"
-              "python3.9-requests-2.29.0"
-              "python3.9-cryptography-40.0.2"
-              "python3.10-requests-2.29.0"
-              "python3.10-cryptography-40.0.2"
-              "python3.11-requests-2.29.0"
-              "python3.11-cryptography-40.0.2"
-            ];
-          };
+          config.allowAliases = false;
         };
 
         poetry2nix = import ./default.nix { inherit pkgs; };
+        p2nix-tools = pkgs.callPackage ./tools { };
       in
       rec {
         formatter = treefmtEval.${system}.config.build.wrapper;

diff --git a/templates/app/flake.nix b/templates/app/flake.nix
@@ -15,7 +15,7 @@
       let
         # see https://github.com/nix-community/poetry2nix/tree/master#api for more functions and examples.
         pkgs = nixpkgs.legacyPackages.${system};
-        inherit (import poetry2nix { inherit pkgs; }) mkPoetryApplication;
+        inherit (poetry2nix.lib.mkPoetry2Nix { inherit pkgs; }) mkPoetryApplication;
       in
       {
         packages = {