nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 23:13:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

gmock: deprecate alias

Browse Source
This commit is contained in:
Sandro Jäckel 2021-03-14 19:03:18 +01:00
parent 33a395f195
commit d24e2d1b0b
No known key found for this signature in database
GPG Key ID: 3AF5A43A3EECC2E5
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/radio/gnss-sdr/default.nix
View File

@ -4,7 +4,7 @@
, cmake , cmake
, gmp , gmp
, glog , glog
, gmock , gtest
, openssl , openssl
, gflags , gflags
, gnuradio3_8 , gnuradio3_8
@ -42,7 +42,7 @@ gnuradio3_8.pkgs.mkDerivation rec {
armadillo armadillo
gnuradio3_8.unwrapped.boost gnuradio3_8.unwrapped.boost
glog glog
gmock gtest
openssl openssl
gflags gflags
orc orc

4
pkgs/development/libraries/libphonenumber/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, gmock, boost, pkg-config, protobuf, icu }: { lib, stdenv, fetchFromGitHub, cmake, gtest, boost, pkg-config, protobuf, icu }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "phonenumber"; pname = "phonenumber";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
gmock gtest
pkg-config pkg-config
]; ];

4
pkgs/development/libraries/librime/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, cmake, boost, glog, leveldb, marisa, opencc, { lib, stdenv, fetchFromGitHub, cmake, boost, glog, leveldb, marisa, opencc,
libyamlcpp, gmock }: libyamlcpp, gtest }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "librime"; pname = "librime";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ boost glog leveldb marisa opencc libyamlcpp gmock ]; buildInputs = [ boost glog leveldb marisa opencc libyamlcpp gtest ];
meta = with lib; { meta = with lib; {
homepage = "https://rime.im/"; homepage = "https://rime.im/";

6
pkgs/development/libraries/protobuf/generic-v3.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv { lib, stdenv
, fetchFromGitHub , fetchFromGitHub
, autoreconfHook, zlib, gmock, buildPackages , autoreconfHook, zlib, gtest, buildPackages
, version, sha256 , version, sha256
, ... , ...
}: }:
@ -20,8 +20,8 @@ mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation {
postPatch = '' postPatch = ''
rm -rf gmock rm -rf gmock
cp -r ${gmock.src}/googlemock gmock cp -r ${gtest.src}/googlemock gmock
cp -r ${gmock.src}/googletest googletest cp -r ${gtest.src}/googletest googletest
chmod -R a+w gmock chmod -R a+w gmock
chmod -R a+w googletest chmod -R a+w googletest
ln -s ../googletest gmock/gtest ln -s ../googletest gmock/gtest

4
pkgs/tools/package-management/nix/default.nix
View File

@ -16,7 +16,7 @@ common =
, jq, libarchive, libcpuid , jq, libarchive, libcpuid
, lowdown, mdbook , lowdown, mdbook
# Used by tests # Used by tests
, gmock , gtest
, busybox-sandbox-shell , busybox-sandbox-shell
, storeDir , storeDir
, stateDir , stateDir
@ -56,7 +56,7 @@ common =
] ]
++ lib.optionals stdenv.isDarwin [ Security ] ++ lib.optionals stdenv.isDarwin [ Security ]
++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
++ lib.optionals is24 [ libarchive gmock lowdown ] ++ lib.optionals is24 [ libarchive gtest lowdown ]
++ lib.optional (is24 && stdenv.isx86_64) libcpuid ++ lib.optional (is24 && stdenv.isx86_64) libcpuid
++ lib.optional withLibseccomp libseccomp ++ lib.optional withLibseccomp libseccomp
++ lib.optional withAWS ++ lib.optional withAWS

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

@ -269,6 +269,7 @@ mapAliases ({
gnustep-make = gnustep.make; # added 2016-7-6 gnustep-make = gnustep.make; # added 2016-7-6
gnupg20 = throw "gnupg20 has been removed from nixpkgs as upstream dropped support on 2017-12-31";# added 2020-07-12 gnupg20 = throw "gnupg20 has been removed from nixpkgs as upstream dropped support on 2017-12-31";# added 2020-07-12
gnuvd = throw "gnuvd was removed because the backend service is missing"; # added 2020-01-14 gnuvd = throw "gnuvd was removed because the backend service is missing"; # added 2020-01-14
gmock = gtest; # moved from top-level 2021-03-14
go_1_12 = throw "go_1_12 has been removed"; # added 2020-04-26 go_1_12 = throw "go_1_12 has been removed"; # added 2020-04-26
go-pup = pup; # added 2017-12-19 go-pup = pup; # added 2017-12-19
gobby5 = gobby; # added 2021-02-01 gobby5 = gobby; # added 2021-02-01

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

@ -5176,7 +5176,6 @@ in
gt5 = callPackage ../tools/system/gt5 { }; gt5 = callPackage ../tools/system/gt5 { };
gtest = callPackage ../development/libraries/gtest { }; gtest = callPackage ../development/libraries/gtest { };
gmock = gtest; # TODO: move to aliases.nix
gbenchmark = callPackage ../development/libraries/gbenchmark {}; gbenchmark = callPackage ../development/libraries/gbenchmark {};