pluginupdate.py: fix compatibility with nix 2.4
This commit is contained in:
parent
e29d818477
commit
5aaa5f5e75
4 changed files with 23 additions and 7 deletions
|
@ -305,7 +305,7 @@ class CleanEnvironment(object):
|
|||
|
||||
def get_current_plugins(editor: Editor) -> List[Plugin]:
|
||||
with CleanEnvironment():
|
||||
cmd = ["nix", "eval", "--json", editor.get_plugins]
|
||||
cmd = ["nix", "eval", "--impure", "--json", "--expr", editor.get_plugins]
|
||||
log.debug("Running command %s", cmd)
|
||||
out = subprocess.check_output(cmd)
|
||||
data = json.loads(out)
|
||||
|
|
15
pkgs/applications/editors/kakoune/plugins/update-shell.nix
Normal file
15
pkgs/applications/editors/kakoune/plugins/update-shell.nix
Normal file
|
@ -0,0 +1,15 @@
|
|||
{ pkgs ? import ../../../../.. { } }:
|
||||
|
||||
with pkgs;
|
||||
let
|
||||
pyEnv = python3.withPackages (ps: [ ps.GitPython ]);
|
||||
in
|
||||
|
||||
mkShell {
|
||||
packages = [
|
||||
bash
|
||||
pyEnv
|
||||
nix
|
||||
nix-prefetch-scripts
|
||||
];
|
||||
}
|
|
@ -1,5 +1,5 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -p nix-prefetch-git -p python3 -p python3Packages.GitPython nix -i python3
|
||||
#!nix-shell update-shell.nix -i python3
|
||||
|
||||
# format:
|
||||
# $ nix run nixpkgs.python3Packages.black -c black update.py
|
||||
|
|
|
@ -1,14 +1,15 @@
|
|||
{ nixpkgs ? import ../../.. { } }:
|
||||
with nixpkgs;
|
||||
{ pkgs ? import ../../.. { } }:
|
||||
|
||||
with pkgs;
|
||||
let
|
||||
pyEnv = python3.withPackages(ps: [ ps.GitPython ]);
|
||||
pyEnv = python3.withPackages (ps: [ ps.GitPython ]);
|
||||
in
|
||||
|
||||
mkShell {
|
||||
packages = [
|
||||
bash
|
||||
pyEnv
|
||||
nix_2_3
|
||||
nix
|
||||
nix-prefetch-scripts
|
||||
];
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue