From 231672a22226d93222c8588b1b51abba87d90176 Mon Sep 17 00:00:00 2001
From: Pedro Martinez <pedro.martinez-ferrer@bsc.es>
Date: Fri, 2 Oct 2020 18:28:13 +0200
Subject: [PATCH] Rename files to improve consistency

---
 .../creams/{SS+hybrid.nix => ss+hybrid.nix}   |  0
 .../creams/{SS+nohybrid.nix => ss+pure.nix}   |  0
 overlay.nix                                   | 30 ++++++++++---------
 3 files changed, 16 insertions(+), 14 deletions(-)
 rename garlic/exp/creams/{SS+hybrid.nix => ss+hybrid.nix} (100%)
 rename garlic/exp/creams/{SS+nohybrid.nix => ss+pure.nix} (100%)

diff --git a/garlic/exp/creams/SS+hybrid.nix b/garlic/exp/creams/ss+hybrid.nix
similarity index 100%
rename from garlic/exp/creams/SS+hybrid.nix
rename to garlic/exp/creams/ss+hybrid.nix
diff --git a/garlic/exp/creams/SS+nohybrid.nix b/garlic/exp/creams/ss+pure.nix
similarity index 100%
rename from garlic/exp/creams/SS+nohybrid.nix
rename to garlic/exp/creams/ss+pure.nix
diff --git a/overlay.nix b/overlay.nix
index 4edc2d0..2a3283f 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -237,20 +237,22 @@ let
           };
         };
 
-        creamsSS = {
-          nohybrid = callPackage ./garlic/exp/creams/SS+nohybrid.nix {
-            pkgs = self // self.bsc.garlic;
-            nixpkgs = import <nixpkgs>;
-            genApp = self.bsc.garlic.genApp;
-            genConfigs = self.bsc.garlic.genConfigs;
-            runWrappers = self.bsc.garlic.runWrappers;
-          };
-         hybrid = callPackage ./garlic/exp/creams/SS+hybrid.nix {
-            pkgs = self // self.bsc.garlic;
-            nixpkgs = import <nixpkgs>;
-            genApp = self.bsc.garlic.genApp;
-            genConfigs = self.bsc.garlic.genConfigs;
-            runWrappers = self.bsc.garlic.runWrappers;
+        creams = {
+          ss = {
+            pure = callPackage ./garlic/exp/creams/ss+pure.nix {
+              pkgs = self // self.bsc.garlic;
+              nixpkgs = import <nixpkgs>;
+              genApp = self.bsc.garlic.genApp;
+              genConfigs = self.bsc.garlic.genConfigs;
+              runWrappers = self.bsc.garlic.runWrappers;
+            };
+            hybrid = callPackage ./garlic/exp/creams/ss+hybrid.nix {
+              pkgs = self // self.bsc.garlic;
+              nixpkgs = import <nixpkgs>;
+              genApp = self.bsc.garlic.genApp;
+              genConfigs = self.bsc.garlic.genConfigs;
+              runWrappers = self.bsc.garlic.runWrappers;
+            };
           };
         };