Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

osm2pgsql: fix build #245244

Merged
merged 1 commit into from
Jul 25, 2023
Merged

osm2pgsql: fix build #245244

merged 1 commit into from
Jul 25, 2023

Conversation

sikmir
Copy link
Member

@sikmir sikmir commented Jul 24, 2023

Description of changes

Use fmt_9 (#233330 (comment))
https://hydra.nixos.org/build/227867921

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@sikmir
Copy link
Member Author

sikmir commented Jul 24, 2023

Result of nixpkgs-review pr 245244 run on x86_64-linux 1

1 package built:
  • osm2pgsql

Result of nixpkgs-review pr 245244 run on x86_64-darwin 1

1 package built:
  • osm2pgsql

@marsam
Copy link
Contributor

marsam commented Jul 24, 2023

Would you mind adding this patch instead?

--- a/pkgs/tools/misc/osm2pgsql/default.nix
+++ b/pkgs/tools/misc/osm2pgsql/default.nix
@@ -2,6 +2,7 @@
 , fetchFromGitHub
 , cmake
 , expat
+, fetchpatch
 , fmt
 , proj
 , bzip2
@@ -27,6 +28,14 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-8Jefd8dfoh/an7wd+8iTM0uOKA4UiUo8t2WzZs4r/Ck=";
   };
 
+  patches = [
+    # Fix compatiblity with fmt 10.0. Remove with the next release
+    (fetchpatch {
+      url = "https://github.com/openstreetmap/osm2pgsql/commit/37aae6c874b58cd5cd27e70b2b433d6624fd7498.patch";
+      hash = "sha256-Fv2zPqhRDoJXlqB1Q9q5iskn28iqq3TYPcdqfu/pvD4=";
+    })
+  ];
+
   postPatch = ''

Besides that, LGTM

Copy link
Contributor

@marsam marsam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@ofborg ofborg bot requested review from das-g and jglukasik July 25, 2023 00:00
@marsam marsam merged commit 0e4ec34 into NixOS:master Jul 25, 2023
7 of 8 checks passed
@sikmir sikmir deleted the osm2pgsql branch July 25, 2023 00:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants