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

Merge branch 'channel-nixos' into python-merge

This commit is contained in:
Florian Friesdorf 2012-11-29 15:36:17 +01:00
parent a4ded47776 2eace0dfe6
commit 471a4b583f
106 changed files with 743 additions and 759 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/editors/geany/default.nix
View File

@ -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 = ''

4
pkgs/applications/editors/zile/default.nix
View File

@ -1,11 +1,11 @@
{ fetchurl, stdenv, ncurses, boehmgc, perl, help2man }:
stdenv.mkDerivation rec {
name = "zile-2.4.7";
name = "zile-2.4.9";
src = fetchurl {
url = "mirror://gnu/zile/${name}.tar.gz";
sha256 = "1ak7qjb7s4whxg8qpkg7yixfnhinwfmzgav7rzi0kjmm93z35xcc";
sha256 = "0j801c28ypm924rw3lqyb6khxyslg6ycrv16wmmwcam0mk3mj6f7";
};
buildInputs = [ ncurses boehmgc ];

8
pkgs/applications/graphics/darktable/default.nix
View File

@ -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 = ''

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

@ -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;

18
pkgs/misc/sane-backends/snapshot.nix → pkgs/applications/graphics/sane/backends-git.nix
View File

@ -5,11 +5,12 @@ in
assert hotplugSupport -> (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux");
stdenv.mkDerivation {
name = "sane-backends-1.0.22.git20121123";
name = "sane-backends-1.0.22.482-g071f226";
src = fetchurl {
url = "http://www.sane-project.org/snapshots/sane-backends-git20121123.tar.gz";
sha256 = "d13a8c9e85af52f7be2e45c70cb93a76ec04b76e7fc983809e7d70389b6e7ae5";
src = fetchgit {
url = "http://git.debian.org/git/sane/sane-backends.git";
rev = "071f2269cd68d3411cbfa05a3d028b74496db970";
sha256 = "178xkv30m6irk4k0gqnfcl5kramm1qyj24dar8gp32428z1444xf";
};
udevSupport = hotplugSupport;
@ -29,4 +30,13 @@ stdenv.mkDerivation {
"mkdir -p \${out}/share/sane/gt68xx ; ln -s " + firmware.fw +
" \${out}/share/sane/gt68xx/" + firmware.name
else "";
meta = {
homepage = "http://www.sane-project.org/";
description = "Scanner Access Now Easy";
license = "GPLv2+";
maintainers = [ stdenv.lib.maintainers.simons ];
platforms = stdenv.lib.platforms.linux;
};
}

26
pkgs/misc/sane-backends/default.nix → pkgs/applications/graphics/sane/backends.nix
View File

@ -1,20 +1,19 @@
{ stdenv, fetchurl, hotplugSupport ? true, libusb ? null, libv4l ? null
, pkgconfig ? null
, gt68xxFirmware ? null }:
let
firmware = gt68xxFirmware {inherit fetchurl;};
in
{ stdenv, fetchurl, hotplugSupport ? true, libusb ? null, libv4l ? null, pkgconfig ? null , gt68xxFirmware ? null }:
assert hotplugSupport -> (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux");
let
firmware = gt68xxFirmware { inherit fetchurl; };
in
stdenv.mkDerivation rec {
version = "1.0.23";
name = "sane-backends-${version}";
src = fetchurl {
url = "https://launchpad.net/ubuntu/+archive/primary/+files/sane-backends_${version}.orig.tar.gz";
sha256 = "4d4f5b2881615af7fc0ed75fdde7dc623a749e80e40f3f792fe4010163cbb029";
};
udevSupport = hotplugSupport;
buildInputs = []
@ -32,8 +31,17 @@ stdenv.mkDerivation rec {
'';
preInstall =
if gt68xxFirmware != null then
if gt68xxFirmware != null then
"mkdir -p \${out}/share/sane/gt68xx ; ln -s " + firmware.fw +
" \${out}/share/sane/gt68xx/" + firmware.name
else "";
meta = {
homepage = "http://www.sane-project.org/";
description = "Scanner Access Now Easy";
license = "GPLv2+";
maintainers = [ stdenv.lib.maintainers.simons ];
platforms = stdenv.lib.platforms.linux;
};
}

26
pkgs/applications/graphics/sane/frontends.nix Normal file
View File

@ -0,0 +1,26 @@
{ stdenv, fetchurl, saneBackends, libX11, gtk, pkgconfig, libusb ? null}:
stdenv.mkDerivation rec {
name = "sane-frontends-1.0.14";
src = fetchurl {
url = "ftp://ftp.sane-project.org/pub/sane/sane-frontends-1.0.14/${name}.tar.gz";
md5 = "c63bf7b0bb5f530cf3c08715db721cd3";
};
preConfigure = ''
sed -e '/SANE_CAP_ALWAYS_SETTABLE/d' -i src/gtkglue.c
'';
buildInputs = [saneBackends libX11 gtk pkgconfig] ++
(if (libusb != null) then [libusb] else []);
meta = {
homepage = "http://www.sane-project.org/";
description = "Scanner Access Now Easy";
license = "GPLv2+";
maintainers = [ stdenv.lib.maintainers.simons ];
platforms = stdenv.lib.platforms.linux;
};
}

10
pkgs/misc/xsane/default.nix → pkgs/applications/graphics/sane/xsane.nix
View File

@ -1,10 +1,10 @@
{stdenv, fetchurl, saneBackends, saneFrontends,
libX11, gtk, pkgconfig, libpng, libusb ? null}:
stdenv.mkDerivation {
{ stdenv, fetchurl, saneBackends, saneFrontends, libX11, gtk, pkgconfig, libpng, libusb ? null }:
stdenv.mkDerivation rec {
name = "xsane-0.998";
src = fetchurl {
url = http://www.xsane.org/download/xsane-0.998.tar.gz;
url = "http://www.xsane.org/download/${name}.tar.gz";
sha256 = "0vn2cj85ijgp2v2j2h9xpqmg2jwlbxmwyb88kxhjjakqay02ybm3";
};
@ -19,7 +19,7 @@ stdenv.mkDerivation {
homepage = http://www.sane-project.org/;
description = "Graphical scanning frontend for sane";
license = "GPLv2+";
maintainers = with stdenv.lib.maintainers; [viric];
maintainers = with stdenv.lib.maintainers; [viric simons];
platforms = with stdenv.lib.platforms; linux;
};
}

4
pkgs/applications/misc/girara/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, gtk, gettext }:
stdenv.mkDerivation rec {
name = "girara-0.1.2";
name = "girara-0.1.4";
src = fetchurl {
url = "http://pwmt.org/projects/girara/download/${name}.tar.gz";
sha256 = "89231d0da3c790e0765ad85d74f64cf50051b8bafe6065882e34e378ab14ec99";
sha256 = "831cf523b131bfa1c182efbf146d68fb642fe62d22ee199caf0cd71408a85739";
};
buildInputs = [ pkgconfig gtk gettext ];

22
pkgs/applications/misc/librecad/default.nix
View File

@ -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;
};
}

55
pkgs/applications/misc/qcad/default.nix
View File

@ -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
};
}

24
pkgs/applications/misc/qcad/qcad-2.0.4.0-1.src-intptr.patch
View File

@ -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;
}

45
pkgs/applications/misc/qcad/qcad-2.0.4.0-gcc43.patch
View File

@ -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

4
pkgs/applications/misc/zathura/core/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
version = "0.1.2";
version = "0.2.1";
name = "zathura-core-${version}";
src = fetchurl {
url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz";
sha256 = "a496c25071e54f675b65ee5eab02fd002c04c2d7d5cf4aa8a1cb517cc13beaef";
sha256 = "075b9def201c77ca738dc9e15b252bc23c085b7c4671a1810d1d962e8d0bd790";
};
buildInputs = [ pkgconfig gtk girara gettext ];

2
pkgs/applications/misc/zathura/default.nix
View File

@ -13,7 +13,7 @@ rec {
zathuraWrapper = stdenv.mkDerivation rec {
name = "zathura-0.1.2";
name = "zathura-${zathura_core.version}";
plugins_path = stdenv.lib.makeSearchPath "lib" [
zathura_pdf_poppler

4
pkgs/applications/misc/zathura/djvu/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, gtk, zathura_core, girara, djvulibre, gettext }:
stdenv.mkDerivation rec {
name = "zathura-djvu-0.1.1";
name = "zathura-djvu-0.2.1";
src = fetchurl {
url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz";
sha256 = "04adad7bf1bb392eae4b7b856fe7d40a137f8185ac274289df922758ae827172";
sha256 = "d8bb3c9e30244a0733e49740ee2dd099ce39fa16f2c320af27a0c09d9a25bcc3";
};
buildInputs = [ pkgconfig djvulibre gettext zathura_core gtk girara ];

4
pkgs/applications/misc/zathura/pdf-poppler/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, zathura_core, girara, poppler, gettext }:
stdenv.mkDerivation rec {
name = "zathura-pdf-poppler-0.1.1";
name = "zathura-pdf-poppler-0.2.1";
src = fetchurl {
url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz";
sha256 = "bec5fee721fcaee9f4b53d3882908b19efa82815393aa8c3619ff948b909d4a7";
sha256 = "1c162ea887e52f48d6dc80f8427a773768f2df2e37242dab7efddeb3d2e361cd";
};
buildInputs = [ pkgconfig poppler gettext zathura_core girara ];

4
pkgs/applications/misc/zathura/ps/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, gtk, zathura_core, girara, libspectre, gettext }:
stdenv.mkDerivation rec {
name = "zathura-ps-0.1.0";
name = "zathura-ps-0.2.0";
src = fetchurl {
url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz";
sha256 = "1669fd11e436636cdedb2cde206b562f4f9c666cea9773f6f2014e765fd62789";
sha256 = "717eda01213b162421b6b52f29d6b981edc302fddf351ccb2c093b6842751414";
};
buildInputs = [ pkgconfig libspectre gettext zathura_core gtk girara ];

12
pkgs/applications/networking/browsers/chromium/sources.nix
View File

@ -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";
};
}

15
pkgs/applications/networking/browsers/firefox/17.0.nix
View File

@ -70,7 +70,7 @@ rec {
"--disable-javaxpcom"
] ++ commonConfigureFlags;
enableParallelBuilding = true;
enableParallelBuilding = false;
preConfigure =
''
@ -94,7 +94,7 @@ rec {
for i in $out/lib/$libDir/*; do
file $i;
if file $i | grep executable &>/dev/null; then
echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename "$i")";
echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")";
chmod a+x "$out/bin/$(basename "$i")";
fi;
done
@ -156,18 +156,9 @@ rec {
postInstall =
''
ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner
for j in $out/bin/*; do
i="$(readlink "$j")";
file $i;
if file $i | grep executable &>/dev/null; then
rm "$out/bin/$(basename "$i")"
echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")"
chmod a+x "$out/bin/$(basename "$i")"
fi;
done;
cd "$out/lib/"firefox-*
rm firefox
echo -e '#!${stdenv.shell}\n${xulrunner}/bin/xulrunner "'"$PWD"'/application.ini" "$@"' > firefox
echo -e '#!${stdenv.shell}\nexec ${xulrunner}/bin/xulrunner "'"$PWD"'/application.ini" "$@"' > firefox
chmod a+x firefox
''; # */

4
pkgs/applications/networking/browsers/opera/default.nix
View File

@ -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 = {

2
pkgs/applications/networking/mailreaders/notmuch/default.nix
View File

@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://notmuchmail.org/releases/${name}.tar.gz";
sha256 = "0lx7kkrsg401zrgj8s4ziqds1jsha3szsh44v57mq4pkq0fijph9";
sha256 = "095e191dc0f3125c4fd98440fdf55050cba01b8e9f68245ffe0190a7f39ca753";
};
buildInputs = [ bash emacs gdb glib gmime gnupg1 pkgconfig talloc xapian ];

4
pkgs/applications/office/hledger-interest/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "hledger-interest";
version = "1.4.1";
sha256 = "05mzqmnr9c4zmss0f2aac4qh4s954nbkimv924d31q2lisdddvw8";
version = "1.4.2";
sha256 = "1his6pxrvs5p28bmk77bd8vaq6rhjlilwq598mbkgfvlqg7q076v";
isLibrary = false;
isExecutable = true;
buildDepends = [ Cabal hledgerLib mtl time ];

3
pkgs/applications/science/electronics/xoscope/default.nix
View File

@ -10,6 +10,9 @@ stdenv.mkDerivation rec {
buildInputs = [ gtk pkgconfig ];
# from: https://aur.archlinux.org/packages.php?ID=12140&detail=1
patches = [ ./gtkdepre.diff ];
meta = {
description = "Oscilloscope through the sound card";
homepage = http://xoscope.sourceforge.net;

58
pkgs/applications/science/electronics/xoscope/gtkdepre.diff Normal file
View File

@ -0,0 +1,58 @@
diff -ru xoscope-2.0-old//gtkdatabox-0.6.0.0/gtk/gtkdatabox.c xoscope-2.0/gtkdatabox-0.6.0.0/gtk/gtkdatabox.c
--- xoscope-2.0-old//gtkdatabox-0.6.0.0/gtk/gtkdatabox.c 2010-06-07 10:42:24.000000000 +0200
+++ xoscope-2.0/gtkdatabox-0.6.0.0/gtk/gtkdatabox.c 2010-06-07 10:45:40.000000000 +0200
@@ -661,7 +661,7 @@
static void
gtk_databox_calculate_hcanvas (GtkDatabox *box)
{
- if (!GTK_WIDGET_VISIBLE (box))
+ if (!gtk_widget_get_visible (box))
return;
if (box->priv->adjX->page_size == 1.0)
@@ -698,7 +698,7 @@
static void
gtk_databox_calculate_vcanvas (GtkDatabox *box)
{
- if (!GTK_WIDGET_VISIBLE (box))
+ if (!gtk_widget_get_visible (box))
return;
if (box->priv->adjY->page_size == 1.0)
@@ -780,7 +780,7 @@
gtk_databox_draw (box, event);
gdk_draw_drawable (widget->window,
- widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
+ widget->style->fg_gc[gtk_widget_get_state (widget)],
box->priv->canvas.pixmap, event->area.x, event->area.y,
event->area.x, event->area.y, event->area.width,
event->area.height);
@@ -940,7 +940,7 @@
GtkWidget *widget = GTK_WIDGET (box);
g_return_if_fail (GTK_IS_DATABOX (box));
- g_return_if_fail (GTK_WIDGET_VISIBLE (widget));
+ g_return_if_fail (gtk_widget_get_visible (widget));
gdk_draw_rectangle (box->priv->canvas.pixmap, widget->style->bg_gc[0],
TRUE, 0, 0,
@@ -1150,7 +1150,7 @@
/* Copy a part of the pixmap to the screen */
if (pixmapCopyRect)
gdk_draw_drawable (widget->window,
- widget->style->fg_gc[GTK_WIDGET_STATE (box)],
+ widget->style->fg_gc[gtk_widget_get_state (box)],
box->priv->canvas.pixmap,
pixmapCopyRect->x,
pixmapCopyRect->y,
--- xoscope-2.0-old//gtkdatabox-0.6.0.0/gtk/Makefile.in 2011-09-02 16:43:43.000000000 +0200
+++ xoscope-2.0/gtkdatabox-0.6.0.0/gtk/Makefile.in 2011-09-02 16:43:57.000000000 +0200
@@ -196,7 +196,6 @@
-DG_DISABLE_DEPRECATED\
-DGDK_DISABLE_DEPRECATED\
-DGDK_PIXBUF_DISABLE_DEPRECATED\
- -DGTK_DISABLE_DEPRECATED\
`pkg-config gtk+-2.0 --cflags`
all: all-am

46
pkgs/applications/science/molecular-dynamics/gromacs/default.nix Normal file
View File

@ -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.
'';
};
}

7
pkgs/applications/version-management/git-and-tools/git-annex/default.nix
View File

@ -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

4
pkgs/applications/version-management/git-and-tools/git/default.nix
View File

@ -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 ];

17
pkgs/applications/window-managers/compiz/bcop.nix
View File

@ -1,17 +0,0 @@
{ stdenv, fetchurl, pkgconfig, libxslt }:
stdenv.mkDerivation rec {
name = "compiz-bcop-0.8.4";
src = fetchurl {
url = "http://releases.compiz.org/components/compiz-bcop/${name}.tar.bz2";
sha256 = "0kwcvalmx2aab7j3x7s0xqm102i3kr5gh1z8mfws9q4qkqdclnfk";
};
buildInputs = [ pkgconfig libxslt ];
meta = {
homepage = http://www.compiz.org/;
description = "Code generator for Compiz plugins";
};
}

31
pkgs/applications/window-managers/compiz/ccsm.nix
View File

@ -1,31 +0,0 @@
{ stdenv, fetchurl, makeWrapper, intltool, gtk
, python, pygtk, pygobject, pycairo, compizconfig_python }:
stdenv.mkDerivation rec {
name = "ccsm-0.8.4";
src = fetchurl {
url = "http://releases.compiz.org/components/ccsm/${name}.tar.bz2";
sha256 = "0vf16a2nmb0qwwxymvgl86nkfscj3n39jdw2q2p737pj5h1xmfa6";
};
buildInputs = [ makeWrapper python intltool gtk ];
buildPhase = "python setup.py build --prefix=$out";
pythonDeps = [ pygtk pygobject pycairo compizconfig_python ];
installPhase =
''
python setup.py install --prefix=$out
wrapProgram $out/bin/ccsm --prefix PYTHONPATH ":" \
"$(toPythonPath "$pythonDeps $out")"
'';
meta = {
homepage = http://www.compiz.org/;
description = "Compiz settings manager";
platforms = stdenv.lib.platforms.linux;
};
}

20
pkgs/applications/window-managers/compiz/config-python.nix
View File

@ -1,20 +0,0 @@
{ stdenv, fetchurl, pkgconfig, xlibs, libcompizconfig, glib
, python, pyrex }:
stdenv.mkDerivation rec {
name = "compizconfig-python-0.8.4";
src = fetchurl {
url = "http://releases.compiz.org/components/compizconfig-python/${name}.tar.bz2";
sha256 = "0nkgqxddjw324aymzcy5nx6ilhfbpk9rra4qbzrq3l39xqsswd37";
};
buildInputs = [ pkgconfig libcompizconfig glib python pyrex xlibs.xlibs ];
NIX_LDFLAGS = "-lcompizconfig";
meta = {
homepage = http://www.compiz.org/;
description = "Python interface to the Compiz configuration";
};
}

40
pkgs/applications/window-managers/compiz/core.nix
View File

@ -1,40 +0,0 @@
{ stdenv, fetchurl, intltool, pkgconfig, xlibs, mesa, libxml2, libxslt
, libstartup_notification, libpng, glib, gtk, gnome, dbus_glib, librsvg, bzip2 }:
let version = "0.8.6"; in
stdenv.mkDerivation {
name = "compiz-${version}";
src = fetchurl {
url = "http://releases.compiz.org/${version}/compiz-${version}.tar.bz2";
sha256 = "132gmdawjmrmvazm31h3r3wwq97h58hz17yyc9sa6q2nkfsnkpy4";
};
patches =
[ # Allow the path to the Compiz plugin library and metadata
# directories to be overriden through $COMPIZ_PLUGINDIR and
# $COMPIZ_METADATADIR, respectively.
./plugindir-core.patch
# Fix compilation with recent GTK versions.
./gdk-deprecated.patch
];
buildInputs =
[ intltool pkgconfig libpng glib
gtk gnome.libwnck gnome.GConf dbus_glib librsvg bzip2
];
propagatedBuildInputs =
[ xlibs.xlibs xlibs.libXfixes xlibs.libXrandr xlibs.libXrender
xlibs.libXdamage xlibs.libXcomposite xlibs.libXinerama
libstartup_notification mesa libxml2 libxslt
];
meta = {
homepage = http://www.compiz.org/;
description = "A compositing window manager";
platforms = stdenv.lib.platforms.linux;
};
}

58
pkgs/applications/window-managers/compiz/default.nix Normal file
View File

@ -0,0 +1,58 @@
{stdenv, fetchurl, cmake, pkgconfig
, libXrender, renderproto, gtk, libwnck, pango, cairo
, GConf, libXdamage, damageproto, libxml2, libxslt, glibmm
, libstartup_notification, libpthreadstubs, libxcb, intltool
, ORBit2, libXau
, dbus, dbus_glib, librsvg, mesa
, libXdmcp, libnotify, python
, hicolor_icon_theme, libjpeg_turbo, libsigcxx, protobuf, pygtk, pythonDBus
, xdg_utils
, gettext, boost, pyrex
, makeWrapper
}:
let
s = # Generated upstream information
rec {
baseName="compiz";
version="0.9.8.6";
name="compiz-0.9.8.6";
hash="0agz5s11lwrkhk3svz3rwimlb6318ln3zcywlzczwks139svxnk6";
url="https://launchpad.net/compiz/0.9.8/0.9.8.6/+download/compiz-0.9.8.6.tar.bz2";
sha256="0agz5s11lwrkhk3svz3rwimlb6318ln3zcywlzczwks139svxnk6";
};
buildInputs = [cmake pkgconfig
libXrender renderproto gtk libwnck pango cairo
GConf libXdamage damageproto libxml2 libxslt glibmm libstartup_notification
libpthreadstubs libxcb intltool
ORBit2 libXau
dbus dbus_glib librsvg mesa
libXdmcp libnotify python
hicolor_icon_theme libjpeg_turbo libsigcxx protobuf pygtk pythonDBus
xdg_utils
gettext boost pyrex
makeWrapper
];
in
stdenv.mkDerivation rec {
inherit (s) name version;
src = fetchurl {
inherit (s) url sha256;
};
inherit buildInputs;
NIX_CFLAGS_COMPILE=" -Wno-error ";
postInstall = ''
wrapProgram "$out/bin/ccsm" \
--prefix PYTHONPATH : "$PYTHONPATH" \
--prefix PYTHONPATH : "$out/lib/${python.libPrefix}/site-packages"
'';
meta = {
description = "Compoziting window manager";
homepage = "http://launchpad.net/compiz/";
license = stdenv.lib.licenses.gpl2;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
inherit (s) version;
};
}

1
pkgs/applications/window-managers/compiz/default.upstream Normal file
View File

@ -0,0 +1 @@
url https://launchpad.net/compiz/+download

14
pkgs/applications/window-managers/compiz/gdk-deprecated.patch
View File

@ -1,14 +0,0 @@
diff -ru -x '*~' compiz-0.8.6-orig//gtk/window-decorator/gtk-window-decorator.c compiz-0.8.6//gtk/window-decorator/gtk-window-decorator.c
--- compiz-0.8.6-orig//gtk/window-decorator/gtk-window-decorator.c 2010-03-28 14:15:35.000000000 +0200
+++ compiz-0.8.6//gtk/window-decorator/gtk-window-decorator.c 2011-03-14 11:00:00.000000000 +0100
@@ -31,10 +31,6 @@
#include <X11/extensions/Xrender.h>
#include <X11/Xregion.h>
-#ifndef GDK_DISABLE_DEPRECATED
-#define GDK_DISABLE_DEPRECATED
-#endif
-
#ifndef GTK_DISABLE_DEPRECATED
#define GTK_DISABLE_DEPRECATED
#endif

22
pkgs/applications/window-managers/compiz/libcompizconfig.nix
View File

@ -1,22 +0,0 @@
{ stdenv, fetchurl,intltool, pkgconfig, xlibs, libxml2, libxslt, compiz }:
stdenv.mkDerivation rec {
name = "libcompizconfig-0.8.4";
src = fetchurl {
url = "http://releases.compiz.org/components/libcompizconfig/${name}.tar.bz2";
sha256 = "0adhl2nc2zrswl5n4a8ipymffq6yjwnxgpkv6rsk7sqvby9kwca1";
};
patches =
[ # See ./core.nix.
./plugindir-libcompizconfig.patch
];
buildInputs = [ pkgconfig intltool xlibs.libX11 compiz libxml2 libxslt ];
meta = {
homepage = http://www.compiz.org/;
description = "Compiz configuration library";
};
}

39
pkgs/applications/window-managers/compiz/plugindir-core.patch
View File

@ -1,39 +0,0 @@
diff -ru -x '*~' compiz-0.8.6-orig/src/metadata.c compiz-0.8.6/src/metadata.c
--- compiz-0.8.6-orig/src/metadata.c 2010-03-28 14:15:35.000000000 +0200
+++ compiz-0.8.6/src/metadata.c 2010-10-20 00:22:47.000000000 +0200
@@ -146,7 +146,7 @@
compAddMetadataFromFile (CompMetadata *metadata,
const char *file)
{
- char *home;
+ char *home, *metadatadir;
Bool status = FALSE;
home = getenv ("HOME");
@@ -163,7 +163,10 @@
}
}
- status |= addMetadataFromFilename (metadata, METADATADIR, file);
+ metadatadir = getenv("COMPIZ_METADATADIR");
+ if (!metadatadir) metadatadir = METADATADIR;
+
+ status |= addMetadataFromFilename (metadata, metadatadir, file);
if (!status)
{
compLogMessage ("core", CompLogLevelWarn,
diff -ru -x '*~' compiz-0.8.6-orig/src/plugin.c compiz-0.8.6/src/plugin.c
--- compiz-0.8.6-orig/src/plugin.c 2010-03-28 14:15:35.000000000 +0200
+++ compiz-0.8.6/src/plugin.c 2010-10-20 00:25:16.000000000 +0200
@@ -579,7 +579,10 @@
}
}
- status = (*loaderLoadPlugin) (p, PLUGINDIR, name);
+ plugindir = getenv("COMPIZ_PLUGINDIR");
+ if (!plugindir) plugindir = PLUGINDIR;
+
+ status = (*loaderLoadPlugin) (p, plugindir, name);
if (status)
return p;

39
pkgs/applications/window-managers/compiz/plugindir-libcompizconfig.patch
View File

@ -1,39 +0,0 @@
diff -ru -x '*~' libcompizconfig-0.8.4-orig/src/compiz.cpp libcompizconfig-0.8.4/src/compiz.cpp
--- libcompizconfig-0.8.4-orig/src/compiz.cpp 2009-10-14 02:36:04.000000000 +0200
+++ libcompizconfig-0.8.4/src/compiz.cpp 2010-10-20 00:35:28.000000000 +0200
@@ -3004,7 +3004,10 @@
}
}
- loadPluginFromXMLFile (context, xmlName, (char *) METADATADIR);
+ char *metadatadir = getenv("COMPIZ_METADATADIR");
+ if (!metadatadir) metadatadir = METADATADIR;
+
+ loadPluginFromXMLFile (context, xmlName, metadatadir);
free (xmlName);
}
@@ -3031,7 +3034,10 @@
free (homeplugins);
}
}
- loadPluginsFromXMLFiles (context, (char *)METADATADIR);
+
+ char *metadatadir = getenv("COMPIZ_METADATADIR");
+ if (!metadatadir) metadatadir = METADATADIR;
+ loadPluginsFromXMLFiles (context, metadatadir);
if (home && strlen (home))
{
@@ -3043,7 +3049,10 @@
free (homeplugins);
}
}
- loadPluginsFromName (context, (char *)PLUGINDIR);
+
+ char *plugindir = getenv("COMPIZ_PLUGINDIR");
+ if (!plugindir) plugindir = PLUGINDIR;
+ loadPluginsFromName (context, plugindir);
}
static void

