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: 468a74629a19
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a1628d980563
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 16, 2020

  1. yle-dl: add setuptools dependency 

    yle-dl was failing with the following error:

  ImportError: No module named pkg_resources

Adding setuptools to propagatedBuildInputs fixes this issue.
    @jluttine
    jluttine committed Jan 16, 2020
    Copy the full SHA
    080da6a View commit details

Commits on Jan 17, 2020

  1. Merge pull request #77811 from jluttine/fix-yle-dl-setuptools 

    yle-dl: add setuptools dependency
    @worldofpeace
    worldofpeace authored Jan 17, 2020
    Copy the full SHA
    a1628d9 View commit details
Showing with 3 additions and 1 deletion.
  1. +3 −1 pkgs/tools/misc/yle-dl/default.nix
4 changes: 3 additions & 1 deletion pkgs/tools/misc/yle-dl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,9 @@ pythonPackages.buildPythonApplication rec {
sha256 = "0k93p9csyjm0w33diwl5s22kzs3g78jl3n9k8nxxpqrybfjl912f";
};

propagatedBuildInputs = with pythonPackages; [ lxml pyamf pycrypto requests future ffmpeg ];
propagatedBuildInputs = with pythonPackages; [
lxml pyamf pycrypto requests future ffmpeg setuptools
];
pythonPath = [ rtmpdump php ];

doCheck = false; # tests require network access