Comparing changes
Open a pull request
base repository: NixOS/nixpkgs-channels
base: b2b2ff737829
head repository: NixOS/nixpkgs-channels
compare: e0e29a5996ec
- 11 commits
- 14 files changed
- 6 contributors
Commits on Mar 17, 2019
-
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)
Configuration menu - View commit details
-
Copy full SHA for ec8ba3e - Browse repository at this point
Copy the full SHA ec8ba3eView commit details -
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)
Configuration menu - View commit details
-
Copy full SHA for 3121c90 - Browse repository at this point
Copy the full SHA 3121c90View commit details
Commits on Mar 18, 2019
-
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)
Configuration menu - View commit details
-
Copy full SHA for 757bbe7 - Browse repository at this point
Copy the full SHA 757bbe7View commit details -
python.pkgs.agate-excel: 0.2.2 -> 0.2.3
(cherry picked from commit b1454f5)
Robert Schütz committedMar 18, 2019 Configuration menu - View commit details
-
Copy full SHA for b5bf9f3 - Browse repository at this point
Copy the full SHA b5bf9f3View commit details -
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 committedMar 18, 2019 Configuration menu - View commit details
-
Copy full SHA for 57e067f - Browse repository at this point
Copy the full SHA 57e067fView commit details -
python.pkgs.mysqlclient: fix build
fallout of NixOS/nixpkgs#54182 fixes NixOS/nixpkgs#57263 (cherry picked from commit ea7885f)
Robert Schütz committedMar 18, 2019 Configuration menu - View commit details
-
Copy full SHA for 0dd99c0 - Browse repository at this point
Copy the full SHA 0dd99c0View commit details -
jl: Patch to work with MonadFail GHC 8.6 change
Backport of #57284 (cherry picked from commit 79e3dcb)
Configuration menu - View commit details
-
Copy full SHA for db7dc94 - Browse repository at this point
Copy the full SHA db7dc94View commit details -
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 committedMar 18, 2019 Configuration menu - View commit details
-
Copy full SHA for d6d0931 - Browse repository at this point
Copy the full SHA d6d0931View commit details -
buildGoModule: Allow pname attribute (#57787)
(cherry picked from commit 832eb25)
Configuration menu - View commit details
-
Copy full SHA for a456b83 - Browse repository at this point
Copy the full SHA a456b83View commit details -
pythonPackages.secretstorage: 3.1.0 -> 3.1.1 (#57857)
(cherry picked from commit 379ff38)
Configuration menu - View commit details
-
Copy full SHA for 7ec0f48 - Browse repository at this point
Copy the full SHA 7ec0f48View commit details -
Merge pull request #57805 from kalbasit/nixpkgs_backport-build-go-module
buildGoModule: backport the new Go infrastructure to release 19.03
Configuration menu - View commit details
-
Copy full SHA for e0e29a5 - Browse repository at this point
Copy the full SHA e0e29a5View commit details
This comparison is taking too long to generate.
Unfortunately it looks like we can’t render this comparison for you right now. It might be too big, or there might be something weird with your repository.
You can try running this command locally to see the comparison on your machine:
git diff b2b2ff737829...e0e29a5996ec