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

Merge remote-tracking branch 'origin/master' into stdenv-updates.

This commit is contained in:
Peter Simons 2013-04-04 00:51:30 +02:00
parent 4cdcd4e74f 40aa6be1d9
commit 62e37492b9
51 changed files with 607 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/audio/mopidy/default.nix
View File

@ -5,12 +5,12 @@
pythonPackages.buildPythonPackage rec {
name = "mopidy-${version}";
version = "0.11.1";
version = "0.12.0";
src = fetchgit {
url = "https://github.com/mopidy/mopidy.git";
rev = "refs/tags/v${version}";
sha256 = "123p9hsnlgwvrw4vzlxjf5f43rqzqa3ynbqha8pyi6r0q3ln7qjn";
sha256 = "18b1gsyq1ph1a8gl6m4jmhkvq1gyyhbkbb6rrr3qr4rb5prl1fyi";
};
propagatedBuildInputs = with pythonPackages; [

2
pkgs/applications/graphics/cinepaint/default.nix
View File

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig ];
NIX_LDFLAGS = "-llcms -ljpeg";
NIX_LDFLAGS = "-llcms -ljpeg -lX11";
# NIX_CFLAGS_COMPILE = "-I.";

53
pkgs/applications/graphics/darktable/1.2rc1.nix Normal file
View File

@ -0,0 +1,53 @@
{ stdenv, fetchurl
, GConf, atk, cairo, cmake, curl, dbus_glib, exiv2, glib
, 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, libxslt }:
assert stdenv ? glibc;
stdenv.mkDerivation rec {
version = "1.2rc1";
name = "darktable-${version}";
src = fetchurl {
url = "http://tinyurl.com/bmwdztq";
name = "${name}-${version}.tar.xz";
sha256 = "0l3gl49bmaljrrl4zfaivvj7apxa2jm934ylq24gcms3b2whv70m";
};
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 libxslt
];
preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/include/gtk-2.0"
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/lib/gtk-2.0/include"
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${cairo}/include/cairo"
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${atk}/include/atk-1.0"
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${ilmbase}/include/OpenEXR"
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${openexr}/include/OpenEXR"
substituteInPlace tools/create_preferences.sh.in --replace '#!/usr/bin/env bash' '#!${bash}/bin/bash'
'';
cmakeFlags = [
"-DPTHREAD_INCLUDE_DIR=${stdenv.glibc}/include"
"-DPTHREAD_LIBRARY=${stdenv.glibc}/lib/libpthread.so"
"-DCMAKE_BUILD_TYPE=Release"
"-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include"
"-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk}/lib/gtk-2.0/include"
];
meta = with stdenv.lib; {
description = "Virtual lighttable and darkroom for photographers";
homepage = http://darktable.sourceforge.net;
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = [ maintainers.goibhniu ];
};
}

17
pkgs/applications/misc/yeganesh/default.nix Normal file
View File

@ -0,0 +1,17 @@
{ cabal, filepath, strict, time, xdgBasedir }:
cabal.mkDerivation (self: {
pname = "yeganesh";
version = "2.5";
sha256 = "1bgw5v1g5n06jj0lyxpf48mdpaa2s49g0lbagf3jf9q01rb92bvf";
isLibrary = false;
isExecutable = true;
buildDepends = [ filepath strict time xdgBasedir ];
meta = {
homepage = "http://dmwit.com/yeganesh";
description = "small dmenu wrapper";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.simons ];
};
})

10
pkgs/applications/networking/browsers/conkeror/default.nix
View File

