[Nix-commits] [NixOS/nixpkgs] c27c1b: neovim-qt: 0.2.1 -> 0.2.3

2016-10-30 Thread Rok Garbas
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: c27c1b2696df39b7f9547dcbe96e75784eaa5d63
  
https://github.com/NixOS/nixpkgs/commit/c27c1b2696df39b7f9547dcbe96e75784eaa5d63
  Author: Rok Garbas 
  Date:   2016-10-30 (Sun, 30 Oct 2016)

  Changed paths:
M pkgs/applications/editors/neovim/qt.nix

  Log Message:
  ---
  neovim-qt: 0.2.1 -> 0.2.3


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 7e4c7d: wpa_supplicant_gui: Add forgotten patch.

2016-10-30 Thread Moritz Ulrich
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 7e4c7d6af04481a13de09939b6ad11103668d79b
  
https://github.com/NixOS/nixpkgs/commit/7e4c7d6af04481a13de09939b6ad11103668d79b
  Author: Moritz Ulrich 
  Date:   2016-10-30 (Sun, 30 Oct 2016)

  Changed paths:
A pkgs/os-specific/linux/wpa_supplicant/remove_inkscape.patch

  Log Message:
  ---
  wpa_supplicant_gui: Add forgotten patch.


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 19bdc3: wpa_supplicant_gui: Replace inkscape with imagemag...

2016-10-30 Thread Moritz Ulrich
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 19bdc31ed6a231f8ba40e89ff3d627ae711ea7dc
  
https://github.com/NixOS/nixpkgs/commit/19bdc31ed6a231f8ba40e89ff3d627ae711ea7dc
  Author: Moritz Ulrich 
  Date:   2016-10-30 (Sun, 30 Oct 2016)

  Changed paths:
M pkgs/os-specific/linux/wpa_supplicant/gui.nix

  Log Message:
  ---
  wpa_supplicant_gui: Replace inkscape with imagemagick in build process.


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 4a1f73: loc: 0.3.0 -> 0.3.3

2016-10-30 Thread Gabriel Ebner
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 4a1f73ab89882542469aa26039085d73c4ec788f
  
https://github.com/NixOS/nixpkgs/commit/4a1f73ab89882542469aa26039085d73c4ec788f
  Author: Gabriel Ebner 
  Date:   2016-10-30 (Sun, 30 Oct 2016)

  Changed paths:
M pkgs/development/misc/loc/default.nix

  Log Message:
  ---
  loc: 0.3.0 -> 0.3.3


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] aef020: rustRegistry: 2016-09-29 -> 2016-10-29

2016-10-30 Thread Gabriel Ebner
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: aef020c232e3f3c693aab8b8930ff871abbe2363
  
https://github.com/NixOS/nixpkgs/commit/aef020c232e3f3c693aab8b8930ff871abbe2363
  Author: c74d <857...@gmail.com>
  Date:   2016-10-29 (Sat, 29 Oct 2016)

  Changed paths:
M pkgs/top-level/rust-packages.nix

  Log Message:
  ---
  rustRegistry: 2016-09-29 -> 2016-10-29

Update the `rustRegistry` package from version 2016-09-29, revision
rust-lang/crates.io-index@12dc47026cadf5aa2823c9d0fdd055b9f2c0f52c, to
version 2016-10-29, revision
rust-lang/crates.io-index@623cc0d9328bfb949b54209443f2b4f06c41961e.

