From 65255be84f05353f651b0eb075cfeaaa038739ec Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte.vanpetegem@ugent.be>
Date: Tue, 24 Jan 2023 09:21:47 +0100
Subject: [PATCH] Update dependencies

---
 flake.lock | 18 +++++++-----------
 flake.nix  | 10 +---------
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/flake.lock b/flake.lock
index ea87b4f1..5b72f38b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -227,9 +227,7 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "nixpkgs-22_11": [
-          "nixpkgs-22_11"
-        ],
+        "nixpkgs-22_11": "nixpkgs-22_11",
         "utils": [
           "flake-utils"
         ]
@@ -250,11 +248,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1674211260,
-        "narHash": "sha256-xU6Rv9sgnwaWK7tgCPadV6HhI2Y/fl4lKxJoG2+m9qs=",
+        "lastModified": 1674459583,
+        "narHash": "sha256-L0UZl/u2H3HGsrhN+by42c5kNYeKtdmJiPzIRvEVeiM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5ed481943351e9fd354aeb557679624224de38d5",
+        "rev": "1b1f50645af2a70dc93eae18bfd88d330bfbcf7f",
         "type": "github"
       },
       "original": {
@@ -268,16 +266,15 @@
       "locked": {
         "lastModified": 1674333941,
         "narHash": "sha256-jelQS56nVVFXGOZg6yUZ/3QWgU1Loa4Bzd4+TEPJX+c=",
-        "owner": "nixos",
+        "owner": "NixOS",
         "repo": "nixpkgs",
         "rev": "339fc3dcc98f39d08496fb90c0d6b5fb81519246",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
+        "id": "nixpkgs",
         "ref": "nixos-22.11",
-        "repo": "nixpkgs",
-        "type": "github"
+        "type": "indirect"
       }
     },
     "nur": {
@@ -307,7 +304,6 @@
         "home-manager": "home-manager",
         "nixos-mailserver": "nixos-mailserver",
         "nixpkgs": "nixpkgs",
-        "nixpkgs-22_11": "nixpkgs-22_11",
         "nur": "nur",
         "tetris": "tetris",
         "utils": "utils",
diff --git a/flake.nix b/flake.nix
index e4da3a9b..e0ff11ff 100644
--- a/flake.nix
+++ b/flake.nix
@@ -58,12 +58,10 @@
       url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
       inputs = {
         nixpkgs.follows = "nixpkgs";
-        nixpkgs-22_11.follows = "nixpkgs-22_11";
         utils.follows = "flake-utils";
       };
     };
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    nixpkgs-22_11.url = "github:nixos/nixpkgs/nixos-22.11";
     nur.url = "github:nix-community/NUR";
     tetris = {
       url = "github:chvp/tetris";
@@ -89,7 +87,7 @@
     };
   };
 
-  outputs = inputs@{ self, nixpkgs, nixpkgs-22_11, accentor, accentor-api, accentor-web, agenix, devshell, emacs-overlay, flake-utils, home-manager, nixos-mailserver, nur, tetris, utils, www-chvp-be }:
+  outputs = inputs@{ self, nixpkgs, accentor, accentor-api, accentor-web, agenix, devshell, emacs-overlay, flake-utils, home-manager, nixos-mailserver, nur, tetris, utils, www-chvp-be }:
     utils.lib.mkFlake {
       inherit self inputs;
       channels.nixpkgs = {
@@ -101,12 +99,6 @@
           emacs-overlay.overlay
           (self: super: {
             tetris = tetris.packages.${self.system}.default;
-            mastodon = nixpkgs-22_11.legacyPackages.${self.system}.mastodon;
-            gitlab-pages = nixpkgs-22_11.legacyPackages.${self.system}.gitlab-pages;
-            gitlab = nixpkgs-22_11.legacyPackages.${self.system}.gitlab;
-            gitlab-gitaly = nixpkgs-22_11.legacyPackages.${self.system}.gitlab-gitaly;
-            gitlab-shell = nixpkgs-22_11.legacyPackages.${self.system}.gitlab-shell;
-            gitlab-workhorse = nixpkgs-22_11.legacyPackages.${self.system}.gitlab-workhorse;
           })
           nur.overlay
           www-chvp-be.overlay