[Nix-dev] Overriding a Haskell package can't be that hard...

2016-06-23 Thread Cody Goodman
I was trying to use the cassandra-thrift haskell package and there was a
bug in one if it's dependencies, thrift. I fixed the bug in thrift and then
went to the nix haskell guide to find out how to override "thrift" with my
bugfixed version.

I came up with this from the haskell guide (
http://nixos.org/nixpkgs/manual/#how-to-build-projects-that-depend-on-each-other
):

{ pkgs }: {
packageOverrides = super: let self = super.pkgs; in
  {
haskellPackages = super.haskellPackages.override {
  overrides = self: super: {
thrift = self.callPackage /home/cody/sources/thrift/lib/hs {};
  };
};
  };

  allowUnfree = true;
  firefox = {
 enableGoogleTalkPlugin = true;
 enableAdobeFlash = true;
  };

and then finally tried the example from ocharle's wiki on nix/haskell,
which involved putting the override in shell.nix like below:

with (import  {}).pkgs;
let modifiedHaskellPackages = haskellPackages.override {
  overrides = self: super: {
thrift = self.callPackage /home/cody/sources/thrift/lib/hs {};
  };
};
in modifiedHaskellPackages.hscassandra.env

I'm a little dismayed since I even went through all 19 or so of the nix
pills(
http://lethalman.blogspot.com/2014/07/nix-pill-1-why-you-should-give-it-try.html)
thinking I just needed to brush up on nix.

If someone could also explain these snippets and how they work in detail or
differently than the resources I've looked at many times:

http://nixos.org/nixpkgs/manual/#how-to-build-projects-that-depend-on-each-other
http://lethalman.blogspot.com/2014/07/nix-pill-1-why-you-should-give-it-try.html
http://wiki.ocharles.org.uk/Nix#multiple-project-usage

If possible, any example git repositories with multiple haskell
projects/overrides would be amazing.

Thank you all for your time.

Sincerely,

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


[Nix-commits] [NixOS/nixpkgs] d7dc83: efl: 1.17.1 -> 1.17.2

2016-06-23 Thread zimbatm
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: d7dc833889b64a04305b384f9db57d5ab7cbf3d9
  
https://github.com/NixOS/nixpkgs/commit/d7dc833889b64a04305b384f9db57d5ab7cbf3d9
  Author: José Romildo Malaquias 
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
M pkgs/desktops/enlightenment/efl.nix

  Log Message:
  ---
  efl: 1.17.1 -> 1.17.2


  Commit: d5092e3342c1d56a5b7c07f504069ac6109fb1a1
  
https://github.com/NixOS/nixpkgs/commit/d5092e3342c1d56a5b7c07f504069ac6109fb1a1
  Author: zimbatm 
  Date:   2016-06-24 (Fri, 24 Jun 2016)

  Changed paths:
M pkgs/desktops/enlightenment/efl.nix

  Log Message:
  ---
  Merge pull request #16431 from romildo/upd.efl

efl: 1.17.1 -> 1.17.2


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


[Nix-commits] [NixOS/nixpkgs] b586b0: gnupg21: 2.1.12 -> 2.1.13

2016-06-23 Thread zimbatm
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: b586b00b3b0e2e2a2074422412d65990b00bf78b
  
https://github.com/NixOS/nixpkgs/commit/b586b00b3b0e2e2a2074422412d65990b00bf78b
  Author: Rahul Gopinath 
  Date:   2016-06-23 (Thu, 23 Jun 2016)

  Changed paths:
M pkgs/tools/security/gnupg/21.nix

  Log Message:
  ---
  gnupg21: 2.1.12 -> 2.1.13


  Commit: ec91698ace81dea98bdb210de3fc38ac999c6cf1
  
https://github.com/NixOS/nixpkgs/commit/ec91698ace81dea98bdb210de3fc38ac999c6cf1
  Author: Rahul Gopinath 
  Date:   2016-06-23 (Thu, 23 Jun 2016)

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

  Log Message:
  ---
  libgcrypt: 1.7.0 -> 1.7.1


  Commit: 1ad68e58df9b398640fe6e754247e0d437c01dc0
  
https://github.com/NixOS/nixpkgs/commit/1ad68e58df9b398640fe6e754247e0d437c01dc0
  Author: Rahul Gopinath 
  Date:   2016-06-23 (Thu, 23 Jun 2016)

  Changed paths:
M pkgs/development/libraries/libgpg-error/default.nix

  Log Message:
  ---
  libgpg-error: 1.21 -> 1.23


  Commit: e0dd0c902d260f486cf052668874d653b24f2ede
  
https://github.com/NixOS/nixpkgs/commit/e0dd0c902d260f486cf052668874d653b24f2ede
  Author: zimbatm 
  Date:   2016-06-24 (Fri, 24 Jun 2016)

  Changed paths:
M pkgs/development/libraries/libgcrypt/default.nix
M pkgs/development/libraries/libgpg-error/default.nix
M pkgs/tools/security/gnupg/21.nix

  Log Message:
  ---
  Merge pull request #16446 from vrthra/gnupg21

gnupg21: 2.1.12 -> 2.1.13


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


[Nix-commits] [NixOS/nixpkgs] ffe0b4: bviplus: fix build

2016-06-23 Thread zimbatm
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: ffe0b43dc0e472eabf2a109d073f0eac0c51
  
https://github.com/NixOS/nixpkgs/commit/ffe0b43dc0e472eabf2a109d073f0eac0c51
  Author: Igor Sharonov 
  Date:   2016-06-23 (Thu, 23 Jun 2016)

  Changed paths:
M pkgs/applications/editors/bviplus/default.nix

  Log Message:
  ---
  bviplus: fix build


  Commit: a53427144f3525b7492885c27dd58f979d770b5c
  
https://github.com/NixOS/nixpkgs/commit/a53427144f3525b7492885c27dd58f979d770b5c
  Author: zimbatm 
  Date:   2016-06-24 (Fri, 24 Jun 2016)

  Changed paths:
M pkgs/applications/editors/bviplus/default.nix

  Log Message:
  ---
  Merge pull request #16464 from igsha/fix-bviplus

bviplus: fix build


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


[Nix-commits] [NixOS/nixpkgs] a4787f: vscode: 1.0.0 -> 1.2.1

2016-06-23 Thread zimbatm
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: a4787f09cc79244829539a7e6846efcbbecea99e
  
https://github.com/NixOS/nixpkgs/commit/a4787f09cc79244829539a7e6846efcbbecea99e
  Author: Simon Vandel Sillesen 
  Date:   2016-06-23 (Thu, 23 Jun 2016)

  Changed paths:
M pkgs/applications/editors/vscode/default.nix

  Log Message:
  ---
  vscode: 1.0.0 -> 1.2.1

fixes #15548


  Commit: e93131f0b1260a51fa398044b6e722da2dc36007
  
https://github.com/NixOS/nixpkgs/commit/e93131f0b1260a51fa398044b6e722da2dc36007
  Author: zimbatm 
  Date:   2016-06-24 (Fri, 24 Jun 2016)

  Changed paths:
M pkgs/applications/editors/vscode/default.nix

  Log Message:
  ---
  Merge pull request #16465 from simonvandel/vscode-1.2.1

vscode: 1.0.0 -> 1.2.1


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


[Nix-commits] [NixOS/nixpkgs] 892ff1: davmail: 4.7.1 -> 4.7.2

2016-06-23 Thread zimbatm
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 892ff1ad204c97858da0781ccc4567289e73c0ad
  
https://github.com/NixOS/nixpkgs/commit/892ff1ad204c97858da0781ccc4567289e73c0ad
  Author: Jos van den Oever 
  Date:   2016-06-24 (Fri, 24 Jun 2016)

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

  Log Message:
  ---
  davmail: 4.7.1 -> 4.7.2

Bugfix release, detect Exchange throttling to temporarily block requests and a 
few Carddav fixes.

EWS:
- EWS: handle Exchange throttling, suspend all requests according to server 
provided delay
- EWS: send DavMailException instead of authentication exception on EWS not 
available error

Enhancements:
- 128x128 DavMail icon
- Add a new davmail.httpMaxRedirects setting
- DAV: add a hidden davmail.disableNTLM setting

Carddav:
- Carddav: fix another regression on contact create with empty field
- Carddav: remove email over EWS unit test
- Carddav: fix email address removal over EWS


  Commit: 4d4d608e378a735e4cf5af40e1f881c5e476e1f4
  
https://github.com/NixOS/nixpkgs/commit/4d4d608e378a735e4cf5af40e1f881c5e476e1f4
  Author: zimbatm 
  Date:   2016-06-24 (Fri, 24 Jun 2016)

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

  Log Message:
  ---
  Merge pull request #16469 from vandenoever/davmail

davmail: 4.7.1 -> 4.7.2


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


[Nix-commits] [NixOS/nixpkgs] c13195: networkmanager: Dependency on avahi-autoipd has be...

2016-06-23 Thread obadz
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: c1319572d4d32297588c95234b37f73abab50d85
  
https://github.com/NixOS/nixpkgs/commit/c1319572d4d32297588c95234b37f73abab50d85
  Author: Alexander Ried 
  Date:   2016-06-23 (Thu, 23 Jun 2016)

  Changed paths:
M nixos/modules/services/networking/networkmanager.nix
M pkgs/tools/networking/network-manager/default.nix

  Log Message:
  ---
  networkmanager: Dependency on avahi-autoipd has been dropped.

Native IPv4 link-local addressing configuration based on systemd network 
library is now used instead.


  Commit: 64a9dc4dd7f6a00d05c1e855daead0b692e0e981
  
https://github.com/NixOS/nixpkgs/commit/64a9dc4dd7f6a00d05c1e855daead0b692e0e981
  Author: Alexander Ried 
  Date:   2016-06-23 (Thu, 23 Jun 2016)

  Changed paths:
M pkgs/tools/networking/network-manager/default.nix

  Log Message:
  ---
  networkmanager: cleanup


  Commit: a6a11b3852174e6c2c1940a8a67aa96546e1054b
  
https://github.com/NixOS/nixpkgs/commit/a6a11b3852174e6c2c1940a8a67aa96546e1054b
  Author: Alexander Ried 
  Date:   2016-06-23 (Thu, 23 Jun 2016)

  Changed paths:
M pkgs/tools/networking/network-manager-applet/default.nix

  Log Message:
  ---
  network-manager-applet: remove unused dbus_glib dependency


  Commit: e13a76f97873a1f1aec5e5ba8502dbecf956f0cc
  
https://github.com/NixOS/nixpkgs/commit/e13a76f97873a1f1aec5e5ba8502dbecf956f0cc
  Author: obadz 
  Date:   2016-06-23 (Thu, 23 Jun 2016)

  Changed paths:
M nixos/modules/services/networking/networkmanager.nix
M pkgs/tools/networking/network-manager-applet/default.nix
M pkgs/tools/networking/network-manager/default.nix

  Log Message:
  ---
  Merge pull request #16467 from groxxda/bump/networkmanager

networkmanager: cleanup


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


[Nix-commits] [NixOS/nixpkgs] 24520a: network-manager/l2tp: remove workaround that's now...

2016-06-23 Thread obadz
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 24520af0faf831f977c2f38d41c757c6b24a6072
  
https://github.com/NixOS/nixpkgs/commit/24520af0faf831f977c2f38d41c757c6b24a6072
  Author: obadz 
  Date:   2016-06-23 (Thu, 23 Jun 2016)

  Changed paths:
M pkgs/tools/networking/network-manager/l2tp.nix

  Log Message:
  ---
  network-manager/l2tp: remove workaround that's now in main repo


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


[Nix-commits] [NixOS/nixpkgs] 5ee7f0: wine: fix gstreamer support

2016-06-23 Thread Nikolay Amiantov
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 5ee7f081e300a573b356848d3270dbf3aae2de89
  
https://github.com/NixOS/nixpkgs/commit/5ee7f081e300a573b356848d3270dbf3aae2de89
  Author: Nikolay Amiantov 
  Date:   2016-06-24 (Fri, 24 Jun 2016)

  Changed paths:
M pkgs/misc/emulators/wine/base.nix

  Log Message:
  ---
  wine: fix gstreamer support


  Commit: 8399068b80de149b0e20c0eed489869bcbf2a341
  
https://github.com/NixOS/nixpkgs/commit/8399068b80de149b0e20c0eed489869bcbf2a341
  Author: Nikolay Amiantov 
  Date:   2016-06-24 (Fri, 24 Jun 2016)

  Changed paths:
M pkgs/misc/emulators/wine/sources.nix

  Log Message:
  ---
  winetricks: 20160219 -> 20160622


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


[Nix-commits] [NixOS/nixpkgs] b27ebf: datamash: 1.0.7 -> 1.1.0

2016-06-23 Thread Joachim Fasting
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: b27ebfa4a7274d772cfeceb3b060f5ec162ca63c
  
https://github.com/NixOS/nixpkgs/commit/b27ebfa4a7274d772cfeceb3b060f5ec162ca63c
  Author: Rahul Gopinath 
  Date:   2016-06-23 (Thu, 23 Jun 2016)

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

  Log Message:
  ---
  datamash: 1.0.7 -> 1.1.0


  Commit: 4c5e9f933d2f7308673e804d6c3b8c6aefe53947
  
https://github.com/NixOS/nixpkgs/commit/4c5e9f933d2f7308673e804d6c3b8c6aefe53947
  Author: Joachim Fasting 
  Date:   2016-06-23 (Thu, 23 Jun 2016)

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

  Log Message:
  ---
  Merge pull request #16445 from vrthra/datamash

datamash: 1.0.7 -> 1.1.0


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


[Nix-commits] [NixOS/nixpkgs] 018043: terra: set meta.platforms

2016-06-23 Thread Joachim Fasting
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 01804364d25b597c324f64aa578ba9895f9c5f1e
  
https://github.com/NixOS/nixpkgs/commit/01804364d25b597c324f64aa578ba9895f9c5f1e
  Author: Joachim Fasting 
  Date:   2016-06-23 (Thu, 23 Jun 2016)

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

  Log Message:
  ---
  terra: set meta.platforms

Upstream claims MacOS, Linux, and Windows as supported platforms; set to unix
for now.


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


Re: [Nix-dev] nix-shell, user-environments and persistent environments - confusion!

2016-06-23 Thread Matthias Beyer
Hi,

just want to set a ping on this, maybe someone can help me here.

On 20-06-2016 19:59:19, Matthias Beyer wrote:
> Hi,
> 
> maybe someone can clear things up for me:
> 
> I want persistent development environments[0] which is do-able, but 
> nowhere is stated how to upgrade and even more important: remove these 
> environments.
> 
> Another thing is, that sometimes it could be a nice idea to create an 
> environment and install it in the local user environment - how does 
> one do that? So that I have to type something like `enter-foo-env` and 
> it spins up a nix-shell environment, basically a persistent nix-shell 
> which is installed in my environment (not system-wide).
> 
> Maybe I'm just too stupid to find the appropriate docs... feel free to 
> point me into the right direction or throw some links in my face. :-)
> 
> [0]: 
> https://nixos.org/wiki/Development_Environments#Making_a_Persistent_nix-shell_Environment
> 

-- 
Mit freundlichen Grüßen,
Kind regards,
Matthias Beyer

Proudly sent with mutt.
Happily signed with gnupg.


signature.asc
Description: PGP signature
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev


[Nix-commits] [NixOS/nixpkgs] 14f3ec: pythonPackage.word2vec: init at 0.9.1

2016-06-23 Thread Frederik Rietdijk
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 14f3ec571862776bda67af34a4f518abaa9ec1e6
  
https://github.com/NixOS/nixpkgs/commit/14f3ec571862776bda67af34a4f518abaa9ec1e6
  Author: NikolaMandic 
  Date:   2016-06-17 (Fri, 17 Jun 2016)

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

  Log Message:
  ---
  pythonPackage.word2vec: init at 0.9.1


  Commit: a48f1472f56b660e898e7c8e8475fbc390c64126
  
https://github.com/NixOS/nixpkgs/commit/a48f1472f56b660e898e7c8e8475fbc390c64126
  Author: Frederik Rietdijk 
  Date:   2016-06-23 (Thu, 23 Jun 2016)

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

  Log Message:
  ---
  Merge pull request #15937 from NikolaMandic/word2vec

pythonPackage.word2vec: init at 0.9.1


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


[Nix-commits] [NixOS/nixpkgs] 09492d: zstd: set meta.platforms to unix

2016-06-23 Thread Tobias Geerinckx-Rice
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 09492d3b858b1aa32184fb113e93c4c1e5fc3ce0
  
https://github.com/NixOS/nixpkgs/commit/09492d3b858b1aa32184fb113e93c4c1e5fc3ce0
  Author: Florian 
  Date:   2016-06-23 (Thu, 23 Jun 2016)

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

  Log Message:
  ---
  zstd: set meta.platforms to unix


  Commit: f91dcf3a1513034d433c13e2f45f51f832ff9e77
  
https://github.com/NixOS/nixpkgs/commit/f91dcf3a1513034d433c13e2f45f51f832ff9e77
  Author: Tobias Geerinckx-Rice 
  Date:   2016-06-23 (Thu, 23 Jun 2016)

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

  Log Message:
  ---
  Merge pull request #16461 from fmu/patch-1

zstd: set meta.platforms to unix


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


[Nix-commits] [NixOS/nixpkgs] 34363d: xpra: add missing python 'rencode' module

2016-06-23 Thread Bjørn Forsman
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 34363d77b0cbb9bc8046691b12d21fa4463f8233
  
https://github.com/NixOS/nixpkgs/commit/34363d77b0cbb9bc8046691b12d21fa4463f8233
  Author: Bjørn Forsman 
  Date:   2016-06-23 (Thu, 23 Jun 2016)

  Changed paths:
M pkgs/tools/X11/xpra/default.nix

  Log Message:
  ---
  xpra: add missing python 'rencode' module

Fixes this:

  $ xpra [...]
  2016-06-23 17:40:03,407 Warning: rencode import failed:
  2016-06-23 17:40:03,407  No module named rencode
  [...]


  Commit: ce8c1ab5e01d9206bc72647b13f16552cc86e40f
  
https://github.com/NixOS/nixpkgs/commit/ce8c1ab5e01d9206bc72647b13f16552cc86e40f
  Author: Bjørn Forsman 
  Date:   2016-06-23 (Thu, 23 Jun 2016)

  Changed paths:
M pkgs/tools/X11/xpra/default.nix

  Log Message:
  ---
  xpra: 0.17.0 -> 0.17.3


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


[Nix-commits] [NixOS/nixpkgs] ffc05c: jimtcl: 0.75 -> 0.76

2016-06-23 Thread zimbatm
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: ffc05cf0288d8042a1a8a1a299e31473825c9270
  
https://github.com/NixOS/nixpkgs/commit/ffc05cf0288d8042a1a8a1a299e31473825c9270
  Author: Rahul Gopinath 
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
M pkgs/development/interpreters/jimtcl/default.nix

  Log Message:
  ---
  jimtcl: 0.75 -> 0.76


  Commit: ab7f92bf6905da15c865b31dc3b620e23f0d2097
  
https://github.com/NixOS/nixpkgs/commit/ab7f92bf6905da15c865b31dc3b620e23f0d2097
  Author: zimbatm 
  Date:   2016-06-23 (Thu, 23 Jun 2016)

  Changed paths:
M pkgs/development/interpreters/jimtcl/default.nix

  Log Message:
  ---
  Merge pull request #16440 from vrthra/jim

jimtcl: 0.75 -> 0.76


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


[Nix-commits] [NixOS/nixpkgs] a1d422: timewarrior: 2016-03-29 -> 0.9.5.alpha

2016-06-23 Thread zimbatm
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: a1d42293ec90191419bdee781b5075e592c6fc6f
  
https://github.com/NixOS/nixpkgs/commit/a1d42293ec90191419bdee781b5075e592c6fc6f
  Author: Matthias Beyer 
  Date:   2016-06-21 (Tue, 21 Jun 2016)

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

  Log Message:
  ---
  timewarrior: 2016-03-29 -> 0.9.5.alpha

Also: Switch to use `fetchurl` instead of `fetchgit`


  Commit: bc1a09c6ee95aa2f31d01e2237bdeaa45729f075
  
https://github.com/NixOS/nixpkgs/commit/bc1a09c6ee95aa2f31d01e2237bdeaa45729f075
  Author: zimbatm 
  Date:   2016-06-23 (Thu, 23 Jun 2016)

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

  Log Message:
  ---
  Merge pull request #16404 from matthiasbeyer/update-timewarrior

timewarrior: 2016-03-29 -> 0.9.5.alpha


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


[Nix-commits] [NixOS/nixpkgs] 31a88b: togglesg-download: 2016-02-08 -> 2016-05-31

2016-06-23 Thread zimbatm
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 31a88b46647a6fd0a5098552e4bae386747c503d
  
https://github.com/NixOS/nixpkgs/commit/31a88b46647a6fd0a5098552e4bae386747c503d
  Author: Peter Hoeg 
  Date:   2016-06-21 (Tue, 21 Jun 2016)

  Changed paths:
M pkgs/tools/misc/togglesg-download/default.nix

  Log Message:
  ---
  togglesg-download: 2016-02-08 -> 2016-05-31


  Commit: e15b33639f6929826abbba789f2c44425a134eae
  
https://github.com/NixOS/nixpkgs/commit/e15b33639f6929826abbba789f2c44425a134eae
  Author: zimbatm 
  Date:   2016-06-23 (Thu, 23 Jun 2016)

  Changed paths:
M pkgs/tools/misc/togglesg-download/default.nix

  Log Message:
  ---
  Merge pull request #16386 from peterhoeg/togglesg

togglesg-download: 2016-02-08 -> 2016-05-31


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


[Nix-commits] [NixOS/nixpkgs] ea4738: gnome-keyring: remove unused configure flag

2016-06-23 Thread zimbatm
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: ea4738ff4f2fee509fc142c0e8fa03b061e51235
  
https://github.com/NixOS/nixpkgs/commit/ea4738ff4f2fee509fc142c0e8fa03b061e51235
  Author: Philip Potter 
  Date:   2016-06-21 (Tue, 21 Jun 2016)

  Changed paths:
M pkgs/desktops/gnome-3/3.18/core/gnome-keyring/default.nix

  Log Message:
  ---
  gnome-keyring: remove unused configure flag

The --with-ca-certificates flag seems to have been removed in
[this commit][1] from March 2013.  The configure script now just warns
about an unknown option.

[1]: 
https://git.gnome.org/browse/gnome-keyring/commit/?id=7afaae43f205c059163c3670169af302f1ba6de3


  Commit: 71e7882eadc398ed7d6cd85bdc221ea3ef3d317b
  
https://github.com/NixOS/nixpkgs/commit/71e7882eadc398ed7d6cd85bdc221ea3ef3d317b
  Author: zimbatm 
  Date:   2016-06-23 (Thu, 23 Jun 2016)

  Changed paths:
M pkgs/desktops/gnome-3/3.18/core/gnome-keyring/default.nix

  Log Message:
  ---
  Merge pull request #16383 from philandstuff/remove-unused-config-option

gnome-keyring: remove unused configure flag


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


[Nix-commits] [NixOS/nixpkgs] 6b25cb: parallel: 20160422 -> 20160622

2016-06-23 Thread Pascal Wittmann
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 6b25cba125b8003194b54b518f6e5434ab4e6537
  
https://github.com/NixOS/nixpkgs/commit/6b25cba125b8003194b54b518f6e5434ab4e6537
  Author: Rahul Gopinath 
  Date:   2016-06-23 (Thu, 23 Jun 2016)

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

  Log Message:
  ---
  parallel: 20160422 -> 20160622


  Commit: d1a4873ae48497322030d923662ba8ed0d746b91
  
https://github.com/NixOS/nixpkgs/commit/d1a4873ae48497322030d923662ba8ed0d746b91
  Author: Pascal Wittmann 
  Date:   2016-06-23 (Thu, 23 Jun 2016)

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

  Log Message:
  ---
  Merge pull request #16447 from vrthra/parallel

parallel: 20160422 -> 20160622


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


[Nix-commits] [NixOS/nixpkgs] ccbb3f: docker: Expose completions for fish

2016-06-23 Thread zimbatm
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: ccbb3fa541b7b908dadbeaf6f1edb8aa1493f6f8
  
https://github.com/NixOS/nixpkgs/commit/ccbb3fa541b7b908dadbeaf6f1edb8aa1493f6f8
  Author: Leon Isenberg 
  Date:   2016-06-20 (Mon, 20 Jun 2016)

  Changed paths:
M pkgs/applications/virtualization/docker/default.nix

  Log Message:
  ---
  docker: Expose completions for fish


  Commit: 457a5f65907031f3141b40109b6b36dae5cdafc4
  
https://github.com/NixOS/nixpkgs/commit/457a5f65907031f3141b40109b6b36dae5cdafc4
  Author: zimbatm 
  Date:   2016-06-23 (Thu, 23 Jun 2016)

  Changed paths:
M pkgs/applications/virtualization/docker/default.nix

  Log Message:
  ---
  Merge pull request #16376 from ljli/fix-docker-fish-completions

docker: Expose completions for fish


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


[Nix-commits] [NixOS/nixpkgs] 0067fa: collectd: add snmp support

2016-06-23 Thread Kyle McKean
  Branch: refs/heads/release-16.03
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 0067fa05388829050c926bded9b360ce15fb9b22
  
https://github.com/NixOS/nixpkgs/commit/0067fa05388829050c926bded9b360ce15fb9b22
  Author: Kyle McKean 
  Date:   2016-06-23 (Thu, 23 Jun 2016)

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

  Log Message:
  ---
  collectd: add snmp support

(cherry picked from commit 544d9a762031355413213d9efebb9d7fdaaf0a20)


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


[Nix-commits] [NixOS/nixpkgs] 544d9a: collectd: add snmp support

2016-06-23 Thread Kyle McKean
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 544d9a762031355413213d9efebb9d7fdaaf0a20
  
https://github.com/NixOS/nixpkgs/commit/544d9a762031355413213d9efebb9d7fdaaf0a20
  Author: Kyle McKean 
  Date:   2016-06-23 (Thu, 23 Jun 2016)

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

  Log Message:
  ---
  collectd: add snmp support


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


[Nix-commits] [NixOS/nixpkgs] 5d3ace: dislocker: init at 0.6.1

2016-06-23 Thread zimbatm
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 5d3ace24e908a4aedede37f460a878cedbcfe43b
  
https://github.com/NixOS/nixpkgs/commit/5d3ace24e908a4aedede37f460a878cedbcfe43b
  Author: Eric Litak 
  Date:   2016-06-20 (Mon, 20 Jun 2016)

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

  Log Message:
  ---
  dislocker: init at 0.6.1


  Commit: d2f9f251aa73b4dae9c1b1c5c6761ce49fd5c3d2
  
https://github.com/NixOS/nixpkgs/commit/d2f9f251aa73b4dae9c1b1c5c6761ce49fd5c3d2
  Author: zimbatm 
  Date:   2016-06-23 (Thu, 23 Jun 2016)

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

  Log Message:
  ---
  Merge pull request #16380 from elitak/dislocker

dislocker: init at 0.6.1


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


[Nix-commits] [NixOS/nixpkgs] 91bc34: zanshin: 0.2.1 -> 0.3.1

2016-06-23 Thread zimbatm
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 91bc34f05bbdf1a50f41df9fdf338854df3e81eb
  
https://github.com/NixOS/nixpkgs/commit/91bc34f05bbdf1a50f41df9fdf338854df3e81eb
  Author: Jos van den Oever 
  Date:   2016-06-20 (Mon, 20 Jun 2016)

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

  Log Message:
  ---
  zanshin: 0.2.1 -> 0.3.1

This is the branch based on KDE 4.


  Commit: 7af9f90a323ec1b91f37304a9b3d59e5058d69ad
  
https://github.com/NixOS/nixpkgs/commit/7af9f90a323ec1b91f37304a9b3d59e5058d69ad
  Author: zimbatm 
  Date:   2016-06-23 (Thu, 23 Jun 2016)

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

  Log Message:
  ---
  Merge pull request #16375 from vandenoever/zanshin

zanshin: 0.2.1 -> 0.3.1


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


[Nix-commits] [NixOS/nixpkgs] ba0d3c: texstudio: 2.9.4 -> 2.11.0

2016-06-23 Thread zimbatm
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: ba0d3ce5f13089c42d7b934ec2b65962335e5b2d
  
https://github.com/NixOS/nixpkgs/commit/ba0d3ce5f13089c42d7b934ec2b65962335e5b2d
  Author: mimadrid 
  Date:   2016-06-20 (Mon, 20 Jun 2016)

  Changed paths:
M pkgs/applications/editors/texstudio/default.nix

  Log Message:
  ---
  texstudio: 2.9.4 -> 2.11.0


  Commit: a0fe5dc90cafbb08d5a5d4969eebfe15ee2cc613
  
https://github.com/NixOS/nixpkgs/commit/a0fe5dc90cafbb08d5a5d4969eebfe15ee2cc613
  Author: zimbatm 
  Date:   2016-06-23 (Thu, 23 Jun 2016)

  Changed paths:
M pkgs/applications/editors/texstudio/default.nix

  Log Message:
  ---
  Merge pull request #16363 from mimadrid/update/texstudio-2.11.0

texstudio: 2.9.4 -> 2.11.0


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


[Nix-commits] [NixOS/nixpkgs] 8b5675: yubikey-neo-manager: init at 1.4.0

2016-06-23 Thread Frederik Rietdijk
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 8b5675da37769b9d70e45635a531f8f6ac3f4f87
  
https://github.com/NixOS/nixpkgs/commit/8b5675da37769b9d70e45635a531f8f6ac3f4f87
  Author: Marius Bakke 
  Date:   2016-06-23 (Thu, 23 Jun 2016)

  Changed paths:
A pkgs/tools/misc/yubikey-neo-manager/default.nix
A pkgs/tools/misc/yubikey-neo-manager/fix-pyside-requirement.diff
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  yubikey-neo-manager: init at 1.4.0


  Commit: 41ca3ba4a9e6c02ed5fdba78e173fe7c0e83a2c8
  
https://github.com/NixOS/nixpkgs/commit/41ca3ba4a9e6c02ed5fdba78e173fe7c0e83a2c8
  Author: Frederik Rietdijk 
  Date:   2016-06-23 (Thu, 23 Jun 2016)

  Changed paths:
A pkgs/tools/misc/yubikey-neo-manager/default.nix
A pkgs/tools/misc/yubikey-neo-manager/fix-pyside-requirement.diff
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  Merge pull request #16425 from mbakke/yubikey-neo-manager

yubikey-neo-manager: init at 1.4.0


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


[Nix-commits] [NixOS/nixpkgs] 0b0ee2: pythonPackages.toolz: use buildPyPIPackage

2016-06-23 Thread Frederik Rietdijk
  Branch: refs/heads/python-wip
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 0b0ee2bfe6cbd499cfdff549382a50fa31c9a934
  
https://github.com/NixOS/nixpkgs/commit/0b0ee2bfe6cbd499cfdff549382a50fa31c9a934
  Author: Frederik Rietdijk 
  Date:   2016-06-23 (Thu, 23 Jun 2016)

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

  Log Message:
  ---
  pythonPackages.toolz: use buildPyPIPackage


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


[Nix-commits] [NixOS/nixpkgs] 7a9392: zstd: 0.7.0 -> 0.7.1

2016-06-23 Thread Tobias Geerinckx-Rice
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 7a93926a91ea52dc7d6590dd7955097379ee263a
  
https://github.com/NixOS/nixpkgs/commit/7a93926a91ea52dc7d6590dd7955097379ee263a
  Author: Tobias Geerinckx-Rice 
  Date:   2016-06-23 (Thu, 23 Jun 2016)

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

  Log Message:
  ---
  zstd: 0.7.0 -> 0.7.1

Fixes:
- ZBUFF_compressEnd() called multiple times with too small dst buffer
- dictBuilder fails if first sample is too small
- corruption issue
- cli breaks during destination file overwrite confirmation

Changes:
- frame checksum enabled by default in command line mode


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


Re: [Nix-dev] Building mesos from git

2016-06-23 Thread Kamil Chmielewski
Hi,

setting zip_safe=False in
https://github.com/apache/mesos/blob/master/src/python/setup.py.in may
solve the issue, like in
https://github.com/noirbizarre/django-eztables/pull/17

--
Kamil

2016-06-23 14:17 GMT+02:00 Maarten Hoogendoorn :

> Hi there,
>
> I want to experiment a bit with some of the features of a unreleased mesos.
>
> I've copied the mesos package definition from nixpkgs to a separate dir,
> and have modified it to point to a git repository. The result is in a
> GitHub repo [1]
>
> The log [2] shows that it compiles all C++ stuff, but fails on creating a
> python egg:
> ValueError: ZIP does not support timestamps before 1980
>
> Makefile:11639: recipe for target 'python/dist/mesos-1.0.0-py2.7.egg' failed
> make[2]: *** [python/dist/mesos-1.0.0-py2.7.egg] Error 1
> make[2]: Leaving directory 
> '/tmp/nix-build-mesos-git-head.drv-0/mesos-d1b681f/src'
> Makefile:3175: recipe for target 'all' failed
> make[1]: *** [all] Error 2
> make[1]: Leaving directory 
> '/tmp/nix-build-mesos-git-head.drv-0/mesos-d1b681f/src'
> Makefile:762: recipe for target 'all-recursive' failed
> make: *** [all-recursive] Error 1
> builder for ‘/nix/store/3h0hgqp70x0kzrwsx4v8imvi4g5ay3x4-mesos-git-head.drv’ 
> failed with exit code 2
> error: build of 
> ‘/nix/store/3h0hgqp70x0kzrwsx4v8imvi4g5ay3x4-mesos-git-head.drv’ failed
>
> I could use some tips on how to proceed. I'd like to keep python support
> in there, but I'm also open to some tips on how to disable python builds.
>
> Thanks,
> Maarten
>
>
> [1] https://github.com/moretea/nixops-mesos-git-head
> [2]
> https://raw.githubusercontent.com/moretea/nixops-mesos-git-head/master/log.txt
>
> ___
> 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] Building mesos from git

2016-06-23 Thread Maarten Hoogendoorn
Hi there,

I want to experiment a bit with some of the features of a unreleased mesos.

I've copied the mesos package definition from nixpkgs to a separate dir,
and have modified it to point to a git repository. The result is in a
GitHub repo [1]

The log [2] shows that it compiles all C++ stuff, but fails on creating a
python egg:
ValueError: ZIP does not support timestamps before 1980

Makefile:11639: recipe for target 'python/dist/mesos-1.0.0-py2.7.egg' failed
make[2]: *** [python/dist/mesos-1.0.0-py2.7.egg] Error 1
make[2]: Leaving directory
'/tmp/nix-build-mesos-git-head.drv-0/mesos-d1b681f/src'
Makefile:3175: recipe for target 'all' failed
make[1]: *** [all] Error 2
make[1]: Leaving directory
'/tmp/nix-build-mesos-git-head.drv-0/mesos-d1b681f/src'
Makefile:762: recipe for target 'all-recursive' failed
make: *** [all-recursive] Error 1
builder for ‘/nix/store/3h0hgqp70x0kzrwsx4v8imvi4g5ay3x4-mesos-git-head.drv’
failed with exit code 2
error: build of
‘/nix/store/3h0hgqp70x0kzrwsx4v8imvi4g5ay3x4-mesos-git-head.drv’
failed

