[Nix-commits] [NixOS/nixpkgs] 08ebb4: adb: init module

2016-11-02 Thread Franz Pletz
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 08ebb422c52c61190346f5289f7e918a8fd7f115
  
https://github.com/NixOS/nixpkgs/commit/08ebb422c52c61190346f5289f7e918a8fd7f115
  Author: Jörg Thalheim 
  Date:   2016-10-31 (Mon, 31 Oct 2016)

  Changed paths:
M nixos/modules/module-list.nix
A nixos/modules/programs/adb.nix

  Log Message:
  ---
  adb: init module


  Commit: 8085aff31572ad6180cd810387f2cbb0a28fd4ec
  
https://github.com/NixOS/nixpkgs/commit/8085aff31572ad6180cd810387f2cbb0a28fd4ec
  Author: Franz Pletz 
  Date:   2016-11-03 (Thu, 03 Nov 2016)

  Changed paths:
M nixos/modules/module-list.nix
A nixos/modules/programs/adb.nix

  Log Message:
  ---
  Merge pull request #20015 from Mic92/adb

adb: init module


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


[Nix-commits] [NixOS/nixpkgs] a29900: memcached: 1.4.20 -> 1.4.33

2016-11-02 Thread Franz Pletz
  Branch: refs/heads/release-16.09
  Home:   https://github.com/NixOS/nixpkgs
  Commit: a29900e76335b4806cbfa917e5db93637a274fee
  
https://github.com/NixOS/nixpkgs/commit/a29900e76335b4806cbfa917e5db93637a274fee
  Author: Franz Pletz 
  Date:   2016-11-03 (Thu, 03 Nov 2016)

  Changed paths:
M pkgs/servers/memcached/default.nix

  Log Message:
  ---
  memcached: 1.4.20 -> 1.4.33

Fixes:

  - CVE-2016-8704
  - CVE-2016-8705
  - CVE-2016-8706

Closes #20079.

cc #20078

(cherry picked from commit a94bd88d7af53b2052035a76eaf474047a5ac614)


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


[Nix-commits] [NixOS/nixpkgs] a94bd8: memcached: 1.4.20 -> 1.4.33

2016-11-02 Thread Franz Pletz
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: a94bd88d7af53b2052035a76eaf474047a5ac614
  
https://github.com/NixOS/nixpkgs/commit/a94bd88d7af53b2052035a76eaf474047a5ac614
  Author: Franz Pletz 
  Date:   2016-11-03 (Thu, 03 Nov 2016)

  Changed paths:
M pkgs/servers/memcached/default.nix

  Log Message:
  ---
  memcached: 1.4.20 -> 1.4.33

Fixes:

  - CVE-2016-8704
  - CVE-2016-8705
  - CVE-2016-8706

Closes #20079.

cc #20078


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


[Nix-commits] [NixOS/nixpkgs] cf35c0: vsftpd service: add extraConfig option, set anon_r...

2016-11-02 Thread Peter J. Jones
  Branch: refs/heads/release-16.09
  Home:   https://github.com/NixOS/nixpkgs
  Commit: cf35c00e84d272c7a8d615eb6bfc35bc0076652e
  
https://github.com/NixOS/nixpkgs/commit/cf35c00e84d272c7a8d615eb6bfc35bc0076652e
  Author: Peter J. Jones 
  Date:   2016-11-03 (Thu, 03 Nov 2016)

  Changed paths:
