gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

yaml-cpp: backport patch for CMake 4; {osm2xmap,proj_7,yaml-cpp_0_3}: drop (#443325)

Browse Source
This commit is contained in:
K900
2025-09-16 05:09:49 +00:00
committed by GitHub
parent fd6c07a083 798a52c35c
commit 9cbba9c42c
10 changed files with 12 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/os/osm2xmap/package.nix
-47
View File
@@ -1,47 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
libroxml,
proj_7,
yaml-cpp_0_3,
boost,
}:
stdenv.mkDerivation rec {
pname = "osm2xmap";
version = "2.0";
src = fetchFromGitHub {
sha256 = "1d3f18wzk240yp0q8i2vskhcfj5ar61s4hw83vgps0wr2aglph3w";
repo = "osm2xmap";
owner = "sembruk";
rev = "v${version}";
};
makeFlags = [
"GIT_VERSION=${version}"
"GIT_TIMESTAMP="
"SHAREDIR=${placeholder "out"}/share/osm2xmap/"
"INSTALL_BINDIR=${placeholder "out"}/bin"
"INSTALL_MANDIR=${placeholder "out"}/share/man/man1"
];
env.NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H";
buildInputs = [
libroxml
proj_7
yaml-cpp_0_3
boost
];
meta = with lib; {
homepage = "https://github.com/sembruk/osm2xmap";
description = "Converter from OpenStreetMap data format to OpenOrienteering Mapper format";
license = licenses.gpl3;
maintainers = [ maintainers.mpickering ];
platforms = with lib.platforms; linux;
mainProgram = "osm2xmap";
};
}
pkgs/development/libraries/proj/only-add-curl-for-static-builds.patch → pkgs/by-name/pr/proj/only-add-curl-for-static-builds.patch
View File
pkgs/development/libraries/proj/default.nix → pkgs/by-name/pr/proj/package.nix
View File
pkgs/development/libraries/proj/tests.nix → pkgs/by-name/pr/proj/tests.nix
View File
pkgs/development/libraries/yaml-cpp/default.nix → pkgs/by-name/ya/yaml-cpp/package.nix
+9
View File
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
gitUpdater,
cmake,
static ? stdenv.hostPlatform.isStatic,
@@ -18,6 +19,14 @@ stdenv.mkDerivation rec {
hash = "sha256-J87oS6Az1/vNdyXu3L7KmUGWzU0IAkGrGMUUha+xDXI=";
};
patches = [
(fetchpatch {
name = "yaml-cpp-fix-cmake-4.patch";
url = "https://github.com/jbeder/yaml-cpp/commit/c2680200486572baf8221ba052ef50b58ecd816e.patch";
hash = "sha256-1kXRa+xrAbLEhcJxNV1oGHPmayj1RNIe6dDWXZA3mUA=";
})
];
strictDeps = true;
nativeBuildInputs = [
pkgs/development/libraries/proj/7.nix
-76
View File
@@ -1,76 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
pkg-config,
sqlite,
libtiff,
curl,
gtest,
fetchpatch,
}:
stdenv.mkDerivation rec {
pname = "proj";
version = "7.2.1";
src = fetchFromGitHub {
owner = "OSGeo";
repo = "PROJ";
rev = version;
sha256 = "0mymvfvs8xggl4axvlj7kc1ksd9g94kaz6w1vdv0x2y5mqk93gx9";
};
patches = [
(fetchpatch {
# https://github.com/OSGeo/PROJ/issues/2557
name = "gie_self_tests-fail.diff"; # included in >= 8.0.1
url = "https://github.com/OSGeo/PROJ/commit/6f1a3c4648bf06862dca0b3725cbb3b7ee0284e3.diff";
sha256 = "0gapny0a9c3r0x9szjgn86sspjrrf4vwbija77b17w6ci5cq4pdf";
})
./tests-sqlite-3.39.patch
];
postPatch = lib.optionalString (version == "7.2.1") ''
substituteInPlace CMakeLists.txt \
--replace "MAJOR 7 MINOR 2 PATCH 0" "MAJOR 7 MINOR 2 PATCH 1"
'';
outputs = [
"out"
"dev"
];
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = [
sqlite
libtiff
curl
];
nativeCheckInputs = [ gtest ];
cmakeFlags = [
"-DUSE_EXTERNAL_GTEST=ON"
];
CXXFLAGS = [
# GCC 13: error: 'int64_t' in namespace 'std' does not name a type
"-include cstdint"
];
doCheck = true;
meta = with lib; {
broken = true; # undefined reference to `TIFFReadEncodedStrip'
description = "Cartographic Projections Library";
homepage = "https://proj4.org";
license = licenses.mit;
platforms = platforms.unix;
maintainers = with maintainers; [ dotlambda ];
};
}
pkgs/development/libraries/proj/tests-sqlite-3.39.patch
-13
View File
@@ -1,13 +0,0 @@
Drop tests that time out with newest sqlite.
https://github.com/OSGeo/PROJ/issues/3254
--- a/test/cli/CMakeLists.txt
+++ b/test/cli/CMakeLists.txt
@@ -16 +15,0 @@
-proj_add_test_script_sh("testprojinfo" PROJINFO_BIN)
--- a/test/unit/CMakeLists.txt
+++ b/test/unit/CMakeLists.txt
@@ -144,3 +143,0 @@
-add_test(NAME proj_test_cpp_api COMMAND proj_test_cpp_api)
-set_property(TEST proj_test_cpp_api
- PROPERTY ENVIRONMENT ${PROJ_TEST_ENVIRONMENT})
pkgs/development/libraries/yaml-cpp/0.3.0.nix
-39
View File
@@ -1,39 +0,0 @@
{
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 = "YAML parser and emitter for C++";
homepage = "https://github.com/jbeder/yaml-cpp";
license = licenses.mit;
platforms = platforms.all;
maintainers = with maintainers; [ OPNA2608 ];
};
}
pkgs/top-level/aliases.nix
+3 -2
View File
@@ -1352,8 +1352,6 @@ mapAliases {
libvpx_1_8 = throw "libvpx_1_8 has been removed because it is impacted by security issues and not used in nixpkgs, move to 'libvpx'"; # Added 2024-07-26
libwnck3 = libwnck; # Added 2021-06-23
libxplayer-plparser = throw "libxplayer-plparser has been removed as the upstream project was archived"; # Added 2024-12-27
libyamlcpp = yaml-cpp; # Added 2023-01-29
libyamlcpp_0_3 = yaml-cpp_0_3; # Added 2023-01-29
libzapojit = throw "'libzapojit' has been removed due to lack of upstream maintenance and archival"; # Added 2025-04-16
licensor = throw "'licensor' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
lightdm_gtk_greeter = lightdm-gtk-greeter; # Added 2022-08-01
@@ -1910,6 +1908,7 @@ mapAliases {
oraclejdk8distro = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01
oraclejdk11 = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01
OSCAR = oscar; # Added 2024-06-12
osm2xmap = throw "osm2xmap has been removed, as it is unmaintained upstream and depended on old dependencies with broken builds"; # Added 2025-09-16
osxfuse = throw "'osxfuse' has been renamed to/replaced by 'macfuse-stubs'"; # Converted to throw 2024-10-17
overrideSDK = "overrideSDK has been removed as it was a legacy compatibility stub. See <https://nixos.org/manual/nixpkgs/stable/#sec-darwin-legacy-frameworks-overrides> for migration instructions"; # Added 2025-08-04
ovn-lts = throw "ovn-lts has been removed. Please use the latest version available under ovn"; # Added 2024-08-24
@@ -2068,6 +2067,7 @@ mapAliases {
private-gpt = throw "'private-gpt' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2025-07-28
probe-rs = probe-rs-tools; # Added 2024-05-23
probe-run = throw "probe-run is deprecated upstream. Use probe-rs instead."; # Added 2024-05-23
proj_7 = throw "proj_7 has been removed, as it was broken and unused"; # Added 2025-09-16
prometheus-dmarc-exporter = dmarc-metrics-exporter; # added 2022-05-31
prometheus-dovecot-exporter = dovecot_exporter; # Added 2024-06-10
prometheus-openldap-exporter = throw "'prometheus-openldap-exporter' has been removed from nixpkgs, as it was unmaintained"; # Added 2024-09-01
@@ -2655,6 +2655,7 @@ mapAliases {
### Y ###
yacc = throw "'yacc' has been renamed to/replaced by 'bison'"; # Converted to throw 2024-10-17
yaml-cpp_0_3 = throw "yaml-cpp_0_3 has been removed, as it was unused"; # Added 2025-09-16
yesplaymusic = throw "YesPlayMusic has been removed as it was broken, unmaintained, and used deprecated Node and Electron versions"; # Added 2024-12-13
yafaray-core = libyafaray; # Added 2022-09-23
yandex-browser = throw "'yandex-browser' has been removed, as it was broken and unmaintained"; # Added 2025-04-17
pkgs/top-level/all-packages.nix
-8
View File
@@ -8325,10 +8325,6 @@ with pkgs;
libwpe-fdo = callPackage ../development/libraries/libwpe/fdo.nix { };
yaml-cpp = callPackage ../development/libraries/yaml-cpp { };
yaml-cpp_0_3 = callPackage ../development/libraries/yaml-cpp/0.3.0.nix { };
liquid-dsp = callPackage ../development/libraries/liquid-dsp {
inherit (darwin) autoSignDarwinBinariesHook;
};
@@ -8639,10 +8635,6 @@ with pkgs;
utils = true;
};
proj = callPackage ../development/libraries/proj { };
proj_7 = callPackage ../development/libraries/proj/7.nix { };
prospector = callPackage ../development/tools/prospector { };
protobuf = protobuf_32;