diff --git a/third_party/nixpkgs/patches/0001-Revert-aws-sdk-cpp-1.8.130-1.9.121.patch b/third_party/nixpkgs/patches/0001-Revert-aws-sdk-cpp-1.8.130-1.9.121.patch deleted file mode 100644 index 35a14c5820..0000000000 --- a/third_party/nixpkgs/patches/0001-Revert-aws-sdk-cpp-1.8.130-1.9.121.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 81ee8637b4e14eed08d7c0206429777c5a856161 Mon Sep 17 00:00:00 2001 -From: Luke Granger-Brown -Date: Tue, 19 Oct 2021 07:20:10 +0100 -Subject: [PATCH] Revert "aws-sdk-cpp: 1.8.130 -> 1.9.121" - -This reverts commit abbb7c6e60b60f2a516b8a69c45c5b8bb415cc0f. ---- - pkgs/development/libraries/aws-sdk-cpp/default.nix | 14 ++------------ - 1 file changed, 2 insertions(+), 12 deletions(-) - -diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix -index d58fabfd5ea..69cb1cc22ae 100644 ---- a/pkgs/development/libraries/aws-sdk-cpp/default.nix -+++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix -@@ -1,5 +1,4 @@ - { lib, stdenv, fetchFromGitHub, cmake, curl, openssl, s2n-tls, zlib --, aws-crt-cpp - , aws-c-cal, aws-c-common, aws-c-event-stream, aws-c-io, aws-checksums - , CoreAudio, AudioToolbox - , # Allow building a limited set of APIs, e.g. ["s3" "ec2"]. -@@ -18,23 +17,15 @@ in - - stdenv.mkDerivation rec { - pname = "aws-sdk-cpp"; -- version = "1.9.121"; -+ version = "1.8.130"; - - src = fetchFromGitHub { - owner = "awslabs"; - repo = "aws-sdk-cpp"; - rev = version; -- sha256 = "sha256-VQpWauk0tdJ1QU0HmtdTwQdKbiAuTTXXsUo2cqpqmdU="; -+ sha256 = "sha256-5T4l0KYB0utFTdEOtYT9trQ/JehQbXxk/IhI6YavErs="; - }; - -- postPatch = '' -- # Includes aws-c-auth private headers, so only works with submodule build -- rm aws-cpp-sdk-core-tests/aws/auth/AWSAuthSignerTest.cpp -- '' + lib.optionalString stdenv.hostPlatform.isMusl '' -- # TestRandomURLMultiThreaded fails -- rm aws-cpp-sdk-core-tests/http/HttpClientTest.cpp -- ''; -- - # FIXME: might be nice to put different APIs in different outputs - # (e.g. libaws-cpp-sdk-s3.so in output "s3"). - outputs = [ "out" "dev" ]; -@@ -42,7 +33,6 @@ stdenv.mkDerivation rec { - nativeBuildInputs = [ cmake curl ]; - - buildInputs = [ -- aws-crt-cpp - curl openssl zlib - ] ++ lib.optionals (stdenv.isDarwin && - ((builtins.elem "text-to-speech" apis) || --- -2.33.0 - diff --git a/third_party/nixpkgs/patches/pr142117-fix-hyperv.patch b/third_party/nixpkgs/patches/pr142117-fix-hyperv.patch deleted file mode 100644 index a661f73859..0000000000 --- a/third_party/nixpkgs/patches/pr142117-fix-hyperv.patch +++ /dev/null @@ -1,22 +0,0 @@ -From d6e1fb43c4e61e7f3df7c72d167758d48aae4647 Mon Sep 17 00:00:00 2001 -From: Sam Hug -Date: Mon, 18 Oct 2021 11:22:53 -0700 -Subject: [PATCH] nixos/hyperv: fix evaluation of kernelParams - ---- - nixos/modules/virtualisation/hyperv-guest.nix | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/nixos/modules/virtualisation/hyperv-guest.nix b/nixos/modules/virtualisation/hyperv-guest.nix -index b3bcfff19807..fb6502644b80 100644 ---- a/nixos/modules/virtualisation/hyperv-guest.nix -+++ b/nixos/modules/virtualisation/hyperv-guest.nix -@@ -34,7 +34,7 @@ in { - initrd.availableKernelModules = [ "hyperv_keyboard" ]; - - kernelParams = [ -- "video=hyperv_fb:${cfg.videoMode} elevator=noop" -+ "video=hyperv_fb:${cfg.videoMode}" "elevator=noop" - ]; - }; - diff --git a/third_party/nixpkgs/patches/series b/third_party/nixpkgs/patches/series index 75c15cae33..324117f1f0 100644 --- a/third_party/nixpkgs/patches/series +++ b/third_party/nixpkgs/patches/series @@ -1,4 +1,2 @@ patch-cherrypy.patch pomerium-fix.patch -pr142117-fix-hyperv.patch -0001-Revert-aws-sdk-cpp-1.8.130-1.9.121.patch