[Nix-commits] [NixOS/nixpkgs] 68a4dc: heimdall: add OSX docs too

2017-06-23 Thread Peter Hoeg
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 68a4dc82c046b627a97c475bb3cb7869893c6971
  
https://github.com/NixOS/nixpkgs/commit/68a4dc82c046b627a97c475bb3cb7869893c6971
  Author: Peter Hoeg 
  Date:   2017-06-24 (Sat, 24 Jun 2017)

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

  Log Message:
  ---
  heimdall: add OSX docs too


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


[Nix-commits] [NixOS/nixpkgs] 276adb: heimdall: 1.4.1 -> 1.4.2

2017-06-23 Thread Peter Hoeg
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 276adb96fad79ea45b66c58e3799524eb226b24e
  
https://github.com/NixOS/nixpkgs/commit/276adb96fad79ea45b66c58e3799524eb226b24e
  Author: Peter Hoeg 
  Date:   2017-06-24 (Sat, 24 Jun 2017)

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

  Log Message:
  ---
  heimdall: 1.4.1 -> 1.4.2


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


[Nix-commits] [NixOS/nixops] 1ab1e6: hetzner: Actually turn XML values into Python type...

2017-06-23 Thread aszlig
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixops
  Commit: 1ab1e6cf2555214fc5f1da49da462883cc115766
  
https://github.com/NixOS/nixops/commit/1ab1e6cf2555214fc5f1da49da462883cc115766
  Author: Niklas Hambüchen 
  Date:   2017-06-20 (Tue, 20 Jun 2017)

  Changed paths:
M nixops/backends/hetzner.py

  Log Message:
  ---
  hetzner: Actually turn XML values into Python types.

This worked so far because all used types are strings,
but we want this to work in general for all types.


  Commit: 72f6b81aa9f0e965e2f11fde57beb58cfbf72c9c
  
https://github.com/NixOS/nixops/commit/72f6b81aa9f0e965e2f11fde57beb58cfbf72c9c
  Author: Niklas Hambüchen 
  Date:   2017-06-20 (Tue, 20 Jun 2017)

  Changed paths:
M doc/manual/overview.xml
M nix/hetzner.nix
M nixops/backends/hetzner.py

  Log Message:
  ---
  hetzner: Add `deployment.hetzner.createSubAccount` setting. Fixes #592.

This allows using NixOps with pre-existing Hetzner "admin" sub-accounts,
which is necessary when 2-factor auth is enabled for the main account.

I've also cleaned up the language a bit, making it more clear that
"admin account" refers to the sub-account, not to the main account.


  Commit: d0da0d724411ff5c908a647548940902501096fb
  
https://github.com/NixOS/nixops/commit/d0da0d724411ff5c908a647548940902501096fb
  Author: aszlig 
  Date:   2017-06-24 (Sat, 24 Jun 2017)

  Changed paths:
M doc/manual/overview.xml
M nix/hetzner.nix
M nixops/backends/hetzner.py

  Log Message:
  ---
  Merge pull request #688 (work around 2FA)

This allows to use an existing admin account instead of creating one
using the API, so that it's easier if you use 2-factor-authentication on
the main robot account.

I've tested this change using the hetzner_backend NixOS test and it
still succeeds, however the problem is that that test doesn't really
test the API, so this might still cause hidden issues on newly installed
servers, but from the code changes I feel confident enough that it's
highly unlikely.


  Commit: 6ed1332ab93fa4a7803523cad185da13ed9d8731
  
https://github.com/NixOS/nixops/commit/6ed1332ab93fa4a7803523cad185da13ed9d8731
  Author: aszlig 
  Date:   2017-06-24 (Sat, 24 Jun 2017)

  Changed paths:
M nixops/backends/hetzner.py

  Log Message:
  ---
  backends/hetzner: Fix Flake8 errors

This fixes the following errors:

F401 'sys' imported but unused
E731 do not assign a lambda expression, use a def
E731 do not assign a lambda expression, use a def
E501 line too long (86 > 79 characters)
E501 line too long (88 > 79 characters)
E731 do not assign a lambda expression, use a def
F812 list comprehension redefines 'net' from line 532
E501 line too long (83 > 79 characters)
E501 line too long (90 > 79 characters)
E731 do not assign a lambda expression, use a def

I've used NOQA on the log_continue() lambdas, because creating a def
just for that would not make it more readable.

In addition, I've removed the "Create a new Admin account exclusively
for this machine." comment because in the line before we have a
log_start() which says pretty much the same.

Also, setting robot_user/robot_pass to None at the beginning of
_get_robot_user_and_pass() is superfluous, because both if/else
statements that follow will set a value in any case.

Signed-off-by: aszlig 


Compare: https://github.com/NixOS/nixops/compare/7ea36691ebec...6ed1332ab93f___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits


Re: [Nix-dev] How to downgrade or patch freetype-2.7 ?

2017-06-23 Thread Volth
There are still at least one place where
"environment.sessionVariables.LD_LIBRARY_PATH = ..." does not replace
freetype with a custom-built version: in cgi-scripts run under
lighttpd service:

