Branch: refs/heads/release-17.03
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 94fcc17b943e391742c6684beed2da66488c5787
      
https://github.com/NixOS/nixpkgs/commit/94fcc17b943e391742c6684beed2da66488c5787
  Author: Joachim Schiele <j...@lastlog.de>
  Date:   2017-03-07 (Tue, 07 Mar 2017)

  Changed paths:
    M nixos/tests/leaps.nix

  Log Message:
  -----------
  nixos/tests/leaps.nix: fixed race condition

(cherry picked from commit f8ad48ea1d83fdae35cbb43e0caafa813f8b4264)


  Commit: 0cb1e29ebe7ae73ee5732bc91b774b20052c5717
      
https://github.com/NixOS/nixpkgs/commit/0cb1e29ebe7ae73ee5732bc91b774b20052c5717
  Author: Matthias Beyer <m...@beyermatthias.de>
  Date:   2017-03-07 (Tue, 07 Mar 2017)

  Changed paths:
    M nixos/doc/manual/configuration/xfce.xml

  Log Message:
  -----------
  nixos doc xfce: Fix missing space

(cherry picked from commit 1e3dec3baaf12c6be0704d4e15fb270a628ecc10)


  Commit: cd6c5976eb23e780a7bb6489b234a9e7c349204c
      
https://github.com/NixOS/nixpkgs/commit/cd6c5976eb23e780a7bb6489b234a9e7c349204c
  Author: Matthias Beyer <m...@beyermatthias.de>
  Date:   2017-03-07 (Tue, 07 Mar 2017)

  Changed paths:
    M nixos/doc/manual/configuration/xfce.xml

  Log Message:
  -----------
  doc: Remove indention from program listings

(cherry picked from commit c56587eb301b514dff380268876134c5cb841cbe)


  Commit: edb47a364e99e57a21455ee92a9da2536540909b
      
https://github.com/NixOS/nixpkgs/commit/edb47a364e99e57a21455ee92a9da2536540909b
  Author: Matthias Beyer <m...@beyermatthias.de>
  Date:   2017-03-07 (Tue, 07 Mar 2017)

  Changed paths:
    M nixos/doc/manual/configuration/xfce.xml

  Log Message:
  -----------
  nixos doc xfce: Tabs -> spaces

(cherry picked from commit 0a18a56375fbf2146b19fba7528b8d1a5bd51d44)


  Commit: 431893ccfb1644d45a35f58c1bcffb8b0e5f9139
      
https://github.com/NixOS/nixpkgs/commit/431893ccfb1644d45a35f58c1bcffb8b0e5f9139
  Author: Matthias Beyer <m...@beyermatthias.de>
  Date:   2017-03-07 (Tue, 07 Mar 2017)

  Changed paths:
    M nixos/doc/manual/configuration/xfce.xml

  Log Message:
  -----------
  Wrap command in <command>

(cherry picked from commit 87f57de8e579ed7b41096c77b1ceb2146db87f5a)


  Commit: e95acf6e817b8dfd5f93b60988e44bd4becad9a2
      
https://github.com/NixOS/nixpkgs/commit/e95acf6e817b8dfd5f93b60988e44bd4becad9a2
  Author: Jörg Thalheim <jo...@thalheim.io>
  Date:   2017-03-07 (Tue, 07 Mar 2017)

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

  Log Message:
  -----------
  xfstests: set correct echo binary

(cherry picked from commit 13ed7e6631b834b7f6628ecfa7e7ab2034528989)


  Commit: 906cea11963a1132c3f3d418e6ef8d9424aa041c
      
https://github.com/NixOS/nixpkgs/commit/906cea11963a1132c3f3d418e6ef8d9424aa041c
  Author: Benno Fünfstück <benno.fuenfstu...@gmail.com>
  Date:   2017-03-07 (Tue, 07 Mar 2017)

  Changed paths:
    M pkgs/tools/cd-dvd/dvdisaster/default.nix

  Log Message:
  -----------
  dvdisaster: fix $out variable expansion (makeFlags)

Make requires variables with more than one letter to be surrounded by 
parentheses,
like `$(out)`. Just writing `$out` will be interpreted as `$o` followed by 
`ut`, so
the package installed its documentaion to `ut/share/doc`.

/cc maintainers @jgeerds @nckx

(cherry picked from commit 3449107d683e80848ed408cbecf20845cf99663e)


  Commit: 24472d433c1353092adcfc63a5231dc31c706227
      
https://github.com/NixOS/nixpkgs/commit/24472d433c1353092adcfc63a5231dc31c706227
  Author: Benno Fünfstück <benno.fuenfstu...@gmail.com>
  Date:   2017-03-07 (Tue, 07 Mar 2017)

  Changed paths:
    M pkgs/tools/audio/mpdris2/default.nix

  Log Message:
  -----------
  mpdris2: install locale files to correct location

The package included outdated intltool makefiles, resulting in installation of
local files to `$out/'@DATADIRNAME'`. Running `intltoolize -f` forces
regeneration of the Makefile and fixes the issue.

(cherry picked from commit f9b08c9dbbeef144b00a7e7a1efa884e81d6ddbb)


Compare: https://github.com/NixOS/nixpkgs/compare/502892f563ba...24472d433c13
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to