nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 16:33:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

treewide: stdenv.lib -> lib

Browse Source
This commit is contained in:
Ben Siraphob 2021-01-27 12:59:00 +07:00
parent 02ee14b9d5
commit 36c91cea1d
13 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/tests/vault-postgresql.nix
View File

@ -8,7 +8,7 @@
import ./make-test-python.nix ({ pkgs, ... }:
{
name = "vault-postgresql";
meta = with pkgs.stdenv.lib.maintainers; {
meta = with pkgs.lib.maintainers; {
maintainers = [ lnl7 roberth ];
};
machine = { lib, pkgs, ... }: {

10
pkgs/build-support/templaterpm/nix-template-rpm.py
View File

@ -229,26 +229,26 @@ class SPECTemplate(object):
@property
def meta(self):
out = ' meta = {\n'
out = ' meta = with lib; {\n'
out += ' homepage = ' + self.spec.sourceHeader['url'] + ';\n'
out += ' description = "' + self.spec.sourceHeader['summary'] + '";\n'
out += ' license = stdenv.lib.licenses.' + self.spec.sourceHeader['license'] + ';\n'
out += ' license = lib.licenses.' + self.spec.sourceHeader['license'] + ';\n'
out += ' platforms = [ "i686-linux" "x86_64-linux" ];\n'
out += ' maintainers = with stdenv.lib.maintainers; [ ' + self.maintainer + ' ];\n'
out += ' maintainers = with lib.maintainers; [ ' + self.maintainer + ' ];\n'
out += ' };\n'
out += '}\n'
return out
def __str__(self):
head = '{stdenv, fetchurl, ' + ', '.join(self.getBuildInputs("ALL")) + '}:\n\n'
head = '{lib, stdenv, fetchurl, ' + ', '.join(self.getBuildInputs("ALL")) + '}:\n\n'
head += 'stdenv.mkDerivation {\n'
body = [ self.name, self.src, self.patch, self.buildInputs, self.configure, self.build, self.ocamlExtra, self.install, self.meta ]
return head + '\n'.join(body)
def getTemplate(self):
head = '{stdenv, buildRoot, fetchurl, ' + ', '.join(self.getBuildInputs("ALL")) + '}:\n\n'
head = '{lib, stdenv, buildRoot, fetchurl, ' + ', '.join(self.getBuildInputs("ALL")) + '}:\n\n'
head += 'let\n'
head += ' buildRootInput = (import "${buildRoot}/usr/share/buildroot/buildRootInput.nix") { fetchurl=fetchurl; buildRoot=buildRoot; };\n'
head += 'in\n\n'

4
pkgs/development/libraries/gcc/libgcc/default.nix
View File

@ -1,4 +1,4 @@
{ stdenvNoLibs, buildPackages
{ lib, stdenvNoLibs, buildPackages
, gcc, glibc
, libiberty
}:
@ -128,7 +128,7 @@ stdenvNoLibs.mkDerivation rec {
"--disable-vtable-verify"
"--with-system-zlib"
] ++ stdenvNoLibs.lib.optional (stdenvNoLibs.hostPlatform.libc == "glibc")
] ++ lib.optional (stdenvNoLibs.hostPlatform.libc == "glibc")
"--with-glibc-version=${glibc.version}";
configurePlatforms = [ "build" "host" ];

10
pkgs/development/lisp-modules/asdf/2.26.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, texinfo, texLive, perl}:
{lib, stdenv, fetchurl, texinfo, texLive, perl}:
let
s = # Generated upstream information
rec {
@ -31,11 +31,11 @@ stdenv.mkDerivation {
cp -r doc/* "$out"/share/doc/asdf/
ln -s "$out"/lib/common-lisp/{asdf/uiop,uiop}
'';
meta = {
meta = with lib; {
inherit (s) version;
description = "Standard software-system definition library for Common Lisp";
license = stdenv.lib.licenses.mit ;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
license = licenses.mit;
maintainers = [maintainers.raskin];
platforms = platforms.linux;
};
}

10
pkgs/development/lisp-modules/asdf/3.1.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, texinfo, texLive, perl}:
{lib, stdenv, fetchurl, texinfo, texLive, perl}:
let
s = # Generated upstream information
rec {
@ -30,11 +30,11 @@ stdenv.mkDerivation {
cp -r doc/* "$out"/share/doc/asdf/
ln -s "$out"/lib/common-lisp/{asdf/uiop,uiop}
'';
meta = {
meta = with lib; {
inherit (s) version;
description = "Standard software-system definition library for Common Lisp";
license = stdenv.lib.licenses.mit ;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.unix;
license = licenses.mit ;
maintainers = [maintainers.raskin];
platforms = platforms.unix;
};
}

10
pkgs/development/lisp-modules/asdf/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, texinfo, texLive, perl}:
{lib, stdenv, fetchurl, texinfo, texLive, perl}:
let
s = # Generated upstream information
rec {
@ -31,11 +31,11 @@ stdenv.mkDerivation {
cp -r doc/* "$out"/share/doc/asdf/
ln -s "$out"/lib/common-lisp/{asdf/uiop,uiop}
'';
meta = {
meta = with lib; {
inherit (s) version;
description = "Standard software-system definition library for Common Lisp";
license = stdenv.lib.licenses.mit ;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.unix;
license = licenses.mit ;
maintainers = [maintainers.raskin];
platforms = platforms.unix;
};
}

4
pkgs/development/lisp-modules/clwrapper/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, asdf, which, bash, lisp ? null}:
{lib, stdenv, asdf, which, bash, lisp ? null}:
stdenv.mkDerivation {
name = "cl-wrapper-script";
@ -52,6 +52,6 @@ stdenv.mkDerivation {
meta = {
description = "Script used to wrap Common Lisp implementations";
maintainers = [stdenv.lib.maintainers.raskin];
maintainers = [lib.maintainers.raskin];
};
}

4
pkgs/development/lisp-modules/define-package.nix
View File

@ -1,4 +1,4 @@
args @ {stdenv, clwrapper, baseName, packageName ? baseName
args @ {lib, stdenv, clwrapper, baseName, packageName ? baseName
, parasites ? []
, buildSystems ? ([packageName] ++ parasites)
, version ? "latest"
@ -89,7 +89,7 @@ basePackage = {
env -i \
NIX_LISP="$NIX_LISP" \
NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(progn
${stdenv.lib.concatMapStrings (system: ''
${lib.concatMapStrings (system: ''
(asdf:compile-system :${system})
(asdf:load-system :${system})
(asdf:operate (quote asdf::compile-bundle-op) :${system})

4
pkgs/development/lisp-modules/lisp-packages.nix
View File

@ -1,6 +1,6 @@
{stdenv, clwrapper, pkgs, sbcl, coreutils, nix, asdf}:
{lib, stdenv, clwrapper, pkgs, sbcl, coreutils, nix, asdf}:
let lispPackages = rec {
inherit pkgs clwrapper stdenv;
inherit lib pkgs clwrapper stdenv;
nixLib = pkgs.lib;
callPackage = nixLib.callPackageWith lispPackages;

4
pkgs/development/lisp-modules/quicklisp-to-nix.nix
View File

@ -1,6 +1,6 @@
{stdenv, fetchurl, pkgs, clwrapper}:
{lib, stdenv, fetchurl, pkgs, clwrapper}:
let quicklisp-to-nix-packages = rec {
inherit stdenv fetchurl clwrapper pkgs quicklisp-to-nix-packages;
inherit lib stdenv fetchurl clwrapper pkgs quicklisp-to-nix-packages;
callPackage = pkgs.lib.callPackageWith quicklisp-to-nix-packages;
buildLispPackage = callPackage ./define-package.nix;

2
pkgs/stdenv/adapters.nix
View File

@ -110,7 +110,7 @@ rec {
*/
replaceMaintainersField = stdenv: pkgs: maintainers: stdenv //
{ mkDerivation = args:
stdenv.lib.recursiveUpdate
pkgs.lib.recursiveUpdate
(stdenv.mkDerivation args)
{ meta.maintainers = maintainers; };
};

4
pkgs/tools/security/proxmark3/proxmark3-rrg.nix
View File

@ -1,4 +1,4 @@
{ stdenv, mkDerivation, fetchFromGitHub, pkg-config, gcc-arm-embedded, bluez5
{ lib, stdenv, mkDerivation, fetchFromGitHub, pkg-config, gcc-arm-embedded, bluez5
, readline
, hardwarePlatform ? "PM3RDV4"
@ -29,7 +29,7 @@ mkDerivation rec {
install -Dt $out/firmware bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "Client for proxmark3, powerful general purpose RFID tool";
homepage = "https://rfidresearchgroup.com/";
license = licenses.gpl2Plus;

2
pkgs/top-level/all-packages.nix
View File

@ -25236,7 +25236,7 @@ in
}).overrideAttrs (oldAttrs: rec {
pname = "vim-darwin";
meta = {
platforms = stdenv.lib.platforms.darwin;
platforms = lib.platforms.darwin;
};
});