Darwin updates
Add Python modules that are needed for work and other things Move import of Bash into Xonsh to the head in order to avoid issues with being overwritten by Bash defaults
This commit is contained in:
+3
-3
@@ -47,6 +47,9 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
configHeader = ''
|
configHeader = ''
|
||||||
|
if '__NIX_DARWIN_SET_ENVIRONMENT_DONE' not in ''${...} or not $__NIX_DARWIN_SET_ENVIRONMENT_DONE:
|
||||||
|
source-bash /etc/bashrc
|
||||||
|
|
||||||
# set -e == $RAISE_SUBPROC_ERROR = True
|
# set -e == $RAISE_SUBPROC_ERROR = True
|
||||||
# set -x == trace on; $XONSH_TRACE_SUBPROC = True
|
# set -x == trace on; $XONSH_TRACE_SUBPROC = True
|
||||||
# $? == _.rtn
|
# $? == _.rtn
|
||||||
@@ -126,9 +129,6 @@ import builtins
|
|||||||
builtins.true = True
|
builtins.true = True
|
||||||
builtins.false = False
|
builtins.false = False
|
||||||
builtins.null = None
|
builtins.null = None
|
||||||
|
|
||||||
if '__NIX_DARWIN_SET_ENVIRONMENT_DONE' not in ''${...} or not $__NIX_DARWIN_SET_ENVIRONMENT_DONE:
|
|
||||||
source-bash /etc/bashrc
|
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,15 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
|
#greg.pypackages = with pkgs; [
|
||||||
|
# datadog-api-client
|
||||||
|
# datadog
|
||||||
|
# dateutil
|
||||||
|
# ipython
|
||||||
|
# pyyaml
|
||||||
|
# responses
|
||||||
|
# ruamel-yaml
|
||||||
|
# typing-extensions
|
||||||
|
# virtualenv
|
||||||
|
#];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,7 +2,16 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
myPackages = pypackages: with pypackages; [
|
myPackages = pypackages: with pypackages; [
|
||||||
|
pkgs.datadog-api-client
|
||||||
pkgs.xonsh-direnv
|
pkgs.xonsh-direnv
|
||||||
|
datadog
|
||||||
|
dateutil
|
||||||
|
ipython
|
||||||
|
pyyaml
|
||||||
|
responses
|
||||||
|
ruamel-yaml
|
||||||
|
typing-extensions
|
||||||
|
virtualenv
|
||||||
];
|
];
|
||||||
|
|
||||||
myPython = pkgs.python3.withPackages myPackages;
|
myPython = pkgs.python3.withPackages myPackages;
|
||||||
|
|||||||
Reference in New Issue
Block a user