greg/nix-bitcoin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: remove use of deprecated stdenv.lib

Browse Source
This commit is contained in:
Erik Arvstedt 2021-03-22 14:38:32 +01:00
parent 6ba5880b2c
commit 4cddf284e9
No known key found for this signature in database
GPG Key ID: 33312B944DD97846
6 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/clboss/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, curl, libev, sqlite }: { lib, stdenv, fetchurl, pkgconfig, curl, libev, sqlite }:
let let
curlWithGnuTLS = curl.override { gnutlsSupport = true; sslSupport = false; }; curlWithGnuTLS = curl.override { gnutlsSupport = true; sslSupport = false; };
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with lib; {
description = "Automated C-Lightning Node Manager"; description = "Automated C-Lightning Node Manager";
homepage = "https://github.com/ZmnSCPxj/clboss"; homepage = "https://github.com/ZmnSCPxj/clboss";
maintainers = with maintainers; [ nixbitcoin ]; maintainers = with maintainers; [ nixbitcoin ];

4
pkgs/elementsd/default.nix
View File

@ -1,8 +1,8 @@
{ stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost, zeromq, rapidcheck { lib, stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost, zeromq, rapidcheck
, zlib, miniupnpc, qtbase ? null, qttools ? null, wrapQtAppsHook ? null, utillinux, protobuf, python3, qrencode, libevent , zlib, miniupnpc, qtbase ? null, qttools ? null, wrapQtAppsHook ? null, utillinux, protobuf, python3, qrencode, libevent
, withGui }: , withGui }:
with stdenv.lib; with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "elements${optionalString (!withGui) "d"}"; pname = "elements${optionalString (!withGui) "d"}";
version = "0.18.1.9"; version = "0.18.1.9";

4
pkgs/hwi/default.nix
View File

@ -1,6 +1,4 @@
{ pkgs, stdenv, fetchurl, fetchFromGitHub, python3 }: { lib, pkgs, stdenv, fetchurl, fetchFromGitHub, python3 }:
with stdenv.lib;
let let
python = python3.override { python = python3.override {

5
pkgs/hwi/ecdsa/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv { lib
, stdenv
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, pkgs , pkgs
@ -18,7 +19,7 @@ buildPythonPackage rec {
# Only needed for tests # Only needed for tests
checkInputs = [ pkgs.openssl ]; checkInputs = [ pkgs.openssl ];
meta = with stdenv.lib; { meta = with lib; {
description = "ECDSA cryptographic signature library"; description = "ECDSA cryptographic signature library";
homepage = "https://github.com/warner/python-ecdsa"; homepage = "https://github.com/warner/python-ecdsa";
license = licenses.mit; license = licenses.mit;

10
pkgs/hwi/hidapi/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, libusb1, udev, darwin, fetchPypi, buildPythonPackage, cython }: { lib, stdenv, libusb1, udev, darwin, fetchPypi, buildPythonPackage, cython }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "hidapi"; pname = "hidapi";
@ -10,18 +10,18 @@ buildPythonPackage rec {
}; };
propagatedBuildInputs = propagatedBuildInputs =
stdenv.lib.optionals stdenv.isLinux [ libusb1 udev ] ++ lib.optionals stdenv.isLinux [ libusb1 udev ] ++
stdenv.lib.optionals stdenv.isDarwin [ darwin.IOKit darwin.apple_sdk.frameworks.CoreFoundation ] ++ lib.optionals stdenv.isDarwin [ darwin.IOKit darwin.apple_sdk.frameworks.CoreFoundation ] ++
[ cython ]; [ cython ];
# Fix the USB backend library lookup # Fix the USB backend library lookup
postPatch = stdenv.lib.optionalString stdenv.isLinux '' postPatch = lib.optionalString stdenv.isLinux ''
libusb=${libusb1.dev}/include/libusb-1.0 libusb=${libusb1.dev}/include/libusb-1.0
test -d $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; } test -d $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; }
sed -i -e "s|/usr/include/libusb-1.0|$libusb|" setup.py sed -i -e "s|/usr/include/libusb-1.0|$libusb|" setup.py
''; '';
meta = with stdenv.lib; { meta = with lib; {
description = "A Cython interface to the hidapi from https://github.com/signal11/hidapi"; description = "A Cython interface to the hidapi from https://github.com/signal11/hidapi";
homepage = "https://github.com/trezor/cython-hidapi"; homepage = "https://github.com/trezor/cython-hidapi";
# license can actually be either bsd3 or gpl3 # license can actually be either bsd3 or gpl3

6
pkgs/secp256k1/default.nix
View File

@ -1,6 +1,4 @@
{ stdenv, fetchFromGitHub, autoreconfHook }: { lib, stdenv, fetchFromGitHub, autoreconfHook }:
let inherit (stdenv.lib) optionals; in
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "secp256k1"; pname = "secp256k1";
@ -18,7 +16,7 @@ stdenv.mkDerivation {
configureFlags = ["--enable-module-recovery" "--disable-jni" "--enable-experimental" "--enable-module-ecdh" "--enable-benchmark=no" ]; configureFlags = ["--enable-module-recovery" "--disable-jni" "--enable-experimental" "--enable-module-ecdh" "--enable-benchmark=no" ];
meta = with stdenv.lib; { meta = with lib; {
description = "Optimized C library for EC operations on curve secp256k1"; description = "Optimized C library for EC operations on curve secp256k1";
homepage = "https://github.com/bitcoin-core/secp256k1"; homepage = "https://github.com/bitcoin-core/secp256k1";
license = with licenses; [ mit ]; license = with licenses; [ mit ];