I could use some tips on how to proceed. I'd like to keep python support in
there, but I'm also open to some tips on how to disable python builds.

Thanks,
Maarten


[1] https://github.com/moretea/nixops-mesos-git-head
[2]
https://raw.githubusercontent.com/moretea/nixops-mesos-git-head/master/log.txt
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev


[Nix-commits] [NixOS/nixpkgs] a709f6: networkmanager/l2tp: fix format error on x86/32bit

2016-06-23 Thread obadz
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: a709f60d7b52f1ae5ac5f6bc114cde9295f45773
  
https://github.com/NixOS/nixpkgs/commit/a709f60d7b52f1ae5ac5f6bc114cde9295f45773
  Author: obadz 
  Date:   2016-06-23 (Thu, 23 Jun 2016)

  Changed paths:
M pkgs/tools/networking/network-manager/l2tp.nix

  Log Message:
  ---
  networkmanager/l2tp: fix format error on x86/32bit


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


[Nix-commits] [NixOS/nixpkgs] d18608: Python: buildPyPIPackage and buildPyPIApplication

2016-06-23 Thread Frederik Rietdijk
  Branch: refs/heads/python-wip
  Home:   https://github.com/NixOS/nixpkgs
  Commit: d186083cbaf4536b1b28a6192a7b35ee9687ab14
  
