Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a7635ad8b543
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 100012e55bc2
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jan 11, 2020

  1. poetry2nix: 1.2.0 -> 1.2.1

    @adisbladis
    adisbladis committed Jan 11, 2020
    1
    Copy the full SHA
    1282b60 View commit details

Commits on Jan 12, 2020

  1. Merge pull request #77538 from adisbladis/poetry2nix-1_2_1 

    poetry2nix: 1.2.0 -> 1.2.1
    @adisbladis
    adisbladis authored Jan 12, 2020
    Copy the full SHA
    100012e View commit details
Showing with 19 additions and 1 deletion.
  1. +19 −1 pkgs/development/tools/poetry2nix/poetry2nix/lib.nix
20 changes: 19 additions & 1 deletion pkgs/development/tools/poetry2nix/poetry2nix/lib.nix
View file
Original file line number Diff line number Diff line change
@@ -30,7 +30,25 @@ let
in
(builtins.foldl' combine initial tokens).state;

readTOML = path: builtins.fromTOML (builtins.readFile path);
fromTOML = toml: if builtins.hasAttr "fromTOML" builtins then builtins.fromTOML toml else
builtins.fromJSON (
builtins.readFile (
pkgs.runCommand "from-toml"
{
inherit toml;
allowSubstitutes = false;
preferLocalBuild = true;
}
''
${pkgs.remarshal}/bin/remarshal \
-if toml \
-i <(echo "$toml") \
-of json \
-o $out
''
)
);
readTOML = path: fromTOML (builtins.readFile path);

#
# Returns the appropriate manylinux dependencies and string representation for the file specified