[Nix-commits] [NixOS/nixpkgs] c2a573: wxPython: fix on darwin

2017-02-16 Thread Daiderd Jordan
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: c2a573365422f200e7d99823f29ba5ffec338579
  
https://github.com/NixOS/nixpkgs/commit/c2a573365422f200e7d99823f29ba5ffec338579
  Author: Dmitry Kalinkin 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

  Changed paths:
M pkgs/development/python-modules/wxPython/3.0.nix

  Log Message:
  ---
  wxPython: fix on darwin


  Commit: 0a44f259b517dd3710882040edf7b347b2889281
  
https://github.com/NixOS/nixpkgs/commit/0a44f259b517dd3710882040edf7b347b2889281
  Author: Dmitry Kalinkin 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

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

  Log Message:
  ---
  python27Packages.taskcoach: mark as broken on darwin


  Commit: 8a5c6153d7528601f74dfbacb16cdaa25929bf98
  
https://github.com/NixOS/nixpkgs/commit/8a5c6153d7528601f74dfbacb16cdaa25929bf98
  Author: Daiderd Jordan 
  Date:   2017-02-17 (Fri, 17 Feb 2017)

  Changed paths:
M pkgs/development/python-modules/wxPython/3.0.nix
M pkgs/top-level/python-packages.nix

  Log Message:
  ---
  Merge pull request #22814 from veprbl/wxpython

wxPython30: fix on darwin


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


[Nix-commits] [NixOS/nixpkgs] 0f905b: polybar: init at 3.0.4

2017-02-16 Thread Robin Gloster
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 0f905b0dc8553b21d9da5333eb1d6c8be4e2ab9d
  
https://github.com/NixOS/nixpkgs/commit/0f905b0dc8553b21d9da5333eb1d6c8be4e2ab9d
  Author: James Alexander Feldman-Crough 
  Date:   2017-02-05 (Sun, 05 Feb 2017)

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

  Log Message:
  ---
  polybar: init at 3.0.4

Polybar is a status bar in the vein of xmobar or i3bar.


  Commit: 2ad43792ad511cc051b7f9d1dc380737a7b5a53f
  
https://github.com/NixOS/nixpkgs/commit/2ad43792ad511cc051b7f9d1dc380737a7b5a53f
  Author: James Alexander Feldman-Crough 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

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

  Log Message:
  ---
  Remove redundant "fetchSubmodules" attr


  Commit: b3c58dc38ba44b701475f3a60f2af9c5c70f5610
  
https://github.com/NixOS/nixpkgs/commit/b3c58dc38ba44b701475f3a60f2af9c5c70f5610
  Author: Robin Gloster 
  Date:   2017-02-17 (Fri, 17 Feb 2017)

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

  Log Message:
  ---
  Merge pull request #2 from afldcr/polybar-3.0.3

polybar: init at 3.0.4


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


[Nix-commits] [NixOS/nixpkgs] 214304: isyncUnstable: download over https

2017-02-16 Thread Robin Gloster
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 21430431466df7ae54c9ecea7309f940d0a77c93
  
https://github.com/NixOS/nixpkgs/commit/21430431466df7ae54c9ecea7309f940d0a77c93
  Author: Thomas Tuegel 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

  Changed paths:
M pkgs/tools/networking/isync/unstable.nix

  Log Message:
  ---
  isyncUnstable: download over https


  Commit: 88fec3005bf29145271e21e42b8d21c98d14e3f2
  
https://github.com/NixOS/nixpkgs/commit/88fec3005bf29145271e21e42b8d21c98d14e3f2
  Author: Thomas Tuegel 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

  Changed paths:
M pkgs/tools/networking/isync/unstable.nix

  Log Message:
  ---
  isyncUnstable: 2015-11-08 -> 20161218

The extra dashes are removed from the version number because Nix treats only the
first component as the version, i.e. `2015-11-08` is version `2015` with two
tags `-11` and `-08`.


  Commit: 3994004a6f8db87f0deb99afc2081bcc3c975d77
  
https://github.com/NixOS/nixpkgs/commit/3994004a6f8db87f0deb99afc2081bcc3c975d77
  Author: Thomas Tuegel 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

  Changed paths:
M pkgs/tools/networking/isync/unstable.nix

  Log Message:
  ---
  isyncUnstable: build with zlib support


  Commit: 953a1e76a25239577441443848506a5a4c46c457
  
https://github.com/NixOS/nixpkgs/commit/953a1e76a25239577441443848506a5a4c46c457
  Author: Thomas Tuegel 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

  Changed paths:
M pkgs/tools/networking/isync/unstable.nix

  Log Message:
  ---
  isyncUnstable: add ttuegel to maintainers


  Commit: a6eb4669b129eaf608c981a1ad11293aee0ec8df
  
https://github.com/NixOS/nixpkgs/commit/a6eb4669b129eaf608c981a1ad11293aee0ec8df
  Author: Robin Gloster 
  Date:   2017-02-17 (Fri, 17 Feb 2017)

  Changed paths:
M pkgs/tools/networking/isync/unstable.nix

  Log Message:
  ---
  Merge pull request #22872 from ttuegel/isync

Update isync-git, with several other improvements


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


[Nix-commits] [NixOS/nixpkgs] 53c2e3: qbittorrent: 3.3.7 -> 3.3.10

2017-02-16 Thread romildo
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 53c2e38e0d16fa10db8237bdeef3ed824c3ffef4
  
https://github.com/NixOS/nixpkgs/commit/53c2e38e0d16fa10db8237bdeef3ed824c3ffef4
  Author: romildo 
  Date:   2017-02-17 (Fri, 17 Feb 2017)

  Changed paths:
M pkgs/applications/networking/p2p/qbittorrent/default.nix

  Log Message:
  ---
  qbittorrent: 3.3.7 -> 3.3.10


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


[Nix-commits] [NixOS/nixpkgs] c1fb4e: keybase: 1.0.18 -> 20170209.17b641d

2017-02-16 Thread Bjarki Ágúst Guðmundsson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: c1fb4ec0413c412f2fdb692f21d9737f457a2b1b
  
https://github.com/NixOS/nixpkgs/commit/c1fb4ec0413c412f2fdb692f21d9737f457a2b1b
  Author: Bjarki Ágúst Guðmundsson 
  Date:   2017-02-17 (Fri, 17 Feb 2017)

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

  Log Message:
  ---
  keybase: 1.0.18 -> 20170209.17b641d


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


[Nix-commits] [NixOS/nixpkgs] 17f566: keybase-gui: init at 20170209.17b641d

2017-02-16 Thread Brian McKenna
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 17f566d1e191290683fac0b3e93428db12e5dd13
  
https://github.com/NixOS/nixpkgs/commit/17f566d1e191290683fac0b3e93428db12e5dd13
  Author: Brian McKenna 
  Date:   2017-02-17 (Fri, 17 Feb 2017)

  Changed paths:
A pkgs/tools/security/keybase-gui/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  keybase-gui: init at 20170209.17b641d

The GUI requires the keybase and kbfs packages to be installed and
running with /keybase as the mount.


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


[Nix-commits] [NixOS/nixpkgs] 8561af: kbfs: 1.0.2 -> 20170209.d1db463

2017-02-16 Thread Bjarki Ágúst Guðmundsson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 8561af2db91464de3737592794389acfc99e9648
  
https://github.com/NixOS/nixpkgs/commit/8561af2db91464de3737592794389acfc99e9648
  Author: Bjarki Ágúst Guðmundsson 
  Date:   2017-02-17 (Fri, 17 Feb 2017)

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

  Log Message:
  ---
  kbfs: 1.0.2 -> 20170209.d1db463


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


[Nix-commits] [NixOS/nixpkgs] 0ea76e: wuzz: 2017-02-09 -> 0.1.0

2017-02-16 Thread Pradeep Chhetri
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 0ea76ef83126e05b4704328b2a7f8959bcc495fe
  
https://github.com/NixOS/nixpkgs/commit/0ea76ef83126e05b4704328b2a7f8959bcc495fe
  Author: Pradeep Chhetri 
  Date:   2017-02-17 (Fri, 17 Feb 2017)

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

  Log Message:
  ---
  wuzz: 2017-02-09 -> 0.1.0


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


[Nix-commits] [NixOS/nixpkgs] 7ab871: consul: 0.7.3 -> 0.7.5