I have tested this patch per nixpkgs manual section 11.1 ("Making
patches").


  Commit: 3a962071af1ba45f4754bbc3c1976c84232d3171
  
https://github.com/NixOS/nixpkgs/commit/3a962071af1ba45f4754bbc3c1976c84232d3171
  Author: Gabriel Ebner 
  Date:   2016-10-30 (Sun, 30 Oct 2016)

  Changed paths:
M pkgs/top-level/rust-packages.nix

  Log Message:
  ---
  Merge pull request #19979 from 8573/8573/pkg/update/rustRegistry/2016-10-29/1

rustRegistry: 2016-09-29 -> 2016-10-29


Compare: https://github.com/NixOS/nixpkgs/compare/75374120ebde...3a962071af1b___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 117697: loc: init at 0.3.0

2016-10-30 Thread Arseniy Seroka
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 1176973ab404a47b5355fc10aa9559df90ffb3ef
  
https://github.com/NixOS/nixpkgs/commit/1176973ab404a47b5355fc10aa9559df90ffb3ef
  Author: Matthias Beyer 
  Date:   2016-10-28 (Fri, 28 Oct 2016)

  Changed paths:
A pkgs/development/misc/loc/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  loc: init at 0.3.0


  Commit: 75374120ebdea11e87f0288d74cc448640565bd1
  
https://github.com/NixOS/nixpkgs/commit/75374120ebdea11e87f0288d74cc448640565bd1
  Author: Arseniy Seroka 
  Date:   2016-10-30 (Sun, 30 Oct 2016)

  Changed paths:
A pkgs/development/misc/loc/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  Merge pull request #19881 from matthiasbeyer/add-loc

loc: init at 0.3.0


Compare: https://github.com/NixOS/nixpkgs/compare/1573858d3720...75374120ebde___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


Re: [Nix-dev] Override php xslSupport config option

2016-10-30 Thread Jookia
On Sun, Oct 30, 2016 at 09:59:20PM +0300, Игорь Пашев wrote:
> Something like this:
> 
> { php70 }: php70.merge {
>   cfg = {
> apxs2Support = false;
> ldapSupport = false;
> mssqlSupport = false;
> pdo_pgsqlSupport = false;
> postgresqlSupport = false;
> sqliteSupport = false;
> xslSupport = false;
>   };
> }
> 
> Use this with nixpkgs.config.packageOverrides

It's really obscure how to use these old-timey .merge{} operations. Maybe it
should be documented somewhere or finally replaced with proper overrides?
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev


Re: [Nix-dev] Override php xslSupport config option

2016-10-30 Thread Игорь Пашев
Something like this:

{ php70 }: php70.merge {
  cfg = {
apxs2Support = false;
ldapSupport = false;
mssqlSupport = false;
pdo_pgsqlSupport = false;
postgresqlSupport = false;
sqliteSupport = false;
xslSupport = false;
  };
}

Use this with nixpkgs.config.packageOverrides

2016-10-30 18:00 GMT+03:00 4levels <4lev...@gmail.com>:
> Hi Nix Devs,
>
> I must be overlooking something obvious here, but I'm failing to enable XSL
> support in PHP.  In this file
> https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/interpreters/php/default.nix
> I see there is a config option cfg.xslSupport which defaults to false.
>
> How can I set this option to true so PHP is built with xsl support?
>
> Kind regards,
>
> Erik
>
> ___
> nix-dev mailing list
> nix-dev@lists.science.uu.nl
> http://lists.science.uu.nl/mailman/listinfo/nix-dev
>
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev


[Nix-commits] [NixOS/nixpkgs] e89c24: pyload change: another patch for missing templates

2016-10-30 Thread Joachim F
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: e89c247d1b1cbd13c7036a17fdcc3a6f2355cb83
  
https://github.com/NixOS/nixpkgs/commit/e89c247d1b1cbd13c7036a17fdcc3a6f2355cb83
  Author: Matthias Herrmann 
  Date:   2016-10-30 (Sun, 30 Oct 2016)

  Changed paths:
M pkgs/applications/networking/pyload/default.nix

  Log Message:
  ---
  pyload change: another patch for missing templates


  Commit: 1573858d3720d2bb31dc0aaf0cbccacf76bd
  
https://github.com/NixOS/nixpkgs/commit/1573858d3720d2bb31dc0aaf0cbccacf76bd
  Author: Joachim F 
  Date:   2016-10-30 (Sun, 30 Oct 2016)

  Changed paths:
M pkgs/applications/networking/pyload/default.nix

  Log Message:
  ---
  Merge pull request #19993 from 2chilled/master

pyload change: another patch for missing templates


Compare: https://github.com/NixOS/nixpkgs/compare/ba252821b1c2...1573858d3720___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] bd7a35: Revert "pyload: add missing parameter"

2016-10-30 Thread Joachim Fasting
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: bd7a3575d72fa380e598ea492828c4fe41d5fbcb
  
https://github.com/NixOS/nixpkgs/commit/bd7a3575d72fa380e598ea492828c4fe41d5fbcb
  Author: Joachim Fasting 
  Date:   2016-10-30 (Sun, 30 Oct 2016)

  Changed paths:
M pkgs/applications/networking/pyload/default.nix

  Log Message:
  ---
  Revert "pyload: add missing parameter"

This reverts commit 9ac269b76f776877ae2544e715ed77a166abcb11.

Ach, I missed https://github.com/NixOS/nixpkgs/pull/19993 which seems
to fix the same issue.


  Commit: ba252821b1c27ccb3981c641cec08300885f2d09
  
https://github.com/NixOS/nixpkgs/commit/ba252821b1c27ccb3981c641cec08300885f2d09
  Author: Joachim Fasting 
  Date:   2016-10-30 (Sun, 30 Oct 2016)

  Changed paths:
M pkgs/applications/networking/pyload/default.nix

  Log Message:
  ---
  Revert "pyload: fix setupPyPatch hash"

This reverts commit 60bd86e27937f97e1d1e5cc9bc51ce08f9d0a81d.

I missed this https://github.com/NixOS/nixpkgs/pull/19993, sorry


Compare: https://github.com/NixOS/nixpkgs/compare/60bd86e27937...ba252821b1c2___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 9ac269: pyload: add missing parameter

2016-10-30 Thread Joachim Fasting
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 9ac269b76f776877ae2544e715ed77a166abcb11
  
https://github.com/NixOS/nixpkgs/commit/9ac269b76f776877ae2544e715ed77a166abcb11
  Author: Joachim Fasting 
  Date:   2016-10-30 (Sun, 30 Oct 2016)

  Changed paths:
M pkgs/applications/networking/pyload/default.nix

  Log Message:
  ---
  pyload: add missing parameter

Ref a22c990e3300dbd776c1b7c25c919784534a024b


  Commit: 60bd86e27937f97e1d1e5cc9bc51ce08f9d0a81d
  
https://github.com/NixOS/nixpkgs/commit/60bd86e27937f97e1d1e5cc9bc51ce08f9d0a81d
  Author: Joachim Fasting 
  Date:   2016-10-30 (Sun, 30 Oct 2016)

  Changed paths:
M pkgs/applications/networking/pyload/default.nix

  Log Message:
  ---
  pyload: fix setupPyPatch hash

Seeing as this never built, this hash mismatch is probably due to a
packaging bug (i.e., having a file with that has in local store, before
switching to a different fetcher).  The patch itself looks okay to me.


Compare: https://github.com/NixOS/nixpkgs/compare/efbec8c4de71...60bd86e27937___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 6ac904: qmidinet: 0.2.1 -> 0.4.1

2016-10-30 Thread zimbatm
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 6ac9046acfa8b4ed8ec0274387c9a116ee342d1a
  
https://github.com/NixOS/nixpkgs/commit/6ac9046acfa8b4ed8ec0274387c9a116ee342d1a
  Author: Bart Brouns 
  Date:   2016-10-30 (Sun, 30 Oct 2016)

  Changed paths:
M pkgs/applications/audio/qmidinet/default.nix

  Log Message:
  ---
  qmidinet: 0.2.1 -> 0.4.1


  Commit: efbec8c4de71fd793464de09cac79c63cb602ec2
  
https://github.com/NixOS/nixpkgs/commit/efbec8c4de71fd793464de09cac79c63cb602ec2
  Author: zimbatm 
  Date:   2016-10-30 (Sun, 30 Oct 2016)

  Changed paths:
M pkgs/applications/audio/qmidinet/default.nix

  Log Message:
  ---
  Merge pull request #15138 from magnetophon/qmidinet

qmidinet: 0.2.1 -> 0.4.1


Compare: https://github.com/NixOS/nixpkgs/compare/3be635b9b531...efbec8c4de71___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] e89366: Merge linux kernel maintenance updates

2016-10-30 Thread Vladimír Čunát
  Branch: refs/heads/release-16.09
  Home:   https://github.com/NixOS/nixpkgs
  Commit: e89366315b351554f842e973faa0d96a510e3ae3
  
https://github.com/NixOS/nixpkgs/commit/e89366315b351554f842e973faa0d96a510e3ae3
  Author: Vladimír Čunát 
  Date:   2016-10-30 (Sun, 30 Oct 2016)

  Changed paths:
M pkgs/os-specific/linux/kernel/linux-4.4.nix
M pkgs/os-specific/linux/kernel/linux-4.8.nix
M pkgs/os-specific/linux/kernel/linux-testing.nix

  Log Message:
  ---
  Merge linux kernel maintenance updates

PRs: #19995 #19996 #19997
(cherry picked from commit 3be635b9b531b9e9cf07e0cd805e82a127cfdf6b)


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 807343: linux: 4.8.4 -> 4.8.5

2016-10-30 Thread Vladimír Čunát
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 8073430d95450c1155910cf67c00bbd6e9c69fc6
  
https://github.com/NixOS/nixpkgs/commit/8073430d95450c1155910cf67c00bbd6e9c69fc6
  Author: Tim Steinbach 
  Date:   2016-10-30 (Sun, 30 Oct 2016)

  Changed paths:
M pkgs/os-specific/linux/kernel/linux-4.8.nix

  Log Message:
  ---
  linux: 4.8.4 -> 4.8.5


  Commit: 1af5b2a80c48d3536585a784baf8b7d73c70868d
  
https://github.com/NixOS/nixpkgs/commit/1af5b2a80c48d3536585a784baf8b7d73c70868d
  Author: Tim Steinbach 
  Date:   2016-10-30 (Sun, 30 Oct 2016)

  Changed paths:
M pkgs/os-specific/linux/kernel/linux-4.4.nix

  Log Message:
  ---
  linux: 4.4.27 -> 4.4.28


  Commit: f154459cf4238ad421892980fb16b20238318ca1
  
https://github.com/NixOS/nixpkgs/commit/f154459cf4238ad421892980fb16b20238318ca1
  Author: Tim Steinbach 
  Date:   2016-10-30 (Sun, 30 Oct 2016)

  Changed paths:
M pkgs/os-specific/linux/kernel/linux-testing.nix

  Log Message:
  ---
  linux: 4.9-rc2 -> 4.9-rc3


  Commit: 3be635b9b531b9e9cf07e0cd805e82a127cfdf6b
  
https://github.com/NixOS/nixpkgs/commit/3be635b9b531b9e9cf07e0cd805e82a127cfdf6b
  Author: Vladimír Čunát 
  Date:   2016-10-30 (Sun, 30 Oct 2016)

  Changed paths:
M pkgs/os-specific/linux/kernel/linux-4.4.nix
M pkgs/os-specific/linux/kernel/linux-4.8.nix
M pkgs/os-specific/linux/kernel/linux-testing.nix

  Log Message:
  ---
  Merge linux kernel maintenance updates

PRs: #19995 #19996 #19997


Compare: https://github.com/NixOS/nixpkgs/compare/c1b0ec526683...3be635b9b531___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/hydra] 3c8f00: Clean up unused images (#404)

2016-10-30 Thread Graham Christensen
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/hydra
  Commit: 3c8f00c76f85747bcdffe1f6ecf3b48d7eef528f
  
https://github.com/NixOS/hydra/commit/3c8f00c76f85747bcdffe1f6ecf3b48d7eef528f
  Author: Graham Christensen 
  Date:   2016-10-30 (Sun, 30 Oct 2016)

  Changed paths:
R src/root/static/images/arrow-down.gif
R src/root/static/images/arrow-right-active.gif
R src/root/static/images/arrow-right.gif
R src/root/static/images/failure-some.gif
R src/root/static/images/failure.gif
R src/root/static/images/information_128.png
R src/root/static/images/information_256.png
R src/root/static/images/information_32.png
R src/root/static/images/information_64.png
R src/root/static/images/persona_sign_in_blue.png
R src/root/static/images/question-mark.png
R src/root/static/images/success.gif

  Log Message:
  ---
  Clean up unused images (#404)

* Drop information_{32,64,128,256}.png because it appears to be unused.

* Delete unused images


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] c1b0ec: android-udev-rules: 20160805 -> 20161014

2016-10-30 Thread Jörg Thalheim
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: c1b0ec526683ec55a28816b8a52f8436e9321fe8
  
https://github.com/NixOS/nixpkgs/commit/c1b0ec526683ec55a28816b8a52f8436e9321fe8
  Author: Jörg Thalheim 
  Date:   2016-10-30 (Sun, 30 Oct 2016)

  Changed paths:
M pkgs/os-specific/linux/android-udev-rules/default.nix

  Log Message:
  ---
  android-udev-rules: 20160805 -> 20161014


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 4df3bb: store-0.3: Build with the right version of store-c...

2016-10-30 Thread Shea Levy
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 4df3bb7e08f06bc1097ffa10e72a7e33345e0d71
  
https://github.com/NixOS/nixpkgs/commit/4df3bb7e08f06bc1097ffa10e72a7e33345e0d71
  Author: Shea Levy 
  Date:   2016-10-30 (Sun, 30 Oct 2016)

  Changed paths:
M pkgs/development/haskell-modules/configuration-common.nix

  Log Message:
  ---
  store-0.3: Build with the right version of store-core


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-dev] Override php xslSupport config option

