[Nix-commits] [NixOS/nixpkgs] 125fff: kernel: 4.6.2 -> 4.6.3

2016-06-24 Thread Tim Steinbach
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 125089b6bd360c82cf986d8cc9b17fc2e8ac
  
https://github.com/NixOS/nixpkgs/commit/125089b6bd360c82cf986d8cc9b17fc2e8ac
  Author: Tim Steinbach 
  Date:   2016-06-24 (Fri, 24 Jun 2016)

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

  Log Message:
  ---
  kernel: 4.6.2 -> 4.6.3


___
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-24 Thread Marc Weber
> nix-shell -A env
my fault - sry.

In the past I used sourceAndTags to get sources tagged (using hasktags)
so that I was able to jump to source using Vim's :tjump command (and
search names) fast.

Is this workflow "outdated" eg because hoogle can do it or should I try
integrating it into current haskell-packages?

hastags fails at "template haskell generated stuff", adding it is
trivial because its just applying

  addHasktagsTaggingInfo = deriv : deriv // {

to an existing derivation. It served me quite well that time.

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] d3da5c: htslib: init at 1.3.1

2016-06-24 Thread Joachim Fasting
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: d3da5cbf449948e5b058cac5b19510c7c0955a55
  
https://github.com/NixOS/nixpkgs/commit/d3da5cbf449948e5b058cac5b19510c7c0955a55
  Author: mimadrid 
  Date:   2016-06-24 (Fri, 24 Jun 2016)

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

  Log Message:
  ---
  htslib: init at 1.3.1


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

  Changed paths:
M pkgs/applications/science/biology/samtools/default.nix

  Log Message:
  ---
  samtools: refactoring


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

  Changed paths:
A pkgs/applications/science/biology/bcftools/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  bcftools: init at 1.3.1


  Commit: 46b07b335b18819626afea21b9caec35aac3cca6
  
https://github.com/NixOS/nixpkgs/commit/46b07b335b18819626afea21b9caec35aac3cca6
  Author: Joachim Fasting 
  Date:   2016-06-24 (Fri, 24 Jun 2016)

  Changed paths:
A pkgs/applications/science/biology/bcftools/default.nix
M pkgs/applications/science/biology/samtools/default.nix
A pkgs/development/libraries/science/biology/htslib/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  Merge pull request #16379 from mimadrid/init/bcftools-1.3.1

bcftools: init at 1.3.1


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


[Nix-commits] [NixOS/nixpkgs] 616f84: matplotlib: Don't search in global paths

2016-06-24 Thread Frederik Rietdijk
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 616f84689437b06d78fadd82e3b3ccf01e9ec7f7
  
https://github.com/NixOS/nixpkgs/commit/616f84689437b06d78fadd82e3b3ccf01e9ec7f7
  Author: Andreas Herrmann 
  Date:   2016-06-24 (Fri, 24 Jun 2016)

  Changed paths:
A pkgs/development/python-modules/matplotlib/basedirlist.patch
M pkgs/development/python-modules/matplotlib/default.nix

  Log Message:
  ---
  matplotlib: Don't search in global paths

Sets the `basedirlist` option in setup.cfg such that distutils does not search
for headers and libraries in `/usr`, and `/usr/local`.

Otherwise the build can fail on non-NixOS machines, see #15993.


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

  Changed paths:
M pkgs/development/python-modules/matplotlib/default.nix

  Log Message:
  ---
  matplotlib: Add support for the TkAgg backend

Fixes #15993


  Commit: 59c7eb60254431f1d2f7df550065100ccd852a0c
  
https://github.com/NixOS/nixpkgs/commit/59c7eb60254431f1d2f7df550065100ccd852a0c
  Author: Frederik Rietdijk 
  Date:   2016-06-24 (Fri, 24 Jun 2016)

  Changed paths:
A pkgs/development/python-modules/matplotlib/basedirlist.patch
M pkgs/development/python-modules/matplotlib/default.nix

  Log Message:
  ---
  Merge pull request #16476 from aherrmann/matplotlib-tkagg

Matplotlib tkagg


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


[Nix-commits] [NixOS/nixpkgs] de0264: attic: unbreak "attic mount" by using old llfuse 0...

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

  Changed paths:
M pkgs/tools/backup/attic/default.nix
M pkgs/top-level/python-packages.nix

  Log Message:
  ---
  attic: unbreak "attic mount" by using old llfuse 0.41

llfuse >= 0.42 has breaking changes, causing "attic mount" to fail:

  TypeError: main() got an unexpected keyword argument 'single'

Side note: borgbackup, a fork of attic, has been updated to work with
newer llfuse.


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


[Nix-commits] [NixOS/nixpkgs] fcd092: nixos-install: fix SSL certificate error

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

  Changed paths:
M nixos/modules/installer/tools/nixos-install.sh
M nixos/modules/installer/tools/tools.nix

  Log Message:
  ---
  nixos-install: fix SSL certificate error