30
pkgs/applications/window-managers/compiz/plugins-extra.nix
View File

@ -1,30 +0,0 @@
{ stdenv, fetchurl, intltool, pkgconfig, compiz, compiz_bcop
, compiz_plugins_main, getopt, libjpeg, cairo, pango, gnome }:
let version = "0.8.6"; in
stdenv.mkDerivation rec {
name = "compiz-plugins-extra-${version}";
src = fetchurl {
url = "http://releases.compiz.org/${version}/${name}.tar.bz2";
sha256 = "1qbxfi332bbadm0ah48frnrl9dkczl111s5a91a0cqz5v7nbw4g1";
};
patches =
[ # Support scaling wallpapers to the maximum size while still
# respecting the aspect ratio.
./wallpaper-maxpect.patch
];
NIX_CFLAGS_COMPILE = "-I${compiz_plugins_main}/include/compiz";
buildInputs =
[ intltool pkgconfig compiz compiz_bcop compiz_plugins_main getopt gnome.GConf ];
meta = {
homepage = http://www.compiz.org/;
description = "Extra plugins for Compiz";
platforms = stdenv.lib.platforms.linux;
};
}

22
pkgs/applications/window-managers/compiz/plugins-main.nix
View File

@ -1,22 +0,0 @@
{ stdenv, fetchurl, intltool, pkgconfig, compiz, compiz_bcop
, getopt, libjpeg, cairo, pango, gnome }:
let version = "0.8.6"; in
stdenv.mkDerivation rec {
name = "compiz-plugins-main-${version}";
src = fetchurl {
url = "http://releases.compiz.org/${version}/${name}.tar.bz2";
sha256 = "1nfn3r4q7wvzfkdh9hrm5zc816xa8cs2s7cliz0fmnqikcs4zp36";
};
buildInputs =
[ intltool pkgconfig compiz compiz_bcop getopt libjpeg cairo pango gnome.GConf ];
meta = {
homepage = http://www.compiz.org/;
description = "Main plugins for Compiz";
platforms = stdenv.lib.platforms.linux;
};
}

