[Nix-commits] [NixOS/nixpkgs] 72f2b5: nixos/grub: Add another example for extraEntries

2017-04-24 Thread aszlig
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 72f2b506c73acbdfc15a076acefc793486d9683e
  
https://github.com/NixOS/nixpkgs/commit/72f2b506c73acbdfc15a076acefc793486d9683e
  Author: aszlig 
  Date:   2017-04-25 (Tue, 25 Apr 2017)

  Changed paths:
M nixos/modules/system/boot/loader/grub/grub.nix

  Log Message:
  ---
  nixos/grub: Add another example for extraEntries

Someone on IRC wanted to boot Fedora from another disk. While I'm not
too familiar with UEFI booting in conjunction with GRUB2 it took some
time to get it to work.

So in order to safe others from frustration I'm adding this as another
example to the extraEntries option.

Signed-off-by: aszlig 


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


[Nix-commits] [NixOS/nixpkgs] b1750d: linux-chromiumos: remove 3.14

2017-04-24 Thread Jörg Thalheim
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: b1750d699cfa6ef50ea02a41ee4758afc74d9536
  
https://github.com/NixOS/nixpkgs/commit/b1750d699cfa6ef50ea02a41ee4758afc74d9536
  Author: Jason A. Donenfeld 
  Date:   2017-04-23 (Sun, 23 Apr 2017)

  Changed paths:
R 
pkgs/os-specific/linux/kernel/chromiumos-patches/fix-double-Kconfig-entry-3.14.patch
R pkgs/os-specific/linux/kernel/chromiumos-patches/mfd-fix-dependency.patch
R pkgs/os-specific/linux/kernel/linux-chromiumos-3.14.nix
M pkgs/os-specific/linux/kernel/patches.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  linux-chromiumos: remove 3.14

3.14 is no longer supported upstream by kernel.org and thus no longer
receives security patches. The git commit mentioned in this .nix isn't
even available in the linked repository --
https://chromium.googlesource.com/chromiumos/third_party/kernel -- so I
think this .nix might be dead anyway. Finally, it specifies 3.14.0,
which is so ridiculously old (the latest was 3.14.79) that nobody
develops for it.

Fixes: #25145
Supports: #25127


  Commit: bd47d042949711a16935f71df71ce29ff1c496a7
  
https://github.com/NixOS/nixpkgs/commit/bd47d042949711a16935f71df71ce29ff1c496a7
  Author: Jörg Thalheim 
  Date:   2017-04-25 (Tue, 25 Apr 2017)

  Changed paths:
R 
pkgs/os-specific/linux/kernel/chromiumos-patches/fix-double-Kconfig-entry-3.14.patch
R pkgs/os-specific/linux/kernel/chromiumos-patches/mfd-fix-dependency.patch
R pkgs/os-specific/linux/kernel/linux-chromiumos-3.14.nix
M pkgs/os-specific/linux/kernel/patches.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  Merge pull request #25146 from zx2c4/remove-old-chromiumos

linux-chromiumos: remove 3.14


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


[Nix-commits] [NixOS/nixpkgs] d4fb8c: linux-headers: Remove stray linux headers 3.18 nix...

2017-04-24 Thread Daniel Peebles
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: d4fb8cfc0998bd9c66bc384abf246c9bf303d092
  
https://github.com/NixOS/nixpkgs/commit/d4fb8cfc0998bd9c66bc384abf246c9bf303d092
  Author: John Ericson 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
R pkgs/os-specific/linux/kernel-headers/3.18.nix

  Log Message:
  ---
  linux-headers: Remove stray linux headers 3.18 nix file

In dced724c009a1646475373cc597ada385d46bde6 this derivation was
unexposed along (in all-packages.nix) with the removal of linux 3.18[1].
I think this file was left behind by mistake.

[1]: 
https://github.com/NixOS/nixpkgs/commit/dced724c009a1646475373cc597ada385d46bde6#diff-036410e9211b4336186fc613f7200b12L11174


  Commit: 3ae7f249dad73ed6debec5733dabb8937debb489
  
https://github.com/NixOS/nixpkgs/commit/3ae7f249dad73ed6debec5733dabb8937debb489
  Author: Daniel Peebles 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
R pkgs/os-specific/linux/kernel-headers/3.18.nix

  Log Message:
  ---
  Merge pull request #25187 from obsidiansystems/remove-stray-kernel-headers

linux-headers: Remove stray linux headers 3.18 nix file


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


[Nix-commits] [NixOS/nixpkgs] 4585fd: qemu module: add virtualisation.cores option

2017-04-24 Thread Graham Christensen
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 4585fdb9d462d8f91ca819f7c0b398cfc47745db
  
https://github.com/NixOS/nixpkgs/commit/4585fdb9d462d8f91ca819f7c0b398cfc47745db
  Author: Graham Christensen 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
M nixos/modules/virtualisation/qemu-vm.nix

  Log Message:
  ---
  qemu module: add virtualisation.cores option

QEMU can allow guests to access more than one host core at a time.
Previously, this had to be done via ad-hoc arguments:

virtualisation.qemu.options = ["-smp 12"];

Now you can simply specify:

virtualisation.cores = 12;


  Commit: 3ab98d0971e68ec115c6ffaa259e0e72aedbc80a
  
https://github.com/NixOS/nixpkgs/commit/3ab98d0971e68ec115c6ffaa259e0e72aedbc80a
  Author: Graham Christensen 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
M nixos/modules/virtualisation/qemu-vm.nix

  Log Message:
  ---
  Merge pull request #24999 from grahamc/qemu

qemu module: add virtualisation.cores option


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


Re: [Nix-dev] packaging windows applications through wine

2017-04-24 Thread aszlig
On Mon, Apr 24, 2017 at 02:39:02AM +, Taeer Bar-Yam wrote:
> When one installs things through wine, one usually has to click
> through a bunch of agreements for things installed via winetricks. Can
> we bypass this so we can make nix packages for these things that
> installs nicely?

That really depnds on the installer:

  * If it's an MSI file, you may be able to automate this using msiexec.
  * Some installers can be extracted via cabextract, unshield, 7zip, etc...
  * You could override specific functionality via WINEDLLOVERRIDES, but
that might be a bit difficult in a GUI application.
  * Automate it via something like xdotool in an Xvfb.

I guess the simplest method would be the latter, because if you extract
the installer archive there might be some missing files or registry keys
that you need to apply as well.

Here is an example for automating this via xdotool:

https://github.com/openlab-aux/vuizvui/blob/97e440e996e9c418e46af3dbcdba58595b5c11ea/pkgs/aszlig/santander/default.nix#L63-L74

In this case the installer is quite simple because all you need to do is
click "Next -> Next -> Next -> ..." here.

If it's something more complicated, like if you need ta accept an EULA,
then you might be either in luck and you just need to apply something
like "key alt+a Return" all over again if for example alt+a is for
"accept EULA".

In most cases however it isn't that easy, so I'd try to look whether you
can get information about what's displayed via tracing the font
rendering calls in wine. Another way would be to use OCR, but that is
slower and might be a bit error prone.

> The other challenge I see is where do you put the wineprefix? Because
> on the one hand you want the installation to happen at system build
> time, so that would suggest the nix store. But you also want the
> application to be able to write files (like saves &c) so that would
> have to be in your home folder.

You could set the user data directory to some other unix path via
dosdevices/ and change %APPDATA% accordingly, like:

https://support.microsoft.com/en-us/help/190234/prb-how-to-modify-the-personal-directory-for-all-new-users

Another way would be to use a wrapper that uses overlayfs to write all
the differences of the immutable store path to some location within the
home directory (like eg. ${XDG_DATA_HOME:-$HOME/.local/share}/your_app).

> Is how to package wine applications a solved problem, or do I need to
> do some creative work?

The latter :-)

a!
-- 
aszlig
Universal dilettante


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


[Nix-commits] [NixOS/nixpkgs] a7d891: top-level: `stdenv.cross` is now only defined with...

2017-04-24 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: a7d89139ea74791137bfa606d109e515512c8460
  
https://github.com/NixOS/nixpkgs/commit/a7d89139ea74791137bfa606d109e515512c8460
  Author: John Ericson 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

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

  Log Message:
  ---
  top-level: `stdenv.cross` is now only defined with host != build

In practice, this is a strictly stronger condition than target != build
as we never have build = target != host. Really, the attribute should
be removed altogether, but for now we make it work for plain libraries,
which do not care about the target platform. In the few cases where the
compilers use this and actually care about the target platform, I'll
manually change them to use `targetPlatform` instead.


  Commit: a7068ace35c5344fc2760733d32cca8fd4f01116
  
https://github.com/NixOS/nixpkgs/commit/a7068ace35c5344fc2760733d32cca8fd4f01116
  Author: John Ericson 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
M pkgs/development/compilers/gcc/4.5/default.nix
M pkgs/development/compilers/gcc/4.8/default.nix
M pkgs/development/compilers/gcc/4.9/default.nix
M pkgs/development/compilers/gcc/5/default.nix
M pkgs/development/compilers/gcc/6/default.nix
M pkgs/development/compilers/gcc/snapshot/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  Rewrite a few `stdenv.cross` uses that *should* be `targetPlatform`

The previous commit redefines `stdenv.cross` for the sake of normal
libaries, the most common use-case of that attribute. Some compilers
however relied on the old definition so we have them use
`targetPlatform` instead. This special casing is fine because we
eventually want to remove `stdenv.cross` and use either `hostPlatform`
or `targetPlatform` instead.


  Commit: 49c99b70cf64ccf99cd292426b3dbcaeb2e885aa
  
https://github.com/NixOS/nixpkgs/commit/49c99b70cf64ccf99cd292426b3dbcaeb2e885aa
  Author: John Ericson 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
M pkgs/stdenv/adapters.nix
M pkgs/stdenv/cross/default.nix
M pkgs/stdenv/darwin/default.nix
M pkgs/stdenv/linux/default.nix

  Log Message:
  ---
  cross-stdenv: Only prune most overrides in the final stage

Before all overrides were also pruned in the previous stage, now
only gcc and binutils are, because they alone care about about the
target platform. The rest of the overrides don't, so it's better to
preserve them in order to avoid spurious rebuilds.


  Commit: 75441dd64ac0a7f87ad9ee44574d829263792fef
  
https://github.com/NixOS/nixpkgs/commit/75441dd64ac0a7f87ad9ee44574d829263792fef
  Author: John Ericson 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
M pkgs/development/compilers/gcc/4.5/default.nix
M pkgs/development/compilers/gcc/4.8/default.nix
M pkgs/development/compilers/gcc/4.9/default.nix
M pkgs/development/compilers/gcc/5/default.nix
M pkgs/development/compilers/gcc/6/default.nix
M pkgs/development/compilers/gcc/snapshot/default.nix
M pkgs/stdenv/adapters.nix
M pkgs/stdenv/cross/default.nix
M pkgs/stdenv/darwin/default.nix
M pkgs/stdenv/linux/default.nix
M pkgs/top-level/all-packages.nix
M pkgs/top-level/stage.nix

  Log Message:
  ---
  Merge pull request #25194 from obsidiansystems/host-target-unconfuse

stdenv.cross is a silly attribute that needs to go leaving the well-defined 
hostPlatform and targetPlatform. This PR doesn't remove it, but changes its 
definition: before it tracked the target platform which is sometimes more 
useful for compilers, and now it tracks the host platform which is more useful 
for everything else. Most usages are libraries, falling in the "everything 
else" category, so changing the definition makes sense to appease the majority. 
The few compiler (gcc in particular) uses that exist I remove to use 
targetPlatform --- preserving correctness and becoming more explicit in the 
process.

I would also update the documentation aside mentioning stdenv.cross as 
deprecated, but the definition given actually erroneously assumes this PR is 
already merged!


Compare: https://github.com/NixOS/nixpkgs/compare/f2d1aa05de4d...75441dd64ac0___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 9fae0f: google-compute-image: switch to use the common mak...

2017-04-24 Thread Daniel Peebles
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 9fae0f3f38e0428bc16d83fd12beff10edd8a317
  
https://github.com/NixOS/nixpkgs/commit/9fae0f3f38e0428bc16d83fd12beff10edd8a317
  Author: Dan Peebles 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
M nixos/modules/virtualisation/google-compute-image.nix

  Log Message:
  ---
  google-compute-image: switch to use the common make-disk-image.nix


  Commit: f2d1aa05de4d925998d67b5ac9b6512a3cb67d81
  
https://github.com/NixOS/nixpkgs/commit/f2d1aa05de4d925998d67b5ac9b6512a3cb67d81
  Author: Daniel Peebles 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
M nixos/modules/virtualisation/google-compute-image.nix

  Log Message:
  ---
  Merge pull request #25165 from copumpkin/google-image-common

google-compute-image: switch to use the common make-disk-image.nix


Compare: https://github.com/NixOS/nixpkgs/compare/331efb3d74bc...f2d1aa05de4d___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


Re: [Nix-dev] packaging windows applications through wine

2017-04-24 Thread Tomas Hlavaty
Hi Taeer,

Taeer Bar-Yam  writes:
> Not sure if you intentionally didn't reply to the group, so I'll send this 
> just to you.

ah, the message was meant for the list.  Thanks for telling me.

>> Hi Taeer,
>> 
>>> When one installs things through wine, one usually has to click
>>> through a bunch of agreements for things installed via winetricks. Can
>>> we bypass this so we can make nix packages for these things that
>>> installs nicely?
>> 
>> It depends.  Is it free software?  Then you can build it from source and
>> don't need any interactive installer.
>  
> LoL isn't free software. But regardless, the process of installing anything in
> wine (even free software) usually requires what I think is proprietary windows
> stuff which requires clicking through installation (like vcrun2005 or
> whatever)

If LoL requires users to click through a bunch of agreements, are you
allowed to bypass that?

>>> The other challenge I see is where do you put the wineprefix? Because
>>> on the one hand you want the installation to happen at system build
>>> time, so that would suggest the nix store. But you also want the
>>> application to be able to write files (like saves &c) so that would
>>> have to be in your home folder.
>> 
>> wineprefix should not be in the nix store.
>> 
>> At build-time, wineprefix can be in a temporary directory which is
>> writeable.
>> 
>> At run-time, it is usually in ~/.wine unless you specify something
>> different.
>
> Right, but the problem is if you're installing something via 
> configuration.nix,
> all of the results have to go into the store, because you don't even know what
> users there are.

Yes, results go into the store.  It does not mean that wineprefix has to
point there, e.g.

$ WINEPREFIX=~/.wine64-test wine64 /nix/store/xx-myprog-1.0/bin/myprog.exe

can work.

>>> Is how to package wine applications a solved problem, or do I need to
>>> do some creative work?
>> 
>> It depends.  At work, we cross-compile some packages with mingw and test
>> them under wine.  This works quite well but is far from solved problem
>> as most packages don't work out of the box.  It's still better than
>> chasing prebuilt and up-to-date binaries or installers on the web.
>
> I'm talking specifically about making nix packages for applications run 
> through
> wine. So you can just add e.g. league_of_legends to your systemPackages, and 
> it
> will install it in a wine prefix and provides you an alias so you can just run
> it, and not even know it's running through wine.

There is not much special about nix packages for applications run
through wine.  Just write a package with a shell script which will do
everything necessary without users having to worry about anything.

I don't think "install it in a wine prefix" is correct way to describe
it.

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


Re: [Nix-dev] Simplify node packages?

2017-04-24 Thread Profpatsch
On 17-04-23 01:10pm, Benno Fünfstück wrote:
> * A simple approach to packaging NPM applications would be to split the
> package for an NPM application into two:
>   - fetch: let NPM download all the dependencies. it should(?) be possible
> to make this a fixed-output derivation, as long as NPM downloads the same
> set of dependencies each time
>   - build: use the cache from the fetch phase, should require no network
> access
> 
> The fetch phase should be deterministic if we freeze the NPM index (is such
> a thing possible?) and use shrinkwrap.
> Or is this not the case? In what cases will it fail to be deterministic?
> 
> * Alternatively, `yarn` claims to be more deterministic. Can we use `yarn`
> to build all NPM packages? Or are there NPM packages that are incompatible?

I’m in the process of writing yarn2nix.

After resolving dependencies yarn writes a lockfile,
example: https://github.com/facebook/react/blob/master/yarn.lock
As you can observe this has everything we need (even the hash!)

Sadly it is not a known format, so I wrote a simple-stupid parser:
https://hackage.haskell.org/package/yarn-lock-0.1.0/docs/Yarn-Lock.html

The pre-alpha-version of converting yarn.lock files to nix expressions
can be found here:
https://github.com/Profpatsch/yarn2nix

nix-shell
$ hpack
$ cabal build
$ ./dist/build/yarn2nix/yarn2nix

should do the trick.

It works for simple yarn.lock files, but the generated output
cannot be nicely checked in yet, since it’s way too verbose.
I need to change the internal data representation a bit,
to a multi-keyed map.

When trying to build our production (ember) app I stumbled on
another major problem: npm package dependencies and yarn.lock
files have cycles.
No sane package manager would allow cycles, but here we are.
So a cycle-breaking function is still needed, not very much
work but not trivial either.

The most interesting property is, that all dependency trees
are linked together with symlinked, so they are cached by nix
on a package level:
https://github.com/Profpatsch/yarn2nix/blob/master/buildNodePackage.nix#L33

I expect yarn2nix to be ready in a few days, most certainly
in the next two weeks.

-- 
Proudly written in Mutt with Vim on NixOS.
May take up to five days to read your message. If it’s urgent, call me.
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-dev


[Nix-commits] [NixOS/nixpkgs] 18de0c: skypeforlinux: init at 5.1.0.1; added myself as ma...

2017-04-24 Thread Jörg Thalheim
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 18de0c3ae56a13f41f38fb52cd899247fd4e1248
  
https://github.com/NixOS/nixpkgs/commit/18de0c3ae56a13f41f38fb52cd899247fd4e1248
  Author: panaeon 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
M lib/maintainers.nix
A pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  skypeforlinux: init at 5.1.0.1; added myself as maintainer


  Commit: 331efb3d74bcfca3de3fd7679c02cd1ed592de8d
  
https://github.com/NixOS/nixpkgs/commit/331efb3d74bcfca3de3fd7679c02cd1ed592de8d
  Author: Jörg Thalheim 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
M lib/maintainers.nix
A pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  Merge pull request #25155 from PanAeon/feature-skypeforlinux

add skypeforlinux beta (new)


Compare: https://github.com/NixOS/nixpkgs/compare/5793e97e6e25...331efb3d74bc___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 1601bf: ucommon: 6.3.1 -> 7.0.0

2017-04-24 Thread Jörg Thalheim
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 1601bf5cfcb823ac5ff4964903d19e67a9f8dc44
  
https://github.com/NixOS/nixpkgs/commit/1601bf5cfcb823ac5ff4964903d19e67a9f8dc44
  Author: Armijn Hemel 
  Date:   2017-04-23 (Sun, 23 Apr 2017)

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

  Log Message:
  ---
  ucommon: 6.3.1 -> 7.0.0


  Commit: 87e94a061adcc9c357f1705485252228277eff9b
  
https://github.com/NixOS/nixpkgs/commit/87e94a061adcc9c357f1705485252228277eff9b
  Author: Armijn Hemel 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
M pkgs/servers/sip/sipwitch/default.nix

  Log Message:
  ---
  upgrade sipwitch to 0.9.15


  Commit: 5793e97e6e25fe8c5aad49fcdb6e07ecf9d2f755
  
https://github.com/NixOS/nixpkgs/commit/5793e97e6e25fe8c5aad49fcdb6e07ecf9d2f755
  Author: Jörg Thalheim 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
M pkgs/development/libraries/ucommon/default.nix
M pkgs/servers/sip/sipwitch/default.nix

  Log Message:
  ---
  Merge pull request #25161 from armijnhemel/ucommon

ucommon: 6.3.1 -> 7.0.0


Compare: https://github.com/NixOS/nixpkgs/compare/af6e4c5b0d92...5793e97e6e25___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 49e694: i2pd: 2.11.0 -> 2.12.0

2017-04-24 Thread Edward Tjörnhammar
  Branch: refs/heads/release-17.03
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 49e6946acc3ded6dffbfecdbc29568c2cdeb44e0
  
https://github.com/NixOS/nixpkgs/commit/49e6946acc3ded6dffbfecdbc29568c2cdeb44e0
  Author: Edward Tjörnhammar 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

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

  Log Message:
  ---
  i2pd: 2.11.0 -> 2.12.0

