-
-
Notifications
You must be signed in to change notification settings - Fork 15.4k
Comparing changes
Open a pull request
base repository: NixOS/nixpkgs
base: a4b1f0441979
head repository: NixOS/nixpkgs
compare: 3ddd951e6aff
Commits on Nov 4, 2020
-
ghc8102BinaryMinimal: Re-add docs, remove more profiling files
(cherry picked from commit 7bd21d3)
Configuration menu - View commit details
-
Copy full SHA for dda47e4 - Browse repository at this point
Copy the full SHA dda47e4View commit details -
Not distributing dependencies via hydraPlatforms does not work, so we keep meta simple. (cherry picked from commit 4643796)
Configuration menu - View commit details
-
Copy full SHA for 6b377f2 - Browse repository at this point
Copy the full SHA 6b377f2View commit details
Commits on Nov 6, 2020
-
Merge pull request #101636 from NixOS/python-unstable
Python packages set: patch updates
Configuration menu - View commit details
-
Copy full SHA for 73f591a - Browse repository at this point
Copy the full SHA 73f591aView commit details -
Merge pull request #102833 from hercules-ci/ghc8102BinaryMinimal-fix-…
…docs ghc8102BinaryMinimal: fix docs as legally required
Configuration menu - View commit details
-
Copy full SHA for fad48e3 - Browse repository at this point
Copy the full SHA fad48e3View commit details
Commits on Nov 7, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 0346b63 - Browse repository at this point
Copy the full SHA 0346b63View commit details -
pythonPackages: rename requiredPythonModules to computeRequiredPython…
…Modules requiredPythonModules is already an attribute in the (passthru of the) builder.
Configuration menu - View commit details
-
Copy full SHA for a3546fc - Browse repository at this point
Copy the full SHA a3546fcView commit details -
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`.
Configuration menu - View commit details
-
Copy full SHA for 6f845f7 - Browse repository at this point
Copy the full SHA 6f845f7View commit details -
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`.
Configuration menu - View commit details
-
Copy full SHA for 100bde9 - Browse repository at this point
Copy the full SHA 100bde9View commit details -
treewide: replace pythonPath with requiredPythonModules
These are now effectively the same.
Configuration menu - View commit details
-
Copy full SHA for d212ce8 - Browse repository at this point
Copy the full SHA d212ce8View commit details -
WIP treewide: replace pythonPath with requiredPythonModules (part 2)
These are the ones explicitly invoking wrapPythonProgramsIn with pythonPath. Need to test this.
Configuration menu - View commit details
-
Copy full SHA for 72ad983 - Browse repository at this point
Copy the full SHA 72ad983View commit details -
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.
Configuration menu - View commit details
-
Copy full SHA for 1076686 - Browse repository at this point
Copy the full SHA 1076686View commit details -
Configuration menu - View commit details
-
Copy full SHA for f9463e3 - Browse repository at this point
Copy the full SHA f9463e3View commit details -
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`.
Configuration menu - View commit details
-
Copy full SHA for d89fe1d - Browse repository at this point
Copy the full SHA d89fe1dView commit details -
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.
Configuration menu - View commit details
-
Copy full SHA for 2bd1f6f - Browse repository at this point
Copy the full SHA 2bd1f6fView commit details -
Configuration menu - View commit details
-
Copy full SHA for cf30233 - Browse repository at this point
Copy the full SHA cf30233View commit details -
Configuration menu - View commit details
-
Copy full SHA for c3ccb03 - Browse repository at this point
Copy the full SHA c3ccb03View commit details -
Configuration menu - View commit details
-
Copy full SHA for 3be4af6 - Browse repository at this point
Copy the full SHA 3be4af6View commit details -
meson: don't remove propagated-build-inputs
BuildPython* no longer propagates dependencies that way.
Configuration menu - View commit details
-
Copy full SHA for 654c9fa - Browse repository at this point
Copy the full SHA 654c9faView commit details
Commits on Nov 8, 2020
-
gtk-doc: no need to clear Python from propagated-build-inputs anymore
since its no longer propagated.
Configuration menu - View commit details
-
Copy full SHA for e902845 - Browse repository at this point
Copy the full SHA e902845View commit details -
Configuration menu - View commit details
-
Copy full SHA for 911e3fd - Browse repository at this point
Copy the full SHA 911e3fdView commit details -
Configuration menu - View commit details
-
Copy full SHA for 1a9747c - Browse repository at this point
Copy the full SHA 1a9747cView commit details
Commits on Nov 10, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 7ddbdff - Browse repository at this point
Copy the full SHA 7ddbdffView commit details -
Configuration menu - View commit details
-
Copy full SHA for 702b962 - Browse repository at this point
Copy the full SHA 702b962View commit details -
Configuration menu - View commit details
-
Copy full SHA for 3ddd951 - Browse repository at this point
Copy the full SHA 3ddd951View 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 a4b1f0441979...3ddd951e6aff