58
pkgs/applications/window-managers/compiz/wallpaper-maxpect.patch
View File

@ -1,58 +0,0 @@
diff -x '*~' -ru compiz-plugins-extra-0.8.6-orig/metadata/wallpaper.xml.in compiz-plugins-extra-0.8.6/metadata/wallpaper.xml.in
--- compiz-plugins-extra-0.8.6-orig/metadata/wallpaper.xml.in 2010-03-29 16:09:17.000000000 +0200
+++ compiz-plugins-extra-0.8.6/metadata/wallpaper.xml.in 2010-10-21 00:23:18.000000000 +0200
@@ -24,7 +24,7 @@
<_long>Image position.</_long>
<type>int</type>
<min>0</min>
- <max>4</max>
+ <max>5</max>
<desc>
<value>0</value>
<_name>Scale and Crop</_name>
@@ -45,6 +45,10 @@
<value>4</value>
<_name>Center Tiled</_name>
</desc>
+ <desc>
+ <value>5</value>
+ <_name>Centered Maxpect</_name>
+ </desc>
</option>
<option name="bg_fill_type" type="list">
<_short>Fill type</_short>
diff -x '*~' -ru compiz-plugins-extra-0.8.6-orig/src/wallpaper/wallpaper.c compiz-plugins-extra-0.8.6/src/wallpaper/wallpaper.c
--- compiz-plugins-extra-0.8.6-orig/src/wallpaper/wallpaper.c 2010-03-29 16:09:18.000000000 +0200
+++ compiz-plugins-extra-0.8.6/src/wallpaper/wallpaper.c 2010-10-21 01:09:10.000000000 +0200
@@ -697,12 +697,12 @@
tmpMatrix = back->imgTex.matrix;
- if (back->imagePos == BgImagePosScaleAndCrop)
+ if ((back->imagePos == BgImagePosScaleAndCrop) || (back->imagePos == BgImagePosCenteredMaxpect))
{
s1 = (float) s->width / back->width;
s2 = (float) s->height / back->height;
- s1 = MAX (s1, s2);
+ s1 = back->imagePos == BgImagePosScaleAndCrop ? MAX (s1, s2) : MIN (s1, s2);
tmpMatrix.xx /= s1;
tmpMatrix.yy /= s1;
@@ -711,6 +711,16 @@
tmpMatrix.x0 -= x * tmpMatrix.xx;
y = (s->height - ((int)back->height * s1)) / 2.0;
tmpMatrix.y0 -= y * tmpMatrix.yy;
+
+ if (back->imagePos == BgImagePosCenteredMaxpect)
+ {
+ reg = &tmpRegion;
+
+ tmpRegion.extents.x1 = MAX (0, x);
+ tmpRegion.extents.y1 = MAX (0, y);
+ tmpRegion.extents.x2 = MIN (s->width, x + ((int) back->width * s1));
+ tmpRegion.extents.y2 = MIN (s->height, y + ((int) back->height * s1));
+ }
}
else if (back->imagePos == BgImagePosScaled)
{

24
pkgs/build-support/upstream-updater/update-walker.sh
View File

@ -3,6 +3,7 @@
own_dir="$(cd "$(dirname "$0")"; pwd)"
CURRENT_URL=
NEED_TO_CHOOSE_URL=1
url () {
CURRENT_URL="$1"
@ -45,12 +46,14 @@ matching_links () {
link () {
CURRENT_URL="$(matching_links "$1" | position_choice "$2" "$3")"
unset NEED_TO_CHOOSE_URL
echo "Linked by: $*"
echo "URL: $CURRENT_URL" >&2
}
version_link () {
CURRENT_URL="$(matching_links "$1" | version_sort | position_choice "$2" "$3")"
unset NEED_TO_CHOOSE_URL
echo "Linked version by: $*"
echo "URL: $CURRENT_URL" >&2
}
@ -86,6 +89,23 @@ ensure_target () {
[ -z "$CURRENT_TARGET" ] && target default.nix
}
ensure_name () {
[ -z "$CURRENT_NAME" ] && name "$(basename "$CONFIG_DIR")"
echo "Resulting name: $CURRENT_NAME"
}
ensure_choice () {
[ -n "NEED_TO_CHOOSE_URL" ] && {
version_link '[.]tar[.]([^./])+$'
unset NEED_TO_CHOOSE_URL
}
[ -z "$CURRENT_URL" ] && {
echo "Error: empty CURRENT_URL"
echo "Error: empty CURRENT_URL" >&2
exit 1
}
}
hash () {
CURRENT_HASH="$(nix-prefetch-url "$CURRENT_URL")"
}
@ -183,9 +203,11 @@ do_overwrite () {
process_config () {
CONFIG_DIR="$(directory_of "$1")"
source "$CONFIG_DIR/$(basename "$1")"
BEGIN_EXPRESSION='# Generated upstream information';
source "$CONFIG_DIR/$(basename "$1")"
ensure_name
retrieve_version
ensure_choice
ensure_version
ensure_target
update_found && do_overwrite "$CURRENT_TARGET"

9
pkgs/development/compilers/gcc/4.7/default.nix
View File

@ -181,7 +181,6 @@ stdenv.mkDerivation ({
let
libc = if libcCross != null then libcCross else stdenv.glibc;
gnu_h = "gcc/config/gnu.h";
i386_gnu_h = "gcc/config/i386/gnu.h";
extraCPPDeps =
libc.propagatedBuildInputs
++ stdenv.lib.optional (libpthreadCross != null) libpthreadCross
@ -194,8 +193,8 @@ stdenv.mkDerivation ({
then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}"
else "-L${libpthread}/lib";
in
'' echo "augmenting \`CPP_SPEC' in \`${i386_gnu_h}' with \`${extraCPPSpec}'..."
sed -i "${i386_gnu_h}" \
'' echo "augmenting \`CPP_SPEC' in \`${gnu_h}' with \`${extraCPPSpec}'..."
sed -i "${gnu_h}" \
-es'|CPP_SPEC *"\(.*\)$|CPP_SPEC "${extraCPPSpec} \1|g'
echo "augmenting \`LIB_SPEC' in \`${gnu_h}' with \`${extraLibSpec}'..."
@ -289,7 +288,9 @@ stdenv.mkDerivation ({
)
)
}
${if (stdenv ? glibc) then " --with-native-system-header-dir=${stdenv.glibc}/include" else ""}
${if (stdenv ? glibc && cross == null)
then " --with-native-system-header-dir=${stdenv.glibc}/include"
else ""}
${ # Trick that should be taken out once we have a mips64el-linux not loongson2f
if cross == null && stdenv.system == "mips64el-linux" then "--with-arch=loongson2f" else ""}
${if langAda then " --enable-libada" else ""}

15
pkgs/development/compilers/julia/default.nix
View File

@ -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 = ''

2
pkgs/development/libraries/boost/1.52-headers.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation {
installPhase = ''
mkdir -p $out/include
tar xf $src -C $out/include --strip-components=1 ./boost_1_52_0/boost
tar xf $src -C $out/include --strip-components=1 boost_1_52_0/boost
'';
meta = {

34
pkgs/development/libraries/despotify/default.nix Normal file
View 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;
};
}

4
pkgs/development/libraries/haskell/binary/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "binary";
version = "0.6.3.0";
sha256 = "0gynhyamhvffy2z88xzi56kf57pd5d6534n7w0m11qq4188w0zai";
version = "0.6.4.0";
sha256 = "0vq80fzhwil5bx4a2vbd3jvfh1awhg1pwxgvq3lvbi37yzl0ydgh";
meta = {
homepage = "https://github.com/kolmodin/binary";
description = "Binary serialisation for Haskell values using lazy ByteStrings";

4
pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "blaze-builder-conduit";
version = "0.5.0.2";
sha256 = "0ynkz822zxp1m02fp9l572d8j8xi5r9j1bg6zs2671m81h22d4in";
version = "0.5.0.3";
sha256 = "0dbymh29zg0bvhlmai5s6qiqypx46hmlg375jpcq1597vzaanwnw";
buildDepends = [ blazeBuilder conduit text transformers ];
meta = {
homepage = "http://github.com/snoyberg/conduit";

4
pkgs/development/libraries/haskell/blaze-html/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "blaze-html";
version = "0.5.1.0";
sha256 = "1f256z68pbm1h6wsk33p94byxwfp01i4pbdrch32jdi1q35cmqxh";
version = "0.5.1.1";
sha256 = "1z1lnfph4spy9vx2nfhbykkfcdnw14fars5aydrgi70spaq5ial2";
buildDepends = [ blazeBuilder blazeMarkup text ];
meta = {
homepage = "http://jaspervdj.be/blaze";

4
pkgs/development/libraries/haskell/blaze-markup/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "blaze-markup";
version = "0.5.1.1";
sha256 = "14va7db8icf2xj7v4i5z0srgv74pf8z6w7046lxs3cyj5pcjl2r9";
version = "0.5.1.2";
sha256 = "1iqwcmb35793drkvnxx8z3zkyyzd6b84x9b8cp2aza2n0qw7sihm";
buildDepends = [ blazeBuilder text ];
meta = {
homepage = "http://jaspervdj.be/blaze";

0
pkgs/development/libraries/haskell/bmp/default.nix → pkgs/development/libraries/haskell/bmp/1.2.2.1.nix
View File

15
pkgs/development/libraries/haskell/bmp/1.2.3.2.nix Normal file
View 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
pkgs/development/libraries/haskell/bytestring-nums/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "bytestring-nums";
version = "0.3.5";
sha256 = "12knbyrvr1wa7za8bwypvq3cp81k18qi032dl98s2ylhcz1r6rdk";
version = "0.3.6";
sha256 = "1kg777gpqj05h5bj0637yky64bdx7x77hm7nq2rhpw4i1mh9gjmx";
isLibrary = true;
isExecutable = true;
meta = {

4
pkgs/development/libraries/haskell/conduit/default.nix
View File

@ -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

4
pkgs/development/libraries/haskell/crypto-conduit/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "crypto-conduit";
version = "0.4.0.1";
sha256 = "1afkn9kp5y1qsgd2l2q85d2bh0wbvn07x0ddi72sr8g7daw8zrs8";
version = "0.4.1";
sha256 = "1gdznwcq3fb9ls68lgpwna6k1k612j241c8441z7r2kx3a64dqwv";
buildDepends = [ cereal conduit cryptoApi transformers ];
meta = {
homepage = "https://github.com/meteficha/crypto-conduit";

4
pkgs/development/libraries/haskell/cryptohash/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "cryptohash";
version = "0.7.8";
sha256 = "0n9m5gl3hfkx0p0mg05k7317vjqqx5aynandg428pcgcjkpbfv9g";
version = "0.7.9";
sha256 = "1prbc65klr93mvqj4hass5yyxv353fral70mj379jrf4m93429hz";
isLibrary = true;
isExecutable = true;
buildDepends = [ cereal cryptoApi tagged ];

4
pkgs/development/libraries/haskell/editline/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "editline";
version = "0.2.1.0";
sha256 = "83618e5f86074fdc11d7f5033aa2886284462941be38fa02966acc92712c46e1";
version = "0.2.1.1";
sha256 = "101zhzja14n8bhbrly7w2aywx3sxyzgyjdrmgpg4gn4alf4lzdlz";
extraLibraries = [ libedit ];
meta = {
homepage = "http://code.haskell.org/editline";

4
pkgs/development/libraries/haskell/gloss/default.nix
View File

@ -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 = {

10
pkgs/development/libraries/haskell/hledger-lib/default.nix
View File

@ -1,14 +1,14 @@
{ cabal, cmdargs, csv, filepath, HUnit, mtl, parsec, regexpr, safe
, shakespeareText, split, time, transformers, utf8String
, split, time, transformers, utf8String
}:
cabal.mkDerivation (self: {
pname = "hledger-lib";
version = "0.19.1";
sha256 = "19ccbf9g1garwg56ig4qckz1zky89g1z71nwfbwi4v57bjw53ab4";
version = "0.19.3";
sha256 = "1wn72ycy1hvcn2ikaplq446hggpkbabyj1d8201vajwn862waxra";
buildDepends = [
cmdargs csv filepath HUnit mtl parsec regexpr safe shakespeareText
split time transformers utf8String
cmdargs csv filepath HUnit mtl parsec regexpr safe split time
transformers utf8String
];
meta = {
homepage = "http://hledger.org";

4
pkgs/development/libraries/haskell/hledger-web/default.nix
View File

@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "hledger-web";
version = "0.19";
sha256 = "0p820pwx4javzfvzhz02930adx6w7246hdk802wz1g4937rlq8p3";
version = "0.19.3";
sha256 = "1kx5mn6drm90clz132vrd2lkssm73hlwvxb9cxg6z82i5qa9jqn9";
isLibrary = true;
isExecutable = true;
buildDepends = [

4
pkgs/development/libraries/haskell/hledger/default.nix
View File

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "hledger";
version = "0.19.1";
sha256 = "0ad7wmcpwi7a9nag4j27rhffhai6a5zgzaafss7sfr7yia00cpgg";
version = "0.19.3";
sha256 = "1kxkv2dwl5ir2vqvbi1ppbwns8mw1lkg5lkfdkdwwbjj7dq0ysr6";
isLibrary = true;
isExecutable = true;
buildDepends = [

4
pkgs/development/libraries/haskell/http-conduit/default.nix
View File

@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "http-conduit";
version = "1.8.4.1";
sha256 = "0jrsl8m0r3i1jyhi8qsadv4dhq069v67hlphzm78sfinrd083h8y";
version = "1.8.4.3";
sha256 = "1g8cpi2mmsrdfh54ik4xlxnf1sf1r1bhnvp5b0rvhbwphcr4z93r";
buildDepends = [
asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder
blazeBuilderConduit caseInsensitive certificate conduit cookie

4
pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
View File

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "http-reverse-proxy";
version = "0.1.0.5";
sha256 = "1x1m9vklgg6x8niry8c5fxcjpmsmrpxv7j2i5h38hp1hbka3mpr0";
version = "0.1.0.6";
sha256 = "0ybhzyim8b2k1kv5bz0qbignj5lwf8pbpqmrp1vrvyz8a2iy71c8";
buildDepends = [
blazeBuilder caseInsensitive classyPreludeConduit conduit
httpConduit httpTypes liftedBase monadControl network

4
pkgs/development/libraries/haskell/lens/default.nix
View File

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "lens";
version = "3.4";
sha256 = "19f5kmd6b1jnimvfm56dpgqzhnlpi0anar1ii9am38lg5yaqbgs4";
version = "3.6";
sha256 = "1zl52hj0ccx21qwlqrscfjmc7i0g2prikmd3lgbfbgjqlh7wnqdq";
buildDepends = [
comonad comonadsFd comonadTransformers filepath hashable mtl
parallel semigroups split text transformers unorderedContainers

13
pkgs/development/libraries/haskell/liblastfm/default.nix
View File

@ -1,15 +1,14 @@
{ cabal, aeson, curl, mtl, pureMD5, urlencoded, utf8String, xml }:
{ cabal, aeson, attoparsec, curl, mtl, pureMD5, urlencoded
, utf8String, xml
}:
cabal.mkDerivation (self: {
pname = "liblastfm";
version = "0.0.3.6";
sha256 = "0xmrciv489dvksgpg9g83kna34x1amsx45wvpngcpnx4m44fcp4w";
version = "0.0.3.8";
sha256 = "0icx86x3w85z0pqdxcch583j6jk5id5aw9gf24266mgfg5k6iwdy";
buildDepends = [
aeson curl mtl pureMD5 urlencoded utf8String xml
aeson attoparsec curl mtl pureMD5 urlencoded utf8String xml
];
patchPhase = ''
sed -i -e 's|curl == .*,|curl,|' -e 's|urlencoded .*,|urlencoded,|' liblastfm.cabal
'';
meta = {
description = "Wrapper to Lastfm API";
license = self.stdenv.lib.licenses.mit;

0
pkgs/development/libraries/haskell/multiset/default.nix → pkgs/development/libraries/haskell/multiset/0.2.1.nix
View File

9
pkgs/development/libraries/haskell/time/1.2.0.5.nix → pkgs/development/libraries/haskell/multiset/0.2.2.nix
View File

@ -1,12 +1,11 @@
{ cabal }:
cabal.mkDerivation (self: {
pname = "time";
version = "1.2.0.5";
sha256 = "0y4plv9qvpmzzzb5855zngm6lmd38m0vr2mzwm94xhz2xsqhdh2z";
pname = "multiset";
version = "0.2.2";
sha256 = "1g14c1zm4rdc8nxvb69k98h542wi24q2lpba1gpqjqspk4d0sjmn";
meta = {
homepage = "http://semantic.org/TimeLib/";
description = "A time library";
description = "The Data.MultiSet container type";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];

4
pkgs/development/libraries/haskell/optparse-applicative/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "optparse-applicative";
version = "0.4.1";
sha256 = "00byv248662n6pr8gn5b777l0fjg6f0wcxfkbhw0qyhd1ciq8d38";
version = "0.4.2";
sha256 = "0hxl4hhh24hz1fc23mbsx83ccnv2fkxbar37d9c5cmiaalsrfb19";
buildDepends = [ transformers ];
meta = {
homepage = "https://github.com/pcapriotti/optparse-applicative";

4
pkgs/development/libraries/haskell/persistent-postgresql/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "persistent-postgresql";
version = "1.0.0";
sha256 = "149vv6wd0a85gphwrqcyd66ivdzyy7yc37c99ngq7377fdnszzhn";
version = "1.0.2";
sha256 = "1ry9g382ihd4b3y1sqng06k5pmj0vh00dzf4abdaph26xnncp7s6";
buildDepends = [
aeson conduit monadControl persistent postgresqlLibpq
postgresqlSimple text time transformers

4
pkgs/development/libraries/haskell/persistent-sqlite/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "persistent-sqlite";
version = "1.0.0";
sha256 = "0ak9x6w9566mjc0ggsqxr69x4w5w7igdxkq6wwm6ysy5cvs8fwc8";
version = "1.0.1";
sha256 = "1qvyxvmy37iy3q0frmy3zcklhms2rpjplw0fhk37cmgmw0bj2b7m";
buildDepends = [
aeson conduit monadControl persistent text transformers
];

4
pkgs/development/libraries/haskell/persistent/default.nix
View File

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "persistent";
version = "1.0.1.3";
sha256 = "156iv1iv807wm39sr98z0f10sbw4q0ac3lafgai0mq3ph5xysi80";
version = "1.0.2.2";
sha256 = "0sas9jv00c01sx593applajcfjdjz24yrncx001kj6mfm7pmm86n";
buildDepends = [
aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit
liftedBase monadControl monadLogger pathPieces poolConduit

4
pkgs/development/libraries/haskell/resourcet/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "resourcet";
version = "0.4.3";
sha256 = "0j3sr4xl30nszy79akzzn8aws40bmhd2dyw8ispirnx004i6ay3b";
version = "0.4.4";
sha256 = "0ad1hl7bl9qid4brchb95gvnylfchmxncgdvgljb5lci7gy9r31z";
buildDepends = [
liftedBase monadControl mtl transformers transformersBase
];

4
pkgs/development/libraries/haskell/skein/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "skein";
version = "0.1.0.9";
sha256 = "06hx064cpfcd397rmrmfbm7ph38pnxcsn6wij8fcfsx9wq5yq1k1";
version = "0.1.0.10";
sha256 = "0qyiy2yx4qmazz744hyq51v2as51zd9r623bhhk21yzsgh7rl9kc";
buildDepends = [ cereal cryptoApi tagged ];
meta = {
homepage = "https://github.com/meteficha/skein";

14
pkgs/development/libraries/haskell/time/1.1.3.nix
View File

@ -1,14 +0,0 @@
{ cabal }:
cabal.mkDerivation (self: {
pname = "time";
version = "1.1.3";
sha256 = "46d32400bc0099ccef1fb670684c00a31055725403ea15c7a39278ff7dccc65b";
meta = {
homepage = "http://semantic.org/TimeLib/";
description = "A time library";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

14
pkgs/development/libraries/haskell/time/1.2.0.3.nix
View File

@ -1,14 +0,0 @@
{ cabal }:
cabal.mkDerivation (self: {
pname = "time";
version = "1.2.0.3";
sha256 = "acb1e3cf2b98a73632d35b0665808b05df6c03fcefd62796fe291f5b2ef4348e";
meta = {
homepage = "http://semantic.org/TimeLib/";
description = "A time library";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

4
pkgs/development/libraries/haskell/time/1.4.0.1.nix → pkgs/development/libraries/haskell/time/1.4.0.2.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "time";
version = "1.4.0.1";
sha256 = "046jyz2xnbg2s94d9xhpphgq93mqlky7bc50vss40wdk6l7w8aws";
version = "1.4.0.2";
sha256 = "0p4ncankr9968lp4fnbq6pc5xwv2198gxhbds656da9jbv74w7j8";
buildDepends = [ deepseq ];
meta = {
homepage = "http://semantic.org/TimeLib/";

4
pkgs/development/libraries/haskell/type-equality/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "type-equality";
version = "0.1.0.2";
sha256 = "09m6vc5hglf3xdg0bg9lgbkgjffmbkfgcrqf5ii36l92c4dik32q";
version = "0.1.1";
sha256 = "0sgb7aki0ns3547y3abv1xh9rlmwhjm1c370pf3jjssysayh2wzv";
meta = {
homepage = "http://github.com/hesselink/type-equality/";
description = "Type equality, coercion/cast and other operations";

4
pkgs/development/libraries/haskell/warp/default.nix
View File

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "warp";
version = "1.3.4.4";
sha256 = "0i6mjadw87f9c949wg9lcbld0yfvnrxn7bhapf71gk36sh7llxaj";
version = "1.3.5";
sha256 = "0hxipvdp0nwziijzmcnf0kdb3cz1m2w6xwszq2zqpjb7fvcy2acl";
buildDepends = [
blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable
httpTypes liftedBase network networkConduit simpleSendfile

19
pkgs/development/libraries/haskell/yesod-auth/default.nix
View File

@ -1,19 +1,20 @@
{ cabal, aeson, authenticate, blazeHtml, blazeMarkup, hamlet
, httpConduit, liftedBase, mimeMail, persistent, persistentTemplate
, pureMD5, pwstoreFast, random, SHA, shakespeareCss, text
, transformers, unorderedContainers, wai, yesodCore, yesodForm
, yesodJson, yesodPersistent
, httpConduit, liftedBase, mimeMail, network, persistent
, persistentTemplate, pureMD5, pwstoreFast, random, SHA
, shakespeareCss, shakespeareJs, text, transformers
, unorderedContainers, wai, yesodCore, yesodForm, yesodJson
, yesodPersistent
}:
cabal.mkDerivation (self: {
pname = "yesod-auth";
version = "1.1.1.6";
sha256 = "0xbr8q7rv73hsh90pdb5cl00pd4mx3q74q0dqampha0y2lpq6124";
version = "1.1.1.7";
sha256 = "09d999sqsm6v59l9q2gh09ar2vl601csr6w8mkcmgax5bdb26waz";
buildDepends = [
aeson authenticate blazeHtml blazeMarkup hamlet httpConduit
liftedBase mimeMail persistent persistentTemplate pureMD5
pwstoreFast random SHA shakespeareCss text transformers
unorderedContainers wai yesodCore yesodForm yesodJson
liftedBase mimeMail network persistent persistentTemplate pureMD5
pwstoreFast random SHA shakespeareCss shakespeareJs text
transformers unorderedContainers wai yesodCore yesodForm yesodJson
yesodPersistent
];
meta = {

4
pkgs/development/libraries/haskell/yesod-core/default.nix
View File

@ -9,8 +9,8 @@
cabal.mkDerivation (self: {
pname = "yesod-core";
version = "1.1.5";
sha256 = "1mnmszka6fy5gps1y4bwpn0aq5vzxdxqyh2vrl7vii1lfl51yly7";
version = "1.1.6";
sha256 = "1y7bw0wzi52mnvs0zf93q8aiq87mnn2j4f2ry4y2f859xfdzbvsi";
buildDepends = [
aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal
clientsession conduit cookie failure fastLogger hamlet httpTypes

4
pkgs/development/libraries/haskell/zlib-conduit/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "zlib-conduit";
version = "0.5.0.2";
sha256 = "1jgj3x4z1901bm1618753hqyrjragzrpyhy9h02qj9kplqswh878";
version = "0.5.0.3";
sha256 = "05rlbyxcwq952psbfp94irmygabqxyf1kkm80pwdanlaaky03nsb";
buildDepends = [ conduit transformers void zlibBindings ];
meta = {
homepage = "http://github.com/snoyberg/conduit";

10
pkgs/development/libraries/muparser/default.nix
View File

@ -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++";

2
pkgs/development/libraries/qt-4.x/4.8/default.nix
View File

@ -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 =

13
pkgs/development/qtcreator/default.nix
View File

@ -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 = {

30
pkgs/development/tools/misc/intltool/default.nix Normal file
View File

@ -0,0 +1,30 @@
{stdenv, fetchurl, perl, perlXMLParser}:
let
s = # Generated upstream information
rec {
baseName="intltool";
version="0.50.2";
name="intltool-0.50.2";
hash="01j4yd7i84n9nk4ccs6yifg84pp68nr9by57jdbhj7dpdxf5rwk7";
url="https://launchpad.net/intltool/trunk/0.50.2/+download/intltool-0.50.2.tar.gz";
sha256="01j4yd7i84n9nk4ccs6yifg84pp68nr9by57jdbhj7dpdxf5rwk7";
};
propagatedBuildInputs = [perl perlXMLParser];
buildInputs = [];
in
stdenv.mkDerivation rec {
inherit (s) name version;
src = fetchurl {
inherit (s) url sha256;
};
inherit propagatedBuildInputs buildInputs;
meta = {
description = "Translation helper tool";
homepage = "http://launchpad.net/intltool/";
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
inherit (s) version;
};
}

1
pkgs/development/tools/misc/intltool/default.upstream Normal file
View File

@ -0,0 +1 @@
url https://launchpad.net/intltool/+download

26
pkgs/development/tools/neoload/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, writeTextFile, oraclejre, makeWrapper, licenseAccepted ? false }:
{ stdenv, fetchurl, writeTextFile, jre, makeWrapper, licenseAccepted ? false }:
# If you happen to use this software on the XMonad window manager, you will have issues with
# grey windows, no resizing, menus not showing and other glitches.
@ -12,10 +12,10 @@ if !licenseAccepted then throw ''
''
else assert licenseAccepted;
# the installer is very picky and demands 1.6.0.29
# the installer is very picky and demands 1.7.0.07
let dotInstall4j = writeTextFile { name = "dot-install4j"; text = ''
JRE_VERSION ${oraclejre} 1 6 0 29
JRE_INFO ${oraclejre} 0
JRE_VERSION ${jre} 1 7 0 7
JRE_INFO ${jre} 94
''; };
responseVarfile = writeTextFile { name = "response.varfile"; text = ''
@ -31,15 +31,15 @@ let dotInstall4j = writeTextFile { name = "dot-install4j"; text = ''
''; };
in stdenv.mkDerivation rec {
name = "neoload-4.0.4";
name = "neoload-4.1.0";
src = fetchurl (
if stdenv.system == "x86_64-linux" then
{ url = http://www.neotys.com/documents/download/neoload/v4.0/neoload_4_0_4_linux_x64.sh;
sha256 = "1w5pqik1998irpamx6y4rf2v5v34nm8xm6cwa1a8j0agawv992w2"; }
{ url = http://www.neotys.com/documents/download/neoload/v4.1/neoload_4_1_0_linux_x64.sh;
sha256 = "07r2pkspdylwi1ba36mqswxsz0xadkw6qn59ljkyw2hsvazd2824"; }
else
{ url = http://www.neotys.com/documents/download/neoload/v4.0/neoload_4_0_4_linux_x86.sh;
sha256 = "0k49kcwnimax9q7d2kychcbhh4zlixlx4ak9jgrm901zpkhw2f3b"; } );
{ url = http://www.neotys.com/documents/download/neoload/v4.1/neoload_4_1_0_linux_x86.sh;
sha256 = "1sd6fc35881dqr8m8qsgbblsfx97agam50w9iasd9hxmws7n6pfs"; } );
buildInputs = [ makeWrapper ];
phases = [ "installPhase" ];
@ -47,6 +47,9 @@ in stdenv.mkDerivation rec {
# TODO: load generator / monitoring agent only builds
installPhase = ''
mkdir -p $out/lib/neoload
ln -s ${jre} $out/lib/neoload/jre
# the installer wants to use its internal JRE
# disable this. The extra spaces are needed because the installer carries
# a binary payload, so should not change in size
@ -59,8 +62,8 @@ in stdenv.mkDerivation rec {
sed -e "s|INSTALLDIR|$out|" ${responseVarfile} > response.varfile
export HOME=`pwd`
export INSTALL4J_JAVA_HOME=${oraclejre}
./installer -q -varfile response.varfile
export INSTALL4J_JAVA_HOME=${jre}
bash -ic './installer -q -varfile response.varfile'
for i in $out/bin/*; do
wrapProgram $i --run 'cp ${dotInstall4j} ~/.install4j' \
@ -74,7 +77,6 @@ in stdenv.mkDerivation rec {
done
rm $out/lib/neoload/*.desktop $out/lib/neoload/uninstall
ln -s ${oraclejre}/bin $out/lib/neoload/jre
'';
meta = {

6
pkgs/games/LambdaHack/default.nix
View File

@ -2,14 +2,14 @@
cabal.mkDerivation (self: {
pname = "LambdaHack";
version = "0.2.1";
sha256 = "1d2mnpy8fl9m5584rbskgary18mqibivwmlz9gfv87gg0lzhw2ab";
version = "0.2.6";
sha256 = "03adjwzbql1k1ky05vivry7waa8p41ha3lsnv9j9mdgpwqldypwd";
isLibrary = true;
isExecutable = true;
buildDepends = [ binary ConfigFile filepath gtk mtl random zlib ];
meta = {
homepage = "http://github.com/kosmikus/LambdaHack";
description = "A roguelike game engine in early and very active development";
description = "A roguelike game engine in early and active development";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];

83
pkgs/games/worldofgoo/default.nix Normal file
View File

@ -0,0 +1,83 @@
{ stdenv, config, requireFile, fetchurl
, libX11, libXext, libXau, libxcb, libXdmcp , SDL, SDL_mixer, libvorbis, mesa
, demo ? false }:
# TODO: add i686 support
stdenv.mkDerivation rec {
name = if demo
then "WorldOfGooDemo-1.41"
else "WorldofGoo-1.41";
arch = if stdenv.system == "x86_64-linux" then "supported"
else throw "Sorry. World of Goo only is only supported on x86_64 now.";
goBuyItNow = ''
We cannot download the full version automatically, as you require a license.
Once you bought a license, you need to add your downloaded version to the nix store.
You can do this by using "nix-prefetch-url file://WorldOfGooSetup.1.41.tar.gz" in the
directory where you saved it.
Or you can install the demo version: 'nix-env -i -A pkgs.worldofgoo_demo'.
'';
getTheDemo = ''
We cannot download the demo version automatically, please go to
http://worldofgoo.com/dl2.php?lk=demo, then add it to your nix store.
You can do this by using "nix-prefetch-url file://WorldOfGooDemo.1.41.tar.gz" in the
directory where you saved it.
'';
src = if demo
then
requireFile {
message = getTheDemo;
name = "WorldOfGooDemo.1.41.tar.gz";
sha256 = "0ndcix1ckvcj47sgndncr3hxjcg402cbd8r16rhq4cc43ibbaxri";
}
else
requireFile {
message = goBuyItNow;
name = "WorldOfGooSetup.1.41.tar.gz";
sha256 = "0rj5asx4a2x41ncwdby26762my1lk1gaqar2rl8dijfnpq8qlnk7";
};
phases = "unpackPhase installPhase";
# XXX: stdenv.lib.makeLibraryPath doesn't pick up /lib64
libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc stdenv.gcc.libc ]
+ ":" + stdenv.lib.makeLibraryPath [libX11 libXext libXau libxcb libXdmcp SDL SDL_mixer libvorbis mesa ]
+ ":" + stdenv.gcc.gcc + "/lib64";
installPhase = ''
ensureDir $out/libexec/2dboy/WorldOfGoo/
ensureDir $out/bin
patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" --set-rpath $libPath ./WorldOfGoo.bin64
cp -r * $out/libexec/2dboy/WorldOfGoo/
#makeWrapper doesn't do cd. :(
cat > $out/bin/WorldofGoo << EOF
#!/bin/sh
cd $out/libexec/2dboy/WorldOfGoo
exec ./WorldOfGoo.bin64
EOF
chmod +x $out/bin/WorldofGoo
'';
meta = {
description = "A physics based puzzle game";
longDescription = ''
World of Goo is a physics based puzzle / construction game. The millions of Goo
Balls who live in the beautiful World of Goo don't know that they are in a
game, or that they are extremely delicious.
'';
homepage = http://worldofgoo.com;
license = [ "unfree" ];
maintainers = with stdenv.lib.maintainers; [ jcumming ];
platforms = [ "x86_64-linux"] ;
};
}

5
pkgs/games/xsokoban/default.nix
View File

@ -20,6 +20,7 @@ rec {
phaseNames = ["preConfigure" "doConfigure" "preBuild" "doMakeInstall"];
preConfigure = a.fullDepEntry (''
sed -e 's/getline/my_getline/' -i score.c
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${a.libXpm}/include/X11"
for i in $NIX_CFLAGS_COMPILE; do echo $i; ls ''${i#-I}; done
chmod a+rw config.h
@ -28,8 +29,8 @@ rec {
echo '#define OWNER "'$(whoami)'"' >> config.h
echo '#define ROOTDIR "'$out/lib/xsokoban'"' >> config.h
echo '#define ANYLEVEL 1' >> config.h
echo '#define SCOREFILE "/tmp/.xsokoban-score"' >> config.h
echo '#define LOCKFILE "/tmp/.xsokoban-score-lock"' >> config.h
echo '#define SCOREFILE ".xsokoban-score"' >> config.h
echo '#define LOCKFILE ".xsokoban-score-lock"' >> config.h
sed -e 's/getpass[(][^)]*[)]/PASSWORD/' -i main.c
sed -e '/if [(]owner[)]/iowner=1;' -i main.c

18
pkgs/games/zdoom/default.nix
View File

@ -1,11 +1,19 @@
{stdenv, fetchsvn, cmake, SDL, nasm, p7zip, zlib, flac, fmod, libjpeg}:
{stdenv, fetchurl, cmake, SDL, nasm, p7zip, zlib, flac, fmod, libjpeg}:
stdenv.mkDerivation {
name = "zdoom-svn-1424";
src = fetchsvn {
url = http://mancubus.net/svn/hosted/zdoom/zdoom/trunk;
rev = 1424;
name = "zdoom-2.6.1";
src = fetchurl {
url = http://zdoom.org/files/zdoom/2.6/zdoom-2.6.1-src.7z;
sha256 = "1ha7hygwf243vkgw0dfh4dxphf5vffb3kkci1p1p75a7r1g1bir8";
};
# XXX: shouldn't inclusion of p7zip handle this?
unpackPhase = ''
mkdir zdoom
cd zdoom
7z x $src
'';
buildInputs = [cmake nasm SDL p7zip zlib flac fmod libjpeg];
cmakeFlags = [ "-DSDL_INCLUDE_DIR=${SDL}/include/SDL" ];

6
pkgs/games/zoom/default.nix
View File

@ -3,11 +3,11 @@
# !!! assert freetype == xlibs.freetype
stdenv.mkDerivation {
name = "zoom-1.0.2alpha1";
name = "zoom-1.1.5";
src = fetchurl {
url = http://www.logicalshift.demon.co.uk/unix/zoom/zoom-1.0.2alpha1.tar.gz;
md5 = "91b2fe444028178aa3b23bd0e3ae1a61";
url = http://www.logicalshift.co.uk/unix/zoom/zoom-1.1.5.tar.gz;
sha256 = "1g6van7f7sg3zfcz80mncnnbccyg2hnm0hq4x558vpsm0lf7z5pj";
};
buildInputs = [perl expat x11 freetype];

2
pkgs/lib/maintainers.nix
View File

@ -15,7 +15,7 @@
bluescreen303 = "Mathijs Kwik <mathijs@bluescreen303.nl>";
chaoflow = "Florian Friesdorf <flo@chaoflow.net>";
coconnor = "Corey O'Connor <coreyoconnor@gmail.com>";
eelco = "Eelco Dolstra <e.dolstra@tudelft.nl>";
eelco = "Eelco Dolstra <eelco.dolstra@logicblox.com>";
garbas = "Rok Garbas <rok@garbas.si>";
goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>";
guibert = "David Guibert <david.guibert@gmail.com>";

17
pkgs/misc/sane-front/default.nix
View File

@ -1,17 +0,0 @@
{stdenv, fetchurl, saneBackends, libX11, gtk,
pkgconfig, libusb ? null}:
stdenv.mkDerivation {
name = "sane-frontend";
src = fetchurl {
url = ftp://ftp.sane-project.org/pub/sane/sane-frontends-1.0.14/sane-frontends-1.0.14.tar.gz;
md5 = "c63bf7b0bb5f530cf3c08715db721cd3";
};
preConfigure = ''
sed -e '/SANE_CAP_ALWAYS_SETTABLE/d' -i src/gtkglue.c
'';
buildInputs = [saneBackends libX11 gtk pkgconfig] ++
(if (libusb != null) then [libusb] else []);
}

4
pkgs/os-specific/linux/kernel/linux-3.0.nix
View File

@ -230,7 +230,7 @@ in
import ./generic.nix (
rec {
version = "3.0.52";
version = "3.0.53";
preConfigure = ''
substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
@ -238,7 +238,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "09iszqkxnwkcmm4cwh7320jrwbpwgzx0v05l8mq36p8ix3s926k6";
sha256 = "0nrlfsi3y3cw398yz4qqh54ymzwxj3jm85g74zm8z2bhqnwmd28d";
};
config = configWithPlatform stdenv.platform;

4
pkgs/os-specific/linux/kernel/linux-3.4.nix
View File

@ -239,7 +239,7 @@ in
import ./generic.nix (
rec {
version = "3.4.19";
version = "3.4.20";
testing = false;
preConfigure = ''
@ -248,7 +248,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
sha256 = "0zf5da2yfy10ml0f7rpzdbfj9avayw2i9mpm07xhjamw717b82bh";
sha256 = "134kfzsdq5mhdizqik293lnqp9nd3bpgz5n3033wws7pslildp24";
};
config = configWithPlatform stdenv.platform;

4
pkgs/os-specific/linux/kernel/linux-3.6.nix
View File

@ -244,7 +244,7 @@ in
import ./generic.nix (
rec {
version = "3.6.7";
version = "3.6.8";
testing = false;
preConfigure = ''
@ -253,7 +253,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
sha256 = "08ivh0md8lcq4xqq98y2ripfb02pykh6qla4zspj76qvl0awvp3x";
sha256 = "1rq44m1czvc7d2zzclqgl6pwvh4xr76gsdgxk9hg1z4wh066zd14";
};
config = configWithPlatform stdenv.platform;

2
pkgs/os-specific/linux/zfs/default.nix
View File

@ -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 = ''

4
pkgs/tools/filesystems/xtreemfs/default.nix
View File

@ -11,10 +11,10 @@ let
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="XtreemFS";
version="1.3.0";
version="1.4";
name="${baseName}-${version}";
url="http://xtreemfs.googlecode.com/files/${name}.tar.gz";
hash="15rg3dh22kb2g94fmbb6r32a9qfl3yr4ql17rwj50l4y8wrcx0hf";
hash="1hzd6anplxdcl4cg6xwriqk9b34541r7ah1ab2xavv149a2ll25s";
};
in
rec {

33
pkgs/tools/networking/connect/default.nix Normal file
View File

@ -0,0 +1,33 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "connect-1.95";
src = fetchurl {
url = http://savannah.gnu.org/maintenance/connect.c;
sha256 = "11dx07pcanwaq71g4xh8d4blr5j7iy0ilmb0fkgpj8p22blb74mf";
};
phases = "unpackPhase buildPhase fixupPhase";
unpackPhase = ''
cp $src connect.c
'';
buildPhase = ''
ensureDir $out/bin
gcc -o $out/bin/connect connect.c
'';
meta = {
description = "make network connection via SOCKS and https proxy.";
longDescription = ''
This proxy traversal tool is intended to assist OpenSSH (via ProxyCommand
in ~/.ssh/config) and GIT (via $GIT_PROXY_COMMAND) utilize SOCKS and https proxies.
'';
homepage = http://bent.latency.net/bent/git/goto-san-connect-1.85/src/connect.html; # source URL is busted there
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.gnu;
maintainers = with stdenv.lib.maintainers; [ jcumming ];
};
}

Some files were not shown because too many files have changed in this diff Show More