(cherry picked from commit dc514b246ef0e4152e3b4566f9cda0134a585979)


  Commit: b37b2ce0c4d1d5ef6c298dbb54b9b111215e9e3c
  
https://github.com/NixOS/nixpkgs/commit/b37b2ce0c4d1d5ef6c298dbb54b9b111215e9e3c
  Author: Edward Tjörnhammar 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

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

  Log Message:
  ---
  i2pd: 2.12.0 -> 2.13.0

(cherry picked from commit da2518fe250f1d5a6dd2a7d7e33a49db944e8c88)


  Commit: ad0a973ea029287ab600e0c927ba1a38beef5335
  
https://github.com/NixOS/nixpkgs/commit/ad0a973ea029287ab600e0c927ba1a38beef5335
  Author: Edward Tjörnhammar 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

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

  Log Message:
  ---
  nixos, i2pd: remove, no longer needed, extip hack

(cherry picked from commit 027734526554051a1acefd0bcc2e191a9c63a091)


Compare: https://github.com/NixOS/nixpkgs/compare/77016a07a411...ad0a973ea029___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] db5a92: crossStdenv on iphone: Just get info from `targetP...

2017-04-24 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: db5a921945b9b2051077a6b7b708e3b1785cc3ea
  
https://github.com/NixOS/nixpkgs/commit/db5a921945b9b2051077a6b7b708e3b1785cc3ea
  Author: John Ericson 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
M pkgs/os-specific/darwin/ios-cross/default.nix
M pkgs/stdenv/cross/default.nix

  Log Message:
  ---
  crossStdenv on iphone: Just get info from `targetPlatform`


  Commit: af6e4c5b0d92301f24cdb96aae2267ceec26f6ff
  
https://github.com/NixOS/nixpkgs/commit/af6e4c5b0d92301f24cdb96aae2267ceec26f6ff
  Author: John Ericson 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
M pkgs/os-specific/darwin/ios-cross/default.nix
M pkgs/stdenv/cross/default.nix

  Log Message:
  ---
  Merge pull request #25190 from obsidiansystems/ios-stdenv-tiny-refactor

crossStdenv on iphone: Just get info from `targetPlatform`


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


[Nix-commits] [NixOS/nixpkgs] 84b1c0: Fix imperative container code examples

2017-04-24 Thread Данило Глинський
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 84b1c0c481d4c97957252182a6273cea9062f4f7
  
https://github.com/NixOS/nixpkgs/commit/84b1c0c481d4c97957252182a6273cea9062f4f7
  Author: Данило Глинський (Danylo Hlynskyi) 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
M nixos/doc/manual/administration/imperative-containers.xml

  Log Message:
  ---
  Fix imperative container code examples

Since some time Nixos has firewall enabled by default, so update example.
Also, remove newline escaping (it isn't needed).

Closes https://github.com/NixOS/nixpkgs/issues/25174


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


Re: [Nix-dev] Modular config and lists

2017-04-24 Thread Layus

Hi Mark,

On 24/04/17 22:00, Mark Gardner wrote:

Hi Layus,

On Mon, Apr 24, 2017 at 3:54 PM, Layus > wrote:


Have you tried this ?


```nix
{ config, pkgs, ... }:
{
  virtualisation.libvirtd.enable = true;
  users.users.myuser.extraGroups = [ "libvirtd" ];
}
```

This should seamlessly integrate with other options. By default
lists will be concatenated, not overwritten.


​No I didn't. I was assuming that the lists would conflict. I tried it 
and it works. (Obviously my nix understanding is still being formed.)


​Mark
--
Mark Gardner
--


I have looked in the nixos manual (not to be confused with the nix 
manual, or the nixpkgs manual), searching for soe text describing this 
behavior.
I found http://nixos.org/nixos/manual/index.html#sec-modularity. It says 
(amongst other things)


   Note that both |configuration.nix| and |kde.nix| define the option
   |environment.systemPackages|. When multiple modules define an
   option, NixOS will try to /merge/ the definitions. In the case of
   |environment.systemPackages|, that’s easy: the lists of packages can
   simply be concatenated. [...]

Regards,

-- Layus.

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


Re: [Nix-dev] Modular config and lists

2017-04-24 Thread Mark Gardner
Hi Layus,

On Mon, Apr 24, 2017 at 3:54 PM, Layus  wrote:

> Have you tried this ?
>
>
> ```nix
> { config, pkgs, ... }:
> {
>   virtualisation.libvirtd.enable = true;
>   users.users.myuser.extraGroups = [ "libvirtd" ];
> }
> ```
>
> This should seamlessly integrate with other options. By default lists will
> be concatenated, not overwritten.
>

​No I didn't. I was assuming that the lists would conflict. I tried it and
it works. (Obviously my nix understanding is still being formed.)

​Mark
-- 
Mark Gardner
--
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-dev


[Nix-commits] [NixOS/nixpkgs] cfaad2: amdgpu-pro: 16.60 -> 17.10

2017-04-24 Thread Vladimír Čunát
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: cfaad2679e419eeb6f152e42cde748e840b07a85
  
https://github.com/NixOS/nixpkgs/commit/cfaad2679e419eeb6f152e42cde748e840b07a85
  Author: David McFarland 
  Date:   2017-04-08 (Sat, 08 Apr 2017)

  Changed paths:
M pkgs/os-specific/linux/amdgpu-pro/default.nix
M pkgs/os-specific/linux/amdgpu-pro/patches/0001-disable-firmware-copy.patch
M pkgs/os-specific/linux/amdgpu-pro/patches/0002-linux-4.9-fixes.patch
M 
pkgs/os-specific/linux/amdgpu-pro/patches/0003-Change-seq_printf-format-for-64-bit-context.patch
M 
pkgs/os-specific/linux/amdgpu-pro/patches/0004-fix-warnings-for-Werror.patch

  Log Message:
  ---
  amdgpu-pro: 16.60 -> 17.10


  Commit: d965e119f2a3bced33b7eb56d7235159d57306d9
  
https://github.com/NixOS/nixpkgs/commit/d965e119f2a3bced33b7eb56d7235159d57306d9
  Author: Vladimír Čunát 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
M pkgs/os-specific/linux/amdgpu-pro/default.nix
M pkgs/os-specific/linux/amdgpu-pro/patches/0001-disable-firmware-copy.patch
M pkgs/os-specific/linux/amdgpu-pro/patches/0002-linux-4.9-fixes.patch
M 
pkgs/os-specific/linux/amdgpu-pro/patches/0003-Change-seq_printf-format-for-64-bit-context.patch
M 
pkgs/os-specific/linux/amdgpu-pro/patches/0004-fix-warnings-for-Werror.patch

  Log Message:
  ---
  Merge #24749: amdgpu-pro: 16.60 -> 17.10


Compare: https://github.com/NixOS/nixpkgs/compare/385844d5e981...d965e119f2a3___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


Re: [Nix-dev] Modular config and lists

2017-04-24 Thread Layus

Hi Mark,

Have you tried this ?


```nix
{ config, pkgs, ... }:
{
  virtualisation.libvirtd.enable = true;
  users.users.myuser.extraGroups = [ "libvirtd" ];
}
```

This should seamlessly integrate with other options. By default lists 
will be concatenated, not overwritten.


-- Layus.

On 24/04/17 18:21, Mark Gardner wrote:
I separated my configuration into different files by functionality. 
The goal is to keep like things together and import them as needed to 
create the final configuration.nix.


My virtualization.nix currently contains:

{ config, pkgs, ... }:
let
  groups = config.users.users.
​myuser>.
extraGroups;
in
{
  virtualisation = {
libvirtd.enable = true;
  };
  users.users.
​myuser
.extraGroups = groups ++ [ "libvirtd" ];
}

​ but nixos-rebuild gives "​infinite recursion encountered". How do I 
set things up so that myuser's group membership will include not only 
what is defined in extraGroup somewhere else but also "libvirtd"?


Mark
--
Mark Gardner
--


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


[Nix-commits] [NixOS/nixpkgs] 2165b4: percona-server56: init at 5.6.35-80.0

2017-04-24 Thread Graham Christensen
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 2165b48e4afbce5f7f70195c50c78605c6dcb100
  
https://github.com/NixOS/nixpkgs/commit/2165b48e4afbce5f7f70195c50c78605c6dcb100
  Author: Graham Christensen 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
A pkgs/servers/sql/percona/5.6.x.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  percona-server56: init at 5.6.35-80.0


  Commit: 385844d5e981b12cbd216e54abf6d954fe6c48b7
  
https://github.com/NixOS/nixpkgs/commit/385844d5e981b12cbd216e54abf6d954fe6c48b7
  Author: Graham Christensen 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
A pkgs/servers/sql/percona/5.6.x.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  Merge pull request #24998 from grahamc/percona

percona-server56: init at 5.6.35-80.0


Compare: https://github.com/NixOS/nixpkgs/compare/07cc3eb0d005...385844d5e981___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] afcf15: pythonPackages.pygit2: 0.24.0 -> 0.25.0

2017-04-24 Thread Franz Pletz
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: afcf15bc8007a40cae4d17973889581043a7f11d
  
https://github.com/NixOS/nixpkgs/commit/afcf15bc8007a40cae4d17973889581043a7f11d
  Author: Franz Pletz 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

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

  Log Message:
  ---
  pythonPackages.pygit2: 0.24.0 -> 0.25.0

cc #24807


  Commit: e74ea4282a7922fd73655de863315854d322ea8d
  
https://github.com/NixOS/nixpkgs/commit/e74ea4282a7922fd73655de863315854d322ea8d
  Author: Franz Pletz 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
M nixos/modules/services/networking/avahi-daemon.nix

  Log Message:
  ---
  avahi service: add reflector option


  Commit: e68c3f0b336cb387233e10b6b4a2180573ae70c7
  
https://github.com/NixOS/nixpkgs/commit/e68c3f0b336cb387233e10b6b4a2180573ae70c7
  Author: Franz Pletz 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
M pkgs/servers/atlassian/confluence.nix

  Log Message:
  ---
  atlassian-confluence: 6.0.3 -> 6.1.1


  Commit: fee8d87d483949b3c4a2483113eb5c0ff5313a17
  
https://github.com/NixOS/nixpkgs/commit/fee8d87d483949b3c4a2483113eb5c0ff5313a17
  Author: Franz Pletz 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
M pkgs/servers/atlassian/jira.nix

  Log Message:
  ---
  atlassian-jira: 7.3.0 -> 7.3.4


  Commit: bede043070c8943fb9c2513b4cbea076434f5c55
  
https://github.com/NixOS/nixpkgs/commit/bede043070c8943fb9c2513b4cbea076434f5c55
  Author: Franz Pletz 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

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

  Log Message:
  ---
  libytnef: init at 1.9.2


  Commit: 07cc3eb0d005938fa44a0580688400f0129efbd7
  
https://github.com/NixOS/nixpkgs/commit/07cc3eb0d005938fa44a0580688400f0129efbd7
  Author: Franz Pletz 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
M pkgs/applications/networking/mailreaders/claws-mail/default.nix

  Log Message:
  ---
  claws-mail: 3.14.1 -> 3.15.0


Compare: https://github.com/NixOS/nixpkgs/compare/ee2d787cc354...07cc3eb0d005___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] bef527: top-level: Common subexpression elimination for cc...

2017-04-24 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: bef52786646f997fb4c2997f23e33b4e720fcef3
  
https://github.com/NixOS/nixpkgs/commit/bef52786646f997fb4c2997f23e33b4e720fcef3
  Author: John Ericson 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

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

  Log Message:
  ---
  top-level: Common subexpression elimination for cc-wrapper usage

 - `ccWrapperFun` can be used in a few more places instead of
   duplicating its definition.

 - `ccWrapper` parameter on `wrapCC` is always substituted with
   `ccWrapperFun` so just get rid of that parameter.


  Commit: ee2d787cc354f986a8e352e897ea4832729c88d6
  
https://github.com/NixOS/nixpkgs/commit/ee2d787cc354f986a8e352e897ea4832729c88d6
  Author: John Ericson 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

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

  Log Message:
  ---
  Merge pull request #25186 from obsidiansystems/ccwrapper-cse

top-level: common subexpression elimination for cc-wrapper usage


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


[Nix-commits] [NixOS/nixpkgs] 027734: nixos, i2pd: remove, no longer needed, extip hack

2017-04-24 Thread Edward Tjörnhammar
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 027734526554051a1acefd0bcc2e191a9c63a091
  
https://github.com/NixOS/nixpkgs/commit/027734526554051a1acefd0bcc2e191a9c63a091
  Author: Edward Tjörnhammar 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

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

  Log Message:
  ---
  nixos, i2pd: remove, no longer needed, extip hack


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


[Nix-commits] [NixOS/nixpkgs] c90998: Revert "rustc: don't build on i686"

2017-04-24 Thread Tuomas Tynkkynen
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: c90998d5cf8b8d7983f5f547546ee9ef2ad11688
  
https://github.com/NixOS/nixpkgs/commit/c90998d5cf8b8d7983f5f547546ee9ef2ad11688
  Author: Tuomas Tynkkynen 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
M pkgs/development/compilers/rust/rustc.nix

  Log Message:
  ---
  Revert "rustc: don't build on i686"

This reverts commit 9f86136cefbd3e050b96a307346278fe9ad8a5bf.

Rust is nowadays required for building Firefox, so the channel updates
are blocked on this.

(It also builds fine for me.)


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


[Nix-commits] [NixOS/nixpkgs] 9437c3: perlPackages.ModuleBuild: 0.4214 -> 0.4222

2017-04-24 Thread Tuomas Tynkkynen
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 9437c36f19d39c11d0bd3f1c526d7f84265d2c04
  
https://github.com/NixOS/nixpkgs/commit/9437c36f19d39c11d0bd3f1c526d7f84265d2c04
  Author: Tuomas Tynkkynen 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

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

  Log Message:
  ---
  perlPackages.ModuleBuild: 0.4214 -> 0.4222


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


[Nix-commits] [NixOS/nixpkgs] 75608e: wireguard: 0.0.20170409 -> 0.0.20170421

2017-04-24 Thread Jörg Thalheim
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 75608e1bb3d26daeebe7a166813e648cffebd151
  
https://github.com/NixOS/nixpkgs/commit/75608e1bb3d26daeebe7a166813e648cffebd151
  Author: Jason A. Donenfeld 
  Date:   2017-04-22 (Sat, 22 Apr 2017)

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

  Log Message:
  ---
  wireguard: 0.0.20170409 -> 0.0.20170421


  Commit: 600a2f2746a7c91fd53309e9810fff8a54c1c0a0
  
https://github.com/NixOS/nixpkgs/commit/600a2f2746a7c91fd53309e9810fff8a54c1c0a0
  Author: Jörg Thalheim 
  Date:   2017-04-23 (Sun, 23 Apr 2017)

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

  Log Message:
  ---
  wireguard: make myself maintainer


  Commit: 8deb0e104fda5f8b00b86b90ad13321aabb2b8ab
  
https://github.com/NixOS/nixpkgs/commit/8deb0e104fda5f8b00b86b90ad13321aabb2b8ab
  Author: Jörg Thalheim 
  Date:   2017-04-23 (Sun, 23 Apr 2017)

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

  Log Message:
  ---
  wireguard: do not fail on warning for older kernel


  Commit: 7c44277d381f53217dfde5e9213a383deb35022f
  
https://github.com/NixOS/nixpkgs/commit/7c44277d381f53217dfde5e9213a383deb35022f
  Author: Jörg Thalheim 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

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

  Log Message:
  ---
  Merge pull request #25127 from zx2c4/patch-3

wireguard: 0.0.20170409 -> 0.0.20170421


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


[Nix-commits] [NixOS/nixpkgs] 053732: networkmanager: Temporarily disable -Wformat-secur...

2017-04-24 Thread Tuomas Tynkkynen
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 053732006231549313533319544dedcdf0abc458
  
https://github.com/NixOS/nixpkgs/commit/053732006231549313533319544dedcdf0abc458
  Author: Tuomas Tynkkynen 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

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

  Log Message:
  ---
  networkmanager: Temporarily disable -Wformat-security until next release

Reportedly this is due to GLib 2.52 which added a G_GNUC_PRINTF attribute to
g_dbus_message_new_method_error().


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


Re: [Nix-dev] Simplify node packages?

2017-04-24 Thread Colin Putney
On Sun, Apr 23, 2017 at 6:10 AM, Benno Fünfstück <
benno.fuenfstu...@gmail.com> wrote:


> * Alternatively, `yarn` claims to be more deterministic. Can we use `yarn`
> to build all NPM packages? Or are there NPM packages that are incompatible?
>

I think this is the best way forward. Yarn is *much* better than npm and is
being enthusiastically adopted by the node community. Whatever
compatibility issues that currently exist with yarn will soon be resolved.
(Nix users have basically no influence, but package maintainers can't
afford to ignore yarn users.)

Node2nix focusses on replicating the typical npm workflow so that "normal"
node developers experience minimal disruption. I think that's a worthy
goal, but it should be balanced against the need to fully exploit the
benefits of nix. For example, it seems to be impossible to override an npm
derivation to add a native dependency. That to, to me, is one of key
features of nix, but at the moment we can't use it. As yarn fixes more and
more of the more pedestrian issue with npm, integration with the nix
ecosystem and will become the only real advantage to using nix with node.

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


[Nix-commits] [NixOS/nixpkgs] ce56c9: mkDerivation: Don't pass buildInputs to stdenv bui...

2017-04-24 Thread Tuomas Tynkkynen
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: ce56c99edcbc1b61ec2fc2ccfc7bfc035cbcb99f
  
https://github.com/NixOS/nixpkgs/commit/ce56c99edcbc1b61ec2fc2ccfc7bfc035cbcb99f
  Author: Tuomas Tynkkynen 
  Date:   2017-03-02 (Thu, 02 Mar 2017)

  Changed paths:
M pkgs/stdenv/generic/default.nix
M pkgs/stdenv/generic/setup.sh

  Log Message:
  ---
  mkDerivation: Don't pass buildInputs to stdenv builder in nativeBuildInputs

When not cross compiling, nativeBuildInputs and buildInputs have
identical behaviour. Currently that is implemented by having
mkDerivation do a concatenation of those variables in Nix code and pass
that to the builder via the nativeBuildInputs attribute.

However, that has some annoying side effects, like `foo.buildInputs`
evaluating to `[ ]` even if buildInputs were specified in the nix
expression for foo.

Instead, pass buildInputs and nativeBuildInputs in separate variables as
usual, and move the logic of cross compilation vs. native compilation to
the stdenv builder script. This is probably a tiny bit uglier but
fixes the previous problem.

Issue #4855.


  Commit: 9896cf10289628a2098cd99bdd96cfb092916b27
  
https://github.com/NixOS/nixpkgs/commit/9896cf10289628a2098cd99bdd96cfb092916b27
  Author: Daiderd Jordan 
  Date:   2017-04-04 (Tue, 04 Apr 2017)

  Changed paths:
M pkgs/development/compilers/gcc/5/default.nix
M pkgs/development/compilers/gcc/builder.sh

  Log Message:
  ---
  gcc: include dylibs for darwin build


  Commit: e7c76d3c25883139f4c86b2afb181868b074ded7
  
https://github.com/NixOS/nixpkgs/commit/e7c76d3c25883139f4c86b2afb181868b074ded7
  Author: Nikolay Amiantov 
  Date:   2017-04-12 (Wed, 12 Apr 2017)

  Changed paths:
M pkgs/build-support/setup-hooks/make-wrapper.sh

  Log Message:
  ---
  makeWrapper: search for free unwrapped file name


  Commit: 60e0130ea1e3451cd12493e49b209f0208806c01
  
https://github.com/NixOS/nixpkgs/commit/60e0130ea1e3451cd12493e49b209f0208806c01
  Author: Nikolay Amiantov 
  Date:   2017-04-12 (Wed, 12 Apr 2017)

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

  Log Message:
  ---
  blueman: use wrapGAppsHook


  Commit: 124e5dd3eb9e3e8fe322d3c62e4501b2043ac898
  
https://github.com/NixOS/nixpkgs/commit/124e5dd3eb9e3e8fe322d3c62e4501b2043ac898
  Author: Nikolay Amiantov 
  Date:   2017-04-13 (Thu, 13 Apr 2017)

  Changed paths:
M pkgs/applications/networking/browsers/qutebrowser/default.nix

  Log Message:
  ---
  qutebrowser: cleanup wrappers


  Commit: 1a1f2262b4a4e44f5540766dfcf5fd3bfca0e64d
  
https://github.com/NixOS/nixpkgs/commit/1a1f2262b4a4e44f5540766dfcf5fd3bfca0e64d
  Author: Vladimír Čunát 
  Date:   2017-04-14 (Fri, 14 Apr 2017)

  Changed paths:
M pkgs/development/compilers/gcc/5/default.nix
M pkgs/development/compilers/gcc/builder.sh

  Log Message:
  ---
  Merge #24637: gcc: include dylibs for darwin build


  Commit: f3ceb764e40dfcf0fde5d461a3b95e8a97b022b8
  
https://github.com/NixOS/nixpkgs/commit/f3ceb764e40dfcf0fde5d461a3b95e8a97b022b8
  Author: Vladimír Čunát 
  Date:   2017-04-14 (Fri, 14 Apr 2017)

  Changed paths:
M pkgs/stdenv/generic/default.nix
M pkgs/stdenv/generic/setup.sh

  Log Message:
  ---
  Merge #23374: mkDerivation: simplify non-cross builds

Don't pass buildInputs to stdenv builder in nativeBuildInputs.


  Commit: aeb056095947812bf732b00b5f0cc43b495b2a86
  
https://github.com/NixOS/nixpkgs/commit/aeb056095947812bf732b00b5f0cc43b495b2a86
  Author: Vladimír Čunát 
  Date:   2017-04-14 (Fri, 14 Apr 2017)

  Changed paths:
M pkgs/applications/networking/browsers/qutebrowser/default.nix
M pkgs/build-support/setup-hooks/make-wrapper.sh
M pkgs/tools/bluetooth/blueman/default.nix

  Log Message:
  ---
  Merge #24858: Smart wrapProgram


  Commit: 878bbaf4e9d49c251d90f0790d2e7ebcf622ddd0
  
https://github.com/NixOS/nixpkgs/commit/878bbaf4e9d49c251d90f0790d2e7ebcf622ddd0
  Author: Vladimír Čunát 
  Date:   2017-04-14 (Fri, 14 Apr 2017)

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

  Log Message:
  ---
  glib: 2.50.3 -> 2.52.1


  Commit: f7a4f146c9fd64966f57040603a897857a14df94
  
https://github.com/NixOS/nixpkgs/commit/f7a4f146c9fd64966f57040603a897857a14df94
  Author: Vladimír Čunát 
  Date:   2017-04-14 (Fri, 14 Apr 2017)

  Changed paths:
M lib/default.nix
M lib/licenses.nix
M lib/tests.nix
M lib/trivial.nix
M nixos/doc/manual/release-notes/rl-1709.xml
M nixos/maintainers/scripts/gce/create-gce.sh
M nixos/modules/config/fonts/fontconfig-penultimate.nix
M nixos/modules/config/fonts/fontconfig.nix
M nixos/modules/security/acme.nix
M nixos/modules/services/cluster/kubernetes.nix
M nixos/modules/services/continuous-integration/hydra/default.nix
M nixos/modules/services/databases/cassandra.nix
M nixos/modules/services/database

[Nix-dev] Modular config and lists

2017-04-24 Thread Mark Gardner
I separated my configuration into different files by functionality. The
goal is to keep like things together and import them as needed to create
the final configuration.nix.

My virtualization.nix currently contains:

{ config, pkgs, ... }:
let
  groups = config.users.users.
​myuser>.
extraGroups;
in
{
  virtualisation = {
libvirtd.enable = true;
  };
  users.users.
​myuser
.extraGroups = groups ++ [ "libvirtd" ];
}

​but nixos-rebuild gives "​infinite recursion encountered". How do I set
things up so that myuser's group membership will include not only what is
defined in extraGroup somewhere else but also "libvirtd"?

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


[Nix-commits] [NixOS/nixpkgs] 9f0de9: net-snmp: fix build by using older perl for now

2017-04-24 Thread Vladimír Čunát
  Branch: refs/heads/staging
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 9f0de9522fd228f437e053fd360b57dd79f6da05
  
https://github.com/NixOS/nixpkgs/commit/9f0de9522fd228f437e053fd360b57dd79f6da05
  Author: Vladimír Čunát 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

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

  Log Message:
  ---
  net-snmp: fix build by using older perl for now

The single patch from upstream doesn't fix build by itself.


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


[Nix-commits] [NixOS/nixpkgs] 10af6b: perl*, statsmodels: fix evaluation problems

2017-04-24 Thread Vladimír Čunát
  Branch: refs/heads/staging
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 10af6b4dbf878ed1b0ac3c6c38a14c6ae67b7aa6
  
https://github.com/NixOS/nixpkgs/commit/10af6b4dbf878ed1b0ac3c6c38a14c6ae67b7aa6
  Author: Vladimír Čunát 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
M pkgs/development/python-modules/statsmodels/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  perl*, statsmodels: fix evaluation problems

The tarball job now builds again.


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


[Nix-commits] [NixOS/hydra] f4b4ee: Add CircleCI plugin.

2017-04-24 Thread Shea Levy
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/hydra
  Commit: f4b4ee575168df585cfb96a8d3f98a30f889afb8
  
https://github.com/NixOS/hydra/commit/f4b4ee575168df585cfb96a8d3f98a30f889afb8
  Author: Shea Levy 
  Date:   2017-04-19 (Wed, 19 Apr 2017)

  Changed paths:
A src/lib/Hydra/Plugin/CircleCINotification.pm

  Log Message:
  ---
  Add CircleCI plugin.


  Commit: 86aa851d8d2bada671c5c02e57de015f7544f155
  
https://github.com/NixOS/hydra/commit/86aa851d8d2bada671c5c02e57de015f7544f155
  Author: Shea Levy 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
A src/lib/Hydra/Plugin/CircleCINotification.pm

  Log Message:
  ---
  Merge branch 'circleci-plugin'


Compare: https://github.com/NixOS/hydra/compare/4c26cf0c81a4...86aa851d8d2b___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 77016a: add papertrail at 0.10.1

2017-04-24 Thread Domen Kožar
  Branch: refs/heads/release-17.03
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 77016a07a41147bfeaf400a1dbf9fffe12945924
  
https://github.com/NixOS/nixpkgs/commit/77016a07a41147bfeaf400a1dbf9fffe12945924
  Author: Domen Kožar 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
A pkgs/tools/text/papertrail/Gemfile
A pkgs/tools/text/papertrail/Gemfile.lock
A pkgs/tools/text/papertrail/default.nix
A pkgs/tools/text/papertrail/gemset.nix
A pkgs/tools/text/papertrail/shell.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  add papertrail at 0.10.1

Thank you @grahamc <3


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


[Nix-commits] [NixOS/nixpkgs] 9f11d1: add papertrail at 0.10.1

2017-04-24 Thread Domen Kožar
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 9f11d17ed28397e3c53c15d97537510f7f08ed39
  
https://github.com/NixOS/nixpkgs/commit/9f11d17ed28397e3c53c15d97537510f7f08ed39
  Author: Domen Kožar 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
A pkgs/tools/text/papertrail/Gemfile
A pkgs/tools/text/papertrail/Gemfile.lock
A pkgs/tools/text/papertrail/default.nix
A pkgs/tools/text/papertrail/gemset.nix
A pkgs/tools/text/papertrail/shell.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  add papertrail at 0.10.1

Thank you @grahamc <3


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


[Nix-commits] [NixOS/nixpkgs] 84e7bb: haskell: preserve overrideScope on override

2017-04-24 Thread Benno Fünfstück
  Branch: refs/heads/haskell-fix-override
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 84e7bb130e977cab208bb758256881c519a6bdeb
  
https://github.com/NixOS/nixpkgs/commit/84e7bb130e977cab208bb758256881c519a6bdeb
  Author: Benno Fünfstück 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
M pkgs/development/haskell-modules/make-package-set.nix

  Log Message:
  ---
  haskell: preserve overrideScope on override

We want code such as `(pkg.override {}).overrideScope (self: super: {})` to
work. This didn't work before, since `override` will call the original package
again, and the attribute `overideScope`, which `callPackageWithScope` added,
wasn't added again. The fix for this is to modify the package function itself
to include the `callPackageWithScope` attribute, so it'll be re-added whenever
the function is overriden for with arguments.

There is a small problem here though: since callPackage uses some magic
(`builtins.functionArgs`) to determine the auto-arguments of a function, we
can't just write `callPackageWith scope drvScope`, since
`builtins.functionArgs drvScope` will be `{}`. To fix this, we implement our own
`callPackageWith`.

fixes NixOS/nixpkgs#7953


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


[Nix-commits] [NixOS/nixpkgs] f207ff: haskell: preserve overrideScope on override

2017-04-24 Thread Benno Fünfstück
  Branch: refs/heads/haskell-fix-override
  Home:   https://github.com/NixOS/nixpkgs
  Commit: f207ff393ac7cf464e45babd063904537ead93e0
  
https://github.com/NixOS/nixpkgs/commit/f207ff393ac7cf464e45babd063904537ead93e0
  Author: Benno Fünfstück 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
M pkgs/development/haskell-modules/make-package-set.nix

  Log Message:
  ---
  haskell: preserve overrideScope on override

We want code such as `(pkg.override {}).overrideScope (self: super: {})` to
work. This didn't work before, since `override` will call the original package
again, and the attribute `overideScope`, which `callPackageWithScope` added,
wasn't added again. The fix for this is to modify the package function itself
to include the `callPackageWithScope` attribute, so it'll be re-added whenever
the function is overriden for with arguments.

There is a small problem here though: since callPackage uses some magic
(`builtins.functionArgs`) to determine the auto-arguments of a function, we
can't just write `callPackageWith scope drvScope`, since
`builtins.functionArgs drvScope` will be `{}`. To fix this, we implement our own
`callPackageWith`.

fixes NixOS/nixpkgs#7953


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


[Nix-commits] [NixOS/nixpkgs] 513c9e: rust: fix fetch-cargo-deps for git dependencies

2017-04-24 Thread Benno Fünfstück
  Branch: refs/heads/haskell-fix-override
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 513c9ea10f3602f0efd4ebd80c1879ac13fd7208
  
https://github.com/NixOS/nixpkgs/commit/513c9ea10f3602f0efd4ebd80c1879ac13fd7208
  Author: Benno Fünfstück 
  Date:   2017-04-23 (Sun, 23 Apr 2017)

  Changed paths:
M pkgs/build-support/rust/fetch-cargo-deps

  Log Message:
  ---
  rust: fix fetch-cargo-deps for git dependencies

We need to make sure that `$revs` ends with a space, since files must always
end with newlines. The previous code ignored the last entry in `$revs`, because
read already returns non-zero exit code for the last entry, as it does not end
with a space.


  Commit: ce72c46bf02270ff9085b86d445733ca3cc6f32a
  
https://github.com/NixOS/nixpkgs/commit/ce72c46bf02270ff9085b86d445733ca3cc6f32a
  Author: Benno Fünfstück 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
M pkgs/development/haskell-modules/make-package-set.nix

  Log Message:
  ---
  haskell: preserve overrideScope on override

We want code such as `(pkg.override {}).overrideScope (self: super: {})` to
work. This didn't work before, since `override` will call the original package
again, and the attribute `overideScope`, which `callPackageWithScope` added,
wasn't added again. The fix for this is to modify the package function itself
to include the `callPackageWithScope` attribute, so it'll be re-added whenever
the function is overriden for with arguments.

There is a small problem here though: since callPackage uses some magic
(`builtins.functionArgs`) to determine the auto-arguments of a function, we
can't just write `callPackageWith scope drvScope`, since
`builtins.functionArgs drvScope` will be `{}`. To fix this, we implement our own
`callPackageWith`.

fixes NixOS/nixpkgs#7953


Compare: https://github.com/NixOS/nixpkgs/compare/02bb2660f953...ce72c46bf022___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 162a05: knot-resolver: maintenance 1.2.5 -> 1.2.6

2017-04-24 Thread Vladimír Čunát
  Branch: refs/heads/release-17.03
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 162a05122cdeb24da2872594d2cc306e32fa
  
https://github.com/NixOS/nixpkgs/commit/162a05122cdeb24da2872594d2cc306e32fa
  Author: Vladimír Čunát 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
M pkgs/servers/dns/knot-resolver/default.nix

  Log Message:
  ---
  knot-resolver: maintenance 1.2.5 -> 1.2.6

(cherry picked from commit 125cf352732d8dd119b3ebb5359a82095ba2b5bf)


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


[Nix-commits] [NixOS/nixpkgs] 125cf3: knot-resolver: maintenance 1.2.5 -> 1.2.6

2017-04-24 Thread Vladimír Čunát
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 125cf352732d8dd119b3ebb5359a82095ba2b5bf
  
https://github.com/NixOS/nixpkgs/commit/125cf352732d8dd119b3ebb5359a82095ba2b5bf
  Author: Vladimír Čunát 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
M pkgs/servers/dns/knot-resolver/default.nix

  Log Message:
  ---
  knot-resolver: maintenance 1.2.5 -> 1.2.6


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


[Nix-commits] [NixOS/nixpkgs] d16c38: R: update to version 3.4.0

2017-04-24 Thread Peter Simons
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: d16c38a260ef41ae648f994918f491437fb7c75c
  
https://github.com/NixOS/nixpkgs/commit/d16c38a260ef41ae648f994918f491437fb7c75c
  Author: Peter Simons 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
M pkgs/applications/science/math/R/default.nix

  Log Message:
  ---
  R: update to version 3.4.0

The new version needs TZ configured to a value other than "UTC" for the test
suite to succeed. Otherwise, an assumption in "reg-tests-1d.R" won't hold that
expects

  d <- as.POSIXlt("2016-12-06"); d$zone <- 1; format(d)

to throw an error about an invalid time zone.


  Commit: 430cbcfd2bc705ecfaf59d431b1274b5e671b123
  
https://github.com/NixOS/nixpkgs/commit/430cbcfd2bc705ecfaf59d431b1274b5e671b123
  Author: Peter Simons 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
M pkgs/development/r-modules/bioc-packages.nix
M pkgs/development/r-modules/cran-packages.nix
M pkgs/development/r-modules/default.nix

  Log Message:
  ---
  R: update CRAN and BIOC package sets


  Commit: 85a9e6dcdf26c96ae360bd156b3bbf919efaf239
  
https://github.com/NixOS/nixpkgs/commit/85a9e6dcdf26c96ae360bd156b3bbf919efaf239
  Author: Peter Simons 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
M pkgs/development/r-modules/README.md
M pkgs/development/r-modules/default.nix
M pkgs/development/r-modules/generate-shell.nix

  Log Message:
  ---
  R: update list of broken packages (and some cosmetic)


  Commit: 7369fd0b51f4cfb4e47b19d4bdaf6809f099e747
  
https://github.com/NixOS/nixpkgs/commit/7369fd0b51f4cfb4e47b19d4bdaf6809f099e747
  Author: Peter Simons 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
M pkgs/applications/science/math/R/default.nix
M pkgs/development/r-modules/README.md
M pkgs/development/r-modules/bioc-packages.nix
M pkgs/development/r-modules/cran-packages.nix
M pkgs/development/r-modules/default.nix
M pkgs/development/r-modules/generate-shell.nix

  Log Message:
  ---
  Merge pull request #25096 from peti/r-updates

R 3.4.0 and package set updates


Compare: https://github.com/NixOS/nixpkgs/compare/e17e5590b567...7369fd0b51f4___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


Re: [Nix-dev] Simplify node packages?

2017-04-24 Thread Benno Fünfstück
William Casarin  schrieb am So., 23. Apr. 2017 um 16:46 Uhr:

> > The fetch phase should be deterministic if we freeze the NPM index (is
> such
> > a thing possible?) and use shrinkwrap.
> > Or is this not the case? In what cases will it fail to be deterministic?
>
> This is effectively what node2nix[1] does, which is the most reliable
> mechanism for deterministic node packages. It looks like this:
>

This is not what node2nix does. Node2nix completely replaces `npm`'s
dependency resolution, therefore it is very dependent on the implementation
of npm. If instead, we would let npm do the resolution but make it do it
determistically by letting it resolve against the same npm index state we
wouldn't have that problem.

Cheers,
Benno
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-dev


[Nix-commits] [NixOS/nixpkgs] e17e55: syncthing: 0.14.26 -> 0.14.27

2017-04-24 Thread Peter Hoeg
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: e17e5590b567c5b17fbf36503d5dde571736293b
  
https://github.com/NixOS/nixpkgs/commit/e17e5590b567c5b17fbf36503d5dde571736293b
  Author: Peter Hoeg 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

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

  Log Message:
  ---
  syncthing: 0.14.26 -> 0.14.27


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


[Nix-commits] [NixOS/nixpkgs] f5fa05: thunderbird: (re)add features lost in refactoring

2017-04-24 Thread Tuomas Tynkkynen
  Branch: refs/heads/staging
  Home:   https://github.com/NixOS/nixpkgs
  Commit: f5fa05677d941c8d27d0852de9b43f7e2148ae04
  
https://github.com/NixOS/nixpkgs/commit/f5fa05677d941c8d27d0852de9b43f7e2148ae04
  Author: Guillaume Maudoux 
  Date:   2017-04-17 (Mon, 17 Apr 2017)

  Changed paths:
M pkgs/applications/networking/mailreaders/thunderbird/default.nix

  Log Message:
  ---
  thunderbird: (re)add features lost in refactoring

The refactoring in b023370f3757a76acb244e647f29e388e076cab0 ported
changes from firefox-unwrpped, but dropped features in firefox's
wrapper.

Add the desktop item and remove useless dev files.


  Commit: eb8f604456516b22045f1f49707da98fd7c3e3fd
  
https://github.com/NixOS/nixpkgs/commit/eb8f604456516b22045f1f49707da98fd7c3e3fd
  Author: Guillaume Maudoux 
  Date:   2017-04-17 (Mon, 17 Apr 2017)

  Changed paths:
M pkgs/applications/networking/mailreaders/thunderbird/default.nix

  Log Message:
  ---
  thunderbird: fix default mail client detection


  Commit: a5cb00e884d3a2f7a8c0976cd0152c1c1ea1cca0
  
https://github.com/NixOS/nixpkgs/commit/a5cb00e884d3a2f7a8c0976cd0152c1c1ea1cca0
  Author: obadz 
  Date:   2017-04-21 (Fri, 21 Apr 2017)

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

  Log Message:
  ---
  pythonPackages.wxPython: inject Cairo, Pango and GDK library paths


  Commit: c8788f4e7b1394268dfc6f38e513c1d182355144
  
https://github.com/NixOS/nixpkgs/commit/c8788f4e7b1394268dfc6f38e513c1d182355144
  Author: obadz 
  Date:   2017-04-22 (Sat, 22 Apr 2017)

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

  Log Message:
  ---
  python2Packages.pyspread: init at 1.1


  Commit: be463abc10fd3edc4f013c382e558b73f205f332
  
https://github.com/NixOS/nixpkgs/commit/be463abc10fd3edc4f013c382e558b73f205f332
  Author: Pascal Bach 
  Date:   2017-04-22 (Sat, 22 Apr 2017)

  Changed paths:
M pkgs/development/tools/continuous-integration/gitlab-runner/default.nix

  Log Message:
  ---
  gitlab-runner: 9.0.0 -> 9.1.0


  Commit: d609a5eb5ccd0942c6c64da6cdf8c59ab238aa64
  
https://github.com/NixOS/nixpkgs/commit/d609a5eb5ccd0942c6c64da6cdf8c59ab238aa64
  Author: Pascal Bach 
  Date:   2017-04-22 (Sat, 22 Apr 2017)

  Changed paths:
M pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix

  Log Message:
  ---
  gitlab-runner_1_11: 1.11.1 -> 1.11.2


  Commit: 69ed7f6e1280bfdd891d2174628ceeb72bccecb6
  
https://github.com/NixOS/nixpkgs/commit/69ed7f6e1280bfdd891d2174628ceeb72bccecb6
  Author: Richard Lupton 
  Date:   2017-04-22 (Sat, 22 Apr 2017)

  Changed paths:
A pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  emacs-all-the-icons-fonts: init at 2.5.0


  Commit: 0ceb82d3dd5ce024dd9f7780c20f27d1bb61eacc
  
https://github.com/NixOS/nixpkgs/commit/0ceb82d3dd5ce024dd9f7780c20f27d1bb61eacc
  Author: Graham Christensen 
  Date:   2017-04-22 (Sat, 22 Apr 2017)

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

  Log Message:
  ---
  perlPackages.SetIntSpan: init at 1.19


  Commit: 76cea3de93c73865a0fb9d0e578c0e2a7c464654
  
https://github.com/NixOS/nixpkgs/commit/76cea3de93c73865a0fb9d0e578c0e2a7c464654
  Author: Graham Christensen 
  Date:   2017-04-22 (Sat, 22 Apr 2017)

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

  Log Message:
  ---
  perlPackages.BusinessHours: init at 0.12


  Commit: a9f89128458895737dee9dc011fda214304088af
  
https://github.com/NixOS/nixpkgs/commit/a9f89128458895737dee9dc011fda214304088af
  Author: Graham Christensen 
  Date:   2017-04-22 (Sat, 22 Apr 2017)

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

  Log Message:
  ---
  perlPackages.CSSMinifierXP: init at 1.02


  Commit: 2f1ef64492a65d0d6c3cfc974e50a00747fe463a
  
https://github.com/NixOS/nixpkgs/commit/2f1ef64492a65d0d6c3cfc974e50a00747fe463a
  Author: Graham Christensen 
  Date:   2017-04-22 (Sat, 22 Apr 2017)

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

  Log Message:
  ---
  perlPackages.GDText: init at 0.86


  Commit: 2d65b7f251c3998653514278589c30d9285e8800
  
https://github.com/NixOS/nixpkgs/commit/2d65b7f251c3998653514278589c30d9285e8800
  Author: Graham Christensen 
  Date:   2017-04-22 (Sat, 22 Apr 2017)

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

  Log Message:
  ---
  perlPackages.JavaScriptMinifierXS: init at 0.11


  Commit: 38574a5878bfd260e6e2135f5ebcf5ffca7c854d
  
https://github.com/NixOS/nixpkgs/commit/38574a5878bfd260e6e2135f5ebcf5ffca7c854d
  Author: Graham Christensen 
  Date:   2017-04-22 (Sat, 22 Apr 2017)

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

  Log Message:
  ---
  perlPackages.GDGraph: init at 1.54


  Commit: b48ea664f596e153fbe6388d704142356a3f6166
  
h

[Nix-commits] [NixOS/nixpkgs] 93870d: ammonite: 0.8.2 -> 0.8.3

2017-04-24 Thread Tim Steinbach
  Branch: refs/heads/release-17.03
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 93870d9e4886ae2293282076a2c5e548da6be3a4
  
https://github.com/NixOS/nixpkgs/commit/93870d9e4886ae2293282076a2c5e548da6be3a4
  Author: Tim Steinbach 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
M pkgs/development/tools/ammonite/default.nix

  Log Message:
  ---
  ammonite: 0.8.2 -> 0.8.3

(cherry picked from commit f6e0e71b9d041b3f236eb2eb3845aa6ab6380aa4)


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


[Nix-commits] [NixOS/nixpkgs] f6e0e7: ammonite: 0.8.2 -> 0.8.3

2017-04-24 Thread Tim Steinbach
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: f6e0e71b9d041b3f236eb2eb3845aa6ab6380aa4
  
https://github.com/NixOS/nixpkgs/commit/f6e0e71b9d041b3f236eb2eb3845aa6ab6380aa4
  Author: Tim Steinbach 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
M pkgs/development/tools/ammonite/default.nix

  Log Message:
  ---
  ammonite: 0.8.2 -> 0.8.3


  Commit: cc4649ddb4db91d35c773aca0670f23000b8ccfc
  
https://github.com/NixOS/nixpkgs/commit/cc4649ddb4db91d35c773aca0670f23000b8ccfc
  Author: Tim Steinbach 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
M pkgs/development/tools/ammonite/default.nix

  Log Message:
  ---
  Merge pull request #25175 from NeQuissimus/ammonite_0_8_3

ammonite: 0.8.2 -> 0.8.3


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


Re: [Nix-dev] Failure to boot after hibernate

2017-04-24 Thread Bas van Dijk
On 24 April 2017 at 12:35, Linus Heckemann  wrote:
> If it's systemd-boot, which it probably is, it does in fact allow
> editing unless you disable it in its config — I think you just press E
> to edit the command line.

I actually disabled that (I believe for security reasons) using:

  boot.loader.systemd-boot.editor = false;

Fortunately I was able to boot my system using a NixOS USB stick,
mount the boot partition and set "editor 1" in
/boot/loader/loader.conf. After that I edited the command line with
"hibernate=no" as Danylo suggested.

Now I'm typing this email on my correctly booted system. Thanks everybody!

Bas

P.S.
Now I just need to figure out how to disable hibernation...
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-dev


Re: [Nix-dev] Failure to boot after hibernate

2017-04-24 Thread Linus Heckemann
On 24/04/17 11:33, Bas van Dijk wrote:
> On 24 April 2017 at 12:20, Danylo Hlynskyi  wrote:
>> Probably too late, but can you boot with hibernate=no kernel parameter?
> 
> Hi Danylo, thanks. Unfortunately I can't edit the kernel parameters.
> My system is using the default EFI loader and isn't using grub which
> does allow editing the kernel command line.
If it's systemd-boot, which it probably is, it does in fact allow
editing unless you disable it in its config — I think you just press E
to edit the command line.
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-dev


Re: [Nix-dev] Failure to boot after hibernate

2017-04-24 Thread Bas van Dijk
On 24 April 2017 at 12:20, Danylo Hlynskyi  wrote:
> Probably too late, but can you boot with hibernate=no kernel parameter?

Hi Danylo, thanks. Unfortunately I can't edit the kernel parameters.
My system is using the default EFI loader and isn't using grub which
does allow editing the kernel command line.

> In general I found this[1] article great on debugging suspend/hibernate
> issues on Nixos (which I had twice).
>
> [1] https://wiki.ubuntu.com/DebuggingKernelSuspend

Thanks, I will study it.

My plan is to boot from a NixOS USB stick, mount the file systems and
then delete/modify some file that stores the state that determines
whether the system is hibernated or not. Any idea which file is
storing that information?

Bas

> 2017-04-24 2:20 GMT+03:00 Bas van Dijk :
>>
>> I made a few pictures and a video of the boot process:
>> https://goo.gl/photos/vrAkb5TFmZZ1J9kn9. In the video you can see that
>> after I've input my passphrase the following lines are printed before
>> the blinking cursor appears:
>>
>>   killall: cryptsetup: no process killed
>>   starting device mapper and LVM...
>> 2 logical volume(s) in volume group "MyStorage" now active
>>   _
>>
>> Bas
>>
>>
>> On 24 April 2017 at 00:48, Bas van Dijk  wrote:
>> > Dear list,
>> >
>> > Two weeks ago I installed NixOS natively on my Mac Book Pro (I was
>> > running NixOS in virtualbox before that). It ren well for two weeks
>> > but today I hit a snag.
>> >
>> > I was doing some work when my battery power became too low. Then I
>> > believe my system hibernated (suspended to disk) before it shut down.
>> > Note that I've set:
>> >
>> >   powerManagement.enable = true;
>> >
>> > Now when I boot my system it asks me for the encryption passphrase for
>> > my LUKS drive. After I enter it I see a cursor blinking for a few
>> > seconds before it freezes. After that my system is unresponsive.
>> >
>> > As mentioned I have an encrypted LUKS drive. On top of that I have a
>> > LVM root and swap volume. So what I believe has happened is that my
>> > system saved its memory to the encrypted swap before it shut down. Now
>> > when it boots up it tries to load that memory back in but fails for
>> > some reason. I guess the trouble starts somewhere here:
>> >
>> >
>> > https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/system/boot/stage-1-init.sh#L407
>> >
>> > Note that I have not set: boot.resumeDevice. Also note that I have set:
>> >
>> >   swapDevices = [ { device = "/dev/disk/by-label/swap"; } ];
>> >
>> > Any idea how to fix this?
>> >
>> > Bas
>> ___
>> nix-dev mailing list
>> nix-dev@lists.science.uu.nl
>> https://mailman.science.uu.nl/mailman/listinfo/nix-dev
>
>
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-dev


Re: [Nix-dev] Failure to boot after hibernate

2017-04-24 Thread Danylo Hlynskyi
Probably too late, but can you boot with hibernate=no kernel parameter?
In general I found this[1] article great on debugging suspend/hibernate
issues on Nixos (which I had twice).

[1] https://wiki.ubuntu.com/DebuggingKernelSuspend

2017-04-24 2:20 GMT+03:00 Bas van Dijk :

> I made a few pictures and a video of the boot process:
> https://goo.gl/photos/vrAkb5TFmZZ1J9kn9. In the video you can see that
> after I've input my passphrase the following lines are printed before
> the blinking cursor appears:
>
>   killall: cryptsetup: no process killed
>   starting device mapper and LVM...
> 2 logical volume(s) in volume group "MyStorage" now active
>   _
>
> Bas
>
>
> On 24 April 2017 at 00:48, Bas van Dijk  wrote:
> > Dear list,
> >
> > Two weeks ago I installed NixOS natively on my Mac Book Pro (I was
> > running NixOS in virtualbox before that). It ren well for two weeks
> > but today I hit a snag.
> >
> > I was doing some work when my battery power became too low. Then I
> > believe my system hibernated (suspended to disk) before it shut down.
> > Note that I've set:
> >
> >   powerManagement.enable = true;
> >
> > Now when I boot my system it asks me for the encryption passphrase for
> > my LUKS drive. After I enter it I see a cursor blinking for a few
> > seconds before it freezes. After that my system is unresponsive.
> >
> > As mentioned I have an encrypted LUKS drive. On top of that I have a
> > LVM root and swap volume. So what I believe has happened is that my
> > system saved its memory to the encrypted swap before it shut down. Now
> > when it boots up it tries to load that memory back in but fails for
> > some reason. I guess the trouble starts somewhere here:
> >
> >   https://github.com/NixOS/nixpkgs/blob/master/nixos/
> modules/system/boot/stage-1-init.sh#L407
> >
> > Note that I have not set: boot.resumeDevice. Also note that I have set:
> >
> >   swapDevices = [ { device = "/dev/disk/by-label/swap"; } ];
> >
> > Any idea how to fix this?
> >
> > Bas
> ___
> nix-dev mailing list
> nix-dev@lists.science.uu.nl
> https://mailman.science.uu.nl/mailman/listinfo/nix-dev
>
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-dev


[Nix-commits] [NixOS/nixpkgs] e879d7: nut: 2.7.1 -> 2.7.4

2017-04-24 Thread Jörg Thalheim
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: e879d7bd8446aaae231012cb6be6de7a895f6edd
  
https://github.com/NixOS/nixpkgs/commit/e879d7bd8446aaae231012cb6be6de7a895f6edd
  Author: Tad Fisher 
  Date:   2017-04-23 (Sun, 23 Apr 2017)

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

  Log Message:
  ---
  nut: 2.7.1 -> 2.7.4


  Commit: 4d7f97b166d4711972e7dbcf7373caf4c3ef2a7b
  
https://github.com/NixOS/nixpkgs/commit/4d7f97b166d4711972e7dbcf7373caf4c3ef2a7b
  Author: Jörg Thalheim 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

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

  Log Message:
  ---
  Merge pull request #25167 from tadfisher/nut-2.7.4

nut: 2.7.1 -> 2.7.4


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


[Nix-commits] [NixOS/nixpkgs] 176ca2: oh-my-zsh: changed example command

2017-04-24 Thread Jörg Thalheim
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 176ca2aac84087d32f4e7aebb43799df0efe3dec
  
https://github.com/NixOS/nixpkgs/commit/176ca2aac84087d32f4e7aebb43799df0efe3dec
  Author: DrawnWren 
  Date:   2017-04-23 (Sun, 23 Apr 2017)

  Changed paths:
M pkgs/shells/oh-my-zsh/default.nix

  Log Message:
  ---
  oh-my-zsh: changed example command

Fixed a typo in the example command. oh-my-zsh-git -> oh-my-zsh


  Commit: 73976a6bc99b13a0e30a0441c722a219091d50fe
  
https://github.com/NixOS/nixpkgs/commit/73976a6bc99b13a0e30a0441c722a219091d50fe
  Author: Jörg Thalheim 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
M pkgs/shells/oh-my-zsh/default.nix

  Log Message:
  ---
  Merge pull request #25163 from DrawnWren/patch-2

oh-my-zsh: changed example command


Compare: https://github.com/NixOS/nixpkgs/compare/30a9923f4c2b...73976a6bc99b___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nix] 9b63bb: nix-shell -p: Use runCommandCC

2017-04-24 Thread Eelco Dolstra
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nix
  Commit: 9b63bb88c8873d192b8b01608e5d230817dd3375
  
https://github.com/NixOS/nix/commit/9b63bb88c8873d192b8b01608e5d230817dd3375
  Author: Eelco Dolstra 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
M src/nix-build/nix-build.cc

  Log Message:
  ---
  nix-shell -p: Use runCommandCC

This restores pre-17.03 behaviour by making gcc available.


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


[Nix-commits] [NixOS/nixpkgs] 9b1b22: radeon-profile: init at 20161221

2017-04-24 Thread Benno Fünfstück
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 9b1b22fcb634e231dea196336a89fdb3269433e2
  
https://github.com/NixOS/nixpkgs/commit/9b1b22fcb634e231dea196336a89fdb3269433e2
  Author: rnhmjoj 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

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

  Log Message:
  ---
  radeon-profile: init at 20161221


  Commit: 30a9923f4c2b25ef94883c66798e090d8b53b6c6
  
https://github.com/NixOS/nixpkgs/commit/30a9923f4c2b25ef94883c66798e090d8b53b6c6
  Author: Benno Fünfstück 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

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

  Log Message:
  ---
  Merge pull request #24359 from rnhmjoj/radeon-profile

radeon-profile: init at 20161221


Compare: https://github.com/NixOS/nixpkgs/compare/229e3383f434...30a9923f4c2b___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/patchelf] c4deb5: Avoid inflating file sizes needlessly and allow bi...

2017-04-24 Thread Eelco Dolstra
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/patchelf
  Commit: c4deb5e9e1ce9c98a48e0d5bb37d87739b8cfee4
  
https://github.com/NixOS/patchelf/commit/c4deb5e9e1ce9c98a48e0d5bb37d87739b8cfee4
  Author: Richard Purdie 
  Date:   2017-03-07 (Tue, 07 Mar 2017)

  Changed paths:
M src/patchelf.cc

  Log Message:
  ---
  Avoid inflating file sizes needlessly and allow binaries to be stripped

The current approach to changing sections in ET_DYN executables is to move
the INTERP section to the end of the file. +This means changing PT_PHDR to
add an extra PT_LOAD section so that the new section is mmaped into memory
by the elf loader in the kernel. In order to extend PHDR, this means moving
it to the end of the file.

Its documented in BUGS there is a kernel 'bug' which means that if you have 
holes
in memory between the base load address and the PT_LOAD segment that contains 
PHDR,
it will pass an incorrect PHDR address to ld.so and fail to load the binary, 
segfaulting.

To avoid this, the code currently inserts space into the binary to ensure that 
when
loaded into memory there are no holes between the PT_LOAD sections. This 
inflates the
binaries by many MBs in some cases. Whilst we could make them sparse, there is 
a second
issue which is that strip can fail to process these binaries:

$ strip fixincl
Not enough room for program headers, try linking with -N
[.note.ABI-tag]: Bad value

This turns out to be due to libbfd not liking the relocated PHDR section either
(https://github.com/NixOS/patchelf/issues/10).

Instead this patch implements a different approach, leaving PHDR where it is 
but extending
it in place to allow addition of a new PT_LOAD section. This overwrites 
sections in the
binary but those get moved to the end of the file in the new PT_LOAD section.

This is based on patches linked from the above github issue, however whilst the 
idea
was good, the implementation wasn't correct and they've been rewritten here.

Signed-off-by: Richard Purdie 


  Commit: 6bfcafbba8d89e44f9ac9582493b4f27d9d8c369
  
https://github.com/NixOS/patchelf/commit/6bfcafbba8d89e44f9ac9582493b4f27d9d8c369
  Author: Eelco Dolstra 
  Date:   2017-04-21 (Fri, 21 Apr 2017)

  Changed paths:
M src/patchelf.cc

  Log Message:
  ---
  Merge branch 'master' of https://github.com/rpurdie/patchelf


Compare: https://github.com/NixOS/patchelf/compare/e44c318b3705...6bfcafbba8d8___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nix] 00b6c6: Fix small grammar issue about page

2017-04-24 Thread Eelco Dolstra
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nix
  Commit: 00b6c6d0c3047e6e0b2ab6ea8fef9bef94586ce4
  
https://github.com/NixOS/nix/commit/00b6c6d0c3047e6e0b2ab6ea8fef9bef94586ce4
  Author: kballou 
  Date:   2017-04-19 (Wed, 19 Apr 2017)

  Changed paths:
M doc/manual/introduction/about-nix.xml

  Log Message:
  ---
  Fix small grammar issue about page

Fix subject-verb agreement issue in introduction/about.


  Commit: 1196470e92f7e698cac28b7d84371fd4d28385ec
  
https://github.com/NixOS/nix/commit/1196470e92f7e698cac28b7d84371fd4d28385ec
  Author: Eelco Dolstra 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
M doc/manual/introduction/about-nix.xml

  Log Message:
  ---
  Merge pull request #1347 from kennyballou/sm-grammar-fix

Fix small grammar issue about page


Compare: https://github.com/NixOS/nix/compare/240399e059aa...1196470e92f7___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nix] 111d34: Drop misleading ellipses

2017-04-24 Thread Eelco Dolstra
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nix
  Commit: 111d347237d7f313ab9acfafc0de859715c31564
  
https://github.com/NixOS/nix/commit/111d347237d7f313ab9acfafc0de859715c31564
  Author: James Earl Douglas 
  Date:   2017-04-20 (Thu, 20 Apr 2017)

  Changed paths:
M doc/manual/introduction/quick-start.xml

  Log Message:
  ---
  Drop misleading ellipses

This portion of the quick start guide may lead to confusion for
newcomers to Nix.  This change clarifies the example to one that can be
copied in its entirety.


  Commit: 240399e059aa611c187305b4e0d134d5d5d3179d
  
https://github.com/NixOS/nix/commit/240399e059aa611c187305b4e0d134d5d5d3179d
  Author: Eelco Dolstra 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
M doc/manual/introduction/quick-start.xml

  Log Message:
  ---
  Merge pull request #1351 from earldouglas/ellipses

Drop misleading ellipses


Compare: https://github.com/NixOS/nix/compare/8d6af0853064...240399e059aa___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nix] 1559c5: document option

2017-04-24 Thread Eelco Dolstra
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nix
  Commit: 1559c596f6301628bbf04468cb897ea0a0010c1e
  
https://github.com/NixOS/nix/commit/1559c596f6301628bbf04468cb897ea0a0010c1e
  Author: Armijn Hemel 
  Date:   2017-04-19 (Wed, 19 Apr 2017)

  Changed paths:
M doc/manual/command-ref/nix-env.xml

  Log Message:
  ---
  document option


  Commit: 8d6af08530647444784713519749b82c5ec496fd
  
https://github.com/NixOS/nix/commit/8d6af08530647444784713519749b82c5ec496fd
  Author: Eelco Dolstra 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

  Changed paths:
M doc/manual/command-ref/nix-env.xml

  Log Message:
  ---
  Merge pull request #1348 from armijnhemel/nix-env

better document --meta option for nix-env


Compare: https://github.com/NixOS/nix/compare/169edf94072c...8d6af0853064___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 229e33: mpv: 0.24.0 -> 0.25.0

2017-04-24 Thread Peter Hoeg
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 229e3383f43446af8cc6445d7173a882707213cc
  
https://github.com/NixOS/nixpkgs/commit/229e3383f43446af8cc6445d7173a882707213cc
  Author: Peter Hoeg 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

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

  Log Message:
  ---
  mpv: 0.24.0 -> 0.25.0


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


[Nix-commits] [NixOS/nixpkgs] 71c7ca: dino: 2017-04-20 -> 2017-04-24

2017-04-24 Thread Jörg Thalheim
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 71c7ca7064720cfe25ee78013229c42287e1b5a7
  
https://github.com/NixOS/nixpkgs/commit/71c7ca7064720cfe25ee78013229c42287e1b5a7
  Author: Jörg Thalheim 
  Date:   2017-04-24 (Mon, 24 Apr 2017)

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

  Log Message:
  ---
  dino: 2017-04-20 -> 2017-04-24


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