JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cpp-gsl: remove in favor of microsoft_gsl

Browse Source 
It's the same package twice but cpp-gsl is older.
This commit is contained in:
Daniel Schaefer 2019-05-24 11:24:11 +02:00
parent ad9f1beab2
commit 8980e3ca62
4 changed files with 9 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkgs/development/libraries/cpp-gsl/default.nix
View File

@ -1,30 +0,0 @@
{ stdenv, fetchFromGitHub, cmake, catch }:
stdenv.mkDerivation rec {
pname = "GSL-unstable";
version = "2017-02-15";
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "Microsoft";
repo = "GSL";
rev = "c87c123d1b3e64ae2cf725584f0c004da4d90f1c";
sha256 = "0h8py468bvxnydkjs352d7a9s8hk0ihc7msjkcnzj2d7nzp5nsc1";
};
NIX_CFLAGS_COMPILE = "-Wno-error=sign-conversion";
nativeBuildInputs = [ cmake catch ];
meta = with stdenv.lib; {
homepage = https://github.com/Microsoft/GSL;
description = "C++ Core Guideline support library";
longDescription = ''
The Guideline Support Library (GSL) contains functions and types that are suggested for
use by the C++ Core Guidelines maintained by the Standard C++ Foundation.
This package contains Microsoft's implementation of GSL.
'';
platforms = stdenv.lib.platforms.unix;
license = licenses.mit;
maintainers = with maintainers; [ yuriaisaka ];
};
}

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

@ -15,7 +15,6 @@ stdenv.mkDerivation rec {
sha256 = "1kxfca9ik934nkzyn34ingkyvwpc09li81cg1yc6vqcrdw51l4ri"; sha256 = "1kxfca9ik934nkzyn34ingkyvwpc09li81cg1yc6vqcrdw51l4ri";
}; };
# build phase just runs the unit tests, so skip it if # build phase just runs the unit tests, so skip it if
# we're doing a cross build # we're doing a cross build
nativeBuildInputs = [ catch cmake ]; nativeBuildInputs = [ catch cmake ];
@ -27,10 +26,15 @@ stdenv.mkDerivation rec {
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Functions and types that are suggested for use by the C++ Core Guidelines"; description = "C++ Core Guideline support library";
homepage = https://github.com/Microsoft/GSL; longDescription = ''
The Guideline Support Library (GSL) contains functions and types that are suggested for
use by the C++ Core Guidelines maintained by the Standard C++ Foundation.
This package contains Microsoft's implementation of GSL.
'';
homepage = "https://github.com/Microsoft/GSL";
license = licenses.mit; license = licenses.mit;
platforms = platforms.all; platforms = platforms.all;
maintainers = with maintainers; [ thoughtpolice xwvvvvwx ]; maintainers = with maintainers; [ thoughtpolice xwvvvvwx yuriaisaka ];
}; };
} }

1
pkgs/top-level/aliases.nix
View File

@ -61,6 +61,7 @@ mapAliases ({
conkerorWrapper = conkeror; # added 2015-01 conkerorWrapper = conkeror; # added 2015-01
conntrack_tools = conntrack-tools; # added 2018-05 conntrack_tools = conntrack-tools; # added 2018-05
cool-old-term = cool-retro-term; # added 2015-01-31 cool-old-term = cool-retro-term; # added 2015-01-31
cpp-gsl = microsoft_gsl; # added 2019-05-24
cupsBjnp = cups-bjnp; # added 2016-01-02 cupsBjnp = cups-bjnp; # added 2016-01-02
cups_filters = cups-filters; # added 2016-08 cups_filters = cups-filters; # added 2016-08
cv = progress; # added 2015-09-06 cv = progress; # added 2015-09-06

2
pkgs/top-level/all-packages.nix
View File

@ -7115,8 +7115,6 @@ in
compcert = callPackage ../development/compilers/compcert { }; compcert = callPackage ../development/compilers/compcert { };
cpp-gsl = callPackage ../development/libraries/cpp-gsl { };
cryptol = haskell.lib.justStaticExecutables haskellPackages.cryptol; cryptol = haskell.lib.justStaticExecutables haskellPackages.cryptol;
inherit (callPackages ../development/compilers/crystal { inherit (callPackages ../development/compilers/crystal {