https://github.com/NixOS/nixpkgs/commit/d186083cbaf4536b1b28a6192a7b35ee9687ab14
  Author: Frederik Rietdijk 
  Date:   2016-06-23 (Thu, 23 Jun 2016)

  Changed paths:
A pkgs/development/python-modules/generic/buildpypi.nix
M pkgs/top-level/python-packages.nix

  Log Message:
  ---
  Python: buildPyPIPackage and buildPyPIApplication

These two functions wrap respectively buildPythonPackage and 
buildPythonApplication, but use by default a repository with metadata retrieved 
from PyPI.


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


[Nix-commits] [NixOS/nixpkgs] 43b63c: pythonPackages.cffi: 1.5.2 -> 1.7.0

2016-06-23 Thread Frederik Rietdijk
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 43b63c1d2ba5ed6b0d7a57a187141976c2058ef3
  
https://github.com/NixOS/nixpkgs/commit/43b63c1d2ba5ed6b0d7a57a187141976c2058ef3
  Author: Frederik Rietdijk 
  Date:   2016-06-23 (Thu, 23 Jun 2016)

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

  Log Message:
  ---
  pythonPackages.cffi: 1.5.2 -> 1.7.0


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


[Nix-commits] [NixOS/nixpkgs] 9e8592: wine: set default features in all-packages

