Skip to content

Irods fix #373470

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.

Sign up for GitHub

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

Closed
bzizou wants to merge 2 commits into from
Closed

Irods fix #373470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd55732
avro-cpp: switch to finalAttrs pattern
bzizou Jan 13, 2025
c8625e1
irods: fix #370452 (irods was broken with avrocpp upgrade)
bzizou Jan 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pkgs/by-name/av/avro-cpp/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
versionCheckHook,
}:

stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "avro-c++";
version = "1.12.0";

src = fetchurl {
url = "mirror://apache/avro/avro-${version}/cpp/avro-cpp-${version}.tar.gz";
url = "mirror://apache/avro/avro-${finalAttrs.version}/cpp/avro-cpp-${finalAttrs.version}.tar.gz";
hash = "sha256-8u33cSanWw7BrRZncr4Fg1HOo9dESL5+LO8gBQwPmKs=";
};

Expand Down Expand Up @@ -49,4 +49,4 @@ stdenv.mkDerivation rec {
maintainers = with lib.maintainers; [ rasendubi ];
platforms = lib.platforms.all;
};
}
})
6 changes: 3 additions & 3 deletions pkgs/tools/filesystems/irods/common.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
fmt,
nlohmann_json,
curl,
spdlog_rods,
spdlog,
bison,
flex,
}:
Expand Down Expand Up @@ -63,7 +63,7 @@
nanodbc
fmt
nlohmann_json
spdlog_rods
spdlog
curl
];

Expand All @@ -79,7 +79,7 @@
"-DIRODS_EXTERNALS_FULLPATH_NANODBC=${nanodbc}"
"-DIRODS_EXTERNALS_FULLPATH_FMT=${fmt}"
"-DIRODS_EXTERNALS_FULLPATH_JSON=${nlohmann_json}"
"-DIRODS_EXTERNALS_FULLPATH_SPDLOG=${spdlog_rods}"
"-DIRODS_EXTERNALS_FULLPATH_SPDLOG=${spdlog}"
"-DIRODS_LINUX_DISTRIBUTION_NAME=nix"
"-DIRODS_LINUX_DISTRIBUTION_VERSION_MAJOR=1.0"
"-DCPACK_GENERATOR=TGZ"
Expand Down
18 changes: 16 additions & 2 deletions pkgs/tools/filesystems/irods/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
curl,
bison,
flex,
fetchurl,
}:

let
Expand All @@ -45,9 +46,22 @@ let
--replace-fail '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@
'';
});
avro-cpp_rods = avro-cpp_llvm.overrideAttrs (attrs: {
inherit stdenv;
version = "1.11.3";
src = attrs.src.overrideAttrs rec {
outputHash = "sha256-+6JCrvd+yBnQdWH8upN1FyGVbejQyujh8vMAtUszG64=";
};
patches = [ ];
preConfigure = ''
substituteInPlace test/SchemaTests.cc --replace "BOOST_CHECKPOINT" "BOOST_TEST_CHECKPOINT"
substituteInPlace test/buffertest.cc --replace "BOOST_MESSAGE" "BOOST_TEST_MESSAGE"
'';
});
in
let
avro-cpp = avro-cpp_llvm;
avro-cpp = avro-cpp_rods;
spdlog = spdlog_rods;
nanodbc = nanodbc_llvm;

common = import ./common.nix {
Expand Down Expand Up @@ -79,7 +93,7 @@ let
fmt
nlohmann_json
curl
spdlog_rods
spdlog
bison
flex
;
Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3728,7 +3728,7 @@ with pkgs;
boost = boost178.override { inherit stdenv; };
fmt = fmt_9.override { inherit stdenv; };
nanodbc_llvm = nanodbc.override { inherit stdenv; };
avro-cpp_llvm = avro-cpp.override { inherit stdenv boost; };
avro-cpp_llvm = avro-cpp.override { inherit stdenv boost fmt; };
spdlog_llvm = spdlog.override { inherit stdenv fmt; };
})
irods
Expand Down