alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

treewide: microsoft_gsl -> microsoft-gsl

Browse source
This commit is contained in:
Weijia Wang 2023-05-26 13:43:45 +03:00
parent 027259f359
commit 5bafafe369
10 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/misc/iptsd/default.nix
View file

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

6
pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix
View file

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

4
pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
View file

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

4
pkgs/applications/terminal-emulators/contour/default.nix
View file

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

4
pkgs/development/libraries/iqueue/default.nix
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 { stdenv.mkDerivation rec {
pname = "iqueue"; pname = "iqueue";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
doCheck = true; doCheck = true;
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ libbsd microsoft_gsl ]; buildInputs = [ libbsd microsoft-gsl ];
env.NIX_CFLAGS_COMPILE = toString [ env.NIX_CFLAGS_COMPILE = toString [
# Needed with GCC 12 # Needed with GCC 12

0
pkgs/development/libraries/microsoft_gsl/default.nix → pkgs/development/libraries/microsoft-gsl/default.nix
View file

4
pkgs/misc/ite-backlight/default.nix
View file

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

4
pkgs/tools/graphics/ueberzugpp/default.nix
View file

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

3
pkgs/top-level/aliases.nix
View file

@ -264,7 +264,7 @@ mapAliases ({
couchdb2 = throw "couchdb2 was removed from nixpkgs, use couchdb3 instead"; # Added 2021-03-03 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 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 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 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 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 crafty = throw "crafty has been removed: deleted by upstream"; # Added 2022-01-07
@ -1036,6 +1036,7 @@ mapAliases ({
mess = mame; # Added 2019-10-30 mess = mame; # Added 2019-10-30
metal = throw "metal has been removed due to lack of maintainers"; 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 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 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 midoriWrapper = throw "'midoriWrapper' has been renamed to/replaced by 'midori'"; # Converted to throw 2022-02-22
mime-types = mailcap; # Added 2022-01-21 mime-types = mailcap; # Added 2022-01-21

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

@ -22981,7 +22981,7 @@ with pkgs;
mhddfs = callPackage ../tools/filesystems/mhddfs { }; 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 = callPackage (import ../applications/networking/browsers/microsoft-edge).stable { };
microsoft-edge-beta = callPackage (import ../applications/networking/browsers/microsoft-edge).beta { }; microsoft-edge-beta = callPackage (import ../applications/networking/browsers/microsoft-edge).beta { };