Merge pull request #213490 from OPNA2608/refactor/yaml-cpp

yaml-cpp*: Refactor, rename, adopt

Sandro a9cadfb7 dd49386f

Changed files
+168 -141
pkgs
applications
audio
ashuffle
editors
rstudio
misc
huggle
osm2xmap
networking
instant-messengers
jami
science
biology
dcm2niix
chemistry
d-seams
computer-architecture
timeloop
physics
nnpdf
xfitter
terminal-emulators
contour
development
libraries
librime
libyaml-cpp
opencolorio
yaml-cpp
tools
games
openxcom
os-specific
linux
sysdig
servers
dns
mir
nosql
mongodb
scylladb
tools
inputmethods
interception-tools
misc
calamares
coreboot-configurator
torrenttools
networking
ip2unix
package-management
micromamba
system
facter
thinkfan
wayland
way-displays
top-level
+2 -2
pkgs/applications/audio/ashuffle/default.nix
···
, meson
, ninja
, libmpdclient
-
, libyamlcpp
+
, yaml-cpp
}:
stdenv.mkDerivation rec {
···
dontUseCmakeConfigure = true;
nativeBuildInputs = [ cmake pkg-config meson ninja ];
-
buildInputs = [ libmpdclient libyamlcpp ];
+
buildInputs = [ libmpdclient yaml-cpp ];
mesonFlags = [ "-Dunsupported_use_system_yamlcpp=true" ];
+2 -2
pkgs/applications/editors/rstudio/default.nix
···
, makeWrapper
, pandoc
, llvmPackages
-
, libyamlcpp
+
, yaml-cpp
, soci
, postgresql
, nodejs
···
openssl
R
libuuid
-
libyamlcpp
+
yaml-cpp
soci
postgresql
] ++ (if server then [
+2 -2
pkgs/applications/misc/huggle/default.nix
···
, unzip
, wrapQtAppsHook
, qtwebengine
-
, libyamlcpp
+
, yaml-cpp
, libirc
}:
···
which
cmake
];
-
buildInputs = [ ncurses libyamlcpp qtwebengine libirc ];
+
buildInputs = [ ncurses yaml-cpp qtwebengine libirc ];
patches = [ ./00-remove-third-party.patch ./01-extensions.patch ];
postPatch = ''
+2 -2
pkgs/applications/misc/osm2xmap/default.nix
···
-
{ lib, stdenv, fetchFromGitHub, libroxml, proj_7, libyamlcpp, boost } :
+
{ lib, stdenv, fetchFromGitHub, libroxml, proj_7, yaml-cpp_0_3, boost } :
stdenv.mkDerivation rec {
pname = "osm2xmap";
···
NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H";
-
buildInputs = [ libroxml proj_7 libyamlcpp boost ];
+
buildInputs = [ libroxml proj_7 yaml-cpp_0_3 boost ];
meta = with lib; {
homepage = "https://github.com/sembruk/osm2xmap";
+2 -2
pkgs/applications/networking/instant-messengers/jami/daemon.nix
···
, libnatpmp
, libpulseaudio
, libupnp
-
, libyamlcpp
+
, yaml-cpp
, msgpack
, opendht-jami
, openssl
···
libnatpmp
libpulseaudio
libupnp
-
libyamlcpp
+
yaml-cpp
msgpack
opendht-jami
openssl
+3 -3
pkgs/applications/science/biology/dcm2niix/default.nix
···
, substituteAll
, cmake
, openjpeg
-
, libyamlcpp
+
, yaml-cpp
, batchVersion ? false
, withJpegLs ? true
, withOpenJpeg ? true
···
];
nativeBuildInputs = [ cmake ];
-
buildInputs = lib.optionals batchVersion [ libyamlcpp ]
+
buildInputs = lib.optionals batchVersion [ yaml-cpp ]
++ lib.optionals withOpenJpeg [ openjpeg openjpeg.dev ];
cmakeFlags = lib.optionals batchVersion [
"-DBATCH_VERSION=ON"
-
"-DYAML-CPP_DIR=${libyamlcpp}/lib/cmake/yaml-cpp"
+
"-DYAML-CPP_DIR=${yaml-cpp}/lib/cmake/yaml-cpp"
] ++ lib.optionals withJpegLs [
"-DUSE_JPEGLS=ON"
] ++ lib.optionals withOpenJpeg [
+2 -2
pkgs/applications/science/chemistry/d-seams/default.nix
···
-
{ clangStdenv, fetchFromGitHub, fetchpatch, catch2, rang, fmt, libyamlcpp, cmake
+
{ clangStdenv, fetchFromGitHub, fetchpatch, catch2, rang, fmt, yaml-cpp, cmake
, eigen, lua, luaPackages, liblapack, blas, lib, boost, gsl }:
clangStdenv.mkDerivation rec {
···
})
];
nativeBuildInputs = [ cmake lua luaPackages.luafilesystem ];
-
buildInputs = [ fmt rang libyamlcpp eigen catch2 boost gsl liblapack blas ];
+
buildInputs = [ fmt rang yaml-cpp eigen catch2 boost gsl liblapack blas ];
meta = with lib; {
description =
+2 -2
pkgs/applications/science/computer-architecture/timeloop/default.nix
···
, libconfig
, boost
, libyaml
-
, libyamlcpp
+
, yaml-cpp
, ncurses
, gpm
, enableAccelergy ? true
···
libconfig
boost
libyaml
-
libyamlcpp
+
yaml-cpp
ncurses
accelergy
] ++ lib.optionals stdenv.isLinux [ gpm ];
+2 -2
pkgs/applications/science/physics/nnpdf/default.nix
···
, gsl
, lhapdf
, libarchive
-
, libyamlcpp
+
, yaml-cpp
, python3
, sqlite
, swig
···
gsl
lhapdf
libarchive
-
libyamlcpp
+
yaml-cpp
python3
python3.pkgs.numpy
sqlite
+2 -2
pkgs/applications/science/physics/xfitter/default.nix
···
, lhapdf
, libtirpc
, libyaml
-
, libyamlcpp
+
, yaml-cpp
, pkg-config
, qcdnum
, root
···
nativeBuildInputs = [ cmake gfortran pkg-config ];
buildInputs =
-
[ apfel blas ceres-solver lhapdf lapack libyaml root qcdnum gsl libyamlcpp zlib ]
+
[ apfel blas ceres-solver lhapdf lapack libyaml root qcdnum gsl yaml-cpp zlib ]
++ lib.optionals ("5" == lib.versions.major root.version) [ apfelgrid applgrid ]
++ lib.optionals (stdenv.system == "x86_64-darwin") [ memorymappingHook memstreamHook ]
++ lib.optional (stdenv.hostPlatform.libc == "glibc") libtirpc
+2 -2
pkgs/applications/terminal-emulators/contour/default.nix
···
, fmt
, microsoft_gsl
, range-v3
-
, libyamlcpp
+
, yaml-cpp
, ncurses
, file
, darwin
···
fmt
microsoft_gsl
range-v3
-
libyamlcpp
+
yaml-cpp
] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.libs.utmp ];
preConfigure = ''
+2 -2
pkgs/development/libraries/librime/default.nix
···
{ lib, stdenv, fetchFromGitHub, cmake, boost, glog, leveldb, marisa, opencc,
-
libyamlcpp, gtest, capnproto, pkg-config, plugins ? [ ] }:
+
yaml-cpp, gtest, capnproto, pkg-config, plugins ? [ ] }:
let
copySinglePlugin = plug: "cp -r ${plug} plugins/${plug.name}";
···
nativeBuildInputs = [ cmake pkg-config ];
-
buildInputs = [ boost glog leveldb marisa opencc libyamlcpp gtest capnproto ]
+
buildInputs = [ boost glog leveldb marisa opencc yaml-cpp gtest capnproto ]
++ plugins; # for propagated build inputs
preConfigure = copyPlugins;
-32
pkgs/development/libraries/libyaml-cpp/0.3.0.nix
···
-
{ lib, stdenv, fetchFromGitHub, cmake }:
-
-
stdenv.mkDerivation rec {
-
pname = "libyaml-cpp";
-
version = "0.3.0";
-
-
src = fetchFromGitHub {
-
owner = "jbeder";
-
repo = "yaml-cpp";
-
rev = "release-${version}";
-
sha256 = "sha256-pmgcULTXhl83+Wc8ZsGebnJ1t0XybHhUEJxDnEZE5x8=";
-
};
-
-
# implement https://github.com/jbeder/yaml-cpp/commit/52a1378e48e15d42a0b755af7146394c6eff998c
-
postPatch = ''
-
substituteInPlace CMakeLists.txt \
-
--replace 'option(YAML_BUILD_SHARED_LIBS "Build Shared Libraries" OFF)' \
-
'option(YAML_BUILD_SHARED_LIBS "Build yaml-cpp shared library" ''${BUILD_SHARED_LIBS})'
-
'';
-
-
nativeBuildInputs = [ cmake ];
-
-
cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DYAML_CPP_BUILD_TESTS=OFF" ];
-
-
meta = with lib; {
-
inherit (src.meta) homepage;
-
description = "A YAML parser and emitter for C++";
-
license = licenses.mit;
-
platforms = platforms.unix;
-
maintainers = with maintainers; [ ];
-
};
-
}
-40
pkgs/development/libraries/libyaml-cpp/default.nix
···
-
{ lib, stdenv, fetchFromGitHub, cmake, fetchpatch }:
-
-
stdenv.mkDerivation rec {
-
pname = "libyaml-cpp";
-
version = "0.7.0";
-
-
src = fetchFromGitHub {
-
owner = "jbeder";
-
repo = "yaml-cpp";
-
rev = "yaml-cpp-${version}";
-
sha256 = "sha256-2tFWccifn0c2lU/U1WNg2FHrBohjx8CXMllPJCevaNk=";
-
};
-
-
patches = [
-
# https://github.com/jbeder/yaml-cpp/issues/774
-
# https://github.com/jbeder/yaml-cpp/pull/1037
-
(fetchpatch {
-
url = "https://github.com/jbeder/yaml-cpp/commit/4f48727b365962e31451cd91027bd797bc7d2ee7.patch";
-
sha256 = "sha256-jarZAh7NgwL3xXzxijDiAQmC/EC2WYfNMkYHEIQBPhM=";
-
})
-
# TODO: Remove with the next release, when https://github.com/jbeder/yaml-cpp/pull/1058 is available
-
(fetchpatch {
-
name = "libyaml-cpp-Fix-pc-paths-for-absolute-GNUInstallDirs.patchj";
-
url = "https://github.com/jbeder/yaml-cpp/commit/328d2d85e833be7cb5a0ab246cc3f5d7e16fc67a.patch";
-
sha256 = "12g5h7lxzd5v16ykay03zww5g28j3k69k228yr3v8fnmyv2spkfl";
-
})
-
];
-
-
nativeBuildInputs = [ cmake ];
-
-
cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DYAML_CPP_BUILD_TESTS=OFF" ];
-
-
meta = with lib; {
-
inherit (src.meta) homepage;
-
description = "A YAML parser and emitter for C++";
-
license = licenses.mit;
-
platforms = platforms.unix;
-
maintainers = with maintainers; [ ];
-
};
-
}
+1 -1
pkgs/development/libraries/opencolorio/1.x.nix
···
cmakeFlags = [
"-DUSE_EXTERNAL_LCMS=ON"
"-DUSE_EXTERNAL_TINYXML=ON"
-
# External libyamlcpp 0.6.* not compatible: https://github.com/imageworks/OpenColorIO/issues/517
+
# External yaml-cpp 0.6.* not compatible: https://github.com/imageworks/OpenColorIO/issues/517
"-DUSE_EXTERNAL_YAML=OFF"
] ++ lib.optional stdenv.isDarwin "-DOCIO_USE_BOOST_PTR=ON"
++ lib.optional (!stdenv.hostPlatform.isx86) "-DOCIO_USE_SSE=OFF"
+2 -2
pkgs/development/libraries/opencolorio/default.nix
···
, fetchpatch
, cmake
, expat
-
, libyamlcpp
+
, yaml-cpp
, ilmbase
, pystring
, imath
···
nativeBuildInputs = [ cmake ];
buildInputs = [
expat
-
libyamlcpp
+
yaml-cpp
ilmbase
pystring
imath
+38
pkgs/development/libraries/yaml-cpp/0.3.0.nix
···
+
{ lib
+
, stdenv
+
, fetchFromGitHub
+
, cmake
+
}:
+
+
stdenv.mkDerivation rec {
+
pname = "yaml-cpp";
+
version = "0.3.0";
+
+
src = fetchFromGitHub {
+
owner = "jbeder";
+
repo = "yaml-cpp";
+
rev = "release-${version}";
+
hash = "sha256-pmgcULTXhl83+Wc8ZsGebnJ1t0XybHhUEJxDnEZE5x8=";
+
};
+
+
strictDeps = true;
+
+
nativeBuildInputs = [
+
cmake
+
];
+
+
cmakeFlags = [
+
"-DYAML_CPP_BUILD_TOOLS=${lib.boolToString doCheck}"
+
"-DBUILD_SHARED_LIBS=${lib.boolToString (!stdenv.hostPlatform.isStatic)}"
+
];
+
+
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
+
+
meta = with lib; {
+
description = "A YAML parser and emitter for C++";
+
homepage = "https://github.com/jbeder/yaml-cpp";
+
license = licenses.mit;
+
platforms = platforms.all;
+
maintainers = with maintainers; [ OPNA2608 ];
+
};
+
}
+61
pkgs/development/libraries/yaml-cpp/default.nix
···
+
{ lib
+
, stdenv
+
, fetchFromGitHub
+
, gitUpdater
+
, cmake
+
, fetchpatch
+
}:
+
+
stdenv.mkDerivation rec {
+
pname = "yaml-cpp";
+
version = "0.7.0";
+
+
src = fetchFromGitHub {
+
owner = "jbeder";
+
repo = "yaml-cpp";
+
rev = "yaml-cpp-${version}";
+
hash = "sha256-2tFWccifn0c2lU/U1WNg2FHrBohjx8CXMllPJCevaNk=";
+
};
+
+
patches = [
+
# https://github.com/jbeder/yaml-cpp/issues/774
+
# https://github.com/jbeder/yaml-cpp/pull/1037
+
(fetchpatch {
+
name = "yaml-cpp-Fix-generated-cmake-config.patch";
+
url = "https://github.com/jbeder/yaml-cpp/commit/4f48727b365962e31451cd91027bd797bc7d2ee7.patch";
+
hash = "sha256-jarZAh7NgwL3xXzxijDiAQmC/EC2WYfNMkYHEIQBPhM=";
+
})
+
# TODO: Remove with the next release, when https://github.com/jbeder/yaml-cpp/pull/1058 is available
+
(fetchpatch {
+
name = "yaml-cpp-Fix-pc-paths-for-absolute-GNUInstallDirs.patch";
+
url = "https://github.com/jbeder/yaml-cpp/commit/328d2d85e833be7cb5a0ab246cc3f5d7e16fc67a.patch";
+
hash = "sha256-1M2rxfbVOrRH9kiImcwcEolXOP8DeDW9Cbu03+mB5Yk=";
+
})
+
];
+
+
strictDeps = true;
+
+
nativeBuildInputs = [
+
cmake
+
];
+
+
cmakeFlags = [
+
"-DYAML_CPP_BUILD_TOOLS=false"
+
"-DYAML_BUILD_SHARED_LIBS=${lib.boolToString (!stdenv.hostPlatform.isStatic)}"
+
"-DINSTALL_GTEST=false"
+
];
+
+
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
+
+
passthru.updateScript = gitUpdater {
+
rev-prefix = "yaml-cpp-";
+
};
+
+
meta = with lib; {
+
description = "A YAML parser and emitter for C++";
+
homepage = "https://github.com/jbeder/yaml-cpp";
+
license = licenses.mit;
+
platforms = platforms.all;
+
maintainers = with maintainers; [ OPNA2608 ];
+
};
+
}
+3 -3
pkgs/development/tools/luaformatter/default.nix
···
-
{ lib, stdenv, fetchFromGitHub, substituteAll, antlr4_9, libargs, catch2, cmake, libyamlcpp }:
+
{ lib, stdenv, fetchFromGitHub, substituteAll, antlr4_9, libargs, catch2, cmake, yaml-cpp }:
let
antlr4 = antlr4_9;
···
(substituteAll {
src = ./fix-lib-paths.patch;
antlr4RuntimeCpp = antlr4.runtime.cpp.dev;
-
inherit libargs catch2 libyamlcpp;
+
inherit libargs catch2 yaml-cpp;
})
];
nativeBuildInputs = [ cmake ];
-
buildInputs = [ antlr4.runtime.cpp libyamlcpp ];
+
buildInputs = [ antlr4.runtime.cpp yaml-cpp ];
meta = with lib; {
description = "Code formatter for Lua";
+1 -1
pkgs/development/tools/luaformatter/fix-lib-paths.patch
···
- ${PROJECT_SOURCE_DIR}/third_party/antlr4/runtime/Cpp/runtime/src
+ @libargs@/include
+ @catch2@/include
-
+ @libyamlcpp@/include
+
+ @yaml-cpp@/include
+ @antlr4RuntimeCpp@/include/antlr4-runtime
${PROJECT_SOURCE_DIR}/src/
)
+2 -2
pkgs/games/openxcom/default.nix
···
, libGL
, zlib
, openssl
-
, libyamlcpp
+
, yaml-cpp
, boost
, SDL
, SDL_image
···
nativeBuildInputs = [ cmake pkg-config ];
-
buildInputs = [ SDL SDL_gfx SDL_image SDL_mixer boost libyamlcpp libGLU libGL openssl zlib ];
+
buildInputs = [ SDL SDL_gfx SDL_image SDL_mixer boost yaml-cpp libGLU libGL openssl zlib ];
meta = with lib; {
description = "Open source clone of UFO: Enemy Unknown";
+2 -2
pkgs/os-specific/linux/sysdig/default.nix
···
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, kernel, installShellFiles, pkg-config
, luajit, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, elfutils, tbb, protobuf, grpc
-
, libyamlcpp, nlohmann_json, re2
+
, yaml-cpp, nlohmann_json, re2
}:
let
···
re2
protobuf
grpc
-
libyamlcpp
+
yaml-cpp
jsoncpp
nlohmann_json
] ++ lib.optionals (kernel != null) kernel.moduleBuildDependencies;
+2 -2
pkgs/servers/dns/pdns/default.nix
···
{ lib, stdenv, fetchurl, pkg-config, nixosTests
-
, boost, libyamlcpp, libsodium, sqlite, protobuf, openssl, systemd
+
, boost, yaml-cpp, libsodium, sqlite, protobuf, openssl, systemd
, mariadb-connector-c, postgresql, lua, openldap, geoip, curl, unixODBC, lmdb, tinycdb
}:
···
nativeBuildInputs = [ pkg-config ];
buildInputs = [
boost mariadb-connector-c postgresql lua openldap sqlite protobuf geoip
-
libyamlcpp libsodium curl unixODBC openssl systemd lmdb tinycdb
+
yaml-cpp libsodium curl unixODBC openssl systemd lmdb tinycdb
];
# Configure phase requires 64-bit time_t even on 32-bit platforms.
+2 -2
pkgs/servers/mir/default.nix
···
, libxcb
, libxkbcommon
, libxmlxx
-
, libyamlcpp
+
, yaml-cpp
, lttng-ust
, mesa
, nettle
···
libxcb
libxkbcommon
libxmlxx
-
libyamlcpp
+
yaml-cpp
lttng-ust
mesa
nettle
+2 -2
pkgs/servers/nosql/mongodb/mongodb.nix
···
, pcre-cpp
, snappy
, zlib
-
, libyamlcpp
+
, yaml-cpp
, sasl
, openssl
, libpcap
···
curl
gperftools
libpcap
-
libyamlcpp
+
yaml-cpp
openssl
pcre-cpp
variants.python
+2 -2
pkgs/servers/scylladb/default.nix
···
protobuf,
cryptopp,
libxfs,
-
libyamlcpp,
+
yaml-cpp,
libsystemtap,
lksctp-tools,
lz4,
···
protobuf
cryptopp
libxfs
-
libyamlcpp
+
yaml-cpp
libsystemtap
lksctp-tools
lz4
+2 -2
pkgs/tools/inputmethods/interception-tools/default.nix
···
-
{ lib, stdenv, fetchFromGitLab, pkg-config, cmake, libyamlcpp,
+
{ lib, stdenv, fetchFromGitLab, pkg-config, cmake, yaml-cpp,
libevdev, udev, boost }:
stdenv.mkDerivation rec {
···
};
nativeBuildInputs = [ cmake pkg-config ];
-
buildInputs = [ libevdev udev libyamlcpp boost ];
+
buildInputs = [ libevdev udev yaml-cpp boost ];
meta = {
description = "A minimal composable infrastructure on top of libudev and libevdev";
+2 -2
pkgs/tools/inputmethods/interception-tools/dual-function-keys.nix
···
-
{ stdenv, lib, fetchFromGitLab, pkg-config, libyamlcpp, libevdev }:
+
{ stdenv, lib, fetchFromGitLab, pkg-config, yaml-cpp, libevdev }:
stdenv.mkDerivation rec {
pname = "dual-function-keys";
···
nativeBuildInputs = [ pkg-config ];
-
buildInputs = [ libevdev libyamlcpp ];
+
buildInputs = [ libevdev yaml-cpp ];
prePatch = ''
substituteInPlace config.mk --replace \
+2 -2
pkgs/tools/misc/calamares/default.nix
···
{ lib, fetchurl, boost, cmake, extra-cmake-modules, kparts, kpmcore, kirigami2
-
, kservice, libatasmart, libxcb, libyamlcpp, libpwquality, parted, polkit-qt, python
+
, kservice, libatasmart, libxcb, yaml-cpp, libpwquality, parted, polkit-qt, python
, qtbase, qtquickcontrols, qtsvg, qttools, qtwebengine, util-linux, tzdata
, ckbcomp, xkeyboard_config, mkDerivation
, nixos-extensions ? false
···
nativeBuildInputs = [ cmake extra-cmake-modules ];
buildInputs = [
boost kparts.dev kpmcore.out kservice.dev kirigami2
-
libatasmart libxcb libyamlcpp libpwquality parted polkit-qt python
+
libatasmart libxcb yaml-cpp libpwquality parted polkit-qt python
qtbase qtquickcontrols qtsvg qttools qtwebengine.dev util-linux
];
+2 -2
pkgs/tools/misc/coreboot-configurator/default.nix
···
, meson
, ninja
, pkg-config
-
, libyamlcpp
+
, yaml-cpp
, nvramtool
, qtbase
, qtsvg
···
};
nativeBuildInputs = [ inkscape meson ninja pkg-config wrapQtAppsHook ];
-
buildInputs = [ libyamlcpp qtbase qtsvg ];
+
buildInputs = [ yaml-cpp qtbase qtsvg ];
postPatch = ''
substituteInPlace src/application/*.cpp \
+2 -2
pkgs/tools/misc/torrenttools/default.nix
···
, fmt
, gsl-lite
, howard-hinnant-date
-
, libyamlcpp
+
, yaml-cpp
, ninja
, nlohmann_json
, openssl
···
fmt
gsl-lite
howard-hinnant-date
-
libyamlcpp
+
yaml-cpp
nlohmann_json
openssl
re2
+2 -2
pkgs/tools/networking/ip2unix/default.nix
···
-
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, libyamlcpp, systemd
+
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, yaml-cpp, systemd
, python3Packages, asciidoc, libxslt, docbook_xml_dtd_45, docbook_xsl
, libxml2, docbook5
}:
···
systemd
];
-
buildInputs = [ libyamlcpp ];
+
buildInputs = [ yaml-cpp ];
doCheck = true;
+2 -2
pkgs/tools/package-management/micromamba/default.nix
···
, ghc_filesystem
, libarchive
, libsolv
-
, libyamlcpp
+
, yaml-cpp
, nlohmann_json
, python3
, reproc
···
nlohmann_json
curl
libarchive
-
libyamlcpp
+
yaml-cpp
libsolv'
reproc
spdlog'
+2 -2
pkgs/tools/system/facter/default.nix
···
-
{ lib, stdenv, fetchFromGitHub, boost, cmake, cpp-hocon, curl, leatherman, libwhereami, libyamlcpp, openssl, ruby, util-linux }:
+
{ lib, stdenv, fetchFromGitHub, boost, cmake, cpp-hocon, curl, leatherman, libwhereami, yaml-cpp, openssl, ruby, util-linux }:
stdenv.mkDerivation rec {
pname = "facter";
···
NIX_CFLAGS_COMPILE = "-Wno-error";
nativeBuildInputs = [ cmake ];
-
buildInputs = [ boost cpp-hocon curl leatherman libwhereami libyamlcpp openssl ruby util-linux ];
+
buildInputs = [ boost cpp-hocon curl leatherman libwhereami yaml-cpp openssl ruby util-linux ];
meta = with lib; {
homepage = "https://github.com/puppetlabs/facter";
+2 -2
pkgs/tools/system/thinkfan/default.nix
···
, stdenv
, fetchFromGitHub
, cmake
-
, libyamlcpp
+
, yaml-cpp
, pkg-config
, procps
, coreutils
···
nativeBuildInputs = [ cmake pkg-config ];
-
buildInputs = [ libyamlcpp ] ++ lib.optional smartSupport libatasmart;
+
buildInputs = [ yaml-cpp ] ++ lib.optional smartSupport libatasmart;
meta = {
description = "A simple, lightweight fan control program";
+2 -2
pkgs/tools/wayland/way-displays/default.nix
···
, pkg-config
, wayland
, libinput
-
, libyamlcpp
+
, yaml-cpp
}:
stdenv.mkDerivation rec {
···
buildInputs = [
wayland
-
libyamlcpp
+
yaml-cpp
libinput
];
+2
pkgs/top-level/aliases.nix
···
libva-full = throw "'libva-full' has been renamed to/replaced by 'libva'"; # Converted to throw 2022-02-22
libva1-full = throw "'libva1-full' has been renamed to/replaced by 'libva1'"; # Converted to throw 2022-02-22
libwnck3 = libwnck;
+
libyamlcpp = yaml-cpp; # Added 2023-01-29
+
libyamlcpp_0_3 = yaml-cpp_0_3; # Added 2023-01-29
lightdm_gtk_greeter = lightdm-gtk-greeter; # Added 2022-08-01
lighttable = throw "'lighttable' crashes (SIGSEGV) on startup, has not been updated in years and depends on deprecated GTK2"; # Added 2022-06-15
lilyterm = throw "lilyterm has been removed from nixpkgs, because it was relying on a vte version that depended on python2"; # Added 2022-01-14
+3 -5
pkgs/top-level/all-packages.nix
···
libyaml = callPackage ../development/libraries/libyaml { };
-
libyamlcpp = callPackage ../development/libraries/libyaml-cpp { };
+
yaml-cpp = callPackage ../development/libraries/yaml-cpp { };
-
libyamlcpp_0_3 = callPackage ../development/libraries/libyaml-cpp/0.3.0.nix { };
+
yaml-cpp_0_3 = callPackage ../development/libraries/yaml-cpp/0.3.0.nix { };
libyang = callPackage ../development/libraries/libyang { };
···
organicmaps = libsForQt5.callPackage ../applications/misc/organicmaps { };
-
osm2xmap = callPackage ../applications/misc/osm2xmap {
-
libyamlcpp = libyamlcpp_0_3;
-
};
+
osm2xmap = callPackage ../applications/misc/osm2xmap { };
osmctools = callPackage ../applications/misc/osmctools { };