pluginupdate.py: fix compatibility with nix 2.4

figsoda 5aaa5f5e e29d8184

Changed files
+23 -7
maintainers
scripts
pkgs
applications
editors
kakoune
misc
vim-plugins
+1 -1
maintainers/scripts/pluginupdate.py
···
def get_current_plugins(editor: Editor) -> List[Plugin]:
with CleanEnvironment():
-
cmd = ["nix", "eval", "--json", editor.get_plugins]
log.debug("Running command %s", cmd)
out = subprocess.check_output(cmd)
data = json.loads(out)
···
def get_current_plugins(editor: Editor) -> List[Plugin]:
with CleanEnvironment():
+
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
···
···
+
{ pkgs ? import ../../../../.. { } }:
+
+
with pkgs;
+
let
+
pyEnv = python3.withPackages (ps: [ ps.GitPython ]);
+
in
+
+
mkShell {
+
packages = [
+
bash
+
pyEnv
+
nix
+
nix-prefetch-scripts
+
];
+
}
+1 -1
pkgs/applications/editors/kakoune/plugins/update.py
···
#!/usr/bin/env nix-shell
-
#!nix-shell -p nix-prefetch-git -p python3 -p python3Packages.GitPython nix -i python3
# format:
# $ nix run nixpkgs.python3Packages.black -c black update.py
···
#!/usr/bin/env nix-shell
+
#!nix-shell update-shell.nix -i python3
# format:
# $ nix run nixpkgs.python3Packages.black -c black update.py
+6 -5
pkgs/misc/vim-plugins/update-shell.nix
···
-
{ nixpkgs ? import ../../.. { } }:
-
with nixpkgs;
let
-
pyEnv = python3.withPackages(ps: [ ps.GitPython ]);
in
mkShell {
packages = [
bash
pyEnv
-
nix_2_3
nix-prefetch-scripts
];
}
-
···
+
{ pkgs ? import ../../.. { } }:
+
+
with pkgs;
let
+
pyEnv = python3.withPackages (ps: [ ps.GitPython ]);
in
+
mkShell {
packages = [
bash
pyEnv
+
nix
nix-prefetch-scripts
];
}