From d62566250f1ac639fd1a6956aec4e1412c4d3c1d Mon Sep 17 00:00:00 2001
From: dadada <dadada@dadada.li>
Date: Wed, 2 Jun 2021 20:25:59 +0200
Subject: [PATCH] Revert "remove references to stdenv and replace with lib"

This reverts commit 0dd9ecdafee7879e1ff6eea6f175b21e9cdf2647.
---
 hosts/gorgon/home/pkgs.nix | 1 +
 pkgs/deploy.nix            | 7 +++----
 pkgs/homePage/default.nix  | 5 ++---
 pkgs/keys/default.nix      | 7 +++----
 pkgs/scripts.nix           | 4 ++--
 pkgs/tubslatex/default.nix | 5 ++---
 6 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/hosts/gorgon/home/pkgs.nix b/hosts/gorgon/home/pkgs.nix
index cdaa46e..a6a2ff7 100644
--- a/hosts/gorgon/home/pkgs.nix
+++ b/hosts/gorgon/home/pkgs.nix
@@ -17,6 +17,7 @@ with pkgs; [
   direnv
   element-desktop
   evince
+  gnome3.evolution
   ffmpeg
   file
   firefox
diff --git a/pkgs/deploy.nix b/pkgs/deploy.nix
index 43aedf0..84be481 100644
--- a/pkgs/deploy.nix
+++ b/pkgs/deploy.nix
@@ -1,10 +1,9 @@
-{ lib 
+{ stdenv
 , git
 , openssh
 , bash
 }:
-with lib;
-mkDerivation rec {
+stdenv.mkDerivation rec {
   name = "dadada-deploy";
   version = "0.1";
 
@@ -25,7 +24,7 @@ mkDerivation rec {
       install $script $out/bin/
     done
   '';
-  meta = {
+  meta = with stdenv.lib; {
     description = "deploy scripts";
     license = licenses.publicDomain;
     platforms = platforms.linux;
diff --git a/pkgs/homePage/default.nix b/pkgs/homePage/default.nix
index 4fd9431..af952ca 100644
--- a/pkgs/homePage/default.nix
+++ b/pkgs/homePage/default.nix
@@ -1,6 +1,5 @@
-{ lib, pandoc, fetchFromGitHub }:
-with lib;
-mkDerivation rec {
+{ stdenv, pandoc, fetchFromGitHub }:
+stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "dadada";
     repo = "dadada.li";
diff --git a/pkgs/keys/default.nix b/pkgs/keys/default.nix
index 1fe1588..6b3552a 100644
--- a/pkgs/keys/default.nix
+++ b/pkgs/keys/default.nix
@@ -1,7 +1,6 @@
-{ lib }:
+{ stdenv }:
 
-with lib;
-mkDerivation rec {
+stdenv.mkDerivation rec {
   name = "dadadaKeys";
   version = "1";
 
@@ -14,7 +13,7 @@ mkDerivation rec {
     cp * $out
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Public keys for my infrastructure";
     license = licenses.publicDomain;
     platforms = platforms.all;
diff --git a/pkgs/scripts.nix b/pkgs/scripts.nix
index 62ba05a..98ca55e 100644
--- a/pkgs/scripts.nix
+++ b/pkgs/scripts.nix
@@ -1,4 +1,4 @@
-{ lib }:
+{ stdenv }:
 
 (import
   (builtins.fetchGit {
@@ -6,4 +6,4 @@
     ref = "main";
     rev = "3393073cd3511d43f622972b891a20ba069fa052";
   })
-  { inherit lib; })
+  { inherit stdenv; })
diff --git a/pkgs/tubslatex/default.nix b/pkgs/tubslatex/default.nix
index f4ac39b..2ca8542 100644
--- a/pkgs/tubslatex/default.nix
+++ b/pkgs/tubslatex/default.nix
@@ -1,6 +1,5 @@
-{ lib, fetchzip, unzip }:
-with lib;
-mkDerivation rec {
+{ stdenv, fetchzip, unzip }:
+stdenv.mkDerivation rec {
   src = ./tubslatex_1.3.2.tds.zip;
   sourceRoot = ".";
   nativeBuildInputs = [ unzip ];