forked from rarias/jungle
Update Intel 2023 derivation to use new TOML
This commit is contained in:
@@ -42,15 +42,15 @@ let
|
||||
|
||||
findMatch = name:
|
||||
let
|
||||
aptPackages = builtins.fromJSON (builtins.readFile ./packages.json);
|
||||
matches = lib.filter (x: name == x.pname) aptPackages;
|
||||
aptPackages = builtins.getAttr "hpckit-2023-1-0" (builtins.fromTOML (builtins.readFile ./packages.toml));
|
||||
matches = lib.filter (x: lib.hasPrefix name (x.name + "-" + x.version)) aptPackages;
|
||||
n = lib.length matches;
|
||||
match = builtins.traceVerbose (name + " -- ${builtins.toString n}") (builtins.head matches);
|
||||
|
||||
apthost = "https://apt.repos.intel.com/oneapi/";
|
||||
in
|
||||
{
|
||||
url = apthost + match.filename;
|
||||
url = apthost + match.file;
|
||||
sha256 = match.sha256;
|
||||
};
|
||||
|
||||
@@ -299,7 +299,7 @@ let
|
||||
src = joinDebs pname [
|
||||
# C/C++
|
||||
"intel-oneapi-dpcpp-cpp-${version}"
|
||||
"intel-oneapi-compiler-dpcpp-cpp-${version}"
|
||||
# "intel-oneapi-compiler-dpcpp-cpp-${version}"
|
||||
"intel-oneapi-compiler-dpcpp-cpp-common-${version}"
|
||||
"intel-oneapi-compiler-dpcpp-cpp-runtime-${version}"
|
||||
"intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic-${version}"
|
||||
|
||||
Reference in New Issue
Block a user