Merge pull request #234198 from wegank/microsoft-gsl-rename

treewide: microsoft_gsl -> microsoft-gsl
This commit is contained in:
Weijia Wang 2023-05-26 14:56:27 +03:00 committed by GitHub
commit 25d265d433
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 18 additions and 17 deletions

View file

@ -10,7 +10,7 @@
, fmt
, hidrd
, inih
, microsoft_gsl
, microsoft-gsl
, spdlog
, systemd
}:
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
fmt
hidrd
inih
microsoft_gsl
microsoft-gsl
spdlog
systemd
];

View file

@ -29,7 +29,7 @@
, jemalloc
, rnnoise
, abseil-cpp
, microsoft_gsl
, microsoft-gsl
, wayland
, libicns
, Cocoa
@ -140,7 +140,7 @@ stdenv.mkDerivation rec {
tl-expected
rnnoise
tg_owt
microsoft_gsl
microsoft-gsl
] ++ lib.optionals stdenv.isLinux [
kwayland
alsa-lib
@ -199,7 +199,7 @@ stdenv.mkDerivation rec {
preFixup = ''
binName=${if stdenv.isLinux then "kotatogram-desktop" else "Kotatogram"}
remove-references-to -t ${stdenv.cc.cc} $out/bin/$binName
remove-references-to -t ${microsoft_gsl} $out/bin/$binName
remove-references-to -t ${microsoft-gsl} $out/bin/$binName
remove-references-to -t ${tg_owt.dev} $out/bin/$binName
'';

View file

@ -52,7 +52,7 @@
, libsysprof-capture
, libpsl
, brotli
, microsoft_gsl
, microsoft-gsl
, rlottie
, stdenv
}:
@ -161,7 +161,7 @@ stdenv.mkDerivation rec {
libsysprof-capture
libpsl
brotli
microsoft_gsl
microsoft-gsl
rlottie
];

View file

@ -11,7 +11,7 @@
, boost
, catch2
, fmt
, microsoft_gsl
, microsoft-gsl
, range-v3
, yaml-cpp
, ncurses
@ -62,7 +62,7 @@ mkDerivation rec {
boost
catch2
fmt
microsoft_gsl
microsoft-gsl
range-v3
yaml-cpp
] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.libs.utmp ];

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkg-config, libbsd, microsoft_gsl }:
{ lib, stdenv, fetchurl, pkg-config, libbsd, microsoft-gsl }:
stdenv.mkDerivation rec {
pname = "iqueue";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
doCheck = true;
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libbsd microsoft_gsl ];
buildInputs = [ libbsd microsoft-gsl ];
env.NIX_CFLAGS_COMPILE = toString [
# Needed with GCC 12

View file

@ -7,7 +7,7 @@
, boost
, fetchFromGitHub
, pkg-config
, microsoft_gsl
, microsoft-gsl
}:
stdenv.mkDerivation rec {
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
ninja
pkg-config
meson
microsoft_gsl
microsoft-gsl
];
buildInputs = [

View file

@ -14,7 +14,7 @@
, vips
, nlohmann_json
, libsixel
, microsoft_gsl
, microsoft-gsl
, opencv
, xorg
, withOpencv ? stdenv.isLinux
@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
vips
nlohmann_json
libsixel
microsoft_gsl
microsoft-gsl
] ++ lib.optionals withOpencv [
opencv
] ++ lib.optionals withX11 [

View file

@ -264,7 +264,7 @@ mapAliases ({
couchdb2 = throw "couchdb2 was removed from nixpkgs, use couchdb3 instead"; # Added 2021-03-03
coreclr = throw "coreclr has been removed from nixpkgs, use dotnet-sdk instead"; # added 2022-06-12
corgi = throw "corgi has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-02
cpp-gsl = throw "'cpp-gsl' has been renamed to/replaced by 'microsoft_gsl'"; # Converted to throw 2022-02-22
cpp-gsl = throw "'cpp-gsl' has been renamed to/replaced by 'microsoft-gsl'"; # Converted to throw 2022-02-22
cpp_ethereum = throw "cpp_ethereum has been removed; abandoned upstream"; # Added 2020-11-30
cpuminer-multi = throw "cpuminer-multi has been removed: deleted by upstream"; # Added 2022-01-07
crafty = throw "crafty has been removed: deleted by upstream"; # Added 2022-01-07
@ -1036,6 +1036,7 @@ mapAliases ({
mess = mame; # Added 2019-10-30
metal = throw "metal has been removed due to lack of maintainers";
metricbeat6 = throw "metricbeat6 has been removed because it reached end of life"; # Added 2022-10-04
microsoft_gsl = microsoft-gsl; # Added 2023-05-26
mididings = throw "mididings has been removed from nixpkgs as it doesn't support recent python3 versions and its upstream stopped maintaining it"; # Added 2022-01-12
midoriWrapper = throw "'midoriWrapper' has been renamed to/replaced by 'midori'"; # Converted to throw 2022-02-22
mime-types = mailcap; # Added 2022-01-21

View file

@ -22994,7 +22994,7 @@ with pkgs;
mhddfs = callPackage ../tools/filesystems/mhddfs { };
microsoft_gsl = callPackage ../development/libraries/microsoft_gsl { };
microsoft-gsl = callPackage ../development/libraries/microsoft-gsl { };
microsoft-edge = callPackage (import ../applications/networking/browsers/microsoft-edge).stable { };
microsoft-edge-beta = callPackage (import ../applications/networking/browsers/microsoft-edge).beta { };