Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 2bd86e9e47d82acf296b353e2bd6b5cb6b7ba213
      
https://github.com/NixOS/nixpkgs/commit/2bd86e9e47d82acf296b353e2bd6b5cb6b7ba213
  Author: Profpatsch <[email protected]>
  Date:   2016-11-04 (Fri, 04 Nov 2016)

  Changed paths:
    R pkgs/applications/networking/instant-messengers/jackline/default.nix
    R pkgs/development/ocaml-modules/astring/default.nix
    M pkgs/development/ocaml-modules/cstruct/default.nix
    R pkgs/development/ocaml-modules/erm_xmpp/0.3.nix
    M pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix
    M pkgs/development/ocaml-modules/nocrypto/default.nix
    R pkgs/development/ocaml-modules/notty/default.nix
    R pkgs/development/ocaml-modules/otr/default.nix
    R pkgs/development/ocaml-modules/ptime/default.nix
    R pkgs/development/ocaml-modules/tls/default.nix
    M pkgs/development/ocaml-modules/uuseg/default.nix
    M pkgs/development/ocaml-modules/uutf/default.nix
    M pkgs/development/ocaml-modules/x509/default.nix
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/ocaml-packages.nix

  Log Message:
  -----------
  Revert "Merge pull request #20090 from sternenseemann/master"

Reason: https://github.com/NixOS/nixpkgs/pull/20090#commitcomment-19686426

This reverts commit 9ffcb1b2503303bfdb4a8fc31c8e4160184eb74c, reversing
changes made to a6283c1126676d30de3abfb3ee8865505da0ed43.


  Commit: 7e0ca08bfa19304b446f860a8899122ef019c51a
      
https://github.com/NixOS/nixpkgs/commit/7e0ca08bfa19304b446f860a8899122ef019c51a
  Author: Profpatsch <[email protected]>
  Date:   2016-11-04 (Fri, 04 Nov 2016)

  Changed paths:
    R pkgs/applications/networking/instant-messengers/jackline/default.nix
    R pkgs/development/ocaml-modules/astring/default.nix
    M pkgs/development/ocaml-modules/cstruct/default.nix
    R pkgs/development/ocaml-modules/erm_xmpp/0.3.nix
    M pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix
    M pkgs/development/ocaml-modules/nocrypto/default.nix
    R pkgs/development/ocaml-modules/notty/default.nix
    R pkgs/development/ocaml-modules/otr/default.nix
    R pkgs/development/ocaml-modules/ptime/default.nix
    R pkgs/development/ocaml-modules/tls/default.nix
    M pkgs/development/ocaml-modules/uuseg/default.nix
    M pkgs/development/ocaml-modules/uutf/default.nix
    M pkgs/development/ocaml-modules/x509/default.nix
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/ocaml-packages.nix

  Log Message:
  -----------
  Merge pull request #20151 from Profpatsch/jackline-revert

Revert "Merge pull request #20090 from sternenseemann/master"


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

Reply via email to