Merge pull request #1329 from sciyoshi/new-bootstrap-fixes

New bootstrap fixes

Author: adisbladis

.envrc

@@ -1,2 +1,2 @@
-use nix
+use flake
 watch_file ./nix/*

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
         nix_path: nixpkgs=channel:nixos-unstable
     - uses: actions/checkout@v4
     - name: Check format
-      run: nix-shell --packages jq --pure --run 'diff --unified overrides/build-systems.json <(jq --from-file overrides/sort-build-systems.jq --raw-output --sort-keys < overrides/build-systems.json)'
+      run: nix-shell --packages jq diffutils --run "diff --unified overrides/build-systems.json <(jq --from-file overrides/sort-build-systems.jq --raw-output --sort-keys < overrides/build-systems.json)"
 
   nixpkgs-fmt:
     runs-on: ubuntu-latest
@@ -27,7 +27,7 @@ jobs:
         nix_path: nixpkgs=channel:nixos-unstable
     - uses: actions/checkout@v4
     - name: Check format
-      run: nix-shell --arg packages 'pkgs:[ pkgs.nixpkgs-fmt ]' --run 'nixpkgs-fmt --check .'
+      run: nix run 'nixpkgs#nixpkgs-fmt' -- --check .
 
   black-fmt:
     runs-on: ubuntu-latest
@@ -41,7 +41,7 @@ jobs:
         name: poetry2nix
         signingKey: "VhaWuN3IyJVpWg+aZvTocVB+W8ziZKKRGLKR53Pkld3YRZxYOUfXZf0fvqF+LkqVW0eA60trVd5vsqNONpX9Hw=="
     - name: Check format
-      run: nix-shell --arg packages 'pkgs:[ pkgs.p2nix-tools.env ]' --run 'black --check .'
+      run: nix develop -c black --check .
 
   nix-matrix:
     runs-on: ubuntu-latest
@@ -60,15 +60,16 @@ jobs:
     needs: nix-matrix
     runs-on: ${{ matrix.os }}
     strategy:
-      matrix: ${{fromJSON(needs.nix-matrix.outputs.matrix)}}
+      fail-fast: false
+      matrix: ${{ fromJSON(needs.nix-matrix.outputs.matrix) }}
     steps:
       - uses: actions/checkout@v4
       - uses: cachix/install-nix-action@v23
       - uses: cachix/cachix-action@v12
         with:
           name: poetry2nix
           signingKey: "VhaWuN3IyJVpWg+aZvTocVB+W8ziZKKRGLKR53Pkld3YRZxYOUfXZf0fvqF+LkqVW0eA60trVd5vsqNONpX9Hw=="
-      - run: nix build -L ".#${{ matrix.attr }}"
+      - run: nix build -L ".#${{ matrix.attr }}" --keep-going
 
   collect:
     runs-on: ubuntu-latest
@@ -78,4 +79,4 @@ jobs:
       - nix-build
       - sort-build-systems
     steps:
-      - run: true
+      - run: exit 0

README.md

@@ -61,8 +61,6 @@ poetry2nix.mkPoetryApplication {
 }
 ```
 
-See [./pkgs/poetry/default.nix](./pkgs/poetry/default.nix) for a working example.
-
 #### Dependency environment
 
 The resulting derivation also has the passthru attribute `dependencyEnv`, which is an environment with a python interpreter, all non-development dependencies and your application.

default.nix

@@ -150,8 +150,6 @@ lib.makeScope pkgs.newScope (self: {
       };
       getFunctorFn = fn: if builtins.typeOf fn == "set" then fn.__functor else fn;
 
-      poetryPkg = pkgs.callPackage ./pkgs/poetry { inherit python; poetry2nix = self; };
-
       scripts = pyProject.tool.poetry.scripts or { };
       hasScripts = scripts != { };
       scriptsPackage = self.mkPoetryScriptsPackage {
@@ -251,10 +249,6 @@ lib.makeScope pkgs.newScope (self: {
                     inherit lib python poetryLib evalPep508;
                   };
 
-                  # # Use poetry-core from the poetry build (pep517/518 build-system)
-                  poetry-core = poetryPkg.passthru.python.pkgs.poetry-core;
-                  poetry = poetryPkg;
-
                   __toPluginAble = toPluginAble self;
                 } // lib.optionalAttrs (! super ? setuptools-scm) {
                   # The canonical name is setuptools-scm

flake.lock

@@ -1,11 +1,15 @@
 {
   description = "Poetry2nix flake";
 
-  inputs.flake-utils.url = "github:numtide/flake-utils";
-  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+  inputs = {
+    flake-utils.url = "github:numtide/flake-utils";
+    nixpkgs.url = "github:NixOS/nixpkgs/master";
 
-  inputs.nix-github-actions.url = "github:nix-community/nix-github-actions";
-  inputs.nix-github-actions.inputs.nixpkgs.follows = "nixpkgs";
+    nix-github-actions = {
+      url = "github:nix-community/nix-github-actions";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+  };
 
   outputs = { self, nixpkgs, flake-utils, nix-github-actions }:
     {
@@ -16,7 +20,7 @@
           mkPkgs = system: import nixpkgs {
             config = {
               allowAliases = false;
-              allowInsecurePredicate = x: true;
+              allowInsecurePredicate = _: true;
             };
             overlays = [ self.overlay ];
             inherit system;
@@ -40,7 +44,7 @@
                 # Aggregate all tests into one derivation so that only one GHA runner is scheduled for all darwin jobs
                 aggregate = pkgs.runCommand "darwin-aggregate"
                   {
-                    env.TEST_INPUTS = (lib.concatStringsSep " " (lib.attrValues (lib.filterAttrs (n: v: lib.isDerivation v) tests)));
+                    env.TEST_INPUTS = lib.concatStringsSep " " (lib.attrValues (lib.filterAttrs (_: v: lib.isDerivation v) tests));
                   } "touch $out";
               };
           };
@@ -53,24 +57,56 @@
         };
         default = self.templates.app;
       };
-
     } // (flake-utils.lib.eachDefaultSystem (system:
       let
-        pkgs = nixpkgs.legacyPackages.${system};
+        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"
+            ];
+          };
+        };
+
         poetry2nix = import ./default.nix { inherit pkgs; };
-        poetry = pkgs.callPackage ./pkgs/poetry { python = pkgs.python3; inherit poetry2nix; };
       in
       rec {
         packages = {
-          inherit poetry;
           poetry2nix = poetry2nix.cli;
           default = poetry2nix.cli;
         };
 
-        legacyPackages = poetry2nix;
+        devShells = {
+          default = pkgs.mkShell {
+            nativeBuildInputs = with pkgs; [
+              p2nix-tools.env
+              p2nix-tools.flamegraph
+              nixpkgs-fmt
+              poetry
+              niv
+              jq
+              nix-prefetch-git
+              nix-eval-jobs
+              nix-build-uncached
+            ];
+          };
+        };
 
         apps = {
-          poetry = flake-utils.lib.mkApp { drv = packages.poetry; };
+          inherit (pkgs) poetry;
           poetry2nix = flake-utils.lib.mkApp { drv = packages.poetry2nix; };
           default = apps.poetry2nix;
         };

flake.nix

@@ -1,24 +1,12 @@
-{ python
-, stdenv
-, buildPackages
-, makeSetupHook
-, wheel
-, pip
-, pkgs
-, lib
-,
-}:
+{ python, stdenv, makeSetupHook, pkgs, lib }:
 let
-  inherit (python.pythonForBuild.pkgs) callPackage;
-  pythonInterpreter = python.pythonForBuild.interpreter;
+  inherit (python) pythonForBuild;
+  inherit (pythonForBuild.pkgs) callPackage;
+  pythonInterpreter = pythonForBuild.interpreter;
   pythonSitePackages = python.sitePackages;
 
   nonOverlayedPython = pkgs.python3.pythonForBuild.withPackages (ps: [ ps.tomlkit ]);
-  makeRemoveSpecialDependenciesHook =
-    { fields
-    , kind
-    ,
-    }:
+  makeRemoveSpecialDependenciesHook = { fields, kind }:
     nonOverlayedPython.pkgs.callPackage
       (
         _:
@@ -57,10 +45,7 @@ in
   pipBuildHook =
     callPackage
       (
-        { pip
-        , wheel
-        ,
-        }:
+        { pip, wheel }:
         makeSetupHook
           ({
             name = "pip-build-hook.sh";
@@ -118,9 +103,7 @@ in
             '';
           };
 
-          pythonPath =
-            [ ]
-            ++ lib.optional (lib.versionOlder python.version "3.9") unparser;
+          pythonPath = lib.optional (lib.versionOlder python.version "3.9") unparser;
         in
         makeSetupHook
           {
@@ -133,18 +116,4 @@ in
           ./python-requires-patch-hook.sh
       )
       { };
-
-  # When the "wheel" package itself is a wheel the nixpkgs hook (which pulls in "wheel") leads to infinite recursion
-  # It doesn't _really_ depend on wheel though, it just copies the wheel.
-  wheelUnpackHook =
-    callPackage
-      (
-        _:
-        makeSetupHook
-          {
-            name = "wheel-unpack-hook.sh";
-          }
-          ./wheel-unpack-hook.sh
-      )
-      { };
 }

hooks/default.nix

@@ -1,13 +1,22 @@
 # Setup hook to use for pip projects
 echo "Sourcing pip-build-hook"
 
+declare -a pipBuildFlags
+
 pipBuildPhase() {
     echo "Executing pipBuildPhase"
     runHook preBuild
 
     mkdir -p dist
     echo "Creating a wheel..."
-    @pythonInterpreter@ -m pip wheel --verbose --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist .
+    @pythonInterpreter@ -m pip wheel \
+       --verbose \
+       --no-index \
+       --no-deps \
+       --no-clean \
+       --no-build-isolation \
+       --wheel-dir dist \
+       $pipBuildFlags .
     echo "Finished creating a wheel..."
 
     runHook postBuild
@@ -24,7 +33,8 @@ pipShellHook() {
       export PATH="$tmp_path/bin:$PATH"
       export PYTHONPATH="$tmp_path/@pythonSitePackages@:$PYTHONPATH"
       mkdir -p "$tmp_path/@pythonSitePackages@"
-      @pythonInterpreter@ -m pip install -e . --prefix "$tmp_path" >&2
+      @pythonInterpreter@ -m pip install -e . --prefix "$tmp_path" \
+         --no-build-isolation >&2
     fi
 
     runHook postShellHook

hooks/pip-build-hook.sh

@@ -1,13 +1,12 @@
 [
-    "poetry",
-    "poetry-core",
-    "flit",
-    "flit-core",
-    "pbr",
-    "flitBuildHook",
-    "cython",
-    "hatchling",
-    "hatch-vcs",
-    "setuptools",
-    "setuptools-scm"
+  "poetry",
+  "poetry-core",
+  "flit",
+  "flit-core",
+  "pbr",
+  "cython",
+  "hatchling",
+  "hatch-vcs",
+  "setuptools",
+  "setuptools-scm"
 ]