diff options
| author | Tim Steinbach <tim@nequissimus.com> | 2020-05-12 08:37:08 -0400 |
|---|---|---|
| committer | Tim Steinbach <tim@nequissimus.com> | 2020-05-12 08:37:08 -0400 |
| commit | 0c9b897241f20b38a35fb84e70b6a93df80d7175 (patch) | |
| tree | 25a8e4cd14058502b5b29c6d4843a3f0aac35ab0 | |
| parent | 511b503b0d029e7a3d2fb4f34b4b99db60a52cba (diff) | |
| download | nixpkgs-0c9b897241f20b38a35fb84e70b6a93df80d7175.tar nixpkgs-0c9b897241f20b38a35fb84e70b6a93df80d7175.tar.gz nixpkgs-0c9b897241f20b38a35fb84e70b6a93df80d7175.tar.bz2 nixpkgs-0c9b897241f20b38a35fb84e70b6a93df80d7175.tar.lz nixpkgs-0c9b897241f20b38a35fb84e70b6a93df80d7175.tar.xz nixpkgs-0c9b897241f20b38a35fb84e70b6a93df80d7175.tar.zst nixpkgs-0c9b897241f20b38a35fb84e70b6a93df80d7175.zip | |
linux-hardened: Fix kernel version detection
| -rwxr-xr-x | pkgs/os-specific/linux/kernel/hardened/update.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/kernel/hardened/update.py b/pkgs/os-specific/linux/kernel/hardened/update.py index 3958c85fe20..d6443d2e751 100755 --- a/pkgs/os-specific/linux/kernel/hardened/update.py +++ b/pkgs/os-specific/linux/kernel/hardened/update.py @@ -184,11 +184,10 @@ for filename in os.listdir(NIXPKGS_KERNEL_PATH): with import {NIXPKGS_PATH} {{}}; (callPackage {NIXPKGS_KERNEL_PATH / filename} {{}}).version """ - kernel_version = parse_version( - run( - "nix", "eval", "--impure", "--raw", "--expr", nix_version_expr, - ).stdout - ) + kernel_version_json = run( + "nix-instantiate", "--eval", "--json", "--expr", nix_version_expr, + ).stdout + kernel_version = parse_version(json.loads(kernel_version_json)) if kernel_version < MIN_KERNEL_VERSION: continue kernel_key = major_kernel_version_key(kernel_version) |