Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 4e9990196104eb670d3e5108bde0666575b0f47e
      
https://github.com/NixOS/nixpkgs/commit/4e9990196104eb670d3e5108bde0666575b0f47e
  Author: Lluís Batlle i Rossell <[email protected]>
  Date:   2015-02-22 (Sun, 22 Feb 2015)

  Changed paths:
    M nixos/modules/security/pam.nix

  Log Message:
  -----------
  nixos: Adding OATH in pam.

(cherry picked from commit cb3cba54a1b87c376d0801238cb827eadb18e39e)

Conflicts:
        nixos/modules/security/pam.nix


  Commit: 9fbbefb9941befc0370710c7f286a919ace4eb4f
      
https://github.com/NixOS/nixpkgs/commit/9fbbefb9941befc0370710c7f286a919ace4eb4f
  Author: Lluís Batlle i Rossell <[email protected]>
  Date:   2015-02-22 (Sun, 22 Feb 2015)

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

  Log Message:
  -----------
  Update xclip to a more recent version (svn)

This can do -target, so it can work with images.

(cherry picked from commit 58a004999b6721fb8e55e397c0c3293d4f96fb7b)


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

Reply via email to