From dd7dfdcb6a73852abca879134e67045a898f4378 Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <bernardo@meurer.org>
Date: Sun, 31 Jan 2021 18:02:21 -0800
Subject: [PATCH] pkgs: don't reference deprecated stdenv.lib

`stdenv.lib` has been deprecated in favor of using `lib` directly.
---
 pkgs/sops-init-gpg-key/default.nix    | 4 ++--
 pkgs/sops-install-secrets/default.nix | 4 ++--
 pkgs/ssh-to-pgp/default.nix           | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/sops-init-gpg-key/default.nix b/pkgs/sops-init-gpg-key/default.nix
index 5381bb7..a5951fe 100644
--- a/pkgs/sops-init-gpg-key/default.nix
+++ b/pkgs/sops-init-gpg-key/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, makeWrapper, gnupg, coreutils, utillinux, unixtools }:
+{ stdenv, lib, makeWrapper, gnupg, coreutils, utillinux, unixtools }:
 
 stdenv.mkDerivation {
   name = "sops-init-gpg-key";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   installPhase = ''
     install -m755 -D $src $out/bin/sops-init-gpg-key
     wrapProgram $out/bin/sops-init-gpg-key \
-      --prefix PATH : ${stdenv.lib.makeBinPath [
+      --prefix PATH : ${lib.makeBinPath [
         coreutils utillinux gnupg unixtools.hostname
       ]}
   '';
diff --git a/pkgs/sops-install-secrets/default.nix b/pkgs/sops-install-secrets/default.nix
index 1e7a0dc..e7527e2 100644
--- a/pkgs/sops-install-secrets/default.nix
+++ b/pkgs/sops-install-secrets/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, path, pkgs, vendorSha256, go }:
+{ stdenv, lib, buildGoModule, path, pkgs, vendorSha256, go }:
 buildGoModule {
   pname = "sops-install-secrets";
   version = "0.0.1";
@@ -28,7 +28,7 @@ buildGoModule {
 
   inherit vendorSha256;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Atomic secret provisioning based on sops";
     homepage = "https://github.com/Mic92/sops-nix";
     license = licenses.mit;
diff --git a/pkgs/ssh-to-pgp/default.nix b/pkgs/ssh-to-pgp/default.nix
index 4c96577..32a7f91 100644
--- a/pkgs/ssh-to-pgp/default.nix
+++ b/pkgs/ssh-to-pgp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, gnupg, vendorSha256, }:
+{ stdenv, lib, buildGoModule, gnupg, vendorSha256, }:
 buildGoModule {
   pname = "ssh-to-pgp";
   version = "0.0.1";
@@ -16,7 +16,7 @@ buildGoModule {
 
   inherit vendorSha256;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Convert ssh public/private keys to PGP";
     homepage = "https://github.com/Mic92/sops-nix";
     license = licenses.mit;