Unverified Commit 1ed9b91d authored by Gaétan Lepage's avatar Gaétan Lepage Committed by GitHub
Browse files

xeus: 3.2.0 -> 5.2.0 (#385730)

parents abd3e9cb e1b8acf7

pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix

+19 −4
Original line number Diff line number Diff line
@@ -34,6 +34,21 @@ let 
    };

  });



  # Nixpkgs moved to xeus 5.2.0, but we need 3.2.0

  # https://github.com/jupyter-xeus/xeus-cling/issues/523

  xeus_3_2_0 = xeus.overrideAttrs (oldAttrs: {

    version = "3.2.0";



    src = fetchFromGitHub {

      owner = "jupyter-xeus";

      repo = "xeus";

      tag = "3.2.0";

      sha256 = "sha256-D/dJ0SHxTHJw63gHD6FRZS7O2TVZ0voIv2mQASEjLA8=";

    };



    buildInputs = oldAttrs.buildInputs ++ lib.singleton xtl;

  });



in



clangStdenv.mkDerivation rec {
@@ -62,7 +77,7 @@ clangStdenv.mkDerivation rec { 
    ncurses

    openssl

    pugixml

    xeus

    xeus_3_2_0

    xeus-zmq

    xtl

    zeromq
@@ -73,11 +88,11 @@ clangStdenv.mkDerivation rec { 


  postPatch = ''

    substituteInPlace src/xmagics/executable.cpp \

      --replace "getDataLayout" "getDataLayoutString"

      --replace-fail "getDataLayout" "getDataLayoutString"

    substituteInPlace src/xmagics/execution.cpp \

      --replace "simplisticCastAs" "castAs"

      --replace-fail "simplisticCastAs" "castAs"

    substituteInPlace src/xmime_internal.hpp \

      --replace "code.str()" "code.str().str()"

      --replace-fail "code.str()" "code.str().str()"

  '';



  dontStrip = debug;

pkgs/by-name/xe/xeus/package.nix

+13 −11
Original line number Diff line number Diff line
@@ -6,18 +6,19 @@ 
  doctest,

  nlohmann_json,

  libuuid,

  nix-update-script,

  xtl,

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "xeus";

  version = "3.2.0";

  version = "5.2.0";



  src = fetchFromGitHub {

    owner = "jupyter-xeus";

    repo = "xeus";

    rev = version;

    sha256 = "sha256-D/dJ0SHxTHJw63gHD6FRZS7O2TVZ0voIv2mQASEjLA8=";

    repo = finalAttrs.pname;

    tag = finalAttrs.version;

    hash = "sha256-/4SVrfPU5pkO3PNrhgdCcNUts++Or7AeMqO/PorsBdw=";

  };



  nativeBuildInputs = [
@@ -28,7 +29,6 @@ stdenv.mkDerivation rec { 
  buildInputs = [

    nlohmann_json

    libuuid

    xtl

  ];



  cmakeFlags = [
@@ -38,11 +38,13 @@ stdenv.mkDerivation rec { 
  doCheck = true;

  preCheck = ''export LD_LIBRARY_PATH=$PWD'';



  meta = with lib; {

  passthru.updateScript = nix-update-script { };



  meta = {

    homepage = "https://xeus.readthedocs.io";

    description = "C++ implementation of the Jupyter Kernel protocol";

    license = licenses.bsd3;

    maintainers = with maintainers; [ serge_sans_paille ];

    platforms = platforms.all;

    license = lib.licenses.bsd3;

    maintainers = with lib.maintainers; [ serge_sans_paille ];

    platforms = lib.platforms.all;

  };

}
 
})