From 849728aeb5b33e2a0f1accb1500aa933684e5cf6 Mon Sep 17 00:00:00 2001
From: Thilo Billerbeck <thilo.billerbeck@officerent.de>
Date: Tue, 12 Dec 2023 01:37:21 +0100
Subject: [PATCH] flake.lock: Add
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Added input 'devenv':
    'github:cachix/devenv/895e8403410c3ec14d1e8cae94e88b4e7e2e8c2f' (2023-12-10)
• Added input 'devenv/flake-compat':
    'github:edolstra/flake-compat/35bb57c0c8d8b62bbfd284272c928ceb64ddbde9' (2023-01-17)
• Added input 'devenv/nix':
    'github:domenkozar/nix/7c91803598ffbcfe4a55c44ac6d49b2cf07a527f' (2023-02-16)
• Added input 'devenv/nix/lowdown-src':
    'github:kristapsdz/lowdown/d2c2b44ff6c27b936ec27358a2653caaef8f73b8' (2021-10-06)
• Added input 'devenv/nix/nixpkgs':
    follows 'devenv/nixpkgs'
• Added input 'devenv/nix/nixpkgs-regression':
    'github:NixOS/nixpkgs/215d4d0fd80ca5163643b03a33fde804a29cc1e2' (2022-01-24)
• Added input 'devenv/nixpkgs':
    'github:NixOS/nixpkgs/126f49a01de5b7e35a43fd43f891ecf6d3a51459' (2023-03-15)
• Added input 'devenv/pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/5843cf069272d92b60c3ed9e55b7a8989c01d4c7' (2023-06-29)
• Added input 'devenv/pre-commit-hooks/flake-compat':
    follows 'devenv/flake-compat'
• Added input 'devenv/pre-commit-hooks/flake-utils':
    'github:numtide/flake-utils/a1720a10a6cfe8234c0e93907ffe81be440f4cef' (2023-05-31)
• Added input 'devenv/pre-commit-hooks/flake-utils/systems':
    'github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e' (2023-04-09)
• Added input 'devenv/pre-commit-hooks/gitignore':
    'github:hercules-ci/gitignore.nix/a20de23b925fd8264fd7fad6454652e142fd7f73' (2022-08-14)
• Added input 'devenv/pre-commit-hooks/gitignore/nixpkgs':
    follows 'devenv/pre-commit-hooks/nixpkgs'
• Added input 'devenv/pre-commit-hooks/nixpkgs':
    follows 'devenv/nixpkgs'
• Added input 'devenv/pre-commit-hooks/nixpkgs-stable':
    'github:NixOS/nixpkgs/c37ca420157f4abc31e26f436c1145f8951ff373' (2023-06-03)
• Added input 'home-manager':
    'github:nix-community/home-manager/defbb9c5857e157703e8fc7cf3c2ceb01cb95883' (2023-12-10)
• Added input 'home-manager/nixpkgs':
    follows 'nixpkgs'
• Added input 'nix-software-center':
    'github:vlinkz/nix-software-center/8faa762f9b710520f8b7f81f4892a6e0aba749dc' (2023-08-27)
• Added input 'nix-software-center/nixpkgs':
    'github:NixOS/nixpkgs/91a22f76cd1716f9d0149e8a5c68424bb691de15' (2023-08-21)
• Added input 'nix-software-center/utils':
    'github:numtide/flake-utils/919d646de7be200f3bf08cb76ae1f09402b6f9b4' (2023-07-11)
• Added input 'nix-software-center/utils/systems':
    'github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e' (2023-04-09)
• Added input 'nixpkgs':
    'github:NixOS/nixpkgs/666fc80e7b2afb570462423cb0e1cf1a3a34fedd' (2023-12-09)
• Added input 'nixpkgs-update':
    'github:ryantm/nixpkgs-update/69c05bc1cd5e336b9264197fd2bcb4feba6039df' (2023-12-10)
• Added input 'nixpkgs-update/mmdoc':
    'github:ryantm/mmdoc/cec02bafac9456bd1ed9b261b8d163a893885e5b' (2022-11-21)
• Added input 'nixpkgs-update/mmdoc/nixpkgs':
    follows 'nixpkgs-update/nixpkgs'
• Added input 'nixpkgs-update/mmdoc/nixpkgs-for-manual':
    'github:ryantm/nixpkgs/6a6caacfdd079a0fa249046514480a1c4597d861' (2022-09-22)
• Added input 'nixpkgs-update/nixpkgs':
    'github:NixOS/nixpkgs/293a28df6d7ff3dec1e61e37cc4ee6e6c0fb0847' (2022-12-30)
---
 flake.lock | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/flake.lock b/flake.lock
index 5dfb826..e23805a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
         "pre-commit-hooks": "pre-commit-hooks"
       },
       "locked": {
-        "lastModified": 1702239743,
-        "narHash": "sha256-3WAHQpcgbtkFl4gUBRPJO8eZYc+alBvZvC7FlPrTK2A=",
+        "lastModified": 1702239828,
+        "narHash": "sha256-H+z5LY1XslLLIlsh0pirHmveD7Eh6QQUT96VNSRJW9w=",
         "owner": "cachix",
         "repo": "devenv",
-        "rev": "814c4656804974394ef0b62f81293f8416ff8ee5",
+        "rev": "895e8403410c3ec14d1e8cae94e88b4e7e2e8c2f",
         "type": "github"
       },
       "original": {
@@ -84,19 +84,11 @@
         ]
       },
       "locked": {
-<<<<<<< HEAD
         "lastModified": 1702203126,
         "narHash": "sha256-4BhN2Vji19MzRC7SUfPZGmtZ2WZydQeUk/ogfRBIZMs=",
         "owner": "nix-community",
         "repo": "home-manager",
         "rev": "defbb9c5857e157703e8fc7cf3c2ceb01cb95883",
-=======
-        "lastModified": 1701609479,
-        "narHash": "sha256-mcEnMz7XB3K57ZX16VXoEkswljSNGXdMuUu5+g8a8R8=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "e504e8d01f950776c3a3160ba38c5957a1b89e66",
->>>>>>> fd032b4 (flake.lock: Update)
         "type": "github"
       },
       "original": {