From 451f17d931cdef0c94befa57f46c321491d99efc Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 2 Apr 2023 12:06:32 +0000 Subject: [PATCH] nixpkgs: more poetry2nix --- .../poetry2nix-cryptography39.0.1.patch | 2 +- .../poetry2nix-cryptography40.0.1.patch | 27 +++++++++++++++++++ third_party/nixpkgs/patches/series | 1 + .../poetry2nix/overrides/default.nix | 2 +- 4 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 third_party/nixpkgs/patches/poetry2nix-cryptography40.0.1.patch diff --git a/third_party/nixpkgs/patches/poetry2nix-cryptography39.0.1.patch b/third_party/nixpkgs/patches/poetry2nix-cryptography39.0.1.patch index 2d5e1ce34a..7c84781d61 100644 --- a/third_party/nixpkgs/patches/poetry2nix-cryptography39.0.1.patch +++ b/third_party/nixpkgs/patches/poetry2nix-cryptography39.0.1.patch @@ -5,7 +5,7 @@ diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix "38.0.3" = "sha256-lzHLW1N4hZj+nn08NZiPVM/X+SEcIsuZDjEOy0OOkSc="; "38.0.4" = "sha256-BN0kOblUwgHj5QBf52RY2Jx0nBn03lwoN1O5PEohbwY="; "39.0.0" = "sha256-clorC0NtGukpE3DnZ84MSdGhJN+qC89DZPITZFuL01Q="; -+ "39.0.1" = "sha256-AlorC0NtGukpE3DnZ84MSdGhJN+qC89DZPITZFuL01Q="; ++ "39.0.1" = "sha256-0x+KIqJznDEyIUqVuYfIESKmHBWfzirPeX2R/cWlngc="; "39.0.2" = "sha256-Admz48/GS2t8diz611Ciin1HKQEyMDEwHxTpJ5tZ1ZA="; }.${version} or ( lib.warn "Unknown cryptography version: '${version}'. Please update getCargoHash." lib.fakeHash diff --git a/third_party/nixpkgs/patches/poetry2nix-cryptography40.0.1.patch b/third_party/nixpkgs/patches/poetry2nix-cryptography40.0.1.patch new file mode 100644 index 0000000000..bb986dda2c --- /dev/null +++ b/third_party/nixpkgs/patches/poetry2nix-cryptography40.0.1.patch @@ -0,0 +1,27 @@ +diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix +--- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix ++++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix +@@ -385,6 +385,7 @@ lib.composeManyExtensions [ + "39.0.0" = "sha256-clorC0NtGukpE3DnZ84MSdGhJN+qC89DZPITZFuL01Q="; + "39.0.1" = "sha256-AlorC0NtGukpE3DnZ84MSdGhJN+qC89DZPITZFuL01Q="; + "39.0.2" = "sha256-Admz48/GS2t8diz611Ciin1HKQEyMDEwHxTpJ5tZ1ZA="; ++ "40.0.1" = "sha256-gFfDTc2QWBWHBCycVH1dYlCsWQMVcRZfOBIau+njtDU="; + }.${version} or ( + lib.warn "Unknown cryptography version: '${version}'. Please update getCargoHash." lib.fakeHash + ); +@@ -402,6 +403,7 @@ lib.composeManyExtensions [ + nativeBuildInputs = (old.nativeBuildInputs or [ ]) + ++ lib.optionals (lib.versionAtLeast old.version "3.4") [ self.setuptools-rust ] + ++ lib.optional (!self.isPyPy) pyBuildPackages.cffi ++ ++ lib.optional (lib.versionAtLeast old.version "40") pkgs.pkg-config + ++ lib.optional (lib.versionAtLeast old.version "3.5" && !isWheel) + (with pkgs.rustPlatform; [ cargoSetupHook rust.cargo rust.rustc ]); + buildInputs = (old.buildInputs or [ ]) +@@ -2595,6 +2597,7 @@ lib.composeManyExtensions [ + let + # Watchfiles does not include Cargo.lock in tarball released on PyPi for versions up to 0.17.0 + getRepoHash = version: { ++ "0.19.0" = "sha256-NmmeoaIfFMNKCcjH6tPnkpflkN35bKlT76MqF9W8LBc="; + "0.18.1" = "sha256-XEhu6M1hFi3/gAKZcei7KJSrIhhlZhlvZvbfyA6VLR4="; + "0.18.0" = "sha256-biGGn0YAUbSO1hCJ4kU0ZWlqlXl/HRrBS3iIA3myRI8="; + "0.17.0" = "1swpf265h9qq30cx55iy6jjirba3wml16wzb68k527ynrxr7hvqx"; diff --git a/third_party/nixpkgs/patches/series b/third_party/nixpkgs/patches/series index 467c9ee10b..c9214ca4e7 100644 --- a/third_party/nixpkgs/patches/series +++ b/third_party/nixpkgs/patches/series @@ -1,3 +1,4 @@ kubo-multiaddr.patch buildrustcrate-aarch64-linux.patch poetry2nix-cryptography39.0.1.patch +poetry2nix-cryptography40.0.1.patch diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix index f9fdb48635..8c94bb5da2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix @@ -383,7 +383,7 @@ lib.composeManyExtensions [ "38.0.3" = "sha256-lzHLW1N4hZj+nn08NZiPVM/X+SEcIsuZDjEOy0OOkSc="; "38.0.4" = "sha256-BN0kOblUwgHj5QBf52RY2Jx0nBn03lwoN1O5PEohbwY="; "39.0.0" = "sha256-clorC0NtGukpE3DnZ84MSdGhJN+qC89DZPITZFuL01Q="; - "39.0.1" = "sha256-AlorC0NtGukpE3DnZ84MSdGhJN+qC89DZPITZFuL01Q="; + "39.0.1" = "sha256-0x+KIqJznDEyIUqVuYfIESKmHBWfzirPeX2R/cWlngc="; "39.0.2" = "sha256-Admz48/GS2t8diz611Ciin1HKQEyMDEwHxTpJ5tZ1ZA="; "40.0.1" = "sha256-gFfDTc2QWBWHBCycVH1dYlCsWQMVcRZfOBIau+njtDU="; }.${version} or (