From 5ec1665962fd5a7a3572a642e57c536a185712ee Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 16 Sep 2025 04:09:19 +0100 Subject: [PATCH 1/6] osm2xmap: drop --- pkgs/by-name/os/osm2xmap/package.nix | 47 ---------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 47 deletions(-) delete mode 100644 pkgs/by-name/os/osm2xmap/package.nix diff --git a/pkgs/by-name/os/osm2xmap/package.nix b/pkgs/by-name/os/osm2xmap/package.nix deleted file mode 100644 index 292b4884711a..000000000000 --- a/pkgs/by-name/os/osm2xmap/package.nix +++ /dev/null @@ -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"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5d903ac3ed8b..ebf5268a7f39 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1910,6 +1910,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 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 From 61b477f6726e915b19b33e445d20f33ff8a2b743 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 16 Sep 2025 04:10:10 +0100 Subject: [PATCH 2/6] proj_7: drop --- pkgs/development/libraries/proj/7.nix | 76 ------------------- .../libraries/proj/tests-sqlite-3.39.patch | 13 ---- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 1 insertion(+), 91 deletions(-) delete mode 100644 pkgs/development/libraries/proj/7.nix delete mode 100644 pkgs/development/libraries/proj/tests-sqlite-3.39.patch diff --git a/pkgs/development/libraries/proj/7.nix b/pkgs/development/libraries/proj/7.nix deleted file mode 100644 index 58b54feee0bf..000000000000 --- a/pkgs/development/libraries/proj/7.nix +++ /dev/null @@ -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 ]; - }; -} diff --git a/pkgs/development/libraries/proj/tests-sqlite-3.39.patch b/pkgs/development/libraries/proj/tests-sqlite-3.39.patch deleted file mode 100644 index 0654ff5eadb6..000000000000 --- a/pkgs/development/libraries/proj/tests-sqlite-3.39.patch +++ /dev/null @@ -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}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ebf5268a7f39..de21703fc4b1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2069,6 +2069,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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e60748213ea..e1e0bed5e8a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8641,8 +8641,6 @@ with pkgs; proj = callPackage ../development/libraries/proj { }; - proj_7 = callPackage ../development/libraries/proj/7.nix { }; - prospector = callPackage ../development/tools/prospector { }; protobuf = protobuf_32; From 5fc1d4322e3ea2374c0a9e3e04aee33af2c7fdf2 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 16 Sep 2025 04:11:34 +0100 Subject: [PATCH 3/6] proj: move to `by-name` --- .../pr}/proj/only-add-curl-for-static-builds.patch | 0 .../libraries/proj/default.nix => by-name/pr/proj/package.nix} | 0 pkgs/{development/libraries => by-name/pr}/proj/tests.nix | 0 pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 2 deletions(-) rename pkgs/{development/libraries => by-name/pr}/proj/only-add-curl-for-static-builds.patch (100%) rename pkgs/{development/libraries/proj/default.nix => by-name/pr/proj/package.nix} (100%) rename pkgs/{development/libraries => by-name/pr}/proj/tests.nix (100%) diff --git a/pkgs/development/libraries/proj/only-add-curl-for-static-builds.patch b/pkgs/by-name/pr/proj/only-add-curl-for-static-builds.patch similarity index 100% rename from pkgs/development/libraries/proj/only-add-curl-for-static-builds.patch rename to pkgs/by-name/pr/proj/only-add-curl-for-static-builds.patch diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/by-name/pr/proj/package.nix similarity index 100% rename from pkgs/development/libraries/proj/default.nix rename to pkgs/by-name/pr/proj/package.nix diff --git a/pkgs/development/libraries/proj/tests.nix b/pkgs/by-name/pr/proj/tests.nix similarity index 100% rename from pkgs/development/libraries/proj/tests.nix rename to pkgs/by-name/pr/proj/tests.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e1e0bed5e8a7..158a68831710 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8639,8 +8639,6 @@ with pkgs; utils = true; }; - proj = callPackage ../development/libraries/proj { }; - prospector = callPackage ../development/tools/prospector { }; protobuf = protobuf_32; From a7b76dbe5a0b0df38c159df72fcf9e9ecf4731a8 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 16 Sep 2025 04:12:13 +0100 Subject: [PATCH 4/6] yaml-cpp_0_3: drop --- pkgs/development/libraries/yaml-cpp/0.3.0.nix | 39 ------------------- pkgs/top-level/aliases.nix | 3 +- pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 43 deletions(-) delete mode 100644 pkgs/development/libraries/yaml-cpp/0.3.0.nix diff --git a/pkgs/development/libraries/yaml-cpp/0.3.0.nix b/pkgs/development/libraries/yaml-cpp/0.3.0.nix deleted file mode 100644 index e1103c33a036..000000000000 --- a/pkgs/development/libraries/yaml-cpp/0.3.0.nix +++ /dev/null @@ -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 ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index de21703fc4b1..2bb8e830460b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -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 @@ -2657,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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 158a68831710..d427348761af 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8327,8 +8327,6 @@ with pkgs; 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; }; From b214834cb4356d56964a6e822cd1b89de63731f3 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 16 Sep 2025 04:13:27 +0100 Subject: [PATCH 5/6] yaml-cpp: move to `by-name` --- .../yaml-cpp/default.nix => by-name/ya/yaml-cpp/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/libraries/yaml-cpp/default.nix => by-name/ya/yaml-cpp/package.nix} (100%) diff --git a/pkgs/development/libraries/yaml-cpp/default.nix b/pkgs/by-name/ya/yaml-cpp/package.nix similarity index 100% rename from pkgs/development/libraries/yaml-cpp/default.nix rename to pkgs/by-name/ya/yaml-cpp/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d427348761af..f5de26e22bf6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8325,8 +8325,6 @@ with pkgs; libwpe-fdo = callPackage ../development/libraries/libwpe/fdo.nix { }; - yaml-cpp = callPackage ../development/libraries/yaml-cpp { }; - liquid-dsp = callPackage ../development/libraries/liquid-dsp { inherit (darwin) autoSignDarwinBinariesHook; }; From 798a52c35c680c65fa509091da68da7c8a036e55 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 16 Sep 2025 04:14:46 +0100 Subject: [PATCH 6/6] yaml-cpp: backport patch for CMake 4 --- pkgs/by-name/ya/yaml-cpp/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/ya/yaml-cpp/package.nix b/pkgs/by-name/ya/yaml-cpp/package.nix index 75941866b604..fcc02c77bd14 100644 --- a/pkgs/by-name/ya/yaml-cpp/package.nix +++ b/pkgs/by-name/ya/yaml-cpp/package.nix @@ -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 = [