2016-06-23 Thread Nikolay Amiantov
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 9e8592d6b9531347845eff12f35666335646ce29
  
https://github.com/NixOS/nixpkgs/commit/9e8592d6b9531347845eff12f35666335646ce29
  Author: Nikolay Amiantov 
  Date:   2016-06-23 (Thu, 23 Jun 2016)

  Changed paths:
M pkgs/misc/emulators/wine/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  wine: set default features in all-packages

I haven't noticed that we actually _do_ set some flags already
in all-packages, just not all the old ones. Use that way instead.


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


[Nix-commits] [NixOS/nixpkgs] 09d505: pythonPackages.cffi: 1.5.2 -> 1.7.0

2016-06-23 Thread Frederik Rietdijk
  Branch: refs/heads/python-wip
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 09d505c40f3842835b6c82940f5d01ba3ffb1c4a
  
https://github.com/NixOS/nixpkgs/commit/09d505c40f3842835b6c82940f5d01ba3ffb1c4a
  Author: Frederik Rietdijk 
  Date:   2016-06-23 (Thu, 23 Jun 2016)

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

  Log Message:
  ---
  pythonPackages.cffi: 1.5.2 -> 1.7.0


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


Re: [Nix-dev] NixOS hangs on boot after upgrading 15.09 -> 16.03; systemd update to blame?

