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

Merge pull request #7062 from abbradar/package-updates 

Package updates
This commit is contained in:
Nikolay Amiantov 2015-03-29 13:20:21 +03:00
parent d98e037774 cb7eeca147
commit c2a99c0e8c
20 changed files with 87 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/graphics/yed/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, makeWrapper, unzip, jre }:
stdenv.mkDerivation rec {
name = "yEd-3.14";
name = "yEd-3.14.1";
src = fetchurl {
url = "http://www.yworks.com/products/yed/demo/${name}.zip";
sha256 = "147bb081b063abee202a0019597ac960273454046afb29ebbe91e62102dd0471";
sha256 = "09zik3pjs5x0vc0jvndm762blk85y44lxac3vdfqqbinwd9gfnm2";
};
nativeBuildInputs = [ unzip makeWrapper ];

8
pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix
View File

@ -4,9 +4,9 @@ stdenv.mkDerivation {
name = "urxvt-perls";
src = fetchgit {
url = "https://github.com/muennich/urxvt-perls";
rev = "4dec629b3631297d17855c35be1b723e2d9e7591";
sha256 = "c61bc8819b4e6655ed4a3ce3b347cb6dbebcb484d5d3973cbe9aa7f2c98d372f";
url = "git://github.com/muennich/urxvt-perls";
rev = "e4dbde31edd19e2f4c2b6c91117ee91e2f83ddd7";
sha256 = "1f8a27c3d54377fdd4ab0be2f4efb8329d4900bb1c792b306dc23b5ee59260b1";
};
installPhase = ''
@ -23,4 +23,4 @@ stdenv.mkDerivation {
license = licenses.gpl2;
maintainers = maintainers.abbradar;
};
}
}

