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

---
 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, 16 insertions(+), 13 deletions(-)

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