Merge remote-tracking branch 'upstream/master'
This commit is contained in:
Jack Cummings
commit
a2bf1b169a
@ -18,6 +18,10 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# This file should normally require a gtk-update-icon-cache -q /usr/share/icons/hicolor command
|
||||
# It have no reasons to exist in a redistribuable package
|
||||
postInstall = "rm $out/share/icons/hicolor/icon-theme.cache";
|
||||
|
||||
meta = {
|
||||
description = "A GTK2 small and ligthweight IDE.";
|
||||
longDescription = ''
|
||||
|
||||
@ -3,24 +3,24 @@
|
||||
, libgnome_keyring, gphoto2, gtk, ilmbase, intltool, lcms, lcms2
|
||||
, lensfun, libXau, libXdmcp, libexif, libglade, libgphoto2, libjpeg
|
||||
, libpng, libpthreadstubs, libraw1394, librsvg, libtiff, libxcb
|
||||
, openexr, pixman, pkgconfig, sqlite, bash }:
|
||||
, openexr, pixman, pkgconfig, sqlite, bash, libxslt }:
|
||||
|
||||
assert stdenv ? glibc;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.0.5";
|
||||
version = "1.1";
|
||||
name = "darktable-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/darktable/darktable-${version}.tar.gz";
|
||||
sha256 = "0c18530446d2f2459fe533a1ef6fc2711300efe7466f36c23168ec2230fb5fbd";
|
||||
sha256 = "8f2401422ab3e0bb038b3fedf411aaf69994d679674757ee7886b6146b9fdd4f";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
[ GConf atk cairo cmake curl dbus_glib exiv2 glib libgnome_keyring gtk
|
||||
ilmbase intltool lcms lcms2 lensfun libXau libXdmcp libexif
|
||||
libglade libgphoto2 libjpeg libpng libpthreadstubs libraw1394
|
||||
librsvg libtiff libxcb openexr pixman pkgconfig sqlite
|
||||
librsvg libtiff libxcb openexr pixman pkgconfig sqlite libxslt
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
|
||||
@ -22,6 +22,10 @@ stdenv.mkDerivation rec {
|
||||
|
||||
patches = [ ./glib-top-level-header.patch ];
|
||||
|
||||
# This file should normally require a gtk-update-icon-cache -q /usr/share/icons/hicolor command
|
||||
# It have no reasons to exist in a redistribuable package
|
||||
postInstall = "rm $out/share/icons/hicolor/icon-theme.cache";
|
||||
|
||||
meta = {
|
||||
description = "Gnome Diagram drawing software";
|
||||
homepage = http://live.gnome.org/Dia;
|
||||
|
||||
@ -1,28 +1,34 @@
|
||||
{ stdenv, fetchurl, qt4}:
|
||||
{ stdenv, fetchurl, qt4, muparser, which}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "librecad-1.0.0";
|
||||
name = "librecad-1.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = https://github.com/LibreCAD/LibreCAD/tarball/v1.0.0;
|
||||
name = "librecad-1.0.0.tar.gz";
|
||||
sha256 = "0s1ikyvy98zz1vw3xf5la73n3sykib6292cmhh2z738ggwigicc9";
|
||||
url = https://github.com/LibreCAD/LibreCAD/tarball/v1.0.2;
|
||||
name = "librecad-1.0.2.tar.gz";
|
||||
sha256 = "13ee7e401e4f5fbc68c2e017b7189bec788038f4f6e77f559861ceb8cfb1907d";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
sed -i -e s,/bin/bash,`type -P bash`, scripts/postprocess-unix.sh
|
||||
sed -i -e s,/usr/share,$out/share, src/lib/engine/rs_system.cpp
|
||||
'';
|
||||
|
||||
configurePhase = "qmake PREFIX=$out";
|
||||
|
||||
# It builds, but it does not install
|
||||
installPhase = "exit 1";
|
||||
installPhase = ''
|
||||
ensureDir $out/bin $out/share
|
||||
cp -R unix/librecad $out/bin
|
||||
cp -R unix/resources $out/share/librecad
|
||||
'';
|
||||
|
||||
buildInputs = [ qt4 ];
|
||||
buildInputs = [ qt4 muparser which ];
|
||||
|
||||
meta = {
|
||||
description = "A 2D CAD package based upon Qt";
|
||||
homepage = http://librecad.org;
|
||||
license = "GPLv2";
|
||||
maintainers = with stdenv.lib.maintainers; [viric];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,55 +0,0 @@
|
||||
# translations still misssing
|
||||
|
||||
{ stdenv, fetchurl, qt3, libpng, libXext, libX11 }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "qcad-2.0.5.0-1-community";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://www.ribbonsoft.com/archives/qcad/qcad-2.0.5.0-1-community.src.tar.gz;
|
||||
sha256 = "07aiw7zjf1fc04dhgwwp29adwb2qs165n7v04lh09zy0k2aplcl3";
|
||||
};
|
||||
|
||||
# TODO: add translations
|
||||
buildPhase = ''
|
||||
cd scripts
|
||||
sh build_qcad.sh notrans
|
||||
cd ..
|
||||
'';
|
||||
|
||||
buildInputs = [ qt3 libpng libXext libX11 ];
|
||||
|
||||
prePatch = ''
|
||||
sed -i 's/-pedantic//' mkspecs/defs.pro
|
||||
# patch -p1 < ${ ./qcad-2.0.4.0-1.src-intptr.patch }
|
||||
'';
|
||||
patches = [
|
||||
/* taken from gentoo, fixes amd64 compilation issue */
|
||||
./qcad-2.0.4.0-1.src-intptr.patch
|
||||
/* taken from gentoo, fixes gcc 4.3 or above compilation issue */
|
||||
./qcad-2.0.4.0-gcc43.patch
|
||||
];
|
||||
|
||||
# probably there is more to be done. But this seems to work for now (eg see gentoo ebuild)
|
||||
installPhase = ''
|
||||
mkdir -p $out/{bin,share}
|
||||
cp -r qcad $out/share
|
||||
|
||||
# The compilation does not fail with error code. But qcad will not exist
|
||||
# if it failed.
|
||||
test -f $out/share/qcad/qcad
|
||||
|
||||
cat >> $out/bin/qcad << EOF
|
||||
#!/bin/sh
|
||||
cd $out/share/qcad
|
||||
./qcad "\$@"
|
||||
EOF
|
||||
chmod +x $out/bin/qcad
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A 2D CAD package based upon Qt";
|
||||
homepage = http://www.ribbonsoft.de/qcad.html;
|
||||
license = "GPLv2"; # community edition
|
||||
};
|
||||
}
|
||||
@ -1,24 +0,0 @@
|
||||
diff -Naur qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_entity.cpp qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_entity.cpp
|
||||
--- qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_entity.cpp 2004-09-14 15:13:02.000000000 -0500
|
||||
+++ qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_entity.cpp 2006-06-23 14:21:40.000000000 -0500
|
||||
@@ -849,7 +849,7 @@
|
||||
os << " layer: NULL ";
|
||||
} else {
|
||||
os << " layer: " << e.layer->getName().latin1() << " ";
|
||||
- os << " layer address: " << (int)(e.layer) << " ";
|
||||
+ os << " layer address: " << (intptr_t)(e.layer) << " ";
|
||||
}
|
||||
|
||||
os << e.pen << "\n";
|
||||
diff -Naur qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_layer.cpp qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_layer.cpp
|
||||
--- qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_layer.cpp 2004-09-14 15:13:02.000000000 -0500
|
||||
+++ qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_layer.cpp 2006-06-23 14:21:23.000000000 -0500
|
||||
@@ -57,7 +57,7 @@
|
||||
os << " name: " << l.getName().latin1()
|
||||
<< " pen: " << l.getPen()
|
||||
<< " frozen: " << (int)l.isFrozen()
|
||||
- << " address: " << (int)(&l)
|
||||
+ << " address: " << (intptr_t)(&l)
|
||||
<< std::endl;
|
||||
return os;
|
||||
}
|
||||
@ -1,45 +0,0 @@
|
||||
diff -Naur qcad-2.0.4.0-1.src/dxflib/src/dl_writer_ascii.cpp qcad-2.0.4.0-1.src.new/dxflib/src/dl_writer_ascii.cpp
|
||||
--- qcad-2.0.4.0-1.src/dxflib/src/dl_writer_ascii.cpp 2004-09-14 16:13:01.000000000 -0400
|
||||
+++ qcad-2.0.4.0-1.src.new/dxflib/src/dl_writer_ascii.cpp 2008-04-27 08:35:47.000000000 -0400
|
||||
@@ -30,6 +30,7 @@
|
||||
#endif // _MSC_VER > 1000
|
||||
|
||||
#include <stdio.h>
|
||||
+#include <cstring>
|
||||
|
||||
#include "dl_writer_ascii.h"
|
||||
#include "dl_exception.h"
|
||||
diff -Naur qcad-2.0.4.0-1.src/dxflib/src/dl_writer.h qcad-2.0.4.0-1.src.new/dxflib/src/dl_writer.h
|
||||
--- qcad-2.0.4.0-1.src/dxflib/src/dl_writer.h 2004-09-14 16:13:01.000000000 -0400
|
||||
+++ qcad-2.0.4.0-1.src.new/dxflib/src/dl_writer.h 2008-04-27 08:35:48.000000000 -0400
|
||||
@@ -34,6 +34,7 @@
|
||||
|
||||
|
||||
#include <iostream>
|
||||
+#include <cstring>
|
||||
|
||||
#include "dl_attributes.h"
|
||||
|
||||
diff -Naur qcad-2.0.4.0-1.src/qcadactions/src/rs_actionzoompan.cpp qcad-2.0.4.0-1.src.new/qcadactions/src/rs_actionzoompan.cpp
|
||||
--- qcad-2.0.4.0-1.src/qcadactions/src/rs_actionzoompan.cpp 2004-09-14 16:13:03.000000000 -0400
|
||||
+++ qcad-2.0.4.0-1.src.new/qcadactions/src/rs_actionzoompan.cpp 2008-04-27 08:35:48.000000000 -0400
|
||||
@@ -28,6 +28,7 @@
|
||||
#include "rs_snapper.h"
|
||||
#include "rs_point.h"
|
||||
|
||||
+#include <cstdlib>
|
||||
|
||||
RS_ActionZoomPan::RS_ActionZoomPan(RS_EntityContainer& container,
|
||||
RS_GraphicView& graphicView)
|
||||
diff -Naur qcad-2.0.4.0-1.src/qcadlib/src/information/rs_information.h qcad-2.0.4.0-1.src.new/qcadlib/src/information/rs_information.h
|
||||
--- qcad-2.0.4.0-1.src/qcadlib/src/information/rs_information.h 2004-09-14 16:13:02.000000000 -0400
|
||||
+++ qcad-2.0.4.0-1.src.new/qcadlib/src/information/rs_information.h 2008-04-27 08:35:48.000000000 -0400
|
||||
@@ -31,7 +31,7 @@
|
||||
#include "rs_line.h"
|
||||
#include "rs_arc.h"
|
||||
|
||||
-
|
||||
+#include <cstdlib>
|
||||
|
||||
/**
|
||||
* Class for getting information about entities. This includes
|
||||
@ -6,13 +6,13 @@
|
||||
sha256 = "1i7ga1qhnjvnw2gynmpmsvvl5pxcb5z9sgldp87d9yalim5sra6s";
|
||||
};
|
||||
beta = {
|
||||
version = "24.0.1312.14";
|
||||
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1312.14.tar.bz2";
|
||||
sha256 = "03w8cg4kqmpj82976ax9x6y275y9gcri4vc11cvfjp6r1issxzk8";
|
||||
version = "24.0.1312.25";
|
||||
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1312.25.tar.bz2";
|
||||
sha256 = "1d2wnv0pmvja1vwqmccngajwgf9kwz55bhid43k1db7yczi591fr";
|
||||
};
|
||||
stable = {
|
||||
version = "23.0.1271.64";
|
||||
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1271.64.tar.bz2";
|
||||
sha256 = "1rzz08sgw07nkmvhhgyrkrcxj3z24lxbx0di6ky6jz3lshibp578";
|
||||
version = "23.0.1271.91";
|
||||
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1271.91.tar.bz2";
|
||||
sha256 = "00avyc8bszkb99jq399jr3h1ia7lw68msszvrdhl5rh052z1lp9q";
|
||||
};
|
||||
}
|
||||
|
||||
@ -73,6 +73,10 @@ stdenv.mkDerivation rec {
|
||||
postFixup = ''
|
||||
oldRPATH=`patchelf --print-rpath $out/lib/opera/opera`
|
||||
patchelf --set-rpath $oldRPATH:${cups}/lib $out/lib/opera/opera
|
||||
|
||||
# This file should normally require a gtk-update-icon-cache -q /usr/share/icons/hicolor command
|
||||
# It have no reasons to exist in a redistribuable package
|
||||
rm $out/share/icons/hicolor/icon-theme.cache
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@ -0,0 +1,46 @@
|
||||
|
||||
{ stdenv, fetchurl, cmake,
|
||||
singlePrec ? true,
|
||||
fftw
|
||||
}:
|
||||
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "gromacs-4.5.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.5.5.tar.gz";
|
||||
md5 = "6a87e7cdfb25d81afa9fea073eb28468";
|
||||
};
|
||||
|
||||
buildInputs = [cmake fftw];
|
||||
|
||||
cmakeFlags = ''
|
||||
${if singlePrec then "-DGMX_DOUBLE=OFF" else "-DGMX_DOUBLE=ON -DGMX_DEFAULT_SUFFIX=OFF"}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "http://www.gromacs.org";
|
||||
licence = "GPLv2";
|
||||
description = "The GROMACS molecular dynamics software package";
|
||||
longDescription = ''
|
||||
GROMACS is a versatile package to perform molecular dynamics,
|
||||
i.e. simulate the Newtonian equations of motion for systems
|
||||
with hundreds to millions of particles.
|
||||
|
||||
It is primarily designed for biochemical molecules like
|
||||
proteins, lipids and nucleic acids that have a lot of
|
||||
complicated bonded interactions, but since GROMACS is
|
||||
extremely fast at calculating the nonbonded interactions (that
|
||||
usually dominate simulations) many groups are also using it
|
||||
for research on non-biological systems, e.g. polymers.
|
||||
|
||||
GROMACS supports all the usual algorithms you expect from a
|
||||
modern molecular dynamics implementation, (check the online
|
||||
reference or manual for details), but there are also quite a
|
||||
few features that make it stand out from the competition.
|
||||
|
||||
See: http://www.gromacs.org/About_Gromacs for details.
|
||||
'';
|
||||
};
|
||||
}
|
||||
@ -12,14 +12,14 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "3.20121112-161-gb27d9eb";
|
||||
version = "3.20121126";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "git-annex-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;h=b27d9ebd0f63bdc449440f2529224d5b655ddbb3;sf=tgz";
|
||||
sha256 = "507efc50e33566a51a6abf688920d30fc55ce984c9c35be085e6df0767686b3a";
|
||||
url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=${version}";
|
||||
sha256 = "7db662ac1869582dda7bfa7d6218a61a962219ea4c94c27153877fa02000be33";
|
||||
name = "git-annex-${version}.tar.gz";
|
||||
};
|
||||
|
||||
@ -36,7 +36,6 @@ stdenv.mkDerivation {
|
||||
checkTarget = "test";
|
||||
doCheck = true;
|
||||
|
||||
# The 'add_url' test fails because it attempts to use the network.
|
||||
preConfigure = ''
|
||||
makeFlagsArray=( PREFIX=$out )
|
||||
sed -i -e 's|#!/usr/bin/perl|#!${perl}/bin/perl|' Build/mdwn2man
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
let
|
||||
|
||||
version = "1.8.0";
|
||||
version = "1.8.0.1";
|
||||
|
||||
svn = subversionClient.override { perlBindings = true; };
|
||||
|
||||
@ -20,7 +20,7 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://git-core.googlecode.com/files/git-${version}.tar.gz";
|
||||
sha1 = "a03afc33f8f0723ad12649d79f1e8968526b4bf7";
|
||||
sha1 = "4e7492f7558f3ba2a450c43efa7de3b0b1adc6c1";
|
||||
};
|
||||
|
||||
patches = [ ./docbook2texi.patch ];
|
||||
|
||||
@ -18,6 +18,7 @@ stdenv.mkDerivation rec {
|
||||
arpack_ver = "3.1.2";
|
||||
clp_ver = "1.14.5";
|
||||
lighttpd_ver = "1.4.29";
|
||||
patchelf_ver = "0.6";
|
||||
|
||||
grisu_src = fetchurl {
|
||||
url = "http://double-conversion.googlecode.com/files/double-conversion-${grisu_ver}.tar.gz";
|
||||
@ -52,11 +53,15 @@ stdenv.mkDerivation rec {
|
||||
url = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${lighttpd_ver}.tar.gz";
|
||||
sha256 = "ff9f4de3901d03bb285634c5b149191223d17f1c269a16c863bac44238119c85";
|
||||
};
|
||||
patchelf_src = fetchurl {
|
||||
url = "http://hydra.nixos.org/build/1524660/download/2/patchelf-${patchelf_ver}.tar.bz2";
|
||||
sha256 = "00bw29vdsscsili65wcb5ay0gvg1w0ljd00sb5xc6br8bylpyzpw";
|
||||
};
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://github.com/JuliaLang/julia.git";
|
||||
rev = "51076ef4c1b269de738b6185865b389601627eb7";
|
||||
sha256 = "1hbhxdiymkv0pd4dhr9wbvh1566ivfffhmafsjh8jcwh2f9fz90b";
|
||||
rev = "53598b026b6fd9f79eba02cbc4e2d6c38ca32bd7";
|
||||
sha256 = "159yasgfbbj6px16kgwf7bg478giv8zbm5hg90ipncp1ls2lv3jy";
|
||||
};
|
||||
|
||||
buildInputs = [ gfortran perl m4 gmp pcre llvm readline zlib
|
||||
@ -75,13 +80,14 @@ stdenv.mkDerivation rec {
|
||||
cp "$1" "$2/$(basename "$1" | sed -e 's/^[a-z0-9]*-//')"
|
||||
}
|
||||
|
||||
for i in "${grisu_src}" "${dsfmt_src}" "${arpack_src}" "${clp_src}" ; do
|
||||
for i in "${grisu_src}" "${dsfmt_src}" "${arpack_src}" "${clp_src}" "${patchelf_src}" ; do
|
||||
copy_kill_hash "$i" deps
|
||||
done
|
||||
copy_kill_hash "${dsfmt_src}" deps/random
|
||||
|
||||
${if realGcc ==null then "" else
|
||||
''export NIX_LDFLAGS="$NIX_LDFLAGS -L${realGcc}/lib -L${realGcc}/lib64 -lpcre -llapack -lm -lfftw3f -lfftw3 -lglpk -lunistring -lz "''}
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC "
|
||||
|
||||
sed -e 's@ cpp @ gcc -E @g' -i base/Makefile
|
||||
|
||||
@ -103,6 +109,9 @@ stdenv.mkDerivation rec {
|
||||
preBuild = ''
|
||||
make -C test/unicode all SHELL="${stdenv.shell}"
|
||||
make -C extras glpk_h.jl GLPK_PREFIX="$GLPK_PREFIX" SHELL="${stdenv.shell}"
|
||||
|
||||
mkdir -p usr/lib
|
||||
ln -s libuv.a usr/lib/uv.a
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
||||
34
pkgs/development/libraries/despotify/default.nix
Normal file
34
pkgs/development/libraries/despotify/default.nix
Normal file
@ -0,0 +1,34 @@
|
||||
{
|
||||
stdenv, fetchsvn, openssl, zlib, libvorbis, pulseaudio, gstreamer, libao,
|
||||
libtool, ncurses, glibc
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
name = "despotify";
|
||||
|
||||
src = fetchsvn {
|
||||
url = "https://despotify.svn.sourceforge.net/svnroot/despotify";
|
||||
rev = "521";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
openssl zlib libvorbis pulseaudio gstreamer libao libtool ncurses glibc
|
||||
];
|
||||
|
||||
configurePhase = "cd src";
|
||||
|
||||
installPhase = "make LDCONFIG=true INSTALL_PREFIX=$out install";
|
||||
|
||||
meta = {
|
||||
description = "Open source Spotify client and library";
|
||||
longDescription = ''
|
||||
despotify is a open source implementation of the Spotify API. This
|
||||
package provides both a library and a few already quite useful,
|
||||
proof-of-concept clients.
|
||||
'';
|
||||
homepage = "http://despotify.se";
|
||||
license = stdenv.lib.licenses.bsd2;
|
||||
};
|
||||
|
||||
}
|
||||
15
pkgs/development/libraries/haskell/bmp/1.2.3.2.nix
Normal file
15
pkgs/development/libraries/haskell/bmp/1.2.3.2.nix
Normal file
@ -0,0 +1,15 @@
|
||||
{ cabal, binary }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "bmp";
|
||||
version = "1.2.3.2";
|
||||
sha256 = "0lr6ys15ap3myzv48xmcy0bv17s4x2drskqz3kmbp06knrx9y1bh";
|
||||
buildDepends = [ binary ];
|
||||
meta = {
|
||||
homepage = "http://code.ouroborus.net/bmp";
|
||||
description = "Read and write uncompressed BMP image files";
|
||||
license = self.stdenv.lib.licenses.mit;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [ self.stdenv.lib.maintainers.andres ];
|
||||
};
|
||||
})
|
||||
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "conduit";
|
||||
version = "0.5.4.1";
|
||||
sha256 = "00fx4v9phclyg8ybz22w8053pfvy92nibx5g3c6h37hhn7hnsxh4";
|
||||
version = "0.5.4.2";
|
||||
sha256 = "0v79bjdn3pvfsyy48h1wjpzyds2sa963wqii9qz7dfkdfq0s825y";
|
||||
buildDepends = [
|
||||
liftedBase monadControl resourcet text transformers
|
||||
transformersBase void
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "gloss";
|
||||
version = "1.7.6.6";
|
||||
sha256 = "1by8zr1194mjnnia0ackhd48yqxh79k752c5jwxx6nsk1diwrvl9";
|
||||
version = "1.7.7.1";
|
||||
sha256 = "0g5ik7zv2iywvqingnjvmb9ihk31fwpnjkbfiglzslmga5cjix2a";
|
||||
buildDepends = [ bmp GLUT OpenGL ];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
|
||||
13
pkgs/development/libraries/haskell/multiset/0.2.2.nix
Normal file
13
pkgs/development/libraries/haskell/multiset/0.2.2.nix
Normal file
@ -0,0 +1,13 @@
|
||||
{ cabal }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "multiset";
|
||||
version = "0.2.2";
|
||||
sha256 = "1g14c1zm4rdc8nxvb69k98h542wi24q2lpba1gpqjqspk4d0sjmn";
|
||||
meta = {
|
||||
description = "The Data.MultiSet container type";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [ self.stdenv.lib.maintainers.andres ];
|
||||
};
|
||||
})
|
||||
@ -1,12 +1,14 @@
|
||||
{stdenv, fetchurl}:
|
||||
{stdenv, fetchurl, unzip}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "muparser-1.34";
|
||||
name = "muparser-2.2.2";
|
||||
src = fetchurl {
|
||||
url = mirror://sourceforge/muparser/muparser_v134.tar.gz;
|
||||
sha256 = "0xi27xjj7bwwf5nw3n2lynpr76al3vp204zwh71wkfnhwbzksg8f";
|
||||
url = mirror://sourceforge/muparser/muparser_v2_2_2.zip;
|
||||
sha256 = "0pncvjzzbwcadgpwnq5r7sl9v5r2y9gjgfnlw0mrs9wj206dbhx9";
|
||||
};
|
||||
|
||||
buildInputs = [ unzip ];
|
||||
|
||||
meta = {
|
||||
homepage = http://muparser.sourceforge.net;
|
||||
description = "An extensible high performance math expression parser library written in C++";
|
||||
|
||||
@ -9,6 +9,7 @@
|
||||
, buildWebkit ? true
|
||||
, flashplayerFix ? false, gdk_pixbuf
|
||||
, gtkStyle ? false, libgnomeui, gtk, GConf, gnome_vfs
|
||||
, developerBuild ? false
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
@ -74,6 +75,7 @@ stdenv.mkDerivation rec {
|
||||
-nomake demos -nomake examples -nomake docs
|
||||
|
||||
-no-phonon ${if buildWebkit then "" else "-no"}-webkit ${if buildMultimedia then "" else "-no"}-multimedia -audio-backend
|
||||
${if developerBuild then "-developer-build" else ""}
|
||||
'';
|
||||
|
||||
propagatedBuildInputs =
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchurl, qt4 }:
|
||||
{ stdenv, fetchurl, qt4_for_qtcreator }:
|
||||
|
||||
let
|
||||
version = "2.5.2";
|
||||
version = "2.6.0";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -9,16 +9,19 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://origin.releases.qt-project.org/qtcreator/${version}/qt-creator-${version}-src.tar.gz";
|
||||
md5 = "4a9c09cdf4609753283c31451c84ceb8";
|
||||
md5 = "9bf01098f84a0fe930b2718d11124204";
|
||||
};
|
||||
|
||||
buildInputs = [ qt4 ];
|
||||
buildInputs = [ qt4_for_qtcreator ];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
preConfigure = "qmake";
|
||||
preConfigure = ''
|
||||
qmake -spec linux-g++ "QT_PRIVATE_HEADERS=${qt4_for_qtcreator}/include" qtcreator.pro
|
||||
'';
|
||||
|
||||
installFlags = "INSTALL_ROOT=$(out)";
|
||||
|
||||
meta = {
|
||||
|
||||
@ -11,6 +11,8 @@ stdenv.mkDerivation {
|
||||
|
||||
buildInputs = [ kernel spl perl autoconf automake libtool zlib libuuid coreutils ];
|
||||
|
||||
# for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work
|
||||
NIX_CFLAGS_LINK = "-lgcc_s";
|
||||
NIX_CFLAGS_COMPILE = "-I${kernel}/lib/modules/${kernel.modDirVersion}/build/include/generated";
|
||||
|
||||
preConfigure = ''
|
||||
|
||||
@ -614,6 +614,8 @@ let
|
||||
|
||||
desktop_file_utils = callPackage ../tools/misc/desktop-file-utils { };
|
||||
|
||||
despotify = callPackage ../development/libraries/despotify { };
|
||||
|
||||
dev86 = callPackage ../development/compilers/dev86 {
|
||||
/* Using GNU Make 3.82 leads to this:
|
||||
make[4]: *** No rule to make target `__ldivmod.o)'
|
||||
@ -4795,6 +4797,10 @@ let
|
||||
gst_plugins_base = null;
|
||||
};
|
||||
|
||||
qt4_for_qtcreator = qt48.override {
|
||||
developerBuild = true;
|
||||
};
|
||||
|
||||
qtscriptgenerator = callPackage ../development/libraries/qtscriptgenerator { };
|
||||
|
||||
quesoglc = callPackage ../development/libraries/quesoglc { };
|
||||
@ -7102,8 +7108,6 @@ let
|
||||
slibGuile = slibGuile.override { scheme = guile_1_8; };
|
||||
};
|
||||
|
||||
qcad = callPackage ../applications/misc/qcad { };
|
||||
|
||||
libquvi = callPackage ../applications/video/quvi/library.nix { };
|
||||
|
||||
praat = callPackage ../applications/audio/praat { };
|
||||
@ -8652,6 +8656,21 @@ let
|
||||
|
||||
openblas = callPackage ../development/libraries/science/math/openblas { };
|
||||
|
||||
|
||||
### SCIENCE/MOLECULAR-DYNAMICS
|
||||
|
||||
gromacs = callPackage ../applications/science/molecular-dynamics/gromacs {
|
||||
singlePrec = true;
|
||||
fftw = fftwSinglePrec;
|
||||
cmake = cmakeCurses;
|
||||
};
|
||||
|
||||
gromacsDouble = lowPrio (callPackage ../applications/science/molecular-dynamics/gromacs {
|
||||
singlePrec = false;
|
||||
fftw = fftw;
|
||||
cmake = cmakeCurses;
|
||||
});
|
||||
|
||||
### SCIENCE/LOGIC
|
||||
|
||||
coq = callPackage ../applications/science/logic/coq {
|
||||
|
||||
@ -518,7 +518,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
|
||||
bloomfilter = callPackage ../development/libraries/haskell/bloomfilter {};
|
||||
|
||||
bmp = callPackage ../development/libraries/haskell/bmp {};
|
||||
bmp_1_2_2_1 = callPackage ../development/libraries/haskell/bmp/1.2.2.1.nix {};
|
||||
bmp_1_2_3_2 = callPackage ../development/libraries/haskell/bmp/1.2.3.2.nix {};
|
||||
bmp = self.bmp_1_2_2_1; # later versions work only with ghc 7.6 and beyond
|
||||
|
||||
Boolean = callPackage ../development/libraries/haskell/Boolean {};
|
||||
|
||||
@ -1207,7 +1209,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
|
||||
multirec = callPackage ../development/libraries/haskell/multirec {};
|
||||
|
||||
multiset = callPackage ../development/libraries/haskell/multiset {};
|
||||
multiset_0_2_1 = callPackage ../development/libraries/haskell/multiset/0.2.1.nix {};
|
||||
multiset_0_2_2 = callPackage ../development/libraries/haskell/multiset/0.2.2.nix {};
|
||||
multiset = self.multiset_0_2_1; # later versions work only with ghc 7.6 and beyond
|
||||
|
||||
murmurHash = callPackage ../development/libraries/haskell/murmur-hash {};
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user