Skip to content

Commit

Permalink
fix: use poetry2nix pull 1329
Browse files Browse the repository at this point in the history
  • Loading branch information
GTrunSec committed Oct 2, 2023
1 parent db5bdcd commit 7220e1e
Show file tree
Hide file tree
Showing 15 changed files with 817 additions and 1,134 deletions.
3 changes: 1 addition & 2 deletions examples/python/science/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ in {
# extraPackages = ps: [
# ps.numpy
# ps.scipy
# # issue with matplotlib
# # ps.matplotlib
# ps.matplotlib
# ];
};
}
21 changes: 11 additions & 10 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 5 additions & 6 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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";
Expand Down Expand Up @@ -96,8 +97,7 @@
{
name = "update-poetry-lock";
runtimeInputs = [
# pkgs.poetry
nixpkgs-stable.legacyPackages."${system}".poetry
pkgs.poetry
];
text = ''
shopt -s globstar
Expand Down Expand Up @@ -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 = ''
Expand Down
2 changes: 1 addition & 1 deletion modules/kernel.nix
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ in {
};

nixpkgs = import ./types/nixpkgs.nix {
inherit lib self system;
inherit lib self system kernelName;
overlays = import ./types/overlays.nix {inherit lib self config kernelName;};
};

Expand Down
20 changes: 10 additions & 10 deletions modules/kernels/bash/poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 7220e1e

Please sign in to comment.