ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-29 14:57:28 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #232811 from wegank/microsoft-gsl-bump

Browse Source 
microsoft_gsl: 3.1.0 -> 4.0.0
This commit is contained in:
Weijia Wang 2023-05-19 15:02:16 +03:00 committed by GitHub
commit 9758484940
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/development/libraries/microsoft_gsl/default.nix
View File

@ -3,29 +3,20 @@
, fetchFromGitHub , fetchFromGitHub
, cmake , cmake
, gtest , gtest
, fetchpatch
, pkg-config , pkg-config
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "microsoft_gsl"; pname = "microsoft-gsl";
version = "3.1.0"; version = "4.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Microsoft"; owner = "Microsoft";
repo = "GSL"; repo = "GSL";
rev = "v${version}"; 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 ]; nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ gtest ]; buildInputs = [ gtest ];