diff --git a/third_party/nixpkgs/patches/pr159074.patch b/third_party/nixpkgs/patches/pr159074.patch new file mode 100644 index 0000000000..f8dedef99b --- /dev/null +++ b/third_party/nixpkgs/patches/pr159074.patch @@ -0,0 +1,23 @@ +From 35cd881e3f259836f034330634920aef9c303490 Mon Sep 17 00:00:00 2001 +From: zowoq <59103226+zowoq@users.noreply.github.com> +Date: Fri, 11 Feb 2022 09:16:45 +1000 +Subject: [PATCH] remarshal: fix build + +--- + pkgs/development/python-modules/remarshal/default.nix | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/pkgs/development/python-modules/remarshal/default.nix b/pkgs/development/python-modules/remarshal/default.nix +index fc888c2379ee3..99c868eb0b804 100644 +--- a/pkgs/development/python-modules/remarshal/default.nix ++++ b/pkgs/development/python-modules/remarshal/default.nix +@@ -31,7 +31,8 @@ buildPythonApplication rec { + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "poetry.masonry.api" "poetry.core.masonry.api" \ +- --replace 'PyYAML = "^5.3"' 'PyYAML = "*"' ++ --replace 'PyYAML = "^5.3"' 'PyYAML = "*"' \ ++ --replace 'tomlkit = "^0.7"' 'tomlkit = "*"' + ''; + + nativeBuildInputs = [ diff --git a/third_party/nixpkgs/patches/series b/third_party/nixpkgs/patches/series index f2cc68009d..bc2de2d81c 100644 --- a/third_party/nixpkgs/patches/series +++ b/third_party/nixpkgs/patches/series @@ -1,3 +1,4 @@ pomerium-fix.patch pomerium-fix2.patch nvidia-sideband-socket.patch +pr159074.patch diff --git a/third_party/nixpkgs/pkgs/development/python-modules/remarshal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/remarshal/default.nix index fc888c2379..99c868eb0b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/remarshal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/remarshal/default.nix @@ -31,7 +31,8 @@ buildPythonApplication rec { postPatch = '' substituteInPlace pyproject.toml \ --replace "poetry.masonry.api" "poetry.core.masonry.api" \ - --replace 'PyYAML = "^5.3"' 'PyYAML = "*"' + --replace 'PyYAML = "^5.3"' 'PyYAML = "*"' \ + --replace 'tomlkit = "^0.7"' 'tomlkit = "*"' ''; nativeBuildInputs = [