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: da7990eb5a8d
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: ed7b654a21c0
Choose a head ref
  • 7 commits
  • 16 files changed
  • 6 contributors

Commits on Sep 10, 2018

  1. kde-frameworks: 5.49 -> 5.50

    @bkchr
    bkchr committed Sep 10, 2018
    Configuration menu
    Copy the full SHA
    ea99e30 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2018

  1. kde-frameworks.syndication: Init

    @bkchr
    bkchr committed Sep 13, 2018
    Configuration menu
    Copy the full SHA
    df007e9 View commit details
    Browse the repository at this point in the history

  2. seaview: init at 4.7 (#46595)

    @iimog @xeji
    iimog authored and xeji committed Sep 13, 2018
    Configuration menu
    Copy the full SHA
    e2df8e7 View commit details
    Browse the repository at this point in the history

  3. tamarin-prover: fix ghc 8.4 build (#46597) 

    See https://hydra.nixos.org/build/81125645

`tamarin-prover' upstream has a patch to fix GHC 8.4 compilation (and
uses stack lts-12.1 now), but it's not released yet:

tamarin-prover/tamarin-prover@a08f6e4

The build is divided in several derivations, therefore the patch had to
be splitted and rebased for `lib/term', `lib/theory' and `lib/utils' to
ensure that the patch applies properly during the `patchPhase'.

Addresses #45960
    @Ma27 @xeji
    Ma27 authored and xeji committed Sep 13, 2018
    Configuration menu
    Copy the full SHA
    2cfc0bb View commit details
    Browse the repository at this point in the history

  4. treewide: fix config.allowAliases = false evaluation

    @ryantm
    ryantm committed Sep 13, 2018
    Configuration menu
    Copy the full SHA
    f91a79e View commit details
    Browse the repository at this point in the history

  5. Merge pull request #46483 from bkchr/kde_frameworks 

    kde-frameworks: 5.49 -> 5.50
    Thomas Tuegel committed Sep 13, 2018
    Configuration menu
    Copy the full SHA
    5039621 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #46593 from ryantm/aliases 

    treewide: fix `config.allowAliases = false` evaluation
    @xeji
    xeji committed Sep 13, 2018
    Configuration menu
    Copy the full SHA
    ed7b654 View commit details
    Browse the repository at this point in the history