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

ipmiview: 2.16.0 -> 2.17.0 #92053

Merged
merged 1 commit into from Oct 15, 2020
Merged

ipmiview: 2.16.0 -> 2.17.0 #92053

merged 1 commit into from Oct 15, 2020

Conversation

dominikh
Copy link
Contributor

@dominikh dominikh commented Jul 2, 2020

Also removes the Configuration category, as this failed to build:

/nix/store/c312nyv9kfckpcf4k7vrxbg6yjk62awc-IPMIView.desktop/share/applications/IPMIView.desktop: error: value "Network;Configuration" for key "Categories" in group "Desktop Entry" contains an unregistered value "Configuration"; values extending the format should start with "X-"
Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@vlaci
Copy link
Contributor

vlaci commented Jul 3, 2020

KVM console does not work for me. Error message is Cannot find iKVM_ssl.jar

@vlaci
Copy link
Contributor

vlaci commented Jul 3, 2020

The following patch fixes KVM console for me:

diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix
index 581f04baf97..851022899d9 100644
--- a/pkgs/applications/misc/ipmiview/default.nix
+++ b/pkgs/applications/misc/ipmiview/default.nix
@@ -32,6 +32,7 @@ stdenv.mkDerivation rec {
     patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libX11 libXext libXrender libXtst libXi ]}" ./jre/lib/amd64/libawt_xawt.so
     patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ freetype ]}" ./jre/lib/amd64/libfontmanager.so
     patchelf --set-rpath "${gcc-unwrapped.lib}/lib" ./libiKVM64.so
+    patchelf --set-rpath "${gcc-unwrapped.lib}/lib" ./libiKVM_v11_64.so
     patchelf --set-rpath "${gcc.cc}/lib:$out/jre/lib/amd64/jli" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/java
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./BMCSecurity/${stunnelBinary}
   '';
@@ -60,7 +61,7 @@ stdenv.mkDerivation rec {
       --add-flags "-jar $out/IPMIView20.jar" \
       --run 'WORK_DIR=''${XDG_DATA_HOME:-~/.local/share}/ipmiview
              mkdir -p $WORK_DIR
-             ln -snf '$out'/iKVM.jar '$out'/libiKVM* '$out'/libSharedLibrary* $WORK_DIR
+             ln -snf '$out'/iKVM.jar '$out'/iKVM_ssl.jar '$out'/libiKVM* '$out'/libSharedLibrary* $WORK_DIR
              cd $WORK_DIR'
   '';

Copy link
Contributor

@vlaci vlaci left a comment

Choose a reason for hiding this comment

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

please fix KVM functionality (see my suggestion in #92053 (comment))

@dominikh
Copy link
Contributor Author

dominikh commented Jul 3, 2020

KVM worked for me, but it's possible that it wasn't using SSL with my endpoint. Will apply your fix.

Also removes the Configuration category, as this failed to build:

    /nix/store/c312nyv9kfckpcf4k7vrxbg6yjk62awc-IPMIView.desktop/share/applications/IPMIView.desktop: error: value "Network;Configuration" for key "Categories" in group "Desktop Entry" contains an unregistered value "Configuration"; values extending the format should start with "X-"
@dominikh
Copy link
Contributor Author

dominikh commented Jul 3, 2020

PTAL

@ofborg ofborg bot requested a review from vlaci July 3, 2020 17:12
Copy link
Contributor

@vlaci vlaci 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 for your work!

@mweinelt
Copy link
Member

Result of nixpkgs-review pr 92053 1

1 package built:
  • ipmiview

@mweinelt mweinelt merged commit 859d6d9 into NixOS:master Oct 15, 2020
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.

None yet

3 participants