fix: use poetry2nix pull 1329

tweag · Oct 2, 2023 · 92f6156 · 92f6156
1 parent db5bdcd
commit 92f6156
Show file tree

Hide file tree

Showing 10 changed files with 808 additions and 1,124 deletions.
diff --git a/examples/python/science/default.nix b/examples/python/science/default.nix
@@ -16,8 +16,7 @@ in {
     # extraPackages = ps: [
     #   ps.numpy
     #   ps.scipy
-    #   # issue with matplotlib
-    #   # ps.matplotlib
+    #   ps.matplotlib
     # ];
   };
 }
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -8,7 +8,7 @@
     "tweag-jupyter.cachix.org-1:UtNH4Zs6hVUFpFBTLaA4ejYavPo5EFFqgd7G7FxGW9g="
   ];
 
-  inputs.nixpkgs.url = "github:nixos/nixpkgs/2de8efefb6ce7f5e4e75bdf57376a96555986841";
+  inputs.nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
   inputs.nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.05";
   inputs.nixpkgs-julia.url = "github:NixOS/nixpkgs/?ref=refs/pull/225513/head";
   inputs.flake-compat.url = "github:edolstra/flake-compat";
@@ -30,7 +30,8 @@
   inputs.pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
   inputs.pre-commit-hooks.inputs.flake-utils.follows = "flake-utils";
   inputs.pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs";
-  inputs.poetry2nix.url = "github:nix-community/poetry2nix";
+  # https://github.com/nix-community/poetry2nix/pull/1329
+  inputs.poetry2nix.url = "github:nix-community/poetry2nix/?ref=refs/pull/1329/head";
   inputs.poetry2nix.inputs.flake-utils.follows = "flake-utils";
   inputs.poetry2nix.inputs.nixpkgs.follows = "nixpkgs";
   inputs.rust-overlay.url = "github:oxalica/rust-overlay";
@@ -96,8 +97,7 @@
           {
             name = "update-poetry-lock";
             runtimeInputs = [
-              # pkgs.poetry
-              nixpkgs-stable.legacyPackages."${system}".poetry
+              pkgs.poetry
             ];
             text = ''
               shopt -s globstar
@@ -155,8 +155,7 @@
             pkgs.poetry2nix.cli
             # FIXME: pkgs.poetry is segfaulting on nixpkgs-unstable & poetry2nix
             # https://github.com/nix-community/poetry2nix/issues/1291
-            nixpkgs-stable.legacyPackages."${system}".poetry
-            # pkgs.poetry
+            pkgs.poetry
             self.packages."${system}".update-poetry-lock
           ];
           shellHook = ''

diff --git a/modules/kernels/bash/poetry.lock b/modules/kernels/bash/poetry.lock