RRD rendered with stock freetype-2.7.1 http://i.imgur.com/HVZ5iPa.png
RRD rendered with freetype-2.7.1 compiled without subpixel rendering
(#define TT_CONFIG_OPTION_SUBPIXEL_HINTING 0):
http://i.imgur.com/Qj4W0Lx.png


On 4/20/17, Volth  wrote:
> On 4/20/17, Thomas Tuegel  wrote:
>> Volth  writes:
>>
>>> The second (http://imgur.com/MDiydzS) is what we get with these
>>> fontconfig rules on NixOS-17.09 (freetype-2.7.1) with default v40.
>>> Antialias is off, but hinting is not in action.
>>
>> Did you intentionally turn off hinting in that sample, or is it just not
>> working? Even with v40, it should be possible to achieve good results
>> with full hinting and no antialiasing.
>
> Hinting is on, the difference between the 2nd and the 3rd images is
> only 35 vs. 40 in the environment variable.
> If you want to reproduce, you may disable antialiasing and enable full
> hinting for pkgs.ubuntu_font_family or pkgs.liberation_ttf_v1_binary
> which are in nixpkgs.
>
>>> PS. v38 works similar to v40. It easy to turn in off by
>>> "config.fonts.fontconfig.ultimate.enable = false;".
>>> What I was looking for is a similar easy way to turn off v40 appeared
>>> in NixOS-unstable.
>>
>> That setting doesn't actually turn off v38! It turns off the
>> fontconfig-ultimate settings, but FreeType 2.6 is still patched to use
>> v38 instead of v35. So, if you could get acceptable rendering with
>> FreeType 2.6 on NixOS (which used v38), we should also be able to fix it
>> with FreeType 2.7 (v40) too.
>
> There was a visually similar issue in 17.03 with liberation_ttf_2.xx
> [1] which forced me to downgrade to 1.07. In 17.09 even
> liberation_ttf_1.07.xx became broken.
>
> There are clearly two diverging ways: the mainstream with
> antialiasing, subpixel rendering, gray-on-white texts, ... and the
> minority people who want to stay with contrast fonts rendered using
> only two colors (foreground and background). In order to stay the
> ground both the fonts and freetype are to be downgraded to their
> previous versions, so it won't be so long to lose the battle. Anyway,
> as dpi grows and pixels became invisible, it won't be the matter at
> all.
>
> 1. https://github.com/NixOS/nixpkgs/issues/21806
>
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-dev


[Nix-commits] [NixOS/nixpkgs] 8f970d: ghcHEAD: Actually split docs into their own output

2017-06-23 Thread John Ericson
  Branch: refs/heads/staging
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 8f970d09fe8e895b6bb7dbf52f80411a45504b19
  
https://github.com/NixOS/nixpkgs/commit/8f970d09fe8e895b6bb7dbf52f80411a45504b19
  Author: John Ericson 
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
M pkgs/development/compilers/ghc/head.nix

  Log Message:
  ---
  ghcHEAD: Actually split docs into their own output

I put `outputs = ...` in the wrong spot in the last PR, oops. Sorry
about that.


  Commit: c4ba2e3ef691c349bcce2b1e8b76a0bcd253544c
  
https://github.com/NixOS/nixpkgs/commit/c4ba2e3ef691c349bcce2b1e8b76a0bcd253544c
  Author: John Ericson 
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
M pkgs/build-support/cc-wrapper/default.nix
M pkgs/stdenv/darwin/default.nix
M pkgs/stdenv/freebsd/default.nix
M pkgs/stdenv/linux/default.nix
M pkgs/stdenv/native/default.nix
M pkgs/stdenv/nix/default.nix

  Log Message:
  ---
  cc-wrapper: Remove `stdenv.is*` for `targetPlatform.is*`

Modify bootstrapping stdenvs to make sure `targetPlatform` also passed.


  Commit: 459f1c60f5e53acb96123a7da8463d1e21093426
  
https://github.com/NixOS/nixpkgs/commit/459f1c60f5e53acb96123a7da8463d1e21093426
  Author: John Ericson 
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
M pkgs/build-support/cc-wrapper/default.nix
M pkgs/stdenv/darwin/default.nix
M pkgs/stdenv/freebsd/default.nix
M pkgs/stdenv/linux/default.nix
M pkgs/stdenv/native/default.nix
M pkgs/stdenv/nix/default.nix

  Log Message:
  ---
  cc-wrapper: Learn about target prefixes

This is first step towards getting rid of gcc-wrapper-cross


  Commit: d70e7263f47e890a350f50686bbf38e5f342cf37
  
https://github.com/NixOS/nixpkgs/commit/d70e7263f47e890a350f50686bbf38e5f342cf37
  Author: John Ericson 
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
M pkgs/build-support/cc-wrapper/default.nix

  Log Message:
  ---
  cc-wrapper: Simplify and correct logic to chose dynamic linker library


  Commit: 04a3cad968fccc11fd07997cd5b496f4c482aae7
  
https://github.com/NixOS/nixpkgs/commit/04a3cad968fccc11fd07997cd5b496f4c482aae7
  Author: John Ericson 
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
M pkgs/build-support/cc-wrapper/default.nix

  Log Message:
  ---
  cc-wrapper: Add support for no libc whatsoever


  Commit: 0f0383394d006ae1c67e2815d5b4a8e4c7788de0
  
https://github.com/NixOS/nixpkgs/commit/0f0383394d006ae1c67e2815d5b4a8e4c7788de0
  Author: John Ericson 
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
M pkgs/build-support/cc-wrapper/default.nix

  Log Message:
  ---
  cc-wrapper: Salt environment variables with LLVM triples

We now (on cross) require per-target flag interposition by putting the
triple in the names of the relevant environment variables, e.g:

export NIX_arm_unknown_linux_gnu_CFLAGS_COMPILE=...

The wrapper also has a `infixSalt` attribute (and "_" prefixed and
suffixed variants) to assist downstream packages.

Note how that the dashes are replaced to keep the identifier valid.
Using names like this allows us to keep the settings for different
compilers seperate.

I think it might be even better to use names like `NIX_{BUILD,HOST}...`
using the platform's role rather than the platform itself, but this
would be more work as the previous stages' tools would have to be re-
wrapped to take on their new role. I therefore didn't do this for now,
but that route should be thoroughly explored in the future.


  Commit: 8a7433fca4d08ee6654df498e0f238f0dfab01be
  
https://github.com/NixOS/nixpkgs/commit/8a7433fca4d08ee6654df498e0f238f0dfab01be
  Author: John Ericson 
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
M pkgs/build-support/cc-wrapper/default.nix

  Log Message:
  ---
  cc-wrapper: Temporarily got to great lengths to avoid mass-rebuild

Eventually we should avoid this "pre-wrapping" and just update those
files in nixpkgs. This mass-rebuild change is best done along with
those needed to reduce the disparity between native and cross (i.e.
making native the "identity cross").


  Commit: 121e7d9335187fa742abba7994e03b495b8f2a6c
  
https://github.com/NixOS/nixpkgs/commit/121e7d9335187fa742abba7994e03b495b8f2a6c
  Author: John Ericson 
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
R pkgs/build-support/gcc-cross-wrapper/add-flags
R pkgs/build-support/gcc-cross-wrapper/builder.sh
R pkgs/build-support/gcc-cross-wrapper/default.nix
R pkgs/build-support/gcc-cross-wrapper/gcc-wrapper.sh
R pkgs/build-support/gcc-cross-wrapper/ld-wrapper.sh
R pkgs/build-support/gcc-cross-wrapper/setup-hook.sh
R 

[Nix-commits] [NixOS/nixpkgs] 06271b: krita: Fix build dependencies

2017-06-23 Thread aszlig
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 06271b6eba7ce754a305df1d90925de976b915d2
  
https://github.com/NixOS/nixpkgs/commit/06271b6eba7ce754a305df1d90925de976b915d2
  Author: aszlig 
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
M pkgs/applications/graphics/krita/default.nix
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  krita: Fix build dependencies

First of all, we need a newer version of Vc, because at least version
1.1.0 is required for Krita 3.1.3.

Also, qtmultimedia and qtx11extras were missing.

Built and tested successfully on my machine.

Signed-off-by: aszlig 
Cc: @abbradar


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


[Nix-commits] [NixOS/nixpkgs] f43ae9: ios-cross: Just properly use the cc-wrapper

2017-06-23 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: f43ae985a68e515197c57de5ab8413d63ae6ef1a
  
https://github.com/NixOS/nixpkgs/commit/f43ae985a68e515197c57de5ab8413d63ae6ef1a
  Author: John Ericson 
  Date:   2017-06-22 (Thu, 22 Jun 2017)

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

  Log Message:
  ---
  ios-cross: Just properly use the cc-wrapper

No other downstream derivations are needed anymore.


  Commit: a24031317ae74400473013b91543b03a24ec3872
  
https://github.com/NixOS/nixpkgs/commit/a24031317ae74400473013b91543b03a24ec3872
  Author: John Ericson 
  Date:   2017-06-23 (Fri, 23 Jun 2017)

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

  Log Message:
  ---
  Merge pull request #26798 from obsidiansystems/ios-cross-stdenv

ios-cross: Just properly use the cc-wrapper


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


[Nix-commits] [NixOS/nixpkgs] 54a370: beam-packages: add erlangR20

2017-06-23 Thread Daiderd Jordan
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 54a370ff5f216a19ba622d1b5d38ad3b0372c201
  
https://github.com/NixOS/nixpkgs/commit/54a370ff5f216a19ba622d1b5d38ad3b0372c201
  Author: Daiderd Jordan 
  Date:   2017-06-23 (Fri, 23 Jun 2017)

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

  Log Message:
  ---
  beam-packages: add erlangR20


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


[Nix-commits] [NixOS/nixpkgs] d79b47: erlangR20: init

2017-06-23 Thread Daiderd Jordan
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: d79b4766a5b123ec078045d9945c805c489e053b
  
https://github.com/NixOS/nixpkgs/commit/d79b4766a5b123ec078045d9945c805c489e053b
  Author: Matthew Daiter 
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
A pkgs/development/interpreters/erlang/R20.nix
M pkgs/top-level/all-packages.nix
M pkgs/top-level/beam-packages.nix

  Log Message:
  ---
  erlangR20: init


  Commit: b0b5911fc14b90d279d54670dccf1484792f2ea0
  
https://github.com/NixOS/nixpkgs/commit/b0b5911fc14b90d279d54670dccf1484792f2ea0
  Author: Daiderd Jordan 
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
A pkgs/development/interpreters/erlang/R20.nix
M pkgs/top-level/all-packages.nix
M pkgs/top-level/beam-packages.nix

  Log Message:
  ---
  Merge pull request #26764 from mdaiter/erlangR20

erlangR20: init


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


[Nix-commits] [NixOS/nixpkgs] 26e166: flask-restplus: update to 0.10

2017-06-23 Thread Frederik Rietdijk
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 26e1664e88f79cf314a821575657fd42a15df51e
  
https://github.com/NixOS/nixpkgs/commit/26e1664e88f79cf314a821575657fd42a15df51e
  Author: Langston Barrett 
  Date:   2017-06-16 (Fri, 16 Jun 2017)

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

  Log Message:
  ---
  flask-restplus: update to 0.10


  Commit: cb0851d5fa27282f5be2969a85cad6ed5a389d38
  
https://github.com/NixOS/nixpkgs/commit/cb0851d5fa27282f5be2969a85cad6ed5a389d38
  Author: Frederik Rietdijk 
  Date:   2017-06-23 (Fri, 23 Jun 2017)

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

  Log Message:
  ---
  Merge pull request #26714 from siddharthist/flask-restplus

flask-restplus: update to 0.10


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


Re: [Nix-dev] 5 somewhat related questions

2017-06-23 Thread Linus Heckemann
Hi Klaas,

>> That intuition holds modulo your Q3 - replaying a sequence of
>> nix-env commands would only reproduce the same generations if a)
>> the states of all channels involved were retained (i.e. you'd need
>> to know which nixpkgs-stable you installed from with each command)
>> and b) all the builds were reproduce-able or cached. Nix assumes
>> reproduce-able builds, and so retains the outcomes of building
>> derivations based on a digest of the derivation itself - but if you
>> replayed the same nix-env commands from scratch, you might get
>> (trivially) different outcomes.
>
> Out of those 2 remarks "a" is the big one, especially if the channel 
> you've subscribed to is in fact not the stable one. As far as I
> understand now, there is no solution for this (yet). Good to know
> though.

You can, instead of using nixpkgs/config.nix, write an expression for
your user environment somewhat like this (say software.nix):

let pkgs = import  {}; in
{
  inherit (pkgs) vim ripgrep ;
}

You can install this using:

nix-env -f software.nix -i

If you add the -r flag, the result will not depend on the previous
generation of your user environment. The benefit of this approach is
that you can replace pkgs in order to pin specific versions, for instance…

let
  # System nixpkgs used only to fetch pinned nixpkgs
  bootPkgs = import  {};
  pkgs = import (bootPkgs.fetchFromGitHub {
owner = "nixos";
repo = "nixpkgs";
rev = "d10fe641247e29b72139776cd316333b13ba";
sha256 = "06viplacb5w49yf3rirsn4jdcfssj98f3s1zic0l8raxng7pmdcq";
  }) {};
in {
  inherit (pkgs) vim ripgrep;
};

Which is a bit harder to maintain but should be much less stateful,
depending only on fetchFromGitHub from your current nixpkgs not breaking
compatibility and on github staying up — and importantly, it would allow
reproducing previous generations more easily. You could of course also
factor the fetching out into a separate file which you could import and
have a script to automatically update. I wouldn't be surprised if
someone had already done that somewhere.

In a similar vein of functionality, you could version your user
environment in a git repo with nixpkgs as a submodule and update it
explicitly. This would provide a similar experience and further reduce
the variability.



