From d3baaea4f0eeb18fc31677bb4fd7e4343cc9f860 Mon Sep 17 00:00:00 2001 From: Christian Ulrich Date: Sat, 24 Jul 2021 15:53:20 +0200 Subject: [PATCH] replace deprecated stdenv.lib with lib --- pkgs/cadet-gtk/default.nix | 5 +++-- pkgs/ngtcp2/default.nix | 3 ++- pkgs/nim-packages/generic.nix | 4 ++-- pkgs/nim-packages/gintro/default.nix | 4 ++-- pkgs/nim-packages/ui.nix | 4 ++-- pkgs/openphone/default.nix | 4 ++-- pkgs/picoquic/default.nix | 5 +++-- pkgs/picotls/default.nix | 5 +++-- pkgs/quicly/default.nix | 5 +++-- pkgs/shinto-cli/default.nix | 5 +++-- 10 files changed, 25 insertions(+), 19 deletions(-) diff --git a/pkgs/cadet-gtk/default.nix b/pkgs/cadet-gtk/default.nix index 24567b9..4592e10 100644 --- a/pkgs/cadet-gtk/default.nix +++ b/pkgs/cadet-gtk/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , cmake , fetchFromGitLab , jansson @@ -37,7 +38,7 @@ stdenv.mkDerivation rec { gtk3 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A GTK based GUI for the CADET subsystem of GNUnet."; homepage = https://gitlab.com/TheJackiMonster/cadet-gtk; license = licenses.gpl3Plus; diff --git a/pkgs/ngtcp2/default.nix b/pkgs/ngtcp2/default.nix index c7d8da6..6ffd70e 100644 --- a/pkgs/ngtcp2/default.nix +++ b/pkgs/ngtcp2/default.nix @@ -1,4 +1,5 @@ { autoreconfHook +, lib , stdenv , fetchFromGitHub , gnutls @@ -33,7 +34,7 @@ stdenv.mkDerivation rec { gnutls ]; - meta = with stdenv.lib; { + meta = with lib; { description = "ngtcp2 project is an effort to implement IETF QUIC protocol"; homepage = https://github.com/ngtcp2/ngtcp2; license = licenses.mit; diff --git a/pkgs/nim-packages/generic.nix b/pkgs/nim-packages/generic.nix index 0387575..850afc8 100644 --- a/pkgs/nim-packages/generic.nix +++ b/pkgs/nim-packages/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, nim }: +{ lib, stdenv, nim }: { name, @@ -15,7 +15,7 @@ ... }: -with stdenv.lib; +with lib; let getRecursiveInputs = getInputsFn: deps: diff --git a/pkgs/nim-packages/gintro/default.nix b/pkgs/nim-packages/gintro/default.nix index 45be89f..1ad629f 100644 --- a/pkgs/nim-packages/gintro/default.nix +++ b/pkgs/nim-packages/gintro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildNimblePackage, fetchFromGitHub, glib, gobjectIntrospection, +{ lib, stdenv, buildNimblePackage, fetchFromGitHub, glib, gobjectIntrospection, gnome3, cairo, pango, librsvg, libnotify, hicolor-icon-theme, wrapGAppsHook }: let @@ -44,7 +44,7 @@ in buildNimblePackage rec { libnotify ]; - meta = with stdenv.lib; { + meta = with lib; { description = "High level GObject-Introspection based GTK3 bindings for Nim language"; homepage = https://github.com/StefanSalewski/gintro; license = licenses.mit; diff --git a/pkgs/nim-packages/ui.nix b/pkgs/nim-packages/ui.nix index 59fda4f..25d8619 100644 --- a/pkgs/nim-packages/ui.nix +++ b/pkgs/nim-packages/ui.nix @@ -1,4 +1,4 @@ -{ stdenv, buildNimblePackage, fetchFromGitHub, pkg-config, gtk3, +{ lib, stdenv, buildNimblePackage, fetchFromGitHub, pkg-config, gtk3, wrapGAppsHook }: buildNimblePackage rec { @@ -23,7 +23,7 @@ buildNimblePackage rec { buildInputs = [ gtk3 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Beginnings of what might become Nim's official UI library"; homepage = https://github.com/nim-lang/ui; license = licenses.mit; diff --git a/pkgs/openphone/default.nix b/pkgs/openphone/default.nix index b2b1c5d..3fe3ca3 100644 --- a/pkgs/openphone/default.nix +++ b/pkgs/openphone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3, hid }: +{ lib, stdenv, python3, hid }: with python3.pkgs; @@ -11,7 +11,7 @@ buildPythonPackage rec { hid ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://ulrich.earth/code/OpenPhone"; description = "Open source desk telephone"; license = licenses.gpl3; diff --git a/pkgs/picoquic/default.nix b/pkgs/picoquic/default.nix index 0815a4a..3cc01cb 100644 --- a/pkgs/picoquic/default.nix +++ b/pkgs/picoquic/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , cmake , openssl , picotls @@ -29,7 +30,7 @@ stdenv.mkDerivation rec { openssl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Minimalist implementation of the QUIC protocol, as defined by the IETF"; homepage = https://github.com/private-octopus/picoquic; license = licenses.mit; diff --git a/pkgs/picotls/default.nix b/pkgs/picotls/default.nix index 3e6a14c..7f8879f 100644 --- a/pkgs/picotls/default.nix +++ b/pkgs/picotls/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , cmake , brotli , openssl @@ -58,7 +59,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Picotls is a TLS 1.3 (RFC 8446) protocol stack written in C"; homepage = https://github.com/h2o/picotls; license = licenses.mit; diff --git a/pkgs/quicly/default.nix b/pkgs/quicly/default.nix index 0580999..2967981 100644 --- a/pkgs/quicly/default.nix +++ b/pkgs/quicly/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , cmake , openssl , perl @@ -63,7 +64,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A modular QUIC stack designed primarily for H2O"; homepage = https://github.com/h2o/quicly; license = licenses.mit; diff --git a/pkgs/shinto-cli/default.nix b/pkgs/shinto-cli/default.nix index e83c3c7..dca3601 100644 --- a/pkgs/shinto-cli/default.nix +++ b/pkgs/shinto-cli/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , buildPythonPackage , fetchPypi , isPy3k @@ -20,7 +21,7 @@ buildPythonPackage rec { buildInputs = [ nose ]; propagatedBuildInputs = [ jinja2 pyyaml ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://github.com/kolypto/j2cli; description = "Jinja2 Command-Line Tool"; license = licenses.bsd3;