Skip to content

Commit

Permalink
Switch from poetry to nixpkgs
Browse files Browse the repository at this point in the history
@alejandrosame: fixed merge conflicts
  • Loading branch information
zmitchell authored and alejandrosame committed Oct 10, 2023
1 parent 4a829fd commit c3c97f8
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 94 deletions.
26 changes: 1 addition & 25 deletions flake.lock

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

90 changes: 21 additions & 69 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,82 +3,34 @@

inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
inputs.flake-utils.url = "github:numtide/flake-utils";
inputs.poetry2nix = {
inputs.flake-utils.follows = "flake-utils";
inputs.nixpkgs.follows = "nixpkgs";
url = "github:nix-community/poetry2nix";
};

outputs = { self, nixpkgs, flake-utils, poetry2nix }:
outputs = { self, nixpkgs, flake-utils}:
flake-utils.lib.eachDefaultSystem (system:
let
pkgs = import nixpkgs {
inherit system;
overlays = [ poetry2nix.overlay ];
};
poetryOverrides = self: super: {

# Refs https://github.com/nix-community/poetry2nix/issues/218#issuecomment-981615612
typing-extensions = super.typing-extensions.overridePythonAttrs (
old: {
buildInputs = (old.buildInputs or [ ]) ++ [ self.flit-core ];
}
);

sphinx = super.sphinx.overridePythonAttrs (
old: {
buildInputs = (old.buildInputs or [ ]) ++ [ self.flit-core ];
}
);

accessible-pygments = super.accessible-pygments.overridePythonAttrs (
old: {
buildInputs = (old.buildInputs or [ ]) ++ [ super.setuptools ];
}
);

sphinx-sitemap = super.sphinx-sitemap.overridePythonAttrs (
old: {
buildInputs = (old.buildInputs or [ ]) ++ [ super.setuptools ];
}
);

sphinx-notfound-page = super.sphinx-notfound-page.overridePythonAttrs (
old: {
buildInputs = (old.buildInputs or [ ]) ++ [ super.flit-core ];
}
);
};
in
rec {
packages = flake-utils.lib.flattenTree {
nix-dev-pyenv = pkgs.poetry2nix.mkPoetryEnv {
projectDir = self;
python = pkgs.python39;
overrides = [
(self: super: {
pydata-sphinx-theme = super.pydata-sphinx-theme.override { preferWheel = true; };
sphinx-book-theme = super.sphinx-book-theme.override { preferWheel = true; };
})
pkgs.poetry2nix.defaultPoetryOverrides
poetryOverrides
];
};
nix-dev-html = pkgs.stdenv.mkDerivation {
name = "nix-dev";
src = self;
buildInputs = [ packages.nix-dev-pyenv ];
buildPhase = ''
make html
'';
installPhase = ''
mkdir -p $out
cp -R build/html/* $out/
'';
};
in {
defaultPackage = pkgs.stdenv.mkDerivation {
name = "nix-dev";
src = self;
buildInputs = with pkgs.python310Packages; [
livereload
myst-parser
sphinx
sphinx-book-theme
sphinx-copybutton
sphinx-design
black
];
buildPhase = ''
make html
'';
installPhase = ''
mkdir -p $out
cp -R build/html/* $out/
'';
};
defaultPackage = packages.nix-dev-html;
}
);

}

0 comments on commit c3c97f8

Please sign in to comment.