From dd341902fcb17a4f26925201bebaa113efbf9fe8 Mon Sep 17 00:00:00 2001
From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Date: Mon, 6 Nov 2023 23:03:56 +0100
Subject: [PATCH] BSC packages are no longer in bsc attribute

Reviewed-by: Aleix Roca Nonell <aleix.rocanonell@bsc.es>
---
 m/common/main.nix |  2 +-
 pkgs/overlay.nix  | 44 +++++++++++++++++++++-----------------------
 2 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/m/common/main.nix b/m/common/main.nix
index 999f043..2844b3f 100644
--- a/m/common/main.nix
+++ b/m/common/main.nix
@@ -42,7 +42,7 @@
     nix-diff ipmitool freeipmi ethtool lm_sensors ix cmake gnumake file tree
     ncdu config.boot.kernelPackages.perf ldns
     # From bsckgs overlay
-    bsc.osumb
+    osumb
   ];
 
   programs.direnv.enable = true;
diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix
index 47a4f3a..efdeada 100644
--- a/pkgs/overlay.nix
+++ b/pkgs/overlay.nix
@@ -1,29 +1,27 @@
 final: prev:
 {
-  bsc = prev.bsc.extend (bscFinal: bscPrev: {
-    # Set MPICH as default
-    mpi = bscFinal.mpich;
+  # Set MPICH as default
+  mpi = final.mpich;
 
-    # Configure the network for MPICH
-    mpich = with final; prev.mpich.overrideAttrs (old: {
-      buildInput = old.buildInputs ++ [
-        libfabric
-        pmix
-      ];
-      configureFlags = [
-        "--enable-shared"
-        "--enable-sharedlib"
-        "--with-pm=no"
-        "--with-device=ch4:ofi"
-        "--with-pmi=pmix"
-        "--with-pmix=${final.pmix}"
-        "--with-libfabric=${final.libfabric}"
-        "--enable-g=log"
-      ] ++ lib.optionals (lib.versionAtLeast gfortran.version "10") [
-        "FFLAGS=-fallow-argument-mismatch" # https://github.com/pmodels/mpich/issues/4300
-        "FCFLAGS=-fallow-argument-mismatch"
-      ];
-    });
+  # Configure the network for MPICH
+  mpich = with final; prev.mpich.overrideAttrs (old: {
+    buildInput = old.buildInputs ++ [
+      libfabric
+      pmix
+    ];
+    configureFlags = [
+      "--enable-shared"
+      "--enable-sharedlib"
+      "--with-pm=no"
+      "--with-device=ch4:ofi"
+      "--with-pmi=pmix"
+      "--with-pmix=${final.pmix}"
+      "--with-libfabric=${final.libfabric}"
+      "--enable-g=log"
+    ] ++ lib.optionals (lib.versionAtLeast gfortran.version "10") [
+      "FFLAGS=-fallow-argument-mismatch" # https://github.com/pmodels/mpich/issues/4300
+      "FCFLAGS=-fallow-argument-mismatch"
+    ];
   });
 
   # Update ceph to 18.2.0 until it lands in nixpkgs, see: