From 32466344b31ff7f89b1a1c27c34e3e3cfe268dc3 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Fri, 2 Apr 2021 02:47:06 +0000 Subject: [PATCH] 3p/nixpkgs: remove 1.1.1k patch, it's in upstream --- third_party/nixpkgs/patches/openssl-1.1.1k.patch | 15 --------------- third_party/nixpkgs/patches/series | 1 - 2 files changed, 16 deletions(-) delete mode 100644 third_party/nixpkgs/patches/openssl-1.1.1k.patch diff --git a/third_party/nixpkgs/patches/openssl-1.1.1k.patch b/third_party/nixpkgs/patches/openssl-1.1.1k.patch deleted file mode 100644 index 4f13ec026b..0000000000 --- a/third_party/nixpkgs/patches/openssl-1.1.1k.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix -index 2edf02e738f30..49ac7954169ff 100644 ---- a/pkgs/development/libraries/openssl/default.nix -+++ b/pkgs/development/libraries/openssl/default.nix -@@ -160,8 +160,8 @@ in { - }; - - openssl_1_1 = common { -- version = "1.1.1j"; -- sha256 = "1gw17520vh13izy1xf5q0a2fqgcayymjjj5bk0dlkxndfnszrwma"; -+ version = "1.1.1k"; -+ sha256 = "1rdfzcrxy9y38wqdw5942vmdax9hjhgrprzxm42csal7p5shhal9"; - patches = [ - ./1.1/nix-ssl-cert-file.patch - diff --git a/third_party/nixpkgs/patches/series b/third_party/nixpkgs/patches/series index 68b750d4e0..bd8d0ba6ce 100644 --- a/third_party/nixpkgs/patches/series +++ b/third_party/nixpkgs/patches/series @@ -1,3 +1,2 @@ various.patch patch-cherrypy.patch -openssl-1.1.1k.patch