8
pkgs/applications/video/bomi/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, perl, python3
{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, perl, python3, which
, libX11, libxcb, qt5, mesa
, ffmpeg
, libchardet
@ -32,13 +32,13 @@ in
stdenv.mkDerivation rec {
name = "bomi-${version}";
version = "0.9.0";
version = "0.9.5";
src = fetchFromGitHub {
owner = "xylosper";
repo = "bomi";
rev = "v${version}";
sha256 = "12xyz40kl03h1m8g7d7s0wf74l2c70v6bd1drhww7ky48hxi0z14";
sha256 = "1pf82dp7v18yd7knsjl853sfzhq4rqc3sq15jgqiw37096gp0sll";
};
buildInputs = with stdenv.lib;
@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
++ optional cddaSupport "--enable-cdda"
;
nativeBuildInputs = [ pkgconfig perl ];
nativeBuildInputs = [ pkgconfig perl which ];
enableParallelBuilding = true;

6
pkgs/development/libraries/cppzmq/default.nix
View File

@ -4,9 +4,9 @@ stdenv.mkDerivation rec {
name = "cppzmq";
src = fetchgit {
url = "https://github.com/zeromq/cppzmq";
rev = "1f05e0d111197c64be32ad5aecd59f4d1b05a819";
sha256 = "3a3507fd5646f191088e7a0a7a09846da54b0cac0fcb08f7c4c8d510b484e6da";
url = "git://github.com/zeromq/cppzmq";
rev = "ac705f604701e2ca1643fa31bae240f9da8b9b9a";
sha256 = "1bcd5553601a6cdc926aa7a7c89fe54d3b14693cfce85dea97af25cf5a144398";
};
installPhase = ''

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

@ -2,14 +2,14 @@
, google-gflags, python, libiberty, openssl }:
stdenv.mkDerivation rec {
version = "0.22.0";
version = "0.32.0";
name = "folly-${version}";
src = fetchFromGitHub {
owner = "facebook";
repo = "folly";
rev = "v${version}";
sha256 = "12p7vbx73jmhf772nbqvd8imw4ihpi16cw6cwxq459r7qds4n0ca";
sha256 = "0yviih6b220bv6d1rg4lx1hqprqapnzfv4rv64cwjxbmz49ckmzh";
};
buildInputs = [ libiberty boost.lib libevent double_conversion glog google-gflags openssl ];
@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "A YAML parser and emitter for C++";
homepage = https://code.google.com/p/yaml-cpp/;
description = "An open-source C++ library developed and used at Facebook";
homepage = https://github.com/facebook/folly;
license = licenses.mit;
# 32bit is not supported: https://github.com/facebook/folly/issues/103
platforms = [ "x86_64-linux" ];

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

@ -1,14 +1,14 @@
{ stdenv, fetchurl, pkgconfig, libusb, glib, nss, nspr, gdk_pixbuf }:
{ stdenv, fetchurl, pkgconfig, libusb, pixman, glib, nss, nspr, gdk_pixbuf }:
stdenv.mkDerivation rec {
name = "libfprint-0.5.1";
name = "libfprint-0.6.0";
src = fetchurl {
url = "http://people.freedesktop.org/~hadess/${name}.tar.xz";
sha256 = "1cwgaswqcvvbclahk2m2qr09k7lf7l8jwvgf3svq92w8j4xmc4kd";
sha256 = "1giwh2z63mn45galsjb59rhyrvgwcy01hvvp4g01iaa2snvzr0r5";
};
buildInputs = [ libusb glib nss nspr gdk_pixbuf ];
buildInputs = [ libusb pixman glib nss nspr gdk_pixbuf ];
nativeBuildInputs = [ pkgconfig ];
configureFlags = [ "--with-udev-rules-dir=$(out)/lib/udev/rules.d" ];

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

@ -1,26 +0,0 @@
{ stdenv, fetchgit, libtool, autoconf, automake113x, pkgconfig, libusb, glib, nss, nspr, pixman }:
stdenv.mkDerivation rec {
name = "libfprint";
src = fetchgit {
url = "git://anongit.freedesktop.org/libfprint/libfprint";
rev = "a3c90f2b24434aa36f782aca3950fd89af01fce0";
sha256 = "01qa58vq299xzxzxrcqkl51k8396wh56674d9wjmkv2msxx877hi";
};
buildInputs = [ libusb glib nss nspr pixman ];
nativeBuildInputs = [ libtool autoconf automake113x pkgconfig ];
configureScript = "./autogen.sh";
configureFlags = [ "--prefix=$(out)" "--disable-examples-build" "--disable-x11-examples-build" "--with-udev-rules-dir=$(out)/lib/udev/rules.d" ];
meta = with stdenv.lib; {
homepage = "http://www.freedesktop.org/wiki/Software/fprint/libfprint/";
description = "A library designed to make it easy to add support for consumer fingerprint readers";
license = licenses.lgpl2;
platforms = platforms.linux;
maintainers = with 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.12.0";
version = "3.12.1";
name = "ipopt-${version}";
src = fetchurl {
url = "http://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip";
sha256 = "18p1ad64mpliba1hf6jkyyrd0srxsqivwbcnbrr09jfpn4jn4bbr";
sha256 = "0x0wcc21d2bfs3zq8nvhva1nv7xi86wjbyixvvxvcrg2kqjlybdy";
};
preConfigure = ''

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

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "C++/C library to construct Excel .xls files in code";
homepage = http://xlslib.sourceforge.net/;
homepage = http://sourceforge.net/projects/xlslib/files/;
license = licenses.bsd2;
platforms = platforms.unix;
maintainers = maintainers.abbradar;

31
pkgs/games/crawl/crawl_purify.patch Normal file
View File

@ -0,0 +1,31 @@
diff --git a/crawl-ref/source/Makefile b/crawl-ref/source/Makefile
index b7e2fbf..5ff23db 100644
--- a/crawl-ref/source/Makefile
+++ b/crawl-ref/source/Makefile
@@ -273,7 +273,7 @@ endif
LIBZ := contrib/install/$(ARCH)/lib/libz.a
ifndef CROSSHOST
- SQLITE_INCLUDE_DIR := /usr/include
+ SQLITE_INCLUDE_DIR := ${sqlite}/include
else
# This is totally wrong, works only with some old-style setups, and
# on some architectures of Debian/new FHS multiarch -- excluding, for
@@ -943,7 +943,7 @@ else
SYS_PROPORTIONAL_FONT = $(shell { name=$(OUR_PROPORTIONAL_FONT);\
{\
fc-list | sed 's/: .*//' | grep -Fi "/$$name";\
- for dir in /usr/share/fonts /usr/local/share/fonts /usr/*/lib/X11/fonts;\
+ for dir in ${dejavu_fonts}/share/fonts;\
do [ -d $$dir ] && echo $$dir; done;\
} | xargs -I% find % -type f -iname $$name -print | head -n1; } 2>/dev/null)
ifneq (,$(SYS_PROPORTIONAL_FONT))
@@ -968,7 +968,7 @@ else
SYS_MONOSPACED_FONT = $(shell { name=$(OUR_MONOSPACED_FONT);\
{\
fc-list | sed 's/: .*//' | grep -Fi "/$$name";\
- for dir in /usr/share/fonts /usr/local/share/fonts /usr/*/lib/X11/fonts;\
+ for dir in ${dejavu_fonts}/share/fonts;\
do [ -d $$dir ] && echo $$dir; done;\
} | xargs -I% find % -type f -iname $$name -print | head -n1; } 2>/dev/null)
ifneq (,$(SYS_MONOSPACED_FONT))

17
pkgs/games/crawl/default.nix
View File

@ -1,18 +1,20 @@
{ stdenv, fetchurl, which, sqlite, lua5_1, perl, zlib, pkgconfig, ncurses
{ stdenv, fetchFromGitHub, which, sqlite, lua5_1, perl, zlib, pkgconfig, ncurses
, dejavu_fonts, libpng, SDL, SDL_image, mesa, freetype
, tileMode ? true
}:
let version = "0.15.2";
let version = "0.16.1";
in
stdenv.mkDerivation rec {
name = "crawl-${version}" + (if tileMode then "-tiles" else "");
src = fetchurl {
url = "mirror://sourceforge/crawl-ref/Stone%20Soup/${version}/stone_soup-${version}-nodeps.tar.xz";
sha256 = "1qi1g8w0sxmwrv96hnay20gpwp1xn2xcq1cw9iwn1yq112484fp9";
src = fetchFromGitHub {
owner = "crawl-ref";
repo = "crawl-ref";
rev = version;
sha256 = "0gciqaij05qr5bwkk5mblvk5k0p6bzjd58czk1b6x5xx5qcp6mmh";
};
patches = [ ./makefile_fonts.patch ./makefile_sqlite.patch ];
patches = [ ./crawl_purify.patch ];
nativeBuildInputs = [ pkgconfig which perl ];
@ -22,7 +24,8 @@ stdenv.mkDerivation rec {
[ libpng SDL SDL_image freetype mesa ];
preBuild = ''
cd source
cd crawl-ref/source
echo "${version}" > util/release_ver
# Related to issue #1963
sed -i 's/-fuse-ld=gold//g' Makefile
for i in util/*.pl; do

20
pkgs/games/crawl/makefile_fonts.patch
View File

@ -1,20 +0,0 @@
--- old/source/Makefile 2013-11-28 01:03:54.000000000 +0000
+++ new/source/Makefile 2014-02-05 14:04:32.531838188 +0000
@@ -880,7 +880,7 @@
INSTALL_FONTS += $(PROPORTIONAL_FONT)
endif
else
- SYS_PROPORTIONAL_FONT = $(shell dir=/usr/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_PROPORTIONAL_FONT)|head -n 1)
+ SYS_PROPORTIONAL_FONT = $(shell dir=${dejavu_fonts}/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_PROPORTIONAL_FONT)|head -n 1)
ifeq (,$(SYS_PROPORTIONAL_FONT))
SYS_PROPORTIONAL_FONT = $(shell dir=/usr/local/share/fonts ; [ -d $$dir ] && find $$dir -iname $(OUR_PROPORTIONAL_FONT)|head -n 1)
endif
@@ -903,7 +903,7 @@
INSTALL_FONTS += $(MONOSPACED_FONT)
endif
else
- SYS_MONOSPACED_FONT = $(shell dir=/usr/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_MONOSPACED_FONT)|head -n 1)
+ SYS_MONOSPACED_FONT = $(shell dir=${dejavu_fonts}/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_MONOSPACED_FONT)|head -n 1)
ifeq (,$(SYS_MONOSPACED_FONT))
SYS_MONOSPACED_FONT = $(shell dir=/usr/local/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_MONOSPACED_FONT)|head -n 1)
endif

11
pkgs/games/crawl/makefile_sqlite.patch
View File

@ -1,11 +0,0 @@
--- old/source/Makefile 2014-04-14 12:46:35.401956673 +0000
+++ new/source/Makefile 2014-04-14 12:47:12.757006254 +0000
@@ -259,7 +259,7 @@
LIBZ := contrib/install/$(ARCH)/lib/libz.a
ifndef CROSSHOST
- SQLITE_INCLUDE_DIR := /usr/include
+ SQLITE_INCLUDE_DIR := ${sqlite}/include
else
# This is totally wrong, works only with some old-style setups, and
# on some architectures of Debian/new FHS multiarch -- excluding, for

16
pkgs/misc/emulators/wine/winetricks.nix
View File

@ -1,13 +1,15 @@
{ stdenv, fetchgit, wine, perl, which, coreutils, zenity, curl
{ stdenv, fetchFromGitHub, wine, perl, which, coreutils, zenity, curl
, cabextract, unzip, p7zip, gnused, gnugrep, bash } :
stdenv.mkDerivation rec {
name = "winetricks-20150206";
let version = "20150316";
in stdenv.mkDerivation rec {
name = "winetricks-${version}";
src = fetchgit {
url = "https://code.google.com/p/winetricks/";
rev = "483056823093a90c9186b3d1a4867f481acf5fa1";
sha256 = "8b86a2a130ced405886775f0f81e7a6b25eb1bc22f357d0fe705fead52fff829";
src = fetchFromGitHub {
owner = "Winetricks";
repo = "winetricks";
rev = version;
sha256 = "00c55jpca6l3v3p02xc0gy5l4xb17gf90282hq5h85nh72kqsbrh";
};
buildInputs = [ perl which ];

4
pkgs/os-specific/linux/android-udev-rules/default.nix
View File

@ -5,8 +5,8 @@ stdenv.mkDerivation {
src = fetchgit {
url = "git://github.com/M0Rf30/android-udev-rules";
rev = "82f78561f388363a925e6663211988d9527de0c6";
sha256 = "badd7a152acf92c75335917c07125ffb1b5fda0bed5ec1e474d76e48a8d9f0db";
rev = "2cc51a456ccfbca338c4e6b76211645aaac631e9";
sha256 = "dbf1614cebb466d1adbcc5f17cefc0c37f148f9e3b46443b3e82f6cd19a1514f";
};
installPhase = ''

37
pkgs/os-specific/linux/ocz-toolbox/default.nix
View File

@ -1,37 +0,0 @@
{ stdenv, fetchurl, libXrender, fontconfig, freetype, libXext, libX11 }:
let arch = if stdenv.system == "x86_64-linux" then "64"
else if stdenv.system == "i686-linux" then "32"
else abort "OCZ Toolbox only support {x86-64,i686}-linux targets";
in stdenv.mkDerivation rec {
version = "4.9.0.634";
name = "ocz-toolbox-${version}";
src = fetchurl {
url = "http://ocz.com/consumer/download/firmware/OCZToolbox_v${version}_linux.tar.gz";
sha256 = "0h51p5bg9h2smxxy1r4xkzzjjavhgql7yy12qmjk0vbh13flgx3y";
};
prePatch = ''
cd linux${arch}
'';
libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc libXrender fontconfig freetype libXext libX11 ];
installPhase = ''
install -Dm755 OCZToolbox $out/bin/OCZToolbox
patchelf \
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "$libPath" \
$out/bin/OCZToolbox
'';
dontStrip = true;
meta = with stdenv.lib; {
description = "Update firmware and BIOS, secure erase, view SMART attributes, and view drive details of your OCZ SSD";
homepage = "http://ocz.com/consumer/download/firmware";
license = licenses.unfree;
maintainers = with maintainers; [ abbradar ];
};
}

4
pkgs/servers/uwsgi/default.nix
View File

@ -24,11 +24,11 @@ in
assert builtins.filter (x: lib.all (y: y.name != x) available) plugins == [];
stdenv.mkDerivation rec {
name = "uwsgi-2.0.9";
name = "uwsgi-2.0.10";
src = fetchurl {
url = "http://projects.unbit.it/downloads/${name}.tar.gz";
sha256 = "15c2j5myx1s54a1f6a7pjblvk7v96mz2kqlbj19mdfd8l2y8j17y";
sha256 = "12q2sn35vf1ils5043svq8da0czy54k63ziybvl33a9dqbb83cy0";
};
nativeBuildInputs = [ python3 pkgconfig ];

2
pkgs/tools/compression/lbzip2/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl}:
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "lbzip2-2.5";

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

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

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

@ -2179,8 +2179,6 @@ let
obnam = callPackage ../tools/backup/obnam { };
ocz-toolbox = callPackage ../os-specific/linux/ocz-toolbox { };
odt2txt = callPackage ../tools/text/odt2txt { };
odamex = callPackage ../games/odamex { };
@ -6319,7 +6317,7 @@ let
extraOnly = true;
};
libfprint = callPackage ../development/libraries/libfprint/master.nix { };
libfprint = callPackage ../development/libraries/libfprint { };
libfpx = callPackage ../development/libraries/libfpx { };