3p/nixpkgs: fix remarshal
This commit is contained in:
parent
75a87253dd
commit
bf207171aa
3 changed files with 26 additions and 1 deletions
23
third_party/nixpkgs/patches/pr159074.patch
vendored
Normal file
23
third_party/nixpkgs/patches/pr159074.patch
vendored
Normal 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
1
third_party/nixpkgs/patches/series
vendored
|
@ -1,3 +1,4 @@
|
||||||
pomerium-fix.patch
|
pomerium-fix.patch
|
||||||
pomerium-fix2.patch
|
pomerium-fix2.patch
|
||||||
nvidia-sideband-socket.patch
|
nvidia-sideband-socket.patch
|
||||||
|
pr159074.patch
|
||||||
|
|
|
@ -31,7 +31,8 @@ buildPythonApplication rec {
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace pyproject.toml \
|
substituteInPlace pyproject.toml \
|
||||||
--replace "poetry.masonry.api" "poetry.core.masonry.api" \
|
--replace "poetry.masonry.api" "poetry.core.masonry.api" \
|
||||||
--replace 'PyYAML = "^5.3"' 'PyYAML = "*"'
|
--replace 'PyYAML = "^5.3"' 'PyYAML = "*"' \
|
||||||
|
--replace 'tomlkit = "^0.7"' 'tomlkit = "*"'
|
||||||
'';
|
'';
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
Loading…
Reference in a new issue