Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: a5b68eb4f6a0d1ac128c103891d8b959363964de
      
https://github.com/NixOS/nixpkgs/commit/a5b68eb4f6a0d1ac128c103891d8b959363964de
  Author: Bjørn Forsman <[email protected]>
  Date:   2015-12-30 (Wed, 30 Dec 2015)

  Changed paths:
    M pkgs/servers/x11/xorg/default.nix
    M pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl

  Log Message:
  -----------
  xorg: add meta.platforms

Add it to the generator script (generate-expr-from-tarballs.pl) and then
add the updated generated file (pkgs/servers/x11/xorg/default.nix) after
performing the steps outlined in the generator script.

NOTE: People seem to have updated .../default.nix manually (even though
it has a "THIS IS A GENERATED FILE.  DO NOT EDIT!" header), so I had to
skip some changes to not downgrade several packages.


  Commit: 680659023c3554a55c7c50df068a2af8a37a9940
      
https://github.com/NixOS/nixpkgs/commit/680659023c3554a55c7c50df068a2af8a37a9940
  Author: Domen Kožar <[email protected]>
  Date:   2015-12-31 (Thu, 31 Dec 2015)

  Changed paths:
    M pkgs/servers/x11/xorg/default.nix
    M pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl

  Log Message:
  -----------
  Merge pull request #12034 from bjornfor/add-meta-platforms-to-xorg

xorg: add meta.platforms


Compare: https://github.com/NixOS/nixpkgs/compare/b9bfedd64dbf...680659023c35
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to