Skip to content

Commit ffb4796

Browse files
committed
Revert "Add autoActivate"
This reverts commit 3147611.
1 parent c3fce73 commit ffb4796

File tree

3 files changed

+1
-13
lines changed

3 files changed

+1
-13
lines changed

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ At the end of the day, you get a declarative and reproducible Julia depot built
7474
There are a few options you can configure in `default.nix` (also documented there):
7575

7676
* Set whether `Pkg.precompile()` is called at the end to precompile all packages (defaults to true).
77-
* Set whether your Julia environment auto-activates the constructed environment (defaults to true).
7877
* Configure `makeWrapper` arguments to Julia, for example to configure environment variables. The default version sets the `PYTHON` environment variable to a Nix-provided Python, so that Julia packages won't try to use Conda to obtain their own.
7978

8079
If you only want the Julia depot to use in your own derivations, it is exposed from `default.nix` as the `depot` attribute.

templates/common.nix

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
# Arguments
1818
makeWrapperArgs ? "",
1919
precompile ? true,
20-
autoActivate ? true,
2120
extraBuildInputs ? []
2221
}:
2322

@@ -153,21 +152,14 @@ let
153152
'
154153
'';
155154

156-
startupJl = writeText "startup.jl" ''
157-
using Pkg;
158-
Pkg.activate("${project}")
159-
'';
160-
161-
autoActivateArgs = lib.optionalString autoActivate "--add-flags '-i ${startupJl}'";
162-
163155
in
164156

165157
runCommand "julia-env" {
166158
inherit julia depot makeWrapperArgs;
167159
buildInputs = [makeWrapper];
168160
} ''
169161
mkdir -p $out/bin
170-
makeWrapper $julia/bin/julia $out/bin/julia ${autoActivateArgs} \
162+
makeWrapper $julia/bin/julia $out/bin/julia \
171163
--suffix JULIA_DEPOT_PATH : "$depot" $makeWrapperArgs \
172164
--set JULIA_PROJECT "${project}"
173165
''

templates/default.nix

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ callPackage ./common.nix {
3232
# Run Pkg.precompile() to precompile all packages?
3333
precompile = true;
3434

35-
# Package Julia with a startup file to automatically activate the constructed environment.
36-
autoActivate = true;
37-
3835
# Extra arguments to makeWrapper when creating the final Julia wrapper.
3936
# By default, it will just put the new depot at the end of JULIA_DEPOT_PATH.
4037
# You can add additional flags here.

0 commit comments

Comments
 (0)