2016-10-30 Thread 4levels
Hi Nix Devs,

I must be overlooking something obvious here, but I'm failing to enable XSL
support in PHP.  In this file
https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/interpreters/php/default.nix
I
see there is a config option cfg.xslSupport which defaults to false.

How can I set this option to true so PHP is built with xsl support?

Kind regards,

Erik
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev


[Nix-commits] [NixOS/nixpkgs] b65c44: pythonPackage.tweepy: disabling tests

2016-10-30 Thread Rok Garbas
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: b65c443276322bbce688c89bca91b24900ec8626
  
https://github.com/NixOS/nixpkgs/commit/b65c443276322bbce688c89bca91b24900ec8626
  Author: Rok Garbas 
  Date:   2016-10-30 (Sun, 30 Oct 2016)

  Changed paths:
M pkgs/top-level/python-packages.nix

  Log Message:
  ---
  pythonPackage.tweepy: disabling tests

tests require access to twitter.com api, fixes #19987


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] e80a6d: mpw: build from github to fix segfault

2016-10-30 Thread Jude Taylor
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: e80a6dc62b33ca18ea6fbce777ee3b6abcf17ce8
  
https://github.com/NixOS/nixpkgs/commit/e80a6dc62b33ca18ea6fbce777ee3b6abcf17ce8
  Author: Jude Taylor 
  Date:   2016-10-30 (Sun, 30 Oct 2016)

  Changed paths:
