From 447aeca1ed3a8d87fd542dc6bb37f7e6aa7dfe6b Mon Sep 17 00:00:00 2001 From: foosinn Date: Mon, 6 Dec 2021 12:42:00 +0100 Subject: [PATCH] fix stdenv deprications --- packages/helm2.nix | 2 +- packages/nagstamon.nix | 5 ++--- packages/notcoal/default.nix | 2 +- packages/oc311.nix | 2 +- packages/oc46.nix | 2 +- packages/openshift-install-4.5.nix | 2 +- packages/skaffold.nix | 2 +- packages/vaultsink.nix | 2 +- 8 files changed, 9 insertions(+), 10 deletions(-) diff --git a/packages/helm2.nix b/packages/helm2.nix index 29956c3..93b18ae 100644 --- a/packages/helm2.nix +++ b/packages/helm2.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { install -m 755 -D linux-amd64/helm $out/bin/helm2 ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://helm.sh"; description = "helms depricated v2 verison"; platforms = platforms.linux; diff --git a/packages/nagstamon.nix b/packages/nagstamon.nix index c1c09e7..0554e39 100644 --- a/packages/nagstamon.nix +++ b/packages/nagstamon.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python38Packages, wrapQtAppsHook }: +{ stdenv, lib, fetchFromGitHub, python38Packages, wrapQtAppsHook }: python38Packages.buildPythonApplication rec { pname = "nagstamon"; @@ -11,7 +11,6 @@ python38Packages.buildPythonApplication rec { sha256 = "1l095halb55qinaik51p3lxiln1s034dr28k7ra6xzrrv9l1x1xw"; }; - # Test assumes darwin doCheck = false; nativeBuildInputs = [ wrapQtAppsHook ]; @@ -34,7 +33,7 @@ python38Packages.buildPythonApplication rec { xlib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A status monitor for the desktop"; homepage = "https://nagstamon.ifw-dresden.de/"; license = licenses.gpl2; diff --git a/packages/notcoal/default.nix b/packages/notcoal/default.nix index 7c080eb..cb99f47 100644 --- a/packages/notcoal/default.nix +++ b/packages/notcoal/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An email tagger for notmuch"; homepage = "https://ghom.niij.org/eaon/notcoal"; }; diff --git a/packages/oc311.nix b/packages/oc311.nix index b4c7c5d..639d882 100644 --- a/packages/oc311.nix +++ b/packages/oc311.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { install -m 755 -D oc $out/bin/oc3 ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.odk.io"; description = "openshift311 client"; platforms = platforms.linux; diff --git a/packages/oc46.nix b/packages/oc46.nix index 263db47..138232f 100644 --- a/packages/oc46.nix +++ b/packages/oc46.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { install -m 755 -D oc $out/bin/oc ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.odk.io"; description = "openshift 4.6 client"; platforms = platforms.linux; diff --git a/packages/openshift-install-4.5.nix b/packages/openshift-install-4.5.nix index 4c59399..8822e91 100644 --- a/packages/openshift-install-4.5.nix +++ b/packages/openshift-install-4.5.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { install -m 755 -D openshift-install $out/bin/openshift-install ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.odk.io"; description = "openshift 4.5 installer"; platforms = platforms.linux; diff --git a/packages/skaffold.nix b/packages/skaffold.nix index eb42f25..3527a42 100644 --- a/packages/skaffold.nix +++ b/packages/skaffold.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ls -lah $out/bin/skaffold ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://skaffold.dev"; description = "skaffold"; platforms = platforms.linux; diff --git a/packages/vaultsink.nix b/packages/vaultsink.nix index 0f36856..ed7672e 100644 --- a/packages/vaultsink.nix +++ b/packages/vaultsink.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { install -m 755 -D vault-sink-linux-amd64 $out/bin/sink ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/cookiefactory/vault-sink"; description = "Vault Secret helper for yaml files"; platforms = platforms.linux;