Skip to content
This repository has been archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
base: 7438211aaa76
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: aa8c4f38eaf1
Choose a head ref
  • 18 commits
  • 11 files changed
  • 7 contributors

Commits on Oct 22, 2018

  1. ghc: add new 8.4.4 version

    (cherry picked from commit 069bf7a)
    peti authored and bgamari committed Oct 22, 2018
    Copy the full SHA
    e05517f View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2018

  1. lib/trivial: Update function comments for doc generation

    Expands on some of the function comments and add some of the
    special syntaxes recognised by nixdoc.
    tazjin committed Oct 29, 2018
    Copy the full SHA
    09772db View commit details
    Browse the repository at this point in the history
  2. lib/strings: Update documentation comments for doc generation

    Updates documentation comments with extra information for nixdoc[1]
    compatibility.
    
    Some documentation strings have additionally been reworded for
    clarity.
    
    "Faux types" are added where applicable, but some functions do things
    that are not trivially representable in the type notation used so they
    were ignored for this purpose.
    
    [1]: https://github.com/tazjin/nixdoc
    tazjin committed Oct 29, 2018
    Copy the full SHA
    34cd613 View commit details
    Browse the repository at this point in the history
  3. lib/lists: Update documentation comments for doc generation

    Updates documentation comments with extra information for nixdoc[1]
    compatibility.
    
    [1]: https://github.com/tazjin/nixdoc
    tazjin committed Oct 29, 2018
    Copy the full SHA
    20d8273 View commit details
    Browse the repository at this point in the history
  4. lib/debug: Update documentation comments for docs generation

    Documents functions in `lib.debug` for docs generation with nixdoc.
    
    Note that type signatures and clearer descriptions are still missing
    on some of these functions, but this is good enough for a first run.
    tazjin committed Oct 29, 2018
    Copy the full SHA
    a53c60d View commit details
    Browse the repository at this point in the history
  5. lib/options: Update documentation comments for docs generation

    Documents functions in `lib.options` for docs generation with nixdoc.
    
    The formatting change in the `mkOption` arguments is due to the way
    `nixdoc` parses documentation comments on pattern arguments. It's not
    ideal, but it works.
    tazjin committed Oct 29, 2018
    Copy the full SHA
    acb1efb View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2018

  1. sqlite-replication: initialize at 3.24.0+replication3

    (cherry picked from commit bf39304)
    jokogr committed Oct 30, 2018
    Copy the full SHA
    1bbe592 View commit details
    Browse the repository at this point in the history
  2. dqlite: initialize at 0.2.4

    (cherry picked from commit 891277e)
    jokogr committed Oct 30, 2018
    Copy the full SHA
    94ffbb5 View commit details
    Browse the repository at this point in the history
  3. lxd: 3.0.0 -> 3.0.2

    (cherry picked from commit ab62fe9)
    jokogr committed Oct 30, 2018
    Copy the full SHA
    1a4a9da View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2018

  1. gmock: 1.8.0 -> 1.8.1 (#46273)

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    gtest
    
    (cherry picked from commit 9cfbcc2)
    Reason: Pre-Requisite to backport uriparser 0.9.0, which patches
    security issues of the 0.8.x branch.
    r-ryantm authored and periklis committed Nov 2, 2018
    Copy the full SHA
    d976450 View commit details
    Browse the repository at this point in the history
  2. gtest: Use native cmake/ninja builder

    Clean up the expression and add pkgconfig support
    
    (cherry picked from commit 9ac64e5)
    Reason: Pre-Requisite to backport uriparser 0.9.0, which patches
    security issues of the 0.8.x branch.
    periklis committed Nov 2, 2018
    Copy the full SHA
    ff43959 View commit details
    Browse the repository at this point in the history
  3. uriparser: 0.8.6 -> 0.9.0

    (cherry picked from commit 2783ca5)
    Reason: Provides security fixes for the 0.8.x branch.
    periklis committed Nov 2, 2018
    Copy the full SHA
    4292214 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2018

  1. dbeaver: 5.2.2 -> 5.2.4

    (cherry picked from commit fada4e8)
    samueldr committed Nov 7, 2018
    Copy the full SHA
    72ab1b4 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2018

  1. Merge pull request #49851 from samueldr/auto/dbeaver/nixos-18.09/5.2.4

    dbeaver: 5.2.2 -> 5.2.4 (18.09)
    c0bw3b committed Nov 9, 2018
    Copy the full SHA
    e97b663 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2018

  1. Merge pull request #49586 from periklis/backport-uriparser-18.09

    uriparser: 0.9.0 backport to 18.09
    samueldr committed Nov 10, 2018
    Copy the full SHA
    6118089 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #49491 from jokogr/u-18.09/lxd-3.0.2

    [18.09] lxd 3.0.0 -> 3.0.2
    samueldr committed Nov 10, 2018
    Copy the full SHA
    06834f7 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #49387 from tazjin/chore/backport-doc-comments

    Backport documentation comment changes to release-18.09
    samueldr committed Nov 10, 2018
    Copy the full SHA
    141f63c View commit details
    Browse the repository at this point in the history
  4. Merge pull request #48806 from bgamari/nixos-18.09-ghc-8.4.4

    [18.09] ghc: add new 8.4.4 version
    samueldr committed Nov 10, 2018
    Copy the full SHA
    aa8c4f3 View commit details
    Browse the repository at this point in the history