> The rollbacks will be as-built, so implicitly they capture the state 
> implied by the channels and configuration.nix. However, there's no 
> explicit capture of those - there was discussion relatively recently 
> about capturing configuration.nix into the generation, but it turns 
> out to be a little harder than you'd expect. Likewise, you'd have to 
> somehow capture the state of all the involved channels.
> 
> 
> Do you have a pointer to this discussion? I cannot find it using the 
> keywords you mentioned above.

This was the discussion David Izquierdo linked in his reply:
https://mailman.science.uu.nl/pipermail/nix-dev/2017-April/023403.html

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


[Nix-commits] [NixOS/nixpkgs] c4ba2e: cc-wrapper: Remove `stdenv.is*` for `targetPlatfor...

2017-06-23 Thread John Ericson
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: c4ba2e3ef691c349bcce2b1e8b76a0bcd253544c
  
https://github.com/NixOS/nixpkgs/commit/c4ba2e3ef691c349bcce2b1e8b76a0bcd253544c
  Author: John Ericson 
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
M pkgs/build-support/cc-wrapper/default.nix
M pkgs/stdenv/darwin/default.nix
M pkgs/stdenv/freebsd/default.nix
M pkgs/stdenv/linux/default.nix
M pkgs/stdenv/native/default.nix
M pkgs/stdenv/nix/default.nix

  Log Message:
  ---
  cc-wrapper: Remove `stdenv.is*` for `targetPlatform.is*`

Modify bootstrapping stdenvs to make sure `targetPlatform` also passed.


  Commit: 459f1c60f5e53acb96123a7da8463d1e21093426
  
https://github.com/NixOS/nixpkgs/commit/459f1c60f5e53acb96123a7da8463d1e21093426
  Author: John Ericson 
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
M pkgs/build-support/cc-wrapper/default.nix
M pkgs/stdenv/darwin/default.nix
M pkgs/stdenv/freebsd/default.nix
M pkgs/stdenv/linux/default.nix
M pkgs/stdenv/native/default.nix
M pkgs/stdenv/nix/default.nix

  Log Message:
  ---
  cc-wrapper: Learn about target prefixes

This is first step towards getting rid of gcc-wrapper-cross


  Commit: d70e7263f47e890a350f50686bbf38e5f342cf37
  
https://github.com/NixOS/nixpkgs/commit/d70e7263f47e890a350f50686bbf38e5f342cf37
  Author: John Ericson 
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
M pkgs/build-support/cc-wrapper/default.nix

  Log Message:
  ---
  cc-wrapper: Simplify and correct logic to chose dynamic linker library


  Commit: 04a3cad968fccc11fd07997cd5b496f4c482aae7
  
https://github.com/NixOS/nixpkgs/commit/04a3cad968fccc11fd07997cd5b496f4c482aae7
  Author: John Ericson 
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
M pkgs/build-support/cc-wrapper/default.nix

  Log Message:
  ---
  cc-wrapper: Add support for no libc whatsoever


  Commit: 0f0383394d006ae1c67e2815d5b4a8e4c7788de0
  
https://github.com/NixOS/nixpkgs/commit/0f0383394d006ae1c67e2815d5b4a8e4c7788de0
  Author: John Ericson 
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
M pkgs/build-support/cc-wrapper/default.nix

  Log Message:
  ---
  cc-wrapper: Salt environment variables with LLVM triples

We now (on cross) require per-target flag interposition by putting the
triple in the names of the relevant environment variables, e.g:

export NIX_arm_unknown_linux_gnu_CFLAGS_COMPILE=...

The wrapper also has a `infixSalt` attribute (and "_" prefixed and
suffixed variants) to assist downstream packages.

Note how that the dashes are replaced to keep the identifier valid.
Using names like this allows us to keep the settings for different
compilers seperate.

I think it might be even better to use names like `NIX_{BUILD,HOST}...`
using the platform's role rather than the platform itself, but this
would be more work as the previous stages' tools would have to be re-
wrapped to take on their new role. I therefore didn't do this for now,
but that route should be thoroughly explored in the future.


  Commit: 8a7433fca4d08ee6654df498e0f238f0dfab01be
  
https://github.com/NixOS/nixpkgs/commit/8a7433fca4d08ee6654df498e0f238f0dfab01be
  Author: John Ericson 
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
M pkgs/build-support/cc-wrapper/default.nix

  Log Message:
  ---
  cc-wrapper: Temporarily got to great lengths to avoid mass-rebuild

Eventually we should avoid this "pre-wrapping" and just update those
files in nixpkgs. This mass-rebuild change is best done along with
those needed to reduce the disparity between native and cross (i.e.
making native the "identity cross").


  Commit: 121e7d9335187fa742abba7994e03b495b8f2a6c
  
https://github.com/NixOS/nixpkgs/commit/121e7d9335187fa742abba7994e03b495b8f2a6c
  Author: John Ericson 
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
R pkgs/build-support/gcc-cross-wrapper/add-flags
R pkgs/build-support/gcc-cross-wrapper/builder.sh
R pkgs/build-support/gcc-cross-wrapper/default.nix
R pkgs/build-support/gcc-cross-wrapper/gcc-wrapper.sh
R pkgs/build-support/gcc-cross-wrapper/ld-wrapper.sh
R pkgs/build-support/gcc-cross-wrapper/setup-hook.sh
R pkgs/build-support/gcc-cross-wrapper/utils.sh
M pkgs/top-level/all-packages.nix

  Log Message:
  ---
  gcc-cross-wrapper: Remove in favor of newly-cross-supporting `cc-wrapper`


  Commit: 9bfd03eff78aa37bff9a7f4cb12c6bed1f04e764
  
https://github.com/NixOS/nixpkgs/commit/9bfd03eff78aa37bff9a7f4cb12c6bed1f04e764
  Author: John Ericson 
  Date:   2017-06-22 (Thu, 22 Jun 2017)

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

[Nix-commits] [NixOS/nixops] 7ea366: Remove comma from setting of CharonNetworkName

2017-06-23 Thread Rob Vermaas
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixops
  Commit: 7ea36691ebec30fbcff8d6ddd8545475b225b800
  
https://github.com/NixOS/nixops/commit/7ea36691ebec30fbcff8d6ddd8545475b225b800
  Author: Rob Vermaas 
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
M nixops/resources/ec2_common.py

  Log Message:
  ---
  Remove comma from setting of CharonNetworkName


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


[Nix-commits] [NixOS/nixpkgs] 2fee07: pythonPackages.pygraphviz: fix build and add pytho...

2017-06-23 Thread rnhmjoj
  Branch: refs/heads/release-17.03
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 2fee07561f9ba193dae52df7b27484cfdf6f5481
  
https://github.com/NixOS/nixpkgs/commit/2fee07561f9ba193dae52df7b27484cfdf6f5481
  Author: rnhmjoj 
  Date:   2017-06-23 (Fri, 23 Jun 2017)

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

  Log Message:
  ---
  pythonPackages.pygraphviz: fix build and add python.pkgs.graphviz

(cherry picked from commit d8027bd9c4a766dcee7aceba7e0d341d407dad77)


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


[Nix-commits] [NixOS/nixpkgs] 7c1a16: knot-dns: security 2.4.2 -> 2.4.5

2017-06-23 Thread Vladimír Čunát
  Branch: refs/heads/release-17.03
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 7c1a1651a50cfa09f6650ea20d70398bb3d6ac71
  
https://github.com/NixOS/nixpkgs/commit/7c1a1651a50cfa09f6650ea20d70398bb3d6ac71
  Author: Vladimír Čunát 
  Date:   2017-06-23 (Fri, 23 Jun 2017)

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

  Log Message:
  ---
  knot-dns: security 2.4.2 -> 2.4.5

https://lists.nic.cz/pipermail/knot-dns-users/2017-June/001144.html
(master is using 2.5.x already)


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


[Nix-commits] [NixOS/nixpkgs] 75872f: knot-dns: security 2.5.1 -> 2.5.2

2017-06-23 Thread Vladimír Čunát
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 75872f31617ef867f7ec77c2d50e1253fc0cad60
  
https://github.com/NixOS/nixpkgs/commit/75872f31617ef867f7ec77c2d50e1253fc0cad60
  Author: Vladimír Čunát 
  Date:   2017-06-23 (Fri, 23 Jun 2017)

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

  Log Message:
  ---
  knot-dns: security 2.5.1 -> 2.5.2

https://lists.nic.cz/pipermail/knot-dns-users/2017-June/001144.html


  Commit: c76f8d9c7ab01119bbf051529e78d541e6f25d41
  
https://github.com/NixOS/nixpkgs/commit/c76f8d9c7ab01119bbf051529e78d541e6f25d41
  Author: Vladimír Čunát 
  Date:   2017-06-23 (Fri, 23 Jun 2017)

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

  Log Message:
  ---
  knot-resolver: maintenance 1.3.0 -> 1.3.1


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


[Nix-commits] [NixOS/nixpkgs] bff2ea: haskell: fix logic error in generic builder introd...

2017-06-23 Thread Peter Simons
  Branch: refs/heads/release-17.03
  Home:   https://github.com/NixOS/nixpkgs
  Commit: bff2ea5a4cfa7d40aaa36f67edcb057aaab84a37
  
https://github.com/NixOS/nixpkgs/commit/bff2ea5a4cfa7d40aaa36f67edcb057aaab84a37
  Author: Peter Simons 
  Date:   2017-06-23 (Fri, 23 Jun 2017)

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

  Log Message:
  ---
  haskell: fix logic error in generic builder introduced in 
00892b7e4ed2e8eb52227db8e8312a06bd1d6699

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

(cherry picked from commit 8ddaef6ddf552a13397cba48294d37cdd9fc93d7)


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


[Nix-commits] [NixOS/nixpkgs] 167b27: LTS Haskell 8.19

2017-06-23 Thread Peter Simons
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 167b27b6a738676c14b3bd0e030b2ef9b537beac
  
https://github.com/NixOS/nixpkgs/commit/167b27b6a738676c14b3bd0e030b2ef9b537beac
  Author: Peter Simons 
  Date:   2017-06-23 (Fri, 23 Jun 2017)

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

  Log Message:
  ---
  LTS Haskell 8.19


  Commit: 7673cd0cd4cab1d2a4f6bde6d33b2dcb3d863d38
  
https://github.com/NixOS/nixpkgs/commit/7673cd0cd4cab1d2a4f6bde6d33b2dcb3d863d38
  Author: Peter Simons 
  Date:   2017-06-23 (Fri, 23 Jun 2017)

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

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

This update was generated by hackage2nix v2.2.1-11-gb2cb3cb from Hackage 
revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/e0fa80e591be1df5eb2a7ccaa8f222e20600ed68.


  Commit: 5148757e8c4d4ffaa8f661f76515b3949f544618
  
https://github.com/NixOS/nixpkgs/commit/5148757e8c4d4ffaa8f661f76515b3949f544618
  Author: Peter Simons 
  Date:   2017-06-23 (Fri, 23 Jun 2017)

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

  Log Message:
  ---
  haskell-hspec-core: break infinity dependency cycle

Test suite dependencies silently and temporary depend on hspec-core in their
test suites.


  Commit: bc208863458f7b1880847d584aadd9731c975915
  
https://github.com/NixOS/nixpkgs/commit/bc208863458f7b1880847d584aadd9731c975915
  Author: Peter Simons 
  Date:   2017-06-23 (Fri, 23 Jun 2017)

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

  Log Message:
  ---
  git-annex: enable shell completions for zsh and fish

The latest optparse-applicative version can do that.


  Commit: d83fb640db31e0485da8498c4280e6017eb86505
  
https://github.com/NixOS/nixpkgs/commit/d83fb640db31e0485da8498c4280e6017eb86505
  Author: Peter Simons 
  Date:   2017-06-23 (Fri, 23 Jun 2017)

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

  Log Message:
  ---
  haskell-opencv: ensure that the underlying C++ library has contrib code 
enabled

https://github.com/NixOS/nixpkgs/commit/0335b93284b156291d77ff121ea51a01c07527c5#commitcomment-22638850


  Commit: 8ddaef6ddf552a13397cba48294d37cdd9fc93d7
  
https://github.com/NixOS/nixpkgs/commit/8ddaef6ddf552a13397cba48294d37cdd9fc93d7
  Author: Peter Simons 
  Date:   2017-06-23 (Fri, 23 Jun 2017)

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

  Log Message:
  ---
  haskell: fix logic error in generic builder introduced in 
00892b7e4ed2e8eb52227db8e8312a06bd1d6699

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


  Commit: 6b6cf6942c7917854fb81a6368df8e28fed1d1a3
  
https://github.com/NixOS/nixpkgs/commit/6b6cf6942c7917854fb81a6368df8e28fed1d1a3
  Author: Peter Simons 
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
M pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
M pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
M pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
M pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix

  Log Message:
  ---
  haskell-optparse-applicative: fix build with pre-8.0.x versions of GHC


  Commit: e31b99c18796194c2f07e5ffe678fd2b46d41eab
  
https://github.com/NixOS/nixpkgs/commit/e31b99c18796194c2f07e5ffe678fd2b46d41eab
  Author: Peter Simons 
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
M pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
M pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
M pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
M pkgs/development/haskell-modules/configuration-hackage2nix.yaml

  Log Message:
  ---
  haskell-network: use older version to compile with GHC 7.4.x and before

Recent versions of network no longer support base libraries that old.


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


Re: [Nix-dev] 5 somewhat related questions

2017-06-23 Thread Klaas van Schelven
Judson,

Thanks for your answers!
I've documented where your answers led me below for myself and others below.


> Second, your questions seem like prime additions to
> https://github.com/nixos-users/wiki/wiki/Documentation-Gaps which I hope
> will inform future version of the Nix manuals.
>
>
Maybe... the biggest missing "thing" in the documentation that I've
encountered so far is not any particular gap, but rather the organization
of the material. I have not yet reached the level where I can reorganize
all of the documentation myself though, nor do I have the time for it :-)


> I'll do my best to share my understanding vis-a-vis your questions, but
> they highlight weaknesses in my own understanding as well.
>
>
> [..]
>> 1. In NixOs /etc/nixos/configuration.nix is the single configuration file
>> that determines the state of the system as a whole. How does this file
>> relate to the existence of the nix-env command, either executed as root or
>> by a single non-privileged user? In particular, I would assume that any
>> nix-env is undone by the time the system is rebuilt from the configuration
>> file. Assuming this is the case: should the usage of nix-env not be
>> actively discouraged in NixOs? (perhaps it is, and I simply did not find
>> the reference)
>>
>> The products of runinng nix-env --install live in profiles (as, in fact,
> do nixos-rebuilds) - there's a diagram here http://nixos.org/nix/
> manual/#sec-profiles that I found useful for understanding how profiles
> work. Specificially, every user has their own "~/.nix-profiles" directory,
> and the system as a whole has a collection of profiles. System and user
> profiles are blended, using Unix pathing mechanisms. If, for example, you
> check your PATH, you'll see references to /home/username/.nix-profile/bin
> and /run/current-system/sw/bin.
>

Yes, the diagram is very useful!
One thing that's missing from the diagram (and my understanding until an
hour ago) is that the PATH value is in practice not a single value, but
rather a list (as is usual for paths, but I didn't necessarily assume that
Nix would do the usual thing). This gives rise to the "blending" that you
mention above, so that a non-privileged user has access to their own env,
the root's env, and the "system" env (AFAIU, the env that's generated from
the configuration.nix).

To answer my own question: root's nix-env and the configuration.nix are
independent from each other and their blended results will be available to
all users. This means that running nixos-rebuild after some imperative
style nix-env commands will in fact *not *undo those nix-env commands. Your
remark that ~


>
> nix-env --install is incredibly convenient to quickly install a program
> you need in the moment. Even better is when the "not installed" warning are
> working properly (which relies on your channel etc) and you can copy and
> paste a nix-env command to get the tool you need _right then_, and take a
> little maintenance time later to "purify" things.
>
> I've found it useful from time to time to do a nix-env -q, and migrate the
> list of installed packages to nix configuration.nix, and then delete my
> local installs along the way. I sort of wish that there were a mechanical
> way to do this, but it'd involve editing configuration.nix automatically
> and triggering nixos-rebuild, which I'm loath to undertake myself.
>
> Admittedly, there is some potential for confusion involved when you've
> nix-env'd a package, since you e.g. won't see it update when nixos-build is
> run. Also beware interactions like dmenu or neovim installed in one place
> and programs or plugins installed in another.
>
>
This is a good tip on an actually practical workflow!



> 2. (Context: Assuming for a moment there _is_ in fact a use-case for
>> nix-env; e.g. the scenario where you're not running NixOs, but are using
>> Nix on top of another distribution). nix-env uses an "imperative style" of
>> manipulating your environment, i.e. using a sequence of commands in a
>> particular order. I understand that after each succesful manipulation the
>> _resulting_ environment becomes available as a separate generation. As far
>> as I understand there's even a "half-product", the so called "derivation"
>> that is available per generation, although I did not study those yet. My
>> question is, however, whether the original commands that led to these
>> constructions can somehow be retrieved. The reason for this question is the
>> observation that the sequence of nix-env (and potentially other similar)
>> commands can be seen as a transactional log that could simply be replayed
>> to reconstruct the resulting generations (assuming that the commands fully
>> express the information needed to construct the associated environments;
>> this assumption might not actually hold in practice. Question 2b: does the
>> assumption hold?).
>>
>
>  That intuition holds modulo your Q3 - replaying a sequence of nix-env
> commands would only reproduce the 

Re: [Nix-dev] 5 somewhat related questions

2017-06-23 Thread Klaas van Schelven
David,

Thanks for your reply; answering below with a few more findings based on
your pointers in the hope that this might be relevant for future readers
(including myself)

3. In the scenario where I use the single configuration file
>> /etc/nixos/configuration.nix but I'm also subscribed to a channel, the
>> state of this channel may influence the outcome of nixos-rebuild (This is
>> by design, it allows us to stay up to date with e.g. security updates).
>> The
>> consecutive states of the channel, as seen by my system when rebuilding,
>> are valuable pieces of information in their own right when I want to debug
>> a problem. Take the following example:
>>
>> t=0, my system is good.
>> t=1, I want to install some extra package, I modify configuration.nix, and
>> run nixos-rebuild
>> t=2, system broken.
>>
>> I understand that I always have the ability to roll back the system _as a
>> whole_, even using Grub if needed. This is awesome of course. The question
>> is: do I also have the ability to debug the parts that lead to that whole?
>> In particular: the precise state of the channel[s] on each rebuild? And
>> preferably also: the state of /etc/nixos/configuration.nix on each build?
>>
>
> I think you want `nix-channel --rollback`, and
> `system.copySystemConfiguration = true` (for c.nix). Note however that at
> some point it will probably be in your best interest to modularise your
> c.nix into several files, and that option only copies c.nix, not any
> imports. You can check this message for a fairly elegant method to have
> your /etc/nixos tree be a part of each generation.
>
> https://mailman.science.uu.nl/pipermail/nix-dev/2017-April/023403.html
>
>>
>>
>>
Thanks for the pointer to `nix-channel --rollback`; it's indeed the kind of
thing I was thinking about, although it seems the various "seen states" of
the channel have not fully been exposed in all tooling. E.g. it's possible
to roll back to a particular generation of the channel, but it's not
possible to list all generations using the tooling (AFAICS); However, at
least we can inspect the directory layout and proceed from there.

system.copySystemConfiguration is the kind of thing I was talking about,
although it's indeed quite useless given it breaks under modularisation of
the config.

The discussion about "source closures" in this pull request is also
interesting: https://github.com/NixOS/nix/pull/709
(found by repairing a link in the discussion you mentioned).

For now, I think I'll just implement this by putting the sources in a more
conventional version control system.
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-dev


[Nix-commits] [NixOS/nixpkgs] be2b6c: gramalecte: init at v0.5.17

2017-06-23 Thread Alexandre Peyroux
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: be2b6c2e473d843f56419e34834124baace46f0d
  
https://github.com/NixOS/nixpkgs/commit/be2b6c2e473d843f56419e34834124baace46f0d
  Author: Alexandre Peyroux 
  Date:   2017-06-23 (Fri, 23 Jun 2017)

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

  Log Message:
  ---
  gramalecte: init at v0.5.17


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


[Nix-commits] [NixOS/nixpkgs] 5c2d4e: ammonite: disable remote logging by default

2017-06-23 Thread Jörg Thalheim
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 5c2d4ef6cfe3bc87cfcca829d4ceb52ede5e69d3
  
https://github.com/NixOS/nixpkgs/commit/5c2d4ef6cfe3bc87cfcca829d4ceb52ede5e69d3
  Author: Markus Hauck 
  Date:   2017-06-23 (Fri, 23 Jun 2017)

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

  Log Message:
  ---
  ammonite: disable remote logging by default


  Commit: 69ca7b145720358c9d574252d301184cc6177b90
  
https://github.com/NixOS/nixpkgs/commit/69ca7b145720358c9d574252d301184cc6177b90
  Author: Jörg Thalheim 
  Date:   2017-06-23 (Fri, 23 Jun 2017)

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

  Log Message:
  ---
  Merge pull request #26784 from markus1189/ammonite-disable-remote-logging

ammonite: disable remote logging by default


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


[Nix-commits] [NixOS/nixops] 919c06: Use 1.5.1 as next release is mostly a release with...

2017-06-23 Thread Rob Vermaas
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixops
  Commit: 919c062281cf2f66cad0dc89263c168537348b19
  
https://github.com/NixOS/nixops/commit/919c062281cf2f66cad0dc89263c168537348b19
  Author: Rob Vermaas 
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
M release.nix

  Log Message:
  ---
  Use 1.5.1 as next release is mostly a release with minor fixed


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


[Nix-commits] [NixOS/nixops] ef4565: Mention deployment.digitalOcean.authToken and DIGI...

2017-06-23 Thread Rob Vermaas
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixops
  Commit: ef45653c51ec90adf41b76f85b6a98a3c60d50e5
  
https://github.com/NixOS/nixops/commit/ef45653c51ec90adf41b76f85b6a98a3c60d50e5
  Author: Rob Vermaas 
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
M doc/manual/overview.xml
M doc/manual/release-notes.xml

  Log Message:
  ---
  Mention deployment.digitalOcean.authToken and DIGITAL_OCEAN_AUTH_TOKEN in the 
digital ocean section.


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


[Nix-commits] [NixOS/nixpkgs] aa3f37: pythonPackages.intelhex init at 2.1

2017-06-23 Thread Peter Jones
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: aa3f37ceed582c8cb6e871db528b7216d17b474f
  
https://github.com/NixOS/nixpkgs/commit/aa3f37ceed582c8cb6e871db528b7216d17b474f
  Author: Peter Jones 
  Date:   2017-06-23 (Fri, 23 Jun 2017)

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

  Log Message:
  ---
  pythonPackages.intelhex init at 2.1


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


[Nix-commits] [NixOS/nixpkgs] 4f0d81: python.pkgs.spyder: remove maintainers

2017-06-23 Thread Frederik Rietdijk
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 4f0d812abcbae2016967e9effb4e76a825b246d4
  
https://github.com/NixOS/nixpkgs/commit/4f0d812abcbae2016967e9effb4e76a825b246d4
  Author: Frederik Rietdijk 
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
M pkgs/applications/science/spyder/default.nix

  Log Message:
  ---
  python.pkgs.spyder: remove maintainers

since we both do not use this package anymore.
cc @bjornfor


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


[Nix-commits] [NixOS/nixpkgs] 00101e: jetbrains updater: use perlPackages.LWPProtocolhtt...

2017-06-23 Thread Jörg Thalheim
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 00101eb7c92f110c857d85f4dbd1a31fc10a668c
  
https://github.com/NixOS/nixpkgs/commit/00101eb7c92f110c857d85f4dbd1a31fc10a668c
  Author: Volth 
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
M pkgs/applications/editors/jetbrains/update.pl

  Log Message:
  ---
  jetbrains updater: use perlPackages.LWPProtocolhttps


  Commit: 7fa29f39d199553bd32b7514fe1f5441a20954de
  
https://github.com/NixOS/nixpkgs/commit/7fa29f39d199553bd32b7514fe1f5441a20954de
  Author: Volth 
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
M pkgs/applications/editors/jetbrains/update.pl

  Log Message:
  ---
  a little simpification (use File::Slurp)


  Commit: a2605322c6211c2bdccd742827902de57b8e2c6f
  
https://github.com/NixOS/nixpkgs/commit/a2605322c6211c2bdccd742827902de57b8e2c6f
  Author: Volth 
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
M pkgs/applications/editors/jetbrains/update.pl

  Log Message:
  ---
  fixed regexp, it did not match the last block


  Commit: f3b626cf4d7283a249d5072c165aee3ca4c40559
  
https://github.com/NixOS/nixpkgs/commit/f3b626cf4d7283a249d5072c165aee3ca4c40559
  Author: Jörg Thalheim 
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
M pkgs/applications/editors/jetbrains/update.pl

  Log Message:
  ---
  Merge pull request #26770 from volth/jetbrains-update-script-2

jetbrains updater: use perlPackages.LWPProtocolhttps


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


[Nix-commits] [NixOS/nixpkgs] d8027b: pythonPackages.pygraphviz: fix build

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

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

  Log Message:
  ---
  pythonPackages.pygraphviz: fix build


  Commit: a807c96e20535140c778ffbbd6d1beef4f44fb5b
  
https://github.com/NixOS/nixpkgs/commit/a807c96e20535140c778ffbbd6d1beef4f44fb5b
  Author: Frederik Rietdijk 
  Date:   2017-06-23 (Fri, 23 Jun 2017)

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

  Log Message:
  ---
  Merge pull request #26752 from rnhmjoj/graphviz

pythonPackages.pygraphviz: fix build


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


[Nix-commits] [NixOS/nixpkgs] d85976: nixos: replaced "userns" with "user namespaces" fo...

2017-06-23 Thread Joachim F
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: d859769f26f956db57c648579be68673d9dae2ab
  
https://github.com/NixOS/nixpkgs/commit/d859769f26f956db57c648579be68673d9dae2ab
  Author: André-Patrick Bubel 
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
M nixos/modules/profiles/hardened.nix

  Log Message:
  ---
  nixos: replaced "userns" with "user namespaces" for clarity

"userns" wasn't introduces as an abbreviation elsewhere as far as I can see, 
and I wasn't sure what was meant at first.


  Commit: 8accb9cb1c27a404232532760e2582f9b4211730
  
https://github.com/NixOS/nixpkgs/commit/8accb9cb1c27a404232532760e2582f9b4211730
  Author: Joachim F 
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
M nixos/modules/profiles/hardened.nix

  Log Message:
  ---
  Merge pull request #26773 from Moredread/patch-1

nixos: replaced "userns" with "user namespaces" for clarity


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