[Nix-commits] [NixOS/nixpkgs] ce56c9: mkDerivation: Don't pass buildInputs to stdenv bui...

2017-04-24 Thread Tuomas Tynkkynen 
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: ce56c99edcbc1b61ec2fc2ccfc7bfc035cbcb99f
  
https://github.com/NixOS/nixpkgs/commit/ce56c99edcbc1b61ec2fc2ccfc7bfc035cbcb99f
  Author: Tuomas Tynkkynen 
  Date:   2017-03-02 (Thu, 02 Mar 2017)

  Changed paths:
M pkgs/stdenv/generic/default.nix
M pkgs/stdenv/generic/setup.sh

  Log Message:
  ---
  mkDerivation: Don't pass buildInputs to stdenv builder in nativeBuildInputs

When not cross compiling, nativeBuildInputs and buildInputs have
identical behaviour. Currently that is implemented by having
mkDerivation do a concatenation of those variables in Nix code and pass
that to the builder via the nativeBuildInputs attribute.

However, that has some annoying side effects, like `foo.buildInputs`
evaluating to `[ ]` even if buildInputs were specified in the nix
expression for foo.

Instead, pass buildInputs and nativeBuildInputs in separate variables as
usual, and move the logic of cross compilation vs. native compilation to
the stdenv builder script. This is probably a tiny bit uglier but
fixes the previous problem.

Issue #4855.


  Commit: 9896cf10289628a2098cd99bdd96cfb092916b27
  
https://github.com/NixOS/nixpkgs/commit/9896cf10289628a2098cd99bdd96cfb092916b27
  Author: Daiderd Jordan 
  Date:   2017-04-04 (Tue, 04 Apr 2017)

  Changed paths:
M pkgs/development/compilers/gcc/5/default.nix
M pkgs/development/compilers/gcc/builder.sh

  Log Message:
  ---
  gcc: include dylibs for darwin build


  Commit: e7c76d3c25883139f4c86b2afb181868b074ded7
  
https://github.com/NixOS/nixpkgs/commit/e7c76d3c25883139f4c86b2afb181868b074ded7
  Author: Nikolay Amiantov 
  Date:   2017-04-12 (Wed, 12 Apr 2017)

  Changed paths:
M pkgs/build-support/setup-hooks/make-wrapper.sh

  Log Message:
  ---
  makeWrapper: search for free unwrapped file name


  Commit: 60e0130ea1e3451cd12493e49b209f0208806c01
  
https://github.com/NixOS/nixpkgs/commit/60e0130ea1e3451cd12493e49b209f0208806c01
  Author: Nikolay Amiantov 
  Date:   2017-04-12 (Wed, 12 Apr 2017)

  Changed paths:
M pkgs/tools/bluetooth/blueman/default.nix

  Log Message:
  ---
  blueman: use wrapGAppsHook


  Commit: 124e5dd3eb9e3e8fe322d3c62e4501b2043ac898
  
https://github.com/NixOS/nixpkgs/commit/124e5dd3eb9e3e8fe322d3c62e4501b2043ac898
  Author: Nikolay Amiantov 
  Date:   2017-04-13 (Thu, 13 Apr 2017)

  Changed paths:
M pkgs/applications/networking/browsers/qutebrowser/default.nix

  Log Message:
  ---
  qutebrowser: cleanup wrappers


  Commit: 1a1f2262b4a4e44f5540766dfcf5fd3bfca0e64d
  
https://github.com/NixOS/nixpkgs/commit/1a1f2262b4a4e44f5540766dfcf5fd3bfca0e64d
  Author: Vladimír Čunát 
  Date:   2017-04-14 (Fri, 14 Apr 2017)

  Changed paths:
M pkgs/development/compilers/gcc/5/default.nix
M pkgs/development/compilers/gcc/builder.sh

  Log Message:
  ---
  Merge #24637: gcc: include dylibs for darwin build


  Commit: f3ceb764e40dfcf0fde5d461a3b95e8a97b022b8
  
