MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 07:13:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #11318 from gebner/morituri-cddb

Browse source 
morituri fails because of missing CDDB dependency
This commit is contained in:
Domen Kožar 2015-12-02 09:21:35 +01:00
commit 33eddc4e90
3 changed files with 47 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkgs/applications/audio/morituri/default.nix
View file

@ -1,22 +1,26 @@
{ stdenv, fetchurl, python, pythonPackages, cdparanoia, cdrdao { stdenv, fetchgit, python, pythonPackages, cdparanoia, cdrdao
, pygobject, gst_python, gst_plugins_base, gst_plugins_good , pygobject, gst_python, gst_plugins_base, gst_plugins_good
, setuptools, utillinux, makeWrapper, substituteAll }: , setuptools, utillinux, makeWrapper, substituteAll, autoreconfHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "morituri-${version}"; name = "morituri-${version}";
version = "0.2.3"; version = "0.2.3.20151109";
namePrefix = ""; namePrefix = "";
src = fetchurl { src = fetchgit {
url = "http://thomas.apestaart.org/download/morituri/${name}.tar.bz2"; url = "https://github.com/thomasvs/morituri.git";
sha256 = "1b30bs1y8azl04izsrl01gw9ys0lhzkn5afxi4p8qbiri2h4v210"; fetchSubmodules = true;
rev = "135b2f7bf27721177e3aeb1d26403f1b29116599";
sha256 = "1ccxq1spny6xgd7nqwn13n9nqa00ay0nhflg3vbdkvbirh8fgxwq";
}; };
pythonPath = [ pythonPath = [
pygobject gst_python pythonPackages.musicbrainzngs pygobject gst_python pythonPackages.musicbrainzngs
pythonPackages.pycdio pythonPackages.pyxdg setuptools pythonPackages.pycdio pythonPackages.pyxdg setuptools
pythonPackages.CDDB
]; ];
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ buildInputs = [
python cdparanoia cdrdao utillinux makeWrapper python cdparanoia cdrdao utillinux makeWrapper
gst_plugins_base gst_plugins_good gst_plugins_base gst_plugins_good

44
pkgs/applications/audio/morituri/paths.patch
View file

@ -1,8 +1,9 @@
diff -Nurp morituri-0.2.3-orig/doc/Makefile.in morituri-0.2.3/doc/Makefile.in diff --git a/doc/Makefile.am b/doc/Makefile.am
--- morituri-0.2.3-orig/doc/Makefile.in 2014-12-23 12:44:46.222410092 +0100 index c115c2c..78c883e 100644
+++ morituri-0.2.3/doc/Makefile.in 2014-12-23 12:46:49.619756940 +0100 --- a/doc/Makefile.am
@@ -486,7 +486,7 @@ morituri.ics: $(top_srcdir)/morituri.doa +++ b/doc/Makefile.am
-moap doap -f $(top_srcdir)/morituri.doap ical > morituri.ics @@ -24,7 +24,7 @@ morituri.ics: $(top_srcdir)/morituri.doap
man_MANS = rip.1
rip.1: $(top_srcdir)/morituri/extern/python-command/scripts/help2man $(top_srcdir)/morituri rip.1: $(top_srcdir)/morituri/extern/python-command/scripts/help2man $(top_srcdir)/morituri
- PYTHONPATH=$(top_srcdir) $(PYTHON) $(top_srcdir)/morituri/extern/python-command/scripts/help2man morituri.rip.main.Rip rip > rip.1 - PYTHONPATH=$(top_srcdir) $(PYTHON) $(top_srcdir)/morituri/extern/python-command/scripts/help2man morituri.rip.main.Rip rip > rip.1
@ -10,9 +11,10 @@ diff -Nurp morituri-0.2.3-orig/doc/Makefile.in morituri-0.2.3/doc/Makefile.in
clean-local: clean-local:
@rm -rf reference @rm -rf reference
diff -Nurp morituri-0.2.3-orig/morituri/common/program.py morituri-0.2.3/morituri/common/program.py diff --git a/morituri/common/program.py b/morituri/common/program.py
--- morituri-0.2.3-orig/morituri/common/program.py 2014-12-23 12:44:46.218410048 +0100 index d340fdd..15cb751 100644
+++ morituri-0.2.3/morituri/common/program.py 2014-12-23 12:46:49.647757245 +0100 --- a/morituri/common/program.py
+++ b/morituri/common/program.py
@@ -92,13 +92,13 @@ class Program(log.Loggable): @@ -92,13 +92,13 @@ class Program(log.Loggable):
""" """
Load the given device. Load the given device.
@ -38,19 +40,12 @@ diff -Nurp morituri-0.2.3-orig/morituri/common/program.py morituri-0.2.3/moritur
def getFastToc(self, runner, toc_pickle, device): def getFastToc(self, runner, toc_pickle, device):
""" """
diff -Nurp morituri-0.2.3-orig/morituri/extern/python-command/scripts/help2man morituri-0.2.3/morituri/extern/python-command/scripts/help2man Submodule morituri/extern/python-command contains modified content
--- morituri-0.2.3-orig/morituri/extern/python-command/scripts/help2man 2014-12-23 12:44:46.206409916 +0100 diff --git a/morituri/program/cdparanoia.py b/morituri/program/cdparanoia.py
+++ morituri-0.2.3/morituri/extern/python-command/scripts/help2man 2014-12-23 12:46:49.631757074 +0100 index 46176d5..fce14a5 100644
@@ -1,4 +1,4 @@ --- a/morituri/program/cdparanoia.py
-#!/usr/bin/python +++ b/morituri/program/cdparanoia.py
+#!@python@/bin/python @@ -278,7 +278,7 @@ class ReadTrackTask(log.Loggable, task.Task):
# -*- Mode: Python -*-
# vi:si:et:sw=4:sts=4:ts=4
diff -Nurp morituri-0.2.3-orig/morituri/program/cdparanoia.py morituri-0.2.3/morituri/program/cdparanoia.py
--- morituri-0.2.3-orig/morituri/program/cdparanoia.py 2014-12-23 12:44:46.202409873 +0100
+++ morituri-0.2.3/morituri/program/cdparanoia.py 2014-12-23 12:46:49.659757376 +0100
@@ -278,7 +278,7 @@ class ReadTrackTask(log.Loggable, task.T
stopTrack, stopOffset) stopTrack, stopOffset)
bufsize = 1024 bufsize = 1024
@ -68,9 +63,10 @@ diff -Nurp morituri-0.2.3-orig/morituri/program/cdparanoia.py morituri-0.2.3/mor
_VERSION_RE, _VERSION_RE,
"%(version)s %(release)s") "%(version)s %(release)s")
diff -Nurp morituri-0.2.3-orig/morituri/program/cdrdao.py morituri-0.2.3/morituri/program/cdrdao.py diff --git a/morituri/program/cdrdao.py b/morituri/program/cdrdao.py
--- morituri-0.2.3-orig/morituri/program/cdrdao.py 2014-12-23 12:44:46.202409873 +0100 index c6fba64..c4d0306 100644
+++ morituri-0.2.3/morituri/program/cdrdao.py 2014-12-23 12:46:49.667757463 +0100 --- a/morituri/program/cdrdao.py
+++ b/morituri/program/cdrdao.py
@@ -257,7 +257,7 @@ class CDRDAOTask(ctask.PopenTask): @@ -257,7 +257,7 @@ class CDRDAOTask(ctask.PopenTask):
def start(self, runner): def start(self, runner):

17
pkgs/top-level/python-packages.nix
View file

@ -2098,6 +2098,23 @@ in modules // {
}; };
}; };
CDDB = buildPythonPackage rec {
name = "CDDB-1.4";
disabled = !isPy27;
src = pkgs.fetchurl {
url = "http://cddb-py.sourceforge.net/${name}.tar.gz";
sha256 = "098xhd575ibvdx7i3dny3lwi851yxhjg2hn5jbbgrwj833rg5l5w";
};
meta = {
homepage = http://cddb-py.sourceforge.net/;
description = "CDDB and FreeDB audio CD track info access";
license = licenses.gpl2Plus;
};
};
celery = buildPythonPackage rec { celery = buildPythonPackage rec {
name = "celery-${version}"; name = "celery-${version}";