Skip to content

influxdb2: fix hardcoded source path #468444

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

Merged
Aleksanaa merged 1 commit into from
Dec 10, 2025
Merged

influxdb2: fix hardcoded source path #468444

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions pkgs/servers/nosql/influxdb2/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ let
hash = "sha256-aC+GYMaxYKkY9GMaeRx22hQ3xi3kfWpaTLC9ajqOaAA=";
};

flux = rustPlatform.buildRustPackage {
flux = rustPlatform.buildRustPackage (finalAttrs: {
Copy link
Member

@Aleksanaa Aleksanaa Dec 6, 2025

Choose a reason for hiding this comment

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

Just found that flux in Nixpkgs is an unmaintained package. Dropping it...

Copy link
Member

@Aleksanaa Aleksanaa Dec 6, 2025

Choose a reason for hiding this comment

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

Okay we cannot drop it 😅

Copy link
Member Author

@DieracDelta DieracDelta Dec 6, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

hmm maybe we could name this package libflux so it doesn't conflict with this flux package from 2013? I do see some examples like this like libffi or libutil though im not sure if that's a best practice

Copy link
Member

@Aleksanaa Aleksanaa Dec 6, 2025

Choose a reason for hiding this comment

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

Yeah, having it as a standalone package would make maintenance much easier. For flux, even if it's dropped now, you can't take that name anytime soon. libflux would be fine.

pname = "libflux";
version = libflux_version;
src = fetchFromGitHub {
Expand All @@ -50,7 +50,7 @@ let
substituteInPlace flux-core/Cargo.toml \
--replace-fail 'default = ["strict"]' 'default = []'
'';
sourceRoot = "${src.name}/libflux";
sourceRoot = "${finalAttrs.src.name}/libflux";

cargoHash = "sha256-A6j/lb47Ob+Po8r1yvqBXDVP0Hf7cNz8WFZqiVUJj+Y=";
nativeBuildInputs = [ rustPlatform.bindgenHook ];
Expand All @@ -65,14 +65,14 @@ let
passAsFile = [ "pkgcfg" ];
postInstall = ''
mkdir -p $out/include $out/pkgconfig
cp -r $NIX_BUILD_TOP/source/libflux/include/influxdata $out/include
cp -r $NIX_BUILD_TOP/${finalAttrs.src.name}/libflux/include/influxdata $out/include
substitute $pkgcfgPath $out/pkgconfig/flux.pc \
--replace-fail /out $out
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
install_name_tool -id $out/lib/libflux.dylib $out/lib/libflux.dylib
'';
};
});
in
buildGoModule {
pname = "influxdb";
Expand Down
Loading