https://github.com/NixOS/nixpkgs/commit/f3ceb764e40dfcf0fde5d461a3b95e8a97b022b8
  Author: Vladimír Čunát 
  Date:   2017-04-14 (Fri, 14 Apr 2017)

  Changed paths:
M pkgs/stdenv/generic/default.nix
M pkgs/stdenv/generic/setup.sh

  Log Message:
  ---
  Merge #23374: mkDerivation: simplify non-cross builds

Don't pass buildInputs to stdenv builder in nativeBuildInputs.


  Commit: aeb056095947812bf732b00b5f0cc43b495b2a86
  
https://github.com/NixOS/nixpkgs/commit/aeb056095947812bf732b00b5f0cc43b495b2a86
  Author: Vladimír Čunát 
  Date:   2017-04-14 (Fri, 14 Apr 2017)

  Changed paths:
M pkgs/applications/networking/browsers/qutebrowser/default.nix
M pkgs/build-support/setup-hooks/make-wrapper.sh
M pkgs/tools/bluetooth/blueman/default.nix

  Log Message:
  ---
  Merge #24858: Smart wrapProgram


  Commit: 878bbaf4e9d49c251d90f0790d2e7ebcf622ddd0
  
https://github.com/NixOS/nixpkgs/commit/878bbaf4e9d49c251d90f0790d2e7ebcf622ddd0
  Author: Vladimír Čunát 
  Date:   2017-04-14 (Fri, 14 Apr 2017)

  Changed paths:
M pkgs/development/libraries/glib/default.nix

  Log Message:
  ---
  glib: 2.50.3 -> 2.52.1


  Commit: f7a4f146c9fd64966f57040603a897857a14df94
  
https://github.com/NixOS/nixpkgs/commit/f7a4f146c9fd64966f57040603a897857a14df94
  Author: Vladimír Čunát 
  Date:   2017-04-14 (Fri, 14 Apr 2017)

  Changed paths:
M lib/default.nix
M lib/licenses.nix
M lib/tests.nix
M lib/trivial.nix
M nixos/doc/manual/release-notes/rl-1709.xml
M nixos/maintainers/scripts/gce/create-gce.sh
M nixos/modules/config/fonts/fontconfig-penultimate.nix
M nixos/modules/config/fonts/fontconfig.nix
M nixos/modules/security/acme.nix
M

[Nix-commits] [NixOS/nixpkgs] ce56c9: mkDerivation: Don't pass buildInputs to stdenv bui...

2017-04-14 Thread Vladimír Čunát 
  Branch: refs/heads/staging
  Home:   https://github.com/NixOS/nixpkgs
  Commit: ce56c99edcbc1b61ec2fc2ccfc7bfc035cbcb99f
  
https://github.com/NixOS/nixpkgs/commit/ce56c99edcbc1b61ec2fc2ccfc7bfc035cbcb99f
  Author: Tuomas Tynkkynen 
  Date:   2017-03-02 (Thu, 02 Mar 2017)

  Changed paths:
M pkgs/stdenv/generic/default.nix
M pkgs/stdenv/generic/setup.sh

  Log Message:
  ---
  mkDerivation: Don't pass buildInputs to stdenv builder in nativeBuildInputs

When not cross compiling, nativeBuildInputs and buildInputs have
identical behaviour. Currently that is implemented by having
mkDerivation do a concatenation of those variables in Nix code and pass
that to the builder via the nativeBuildInputs attribute.

However, that has some annoying side effects, like `foo.buildInputs`
evaluating to `[ ]` even if buildInputs were specified in the nix
expression for foo.

Instead, pass buildInputs and nativeBuildInputs in separate variables as
usual, and move the logic of cross compilation vs. native compilation to
the stdenv builder script. This is probably a tiny bit uglier but
fixes the previous problem.

Issue #4855.


  Commit: 9896cf10289628a2098cd99bdd96cfb092916b27
  
https://github.com/NixOS/nixpkgs/commit/9896cf10289628a2098cd99bdd96cfb092916b27
  Author: Daiderd Jordan 
  Date:   2017-04-04 (Tue, 04 Apr 2017)

  Changed paths:
