[Nix-commits] [NixOS/nixpkgs] 30ba40: zeromq: remove unused sodium_warning.patch

2016-06-21 Thread Tobias Geerinckx-Rice
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 30ba40798ca12abbef37e98f30b5ba1e25796e67
  
https://github.com/NixOS/nixpkgs/commit/30ba40798ca12abbef37e98f30b5ba1e25796e67
  Author: Tobias Geerinckx-Rice 
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
R pkgs/development/libraries/zeromq/sodium_warning.patch

  Log Message:
  ---
  zeromq: remove unused sodium_warning.patch


  Commit: eec8d443355aa6ea74757b4ad9f1d9b335a8ce68
  
https://github.com/NixOS/nixpkgs/commit/eec8d443355aa6ea74757b4ad9f1d9b335a8ce68
  Author: Tobias Geerinckx-Rice 
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
R pkgs/os-specific/linux/nvidia-x11/nvidia-340.76-kernel-4.0.patch

  Log Message:
  ---
  nvidia_x11_legacy*: remove unused nvidia-340.76-kernel-4.0.patch


  Commit: 2a08ea94265cf2c648b979eacaa718c8f42795c9
  
https://github.com/NixOS/nixpkgs/commit/2a08ea94265cf2c648b979eacaa718c8f42795c9
  Author: Tobias Geerinckx-Rice 
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
R pkgs/desktops/gnome-3/3.18/core/epiphany/libxml_depend.patch
R pkgs/desktops/gnome-3/3.20/core/epiphany/libxml_depend.patch

  Log Message:
  ---
  epiphany: remove unused libxml_depend.patch


  Commit: 271443daa1edc05576d4844711c9f8a8e93b6ece
  
https://github.com/NixOS/nixpkgs/commit/271443daa1edc05576d4844711c9f8a8e93b6ece
  Author: Tobias Geerinckx-Rice 
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
R pkgs/development/libraries/gobject-introspection/separate-rpath-arg.patch

  Log Message:
  ---
  gobject-introspection: remove unused separate-rpath-arg.patch


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


[Nix-commits] [NixOS/nixpkgs] 389981: uwsgi: add rack support

2016-06-21 Thread Nikolay Amiantov
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 389981f34bee767011e7859cd553ef90533b3c04
  
https://github.com/NixOS/nixpkgs/commit/389981f34bee767011e7859cd553ef90533b3c04
  Author: Nikolay Amiantov 
  Date:   2016-06-22 (Wed, 22 Jun 2016)

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

  Log Message:
  ---
  uwsgi: add rack support


  Commit: c890f28fb1e884986baa3565bc368be31b64da6e
  
https://github.com/NixOS/nixpkgs/commit/c890f28fb1e884986baa3565bc368be31b64da6e
  Author: Nikolay Amiantov 
  Date:   2016-06-22 (Wed, 22 Jun 2016)

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

  Log Message:
  ---
  perlPackages.TextRoman: init at 3.3


  Commit: d51ec20a50a3dbce2ef129e3fa65c46a171c3591
  
https://github.com/NixOS/nixpkgs/commit/d51ec20a50a3dbce2ef129e3fa65c46a171c3591
  Author: Nikolay Amiantov 
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
M pkgs/tools/typesetting/biber/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  biber: 1.9 -> 2.4


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


[Nix-commits] [NixOS/nixpkgs] 12bf38: pythonPackages.scipy: remove unused scipy-0.16.1-d...

2016-06-21 Thread Tobias Geerinckx-Rice
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 12bf38609ec4a79cc9834752f6e47117b1ac646d
  
https://github.com/NixOS/nixpkgs/commit/12bf38609ec4a79cc9834752f6e47117b1ac646d
  Author: Tobias Geerinckx-Rice 
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
R pkgs/development/python-modules/scipy-0.16.1-decorator-fix.patch

  Log Message:
  ---
  pythonPackages.scipy: remove unused scipy-0.16.1-decorator-fix.patch


  Commit: 84e83fe055676e87c276ee710db1d5370de890bb
  
https://github.com/NixOS/nixpkgs/commit/84e83fe055676e87c276ee710db1d5370de890bb
  Author: Tobias Geerinckx-Rice 
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
R pkgs/servers/nosql/riak/riak-1.3.1.patch
R pkgs/servers/nosql/riak/riak-admin-1.3.1.patch

  Log Message:
  ---
  riak: remove unused 1.x patches


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


[Nix-commits] [NixOS/nixpkgs] aa18ee: geary 0.10: remove unused disable_valadoc.patch

2016-06-21 Thread Tobias Geerinckx-Rice
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: aa18ee6a73382097d4acc237e0d42805f95e4107
  
https://github.com/NixOS/nixpkgs/commit/aa18ee6a73382097d4acc237e0d42805f95e4107
  Author: Tobias Geerinckx-Rice 
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
R pkgs/desktops/gnome-3/3.20/misc/geary/disable_valadoc.patch

  Log Message:
  ---
  geary 0.10: remove unused disable_valadoc.patch


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


[Nix-commits] [NixOS/nixpkgs] fe04ea: nix-tour: 0.0.1 initial release for offline use

2016-06-21 Thread Shea Levy
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: fe04ea79ddc33a612181050c1fb69c6f928b2f6c
  
https://github.com/NixOS/nixpkgs/commit/fe04ea79ddc33a612181050c1fb69c6f928b2f6c
  Author: Joachim Schiele 
  Date:   2016-06-17 (Fri, 17 Jun 2016)

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

  Log Message:
  ---
  nix-tour: 0.0.1 initial release for offline use


  Commit: 8f28dad52ce7da0dd4d2342dfb740a5b5e1f4d9b
  
https://github.com/NixOS/nixpkgs/commit/8f28dad52ce7da0dd4d2342dfb740a5b5e1f4d9b
  Author: Shea Levy 
  Date:   2016-06-21 (Tue, 21 Jun 2016)

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

  Log Message:
  ---
  Merge branch 'nix-tour' of git://github.com/qknight/nixpkgs


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


[Nix-commits] [NixOS/nixpkgs] 61ba95: binutils: remove unused pt-pax-flags-20121023.patc...

2016-06-21 Thread Tobias Geerinckx-Rice
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 61ba956cc891ac579387047371488aae48d5d55d
  
https://github.com/NixOS/nixpkgs/commit/61ba956cc891ac579387047371488aae48d5d55d
  Author: Tobias Geerinckx-Rice 
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
R pkgs/development/tools/misc/binutils/pt-pax-flags-20121023.patch

  Log Message:
  ---
  binutils: remove unused pt-pax-flags-20121023.patch


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


[Nix-commits] [NixOS/nixpkgs] 33f831: perlPackages: bump some packages

2016-06-21 Thread Robert Helgesson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 33f831ea4c9f8d855b19ee70c7f5b3661279c8a8
  
https://github.com/NixOS/nixpkgs/commit/33f831ea4c9f8d855b19ee70c7f5b3661279c8a8
  Author: Robert Helgesson 
  Date:   2016-06-22 (Wed, 22 Jun 2016)

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

  Log Message:
  ---
  perlPackages: bump some packages

 - CryptX: 0.036 -> 0.037
 - DBIxClass: 0.082821 -> 0.082840
 - MathBigInt: 1.999723 -> 1.999724
 - Moo: 2.001001 -> 2.002002
 - MooseXGetopt: 0.70 -> 0.71


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


[Nix-commits] [NixOS/nixpkgs] 571c13: graylog: 2.0.2 -> 2.0.3

2016-06-21 Thread Arseniy Seroka
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 571c134613e24a3e792a1f23d65e844ed5dbb76e
  
https://github.com/NixOS/nixpkgs/commit/571c134613e24a3e792a1f23d65e844ed5dbb76e
  Author: Tristan Helmich 
  Date:   2016-06-21 (Tue, 21 Jun 2016)

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

  Log Message:
  ---
  graylog: 2.0.2 -> 2.0.3


  Commit: 8491cdff1b9cfbec07415c4ff5f800c704af95d8
  
https://github.com/NixOS/nixpkgs/commit/8491cdff1b9cfbec07415c4ff5f800c704af95d8
  Author: Arseniy Seroka 
  Date:   2016-06-21 (Tue, 21 Jun 2016)

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

  Log Message:
  ---
  Merge pull request #16402 from mayflower/graylog_2.0.3

graylog: 2.0.2 -> 2.0.3


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


Re: [Nix-dev] Disabling gnome-keyring xdg autostart configuration

2016-06-21 Thread Azul
I simply commit my .config folder into git.
there is so much customization to be done on the higher level window
managers and apps, that I personally don't think its worth the time finding
about a particular way to set a particular setting.
On 21 Jun 2016 22:35, "Philip Potter"  wrote:

> I got a solution to my problem in the end!
>
> I got stuck for a while because removing the /etc/xdg/autostart
> symlink is basically impossible without recompiling the gnome-keyring
> package.  However, the xdg autostart standard allows users to override
> these values by putting files into ~/.config.
>
> This askubuntu stack exchange answer captures it perfectly:
> http://askubuntu.com/a/607563/559764
>
> All I had to do was:
> cp /run/current-system/sw/etc/xdg/autostart/gnome-keyring-ssh.desktop
> ~/.config/autostart
> echo Hidden=true >> ~/.config/autostart/gnome-keyring-ssh.desktop
>
> and now gnome-keyring's ssh component no longer starts, and I can use
> gpg-agent as my ssh-agent again as desired.
>
> I think there may be a way to do this more declaratively by instead
> installing a package into the user profile which would drop the
> required file into
> ~/.nix-profile/etc/xdg/autostart/gnome-keyring-ssh.desktop but I
> haven't fully investigated this yet.
>
> Phil
>
>
>
> On 18 June 2016 at 12:24, Philip Potter  wrote:
> > Hello all,
> >
> > I'm using NixOS and trying to set up gpg-agent under gnome.  As part
> > of this, I want to use gpg-agent as an ssh-agent.
> >
> > However, gnome-keyring also acts as an ssh-agent, so I want to disable
> > this functionality.
> >
> > It's possible to disable this by compiling it out entirely [1] but
> > this seems heavyweight, not least because it would require recompiling
> > anything which depends on gnome-keyring.
> >
> > It seems it's also possible to disable it by removing the
> > /etc/xdg/autostart symlink for the ssh module [2].
> >
> > Is it possible to do this in NixOS? Enabling gnome causes the
> > gnome3.gnome_keyring package to be added to systemPackages, which
> > seems to automatically add all gnome-keyring /etc/xdg/autostart files
> > to the system profile. Can I suppress a single autostart script when
> > adding a package to systemPackages? Is there some sort of package
> > override that would let me do this?
> >
> > Phil
> >
> > [1]: https://wiki.gnome.org/Projects/GnomeKeyring/Ssh
> > [2]:
> https://wiki.archlinux.org/index.php/GNOME/Keyring#Disable_keyring_daemon_SSH_component
> ___
> 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


Re: [Nix-dev] Disabling gnome-keyring xdg autostart configuration

2016-06-21 Thread Philip Potter
I got a solution to my problem in the end!

I got stuck for a while because removing the /etc/xdg/autostart
symlink is basically impossible without recompiling the gnome-keyring
package.  However, the xdg autostart standard allows users to override
these values by putting files into ~/.config.

This askubuntu stack exchange answer captures it perfectly:
http://askubuntu.com/a/607563/559764

All I had to do was:
cp /run/current-system/sw/etc/xdg/autostart/gnome-keyring-ssh.desktop
~/.config/autostart
echo Hidden=true >> ~/.config/autostart/gnome-keyring-ssh.desktop

and now gnome-keyring's ssh component no longer starts, and I can use
gpg-agent as my ssh-agent again as desired.

I think there may be a way to do this more declaratively by instead
installing a package into the user profile which would drop the
required file into
~/.nix-profile/etc/xdg/autostart/gnome-keyring-ssh.desktop but I
haven't fully investigated this yet.

Phil



On 18 June 2016 at 12:24, Philip Potter  wrote:
> Hello all,
>
> I'm using NixOS and trying to set up gpg-agent under gnome.  As part
> of this, I want to use gpg-agent as an ssh-agent.
>
> However, gnome-keyring also acts as an ssh-agent, so I want to disable
> this functionality.
>
> It's possible to disable this by compiling it out entirely [1] but
> this seems heavyweight, not least because it would require recompiling
> anything which depends on gnome-keyring.
>
> It seems it's also possible to disable it by removing the
> /etc/xdg/autostart symlink for the ssh module [2].
>
> Is it possible to do this in NixOS? Enabling gnome causes the
> gnome3.gnome_keyring package to be added to systemPackages, which
> seems to automatically add all gnome-keyring /etc/xdg/autostart files
> to the system profile. Can I suppress a single autostart script when
> adding a package to systemPackages? Is there some sort of package
> override that would let me do this?
>
> Phil
>
> [1]: https://wiki.gnome.org/Projects/GnomeKeyring/Ssh
> [2]: 
> https://wiki.archlinux.org/index.php/GNOME/Keyring#Disable_keyring_daemon_SSH_component
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev


[Nix-commits] [NixOS/nixpkgs] bb8bd4: trojita: init at 0.7

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

  Changed paths:
A pkgs/applications/networking/mailreaders/trojita/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  trojita: init at 0.7


  Commit: 6a61621cb4e93ff50b5dac7dc8900acc55184ed1
  
https://github.com/NixOS/nixpkgs/commit/6a61621cb4e93ff50b5dac7dc8900acc55184ed1
  Author: Thomas Tuegel 
  Date:   2016-06-21 (Tue, 21 Jun 2016)

  Changed paths:
A pkgs/applications/networking/mailreaders/trojita/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  Merge pull request #16396 from FRidh/trojita

trojita: init at 0.7


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


[Nix-commits] [NixOS/nixpkgs] 624602: python-lti: 0.4.0 -> 0.4.1

2016-06-21 Thread Frederik Rietdijk
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 624602ef7562e2c5b7e4f8826a59a8fd55d56183
  
https://github.com/NixOS/nixpkgs/commit/624602ef7562e2c5b7e4f8826a59a8fd55d56183
  Author: Guillaume Maudoux 
  Date:   2016-06-14 (Tue, 14 Jun 2016)

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

  Log Message:
  ---
  python-lti: 0.4.0 -> 0.4.1


  Commit: a48796ab831f564cd83fff2a3ce6e46114a6cb80
  
https://github.com/NixOS/nixpkgs/commit/a48796ab831f564cd83fff2a3ce6e46114a6cb80
  Author: Guillaume Maudoux 
  Date:   2016-06-14 (Tue, 14 Jun 2016)

  Changed paths:
A pkgs/servers/inginious/default.nix
M pkgs/top-level/all-packages.nix
M pkgs/top-level/python-packages.nix

  Log Message:
  ---
  inginious: turn lib into a python app.


  Commit: 0fef9ed3ed5443371242c3427fdd6d9baacdc4cf
  
https://github.com/NixOS/nixpkgs/commit/0fef9ed3ed5443371242c3427fdd6d9baacdc4cf
  Author: Guillaume Maudoux 
  Date:   2016-06-14 (Tue, 14 Jun 2016)

  Changed paths:
M nixos/modules/module-list.nix
A nixos/modules/services/web-servers/lighttpd/inginious.nix

  Log Message:
  ---
  inginious: init NixOS module


  Commit: 9e2866d5de1d2fb968e475b45c6be01d83f09299
  
https://github.com/NixOS/nixpkgs/commit/9e2866d5de1d2fb968e475b45c6be01d83f09299
  Author: Frederik Rietdijk 
  Date:   2016-06-21 (Tue, 21 Jun 2016)

  Changed paths:
M nixos/modules/module-list.nix
A nixos/modules/services/web-servers/lighttpd/inginious.nix
A pkgs/servers/inginious/default.nix
M pkgs/top-level/all-packages.nix
M pkgs/top-level/python-packages.nix

  Log Message:
  ---
  Merge pull request #16086 from layus/inginious

INGInious: provide a NixOS module


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


[Nix-commits] [NixOS/nixpkgs] df4750: lib: Make escapeShellArg more robust

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

  Changed paths:
M lib/strings.nix

  Log Message:
  ---
  lib: Make escapeShellArg more robust

Quoting various characters that the shell *may* interpret specially is a
very fragile thing to do.

I've used something more robust all over the place in various Nix
expression I've written just because I didn't trust escapeShellArg.

Here is a proof of concept showing that I was indeed right in
distrusting escapeShellArg:

with import  {};

let
  payload = runCommand "payload" {} ''
# \x00 is not allowed for Nix strings, so let's begin at 1
for i in $(seq 1 255); do
  echo -en "\\x$(printf %02x $i)"
done > "$out"
  '';

  escapers = with lib; {
current = escapeShellArg;
better = arg: let
  backslashEscapes = stringToCharacters "\"\\ ';$`()|<>\r\t*[]&!~#";
  search = backslashEscapes ++ [ "\n" ];
  replace = map (c: "\\${c}") backslashEscapes ++ [ "'\n'" ];
in replaceStrings search replace (toString arg);
best = arg: "'${replaceStrings ["'"] ["'\\''"] (toString arg)}'";
  };

  testWith = escaper: let
escaped = escaper (builtins.readFile payload);
  in runCommand "test" {} ''
if ! r="$(bash -c ${escapers.best "echo -nE ${escaped}"} 2> /dev/null)"
then
  echo bash eval error > "$out"
  exit 0
fi
if echo -n "$r" | cmp -s "${payload}"; then
  echo success > "$out"
else
  echo failed > "$out"
fi
  '';

in runCommand "results" {} ''
  echo "Test results:"
  ${lib.concatStrings (lib.mapAttrsToList (name: impl: ''
echo "  ${name}: $(< "${testWith impl}")"
  '') escapers)}
  exit 1
''

The resulting output is the following:

Test results:
  best: success
  better: success
  current: bash eval error

I did the "better" implementation just to illustrate that the method of
quoting only "harmful" characters results in madness in terms of
implementation and performance.

Signed-off-by: aszlig 
Cc: @edolstra, @zimbatm


  Commit: bc6b93511f21f9943b1c9a9b872717d507ab9070
  
https://github.com/NixOS/nixpkgs/commit/bc6b93511f21f9943b1c9a9b872717d507ab9070
  Author: zimbatm 
  Date:   2016-06-21 (Tue, 21 Jun 2016)

  Changed paths:
M lib/strings.nix

  Log Message:
  ---
  Merge pull request #16377 from aszlig/improve-escape-shell-arg

lib: Make escapeShellArg more robust


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


[Nix-commits] [NixOS/nixpkgs] 67d0dd: autorevision: init at 1.14

2016-06-21 Thread Bjørn Forsman
  Branch: refs/heads/release-16.03
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 67d0dd7717cb97d99bfbf28fffb8f6aa20d4719c
  
https://github.com/NixOS/nixpkgs/commit/67d0dd7717cb97d99bfbf28fffb8f6aa20d4719c
  Author: Bjørn Forsman 
  Date:   2016-06-21 (Tue, 21 Jun 2016)

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

  Log Message:
  ---
  autorevision: init at 1.14

A shell script for extracting revision information useful in
release/build scripting from repositories.

(cherry picked from commit 6536804848f3989977441d92d77aa9230dd07018)


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


[Nix-commits] [NixOS/nixpkgs] 653680: autorevision: init at 1.14

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

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

  Log Message:
  ---
  autorevision: init at 1.14

A shell script for extracting revision information useful in
release/build scripting from repositories.


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


[Nix-commits] [NixOS/nixpkgs] c22720: wolfssl: 3.9.0 -> 3.9.6, split package

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

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

  Log Message:
  ---
  wolfssl: 3.9.0 -> 3.9.6, split package


  Commit: 6596d1eb613b2c0c4f8c48c97543781c8a5aa67c
  
https://github.com/NixOS/nixpkgs/commit/6596d1eb613b2c0c4f8c48c97543781c8a5aa67c
  Author: zimbatm 
  Date:   2016-06-21 (Tue, 21 Jun 2016)

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

  Log Message:
  ---
  Merge pull request #16389 from mcmtroffaes/feature/wolfssl-3.9.6

wolfssl: 3.9.0 -> 3.9.6, split package


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


[Nix-commits] [NixOS/nixpkgs] 98b940: top-level: builtins.toPath no longer needed

2016-06-21 Thread zimbatm
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 98b9403a2227ce1e626c96b49955ea22d7f9c715
  
https://github.com/NixOS/nixpkgs/commit/98b9403a2227ce1e626c96b49955ea22d7f9c715
  Author: John Ericson 
  Date:   2016-06-21 (Tue, 21 Jun 2016)

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

  Log Message:
  ---
  top-level: builtins.toPath no longer needed


  Commit: afbba2bffa8ce4b627e6dfc7d3c76909bb959144
  
https://github.com/NixOS/nixpkgs/commit/afbba2bffa8ce4b627e6dfc7d3c76909bb959144
  Author: zimbatm 
  Date:   2016-06-21 (Tue, 21 Jun 2016)

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

  Log Message:
  ---
  Merge pull request #16384 from Ericson2314/top-level-to-path

top-level: builtins.toPath no longer needed


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


[Nix-commits] [NixOS/nixpkgs] f3950f: i2pd: 2.7.0 -> 2.8.0

2016-06-21 Thread Edward Tjörnhammar
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: f3950f712fbd85ced8098bb19b99b5150fbf180b
  
https://github.com/NixOS/nixpkgs/commit/f3950f712fbd85ced8098bb19b99b5150fbf180b
  Author: Edward Tjörnhammar 
  Date:   2016-06-21 (Tue, 21 Jun 2016)

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

  Log Message:
  ---
  i2pd: 2.7.0 -> 2.8.0

Signed-off-by: Edward Tjörnhammar 


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


[Nix-commits] [NixOS/nixpkgs] e2410f: cornice: 0.17.0 -> 1.2.1

2016-06-21 Thread Frederik Rietdijk
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: e2410f1d0b950ded88c6c78e09758b26bbc73892
  
https://github.com/NixOS/nixpkgs/commit/e2410f1d0b950ded88c6c78e09758b26bbc73892
  Author: Tom Hunger 
  Date:   2016-06-07 (Tue, 07 Jun 2016)

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

  Log Message:
  ---
  cornice: 0.17.0 -> 1.2.1


  Commit: 712d5f2612046bdff64d404e59cc6fdc489e3358
  
https://github.com/NixOS/nixpkgs/commit/712d5f2612046bdff64d404e59cc6fdc489e3358
  Author: Tom Hunger 
  Date:   2016-06-07 (Tue, 07 Jun 2016)

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

  Log Message:
  ---
  pyramid: 1.5.7 -> 1.7


  Commit: f6351897c3348ae771cd25109bff19fdca0d0898
  
https://github.com/NixOS/nixpkgs/commit/f6351897c3348ae771cd25109bff19fdca0d0898
  Author: Tom Hunger 
  Date:   2016-06-07 (Tue, 07 Jun 2016)

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

  Log Message:
  ---
  pyramid-multiauth: 0.3.2 -> 0.8.0


  Commit: 95852c6c724cc7c3db02488ce19d10cf677c8e17
  
https://github.com/NixOS/nixpkgs/commit/95852c6c724cc7c3db02488ce19d10cf677c8e17
  Author: Tom Hunger 
  Date:   2016-06-07 (Tue, 07 Jun 2016)

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

  Log Message:
  ---
  structlog: 15.3.0 -> 16.1.0

Also removing twisted test to avoid pulling in twisted just for one
test case.


  Commit: 3e65082c74b64e182745659b1df2c6e2d1e7bc1e
  
https://github.com/NixOS/nixpkgs/commit/3e65082c74b64e182745659b1df2c6e2d1e7bc1e
  Author: Tom Hunger 
  Date:   2016-06-07 (Tue, 07 Jun 2016)

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

  Log Message:
  ---
  ujson: 1.33 -> 1.35


  Commit: 832ac8479b9fd3cb0bd6a20c4f8e251789e1e53e
  
https://github.com/NixOS/nixpkgs/commit/832ac8479b9fd3cb0bd6a20c4f8e251789e1e53e
  Author: Frederik Rietdijk 
  Date:   2016-06-21 (Tue, 21 Jun 2016)

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

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

Update several python packages


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


[Nix-commits] [NixOS/nixpkgs] 4c454f: texmaker: 4.4.1 -> 4.5 (#16359)

2016-06-21 Thread Miguel Madrid
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 4c454fed33271be1f7f82ac7f1f958f49f85f01b
  
https://github.com/NixOS/nixpkgs/commit/4c454fed33271be1f7f82ac7f1f958f49f85f01b
  Author: Miguel Madrid 
  Date:   2016-06-21 (Tue, 21 Jun 2016)

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

  Log Message:
  ---
  texmaker: 4.4.1 -> 4.5 (#16359)


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


[Nix-commits] [NixOS/nixpkgs] 091a91: bleach: 1.4 -> 1.4.3

2016-06-21 Thread Frederik Rietdijk
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 091a911bcd2e3489f3fe565187acf63914fc1faa
  
https://github.com/NixOS/nixpkgs/commit/091a911bcd2e3489f3fe565187acf63914fc1faa
  Author: Benjamin Saunders 
  Date:   2016-06-14 (Tue, 14 Jun 2016)

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

  Log Message:
  ---
  bleach: 1.4 -> 1.4.3


  Commit: 26da79230b30653eefdb574b05ad6de65e0efdd5
  
https://github.com/NixOS/nixpkgs/commit/26da79230b30653eefdb574b05ad6de65e0efdd5
  Author: Benjamin Saunders 
  Date:   2016-06-17 (Fri, 17 Jun 2016)

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

  Log Message:
  ---
  matrix-synapse: 0.14 -> 0.16


  Commit: 39043e4d6e7ea5014503013f1c44705f2bde51c1
  
https://github.com/NixOS/nixpkgs/commit/39043e4d6e7ea5014503013f1c44705f2bde51c1
  Author: Frederik Rietdijk 
  Date:   2016-06-21 (Tue, 21 Jun 2016)

  Changed paths:
M nixos/modules/services/misc/matrix-synapse.nix
M pkgs/servers/matrix-synapse/default.nix
M pkgs/top-level/python-packages.nix

  Log Message:
  ---
  Merge pull request #16239 from Ralith/matrix-synapse

matrix-synapse: 0.14 -> 0.16


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


[Nix-commits] [NixOS/nixpkgs] 465d6a: Theano-cuda: init at 0.8.2

2016-06-21 Thread Frederik Rietdijk
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 465d6a211370ed635fac338b59e718b4056f1142
  
https://github.com/NixOS/nixpkgs/commit/465d6a211370ed635fac338b59e718b4056f1142
  Author: artuuge 
  Date:   2016-06-20 (Mon, 20 Jun 2016)

  Changed paths:
A pkgs/development/libraries/science/math/cudnn/7.5-5.0/default.nix
A pkgs/development/python-modules/theano/cuda/default.nix
M pkgs/top-level/all-packages.nix
M pkgs/top-level/python-packages.nix

  Log Message:
  ---
  Theano-cuda: init at 0.8.2


  Commit: 8ef747baed3a3313c229d86e8c410b731d3a9124
  
https://github.com/NixOS/nixpkgs/commit/8ef747baed3a3313c229d86e8c410b731d3a9124
  Author: Frederik Rietdijk 
  Date:   2016-06-21 (Tue, 21 Jun 2016)

  Changed paths:
A pkgs/development/libraries/science/math/cudnn/7.5-5.0/default.nix
A pkgs/development/python-modules/theano/cuda/default.nix
M pkgs/top-level/all-packages.nix
M pkgs/top-level/python-packages.nix

  Log Message:
  ---
  Merge pull request #16334 from artuuge/theano_cudnn

Theano-cuda: init at 0.8.2


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


[Nix-commits] [NixOS/nixpkgs] 0a8e61: aspino: init at 2016-01-31

2016-06-21 Thread Gabriel Ebner
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 0a8e613cea27d4a32ea43e73c2b5bf0ebcb54211
  
https://github.com/NixOS/nixpkgs/commit/0a8e613cea27d4a32ea43e73c2b5bf0ebcb54211
  Author: Gabriel Ebner 
  Date:   2016-06-21 (Tue, 21 Jun 2016)

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

  Log Message:
  ---
  aspino: init at 2016-01-31


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


[Nix-commits] [NixOS/nixpkgs] 8f84a5: glucose, glucose-syrup: init at 4.0

2016-06-21 Thread Gabriel Ebner
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 8f84a5cb0861f91fcb62785bd77c0a512a9768ab
  
https://github.com/NixOS/nixpkgs/commit/8f84a5cb0861f91fcb62785bd77c0a512a9768ab
  Author: Gabriel Ebner 
  Date:   2016-06-21 (Tue, 21 Jun 2016)

  Changed paths:
A pkgs/applications/science/logic/glucose/default.nix
A pkgs/applications/science/logic/glucose/syrup.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  glucose, glucose-syrup: init at 4.0


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


[Nix-commits] [NixOS/nixops] 465727: show-arguments: use false for dummyArgs in stead o...

2016-06-21 Thread Rob Vermaas
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixops
  Commit: 46572795546cff82dc9fbf039b9cc1205047d63e
  
https://github.com/NixOS/nixops/commit/46572795546cff82dc9fbf039b9cc1205047d63e
  Author: Rob Vermaas 
  Date:   2016-06-13 (Mon, 13 Jun 2016)

  Changed paths:
M nix/eval-machine-info.nix

  Log Message:
  ---
  show-arguments: use false for dummyArgs in stead of null.


  Commit: f0475ec4b47611a317cd8f0849ee6e8415d2fff8
  
https://github.com/NixOS/nixops/commit/f0475ec4b47611a317cd8f0849ee6e8415d2fff8
  Author: Rob Vermaas 
  Date:   2016-06-21 (Tue, 21 Jun 2016)

  Changed paths:
M nixops/backends/ec2.py

  Log Message:
  ---
  Add confirmation to nixops stop for EC2 instances.


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


[Nix-commits] [NixOS/nixpkgs] 22a7f3: youtube-dl: 2016.05.21.2 -> 2016.06.19.1 (#16338)

2016-06-21 Thread wrb
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 22a7f3a849c8f2e2a3fbdeea5d6e0505171ae5fd
  
https://github.com/NixOS/nixpkgs/commit/22a7f3a849c8f2e2a3fbdeea5d6e0505171ae5fd
  Author: wrb 
  Date:   2016-06-21 (Tue, 21 Jun 2016)

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

  Log Message:
  ---
  youtube-dl: 2016.05.21.2 -> 2016.06.19.1 (#16338)


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


[Nix-commits] [NixOS/nixpkgs] 8e4778: coturn: init at 4.5.0.3 (#16284)

2016-06-21 Thread Benjamin Saunders
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 8e47786c0ea383a7e0bd0d3e166d575152cd4a0c
  
https://github.com/NixOS/nixpkgs/commit/8e47786c0ea383a7e0bd0d3e166d575152cd4a0c
  Author: Benjamin Saunders 
  Date:   2016-06-21 (Tue, 21 Jun 2016)

  Changed paths:
M lib/maintainers.nix
M nixos/modules/misc/ids.nix
M nixos/modules/module-list.nix
A nixos/modules/services/networking/coturn.nix
A pkgs/servers/coturn/default.nix
A pkgs/servers/coturn/pure-configure.patch
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  coturn: init at 4.5.0.3 (#16284)


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


Re: [Nix-dev] Using string as path to eg. builtins.readFile

2016-06-21 Thread Roger Qiu
Thanks, even if that doesn't go into the docs, I'm putting that into a 
github gist.



On 21/06/2016 5:44 PM, Bas van Dijk wrote:

Hi Erik,

Do note that I went through the same trouble as you figuring out how
to apply builtins.readFile to a dynamically constructed path. Maybe we
can document this "trick" in the documentation of builtins.readFile so
other people don't have to go through the same trouble.

To understand these things I would recommend using nix-repl:

   $ nix-repl
   Welcome to Nix version 1.11.2. Type :? for help.

   nix-repl> name = "bar"

   nix-repl> ./foo + "${name}"
   /home/bas.van.dijk/foobar

Note that the previous is equivalent to the simpler:

   nix-repl> ./foo + name
   /home/bas.van.dijk/foobar

The reason that you get "foobar" is that we didn't include a "/". So
lets try to do that:

   nix-repl> ./foo/ + name
   error: syntax error, unexpected '+', at (string):1:8

Apparently the Nix path parser doesn't like a slash at the end of a
path literal. So lets try adding the slash dynamically:

   nix-repl> ./foo + "/" + name
   /home/bas.van.dijk/foobar

What happened here? Well, + is left associative so it is interpreted as:

   (./foo + "/") + name

Lets try evaluating that left expression alone:

   nix-repl> ./foo + "/"
   /home/bas.van.dijk/foo

Apparently Nix performs normalization on paths since the final slash
is not included. So lets put the parenthesis differently:

   nix-repl> ./foo + ("/" + name)
   /home/bas.van.dijk/foo/bar

That's better! Now we can shorten this using some antiquotation:

   nix-repl> ./foo + "/${name}"
   /home/bas.van.dijk/foo/bar

I hope this helped.

Cheers,

Bas

On 21 June 2016 at 09:19, 4levels <4lev...@gmail.com> wrote:

Hi Bas,

Out of curiosity I've been experimenting with different approaches but only
yours works and I have no clue why..  Is there anything I can learn / read /
study to understand why?  Without having to study C++ (or python for that
matter as I can't even tell them apart ;-)
Is this basic lambda programming or very specific to Nix?

Works
builtins.readFile (./keys + "/${name}")

Doesn't work
builtins.readFile (./keys/ + "${name}") - unexpected +
builtins.readFile (./keys/ + name) - unexpected +
builtins.readFile (./keys + "/" + name") - no build errors, but doesn't
parse the / in the middle -> ./keysmancloud.amazon.iam.key_id -> not found

Kind regards and thanks again, my key deployment sections have become very
compact and maintainable now..

Erik

On Tue, Jun 21, 2016 at 1:56 AM 4levels <4lev...@gmail.com> wrote:

Hi Bas,

Thank you so much! Exactly what I was looking for.
It's these basic things that I keep not getting my head around.. You have
no idea how many fruitless Google and GitHub searches I tried on this one
;-)

Finally resolved and another lesson learned, amazing!

Kind regards,

Erik


On Tue, Jun 21, 2016, 01:39 Bas van Dijk  wrote:

On 19 June 2016 at 15:58, 4levels <4lev...@gmail.com> wrote:

builtins.readFile "./keys/${name}"

Hi Erik, try this:

   builtins.readFile (./keys + "/${name}")

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


--
Founder of Matrix AI
https://matrix.ai/
+61420925975

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


[Nix-commits] [NixOS/nixpkgs] 47d95a: Remove dead code in stdenvCross adaptor

2016-06-21 Thread Peter Simons
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 47d95a7571ded20c2d6a7a393b49966037c91213
  
https://github.com/NixOS/nixpkgs/commit/47d95a7571ded20c2d6a7a393b49966037c91213
  Author: John Ericson 
  Date:   2016-06-20 (Mon, 20 Jun 2016)

  Changed paths:
M pkgs/stdenv/adapters.nix

  Log Message:
  ---
  Remove dead code in stdenvCross adaptor


  Commit: 5b7bdb28615cd033d38267328d8d74723570beec
  
https://github.com/NixOS/nixpkgs/commit/5b7bdb28615cd033d38267328d8d74723570beec
  Author: John Ericson 
  Date:   2016-06-20 (Mon, 20 Jun 2016)

  Changed paths:
M pkgs/stdenv/adapters.nix

  Log Message:
  ---
  Remove more dead code: `stdenvDarwinNaked` no longer exists


  Commit: 7cbf4a56f7f6f281570692403e79f89cc21ae388
  
https://github.com/NixOS/nixpkgs/commit/7cbf4a56f7f6f281570692403e79f89cc21ae388
  Author: John Ericson 
  Date:   2016-06-20 (Mon, 20 Jun 2016)

  Changed paths:
R pkgs/development/compilers/ghc/with-packages.nix

  Log Message:
  ---
  Remove dead `pkgs/development/compilers/ghc/with-packages.nix`

Superseded by `/pkgs/development/haskell-modules/with-packages-wrapper.nix`


  Commit: bc08bef615261dff66ddc0384398fd8565c778cf
  
https://github.com/NixOS/nixpkgs/commit/bc08bef615261dff66ddc0384398fd8565c778cf
  Author: Peter Simons 
  Date:   2016-06-21 (Tue, 21 Jun 2016)

  Changed paths:
R pkgs/development/compilers/ghc/with-packages.nix
M pkgs/stdenv/adapters.nix

  Log Message:
  ---
  Merge pull request #16382 from Ericson2314/morgue

Remove misc dead code


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


[Nix-commits] [NixOS/nixpkgs] e94564: idea: make jdk overrideable using .override

2016-06-21 Thread Edward Tjörnhammar
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: e945646be3a045948801ff7262bec11a7b9315b3
  
https://github.com/NixOS/nixpkgs/commit/e945646be3a045948801ff7262bec11a7b9315b3
  Author: Edward Tjörnhammar 
  Date:   2016-06-21 (Tue, 21 Jun 2016)

  Changed paths:
M pkgs/applications/editors/idea/common.nix
M pkgs/applications/editors/idea/default.nix

  Log Message:
  ---
  idea: make jdk overrideable using .override

Signed-off-by: Edward Tjörnhammar 


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


Re: [Nix-dev] Using string as path to eg. builtins.readFile

2016-06-21 Thread Bas van Dijk
Hi Erik,

Do note that I went through the same trouble as you figuring out how
to apply builtins.readFile to a dynamically constructed path. Maybe we
can document this "trick" in the documentation of builtins.readFile so
other people don't have to go through the same trouble.

To understand these things I would recommend using nix-repl:

  $ nix-repl
  Welcome to Nix version 1.11.2. Type :? for help.

  nix-repl> name = "bar"

  nix-repl> ./foo + "${name}"
  /home/bas.van.dijk/foobar

Note that the previous is equivalent to the simpler:

  nix-repl> ./foo + name
  /home/bas.van.dijk/foobar

The reason that you get "foobar" is that we didn't include a "/". So
lets try to do that:

  nix-repl> ./foo/ + name
  error: syntax error, unexpected '+', at (string):1:8

Apparently the Nix path parser doesn't like a slash at the end of a
path literal. So lets try adding the slash dynamically:

  nix-repl> ./foo + "/" + name
  /home/bas.van.dijk/foobar

What happened here? Well, + is left associative so it is interpreted as:

  (./foo + "/") + name

Lets try evaluating that left expression alone:

  nix-repl> ./foo + "/"
  /home/bas.van.dijk/foo

Apparently Nix performs normalization on paths since the final slash
is not included. So lets put the parenthesis differently:

  nix-repl> ./foo + ("/" + name)
  /home/bas.van.dijk/foo/bar

That's better! Now we can shorten this using some antiquotation:

  nix-repl> ./foo + "/${name}"
  /home/bas.van.dijk/foo/bar

I hope this helped.

Cheers,

Bas

On 21 June 2016 at 09:19, 4levels <4lev...@gmail.com> wrote:
> Hi Bas,
>
> Out of curiosity I've been experimenting with different approaches but only
> yours works and I have no clue why..  Is there anything I can learn / read /
> study to understand why?  Without having to study C++ (or python for that
> matter as I can't even tell them apart ;-)
> Is this basic lambda programming or very specific to Nix?
>
> Works
> builtins.readFile (./keys + "/${name}")
>
> Doesn't work
> builtins.readFile (./keys/ + "${name}") - unexpected +
> builtins.readFile (./keys/ + name) - unexpected +
> builtins.readFile (./keys + "/" + name") - no build errors, but doesn't
> parse the / in the middle -> ./keysmancloud.amazon.iam.key_id -> not found
>
> Kind regards and thanks again, my key deployment sections have become very
> compact and maintainable now..
>
> Erik
>
> On Tue, Jun 21, 2016 at 1:56 AM 4levels <4lev...@gmail.com> wrote:
>>
>> Hi Bas,
>>
>> Thank you so much! Exactly what I was looking for.
>> It's these basic things that I keep not getting my head around.. You have
>> no idea how many fruitless Google and GitHub searches I tried on this one
>> ;-)
>>
>> Finally resolved and another lesson learned, amazing!
>>
>> Kind regards,
>>
>> Erik
>>
>>
>> On Tue, Jun 21, 2016, 01:39 Bas van Dijk  wrote:
>>>
>>> On 19 June 2016 at 15:58, 4levels <4lev...@gmail.com> wrote:
>>> > builtins.readFile "./keys/${name}"
>>>
>>> Hi Erik, try this:
>>>
>>>   builtins.readFile (./keys + "/${name}")
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev


Re: [Nix-dev] Using string as path to eg. builtins.readFile

2016-06-21 Thread 4levels
Hi Bas,

Out of curiosity I've been experimenting with different approaches but only
yours works and I have no clue why..  Is there anything I can learn / read
/ study to understand why?  Without having to study C++ (or python for that
matter as I can't even tell them apart ;-)
Is this basic lambda programming or very specific to Nix?

Works
builtins.readFile (./keys + "/${name}")

Doesn't work
builtins.readFile (./keys/ + "${name}") - unexpected +
builtins.readFile (./keys/ + name) - unexpected +
builtins.readFile (./keys + "/" + name") - no build errors, but doesn't
parse the / in the middle -> ./keysmancloud.amazon.iam.key_id -> not found

Kind regards and thanks again, my key deployment sections have become very
compact and maintainable now..

Erik

On Tue, Jun 21, 2016 at 1:56 AM 4levels <4lev...@gmail.com> wrote:

> Hi Bas,
>
> Thank you so much! Exactly what I was looking for.
> It's these basic things that I keep not getting my head around.. You have
> no idea how many fruitless Google and GitHub searches I tried on this one
> ;-)
>
> Finally resolved and another lesson learned, amazing!
>
> Kind regards,
>
> Erik
>
> On Tue, Jun 21, 2016, 01:39 Bas van Dijk  wrote:
>
>> On 19 June 2016 at 15:58, 4levels <4lev...@gmail.com> wrote:
>> > builtins.readFile "./keys/${name}"
>>
>> Hi Erik, try this:
>>
>>   builtins.readFile (./keys + "/${name}")
>>
>
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev