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

Get rid of all with { inherit... } and just used let inherit...

Browse Source 
The old forms presumably predates, or were made in ignorance of,
`let inherit`. This way is better style as the scoping as more lexical,
something which Nix can (or might already!) take advantage of.
This commit is contained in:
John Ericson 2017-02-08 20:52:13 -05:00
parent da79d1f01f
commit 4c0d7da183
19 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/attrsets.nix
View File

@ -1,12 +1,12 @@
# Operations on attribute sets.
with {
let
inherit (builtins) head tail length;
inherit (import ./trivial.nix) or;
inherit (import ./default.nix) fold;
inherit (import ./strings.nix) concatStringsSep;
inherit (import ./lists.nix) concatMap concatLists all deepSeqList;
};
in
rec {
inherit (builtins) attrNames listToAttrs hasAttr isAttrs getAttr;

2
lib/types.nix
View File

@ -6,7 +6,7 @@ with import ./attrsets.nix;
with import ./options.nix;
with import ./trivial.nix;
with import ./strings.nix;
with {inherit (import ./modules.nix) mergeDefinitions filterOverrides; };
let inherit (import ./modules.nix) mergeDefinitions filterOverrides; in
rec {

2
pkgs/applications/editors/codeblocks/default.nix
View File

@ -4,8 +4,6 @@
with stdenv.lib;
with { inherit (stdenv.lib) optionalString optional optionals; };
stdenv.mkDerivation rec {
name = "${pname}-${stdenv.lib.optionalString contribPlugins "full-"}${version}";
version = "16.01";

2
pkgs/applications/networking/p2p/transmission/default.nix
View File

@ -10,7 +10,7 @@ let
version = "2.92";
in
with { inherit (stdenv.lib) optional optionals optionalString; };
let inherit (stdenv.lib) optional optionals optionalString; in
stdenv.mkDerivation rec {
name = "transmission-" + optionalString enableGTK3 "gtk-" + version;

2
pkgs/applications/office/libreoffice/default.nix
View File

@ -22,7 +22,7 @@ let
primary-src = import ./default-primary-src.nix { inherit fetchurl; };
in
with { inherit (primary-src) major minor subdir version; };
let inherit (primary-src) major minor subdir version; in
let
lib = stdenv.lib;

2
pkgs/applications/office/libreoffice/still.nix
View File

@ -22,7 +22,7 @@ let
primary-src = import ./still-primary-src.nix { inherit fetchurl; };
in
with { inherit (primary-src) major minor subdir version; };
let inherit (primary-src) major minor subdir version; in
let
lib = stdenv.lib;

2
pkgs/development/libraries/cairo/default.nix
View File

@ -9,7 +9,7 @@
assert glSupport -> mesa_noglu != null;
with { inherit (stdenv.lib) optional optionals; };
let inherit (stdenv.lib) optional optionals; in
stdenv.mkDerivation rec {
name = "cairo-1.14.8";

8
pkgs/development/libraries/freetype/default.nix
View File

@ -9,11 +9,11 @@
useEncumberedCode ? true,
}:
with { inherit (stdenv.lib) optional optionals optionalString; };
let
inherit (stdenv.lib) optional optionals optionalString;
version = "2.7.1"; name = "freetype-" + version;
let version = "2.7.1"; name = "freetype-" + version; in
stdenv.mkDerivation {
in stdenv.mkDerivation {
inherit name;
meta = with stdenv.lib; {

2
pkgs/development/libraries/gmp/5.1.x.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, m4, cxx ? true, withStatic ? true }:
with { inherit (stdenv.lib) optional optionalString; };
let inherit (stdenv.lib) optional optionalString; in
let self = stdenv.mkDerivation rec {
name = "gmp-5.1.3";

2
pkgs/development/libraries/gmp/6.x.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, m4, cxx ? true, withStatic ? false }:
with { inherit (stdenv.lib) optional optionalString; };
let inherit (stdenv.lib) optional optionalString; in
let self = stdenv.mkDerivation rec {
name = "gmp-6.1.1";

2
pkgs/development/libraries/libav/default.nix
View File

@ -17,7 +17,7 @@
assert faacSupport -> enableUnfree;
with { inherit (stdenv.lib) optional optionals hasPrefix; };
let inherit (stdenv.lib) optional optionals hasPrefix; in
/* ToDo:
- more deps, inspiration: http://packages.ubuntu.com/raring/libav-tools

2
pkgs/development/libraries/libgsf/default.nix
View File

@ -1,7 +1,7 @@
{ fetchurl, stdenv, pkgconfig, intltool, gettext, glib, libxml2, zlib, bzip2
, python, perl, gdk_pixbuf, libiconv, libintlOrEmpty }:
with { inherit (stdenv.lib) optionals; };
let inherit (stdenv.lib) optionals; in
stdenv.mkDerivation rec {
name = "libgsf-1.14.41";

2
pkgs/development/libraries/nghttp2/default.nix
View File

@ -13,7 +13,7 @@ assert enableAsioLib -> boost != null;
assert enableGetAssets -> libxml2 != null;
assert enableJemalloc -> jemalloc != null;
with { inherit (stdenv.lib) optional; };
let inherit (stdenv.lib) optional; in
stdenv.mkDerivation rec {
name = "nghttp2-${version}";

2
pkgs/development/mobile/androidenv/androidsdk.nix
View File

@ -7,7 +7,7 @@
}:
{ platformVersions, abiVersions, useGoogleAPIs, useExtraSupportLibs ? false, useGooglePlayServices ? false }:
with { inherit (stdenv.lib) makeLibraryPath; };
let inherit (stdenv.lib) makeLibraryPath; in
stdenv.mkDerivation rec {
name = "android-sdk-${version}";

2
pkgs/development/tools/misc/binutils/default.nix
View File

@ -4,7 +4,7 @@
let basename = "binutils-2.28"; in
with { inherit (stdenv.lib) optional optionals optionalString; };
let inherit (stdenv.lib) optional optionals optionalString; in
stdenv.mkDerivation rec {
name = basename + optionalString (cross != null) "-${cross.config}";

2
pkgs/games/oilrush/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, config, fetchurl, libX11, libXext, libXinerama, libXrandr
, libXrender, fontconfig, freetype, openal }:
with { inherit (stdenv.lib) makeLibraryPath; };
let inherit (stdenv.lib) makeLibraryPath; in
stdenv.mkDerivation {
name = "oilrush";

2
pkgs/servers/coturn/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, openssl, libevent }:
with { inherit (stdenv.lib) optional; };
let inherit (stdenv.lib) optional; in
stdenv.mkDerivation rec {
name = "coturn-${version}";

2
pkgs/servers/dns/knot-dns/default.nix
View File

@ -2,7 +2,7 @@
, systemd, nettle, libedit, zlib, libiconv, fetchpatch
}:
with { inherit (stdenv.lib) optional optionals; };
let inherit (stdenv.lib) optional optionals; in
# Note: ATM only the libraries have been tested in nixpkgs.
stdenv.mkDerivation rec {

2
pkgs/tools/misc/hdf5/default.nix
View File

@ -12,7 +12,7 @@
# (--enable-unsupported could be used to force the build)
assert !cpp || mpi == null;
with { inherit (stdenv.lib) optional optionals; };
let inherit (stdenv.lib) optional optionals; in
stdenv.mkDerivation rec {
version = "1.8.18";