From 25d45787308b6b47791e233985a8d58dffd511ac Mon Sep 17 00:00:00 2001
From: Stefan Ellmauthaler <stefan.ellmauthaler@tu-dresden.de>
Date: Thu, 5 May 2022 16:35:28 +0200
Subject: [PATCH] fix comma overlay

---
 baseconfiguration.nix |  2 +-
 default.nix           |  4 +---
 flake.lock            | 42 ++++++++++++++++++++++++++----------------
 3 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/baseconfiguration.nix b/baseconfiguration.nix
index 4549a66..0ab099a 100644
--- a/baseconfiguration.nix
+++ b/baseconfiguration.nix
@@ -76,7 +76,7 @@
       clang
       rnix-lsp
       procs
-      comma
+      comma.comma
     ];
     sessionVariables = rec {
       XDG_CACHE_HOME  = "\${HOME}/.cache";
diff --git a/default.nix b/default.nix
index 95e762f..5712ca4 100644
--- a/default.nix
+++ b/default.nix
@@ -16,9 +16,7 @@ let
       };
 
       overlay-comma = final: prev: {
-        comma = import flakes.comma {
-          system = "${system}";
-        };
+        comma = flakes.comma.packages."${system}";
       };
     in
       {
diff --git a/flake.lock b/flake.lock
index acb7059..2e5ee77 100644
--- a/flake.lock
+++ b/flake.lock
@@ -93,10 +93,7 @@
     },
     "naersk": {
       "inputs": {
-        "nixpkgs": [
-          "comma",
-          "nixpkgs"
-        ]
+        "nixpkgs": "nixpkgs"
       },
       "locked": {
         "lastModified": 1650101877,
@@ -131,18 +128,15 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1651662302,
-        "narHash": "sha256-utlTjLa1s4ezdQIUvnBtmA9TBYFrPlXpAJnCXEiZFZI=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "dff5496b12817e3d019983827c4b7ba7beb96580",
-        "type": "github"
+        "lastModified": 1651310835,
+        "narHash": "sha256-MLk/zsLlbPhwFucxL64Fr+oIrvQC2/76Ap2F7ekbPNI=",
+        "path": "/nix/store/fj0r6l3gglr0k0b4dxn3hm8drcwclm36-source",
+        "rev": "fd3e33d696b81e76b30160dfad2efb7ac1f19879",
+        "type": "path"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "nixos-21.11",
-        "repo": "nixpkgs",
-        "type": "github"
+        "id": "nixpkgs",
+        "type": "indirect"
       }
     },
     "nixpkgs-21_05": {
@@ -192,6 +186,22 @@
       }
     },
     "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1651662302,
+        "narHash": "sha256-utlTjLa1s4ezdQIUvnBtmA9TBYFrPlXpAJnCXEiZFZI=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "dff5496b12817e3d019983827c4b7ba7beb96580",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-21.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1626852498,
         "narHash": "sha256-lOXUJvi0FJUXHTVSiC5qsMRtEUgqM4mGZpMESLuGhmo=",
@@ -212,7 +222,7 @@
         "emacs-overlay": "emacs-overlay",
         "home-manager": "home-manager",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "simple-nixos-mailserver": "simple-nixos-mailserver",
         "sops-nix": "sops-nix"
@@ -221,7 +231,7 @@
     "simple-nixos-mailserver": {
       "inputs": {
         "blobs": "blobs",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_3",
         "nixpkgs-21_05": "nixpkgs-21_05",
         "nixpkgs-21_11": "nixpkgs-21_11",
         "utils": "utils_2"