diff --git a/ci.nix b/ci.nix index 546f26aa..4dd1f56d 100644 --- a/ci.nix +++ b/ci.nix @@ -45,8 +45,8 @@ in xo-callback xo-object xo-ordinaltree - xo-expression + xo-pyexpression xo-tokenizer xo-reader xo-jit diff --git a/shells.nix b/shells.nix index 9f2bf6e3..ef18d660 100644 --- a/shells.nix +++ b/shells.nix @@ -352,6 +352,10 @@ in callback = pkgs.xo-callback; object = pkgs.xo-object; ordinaltree = pkgs.xo-ordinaltree; + expression = pkgs.xo-expression; + pyexpression = pkgs.xo-pyexpression; + tokenizer = pkgs.xo-tokenizer; + reader = pkgs.xo-reader; webutil = pkgs.xo-webutil; pywebutil = pkgs.xo-pywebutil; @@ -370,10 +374,6 @@ in pyprocess = pkgs.xo-pyprocess; kalmanfilter = pkgs.xo-kalmanfilter; pykalmanfilter = pkgs.xo-pykalmanfilter; - expression = pkgs.xo-expression; - pyexpression = pkgs.xo-pyexpression; - tokenizer = pkgs.xo-tokenizer; - reader = pkgs.xo-reader; jit = pkgs.xo-jit; pyjit = pkgs.xo-pyjit; }; diff --git a/xo.nix b/xo.nix index 5a81625f..130a5b71 100644 --- a/xo.nix +++ b/xo.nix @@ -58,6 +58,10 @@ let xo-callback = callPackage pkgs/xo-callback.nix { stdenv = jitStdenv; }; xo-object = callPackage pkgs/xo-object.nix { stdenv = jitStdenv; }; xo-ordinaltree = callPackage pkgs/xo-ordinaltree.nix { stdenv = jitStdenv; }; + xo-expression = callPackage pkgs/xo-expression.nix { stdenv = jitStdenv; buildExamples = true; }; + xo-pyexpression = callPackage pkgs/xo-pyexpression.nix { stdenv = jitStdenv; }; + xo-tokenizer = callPackage pkgs/xo-tokenizer.nix { stdenv = jitStdenv; buildDocs = true; buildExamples = true; }; + xo-reader = callPackage pkgs/xo-reader.nix { stdenv = jitStdenv; buildDocs = true; buildExamples = true; }; xo-webutil = callPackage pkgs/xo-webutil.nix { stdenv = jitStdenv; }; xo-pywebutil = callPackage pkgs/xo-pywebutil.nix {}; xo-printjson = callPackage pkgs/xo-printjson.nix {}; @@ -75,10 +79,6 @@ let xo-pyprocess = callPackage pkgs/xo-pyprocess.nix {}; xo-kalmanfilter = callPackage pkgs/xo-kalmanfilter.nix {}; xo-pykalmanfilter = callPackage pkgs/xo-pykalmanfilter.nix {}; - xo-expression = callPackage pkgs/xo-expression.nix { buildExamples = true; }; - xo-pyexpression = callPackage pkgs/xo-pyexpression.nix {}; - xo-tokenizer = callPackage pkgs/xo-tokenizer.nix { buildDocs = true; buildExamples = true; }; - xo-reader = callPackage pkgs/xo-reader.nix { buildDocs = true; buildExamples = true; }; xo-jit = callPackage pkgs/xo-jit.nix { buildDocs = true; buildExamples = true; llvm = llvmPackages1.llvm; }; xo-pyjit = callPackage pkgs/xo-pyjit.nix {};