diff --git a/pkgs/applications/audio/ashuffle/default.nix b/pkgs/applications/audio/ashuffle/default.nix index bd5a6448574..fa75711acea 100644 --- a/pkgs/applications/audio/ashuffle/default.nix +++ b/pkgs/applications/audio/ashuffle/default.nix @@ -6,7 +6,7 @@ , meson , ninja , libmpdclient -, libyamlcpp +, yaml-cpp }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { dontUseCmakeConfigure = true; nativeBuildInputs = [ cmake pkg-config meson ninja ]; - buildInputs = [ libmpdclient libyamlcpp ]; + buildInputs = [ libmpdclient yaml-cpp ]; mesonFlags = [ "-Dunsupported_use_system_yamlcpp=true" ]; diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 71633c8c8e4..2d8b3c2bb09 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -25,7 +25,7 @@ , makeWrapper , pandoc , llvmPackages -, libyamlcpp +, yaml-cpp , soci , postgresql , nodejs @@ -95,7 +95,7 @@ in openssl R libuuid - libyamlcpp + yaml-cpp soci postgresql ] ++ (if server then [ diff --git a/pkgs/applications/misc/huggle/default.nix b/pkgs/applications/misc/huggle/default.nix index 85c65a0eeb4..327457a017b 100644 --- a/pkgs/applications/misc/huggle/default.nix +++ b/pkgs/applications/misc/huggle/default.nix @@ -8,7 +8,7 @@ , unzip , wrapQtAppsHook , qtwebengine -, libyamlcpp +, yaml-cpp , libirc }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { which cmake ]; - buildInputs = [ ncurses libyamlcpp qtwebengine libirc ]; + buildInputs = [ ncurses yaml-cpp qtwebengine libirc ]; patches = [ ./00-remove-third-party.patch ./01-extensions.patch ]; postPatch = '' diff --git a/pkgs/applications/misc/osm2xmap/default.nix b/pkgs/applications/misc/osm2xmap/default.nix index f9f880050ed..ef31ed2f033 100644 --- a/pkgs/applications/misc/osm2xmap/default.nix +++ b/pkgs/applications/misc/osm2xmap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libroxml, proj_7, libyamlcpp, boost } : +{ lib, stdenv, fetchFromGitHub, libroxml, proj_7, yaml-cpp_0_3, boost } : stdenv.mkDerivation rec { pname = "osm2xmap"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { 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"; diff --git a/pkgs/applications/networking/instant-messengers/jami/daemon.nix b/pkgs/applications/networking/instant-messengers/jami/daemon.nix index 131ca7b913c..715560c6e12 100644 --- a/pkgs/applications/networking/instant-messengers/jami/daemon.nix +++ b/pkgs/applications/networking/instant-messengers/jami/daemon.nix @@ -21,7 +21,7 @@ , libnatpmp , libpulseaudio , libupnp -, libyamlcpp +, yaml-cpp , msgpack , opendht-jami , openssl @@ -62,7 +62,7 @@ stdenv.mkDerivation { libnatpmp libpulseaudio libupnp - libyamlcpp + yaml-cpp msgpack opendht-jami openssl diff --git a/pkgs/applications/science/biology/dcm2niix/default.nix b/pkgs/applications/science/biology/dcm2niix/default.nix index 90eef027a84..cbde1647db9 100644 --- a/pkgs/applications/science/biology/dcm2niix/default.nix +++ b/pkgs/applications/science/biology/dcm2niix/default.nix @@ -4,7 +4,7 @@ , substituteAll , cmake , openjpeg -, libyamlcpp +, yaml-cpp , batchVersion ? false , withJpegLs ? true , withOpenJpeg ? true @@ -40,12 +40,12 @@ stdenv.mkDerivation rec { ]; 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 [ diff --git a/pkgs/applications/science/chemistry/d-seams/default.nix b/pkgs/applications/science/chemistry/d-seams/default.nix index dc41019d364..260b1e24a08 100644 --- a/pkgs/applications/science/chemistry/d-seams/default.nix +++ b/pkgs/applications/science/chemistry/d-seams/default.nix @@ -1,4 +1,4 @@ -{ 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 { @@ -20,7 +20,7 @@ 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 = diff --git a/pkgs/applications/science/computer-architecture/timeloop/default.nix b/pkgs/applications/science/computer-architecture/timeloop/default.nix index e1ed24be783..9b277ac650b 100644 --- a/pkgs/applications/science/computer-architecture/timeloop/default.nix +++ b/pkgs/applications/science/computer-architecture/timeloop/default.nix @@ -5,7 +5,7 @@ , libconfig , boost , libyaml -, libyamlcpp +, yaml-cpp , ncurses , gpm , enableAccelergy ? true @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { libconfig boost libyaml - libyamlcpp + yaml-cpp ncurses accelergy ] ++ lib.optionals stdenv.isLinux [ gpm ]; diff --git a/pkgs/applications/science/physics/nnpdf/default.nix b/pkgs/applications/science/physics/nnpdf/default.nix index bc9e3c7e90c..c3ac1f6e0a8 100644 --- a/pkgs/applications/science/physics/nnpdf/default.nix +++ b/pkgs/applications/science/physics/nnpdf/default.nix @@ -8,7 +8,7 @@ , gsl , lhapdf , libarchive -, libyamlcpp +, yaml-cpp , python3 , sqlite , swig @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { gsl lhapdf libarchive - libyamlcpp + yaml-cpp python3 python3.pkgs.numpy sqlite diff --git a/pkgs/applications/science/physics/xfitter/default.nix b/pkgs/applications/science/physics/xfitter/default.nix index 4e6f6626602..31df19b539a 100644 --- a/pkgs/applications/science/physics/xfitter/default.nix +++ b/pkgs/applications/science/physics/xfitter/default.nix @@ -13,7 +13,7 @@ , lhapdf , libtirpc , libyaml -, libyamlcpp +, yaml-cpp , pkg-config , qcdnum , root @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { 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 diff --git a/pkgs/applications/terminal-emulators/contour/default.nix b/pkgs/applications/terminal-emulators/contour/default.nix index a736e836cb6..0e74c2046c0 100644 --- a/pkgs/applications/terminal-emulators/contour/default.nix +++ b/pkgs/applications/terminal-emulators/contour/default.nix @@ -13,7 +13,7 @@ , fmt , microsoft_gsl , range-v3 -, libyamlcpp +, yaml-cpp , ncurses , file , darwin @@ -64,7 +64,7 @@ mkDerivation rec { fmt microsoft_gsl range-v3 - libyamlcpp + yaml-cpp ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.libs.utmp ]; preConfigure = '' diff --git a/pkgs/development/libraries/librime/default.nix b/pkgs/development/libraries/librime/default.nix index 4fc6489130d..7daa4ad19e5 100644 --- a/pkgs/development/libraries/librime/default.nix +++ b/pkgs/development/libraries/librime/default.nix @@ -1,5 +1,5 @@ { 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}"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { 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; diff --git a/pkgs/development/libraries/libyaml-cpp/0.3.0.nix b/pkgs/development/libraries/libyaml-cpp/0.3.0.nix deleted file mode 100644 index e379c347267..00000000000 --- a/pkgs/development/libraries/libyaml-cpp/0.3.0.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ 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; [ ]; - }; -} diff --git a/pkgs/development/libraries/libyaml-cpp/default.nix b/pkgs/development/libraries/libyaml-cpp/default.nix deleted file mode 100644 index 9b30ce19b1d..00000000000 --- a/pkgs/development/libraries/libyaml-cpp/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ 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; [ ]; - }; -} diff --git a/pkgs/development/libraries/opencolorio/1.x.nix b/pkgs/development/libraries/opencolorio/1.x.nix index 2941a1a1e7c..0355b997744 100644 --- a/pkgs/development/libraries/opencolorio/1.x.nix +++ b/pkgs/development/libraries/opencolorio/1.x.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { 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" diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix index 4cf75039c49..3d8a5588043 100644 --- a/pkgs/development/libraries/opencolorio/default.nix +++ b/pkgs/development/libraries/opencolorio/default.nix @@ -4,7 +4,7 @@ , fetchpatch , cmake , expat -, libyamlcpp +, yaml-cpp , ilmbase , pystring , imath @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ expat - libyamlcpp + yaml-cpp ilmbase pystring imath diff --git a/pkgs/development/libraries/yaml-cpp/0.3.0.nix b/pkgs/development/libraries/yaml-cpp/0.3.0.nix new file mode 100644 index 00000000000..fad3397b74b --- /dev/null +++ b/pkgs/development/libraries/yaml-cpp/0.3.0.nix @@ -0,0 +1,38 @@ +{ 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 ]; + }; +} diff --git a/pkgs/development/libraries/yaml-cpp/default.nix b/pkgs/development/libraries/yaml-cpp/default.nix new file mode 100644 index 00000000000..c9468b10b99 --- /dev/null +++ b/pkgs/development/libraries/yaml-cpp/default.nix @@ -0,0 +1,61 @@ +{ 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 ]; + }; +} diff --git a/pkgs/development/tools/luaformatter/default.nix b/pkgs/development/tools/luaformatter/default.nix index b2d719267a6..207ef4d9fe1 100644 --- a/pkgs/development/tools/luaformatter/default.nix +++ b/pkgs/development/tools/luaformatter/default.nix @@ -1,4 +1,4 @@ -{ 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; @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { (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"; diff --git a/pkgs/development/tools/luaformatter/fix-lib-paths.patch b/pkgs/development/tools/luaformatter/fix-lib-paths.patch index fce2347d8e0..610a313ca27 100644 --- a/pkgs/development/tools/luaformatter/fix-lib-paths.patch +++ b/pkgs/development/tools/luaformatter/fix-lib-paths.patch @@ -12,7 +12,7 @@ index 4a21b94..0ac7911 100644 - ${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/ ) diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix index 661cf394e52..ce9d098082d 100644 --- a/pkgs/games/openxcom/default.nix +++ b/pkgs/games/openxcom/default.nix @@ -7,7 +7,7 @@ , libGL , zlib , openssl -, libyamlcpp +, yaml-cpp , boost , SDL , SDL_image @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { 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"; diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index e316423f01a..a8579a50fb6 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -1,6 +1,6 @@ { 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 @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { re2 protobuf grpc - libyamlcpp + yaml-cpp jsoncpp nlohmann_json ] ++ lib.optionals (kernel != null) kernel.moduleBuildDependencies; diff --git a/pkgs/servers/dns/pdns/default.nix b/pkgs/servers/dns/pdns/default.nix index a4bcd8744e8..72e1bfaf464 100644 --- a/pkgs/servers/dns/pdns/default.nix +++ b/pkgs/servers/dns/pdns/default.nix @@ -1,5 +1,5 @@ { 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 }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { 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. diff --git a/pkgs/servers/mir/default.nix b/pkgs/servers/mir/default.nix index 9d4fd2a7341..7d629ddb68e 100644 --- a/pkgs/servers/mir/default.nix +++ b/pkgs/servers/mir/default.nix @@ -23,7 +23,7 @@ , libxcb , libxkbcommon , libxmlxx -, libyamlcpp +, yaml-cpp , lttng-ust , mesa , nettle @@ -136,7 +136,7 @@ stdenv.mkDerivation rec { libxcb libxkbcommon libxmlxx - libyamlcpp + yaml-cpp lttng-ust mesa nettle diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix index a253e6d7fbc..10febf0fd5c 100644 --- a/pkgs/servers/nosql/mongodb/mongodb.nix +++ b/pkgs/servers/nosql/mongodb/mongodb.nix @@ -7,7 +7,7 @@ , pcre-cpp , snappy , zlib -, libyamlcpp +, yaml-cpp , sasl , openssl , libpcap @@ -91,7 +91,7 @@ in stdenv.mkDerivation rec { curl gperftools libpcap - libyamlcpp + yaml-cpp openssl pcre-cpp variants.python diff --git a/pkgs/servers/scylladb/default.nix b/pkgs/servers/scylladb/default.nix index d44885360f9..ef55409d280 100644 --- a/pkgs/servers/scylladb/default.nix +++ b/pkgs/servers/scylladb/default.nix @@ -19,7 +19,7 @@ protobuf, cryptopp, libxfs, - libyamlcpp, + yaml-cpp, libsystemtap, lksctp-tools, lz4, @@ -64,7 +64,7 @@ gcc8Stdenv.mkDerivation { protobuf cryptopp libxfs - libyamlcpp + yaml-cpp libsystemtap lksctp-tools lz4 diff --git a/pkgs/tools/inputmethods/interception-tools/default.nix b/pkgs/tools/inputmethods/interception-tools/default.nix index 5d5bd7bdfc2..843584a7d44 100644 --- a/pkgs/tools/inputmethods/interception-tools/default.nix +++ b/pkgs/tools/inputmethods/interception-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, pkg-config, cmake, libyamlcpp, +{ lib, stdenv, fetchFromGitLab, pkg-config, cmake, yaml-cpp, libevdev, udev, boost }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ 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"; diff --git a/pkgs/tools/inputmethods/interception-tools/dual-function-keys.nix b/pkgs/tools/inputmethods/interception-tools/dual-function-keys.nix index 9824a46d43e..f8caefa6087 100644 --- a/pkgs/tools/inputmethods/interception-tools/dual-function-keys.nix +++ b/pkgs/tools/inputmethods/interception-tools/dual-function-keys.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitLab, pkg-config, libyamlcpp, libevdev }: +{ stdenv, lib, fetchFromGitLab, pkg-config, yaml-cpp, libevdev }: stdenv.mkDerivation rec { pname = "dual-function-keys"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libevdev libyamlcpp ]; + buildInputs = [ libevdev yaml-cpp ]; prePatch = '' substituteInPlace config.mk --replace \ diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index 34d05852a7e..71656745ac2 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -1,5 +1,5 @@ { 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 @@ -43,7 +43,7 @@ mkDerivation rec { 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 ]; diff --git a/pkgs/tools/misc/coreboot-configurator/default.nix b/pkgs/tools/misc/coreboot-configurator/default.nix index 923b7d55cae..7e0a6d0c706 100644 --- a/pkgs/tools/misc/coreboot-configurator/default.nix +++ b/pkgs/tools/misc/coreboot-configurator/default.nix @@ -5,7 +5,7 @@ , meson , ninja , pkg-config -, libyamlcpp +, yaml-cpp , nvramtool , qtbase , qtsvg @@ -24,7 +24,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ inkscape meson ninja pkg-config wrapQtAppsHook ]; - buildInputs = [ libyamlcpp qtbase qtsvg ]; + buildInputs = [ yaml-cpp qtbase qtsvg ]; postPatch = '' substituteInPlace src/application/*.cpp \ diff --git a/pkgs/tools/misc/torrenttools/default.nix b/pkgs/tools/misc/torrenttools/default.nix index 8e9bbba4461..f8da452c52f 100644 --- a/pkgs/tools/misc/torrenttools/default.nix +++ b/pkgs/tools/misc/torrenttools/default.nix @@ -10,7 +10,7 @@ , fmt , gsl-lite , howard-hinnant-date -, libyamlcpp +, yaml-cpp , ninja , nlohmann_json , openssl @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { fmt gsl-lite howard-hinnant-date - libyamlcpp + yaml-cpp nlohmann_json openssl re2 diff --git a/pkgs/tools/networking/ip2unix/default.nix b/pkgs/tools/networking/ip2unix/default.nix index 7e2eef70b8a..c4c03cae3a7 100644 --- a/pkgs/tools/networking/ip2unix/default.nix +++ b/pkgs/tools/networking/ip2unix/default.nix @@ -1,4 +1,4 @@ -{ 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 }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { systemd ]; - buildInputs = [ libyamlcpp ]; + buildInputs = [ yaml-cpp ]; doCheck = true; diff --git a/pkgs/tools/package-management/micromamba/default.nix b/pkgs/tools/package-management/micromamba/default.nix index 55b949aad4e..e79bfc889dc 100644 --- a/pkgs/tools/package-management/micromamba/default.nix +++ b/pkgs/tools/package-management/micromamba/default.nix @@ -9,7 +9,7 @@ , ghc_filesystem , libarchive , libsolv -, libyamlcpp +, yaml-cpp , nlohmann_json , python3 , reproc @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { nlohmann_json curl libarchive - libyamlcpp + yaml-cpp libsolv' reproc spdlog' diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index d1d18809a5b..de4acffa63e 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -1,4 +1,4 @@ -{ 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"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { 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"; diff --git a/pkgs/tools/system/thinkfan/default.nix b/pkgs/tools/system/thinkfan/default.nix index a564c946bcf..dc6920a97bd 100644 --- a/pkgs/tools/system/thinkfan/default.nix +++ b/pkgs/tools/system/thinkfan/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , cmake -, libyamlcpp +, yaml-cpp , pkg-config , procps , coreutils @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { 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"; diff --git a/pkgs/tools/wayland/way-displays/default.nix b/pkgs/tools/wayland/way-displays/default.nix index 8d8b744583c..60f2b3e8374 100644 --- a/pkgs/tools/wayland/way-displays/default.nix +++ b/pkgs/tools/wayland/way-displays/default.nix @@ -4,7 +4,7 @@ , pkg-config , wayland , libinput -, libyamlcpp +, yaml-cpp }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ wayland - libyamlcpp + yaml-cpp libinput ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d6dd82b8bda..a8b064f07a3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -827,6 +827,8 @@ mapAliases ({ 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 83fd17549fa..efa2f0dfe55 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21955,9 +21955,9 @@ with pkgs; 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 { }; @@ -31945,9 +31945,7 @@ with pkgs; 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 { };