philipp
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

treewide: remove implicit use of stdenv.lib

master
Ben Siraphob 2021-01-27 17:21:31 +07:00
parent 78b5cfc15a
commit 82454e9df8
15 changed files with 35 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/networking/irc/wraith/default.nix
View File

@ -1,9 +1,6 @@
{ stdenv, fetchurl, openssl }: { lib, stdenv, fetchurl, openssl }:
with stdenv; stdenv.mkDerivation rec {
with lib;
mkDerivation rec {
pname = "wraith"; pname = "wraith";
version = "1.4.7"; version = "1.4.7";
src = fetchurl { src = fetchurl {
@ -25,7 +22,7 @@ mkDerivation rec {
ln -s wraith $out/bin/hub ln -s wraith $out/bin/hub
''; '';
meta = { meta = with lib; {
description = "An IRC channel management bot written purely in C/C++"; description = "An IRC channel management bot written purely in C/C++";
longDescription = '' longDescription = ''
Wraith is an IRC channel management bot written purely in C/C++. It has Wraith is an IRC channel management bot written purely in C/C++. It has

2
pkgs/applications/science/logic/coq/default.nix
View File

@ -45,7 +45,7 @@ let
}; };
releaseRev = v: "V${v}"; releaseRev = v: "V${v}";
fetched = import ../../../../build-support/coq/meta-fetch/default.nix fetched = import ../../../../build-support/coq/meta-fetch/default.nix
{ inherit stdenv fetchzip; } { inherit lib stdenv fetchzip; }
{ inherit release releaseRev; location = { owner = "coq"; repo = "coq";}; } { inherit release releaseRev; location = { owner = "coq"; repo = "coq";}; }
args.version; args.version;
version = fetched.version; version = fetched.version;

2
pkgs/applications/version-management/cvs-fast-export/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, makeWrapper, flex, bison, {lib, stdenv, fetchurl, makeWrapper, flex, bison,
asciidoc, docbook_xml_dtd_45, docbook_xsl, asciidoc, docbook_xml_dtd_45, docbook_xsl,
libxml2, libxslt, libxml2, libxslt,
python3, rcs, cvs, git, python3, rcs, cvs, git,

2
pkgs/applications/version-management/reposurgeon/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, makeWrapper, python27Packages, git { lib, stdenv, fetchurl, makeWrapper, python27Packages, git
, docbook_xml_dtd_412, docbook_xsl, asciidoc, xmlto, pypy , docbook_xml_dtd_412, docbook_xsl, asciidoc, xmlto, pypy
, breezy ? null, cvs ? null, darcs ? null, fossil ? null , breezy ? null, cvs ? null, darcs ? null, fossil ? null
, mercurial ? null, monotone ? null, rcs ? null , mercurial ? null, monotone ? null, rcs ? null

2
pkgs/build-support/coq/default.nix
View File

@ -35,7 +35,7 @@ let
"extraInstallFlags" "setCOQBIN" "mlPlugin" "extraInstallFlags" "setCOQBIN" "mlPlugin"
"dropAttrs" "dropDerivationAttrs" "keepAttrs" ] ++ dropAttrs) keepAttrs; "dropAttrs" "dropDerivationAttrs" "keepAttrs" ] ++ dropAttrs) keepAttrs;
fetch = import ../coq/meta-fetch/default.nix fetch = import ../coq/meta-fetch/default.nix
{ inherit stdenv fetchzip; } ({ { inherit lib stdenv fetchzip; } ({
inherit release releaseRev; inherit release releaseRev;
location = { inherit domain owner repo; }; location = { inherit domain owner repo; };
} // optionalAttrs (args?fetcher) {inherit fetcher;}); } // optionalAttrs (args?fetcher) {inherit fetcher;});

5
pkgs/build-support/coq/meta-fetch/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv, fetchzip }@args: { lib, stdenv, fetchzip }@args:
let lib = import ../extra-lib.nix {inherit (args.stdenv) lib;}; in let lib' = lib; in
let lib = import ../extra-lib.nix {lib = lib';}; in
with builtins; with lib; with builtins; with lib;
let let
default-fetcher = {domain ? "github.com", owner ? "", repo, rev, name ? "source", sha256 ? null, ...}@args: default-fetcher = {domain ? "github.com", owner ? "", repo, rev, name ? "source", sha256 ? null, ...}@args:

7
pkgs/development/compilers/dmd/binary.nix
View File

@ -1,10 +1,11 @@
{ stdenv, fetchurl, curl, tzdata, autoPatchelfHook, fixDarwinDylibNames, glibc { lib, stdenv, fetchurl, curl, tzdata, autoPatchelfHook, fixDarwinDylibNames, glibc
, version, hashes }: , version, hashes }:
with stdenv;
let let
inherit (stdenv) hostPlatform;
OS = if hostPlatform.isDarwin then "osx" else hostPlatform.parsed.kernel.name; OS = if hostPlatform.isDarwin then "osx" else hostPlatform.parsed.kernel.name;
MODEL = toString hostPlatform.parsed.cpu.bits; MODEL = toString hostPlatform.parsed.cpu.bits;
in mkDerivation { in stdenv.mkDerivation {
pname = "dmd-bootstrap"; pname = "dmd-bootstrap";
inherit version; inherit version;

9
pkgs/development/compilers/ldc/binary.nix
View File

@ -1,10 +1,11 @@
{ stdenv, fetchurl, curl, tzdata, autoPatchelfHook, fixDarwinDylibNames, libxml2 { lib, stdenv, fetchurl, curl, tzdata, autoPatchelfHook, fixDarwinDylibNames, libxml2
, version, hashes }: , version, hashes }:
with stdenv;
let let
OS = if hostPlatform.isDarwin then "osx" else hostPlatform.parsed.kernel.name; inherit (stdenv) hostPlatform;
OS = if stdenv.hostPlatform.isDarwin then "osx" else hostPlatform.parsed.kernel.name;
ARCH = toString hostPlatform.parsed.cpu.name; ARCH = toString hostPlatform.parsed.cpu.name;
in mkDerivation { in stdenv.mkDerivation {
pname = "ldc-bootstrap"; pname = "ldc-bootstrap";
inherit version; inherit version;

4
pkgs/development/compilers/nextpnr/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake { lib, stdenv, fetchFromGitHub, cmake
, boost, python3, eigen , boost, python3, eigen
, icestorm, trellis , icestorm, trellis
, llvmPackages , llvmPackages
@ -12,7 +12,7 @@
let let
boostPython = boost.override { python = python3; enablePython = true; }; boostPython = boost.override { python = python3; enablePython = true; };
in in
with stdenv; mkDerivation rec { stdenv.mkDerivation rec {
pname = "nextpnr"; pname = "nextpnr";
version = "2021.01.02"; version = "2021.01.02";

6
pkgs/development/libraries/libftdi/default.nix
View File

@ -1,6 +1,6 @@
{stdenv, fetchurl, libusb-compat-0_1}: {lib, stdenv, fetchurl, libusb-compat-0_1}:
with stdenv; mkDerivation rec { stdenv.mkDerivation rec {
name = "libftdi-0.20"; name = "libftdi-0.20";
src = fetchurl { src = fetchurl {
@ -14,7 +14,7 @@ with stdenv; mkDerivation rec {
# Hack to avoid TMPDIR in RPATHs. # Hack to avoid TMPDIR in RPATHs.
preFixup = ''rm -rf "$(pwd)" ''; preFixup = ''rm -rf "$(pwd)" '';
configureFlags = lib.optional (!isDarwin) "--with-async-mode"; configureFlags = lib.optional (!stdenv.isDarwin) "--with-async-mode";
# allow async mode. from ubuntu. see: # allow async mode. from ubuntu. see:
# https://bazaar.launchpad.net/~ubuntu-branches/ubuntu/trusty/libftdi/trusty/view/head:/debian/patches/04_async_mode.diff # https://bazaar.launchpad.net/~ubuntu-branches/ubuntu/trusty/libftdi/trusty/view/head:/debian/patches/04_async_mode.diff

2
pkgs/development/ocaml-modules/elpi/default.nix
View File

@ -4,7 +4,7 @@
}: }:
with lib; with lib;
let fetched = import ../../../build-support/coq/meta-fetch/default.nix let fetched = import ../../../build-support/coq/meta-fetch/default.nix
{inherit stdenv fetchzip; } ({ {inherit lib stdenv fetchzip; } ({
release."1.12.0".sha256 = "1agisdnaq9wrw3r73xz14yrq3wx742i6j8i5icjagqk0ypmly2is"; release."1.12.0".sha256 = "1agisdnaq9wrw3r73xz14yrq3wx742i6j8i5icjagqk0ypmly2is";
release."1.11.4".sha256 = "1m0jk9swcs3jcrw5yyw5343v8mgax238cjb03s8gc4wipw1fn9f5"; release."1.11.4".sha256 = "1m0jk9swcs3jcrw5yyw5343v8mgax238cjb03s8gc4wipw1fn9f5";
releaseRev = v: "v${v}"; releaseRev = v: "v${v}";

4
pkgs/misc/emulators/mame/default.nix
View File

@ -1,10 +1,8 @@
{ stdenv, mkDerivation, fetchFromGitHub, makeDesktopItem, makeWrapper { lib, stdenv, mkDerivation, fetchFromGitHub, makeDesktopItem, makeWrapper
, python, pkg-config, SDL2, SDL2_ttf, alsaLib, which, qtbase, libXinerama , python, pkg-config, SDL2, SDL2_ttf, alsaLib, which, qtbase, libXinerama
, libpcap, CoreAudioKit, ForceFeedback , libpcap, CoreAudioKit, ForceFeedback
, installShellFiles }: , installShellFiles }:
with stdenv;
let let
majorVersion = "0"; majorVersion = "0";
minorVersion = "226"; minorVersion = "226";

9
pkgs/tools/filesystems/ceph/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, runCommand, fetchurl { lib, stdenv, runCommand, fetchurl
, fetchpatch , fetchpatch
, ensureNewerSourcesHook , ensureNewerSourcesHook
, cmake, pkg-config , cmake, pkg-config
@ -36,7 +36,6 @@
# We must have one crypto library # We must have one crypto library
assert cryptopp != null || (nss != null && nspr != null); assert cryptopp != null || (nss != null && nspr != null);
with stdenv; with lib;
let let
shouldUsePkg = pkg: if pkg != null && pkg.meta.available then pkg else null; shouldUsePkg = pkg: if pkg != null && pkg.meta.available then pkg else null;
@ -76,7 +75,7 @@ let
none = [ ]; none = [ ];
}; };
getMeta = description: { getMeta = description: with lib; {
homepage = "https://ceph.com/"; homepage = "https://ceph.com/";
inherit description; inherit description;
license = with licenses; [ lgpl21 gpl2 bsd3 mit publicDomain ]; license = with licenses; [ lgpl21 gpl2 bsd3 mit publicDomain ];
@ -148,11 +147,11 @@ in rec {
boost ceph-python-env libxml2 optYasm optLibatomic_ops optLibs3 boost ceph-python-env libxml2 optYasm optLibatomic_ops optLibs3
malloc zlib openldap lttng-ust babeltrace gperf gtest cunit malloc zlib openldap lttng-ust babeltrace gperf gtest cunit
snappy rocksdb lz4 oathToolkit leveldb libnl libcap_ng rdkafka snappy rocksdb lz4 oathToolkit leveldb libnl libcap_ng rdkafka
] ++ optionals stdenv.isLinux [ ] ++ lib.optionals stdenv.isLinux [
linuxHeaders util-linux libuuid udev keyutils optLibaio optLibxfs optZfs linuxHeaders util-linux libuuid udev keyutils optLibaio optLibxfs optZfs
# ceph 14 # ceph 14
rdma-core rabbitmq-c rdma-core rabbitmq-c
] ++ optionals hasRadosgw [ ] ++ lib.optionals hasRadosgw [
optFcgi optExpat optCurl optFuse optLibedit optFcgi optExpat optCurl optFuse optLibedit
]; ];

6
pkgs/tools/filesystems/irods/common.nix
View File

@ -1,9 +1,7 @@
{ stdenv, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp, boost, jansson, zeromq, openssl, pam, libiodbc, kerberos, gcc, libcxx, which, catch2 }: { lib, stdenv, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp, boost, jansson, zeromq, openssl, pam, libiodbc, kerberos, gcc, libcxx, which, catch2 }:
# Common attributes of irods packages # Common attributes of irods packages
with stdenv;
{ {
nativeBuildInputs = [ autoconf automake cmake gnumake help2man texinfo which gcc ]; nativeBuildInputs = [ autoconf automake cmake gnumake help2man texinfo which gcc ];
buildInputs = [ bzip2 zlib libtool cppzmq libarchive avro-cpp jansson zeromq openssl pam libiodbc kerberos boost libcxx catch2 ]; buildInputs = [ bzip2 zlib libtool cppzmq libarchive avro-cpp jansson zeromq openssl pam libiodbc kerberos boost libcxx catch2 ];
@ -35,7 +33,7 @@ with stdenv;
" "
''; '';
meta = { meta = with lib; {
description = "Integrated Rule-Oriented Data System (iRODS)"; description = "Integrated Rule-Oriented Data System (iRODS)";
longDescription = '' longDescription = ''
The Integrated Rule-Oriented Data System (iRODS) is open source data management The Integrated Rule-Oriented Data System (iRODS) is open source data management

8
pkgs/tools/filesystems/irods/default.nix
View File

@ -1,13 +1,11 @@
{ stdenv, fetchFromGitHub, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp_llvm, boost, jansson, zeromq, openssl , pam, libiodbc, kerberos, gcc, libcxx, which, catch2 }: { lib, stdenv, fetchFromGitHub, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp_llvm, boost, jansson, zeromq, openssl , pam, libiodbc, kerberos, gcc, libcxx, which, catch2 }:
with stdenv;
let let
avro-cpp=avro-cpp_llvm; avro-cpp=avro-cpp_llvm;
in in
let let
common = import ./common.nix { common = import ./common.nix {
inherit stdenv bzip2 zlib autoconf automake cmake gnumake inherit lib stdenv bzip2 zlib autoconf automake cmake gnumake
help2man texinfo libtool cppzmq libarchive jansson help2man texinfo libtool cppzmq libarchive jansson
zeromq openssl pam libiodbc kerberos gcc libcxx zeromq openssl pam libiodbc kerberos gcc libcxx
boost avro-cpp which catch2; boost avro-cpp which catch2;
@ -83,7 +81,7 @@ in rec {
''; '';
cmakeFlags = common.cmakeFlags ++ [ cmakeFlags = common.cmakeFlags ++ [
"-DCMAKE_INSTALL_PREFIX=${out}" "-DCMAKE_INSTALL_PREFIX=${stdenv.out}"
"-DIRODS_DIR=${irods}/lib/irods/cmake" "-DIRODS_DIR=${irods}/lib/irods/cmake"
"-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath,${irods}/lib" "-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath,${irods}/lib"
"-DCMAKE_MODULE_LINKER_FLAGS=-Wl,-rpath,${irods}/lib" "-DCMAKE_MODULE_LINKER_FLAGS=-Wl,-rpath,${irods}/lib"