From 3f6d8c5c149fc3b47cfa8fefb070a134b417b55a Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Fri, 14 Apr 2023 20:38:37 +0000 Subject: [PATCH] 3p/nixpkgs: poetry2nix: drop cryptography 40.0.1 patch and make the 39.0.1 patch easier to apply consistently --- .../poetry2nix-cryptography39.0.1.patch | 4 +-- .../poetry2nix-cryptography40.0.1.patch | 27 ------------------- third_party/nixpkgs/patches/series | 1 - 3 files changed, 1 insertion(+), 31 deletions(-) delete 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 7c84781d61..2b69e1afa8 100644 --- a/third_party/nixpkgs/patches/poetry2nix-cryptography39.0.1.patch +++ b/third_party/nixpkgs/patches/poetry2nix-cryptography39.0.1.patch @@ -1,11 +1,9 @@ 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 -@@ -383,6 +383,7 @@ lib.composeManyExtensions [ +@@ -383,4 +383,5 @@ 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-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 deleted file mode 100644 index bb986dda2c..0000000000 --- a/third_party/nixpkgs/patches/poetry2nix-cryptography40.0.1.patch +++ /dev/null @@ -1,27 +0,0 @@ -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 c9214ca4e7..467c9ee10b 100644 --- a/third_party/nixpkgs/patches/series +++ b/third_party/nixpkgs/patches/series @@ -1,4 +1,3 @@ kubo-multiaddr.patch buildrustcrate-aarch64-linux.patch poetry2nix-cryptography39.0.1.patch -poetry2nix-cryptography40.0.1.patch