pkgs/tools: stdenv.lib -> lib
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
{ fetchurl, bash, glibc, stdenv }:
|
||||
{ fetchurl, bash, glibc, lib, stdenv }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "daemontools-0.76";
|
||||
@@ -34,11 +34,11 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = {
|
||||
license = stdenv.lib.licenses.publicDomain;
|
||||
license = lib.licenses.publicDomain;
|
||||
homepage = "https://cr.yp.to/daemontools.html";
|
||||
description = "A collection of tools for managing UNIX services";
|
||||
|
||||
maintainers = with stdenv.lib.maintainers; [ kevincox ];
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ kevincox ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
mkdir -p $out/bin
|
||||
cp -a dehydrated $out/bin
|
||||
wrapProgram "$out/bin/dehydrated" --prefix PATH : "${stdenv.lib.makeBinPath [ openssl coreutils gnused gnugrep diffutils curl gawk ]}"
|
||||
wrapProgram "$out/bin/dehydrated" --prefix PATH : "${lib.makeBinPath [ openssl coreutils gnused gnugrep diffutils curl gawk ]}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -13,9 +13,9 @@ buildGoPackage rec {
|
||||
sha256 = "0xgmwjva3j1s0cqkbajbamj13bgzh5jkf2ir54m9a7w8gjnsh6dx";
|
||||
};
|
||||
|
||||
nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ];
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
|
||||
|
||||
buildInputs = stdenv.lib.optionals stdenv.isLinux [ libsecret ];
|
||||
buildInputs = lib.optionals stdenv.isLinux [ libsecret ];
|
||||
|
||||
buildPhase =
|
||||
if stdenv.isDarwin
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, buildGoPackage, fetchFromGitHub }:
|
||||
{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "exoscale-cli";
|
||||
@@ -27,7 +27,7 @@ buildGoPackage rec {
|
||||
meta = {
|
||||
description = "Command-line tool for everything at Exoscale: compute, storage, dns";
|
||||
homepage = "https://github.com/exoscale/cli";
|
||||
license = stdenv.lib.licenses.asl20;
|
||||
maintainers = with stdenv.lib.maintainers; [ dramaturg ];
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ dramaturg ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{stdenv, fetchFromGitHub}:
|
||||
{lib, stdenv, fetchFromGitHub}:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "fbvnc";
|
||||
@@ -22,9 +22,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = {
|
||||
description = "Framebuffer VNC client";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
maintainers = [stdenv.lib.maintainers.raskin];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [lib.maintainers.raskin];
|
||||
platforms = lib.platforms.linux;
|
||||
homepage = "https://github.com/zohead/fbvnc/";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
outputs = [ "out" "bin" "man" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1060ws037v556rx1qhfrcg02859rscksrzr8fq11himdg4d1y6m8";
|
||||
};
|
||||
|
||||
|
||||
@@ -46,7 +46,7 @@ buildGoPackage rec {
|
||||
# test binaries, code generation
|
||||
rm $out/bin/{deps,macaroon-identity,generate}
|
||||
|
||||
wrapProgram $out/bin/lxd --prefix PATH : ${stdenv.lib.makeBinPath (
|
||||
wrapProgram $out/bin/lxd --prefix PATH : ${lib.makeBinPath (
|
||||
networkPkgs
|
||||
++ [ acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute bash criu ]
|
||||
++ [ (writeShellScriptBin "apparmor_parser" ''
|
||||
|
||||
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
cargoSha256 = "13wfz0ig9dsl0h085rzlrx0dg9la957c50xyzjfxq1ybw2qr266b";
|
||||
|
||||
buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
|
||||
buildInputs = lib.optional stdenv.isDarwin Security;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A modern replacement for ps written in Rust";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ fetchFromGitHub, perl, stdenv }:
|
||||
{ fetchFromGitHub, perl, lib, stdenv }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "sec-${meta.version}";
|
||||
@@ -23,10 +23,10 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = {
|
||||
homepage = "https://simple-evcorr.github.io";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
license = lib.licenses.gpl2;
|
||||
description = "Simple Event Correlator";
|
||||
maintainers = [ stdenv.lib.maintainers.tv ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
maintainers = [ lib.maintainers.tv ];
|
||||
platforms = lib.platforms.all;
|
||||
version = "2.8.3";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
|
||||
mkdir -p $out/bin
|
||||
cp $pname $out/bin/$pname
|
||||
wrapProgram $out/bin/$pname \
|
||||
--set PATH "${stdenv.lib.makeBinPath buildInputs}"
|
||||
--set PATH "${lib.makeBinPath buildInputs}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
, xorg, xkeyboard_config, zlib
|
||||
, libjpeg_turbo, pixman, fltk
|
||||
, fontDirectories
|
||||
@@ -9,7 +9,7 @@
|
||||
, makeWrapper
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.11.0";
|
||||
@@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
|
||||
rm -f $out/lib/xorg/protocol.txt
|
||||
|
||||
wrapProgram $out/bin/vncserver \
|
||||
--prefix PATH : ${stdenv.lib.makeBinPath (with xorg; [ xterm twm xsetroot xauth ]) }
|
||||
--prefix PATH : ${lib.makeBinPath (with xorg; [ xterm twm xsetroot xauth ]) }
|
||||
'';
|
||||
|
||||
buildInputs = with xorg; [
|
||||
@@ -100,10 +100,10 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = {
|
||||
homepage = "https://tigervnc.org/";
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
license = lib.licenses.gpl2Plus;
|
||||
description = "Fork of tightVNC, made in cooperation with VirtualGL";
|
||||
maintainers = with stdenv.lib.maintainers; [viric];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
maintainers = with lib.maintainers; [viric];
|
||||
platforms = with lib.platforms; linux;
|
||||
# Prevent a store collision.
|
||||
priority = 4;
|
||||
};
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, xlibsWrapper, zlib, libjpeg, imake, gccmakedep, libXmu
|
||||
{ lib, stdenv, fetchurl, xlibsWrapper, zlib, libjpeg, imake, gccmakedep, libXmu
|
||||
, libXaw, libXpm, libXp , perl, xauth, fontDirectories, openssh }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
@@ -68,7 +68,7 @@ stdenv.mkDerivation {
|
||||
'';
|
||||
|
||||
meta = {
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
license = lib.licenses.gpl2Plus;
|
||||
homepage = "http://vnc-tight.sourceforge.net/";
|
||||
description = "Improved version of VNC";
|
||||
|
||||
@@ -80,6 +80,6 @@ stdenv.mkDerivation {
|
||||
'';
|
||||
|
||||
maintainers = [];
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user