diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-08-30 13:43:34 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-08-30 23:17:02 +0000 |
| commit | 7f3a4f6b67a4887e1fbf9c576f3f4b369e98e274 (patch) | |
| tree | 25e6418acced156fc23b602487d0bd9b30306f25 /pkgs/os-specific/linux/isgx/default.nix | |
| parent | c54d1a6caac9e88ce9ca94b99ad4cbc4a386e594 (diff) | |
| download | nixpkgs-7f3a4f6b67a4887e1fbf9c576f3f4b369e98e274.tar nixpkgs-7f3a4f6b67a4887e1fbf9c576f3f4b369e98e274.tar.gz nixpkgs-7f3a4f6b67a4887e1fbf9c576f3f4b369e98e274.tar.bz2 nixpkgs-7f3a4f6b67a4887e1fbf9c576f3f4b369e98e274.tar.lz nixpkgs-7f3a4f6b67a4887e1fbf9c576f3f4b369e98e274.tar.xz nixpkgs-7f3a4f6b67a4887e1fbf9c576f3f4b369e98e274.tar.zst nixpkgs-7f3a4f6b67a4887e1fbf9c576f3f4b369e98e274.zip | |
linuxPackages.isgx: 2.11 -> 2.14
Diffstat (limited to 'pkgs/os-specific/linux/isgx/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/isgx/default.nix | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/pkgs/os-specific/linux/isgx/default.nix b/pkgs/os-specific/linux/isgx/default.nix index fb6caf3bacb..6e97532ee5d 100644 --- a/pkgs/os-specific/linux/isgx/default.nix +++ b/pkgs/os-specific/linux/isgx/default.nix @@ -1,29 +1,16 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, kernel, kernelAtLeast }: +{ stdenv, lib, fetchFromGitHub, kernel, kernelAtLeast }: stdenv.mkDerivation rec { name = "isgx-${version}-${kernel.version}"; - version = "2.11"; + version = "2.14"; src = fetchFromGitHub { owner = "intel"; repo = "linux-sgx-driver"; - rev = "sgx_driver_${version}"; - hash = "sha256-zZ0FgCx63LCNmvQ909O27v/o4+93gefhgEE/oDr/bHw="; + rev = "sgx_diver_${version}"; # Typo is upstream's. + sha256 = "0kbbf2inaywp44lm8ig26mkb36jq3smsln0yp6kmrirdwc3c53mi"; }; - patches = [ - # Fixes build with kernel >= 5.8 - (fetchpatch { - url = "https://github.com/intel/linux-sgx-driver/commit/276c5c6a064d22358542f5e0aa96b1c0ace5d695.patch"; - sha256 = "sha256-PmchqYENIbnJ51G/tkdap/g20LUrJEoQ4rDtqy6hj24="; - }) - # Fixes detection with kernel >= 5.11 - (fetchpatch { - url = "https://github.com/intel/linux-sgx-driver/commit/ed2c256929962db1a8805db53bed09bb8f2f4de3.patch"; - sha256 = "sha256-MRbgS4U8FTCP1J1n+rhsvbXxKDytfl6B7YlT9Izq05U="; - }) - ]; - hardeningDisable = [ "pic" ]; nativeBuildInputs = kernel.moduleBuildDependencies; |