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

+2 -2

pkgs/applications/misc/iptsd/default.nix

··· 10 10 , fmt 11 11 , hidrd 12 12 , inih 13 - , microsoft_gsl 13 + , microsoft-gsl 14 14 , spdlog 15 15 , systemd 16 16 }: ··· 41 41 fmt 42 42 hidrd 43 43 inih 44 - microsoft_gsl 44 + microsoft-gsl 45 45 spdlog 46 46 systemd 47 47 ];

+3 -3

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

··· 29 29 , jemalloc 30 30 , rnnoise 31 31 , abseil-cpp 32 - , microsoft_gsl 32 + , microsoft-gsl 33 33 , wayland 34 34 , libicns 35 35 , Cocoa ··· 140 140 tl-expected 141 141 rnnoise 142 142 tg_owt 143 - microsoft_gsl 143 + microsoft-gsl 144 144 ] ++ lib.optionals stdenv.isLinux [ 145 145 kwayland 146 146 alsa-lib ··· 199 199 preFixup = '' 200 200 binName=${if stdenv.isLinux then "kotatogram-desktop" else "Kotatogram"} 201 201 remove-references-to -t ${stdenv.cc.cc} $out/bin/$binName 202 - remove-references-to -t ${microsoft_gsl} $out/bin/$binName 202 + remove-references-to -t ${microsoft-gsl} $out/bin/$binName 203 203 remove-references-to -t ${tg_owt.dev} $out/bin/$binName 204 204 ''; 205 205

+2 -2

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

··· 52 52 , libsysprof-capture 53 53 , libpsl 54 54 , brotli 55 - , microsoft_gsl 55 + , microsoft-gsl 56 56 , rlottie 57 57 , stdenv 58 58 }: ··· 161 161 libsysprof-capture 162 162 libpsl 163 163 brotli 164 - microsoft_gsl 164 + microsoft-gsl 165 165 rlottie 166 166 ]; 167 167

+2 -2

pkgs/applications/terminal-emulators/contour/default.nix

··· 11 11 , boost 12 12 , catch2 13 13 , fmt 14 - , microsoft_gsl 14 + , microsoft-gsl 15 15 , range-v3 16 16 , yaml-cpp 17 17 , ncurses ··· 62 62 boost 63 63 catch2 64 64 fmt 65 - microsoft_gsl 65 + microsoft-gsl 66 66 range-v3 67 67 yaml-cpp 68 68 ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.libs.utmp ];

+2 -2

pkgs/development/libraries/iqueue/default.nix

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

pkgs/development/libraries/microsoft_gsl/default.nix pkgs/development/libraries/microsoft-gsl/default.nix

+2 -2

pkgs/misc/ite-backlight/default.nix

··· 7 7 , boost 8 8 , fetchFromGitHub 9 9 , pkg-config 10 - , microsoft_gsl 10 + , microsoft-gsl 11 11 }: 12 12 13 13 stdenv.mkDerivation rec { ··· 25 25 ninja 26 26 pkg-config 27 27 meson 28 - microsoft_gsl 28 + microsoft-gsl 29 29 ]; 30 30 31 31 buildInputs = [

+2 -2

pkgs/tools/graphics/ueberzugpp/default.nix

··· 14 14 , vips 15 15 , nlohmann_json 16 16 , libsixel 17 - , microsoft_gsl 17 + , microsoft-gsl 18 18 , opencv 19 19 , xorg 20 20 , withOpencv ? stdenv.isLinux ··· 49 49 vips 50 50 nlohmann_json 51 51 libsixel 52 - microsoft_gsl 52 + microsoft-gsl 53 53 ] ++ lib.optionals withOpencv [ 54 54 opencv 55 55 ] ++ lib.optionals withX11 [

+2 -1

pkgs/top-level/aliases.nix

··· 264 264 couchdb2 = throw "couchdb2 was removed from nixpkgs, use couchdb3 instead"; # Added 2021-03-03 265 265 coreclr = throw "coreclr has been removed from nixpkgs, use dotnet-sdk instead"; # added 2022-06-12 266 266 corgi = throw "corgi has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-02 267 - cpp-gsl = throw "'cpp-gsl' has been renamed to/replaced by 'microsoft_gsl'"; # Converted to throw 2022-02-22 267 + cpp-gsl = throw "'cpp-gsl' has been renamed to/replaced by 'microsoft-gsl'"; # Converted to throw 2022-02-22 268 268 cpp_ethereum = throw "cpp_ethereum has been removed; abandoned upstream"; # Added 2020-11-30 269 269 cpuminer-multi = throw "cpuminer-multi has been removed: deleted by upstream"; # Added 2022-01-07 270 270 crafty = throw "crafty has been removed: deleted by upstream"; # Added 2022-01-07 ··· 1036 1036 mess = mame; # Added 2019-10-30 1037 1037 metal = throw "metal has been removed due to lack of maintainers"; 1038 1038 metricbeat6 = throw "metricbeat6 has been removed because it reached end of life"; # Added 2022-10-04 1039 + microsoft_gsl = microsoft-gsl; # Added 2023-05-26 1039 1040 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 1040 1041 midoriWrapper = throw "'midoriWrapper' has been renamed to/replaced by 'midori'"; # Converted to throw 2022-02-22 1041 1042 mime-types = mailcap; # Added 2022-01-21

+1 -1

pkgs/top-level/all-packages.nix

··· 22994 22994 22995 22995 mhddfs = callPackage ../tools/filesystems/mhddfs { }; 22996 22996 22997 - microsoft_gsl = callPackage ../development/libraries/microsoft_gsl { }; 22997 + microsoft-gsl = callPackage ../development/libraries/microsoft-gsl { }; 22998 22998 22999 22999 microsoft-edge = callPackage (import ../applications/networking/browsers/microsoft-edge).stable { }; 23000 23000 microsoft-edge-beta = callPackage (import ../applications/networking/browsers/microsoft-edge).beta { };

Configure Feed

Configure Feed