diff options
| author | Alexandre Iooss <erdnaxe@crans.org> | 2023-05-14 10:12:47 +0200 |
|---|---|---|
| committer | Alexandre Iooss <erdnaxe@crans.org> | 2023-05-14 21:04:11 +0200 |
| commit | 1dd536c54c896105b1e0c1d0661c91dd61fee63f (patch) | |
| tree | 45b53f6d99082fe6a44b7688d3902225f2d935d1 | |
| parent | 491c395163d4dfa4839f6af8a01aed10481c48f8 (diff) | |
| download | nixpkgs-1dd536c54c896105b1e0c1d0661c91dd61fee63f.tar nixpkgs-1dd536c54c896105b1e0c1d0661c91dd61fee63f.tar.gz nixpkgs-1dd536c54c896105b1e0c1d0661c91dd61fee63f.tar.bz2 nixpkgs-1dd536c54c896105b1e0c1d0661c91dd61fee63f.tar.lz nixpkgs-1dd536c54c896105b1e0c1d0661c91dd61fee63f.tar.xz nixpkgs-1dd536c54c896105b1e0c1d0661c91dd61fee63f.tar.zst nixpkgs-1dd536c54c896105b1e0c1d0661c91dd61fee63f.zip | |
chipsec: 1.8.1 -> 1.10.6
| -rw-r--r-- | pkgs/tools/security/chipsec/compile-ko.diff | 14 | ||||
| -rw-r--r-- | pkgs/tools/security/chipsec/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/security/chipsec/ko-path.diff | 16 |
3 files changed, 18 insertions, 18 deletions
diff --git a/pkgs/tools/security/chipsec/compile-ko.diff b/pkgs/tools/security/chipsec/compile-ko.diff index 0ab2c80a625..2ac6f69b4f6 100644 --- a/pkgs/tools/security/chipsec/compile-ko.diff +++ b/pkgs/tools/security/chipsec/compile-ko.diff @@ -1,10 +1,10 @@ -diff --git i/setup.py w/setup.py -index cfe2665..5795874 100755 ---- i/setup.py -+++ w/setup.py -@@ -179,7 +179,7 @@ class build_ext(_build_ext): - driver_build_function = self._build_win_driver - self._build_win_compression() +diff --git a/setup.py b/setup.py +index 3465765c..ae128922 100755 +--- a/setup.py ++++ b/setup.py +@@ -137,7 +137,7 @@ class build_ext(_build_ext): + elif platform.system().lower() == "windows": + driver_build_function = self._build_win_driver - if not self.skip_driver: + if True: diff --git a/pkgs/tools/security/chipsec/default.nix b/pkgs/tools/security/chipsec/default.nix index 2acdc9bb09f..8f8f4ee538d 100644 --- a/pkgs/tools/security/chipsec/default.nix +++ b/pkgs/tools/security/chipsec/default.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec { pname = "chipsec"; - version = "1.8.1"; + version = "1.10.6"; disabled = !stdenv.isLinux; @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { owner = "chipsec"; repo = "chipsec"; rev = version; - hash = "sha256-bK8wlwhP0pi8rOs8ysbSZ+0aZOaX4mckfH/p4OLGnes="; + hash = "sha256-+pbFG1SmSO/cnt1e+kel7ereC0I1OCJKKsS0KaJDWdc="; }; patches = lib.optionals withDriver [ ./ko-path.diff ./compile-ko.diff ]; @@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ libelf nasm - ]; + ] ++ lib.optionals withDriver kernel.moduleBuildDependencies; nativeCheckInputs = with python3.pkgs; [ distro diff --git a/pkgs/tools/security/chipsec/ko-path.diff b/pkgs/tools/security/chipsec/ko-path.diff index ad26d232d96..f7359600a8e 100644 --- a/pkgs/tools/security/chipsec/ko-path.diff +++ b/pkgs/tools/security/chipsec/ko-path.diff @@ -1,13 +1,13 @@ -diff --git c/chipsec/helper/linux/linuxhelper.py i/chipsec/helper/linux/linuxhelper.py -index c51b5e6..4be05ea 100644 ---- c/chipsec/helper/linux/linuxhelper.py -+++ i/chipsec/helper/linux/linuxhelper.py -@@ -152,7 +152,7 @@ class LinuxHelper(Helper): +diff --git a/chipsec/helper/linux/linuxhelper.py b/chipsec/helper/linux/linuxhelper.py +index 2fd65140..f3f26bcb 100644 +--- a/chipsec/helper/linux/linuxhelper.py ++++ b/chipsec/helper/linux/linuxhelper.py +@@ -153,7 +153,7 @@ class LinuxHelper(Helper): else: - a2 = "a2=0x{}".format(phys_mem_access_prot) + a2 = f'a2=0x{phys_mem_access_prot}' -- driver_path = os.path.join(chipsec.file.get_main_dir(), "chipsec", "helper", "linux", "chipsec.ko" ) -+ driver_path = os.path.join(chipsec.file.get_main_dir(), "drivers", "linux", "chipsec.ko" ) +- driver_path = os.path.join(chipsec.file.get_main_dir(), "chipsec", "helper", "linux", "chipsec.ko") ++ driver_path = os.path.join(chipsec.file.get_main_dir(), "drivers", "linux", "chipsec.ko") if not os.path.exists(driver_path): driver_path += ".xz" if not os.path.exists(driver_path): |