Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 8d8277e00091
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 43968da0755e
Choose a head ref
  • 7 commits
  • 50 files changed
  • 4 contributors

Commits on Oct 16, 2019

  1. coq_8_10: do not build CoqIDE on darwin 

    See https://gitlab.gnome.org/GNOME/gtk/merge_requests/1004
for details about the GTK3 issue
    @vbgl
    vbgl committed Oct 16, 2019
    Copy the full SHA
    bb75840 View commit details
    Browse the repository at this point in the history

  2. coq_8_10: 8.10+β2 → 8.10+β3 

    (cherry picked from commit 8288301)
    @vbgl
    vbgl committed Oct 16, 2019
    Copy the full SHA
    2e37793 View commit details
    Browse the repository at this point in the history

  3. coq_8_10: do not take “camlp5” as input 

    (cherry picked from commit 1292f49)
    @vbgl
    vbgl committed Oct 16, 2019
    Copy the full SHA
    090dccf View commit details
    Browse the repository at this point in the history

  4. elpi: 1.6.0 -> 1.7.0 

    (cherry picked from commit c70d7fa)
    @maggesi @vbgl
    maggesi authored and vbgl committed Oct 16, 2019
    Copy the full SHA
    46b2ba1 View commit details
    Browse the repository at this point in the history

  5. coq_8_10: 8.10+β3 → 8.10.0 

    coqPackages.coq-elpi: master → 1.1.0

(cherry picked from commit b4db381)
    @vbgl
    vbgl committed Oct 16, 2019
    Copy the full SHA
    0da40a1 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2019

  1. Merge pull request #71214 from vbgl/coq-8.10.0+release-19.09 

    [19.09] Coq 8.10.0
    @vbgl
    vbgl committed Oct 23, 2019
    Copy the full SHA
    37082f6 View commit details
    Browse the repository at this point in the history

  2. doc: backport manual improvements (19.09) (#71779) 

    * doc: organize chapters into parts, and reduce toc depth

Reorganize the chapters into parts and reduce the TOC depth to make the
TOC useful again. The top-level TOC is very brief, but that is fine
because every part will have its own TOC.

Section titles of languages/frameworks are also simplified to just
the name of the language/framework.

* doc: merge package notes and package-specific notes

Maybe there was an idea behind this separation, but looking at the
contents I don't see any reason for these being separate.

* doc: split packages part into xml file per package

* doc: move fetchers and trivial builders under builders

* doc: move image builders into new images chapter

* doc: move overrides into separate chapter

* doc: move fhs and mkShell under builders/special

In my opinion Functions should only contain pure functions. These are
both meant to provide derivations so I put them under Builders. Don't
know exactly *where* to put them so "special" it is...
    @FRidh
    FRidh committed Oct 23, 2019
    Copy the full SHA
    43968da View commit details
    Browse the repository at this point in the history