Simplify findMatch in intel-oneapi 2023

This should be a noop

default.nix

@@ -1,11 +1,19 @@
 let
   bscOverlay = import ./overlay.nix;
 
-  # Pin the nixpkgs
+  # read flake.lock and determine revision from there
-  nixpkgsPath = import ./nixpkgs.nix;
+  lock = builtins.fromJSON (builtins.readFile ./flake.lock);
-
+  inherit (lock.nodes.nixpkgs.locked) rev narHash;
-  pkgs = import nixpkgsPath {
+  fetchedNixpkgs = builtins.fetchTarball {
-    overlays = [ bscOverlay ];
+    url = "https://github.com/NixOS/nixpkgs/archive/${rev}.tar.gz";
+    sha256 = narHash;
   };
-
+in
-in pkgs
+{ overlays ? [ ]
+, nixpkgs ? fetchedNixpkgs
+, ...
+}@attrs:
+import nixpkgs (
+  (builtins.removeAttrs attrs [ "overlays" "nixpkgs" ]) //
+  { overlays = [ bscOverlay ] ++ overlays; }
+)

nixpkgs.nix

@@ -1,9 +0,0 @@
-let
-  commit = "e4ad989506ec7d71f7302cc3067abd82730a4beb";
-in builtins.fetchTarball {
-    # Descriptive name to make the store path easier to identify
-    name = "nixpkgs-${commit}";
-    url = "https://github.com/nixos/nixpkgs/archive/${commit}.tar.gz";
-    # Hash obtained using `nix-prefetch-url --unpack <url>`
-    sha256 = "sha256-de9KYi8rSJpqvBfNwscWdalIJXPo8NjdIZcEJum1mH0=";
-}

pkgs/tasycl/default.nix

@@ -12,11 +12,11 @@
 , opensycl ? null
 , adaptivecpp ? null
 , useIntel ? true
-  # TODO: move back to main branch and release
+
-, useGit ? true
+, useGit ? false
 , gitUrl ? "git@gitlab-internal.bsc.es:task-awareness/tasycl/tasycl.git"
-, gitBranch ? "fix/various"
+, gitBranch ? "main"
-, gitCommit ? "8be4729ded0ef64f028e98eb2b2baf2ccba7ff42"
+, gitCommit ? "78f98dcf60a66e0eaa3b4ebcf55be076bec64825"
 }:
 
 assert (useIntel || opensycl != null || adaptivecpp != null);
@@ -42,12 +42,12 @@ let
   ;
 
   release = rec {
-    version = "2.0.0";
+    version = "2.1.0";
     src = fetchFromGitHub {
       owner = "bsc-pm";
       repo = "tasycl";
       rev = version;
-      hash = "sha256-Z4d45baVBhE9NW8Ww948M78TJx7BpxTr9pGJvJO9hdI=";
+      hash = "sha256-0kXnb0lHeQNHR27GTLbJ8xbiICLU8k2+FqEnnFSrzzo=";
     };
   };