Merge all branches

flake.nix

@@ -14,12 +14,9 @@
       bscOverlay = import ./overlay.nix;
       overlays.default = self.bscOverlay;
  
-      # propagate nixpkgs lib, so we can do bscpkgs.lib
-      inherit (nixpkgs) lib;
-
       # full nixpkgs with our overlay applied
       legacyPackages.${system} = pkgs;
-
+ 
       # packages added by our overlay
       packages.${system} =
         let
@@ -35,9 +32,7 @@
             (filterAttrs (_: isDerivation))
           ];
 
-      hydraJobs = {
-        inherit (self.legacyPackages.x86_64-linux.bsc-ci) test;
-        packages = self.packages.${system};
-      };
-   };
+      # propagate nixpkgs lib, so we can do bscpkgs.lib
+      inherit (nixpkgs) lib;
+    };
 }

pkgs/paraver/default.nix

@@ -1,18 +1,19 @@
-{ stdenv
-, fetchFromGitHub
-, autoreconfHook
-, boost
-, libxml2
-, xml2
-, wxGTK32
-, autoconf
-, automake
-, paraverKernel
-, openssl
-, glibcLocales
-, wrapGAppsHook
+{
+  stdenv,
+  fetchFromGitHub,
+  autoreconfHook,
+  boost,
+  libxml2,
+  xml2,
+  wxGTK32,
+  autoconf,
+  automake,
+  paraverKernel,
+  openssl,
+  glibcLocales,
+  wrapGAppsHook,
 
-, enableDebug ? false
+  enableDebug ? false,
 }:
 
 let

pkgs/paraver/kernel.nix

@@ -1,15 +1,16 @@
-{ stdenv
-, fetchFromGitHub
-, autoreconfHook
-, boost
-, libxml2
-, xml2
-, autoconf
-, automake
-, pkg-config
-, zlib
+{
+  stdenv,
+  fetchFromGitHub,
+  autoreconfHook,
+  boost,
+  libxml2,
+  xml2,
+  autoconf,
+  automake,
+  pkg-config,
+  zlib,
 
-, enableDebug ? false
+  enableDebug ? false,
 }:
 
 let