(cherry picked from commit 1193790b9534a9c8d063941841c3b20e7acf5b12)


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


[Nix-commits] [NixOS/nixpkgs] 786a10: pythonPackages.nipy: init at 0.4.0

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

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

  Log Message:
  ---
  pythonPackages.nipy: init at 0.4.0


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

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

  Log Message:
  ---
  Merge pull request #16470 from bcdarwin/nipy

pythonPackages.nipy: init at 0.4.0


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


[Nix-commits] [NixOS/nixpkgs] cffec6: ibus: fix #16292

2016-06-24 Thread Thomas Tuegel
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: cffec6292a96862b45a79302b368467b02c1fc11
  
https://github.com/NixOS/nixpkgs/commit/cffec6292a96862b45a79302b368467b02c1fc11
  Author: Silvio Frischknecht 
  Date:   2016-06-21 (Tue, 21 Jun 2016)

  Changed paths:
M pkgs/tools/inputmethods/ibus/wrapper.nix

  Log Message:
  ---
  ibus: fix #16292

set GDK_PIXBUF_MODULE_FILE instead of prefixing it


  Commit: 8084977ec82b88db26042f12741045961335a89c
  
https://github.com/NixOS/nixpkgs/commit/8084977ec82b88db26042f12741045961335a89c
  Author: Thomas Tuegel 
  Date:   2016-06-24 (Fri, 24 Jun 2016)

  Changed paths:
M pkgs/tools/inputmethods/ibus/wrapper.nix

  Log Message:
  ---
  Merge pull request #16475 from yokto/ibus

ibus: fix #16292


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


Re: [Nix-dev] Nix syntax surprise.

2016-06-24 Thread Kevin Cox
On 24/06/16 05:58, Guillaume Maudoux (Layus) wrote:
> Hi,
> 
> Does someone understand why the following nix expression is invalid ?
> 
> |[ let a = 10; in { b = "a = ${a}"; } ] |
> 
> Running |nix-instantiate --eval ./bug.nix --strict| gives |error: syntax
> error, unexpected ID, expecting '{', at /home/layus/bug.nix:3:5|.
> 
> The manual says nothing about this in the “let expressions” section.
> 

Most often if you have non-trivial expressions in a list you need to put
them in brackets. I know this doesn't specifically answer your question
but I consider it a good practice.




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


[Nix-commits] [NixOS/nixpkgs] 01b3e5: clipgrab: 3.6.0 -> 3.6.1

2016-06-24 Thread Tobias Geerinckx-Rice
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 01b3e545750cf69b8708ac67dd406218bd31d2d8
  
https://github.com/NixOS/nixpkgs/commit/01b3e545750cf69b8708ac67dd406218bd31d2d8
  Author: Tobias Geerinckx-Rice 
  Date:   2016-06-24 (Fri, 24 Jun 2016)

  Changed paths:
M pkgs/applications/video/clipgrab/default.nix

  Log Message:
  ---
  clipgrab: 3.6.0 -> 3.6.1


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


[Nix-commits] [NixOS/nixpkgs] 748fcd: eclipse-plugin-checkstyle: 6.16.0 -> 6.19.0

2016-06-24 Thread Robert Helgesson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 748fcd083a755c8139f67cfd5b32ae4a676b1169
  
https://github.com/NixOS/nixpkgs/commit/748fcd083a755c8139f67cfd5b32ae4a676b1169
  Author: Robert Helgesson 
  Date:   2016-06-24 (Fri, 24 Jun 2016)

  Changed paths:
M pkgs/applications/editors/eclipse/plugins.nix

  Log Message:
  ---
  eclipse-plugin-checkstyle: 6.16.0 -> 6.19.0


  Commit: 0ae376dcb8d280d86abd77eee73f1b414a28ddfb
  
https://github.com/NixOS/nixpkgs/commit/0ae376dcb8d280d86abd77eee73f1b414a28ddfb
  Author: Robert Helgesson 
  Date:   2016-06-24 (Fri, 24 Jun 2016)

  Changed paths:
M pkgs/applications/editors/eclipse/plugins.nix

  Log Message:
  ---
  eclipse-plugin-jdt: 4.5.1 -> 4.5.2


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


Re: [Nix-dev] Nix syntax surprise.

2016-06-24 Thread Guillaume Maudoux (Layus)
Yep, that's it. In my original use case however, the issue was several
lines above the reported location.

Thanks for your fast answer!

-- Layus

Le 24/06/16 à 12:15, Vladimír Čunát a écrit :
> On 06/24/2016 11:58 AM, Guillaume Maudoux (Layus) wrote:
>> Does someone understand why the following nix expression is invalid ?
> You need to put the let-expression into parentheses. Lists are
> whitespace-separated, so most nontrivial items have to be parenthesized.
>
> --Vladimir
>
>

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


Re: [Nix-dev] Nix syntax surprise.

2016-06-24 Thread Vladimír Čunát
On 06/24/2016 11:58 AM, Guillaume Maudoux (Layus) wrote:
> Does someone understand why the following nix expression is invalid ?

You need to put the let-expression into parentheses. Lists are
whitespace-separated, so most nontrivial items have to be parenthesized.

--Vladimir




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


[Nix-dev] Nix syntax surprise.

2016-06-24 Thread Guillaume Maudoux (Layus)
Hi,

Does someone understand why the following nix expression is invalid ?

|[ let a = 10; in { b = "a = ${a}"; } ] |

Running |nix-instantiate --eval ./bug.nix --strict| gives |error: syntax
error, unexpected ID, expecting '{', at /home/layus/bug.nix:3:5|.

The manual says nothing about this in the “let expressions” section.

Thanks for any pointer,

— Layus.

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


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

2016-06-24 Thread Guillaume Maudoux (Layus)
I have written nix examples in increasing order of complexity.
They should help you understand what is going on behind the scenes. (see
below).

As for your snippets,

|haskellPackages.override { overrides = self: super: { thrift =
self.callPackage /home/cody/sources/thrift/lib/hs {}; }; }; |

performs a deep override of thrift on haskellPackages. This means that
every package using thrift will use your definition of thrift, not the
one bundled with nixpkgs.
The expressions returns this new haskellPackages set.

Now,

|packageOverrides = oldPkgs: { haskellPackages =
oldPkgs.haskellPackages.override { ... }; }; |

is the usual way to make a deep package override on the top-level
packages set.
With this expression, haskellPackages will now refer to your updated
haskellPackges set everywhere in nixpkgs.
You HAVE TO use oldPkgs (or super, as it is called in your examples)
otherwise you get an infinite loop where packages override themselves
(bad :-)).

Now, my interactive examples
You can also look at
https://medium.com/@MrJamesFisher/nix-by-example-a0063a1a4c55#.wby41ssn0.

|# to eval this file, run `nix-instantiate --eval  --strict`.
# Result is always "high depends on low and med depends on low", #
except for the two last ones wihich read "high depends on low and med,
which depends on low". builtins.map (s: (if s ? ps' then s.ps' else
s.ps).high ) [ { # A simple recursive package set (ps). ps = rec { low =
"low"; med = "med depends on ${low}"; high = "high depends on ${low} and
${med}"; }; } rec { # A simple recursive package set, using with instead
of rec. # Note the higher level "rec" to reuse ps in the with clause. ps
= with ps; { low = "low"; med = "med depends on ${low}"; high = "high
depends on ${low} and ${med}"; }; } rec { # Again the same, but with a
function. psFun = self: with self; { low = "low"; med = "med depends on
${low}"; high = "high depends on ${low} and ${med}"; }; ps = psFun ps; #
Look at this fixpoint. # ps is the result of calling psFun on itself. #
This works thanks to lazyness. } rec { # Using with is not always
desirable. # In this case we prefer to use self directly. psFun = self:
{ low = "low"; med = "med depends on ${self.low}"; high = "high depends
on ${self.low} and ${self.med}"; }; ps = psFun ps; } ## The question is:
How do I override a package ? ## 1. Simple answer rec { psFun = self: {
low = "low"; med = "med depends on ${self.low}"; high = "high depends on
${self.low} and ${self.med}"; }; ps = psFun ps; ps' = ps // { med =
"med, which depends on ${ps'.low}"; }; } ## Here ps' contains an updated
med package, but ps'.high does not use the updated package. ## for
proof, the output is unchanged. ## 2. A method that works. ## psFun
thinks it receives itself as an argument, but we may trick it ## by
giving a sligtly different self: rec { psFun = self: { low = "low"; med
= "med depends on ${self.low}"; high = "high depends on ${self.low} and
${self.med}"; }; ps = psFun ps; ps' = (psFun ps') // { med = "med, which
depends on ${ps'.low}"; }; } ## in this case, med is overriden by our
own definition, and any package that ## uses self.med in psFun now uses
our updated package. ## We have effectively replaced med in the whole
hierarchy. ## I am a bit overextending myself here, but haskellPackages
must do something like: rec { psFun = self: { low = "low"; med = "med
depends on ${self.low}"; high = "high depends on ${self.low} and
${self.med}"; }; overrides = pkgs: { med = "med, which depends on
${pkgs.low}"; }; ps = (psFun ps) // (overrides ps); } ] |

Le 24/06/16 à 05:57, Cody Goodman a écrit :

> 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 

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

2016-06-24 Thread Domen Kožar
This is all about Nix GC roots and .drv files. Read how they work and how
to manipulate them and you'll be able to understand also nix-shell.



On Thu, Jun 23, 2016 at 9:16 PM, Matthias Beyer 
wrote:

> 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.
>
> ___
> 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