2017-02-16 Thread Pradeep Chhetri
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 7ab871b394c25c37295e26787c9d9f5de5591dcc
  
https://github.com/NixOS/nixpkgs/commit/7ab871b394c25c37295e26787c9d9f5de5591dcc
  Author: Pradeep Chhetri 
  Date:   2017-02-17 (Fri, 17 Feb 2017)

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

  Log Message:
  ---
  consul: 0.7.3 -> 0.7.5


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


[Nix-commits] [NixOS/nixpkgs] 3e484e: consul-template: 0.18.0 -> 0.18.1

2017-02-16 Thread Pradeep Chhetri
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 3e484e7880679e5217660ee5a6a0489241ea9eb8
  
https://github.com/NixOS/nixpkgs/commit/3e484e7880679e5217660ee5a6a0489241ea9eb8
  Author: Pradeep Chhetri 
  Date:   2017-02-17 (Fri, 17 Feb 2017)

  Changed paths:
M pkgs/tools/system/consul-template/default.nix

  Log Message:
  ---
  consul-template: 0.18.0 -> 0.18.1


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


[Nix-commits] [NixOS/nixpkgs] cfea44: phpPackages.memcached: add missing zlib build depe...

2017-02-16 Thread Mogria
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: cfea4469208ab01d2d60bac080c70ff856241a4d
  
https://github.com/NixOS/nixpkgs/commit/cfea4469208ab01d2d60bac080c70ff856241a4d
  Author: Mogria 
  Date:   2017-02-17 (Fri, 17 Feb 2017)

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

  Log Message:
  ---
  phpPackages.memcached: add missing zlib build dependency


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


[Nix-commits] [NixOS/nixpkgs] 90d225: microsoft_gsl: init at 2017-02-13

2017-02-16 Thread David Terry
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 90d225db766baa997a2ded830de968d27432b9d8
  
https://github.com/NixOS/nixpkgs/commit/90d225db766baa997a2ded830de968d27432b9d8
  Author: David Terry 
  Date:   2017-02-17 (Fri, 17 Feb 2017)

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

  Log Message:
  ---
  microsoft_gsl: init at 2017-02-13


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


[Nix-commits] [NixOS/nixpkgs] 651585: awless: init at 0.0.13

2017-02-16 Thread Pradeep Chhetri
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 6515854248601b78ef08f52c3de7b80858892d5f
  
https://github.com/NixOS/nixpkgs/commit/6515854248601b78ef08f52c3de7b80858892d5f
  Author: Pradeep Chhetri 
  Date:   2017-02-17 (Fri, 17 Feb 2017)

  Changed paths:
A pkgs/tools/virtualization/awless/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  awless: init at 0.0.13


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


[Nix-commits] [NixOS/nixpkgs] 108c6d: socat: 1.7.3.1 -> 1.7.3.2

2017-02-16 Thread Robin Gloster
  Branch: refs/heads/staging
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 108c6d1a03ea945a9c6d9de8b36dce3c262a8686
  
https://github.com/NixOS/nixpkgs/commit/108c6d1a03ea945a9c6d9de8b36dce3c262a8686
  Author: Robin Gloster 
  Date:   2017-02-17 (Fri, 17 Feb 2017)

  Changed paths:
M pkgs/tools/networking/socat/default.nix
R pkgs/tools/networking/socat/enable-ecdhe.patch

  Log Message:
  ---
  socat: 1.7.3.1 -> 1.7.3.2

fixes compatibility with openssl 1.1.0 (and libressl)


  Commit: 71e8ef6e766804214c16be4f432f921b6653d149
  
https://github.com/NixOS/nixpkgs/commit/71e8ef6e766804214c16be4f432f921b6653d149
  Author: Robin Gloster 
  Date:   2017-02-17 (Fri, 17 Feb 2017)

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

  Log Message:
  ---
  afflib: 3.7.6 -> 3.7.15


  Commit: 4277978fb26ddc18499b2e5cb9e11c3689dbec6c
  
https://github.com/NixOS/nixpkgs/commit/4277978fb26ddc18499b2e5cb9e11c3689dbec6c
  Author: Robin Gloster 
  Date:   2017-02-17 (Fri, 17 Feb 2017)

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

  Log Message:
  ---
  gsoap: 2.8.37 -> 2.8.42


  Commit: 9d39e8b974900b98f376e49dabdeb7a614b99514
  
https://github.com/NixOS/nixpkgs/commit/9d39e8b974900b98f376e49dabdeb7a614b99514
  Author: Robin Gloster 
  Date:   2017-02-17 (Fri, 17 Feb 2017)

  Changed paths:
M pkgs/applications/networking/mailreaders/imapfilter.nix

  Log Message:
  ---
  imapfilter: 2.6.3 -> 2.6.10


  Commit: 80d8b8c71660aa9607d45481e8ece491bec302bc
  
https://github.com/NixOS/nixpkgs/commit/80d8b8c71660aa9607d45481e8ece491bec302bc
  Author: Robin Gloster 
  Date:   2017-02-17 (Fri, 17 Feb 2017)

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

  Log Message:
  ---
  mongoc: 1.1.10 -> 1.5.4


  Commit: c3011fde96f4f8645ca8672ac02e91a16eba9276
  
https://github.com/NixOS/nixpkgs/commit/c3011fde96f4f8645ca8672ac02e91a16eba9276
  Author: Robin Gloster 
  Date:   2017-02-17 (Fri, 17 Feb 2017)

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

  Log Message:
  ---
  neon: 0.30.1 -> 0.30.2


  Commit: f6778c8137e089c059742f13db21eced669a08d7
  
https://github.com/NixOS/nixpkgs/commit/f6778c8137e089c059742f13db21eced669a08d7
  Author: Robin Gloster 
  Date:   2017-02-17 (Fri, 17 Feb 2017)

  Changed paths:
M pkgs/tools/networking/aircrack-ng/default.nix

  Log Message:
  ---
  aircrack-ng: 1.2-rc3 -> 1.2-rc4


  Commit: df58ed2f131d19dfbf8b6bb1bab7490cf09cdebb
  
https://github.com/NixOS/nixpkgs/commit/df58ed2f131d19dfbf8b6bb1bab7490cf09cdebb
  Author: Robin Gloster 
  Date:   2017-02-17 (Fri, 17 Feb 2017)

  Changed paths:
M pkgs/os-specific/linux/hostapd/default.nix

  Log Message:
  ---
  hostapd: 2.5 -> 2.6


  Commit: 46966ad4e5458289c7b477f4b0cf84d5ff480e0a
  
https://github.com/NixOS/nixpkgs/commit/46966ad4e5458289c7b477f4b0cf84d5ff480e0a
  Author: Robin Gloster 
  Date:   2017-02-17 (Fri, 17 Feb 2017)

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

  Log Message:
  ---
  ipmitool: 1.8.15 -> 1.8.17


  Commit: 6729b9e23bb054a0cd6019c4d6dfc5fd209e85a7
  
https://github.com/NixOS/nixpkgs/commit/6729b9e23bb054a0cd6019c4d6dfc5fd209e85a7
  Author: Robin Gloster 
  Date:   2017-02-17 (Fri, 17 Feb 2017)

  Changed paths:
M pkgs/servers/irc/ircd-hybrid/default.nix

  Log Message:
  ---
  ircdHybrid: 8.2.2 -> 8.2.21


  Commit: bee26ba6b250e0cb2b3d2d52f7139a87d8c2056f
  
https://github.com/NixOS/nixpkgs/commit/bee26ba6b250e0cb2b3d2d52f7139a87d8c2056f
  Author: Robin Gloster 
  Date:   2017-02-17 (Fri, 17 Feb 2017)

  Changed paths:
M pkgs/tools/security/lastpass-cli/default.nix

  Log Message:
  ---
  lastpass-cli: 1.0.0 -> 1.1.1


  Commit: 7977cc4451a24119932755ba1ec5a38dc7b9c8f0
  
https://github.com/NixOS/nixpkgs/commit/7977cc4451a24119932755ba1ec5a38dc7b9c8f0
  Author: Robin Gloster 
  Date:   2017-02-17 (Fri, 17 Feb 2017)

  Changed paths:
M pkgs/servers/irc/ngircd/default.nix

  Log Message:
  ---
  ngircd: 21 -> 24


  Commit: 900cc90fbe635ebdf614a7c7d205a9b292641c00
  