M pkgs/tools/security/mpw/default.nix

  Log Message:
  ---
  mpw: build from github to fix segfault


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] db537e: opensmtpd service: fix evaluation error caused by ...

2016-10-30 Thread Aristid Breitkreuz
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: db537ed87d5620d4b1be5a8ff77dbb9ab645ef47
  
https://github.com/NixOS/nixpkgs/commit/db537ed87d5620d4b1be5a8ff77dbb9ab645ef47
  Author: Aristid Breitkreuz 
  Date:   2016-10-30 (Sun, 30 Oct 2016)

  Changed paths:
M nixos/modules/services/mail/opensmtpd.nix

  Log Message:
  ---
  opensmtpd service: fix evaluation error caused by Joachim's refactoring


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 39b64b: mkDerivation: add overrideAttrs function

2016-10-30 Thread Domen Kožar
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 39b64b52ed349bb7b6f26f50013335d76d1605f6
  
https://github.com/NixOS/nixpkgs/commit/39b64b52ed349bb7b6f26f50013335d76d1605f6
  Author: Aneesh Agrawal 
  Date:   2016-10-02 (Sun, 02 Oct 2016)

  Changed paths:
M doc/functions.xml
M lib/customisation.nix
M pkgs/stdenv/generic/default.nix

  Log Message:
  ---
  mkDerivation: add overrideAttrs function

This is similar to `overrideDerivation`, but overrides the arguments to
`mkDerivation` instead of the underlying `derivation` call.

Also update `makeOverridable` so that uses of `overrideAttrs` can be
followed by `override` and `overrideDerivation`, i.e. they can be
mix-and-matched.


  Commit: 62edf873aad11ffd4acc95026a416eaa37fc42ec
  
https://github.com/NixOS/nixpkgs/commit/62edf873aad11ffd4acc95026a416eaa37fc42ec
  Author: Domen Kožar 
  Date:   2016-10-30 (Sun, 30 Oct 2016)

  Changed paths:
M doc/functions.xml
M lib/customisation.nix
M pkgs/stdenv/generic/default.nix

  Log Message:
  ---
  Merge pull request #18660 from aneeshusa/add-override-attrs

mkDerivation: add overrideAttrs function


Compare: https://github.com/NixOS/nixpkgs/compare/9ca0521099ab...62edf873aad1___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits