summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoradisbladis <adisbladis@gmail.com>2020-01-11 23:37:05 +0000
committeradisbladis <adisbladis@gmail.com>2020-01-11 23:37:05 +0000
commit1282b60452b32d625d537fd26c17f76b28208c24 (patch)
treef0d977ecbb20b43d3f45bb078d11ae495f10a6b1
parentfirefox-beta-bin: 72.0b3 -> 73.0b3 (diff)
downloadnixpkgs-1282b60452b32d625d537fd26c17f76b28208c24.tar.gz
poetry2nix: 1.2.0 -> 1.2.1
-rw-r--r--pkgs/development/tools/poetry2nix/poetry2nix/lib.nix20
1 files changed, 19 insertions, 1 deletions
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix b/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix
index 3d0b80c4c5ab..559c3051a73a 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix
@@ -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