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: 0125544e2a05
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 4708d3f84bce
Choose a head ref
  • 10 commits
  • 8 files changed
  • 5 contributors

Commits on Mar 12, 2019

  1. Copy the full SHA
    83ec870 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    e5a71bd View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    c3fb95b View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2019

  1. radiotray-ng: 0.2.4 -> 0.2.5

    patch to use provided gtest/gmock, fix+enable tests
    dtzWill committed Mar 16, 2019
    Copy the full SHA
    c397b01 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2019

  1. Merge pull request #57540 from dtzWill/update/sqlite-replication-and-…

    …dqlite
    
    dqlite,sqlite-replication,lxd: updates!
    dtzWill committed Mar 17, 2019
    Copy the full SHA
    e37f63d View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    8fcb8b5 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #57761 from dtzWill/update/radiotray-ng-0.2.5

    radiotray-ng: 0.2.4 -> 0.2.5
    dtzWill committed Mar 17, 2019
    Copy the full SHA
    4f7a762 View commit details
    Browse the repository at this point in the history
  4. generic Haskell builder: don't copy packages from GHC

    In order to build the package databases that we will use when compiling
    a Haskell package, we iterate over the relevant dependencies, and if
    they contain a package db, we copy its contents over.
    
    So far so good, except when one of those dependencies is GHC. This
    doesn't happen ordinarily, but it will happen when we construct the
    package database for compiling `Setup.hs`.  This is compiled for the
    build architecture, so we get the build deps, including both the native
    and the cross GHC (if there is one).
    
    In this case, we end up copying the packages from the GHC's package
    database. This is at best unnecessary, since we will get those packages
    from the GHC when we compile with it.
    
    At worst, however, this is semantically questionable. We can end up
    having multiple copies of e.g. Cabal with the same version, but
    (potentially) different contents. At the moment, GHC will expose one of
    these at semi-random depending on which one it looks at "first".
    However, there is a MR open [in
    GHC](https://gitlab.haskell.org/ghc/ghc/merge_requests/545) which as a
    side effect will instead expose both, leading to ambiguous module
    warnings (which is not unreasonable, since it *is* ambiguous).
    
    So what can we do about it? The simplest solution is just to not copy
    the package databases from GHC. GHC is special in this regard, so I
    think it's okay to treat it specially.
    
    This PR should have no effect on anything now, but will prevent any
    breakage when/if the GHC patch lands.
    
    Closes NixOS/nixpkgs#57706.
    michaelpj authored and peti committed Mar 17, 2019
    Copy the full SHA
    387c513 View commit details
    Browse the repository at this point in the history
  5. hackage-packages.nix: automatic Haskell package set update

    This update was generated by hackage2nix v2.14.2-3-gea0f0ca from Hackage revision
    commercialhaskell/all-cabal-hashes@83ddbaa.
    peti committed Mar 17, 2019
    Copy the full SHA
    e98e4d2 View commit details
    Browse the repository at this point in the history
  6. hardinfo: fix not finding libc

    OPNA2608 authored and bjornfor committed Mar 17, 2019
    Copy the full SHA
    4708d3f View commit details
    Browse the repository at this point in the history