https://github.com/NixOS/nixpkgs/commit/900cc90fbe635ebdf614a7c7d205a9b292641c00
  Author: Robin Gloster 
  Date:   2017-02-17 (Fri, 17 Feb 2017)

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

  Log Message:
  ---
  openfortivpn: 1.1.4 -> 1.2.0


  Commit: 96b4d69136dabcdd718dc40d3e554ba24943feb6
  
https://github.com/NixOS/nixpkgs/commit/96b4d69136dabcdd718dc40d3e554ba24943feb6
  Author: Robin Gloster 
  Date:   2017-02-17 (Fri, 17 Feb 2017)

  Changed paths:
M pkgs/os-specific/linux/open-isns/default.nix

  Log Message:
  ---
  

[Nix-commits] [NixOS/nixpkgs] 31ff2a: systemd: add patch to fix docker

2017-02-16 Thread Robin Gloster
  Branch: refs/heads/staging
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 31ff2ac05792a5132ae87c968c35bd51419750d1
  
https://github.com/NixOS/nixpkgs/commit/31ff2ac05792a5132ae87c968c35bd51419750d1
  Author: Robin Gloster 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

  Changed paths:
M pkgs/os-specific/linux/systemd/default.nix

  Log Message:
  ---
  systemd: add patch to fix docker

https://github.com/systemd/systemd/commit/843d5baf6aad6c53fc00ea8d95d83209a4f92de1

"don't use the unified hierarchy for the systemd cgroup yet"

fixes #22472


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


[Nix-commits] [NixOS/nixpkgs] 4ebfc1: keepalived: 1.2.19 -> 1.3.2

2017-02-16 Thread Joachim F
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 4ebfc1933563943711e1e4326c964faf30c332be
  
https://github.com/NixOS/nixpkgs/commit/4ebfc1933563943711e1e4326c964faf30c332be
  Author: Marius Bergmann 
  Date:   2017-02-15 (Wed, 15 Feb 2017)

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

  Log Message:
  ---
  keepalived: 1.2.19 -> 1.3.2


  Commit: 32befcb62b7680bf579e0b084f29dd3e50d1b988
  
https://github.com/NixOS/nixpkgs/commit/32befcb62b7680bf579e0b084f29dd3e50d1b988
  Author: Joachim F 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

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

  Log Message:
  ---
  Merge pull request #22754 from mbrgm/update-keepalived

keepalived: 1.2.19 -> 1.3.2


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


Re: [Nix-dev] Explicitly selecting sources for "src" in stdenv.mkDerivation?

2017-02-16 Thread Bas van Dijk
At LumiGuide we're using the following function in our Haskell packages:

  # Copy everything under src into the Nix store except those paths that
don't
  # have one of the specified allowedPrefixes.
  whitelistSource = src: allowedPrefixes:
builtins.filterSource
  (path: type:
lib.any (allowedPrefix: lib.hasPrefix (toString (src + "/${
allowedPrefix}")) path)
allowedPrefixes)
  src;

To be used as for example:

  src = lib.whitelistSource ./. [
  "lumi-central-server.cabal"
  "src"
  "default.conf"
];

Bas

Op 16 feb. 2017 13:14 schreef "Thomas Hunger" :

Hi,

I am consistently struggling with the following in nix: I have a repository
and I want to specify derivations for some local sub-projects. The obvious
solution is

  src = ./subproject-A;

But that pulls in everything in that directory, including build artifacts,
or random intermediate data files.

Another solution is

  src = sourceFilesBySuffices ./subproject-A [".cabal" ".hs"];

Which works reasonably well but introduces this weird dance where I suffix
files so they can be matched by sourceFilesBySuffices. Mostly I want to do
this:

  src = [ ./subproject-A/schema.sql ./subproject-A/lib ];

Or even get all the files checked into git:

  src = gitFiles ./subproject-A; # does not work

I was wondering whether any of you have this issue, and if you do: how do
you solve it?

~

(see also https://github.com/NixOS/nix/issues/885)

___
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] 6e1240: Revert "nginx: Format the config file"

2017-02-16 Thread Robin Gloster
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 6e12406e30b263ea7ce49a784c85f5a727b5fc8a
  
https://github.com/NixOS/nixpkgs/commit/6e12406e30b263ea7ce49a784c85f5a727b5fc8a
  Author: Robin Gloster 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

  Changed paths:
M nixos/modules/services/web-servers/nginx/default.nix

  Log Message:
  ---
  Revert "nginx: Format the config file"

This reverts commit e362a3d5c94ba379d428fbd2cc40470719a61556.

See #22883


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


[Nix-commits] [NixOS/nixpkgs] 3f971d: vault: 0.6.4 -> 0.6.5

2017-02-16 Thread Daniel Peebles
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 3f971d9863e4551aca97aefbb59f5d764f09f655
  
https://github.com/NixOS/nixpkgs/commit/3f971d9863e4551aca97aefbb59f5d764f09f655
  Author: Pradeep Chhetri 
  Date:   2017-02-17 (Fri, 17 Feb 2017)

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

  Log Message:
  ---
  vault: 0.6.4 -> 0.6.5


  Commit: 96c152f98eeffe3fd532dcd208479a01513b34f2
  
https://github.com/NixOS/nixpkgs/commit/96c152f98eeffe3fd532dcd208479a01513b34f2
  Author: Daniel Peebles 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

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

  Log Message:
  ---
  Merge pull request #22881 from pradeepchhetri/vault-update

vault: 0.6.4 -> 0.6.5


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


[Nix-commits] [NixOS/nixpkgs] c37464: ghostscript: fix installed library name on darwin

2017-02-16 Thread Daiderd Jordan
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: c37464a9b1e533c723b5a63a016c939dbc921326
  
https://github.com/NixOS/nixpkgs/commit/c37464a9b1e533c723b5a63a016c939dbc921326
  Author: Anthony Cowley 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

  Changed paths:
M pkgs/misc/ghostscript/default.nix

  Log Message:
  ---
  ghostscript: fix installed library name on darwin


  Commit: 2fe40506accc37f18a944f85c6b5373ec0bfd470
  
https://github.com/NixOS/nixpkgs/commit/2fe40506accc37f18a944f85c6b5373ec0bfd470
  Author: Daiderd Jordan 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

  Changed paths:
M pkgs/misc/ghostscript/default.nix

  Log Message:
  ---
  Merge pull request #22875 from acowley/ghostscript-id

ghostscript: fix installed library name on darwin


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


[Nix-commits] [NixOS/nixpkgs] 0c42ef: SDL2: fix creation of libSDL2main.a

2017-02-16 Thread Lluís Batlle i Rossell
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 0c42efd9d70774eafb47212967caada630335731
  
https://github.com/NixOS/nixpkgs/commit/0c42efd9d70774eafb47212967caada630335731
  Author: Lluís Batlle i Rossell 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

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

  Log Message:
  ---
  SDL2: fix creation of libSDL2main.a

It's required by a trigger rally update I will commit next.
And other games use that too.


  Commit: 1e7da9ec78d11f586fc74747d77b17f91969a7ed
  
https://github.com/NixOS/nixpkgs/commit/1e7da9ec78d11f586fc74747d77b17f91969a7ed
  Author: Lluís Batlle i Rossell 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

  Changed paths:
M pkgs/games/trigger/default.nix

  Log Message:
  ---
  trigger: update to 0.6.5


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


[Nix-commits] [NixOS/nixpkgs] 6c1ba7: kde5.khotkey: fix patch hash wrongly added in b719...

2017-02-16 Thread Vladimír Čunát
  Branch: refs/heads/staging
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 6c1ba728789073f182a9d30d061ceb962fbdb1ee
  
https://github.com/NixOS/nixpkgs/commit/6c1ba728789073f182a9d30d061ceb962fbdb1ee
  Author: Vladimír Čunát 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

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

  Log Message:
  ---
  kde5.khotkey: fix patch hash wrongly added in b719852


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


[Nix-commits] [NixOS/nixpkgs] e62fe3: zstd: update to 1.1.3

2017-02-16 Thread Lluís Batlle i Rossell
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: e62fe375757fb3175b859bb6dc171a23e15726c8
  
https://github.com/NixOS/nixpkgs/commit/e62fe375757fb3175b859bb6dc171a23e15726c8
  Author: Lluís Batlle i Rossell 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

  Changed paths:
M pkgs/tools/compression/zstd/default.nix

  Log Message:
  ---
  zstd: update to 1.1.3


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


[Nix-commits] [NixOS/nixpkgs] 0cee46: brotli: update to 0.5.2

2017-02-16 Thread Lluís Batlle i Rossell
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 0cee46dd217641baf09a8dee40e80ff4c32d47d6
  
https://github.com/NixOS/nixpkgs/commit/0cee46dd217641baf09a8dee40e80ff4c32d47d6
  Author: Lluís Batlle i Rossell 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

  Changed paths:
M pkgs/tools/compression/brotli/default.nix

  Log Message:
  ---
  brotli: update to 0.5.2

>From 0.3.0


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


[Nix-commits] [NixOS/nixpkgs] 9debda: networking.bonds: add support for arbitrary driver...

2017-02-16 Thread Profpatsch
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 9debdaf512bc510f7f5d5450c4902e7d1f713274
  
https://github.com/NixOS/nixpkgs/commit/9debdaf512bc510f7f5d5450c4902e7d1f713274
  Author: Profpatsch 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

  Changed paths:
M nixos/modules/tasks/network-interfaces-scripted.nix
M nixos/modules/tasks/network-interfaces.nix
M nixos/tests/networking.nix

  Log Message:
  ---
  networking.bonds: add support for arbitrary driverOptions

Until now the four attributes available very selectively provided a small
subset, while copying upstream documentation.

We make driver options an arbitrary key-value set and point to kernel
documentation, which is always up-to-date. This way every option can be set.
The four already existing options are deprecated with a warning.


  Commit: bb797c1390971753f17f33882cfd477bc0f6d186
  
https://github.com/NixOS/nixpkgs/commit/bb797c1390971753f17f33882cfd477bc0f6d186
  Author: Profpatsch 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

  Changed paths:
M nixos/modules/system/boot/networkd.nix
M nixos/modules/tasks/network-interfaces-systemd.nix

  Log Message:
  ---
  networking.networkd: adjust autmatic mapping of bonds

Since the bonds interface changed to a lot more possible values we create a
mapping of kernel bond attribute names and values to networkd attributes.
Those match for the most part, but have to transformed slightly.

There is also an assert that unknown options won’t slip through silently.


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


[Nix-commits] [NixOS/nixpkgs] 03024b: tex4ht: fixup evaluation errors in the broken pack...

2017-02-16 Thread Vladimír Čunát
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 03024b39b7d4b94724faa1a62f21aed3531bb35a
  
https://github.com/NixOS/nixpkgs/commit/03024b39b7d4b94724faa1a62f21aed3531bb35a
  Author: Vladimír Čunát 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

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

  Log Message:
  ---
  tex4ht: fixup evaluation errors in the broken package

https://github.com/NixOS/nixpkgs/pull/22873#issuecomment-280390590


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


[Nix-commits] [NixOS/nixpkgs] 5ad81a: libxml2: bugfix updates from git upstream

2017-02-16 Thread Vladimír Čunát
  Branch: refs/heads/staging
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 5ad81ab09c86a7acc99b31224a6aeb8fca4c152e
  
https://github.com/NixOS/nixpkgs/commit/5ad81ab09c86a7acc99b31224a6aeb8fca4c152e
  Author: Vladimír Čunát 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

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

  Log Message:
  ---
  libxml2: bugfix updates from git upstream

This should solve CVE-2016-5131 and some other bugs, but not what Suse
calls CVE-2016-9597: https://bugzilla.suse.com/show_bug.cgi?id=1017497
The bugzilla discussion seems to indicate that the CVE is referenced
incorrectly and only shows reproducing when using command-line flags
that are considered "unsafe".

CVE-2016-9318 also remains unfixed, as I consider their reasoning OK:
https://lwn.net/Alerts/714411/

/cc #22826.


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


Re: [Nix-dev] Explicitly selecting sources for "src" in stdenv.mkDerivation?

2017-02-16 Thread zimbatm
I've been using filterSource. It works okay but is a bit too generic. It
would be nice to have a function that understands a gitignore-like syntax.

On Thu, 16 Feb 2017, 12:44 Profpatsch,  wrote:

> On 17-02-16 01:28pm, Freddy Rietdijk wrote:
> > > src = [ ./subproject-A/schema.sql ./subproject-A/lib ];
> >
> > Each of the files you mentioned here will be stored in a separate store
> > path. You could write a simple function that takes a list of derivations
> > and copies the contents of those derivations in a new output.
>
> Also maybe take a look at the `filterSource` builtin.
> There’s also some wrappers for common setups in lib/sources.nix
>
> --
> Proudly written in Mutt with Vim on NixOS.
> Q: Why is this email five sentences or less?
> A: http://five.sentenc.es
> May take up to five days to read your message. If it’s urgent, call me.
> ___
> 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] 524de8: findutils: plug a memory leak (close #22857)

2017-02-16 Thread Vladimír Čunát
  Branch: refs/heads/staging
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 524de86db03a0dbecb9c51353cdd70bc0b74a8a5
  
https://github.com/NixOS/nixpkgs/commit/524de86db03a0dbecb9c51353cdd70bc0b74a8a5
  Author: Vladimír Čunát 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

  Changed paths:
M pkgs/tools/misc/findutils/default.nix
A pkgs/tools/misc/findutils/memory-leak.patch

  Log Message:
  ---
  findutils: plug a memory leak (close #22857)

Using the upstream patch directly.  It's copied in nixpkgs, because:
 - fetchpatch isn't usable at this point in bootstrapping,
 - the upstream patch creates collisions in NEWS.


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


[Nix-commits] [NixOS/nixpkgs] 568331: AgdaStdlib: v0.12 -> v0.13

2017-02-16 Thread Vladimír Čunát
  Branch: refs/heads/staging
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 5683311b7c0ae5c20f7cdb3ae219b7bff7491d3f
  
https://github.com/NixOS/nixpkgs/commit/5683311b7c0ae5c20f7cdb3ae219b7bff7491d3f
  Author: laMudri 
  Date:   2016-12-24 (Sat, 24 Dec 2016)

  Changed paths:
M pkgs/development/libraries/agda/agda-stdlib/default.nix

  Log Message:
  ---
  AgdaStdlib: v0.12 -> v0.13


  Commit: 8cef304ede7f8d9d3647dcb885e05df9d097469c
  
https://github.com/NixOS/nixpkgs/commit/8cef304ede7f8d9d3647dcb885e05df9d097469c
  Author: Peter Hoeg 
  Date:   2017-02-14 (Tue, 14 Feb 2017)

  Changed paths:
A pkgs/development/libraries/libtoxcore/default.nix
A pkgs/development/libraries/libtoxcore/new-api.nix
R pkgs/development/libraries/libtoxcore/new-api/default.nix
A pkgs/development/libraries/libtoxcore/old-api.nix
R pkgs/development/libraries/libtoxcore/old-api/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  libtoxcore: init at 0.1.6 and move old versions away


  Commit: 5a88ab3f55327a87c44671178d9304312b3f9df4
  
https://github.com/NixOS/nixpkgs/commit/5a88ab3f55327a87c44671178d9304312b3f9df4
  Author: Peter Hoeg 
  Date:   2017-02-14 (Tue, 14 Feb 2017)

  Changed paths:
M 
pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  tox-prpl: 20141202 -> 0.5.1


  Commit: eb52ef12c2a025d87e1c6a6e1500fc2e4fc39f60
  
https://github.com/NixOS/nixpkgs/commit/eb52ef12c2a025d87e1c6a6e1500fc2e4fc39f60
  Author: Peter Hoeg 
  Date:   2017-02-14 (Tue, 14 Feb 2017)

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

  Log Message:
  ---
  ratox: use libtoxcore-old


  Commit: a66e04d3bec08581efb3e21188eb7625e72eaeee
  
https://github.com/NixOS/nixpkgs/commit/a66e04d3bec08581efb3e21188eb7625e72eaeee
  Author: Peter Hoeg 
  Date:   2017-02-14 (Tue, 14 Feb 2017)

  Changed paths:
M pkgs/applications/networking/instant-messengers/toxic/default.nix

  Log Message:
  ---
  toxic: 20160728 -> 0.7.2


  Commit: 7690ec0022c8da7aa813b6b2440fe0daeb5467f2
  
https://github.com/NixOS/nixpkgs/commit/7690ec0022c8da7aa813b6b2440fe0daeb5467f2
  Author: Peter Hoeg 
  Date:   2017-02-14 (Tue, 14 Feb 2017)

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

  Log Message:
  ---
  toxvpn: 20160909 -> 20161230


  Commit: e110f38bd4f3997ef1e71e26b6c3fe2c31487b17
  
https://github.com/NixOS/nixpkgs/commit/e110f38bd4f3997ef1e71e26b6c3fe2c31487b17
  Author: Peter Hoeg 
  Date:   2017-02-14 (Tue, 14 Feb 2017)

  Changed paths:
M pkgs/applications/networking/instant-messengers/utox/default.nix

  Log Message:
  ---
  utox: 0.9.8 -> 0.12.2


  Commit: 55e1d04e91f8e3600064e1972c84b9fbc31623ee
  
https://github.com/NixOS/nixpkgs/commit/55e1d04e91f8e3600064e1972c84b9fbc31623ee
  Author: Peter Hoeg 
  Date:   2017-02-14 (Tue, 14 Feb 2017)

  Changed paths:
M pkgs/applications/networking/instant-messengers/qtox/default.nix

  Log Message:
  ---
  qtox: 1.5.0 -> 1.8.1


  Commit: 020fb2cce1684e84da2b584374a85e4d5f36fae1
  
https://github.com/NixOS/nixpkgs/commit/020fb2cce1684e84da2b584374a85e4d5f36fae1
  Author: Bas van Dijk 
  Date:   2017-02-14 (Tue, 14 Feb 2017)

  Changed paths:
M pkgs/tools/system/syslog-ng/default.nix

  Log Message:
  ---
  syslog-ng: 3.6.2 -> 3.9.1

This should fix: https://github.com/NixOS/nixpkgs/issues/20153


  Commit: 4e72d2da504a0e6b957df7d15ca280e6f314ac8b
  
https://github.com/NixOS/nixpkgs/commit/4e72d2da504a0e6b957df7d15ca280e6f314ac8b
  Author: Toni Reina 
  Date:   2017-02-14 (Tue, 14 Feb 2017)

  Changed paths:
M pkgs/development/libraries/aspell/dictionaries.nix

  Log Message:
  ---
  aspell-dict-ca: init at 2.1.5-1


  Commit: 057fae5ea0e6efa7356f444b505294267e6427d5
  
https://github.com/NixOS/nixpkgs/commit/057fae5ea0e6efa7356f444b505294267e6427d5
  Author: Bas van Dijk 
  Date:   2017-02-14 (Tue, 14 Feb 2017)

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

  Log Message:
  ---
  ghcWithHoogle: fix for ghcjs

`haskell.packages.ghcjs.ghcWithHoogle` failed because the following line:

  for docdir in ${ghc.doc}/${docLibGlob}/*; do

failed because `doc` is not an attribute of `ghc` when `ghc` is
substituted for ghcjs.


  Commit: e38f7c625e58a05f0c461599183da6511e7613cd
  
https://github.com/NixOS/nixpkgs/commit/e38f7c625e58a05f0c461599183da6511e7613cd
  Author: Franz Pletz 
  Date:   2017-02-15 (Wed, 15 Feb 2017)

  Changed paths:
M pkgs/tools/system/syslog-ng/default.nix

  Log Message:
  ---
  syslog-ng: refactor

[Nix-commits] [NixOS/nixpkgs] b17268: amazon-init NixOS module: fix (I think) race condi...

2017-02-16 Thread Daniel Peebles
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: b172684c17aa1eea76a996ab888cef13ea7a16af
  
https://github.com/NixOS/nixpkgs/commit/b172684c17aa1eea76a996ab888cef13ea7a16af
  Author: Dan Peebles 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

  Changed paths:
M nixos/modules/virtualisation/amazon-init.nix

  Log Message:
  ---
  amazon-init NixOS module: fix (I think) race condition with network

The initialization code is now a systemd service that explicitly
waits for network-online, so the occasional failure I was seeing
because the `nixos-rebuild` couldn't get anything from the binary
cache should stop. I hope!


  Commit: 19a9099eb25795a8caa408f842a5254920157456
  
https://github.com/NixOS/nixpkgs/commit/19a9099eb25795a8caa408f842a5254920157456
  Author: Daniel Peebles 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

  Changed paths:
M nixos/modules/virtualisation/amazon-init.nix

  Log Message:
  ---
  Merge pull request #22869 from copumpkin/amazon-init-fix

amazon-init NixOS module: fix (I think) race condition with network


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


[Nix-commits] [NixOS/nixops]

2017-02-16 Thread rbvermaa
  Branch: refs/tags/v1.5
  Home:   https://github.com/NixOS/nixops
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 1c366b: nixops: update to 1.5

2017-02-16 Thread Rob Vermaas
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 1c366b4e0647abea0385395dcb2981a5b3161cf8
  
https://github.com/NixOS/nixpkgs/commit/1c366b4e0647abea0385395dcb2981a5b3161cf8
  Author: Rob Vermaas 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

  Changed paths:
M pkgs/tools/package-management/nixops/default.nix
M pkgs/tools/package-management/nixops/generic.nix
M pkgs/tools/package-management/nixops/unstable.nix

  Log Message:
  ---
  nixops: update to 1.5

(cherry picked from commit 780a38c611162c34229c9d06b09dd4ec2f8466f4)


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


[Nix-commits] [NixOS/nixpkgs] 780a38: nixops: update to 1.5

2017-02-16 Thread Rob Vermaas
  Branch: refs/heads/release-16.09
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 780a38c611162c34229c9d06b09dd4ec2f8466f4
  
https://github.com/NixOS/nixpkgs/commit/780a38c611162c34229c9d06b09dd4ec2f8466f4
  Author: Rob Vermaas 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

  Changed paths:
M pkgs/tools/package-management/nixops/default.nix
M pkgs/tools/package-management/nixops/generic.nix
M pkgs/tools/package-management/nixops/unstable.nix

  Log Message:
  ---
  nixops: update to 1.5


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


[Nix-commits] [NixOS/nixpkgs] 463e90: pam: add optional pam_kwallet5 integration

2017-02-16 Thread Thomas Tuegel
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 463e90273fba176931d58e633707106c8f11d23a
  
https://github.com/NixOS/nixpkgs/commit/463e90273fba176931d58e633707106c8f11d23a
  Author: Benjamin Staffin 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

  Changed paths:
M nixos/modules/security/pam.nix
M nixos/modules/services/x11/desktop-managers/kde5.nix

  Log Message:
  ---
  pam: add optional pam_kwallet5 integration


  Commit: 7c260ad2cce34b428c3c7a3fd40ac6f607dbe87b
  
https://github.com/NixOS/nixpkgs/commit/7c260ad2cce34b428c3c7a3fd40ac6f607dbe87b
  Author: Thomas Tuegel 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

  Changed paths:
M nixos/modules/security/pam.nix
M nixos/modules/services/x11/desktop-managers/kde5.nix

  Log Message:
  ---
  Merge pull request #22813 from benley/pam-kwallet

nixos: add optional pam_kwallet5 integration


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


[Nix-commits] [NixOS/nixpkgs] 17e9f2: parsel: 1.0.3 -> 1.1.0

2017-02-16 Thread Frederik Rietdijk
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 17e9f21b9c48ef488f305f3c5161743c8605b092
  
https://github.com/NixOS/nixpkgs/commit/17e9f21b9c48ef488f305f3c5161743c8605b092
  Author: Tom Hunger 
  Date:   2017-02-15 (Wed, 15 Feb 2017)

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

  Log Message:
  ---
  parsel: 1.0.3 -> 1.1.0


  Commit: dde5350971953d7bc06f1b3bb540f1806ad06f00
  
https://github.com/NixOS/nixpkgs/commit/dde5350971953d7bc06f1b3bb540f1806ad06f00
  Author: Tom Hunger 
  Date:   2017-02-15 (Wed, 15 Feb 2017)

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

  Log Message:
  ---
  w3lib: 1.14.2 -> 1.17.0


  Commit: c10b0e7bc4b001da7d0530765ba84c79f9432530
  
https://github.com/NixOS/nixpkgs/commit/c10b0e7bc4b001da7d0530765ba84c79f9432530
  Author: Tom Hunger 
  Date:   2017-02-15 (Wed, 15 Feb 2017)

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

  Log Message:
  ---
  scrapy: 1.1.2 -> 1.3.1


  Commit: 69363e96113598d95f9083346d5600cc64e349fd
  
https://github.com/NixOS/nixpkgs/commit/69363e96113598d95f9083346d5600cc64e349fd
  Author: Tom Hunger 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

  Changed paths:
A pkgs/development/python-modules/scrapy/default.nix
A pkgs/development/python-modules/scrapy/permissions-fix.patch
M pkgs/top-level/python-packages.nix

  Log Message:
  ---
  Move scrapy to its own module and add patch to fix broken permission code.

Scrapy is usually installed via pip where copying all permissions
makes sense. In Nix the files copied are owned by root and
readonly. As a consequence scrapy can't edit the project templates so

  scrapy startproject

fails.


  Commit: 624cd8ae9eecc42d04559b8f1c36cb1bd4796fbf
  
https://github.com/NixOS/nixpkgs/commit/624cd8ae9eecc42d04559b8f1c36cb1bd4796fbf
  Author: Frederik Rietdijk 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

  Changed paths:
A pkgs/development/python-modules/scrapy/default.nix
A pkgs/development/python-modules/scrapy/permissions-fix.patch
M pkgs/top-level/python-packages.nix

  Log Message:
  ---
  Merge pull request #22593 from teh/master

Update scrapy & dependencies


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


[Nix-commits] [NixOS/nixpkgs] 3ee25d: containers module: Add option to enable tunnel acc...

2017-02-16 Thread Graham Christensen
  Branch: refs/heads/release-16.09
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 3ee25d42c7f705dcdeb01a3dc40c3452b18896b0
  
https://github.com/NixOS/nixpkgs/commit/3ee25d42c7f705dcdeb01a3dc40c3452b18896b0
  Author: Wilhelm Schuster 
  Date:   2016-10-13 (Thu, 13 Oct 2016)

  Changed paths:
M nixos/modules/virtualisation/containers.nix

  Log Message:
  ---
  containers module: Add option to enable tunnel access

This adds the containers..enableTun option allowing containers to
access /dev/net/tun. This is required by openvpn, tinc, etc. in order to
work properly inside containers.

The new option builds on top of two generic options
containers..additionalCapabilities and
containers..allowedDevices which also can be used for example when
adding support for FUSE later down the road.

Backported to 16.09.


  Commit: feb901f7c66c30754744e5f2c905d11171eda34e
  
https://github.com/NixOS/nixpkgs/commit/feb901f7c66c30754744e5f2c905d11171eda34e
  Author: Graham Christensen 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

  Changed paths:
M nixos/modules/virtualisation/containers.nix

  Log Message:
  ---
  Merge pull request #19523 from rasendubi/containers-dev-tun

Allow access to /dev/net/tun inside containers (port to 16.09)


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


[Nix-commits] [NixOS/nix] 40f0e3: Include "curl" in the User-Agent header

2017-02-16 Thread Eelco Dolstra
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nix
  Commit: 40f0e3b366458a6f1bc09a366a218abf13a1af1e
  
https://github.com/NixOS/nix/commit/40f0e3b366458a6f1bc09a366a218abf13a1af1e
  Author: Eelco Dolstra 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

  Changed paths:
M src/libstore/download.cc

  Log Message:
  ---
  Include "curl" in the User-Agent header

Some sites (e.g. BitBucket) give a helpful 401 error when trying to
download a private archive if the User-Agent contains "curl", but give
a redirect to a login page otherwise (so for instance
"nix-prefetch-url" will succeed but produce useless output).


  Commit: b63f79175e128f8ae394d2be7d65999263eebe27
  
https://github.com/NixOS/nix/commit/b63f79175e128f8ae394d2be7d65999263eebe27
  Author: Eelco Dolstra 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

  Changed paths:
M corepkgs/fetchurl.nix

  Log Message:
  ---
  : Remove unnecessary assertion


  Commit: bd5388e7b22daa2d22c21578ef5735be8b8353a6
  
https://github.com/NixOS/nix/commit/bd5388e7b22daa2d22c21578ef5735be8b8353a6
  Author: Eelco Dolstra 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

  Changed paths:
M doc/manual/command-ref/conf-file.xml

  Log Message:
  ---
  Tweak netrc docs


  Commit: cde4b609192d11dc299ea3c27d7f92735f161db1
  
https://github.com/NixOS/nix/commit/cde4b609192d11dc299ea3c27d7f92735f161db1
  Author: Eelco Dolstra 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

  Changed paths:
M perl/lib/Nix/Store.xs
M src/libmain/shared.cc
M src/libstore/download.cc
M src/libstore/globals.cc
M src/libstore/globals.hh

  Log Message:
  ---
  Move netrcFile to Settings

Also get rid of Settings::processEnvironment(), it appears to be
useless.


  Commit: 302386f775eea309679654e5ea7c972fb6e7b9af
  
https://github.com/NixOS/nix/commit/302386f775eea309679654e5ea7c972fb6e7b9af
  Author: Eelco Dolstra 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

  Changed paths:
M src/libstore/build.cc
M src/libstore/builtins.cc
M src/libstore/builtins.hh
M src/libutil/util.cc
M src/libutil/util.hh

  Log Message:
  ---
  Support netrc in 

This allows  to fetch private Git/Mercurial
repositories, e.g.

  import  {
url = 
https://edols...@bitbucket.org/edolstra/my-private-repo/get/80a14018daed.tar.bz2;
sha256 = "1mgqzn7biqkq3hf2697b0jc4wabkqhmzq2srdymjfa6sb9zb6qs7";
  }

where /etc/nix/netrc contains:

  machine bitbucket.org
  login edolstra
  password blabla...

This works even when sandboxing is enabled.

To do: add unpacking support (i.e. fetchzip functionality).


Compare: https://github.com/NixOS/nix/compare/d1139ff36b5d...302386f775ee___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] a72dc9: compton: 0.1_beta2 -> 0.1_beta2.5

2017-02-16 Thread Nikolay Amiantov
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: a72dc9f3bfc26cf59075fb8e01ac6f3e448793dc
  
https://github.com/NixOS/nixpkgs/commit/a72dc9f3bfc26cf59075fb8e01ac6f3e448793dc
  Author: Nikolay Amiantov 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

  Changed paths:
M pkgs/applications/window-managers/compton/default.nix

  Log Message:
  ---
  compton: 0.1_beta2 -> 0.1_beta2.5


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


[Nix-commits] [NixOS/nixpkgs] 9f7ec8: openssl: 1.1.0d -> 1.1.0e for High severity CVE-20...

2017-02-16 Thread Matthew Maurer
  Branch: refs/heads/release-16.09
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 9f7ec8102ecfaa8c035154ed58c68743a06173b3
  
https://github.com/NixOS/nixpkgs/commit/9f7ec8102ecfaa8c035154ed58c68743a06173b3
  Author: Matthew Maurer 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

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

  Log Message:
  ---
  openssl: 1.1.0d -> 1.1.0e for High severity CVE-2017-3733

(cherry picked from commit 0d2ba7ef2b85403d2b8b001409c53fe99fa147bc)


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


[Nix-commits] [NixOS/nixpkgs] 0d2ba7: openssl: 1.1.0d -> 1.1.0e for High severity CVE-20...

2017-02-16 Thread Graham Christensen
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 0d2ba7ef2b85403d2b8b001409c53fe99fa147bc
  
https://github.com/NixOS/nixpkgs/commit/0d2ba7ef2b85403d2b8b001409c53fe99fa147bc
  Author: Matthew Maurer 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

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

  Log Message:
  ---
  openssl: 1.1.0d -> 1.1.0e for High severity CVE-2017-3733


  Commit: cfbddd3ae0d95adb040c09d52b06cf121db971a8
  
https://github.com/NixOS/nixpkgs/commit/cfbddd3ae0d95adb040c09d52b06cf121db971a8
  Author: Graham Christensen 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

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

  Log Message:
  ---
  Merge pull request #22867 from maurer/openssl-cve-2017-3733

openssl: 1.1.0d -> 1.1.0e for High severity CVE-2017-3733


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


[Nix-commits] [NixOS/nixpkgs] e355b9: geteltorito: init at 0.6 (#18614)

2017-02-16 Thread Bjørn Forsman
  Branch: refs/heads/release-16.09
  Home:   https://github.com/NixOS/nixpkgs
  Commit: e355b970c79afec4fdd3fc0c4505821d8923e4c8
  
https://github.com/NixOS/nixpkgs/commit/e355b970c79afec4fdd3fc0c4505821d8923e4c8
  Author: Profpatsch 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

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

  Log Message:
  ---
  geteltorito: init at 0.6 (#18614)

(cherry picked from commit c535924f5f2cd1278d29a50d3f78042961088420)


  Commit: 5e303aaae8fb2beb5ee7c2896131059f09179784
  
https://github.com/NixOS/nixpkgs/commit/5e303aaae8fb2beb5ee7c2896131059f09179784
  Author: Profpatsch 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

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

  Log Message:
  ---
  geteltorito: switch to upstream dist (#19226)

Upstream has now a versioned release, so we switch over from the github
mirror.
(cherry picked from commit bc8733aae609aa83678458f5a0dc47008fc7e22e)


  Commit: 3c227aaa5324186f2b943622ceed585e3880384d
  
https://github.com/NixOS/nixpkgs/commit/3c227aaa5324186f2b943622ceed585e3880384d
  Author: Bjørn Forsman 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

  Changed paths:
A pkgs/tools/filesystems/genimage/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  genimage: init at 9

Genimage is a tool to generate filesystem images from directory trees.

(cherry picked from commit a1892edcee7da13fb4dda1a2e6fc22b9d904671b)


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


[Nix-commits] [NixOS/nixpkgs] 2d6436: mozart: refactoring

2017-02-16 Thread Joachim Fasting
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 2d643613f3f56bc23060cc3bedbff231dd9e9e1e
  
https://github.com/NixOS/nixpkgs/commit/2d643613f3f56bc23060cc3bedbff231dd9e9e1e
  Author: Joachim Fasting 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

  Changed paths:
M pkgs/development/compilers/mozart/binary.nix
R pkgs/development/compilers/mozart/builder.sh

  Log Message:
  ---
  mozart: refactoring

- Append emacs to the oz wrapper's command search path rather than the
  rpath.  Previously, emacs would end up in the closure but the oz
  shell script would not be helped by it. Now a user without emacs in
  their PATH can still get the complete Oz experience (which depends
  crucially on emacs).  To build a variant without emacs, do
  mozart.override { emacs = null; }
- Patch full path to oz executable into the oz desktop item to make the
  output less reliant on the runtime PATH
- Compress .elc files to save a little bit of space
- Make it easier to extend platform support
- Inline builder.sh
- Be more specific about patching.  oz and ozc are capable of inferring
  OZHOME themselves; thus we generate wrappers only for the binary
  executable components.

Note that gmp and boost would be removed by patchelf --shrink-path; I've
no idea whether they are used somehow, so we leave them in and forego
rpath shrinking for now.


  Commit: bc2f53fd295c5e9f290b6705789653497aeb047a
  
https://github.com/NixOS/nixpkgs/commit/bc2f53fd295c5e9f290b6705789653497aeb047a
  Author: Joachim Fasting 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

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

  Log Message:
  ---
  grsecurity: 4.9.8-201702071801 -> 4.9.10-201702152052


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


[Nix-commits] [NixOS/nixpkgs] a46258: lxappearance: 0.6.2 -> 0.6.3 (#22865)

2017-02-16 Thread José Romildo Malaquias
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: a46258ed0adae68ee46380a7f5eeef810a884c11
  
https://github.com/NixOS/nixpkgs/commit/a46258ed0adae68ee46380a7f5eeef810a884c11
  Author: José Romildo Malaquias 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

  Changed paths:
M pkgs/desktops/lxde/core/lxappearance/default.nix

  Log Message:
  ---
  lxappearance: 0.6.2 -> 0.6.3 (#22865)


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


[Nix-commits] [NixOS/nixpkgs] 5125ec: blueman: add librsvg

2017-02-16 Thread Nikolay Amiantov
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 5125ecb2c189ca542a37d9066019005c188b74ed
  
https://github.com/NixOS/nixpkgs/commit/5125ecb2c189ca542a37d9066019005c188b74ed
  Author: Nikolay Amiantov 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

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

  Log Message:
  ---
  blueman: add librsvg


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


[Nix-commits] [NixOS/nixpkgs] 073ca2: aspcu: 1.9.0 -> 1.9.1

2017-02-16 Thread Graham Christensen
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 073ca2b34faf33e835ac136024f9b1f419f8b1fa
  
https://github.com/NixOS/nixpkgs/commit/073ca2b34faf33e835ac136024f9b1f419f8b1fa
  Author: Graham Christensen 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

  Changed paths:
M pkgs/tools/misc/aspcud/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  aspcu: 1.9.0 -> 1.9.1


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


[Nix-commits] [NixOS/nixpkgs] a597e3: caddy: 0.9.2 -> 0.9.5

2017-02-16 Thread Graham Christensen
  Branch: refs/heads/release-16.09
  Home:   https://github.com/NixOS/nixpkgs
  Commit: a597e30c2a81b0d80e191e42e6be50fd054ab586
  
https://github.com/NixOS/nixpkgs/commit/a597e30c2a81b0d80e191e42e6be50fd054ab586
  Author: rnhmjoj 
  Date:   2017-02-08 (Wed, 08 Feb 2017)

  Changed paths:
M pkgs/servers/caddy/default.nix
M pkgs/servers/caddy/deps.nix

  Log Message:
  ---
  caddy: 0.9.2 -> 0.9.5


  Commit: c1f233112196954edae90e7c11316b9bef355e13
  
https://github.com/NixOS/nixpkgs/commit/c1f233112196954edae90e7c11316b9bef355e13
  Author: Graham Christensen 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

  Changed paths:
M pkgs/servers/caddy/default.nix
M pkgs/servers/caddy/deps.nix

  Log Message:
  ---
  Merge pull request #22544 from rnhmjoj/caddy-backport

caddy: 0.9.2 -> 0.9.5 (backport)


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


Re: [Nix-dev] Explicitly selecting sources for "src" in stdenv.mkDerivation?

2017-02-16 Thread Profpatsch
On 17-02-16 01:28pm, Freddy Rietdijk wrote:
> > src = [ ./subproject-A/schema.sql ./subproject-A/lib ];
> 
> Each of the files you mentioned here will be stored in a separate store
> path. You could write a simple function that takes a list of derivations
> and copies the contents of those derivations in a new output.

Also maybe take a look at the `filterSource` builtin.
There’s also some wrappers for common setups in lib/sources.nix

-- 
Proudly written in Mutt with Vim on NixOS.
Q: Why is this email five sentences or less?
A: http://five.sentenc.es
May take up to five days to read your message. If it’s urgent, call me.
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev


[Nix-commits] [NixOS/nixpkgs] 6d8235: boost: 1.63.0 (not default)

2017-02-16 Thread Graham Christensen
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 6d8235210d34a914e55589f056626561c6eb1eaf
  
https://github.com/NixOS/nixpkgs/commit/6d8235210d34a914e55589f056626561c6eb1eaf
  Author: Ilya Kolpakov 
  Date:   2017-02-15 (Wed, 15 Feb 2017)

  Changed paths:
A pkgs/development/libraries/boost/1.63.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  boost: 1.63.0 (not default)


  Commit: 52026edf98d06982a4c23491697cba3cffa8c768
  
https://github.com/NixOS/nixpkgs/commit/52026edf98d06982a4c23491697cba3cffa8c768
  Author: Graham Christensen 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

  Changed paths:
A pkgs/development/libraries/boost/1.63.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  Merge pull request #22839 from ilya-kolpakov/master

boost: 1.63.0 (not default)


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


Re: [Nix-dev] Explicitly selecting sources for "src" in stdenv.mkDerivation?

2017-02-16 Thread Linus Heckemann
On 16/02/17 12:28, Freddy Rietdijk wrote:
>> src = [ ./subproject-A/schema.sql ./subproject-A/lib ];
> 
> Each of the files you mentioned here will be stored in a separate store
> path. You could write a simple function that takes a list of derivations
> and copies the contents of those derivations in a new output.

Or use symlinkJoin, which does that but without the copying.
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev


[Nix-commits] [NixOS/nixpkgs] 434aff: openbox: fix openbox-xdg-autostart

2017-02-16 Thread Nikolay Amiantov
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 434affb14df7b5b785b835c4d8651effc16279be
  
https://github.com/NixOS/nixpkgs/commit/434affb14df7b5b785b835c4d8651effc16279be
  Author: Nikolay Amiantov 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

  Changed paths:
M pkgs/applications/window-managers/openbox/default.nix

  Log Message:
  ---
  openbox: fix openbox-xdg-autostart

Also add more optional dependencies.


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


Re: [Nix-dev] Explicitly selecting sources for "src" in stdenv.mkDerivation?

2017-02-16 Thread Freddy Rietdijk
> src = [ ./subproject-A/schema.sql ./subproject-A/lib ];

Each of the files you mentioned here will be stored in a separate store
path. You could write a simple function that takes a list of derivations
and copies the contents of those derivations in a new output.

On Thu, Feb 16, 2017 at 1:14 PM, Thomas Hunger  wrote:

> Hi,
>
> I am consistently struggling with the following in nix: I have a
> repository and I want to specify derivations for some local sub-projects.
> The obvious solution is
>
>   src = ./subproject-A;
>
> But that pulls in everything in that directory, including build artifacts,
> or random intermediate data files.
>
> Another solution is
>
>   src = sourceFilesBySuffices ./subproject-A [".cabal" ".hs"];
>
> Which works reasonably well but introduces this weird dance where I suffix
> files so they can be matched by sourceFilesBySuffices. Mostly I want to do
> this:
>
>   src = [ ./subproject-A/schema.sql ./subproject-A/lib ];
>
> Or even get all the files checked into git:
>
>   src = gitFiles ./subproject-A; # does not work
>
> I was wondering whether any of you have this issue, and if you do: how do
> you solve it?
>
> ~
>
> (see also https://github.com/NixOS/nix/issues/885)
>
> ___
> 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-dev] Explicitly selecting sources for "src" in stdenv.mkDerivation?

2017-02-16 Thread Thomas Hunger
Hi,

I am consistently struggling with the following in nix: I have a repository
and I want to specify derivations for some local sub-projects. The obvious
solution is

  src = ./subproject-A;

But that pulls in everything in that directory, including build artifacts,
or random intermediate data files.

Another solution is

  src = sourceFilesBySuffices ./subproject-A [".cabal" ".hs"];

Which works reasonably well but introduces this weird dance where I suffix
files so they can be matched by sourceFilesBySuffices. Mostly I want to do
this:

  src = [ ./subproject-A/schema.sql ./subproject-A/lib ];

Or even get all the files checked into git:

  src = gitFiles ./subproject-A; # does not work

I was wondering whether any of you have this issue, and if you do: how do
you solve it?

~

(see also https://github.com/NixOS/nix/issues/885)
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev


[Nix-commits] [NixOS/nix] e6e74f: Add netrc-file support

2017-02-16 Thread Eelco Dolstra
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nix
  Commit: e6e74f987f0fa284d220432d426eb965269a97d6
  
https://github.com/NixOS/nix/commit/e6e74f987f0fa284d220432d426eb965269a97d6
  Author: Renzo Carbonara 
  Date:   2017-02-02 (Thu, 02 Feb 2017)

  Changed paths:
M doc/manual/command-ref/conf-file.xml
M src/libstore/download.cc

  Log Message:
  ---
  Add netrc-file support


  Commit: e2257d4eeb3f75bac57d9cb77c9ce06b702de050
  
https://github.com/NixOS/nix/commit/e2257d4eeb3f75bac57d9cb77c9ce06b702de050
  Author: Renzo Carbonara 
  Date:   2017-02-09 (Thu, 09 Feb 2017)

  Changed paths:
M src/libstore/download.cc

  Log Message:
  ---
  Documentation.


  Commit: d1139ff36b5df48ddf76600ad17e59a9d1dcd46a
  
https://github.com/NixOS/nix/commit/d1139ff36b5df48ddf76600ad17e59a9d1dcd46a
  Author: Eelco Dolstra 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

  Changed paths:
M doc/manual/command-ref/conf-file.xml
M src/libstore/download.cc

  Log Message:
  ---
  Merge pull request #1215 from k0001/netrc-1

Add netrc-file support


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


[Nix-commits] [NixOS/nixpkgs] 34584b: hackage: update snapshot to 2017-02-12T15:49:03Z

2017-02-16 Thread Peter Simons
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 34584b2c3c09b2517568a8bd44a23f1a015d67e2
  
https://github.com/NixOS/nixpkgs/commit/34584b2c3c09b2517568a8bd44a23f1a015d67e2
  Author: Peter Simons 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

  Changed paths:
M pkgs/data/misc/hackage/default.nix

  Log Message:
  ---
  hackage: update snapshot to 2017-02-12T15:49:03Z


  Commit: 918a5926c6b945e8effdc894fec761331c971cdd
  
https://github.com/NixOS/nixpkgs/commit/918a5926c6b945e8effdc894fec761331c971cdd
  Author: Peter Simons 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

  Changed paths:
M pkgs/development/haskell-modules/configuration-hackage2nix.yaml

  Log Message:
  ---
  hackage2nix: drop obsolete extra packages


  Commit: 5e910bcbf6d1d0760e097f216f28fb8d06b9d9c8
  
https://github.com/NixOS/nixpkgs/commit/5e910bcbf6d1d0760e097f216f28fb8d06b9d9c8
  Author: Peter Simons 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

  Changed paths:
M pkgs/development/haskell-modules/hackage-packages.nix

  Log Message:
  ---
  hackage-packages.nix: automatic Haskell package set update

This update was generated by hackage2nix v2.0.4-12-gf83834c from Hackage 
revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/2701517fd67fdbecb477b0afb1382e7083aba1a2.


  Commit: 3c0b1919e7440262a9d0d259d77d5ba142e44af5
  
https://github.com/NixOS/nixpkgs/commit/3c0b1919e7440262a9d0d259d77d5ba142e44af5
  Author: Peter Simons 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

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

  Log Message:
  ---
  git-annex: update sha256 hash for the new version


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


[Nix-commits] [NixOS/nixpkgs] 790e5b: ecryptfs: fix after security wrapper change

2017-02-16 Thread Robin Gloster
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 790e5bf4d8aac5da407274350712b402b5d73c89
  
https://github.com/NixOS/nixpkgs/commit/790e5bf4d8aac5da407274350712b402b5d73c89
  Author: Robin Gloster 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

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

  Log Message:
  ---
  ecryptfs: fix after security wrapper change

The replacements matched to much due to wrapperDir having `/bin` in its
path now.

cc #16654


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


[Nix-commits] [NixOS/nixpkgs] 0418f7: terraform: 0.8.6 -> 0.8.7

2017-02-16 Thread Peter Hoeg
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 0418f784b2616795ba2e0412ab883f4624ee1304
  
https://github.com/NixOS/nixpkgs/commit/0418f784b2616795ba2e0412ab883f4624ee1304
  Author: Peter Hoeg 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

  Changed paths:
M pkgs/applications/networking/cluster/terraform/default.nix

  Log Message:
  ---
  terraform: 0.8.6 -> 0.8.7


  Commit: de31599f3f82dcee60b24c68c05258ce80017336
  
https://github.com/NixOS/nixpkgs/commit/de31599f3f82dcee60b24c68c05258ce80017336
  Author: Peter Hoeg 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

  Changed paths:
M pkgs/applications/networking/cluster/terraform/default.nix

  Log Message:
  ---
  Merge pull request #22859 from peterhoeg/u/tf

terraform: 0.8.6 -> 0.8.7


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


[Nix-commits] [NixOS/nixpkgs] 97fc80: nix-prefetch-zip: Remove

2017-02-16 Thread Eelco Dolstra
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 97fc806a7b40babe7872bdb5cb1361bd7f8c2b3f
  
https://github.com/NixOS/nixpkgs/commit/97fc806a7b40babe7872bdb5cb1361bd7f8c2b3f
  Author: Eelco Dolstra 
  Date:   2017-02-16 (Thu, 16 Feb 2017)

  Changed paths:
R pkgs/build-support/fetchzip/nix-prefetch-zip
M pkgs/tools/package-management/nix-prefetch-scripts/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  nix-prefetch-zip: Remove

This script is not needed anymore since "nix-prefetch-url --unpack
" and "nix-prefetch-url -A foo.src" (where "foo.src" is a
fetchzip / fetchFromGitHub call) work fine.


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