2016-06-23 Thread Tomasz Czyż
James, maybe it's worth to open the ticket on
https://github.com/NixOS/nixpkgs/issues/

2016-06-23 4:08 GMT+01:00 James Cook :

> On 22 June 2016 at 19:27, James Cook  wrote:
> > After updating my desktop from 15.09 to 16.03, it hangs on boot after
> > printing the message "regenerating udev hardware database". I do not
> > think the problem is directly related to that message; see below. Any
> > ideas for debugging this?
> >
> > Here's what I've figured out so far:
> >
> > * Using git-bisect, it seems that the problem starts at commit
> > ecbe04b4, "systemd: Update to 225". (I had to cherry-pick 3cc04956,
> > "libseccomp: Fix hash", to got it to build.)
> >
> > * I don't think the script that prints "regenerating udev hardware
> > database" is the one that hangs. I added a debugging echo command to
> > the end of system.activationScripts.udevd (in
> > nixos/modules/services/hardware/udev.nix), and I saw the extra message
> > when I booted. So the hang happens after.
> >
> > My next step was going to be to add more debugging statements to the
> > boot process, but I'm having trouble figuring out where any of that
> > stuff is. I can't find where system.activationScripts.udevd is called
> > from, and I was mystified to find that grep -R "egenerating udev"
> > /nix/store/(...)-nixos-16.0.3.git.3cc0495M produces no output (except
> > some errors, e.g. etc/zoneinfo/posix is a directoly loop).
> >
> > James
>
> Another note: the problem also happens on master (commit 0167eef9).
> The "regenerating udev hardware database..." message is no longer
> printed at master; the last messages before the hang are "setting up
> /etc..." and a bunch of "removing obsolete symblink ..." and "removing
> group ..." messages.
>
> James
> ___
> nix-dev mailing list
> nix-dev@lists.science.uu.nl
> http://lists.science.uu.nl/mailman/listinfo/nix-dev
>



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


