Branch: refs/heads/hardened-stdenv
Home: https://github.com/NixOS/nixpkgs
Commit: 851446e26ecfda12be4fbda6809eec8b62e854c2
https://github.com/NixOS/nixpkgs/commit/851446e26ecfda12be4fbda6809eec8b62e854c2
Author: Robin Gloster <m...@glob.in>
Date: 2016-06-11 (Sat, 11 Jun 2016)
Changed paths:
M pkgs/top-level/all-packages.nix
M pkgs/top-level/rust-packages.nix
Log Message:
-----------
fix merge failure
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
