pyrox.dev / nixpkgs
lol
fork atom

morituri: 0.2.3 -> 0.2.3.20151109

Gabriel Ebner 1c620f07 50532874

+29 -30
unified split
+9 -6
pkgs/applications/audio/morituri/default.nix
··· 1 - { stdenv, fetchurl, python, pythonPackages, cdparanoia, cdrdao 1 + { stdenv, fetchgit, python, pythonPackages, cdparanoia, cdrdao 2 2 , pygobject, gst_python, gst_plugins_base, gst_plugins_good 3 - , setuptools, utillinux, makeWrapper, substituteAll }: 3 + , setuptools, utillinux, makeWrapper, substituteAll, autoreconfHook }: 4 4 5 5 stdenv.mkDerivation rec { 6 6 name = "morituri-${version}"; 7 - version = "0.2.3"; 7 + version = "0.2.3.20151109"; 8 8 namePrefix = ""; 9 9 10 - src = fetchurl { 11 - url = "http://thomas.apestaart.org/download/morituri/${name}.tar.bz2"; 12 - sha256 = "1b30bs1y8azl04izsrl01gw9ys0lhzkn5afxi4p8qbiri2h4v210"; 10 + src = fetchgit { 11 + url = "https://github.com/thomasvs/morituri.git"; 12 + fetchSubmodules = true; 13 + rev = "135b2f7bf27721177e3aeb1d26403f1b29116599"; 14 + sha256 = "1ccxq1spny6xgd7nqwn13n9nqa00ay0nhflg3vbdkvbirh8fgxwq"; 13 15 }; 14 16 15 17 pythonPath = [ ··· 18 20 pythonPackages.CDDB 19 21 ]; 20 22 23 + nativeBuildInputs = [ autoreconfHook ]; 21 24 buildInputs = [ 22 25 python cdparanoia cdrdao utillinux makeWrapper 23 26 gst_plugins_base gst_plugins_good
+20 -24
pkgs/applications/audio/morituri/paths.patch
··· 1 - diff -Nurp morituri-0.2.3-orig/doc/Makefile.in morituri-0.2.3/doc/Makefile.in 2 - --- morituri-0.2.3-orig/doc/Makefile.in 2014-12-23 12:44:46.222410092 +0100 3 - +++ morituri-0.2.3/doc/Makefile.in 2014-12-23 12:46:49.619756940 +0100 4 - @@ -486,7 +486,7 @@ morituri.ics: $(top_srcdir)/morituri.doa 5 - -moap doap -f $(top_srcdir)/morituri.doap ical > morituri.ics 1 + diff --git a/doc/Makefile.am b/doc/Makefile.am 2 + index c115c2c..78c883e 100644 3 + --- a/doc/Makefile.am 4 + +++ b/doc/Makefile.am 5 + @@ -24,7 +24,7 @@ morituri.ics: $(top_srcdir)/morituri.doap 6 + man_MANS = rip.1 6 7 7 8 rip.1: $(top_srcdir)/morituri/extern/python-command/scripts/help2man $(top_srcdir)/morituri 8 9 - PYTHONPATH=$(top_srcdir) $(PYTHON) $(top_srcdir)/morituri/extern/python-command/scripts/help2man morituri.rip.main.Rip rip > rip.1 ··· 10 11 11 12 clean-local: 12 13 @rm -rf reference 13 - diff -Nurp morituri-0.2.3-orig/morituri/common/program.py morituri-0.2.3/morituri/common/program.py 14 - --- morituri-0.2.3-orig/morituri/common/program.py 2014-12-23 12:44:46.218410048 +0100 15 - +++ morituri-0.2.3/morituri/common/program.py 2014-12-23 12:46:49.647757245 +0100 14 + diff --git a/morituri/common/program.py b/morituri/common/program.py 15 + index d340fdd..15cb751 100644 16 + --- a/morituri/common/program.py 17 + +++ b/morituri/common/program.py 16 18 @@ -92,13 +92,13 @@ class Program(log.Loggable): 17 19 """ 18 20 Load the given device. ··· 38 40 39 41 def getFastToc(self, runner, toc_pickle, device): 40 42 """ 41 - diff -Nurp morituri-0.2.3-orig/morituri/extern/python-command/scripts/help2man morituri-0.2.3/morituri/extern/python-command/scripts/help2man 42 - --- morituri-0.2.3-orig/morituri/extern/python-command/scripts/help2man 2014-12-23 12:44:46.206409916 +0100 43 - +++ morituri-0.2.3/morituri/extern/python-command/scripts/help2man 2014-12-23 12:46:49.631757074 +0100 44 - @@ -1,4 +1,4 @@ 45 - -#!/usr/bin/python 46 - +#!@python@/bin/python 47 - 48 - # -*- Mode: Python -*- 49 - # vi:si:et:sw=4:sts=4:ts=4 50 - diff -Nurp morituri-0.2.3-orig/morituri/program/cdparanoia.py morituri-0.2.3/morituri/program/cdparanoia.py 51 - --- morituri-0.2.3-orig/morituri/program/cdparanoia.py 2014-12-23 12:44:46.202409873 +0100 52 - +++ morituri-0.2.3/morituri/program/cdparanoia.py 2014-12-23 12:46:49.659757376 +0100 53 - @@ -278,7 +278,7 @@ class ReadTrackTask(log.Loggable, task.T 43 + Submodule morituri/extern/python-command contains modified content 44 + diff --git a/morituri/program/cdparanoia.py b/morituri/program/cdparanoia.py 45 + index 46176d5..fce14a5 100644 46 + --- a/morituri/program/cdparanoia.py 47 + +++ b/morituri/program/cdparanoia.py 48 + @@ -278,7 +278,7 @@ class ReadTrackTask(log.Loggable, task.Task): 54 49 stopTrack, stopOffset) 55 50 56 51 bufsize = 1024 ··· 68 63 _VERSION_RE, 69 64 "%(version)s %(release)s") 70 65 71 - diff -Nurp morituri-0.2.3-orig/morituri/program/cdrdao.py morituri-0.2.3/morituri/program/cdrdao.py 72 - --- morituri-0.2.3-orig/morituri/program/cdrdao.py 2014-12-23 12:44:46.202409873 +0100 73 - +++ morituri-0.2.3/morituri/program/cdrdao.py 2014-12-23 12:46:49.667757463 +0100 66 + diff --git a/morituri/program/cdrdao.py b/morituri/program/cdrdao.py 67 + index c6fba64..c4d0306 100644 68 + --- a/morituri/program/cdrdao.py 69 + +++ b/morituri/program/cdrdao.py 74 70 @@ -257,7 +257,7 @@ class CDRDAOTask(ctask.PopenTask): 75 71 76 72 def start(self, runner):