M pkgs/development/compilers/gcc/5/default.nix
M pkgs/development/compilers/gcc/builder.sh

  Log Message:
  ---
  gcc: include dylibs for darwin build


  Commit: e7c76d3c25883139f4c86b2afb181868b074ded7
  
https://github.com/NixOS/nixpkgs/commit/e7c76d3c25883139f4c86b2afb181868b074ded7
  Author: Nikolay Amiantov 
  Date:   2017-04-12 (Wed, 12 Apr 2017)

  Changed paths:
M pkgs/build-support/setup-hooks/make-wrapper.sh

  Log Message:
  ---
  makeWrapper: search for free unwrapped file name


  Commit: 60e0130ea1e3451cd12493e49b209f0208806c01
  
https://github.com/NixOS/nixpkgs/commit/60e0130ea1e3451cd12493e49b209f0208806c01
  Author: Nikolay Amiantov 
  Date:   2017-04-12 (Wed, 12 Apr 2017)

  Changed paths:
M pkgs/tools/bluetooth/blueman/default.nix

  Log Message:
  ---
  blueman: use wrapGAppsHook


  Commit: 124e5dd3eb9e3e8fe322d3c62e4501b2043ac898
  
https://github.com/NixOS/nixpkgs/commit/124e5dd3eb9e3e8fe322d3c62e4501b2043ac898
  Author: Nikolay Amiantov 
  Date:   2017-04-13 (Thu, 13 Apr 2017)

  Changed paths:
M pkgs/applications/networking/browsers/qutebrowser/default.nix

  Log Message:
  ---
  qutebrowser: cleanup wrappers


  Commit: 1a1f2262b4a4e44f5540766dfcf5fd3bfca0e64d
  
https://github.com/NixOS/nixpkgs/commit/1a1f2262b4a4e44f5540766dfcf5fd3bfca0e64d
  Author: Vladimír Čunát 
  Date:   2017-04-14 (Fri, 14 Apr 2017)

  Changed paths:
M pkgs/development/compilers/gcc/5/default.nix
M pkgs/development/compilers/gcc/builder.sh

  Log Message:
  ---
  Merge #24637: gcc: include dylibs for darwin build


  Commit: f3ceb764e40dfcf0fde5d461a3b95e8a97b022b8
  
https://github.com/NixOS/nixpkgs/commit/f3ceb764e40dfcf0fde5d461a3b95e8a97b022b8
  Author: Vladimír Čunát 
  Date:   2017-04-14 (Fri, 14 Apr 2017)

  Changed paths:
M pkgs/stdenv/generic/default.nix
M pkgs/stdenv/generic/setup.sh

  Log Message:
  ---
  Merge #23374: mkDerivation: simplify non-cross builds

Don't pass buildInputs to stdenv builder in nativeBuildInputs.


  Commit: aeb056095947812bf732b00b5f0cc43b495b2a86
  
https://github.com/NixOS/nixpkgs/commit/aeb056095947812bf732b00b5f0cc43b495b2a86
  Author: Vladimír Čunát 
  Date:   2017-04-14 (Fri, 14 Apr 2017)

  Changed paths:
M pkgs/applications/networking/browsers/qutebrowser/default.nix
M pkgs/build-support/setup-hooks/make-wrapper.sh
M pkgs/tools/bluetooth/blueman/default.nix

  Log Message:
  ---
  Merge #24858: Smart wrapProgram


  Commit: 878bbaf4e9d49c251d90f0790d2e7ebcf622ddd0
  
https://github.com/NixOS/nixpkgs/commit/878bbaf4e9d49c251d90f0790d2e7ebcf622ddd0
  Author: Vladimír Čunát 
  Date:   2017-04-14 (Fri, 14 Apr 2017)

  Changed paths:
M pkgs/development/libraries/glib/default.nix

  Log Message:
  ---
  glib: 2.50.3 -> 2.52.1


Compare: https://github.com/NixOS/nixpkgs/compare/304d30ce3f22...878bbaf4e9d4___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits