lukegb/depot
1
0
Fork 0
Code Issues 1 Pull requests Projects Packages Activity Actions

3p/nixpkgs: fix remarshal

Browse source
This commit is contained in:
Luke Granger-Brown 2022-02-13 23:04:32 +00:00
parent 75a87253dd
commit bf207171aa
3 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
third_party/nixpkgs/patches/pr159074.patch vendored Normal file
View file

@ -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 = [

1
third_party/nixpkgs/patches/series vendored
View file

@ -1,3 +1,4 @@
pomerium-fix.patch
pomerium-fix2.patch
nvidia-sideband-socket.patch
pr159074.patch

3
third_party/nixpkgs/pkgs/development/python-modules/remarshal/default.nix vendored
View file

@ -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 = [