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: b2b2ff737829
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: e0e29a5996ec
Choose a head ref
  • 11 commits
  • 14 files changed
  • 6 contributors

Commits on Mar 17, 2019

  1. buildGoPackage: move it under a different path

    This change moves buildGoPackage from pkgs/development/go-modules to
    pkgs/development/go-packages, so we can have buildGoModule at
    pkgs/development/go-modules.
    
    (cherry picked from commit a0d835e)
    kalbasit committed Mar 17, 2019
    Configuration menu
    Copy the full SHA
    ec8ba3e View commit details
    Browse the repository at this point in the history
  2. buildGoModule: function for packaging Go modules

    The function buildGoModule builds Go programs managed with Go modules. It builds
    a Go module through a two phase build:
    
    - An intermediate fetcher derivation. This derivation will be used to
      fetch all of the dependencies of the Go module.
    - A final derivation will use the output of the intermediate derivation
      to build the binaries and produce the final output.
    
    (cherry picked from commit 28435e4)
    kalbasit committed Mar 17, 2019
    Configuration menu
    Copy the full SHA
    3121c90 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2019

  1. 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.
    
    (cherry picked from commit 387c513)
    michaelpj authored and peti committed Mar 18, 2019
    Configuration menu
    Copy the full SHA
    757bbe7 View commit details
    Browse the repository at this point in the history
  2. python.pkgs.agate-excel: 0.2.2 -> 0.2.3

    (cherry picked from commit b1454f5)
    Robert Schütz committed Mar 18, 2019
    Configuration menu
    Copy the full SHA
    b5bf9f3 View commit details
    Browse the repository at this point in the history
  3. csvkit: move out of pythonPackages

    From https://csvkit.readthedocs.io/en/1.0.3/index.html:
    > csvkit is a suite of *command-line tools* for [...]
    
    (cherry picked from commit 5e39aa2)
    Robert Schütz committed Mar 18, 2019
    Configuration menu
    Copy the full SHA
    57e067f View commit details
    Browse the repository at this point in the history
  4. python.pkgs.mysqlclient: fix build

    fallout of NixOS/nixpkgs#54182
    fixes NixOS/nixpkgs#57263
    
    (cherry picked from commit ea7885f)
    Robert Schütz committed Mar 18, 2019
    Configuration menu
    Copy the full SHA
    0dd99c0 View commit details
    Browse the repository at this point in the history
  5. jl: Patch to work with MonadFail GHC 8.6 change

    Backport of #57284
    (cherry picked from commit 79e3dcb)
    srhb committed Mar 18, 2019
    Configuration menu
    Copy the full SHA
    db7dc94 View commit details
    Browse the repository at this point in the history
  6. bonfire: use pytest_3

    Otherwise, tests fail with
    > Failed: [pytest] section in setup.cfg files is no longer supported, change to [tool:pytest] instead.
    
    (cherry picked from commit 8f115c0)
    Robert Schütz committed Mar 18, 2019
    Configuration menu
    Copy the full SHA
    d6d0931 View commit details
    Browse the repository at this point in the history
  7. buildGoModule: Allow pname attribute (#57787)

    (cherry picked from commit 832eb25)
    dywedir authored and kalbasit committed Mar 18, 2019
    Configuration menu
    Copy the full SHA
    a456b83 View commit details
    Browse the repository at this point in the history
  8. pythonPackages.secretstorage: 3.1.0 -> 3.1.1 (#57857)

    (cherry picked from commit 379ff38)
    srhb authored and Robert Schütz committed Mar 18, 2019
    Configuration menu
    Copy the full SHA
    7ec0f48 View commit details
    Browse the repository at this point in the history
  9. Merge pull request #57805 from kalbasit/nixpkgs_backport-build-go-module

    buildGoModule: backport the new Go infrastructure to release 19.03
    Mic92 committed Mar 18, 2019
    Configuration menu
    Copy the full SHA
    e0e29a5 View commit details
    Browse the repository at this point in the history