From 13f9a3b6a3358d6a8a8adc4a7052bc2d270ee7c1 Mon Sep 17 00:00:00 2001
From: clerie <git@clerie.de>
Date: Sun, 12 Dec 2021 13:35:13 +0100
Subject: [PATCH] Fix changed behaviour of fetchGit

---
 hosts/web-2/bubblesort.nix        | 1 +
 hosts/web-2/clerie.nix            | 1 +
 hosts/web-2/milchinsel.nix        | 1 +
 hosts/web-2/reichartstrasse.nix   | 1 +
 hosts/world-dev/configuration.nix | 6 ++++--
 pkgs/iot-data/default.nix         | 1 +
 pkgs/uptimestatus/default.nix     | 1 +
 pkgs/wetter/default.nix           | 1 +
 8 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/hosts/web-2/bubblesort.nix b/hosts/web-2/bubblesort.nix
index 5994696..5247378 100644
--- a/hosts/web-2/bubblesort.nix
+++ b/hosts/web-2/bubblesort.nix
@@ -6,6 +6,7 @@
       forceSSL = true;
       root = fetchGit {
         url = "https://git.clerie.de/clerie/bubblesort_js.git";
+        ref = "main";
         rev = "39d54701a11f4fb48d7e023e384a848e6bde5640";
       };
     };
diff --git a/hosts/web-2/clerie.nix b/hosts/web-2/clerie.nix
index b51b505..b658a65 100644
--- a/hosts/web-2/clerie.nix
+++ b/hosts/web-2/clerie.nix
@@ -15,6 +15,7 @@
       forceSSL = true;
       root = fetchGit {
         url = "https://git.clerie.de/clerie/clerie.de.git";
+        ref = "main";
         rev = "7fbb8042100fde4a8524eec656519eb8b48ae68a";
       };
     };
diff --git a/hosts/web-2/milchinsel.nix b/hosts/web-2/milchinsel.nix
index d182709..322d911 100644
--- a/hosts/web-2/milchinsel.nix
+++ b/hosts/web-2/milchinsel.nix
@@ -15,6 +15,7 @@
       forceSSL = true;
       root = fetchGit {
         url = "https://git.clerie.de/clerie/milchinsel.de.git";
+        ref = "master";
         rev = "8ca6727902fb5a2581b56c4b3ab8d01585f3acb0";
       };
     };
diff --git a/hosts/web-2/reichartstrasse.nix b/hosts/web-2/reichartstrasse.nix
index 5c9ca37..8814083 100644
--- a/hosts/web-2/reichartstrasse.nix
+++ b/hosts/web-2/reichartstrasse.nix
@@ -15,6 +15,7 @@
       forceSSL = true;
       root = fetchGit {
         url = "https://git.clerie.de/clerie/reichartstrasse.de.git";
+        ref = "master";
         rev = "377e27d8a8d4b701fa7da072d3f3e68925c5f274";
       };
     };
diff --git a/hosts/world-dev/configuration.nix b/hosts/world-dev/configuration.nix
index 917e3ae..d3c4703 100644
--- a/hosts/world-dev/configuration.nix
+++ b/hosts/world-dev/configuration.nix
@@ -8,14 +8,16 @@
       ../../configuration/proxmox-vm
       (import (fetchGit {
          url = https://bitbucket.fem.tu-ilmenau.de/scm/~clerie/workadventure-nix-modules.git;
-         ref = "96c7a69f52154b8bb88dfaee8926a13da0759503";
+         ref = "main";
+         rev = "96c7a69f52154b8bb88dfaee8926a13da0759503";
       }))
     ];
 
   nixpkgs.overlays = [
     (import (fetchGit {
        url = https://bitbucket.fem.tu-ilmenau.de/scm/~clerie/workadventure-nix.git;
-       ref = "9c08f674a62e29c33fa566df02df0cea37fb71ba";
+       ref = "one-for-all";
+       rev = "9c08f674a62e29c33fa566df02df0cea37fb71ba";
     } + "/overlay.nix"))
   ];
 
diff --git a/pkgs/iot-data/default.nix b/pkgs/iot-data/default.nix
index 487ab97..22b1852 100644
--- a/pkgs/iot-data/default.nix
+++ b/pkgs/iot-data/default.nix
@@ -7,6 +7,7 @@
 let
   src = fetchGit {
     url = "https://git.clerie.de/clerie/iot-data.git";
+    ref = "main";
     rev = "f60e3a3f89549b4ce88df20888c08a01062d086a";
   };
   pname = "iot-data";
diff --git a/pkgs/uptimestatus/default.nix b/pkgs/uptimestatus/default.nix
index 956e71e..81a25ed 100644
--- a/pkgs/uptimestatus/default.nix
+++ b/pkgs/uptimestatus/default.nix
@@ -8,6 +8,7 @@
 let
   src = fetchGit {
     url = "https://git.clerie.de/clerie/uptime-status.git";
+    ref = "main";
     rev = "caacaced97617838bbd9b7b91a4e3d06e411139b";
   };
   pname = "uptimestatus";
diff --git a/pkgs/wetter/default.nix b/pkgs/wetter/default.nix
index 0f06e72..bc1344a 100644
--- a/pkgs/wetter/default.nix
+++ b/pkgs/wetter/default.nix
@@ -19,6 +19,7 @@
 let
   src = fetchGit {
     url = "https://git.clerie.de/clerie/wetter.git";
+    ref = "master";
     rev = "bb503828098717825c389fd6f450b395a02dcc6a";
   };
   pname = "wetter";