From b63dfb7ad4f0ba701d838ec8cde96c6f0c586f2d Mon Sep 17 00:00:00 2001 From: Nathan van Doorn Date: Mon, 5 Jul 2021 19:47:58 +0100 Subject: [PATCH] Rename version to version.txt is a standard header with C++20 which could cause issues if a library checks it exists then imports it Because we have the root of this repo in the include path, it'd see that exists (with, e.g., __has_include), and then try to include it as a header But because it's just a file that says 0.1, this would fail This happens with libpqxx 7 --- configure.ac | 2 +- flake.nix | 2 +- version => version.txt | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename version => version.txt (100%) diff --git a/configure.ac b/configure.ac index 2fb175c8..9a32651e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([Hydra], [m4_esyscmd([echo -n $(cat ./version)$VERSION_SUFFIX])]) +AC_INIT([Hydra], [m4_esyscmd([echo -n $(cat ./version.txt)$VERSION_SUFFIX])]) AC_CONFIG_AUX_DIR(config) AM_INIT_AUTOMAKE([foreign serial-tests]) diff --git a/flake.nix b/flake.nix index 334119ce..25aaa1aa 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,7 @@ outputs = { self, nixpkgs, nix }: let - version = "${builtins.readFile ./version}.${builtins.substring 0 8 self.lastModifiedDate}.${self.shortRev or "DIRTY"}"; + version = "${builtins.readFile ./version.txt}.${builtins.substring 0 8 self.lastModifiedDate}.${self.shortRev or "DIRTY"}"; pkgs = import nixpkgs { system = "x86_64-linux"; diff --git a/version b/version.txt similarity index 100% rename from version rename to version.txt