From 9ed27f014e73590ccaf87e8c0f573c27f0dd1e62 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 14 Sep 2024 14:28:10 +0200 Subject: [PATCH] coeurl: move to by-name and reformat --- .../co/coeurl/package.nix} | 31 ++++++++++++------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 20 insertions(+), 13 deletions(-) rename pkgs/{development/libraries/coeurl/default.nix => by-name/co/coeurl/package.nix} (73%) diff --git a/pkgs/development/libraries/coeurl/default.nix b/pkgs/by-name/co/coeurl/package.nix similarity index 73% rename from pkgs/development/libraries/coeurl/default.nix rename to pkgs/by-name/co/coeurl/package.nix index d2cba732fa20..b3a24e910bda 100644 --- a/pkgs/development/libraries/coeurl/default.nix +++ b/pkgs/by-name/co/coeurl/package.nix @@ -1,12 +1,13 @@ -{ lib -, stdenv -, fetchFromGitLab -, ninja -, pkg-config -, meson -, libevent -, curl -, spdlog +{ + lib, + stdenv, + fetchFromGitLab, + ninja, + pkg-config, + meson, + libevent, + curl, + spdlog, }: stdenv.mkDerivation rec { @@ -24,9 +25,17 @@ stdenv.mkDerivation rec { substituteInPlace subprojects/curl.wrap --replace '[provides]' '[provide]' ''; - nativeBuildInputs = [ ninja pkg-config meson ]; + nativeBuildInputs = [ + ninja + pkg-config + meson + ]; - buildInputs = [ libevent curl spdlog ]; + buildInputs = [ + libevent + curl + spdlog + ]; meta = with lib; { description = "Simple async wrapper around CURL for C++"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a5e9c8fc17a4..1bec0857df1a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19180,8 +19180,6 @@ with pkgs; protobuf = protobuf_21; }; - coeurl = callPackage ../development/libraries/coeurl { }; - coercer = callPackage ../tools/security/coercer { }; cogl = callPackage ../development/libraries/cogl {