Merge branch 'master' into patch-1

.github/workflows/ci.yml

@@ -18,7 +18,7 @@ jobs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
       - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v27
+      - uses: cachix/install-nix-action@v30
       - id: set-matrix
         name: Generate Nix Matrix
         run: |
@@ -36,7 +36,7 @@ jobs:
       matrix: ${{ fromJSON(needs.nix-matrix.outputs.matrix) }}
     steps:
       - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v27
+      - uses: cachix/install-nix-action@v30
       - uses: cachix/cachix-action@v15
         with:
           name: poetry2nix
@@ -54,7 +54,7 @@ jobs:
           - macos-14
     steps:
       - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v27
+      - uses: cachix/install-nix-action@v30
       - uses: cachix/cachix-action@v15
         with:
           name: poetry2nix
@@ -77,7 +77,7 @@ jobs:
           - macos-14
     steps:
       - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v27
+      - uses: cachix/install-nix-action@v30
       - uses: cachix/cachix-action@v15
         with:
           name: poetry2nix
@@ -95,7 +95,7 @@ jobs:
           - macos-14
     steps:
       - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v27
+      - uses: cachix/install-nix-action@v30
       - uses: cachix/cachix-action@v15
         with:
           name: poetry2nix

README.md

@@ -394,7 +394,7 @@ let
     # pyself & pyprev refers to python packages
     defaultPoetryOverrides = prev.defaultPoetryOverrides.extend (pyfinal: pyprev: {
 
-      my-custom-pkg = prev.my-custom-pkg.overridePythonAttrs (oldAttrs: { });
+      my-custom-pkg = pyprev.my-custom-pkg.overridePythonAttrs (oldAttrs: { });
 
     });
 
@@ -421,7 +421,7 @@ let
           # pyfinal & pyprev refers to python packages
           defaultPoetryOverrides = p2nixprev.defaultPoetryOverrides.extend (pyfinal: pyprev: {
 
-            my-custom-pkg = prev.my-custom-pkg.overridePythonAttrs (oldAttrs: { });
+            my-custom-pkg = pyprev.my-custom-pkg.overridePythonAttrs (oldAttrs: { });
 
           });
 
@@ -602,8 +602,7 @@ This is a short (11 minutes) video tutorial by [Steve Purcell](https://github.co
 
 Contributions to this project are welcome in the form of GitHub PRs. Please consider the following before creating PRs:
 
-- This project uses [nixpkgs-fmt](https://github.com/nix-community/nixpkgs-fmt) for formatting the Nix code. You can use
-`nix-shell --run "nixpkgs-fmt ."` to format everything.
+- You can use `nix fmt` to format everything and sort `overrides/build-systems.json`.
 - If you are planning to make any considerable changes, you should first present your plans in a GitHub issue so it can be discussed.
 - If you add new features please consider adding tests. You can run them locally as follows:
 
@@ -629,8 +628,6 @@ To test with a specific channel:
 nix-build --expr 'with import <unstable> {}; callPackage ./tests/default.nix {}'
 ```
 
-To sort `overrides/build-systems.json` according to the [`sort-build-systems` job](.github/workflows/ci.yml), patch the source with the output of the "Check format" step, like this: `nix-shell [omitted] | patch -p0`.
-
 ## Contact
 
 We have a Matrix room at [#poetry2nix:blad.is](https://matrix.to/#/#poetry2nix:blad.is).

dev/treefmt.nix

@@ -20,6 +20,9 @@
     };
 
     black.excludes = [ "vendor/**.py" ];
+
+    deadnix.excludes = [ "vendor/**.nix" ];
+    statix.excludes = [ "vendor/**.nix" ];
   };
 
   programs.deadnix.enable = true;

flake.nix

@@ -135,7 +135,7 @@
         poetry = {
           # https://wiki.nixos.org/wiki/Flakes
           type = "app";
-          program = pkgs.poetry;
+          program = "${pkgs.poetry}/bin/poetry";
         };
         poetry2nix = flake-utils.lib.mkApp { drv = packages.poetry2nix; };
         default = apps.poetry2nix;