Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a4b1f0441979
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3ddd951e6aff
Choose a head ref

Commits on Nov 4, 2020

  1. ghc8102BinaryMinimal: Re-add docs, remove more profiling files

    (cherry picked from commit 7bd21d3)
    roberth committed Nov 4, 2020
    Copy the full SHA
    dda47e4 View commit details
  2. ghc8102Binary*: simplify meta

    Not distributing dependencies via hydraPlatforms does not work,
    so we keep meta simple.
    
    (cherry picked from commit 4643796)
    roberth committed Nov 4, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    6b377f2 View commit details

Commits on Nov 6, 2020

  1. Merge pull request #101636 from NixOS/python-unstable

    Python packages set: patch updates
    FRidh authored Nov 6, 2020
    Copy the full SHA
    73f591a View commit details
  2. Merge pull request #102833 from hercules-ci/ghc8102BinaryMinimal-fix-…

    …docs
    
    ghc8102BinaryMinimal: fix docs as legally required
    domenkozar authored Nov 6, 2020
    Copy the full SHA
    fad48e3 View commit details

Commits on Nov 7, 2020

  1. kupfer: fix build

    FRidh committed Nov 7, 2020
    Copy the full SHA
    0346b63 View commit details
  2. pythonPackages: rename requiredPythonModules to computeRequiredPython…

    …Modules
    
    requiredPythonModules is already an attribute in the (passthru of the)
    builder.
    FRidh committed Nov 7, 2020
    Copy the full SHA
    a3546fc View commit details
  3. WIP: Python: wrap and patch using requiredPythonModules instead of …

    …`propagatedBuildInputs`
    
    Python programs look up their dependencies dynamically. To support this,
    Python executables are wrapped and patched.
    
    To find the dependencies to include when wrapping and patching, the
    `wrapPythonPrograms` function would traverse the
    `propagatedBuildInputs`. `propagatedBuildInputs` are dependencies that
    need to be propagated during *build time*. While that is needed, we do
    not want to have *all* propagated build inputs always as run-time
    dependencies. Therefore, many derivations instead choose to set
    `pythonPath`, which `wrapPythonPrograms` also considers.`pythonPath`,
    however, is just an attribute that is not recursed into.
    
    This commit implements `requiredPythonModules`, which was already set in
    the `passthru` of Python packages for
    `python.buildEnv`/`python.withPackages`. Now, it is also passed to the
    builder, and `wrapPythonPrograms` will consider this environment
    variable instead of `propagatedBuildInputs`. This change will thus
    prevent unwanted bloat in wrappers. It also effectively replaces
    `pythonPath`. Note we could have used `pythonPath` for this, but I want
    to avoid that name because what we do is not exactly what `PYTHONPATH`
    does.
    
    Builders other than `buildPythonPackage` will typically need to pass
    something like
    
    requiredPythonModules = with python3.pkgs;
    computeRequiredPythonModules [ sphinx ];
    
    for run-time Python dependencies.
    
    This change is a prerequisite to unifying how we deal with wrappers in
    Nixpkgs. E.g., now we can look into a common method for dealing with
    wrappers for Qt, Python and GApps without getting bloat from Python
    packages.
    
    TODO: update documentation
    
    buildPython*: drop support for pythonPath
    
    buildPythonPackage: add note regarding propagation
    
    buildPython*: write requiredPythonModules to nix-support/
    
    We would like to keep references to run-time dependencies. Before, this
    was done with `propagatedBuildInputs` resulting in
    `nix-support/propagated-build-inputs`.
    
    This is also another step towards getting rid of `propagatedBuildInputs`.
    FRidh committed Nov 7, 2020
    Copy the full SHA
    6f845f7 View commit details
  4. treewide: buildPython*: use requiredPythonModules instead of propagat…

    …edBuildInputs
    
    Python packages should now use `requiredPythonModules` to declare their
    runtime dependencies.
    
    Note in some cases there may have been good reasons to put a non-Python
    package in `propagatedBuildInputs`. In that case, a manual change needs
    to be made to put that package back into `propagatedBuildInputs`.
    FRidh committed Nov 7, 2020
    Copy the full SHA
    100bde9 View commit details
  5. treewide: replace pythonPath with requiredPythonModules

    These are now effectively the same.
    FRidh committed Nov 7, 2020
    Copy the full SHA
    d212ce8 View commit details
  6. WIP treewide: replace pythonPath with requiredPythonModules (part 2)

    These are the ones explicitly invoking wrapPythonProgramsIn with
    pythonPath. Need to test this.
    FRidh committed Nov 7, 2020
    Copy the full SHA
    72ad983 View commit details
  7. diffoscope: add non-Python dependencies to PATH

    `wrapPython` will already extend PATH with the bin/ of each Python
    dependency. We should do the same for non-Python dependencies.
    FRidh committed Nov 7, 2020
    Copy the full SHA
    1076686 View commit details
  8. Copy the full SHA
    f9463e3 View commit details
  9. treewide: replace pythonPath for non-buildPython* packages

    Replace pythonPath with requiredPythonModules for non-buildPython*
    packages.
    
    In this case, it is just a name of the attribute, and it does not matter
    what it is because `wrapPythonProgramsIn` is invoked explicitly.
    
    In a future commit wrapPython hook will be replaced by one that does not
    require an explicit invocatoin of `wrapPythonProgramsIn`.
    FRidh committed Nov 7, 2020
    Copy the full SHA
    d89fe1d View commit details
  10. buildPythonPackage: warn if propagatedBuildInputs is used

    Now that Python packages should use `requiredPythonModules` instead of
    `propagatedBuildInputs`, we could actually check it during evaluation time.
    
    This commit adds a warning in case Python modules are propagated. Now, in
    principle it is fine to propagate modules, but there is not really any
    good reason for it.
    
    Note application propagation is not affected by this because in that case
    `drv.pythonModule` is `false` or missing.
    FRidh committed Nov 7, 2020
    Copy the full SHA
    2bd1f6f View commit details
  11. claws-mail: fix eval

    FRidh committed Nov 7, 2020
    Copy the full SHA
    cf30233 View commit details
  12. fixup: filter null

    FRidh committed Nov 7, 2020
    Copy the full SHA
    c3ccb03 View commit details
  13. claws-mail-gtk3: fix eval

    FRidh committed Nov 7, 2020
    Copy the full SHA
    3be4af6 View commit details
  14. meson: don't remove propagated-build-inputs

    BuildPython* no longer propagates dependencies that way.
    FRidh committed Nov 7, 2020
    Copy the full SHA
    654c9fa View commit details

Commits on Nov 8, 2020

  1. gtk-doc: no need to clear Python from propagated-build-inputs anymore

    since its no longer propagated.
    FRidh committed Nov 8, 2020
    Copy the full SHA
    e902845 View commit details
  2. Copy the full SHA
    911e3fd View commit details
  3. Copy the full SHA
    1a9747c View commit details

Commits on Nov 10, 2020

  1. Copy the full SHA
    7ddbdff View commit details
  2. Copy the full SHA
    702b962 View commit details
  3. Copy the full SHA
    3ddd951 View commit details
Loading