public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6107 from abbradar/updates 

Update my packages
This commit is contained in:
Nikolay Amiantov 2015-02-03 15:39:26 +03:00
parent c6951f5420 a1c8ee9d41
commit 93928557b9
18 changed files with 85 additions and 7577 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
pkgs/applications/video/cmplayer/default.nix → pkgs/applications/video/bomi/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, python2, perl
{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, perl, python3
, libX11, libxcb, qt5, mesa
, ffmpeg
, libchardet
@ -22,16 +22,24 @@ assert portaudioSupport -> portaudio != null;
assert pulseSupport -> pulseaudio != null;
assert cddaSupport -> libcdda != null;
stdenv.mkDerivation rec {
name = "cmplayer-${version}";
version = "0.8.16";
src = fetchurl {
url = "https://github.com/xylosper/cmplayer/releases/download/v${version}/${name}-source.tar.gz";
sha256 = "1yppp0jbq3mwa7vq4sjmm2lsqnfcv4n7cjap50gc2bavq7qynr85";
let
waf = fetchurl {
url = http://ftp.waf.io/pub/release/waf-1.8.4;
sha256 = "1a7skwgpl91adhcwlmdr76xzdpidh91hvcmj34zz6548bpx3a87h";
};
patches = [ ./fix-gcc48.patch ];
in
stdenv.mkDerivation rec {
name = "bomi-${version}";
version = "0.9.0";
src = fetchFromGitHub {
owner = "xylosper";
repo = "bomi";
rev = "v${version}";
sha256 = "12xyz40kl03h1m8g7d7s0wf74l2c70v6bd1drhww7ky48hxi0z14";
};
buildInputs = with stdenv.lib;
[ libX11 libxcb qt5 mesa
@ -55,8 +63,14 @@ stdenv.mkDerivation rec {
;
preConfigure = ''
patchShebangs ./configure
patchShebangs src/mpv/waf
patchShebangs configure
# src/mpv/waf build-mpv; do
'';
preBuild = ''
patchShebangs build-mpv
install -m755 ${waf} src/mpv/waf
sed -i '1 s,.*,#!${python3.interpreter},' src/mpv/waf
'';
configureFlags = with stdenv.lib;
@ -67,15 +81,13 @@ stdenv.mkDerivation rec {
++ optional cddaSupport "--enable-cdda"
;
preBuild = "patchShebangs ./build-mpv";
nativeBuildInputs = [ pkgconfig python2 perl ];
nativeBuildInputs = [ pkgconfig perl ];
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "Powerful and easy-to-use multimedia player";
homepage = http://cmplayer.github.io;
homepage = https://bomi-player.github.io/;
license = licenses.gpl2Plus;
maintainers = [ maintainers.abbradar ];
platforms = platforms.linux;

22
pkgs/applications/video/cmplayer/fix-gcc48.patch
View File

@ -1,22 +0,0 @@
From f6de1c7537dc3a0b4c9d69a63653c9bb4af26948 Mon Sep 17 00:00:00 2001
From: xylosper <darklin20@gmail.com>
Date: Wed, 2 Jul 2014 11:57:05 +0900
Subject: [PATCH] add a space between user defined literal operator
---
src/cmplayer/stdafx.hpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/cmplayer/stdafx.hpp b/src/cmplayer/stdafx.hpp
index 5f7d49c..c724f08 100644
--- a/src/cmplayer/stdafx.hpp
+++ b/src/cmplayer/stdafx.hpp
@@ -52,7 +52,7 @@ SIA operator "" _q(const char16_t *str, size_t len) -> QString
SIA operator "" _a(const char *str, size_t len) -> QLatin1String
{ return QLatin1String(str, len); }
-SIA operator ""_b(const char *str, size_t len) -> QByteArray
+SIA operator "" _b(const char *str, size_t len) -> QByteArray
{ return QByteArray::fromRawData(str, len); }
SIA operator "" _8(const char *str, size_t len) -> QString

21
pkgs/development/libraries/double-conversion/default.nix
View File

@ -1,19 +1,16 @@
{ stdenv, fetchurl, cmake }:
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
name = "double-conversion-1.1.5";
version = "2.0.1";
name = "double-conversion-${version}";
src = fetchurl {
url = "https://double-conversion.googlecode.com/files/${name}.tar.gz";
sha256 = "0hnlyn9r8vd9b3dafnk01ykz4k7bk6xvmvslv93as1cswf7vdvqv";
src = fetchFromGitHub {
owner = "floitsch";
repo = "double-conversion";
rev = "v${version}";
sha256 = "05x5rdwndgp1vdq2z1bpvng0dd8pn93kw4vhl6nsvv9vsara2q4b";
};
unpackPhase = ''
mkdir $name
cd $name
tar xzf $src
'';
nativeBuildInputs = [ cmake ];
cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
@ -22,7 +19,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Binary-decimal and decimal-binary routines for IEEE doubles";
homepage = https://code.google.com/p/double-conversion/;
homepage = https://github.com/floitsch/double-conversion;
license = licenses.bsd3;
platforms = platforms.unix;
maintainers = maintainers.abbradar;

22
pkgs/development/libraries/folly/105.patch
View File

@ -1,22 +0,0 @@
From 30b8bb70e0fdcc0b85abbfebf43ed9f127db5248 Mon Sep 17 00:00:00 2001
From: Johnny Robeson <johnny@localmomentum.net>
Date: Mon, 1 Dec 2014 23:26:27 -0500
Subject: [PATCH] include gflags header in SSLSessionCacheManager
this is one way to solve #104
---
folly/experimental/wangle/ssl/SSLSessionCacheManager.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/folly/experimental/wangle/ssl/SSLSessionCacheManager.cpp b/folly/experimental/wangle/ssl/SSLSessionCacheManager.cpp
index fc339a1..ca18242 100644
--- folly/experimental/wangle/ssl/SSLSessionCacheManager.cpp
+++ folly/experimental/wangle/ssl/SSLSessionCacheManager.cpp
@@ -7,6 +7,7 @@
* of patent rights can be found in the PATENTS file in the same directory.
*
*/
+#include <gflags/gflags.h>
#include <folly/experimental/wangle/ssl/SSLSessionCacheManager.h>
#include <folly/experimental/wangle/ssl/SSLCacheProvider.h>

16
pkgs/development/libraries/folly/default.nix
View File

@ -1,17 +1,17 @@
{ stdenv, fetchgit, autoreconfHook, boost, libevent, double_conversion, glog
{ stdenv, fetchFromGitHub, autoreconfHook, boost, libevent, double_conversion, glog
, google-gflags, python, libiberty, openssl }:
stdenv.mkDerivation rec {
name = "folly-17";
version = "0.22.0";
name = "folly-${version}";
src = fetchgit {
url = "https://github.com/facebook/folly";
rev = "2c2d5777cd2551397a920007589fd3adba6cb7ab";
sha256 = "13mfnv04ckkr2syigaaxrbaxmfiwqvn0a7fjxvdi6dii3fx81rsx";
src = fetchFromGitHub {
owner = "facebook";
repo = "folly";
rev = "v${version}";
sha256 = "12p7vbx73jmhf772nbqvd8imw4ihpi16cw6cwxq459r7qds4n0ca";
};
patches = [ ./105.patch ];
buildInputs = [ libiberty boost.lib libevent double_conversion glog google-gflags openssl ];
nativeBuildInputs = [ autoreconfHook python boost ];

15
pkgs/development/libraries/libaacs/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, libgcrypt}:
{ stdenv, fetchurl, libgcrypt, yacc, flex }:
# library that allows libbluray to play AACS protected bluray disks
# libaacs does not infringe DRM's right or copyright. See the legal page of the website for more info.
@ -9,7 +9,7 @@
let baseName = "libaacs";
version = "0.3.0";
version = "0.8.0";
in
stdenv.mkDerivation {
@ -17,14 +17,17 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://download.videolan.org/pub/videolan/${baseName}/${version}/${baseName}-${version}.tar.bz2";
sha256 = "bf92dab1a6a8ee08a55e8cf347c2cda49e6535b52e85bb1e92e1cfcc8ecec22c";
sha256 = "155sah8z4vbp6j3sq9b17mcn6rj1938ijszz97m8pd2cgif58i2y";
};
buildInputs = [libgcrypt];
buildInputs = [ libgcrypt ];
meta = {
nativeBuildInputs = [ yacc flex ];
meta = with stdenv.lib; {
homepage = http://www.videolan.org/developers/libbluray.html;
description = "Library to access Blu-Ray disks for video playback";
license = stdenv.lib.licenses.lgpl21;
license = licenses.lgpl21;
maintainers = with maintainers; [ abbradar ];
};
}

80
pkgs/development/libraries/libbluray/A01-filter-dup.patch
View File

@ -1,80 +0,0 @@
diff --git a/src/libbluray/bdnav/navigation.c b/src/libbluray/bdnav/navigation.c
index c8dc307..26d0000 100644
--- a/src/libbluray/bdnav/navigation.c
+++ b/src/libbluray/bdnav/navigation.c
@@ -32,9 +32,25 @@
#include <stdlib.h>
#include <string.h>
+static int _stream_cmp(MPLS_STREAM *a, MPLS_STREAM *b)
+{
+ if (a->stream_type == b->stream_type &&
+ a->coding_type == b->coding_type &&
+ a->pid == b->pid &&
+ a->subpath_id == b->subpath_id &&
+ a->subclip_id == b->subclip_id &&
+ a->format == b->format &&
+ a->rate == b->rate &&
+ a->char_code == b->char_code &&
+ memcmp(a->lang, b->lang, 4) == 0) {
+ return 1;
+ }
+ return 0;
+}
+
static int _filter_dup(MPLS_PL *pl_list[], unsigned count, MPLS_PL *pl)
{
- unsigned ii, jj;
+ unsigned ii, jj, kk;
for (ii = 0; ii < count; ii++) {
if (pl->list_count != pl_list[ii]->list_count) {
@@ -54,7 +70,48 @@ static int _filter_dup(MPLS_PL *pl_list[], unsigned count, MPLS_PL *pl)
pi1->out_time != pi2->out_time) {
break;
}
+ if (pi1->stn.num_video != pi2->stn.num_video ||
+ pi1->stn.num_audio != pi2->stn.num_audio ||
+ pi1->stn.num_pg != pi2->stn.num_pg ||
+ pi1->stn.num_ig != pi2->stn.num_ig ||
+ pi1->stn.num_secondary_audio != pi2->stn.num_secondary_audio ||
+ pi1->stn.num_secondary_video != pi2->stn.num_secondary_video) {
+ break;
+ }
+ for (kk = 0; kk < pi1->stn.num_video; kk++) {
+ if (!_stream_cmp(&pi1->stn.video[kk], &pi2->stn.video[kk])) {
+ goto next;
+ }
+ }
+ for (kk = 0; kk < pi1->stn.num_audio; kk++) {
+ if (!_stream_cmp(&pi1->stn.audio[kk], &pi2->stn.audio[kk])) {
+ goto next;
+ }
+ }
+ for (kk = 0; kk < pi1->stn.num_pg; kk++) {
+ if (!_stream_cmp(&pi1->stn.pg[kk], &pi2->stn.pg[kk])) {
+ goto next;
+ }
+ }
+ for (kk = 0; kk < pi1->stn.num_ig; kk++) {
+ if (!_stream_cmp(&pi1->stn.ig[kk], &pi2->stn.ig[kk])) {
+ goto next;
+ }
+ }
+ for (kk = 0; kk < pi1->stn.num_secondary_audio; kk++) {
+ if (!_stream_cmp(&pi1->stn.secondary_audio[kk],
+ &pi2->stn.secondary_audio[kk])) {
+ goto next;
+ }
+ }
+ for (kk = 0; kk < pi1->stn.num_secondary_video; kk++) {
+ if (!_stream_cmp(&pi1->stn.secondary_video[kk],
+ &pi2->stn.secondary_video[kk])) {
+ goto next;
+ }
+ }
}
+next:
if (jj != pl->list_count) {
continue;
}

9
pkgs/development/libraries/libbluray/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig
{ stdenv, fetchurl, pkgconfig, fontconfig
, withAACS ? false, libaacs ? null, jdk ? null, ant ? null
, withMetadata ? true, libxml2 ? null
, withFonts ? true, freetype ? null
@ -13,12 +13,12 @@ assert withFonts -> freetype != null;
stdenv.mkDerivation rec {
baseName = "libbluray";
version = "0.6.2";
version = "0.7.0";
name = "${baseName}-${version}";
src = fetchurl {
url = "ftp://ftp.videolan.org/pub/videolan/${baseName}/${version}/${name}.tar.bz2";
sha256 = "1l2wr9mwz5pikqxlxkjfw3rwz0l1j0n7x9hl80sfiqm1lk41194c";
sha256 = "13dngs4b4cv29f6b825dq14n77mfhvk1kjb42axpq494pfgyp6zp";
};
nativeBuildInputs = with stdenv.lib;
@ -27,7 +27,8 @@ stdenv.mkDerivation rec {
;
buildInputs = with stdenv.lib;
optionals withAACS [jdk libaacs]
[fontconfig]
++ optionals withAACS [jdk libaacs]
++ optional withMetadata libxml2
++ optional withFonts freetype
;

7375
pkgs/development/libraries/libfprint/0001-lib-Add-VFS5011-driver.patch
View File

File diff suppressed because it is too large Load Diff

6
pkgs/development/libraries/libfprint/master.nix
View File

@ -5,12 +5,10 @@ stdenv.mkDerivation rec {
src = fetchgit {
url = "git://anongit.freedesktop.org/libfprint/libfprint";
rev = "35e356f625d254f44c14f720c0eb9216297d35c2";
sha256 = "b7fd74a914d7c4e2999ac20432a7f2af5d6c7af5e75a367bc3babe03e4576c86";
rev = "a3c90f2b24434aa36f782aca3950fd89af01fce0";
sha256 = "01qa58vq299xzxzxrcqkl51k8396wh56674d9wjmkv2msxx877hi";
};
patches = [ ./0001-lib-Add-VFS5011-driver.patch ];
buildInputs = [ libusb glib nss nspr pixman ];
nativeBuildInputs = [ libtool autoconf automake113x pkgconfig ];

4
pkgs/development/libraries/libiberty/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
version = "4.8.3";
version = "4.8.4";
name = "libiberty-${version}";
src = fetchurl {
url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2";
sha256 = "07hg10zs7gnqz58my10ch0zygizqh0z0bz6pv4pgxx45n48lz3ka";
sha256 = "15c6gwm6dzsaagamxkak5smdkf1rdfbqqjs9jdbrp3lbg4ism02a";
};
postUnpack = "sourceRoot=\${sourceRoot}/libiberty";

2
pkgs/development/libraries/libxls/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Extract Cell Data From Excel xls files";
homepage = http://libxls.sourceforge.net/;
homepage = http://sourceforge.net/projects/libxls/;
license = licenses.bsd2;
platforms = platforms.unix;
maintainers = maintainers.abbradar;

4
pkgs/development/libraries/science/math/ipopt/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, unzip, blas, liblapack, gfortran }:
stdenv.mkDerivation rec {
version = "3.11.9";
version = "3.12.0";
name = "ipopt-${version}";
src = fetchurl {
url = "http://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip";
sha256 = "0sji4spl5dhw1s3f9y0ym09gi7d1c8wldn6wbiap4q8dq7cvklq5";
sha256 = "18p1ad64mpliba1hf6jkyyrd0srxsqivwbcnbrr09jfpn4jn4bbr";
};
preConfigure = ''

8
pkgs/development/libraries/xlslib/default.nix
View File

@ -1,15 +1,15 @@
{ stdenv, fetchurl, unzip }:
{ stdenv, fetchurl, autoreconfHook, unzip }:
stdenv.mkDerivation rec {
version = "2.4.0";
version = "2.5.0";
name = "xlslib-${version}";
src = fetchurl {
url = "mirror://sourceforge/xlslib/xlslib-package-${version}.zip";
sha256 = "0h7qhxcc55cz3jvrfv4scjnzf5w9g97wigyviandi4ag54qjxjdc";
sha256 = "1wx3jbpkz2rvgs45x6mwawamd1b2llb0vn29b5sr0rfxzx9d1985";
};
nativeBuildInputs = [ unzip ];
nativeBuildInputs = [ unzip autoreconfHook ];
setSourceRoot = "export sourceRoot=xlslib/xlslib";

4
pkgs/tools/misc/tlp/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, makeWrapper, perl, systemd, iw, rfkill, hdparm, ethtool, inetutils, kmod
, enableRDW ? true, networkmanager }:
let version = "0.6";
let version = "0.7";
in stdenv.mkDerivation {
inherit enableRDW;
@ -11,7 +11,7 @@ in stdenv.mkDerivation {
owner = "linrunner";
repo = "TLP";
rev = "${version}";
sha256 = "1kfm6x5w9vica2i13vfckza4fad4wv8ivr40fws3qa6d5jbyx0fy";
sha256 = "0vgx2jnk9gp41fw992l9dmv462jpcrnwqkzsa8z0lh0l77ax2jcg";
};
makeFlags = [ "DESTDIR=$(out)"

18
pkgs/tools/security/fprintd/default.nix
View File

@ -1,17 +1,19 @@
{ stdenv, fetchurl, pkgconfig, libfprint, intltool, glib, dbus_glib, polkit, nss, pam, systemd }:
{ stdenv, fetchgit, automake, autoconf, libtool, pkgconfig, gtk_doc
, libfprint, intltool, glib, dbus_glib, polkit, nss, pam, systemd }:
stdenv.mkDerivation rec {
name = "fprintd-0.5.1";
name = "fprintd";
src = fetchurl {
url = "http://people.freedesktop.org/~hadess/${name}.tar.xz";
sha256 = "0n3fh28cvqrhjig30lz1p075g0wd7jnhvz1j34n37c0cwc7rfmlj";
src = fetchgit {
url = "git://anongit.freedesktop.org/libfprint/fprintd";
rev = "f7c51b0d585eb63702f0d005081e53f44325df86";
sha256 = "1gmnn72ablfxvv13s0rms5f39hc4y2z97aq44d7l9hblnfn6wq12";
};
patches = [ ./pod.patch ];
buildInputs = [ libfprint glib dbus_glib polkit nss pam systemd ];
nativeBuildInputs = [ pkgconfig intltool ];
nativeBuildInputs = [ automake libtool autoconf gtk_doc pkgconfig intltool ];
configureScript = "./autogen.sh";
configureFlags = [ "--with-systemdsystemunitdir=$(out)/lib/systemd/system" ];

9
pkgs/tools/security/fprintd/pod.patch
View File

@ -1,9 +0,0 @@
diff -u -r fprintd-0.5.1/data/fprintd.pod fprintd-0.5.1-pod/data/fprintd.pod
--- fprintd-0.5.1/data/fprintd.pod 2013-06-26 13:10:17.000000000 +0200
+++ fprintd-0.5.1-pod/data/fprintd.pod 2013-08-17 12:17:36.330332635 +0200
@@ -100,3 +100,5 @@
=over 8
=item B<dbus-daemon>, B<gnome-about-me>
+
+=back

5
pkgs/top-level/all-packages.nix
View File

@ -9625,10 +9625,13 @@ let
clipit = callPackage ../applications/misc/clipit { };
cmplayer = callPackage ../applications/video/cmplayer {
bomi = callPackage ../applications/video/bomi {
stdenv = overrideCC stdenv gcc49;
pulseSupport = config.pulseaudio or false;
};
cmplayer = builtins.trace "cmplayer is renamed to bomi" bomi;
cmus = callPackage ../applications/audio/cmus { };
compiz = callPackage ../applications/window-managers/compiz {