xeus: 3.2.0 -> 5.2.0 (#385730)
use finalAttrs prefix for repo and tag add nix-update-script with lib.maintainers and include nix-update-script pin old ver of xeus for xeus-cling and xeus-zmq add xeus_3_2_0 var to cling and zmq fix typos fix version var rm vars for version address PR feedback change "version" to "tag" in the fetchFromGitHub call in xeus-cling add xlt to the buildInputs in xeus-cling use just `xeus` in the buildInputs in xeus-zmq link to the issue in xeus-cling that explains the need for the 3.2.0 version of xeus change xlt to xtl
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -12,6 +12,21 @@
|
||||
zeromq,
|
||||
}:
|
||||
|
||||
let
|
||||
# Nixpkgs moved to xeus 5.2.0, but we need 3.2.0
|
||||
xeus_3_2_0 = xeus.overrideAttrs (oldAttrs: {
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jupyter-xeus";
|
||||
repo = "xeus";
|
||||
version = "3.2.0";
|
||||
sha256 = "sha256-D/dJ0SHxTHJw63gHD6FRZS7O2TVZ0voIv2mQASEjLA8=";
|
||||
};
|
||||
});
|
||||
|
||||
in
|
||||
|
||||
clangStdenv.mkDerivation rec {
|
||||
pname = "xeus-zmq";
|
||||
version = "1.3.0";
|
||||
|
||||
@@ -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;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user