Merge branch 'master' into feature/default-deps-main-group

nix-community · Oct 10, 2024 · c779b19 · c779b19
2 parents 581b49d + 39439be
commit c779b19
Show file tree

Hide file tree

Showing 111 changed files with 24,964 additions and 6,210 deletions.
diff --git a/.github/workflows/ci.yml b/.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

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

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/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;