public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pkgs/tools: stdenv.lib -> lib

Browse Source
This commit is contained in:
Ben Siraphob
2021-01-15 17:12:36 +07:00
parent 94f3683935
commit 8c5d37129f
916 changed files with 2510 additions and 2510 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/misc/0x0/default.nix
+1 -1
View File
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
patchShebangs $out/bin/0x0
wrapProgram $out/bin/0x0 \
--prefix PATH : '${stdenv.lib.makeBinPath [ curl xsel ]}'
--prefix PATH : '${lib.makeBinPath [ curl xsel ]}'
'';
meta = with lib; {
pkgs/tools/misc/abduco/default.nix
+3 -3
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, writeText, conf ? null }:
{ lib, stdenv, fetchFromGitHub, writeText, conf ? null }:
with stdenv.lib;
with lib;
stdenv.mkDerivation rec {
name = "abduco-2018-05-16";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
configFile = optionalString (conf!=null) (writeText "config.def.h" conf);
preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";
CFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE";
CFLAGS = lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE";
meta = {
homepage = "http://brain-dump.org/projects/abduco";
pkgs/tools/misc/aescrypt/default.nix
+2 -2
View File
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1iziymcbpc64d44djgqfifpblsly4sr5bxsp5g29jgxz552kjlah";
};
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-liconv";
NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-liconv";
preBuild = ''
substituteInPlace src/Makefile --replace "CC=gcc" "CC?=gcc"
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
homepage = "https://www.aescrypt.com/";
license = licenses.gpl2;
maintainers = with maintainers; [ lovek323 qknight ];
platforms = stdenv.lib.platforms.all;
platforms = lib.platforms.all;
hydraPlatforms = with platforms; unix;
};
}
pkgs/tools/misc/aptly/default.nix
+1 -1
View File
@@ -34,7 +34,7 @@ buildGoPackage {
postInstall = ''
installShellCompletion --bash ${aptlyCompletionSrc}/aptly
wrapProgram "$out/bin/aptly" \
--prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg bzip2 xz graphviz ]}"
--prefix PATH ":" "${lib.makeBinPath [ gnupg bzip2 xz graphviz ]}"
'';
meta = with lib; {
pkgs/tools/misc/aws-mturk-clt/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, jre }:
{ lib, stdenv, fetchurl, jre }:
stdenv.mkDerivation rec {
name = "aws-mturk-clt-1.3.0";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "https://requester.mturk.com/developer";
description = "Command line tools for interacting with the Amazon Mechanical Turk";
license = stdenv.lib.licenses.amazonsl;
license = lib.licenses.amazonsl;
longDescription =
''
pkgs/tools/misc/azure-vhd-utils/default.nix
+1 -1
View File
@@ -3,7 +3,7 @@
buildGoPackage rec {
pname = "azure-vhd-utils";
version = "20160614-${stdenv.lib.strings.substring 0 7 rev}";
version = "20160614-${lib.strings.substring 0 7 rev}";
rev = "070db2d701a462ca2edcf89d677ed3cac309d8e8";
goPackagePath = "github.com/Microsoft/azure-vhd-utils";
pkgs/tools/misc/bat-extras/default.nix
+3 -3
View File
@@ -116,9 +116,9 @@ let
runHook preInstall
mkdir -p $out/bin
cp -p bin/${name} $out/bin/${name}
'' + stdenv.lib.optionalString (dependencies != []) ''
'' + lib.optionalString (dependencies != []) ''
wrapProgram $out/bin/${name} \
--prefix PATH : ${stdenv.lib.makeBinPath dependencies}
--prefix PATH : ${lib.makeBinPath dependencies}
'' + ''
runHook postInstall
'';
@@ -130,7 +130,7 @@ let
};
optionalDep = cond: dep:
assert cond -> dep != null;
stdenv.lib.optional cond dep;
lib.optional cond dep;
in
{
batdiff = script "batdiff" ([ less coreutils gitMinimal ] ++ optionalDep withDelta delta);
pkgs/tools/misc/bat/default.nix
+2 -2
View File
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkg-config installShellFiles makeWrapper ];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security libiconv ];
buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ];
postInstall = ''
installManPage $releaseDir/build/bat-*/out/assets/manual/bat.1
@@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec {
# expected with certain flag combinations.
postFixup = ''
wrapProgram "$out/bin/bat" \
--prefix PATH : "${stdenv.lib.makeBinPath [ less ]}"
--prefix PATH : "${lib.makeBinPath [ less ]}"
'';
passthru.tests = { inherit (nixosTests) bat; };
pkgs/tools/misc/bc/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, autoreconfHook, buildPackages
{ lib, stdenv, autoreconfHook, buildPackages
, fetchurl, flex, readline, ed, texinfo
}:
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
meta = {
description = "GNU software calculator";
homepage = "https://www.gnu.org/software/bc/";
license = stdenv.lib.licenses.gpl3;
platforms = stdenv.lib.platforms.all;
license = lib.licenses.gpl3;
platforms = lib.platforms.all;
};
}
pkgs/tools/misc/bfr/default.nix
+1 -1
View File
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A general-purpose command-line pipe buffer";
license = stdenv.lib.licenses.gpl2;
license = lib.licenses.gpl2;
maintainers = with maintainers; [ pSub ];
platforms = platforms.linux;
};
pkgs/tools/misc/blink1-tool/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, libusb1, pkgconfig, ... }:
{ lib, stdenv, fetchurl, libusb1, pkgconfig, ... }:
stdenv.mkDerivation rec {
pname = "blink1";
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
meta = {
description = "Command line client for the blink(1) notification light";
homepage = "https://blink1.thingm.com/";
license = stdenv.lib.licenses.cc-by-sa-30;
maintainers = [ stdenv.lib.maintainers.cransom ];
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.cc-by-sa-30;
maintainers = [ lib.maintainers.cransom ];
platforms = lib.platforms.linux;
};
}
pkgs/tools/misc/bogofilter/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{fetchurl, stdenv, flex, db}:
{fetchurl, lib, stdenv, flex, db}:
stdenv.mkDerivation rec {
name = "bogofilter-1.2.4";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
classifications and corrections. It is based on a Bayesian
filter.
'';
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.gpl2;
platforms = lib.platforms.linux;
};
}
pkgs/tools/misc/brltty/default.nix
+6 -6
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, python3, bluez
{ lib, stdenv, fetchurl, pkgconfig, python3, bluez
, alsaSupport ? stdenv.isLinux, alsaLib ? null
, systemdSupport ? stdenv.isLinux, systemd ? null }:
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig python3.pkgs.cython ];
buildInputs = [ bluez ]
++ stdenv.lib.optional alsaSupport alsaLib
++ stdenv.lib.optional systemdSupport systemd;
++ lib.optional alsaSupport alsaLib
++ lib.optional systemdSupport systemd;
meta = {
description = "Access software for a blind person using a braille display";
@@ -27,9 +27,9 @@ stdenv.mkDerivation rec {
Some speech capability has also been incorporated.
'';
homepage = "http://www.brltty.com/";
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.bramd ];
platforms = stdenv.lib.platforms.all;
license = lib.licenses.gpl2;
maintainers = [ lib.maintainers.bramd ];
platforms = lib.platforms.all;
};
makeFlags = [ "PYTHON_PREFIX=$(out)" ];
pkgs/tools/misc/broot/default.nix
+1 -1
View File
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
installShellFiles
];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [
buildInputs = lib.optionals stdenv.isDarwin [
libiconv
Security
zlib
pkgs/tools/misc/capture/default.nix
+1 -1
View File
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
patchShebangs $out/bin/capture
wrapProgram $out/bin/capture \
--prefix PATH : '${stdenv.lib.makeBinPath [ slop ffmpeg_3 ]}'
--prefix PATH : '${lib.makeBinPath [ slop ffmpeg_3 ]}'
'';
meta = with lib; {
pkgs/tools/misc/catimg/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake } :
{ lib, stdenv, fetchFromGitHub, cmake } :
with stdenv.lib;
with lib;
stdenv.mkDerivation rec {
pname = "catimg";
pkgs/tools/misc/chafa/default.nix
+1 -1
View File
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
docbook_xsl
];
buildInputs = [ glib imagemagick ] ++ stdenv.lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.ApplicationServices ];
buildInputs = [ glib imagemagick ] ++ lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.ApplicationServices ];
patches = [ ./xmlcatalog_patch.patch ];
pkgs/tools/misc/cht.sh/default.nix
+1 -1
View File
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
cp share/zsh.txt $out/share/zsh/site-functions/_cht
wrapProgram "$out/bin/cht.sh" \
--prefix PATH : "${stdenv.lib.makeBinPath [ curl rlwrap ncurses xsel ]}"
--prefix PATH : "${lib.makeBinPath [ curl rlwrap ncurses xsel ]}"
'';
passthru.updateScript = unstableGitUpdater { };
pkgs/tools/misc/cloc/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, makeWrapper, perlPackages }:
{ lib, stdenv, fetchFromGitHub, makeWrapper, perlPackages }:
stdenv.mkDerivation rec {
pname = "cloc";
@@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
meta = {
description = "A program that counts lines of source code";
homepage = "https://github.com/AlDanial/cloc";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.all;
maintainers = with stdenv.lib.maintainers; [ rycee ];
license = lib.licenses.gpl2;
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ rycee ];
};
}
pkgs/tools/misc/cloud-utils/default.nix
+2 -2
View File
@@ -37,11 +37,11 @@ in stdenv.mkDerivation rec {
moveToOutput bin/vcs-run $guest
for i in $out/bin/*; do
wrapProgram $i --prefix PATH : "${stdenv.lib.makeBinPath binDeps}:$out/bin"
wrapProgram $i --prefix PATH : "${lib.makeBinPath binDeps}:$out/bin"
done
for i in $guest/bin/*; do
wrapProgram $i --prefix PATH : "${stdenv.lib.makeBinPath guestDeps}:$guest/bin"
wrapProgram $i --prefix PATH : "${lib.makeBinPath guestDeps}:$guest/bin"
ln -s $i $out/bin
done
'';
pkgs/tools/misc/contacts/default.nix
+2 -2
View File
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
homepage = "http://www.gnufoo.org/contacts/contacts.html";
license = licenses.gpl2;
maintainers = with maintainers; [ jwiegley ];
platforms = stdenv.lib.platforms.darwin;
hydraPlatforms = stdenv.lib.platforms.darwin;
platforms = lib.platforms.darwin;
hydraPlatforms = lib.platforms.darwin;
};
}
pkgs/tools/misc/coreboot-utils/default.nix
+4 -4
View File
@@ -1,9 +1,9 @@
{ stdenv, fetchurl, zlib, pciutils, coreutils, acpica-tools, iasl, makeWrapper, gnugrep, gnused, file, buildEnv }:
{ lib, stdenv, fetchurl, zlib, pciutils, coreutils, acpica-tools, iasl, makeWrapper, gnugrep, gnused, file, buildEnv }:
let
version = "4.13";
commonMeta = with stdenv.lib; {
commonMeta = with lib; {
description = "Various coreboot-related tools";
homepage = "https://www.coreboot.org";
license = licenses.gpl2;
@@ -91,14 +91,14 @@ let
installPhase = "install -Dm755 acpidump-all $out/bin/acpidump-all";
postFixup = let
binPath = [ coreutils acpica-tools iasl gnugrep gnused file ];
in "wrapProgram $out/bin/acpidump-all --set PATH ${stdenv.lib.makeBinPath binPath}";
in "wrapProgram $out/bin/acpidump-all --set PATH ${lib.makeBinPath binPath}";
};
};
in utils // {
coreboot-utils = (buildEnv {
name = "coreboot-utils-${version}";
paths = stdenv.lib.attrValues utils;
paths = lib.attrValues utils;
postBuild = "rm -rf $out/sbin";
}) // {
inherit version;
pkgs/tools/misc/coreutils/default.nix
+1 -1
View File
@@ -154,6 +154,6 @@ stdenv.mkDerivation (rec {
} // optionalAttrs stdenv.hostPlatform.isMusl {
# Work around a bogus warning in conjunction with musl.
NIX_CFLAGS_COMPILE = "-Wno-error";
} // stdenv.lib.optionalAttrs stdenv.hostPlatform.isAndroid {
} // lib.optionalAttrs stdenv.hostPlatform.isAndroid {
NIX_CFLAGS_COMPILE = "-D__USE_FORTIFY_LEVEL=0";
})
pkgs/tools/misc/cpuminer-multi/default.nix
+1 -1
View File
@@ -6,7 +6,7 @@ let
date = "20160316";
in
stdenv.mkDerivation {
name = "cpuminer-multi-${date}-${stdenv.lib.strings.substring 0 7 rev}";
name = "cpuminer-multi-${date}-${lib.strings.substring 0 7 rev}";
src = fetchFromGitHub {
owner = "hyc";
pkgs/tools/misc/cunit/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, autoconf, automake, libtool, autoreconfHook}:
{ lib, stdenv, fetchurl, autoconf, automake, libtool, autoreconfHook}:
stdenv.mkDerivation rec {
pname = "CUnit";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
homepage = "http://cunit.sourceforge.net/";
license = stdenv.lib.licenses.lgpl2;
platforms = stdenv.lib.platforms.unix;
license = lib.licenses.lgpl2;
platforms = lib.platforms.unix;
};
}
pkgs/tools/misc/dasht/default.nix
+3 -3
View File
@@ -58,8 +58,8 @@ stdenv.mkDerivation rec {
meta = {
description = "Search API docs offline, in terminal or browser";
homepage = "https://sunaku.github.io/dasht/man";
license = stdenv.lib.licenses.isc;
platforms = stdenv.lib.platforms.unix; #cannot test other
maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ];
license = lib.licenses.isc;
platforms = lib.platforms.unix; #cannot test other
maintainers = with lib.maintainers; [ matthiasbeyer ];
};
}
pkgs/tools/misc/dbacl/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{fetchurl, stdenv}:
{fetchurl, lib, stdenv}:
stdenv.mkDerivation rec {
name = "dbacl-1.14";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
homepage = "http://dbacl.sourceforge.net/";
longDescription = "a digramic Bayesian classifier for text recognition.";
maintainers = [];
license = stdenv.lib.licenses.gpl3;
platforms = stdenv.lib.platforms.unix;
license = lib.licenses.gpl3;
platforms = lib.platforms.unix;
};
}
pkgs/tools/misc/ddate/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake }:
{ lib, stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
pname = "ddate";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
meta = with stdenv.lib; {
meta = with lib; {
homepage = "https://github.com/bo0ts/ddate";
description = "Discordian version of the date program";
license = licenses.publicDomain;
pkgs/tools/misc/ddccontrol/default.nix
+1 -1
View File
@@ -60,6 +60,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/ddccontrol/ddccontrol";
license = licenses.gpl2;
platforms = [ "i686-linux" "x86_64-linux" ];
maintainers = [ stdenv.lib.maintainers.pakhfn ];
maintainers = [ lib.maintainers.pakhfn ];
};
}
pkgs/tools/misc/debootstrap/default.nix
+1 -1
View File
@@ -2,7 +2,7 @@
, gnugrep, gnutar, gnused, gzip, makeWrapper }:
# USAGE like this: debootstrap sid /tmp/target-chroot-directory
# There is also cdebootstrap now. Is that easier to maintain?
let binPath = stdenv.lib.makeBinPath [
let binPath = lib.makeBinPath [
coreutils
dpkg
gawk
pkgs/tools/misc/desktop-file-utils/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, glib, libintl }:
{ lib, stdenv, fetchurl, pkgconfig, glib, libintl }:
with stdenv.lib;
with lib;
stdenv.mkDerivation rec {
pname = "desktop-file-utils";
pkgs/tools/misc/ding-libs/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, check }:
{ lib, stdenv, fetchurl, check }:
stdenv.mkDerivation rec {
pname = "ding-libs";
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
meta = {
description = "'D is not GLib' utility libraries";
homepage = "https://fedorahosted.org/sssd/";
platforms = with stdenv.lib.platforms; linux;
maintainers = with stdenv.lib.maintainers; [ e-user ];
license = [ stdenv.lib.licenses.gpl3 stdenv.lib.licenses.lgpl3 ];
platforms = with lib.platforms; linux;
maintainers = with lib.maintainers; [ e-user ];
license = [ lib.licenses.gpl3 stdenv.lib.licenses.lgpl3 ];
};
}
pkgs/tools/misc/direnv/default.nix
+1 -1
View File
@@ -15,7 +15,7 @@ buildGoModule rec {
# we have no bash at the moment for windows
BASH_PATH =
stdenv.lib.optionalString (!stdenv.hostPlatform.isWindows)
lib.optionalString (!stdenv.hostPlatform.isWindows)
"${bash}/bin/bash";
# replace the build phase to use the GNUMakefile instead
pkgs/tools/misc/diskus/default.nix
+1 -1
View File
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "087w58q5kd3r23a9qnhqgvq4vhv69b5a6a7n3kh09g5cjszy8s05";
};
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
cargoSha256 = "0bivmjn7h4lfp5azbc6q0xiqq3fk68jdd4kwrwgbxiljg4xd2qy8";
pkgs/tools/misc/disper/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, python, xorg, makeWrapper }:
{ lib, stdenv, fetchFromGitHub, python, xorg, makeWrapper }:
stdenv.mkDerivation rec {
pname = "disper";
@@ -21,14 +21,14 @@ stdenv.mkDerivation rec {
postInstall = ''
wrapProgram $out/bin/disper \
--prefix "LD_LIBRARY_PATH" : "${stdenv.lib.makeLibraryPath [ xorg.libXrandr xorg.libX11 ]}"
--prefix "LD_LIBRARY_PATH" : "${lib.makeLibraryPath [ xorg.libXrandr xorg.libX11 ]}"
'';
meta = {
description = "On-the-fly display switch utility";
homepage = "http://willem.engen.nl/projects/disper/";
platforms = stdenv.lib.platforms.unix;
license = stdenv.lib.licenses.gpl3;
platforms = lib.platforms.unix;
license = lib.licenses.gpl3;
};
}
pkgs/tools/misc/dmg2img/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, zlib, bzip2, openssl, fetchpatch }:
{ lib, stdenv, fetchurl, zlib, bzip2, openssl, fetchpatch }:
stdenv.mkDerivation rec {
name = "dmg2img-1.6.7";
@@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
'';
meta = {
platforms = stdenv.lib.platforms.unix;
platforms = lib.platforms.unix;
description = "An Apple's compressed dmg to standard (hfsplus) image disk file convert tool";
license = stdenv.lib.licenses.gpl3;
license = lib.licenses.gpl3;
};
}
pkgs/tools/misc/dtach/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl }:
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
pname = "dtach";
@@ -27,9 +27,9 @@ stdenv.mkDerivation rec {
themselves.
'';
license = stdenv.lib.licenses.gpl2Plus;
license = lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.unix;
platforms = lib.platforms.unix;
maintainers = [ ];
};
}
pkgs/tools/misc/duc/default.nix
+2 -2
View File
@@ -19,10 +19,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ tokyocabinet ncurses ] ++
stdenv.lib.optionals enableCairo [ cairo pango ];
lib.optionals enableCairo [ cairo pango ];
configureFlags =
stdenv.lib.optionals (!enableCairo) [ "--disable-x11" "--disable-cairo" ];
lib.optionals (!enableCairo) [ "--disable-x11" "--disable-cairo" ];
meta = with lib; {
homepage = "http://duc.zevv.nl/";
pkgs/tools/misc/dvtm/dvtm.nix
+2 -2
View File
@@ -3,9 +3,9 @@ stdenv.mkDerivation {
inherit name src patches;
CFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE";
CFLAGS = lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE";
postPatch = stdenv.lib.optionalString (customConfig != null) ''
postPatch = lib.optionalString (customConfig != null) ''
cp ${builtins.toFile "config.h" customConfig} ./config.h
'';
pkgs/tools/misc/edid-decode/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchgit }:
{ lib, stdenv, fetchgit }:
let
version = "2018-12-06";
in stdenv.mkDerivation {
@@ -19,9 +19,9 @@ in stdenv.mkDerivation {
meta = {
description = "EDID decoder and conformance tester";
homepage = "https://cgit.freedesktop.org/xorg/app/edid-decode/";
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.chiiruno ];
platforms = stdenv.lib.platforms.all;
license = lib.licenses.mit;
maintainers = [ lib.maintainers.chiiruno ];
platforms = lib.platforms.all;
};
}
pkgs/tools/misc/edid-generator/default.nix
+5 -5
View File
@@ -1,4 +1,4 @@
{ stdenv
{ lib, stdenv
, fetchFromGitHub
, dos2unix
, edid-decode
@@ -25,7 +25,7 @@ in stdenv.mkDerivation {
patchShebangs modeline2edid
'';
configurePhase = (stdenv.lib.concatMapStringsSep "\n" (m: "echo \"${m}\" | ./modeline2edid -") modelines);
configurePhase = (lib.concatMapStringsSep "\n" (m: "echo \"${m}\" | ./modeline2edid -") modelines);
installPhase = ''
install -Dm 444 *.bin -t "$out/lib/firmware/edid"
@@ -34,8 +34,8 @@ in stdenv.mkDerivation {
meta = {
description = "Hackerswork to generate an EDID blob from given Xorg Modelines";
homepage = "https://github.com/akatrevorjay/edid-generator";
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.flokli ];
platforms = stdenv.lib.platforms.all;
license = lib.licenses.mit;
maintainers = [ lib.maintainers.flokli ];
platforms = lib.platforms.all;
};
}
pkgs/tools/misc/emv/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl }:
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation {
pname = "emv";
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
meta = {
homepage = "http://www.i0i0.de/toolchest/emv";
description = "Editor Move: Rename files with your favourite text editor";
license = stdenv.lib.licenses.publicDomain;
platforms = stdenv.lib.platforms.unix;
license = lib.licenses.publicDomain;
platforms = lib.platforms.unix;
};
}
pkgs/tools/misc/ent/default.nix
+1 -1
View File
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
buildInputs = [ unzip ];
buildFlags = stdenv.lib.optional stdenv.cc.isClang "CC=clang";
buildFlags = lib.optional stdenv.cc.isClang "CC=clang";
installPhase = ''
mkdir -p $out/bin
pkgs/tools/misc/envchain/default.nix
+1 -1
View File
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libsecret readline ]
++ stdenv.lib.optionals stdenv.isDarwin [ libedit ncurses Security ];
++ lib.optionals stdenv.isDarwin [ libedit ncurses Security ];
makeFlags = [ "DESTDIR=$(out)" ];
pkgs/tools/misc/envdir-go/default.nix
+3 -3
View File
@@ -1,5 +1,5 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
{ stdenv, buildGoPackage, fetchFromGitHub }:
{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
version = "1.0.0";
@@ -16,12 +16,12 @@ buildGoPackage rec {
preBuild = ''
# TODO: is there a way to get the commit ref so we can set main.buildCommit?
buildFlagsArray+=("-ldflags" "-X main.buildDate=1970-01-01T00:00:00+0000 -X main.buildVersion=${version}")
buildFlagsArray+=("-ldflags" "-X main.buildDate=1970-01-01T00:00:00+0000 -X main.buildVersion=${version}")
'';
meta = {
description = "A go rewrite of envdir";
homepage = "https://github.com/d10n/envdir";
maintainers = with stdenv.lib.maintainers; [ edude03 ];
maintainers = with lib.maintainers; [ edude03 ];
};
}
pkgs/tools/misc/eot-utilities/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, pkgconfig }:
{lib, stdenv, fetchurl, pkgconfig }:
stdenv.mkDerivation rec {
pname = "eot_utilities";
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://www.w3.org/Tools/eot-utils/";
description = "Create Embedded Open Type from OpenType or TrueType font";
license = stdenv.lib.licenses.w3c;
maintainers = with stdenv.lib.maintainers; [ leenaars ];
platforms = with stdenv.lib.platforms; unix;
license = lib.licenses.w3c;
maintainers = with lib.maintainers; [ leenaars ];
platforms = with lib.platforms; unix;
};
}
pkgs/tools/misc/etcher/default.nix
+1 -1
View File
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
postFixup = ''
makeWrapper ${electron}/bin/electron $out/bin/${pname} \
--add-flags $out/share/${pname}/resources/app.asar \
--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ gcc-unwrapped.lib ]}"
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gcc-unwrapped.lib ]}"
'';
meta = with lib; {
pkgs/tools/misc/exa/default.nix
+1 -1
View File
@@ -28,7 +28,7 @@ buildRustPackage rec {
nativeBuildInputs = [ cmake pkgconfig perl installShellFiles ];
buildInputs = [ zlib ]
++ stdenv.lib.optionals stdenv.isDarwin [
++ lib.optionals stdenv.isDarwin [
libiconv darwin.apple_sdk.frameworks.Security ]
;
pkgs/tools/misc/expect/default.nix
+1 -1
View File
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
wrapProgram $i \
--prefix PATH : "${tcl}/bin" \
--prefix TCLLIBPATH ' ' $out/lib/* \
${stdenv.lib.optionalString stdenv.isDarwin "--prefix DYLD_LIBRARY_PATH : $out/lib/expect${version}"}
${lib.optionalString stdenv.isDarwin "--prefix DYLD_LIBRARY_PATH : $out/lib/expect${version}"}
done
'';
pkgs/tools/misc/fasd/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub } :
{ lib, stdenv, fetchFromGitHub } :
stdenv.mkDerivation rec {
pname = "fasd";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "https://github.com/clvv/${pname}";
description = "Quick command-line access to files and directories for POSIX shells";
license = stdenv.lib.licenses.mit;
license = lib.licenses.mit;
longDescription = ''
Fasd is a command-line productivity booster.
@@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
command line.
'';
platforms = stdenv.lib.platforms.all;
platforms = lib.platforms.all;
};
}
pkgs/tools/misc/ffsend/default.nix
+1 -1
View File
@@ -32,7 +32,7 @@ buildRustPackage rec {
if stdenv.isDarwin then (with darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices Security AppKit ])
else [ openssl ];
preBuild = stdenv.lib.optionalString (x11Support && usesX11) (
preBuild = lib.optionalString (x11Support && usesX11) (
if preferXsel && xsel != null then ''
export XSEL_PATH="${xsel}/bin/xsel"
'' else ''
pkgs/tools/misc/figlet/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch }:
{ lib, stdenv, fetchurl, fetchpatch }:
stdenv.mkDerivation {
name = "figlet-2.2.5";
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
meta = {
description = "Program for making large letters out of ordinary text";
homepage = "http://www.figlet.org/";
license = stdenv.lib.licenses.afl21;
platforms = stdenv.lib.platforms.unix;
license = lib.licenses.afl21;
platforms = lib.platforms.unix;
};
}
pkgs/tools/misc/file/default.nix
+3 -3
View File
@@ -18,13 +18,13 @@ stdenv.mkDerivation rec {
./webassembly-format-fix.patch
];
nativeBuildInputs = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file;
nativeBuildInputs = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file;
buildInputs = [ zlib ]
++ stdenv.lib.optional stdenv.hostPlatform.isWindows libgnurx;
++ lib.optional stdenv.hostPlatform.isWindows libgnurx;
doCheck = true;
makeFlags = stdenv.lib.optional stdenv.hostPlatform.isWindows "FILE_COMPILE=file";
makeFlags = lib.optional stdenv.hostPlatform.isWindows "FILE_COMPILE=file";
meta = with lib; {
homepage = "https://darwinsys.com/file";
pkgs/tools/misc/fileschanged/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, gamin }:
{ lib, stdenv, fetchurl, gamin }:
stdenv.mkDerivation rec {
name = "fileschanged-0.6.9";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "https://www.nongnu.org/fileschanged/";
description = "A command-line utility that reports when files have been altered";
license = stdenv.lib.licenses.gpl3Plus;
license = lib.licenses.gpl3Plus;
longDescription = ''
This utility is a client to FAM (File Alteration Monitor) servers
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
standard-output or executes a given command.
'';
platforms = stdenv.lib.platforms.linux;
platforms = lib.platforms.linux;
};
}
pkgs/tools/misc/findutils/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl
{ lib, stdenv, fetchurl
, coreutils
}:
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
patches = [ ./no-install-statedir.patch ]
# fix gnulib tests on 32-bit ARM. Included on findutils master.
# https://lists.gnu.org/r/bug-gnulib/2020-08/msg00225.html
++ stdenv.lib.optional stdenv.hostPlatform.isAarch32 ./fix-gnulib-tests-arm.patch;
++ lib.optional stdenv.hostPlatform.isAarch32 ./fix-gnulib-tests-arm.patch;
buildInputs = [ coreutils ]; # bin/updatedb script needs to call sort
@@ -64,8 +64,8 @@ stdenv.mkDerivation rec {
* xargs - build and execute command lines from standard input.
'';
platforms = stdenv.lib.platforms.all;
platforms = lib.platforms.all;
license = stdenv.lib.licenses.gpl3Plus;
license = lib.licenses.gpl3Plus;
};
}
pkgs/tools/misc/fondu/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl }:
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
version = "060102";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "fortify" ];
meta = {
platforms = stdenv.lib.platforms.unix;
license = stdenv.lib.licenses.gpl3;
platforms = lib.platforms.unix;
license = lib.licenses.gpl3;
};
}
pkgs/tools/misc/fontforge/default.nix
+3 -3
View File
@@ -76,8 +76,8 @@ stdenv.mkDerivation rec {
meta = {
description = "A font editor";
homepage = "http://fontforge.github.io";
platforms = stdenv.lib.platforms.all;
license = stdenv.lib.licenses.bsd3;
maintainers = [ stdenv.lib.maintainers.erictapen ];
platforms = lib.platforms.all;
license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.erictapen ];
};
}
pkgs/tools/misc/fpp/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, python3 }:
{ lib, stdenv, fetchFromGitHub, python3 }:
stdenv.mkDerivation rec {
pname = "fpp";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
meta = {
description = "CLI program that accepts piped input and presents files for selection";
homepage = "https://facebook.github.io/PathPicker/";
license = stdenv.lib.licenses.bsd3;
platforms = stdenv.lib.platforms.all;
license = lib.licenses.bsd3;
platforms = lib.platforms.all;
};
}
pkgs/tools/misc/fx_cast/default.nix
+1 -1
View File
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
# See now-cli/default.nix
dontStrip = true;
preFixup = let
libPath = stdenv.lib.makeLibraryPath [stdenv.cc.cc stdenv.cc.libc];
libPath = lib.makeLibraryPath [stdenv.cc.cc stdenv.cc.libc];
bin = "$out/bin/${pname}";
in ''
pkgs/tools/misc/gams/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, unzip, file, licenseFile ? null, optgamsFile ? null}:
{ lib, stdenv, fetchurl, unzip, file, licenseFile ? null, optgamsFile ? null}:
assert licenseFile != null;
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
cp -a * "$out/share/gams"
cp ${licenseFile} $out/share/gams/gamslice.txt
'' + stdenv.lib.optionalString (optgamsFile != null) ''
'' + lib.optionalString (optgamsFile != null) ''
cp ${optgamsFile} $out/share/gams/optgams.def
ln -s $out/share/gams/optgams.def $out/bin/optgams.def
'';
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
done
'';
meta = with stdenv.lib;{
meta = with lib;{
description = "General Algebraic Modeling System";
longDescription = ''
The General Algebraic Modeling System is a high-level modeling system for mathematical optimization.
pkgs/tools/misc/gawp/default.nix
+3 -3
View File
@@ -1,10 +1,10 @@
{ stdenv, buildGoPackage, fetchgit }:
{ lib, stdenv, buildGoPackage, fetchgit }:
with builtins;
buildGoPackage rec {
pname = "gawp";
version = "20160121-${stdenv.lib.strings.substring 0 7 rev}";
version = "20160121-${lib.strings.substring 0 7 rev}";
rev = "5db2d8faa220e8d6eaf8677354bd197bf621ff7f";
goPackagePath = "github.com/martingallagher/gawp";
@@ -20,6 +20,6 @@ buildGoPackage rec {
meta = {
homepage = "https://github.com/martingallagher/gawp";
description = "A simple, configurable, file watching, job execution tool";
license = stdenv.lib.licenses.asl20;
license = lib.licenses.asl20;
};
}
pkgs/tools/misc/gbdfed/default.nix
+6 -6
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, freetype, gtk }:
{ lib, stdenv, fetchurl, pkgconfig, freetype, gtk }:
stdenv.mkDerivation rec {
version = "1.6";
@@ -20,13 +20,13 @@ stdenv.mkDerivation rec {
description = "Bitmap Font Editor";
longDescription = ''
gbdfed lets you interactively create new bitmap font files or modify existing ones.
It allows editing multiple fonts and multiple glyphs,
It allows editing multiple fonts and multiple glyphs,
it allows cut and paste operations between fonts and glyphs and editing font properties.
The editor works natively with BDF fonts.
The editor works natively with BDF fonts.
'';
homepage = "http://sofia.nmsu.edu/~mleisher/Software/gbdfed/";
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.linquize ];
platforms = stdenv.lib.platforms.all;
license = lib.licenses.mit;
maintainers = [ lib.maintainers.linquize ];
platforms = lib.platforms.all;
};
}
pkgs/tools/misc/geekbench/default.nix
+1 -1
View File
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
for f in geekbench5 geekbench_x86_64 ; do
patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) $out/bin/$f
wrapProgram $out/bin/$f --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$out/lib/"
wrapProgram $out/bin/$f --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$out/lib/"
done
'';
pkgs/tools/misc/getopt/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl}:
{lib, stdenv, fetchurl}:
stdenv.mkDerivation rec {
pname = "getopt";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
];
meta = {
platforms = stdenv.lib.platforms.unix;
platforms = lib.platforms.unix;
homepage = "http://frodo.looijaard.name/project/getopt";
description = "Parses command-line arguments from shell scripts";
};
pkgs/tools/misc/gibo/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, coreutils, findutils, git }:
{ lib, stdenv, fetchFromGitHub, coreutils, findutils, git }:
stdenv.mkDerivation rec {
pname = "gibo";
@@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
meta = {
homepage = "https://github.com/simonwhitaker/gibo";
license = stdenv.lib.licenses.publicDomain;
license = lib.licenses.publicDomain;
description = "A shell script for easily accessing gitignore boilerplates";
platforms = stdenv.lib.platforms.unix;
platforms = lib.platforms.unix;
};
}
pkgs/tools/misc/gnokii/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, intltool, perl, gettext, libusb-compat-0_1, pkgconfig, bluez
{ lib, stdenv, fetchurl, intltool, perl, gettext, libusb-compat-0_1, pkgconfig, bluez
, readline, pcsclite, libical, gtk2, glib, libXpm }:
stdenv.mkDerivation rec {
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
meta = {
description = "Cellphone tool";
homepage = "http://www.gnokii.org";
maintainers = [ stdenv.lib.maintainers.raskin ];
platforms = stdenv.lib.platforms.linux;
maintainers = [ lib.maintainers.raskin ];
platforms = lib.platforms.linux;
broken = true; # 2018-04-10
};
}
pkgs/tools/misc/goaccess/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, ncurses, glib, libmaxminddb, fetchpatch }:
{ lib, stdenv, fetchurl, pkgconfig, ncurses, glib, libmaxminddb, fetchpatch }:
stdenv.mkDerivation rec {
version = "1.4";
@@ -31,8 +31,8 @@ stdenv.mkDerivation rec {
meta = {
description = "Real-time web log analyzer and interactive viewer that runs in a terminal in *nix systems";
homepage = "https://goaccess.io";
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
maintainers = with stdenv.lib.maintainers; [ ederoyd46 ];
license = lib.licenses.mit;
platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin;
maintainers = with lib.maintainers; [ ederoyd46 ];
};
}
pkgs/tools/misc/gosu/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, buildGoPackage, fetchgit }:
{ lib, stdenv, buildGoPackage, fetchgit }:
buildGoPackage rec {
pname = "gosu";
@@ -18,7 +18,7 @@ buildGoPackage rec {
meta = {
description= "Tool that avoids TTY and signal-forwarding behavior of sudo and su";
homepage = "https://github.com/tianon/gosu";
license = stdenv.lib.licenses.gpl3;
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.gpl3;
platforms = lib.platforms.linux;
};
}
pkgs/tools/misc/gparted/default.nix
+1 -1
View File
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
preFixup = ''
gappsWrapperArgs+=(
--prefix PATH : "${stdenv.lib.makeBinPath [ gpart hdparm util-linux procps coreutils gnused gnugrep ]}"
--prefix PATH : "${lib.makeBinPath [ gpart hdparm util-linux procps coreutils gnused gnugrep ]}"
)
'';
pkgs/tools/misc/graylog/plugins.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ pkgs, stdenv, fetchurl, unzip, graylog }:
{ pkgs, lib, stdenv, fetchurl, unzip, graylog }:
with pkgs.lib;
@@ -77,7 +77,7 @@ in {
meta = {
homepage = "https://docs.graylog.org/en/3.3/pages/integrations.html#enterprise";
description = "Integrations are tools that help Graylog work with external systems (unfree enterprise integrations)";
license = stdenv.lib.licenses.unfree;
license = lib.licenses.unfree;
};
};
filter-messagesize = glPlugin rec {
pkgs/tools/misc/grex/default.nix
+1 -1
View File
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "1viph7ki6f2akc5mpbgycacndmxnv088ybfji2bfdbi5jnpyavvs";
};
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
doInstallCheck = true;
installCheckPhase = ''
pkgs/tools/misc/gringo/default.nix
+1 -1
View File
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
./gringo-4.5.4-to_string.patch
];
postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
postPatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace ./SConstruct \
--replace \
"env['CXX'] = 'g++'" \
pkgs/tools/misc/grub/2.0x.nix
+1 -1
View File
@@ -7,7 +7,7 @@
, xenSupport ? false
}:
with stdenv.lib;
with lib;
let
pcSystems = {
i686-linux.target = "i386";
pkgs/tools/misc/grub/default.nix
+1 -1
View File
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
# grub-install isn't smart enough.
./symlink.patch
]
++ (stdenv.lib.optional buggyBiosCDSupport ./buggybios.patch)
++ (lib.optional buggyBiosCDSupport ./buggybios.patch)
++ map fetchurl (import ./grub1.patches.nix)
;
pkgs/tools/misc/grub/pvgrub_image/default.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ lib, stdenv, grub2_xen }:
with stdenv.lib;
with lib;
let
efiSystemsBuild = {
i686-linux.target = "i386";
pkgs/tools/misc/grub/trusted.nix
+1 -1
View File
@@ -3,7 +3,7 @@
, for_HP_laptop ? false
}:
with stdenv.lib;
with lib;
let
pcSystems = {
i686-linux.target = "i386";
pkgs/tools/misc/gsmartcontrol/default.nix
+5 -5
View File
@@ -1,4 +1,4 @@
{ fetchurl, stdenv, smartmontools, autoreconfHook, gettext, gtkmm3, pkgconfig, wrapGAppsHook, pcre-cpp, gnome3 }:
{ fetchurl, lib, stdenv, smartmontools, autoreconfHook, gettext, gtkmm3, pkgconfig, wrapGAppsHook, pcre-cpp, gnome3 }:
stdenv.mkDerivation rec {
version="1.1.3";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
preFixup = ''
gappsWrapperArgs+=(
--prefix PATH : "${stdenv.lib.makeBinPath [ smartmontools ]}"
--prefix PATH : "${lib.makeBinPath [ smartmontools ]}"
)
'';
@@ -36,8 +36,8 @@ stdenv.mkDerivation rec {
as well as run various tests on it.
'';
homepage = "https://gsmartcontrol.sourceforge.io/";
license = stdenv.lib.licenses.gpl2Plus;
maintainers = with stdenv.lib.maintainers; [qknight];
platforms = with stdenv.lib.platforms; linux;
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [qknight];
platforms = with lib.platforms; linux;
};
}
pkgs/tools/misc/hdf4/default.nix
+8 -8
View File
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
cmake
] ++ stdenv.lib.optionals stdenv.isDarwin [
] ++ lib.optionals stdenv.isDarwin [
fixDarwinDylibNames
];
@@ -52,16 +52,16 @@ stdenv.mkDerivation rec {
libjpeg
szip
zlib
] ++ stdenv.lib.optionals uselibtirpc [
] ++ lib.optionals uselibtirpc [
libtirpc
];
preConfigure = stdenv.lib.optionalString uselibtirpc ''
preConfigure = lib.optionalString uselibtirpc ''
# Make tirpc discovery work with CMAKE_PREFIX_PATH
substituteInPlace config/cmake/FindXDR.cmake \
--replace 'find_path(XDR_INCLUDE_DIR NAMES rpc/types.h PATHS "/usr/include" "/usr/include/tirpc")' \
'find_path(XDR_INCLUDE_DIR NAMES rpc/types.h PATH_SUFFIXES include/tirpc)'
'' + stdenv.lib.optionalString (szip != null) ''
'' + lib.optionalString (szip != null) ''
export SZIP_INSTALL=${szip}
'';
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
"-DHDF4_ENABLE_Z_LIB_SUPPORT=ON"
"-DHDF4_BUILD_FORTRAN=OFF"
"-DJPEG_DIR=${libjpeg}"
] ++ stdenv.lib.optionals (szip != null) [
] ++ lib.optionals (szip != null) [
"-DHDF4_ENABLE_SZIP_ENCODING=ON"
"-DHDF4_ENABLE_SZIP_SUPPORT=ON"
];
@@ -84,11 +84,11 @@ stdenv.mkDerivation rec {
preCheck = ''
export LD_LIBRARY_PATH=$(pwd)/bin
'' + stdenv.lib.optionalString (stdenv.isDarwin) ''
'' + lib.optionalString (stdenv.isDarwin) ''
export DYLD_LIBRARY_PATH=$(pwd)/bin
'';
excludedTests = stdenv.lib.optionals stdenv.isDarwin [
excludedTests = lib.optionals stdenv.isDarwin [
"MFHDF_TEST-hdftest"
"MFHDF_TEST-hdftest-shared"
"HDP-dumpsds-18"
@@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
];
checkPhase = let excludedTestsRegex = if (excludedTests != [])
then "(" + (stdenv.lib.concatStringsSep "|" excludedTests) + ")"
then "(" + (lib.concatStringsSep "|" excludedTests) + ")"
else ""; in ''
runHook preCheck
ctest -E "${excludedTestsRegex}" --output-on-failure
pkgs/tools/misc/hdf5/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ stdenv
{ lib, stdenv
, fetchurl
, removeReferencesTo
, cpp ? false
@@ -13,7 +13,7 @@
# (--enable-unsupported could be used to force the build)
assert !cpp || mpi == null;
let inherit (stdenv.lib) optional optionals; in
let inherit (lib) optional optionals; in
stdenv.mkDerivation rec {
version = "1.10.6";
@@ -67,8 +67,8 @@ stdenv.mkDerivation rec {
applications to evolve in their use of HDF5. The HDF5 Technology suite includes tools and
applications for managing, manipulating, viewing, and analyzing data in the HDF5 format.
'';
license = stdenv.lib.licenses.bsd3; # Lawrence Berkeley National Labs BSD 3-Clause variant
license = lib.licenses.bsd3; # Lawrence Berkeley National Labs BSD 3-Clause variant
homepage = "https://www.hdfgroup.org/HDF5/";
platforms = stdenv.lib.platforms.unix;
platforms = lib.platforms.unix;
};
}
pkgs/tools/misc/hdfjava/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, javac }:
{ lib, stdenv, fetchurl, cmake, javac }:
stdenv.mkDerivation rec {
pname = "hdf-java";
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
meta = {
description = "A Java package that implements HDF4 and HDF5 data objects in an object-oriented form";
license = stdenv.lib.licenses.free; # BSD-like
license = lib.licenses.free; # BSD-like
homepage = "https://support.hdfgroup.org/products/java/index.html";
platforms = stdenv.lib.platforms.linux;
platforms = lib.platforms.linux;
};
}
pkgs/tools/misc/hdfview/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, ant, javac, hdf_java }:
{ lib, stdenv, fetchurl, ant, javac, hdf_java }:
stdenv.mkDerivation rec {
pname = "hdfview";
@@ -32,8 +32,8 @@ stdenv.mkDerivation rec {
meta = {
description = "A visual tool for browsing and editing HDF4 and HDF5 files";
license = stdenv.lib.licenses.free; # BSD-like
license = lib.licenses.free; # BSD-like
homepage = "https://support.hdfgroup.org/products/java/index.html";
platforms = stdenv.lib.platforms.linux;
platforms = lib.platforms.linux;
};
}
pkgs/tools/misc/heimdall/default.nix
+2 -2
View File
@@ -16,7 +16,7 @@ mkDerivation {
buildInputs = [
zlib libusb1
] ++ stdenv.lib.optional enableGUI qtbase;
] ++ lib.optional enableGUI qtbase;
nativeBuildInputs = [ cmake ];
cmakeFlags = [
@@ -27,7 +27,7 @@ mkDerivation {
preConfigure = ''
# Give ownership of the Galaxy S USB device to the logged in user.
substituteInPlace heimdall/60-heimdall.rules --replace 'MODE="0666"' 'TAG+="uaccess"'
'' + stdenv.lib.optionalString stdenv.isDarwin ''
'' + lib.optionalString stdenv.isDarwin ''
substituteInPlace libpit/CMakeLists.txt --replace "-std=gnu++11" ""
'';
pkgs/tools/misc/hexd/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub }:
{ lib, stdenv, fetchFromGitHub }:
with stdenv.lib;
with lib;
stdenv.mkDerivation rec {
pname = "hexd";
pkgs/tools/misc/hhpc/default.nix
+1 -1
View File
@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
description = "Hides the mouse pointer in X11";
maintainers = with maintainers; [ nico202 ];
platforms = platforms.unix;
license = stdenv.lib.licenses.bsd3;
license = lib.licenses.bsd3;
};
}
pkgs/tools/misc/hyperfine/default.nix
+1 -1
View File
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "12qdllhydd29xh20l5gir6qpj4a1nkzp8ics344rcwj8wsj7g5zw";
nativeBuildInputs = [ installShellFiles ];
buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
buildInputs = lib.optional stdenv.isDarwin Security;
postInstall = ''
installManPage doc/hyperfine.1
pkgs/tools/misc/i3cat/default.nix
+2 -2
View File
@@ -1,8 +1,8 @@
{ stdenv, buildGoPackage, fetchgit }:
{ lib, stdenv, buildGoPackage, fetchgit }:
buildGoPackage rec {
pname = "i3cat";
version = "20150321-${stdenv.lib.strings.substring 0 7 rev}";
version = "20150321-${lib.strings.substring 0 7 rev}";
rev = "b9ba886a7c769994ccd8d4627978ef4b51fcf576";
goPackagePath = "github.com/vincent-petithory/i3cat";
pkgs/tools/misc/i3minator/default.nix
+2 -2
View File
@@ -26,9 +26,9 @@ pythonPackages.buildPythonApplication rec {
project is inspired by tmuxinator and uses i3-py.
'';
homepage = "https://github.com/carlesso/i3minator";
license = stdenv.lib.licenses.wtfpl;
license = lib.licenses.wtfpl;
maintainers = with maintainers; [ domenkozar ];
platforms = stdenv.lib.platforms.linux;
platforms = lib.platforms.linux;
};
}
pkgs/tools/misc/idevicerestore/default.nix
+1 -1
View File
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
# Not listing other dependencies specified in
# https://github.com/libimobiledevice/idevicerestore/blob/8a882038b2b1e022fbd19eaf8bea51006a373c06/README#L20
# because they are inherited `libimobiledevice`.
] ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ];
] ++ lib.optionals stdenv.isDarwin [ IOKit ];
meta = with lib; {
homepage = "https://github.com/libimobiledevice/idevicerestore";
pkgs/tools/misc/idutils/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ fetchurl, stdenv, emacs }:
{ fetchurl, lib, stdenv, emacs }:
stdenv.mkDerivation rec {
name = "idutils-4.6";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
sed -i '/gets is a security hole/d' lib/stdio.in.h
'';
buildInputs = stdenv.lib.optional stdenv.isLinux emacs;
buildInputs = lib.optional stdenv.isLinux emacs;
doCheck = !stdenv.isDarwin;
@@ -46,10 +46,10 @@ stdenv.mkDerivation rec {
'';
homepage = "https://www.gnu.org/software/idutils/";
license = stdenv.lib.licenses.gpl3Plus;
license = lib.licenses.gpl3Plus;
maintainers = [ ];
platforms = stdenv.lib.platforms.all;
platforms = lib.platforms.all;
broken = true;
};
}
pkgs/tools/misc/intermodal/default.nix
+1 -1
View File
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "0kf5afarfwcl47b40pwnslfvxmxllmb995vc5ls2lpz4cx0jwahn";
# include_hidden test tries to use `chflags` on darwin
checkFlagsArray = stdenv.lib.optionals stdenv.isDarwin [ "--skip=subcommand::torrent::create::tests::include_hidden" ];
checkFlagsArray = lib.optionals stdenv.isDarwin [ "--skip=subcommand::torrent::create::tests::include_hidden" ];
meta = with lib; {
description = "User-friendly and featureful command-line BitTorrent metainfo utility";
pkgs/tools/misc/ipxe/default.nix
+1 -1
View File
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = with stdenv.lib;
meta = with lib;
{ description = "Network boot firmware";
homepage = "https://ipxe.org/";
license = licenses.gpl2;
pkgs/tools/misc/ised/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl }:
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
pname = "ised";
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
meta = {
description = "A numeric sequence editor";
maintainers = with stdenv.lib.maintainers; [ raskin ];
platforms = with stdenv.lib.platforms; linux;
license = stdenv.lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ raskin ];
platforms = with lib.platforms; linux;
license = lib.licenses.gpl3Plus;
};
}
pkgs/tools/misc/ix/default.nix
+1 -1
View File
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
'';
postFixup = ''
wrapProgram $out/bin/ix --prefix PATH : "${stdenv.lib.makeBinPath [ curl ]}"
wrapProgram $out/bin/ix --prefix PATH : "${lib.makeBinPath [ curl ]}"
'';
meta = with lib; {
pkgs/tools/misc/jdupes/default.nix
+2 -2
View File
@@ -19,10 +19,10 @@ stdenv.mkDerivation rec {
makeFlags = [
"PREFIX=${placeholder "out"}"
] ++ stdenv.lib.optionals stdenv.isLinux [
] ++ lib.optionals stdenv.isLinux [
"ENABLE_DEDUPE=1"
"STATIC_DEDUPE_H=1"
] ++ stdenv.lib.optionals stdenv.cc.isGNU [
] ++ lib.optionals stdenv.cc.isGNU [
"HARDEN=1"
];
pkgs/tools/misc/keychain/default.nix
+13 -13
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, makeWrapper, coreutils, openssh, gnupg
{ lib, stdenv, fetchFromGitHub, makeWrapper, coreutils, openssh, gnupg
, perl, procps, gnugrep, gawk, findutils, gnused }:
stdenv.mkDerivation rec {
@@ -32,23 +32,23 @@ stdenv.mkDerivation rec {
meta = {
description = "Keychain management tool";
homepage = "https://www.funtoo.org/Keychain";
license = stdenv.lib.licenses.gpl2;
license = lib.licenses.gpl2;
# other platforms are untested (AFAIK)
platforms =
with stdenv.lib;
with lib;
platforms.linux ++ platforms.darwin;
maintainers = with stdenv.lib.maintainers; [ sigma ];
maintainers = with lib.maintainers; [ sigma ];
longDescription = ''
Keychain helps you to manage SSH and GPG keys in a convenient and secure
manner. It acts as a frontend to ssh-agent and ssh-add, but allows you
to easily have one long running ssh-agent process per system, rather
than the norm of one ssh-agent per login session.
Keychain helps you to manage SSH and GPG keys in a convenient and secure
manner. It acts as a frontend to ssh-agent and ssh-add, but allows you
to easily have one long running ssh-agent process per system, rather
than the norm of one ssh-agent per login session.
This dramatically reduces the number of times you need to enter your
passphrase. With keychain, you only need to enter a passphrase once
every time your local machine is rebooted. Keychain also makes it easy
for remote cron jobs to securely "hook in" to a long-running ssh-agent
process, allowing your scripts to take advantage of key-based logins.
This dramatically reduces the number of times you need to enter your
passphrase. With keychain, you only need to enter a passphrase once
every time your local machine is rebooted. Keychain also makes it easy
for remote cron jobs to securely "hook in" to a long-running ssh-agent
process, allowing your scripts to take advantage of key-based logins.
'';
};
}
pkgs/tools/misc/kisslicer/default.nix
+1 -1
View File
@@ -7,7 +7,7 @@
let
libPath = stdenv.lib.makeLibraryPath [
libPath = lib.makeLibraryPath [
libGLU libGL
stdenv.cc.cc
libX11
pkgs/tools/misc/kodi-cli/default.nix
+4 -4
View File
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
pname = "kodi-cli";
version = "1.1.1";
src = fetchFromGitHub {
owner = "nawar";
repo = pname;
@@ -16,11 +16,11 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/bin
cp -a kodi-cli $out/bin
wrapProgram $out/bin/kodi-cli --prefix PATH : ${stdenv.lib.makeBinPath [ curl bash ]}
wrapProgram $out/bin/kodi-cli --prefix PATH : ${lib.makeBinPath [ curl bash ]}
cp -a playlist_to_kodi $out/bin
wrapProgram $out/bin/playlist_to_kodi --prefix PATH : ${stdenv.lib.makeBinPath [ curl bash gnome3.zenity jq youtube-dl ]}
wrapProgram $out/bin/playlist_to_kodi --prefix PATH : ${lib.makeBinPath [ curl bash gnome3.zenity jq youtube-dl ]}
'';
meta = with lib; {
homepage = "https://github.com/nawar/kodi-cli";
description = "Kodi/XBMC bash script to send Kodi commands using JSON RPC. It also allows sending YouTube videos to Kodi";
pkgs/tools/misc/lbdb/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, perl, perlPackages, finger_bsd, makeWrapper
{ lib, stdenv, fetchurl, fetchpatch, perl, perlPackages, finger_bsd, makeWrapper
, abook ? null
, gnupg ? null
, goobook ? null
@@ -9,7 +9,7 @@
let
version = "0.48.1";
in
with stdenv.lib;
with lib;
with perlPackages;
stdenv.mkDerivation {
pname = "lbdb";
pkgs/tools/misc/ldapvi/default.nix
+1 -1
View File
@@ -27,6 +27,6 @@ stdenv.mkDerivation {
homepage = "http://www.lichteblau.com/ldapvi/";
license = licenses.gpl2;
maintainers = with maintainers; [ domenkozar ];
platforms = stdenv.lib.platforms.linux;
platforms = lib.platforms.linux;
};
}
pkgs/tools/misc/less/default.nix
+1 -1
View File
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
configureFlags = [ "--sysconfdir=/etc" ] # Look for ‘sysless’ in /etc.
++ stdenv.lib.optional lessSecure [ "--with-secure" ];
++ lib.optional lessSecure [ "--with-secure" ];
buildInputs = [ ncurses ];

Some files were not shown because too many files have changed in this diff Show More