From 67d181f13c4c2491ddd487c0be962b29c9282a80 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 19 May 2023 13:43:57 +0300 Subject: [PATCH] microsoft_gsl: 3.1.0 -> 4.0.0 --- .../libraries/microsoft_gsl/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/microsoft_gsl/default.nix b/pkgs/development/libraries/microsoft_gsl/default.nix index 35765ff2d43f..f0bd76ab4fba 100644 --- a/pkgs/development/libraries/microsoft_gsl/default.nix +++ b/pkgs/development/libraries/microsoft_gsl/default.nix @@ -3,29 +3,20 @@ , fetchFromGitHub , cmake , gtest -, fetchpatch , pkg-config }: stdenv.mkDerivation rec { - pname = "microsoft_gsl"; - version = "3.1.0"; + pname = "microsoft-gsl"; + version = "4.0.0"; src = fetchFromGitHub { owner = "Microsoft"; repo = "GSL"; rev = "v${version}"; - sha256 = "sha256-gIpyuNlp3mvR8r1Azs2r76ElEodykRLGAwMN4BDJez0="; + hash = "sha256-cXDFqt2KgMFGfdh6NGE+JmP4R0Wm9LNHM0eIblYe6zU="; }; - patches = [ - # Search for GoogleTest via pkg-config first, ref: https://github.com/NixOS/nixpkgs/pull/130525 - (fetchpatch { - url = "https://github.com/microsoft/GSL/commit/f5cf01083baf7e8dc8318db3648bc6098dc32d67.patch"; - sha256 = "sha256-HJxG87nVFo1CGNivCqt/JhjTj2xLzQe8bF5Km7/KG+Y="; - }) - ]; - nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ gtest ];