From d95e07f63779a53d5e938323e63950ec9fc27777 Mon Sep 17 00:00:00 2001
From: Stefan Ellmauthaler <stefan.ellmauthaler@tu-dresden.de>
Date: Mon, 17 Jan 2022 16:16:48 +0100
Subject: [PATCH] FLAKE upd
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

• Updated input 'emacs-overlay':
  → 'github:nix-community/emacs-overlay/cda8c68fe3dabd1cfd8b9621564d3088d0bcb071' (2022-01-17)
• Updated input 'nixos-hardware':
  → 'github:NixOS/nixos-hardware/87a35a0d58f546dc23f37b4f6af575d0e4be6a7a' (2022-01-12)
• Updated input 'nixpkgs':
  → 'github:NixOS/nixpkgs/3ddd960a3b575bf3230d0e59f42614b71f9e0db9' (2022-01-14)
• Updated input 'nixpkgs-unstable':
  → 'github:NixOS/nixpkgs/5aaed40d22f0d9376330b6fa413223435ad6fee5' (2022-01-13)
---
 flake.lock | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/flake.lock b/flake.lock
index 0ad0d27..31bb89c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,19 @@
   "nodes": {
     "emacs-overlay": {
       "locked": {
+<<<<<<< HEAD
         "lastModified": 1642044102,
         "narHash": "sha256-GjDR4EmJw+OUCapU8Lx4VqKsycfr9Kd1gbeHL32q0jM=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
         "rev": "7b47359a8007a77b36c8bc2484930f988333f3ce",
+=======
+        "lastModified": 1642414078,
+        "narHash": "sha256-izmKOQGC3nttxqnpgJZo6IoR/ZNto9u12ToFRdEwL4Y=",
+        "owner": "nix-community",
+        "repo": "emacs-overlay",
+        "rev": "cda8c68fe3dabd1cfd8b9621564d3088d0bcb071",
+>>>>>>> edea0b8 (FLAKE upd)
         "type": "github"
       },
       "original": {
@@ -54,11 +62,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1641870998,
-        "narHash": "sha256-6HkxR2WZsm37VoQS7jgp6Omd71iw6t1kP8bDbaqCDuI=",
+        "lastModified": 1642190797,
+        "narHash": "sha256-cxeEEAtfIACnm8sV1oz0xlNp9IVk10Fxcc09ggoEZuo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "386234e2a61e1e8acf94dfa3a3d3ca19a6776efb",
+        "rev": "3ddd960a3b575bf3230d0e59f42614b71f9e0db9",
         "type": "github"
       },
       "original": {
@@ -70,11 +78,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1641887635,
-        "narHash": "sha256-kDGpufwzVaiGe5e1sBUBPo9f1YN+nYHJlYqCaVpZTQQ=",
+        "lastModified": 1642104392,
+        "narHash": "sha256-m71b7MgMh9FDv4MnI5sg9MiBVW6DhE1zq+d/KlLWSC8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b2737d4980a17cc2b7d600d7d0b32fd7333aca88",
+        "rev": "5aaed40d22f0d9376330b6fa413223435ad6fee5",
         "type": "github"
       },
       "original": {