@ -1,18 +1,18 @@
{ stdenv, fetchurl, unzip, xulrunner, makeWrapper }:
stdenv.mkDerivation {
name = "conkeror-1.0pre-20120316";
name = "conkeror-1.0pre-20130401";
src = fetchurl {
url = http://repo.or.cz/w/conkeror.git/snapshot/1264c0dbbefb6d671504a072d4ddb48d62ccead2.zip;
sha256 = "1vdxnhqjjvg9cry70byv6d3wib2p4rxhkmv7hs10pq39km1kpj7f";
url = http://repo.or.cz/w/conkeror.git/snapshot/0341e791c78653a2f5bbbff9a1dac04bf898dd65.zip;
sha256 = "11v7p40lcz6r5z0w54f8pk6hyn9mqjcw44fqszjyz25rkhx951ry";
};
buildInputs = [ unzip makeWrapper ];
buildCommand = ''
installPhase = ''
mkdir -p $out/libexec/conkeror
unzip $src -d $out/libexec
cp -r * $out/libexec/conkeror
makeWrapper ${xulrunner}/bin/xulrunner $out/bin/conkeror \
--add-flags $out/libexec/conkeror/application.ini

36
pkgs/applications/networking/dropbox-cli/default.nix Normal file
View File

@ -0,0 +1,36 @@
{ stdenv, coreutils, fetchurl, python }:
stdenv.mkDerivation {
name = "dropbox-cli";
src = fetchurl {
url = "https://linux.dropbox.com/packages/dropbox.py";
sha256 = "1x46i0aplah4a2nqglb8byl3c60w7h1cjja62myxj2dpxyv7fydy";
};
buildInputs = [ coreutils python ];
phases = "installPhase fixupPhase";
installPhase = ''
mkdir -pv $out/bin/
cp $src $out/bin/dropbox-cli
'';
fixupPhase = ''
substituteInPlace $out/bin/dropbox-cli \
--replace "/usr/bin/python" ${python}/bin/python \
--replace "use dropbox help" "use dropbox-cli help"
chmod +x $out/bin/dropbox-cli
'';
meta = {
homepage = http://dropbox.com;
description = "Command line client for the dropbox daemon.";
license = stdenv.lib.licenses.gpl3;
# NOTE: Dropbox itself only works on linux, so this is ok.
platforms = stdenv.lib.platforms.linux;
};
}

14
pkgs/applications/science/electronics/kicad/default.nix
View File

@ -1,18 +1,18 @@
{stdenv, fetchurl, fetchbzr, unzip, cmake, mesa, wxGTK, zlib, libX11,
gettext}:
{ stdenv, fetchurl, fetchbzr, unzip, cmake, mesa, gtk, wxGTK, zlib, libX11,
gettext, cups } :
stdenv.mkDerivation rec {
name = "kicad-20110708";
name = "kicad-20130325";
src = fetchurl {
url = ftp://iut-tice.ujf-grenoble.fr/cao/sources/kicad_sources-2011-07-08-BZR3044.zip;
sha256 = "1gr75zcf55p3xpbg1gdkdpbh5x11bawc9rcff4fskwjyc3vfiv6a";
url = "http://iut-tice.ujf-grenoble.fr/cao/kicad-sources-stable_2013-03-25_BZR4005.zip";
sha256 = "0hg2aiis14am7mmpimcxnxvhy7c7fr5rgzlk6rjv44d9m0f9957m";
};
srcLibrary = fetchbzr {
url = "http://bazaar.launchpad.net/~kicad-lib-committers/kicad/library";
revision = 112;
sha256 = "49fa9ad90759cfaf522c2a62665f033688b9d84d02f31c6b2505c08a217ad312";
revision = 220;
sha256 = "0l2lblgnm51n2w1p4ifpwdvq04rxgq73zrfxlhqa9zdlyh4rcddb";
};
cmakeFlags = "-DKICAD_TESTING_VERSION=ON";

59
pkgs/applications/search/recoll/default.nix Normal file
View File

@ -0,0 +1,59 @@
{ stdenv, fetchurl
, qt4, xapian, file, python
, djvulibre, groff, libxslt, unzip, xpdf, antiword, catdoc, lyx
, ghostscript, gawk, gnugrep, gnused, gnutar, gzip, libiconvOrLibc }:
stdenv.mkDerivation rec {
ver = "1.18.1";
name = "recoll-${ver}";
src = fetchurl {
url = "http://www.lesbonscomptes.com/recoll/${name}.tar.gz";
sha256 = "0cyrkx5aza3485avb2kxc6cbsqqrb32l1kq8ravr9d828331v84f";
};
configureFlags = [ "--with-inotify" ];
buildInputs = [ qt4 xapian file python ];
# the filters search through ${PATH} using a sh proc 'checkcmds' for the
# filtering utils. Short circuit this by replacing the filtering command with
# the absolute path to the filtering command.
postInstall = ''
for f in $out/share/recoll/filters/* ; do
substituteInPlace $f --replace antiword ${antiword}/bin/antiword
substituteInPlace $f --replace awk ${gawk}/bin/awk
substituteInPlace $f --replace catppt ${catdoc}/bin/catppt
substituteInPlace $f --replace djvused ${djvulibre}/bin/djvused
substituteInPlace $f --replace djvutxt ${djvulibre}/bin/djvutxt
substituteInPlace $f --replace grep ${gnugrep}/bin/grep
substituteInPlace $f --replace groff ${groff}/bin/groff
substituteInPlace $f --replace gunzip ${gzip}/bin/gunzip
substituteInPlace $f --replace iconv ${libiconvOrLibc}/bin/iconv
substituteInPlace $f --replace lyx ${lyx}/bin/lyx
substituteInPlace $f --replace pdftotext ${xpdf}/bin/pdftotext
substituteInPlace $f --replace pstotext ${ghostscript}/bin/ps2ascii
substituteInPlace $f --replace sed ${gnused}/bin/sed
substituteInPlace $f --replace tar ${gnutar}/bin/tar
substituteInPlace $f --replace unzip ${unzip}/bin/unzip
substituteInPlace $f --replace xls2csv ${catdoc}/bin/xls2csv
substituteInPlace $f --replace xsltproc ${libxslt}/bin/xsltproc
done
'';
# TODO:
#substituteInPlace $f --replace unrtf ${unrtf}/bin/unrtf
#substituteInPlace $f --replace untex ${untex}/bin/untex
#substituteInPlace $f --replace wpd2html ${wpd2html}/bin/wpd2html
meta = {
description = "finds keywords inside documents as well as file names";
longDescription = ''
Recoll is an Xapian frontend that can search through files, archive
members, email attachments.
'';
homepage = http://www.lesbonscomptes.com/recoll/;
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ jcumming ];
};
}

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

@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
installPhase = ''
make install
make install-doc
mkdir -p $out/etc/bash_completion.d/
cp contrib/tig-completion.bash $out/etc/bash_completion.d/
'';
meta = {
homepage = "http://jonas.nitro.dk/tig/";

13
pkgs/applications/video/xbmc/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, makeWrapper
, pkgconfig, cmake, gnumake, yasm, python
, boost
, boost, avahi, libdvdcss, lame
, gettext, pcre, yajl, fribidi
, openssl, gperf, tinyxml2, taglib, libssh, swig, jre
, libX11, xproto, inputproto
@ -20,7 +20,9 @@
, libusb ? null, usbSupport ? false
, samba ? null, sambaSupport ? true
# TODO: would be nice to have nfsSupport (needs libnfs library)
# TODO: librtmp
, libvdpau ? null, vdpauSupport ? true
, pulseaudio ? null, pulseSupport ? false
}:
assert dbusSupport -> dbus_libs != null;
@ -28,6 +30,7 @@ assert udevSupport -> udev != null;
assert usbSupport -> libusb != null && ! udevSupport; # libusb won't be used if udev is avaliable
assert sambaSupport -> samba != null;
assert vdpauSupport -> libvdpau != null && ffmpeg.vdpauSupport;
assert pulseSupport -> pulseaudio != null;
stdenv.mkDerivation rec {
name = "xbmc-12.1";
@ -53,14 +56,15 @@ stdenv.mkDerivation rec {
ffmpeg libmpeg2 libsamplerate libmad
libogg libvorbis flac
lzo libcdio libmodplug libass
sqlite mysql nasm
sqlite mysql nasm avahi libdvdcss lame
curl bzip2 zip unzip glxinfo xdpyinfo
]
++ lib.optional dbusSupport dbus_libs
++ lib.optional udevSupport udev
++ lib.optional usbSupport libusb
++ lib.optional sambaSupport samba
++ lib.optional vdpauSupport libvdpau;
++ lib.optional vdpauSupport libvdpau
++ lib.optional pulseSupport pulseaudio;
dontUseCmakeConfigure = true;
@ -69,7 +73,8 @@ stdenv.mkDerivation rec {
"--disable-webserver"
]
++ lib.optional (! sambaSupport) "--disable-samba"
++ lib.optional vdpauSupport "--enable-vdpau";
++ lib.optional vdpauSupport "--enable-vdpau"
++ lib.optional pulseSupport "--enable-pulse";
postInstall = ''
for p in $(ls $out/bin/) ; do

2
pkgs/build-support/fetchbzr/builder.sh
View File

@ -4,6 +4,6 @@ header "exporting \`$url' (revision $revision) into \`$out'"
# Perform a lightweight checkout so that we don't end up importing
# all the repository's history.
bzr checkout --lightweight "$url" -r "$revision" "$out"
bzr -Ossl.cert_reqs=none export -r "$revision" --format=dir "$out" "$url"
stopNest

7
pkgs/build-support/fetchbzr/nix-prefetch-bzr
View File

@ -50,12 +50,7 @@ if test -z "$finalPath"; then
trap "rm -rf $tmpPath" EXIT
# Perform the checkout.
if test "$NIX_PREFETCH_BZR_LEAVE_DOT_BZR" != 1
then
bzr export $revarg "$tmpFile" "$url" >&2
else
bzr checkout --lightweight $revarg "$url" "$tmpFile" >&2
fi
bzr -Ossl.cert_reqs=none export $revarg --format=dir "$tmpFile" "$url"
# Compute the hash.
hash=$(nix-hash --type $hashType $hashFormat $tmpFile)

53
pkgs/development/compilers/tinycc/default.nix
View File

@ -2,59 +2,26 @@
assert stdenv ? glibc;
let version = "0.9.25"; in
stdenv.mkDerivation {
name = "tinycc-${version}";
stdenv.mkDerivation rec {
name = "tcc-0.9.26";
src = fetchurl {
url = "mirror://savannah/tinycc/tcc-${version}.tar.bz2";
sha256 = "0dfycf80x73dz67c97j1ry29wrv35393ai5ry46i1x1fzfq6rv8v";
url = "mirror://savannah/tinycc/${name}.tar.bz2";
sha256 = "0wbdbdq6090ayw8bxnbikiv989kykff3m5rzbia05hrnwhd707jj";
};
nativeBuildInputs = [ perl texinfo ];
patches =
[ (fetchurl {
# Add support for `alloca' on x86-64.
url = "http://repo.or.cz/w/tinycc.git/patch/8ea8305199496ba29b6d0da2de07aea4441844aa";
sha256 = "0dz1cm9zihk533hszqql4gxpzbp8c4g9dnvkkh9vs4js6fnz1fl2";
name = "x86-64-alloca.patch";
})
(fetchurl {
# Fix alignment of the return value of `alloca'.
url = "http://repo.or.cz/w/tinycc.git/patch/dca2b15df42c1341794dd412917708416da25594";
sha256 = "0617a69gnfdmv8pr6dj3szv97v3zh57439dsbklxrnipx2jv6pq7";
name = "x86-64-alloca-align.patch";
})
];
postPatch = ''
substituteInPlace "texi2pod.pl" \
--replace "/usr/bin/perl" "${perl}/bin/perl"
'';
# To produce executables, `tcc' needs to know where `crt*.o' are.
sed -i "tcc.h" \
-e's|define CONFIG_TCC_CRT_PREFIX.*$|define CONFIG_TCC_CRT_PREFIX "${stdenv.glibc}/lib"|g'
sed -i "libtcc.c" \
-e's|tcc_add_library_path(s, CONFIG_SYSROOT "/lib");|tcc_add_library_path(s, "${stdenv.glibc}/lib");|g;
s|tcc_add_sysinclude_path(s, CONFIG_SYSROOT "/usr/include");|tcc_add_library_path(s, "${stdenv.glibc}/include");|g ;
s|tcc_add_sysinclude_path(s, buf);|tcc_add_sysinclude_path(s, buf); tcc_add_sysinclude_path(s, "${stdenv.glibc}/include");|g'
# Tell it about the loader's location.
sed -i "tccelf.c" \
-e's|".*/ld-linux\([^"]\+\)"|"${stdenv.glibc}/lib/ld-linux\1"|g'
''; # "
postInstall = ''
makeinfo --force tcc-doc.texi || true
mkdir -p "$out/share/info"
mv tcc-doc.info* "$out/share/info"
echo 'int main () { printf ("it works!\n"); exit(0); }' | \
"$out/bin/tcc" -run -
preConfigure = ''
configureFlagsArray+=("--elfinterp=$(cat $NIX_GCC/nix-support/dynamic-linker)")
configureFlagsArray+=("--crtprefix=${stdenv.glibc}/lib")
configureFlagsArray+=("--sysincludepaths=${stdenv.glibc}/include:{B}/include")
configureFlagsArray+=("--libpaths=${stdenv.glibc}/lib")
'';
doCheck = true;

2
pkgs/development/interpreters/guile/default.nix
View File

@ -29,7 +29,7 @@
enableParallelBuilding = true;
patches = [ ./disable-gc-sensitive-tests.patch ] ++
patches = [ ./disable-gc-sensitive-tests.patch ./eai_system.patch ] ++
(stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch);
# Explicitly link against libgcc_s, to work around the infamous

24
pkgs/development/interpreters/guile/eai_system.patch Normal file
View File

@ -0,0 +1,24 @@
Building nixpkgs in non-chroot, NSS modules may fail
and that will report EAI_SYSTEM in getaddrinfo.
https://bugzilla.novell.com/show_bug.cgi?id=794696
Index: guile-2.0.7/test-suite/tests/net-db.test
===================================================================
--- guile-2.0.7.orig/test-suite/tests/net-db.test
+++ guile-2.0.7/test-suite/tests/net-db.test
@@ -79,6 +79,7 @@
(and (defined? 'EAI_NODATA) ; GNU extension
(= errcode EAI_NODATA))
(= errcode EAI_AGAIN)
+ (= errcode EAI_SYSTEM)
(begin
(format #t "unexpected error code: ~a ~s~%"
errcode (gai-strerror errcode))
@@ -105,6 +106,7 @@
;; `EAI_NONAME'.)
(and (or (= errcode EAI_SERVICE)
(= errcode EAI_NONAME)
+ (= errcode EAI_SYSTEM)
(and (defined? 'EAI_NODATA)
(= errcode EAI_NODATA)))
(string? (gai-strerror errcode))))))))

6
pkgs/development/interpreters/racket/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, cairo, file, pango, glib, gtk
, which, libtool, makeWrapper, libjpeg, libpng
, fontconfig, liberation_ttf } :
, fontconfig, liberation_ttf, sqlite } :
stdenv.mkDerivation rec {
pname = "racket";
@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
};
# Various racket executables do run-time searches for these.
ffiSharedLibs = "${glib}/lib:${cairo}/lib:${pango}/lib:${gtk}/lib:${libjpeg}/lib:${libpng}/lib";
ffiSharedLibs = "${glib}/lib:${cairo}/lib:${pango}/lib:${gtk}/lib:${libjpeg}/lib:${libpng}/lib:${sqlite}/lib";
buildInputs = [ file libtool which makeWrapper fontconfig liberation_ttf ];
buildInputs = [ file libtool which makeWrapper fontconfig liberation_ttf sqlite ];
preConfigure = ''
export LD_LIBRARY_PATH=${ffiSharedLibs}:$LD_LIBRARY_PATH

12
pkgs/development/libraries/glibc/2.17/common.nix
View File

@ -31,13 +31,11 @@ stdenv.mkDerivation ({
enableParallelBuilding = true;
patches =
[ /* Have rpcgen(1) look for cpp(1) in $PATH.
On GNU/Hurd, use the old version of the patch since the new one
doesn't apply. */
(if hurdHeaders != null
then ../2.13/rpcgen-path.patch
else ./rpcgen-path.patch)
/* Don't try to apply these patches to the Hurd's snapshot, which is
older. */
patches = stdenv.lib.optionals (hurdHeaders == null)
[ /* Have rpcgen(1) look for cpp(1) in $PATH. */
./rpcgen-path.patch
/* Allow NixOS and Nix to handle the locale-archive. */
./nix-locale-archive.patch

18
pkgs/development/libraries/haskell/HUnit/1.2.5.2.nix Normal file
View File

@ -0,0 +1,18 @@
{ cabal, deepseq }:
cabal.mkDerivation (self: {
pname = "HUnit";
version = "1.2.5.2";
sha256 = "0hcs6qh8bqhip1kkjjnw7ccgcsmawdz5yvffjj5y8zd2vcsavx8a";
buildDepends = [ deepseq ];
meta = {
homepage = "http://hunit.sourceforge.net/";
description = "A unit testing framework for Haskell";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "clientsession";
version = "0.8.1";
sha256 = "1x4qfm4hkvm3xmn7hnvcx1j900g97qhks66xzik1wvsjy3piwpgd";
version = "0.9";
sha256 = "0cyw34vzvv1j7w094cjcf97g8bki7l9x82s8csaf96y6d9qws308";
buildDepends = [
base64Bytestring cereal cipherAes cprngAes cryptoApi entropy skein
tagged

13
pkgs/development/libraries/haskell/data-default-class/default.nix Normal file
View File

@ -0,0 +1,13 @@
{ cabal }:
cabal.mkDerivation (self: {
pname = "data-default-class";
version = "0.0.1";
sha256 = "0ccgr3jllinchqhw3lsn73ic6axk4196if5274rr1rghls0fxj5d";
meta = {
description = "A class for types with a default value";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.simons ];
};
})

14
pkgs/development/libraries/haskell/data-default-instances-base/default.nix Normal file
View File

@ -0,0 +1,14 @@
{ cabal, dataDefaultClass }:
cabal.mkDerivation (self: {
pname = "data-default-instances-base";
version = "0.0.1";
sha256 = "1832nq6by91f1iw73ycvkbgn8kpra83pvf2q61hy47xffh0zy4pb";
buildDepends = [ dataDefaultClass ];
meta = {
description = "Default instances for types in base";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.simons ];
};
})

14
pkgs/development/libraries/haskell/data-default-instances-containers/default.nix Normal file
View File

@ -0,0 +1,14 @@
{ cabal, dataDefaultClass }:
cabal.mkDerivation (self: {
pname = "data-default-instances-containers";
version = "0.0.1";
sha256 = "06h8xka031w752a7cjlzghvr8adqbl95xj9z5zc1b62w02phfpm5";
buildDepends = [ dataDefaultClass ];
meta = {
description = "Default instances for types in containers";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.simons ];
};
})

14
pkgs/development/libraries/haskell/data-default-instances-dlist/default.nix Normal file
View File

@ -0,0 +1,14 @@
{ cabal, dataDefaultClass, dlist }:
cabal.mkDerivation (self: {
pname = "data-default-instances-dlist";
version = "0.0.1";
sha256 = "0narkdqiprhgayjiawrr4390h4rq4pl2pb6mvixbv2phrc8kfs3x";
buildDepends = [ dataDefaultClass dlist ];
meta = {
description = "Default instances for types in dlist";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.simons ];
};
})

14
pkgs/development/libraries/haskell/data-default-instances-old-locale/default.nix Normal file
View File

@ -0,0 +1,14 @@
{ cabal, dataDefaultClass }:
cabal.mkDerivation (self: {
pname = "data-default-instances-old-locale";
version = "0.0.1";
sha256 = "00h81i5phib741yj517p8mbnc48myvfj8axzsw44k34m48lv1lv0";
buildDepends = [ dataDefaultClass ];
meta = {
description = "Default instances for types in old-locale";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.simons ];
};
})

15
pkgs/development/libraries/haskell/data-default/default.nix
View File

@ -1,10 +1,17 @@
{ cabal, dlist }:
{ cabal, dataDefaultClass, dataDefaultInstancesBase
, dataDefaultInstancesContainers, dataDefaultInstancesDlist
, dataDefaultInstancesOldLocale
}:
cabal.mkDerivation (self: {
pname = "data-default";
version = "0.5.1";
sha256 = "05zp9bcxm4lcdqniwckq0zi014iqcnqbrk5wh54dyy83h97z6mpv";
buildDepends = [ dlist ];
version = "0.5.2";
sha256 = "1w9wqv3k579zp5w11v06fak0lr9zzads49b1c9rb1vkz1d8bvf82";
buildDepends = [
dataDefaultClass dataDefaultInstancesBase
dataDefaultInstancesContainers dataDefaultInstancesDlist
dataDefaultInstancesOldLocale
];
meta = {
description = "A class for types with a default value";
license = self.stdenv.lib.licenses.bsd3;

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "doctest";
version = "0.9.5.1";
sha256 = "0phakf605pdwp89y522wm17n1bflxlgqkgahklnf10wnywxwm7cs";
version = "0.9.6";
sha256 = "0gw13pm4hg69v60swsv6w4iwzgdj5f4pkcyfmgzfp1dx399p6hyl";
isLibrary = true;
isExecutable = true;
buildDepends = [ deepseq filepath ghcPaths syb transformers ];

5
pkgs/development/libraries/haskell/ghc-mod/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "ghc-mod";
version = "1.12.3";
sha256 = "1dc919xbq7aqvpayqh9czvpzz4w4j082d1fjv0n9b7i4a780xghv";
version = "1.12.4";
sha256 = "1f4pdwimzc2i7bb7ccpbl8pn18ygnqd65xw1z5cmhlswasbdab14";
isLibrary = false;
isExecutable = true;
buildDepends = [
@ -25,6 +25,7 @@ cabal.mkDerivation (self: {
ensureDir "$out/share/emacs"
mv $pname-$version emacs/site-lisp
'';
doCheck = false;
meta = {
homepage = "http://www.mew.org/~kazu/proj/ghc-mod/";
description = "Happy Haskell programming on Emacs/Vim";

12
pkgs/development/libraries/haskell/hspec-meta/default.nix
View File

@ -1,16 +1,16 @@
{ cabal, ansiTerminal, filepath, hspecExpectations, HUnit
, QuickCheck, quickcheckIo, setenv, time, transformers
{ cabal, ansiTerminal, deepseq, filepath, hspecExpectations, HUnit
, QuickCheck, quickcheckIo, random, setenv, time, transformers
}:
cabal.mkDerivation (self: {
pname = "hspec-meta";
version = "1.5.1";
sha256 = "1js62n2mxv4mj4w89ymz5cn3d2qznjndzk3c78gmy6chvig23zlf";
version = "1.5.2";
sha256 = "1kzlppbp8ralkpi89qrfdm5yrr72b9iq4nrvmblyjrb67h9412q0";
isLibrary = true;
isExecutable = true;
buildDepends = [
ansiTerminal filepath hspecExpectations HUnit QuickCheck
quickcheckIo setenv time transformers
ansiTerminal deepseq filepath hspecExpectations HUnit QuickCheck
quickcheckIo random setenv time transformers
];
doCheck = false;
meta = {

18
pkgs/development/libraries/haskell/hspec/default.nix
View File

@ -1,22 +1,24 @@
{ cabal, ansiTerminal, doctest, filepath, ghcPaths
{ cabal, ansiTerminal, deepseq, doctest, filepath, ghcPaths
, hspecExpectations, hspecMeta, HUnit, QuickCheck, quickcheckIo
, setenv, silently, time, transformers
, random, setenv, silently, time, transformers
}:
cabal.mkDerivation (self: {
pname = "hspec";
version = "1.5.1";
sha256 = "0iz34hgwir07g2qv3zdkg5k5wrv68qd0c77xkpfcs653fi28i91a";
version = "1.5.2";
sha256 = "1bndznbq7qyqr4j4mnsxf3dabmjyzah0bsiyynrc00ay1pf033l8";
isLibrary = true;
isExecutable = true;
buildDepends = [
ansiTerminal filepath hspecExpectations HUnit QuickCheck
quickcheckIo setenv time transformers
ansiTerminal deepseq filepath hspecExpectations HUnit QuickCheck
quickcheckIo random setenv time transformers
];
testDepends = [
ansiTerminal doctest filepath ghcPaths hspecExpectations hspecMeta
HUnit QuickCheck quickcheckIo setenv silently time transformers
ansiTerminal deepseq doctest filepath ghcPaths hspecExpectations
hspecMeta HUnit QuickCheck quickcheckIo random setenv silently time
transformers
];
doCheck = self.stdenv.system == "x86_64-linux";
meta = {
homepage = "http://hspec.github.com/";
description = "Behavior-Driven Development for Haskell";

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

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "http-reverse-proxy";
version = "0.1.1.3";
sha256 = "0z2h2xbvg034snfh3hzc0v2zp5j57lcak2h4vz10lwaqr3jxqnpn";
version = "0.1.1.4";
sha256 = "0j77hp1ddbxrsv65xf6kqbl8jnvl6qzx98p0lg73j7s76j7vg9cd";
buildDepends = [
blazeBuilder caseInsensitive classyPrelude conduit dataDefault
httpConduit httpTypes liftedBase monadControl network

1
pkgs/development/libraries/haskell/quickcheck-io/default.nix
View File

@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
description = "Use HUnit assertions as QuickCheck properties";
license = self.stdenv.lib.licenses.mit;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.simons ];
};
})

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "skein";
version = "0.1.0.12";
sha256 = "1nx0ad0y7zmljc7phwin2aph6frs70hvz3di8q52kzpi5m1h3g3a";
version = "1.0.0";
sha256 = "03r9kqbvv6z1d8ivdwrxvac5bnd29w116pbixyrcrbx0sg1wwpfa";
buildDepends = [ cereal cryptoApi tagged ];
testDepends = [ cereal cryptoApi filepath hspec tagged ];
meta = {

4
pkgs/development/libraries/haskell/unix-time/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "unix-time";
version = "0.1.5";
sha256 = "13xks5kshr51mbs112j8vvhirzhbi3fq6zjw7l4z2iwn8chh4hwg";
version = "0.1.6";
sha256 = "0l8k42n67qwc1ljxw2ksmdnj630q1ql0im0j1z7yv9kak9pmqfy6";
testDepends = [ doctest hspec QuickCheck time ];
meta = {
description = "Unix time parser/formatter and utilities";

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

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "warp";
version = "1.3.7.5";
sha256 = "1y6xnlrqfd763s5r79f53vlbk4iirnci6wpaicrm14f791w2mppc";
version = "1.3.8";
sha256 = "0lpyrdwgsaxzds6qrh0drp0r90x1va4d7z2n65xb0rhkslr3sk3l";
buildDepends = [
blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable
httpTypes liftedBase network networkConduit simpleSendfile

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "xml";
version = "1.3.12";
sha256 = "1lmqnzna0zy297y4q6qviv7a4966zz9mhfhk6anrp66cz890whai";
version = "1.3.13";
sha256 = "04xq2ma2if5gqz16bjrxwigh4vzw6m8i2zk11s5qg3d4z370fdn3";
buildDepends = [ text ];
meta = {
homepage = "http://code.galois.com";

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

@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "yesod-auth";
version = "1.1.5.3";
sha256 = "07srz4zpkn8w382xwi8ri6mh9kgplf0m51819zw1hympphmd9z82";
version = "1.1.6";
sha256 = "0g6ik3qvjnpyfbr2fciz53l62q44zi7ipil8v7hy56808n5y6i4i";
buildDepends = [
aeson authenticate blazeHtml blazeMarkup fileEmbed hamlet
httpConduit httpTypes liftedBase mimeMail network persistent

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

@ -9,8 +9,8 @@
cabal.mkDerivation (self: {
pname = "yesod-core";
version = "1.1.8.2";
sha256 = "0brrvij1vldb5zr3vnynikaf1x479qrgf7k3162nhrmwl57lm9sz";
version = "1.1.8.3";
sha256 = "116vglpqh2561g0gzhm4ijwx829c50ai1hh715vwi5j5i01y2rkr";
buildDepends = [
aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal
clientsession conduit cookie failure fastLogger hamlet httpTypes
@ -23,6 +23,7 @@ cabal.mkDerivation (self: {
blazeBuilder conduit hamlet hspec httpTypes HUnit QuickCheck random
shakespeareCss shakespeareJs text transformers wai waiTest
];
jailbreak = true;
meta = {
homepage = "http://www.yesodweb.com/";
description = "Creation of type-safe, RESTful web applications";

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

@ -1,11 +1,11 @@
{ fetchurl, stdenv }:
stdenv.mkDerivation (rec {
name = "libffi-3.0.9";
name = "libffi-3.0.13";
src = fetchurl {
url = "ftp://sourceware.org/pub/libffi/${name}.tar.gz";
sha256 = "0ln4jbpb6clcsdpb9niqk0frgx4k0xki96wiv067ig0q4cajb7aq";
sha256 = "077ibkf84bvcd6rw1m6jb107br63i2pp301rkmsbgg6300adxp8x";
};
doCheck = true;

14
pkgs/servers/http/lighttpd/default.nix
View File

@ -1,14 +1,18 @@
{ stdenv, fetchurl, pcre, libxml2, zlib, attr, bzip2 }:
{ stdenv, fetchurl, pcre, libxml2, zlib, attr, bzip2, which, file }:
stdenv.mkDerivation {
name = "lighttpd-1.4.30";
name = "lighttpd-1.4.32";
src = fetchurl {
url = http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.30.tar.xz;
sha256 = "c237692366935b19ef8a6a600b2f3c9b259a9c3107271594c081a45902bd9c9b";
url = http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.32.tar.xz;
sha256 = "1hgd9bi4mrak732h57na89lqg58b1kkchnddij9gawffd40ghs0k";
};
buildInputs = [ pcre libxml2 zlib attr bzip2 ];
buildInputs = [ pcre libxml2 zlib attr bzip2 which file ];
preConfigure = ''
sed -i "s:/usr/bin/file:${file}/bin/file:g" configure
'';
meta = {
description = "Lightweight high-performance web server";

46
pkgs/tools/graphics/lprof/default.nix Normal file
View File

@ -0,0 +1,46 @@
{ stdenv, fetchurl, scons, qt3, lcms1, libtiff, vigra }:
/* how to calibrate your monitor:
Eg see https://wiki.archlinux.org/index.php/ICC_Profiles#Loading_ICC_Profiles
*/
stdenv.mkDerivation {
name = "lprof-1.11.4.1";
buildInputs = [ scons qt3 lcms1 libtiff vigra ];
preConfigure = ''
export QTDIR=${qt3}
export qt_directory=${qt3}
'';
src = fetchurl {
url = mirror://sourceforge/lprof/lprof/lprof-1.11.4/lprof-1.11.4.1.tar.gz;
sha256 = "0q8x24fm5yyvm151xrl3l03p7hvvciqnkbviprfnvlr0lyg9wsrn";
};
# The sed commands disable header checks and add LDFLAGS NIX_CFLAGS_COMPILE
# to the gcc environment
buildPhase = ''
mkdir -p $out
export CXX=g++
sed -i SConstruct \
-e 's/def CheckForQt(context):/def CheckForQt(context):\n return 1/' \
-e "s/not config.CheckHeader('lcms.h')/False/" \
-e "s/not config.CheckHeader('tiff.h')/False/" \
-e "s/not config.CheckCXXHeader('vigra\/impex.hxx')/False/" \
\
-e "s/^\( 'LDFLAGS'.*\)/\1\n,'NIX_CFLAGS_COMPILE' : os.environ['NIX_CFLAGS_COMPILE']/" \
-e "s/^\( 'LDFLAGS'.*\)/\1\n,'NIX_LDFLAGS' : os.environ['NIX_LDFLAGS']/"
scons PREFIX=$out SYSLIBS=1 install
'';
installPhase = ":";
patches = [ ./lcms-1.17.patch ];
meta = {
description = "Little CMS ICC profile construction set";
homepage = "http://sourceforge.net/projects/lprof";
license = stdenv.lib.licenses.gpl2;
};
}

13
pkgs/tools/graphics/lprof/lcms-1.17.patch Normal file
View File

@ -0,0 +1,13 @@
--- a/src/liblprof/lcmsprf.h 2007-08-31 15:36:20.000000000 -0700
+++ b/src/liblprof/lcmsprf.h 2007-08-31 15:37:39.000000000 -0700
@@ -67,6 +67,9 @@
#define mmax(a,b) ((a) > (b)?(a):(b))
#endif
+#if LCMS_VERSION > 116
+typedef int BOOL;
+#endif
/* Misc operations ------------------------------------------------------------------------ */

35
pkgs/tools/misc/g500-control/default.nix Normal file
View File

@ -0,0 +1,35 @@
{stdenv, fetchurl, coreutils}:
stdenv.mkDerivation rec {
name = "g500-control-0.0.1";
src = fetchurl {
url = "http://g500-control.googlecode.com/files/g500_control_0.0.1.tar.gz";
sha256 = "1xlg9lpxnk3228k81y1i6jjh4df1p4jh64g54w969g6a6v6dazvb";
};
buildInputs = [ coreutils ];
unpackPhase = ''
mkdir -pv g500-control
tar -C g500-control/ -xf $src
'';
buildPhase = ''
cd g500-control
gcc -o g500-control *.c
'';
installPhase = ''
mkdir -pv $out/bin/
cp g500-control $out/bin/
'';
meta = {
homepage = http://code.google.com/p/g500-control/;
description = "Configure Logitech G500's internal profile under Linux";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
};
}

9
pkgs/tools/misc/tmux/default.nix
View File

@ -2,21 +2,16 @@
stdenv.mkDerivation rec {
pname = "tmux";
version = "1.7";
version = "1.8";
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${name}.tar.gz";
sha256 = "0ywy1x2g905hmhkdz418ik42lcvnhnwr8fv63rcqczfg27d6nd38";
sha256 = "f265401ca890f8223e09149fcea5abcd6dfe75d597ab106e172b01e9d0c9cd44";
};
nativeBuildInputs = [ pkgconfig ];
# There's a bug in tmux's configure script, --disable-static actually enables it
# Fixed upstream in revision ThomasAdam/tmux@e964ff70e696f30f0301d11deb45c8ada54e0c55
# Remove on next update
dontDisableStatic = true;
buildInputs = [ ncurses libevent ];
meta = {

2
pkgs/tools/networking/wicd/default.nix
View File

@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
substituteInPlace in/scripts=wicd.in --subst-var-by TEMPLATE-DEFAULT $out/share/other/dhclient.conf.template.default
sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin:${wpa_supplicant}/sbin:${dhcpcd}/sbin:${dhcp}/sbin:${wirelesstools}/sbin:${nettools}/sbin:${nettools}/bin:${iputils}/sbin:${openresolv}/sbin:${iproute}/sbin" in/scripts=wicd.in
sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin:${wpa_supplicant}/sbin:${dhcpcd}/sbin:${dhcp}/sbin:${wirelesstools}/sbin:${nettools}/sbin:${nettools}/bin:${iputils}/bin:${openresolv}/sbin:${iproute}/sbin" in/scripts=wicd.in
sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pygobject}):$(toPythonPath ${pythonDBus})" in/scripts=wicd.in
sed -i "4iexport LC_ALL=\\\"${locale}\\\"" in/scripts=wicd.in
sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-client.in

46
pkgs/tools/security/sudo/default.nix
View File

@ -1,37 +1,45 @@
{ stdenv, fetchurl, coreutils, pam, groff }:
stdenv.mkDerivation rec {
name = "sudo-1.7.2";
name = "sudo-1.8.6p7";
src = fetchurl {
urls =
[ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz"
"ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz"
];
sha256 = "02hhvwxj7gnsvmq3cjh592g2xdjpkfcp1jjvwb64nxsz2kbccwy1";
sha256 = "0djh2b14d1b1knah46v971x940rz63hvnskz16fzami3nbnqj41h";
};
# `--with-stow' allows /etc/sudoers to be a symlink. Only it
# doesn't really help because the target still has to have mode 0440,
# while files in the Nix store all have mode 0444.
#configureFlags = "--with-stow";
postConfigure = ''
cat >> pathnames.h <<EOF
#undef _PATH_SUDO_LOGFILE
#define _PATH_SUDO_LOGFILE "/var/log/sudo.log"
#undef _PATH_SUDO_TIMEDIR
#define _PATH_SUDO_TIMEDIR "/run/sudo"
#undef _PATH_VI
#define _PATH_VI "/run/current-system/sw/bin/nano"
#undef _PATH_MV
#define _PATH_MV "${coreutils}/bin/mv"
EOF
postConfigure = "
sed -e '/_PATH_MV/d; /_PATH_VI/d' -i config.h
echo '#define _PATH_SUDO_LOGFILE \"/var/log/sudo.log\"' >> config.h
echo '#define _PATH_SUDO_TIMEDIR \"/var/run/sudo\"' >> config.h
echo '#define _PATH_MV \"/var/run/current-system/sw/bin/mv\"' >> config.h
echo '#define _PATH_VI \"/var/run/current-system/sw/bin/nano\"' >> config.h
echo '#define EDITOR _PATH_VI' >>config.h
makeFlags=\"install_uid=$(id -u) install_gid=$(id -g)\"
installFlags=\"sudoers_uid=$(id -u) sudoers_gid=$(id -g) sysconfdir=$out/etc\"
";
makeFlags="install_uid=$(id -u) install_gid=$(id -g)"
installFlags="sudoers_uid=$(id -u) sudoers_gid=$(id -g) sysconfdir=$out/etc"
'';
buildInputs = [ coreutils pam groff ];
enableParallelBuilding = true;
postInstall = ''
# ‘visudo’ does not make sense on NixOS.
rm $out/sbin/visudo $out/share/man/man8/visudo.8
rm $out/share/doc/sudo/ChangeLog
'';
meta = {
description = "sudo, a command to run commands as root";
description = "A command to run commands as root";
longDescription = ''
Sudo (su "do") allows a system administrator to delegate
@ -43,5 +51,7 @@ stdenv.mkDerivation rec {
homepage = http://www.sudo.ws/;
license = http://www.sudo.ws/sudo/license.html;
maintainers = [ stdenv.lib.maintainers.eelco ];
};
}

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

@ -772,6 +772,8 @@ let
libbsd = callPackage ../development/libraries/libbsd { };
lprof = callPackage ../tools/graphics/lprof { };
flvtool2 = callPackage ../tools/video/flvtool2 { };
fontforge = lowPrio (callPackage ../tools/misc/fontforge { });
@ -813,6 +815,8 @@ let
uni2ascii = callPackage ../tools/text/uni2ascii { };
g500-control = callPackage ../tools/misc/g500-control { };
gawk = callPackage ../tools/text/gawk { };
gdmap = callPackage ../tools/system/gdmap { };
@ -1474,6 +1478,8 @@ let
recutils = callPackage ../tools/misc/recutils { };
recoll = callPackage ../applications/search/recoll { };
refind = callPackage ../tools/misc/refind { };
reiser4progs = callPackage ../tools/filesystems/reiser4progs { };
@ -6719,6 +6725,10 @@ let
inherit (gnome) GConf libglade;
};
darktable12 = callPackage ../applications/graphics/darktable/1.2rc1.nix {
inherit (gnome) GConf libglade;
};
"dd-agent" = callPackage ../tools/networking/dd-agent { };
dia = callPackage ../applications/graphics/dia {
@ -7720,6 +7730,8 @@ let
dropbox = callPackage ../applications/networking/dropbox { };
dropbox-cli = callPackage ../applications/networking/dropbox-cli { };
lightdm = callPackage ../applications/display-managers/lightdm { };
lightdm_gtk_greeter = callPackage ../applications/display-managers/lightdm-gtk-greeter { };
@ -8750,7 +8762,9 @@ let
gtkwave = callPackage ../applications/science/electronics/gtkwave { };
kicad = callPackage ../applications/science/electronics/kicad { };
kicad = callPackage ../applications/science/electronics/kicad {
wxGTK = wxGTK29;
};
ngspice = callPackage ../applications/science/electronics/ngspice { };

13
pkgs/top-level/haskell-packages.nix
View File

@ -139,7 +139,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
haskellSrc = self.haskellSrc_1_0_1_5; # 7.6 ok
html = self.html_1_0_1_2; # 7.6 ok
HTTP = self.HTTP_4000_2_8; # 7.6 ok
HUnit = self.HUnit_1_2_5_1; # 7.6 ok
HUnit = self.HUnit_1_2_5_2; # 7.6 ok
mtl = self.mtl_2_1_2; # 7.6 ok
network = self.network_2_4_1_2; # 7.6 ok
OpenGL = self.OpenGL_2_8_0_0; # 7.6 ok
@ -703,6 +703,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
dataDefault = callPackage ../development/libraries/haskell/data-default {};
dataDefaultClass = callPackage ../development/libraries/haskell/data-default-class {};
dataDefaultInstancesBase = callPackage ../development/libraries/haskell/data-default-instances-containers {};
dataDefaultInstancesContainers = callPackage ../development/libraries/haskell/data-default-instances-base {};
dataDefaultInstancesDlist = callPackage ../development/libraries/haskell/data-default-instances-dlist {};
dataDefaultInstancesOldLocale = callPackage ../development/libraries/haskell/data-default-instances-old-locale {};
dataenc = callPackage ../development/libraries/haskell/dataenc {};
dataInttrie = callPackage ../development/libraries/haskell/data-inttrie {};
@ -1136,7 +1142,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
HUnit_1_2_4_2 = callPackage ../development/libraries/haskell/HUnit/1.2.4.2.nix {};
HUnit_1_2_4_3 = callPackage ../development/libraries/haskell/HUnit/1.2.4.3.nix {};
HUnit_1_2_5_1 = callPackage ../development/libraries/haskell/HUnit/1.2.5.1.nix {};
HUnit = self.HUnit_1_2_5_1;
HUnit_1_2_5_2 = callPackage ../development/libraries/haskell/HUnit/1.2.5.2.nix {};
HUnit = self.HUnit_1_2_5_2;
hxt = callPackage ../development/libraries/haskell/hxt {};
@ -1966,6 +1973,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
yap = callPackage ../development/libraries/haskell/yap {};
yeganesh = callPackage ../applications/misc/yeganesh {};
yesod = callPackage ../development/libraries/haskell/yesod {};
yesodAuth = callPackage ../development/libraries/haskell/yesod-auth {};

33
pkgs/top-level/node-packages.nix
View File

@ -9,9 +9,12 @@ let self = {
patchLatest = srcAttrs:
let src = fetchurl srcAttrs; in
pkgs.runCommand src.name {} ''
mkdir unpack
cd unpack
tar xf ${src}
mv */ package 2>/dev/null || true
sed -i -e "s/: \"latest\"/: \"*\"/" package/package.json
tar cf $out package
tar cf $out *
'';
"abbrev" = self."abbrev-1";
@ -96,6 +99,19 @@ let self = {
"aws-sdk" = self."aws-sdk-*";
"aws-sdk-git" = self.buildNodePackage rec {
name = "aws-sdk-0.9.8-pre7b687a0c262ac129fd6eaffeb02de09ee7e6a87c";
src = self.patchLatest {
url = "https://github.com/aws/aws-sdk-js/archive/7b687a0c262ac129fd6eaffeb02de09ee7e6a87c.tar.gz";
sha256 = "1pn43wxi3xz4kjyxf8j7zil5frhd1zpqja8szamgll2pxxnpnr3i";
name = "${name}.tgz";
};
deps = [
self."xml2js-0.2.4"
self."xmlbuilder"
];
};
"aws-sdk-*" = self.buildNodePackage rec {
name = "aws-sdk-0.9.7-pre.8";
src = self.patchLatest {
@ -1192,6 +1208,21 @@ let self = {
];
};
"s3http" = self."s3http-*";
"s3http-*" = self.buildNodePackage rec {
name = "s3http-0.0.1";
src = fetchurl {
url = "http://registry.npmjs.org/s3http/-/${name}.tgz";
sha256 = "7140a0ee6df9fb90fd74aa0b68b73f899c6d8e2eaa2de89fde3f634e9bf10dba";
};
deps = [
self."aws-sdk-git"
self."commander-0.5.1"
self."http-auth-*"
];
};
"sax" = self."sax->=0.4.2";
"sax->=0.4.2" = self.buildNodePackage rec {

2
pkgs/top-level/python-packages.nix
View File

@ -1485,7 +1485,7 @@ pythonPackages = python.modules // rec {
};
buildInputs = [ nose ];
propagatedBuildInputs = [ beautifulsoup4 pyrss2gen feedparser pynzb html5lib dateutil beautifulsoup flask jinja2 requests sqlalchemy pyyaml cherrypy progressbar ];
propagatedBuildInputs = [ beautifulsoup4 pyrss2gen feedparser pynzb html5lib dateutil beautifulsoup flask jinja2 requests sqlalchemy pyyaml cherrypy progressbar deluge ];
meta = {
homepage = http://flexget.com/;

2
pkgs/top-level/release-small.nix
View File

@ -177,7 +177,7 @@ with import ./release-lib.nix {
texLiveExtra = linux;
texinfo = all;
time = linux;
tinycc = ["i686-linux"];
tinycc = linux;
udev = linux;
unrar = linux;
unzip = all;

2
pkgs/top-level/release.nix
View File

@ -304,7 +304,7 @@ let
texinfo = all;
tightvnc = linux;
time = linux;
tinycc = ["i686-linux"];
tinycc = linux;
uae = linux;
udev = linux;
unrar = linux;