Skip to content

Commit

Permalink
osrm-backend: 5.27.1 -> 5.27.1-unstable-2024-11-03
Browse files Browse the repository at this point in the history
Includes fixes for newer versions of GCC and Boost and obsoletes our
patch and most of our flags.

Upstream has not cut a release tag in over two years. They have
signalled a desire to make a new release this year, but have limited
resources to do so:

* <Project-OSRM/osrm-backend#6747>
* <Project-OSRM/osrm-backend#6778>
* <Project-OSRM/osrm-backend#7028>

The NixOS test passes, so I think this should be okay and leave this
package in a healthier state than it is currently in.
  • Loading branch information
emilazy committed Nov 25, 2024
1 parent 382ef6c commit d2f4b62
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 36 deletions.
39 changes: 5 additions & 34 deletions pkgs/servers/osrm-backend/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@

stdenv.mkDerivation rec {
pname = "osrm-backend";
version = "5.27.1";
version = "5.27.1-unstable-2024-11-03";

src = fetchFromGitHub {
owner = "Project-OSRM";
repo = "osrm-backend";
rev = "v${version}";
sha256 = "sha256-3oA/U5O4GLfwMF7x99JQuFK7ewDrLJLh6BBLYfnyNaM=";
rev = "3614af7f6429ee35c3f2e836513b784a74664ab6";
hash = "sha256-iix++G49cC13wZGZIpXu1SWGtVAcqpuX3GhsIaETzUU=";
};

nativeBuildInputs = [
Expand All @@ -43,37 +43,8 @@ stdenv.mkDerivation rec {
expat
];

patches = [
# gcc-13 build fix:
# https://github.com/Project-OSRM/osrm-backend/pull/6632
(fetchpatch {
name = "gcc-13.patch";
url = "https://github.com/Project-OSRM/osrm-backend/commit/af59a9cfaee4d601b5c88391624a05f2a38da17b.patch";
hash = "sha256-dB9JP/DrJXpFGLD/paein2z64UtHIYZ17ycb91XWpEI=";
})
];

env.NIX_CFLAGS_COMPILE = toString (
[
# Needed with GCC 12
"-Wno-error=stringop-overflow"
"-Wno-error=uninitialized"
# Needed for GCC 13
"-Wno-error=array-bounds"
]
++
# error: aligned deallocation function of type 'void (void *, std::align_val_t) noexcept' is only available on macOS 10.13 or newer
(lib.optionals
(
stdenv.hostPlatform.isDarwin
&& stdenv.hostPlatform.isx86_64
&& lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13"
)
[
"-faligned-allocation"
]
)
);
# Needed with GCC 12
env.NIX_CFLAGS_COMPILE = "-Wno-error=uninitialized";

postInstall = ''
mkdir -p $out/share/osrm-backend
Expand Down
2 changes: 0 additions & 2 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11859,8 +11859,6 @@ with pkgs;
opensmtpd-filter-rspamd = callPackage ../servers/mail/opensmtpd/filter-rspamd.nix { };
osrm-backend = callPackage ../servers/osrm-backend {
tbb = tbb_2021_11;
# https://github.com/Project-OSRM/osrm-backend/issues/6503
boost = boost179;
};

postfix = callPackage ../servers/mail/postfix { };
Expand Down

0 comments on commit d2f4b62

Please sign in to comment.