From 8980e3ca624ba4b8f32cdf59150edb758adf10be Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Fri, 24 May 2019 11:24:11 +0200 Subject: [PATCH] cpp-gsl: remove in favor of microsoft_gsl It's the same package twice but cpp-gsl is older. --- .../development/libraries/cpp-gsl/default.nix | 30 ------------------- .../libraries/microsoft_gsl/default.nix | 12 +++++--- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 9 insertions(+), 36 deletions(-) delete mode 100644 pkgs/development/libraries/cpp-gsl/default.nix diff --git a/pkgs/development/libraries/cpp-gsl/default.nix b/pkgs/development/libraries/cpp-gsl/default.nix deleted file mode 100644 index 833275c72bd..00000000000 --- a/pkgs/development/libraries/cpp-gsl/default.nix +++ /dev/null @@ -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 ]; - }; -} diff --git a/pkgs/development/libraries/microsoft_gsl/default.nix b/pkgs/development/libraries/microsoft_gsl/default.nix index b63de43fd9b..788d2c5d618 100644 --- a/pkgs/development/libraries/microsoft_gsl/default.nix +++ b/pkgs/development/libraries/microsoft_gsl/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { sha256 = "1kxfca9ik934nkzyn34ingkyvwpc09li81cg1yc6vqcrdw51l4ri"; }; - # build phase just runs the unit tests, so skip it if # we're doing a cross build nativeBuildInputs = [ catch cmake ]; @@ -27,10 +26,15 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Functions and types that are suggested for use by the C++ Core Guidelines"; - 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. + ''; + homepage = "https://github.com/Microsoft/GSL"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ thoughtpolice xwvvvvwx ]; + maintainers = with maintainers; [ thoughtpolice xwvvvvwx yuriaisaka ]; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 628e19ce82b..377322c5bcc 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -61,6 +61,7 @@ mapAliases ({ conkerorWrapper = conkeror; # added 2015-01 conntrack_tools = conntrack-tools; # added 2018-05 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 cups_filters = cups-filters; # added 2016-08 cv = progress; # added 2015-09-06 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b76d509ea1..042b7517660 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7115,8 +7115,6 @@ in compcert = callPackage ../development/compilers/compcert { }; - cpp-gsl = callPackage ../development/libraries/cpp-gsl { }; - cryptol = haskell.lib.justStaticExecutables haskellPackages.cryptol; inherit (callPackages ../development/compilers/crystal {