[Nix-commits] [NixOS/nixpkgs] 7de7a3: zpaqd: 7.07 -> 7.08

2016-06-23 Thread Tobias Geerinckx-Rice
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 7de7a35d59bceb8f97647015c2f712787f8f50ba
  
https://github.com/NixOS/nixpkgs/commit/7de7a35d59bceb8f97647015c2f712787f8f50ba
  Author: Tobias Geerinckx-Rice 
  Date:   2016-06-23 (Thu, 23 Jun 2016)

  Changed paths:
M pkgs/tools/archivers/zpaq/zpaqd.nix

  Log Message:
  ---
  zpaqd: 7.07 -> 7.08

Fixes double close in r command to output file.


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


[Nix-commits] [NixOS/nixpkgs] d87455: pypi2nix: Use pypi mirror (#16451)

2016-06-23 Thread Jussi Mäki
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: d87455a0991cb5bba675ee2a04f7d0ab6ad17942
  
https://github.com/NixOS/nixpkgs/commit/d87455a0991cb5bba675ee2a04f7d0ab6ad17942
  Author: Jussi Mäki 
  Date:   2016-06-23 (Thu, 23 Jun 2016)

  Changed paths:
M pkgs/development/tools/pypi2nix/deps.nix

  Log Message:
  ---
  pypi2nix: Use pypi mirror (#16451)


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


[Nix-commits] [NixOS/nixpkgs] a1083a: doc: Update stripHash documentation

2016-06-23 Thread zimbatm
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: a1083a5d274bdbff0ebf3d7ea63a4d0d6268b2cc
  
https://github.com/NixOS/nixpkgs/commit/a1083a5d274bdbff0ebf3d7ea63a4d0d6268b2cc
  Author: Tom Boettcher 
  Date:   2016-06-21 (Tue, 21 Jun 2016)

  Changed paths:
M doc/stdenv.xml

  Log Message:
  ---
  doc: Update stripHash documentation

The documentation now matches the behavior of the function.


  Commit: 7473e4f2b4754973fc6b4d7e439f2e04e7b65fe4
  
https://github.com/NixOS/nixpkgs/commit/7473e4f2b4754973fc6b4d7e439f2e04e7b65fe4
  Author: zimbatm 
  Date:   2016-06-23 (Thu, 23 Jun 2016)

  Changed paths:
M doc/stdenv.xml

  Log Message:
  ---
  Merge pull request #16398 from tboettch/master

doc: Update stripHash documentation


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


[Nix-commits] [NixOS/nixpkgs] 5bff6f: wine: restore old features

2016-06-23 Thread Nikolay Amiantov
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 5bff6fef557590d2287853db8a1d25870c0b9dc4
  
https://github.com/NixOS/nixpkgs/commit/5bff6fef557590d2287853db8a1d25870c0b9dc4
  Author: Nikolay Amiantov 
  Date:   2016-06-23 (Thu, 23 Jun 2016)

  Changed paths:
M pkgs/misc/emulators/wine/default.nix

  Log Message:
  ---
  wine: restore old features


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


[Nix-commits] [NixOS/nixpkgs] 3cf282: kde5.kauth: remove unused kauth-policy-install.pat...

2016-06-23 Thread Tobias Geerinckx-Rice
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 3cf282473c8a1927728c562cc8613f0026cf4ea5
  
https://github.com/NixOS/nixpkgs/commit/3cf282473c8a1927728c562cc8613f0026cf4ea5
  Author: Tobias Geerinckx-Rice 
  Date:   2016-06-23 (Thu, 23 Jun 2016)

  Changed paths:
R pkgs/desktops/kde-5/frameworks-5.22/kauth/kauth-policy-install.patch

  Log Message:
  ---
  kde5.kauth: remove unused kauth-policy-install.patch


  Commit: 6669fac77e79d4af0f956eec5317d2ae1f220503
  
https://github.com/NixOS/nixpkgs/commit/6669fac77e79d4af0f956eec5317d2ae1f220503
  Author: Tobias Geerinckx-Rice 
  Date:   2016-06-23 (Thu, 23 Jun 2016)

  Changed paths:
R pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-gtkstyle.patch

  Log Message:
  ---
  qt55.qtbase: remove unused dlopen-gtkstyle.patch


  Commit: a0551529633fc2228484c4890cd96247f30f7dfa
  
https://github.com/NixOS/nixpkgs/commit/a0551529633fc2228484c4890cd96247f30f7dfa
  Author: Tobias Geerinckx-Rice 
  Date:   2016-06-23 (Thu, 23 Jun 2016)

  Changed paths:
M pkgs/development/tools/sauce-connect/default.nix

  Log Message:
  ---
  sauce-connect: listify phases and run in correct order

patchPhase was being run after installPhase, causing patchelf to be
run on the left-behind binary instead of the copy in $out. Fixes:

  ```
  $ .../bin/sc
  bash: .../bin/sc: No such file or directory
  $ patchelf --print-interpreter .../bin/sc
  /lib64/ld-linux-x86-64.so.2
  ```


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


Re: [Nix-dev] Haskell workflow - ghc not in PATH - recommended way / documentation?

2016-06-23 Thread Brian McKenna
I think you might want to use:

nix-shell -A env

The `env` attribute creates a derivation that brings in GHC. You can
generate a shell.nix via `cabal2nix --shell` which detects if you're
in a shell and automatically uses the attribute.

On 23 June 2016 at 19:24, Marc Weber  wrote:
> It's way too much work to keep maintaining my nixpkgs-haskell-overlay.
>
> Trying the workflow specified in the manual:
>
> 1) ./default.nix:
>
>   { nixpkgs ? import  {}, compiler ? "ghc7102" }:
>   nixpkgs.pkgs.haskell.packages.${compiler}.callPackage ./foo.nix { }
>
>
> 2) cabal2nix . >| foo.nix
>
> 3) nix-shell --command zsh
>
> however doesn't put ghc in PATH.
>
> BTW: Cabal2nix on cabal2nix seems to fail:
>
> configureFlags: --verbose 
> --prefix=/nix/store/qk9jk6abnqzg8dybzgiabm4p3wjmflr0-distribution-nixpkgs-1 
> --libdir=$prefix/lib/$compiler --libsubdir=$pkgid --with-gcc=gcc 
> --package-db=/tmp/nix-build-distribution-nixpkgs-1.drv-0/package.conf.d 
> --ghc-option=-optl=-Wl,-rpath=/nix/store/qk9jk6abnqzg8dybzgiabm4p3wjmflr0-distribution-nixpkgs-1/lib/ghc-7.10.2/distribution-nixpkgs-1
>  --enable-split-objs --disable-library-profiling 
> --disable-executable-profiling --enable-shared --enable-library-vanilla 
> --enable-executable-dynamic --enable-tests
> Configuring distribution-nixpkgs-1...
> Setup: At least the following dependencies are missing:
> Cabal >1.24
> builder for 
> ‘/nix/store/9ml89qkri8fkn1bldyh446a2g6rkscjc-distribution-nixpkgs-1.drv’ 
> failed with exit code 1
> error: build of 
> ‘/nix/store/9ml89qkri8fkn1bldyh446a2g6rkscjc-distribution-nixpkgs-1.drv’ 
> failed
>
>
> I'm pretty sure that I missed something obvious ..
>
> Marc Weber
> ___
> 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] Haskell workflow - ghc not in PATH - recommended way / documentation?

