Skip to content
This repository was 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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 720af0f20fb0
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e76b1128537a
Choose a head ref
  • 12 commits
  • 15 files changed
  • 5 contributors

Commits on Oct 11, 2018

  1. xorg: sync source lists with default.nix

    @thefloweringash @Ericson2314
    thefloweringash authored and Ericson2314 committed Oct 11, 2018
    Copy the full SHA
    0804902 View commit details

  2. xorg: allow overriding via overrideScope

    @thefloweringash @Ericson2314
    thefloweringash authored and Ericson2314 committed Oct 11, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9454f71 View commit details

  3. xorg: add caching to generate-expr-from-tarballs.pl

    @thefloweringash @Ericson2314
    thefloweringash authored and Ericson2314 committed Oct 11, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0e12683 View commit details

  4. xorg: simplify argument passing into xorg and overrides

    @thefloweringash @Ericson2314
    thefloweringash authored and Ericson2314 committed Oct 11, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    fb9604c View commit details

  5. xorg: don't splice scope attributes into main package set

    @thefloweringash @Ericson2314
    thefloweringash authored and Ericson2314 committed Oct 11, 2018
    Copy the full SHA
    47bf3f3 View commit details

Commits on Oct 18, 2018

  1. xorg: Don't use deprecated item

    @Ericson2314
    Ericson2314 committed Oct 18, 2018
    Copy the full SHA
    88cd633 View commit details

  2. Merge remote-tracking branch 'upstream/release-18.09' into xorg-overr… 

    …ide-18.09
    @Ericson2314
    Ericson2314 committed Oct 18, 2018
    Copy the full SHA
    318e45d View commit details

Commits on Oct 19, 2018

  1. Merge remote-tracking branch 'upstream/release-18.09' into xorg-overr… 

    …ide-18.09
    @Ericson2314
    Ericson2314 committed Oct 19, 2018
    Copy the full SHA
    e23b220 View commit details

Commits on Oct 20, 2018

  1. Merge pull request #48673 from Ericson2314/xorg-override-18.09 

    xorg: allow overriding via overrideScope' for 18.09
    @Ericson2314
    Ericson2314 authored Oct 20, 2018
    Copy the full SHA
    2569506 View commit details

  2. python2Packages.astroid: init at 1.6.5 

    Older version backported from master, as requirement for pylint 1.9.2

(cherry picked from commit 4f09e05)
    @lopsided98 @FRidh
    lopsided98 authored and FRidh committed Oct 20, 2018
    Copy the full SHA
    b33fe1b View commit details

  3. python2Packages.pylint: init at 1.9.2 

    Backport of pylint 1.9.2, required for older python2.7
(2.x versions of pylint work only with python 3.4+)

(cherry picked from commit 67ea567)
    @lopsided98 @FRidh
    lopsided98 authored and FRidh committed Oct 20, 2018
    Copy the full SHA
    0da77aa View commit details

  4. ruby: 2.5.2 -> 2.5.3 

    https://www.ruby-lang.org/en/news/2018/10/18/ruby-2-5-3-released/

This release is just for fixing the packaging issue. This release doesn’t
contain any additional bug fixes from 2.5.2.

(cherry picked from commit 87407bc)
    @samueldr @Mic92
    samueldr authored and Mic92 committed Oct 20, 2018
    Copy the full SHA
    e76b112 View commit details
Loading