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

Commits on Jan 4, 2021

  1. tartube: 2.1.0 -> 2.3.042 

    - Add new ffmpeg dependency.
- Update patch since gi was renamed pgi.
    @ryneeverett
    ryneeverett committed Jan 4, 2021
    Copy the full SHA
    905e3ba View commit details

Commits on Jan 5, 2021

  1. Merge pull request #108412 from ryneeverett/tartube-2.3.042 

    tartube: 2.1.0 -> 2.3.042
    @SuperSandro2000
    SuperSandro2000 authored Jan 5, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2fb357b View commit details
Showing with 5 additions and 3 deletions.
  1. +5 −3 pkgs/applications/video/tartube/default.nix
8 changes: 5 additions & 3 deletions pkgs/applications/video/tartube/default.nix
View file
Original file line number Diff line number Diff line change
@@ -10,17 +10,18 @@
, wrapGAppsHook
, youtube-dl
, glib
, ffmpeg
}:

python3Packages.buildPythonApplication rec {
pname = "tartube";
version = "2.1.0";
version = "2.3.042";

src = fetchFromGitHub {
owner = "axcore";
repo = "tartube";
rev = "v${version}";
sha256 = "1klqjwqm29y2f6nc8gn222ykfvb5d64z1w2kifw9bq5bv0np9bda";
sha256 = "117q4s2b2js3204506qv3kjcsy3amcf0mpwj6q0ixs1256ilkxwj";
};

nativeBuildInputs = [
@@ -37,6 +38,7 @@ python3Packages.buildPythonApplication rec {
requests
feedparser
playsound
ffmpeg
];

buildInputs = [
@@ -48,7 +50,7 @@ python3Packages.buildPythonApplication rec {
];

postPatch = ''
sed -i "/^\s*install_requires/s/, 'gi'\|'gi', \|'gi'//" setup.py
sed -i "/^\s*install_requires/s/, 'pgi'\|'pgi', \|'pgi'//" setup.py
'';

postInstall = ''