M nixos/modules/services/networking/vsftpd.nix

  Log Message:
  ---
  vsftpd service: add extraConfig option, set anon_root (#20069)

This commit includes two changes:

  1. A new `extraConfig` option to allow administrators to set any
 vsftpd configuration option that isn't directly supported by this
 derivation.

  2. Correctly set the `anon_root` vsftpd option to `anonymousUserHome`
(cherry picked from commit d19967bf48c5605cb984b0f15863f013043c8ad9)


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


[Nix-commits] [NixOS/nixpkgs] d19967: vsftpd service: add extraConfig option, set anon_r...

2016-11-02 Thread Peter J. Jones
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: d19967bf48c5605cb984b0f15863f013043c8ad9
  
https://github.com/NixOS/nixpkgs/commit/d19967bf48c5605cb984b0f15863f013043c8ad9
  Author: Peter J. Jones 
  Date:   2016-11-03 (Thu, 03 Nov 2016)

  Changed paths:
M nixos/modules/services/networking/vsftpd.nix

  Log Message:
  ---
  vsftpd service: add extraConfig option, set anon_root (#20069)

This commit includes two changes:

  1. A new `extraConfig` option to allow administrators to set any
 vsftpd configuration option that isn't directly supported by this
 derivation.

  2. Correctly set the `anon_root` vsftpd option to `anonymousUserHome`


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


[Nix-commits] [NixOS/nixpkgs] 7fd38d: znc module: optionSet -> submodule (#20096)

2016-11-02 Thread Eric Sagnes
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 7fd38dc8b32d12236c7b82f401d21dbd9d62e9fd
  
https://github.com/NixOS/nixpkgs/commit/7fd38dc8b32d12236c7b82f401d21dbd9d62e9fd
  Author: Eric Sagnes 
  Date:   2016-11-03 (Thu, 03 Nov 2016)

  Changed paths:
M nixos/modules/services/networking/znc.nix

  Log Message:
  ---
  znc module: optionSet -> submodule (#20096)


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


[Nix-commits] [NixOS/nixpkgs] 5d6eaa: screenfetch: add bc dependency (#20097)

2016-11-02 Thread Eric Sagnes
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 5d6eaaa179ed03426734c08a24deb2523c945459
  
https://github.com/NixOS/nixpkgs/commit/5d6eaaa179ed03426734c08a24deb2523c945459
  Author: Eric Sagnes 
  Date:   2016-11-03 (Thu, 03 Nov 2016)

  Changed paths:
M pkgs/tools/misc/screenfetch/default.nix

  Log Message:
  ---
  screenfetch: add bc dependency (#20097)


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


[Nix-commits] [NixOS/nixpkgs] 66a259: maintainers: add rbasso

2016-11-02 Thread Franz Pletz
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 66a25908debec9e306bdea3f07a1ff8a01012822
  
https://github.com/NixOS/nixpkgs/commit/66a25908debec9e306bdea3f07a1ff8a01012822
  Author: rbasso 
  Date:   2016-11-03 (Thu, 03 Nov 2016)

  Changed paths:
M lib/maintainers.nix

  Log Message:
  ---
  maintainers: add rbasso


  Commit: fa46c22354a4461c9fab41b28ac427ec21c14c71
  
https://github.com/NixOS/nixpkgs/commit/fa46c22354a4461c9fab41b28ac427ec21c14c71
  Author: rbasso 
  Date:   2016-11-03 (Thu, 03 Nov 2016)

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

  Log Message:
  ---
  exercism: init at 2.3.0


  Commit: 9b3da616288a8833b397f24badb9068c1c135247
  
https://github.com/NixOS/nixpkgs/commit/9b3da616288a8833b397f24badb9068c1c135247
  Author: Franz Pletz 
  Date:   2016-11-03 (Thu, 03 Nov 2016)

  Changed paths:
M lib/maintainers.nix
A pkgs/applications/misc/exercism/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  Merge pull request #20106 from rbasso/exercism-init-at-2.3.0

exercism: init at 2.3.0


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


[Nix-commits] [NixOS/nixpkgs] 7668d3: styx: 0.2.0 -> 0.3.1 (#20118)

2016-11-02 Thread Eric Sagnes
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 7668d3e69bd546a16738c6490cfe02b1f9d4e80b
  
https://github.com/NixOS/nixpkgs/commit/7668d3e69bd546a16738c6490cfe02b1f9d4e80b
  Author: Eric Sagnes 
  Date:   2016-11-03 (Thu, 03 Nov 2016)

  Changed paths:
M pkgs/applications/misc/styx/default.nix

  Log Message:
  ---
  styx: 0.2.0 -> 0.3.1 (#20118)


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


[Nix-commits] [NixOS/nixpkgs] 3b42bf: groonga: 6.0.9 -> 6.1.0 (#20119)

2016-11-02 Thread Eric Sagnes
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 3b42bfa77e11e4618523702601c948ac358a6748
  
https://github.com/NixOS/nixpkgs/commit/3b42bfa77e11e4618523702601c948ac358a6748
  Author: Eric Sagnes 
  Date:   2016-11-03 (Thu, 03 Nov 2016)

  Changed paths:
M pkgs/servers/search/groonga/default.nix

  Log Message:
  ---
  groonga: 6.0.9 -> 6.1.0 (#20119)

release notes: http://groonga.org/en/blog/2016/10/29/groonga-6.1.0.html


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


[Nix-commits] [NixOS/nixpkgs] 826a5d: cairo: add patch to fix CVE-2016-9082

2016-11-02 Thread Franz Pletz
  Branch: refs/heads/release-16.09
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 826a5d7aa1899c4a3ed8bb5e207d4c4c3d574a33
  
https://github.com/NixOS/nixpkgs/commit/826a5d7aa1899c4a3ed8bb5e207d4c4c3d574a33
  Author: Franz Pletz 
  Date:   2016-11-03 (Thu, 03 Nov 2016)

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

  Log Message:
  ---
  cairo: add patch to fix CVE-2016-9082

cc #20078

(cherry picked from commit 2b2f2733757922c0ea1fd2312662dc0442b59637)


  Commit: 924230d126a7c59d8423509cd8556558269f9316
  
https://github.com/NixOS/nixpkgs/commit/924230d126a7c59d8423509cd8556558269f9316
  Author: Franz Pletz 
  Date:   2016-11-03 (Thu, 03 Nov 2016)

  Changed paths:
A pkgs/applications/virtualization/qemu/CVE-2016-9102.patch
M pkgs/applications/virtualization/qemu/default.nix

  Log Message:
  ---
  qemu: add patches to fix lots of CVEs

Patches from Debian and upstream git repo.

Fixes:

 * CVE-2016-6836
 * CVE-2016-7155
 * CVE-2016-7156
 * CVE-2016-7157
 * CVE-2016-7421
 * CVE-2016-7422
 * CVE-2016-7423
 * CVE-2016-7466
 * CVE-2016-8909
 * CVE-2016-8910
 * CVE-2016-9102
 * CVE-2016-9103
 * CVE-2016-9104
 * CVE-2016-9105
 * CVE-2016-9106

cc #20078

(cherry picked from commit 25c01931bb52bd2bc42b0bb017bd991236abd4fd)


  Commit: eb653d96201b21d1e062191bea116c4996a6051b
  
https://github.com/NixOS/nixpkgs/commit/eb653d96201b21d1e062191bea116c4996a6051b
  Author: Franz Pletz 
  Date:   2016-11-03 (Thu, 03 Nov 2016)

  Changed paths:
M pkgs/applications/graphics/graphicsmagick/default.nix

  Log Message:
  ---
  graphicsmagick: add patches to fix 3 CVEs

Fixes CVE-2016-8682, CVE-2016-8683, CVE-2016-8684.

cc #20078

(cherry picked from commit 04db88d2474431417ed3c9276f3078c69a125af6)


  Commit: d158206bf4d1d7b5512c2bd5b8f8677b10f1ba14
  
https://github.com/NixOS/nixpkgs/commit/d158206bf4d1d7b5512c2bd5b8f8677b10f1ba14
  Author: Franz Pletz 
  Date:   2016-11-03 (Thu, 03 Nov 2016)

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

  Log Message:
  ---
  libxml2: add patch to fix CVE-2016-4658

cc #20078

(cherry picked from commit 64902aebb0dbc839a3bfd52f65a024b4e7a77e6c)


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


[Nix-commits] [NixOS/nixpkgs] 2b2f27: cairo: add patch to fix CVE-2016-9082

2016-11-02 Thread Franz Pletz
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 2b2f2733757922c0ea1fd2312662dc0442b59637
  
https://github.com/NixOS/nixpkgs/commit/2b2f2733757922c0ea1fd2312662dc0442b59637
  Author: Franz Pletz 
  Date:   2016-11-03 (Thu, 03 Nov 2016)

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

  Log Message:
  ---
  cairo: add patch to fix CVE-2016-9082

cc #20078


  Commit: 25c01931bb52bd2bc42b0bb017bd991236abd4fd
  
https://github.com/NixOS/nixpkgs/commit/25c01931bb52bd2bc42b0bb017bd991236abd4fd
  Author: Franz Pletz 
  Date:   2016-11-03 (Thu, 03 Nov 2016)

  Changed paths:
A pkgs/applications/virtualization/qemu/CVE-2016-9102.patch
M pkgs/applications/virtualization/qemu/default.nix

  Log Message:
  ---
  qemu: add patches to fix lots of CVEs

Patches from Debian and upstream git repo.

Fixes:

 * CVE-2016-6836
 * CVE-2016-7155
 * CVE-2016-7156
 * CVE-2016-7157
 * CVE-2016-7421
 * CVE-2016-7422
 * CVE-2016-7423
 * CVE-2016-7466
 * CVE-2016-8909
 * CVE-2016-8910
 * CVE-2016-9102
 * CVE-2016-9103
 * CVE-2016-9104
 * CVE-2016-9105
 * CVE-2016-9106

cc #20078


  Commit: 04db88d2474431417ed3c9276f3078c69a125af6
  
https://github.com/NixOS/nixpkgs/commit/04db88d2474431417ed3c9276f3078c69a125af6
  Author: Franz Pletz 
  Date:   2016-11-03 (Thu, 03 Nov 2016)

  Changed paths:
M pkgs/applications/graphics/graphicsmagick/default.nix

  Log Message:
  ---
  graphicsmagick: add patches to fix 3 CVEs

Fixes CVE-2016-8682, CVE-2016-8683, CVE-2016-8684.

cc #20078


  Commit: 64902aebb0dbc839a3bfd52f65a024b4e7a77e6c
  
https://github.com/NixOS/nixpkgs/commit/64902aebb0dbc839a3bfd52f65a024b4e7a77e6c
  Author: Franz Pletz 
  Date:   2016-11-03 (Thu, 03 Nov 2016)

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

  Log Message:
  ---
  libxml2: add patch to fix CVE-2016-4658

cc #20078


Compare: https://github.com/NixOS/nixpkgs/compare/08fb099b820c...64902aebb0db___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 248bf5: smokeping service: Fix permissions in $smokepingHo...

2016-11-02 Thread Tim Steinbach
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 248bf519c9b29a93684d5bb900046d5d0ef1d26e
  
https://github.com/NixOS/nixpkgs/commit/248bf519c9b29a93684d5bb900046d5d0ef1d26e
  Author: Marius Bergmann 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
M nixos/modules/services/networking/smokeping.nix

  Log Message:
  ---
  smokeping service: Fix permissions in $smokepingHome

In the prestart config of the smokeping service, smokeping is executed
initially. This happens as the user root and writes some files to
$smokepingHome, which can't be overwritten by the smokeping user. This
gives an error message.

I fixed this by moving the chown step after the initial smokeping runs,
so that it also affects the generated files.


  Commit: 08fb099b820cc6f1d5a4b09c8d32308b6240ee00
  
https://github.com/NixOS/nixpkgs/commit/08fb099b820cc6f1d5a4b09c8d32308b6240ee00
  Author: Tim Steinbach 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
M nixos/modules/services/networking/smokeping.nix

  Log Message:
  ---
  Merge pull request #20085 from mbrgm/fix/smokeping-permissions

smokeping service: Fix permissions in $smokepingHome


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


[Nix-commits] [NixOS/nixpkgs] c9d27c: nodejs-7_x: init

2016-11-02 Thread Tim Steinbach
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: c9d27cc3ea6377b2e4b40110049a5e32e05a08ce
  
https://github.com/NixOS/nixpkgs/commit/c9d27cc3ea6377b2e4b40110049a5e32e05a08ce
  Author: Christine Koppelt 
  Date:   2016-11-03 (Thu, 03 Nov 2016)

  Changed paths:
A pkgs/development/web/nodejs/v7.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  nodejs-7_x: init


  Commit: e97e9835dc27395a0e274e6a9bfcaa546a451ab2
  
https://github.com/NixOS/nixpkgs/commit/e97e9835dc27395a0e274e6a9bfcaa546a451ab2
  Author: Tim Steinbach 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
A pkgs/development/web/nodejs/v7.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  Merge pull request #20112 from cko/nodejs_7x

nodejs-7_x: init


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


[Nix-commits] [NixOS/nixpkgs] 0e1066: netdata: allow execution without a config file

2016-11-02 Thread Tim Steinbach
  Branch: refs/heads/release-16.09
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 0e1066e8e431a3756825cceb94381a0ba05c1a43
  
https://github.com/NixOS/nixpkgs/commit/0e1066e8e431a3756825cceb94381a0ba05c1a43
  Author: Kranium Gikos Mendoza 
  Date:   2016-10-25 (Tue, 25 Oct 2016)

  Changed paths:
M pkgs/tools/system/netdata/default.nix

  Log Message:
  ---
  netdata: allow execution without a config file


  Commit: d5b6594046791ad68d193ef463863e6ff7bef4f0
  
https://github.com/NixOS/nixpkgs/commit/d5b6594046791ad68d193ef463863e6ff7bef4f0
  Author: Tim Steinbach 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
M pkgs/tools/system/netdata/default.nix

  Log Message:
  ---
  Merge pull request #19864 from womfoo/fix/netdata-16.09

netdata: allow execution without a config file (16.09)


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


[Nix-commits] [NixOS/nixpkgs] 237c15: netdata: allow UI to load when running as non-root

2016-11-02 Thread Tim Steinbach
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 237c15d883d6f515b6829835167cf3c9f564e2ec
  
https://github.com/NixOS/nixpkgs/commit/237c15d883d6f515b6829835167cf3c9f564e2ec
  Author: Kranium Gikos Mendoza 
  Date:   2016-10-25 (Tue, 25 Oct 2016)

  Changed paths:
M pkgs/tools/system/netdata/default.nix
A pkgs/tools/system/netdata/web_access.patch

  Log Message:
  ---
  netdata: allow UI to load when running as non-root


  Commit: 8ce23cfec212ed868f81a44871ed9cbd3225523a
  
https://github.com/NixOS/nixpkgs/commit/8ce23cfec212ed868f81a44871ed9cbd3225523a
  Author: Kranium Gikos Mendoza 
  Date:   2016-10-25 (Tue, 25 Oct 2016)

  Changed paths:
M pkgs/tools/system/netdata/default.nix

  Log Message:
  ---
  netdata: allow execution without a config file


  Commit: 29f679d32e1f04e60ec6ef4becd032720980f4dc
  
https://github.com/NixOS/nixpkgs/commit/29f679d32e1f04e60ec6ef4becd032720980f4dc
  Author: Tim Steinbach 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
M pkgs/tools/system/netdata/default.nix
A pkgs/tools/system/netdata/web_access.patch

  Log Message:
  ---
  Merge pull request #19861 from womfoo/fix/netdata

netdata: allow execution without a config file


Compare: https://github.com/NixOS/nixpkgs/compare/04b22dd935ee...29f679d32e1f___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] e23725: netcat: make netcat-openbsd the default netcat (#1...

2016-11-02 Thread Tim Steinbach
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: e2372502d3d0503711ea792a74292373286e5c8f
  
https://github.com/NixOS/nixpkgs/commit/e2372502d3d0503711ea792a74292373286e5c8f
  Author: sternenseemann 
  Date:   2016-10-30 (Sun, 30 Oct 2016)

  Changed paths:
M nixos/tests/hibernate.nix
M nixos/tests/virtualbox.nix
M pkgs/applications/misc/playonlinux/default.nix
M pkgs/build-support/vm/windows/bootstrap.nix
M pkgs/build-support/vm/windows/controller/default.nix
M pkgs/build-support/vm/windows/default.nix
M pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix
A pkgs/tools/networking/netcat-gnu/default.nix
R pkgs/tools/networking/netcat/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  netcat: make netcat-openbsd the default netcat (#19411)

The motivation for this change is the following: As gnu-netcat,
e. g. does not support ipv6, it is not suitable as default netcat.

This commit also fixes all obvious build issues caused by this change.


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

  Changed paths:
M pkgs/tools/networking/netcat-openbsd/default.nix

  Log Message:
  ---
  netcat-openbsd: install man page


  Commit: 04b22dd935ee3359adaef20186db50017dbe3975
  
https://github.com/NixOS/nixpkgs/commit/04b22dd935ee3359adaef20186db50017dbe3975
  Author: Tim Steinbach 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
M nixos/tests/hibernate.nix
M nixos/tests/virtualbox.nix
M pkgs/applications/misc/playonlinux/default.nix
M pkgs/build-support/vm/windows/bootstrap.nix
M pkgs/build-support/vm/windows/controller/default.nix
M pkgs/build-support/vm/windows/default.nix
M pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix
A pkgs/tools/networking/netcat-gnu/default.nix
M pkgs/tools/networking/netcat-openbsd/default.nix
R pkgs/tools/networking/netcat/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  Merge pull request #19982 from sternenseemann/netcat

Make netcat-openbsd the default netcat


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


[Nix-commits] [NixOS/nixpkgs] 8bae05: solc: 0.4.2 -> 0.4.4

2016-11-02 Thread Tim Steinbach
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 8bae051c72d70f9ebd53335615d326349dcfd424
  
https://github.com/NixOS/nixpkgs/commit/8bae051c72d70f9ebd53335615d326349dcfd424
  Author: Daniel Brockman 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
M pkgs/development/compilers/solc/default.nix

  Log Message:
  ---
  solc: 0.4.2 -> 0.4.4


  Commit: 9e150c92d4de210f84bb5bd80630cc07a12f40be
  
https://github.com/NixOS/nixpkgs/commit/9e150c92d4de210f84bb5bd80630cc07a12f40be
  Author: Tim Steinbach 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
M pkgs/development/compilers/solc/default.nix

  Log Message:
  ---
  Merge pull request #20098 from nexusdev/solc

solc: 0.4.2 -> 0.4.4


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


[Nix-commits] [NixOS/nixpkgs] bcb0a6: perl-Role-Tiny: 2.000003 -> 2.000005

2016-11-02 Thread Robert Helgesson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: bcb0a65f23a0d3ac1850ecd2b004e7c28b19a6d8
  
https://github.com/NixOS/nixpkgs/commit/bcb0a65f23a0d3ac1850ecd2b004e7c28b19a6d8
  Author: Robert Helgesson 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

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

  Log Message:
  ---
  perl-Role-Tiny: 2.03 -> 2.05


  Commit: f7e2675ed509bdd4da45c9d8bd19c5976111b16d
  
https://github.com/NixOS/nixpkgs/commit/f7e2675ed509bdd4da45c9d8bd19c5976111b16d
  Author: Robert Helgesson 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

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

  Log Message:
  ---
  perl-Moo: 2.002003 -> 2.002005


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


[Nix-commits] [NixOS/nixpkgs] 2f8ac2: nixos: remove test-config-examples.sh (obsolete)

2016-11-02 Thread Bjørn Forsman
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 2f8ac21e1bdf4f94730a9ed5774bef9542ae523d
  
https://github.com/NixOS/nixpkgs/commit/2f8ac21e1bdf4f94730a9ed5774bef9542ae523d
  Author: Bjørn Forsman 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
R nixos/tests/test-config-examples.sh

  Log Message:
  ---
  nixos: remove test-config-examples.sh (obsolete)

This file has been non-functional for over two years, since
commit f002a27a80 ("Remove obsolete directory") removed
.../doc/config-examples/.


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


[Nix-commits] [NixOS/nixpkgs] a11338: top-level: Use `nixpkgsFun` to avoid import ../..

2016-11-02 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: a113382f2c8557ede623e392be6a294b8a6aa545
  
https://github.com/NixOS/nixpkgs/commit/a113382f2c8557ede623e392be6a294b8a6aa545
  Author: John Ericson 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
M pkgs/top-level/all-packages.nix
M pkgs/top-level/default.nix
M pkgs/top-level/stdenv.nix

  Log Message:
  ---
  top-level: Use `nixpkgsFun` to avoid import ../..


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


Re: [Nix-dev] svanderburg/disnix migrate to nixos/disnix

2016-11-02 Thread Vladimír Čunát
On 11/02/2016 05:39 PM, stewart mackenzie wrote:
> It would seem that by using disnix I'll be
> able to deploy fractalide services in a destributed environment. Is
> this accurate?

Yes, disnix can deploy to many more systems than nixos (reportedly).

--Vladimir




smime.p7s
Description: S/MIME Cryptographic Signature
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev


[Nix-commits] [NixOS/nixpkgs] 64a331: youtube-dl: 2016-10-31 -> 2016-11-02 (#20103)

2016-11-02 Thread Stefan Goetz
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 64a3317889e18776ac6ad97a7723d795e10a94ed
  
https://github.com/NixOS/nixpkgs/commit/64a3317889e18776ac6ad97a7723d795e10a94ed
  Author: Stefan Goetz 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
M pkgs/tools/misc/youtube-dl/default.nix

  Log Message:
  ---
  youtube-dl: 2016-10-31 -> 2016-11-02 (#20103)


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


[Nix-commits] [NixOS/nixpkgs] 1b78ae: Add npm2nix to v6.x nodePackages

2016-11-02 Thread Tim Steinbach
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 1b78ae4b6a172f8deed17b4a95ea1625cfb35e97
  
https://github.com/NixOS/nixpkgs/commit/1b78ae4b6a172f8deed17b4a95ea1625cfb35e97
  Author: Tobias Pflug 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
M pkgs/development/node-packages/default-v6.nix

  Log Message:
  ---
  Add npm2nix to v6.x nodePackages


  Commit: aa39f651749812117191c9cf94d929aa94461d73
  
https://github.com/NixOS/nixpkgs/commit/aa39f651749812117191c9cf94d929aa94461d73
  Author: Tim Steinbach 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
M pkgs/development/node-packages/default-v6.nix

  Log Message:
  ---
  Merge pull request #20102 from holidaycheck/v6-add-npm2nix

Add npm2nix to v6.x nodePackages


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


[Nix-commits] [NixOS/nixpkgs] 6f17cb: bear: 2.2.0 -> 2.2.1

2016-11-02 Thread Pavel Chuprikov
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 6f17cb108d8ea95e673734282be508d4cf8a6ee6
  
https://github.com/NixOS/nixpkgs/commit/6f17cb108d8ea95e673734282be508d4cf8a6ee6
  Author: Pavel Chuprikov 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
M pkgs/development/tools/build-managers/bear/default.nix

  Log Message:
  ---
  bear: 2.2.0 -> 2.2.1

Taken from #20020.


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


[Nix-commits] [NixOS/nixpkgs] 7f805a: nodejs: put back a comment about closure size

2016-11-02 Thread Vladimír Čunát
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 7f805a60d89f8a92050cb035f4c85bb2a441a5aa
  
https://github.com/NixOS/nixpkgs/commit/7f805a60d89f8a92050cb035f4c85bb2a441a5aa
  Author: Vladimír Čunát 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
M pkgs/development/web/nodejs/nodejs.nix

  Log Message:
  ---
  nodejs: put back a comment about closure size


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


[Nix-commits] [NixOS/nixpkgs] a5dad8: nodejs: refactor derivations (#19973)

2016-11-02 Thread Tobias Pflug
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: a5dad8aeeb3bc006646e736ae36277a610b5ed22
  
https://github.com/NixOS/nixpkgs/commit/a5dad8aeeb3bc006646e736ae36277a610b5ed22
  Author: Tobias Pflug 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
M pkgs/development/web/nodejs/nodejs.nix
M pkgs/development/web/nodejs/v4.nix
M pkgs/development/web/nodejs/v6.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  nodejs: refactor derivations (#19973)

* refactor and clean up the derivation composition
* add slim variation: the slim variations configure node without npm.
Building node with npm introduces a python runtime depndency through
gyp - slim variation makes sense for building small nodejs production
images


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


Re: [Nix-dev] svanderburg/disnix migrate to nixos/disnix

2016-11-02 Thread stewart mackenzie
I'm exploring this software now and it excites me, I'm currently
trying to get dysnomia installed, would be perfect if there was a
disnix/default.nix that'll just automate all that away (for those
nixos users).

I keep shying away from building subnets that are services in
github.com/fractalide/fractalide because services need the nixos layer
to automate everything. It would seem that by using disnix I'll be
able to deploy fractalide services in a destributed environment. Is
this accurate?

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


[Nix-commits] [NixOS/nixpkgs] a890d1: zotero: mark as broken #20049

2016-11-02 Thread Vladimír Čunát
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: a890d1765b628efd675cbfb0568eb5d479659578
  
https://github.com/NixOS/nixpkgs/commit/a890d1765b628efd675cbfb0568eb5d479659578
  Author: Vladimír Čunát 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
M pkgs/applications/office/zotero/default.nix

  Log Message:
  ---
  zotero: mark as broken #20049


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


Re: [Nix-dev] svanderburg/disnix migrate to nixos/disnix

2016-11-02 Thread Sander van der Burg
Dunno, I'm actually the only person developing it and it's most prominent
user :)

Moreover, to be able to use Disnix, it's more than just the disnix package.
For example, you also need to use dysnomia. Also, I created a many example
packages, that you will find on my github page.

On Wed, Nov 2, 2016 at 5:16 PM, stewart mackenzie 
wrote:

> Hi Sander + all,
>
> Disnix looks like a very interesting piece of software, would it be a
> good idea to move disnix to the main nixos/ organization?
>
> kr/sjm
> ___
> 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] 9f4114: samsung-unified-linux-driver_1_00_37: fix build fa...

2016-11-02 Thread Tobias Geerinckx-Rice
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 9f4114a7402cd1a761b8b6a267c7cb1641668002
  
https://github.com/NixOS/nixpkgs/commit/9f4114a7402cd1a761b8b6a267c7cb1641668002
  Author: Kier Davis 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
M pkgs/misc/cups/drivers/samsung/default.nix

  Log Message:
  ---
  samsung-unified-linux-driver_1_00_37: fix build failing due to upstream 
change in 'cups'

This commit should fix the package building to build due to 
https://github.com/NixOS/nixpkgs/issues/16238

Printing tested on M2875FD and M2675FN models. Scanning not tested yet due to 
lack of access of Samsung scanning devices.

All work in this commit is attributed to @jokogr. Content of this commit is 
basically copied+pasted from 
https://github.com/jokogr/nixpkgs/commit/c41e771a388dca6cb5f15edab2fd36fd6f96c8a8


  Commit: 50945dda705542422708c4582d382cd0efca021f
  
https://github.com/NixOS/nixpkgs/commit/50945dda705542422708c4582d382cd0efca021f
  Author: Tobias Geerinckx-Rice 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
M pkgs/misc/cups/drivers/samsung/default.nix

  Log Message:
  ---
  Merge pull request #20092 from kierdavis/samsung-unified-linux-driver

samsung-unified-linux-driver_1_00_37: fix build failing due to upstream change 
in cups


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


[Nix-dev] svanderburg/disnix migrate to nixos/disnix

2016-11-02 Thread stewart mackenzie
Hi Sander + all,

Disnix looks like a very interesting piece of software, would it be a
good idea to move disnix to the main nixos/ organization?

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


[Nix-commits] [NixOS/nixpkgs] 5c197b: haskellPackages: mark sindre broken

2016-11-02 Thread Peter Simons
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 5c197b2e38563c368a5e6945fdba27aa8dd5baed
  
https://github.com/NixOS/nixpkgs/commit/5c197b2e38563c368a5e6945fdba27aa8dd5baed
  Author: Profpatsch 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

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

  Log Message:
  ---
  haskellPackages: mark sindre broken


  Commit: 62e0985ec8625285f7b7f95a2f84ea00b39cd998
  
https://github.com/NixOS/nixpkgs/commit/62e0985ec8625285f7b7f95a2f84ea00b39cd998
  Author: Peter Simons 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

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

  Log Message:
  ---
  Merge pull request #20094 from Profpatsch/haskell-sindre

haskellPackages: mark sindre broken


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


[Nix-commits] [NixOS/nixpkgs] accd07: haskellPackages.tinc: 20160924 -> 20161102

2016-11-02 Thread Peter Simons
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: accd0728d84f699f96d06b3c4000b77c8dc4f504
  
https://github.com/NixOS/nixpkgs/commit/accd0728d84f699f96d06b3c4000b77c8dc4f504
  Author: Robbin C 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
M pkgs/development/tools/haskell/tinc/default.nix

  Log Message:
  ---
  haskellPackages.tinc: 20160924 -> 20161102


  Commit: 202d0d5b5abbdf687291ab90d9fedd2ec406aedb
  
https://github.com/NixOS/nixpkgs/commit/202d0d5b5abbdf687291ab90d9fedd2ec406aedb
  Author: Peter Simons 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
M pkgs/development/tools/haskell/tinc/default.nix

  Log Message:
  ---
  Merge pull request #20093 from robbinch/pkg-tinc

haskellPackages.tinc: 20160924 -> 20161102


Compare: https://github.com/NixOS/nixpkgs/compare/18375a7331db...202d0d5b5abb___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 18375a: Revert "python: adding a back python27Full"

2016-11-02 Thread Rok Garbas
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 18375a7331dbaeb9a7a8aa0b505454bafd31f57b
  
https://github.com/NixOS/nixpkgs/commit/18375a7331dbaeb9a7a8aa0b505454bafd31f57b
  Author: Rok Garbas 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

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

  Log Message:
  ---
  Revert "python: adding a back python27Full"

This reverts commit 822f480922fe2a0a38bc9de429cb2457b2eda96f.

See here for more discussion: 
https://github.com/NixOS/nixpkgs/commit/822f480922fe2a0a38bc9de429cb2457b2eda96f


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


[Nix-commits] [NixOS/nixpkgs] b5cbec: memtest86+: Build with gcc 5

2016-11-02 Thread Eelco Dolstra
  Branch: refs/heads/gcc-6
  Home:   https://github.com/NixOS/nixpkgs
  Commit: b5cbecd12794c79f4ddb9ef11e6e6b9131d8930e
  
https://github.com/NixOS/nixpkgs/commit/b5cbecd12794c79f4ddb9ef11e6e6b9131d8930e
  Author: Eelco Dolstra 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

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

  Log Message:
  ---
  memtest86+: Build with gcc 5

http://hydra.nixos.org/build/43011285


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


[Nix-commits] [NixOS/nixpkgs] 84174c: libjack2Unstable: and remove the old file

2016-11-02 Thread Frederik Rietdijk
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 84174c0cb8b9fdc40ef5390ad07c4f1633db38ae
  
https://github.com/NixOS/nixpkgs/commit/84174c0cb8b9fdc40ef5390ad07c4f1633db38ae
  Author: Frederik Rietdijk 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
R pkgs/misc/jackaudio/unstable.git

  Log Message:
  ---
  libjack2Unstable: and remove the old file

that I forgot to stage.


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


[Nix-commits] [NixOS/nixpkgs] 48bf4c: pythonPackages.django_1_10: 1.10.2 -> 1.10.3

2016-11-02 Thread Franz Pletz
  Branch: refs/heads/release-16.09
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 48bf4c8518b1517f5af5aaeb158ee7148ecc0be7
  
https://github.com/NixOS/nixpkgs/commit/48bf4c8518b1517f5af5aaeb158ee7148ecc0be7
  Author: Franz Pletz 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

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

  Log Message:
  ---
  pythonPackages.django_1_10: 1.10.2 -> 1.10.3

Fixes CVE-2016-9013, CVE-2016-9014.

https://www.djangoproject.com/weblog/2016/nov/01/security-releases/
(cherry picked from commit 6ad14d42569ffbf214ee301aaa9f47370bcd)


  Commit: abfb2e5cf9d2339fe9d8d0dc1085c0e6e715aea0
  
https://github.com/NixOS/nixpkgs/commit/abfb2e5cf9d2339fe9d8d0dc1085c0e6e715aea0
  Author: Franz Pletz 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

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

  Log Message:
  ---
  pythonPackages.django_1_9: 1.9.10 -> 1.9.11

Fixes CVE-2016-9013, CVE-2016-9014.

https://www.djangoproject.com/weblog/2016/nov/01/security-releases/
(cherry picked from commit 58ad105cd43356e3de024fbf7df2d34f10d696df)


  Commit: 74b91a85790683106a16f442c6a456f9561d94a9
  
https://github.com/NixOS/nixpkgs/commit/74b91a85790683106a16f442c6a456f9561d94a9
  Author: Franz Pletz 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

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

  Log Message:
  ---
  pythonPackages.django_1_8: 1.8.15 -> 1.8.16

Fixes CVE-2016-9013, CVE-2016-9014.

https://www.djangoproject.com/weblog/2016/nov/01/security-releases/
(cherry picked from commit b806e14a3ced762ec2b0ce162c75d400f312e897)


Compare: https://github.com/NixOS/nixpkgs/compare/31ba04e416e4...74b91a857906___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 6ad14d: pythonPackages.django_1_10: 1.10.2 -> 1.10.3

2016-11-02 Thread Franz Pletz
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 6ad14d42569ffbf214ee301aaa9f47370bcd
  
https://github.com/NixOS/nixpkgs/commit/6ad14d42569ffbf214ee301aaa9f47370bcd
  Author: Franz Pletz 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

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

  Log Message:
  ---
  pythonPackages.django_1_10: 1.10.2 -> 1.10.3

Fixes CVE-2016-9013, CVE-2016-9014.

https://www.djangoproject.com/weblog/2016/nov/01/security-releases/


  Commit: 58ad105cd43356e3de024fbf7df2d34f10d696df
  
https://github.com/NixOS/nixpkgs/commit/58ad105cd43356e3de024fbf7df2d34f10d696df
  Author: Franz Pletz 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

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

  Log Message:
  ---
  pythonPackages.django_1_9: 1.9.10 -> 1.9.11

Fixes CVE-2016-9013, CVE-2016-9014.

https://www.djangoproject.com/weblog/2016/nov/01/security-releases/


  Commit: b806e14a3ced762ec2b0ce162c75d400f312e897
  
https://github.com/NixOS/nixpkgs/commit/b806e14a3ced762ec2b0ce162c75d400f312e897
  Author: Franz Pletz 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

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

  Log Message:
  ---
  pythonPackages.django_1_8: 1.8.15 -> 1.8.16

Fixes CVE-2016-9013, CVE-2016-9014.

https://www.djangoproject.com/weblog/2016/nov/01/security-releases/


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


[Nix-commits] [NixOS/nixpkgs] ab0ac1: libjack2Unstable: fix evaluation

2016-11-02 Thread Frederik Rietdijk
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: ab0ac18279d6497bdeb616cbe7cd0797d6534739
  
https://github.com/NixOS/nixpkgs/commit/ab0ac18279d6497bdeb616cbe7cd0797d6534739
  Author: Frederik Rietdijk 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
A pkgs/misc/jackaudio/unstable.nix

  Log Message:
  ---
  libjack2Unstable: fix evaluation

broken by f64933596c58329d59eae7485f4868b53955fc3a


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


[Nix-commits] [NixOS/nixpkgs] 794069: ksysguard: Add required qtwebkit dependency.

2016-11-02 Thread Thomas Tuegel
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 7940692801dff8f94bb2ec87e0d3b4cd3de4038a
  
https://github.com/NixOS/nixpkgs/commit/7940692801dff8f94bb2ec87e0d3b4cd3de4038a
  Author: Ambroz Bizjak 
  Date:   2016-11-01 (Tue, 01 Nov 2016)

  Changed paths:
M pkgs/desktops/kde-5/plasma/ksysguard.nix

  Log Message:
  ---
  ksysguard: Add required qtwebkit dependency.

Without this the only the daemon would be built without a GUI.


  Commit: b76fdc3f3c6b46f18be1a8dd1f70c29f1af2db2d
  
https://github.com/NixOS/nixpkgs/commit/b76fdc3f3c6b46f18be1a8dd1f70c29f1af2db2d
  Author: Thomas Tuegel 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
M pkgs/desktops/kde-5/plasma/ksysguard.nix

  Log Message:
  ---
  Merge pull request #20066 from ambrop72/ksysguard-fix

ksysguard: Add required qtwebkit dependency.


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


[Nix-commits] [NixOS/nixpkgs] 4396ee: fmsynth: init at 2015-02-07

2016-11-02 Thread Frederik Rietdijk
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 4396ee953611b300f229ec33c05442769b19cf73
  
https://github.com/NixOS/nixpkgs/commit/4396ee953611b300f229ec33c05442769b19cf73
  Author: Bart Brouns 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
A pkgs/applications/audio/fmsynth/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  fmsynth: init at 2015-02-07


  Commit: e4d7515aef28cbfc465e2aac99d35aeb75fc34b2
  
https://github.com/NixOS/nixpkgs/commit/e4d7515aef28cbfc465e2aac99d35aeb75fc34b2
  Author: Frederik Rietdijk 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
A pkgs/applications/audio/fmsynth/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  Merge pull request #20054 from magnetophon/fmsynth

fmsynth: init at 2015-02-07


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


[Nix-commits] [NixOS/nixpkgs] 6c9e8e: x42-plugins: 20160619 -> 20160825

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

  Changed paths:
M pkgs/applications/audio/x42-plugins/default.nix

  Log Message:
  ---
  x42-plugins: 20160619 -> 20160825


  Commit: 830787624046da973378d3999766f70ffec3d174
  
https://github.com/NixOS/nixpkgs/commit/830787624046da973378d3999766f70ffec3d174
  Author: Frederik Rietdijk 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
M pkgs/applications/audio/x42-plugins/default.nix

  Log Message:
  ---
  Merge pull request #19983 from magnetophon/x42-plugins

x42-plugins: 20160619 ->20160825


Compare: https://github.com/NixOS/nixpkgs/compare/827861f4b4ff...830787624046___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 2d6252: ardour5: add dummy backend, so Ardour Session Util...

2016-11-02 Thread Frederik Rietdijk
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 2d62522c534ebf32d54f857cdb470e8c37e87c5b
  
https://github.com/NixOS/nixpkgs/commit/2d62522c534ebf32d54f857cdb470e8c37e87c5b
  Author: Bart Brouns 
  Date:   2016-11-01 (Tue, 01 Nov 2016)

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

  Log Message:
  ---
  ardour5: add dummy backend, so Ardour Session Utilities get built


  Commit: ea2907ad7a5e8cedc70b983b3cee3ad21e33ba44
  
https://github.com/NixOS/nixpkgs/commit/ea2907ad7a5e8cedc70b983b3cee3ad21e33ba44
  Author: Frederik Rietdijk 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

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

  Log Message:
  ---
  Merge pull request #20041 from magnetophon/ardour

ardour5: add dummy backend, so Ardour Session Utilities get built


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


[Nix-commits] [NixOS/nixpkgs] a8a144: zita-resampler: 1.3.0 -> 1.6.0

2016-11-02 Thread Frederik Rietdijk
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: a8a1449b1c6c129338d80be2420343fb2dd76499
  
https://github.com/NixOS/nixpkgs/commit/a8a1449b1c6c129338d80be2420343fb2dd76499
  Author: Bart Brouns 
  Date:   2016-11-01 (Tue, 01 Nov 2016)

  Changed paths:
M pkgs/development/libraries/audio/zita-resampler/default.nix

  Log Message:
  ---
  zita-resampler: 1.3.0 -> 1.6.0


  Commit: 827861f4b4ffbd29f58935df56119c35186f4558
  
https://github.com/NixOS/nixpkgs/commit/827861f4b4ffbd29f58935df56119c35186f4558
  Author: Frederik Rietdijk 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
M pkgs/development/libraries/audio/zita-resampler/default.nix

  Log Message:
  ---
  Merge pull request #20038 from magnetophon/zita-resampler

zita-resampler: 1.3.0 -> 1.6.0


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


[Nix-commits] [NixOS/nixpkgs] d315ca: libjack2-git: 2015-09-03 -> 2016-08-18

2016-11-02 Thread Frederik Rietdijk
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: d315ca408065cd86d554648c75b323ead8f7c175
  
https://github.com/NixOS/nixpkgs/commit/d315ca408065cd86d554648c75b323ead8f7c175
  Author: Bart Brouns 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
M pkgs/development/libraries/libsoundio/default.nix
R pkgs/misc/jackaudio/git.nix
A pkgs/misc/jackaudio/unstable.git
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  libjack2-git: 2015-09-03 -> 2016-08-18


  Commit: f64933596c58329d59eae7485f4868b53955fc3a
  
https://github.com/NixOS/nixpkgs/commit/f64933596c58329d59eae7485f4868b53955fc3a
  Author: Frederik Rietdijk 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
M pkgs/development/libraries/libsoundio/default.nix
R pkgs/misc/jackaudio/git.nix
A pkgs/misc/jackaudio/unstable.git
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  Merge pull request #20083 from magnetophon/libjack2-git

libjack2-git: 2015-09-03 -> 2016-08-18


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


[Nix-commits] [NixOS/hydra] 4f08c8: hydra-queue-runner: Fix assertion failure

2016-11-02 Thread Eelco Dolstra
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/hydra
  Commit: 4f08c85c69a3e0ae056aba3fe8ab2d289597edcd
  
https://github.com/NixOS/hydra/commit/4f08c85c69a3e0ae056aba3fe8ab2d289597edcd
  Author: Eelco Dolstra 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
M src/hydra-queue-runner/builder.cc
M src/hydra-queue-runner/state.hh

  Log Message:
  ---
  hydra-queue-runner: Fix assertion failure

It was hitting

assert(reservation.unique());

Since we do want the machine reservation to be released before calling
wakeDispatcher(), let's use a different object for keeping track of
active steps.


  Commit: d7453bd8be10e80a60d6a20e917c2bb3587a627b
  
https://github.com/NixOS/hydra/commit/d7453bd8be10e80a60d6a20e917c2bb3587a627b
  Author: Eelco Dolstra 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
M src/hydra-queue-runner/builder.cc

  Log Message:
  ---
  hydra-queue-runner: Fix message


Compare: https://github.com/NixOS/hydra/compare/07decd691574...d7453bd8be10___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 22b74e: qjackctl: 0.4.2 -> 0.4.3

2016-11-02 Thread Frederik Rietdijk
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 22b74e35350da40ab23ef2564534ac9958c93306
  
https://github.com/NixOS/nixpkgs/commit/22b74e35350da40ab23ef2564534ac9958c93306
  Author: Bart Brouns 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

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

  Log Message:
  ---
  qjackctl: 0.4.2 -> 0.4.3


  Commit: 1e95264578450d0edc7c17c5b38209e06c78bda3
  
https://github.com/NixOS/nixpkgs/commit/1e95264578450d0edc7c17c5b38209e06c78bda3
  Author: Frederik Rietdijk 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

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

  Log Message:
  ---
  Merge pull request #20084 from magnetophon/qjackctl

qjackctl: 0.4.2 -> 0.4.3


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


Re: [Nix-dev] Python: getting rid of PYTHONPATH in Nixpkgs

2016-11-02 Thread Domen Kožar
You can do something like:

(python3.withPackages (ps: [ ps.mrbob ])).override(foo: {ignoreCollisions =
true;})

On Wed, Nov 2, 2016 at 11:33 AM, Thomas Hunger  wrote:

> I played with `withPackages` and it's rather nice. The only problem I had
> was "collision between A and B" style errors. Is there any plan to allow
> for collisions?
>
> On 2 November 2016 at 06:05, Dmitry Kalinkin 
> wrote:
>
>>
>> > On 01 Nov 2016, at 11:56, Freddy Rietdijk 
>> wrote:
>> >
>> >
>> > > To solve 2) you could also make a wrapper that combines selected
>> outputs of the multiple output package without python itself. I think, this
>> is what texlive does. That way all the burden of wrapping will be limited
>> only to the multiple output packages.
>> >
>> > I'm not sure whether I understand what you mean. What kind of wrapper
>> do you mean? What does it wrap, and what does it set? The problem with the
>> multiple outputs is that when you would add each to PYTHONPATH, the extra
>> outputs won't be importable unless the 'main' output is first. I don't see
>> how that can be solved. One that sets PYTHONPATH? Or some kind of package
>> I had in mind a simple ```combine [blah.foo blah.bar]``` that would
>> produce a derivation with symlinks to both $foo/lib/python2.7/blah/foo and
>> $foo/lib/python2.7/blah/bar, so multiple outputs are combined back and can
>> be importable with the current envHook setting the PYTHONPATH. This is
>> similar to the current python wrapper that additionally throws in the
>> python interpreter itself along with wrapper to set PYTHONHOME.
>> >
>> > > As for the first point, I couldn’t very well understand what the
>> problem is. Are you talking about conflict between instances of a package
>> that were built against different version of the python? Then shouldn’t
>> `--prefix` override the incompatible version, since, as you said, order
>> matters?
>> >
>> > Example with discussion: https://github.com/NixOS/nixpkgs/pull/17749
>> >
>> >
>> > On Tue, Nov 1, 2016 at 4:12 PM, Dmitry Kalinkin <
>> dmitry.kalin...@gmail.com> wrote:
>> >
>> > > On 01 Nov 2016, at 06:22, Freddy Rietdijk 
>> wrote:
>> > >
>> > > Hi,
>> > >
>> > > Currently we use PYTHONPATH a lot in Nixpkgs to let applications and
>> the interpreter find Python modules. This typically works fine, but there
>> are problems with this method and so I would like to get rid of it and use
>> only `python.withPackages` which uses `python.buildEnv`.
>> > >
>> > > The two main issues with the use of PYTHONPATH:
>> > >   • Before we used `--prefix $PYTHONPATH`, but this would leak
>> PYTHONPATH into subprocesses, which is especially problematic when both
>> parent and child depend on Python but of different versions.  `--set
>> $PYTHONPATH` would solve that issue, but that makes it impossible to add
>> other (impure) paths, which is an important feature. This also breaks
>> alternative shells like `ipython`. This issue is currently solved by
>> extending `sys.path` in the Python applications.
>> > >   • Limits the use of multiple outputs. When moving a module of a
>> package into a separate output it becomes problematic to load this again,
>> since just adding the module to PYTHONPATH typically doesn't work because
>> the order matters. While Python modules are typically small, and build
>> fast, rebuilding can take a lot of time in cases like `matplotlib` which
>> supports multiple backends and is depended on by quite some packages.
>> > > A method that is more reliable is building an environment with
>> symbolic links to all the modules, and wrapping the applications with a
>> wrapper that sets PYTHONHOME. This is exactly what `python.buildEnv` does,
>> and it solves both 1) and 2).
>> > >
>> > > `PYTHONPATH` is mainly constructed with the Python interpreter
>> setupHook. It is used in `buildPythonPackage` for building the package, and
>> after installing it is extended so the tests can run. Furthermore,
>> `PYTHONPATH` is set by the `setupHook` when using `nix-shell` like
>> `nix-shell -p pythonPackages.numpy`.
>> > >
>> > > I think we can get rid of the setupHook. For the building we can
>> create an env. This would be able to support multiple outputs as inputs,
>> but will be more expensive than setting PYTHONPATH. For the tests we do add
>> the newly constructed package to PYTHONPATH; there's no way around it and
>> it doesn't cause any problems either.
>> > >
>> > > The biggest impact will be on how `nix-shell` is used. It won't be
>> possible anymore to use it as shown before, instead `nix-shell -p
>> 'python.withPackages(ps:[ps.numpy])'` would have to be used. While it is
>> possible to keep the setupHook (or use it as a shellHook) it will be
>> unreliable in the case of multiple outputs.
>> > >
>> > > What do you think about this change? Do you see any problems with it?
>> Any other suggestions?
>> > >
>> > > Freddy
>> > > ___
>> > > nix-dev mailing list
>> > > nix-dev@lists.science.uu.nl
>> 

[Nix-commits] [NixOS/nixpkgs] 0973d2: tre: add patch for CVE-2016-8859

2016-11-02 Thread Graham Christensen
  Branch: refs/heads/release-16.03
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 0973d27ddbae61a93e32a5f0b9e6253c0d9bce8b
  
https://github.com/NixOS/nixpkgs/commit/0973d27ddbae61a93e32a5f0b9e6253c0d9bce8b
  Author: Graham Christensen 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

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

  Log Message:
  ---
  tre: add patch for CVE-2016-8859

(cherry picked from commit cd67a0aada863e1510c0573aed03b20959dfdebb)


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


[Nix-commits] [NixOS/nixpkgs] 31ba04: tre: add patch for CVE-2016-8859

2016-11-02 Thread Graham Christensen
  Branch: refs/heads/release-16.09
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 31ba04e416e4b7e318a0b8c39614c5b4868b3f68
  
https://github.com/NixOS/nixpkgs/commit/31ba04e416e4b7e318a0b8c39614c5b4868b3f68
  Author: Graham Christensen 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

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

  Log Message:
  ---
  tre: add patch for CVE-2016-8859

(cherry picked from commit cd67a0aada863e1510c0573aed03b20959dfdebb)


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


[Nix-commits] [NixOS/nixpkgs] cd67a0: tre: add patch for CVE-2016-8859

2016-11-02 Thread Graham Christensen
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: cd67a0aada863e1510c0573aed03b20959dfdebb
  
https://github.com/NixOS/nixpkgs/commit/cd67a0aada863e1510c0573aed03b20959dfdebb
  Author: Graham Christensen 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

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

  Log Message:
  ---
  tre: add patch for CVE-2016-8859


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


[Nix-commits] [NixOS/nixpkgs] f33c5f: perl-Image-Info: 1.38 -> 1.39

2016-11-02 Thread Robert Helgesson
  Branch: refs/heads/release-16.09
  Home:   https://github.com/NixOS/nixpkgs
  Commit: f33c5f713e1aa7c780134154e8e5072ad2081921
  
https://github.com/NixOS/nixpkgs/commit/f33c5f713e1aa7c780134154e8e5072ad2081921
  Author: Robert Helgesson 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

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

  Log Message:
  ---
  perl-Image-Info: 1.38 -> 1.39

Fixes information disclosure security issue. See
https://lwn.net/Vulnerabilities/704702/.

(cherry picked from commit 68f2bc8fb351065fda55c8a7b1ee6d74ba64a9a0)


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


[Nix-commits] [NixOS/nixpkgs] 68f2bc: perl-Image-Info: 1.38 -> 1.39

2016-11-02 Thread Robert Helgesson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 68f2bc8fb351065fda55c8a7b1ee6d74ba64a9a0
  
https://github.com/NixOS/nixpkgs/commit/68f2bc8fb351065fda55c8a7b1ee6d74ba64a9a0
  Author: Robert Helgesson 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

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

  Log Message:
  ---
  perl-Image-Info: 1.38 -> 1.39

Fixes information disclosure security issue. See
https://lwn.net/Vulnerabilities/704702/.


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


Re: [Nix-dev] Python: getting rid of PYTHONPATH in Nixpkgs

2016-11-02 Thread Thomas Hunger
I played with `withPackages` and it's rather nice. The only problem I had
was "collision between A and B" style errors. Is there any plan to allow
for collisions?

On 2 November 2016 at 06:05, Dmitry Kalinkin 
wrote:

>
> > On 01 Nov 2016, at 11:56, Freddy Rietdijk 
> wrote:
> >
> >
> > > To solve 2) you could also make a wrapper that combines selected
> outputs of the multiple output package without python itself. I think, this
> is what texlive does. That way all the burden of wrapping will be limited
> only to the multiple output packages.
> >
> > I'm not sure whether I understand what you mean. What kind of wrapper do
> you mean? What does it wrap, and what does it set? The problem with the
> multiple outputs is that when you would add each to PYTHONPATH, the extra
> outputs won't be importable unless the 'main' output is first. I don't see
> how that can be solved. One that sets PYTHONPATH? Or some kind of package
> I had in mind a simple ```combine [blah.foo blah.bar]``` that would
> produce a derivation with symlinks to both $foo/lib/python2.7/blah/foo and
> $foo/lib/python2.7/blah/bar, so multiple outputs are combined back and can
> be importable with the current envHook setting the PYTHONPATH. This is
> similar to the current python wrapper that additionally throws in the
> python interpreter itself along with wrapper to set PYTHONHOME.
> >
> > > As for the first point, I couldn’t very well understand what the
> problem is. Are you talking about conflict between instances of a package
> that were built against different version of the python? Then shouldn’t
> `--prefix` override the incompatible version, since, as you said, order
> matters?
> >
> > Example with discussion: https://github.com/NixOS/nixpkgs/pull/17749
> >
> >
> > On Tue, Nov 1, 2016 at 4:12 PM, Dmitry Kalinkin <
> dmitry.kalin...@gmail.com> wrote:
> >
> > > On 01 Nov 2016, at 06:22, Freddy Rietdijk 
> wrote:
> > >
> > > Hi,
> > >
> > > Currently we use PYTHONPATH a lot in Nixpkgs to let applications and
> the interpreter find Python modules. This typically works fine, but there
> are problems with this method and so I would like to get rid of it and use
> only `python.withPackages` which uses `python.buildEnv`.
> > >
> > > The two main issues with the use of PYTHONPATH:
> > >   • Before we used `--prefix $PYTHONPATH`, but this would leak
> PYTHONPATH into subprocesses, which is especially problematic when both
> parent and child depend on Python but of different versions.  `--set
> $PYTHONPATH` would solve that issue, but that makes it impossible to add
> other (impure) paths, which is an important feature. This also breaks
> alternative shells like `ipython`. This issue is currently solved by
> extending `sys.path` in the Python applications.
> > >   • Limits the use of multiple outputs. When moving a module of a
> package into a separate output it becomes problematic to load this again,
> since just adding the module to PYTHONPATH typically doesn't work because
> the order matters. While Python modules are typically small, and build
> fast, rebuilding can take a lot of time in cases like `matplotlib` which
> supports multiple backends and is depended on by quite some packages.
> > > A method that is more reliable is building an environment with
> symbolic links to all the modules, and wrapping the applications with a
> wrapper that sets PYTHONHOME. This is exactly what `python.buildEnv` does,
> and it solves both 1) and 2).
> > >
> > > `PYTHONPATH` is mainly constructed with the Python interpreter
> setupHook. It is used in `buildPythonPackage` for building the package, and
> after installing it is extended so the tests can run. Furthermore,
> `PYTHONPATH` is set by the `setupHook` when using `nix-shell` like
> `nix-shell -p pythonPackages.numpy`.
> > >
> > > I think we can get rid of the setupHook. For the building we can
> create an env. This would be able to support multiple outputs as inputs,
> but will be more expensive than setting PYTHONPATH. For the tests we do add
> the newly constructed package to PYTHONPATH; there's no way around it and
> it doesn't cause any problems either.
> > >
> > > The biggest impact will be on how `nix-shell` is used. It won't be
> possible anymore to use it as shown before, instead `nix-shell -p
> 'python.withPackages(ps:[ps.numpy])'` would have to be used. While it is
> possible to keep the setupHook (or use it as a shellHook) it will be
> unreliable in the case of multiple outputs.
> > >
> > > What do you think about this change? Do you see any problems with it?
> Any other suggestions?
> > >
> > > Freddy
> > > ___
> > > nix-dev mailing list
> > > nix-dev@lists.science.uu.nl
> > > http://lists.science.uu.nl/mailman/listinfo/nix-dev
> >
> > Hi,
> >
> > I’m far from being an expert in python, but here are my thoughts:
> >
> > To solve 2) you could also make a wrapper that combines selected outputs
> of the multiple output package without python

[Nix-commits] [NixOS/nixpkgs] 55dfaf: curl: 7.50.3 -> 7.51.0

2016-11-02 Thread Eelco Dolstra
  Branch: refs/heads/release-16.09
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 55dfafa4da724ada6ea5f8e17111a8c2fe7d68d9
  
https://github.com/NixOS/nixpkgs/commit/55dfafa4da724ada6ea5f8e17111a8c2fe7d68d9
  Author: Eelco Dolstra 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
M pkgs/tools/networking/curl/default.nix

  Log Message:
  ---
  curl: 7.50.3 -> 7.51.0

Fixes 11 CVEs:

https://curl.haxx.se/changes.html#7_51_0
(cherry picked from commit 1e1609da6ad87fe828973f17f1f175b3de841383)


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


[Nix-commits] [NixOS/nixpkgs] d32b95: kile: 2016-07-25 -> 2016-10-24

2016-11-02 Thread Frederik Rietdijk
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: d32b95c9667f07f99551e72c1217bece4ec2327f
  
https://github.com/NixOS/nixpkgs/commit/d32b95c9667f07f99551e72c1217bece4ec2327f
  Author: Frederik Rietdijk 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
M pkgs/applications/editors/kile/frameworks.nix

  Log Message:
  ---
  kile: 2016-07-25 -> 2016-10-24


  Commit: e1939ed0568b11eba481121e10f9162e0a43acfd
  
https://github.com/NixOS/nixpkgs/commit/e1939ed0568b11eba481121e10f9162e0a43acfd
  Author: Frederik Rietdijk 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
M pkgs/applications/networking/irc/konversation/1.6.nix

  Log Message:
  ---
  konversation: 1.6.1 -> 1.6.2


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


[Nix-commits] [NixOS/nixpkgs] 1e1609: curl: 7.50.3 -> 7.51.0

2016-11-02 Thread Eelco Dolstra
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 1e1609da6ad87fe828973f17f1f175b3de841383
  
https://github.com/NixOS/nixpkgs/commit/1e1609da6ad87fe828973f17f1f175b3de841383
  Author: Eelco Dolstra 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
M pkgs/tools/networking/curl/default.nix

  Log Message:
  ---
  curl: 7.50.3 -> 7.51.0

Fixes 11 CVEs:

https://curl.haxx.se/changes.html#7_51_0


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


[Nix-commits] [NixOS/nixpkgs] 08d7fb: matrix-synapse: Allow keys to be generated

2016-11-02 Thread Ruben Maher
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 08d7fbb42d37994ad0a4f736f5585d6b584b4b87
  
https://github.com/NixOS/nixpkgs/commit/08d7fbb42d37994ad0a4f736f5585d6b584b4b87
  Author: Ruben Maher 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
M nixos/modules/services/misc/matrix-synapse.nix

  Log Message:
  ---
  matrix-synapse: Allow keys to be generated

The matrix-synapse user has `createHome = true;` which runs before the
`preStart` script, so the home directory will always exist and the block
will never execute.

Also don't include default path to keys in the configuration file,
because synapse will choke if it tries to open them before they
exist (even with `--generate-keys`).


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


[Nix-commits] [NixOS/nixpkgs] 270365: samsung-unified-linux-driver: add 4.01.17

2016-11-02 Thread Arseniy Seroka
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 270365a1ee513a0d3d274c7426a153ab8e971036
  
https://github.com/NixOS/nixpkgs/commit/270365a1ee513a0d3d274c7426a153ab8e971036
  Author: Ioannis Koutras 
  Date:   2016-11-01 (Tue, 01 Nov 2016)

  Changed paths:
A pkgs/misc/cups/drivers/samsung/4.01.17.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  samsung-unified-linux-driver: add 4.01.17


  Commit: 4ae2a59aaafbf1986cda21be06ab4f8c83f5449d
  
https://github.com/NixOS/nixpkgs/commit/4ae2a59aaafbf1986cda21be06ab4f8c83f5449d
  Author: Arseniy Seroka 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
A pkgs/misc/cups/drivers/samsung/4.01.17.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  Merge pull request #20060 from jokogr/u/samsung-unified-linux-driver-4.01.17

samsung-unified-linux-driver: add 4.01.17


Compare: https://github.com/NixOS/nixpkgs/compare/21163a9c122e...4ae2a59aaafb___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 767d11: dropbox: 11.4.22 -> 13.4.21

2016-11-02 Thread Arseniy Seroka
  Branch: refs/heads/release-16.09
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 767d11ea4790795830feedc0b9c8dfe8148f9d32
  
https://github.com/NixOS/nixpkgs/commit/767d11ea4790795830feedc0b9c8dfe8148f9d32
  Author: Peter Hoeg 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

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

  Log Message:
  ---
  dropbox: 11.4.22 -> 13.4.21


  Commit: 238c7e0dbf73d7f330689cb6ec4b1218526cee4e
  
https://github.com/NixOS/nixpkgs/commit/238c7e0dbf73d7f330689cb6ec4b1218526cee4e
  Author: Arseniy Seroka 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

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

  Log Message:
  ---
  Merge pull request #20075 from peterhoeg/stable/dropbox

dropbox: 11.4.22 -> 13.4.21


Compare: https://github.com/NixOS/nixpkgs/compare/8f0b93b4ed3a...238c7e0dbf73___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 9cd790: dropbox: 12.4.22 -> 13.4.21

2016-11-02 Thread Arseniy Seroka
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 9cd790cffcf8e1cb210355926434a9c6e839bae0
  
https://github.com/NixOS/nixpkgs/commit/9cd790cffcf8e1cb210355926434a9c6e839bae0
  Author: Peter Hoeg 
  Date:   2016-11-01 (Tue, 01 Nov 2016)

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

  Log Message:
  ---
  dropbox: 12.4.22 -> 13.4.21


  Commit: 21163a9c122ef6fda2221ffd1a91a5cd06f9a130
  
https://github.com/NixOS/nixpkgs/commit/21163a9c122ef6fda2221ffd1a91a5cd06f9a130
  Author: Arseniy Seroka 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

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

  Log Message:
  ---
  Merge pull request #20074 from peterhoeg/u/dropbox

dropbox: 12.4.22 -> 13.4.21


Compare: https://github.com/NixOS/nixpkgs/compare/382f97ecc21f...21163a9c122e___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 83317f: haskellPackages: fix libsystemd-journal

2016-11-02 Thread Peter Simons
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 83317f7d04644ad207e95c639d08e35907d3964d
  
https://github.com/NixOS/nixpkgs/commit/83317f7d04644ad207e95c639d08e35907d3964d
  Author: Profpatsch 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

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

  Log Message:
  ---
  haskellPackages: fix libsystemd-journal


  Commit: 382f97ecc21fb0fce3aa083d92082427f959c42c
  
https://github.com/NixOS/nixpkgs/commit/382f97ecc21fb0fce3aa083d92082427f959c42c
  Author: Peter Simons 
  Date:   2016-11-02 (Wed, 02 Nov 2016)

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

  Log Message:
  ---
  Merge pull request #20061 from Profpatsch/haskell-libsystemd-journald

haskellPackages: fix libsystemd-journal


Compare: https://github.com/NixOS/nixpkgs/compare/1ec0855c20cc...382f97ecc21f___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits