From 3a5076501f838a7d268e0edb7051ddcfdfba0977 Mon Sep 17 00:00:00 2001 From: Rafael Fernández López Date: Tue, 23 May 2023 21:35:05 +0200 Subject: fastly: 10.0.1 -> 10.1.0 --- pkgs/misc/fastly/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/misc') diff --git a/pkgs/misc/fastly/default.nix b/pkgs/misc/fastly/default.nix index e06777c1325..2eec7227fc6 100644 --- a/pkgs/misc/fastly/default.nix +++ b/pkgs/misc/fastly/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "fastly"; - version = "10.0.1"; + version = "10.1.0"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-khGg6TcbyJMn+hiBANhHA6IU6aODTA94AV7yCaELqrs="; + hash = "sha256-gMSKk5igNy8W7Qb1xtKgfpzftiPVZaAv/oKIdinTMGA="; # The git commit is part of the `fastly version` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, @@ -52,8 +52,8 @@ buildGoModule rec { ]; preBuild = let cliConfigToml = fetchurl { - url = "https://web.archive.org/web/20230412222811/https://developer.fastly.com/api/internal/cli-config"; - hash = "sha256-NACjeBGOvBL6kUBZtSx4ChZgn7V69f4K2yyDCwTZsbU="; + url = "https://web.archive.org/web/20230523192914/https://developer.fastly.com/api/internal/cli-config"; + hash = "sha256-zgZ3m69dRvuc1S7hHeLxzrM/Z/u0PKUn0XbyQOYO3es="; }; in '' cp ${cliConfigToml} ./pkg/config/config.toml -- cgit 1.4.1 From 5bafafe369db3d6db24e526cc5a0a1945ded7d1e Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 26 May 2023 13:43:45 +0300 Subject: treewide: microsoft_gsl -> microsoft-gsl --- pkgs/applications/misc/iptsd/default.nix | 4 +-- .../telegram/kotatogram-desktop/default.nix | 6 ++-- .../telegram/telegram-desktop/default.nix | 4 +-- .../terminal-emulators/contour/default.nix | 4 +-- pkgs/development/libraries/iqueue/default.nix | 4 +-- .../libraries/microsoft-gsl/default.nix | 37 ++++++++++++++++++++++ .../libraries/microsoft_gsl/default.nix | 37 ---------------------- pkgs/misc/ite-backlight/default.nix | 4 +-- pkgs/tools/graphics/ueberzugpp/default.nix | 4 +-- pkgs/top-level/aliases.nix | 3 +- pkgs/top-level/all-packages.nix | 2 +- 11 files changed, 55 insertions(+), 54 deletions(-) create mode 100644 pkgs/development/libraries/microsoft-gsl/default.nix delete mode 100644 pkgs/development/libraries/microsoft_gsl/default.nix (limited to 'pkgs/misc') diff --git a/pkgs/applications/misc/iptsd/default.nix b/pkgs/applications/misc/iptsd/default.nix index 2c1ac9dc252..6cebdd2e9b0 100644 --- a/pkgs/applications/misc/iptsd/default.nix +++ b/pkgs/applications/misc/iptsd/default.nix @@ -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 ]; diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index 36b2b6bc50b..dbd81911501 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -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 ''; diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 254540bf8f9..28f3c363bbd 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -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 ]; diff --git a/pkgs/applications/terminal-emulators/contour/default.nix b/pkgs/applications/terminal-emulators/contour/default.nix index 0e74c2046c0..c1eba0e3fe4 100644 --- a/pkgs/applications/terminal-emulators/contour/default.nix +++ b/pkgs/applications/terminal-emulators/contour/default.nix @@ -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 ]; diff --git a/pkgs/development/libraries/iqueue/default.nix b/pkgs/development/libraries/iqueue/default.nix index 8803628f675..7f5d5c4c069 100644 --- a/pkgs/development/libraries/iqueue/default.nix +++ b/pkgs/development/libraries/iqueue/default.nix @@ -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 diff --git a/pkgs/development/libraries/microsoft-gsl/default.nix b/pkgs/development/libraries/microsoft-gsl/default.nix new file mode 100644 index 00000000000..f0bd76ab4fb --- /dev/null +++ b/pkgs/development/libraries/microsoft-gsl/default.nix @@ -0,0 +1,37 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, gtest +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "microsoft-gsl"; + version = "4.0.0"; + + src = fetchFromGitHub { + owner = "Microsoft"; + repo = "GSL"; + rev = "v${version}"; + hash = "sha256-cXDFqt2KgMFGfdh6NGE+JmP4R0Wm9LNHM0eIblYe6zU="; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ gtest ]; + + doCheck = true; + + meta = with lib; { + 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 yuriaisaka ]; + }; +} diff --git a/pkgs/development/libraries/microsoft_gsl/default.nix b/pkgs/development/libraries/microsoft_gsl/default.nix deleted file mode 100644 index f0bd76ab4fb..00000000000 --- a/pkgs/development/libraries/microsoft_gsl/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, gtest -, pkg-config -}: - -stdenv.mkDerivation rec { - pname = "microsoft-gsl"; - version = "4.0.0"; - - src = fetchFromGitHub { - owner = "Microsoft"; - repo = "GSL"; - rev = "v${version}"; - hash = "sha256-cXDFqt2KgMFGfdh6NGE+JmP4R0Wm9LNHM0eIblYe6zU="; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ gtest ]; - - doCheck = true; - - meta = with lib; { - 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 yuriaisaka ]; - }; -} diff --git a/pkgs/misc/ite-backlight/default.nix b/pkgs/misc/ite-backlight/default.nix index 033ff0f2055..aa53ecabff3 100644 --- a/pkgs/misc/ite-backlight/default.nix +++ b/pkgs/misc/ite-backlight/default.nix @@ -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 = [ diff --git a/pkgs/tools/graphics/ueberzugpp/default.nix b/pkgs/tools/graphics/ueberzugpp/default.nix index 41b707ba51c..cd9c5ca3e86 100644 --- a/pkgs/tools/graphics/ueberzugpp/default.nix +++ b/pkgs/tools/graphics/ueberzugpp/default.nix @@ -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 [ diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 655d76c2be5..1a19c510d21 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ad00e45c4f..8a76c7f03c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22981,7 +22981,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 { }; -- cgit 1.4.1