mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-15 21:57:02 +03:00
Merge master into x-updates
This commit is contained in:
Vladimír Čunát
commit
2b24f1349a
@ -68,6 +68,8 @@ in
|
||||
|
||||
preStart =
|
||||
''
|
||||
PATH="$PATH:${pkgs.ejabberd}/sbin:${pkgs.ejabberd}/bin:${pkgs.coreutils}/bin:${pkgs.bash}/bin:${pkgs.gnused}/bin";
|
||||
|
||||
# Initialise state data
|
||||
mkdir -p ${cfg.logsDir}
|
||||
|
||||
|
||||
@ -72,11 +72,11 @@ let
|
||||
|
||||
# Unpack Mediawiki and put the config file in its root directory.
|
||||
mediawikiRoot = pkgs.stdenv.mkDerivation rec {
|
||||
name= "mediawiki-1.20.7";
|
||||
name= "mediawiki-1.20.8";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "http://download.wikimedia.org/mediawiki/1.20/${name}.tar.gz";
|
||||
sha256 = "0cdl2mq3nw1jymanlxn7pi3qbf5y5003q53kmc8dip73nvrwnfxm";
|
||||
sha256 = "0yfmh5vnfbgpvicfqh7nh4hwdk4qbc6gfniv02vchkg5al0nn7ag";
|
||||
};
|
||||
|
||||
skins = config.skins;
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mhwaveedit-${version}";
|
||||
version = "1.4.21";
|
||||
version = "1.4.23";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.gna.org/mhwaveedit/${name}.tar.bz2";
|
||||
sha256 = "0jl7gvhwsz4fcn5d146h4m6i3hlxdsw4mmj280cv9g70p6zqi1w7";
|
||||
sha256 = "010rk4mr631s440q9cfgdxx2avgzysr9aq52diwdlbq9cddifli3";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "samplv1-${version}";
|
||||
version = "0.3.2";
|
||||
version = "0.3.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/samplv1/${name}.tar.gz";
|
||||
sha256 = "1j6q3ywbdsyhskc60p7k8ph058ylrrmjmri3q1wr2d2akcaqvb7m";
|
||||
sha256 = "1q4ggcbbz9lfrjh0ybr3grgipjkq6w5fb9gz5k5cryzz92p7ihw9";
|
||||
};
|
||||
|
||||
buildInputs = [ jackaudio libsndfile lv2 qt4 ];
|
||||
|
||||
@ -16,5 +16,6 @@ stdenv.mkDerivation rec {
|
||||
description = "Emacs Speaks Statistics";
|
||||
homepage = "http://ess.r-project.org/";
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
hydraPlatforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
assert gimpSupport -> gimp_2_8 != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xsane-0.998";
|
||||
name = "xsane-0.999";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.xsane.org/download/${name}.tar.gz";
|
||||
sha256 = "0vn2cj85ijgp2v2j2h9xpqmg2jwlbxmwyb88kxhjjakqay02ybm3";
|
||||
sha256 = "0jrb918sfb9jw3vmrz0z7np4q55hgsqqffpixs0ir5nwcwzd50jp";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
||||
@ -1,18 +1,18 @@
|
||||
{ fetchurl, stdenv, pkgconfig, gtk, gettext, bzip2, zlib
|
||||
, libjpeg, libtiff, cfitsio, exiv2, lcms, gtkimageview }:
|
||||
, libjpeg, libtiff, cfitsio, exiv2, lcms, gtkimageview, lensfun }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ufraw-0.18";
|
||||
name = "ufraw-0.19.2";
|
||||
|
||||
src = fetchurl {
|
||||
# XXX: These guys appear to mutate uploaded tarballs!
|
||||
url = "mirror://sourceforge/ufraw/${name}.tar.gz";
|
||||
sha256 = "01cjdc748vamjpaw2sbm8a9kwmb2hry4f200j3hlvqg9c6f77zi4";
|
||||
sha256 = "1lxba7pb3vcsq94dwapg9bk9mb3ww6r3pvvcyb0ah5gh2sgzxgkk";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
[ pkgconfig gtk gtkimageview gettext bzip2 zlib
|
||||
libjpeg libtiff cfitsio exiv2 lcms
|
||||
libjpeg libtiff cfitsio exiv2 lcms lensfun
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@ -1,17 +1,17 @@
|
||||
{ stdenv, fetchurl, pkgconfig, neon, libusb, openssl, udev, avahi, freeipmi
|
||||
, libtool }:
|
||||
, libtool, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "nut-2.6.5";
|
||||
name = "nut-2.7.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.networkupstools.org/source/2.6/${name}.tar.gz";
|
||||
sha256 = "0gxrzsblx0jc4g9w0903ybwqbv1d79vq5hnks403fvnay4fgg3b1";
|
||||
url = "http://www.networkupstools.org/source/2.7/${name}.tar.gz";
|
||||
sha256 = "1667n9h8jcz7k6h24fn615khqahlq5z22zxs4s0q046rsqxdg9ki";
|
||||
};
|
||||
|
||||
buildInputs = [ neon libusb openssl udev avahi freeipmi libtool ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkgconfig makeWrapper ];
|
||||
|
||||
configureFlags =
|
||||
[ "--with-all"
|
||||
@ -21,10 +21,17 @@ stdenv.mkDerivation rec {
|
||||
"--without-cgi"
|
||||
"--without-hal"
|
||||
"--with-systemdsystemunitdir=$(out)/etc/systemd/systemd"
|
||||
"--with-udev-dir=$(out)/etc/udev"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/nut-scanner --prefix LD_LIBRARY_PATH : \
|
||||
"$out/lib:${neon}/lib:${libusb}/lib:${avahi}/lib:${freeipmi}/lib"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Network UPS Tools";
|
||||
longDescription = ''
|
||||
@ -33,6 +40,7 @@ stdenv.mkDerivation rec {
|
||||
It uses a layered approach to connect all of the parts.
|
||||
'';
|
||||
homepage = http://www.networkupstools.org/;
|
||||
repositories.git = https://github.com/networkupstools/nut.git;
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
maintainers = with stdenv.lib.maintainers; [ pierron ];
|
||||
priority = 10;
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
{stdenv, fetchurl, wxGTK, chmlib}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "xchm-1.18";
|
||||
name = "xchm-1.23";
|
||||
src = fetchurl {
|
||||
url = mirror://sourceforge/xchm/xchm-1.18.tar.gz;
|
||||
sha256 = "1wvvyzqbmj3c6i46x4vpxkawjwmmp276r84ifvlzaj5q4b52g5gw";
|
||||
url = mirror://sourceforge/xchm/xchm-1.23.tar.gz;
|
||||
sha256 = "0qn0fyxcrn30ndq2asx31k0qkx3grbm16fb1y580wd2gjmh5r3wg";
|
||||
};
|
||||
buildInputs = [wxGTK chmlib];
|
||||
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
|
||||
{stdenv, fetchurl, makeWrapper, libX11, pkgconfig, libXaw}:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xfontsel-1.0.2";
|
||||
name = "xfontsel-1.0.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://xorg/individual/app/${name}.tar.bz2";
|
||||
sha256 = "1a86a08sf0wjrki9ydh7hr5qf6hrixc4ljlxizakjzmx20wvlrks";
|
||||
sha256 = "1grir464hy52a71r3mpm9mzvkf7nwr3vk0b1vc27pd3gp588a38p";
|
||||
};
|
||||
|
||||
buildInputs = [libX11 makeWrapper pkgconfig libXaw];
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
, zlib, libpng, xorg, cairo, podofo, aspell, boostHeaders, cmake }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "scribus-1.4.1";
|
||||
name = "scribus-1.4.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/scribus/scribus/${name}.tar.xz";
|
||||
sha256 = "1n67z2bk5ca2sxvv43jvj7yygfr4d2x5yc69zk70v38prm0gqlv8";
|
||||
sha256 = "1zxgl2g299rllfy5ihs5skicpv7zcmz149ahraami69gqcag6bn7";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, gmp, readline }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "pari-2.5.4";
|
||||
name = "pari-2.5.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz";
|
||||
sha256 = "0gpsj5n8d1gyl7nq2y915sscs3d334ryrv8qgjdwqf3cr95f2dwz";
|
||||
sha256 = "058nw1fhggy7idii4f124ami521lv3izvngs9idfz964aks8cvvn";
|
||||
};
|
||||
|
||||
buildInputs = [gmp readline];
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "cacert-20121229";
|
||||
name = "cacert-20131205";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://tarballs.nixos.org/${name}.pem.bz2";
|
||||
sha256 = "031s86pqvn620zkj6w97hqgjvkp6vsvlymzz7rwvkv25zvrjsgif";
|
||||
sha256 = "049cm3nrhawkh9xpfjhgis6w58zji5ppi4d9yyjzrr7mpw0a34df";
|
||||
};
|
||||
|
||||
unpackPhase = "true";
|
||||
|
||||
@ -39,9 +39,9 @@ let
|
||||
else
|
||||
throw "openjdk requires i686-linux or x86_64 linux";
|
||||
|
||||
update = "6";
|
||||
update = "40";
|
||||
|
||||
build = "24";
|
||||
build = "43";
|
||||
|
||||
in
|
||||
|
||||
@ -49,11 +49,11 @@ stdenv.mkDerivation rec {
|
||||
name = "openj${if jreOnly then "re" else "dk"}-7u${update}b${build}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.java.net/download/openjdk/jdk7u6/promoted/b24/openjdk-7u6-fcs-src-b24-28_aug_2012.zip";
|
||||
sha256 = "1x1iq8ga0hqqh0bpcmydzzy19757hknn2yvgzib85p7b7dx0vfx9";
|
||||
url = http://www.java.net/download/openjdk/jdk7u40/promoted/b43/openjdk-7u40-fcs-src-b43-26_aug_2013.zip;
|
||||
sha256 = "15h5nmbw6yn5596ccakqdbs0vd8hmslsfg5sfk8wmjvn31bfmy00";
|
||||
};
|
||||
|
||||
# outputs = [ "out" ] ++ stdenv.lib.optionals (! jreOnly) [ "jre" ];
|
||||
# outputs = [ "out" ] ++ stdenv.lib.optionals (! jreOnly) [ "jre" ];
|
||||
|
||||
buildInputs = [
|
||||
unzip
|
||||
@ -90,10 +90,7 @@ stdenv.mkDerivation rec {
|
||||
openjdk/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c
|
||||
'';
|
||||
|
||||
patches = [
|
||||
./cppflags-include-fix.patch
|
||||
./no-crypto-restrictions.patch
|
||||
];
|
||||
patches = [ ./cppflags-include-fix.patch ];
|
||||
|
||||
makeFlags = [
|
||||
"SORT=${coreutils}/bin/sort"
|
||||
@ -108,6 +105,7 @@ stdenv.mkDerivation rec {
|
||||
"DEVTOOLS_PATH="
|
||||
"UNIXCOMMAND_PATH="
|
||||
"BOOTDIR=${jdk}"
|
||||
"UNLIMITED_CRYPTO=1"
|
||||
];
|
||||
|
||||
configurePhase = ''
|
||||
@ -117,6 +115,14 @@ stdenv.mkDerivation rec {
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
cp -av build/*/j2${if jreOnly then "re" else "sdk"}-image/* $out
|
||||
|
||||
# Remove some broken manpages.
|
||||
rm -rf $out/share/man/ja*
|
||||
|
||||
# Remove crap from the installation.
|
||||
rm -rf $out/demo $out/sample
|
||||
|
||||
# Generate certificates.
|
||||
pushd $out/${if ! jreOnly then "jre/" else ""}lib/security
|
||||
rm cacerts
|
||||
perl ${./generate-cacerts.pl} $out/bin/keytool ${cacert}/etc/ca-bundle.crt
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
diff -Naur openjdk-orig/jdk/make/javax/crypto/Makefile openjdk/jdk/make/javax/crypto/Makefile
|
||||
--- openjdk-orig/jdk/make/javax/crypto/Makefile 2011-06-27 13:18:45.000000000 -0400
|
||||
+++ openjdk/jdk/make/javax/crypto/Makefile 2012-11-08 14:12:01.360718616 -0500
|
||||
@@ -156,7 +156,7 @@
|
||||
#
|
||||
|
||||
ifdef OPENJDK
|
||||
-all: build-jar install-jar build-policy install-limited
|
||||
+all: build-jar install-jar build-policy install-unlimited
|
||||
else # OPENJDK
|
||||
ifeq ($(strip $(FILES_java)),)
|
||||
all:
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "orc-0.4.17";
|
||||
name = "orc-0.4.18";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://code.entropywave.com/download/orc/${name}.tar.gz";
|
||||
sha256 = "1s6psp8phrd1jmxz9j01cksh3q5xrm1bd3z7zqxg5zsrijjcrisg";
|
||||
sha256 = "093a7a495bsy3j6i4wxaxqbqxk6hwg2hdhgvvkabwhlz4nkwilrl";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@ -5,7 +5,7 @@ assert zlibSupport -> zlib != null;
|
||||
|
||||
let
|
||||
|
||||
majorVersion = "2.2";
|
||||
majorVersion = "2.2.1";
|
||||
version = "${majorVersion}";
|
||||
pythonVersion = "2.7";
|
||||
libPrefix = "pypy${majorVersion}";
|
||||
@ -17,7 +17,7 @@ let
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://bitbucket.org/pypy/pypy/downloads/pypy-${version}-src.tar.bz2";
|
||||
sha256 = "0kp0922d1739v3fqnxhrbwz1fg651dc5dmk3199ikq1rc2wgrzsh";
|
||||
sha256 = "0pq36n6bap96smpacx8gvgl8yvi9r7ddl4mlpsi5cdj4gqc4a815";
|
||||
};
|
||||
|
||||
buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite ]
|
||||
@ -56,7 +56,8 @@ let
|
||||
export HOME="$TMPDIR";
|
||||
# disable shutils because it assumes gid 0 exists
|
||||
# disable socket because it has two actual network tests that fail
|
||||
./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k '-test_socket -test_shutil' lib-python
|
||||
# disable test_mhlib because it fails for unknown reason
|
||||
./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k '-test_socket -test_shutil -test_mhlib' lib-python
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "suil-${version}";
|
||||
version = "0.6.10";
|
||||
version = "0.6.16";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.drobilla.net/${name}.tar.bz2";
|
||||
sha256 = "1y7zgfciphr3icamikdfv2gh8xwix5blpq4npl426399i8f4ya5y";
|
||||
sha256 = "101xq7pd8kvnqwm4viaj4ikhn65jxrlrkg79ca954yqrdb9p9w8v";
|
||||
};
|
||||
|
||||
buildInputs = [ gtk lv2 pkgconfig python qt4 serd sord sratom ];
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{stdenv, fetchurl, SDL, mesa, erlang}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "esdl-1.2";
|
||||
name = "esdl-1.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/esdl/${name}.src.tar.gz";
|
||||
sha256 = "0zbnwhy2diivrrs55n96y3sfnbs6lsgz91xjaq15sfi858k9ha29";
|
||||
sha256 = "0zc7cmr44v10sb593dismdm5qc2v7sm3z9yh22g4r9g6asbg5z0n";
|
||||
};
|
||||
|
||||
buildInputs = [ erlang ];
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{stdenv, fetchurl, cmake, zlib, python}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.18.0";
|
||||
version = "0.20.0";
|
||||
name = "libgit2-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
name = "${name}.tar.gz";
|
||||
url = "https://github.com/libgit2/libgit2/tarball/v${version}";
|
||||
md5 = "50409ddb0c34713677b33ef617e92c94";
|
||||
sha256 = "1iyncz8fqazw683dxjls3lf5pw3f5ma8kachkvjz7dsq57wxllbj";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake python ];
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
, cairo, gconf, libgnomeui }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "goffice-0.10.0";
|
||||
name = "goffice-0.10.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz";
|
||||
sha256 = "7e7577f69203b03c4966906bcaabc6e87a629efb1684630c2bee7907bed08439";
|
||||
sha256 = "0xc82hymhkdglnksd3r7405p39d5ym826rwaa7dfkps5crjwq8cg";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
|
||||
version = "0.1";
|
||||
sha256 = "1xwd6rhka9gzmldkaw3d7262h51wxw9dwgip39q8pjkvvfs5kwkr";
|
||||
buildDepends = [ prettyShow text ];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
homepage = "https://github.com/Mikolaj/assert-failure";
|
||||
description = "Syntactic sugar improving 'assert' and 'error'";
|
||||
|
||||
@ -11,5 +11,6 @@ cabal.mkDerivation (self: {
|
||||
description = "Haskell bindings for the CUFFT library";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
hydraPlatforms = self.stdenv.lib.platforms.none;
|
||||
};
|
||||
})
|
||||
|
||||
@ -14,6 +14,7 @@ cabal.mkDerivation (self: {
|
||||
stringbuilder syb transformers
|
||||
];
|
||||
doCheck = false;
|
||||
noHaddock = self.stdenv.lib.versionOlder self.ghc.version "7.4";
|
||||
meta = {
|
||||
homepage = "https://github.com/sol/doctest-haskell#readme";
|
||||
description = "Test interactive Haskell examples";
|
||||
|
||||
@ -6,8 +6,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "haskell-names";
|
||||
version = "0.3.2.3";
|
||||
sha256 = "0vh88qkvlljqviy5mqjz8gbpwnl2wq65c2rm9kyjnc2cpyp4i8zx";
|
||||
version = "0.3.2.4";
|
||||
sha256 = "1m3p64kkm8zv2diwila0zdincykavf2fvxpqzpsmfndwb24f5b3p";
|
||||
buildDepends = [
|
||||
aeson Cabal dataLens dataLensTemplate filepath haskellPackages
|
||||
haskellSrcExts hseCpp mtl tagged transformers traverseWithClass
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "http-client-tls";
|
||||
version = "0.2.0.1";
|
||||
sha256 = "0wzbxah6pkglpgl4ax12crw3cl8w48b8pbasb3xkbqcxpaakvbkx";
|
||||
version = "0.2.0.2";
|
||||
sha256 = "0v5730rssddc28f1q6ndkcjrfz8r5a1wmxk1azpmdxlq6nh4i9q9";
|
||||
buildDepends = [ connection dataDefault httpClient network tls ];
|
||||
testDepends = [ hspec httpClient httpTypes ];
|
||||
doCheck = false;
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "minimorph";
|
||||
version = "0.1.4.0";
|
||||
sha256 = "16ri9hfriszrgqcm111b1pp5x65s034hrc35kjz5qax32mnc9rn6";
|
||||
version = "0.1.5.0";
|
||||
sha256 = "00dnvv0pap2xr74xwzldz89783iw320z7p1rdw0lwjjpbqa3v00g";
|
||||
buildDepends = [ text ];
|
||||
testDepends = [ HUnit testFramework testFrameworkHunit text ];
|
||||
meta = {
|
||||
|
||||
@ -1,14 +1,15 @@
|
||||
{ cabal, binary, bson, cryptohash, liftedBase, monadControl, mtl
|
||||
, network, parsec, random, randomShuffle, text, transformersBase
|
||||
{ cabal, binary, bson, cryptohash, hashtables, liftedBase
|
||||
, monadControl, mtl, network, parsec, random, randomShuffle, text
|
||||
, transformersBase
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "mongoDB";
|
||||
version = "1.4.1.1";
|
||||
sha256 = "1c9980x3i0jgacgz7mx65l5nyp3h83mqp9b52pzxq90lix6xnwhi";
|
||||
version = "1.4.2";
|
||||
sha256 = "15m23q17q8asrsa27mb73ydim1yjrxl06lgf7z8w4r6jy6lk34hf";
|
||||
buildDepends = [
|
||||
binary bson cryptohash liftedBase monadControl mtl network parsec
|
||||
random randomShuffle text transformersBase
|
||||
binary bson cryptohash hashtables liftedBase monadControl mtl
|
||||
network parsec random randomShuffle text transformersBase
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://github.com/selectel/mongodb-haskell";
|
||||
|
||||
@ -5,14 +5,14 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "postgresql-simple";
|
||||
version = "0.3.9.1";
|
||||
sha256 = "0byzlmcbwlycvlk35w0gdp5x7860jcc589ypbdx0vm08aq5vz87v";
|
||||
version = "0.3.10.0";
|
||||
sha256 = "1nfp05vxs3frp6yygf68ardz6s3pllccwl6myaa18kf42654lgyx";
|
||||
buildDepends = [
|
||||
aeson attoparsec blazeBuilder blazeTextual postgresqlLibpq text
|
||||
time transformers uuid vector
|
||||
];
|
||||
testDepends = [
|
||||
base16Bytestring cryptohash HUnit text time vector
|
||||
aeson base16Bytestring cryptohash HUnit text time vector
|
||||
];
|
||||
doCheck = false;
|
||||
meta = {
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "pretty-show";
|
||||
version = "1.6.2";
|
||||
sha256 = "0xhxyxymdjag2xczjrda5dkjc51m5k1nanpg9dmw0gr6wjaijbnp";
|
||||
version = "1.6.3";
|
||||
sha256 = "161zhbsqa86s1gqa7ss8pimw2msdlvgjlldh6ryizc17579dfcfw";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [ filepath haskellLexer ];
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "quickcheck-instances";
|
||||
version = "0.3.4";
|
||||
sha256 = "10kkjqn530cd4bz5jfnvfvpswk25glyjnmy21qj253db6ja8xns1";
|
||||
version = "0.3.5";
|
||||
sha256 = "1ak55d3yi6ii01921zihn8mk12mws78w05gmhk766kpylhhgni5f";
|
||||
buildDepends = [ QuickCheck text time ];
|
||||
meta = {
|
||||
homepage = "https://github.com/aslatter/qc-instances";
|
||||
|
||||
@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
|
||||
version = "1.1.8";
|
||||
sha256 = "1m75xh5bwmmgg5f757dc126kv47yfqqnz9fzj1hc80p6jpzs573x";
|
||||
buildDepends = [ mtl parsec regexBase ];
|
||||
patches = [ ./fix-build-with-array5.patch ];
|
||||
meta = {
|
||||
homepage = "http://hackage.haskell.org/package/regex-tdfa";
|
||||
description = "Replaces/Enhances Text.Regex";
|
||||
|
||||
@ -0,0 +1,120 @@
|
||||
diff -uwr regex-tdfa-1.1.8-orig/Text/Regex/TDFA/NewDFA/Engine_FA.hs regex-tdfa-1.1.8-patched/Text/Regex/TDFA/NewDFA/Engine_FA.hs
|
||||
--- regex-tdfa-1.1.8-orig/Text/Regex/TDFA/NewDFA/Engine_FA.hs 2011-03-12 00:46:39.000000000 +0100
|
||||
+++ regex-tdfa-1.1.8-patched/Text/Regex/TDFA/NewDFA/Engine_FA.hs 2013-12-19 12:42:27.048813869 +0100
|
||||
@@ -1,3 +1,4 @@
|
||||
+{-# LANGUAGE CPP #-}
|
||||
-- | This is the code for the main engine. This captures the posix
|
||||
-- subexpressions. There is also a non-capturing engine, and a
|
||||
-- testing engine.
|
||||
@@ -20,7 +21,12 @@
|
||||
|
||||
import Prelude hiding ((!!))
|
||||
import Control.Monad(when,unless,forM,forM_,liftM2,foldM)
|
||||
+#if MIN_VERSION_array(0,4,0)
|
||||
+import Data.Array.MArray(MArray(..))
|
||||
+import Data.Array.Unsafe(unsafeFreeze)
|
||||
+#else
|
||||
import Data.Array.MArray(MArray(..),unsafeFreeze)
|
||||
+#endif
|
||||
import Data.Array.IArray(Array,bounds,assocs,Ix(range))
|
||||
import qualified Data.IntMap.CharMap2 as CMap(findWithDefault)
|
||||
import Data.IntMap(IntMap)
|
||||
@@ -574,7 +580,7 @@
|
||||
case unsafeCoerce# memcpy mdest msource n# s1# of { (# s2#, () #) ->
|
||||
(# s2#, () #) }}
|
||||
{-
|
||||
-#else /* !__GLASGOW_HASKELL__ */
|
||||
+-- #else /* !__GLASGOW_HASKELL__ */
|
||||
|
||||
copySTU :: (MArray (STUArray s) e (S.ST s))=> STUArray s Tag e -> STUArray s Tag e -> S.ST s (STUArray s i e)
|
||||
copySTU source destination = do
|
||||
@@ -585,5 +591,5 @@
|
||||
forM_ (range b) $ \index ->
|
||||
set destination index =<< source !! index
|
||||
return destination
|
||||
-#endif /* !__GLASGOW_HASKELL__ */
|
||||
+-- #endif /* !__GLASGOW_HASKELL__ */
|
||||
-}
|
||||
diff -uwr regex-tdfa-1.1.8-orig/Text/Regex/TDFA/NewDFA/Engine.hs regex-tdfa-1.1.8-patched/Text/Regex/TDFA/NewDFA/Engine.hs
|
||||
--- regex-tdfa-1.1.8-orig/Text/Regex/TDFA/NewDFA/Engine.hs 2011-03-12 00:46:39.000000000 +0100
|
||||
+++ regex-tdfa-1.1.8-patched/Text/Regex/TDFA/NewDFA/Engine.hs 2013-12-19 12:42:27.049813918 +0100
|
||||
@@ -1,3 +1,4 @@
|
||||
+{-# LANGUAGE CPP #-}
|
||||
-- | This is the code for the main engine. This captures the posix subexpressions. This 'execMatch'
|
||||
-- also dispatches to "Engine_NC", "Engine_FA", and "Engine_FC_NA"
|
||||
--
|
||||
@@ -19,7 +20,12 @@
|
||||
-}
|
||||
import Prelude hiding ((!!))
|
||||
|
||||
+#if MIN_VERSION_array(0,4,0)
|
||||
+import Data.Array.MArray(MArray(..))
|
||||
+import Data.Array.Unsafe(unsafeFreeze)
|
||||
+#else
|
||||
import Data.Array.MArray(MArray(..),unsafeFreeze)
|
||||
+#endif
|
||||
import Data.Array.IArray(Array,bounds,assocs,Ix(rangeSize,range))
|
||||
import qualified Data.IntMap.CharMap2 as CMap(findWithDefault)
|
||||
import Data.IntMap(IntMap)
|
||||
@@ -716,7 +722,7 @@
|
||||
case unsafeCoerce# memcpy mdest msource n# s1# of { (# s2#, () #) ->
|
||||
(# s2#, () #) }}
|
||||
{-
|
||||
-#else /* !__GLASGOW_HASKELL__ */
|
||||
+-- #else /* !__GLASGOW_HASKELL__ */
|
||||
|
||||
copySTU :: (MArray (STUArray s) e (S.ST s))=> STUArray s Tag e -> STUArray s Tag e -> S.ST s (STUArray s i e)
|
||||
copySTU source destination = do
|
||||
@@ -727,5 +733,5 @@
|
||||
forM_ (range b) $ \index ->
|
||||
set destination index =<< source !! index
|
||||
return destination
|
||||
-#endif /* !__GLASGOW_HASKELL__ */
|
||||
+-- #endif /* !__GLASGOW_HASKELL__ */
|
||||
-}
|
||||
diff -uwr regex-tdfa-1.1.8-orig/Text/Regex/TDFA/NewDFA/Engine_NC_FA.hs regex-tdfa-1.1.8-patched/Text/Regex/TDFA/NewDFA/Engine_NC_FA.hs
|
||||
--- regex-tdfa-1.1.8-orig/Text/Regex/TDFA/NewDFA/Engine_NC_FA.hs 2011-03-12 00:46:39.000000000 +0100
|
||||
+++ regex-tdfa-1.1.8-patched/Text/Regex/TDFA/NewDFA/Engine_NC_FA.hs 2013-12-19 12:42:27.048813869 +0100
|
||||
@@ -1,10 +1,16 @@
|
||||
+{-# LANGUAGE CPP #-}
|
||||
-- | This is the non-capturing form of Text.Regex.TDFA.NewDFA.String
|
||||
module Text.Regex.TDFA.NewDFA.Engine_NC_FA(execMatch) where
|
||||
|
||||
import Control.Monad(unless)
|
||||
import Prelude hiding ((!!))
|
||||
|
||||
+#if MIN_VERSION_array(0,4,0)
|
||||
+import Data.Array.MArray(MArray(newArray))
|
||||
+import Data.Array.Unsafe(unsafeFreeze)
|
||||
+#else
|
||||
import Data.Array.MArray(MArray(newArray),unsafeFreeze)
|
||||
+#endif
|
||||
import Data.Array.ST(STArray)
|
||||
import qualified Data.IntMap.CharMap2 as CMap(findWithDefault)
|
||||
import qualified Data.IntMap as IMap(null)
|
||||
diff -uwr regex-tdfa-1.1.8-orig/Text/Regex/TDFA/NewDFA/Engine_NC.hs regex-tdfa-1.1.8-patched/Text/Regex/TDFA/NewDFA/Engine_NC.hs
|
||||
--- regex-tdfa-1.1.8-orig/Text/Regex/TDFA/NewDFA/Engine_NC.hs 2011-03-12 00:46:39.000000000 +0100
|
||||
+++ regex-tdfa-1.1.8-patched/Text/Regex/TDFA/NewDFA/Engine_NC.hs 2013-12-19 12:42:27.048813869 +0100
|
||||
@@ -1,3 +1,4 @@
|
||||
+{-# LANGUAGE CPP #-}
|
||||
-- | This is the non-capturing form of Text.Regex.TDFA.NewDFA.String
|
||||
module Text.Regex.TDFA.NewDFA.Engine_NC(execMatch) where
|
||||
|
||||
@@ -5,7 +6,12 @@
|
||||
import Data.Array.Base(unsafeRead,unsafeWrite)
|
||||
import Prelude hiding ((!!))
|
||||
|
||||
+#if MIN_VERSION_array(0,4,0)
|
||||
+import Data.Array.MArray(MArray(..))
|
||||
+import Data.Array.Unsafe(unsafeFreeze)
|
||||
+#else
|
||||
import Data.Array.MArray(MArray(..),unsafeFreeze)
|
||||
+#endif
|
||||
import Data.Array.IArray(Ix)
|
||||
import Data.Array.ST(STArray,STUArray)
|
||||
import qualified Data.IntMap.CharMap2 as CMap(findWithDefault)
|
||||
@@ -248,4 +254,3 @@
|
||||
wsToGroup (WScratch start stop) = do
|
||||
ma <- newArray (0,0) (start,stop-start) :: S.ST s (STArray s Int (MatchOffset,MatchLength))
|
||||
unsafeFreeze ma
|
||||
-
|
||||
@ -1,13 +1,14 @@
|
||||
{ cabal, ansiTerminal, deepseq, mtl, optparseApplicative
|
||||
{ cabal, ansiTerminal, deepseq, either, mtl, optparseApplicative
|
||||
, regexPosix, stm, tagged
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "tasty";
|
||||
version = "0.5.2.1";
|
||||
sha256 = "0dph1c0j2vjvzf5csp6hwlcx2zqa12yqrafk6pxs8bnd3r9a11ym";
|
||||
version = "0.6";
|
||||
sha256 = "00mf8pxwingzywnzgh7dypask1spp18kpiwqjbf1y11dqbs6ib6w";
|
||||
buildDepends = [
|
||||
ansiTerminal deepseq mtl optparseApplicative regexPosix stm tagged
|
||||
ansiTerminal deepseq either mtl optparseApplicative regexPosix stm
|
||||
tagged
|
||||
];
|
||||
meta = {
|
||||
description = "Modern and extensible testing framework";
|
||||
|
||||
@ -2,10 +2,10 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "type-eq";
|
||||
version = "0.3";
|
||||
sha256 = "094m8mk4a1iiqgrnqw0yk89rimp5ffj7i4n61nx3lzxqs5mw0kws";
|
||||
version = "0.4";
|
||||
sha256 = "1cvbqxwkiybxbpzr98yl2pnx5w4zrr340z86q40zirgr1f0ch674";
|
||||
meta = {
|
||||
homepage = "http://github.com/glehel/type-eq";
|
||||
homepage = "http://github.com/glaebhoerl/type-eq";
|
||||
description = "Type equality evidence you can carry around";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
|
||||
@ -7,11 +7,11 @@ assert gtkSupport -> glib != null && gtk3 != null;
|
||||
assert videoSupport -> ffmpeg != null && libmpeg2 != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libextractor-1.0.1";
|
||||
name = "libextractor-1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/libextractor/${name}.tar.gz";
|
||||
sha256 = "1khy9s86vq6667h02zp2fvb16sqm27xlmr0xchgfxvsd6ascnl9j";
|
||||
sha256 = "1n7z6s5ils6xmf6b0z1xda41maxj94c1n6wlyyxmacs5lrkh2a96";
|
||||
};
|
||||
|
||||
preConfigure =
|
||||
|
||||
44
pkgs/development/libraries/libgcrypt/1.6.nix
Normal file
44
pkgs/development/libraries/libgcrypt/1.6.nix
Normal file
@ -0,0 +1,44 @@
|
||||
{ fetchurl, stdenv, libgpgerror, transfig, ghostscript, texinfo }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libgcrypt-1.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnupg/libgcrypt/${name}.tar.bz2";
|
||||
sha256 = "024plbybsmnxbp39hs92lp6dzvkz2cb70nv69qrwr55d02350bb6";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ transfig ghostscript texinfo ];
|
||||
|
||||
propagatedBuildInputs = [ libgpgerror ];
|
||||
|
||||
preBuild = ''
|
||||
(cd doc; make stamp-vti)
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
# For some reason the tests don't find `libgpg-error.so'.
|
||||
checkPhase = ''
|
||||
LD_LIBRARY_PATH="${libgpgerror}/lib:$LD_LIBRARY_PATH" \
|
||||
make check
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "GNU Libgcrypt, a general-pupose cryptographic library";
|
||||
|
||||
longDescription = ''
|
||||
GNU Libgcrypt is a general purpose cryptographic library based on
|
||||
the code from GnuPG. It provides functions for all
|
||||
cryptographic building blocks: symmetric ciphers, hash
|
||||
algorithms, MACs, public key algorithms, large integer
|
||||
functions, random numbers and a lot of supporting functions.
|
||||
'';
|
||||
|
||||
license = "LGPLv2+";
|
||||
|
||||
homepage = https://www.gnu.org/software/libgcrypt/;
|
||||
repositories.git = git://git.gnupg.org/libgcrypt.git;
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
@ -1,13 +1,15 @@
|
||||
{stdenv, fetchurl}:
|
||||
{stdenv, fetchurl, xz}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libunwind-1.0.1";
|
||||
name = "libunwind-1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://savannah/libunwind/${name}.tar.gz";
|
||||
sha256 = "aa95fd184c0b90d95891c2f3bac2c7df708ff016d2a6ee8b2eabb769f864101f";
|
||||
sha256 = "16nhx2pahh9d62mvszc88q226q5lwjankij276fxwrm8wb50zzlx";
|
||||
};
|
||||
|
||||
|
||||
propagatedBuildInputs = [ xz ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = if stdenv.system == "x86_64-linux" then "-fPIC" else "";
|
||||
preInstall = ''
|
||||
mkdir -p "$out/lib"
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.7.1";
|
||||
version = "0.8.1";
|
||||
name = "mdds-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://multidimalgorithm.googlecode.com/files/mdds_${version}.tar.bz2";
|
||||
sha256 = "0zhrx7m04pknc8i2cialmbna1hmwa0fzs8qphan4rdxibf0c4yzy";
|
||||
sha256 = "12w8rs8kb8yffndsw0g7qfjvy4gpnppkdzc7r7vvc9n800ixl1gn";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@ -3,7 +3,7 @@ let
|
||||
lib = args.lib;
|
||||
fetchurl = args.fetchurl;
|
||||
|
||||
version = lib.attrByPath ["version"] "0.11.1" args;
|
||||
version = lib.attrByPath ["version"] "0.12" args;
|
||||
buildInputs = with args; [
|
||||
|
||||
];
|
||||
@ -11,7 +11,7 @@ in
|
||||
rec {
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/opende/ode-${version}.tar.bz2";
|
||||
sha256 = "1883gbsnn7zldrpwfdh6kwj20g627n5bspz3yb2z6lrxdal88y47";
|
||||
sha256 = "0l63ymlkgfp5cb0ggqwm386lxmc3al21nb7a07dd49f789d33ib5";
|
||||
};
|
||||
|
||||
inherit buildInputs;
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "onig-5.9.3";
|
||||
name = "onig-5.9.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://www.geocities.jp/kosako3/oniguruma/archive/onig-5.9.3.tar.gz;
|
||||
sha256 = "0ahz0l64v2xv4jbh0w3q697xjff8jzdq2264h9jhwxl459msdfy3";
|
||||
url = http://www.geocities.jp/kosako3/oniguruma/archive/onig-5.9.4.tar.gz;
|
||||
sha256 = "15q62c2id918fj2i7xbdrcc79xrdafdc75lhhld98rgq3y8j30lq";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
{stdenv, fetchurl, gfortran}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "openmpi-1.6.4";
|
||||
name = "openmpi-1.6.5";
|
||||
src = fetchurl {
|
||||
url = http://www.open-mpi.org/software/ompi/v1.6/downloads/openmpi-1.6.4.tar.bz2 ;
|
||||
sha1 = "38095d3453519177272f488d5058a98f7ebdbf10";
|
||||
url = http://www.open-mpi.org/software/ompi/v1.6/downloads/openmpi-1.6.5.tar.bz2 ;
|
||||
sha256 = "11gws4d3z7934zna2r7m1f80iay2ha17kp42mkh39wjykfwbldzy";
|
||||
};
|
||||
buildInputs = [ gfortran ];
|
||||
meta = {
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "snappy-1.1.0";
|
||||
name = "snappy-1.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://snappy.googlecode.com/files/${name}.tar.gz";
|
||||
sha256 = "0q31cx3zkw0apx1fy8z3xlh2lvivssvykqn0vxsgm4xvi32jpa0z";
|
||||
sha256 = "1czscb5i003jg1amw3g1fmasv8crr5g3d922800kll8b3fj097yp";
|
||||
};
|
||||
|
||||
# -DNDEBUG for speed
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{fetchurl, buildPerlPackage, db4}:
|
||||
|
||||
buildPerlPackage rec {
|
||||
name = "DB_File-1.826";
|
||||
name = "DB_File-1.831";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
|
||||
sha256 = "c39828ef3cfecff8197ff057cb1c6127b87107c051d182b87c6b9ac79d23f09c";
|
||||
sha256 = "0hq2vvcsa3nkb5bpcl0nkfsxhk8wyrsp3p3ara18rscrfd783hjs";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
||||
@ -1,23 +1,26 @@
|
||||
{ cabal, cmdtheline, deepseq, Diff, filepath, ghcMod, ghcPaths
|
||||
, ghcSybUtils, hslogger, hspec, HUnit, mtl, parsec, QuickCheck
|
||||
, rosezipper, silently, StrafunskiStrategyLib, stringbuilder, syb
|
||||
, syz, time, transformers
|
||||
{ cabal, deepseq, Diff, dualTree, filepath, ghcMod, ghcPaths
|
||||
, ghcSybUtils, hslogger, hspec, HUnit, monoidExtras, mtl, parsec
|
||||
, QuickCheck, rosezipper, semigroups, silently
|
||||
, StrafunskiStrategyLib, stringbuilder, syb, syz, time
|
||||
, transformers
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "HaRe";
|
||||
version = "0.7.0.7";
|
||||
sha256 = "0pgl5mav4sqc453by7nddf5fz7nj231072bklzj6crcph7qw4zy4";
|
||||
version = "0.7.0.9";
|
||||
sha256 = "1a3kf6hdzchcyb743l6ikyw3nclcy8g7a5kaj4jgxqvmss9z73f1";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
cmdtheline filepath ghcMod ghcPaths ghcSybUtils hslogger mtl parsec
|
||||
rosezipper StrafunskiStrategyLib syb syz time transformers
|
||||
dualTree filepath ghcMod ghcPaths ghcSybUtils hslogger monoidExtras
|
||||
mtl parsec rosezipper semigroups StrafunskiStrategyLib syb syz time
|
||||
transformers
|
||||
];
|
||||
testDepends = [
|
||||
deepseq Diff filepath ghcMod ghcPaths ghcSybUtils hslogger hspec
|
||||
HUnit mtl QuickCheck rosezipper silently StrafunskiStrategyLib
|
||||
stringbuilder syb syz time transformers
|
||||
deepseq Diff dualTree filepath ghcMod ghcPaths ghcSybUtils hslogger
|
||||
hspec HUnit monoidExtras mtl QuickCheck rosezipper semigroups
|
||||
silently StrafunskiStrategyLib stringbuilder syb syz time
|
||||
transformers
|
||||
];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "uuagc";
|
||||
version = "0.9.50";
|
||||
sha256 = "0vyydqgmyl590ry63ibwshfpj2w9dd2v0nmr4jqlfw0m0d9ff50j";
|
||||
version = "0.9.50.1";
|
||||
sha256 = "0fpksqny1f083bzpr7pvx5ny53yds3mqss73fx4li8cwb2bs4azw";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [ filepath haskellSrcExts mtl uuagcCabal uulib ];
|
||||
|
||||
@ -14,6 +14,7 @@ cabal.mkDerivation (self: {
|
||||
hashable keys miniutter mtl prettyShow random stm text transformers
|
||||
unorderedContainers zlib
|
||||
];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
homepage = "http://github.com/kosmikus/LambdaHack";
|
||||
description = "A roguelike game engine in early and active development";
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, pkgconfig, intltool, curl, gtk, gtkdatabox }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "klavaro-1.9.5";
|
||||
name = "klavaro-2.00";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/klavaro/${name}.tar.bz2";
|
||||
sha256 = "06c35247866fb74f7c1a52a2350b352fdb44dace7216fdbebc1fa54990d14fc9";
|
||||
sha256 = "1w94r7r132sg7554xhcgvymxxxgfas99lkgv6j3nmxa8m2fzhwlq";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig intltool curl gtk gtkdatabox ];
|
||||
|
||||
@ -30,10 +30,12 @@ rec {
|
||||
inherit buildInputs;
|
||||
|
||||
/* doConfigure should be removed if not needed */
|
||||
phaseNames = ["doConfigure" "doMakeInstall"];
|
||||
phaseNames = ["doPatch" "doConfigure" "doMakeInstall"];
|
||||
|
||||
configureFlags = "CFLAGS=\"-include ${zlib}/include/zlib.h\"";
|
||||
|
||||
patches = [ ./gcc-fix.patch ];
|
||||
|
||||
meta = {
|
||||
description = "Ballistics turn-based battle game between teams";
|
||||
maintainers = with a.lib.maintainers;
|
||||
|
||||
36
pkgs/games/warmux/gcc-fix.patch
Normal file
36
pkgs/games/warmux/gcc-fix.patch
Normal file
@ -0,0 +1,36 @@
|
||||
## i-love-you-lordheavy.patch [diff]
|
||||
diff -ru warmux-11.04/lib/warmux/action/action.cpp warmux-11.04-new/lib/warmux/action/action.cpp
|
||||
--- warmux-11.04/lib/warmux/action/action.cpp 2011-04-28 21:03:14.000000000 +0200
|
||||
+++ warmux-11.04-new/lib/warmux/action/action.cpp 2012-01-29 09:51:16.680251815 +0100
|
||||
@@ -81,7 +81,7 @@
|
||||
}
|
||||
|
||||
// Build an action from a network packet
|
||||
-Action::Action(const char *buffer, DistantComputer* _creator)
|
||||
+Action::Action(char *buffer, DistantComputer* _creator)
|
||||
{
|
||||
m_creator = _creator;
|
||||
|
||||
diff -ru warmux-11.04/lib/warmux/include/WARMUX_action.h warmux-11.04-new/lib/warmux/include/WARMUX_action.h
|
||||
--- warmux-11.04/lib/warmux/include/WARMUX_action.h 2011-04-28 21:03:13.000000000 +0200
|
||||
+++ warmux-11.04-new/lib/warmux/include/WARMUX_action.h 2012-01-29 09:52:14.246921833 +0100
|
||||
@@ -168,7 +168,7 @@
|
||||
Action(Action_t type, Double value1, Double value2);
|
||||
|
||||
// Build an action from a network packet
|
||||
- Action(const char* buffer, DistantComputer* _creator);
|
||||
+ Action(char* buffer, DistantComputer* _creator);
|
||||
|
||||
~Action();
|
||||
|
||||
Description: Fix FTBFS with gcc 4.7.
|
||||
Author: Felix Geyer <debfx-pkg@fobos.de>
|
||||
|
||||
--- warmux-11.04.1+repack.orig/tools/list_games/main.cpp
|
||||
+++ warmux-11.04.1+repack/tools/list_games/main.cpp
|
||||
@@ -1,4 +1,5 @@
|
||||
#include <stdio.h>
|
||||
+#include <unistd.h>
|
||||
#include <WARMUX_types.h>
|
||||
#include <WARMUX_network.h>
|
||||
#include <WARMUX_index_server.h>
|
||||
@ -4,12 +4,12 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "5.19";
|
||||
version = "5.26";
|
||||
name = "xscreensaver-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.jwz.org/xscreensaver/${name}.tar.gz";
|
||||
sha256 = "fd62ea0f996abe1bea3770dd7141681454521b49302f9bced8af9c2ee428c0e0";
|
||||
sha256 = "0m8v9zxl1pyqndqqinhsvpc8s3byg397vy6i4ihkjiqrw5kdr91c";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, ... } @ args:
|
||||
|
||||
import ./generic.nix (args // rec {
|
||||
version = "3.12.5";
|
||||
version = "3.12.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
|
||||
sha256 = "48181474f3943f77c1e62bed676b09a9fed64364d5847ce14a45b8d947112719";
|
||||
sha256 = "085c4d6663f7e85afe8ae196231f291b28187d4237e46492fa63e1726db04412";
|
||||
};
|
||||
|
||||
features.iwlwifi = true;
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "udisks-2.1.0";
|
||||
name = "udisks-2.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://udisks.freedesktop.org/releases/${name}.tar.bz2";
|
||||
sha256 = "1a0mipihilscv9jwy59xrqn2kkri9p12a09anpjdld83l7jhh0ii";
|
||||
sha256 = "1yw6h3l13y796adwgj6m4j3hijv58lgpf98mq24nn9da73zhjfq1";
|
||||
};
|
||||
|
||||
patches = [ ./force-path.patch ];
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
assert withQt4 -> qt4 != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "v4l-utils-0.9.3";
|
||||
name = "v4l-utils-1.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://linuxtv.org/downloads/v4l-utils/${name}.tar.bz2";
|
||||
sha256 = "0gaag38x47wlvmp4j60wgf9ma1rxzfyg7i12zxxxi4m3cpcb0bah";
|
||||
sha256 = "0c2z500ijxr1ldzb4snasfpwi2icp04f8pk7akiqjkp0k4h8iqqx";
|
||||
};
|
||||
|
||||
buildInputs = [ which ];
|
||||
|
||||
@ -5,11 +5,11 @@ assert enableJabber -> minmay != null;
|
||||
|
||||
let
|
||||
|
||||
version = "2.0.9";
|
||||
version = "2.0.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz";
|
||||
sha256 = "057fjqww0qzs56nm8m3c36kbrhwriysvjvqzgwm9j2bg9ylixvym";
|
||||
sha256 = "0p86m634j08w0gbr2rwqr3h5p6md7k0c688w5yxc1ii3l9fmnhbi";
|
||||
};
|
||||
|
||||
preConfigure =
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
let
|
||||
|
||||
version = "1.8.18rc1";
|
||||
version = "1.8.19";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz";
|
||||
sha256 = "1pa4656dcl5r7r36nwk05zy38z49np6j717wjmmd8sqlz6szw01n";
|
||||
sha256 = "0xgki1lrqyhfvx2691v8mk7a868zz35cnvrhiyqgksq2kshm11ph";
|
||||
};
|
||||
|
||||
preConfigure =
|
||||
|
||||
@ -2,14 +2,15 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "dash-0.5.7";
|
||||
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://gondor.apana.org.au/~herbert/dash/files/${name}.tar.gz";
|
||||
sha256 = "0fafpbpq6jghs0fr392x525dybym9kq1s3kly2679ds526gzm2df";
|
||||
};
|
||||
|
||||
|
||||
meta = {
|
||||
homepage = http://gondor.apana.org.au/~herbert/dash/;
|
||||
description = "A POSIX-compliant implementation of /bin/sh that aims to be as small as possible";
|
||||
hydraPlatforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
{ fetchurl, stdenv, libcdio, zlib, bzip2, readline, acl }:
|
||||
{ fetchurl, stdenv, libcdio, zlib, bzip2, readline, acl, attr }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xorriso-1.2.2";
|
||||
name = "xorriso-1.3.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/xorriso/${name}.tar.gz";
|
||||
sha256 = "0kw4fiqn24vya3zhay6minzrbz10zlxm8sjs272z7l5s2kwcjypx";
|
||||
sha256 = "0wvxbvkpdydcbmqi9xz7nv8cna6vp9726ahmmxxyx56cz4xifr4x";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
||||
buildInputs = [ libcdio zlib bzip2 readline ]
|
||||
buildInputs = [ libcdio zlib bzip2 readline attr ]
|
||||
++ stdenv.lib.optional stdenv.isLinux acl;
|
||||
|
||||
meta = {
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
{stdenv, fetchurl, ucl, zlib}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "upx-3.07";
|
||||
name = "upx-3.09";
|
||||
src = fetchurl {
|
||||
url = mirror://sourceforge/upx/upx-3.07-src.tar.bz2;
|
||||
sha256 = "07pcgjn7x0a734mvhgqwz24qkm1rzqrkcp67pmagzz6i765cp7bs";
|
||||
url = mirror://sourceforge/upx/upx-3.09-src.tar.bz2;
|
||||
sha256 = "16jwynharr1silfd6vlxl9i94fs8mg79qp72dr48r3wv9mlra6pn";
|
||||
};
|
||||
|
||||
buildInputs = [ ucl zlib ];
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ fetchurl, stdenv, pkgconfig, db48, libgcrypt, avahi, libiconv, pam, openssl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "netatalk-3.0.5";
|
||||
name = "netatalk-3.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/netatalk/netatalk/${name}.tar.bz2";
|
||||
sha256 = "1adlcj509czxsx60r1s96qlznspp5nz7dxc5fws11danidr4fhl8";
|
||||
sha256 = "1d8dc8ysslkis4yl1xab1w9p0pz7a1kg0i6fds4wxsp4fhb6wqhq";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig db48 libgcrypt avahi libiconv pam openssl ];
|
||||
|
||||
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://www.gnuplot.info;
|
||||
description = "A portable command-line driven graphing utility for many platforms";
|
||||
platforms = platforms.all;
|
||||
hydraPlatforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = with maintainers; [ lovek323 ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, ncurses }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "multitail-5.2.12";
|
||||
name = "multitail-5.2.13";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://www.vanheusden.com/multitail/multitail-5.2.12.tgz;
|
||||
sha256 = "681d87cd49e11aab1d82ad7818ee639c88a3d305db8accf0859977beda6c493c";
|
||||
url = http://www.vanheusden.com/multitail/multitail-5.2.13.tgz;
|
||||
sha256 = "1axgbdm1xkg570j0p150492x7p3mf11shwvn6dz8g4rha7cak4l6";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses ];
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, pkgconfig, intltool, gtk2 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "parcellite-1.1.6";
|
||||
name = "parcellite-1.1.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/parcellite/${name}.tar.gz";
|
||||
sha256 = "0nz951ykj162mfbcn3w9zk525ww6qcqn5yqdx13nx70fnn6rappi";
|
||||
sha256 = "0pszw3yd4a08p6jsz7asayr7jir08bxbwvfb16k01cj7ya4kf3w7";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig intltool gtk2 ];
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ stdenv, fetchurl, python, zip }:
|
||||
|
||||
let
|
||||
version = "2013.12.11.2";
|
||||
version = "2013.12.17.2";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "youtube-dl-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz";
|
||||
sha256 = "1ar0shbk22dfnq37z8kxd1bv7dk3vm3439f4zhgc9ylvn6n0hnkq";
|
||||
sha256 = "1dmv14v623v9afxfn0rw1gfdd91sngfgj4dg7hwbmnqsja0qxydv";
|
||||
};
|
||||
|
||||
buildInputs = [ python ];
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, perl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ndisc6-1.0.1";
|
||||
name = "ndisc6-1.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.remlab.net/files/ndisc6/archive/${name}.tar.bz2";
|
||||
sha256 = "1pggc9x3zki1sv08rs8x4fm7pmd3sn1nwkan3szax19xg049xbqx";
|
||||
sha256 = "0ynacanjhlib4japqmf7n2c0bv5f2qq6rx2nhk4kmylyrfhcikka";
|
||||
};
|
||||
|
||||
buildInputs = [ perl ];
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, bison, flex }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "olsrd-0.6.5.4";
|
||||
name = "olsrd-0.6.6.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.olsr.org/releases/0.6/${name}.tar.bz2";
|
||||
sha256 = "757327b9a22b066bd0cab2a8e1cdd1c462f474bb99864a175388aa5f0c70504c";
|
||||
sha256 = "1fphbh9x724r83gxxrd13zv487s4svnr9jdy76h4f36xxb15pnp8";
|
||||
};
|
||||
|
||||
buildInputs = [ bison flex ];
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{stdenv, fetchurl, perl}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "surfraw-2.2.8";
|
||||
name = "surfraw-2.2.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://surfraw.alioth.debian.org/dist/surfraw-2.2.8.tar.gz";
|
||||
sha256 = "925075e05637e39458b00e859193aacde306aafd9a962f44f5114f81713539ec";
|
||||
url = "http://surfraw.alioth.debian.org/dist/surfraw-2.2.9.tar.gz";
|
||||
sha256 = "1fy4ph5h9kp0jzj1m6pfylxnnmgdk0mmdppw76z9jhna4jndk5xa";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
@ -18,5 +18,6 @@ stdenv.mkDerivation rec {
|
||||
description = "Provides a fast unix command line interface to a variety of popular WWW search engines and other artifacts of power";
|
||||
homepage = "http://surfraw.alioth.debian.org";
|
||||
maintainers = [];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, openssl, expat, libevent, ldns }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "unbound-1.4.13";
|
||||
name = "unbound-1.4.21";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://unbound.net/downloads/${name}.tar.gz";
|
||||
sha256 = "04r379gma1ghr9zjc1fmncpw8kka4f0mpcmrzidsp264aqkxriw3";
|
||||
sha256 = "0w09m2rbn688rsk37k5xm3vkk5h2hxhivsr374j7h7vjf9x82bsh";
|
||||
};
|
||||
|
||||
buildInputs = [openssl expat libevent ldns];
|
||||
|
||||
@ -11,10 +11,10 @@ let
|
||||
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
|
||||
sourceInfo = rec {
|
||||
baseName="wavemon";
|
||||
version="0.7.2";
|
||||
version="0.7.5";
|
||||
name="${baseName}-${version}";
|
||||
url="http://eden-feed.erg.abdn.ac.uk/wavemon/stable-releases/${name}.tar.bz2";
|
||||
hash="1w1nq082mpjkcj7q6qs80104vki9kddwqv1wch6nmwwh0l72dgma";
|
||||
hash="0b1fx00aar2fsw49a10w5bpiyjpz8h8f4nrlwb1acfw36yi1pfkd";
|
||||
};
|
||||
in
|
||||
rec {
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, readline, bzip2 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnupg-1.4.15";
|
||||
name = "gnupg-1.4.16";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnupg/gnupg/${name}.tar.bz2";
|
||||
sha1 = "63ebf0ab375150903c65738070e4105200197fd4";
|
||||
sha256 = "0bsa1yqa3ybhvmc4ys73amdpcmckrlq1fsxjl2980cxada778fvv";
|
||||
};
|
||||
|
||||
buildInputs = [ readline bzip2 ];
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, zlib, bzip2, bison, flex }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mairix-0.22";
|
||||
name = "mairix-0.23";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/mairix/${name}.tar.gz";
|
||||
sha256 = "0kwxq738nbv8ip5gkq2bw320qs1vg0pnv7wsc0p5cxwzxxrv47ql";
|
||||
sha256 = "1yzjpmsih6c60ks0d0ia153z9g35nj7dmk98383m0crw31dj6kl0";
|
||||
};
|
||||
|
||||
buildInputs = [ zlib bzip2 bison flex ];
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ fetchurl, stdenv, perl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "namazu-2.0.20";
|
||||
name = "namazu-2.0.21";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://namazu.org/stable/${name}.tar.gz";
|
||||
sha256 = "1czw3l6wmz8887wfjpgds9di8hcg0hsmbc0mc6bkahj8g7lvrnyd";
|
||||
sha256 = "1xvi7hrprdchdpzhg3fvk4yifaakzgydza5c0m50h1yvg6vay62w";
|
||||
};
|
||||
|
||||
buildInputs = [ perl ];
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
let
|
||||
version = "5.6.1";
|
||||
version = "5.8.1";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "numdiff-${version}";
|
||||
src = fetchurl {
|
||||
url = "mirror://savannah/numdiff/numdiff-${version}.tar.gz";
|
||||
sha256 = "062byxp9vajj4flg1rqh0r2nwg9yx608mbsj5y25wkrzmkgcq3fx";
|
||||
sha256 = "00zm9955gjsid0daa94sbw69klk0vrnrrh0ihijza99kysnvmblr";
|
||||
};
|
||||
meta = {
|
||||
description = ''
|
||||
|
||||
47
pkgs/tools/typesetting/docbook2odf/default.nix
Normal file
47
pkgs/tools/typesetting/docbook2odf/default.nix
Normal file
@ -0,0 +1,47 @@
|
||||
{ stdenv, fetchurl, perl, makeWrapper, zip, libxslt, PerlMagick }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "docbook2odf-0.244";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://open.comsultia.com/docbook2odf/dwn/${name}.tar.gz";
|
||||
sha256 = "10k44g0qqa37k30pfj8vz95j6zdzz0nmnqjq1lyahfs2h4glzgwb";
|
||||
};
|
||||
|
||||
buildInputs = [ perl makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "$out/bin/"
|
||||
mkdir -p "$out/share/docbook2odf/"
|
||||
mkdir -p "$out/share/doc/docbook2odf/"
|
||||
mkdir -p "$out/share/man/man1/"
|
||||
mkdir -p "$out/share/applications/"
|
||||
|
||||
cp utils/docbook2odf "$out/bin/"
|
||||
cp docs/docbook2odf.1 "$out/share/man/man1/"
|
||||
cp -r examples/ "$out/share/doc/docbook2odf/"
|
||||
cp -r xsl/ "$out/share/docbook2odf/"
|
||||
cp bindings/desktop/docbook2odf.desktop "$out/share/applications/"
|
||||
|
||||
sed -i "s|/usr/share/docbook2odf|$out/share/docbook2odf|" "$out/bin/docbook2odf"
|
||||
|
||||
wrapProgram "$out/bin/docbook2odf" \
|
||||
--prefix PATH : "${zip}/bin:${libxslt}/bin" \
|
||||
--prefix PERL5PATH : "${stdenv.lib.makePerlPath [PerlMagick]}"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Convert DocBook to OpenDocument Format (ODF)";
|
||||
longDescription = ''
|
||||
Docbook2odf is a toolkit that automaticaly converts DocBook to OASIS
|
||||
OpenDocument (ODF, the ISO standardized format used for texts,
|
||||
spreadsheets and presentations). Conversion is based on a XSLT which
|
||||
makes it easy to convert DocBook->ODF, ODT, ODS and ODP as all these
|
||||
documents are XML based.
|
||||
'';
|
||||
homepage = http://open.comsultia.com/docbook2odf/;
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.bjornfor ];
|
||||
};
|
||||
}
|
||||
@ -3,11 +3,11 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "swfmill-0.3.2";
|
||||
name = "swfmill-0.3.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://swfmill.org/releases/${name}.tar.gz";
|
||||
sha256 = "077agf62q0xz95dxj4cq9avcqwin94vldrpb80iqwjskvkwpz9gy";
|
||||
sha256 = "15mcpql448vvgsbxs7wd0vdk1ln6rdcpnif6i2zjm5l4xng55s7r";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig libxslt freetype libpng libxml2 ];
|
||||
|
||||
@ -790,6 +790,10 @@ let
|
||||
|
||||
dmg2img = callPackage ../tools/misc/dmg2img { };
|
||||
|
||||
docbook2odf = callPackage ../tools/typesetting/docbook2odf {
|
||||
inherit (perlPackages) PerlMagick;
|
||||
};
|
||||
|
||||
docbook2x = callPackage ../tools/typesetting/docbook2x {
|
||||
inherit (perlPackages) XMLSAX XMLParser XMLNamespaceSupport;
|
||||
texinfo = texinfo5;
|
||||
@ -4840,6 +4844,8 @@ let
|
||||
|
||||
libgcrypt = callPackage ../development/libraries/libgcrypt { };
|
||||
|
||||
libgcrypt_1_6 = lowPrio (callPackage ../development/libraries/libgcrypt/1.6.nix { });
|
||||
|
||||
libgcrypt_git = lowPrio (callPackage ../development/libraries/libgcrypt/git.nix { });
|
||||
|
||||
libgdiplus = callPackage ../development/libraries/libgdiplus { };
|
||||
@ -8101,7 +8107,7 @@ let
|
||||
gnunet = callPackage ../applications/networking/p2p/gnunet { };
|
||||
|
||||
gnunet_svn = lowPrio (callPackage ../applications/networking/p2p/gnunet/svn.nix {
|
||||
libgcrypt = libgcrypt_git;
|
||||
libgcrypt = libgcrypt_1_6;
|
||||
});
|
||||
|
||||
gocr = callPackage ../applications/graphics/gocr { };
|
||||
|
||||
@ -1782,10 +1782,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
|
||||
ppm = callPackage ../development/libraries/haskell/ppm {};
|
||||
|
||||
prettyShow_1_2 = callPackage ../development/libraries/haskell/pretty-show/1.2.nix {};
|
||||
prettyShow_1_6_2 = callPackage ../development/libraries/haskell/pretty-show/1.6.2.nix {
|
||||
prettyShow_1_6_3 = callPackage ../development/libraries/haskell/pretty-show/1.6.3.nix {
|
||||
happy = self.happy_1_19_2;
|
||||
};
|
||||
prettyShow = self.prettyShow_1_6_2;
|
||||
prettyShow = self.prettyShow_1_6_3;
|
||||
|
||||
punycode = callPackage ../development/libraries/haskell/punycode {};
|
||||
|
||||
|
||||
@ -1489,10 +1489,10 @@ rec {
|
||||
};
|
||||
|
||||
Coro = buildPerlPackage {
|
||||
name = "Coro-6.31";
|
||||
name = "Coro-6.33";
|
||||
src = fetchurl {
|
||||
url = mirror://cpan/authors/id/M/ML/MLEHMANN/Coro-6.31.tar.gz;
|
||||
sha256 = "a73ace48d940b28e3dfb32d2f3507205d3ddfdc6610075ecc72e19476bb6de44";
|
||||
url = mirror://cpan/authors/id/M/ML/MLEHMANN/Coro-6.33.tar.gz;
|
||||
sha256 = "1497wd9df10y65rb0w5h4h6wiy3smw9maw7z0gbz6dir774znfb5";
|
||||
};
|
||||
propagatedBuildInputs = [ AnyEvent Guard CommonSense ];
|
||||
meta = {
|
||||
@ -1502,10 +1502,10 @@ rec {
|
||||
};
|
||||
|
||||
CPANChanges = buildPerlPackage {
|
||||
name = "CPAN-Changes-0.23";
|
||||
name = "CPAN-Changes-0.27";
|
||||
src = fetchurl {
|
||||
url = mirror://cpan/authors/id/B/BR/BRICAS/CPAN-Changes-0.23.tar.gz;
|
||||
sha256 = "445a5c751d047c2a2e20680aa86d8bdab25e52891bac24681e9b4f24e98a347c";
|
||||
url = mirror://cpan/authors/id/B/BR/BRICAS/CPAN-Changes-0.27.tar.gz;
|
||||
sha256 = "14dizyvgzp81hmg0djwnvvkdhqd3bsmms462cj0ai84z221scv1q";
|
||||
};
|
||||
meta = {
|
||||
description = "Read and write Changes files";
|
||||
@ -1570,10 +1570,10 @@ rec {
|
||||
};
|
||||
|
||||
CPANUploader = buildPerlPackage {
|
||||
name = "CPAN-Uploader-0.103004";
|
||||
name = "CPAN-Uploader-0.103006";
|
||||
src = fetchurl {
|
||||
url = mirror://cpan/authors/id/R/RJ/RJBS/CPAN-Uploader-0.103004.tar.gz;
|
||||
sha256 = "cfaf6d4ad32a92cdefabb3abaf1f43c7c11aca5afd5561ea6f691065ac396e97";
|
||||
url = mirror://cpan/authors/id/R/RJ/RJBS/CPAN-Uploader-0.103006.tar.gz;
|
||||
sha256 = "1hkbi2j0a9v4577jxfzw586rvpzw0af61qbiggh3dd7j9b183w39";
|
||||
};
|
||||
propagatedBuildInputs = [ FileHomeDir GetoptLongDescriptive HTTPMessage LWP LWPProtocolhttps TermReadKey ];
|
||||
meta = {
|
||||
@ -1749,10 +1749,10 @@ rec {
|
||||
};
|
||||
|
||||
DataDump = buildPerlPackage {
|
||||
name = "Data-Dump-1.21";
|
||||
name = "Data-Dump-1.22";
|
||||
src = fetchurl {
|
||||
url = mirror://cpan/authors/id/G/GA/GAAS/Data-Dump-1.21.tar.gz;
|
||||
sha256 = "1fcy6q8p406ag8g50l7znns3kxazfb458l6kw8pbsp4axnkz9ydx";
|
||||
url = mirror://cpan/authors/id/G/GA/GAAS/Data-Dump-1.22.tar.gz;
|
||||
sha256 = "1ciqlwsy1q35s94dry9bjy1pwanbq6b7q4rhxm9z8prgkzbslg2k";
|
||||
};
|
||||
meta = {
|
||||
description = "Pretty printing of data structures";
|
||||
@ -1803,10 +1803,10 @@ rec {
|
||||
};
|
||||
|
||||
DataOptList = buildPerlPackage {
|
||||
name = "Data-OptList-0.107";
|
||||
name = "Data-OptList-0.109";
|
||||
src = fetchurl {
|
||||
url = mirror://cpan/authors/id/R/RJ/RJBS/Data-OptList-0.107.tar.gz;
|
||||
sha256 = "0r2sbvh1kj69al5crg394v5j5wkffvqdb17fz1rjfgb6h3v93xi8";
|
||||
url = mirror://cpan/authors/id/R/RJ/RJBS/Data-OptList-0.109.tar.gz;
|
||||
sha256 = "1j44rm2spprlq3bc80cxni3dzs3gfjiqv1qc9q7820n1qj0wgmqw";
|
||||
};
|
||||
propagatedBuildInputs = [ ParamsUtil SubInstall ];
|
||||
meta = {
|
||||
@ -2192,10 +2192,10 @@ rec {
|
||||
};
|
||||
|
||||
DBI = buildPerlPackage {
|
||||
name = "DBI-1.625";
|
||||
name = "DBI-1.630";
|
||||
src = fetchurl {
|
||||
url = mirror://cpan/authors/id/T/TI/TIMB/DBI-1.625.tar.gz;
|
||||
sha256 = "1rl1bnirf1hshc0z04vk41qplx2ixzciabvwy50a1sld7vs46q4w";
|
||||
url = mirror://cpan/authors/id/T/TI/TIMB/DBI-1.630.tar.gz;
|
||||
sha256 = "18szayj2bl28fm9frf9v1dwncj67bx3rvw8ny1zwbvc6alshs5ji";
|
||||
};
|
||||
meta = {
|
||||
homepage = http://dbi.perl.org/;
|
||||
@ -2430,10 +2430,10 @@ rec {
|
||||
};
|
||||
|
||||
DevelSymdump = buildPerlPackage rec {
|
||||
name = "Devel-Symdump-2.08";
|
||||
name = "Devel-Symdump-2.11";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/A/AN/ANDK/${name}.tar.gz";
|
||||
sha256 = "0qzj68zw1yypk8jw77h0w5sdpdcrp4xcmgfghcfyddjr2aim60x5";
|
||||
sha256 = "0i5m2w8rsmp5lqi1y5y6b6938pidpz9hg92xahrshaddph00358i";
|
||||
};
|
||||
propagatedBuildInputs = [
|
||||
TestPod /* cyclic dependency: TestPodCoverage */
|
||||
@ -2966,20 +2966,20 @@ rec {
|
||||
};
|
||||
|
||||
EmailValid = buildPerlPackage {
|
||||
name = "Email-Valid-0.179";
|
||||
name = "Email-Valid-1.192";
|
||||
src = fetchurl {
|
||||
url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Valid-0.179.tar.gz;
|
||||
sha256 = "13yfjll63cp1y4xqzdcr1mjhfncn48v6hckk5mvwi47w3ccj934a";
|
||||
url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Valid-1.192.tar.gz;
|
||||
sha256 = "0vpqgbr5bj4bvrd7c2fh9hs1mz0m6nfybl2rdn5yb4h67bmxfkbp";
|
||||
};
|
||||
propagatedBuildInputs = [MailTools NetDNS];
|
||||
doCheck = false;
|
||||
};
|
||||
|
||||
Encode = buildPerlPackage {
|
||||
name = "Encode-2.44";
|
||||
name = "Encode-2.55";
|
||||
src = fetchurl {
|
||||
url = mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-2.44.tar.gz;
|
||||
sha256 = "c121f9c8ae03e718d1b5d5465d66bb3138af429188735966326656f99a9499c6";
|
||||
url = mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-2.55.tar.gz;
|
||||
sha256 = "0bpnfan0034k644gz6yg9xfddmsqxr2p7vbavijwbxc5k2c2sarz";
|
||||
};
|
||||
};
|
||||
|
||||
@ -3185,10 +3185,10 @@ rec {
|
||||
};
|
||||
|
||||
ExtUtilsMakeMaker = buildPerlPackage rec{
|
||||
name = "ExtUtils-MakeMaker-6.66";
|
||||
name = "ExtUtils-MakeMaker-6.84";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz";
|
||||
sha256 = "1w9pbjajas60a9i29j8h10nz9jf86w7jb197llnfs9fqcf4yvfha";
|
||||
sha256 = "1s3fn1fkm9l6pjhz7dbzsc6nhw1jm2hpf08fqhsqh1h50nj5pv5b";
|
||||
};
|
||||
propagatedBuildInputs =
|
||||
[ ParseCPANMeta version JSONPP CPANMetaYAML CPANMeta
|
||||
@ -3205,10 +3205,10 @@ rec {
|
||||
};
|
||||
|
||||
ExtUtilsParseXS = buildPerlPackage rec {
|
||||
name = "ExtUtils-ParseXS-3.18";
|
||||
name = "ExtUtils-ParseXS-3.22";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz";
|
||||
sha256 = "0kvbx66vncgk2c72994z31bgh2w3rsrlnx0z7cmxqa7w3hlc4741";
|
||||
sha256 = "03i93xfm9064vg2z70mcfwpnbmciafzrng113vmb8w8g117pvr84";
|
||||
};
|
||||
};
|
||||
|
||||
@ -3453,10 +3453,10 @@ rec {
|
||||
};
|
||||
|
||||
FileRemove = buildPerlPackage rec {
|
||||
name = "File-Remove-1.42";
|
||||
name = "File-Remove-1.52";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz";
|
||||
sha256 = "2ec2643c4e1a721965ed70ce184b72ae831c82b577420612a59eba8a0ce2a504";
|
||||
sha256 = "1p8bal9qhwkjbghivxn1d5m3qdj2qwm1agrjbmakm6la9dbxqm21";
|
||||
};
|
||||
};
|
||||
|
||||
@ -3639,10 +3639,10 @@ rec {
|
||||
};
|
||||
|
||||
GetoptLong = buildPerlPackage rec {
|
||||
name = "Getopt-Long-2.38";
|
||||
name = "Getopt-Long-2.42";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/J/JV/JV/${name}.tar.gz";
|
||||
sha256 = "0lrsm8vlqhdnkzfvyaiyfivmaar0rirrnwa2v0qk6l130a497mky";
|
||||
sha256 = "12c5pvmx0jxx0mls8qll9ixb1lbacs7p1rwvmciv0dvw3w25dmr7";
|
||||
};
|
||||
};
|
||||
|
||||
@ -3887,10 +3887,10 @@ rec {
|
||||
};
|
||||
|
||||
HTMLParser = buildPerlPackage {
|
||||
name = "HTML-Parser-3.69";
|
||||
name = "HTML-Parser-3.71";
|
||||
src = fetchurl {
|
||||
url = mirror://cpan/authors/id/G/GA/GAAS/HTML-Parser-3.69.tar.gz;
|
||||
sha256 = "01i4lj37dgwbj9mna756dzzz5lvx7adcnjk9s0hskqq0cn81r2vl";
|
||||
url = mirror://cpan/authors/id/G/GA/GAAS/HTML-Parser-3.71.tar.gz;
|
||||
sha256 = "00nqzdgl7c3jilx7mil19k5jwcw3as14pvkjgxi97zyk94vqp4dy";
|
||||
};
|
||||
propagatedBuildInputs = [ HTMLTagset ];
|
||||
meta = {
|
||||
@ -3955,10 +3955,10 @@ rec {
|
||||
};
|
||||
|
||||
HTMLTokeParserSimple = buildPerlPackage rec {
|
||||
name = "HTML-TokeParser-Simple-3.15";
|
||||
name = "HTML-TokeParser-Simple-3.16";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/O/OV/OVID/${name}.tar.gz";
|
||||
sha256 = "0ii1ww17h7wps1lcj7bxrjbisa37f6cvlm0xxpgfq1s6iy06q05b";
|
||||
sha256 = "17aa1v62sp8ycxcicwhankmj4brs6nnfclk9z7mf1rird1f164gd";
|
||||
};
|
||||
propagatedBuildInputs = [HTMLParser SubOverride];
|
||||
buildInputs = [TestPod];
|
||||
@ -4162,10 +4162,10 @@ rec {
|
||||
};
|
||||
|
||||
IOAll = buildPerlPackage {
|
||||
name = "IO-All-0.46";
|
||||
name = "IO-All-0.50";
|
||||
src = fetchurl {
|
||||
url = mirror://cpan/authors/id/I/IN/INGY/IO-All-0.46.tar.gz;
|
||||
sha256 = "0rqv270gi7x4sjicfwf1hiqvicwlj3s0zyi2cxqwrc8q9hs2pdya";
|
||||
url = mirror://cpan/authors/id/I/IN/INGY/IO-All-0.50.tar.gz;
|
||||
sha256 = "13mc913jqqfkaily48cd886x0n6x6zw59c00fmkhqc97xh1kdckc";
|
||||
};
|
||||
propagatedBuildInputs = [ IOString ];
|
||||
meta = {
|
||||
@ -4186,10 +4186,10 @@ rec {
|
||||
};
|
||||
|
||||
IOCompress = buildPerlPackage {
|
||||
name = "IO-Compress-2.060";
|
||||
name = "IO-Compress-2.063";
|
||||
src = fetchurl {
|
||||
url = mirror://cpan/authors/id/P/PM/PMQS/IO-Compress-2.060.tar.gz;
|
||||
sha256 = "03zaq9xzg0z9wcgj1hws8zhzdgdlwiz48nh6sy663bn7rzxm5k28";
|
||||
url = mirror://cpan/authors/id/P/PM/PMQS/IO-Compress-2.063.tar.gz;
|
||||
sha256 = "1198jqsfyshc8pc74dvn04gmqa0x6nwngkbf731zgd4chrjlylhd";
|
||||
};
|
||||
propagatedBuildInputs = [ CompressRawBzip2 CompressRawZlib ];
|
||||
meta = {
|
||||
@ -4251,10 +4251,10 @@ rec {
|
||||
};
|
||||
|
||||
IOSocketInet6 = buildPerlPackage rec {
|
||||
name = "IO-Socket-INET6-2.69";
|
||||
name = "IO-Socket-INET6-2.71";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz";
|
||||
sha256 = "accd565643969d905e199e28e60e833213ccc2026c372432df01e49b044c3045";
|
||||
sha256 = "041iv3fdskvk7in73bf7253ah9aiqwxzi4zxfiwkn0jlb7mnqjrl";
|
||||
};
|
||||
propagatedBuildInputs = [Socket6];
|
||||
doCheck = false;
|
||||
@ -4329,10 +4329,10 @@ rec {
|
||||
};
|
||||
|
||||
IPCRun3 = buildPerlPackage rec {
|
||||
name = "IPC-Run3-0.043";
|
||||
name = "IPC-Run3-0.046";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz";
|
||||
sha256 = "96b534e07e1459529ac12a77393628366f30d122b0dfaaa3ed5ec032079097ad";
|
||||
sha256 = "033miv4z6g50q71blj8l1g846frngm1v5l3mcv38dslkjqimxxp4";
|
||||
};
|
||||
};
|
||||
|
||||
@ -5001,10 +5001,10 @@ rec {
|
||||
};
|
||||
|
||||
MIMEBase64 = buildPerlPackage rec {
|
||||
name = "MIME-Base64-3.09";
|
||||
name = "MIME-Base64-3.14";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/G/GA/GAAS/${name}.tar.gz";
|
||||
sha256 = "1gi2zyxwkkmyng8jawfnbxpsybvybz6h6ryq0wfdljmmjpjbmzzc";
|
||||
sha256 = "1qbcipxij7pv25qhnfdc2lnkqi2cf60frlhlh86gjxslc8kr8nhj";
|
||||
};
|
||||
};
|
||||
|
||||
@ -5018,10 +5018,10 @@ rec {
|
||||
};
|
||||
|
||||
MIMETypes = buildPerlPackage {
|
||||
name = "MIME-Types-1.38";
|
||||
name = "MIME-Types-2.04";
|
||||
src = fetchurl {
|
||||
url = mirror://cpan/authors/id/M/MA/MARKOV/MIME-Types-1.38.tar.gz;
|
||||
sha256 = "12m8cvj80qbwxckj5jildl5zw6p1jincj3m1s77z6lnw3h59rj4l";
|
||||
url = mirror://cpan/authors/id/M/MA/MARKOV/MIME-Types-2.04.tar.gz;
|
||||
sha256 = "13yci99n8kl8p4ac5n5f1j968p7va2phlvfc5qgpnn1d6yfhddi2";
|
||||
};
|
||||
meta = {
|
||||
description = "Definition of MIME types";
|
||||
@ -5080,10 +5080,10 @@ rec {
|
||||
};
|
||||
|
||||
ModuleCoreList = buildPerlPackage {
|
||||
name = "Module-CoreList-2.97";
|
||||
name = "Module-CoreList-3.01";
|
||||
src = fetchurl {
|
||||
url = mirror://cpan/authors/id/B/BI/BINGOS/Module-CoreList-2.97.tar.gz;
|
||||
sha256 = "fa39c487d43088e7010467621f57d8e3f57b72d2bbf711fc509e87a501f35e09";
|
||||
url = mirror://cpan/authors/id/B/BI/BINGOS/Module-CoreList-3.01.tar.gz;
|
||||
sha256 = "10vf18x9qk4hdpwazxq8c0qykals36dxj0bjazqqcbp5xfb4fnyg";
|
||||
};
|
||||
meta = {
|
||||
homepage = http://dev.perl.org/;
|
||||
@ -5178,10 +5178,10 @@ rec {
|
||||
};
|
||||
|
||||
ModuleMetadata = buildPerlPackage rec {
|
||||
name = "Module-Metadata-1.000005";
|
||||
name = "Module-Metadata-1.000019";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/modules/by-module/Module/${name}.tar.gz";
|
||||
sha256 = "04xxs3542mqdadcs2bdlpyldmbbxdn9x0gwjnyy5p1d5c3ajnq9k";
|
||||
sha256 = "0m755qn44nasbaj578628jgdqg0k4ldyn6fm3880hdi1q16skz2s";
|
||||
};
|
||||
propagatedBuildInputs = [ version ];
|
||||
};
|
||||
@ -6388,10 +6388,10 @@ rec {
|
||||
};
|
||||
|
||||
ParseCPANMeta = buildPerlPackage rec {
|
||||
name = "Parse-CPAN-Meta-1.4404";
|
||||
name = "Parse-CPAN-Meta-1.4409";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/modules/by-module/Parse/${name}.tar.gz";
|
||||
sha256 = "1y4mr5hmkkl405x4v31kx2nmlahpg0c38k8s65vgqc4s28wxafmh";
|
||||
sha256 = "0b7cp78zajmwf4a0968p3b2bb00axkxj3a9nq1rx8cb17hhva819";
|
||||
};
|
||||
propagatedBuildInputs = [ CPANMetaYAML JSONPP ];
|
||||
};
|
||||
@ -6511,10 +6511,10 @@ rec {
|
||||
};
|
||||
|
||||
PerlTidy = buildPerlPackage rec {
|
||||
name = "Perl-Tidy-20090616";
|
||||
name = "Perl-Tidy-20130922";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/S/SH/SHANCOCK/${name}.tar.gz";
|
||||
sha256 = "c7ca21e287d23c769c235f6742fab7b5779b7c7bf58b6a55ba8cdc492e50a118";
|
||||
sha256 = "0qmp6308917lsvms5dbihdj85cnkhy821azc5i6q3p3703qdd375";
|
||||
};
|
||||
};
|
||||
|
||||
@ -6657,10 +6657,10 @@ rec {
|
||||
};
|
||||
|
||||
Perl6Junction = buildPerlPackage rec {
|
||||
name = "Perl6-Junction-1.40000";
|
||||
name = "Perl6-Junction-1.60000";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/C/CF/CFRANKS/${name}.tar.gz";
|
||||
sha256 = "0sgv8hqrkhx73bcb5jyi8a0b3v5bxqr3aziram1zndx43i1knzp4";
|
||||
sha256 = "0r3in9pyrm6wfrhcvxbq5w1617x8x5537lxj9hdzks4pa7l7a8yh";
|
||||
};
|
||||
};
|
||||
|
||||
@ -7215,10 +7215,10 @@ rec {
|
||||
};
|
||||
|
||||
Starman = buildPerlModule {
|
||||
name = "Starman-0.3011";
|
||||
name = "Starman-0.4008";
|
||||
src = fetchurl {
|
||||
url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Starman-0.3011.tar.gz;
|
||||
sha256 = "f700e1e9fa8a56609db1b75878ccfbbccfda32454c32e3c33912a1776f583cf2";
|
||||
url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Starman-0.4008.tar.gz;
|
||||
sha256 = "06fc3yp3nmi26d7lcfqanwwk5jxsmqmidyr8n2qfrsa0r7d07c88";
|
||||
};
|
||||
buildInputs = [ ModuleBuildTiny TestRequires ];
|
||||
propagatedBuildInputs = [ DataDump HTTPDate HTTPMessage HTTPParserXS NetServer Plack TestTCP ];
|
||||
@ -8048,10 +8048,10 @@ rec {
|
||||
};
|
||||
|
||||
TestFatal = buildPerlPackage {
|
||||
name = "Test-Fatal-0.010";
|
||||
name = "Test-Fatal-0.013";
|
||||
src = fetchurl {
|
||||
url = mirror://cpan/authors/id/R/RJ/RJBS/Test-Fatal-0.010.tar.gz;
|
||||
sha256 = "01ck4wyrj4nqyr1cz3lcff6g9nryadsflpf85jmsa6vcl2bq8pl0";
|
||||
url = mirror://cpan/authors/id/R/RJ/RJBS/Test-Fatal-0.013.tar.gz;
|
||||
sha256 = "1rrndzkjff3bdlzzdsfsd3fhng142la2m74ihkgv17islkp17yq2";
|
||||
};
|
||||
propagatedBuildInputs = [ TryTiny ];
|
||||
meta = {
|
||||
@ -8408,10 +8408,10 @@ rec {
|
||||
};
|
||||
|
||||
TestTester = buildPerlPackage {
|
||||
name = "Test-Tester-0.108";
|
||||
name = "Test-Tester-0.109";
|
||||
src = fetchurl {
|
||||
url = mirror://cpan/authors/id/F/FD/FDALY/Test-Tester-0.108.tar.gz;
|
||||
sha256 = "1pby9w41b7z0cgnxpgkh397x7z68855sjg5yda48r6lck3lga62h";
|
||||
url = mirror://cpan/authors/id/F/FD/FDALY/Test-Tester-0.109.tar.gz;
|
||||
sha256 = "0m9n28z09kq455r5nydj1bnr85lvmbfpcbjdkjfbpmfb5xgciiyk";
|
||||
};
|
||||
};
|
||||
|
||||
@ -9307,10 +9307,10 @@ rec {
|
||||
};
|
||||
|
||||
XMLTwig = buildPerlPackage {
|
||||
name = "XML-Twig-3.32";
|
||||
name = "XML-Twig-3.44";
|
||||
src = fetchurl {
|
||||
url = mirror://cpan/authors/id/M/MI/MIROD/XML-Twig-3.32.tar.gz;
|
||||
sha256 = "07zdsfzw9dlrx6ril9clf1jfif09vpf27rz66laja7mvih9izd1v";
|
||||
url = mirror://cpan/authors/id/M/MI/MIROD/XML-Twig-3.44.tar.gz;
|
||||
sha256 = "1fi05ddq4dqpff7xvgsw2rr8p5bah401gmblyb3pvjg225ic2l96";
|
||||
};
|
||||
propagatedBuildInputs = [XMLParser];
|
||||
doCheck = false; # requires lots of extra packages
|
||||
|
||||
@ -4670,11 +4670,11 @@ pythonPackages = modules // import ./python-packages-generated.nix {
|
||||
|
||||
|
||||
pygit2 = buildPythonPackage rec {
|
||||
name = "pygit2-0.18.1";
|
||||
name = "pygit2-0.20.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://pypi.python.org/packages/source/p/pygit2/${name}.tar.gz";
|
||||
md5 = "8d27f84509a96d6791a6c393ae67d7c8";
|
||||
sha256 = "04132q7bn8k7q7ky7nj3bkza8r9xkzkdpfv462b6rgjsd1x6h340";
|
||||
};
|
||||
|
||||
preConfigure = ( if stdenv.isDarwin then ''
|
||||
@ -5360,11 +5360,11 @@ pythonPackages = modules // import ./python-packages-generated.nix {
|
||||
|
||||
|
||||
pysvn = pkgs.stdenv.mkDerivation {
|
||||
name = "pysvn-1.7.6";
|
||||
name = "pysvn-1.7.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pysvn.barrys-emacs.org/source_kits/pysvn-1.7.6.tar.gz";
|
||||
sha256 = "0wwb9h3rw2r8hzqya8mv5z8pgjpa6y3i15a3cccdv2mil44289a7";
|
||||
url = "http://pysvn.barrys-emacs.org/source_kits/pysvn-1.7.8.tar.gz";
|
||||
sha256 = "1qk7af0laby1f79bd07l9p0dxn5xmcmfwlcb9l1hk29zwwq6x4v0";
|
||||
};
|
||||
|
||||
buildInputs = [ python pkgs.subversion pkgs.apr pkgs.aprutil pkgs.expat pkgs.neon pkgs.openssl ]
|
||||
@ -6860,12 +6860,12 @@ pythonPackages = modules // import ./python-packages-generated.nix {
|
||||
|
||||
|
||||
webob = buildPythonPackage rec {
|
||||
version = "1.2.3";
|
||||
version = "1.3.1";
|
||||
name = "webob-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pypi.python.org/packages/source/W/WebOb/WebOb-${version}.tar.gz";
|
||||
md5 = "11825b7074ba7043e157805e4e6e0f55";
|
||||
md5 = "20918251c5726956ba8fef22d1556177";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ nose modules.ssl ];
|
||||
|
||||
Loading…
Reference in New Issue
Block a user