Unverified Commit bfb7ef86 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge branch 'master' into staging 

Mass rebuilds incoming.  The mass-rebuild situation got really messy
this weekend.
parents d10c3cc5 466e7e23

doc/cross-compilation.xml

+3 −2
Original line number Diff line number Diff line
@@ -37,8 +37,9 @@ 
    </para>

    <para>

      In Nixpkgs, these three platforms are defined as attribute sets under the names <literal>buildPlatform</literal>, <literal>hostPlatform</literal>, and <literal>targetPlatform</literal>.

      All three are always defined at the top level, so one can get at them just like a dependency in a function that is imported with <literal>callPackage</literal>:

      <programlisting>{ stdenv, buildPlatform, hostPlatform, fooDep, barDep, .. }: ...</programlisting>

      All three are always defined as attributes in the standard environment, and at the top level. That means one can get at them just like a dependency in a function that is imported with <literal>callPackage</literal>:

      <programlisting>{ stdenv, buildPlatform, hostPlatform, fooDep, barDep, .. }: ...buildPlatform...</programlisting>, or just off <varname>stdenv</varname>:

      <programlisting>{ stdenv, fooDep, barDep, .. }: ...stdenv.buildPlatform...</programlisting>.

    </para>

    <variablelist>

      <varlistentry>

lib/lists.nix

+8 −0
Original line number Diff line number Diff line
@@ -477,4 +477,12 @@ rec { 
  */

  subtractLists = e: filter (x: !(elem x e));



  /* Test if two lists have no common element.

     It should be slightly more efficient than (intersectLists a b == [])

  */

  mutuallyExclusive = a: b:

    (builtins.length a) == 0 ||

    (!(builtins.elem (builtins.head a) b) &&

     mutuallyExclusive (builtins.tail a) b);



}

lib/maintainers.nix

+6 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
  andrewrk = "Andrew Kelley <superjoe30@gmail.com>";

  andsild = "Anders Sildnes <andsild@gmail.com>";

  aneeshusa = "Aneesh Agrawal <aneeshusa@gmail.com>";

  ankhers = "Justin Wood <justin.k.wood@gmail.com>";

  antono = "Antono Vasiljev <self@antono.info>";

  apeschar = "Albert Peschar <albert@peschar.net>";

  apeyroux = "Alexandre Peyroux <alex@px.io>";
@@ -62,6 +63,7 @@ 
  bachp = "Pascal Bach <pascal.bach@nextrem.ch>";

  badi = "Badi' Abdul-Wahid <abdulwahidc@gmail.com>";

  balajisivaraman = "Balaji Sivaraman<sivaraman.balaji@gmail.com>";

  barrucadu = "Michael Walker <mike@barrucadu.co.uk>";

  basvandijk = "Bas van Dijk <v.dijk.bas@gmail.com>";

  Baughn = "Svein Ove Aas <sveina@gmail.com>";

  bcarrell = "Brandon Carrell <brandoncarrell@gmail.com>";
@@ -155,6 +157,7 @@ 
  drewkett = "Andrew Burkett <burkett.andrew@gmail.com>";

  dsferruzza = "David Sferruzza <david.sferruzza@gmail.com>";

  dtzWill = "Will Dietz <nix@wdtz.org>";

  dywedir = "Vladyslav M. <dywedir@protonmail.ch>";

  e-user = "Alexander Kahl <nixos@sodosopa.io>";

  ebzzry = "Rommel Martinez <ebzzry@gmail.com>";

  edanaher = "Evan Danaher <nixos@edanaher.net>";
@@ -224,6 +227,7 @@ 
  havvy = "Ryan Scheel <ryan.havvy@gmail.com>";

  hbunke = "Hendrik Bunke <bunke.hendrik@gmail.com>";

  hce = "Hans-Christian Esperer <hc@hcesperer.org>";

  hectorj = "Hector Jusforgues <hector.jusforgues+nixos@gmail.com>";

  heel = "Sergii Paryzhskyi <parizhskiy@gmail.com>";

  henrytill = "Henry Till <henrytill@gmail.com>";

  hinton = "Tom Hinton <t@larkery.com>";
@@ -315,6 +319,7 @@ 
  luispedro = "Luis Pedro Coelho <luis@luispedro.org>";

  lukego = "Luke Gorrie <luke@snabb.co>";

  lw = "Sergey Sofeychuk <lw@fmap.me>";

  lyt = "Tim Liou <wheatdoge@gmail.com>";

  m3tti = "Mathaeus Sander <mathaeus.peter.sander@gmail.com>";

  ma27 = "Maximilian Bosch <maximilian@mbosch.me>";

  madjar = "Georges Dubus <georges.dubus@compiletoi.net>";
@@ -564,6 +569,7 @@ 
  tv = "Tomislav Viljetić <tv@shackspace.de>";

  tvestelind = "Tomas Vestelind <tomas.vestelind@fripost.org>";

  tvorog = "Marsel Zaripov <marszaripov@gmail.com>";

  tweber = "Thorsten Weber <tw+nixpkgs@360vier.de>";

  twey = "James ‘Twey’ Kay <twey@twey.co.uk>";

  uralbash = "Svintsov Dmitry <root@uralbash.ru>";

  utdemir = "Utku Demir <me@utdemir.com>";

nixos/modules/installer/tools/nixos-rebuild.sh

+1 −1
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ trap cleanup EXIT 
# If --repair is given, don't try to use the Nix daemon, because the

# flag can only be used directly.

if [ -z "$repair" ] && systemctl show nix-daemon.socket nix-daemon.service | grep -q ActiveState=active; then

    export NIX_REMOTE=${NIX_REMOTE:-daemon}

    export NIX_REMOTE=${NIX_REMOTE-daemon}

fi

nixos/modules/programs/zsh/oh-my-zsh.nix

+4 −0
Original line number Diff line number Diff line
@@ -42,6 +42,10 @@ in 
    };



    config = mkIf cfg.enable {



      # Prevent zsh from overwriting oh-my-zsh's prompt

      programs.zsh.promptInit = mkDefault "";



      environment.systemPackages = with pkgs; [ oh-my-zsh ];



      programs.zsh.interactiveShellInit = with pkgs; with builtins; ''