2016-06-23 Thread Marc Weber
It's way too much work to keep maintaining my nixpkgs-haskell-overlay.

Trying the workflow specified in the manual:

1) ./default.nix:

  { nixpkgs ? import  {}, compiler ? "ghc7102" }:
  nixpkgs.pkgs.haskell.packages.${compiler}.callPackage ./foo.nix { }


2) cabal2nix . >| foo.nix

3) nix-shell --command zsh

however doesn't put ghc in PATH.

BTW: Cabal2nix on cabal2nix seems to fail:

configureFlags: --verbose 
--prefix=/nix/store/qk9jk6abnqzg8dybzgiabm4p3wjmflr0-distribution-nixpkgs-1 
--libdir=$prefix/lib/$compiler --libsubdir=$pkgid --with-gcc=gcc 
--package-db=/tmp/nix-build-distribution-nixpkgs-1.drv-0/package.conf.d 
--ghc-option=-optl=-Wl,-rpath=/nix/store/qk9jk6abnqzg8dybzgiabm4p3wjmflr0-distribution-nixpkgs-1/lib/ghc-7.10.2/distribution-nixpkgs-1
 --enable-split-objs --disable-library-profiling --disable-executable-profiling 
--enable-shared --enable-library-vanilla --enable-executable-dynamic 
--enable-tests
Configuring distribution-nixpkgs-1...
Setup: At least the following dependencies are missing:
Cabal >1.24
builder for 
‘/nix/store/9ml89qkri8fkn1bldyh446a2g6rkscjc-distribution-nixpkgs-1.drv’ failed 
with exit code 1
error: build of 
‘/nix/store/9ml89qkri8fkn1bldyh446a2g6rkscjc-distribution-nixpkgs-1.drv’ failed


I'm pretty sure that I missed something obvious ..

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


[Nix-commits] [NixOS/nixpkgs] b3bcb5: tcsh: import an Arch patch (merging the two patche...

2016-06-23 Thread Michael Raskin
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: b3bcb59bd5fddc3c0f74bbe120de561bbea29878
  
https://github.com/NixOS/nixpkgs/commit/b3bcb59bd5fddc3c0f74bbe120de561bbea29878
  Author: Michael Raskin <7c6f4...@mail.ru>
  Date:   2016-06-23 (Thu, 23 Jun 2016)

  Changed paths:
A pkgs/shells/tcsh/avoid-gcc5-wrong-optimisation.patch
M pkgs/shells/tcsh/default.nix

  Log Message:
  ---
  tcsh: import an Arch patch (merging the two patches into a single one) for 
fixing gcc5 optimisation


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