Use explicit order in overlays

2023-06-16 16:02:25 +02:00 · 2023-06-16 16:02:25 +02:00 · 1724535495
commit 1724535495
parent 5b41670f36
2 changed files with 27 additions and 32 deletions
--- a/m/common/main.nix
+++ b/m/common/main.nix
@ -9,11 +9,12 @@
    ./slurm.nix
    ./ssh.nix
    ./users.nix
-
-    ../../pkgs/mpi.nix
  ];

-  nixpkgs.overlays = [ bscpkgs.bscOverlay ];
+  nixpkgs.overlays = [
+    bscpkgs.bscOverlay
+    (import ../../pkgs/mpi.nix)
+  ];

  nix.nixPath = [
    "nixpkgs=${nixpkgs}"
--- a/pkgs/mpi.nix
+++ b/pkgs/mpi.nix
@ -1,5 +1,4 @@
-let
-  overlay = final: prev:
+final: prev:
 {
  bsc = prev.bsc.extend (bsc: {
    mpi2 = bsc.mpich;
@ -22,10 +21,5 @@ let
        "FCFLAGS=-fallow-argument-mismatch"
      ];
    });
-    };
-  };
-in
-
-{
-  nixpkgs.overlays = [ overlay ];
+  });
 }