Skip to content

Commit

Permalink
Take nixpkgs.lib functions in poetryOverrides.nix from flake nixpkgs
Browse files Browse the repository at this point in the history
It seems cleaner to me to just use the local flake input when we are
just pulling functions from lib. The consumer shouldn't need to provide it's
local packageset just for access to lib.
  • Loading branch information
hcallahan-lowrisc committed Jan 3, 2024
1 parent 02faef3 commit c6b012a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
...
} @ inputs: let
no_system_outputs = {
poetryOverrides = import ./poetryOverrides.nix;
poetryOverrides = import ./poetryOverrides.nix { inherit nixpkgs; };
};

all_system_outputs = flake-utils.lib.eachDefaultSystem (system: let
Expand Down
4 changes: 2 additions & 2 deletions poetryOverrides.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright lowRISC Contributors.
# Licensed under the MIT License, see LICENSE for details.
# SPDX-License-Identifier: MIT
{pkgs, ...}: let
{nixpkgs, ...}: let
# https://github.com/nix-community/poetry2nix/blob/master/docs/edgecases.md
# poetry2nix tries to build the python packages based on the information
# given in their own build description files (setup.py etc.)
Expand Down Expand Up @@ -61,7 +61,7 @@
};
};
in
pkgs.lib.composeManyExtensions [
nixpkgs.lib.composeManyExtensions [
preferwheel-overlay
buildreqs-overlay
dontwrap-overlay
Expand Down

0 comments on commit c6b012a

Please sign in to comment.