diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-07-21 15:41:22 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-21 15:41:22 +0100 |
commit | 218298b30fe79be30716438a1906d1abd61b9377 (patch) | |
tree | 65e0041ee5468689142d669c4c4fc4f73f3618ba /pkgs/development/compilers | |
parent | cd6e2c9642b8e608c905f350cece21141435deef (diff) | |
parent | e85db6863a546cfdde0150f03ed0d2db28992575 (diff) | |
download | nixpkgs-218298b30fe79be30716438a1906d1abd61b9377.tar nixpkgs-218298b30fe79be30716438a1906d1abd61b9377.tar.gz nixpkgs-218298b30fe79be30716438a1906d1abd61b9377.tar.bz2 nixpkgs-218298b30fe79be30716438a1906d1abd61b9377.tar.lz nixpkgs-218298b30fe79be30716438a1906d1abd61b9377.tar.xz nixpkgs-218298b30fe79be30716438a1906d1abd61b9377.tar.zst nixpkgs-218298b30fe79be30716438a1906d1abd61b9377.zip |
Merge branch 'master' into unused5
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r-- | pkgs/development/compilers/go/1.10.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/go/1.9.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/ocaml/ber-metaocaml-104.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/rust/binaryBuild.nix | 3 | ||||
-rw-r--r-- | pkgs/development/compilers/rust/rustc.nix | 2 |
5 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix index 272c953af7a..513d0307f6b 100644 --- a/pkgs/development/compilers/go/1.10.nix +++ b/pkgs/development/compilers/go/1.10.nix @@ -6,7 +6,7 @@ let - inherit (stdenv.lib) optional optionals optionalString; + inherit (stdenv.lib) optionals optionalString; clangHack = writeScriptBin "clang" '' #!${stdenv.shell} diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix index cbaa427c827..d46e40f460b 100644 --- a/pkgs/development/compilers/go/1.9.nix +++ b/pkgs/development/compilers/go/1.9.nix @@ -6,7 +6,7 @@ let - inherit (stdenv.lib) optional optionals optionalString; + inherit (stdenv.lib) optionals optionalString; clangHack = writeScriptBin "clang" '' #!${stdenv.shell} diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix b/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix index e084a2dcf94..e6c68894036 100644 --- a/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix +++ b/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix @@ -2,7 +2,7 @@ let useX11 = stdenv.isi686 || stdenv.isx86_64; - inherit (stdenv.lib) optionals optionalString; + inherit (stdenv.lib) optionals; in stdenv.mkDerivation rec { diff --git a/pkgs/development/compilers/rust/binaryBuild.nix b/pkgs/development/compilers/rust/binaryBuild.nix index 3cf6d4efe2d..488d43a6fea 100644 --- a/pkgs/development/compilers/rust/binaryBuild.nix +++ b/pkgs/development/compilers/rust/binaryBuild.nix @@ -6,8 +6,7 @@ }: let - inherit (stdenv.lib) getLib optionalString; - inherit (darwin) libiconv; + inherit (stdenv.lib) optionalString; inherit (darwin.apple_sdk.frameworks) Security; bootstrapping = versionType == "bootstrap"; diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index b0dae9d2042..f3f9e2f57b7 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -13,7 +13,7 @@ , doCheck ? true , broken ? false , buildPlatform, hostPlatform -} @ args: +}: let inherit (stdenv.lib) optional optionalString; |