dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'master' into x-updates

Browse Source 
Conflicts (easy):
	pkgs/desktops/xfce/core/xfdesktop.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/pango/default.nix
This commit is contained in:
Vladimír Čunát 2013-03-17 11:28:28 +01:00
commit b1eeae8cac
108 changed files with 1216 additions and 365 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/applications/audio/ardour/ardour3.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchsvn, alsaLib, aubio, boost, cairomm, curl, fftw
{ stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, fftw
, fftwSinglePrec, flac, glibc, glibmm, gtk, gtkmm, jackaudio
, libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf
, librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile
@ -6,17 +6,17 @@
, perl, pkgconfig, python, serd, sord, sratom, suil }:
let
# Ardour 3 RC2
rev = "14092";
# Ardour 3.0 tag
rev = "79db9422";
in
stdenv.mkDerivation {
name = "ardour3-svn-${rev}";
name = "ardour3";
src = fetchsvn {
url = http://subversion.ardour.org/svn/ardour2/branches/3.0;
src = fetchgit {
url = git://git.ardour.org/ardour/ardour.git;
inherit rev;
sha256 = "1zyy74z3xcsdhrzw4g6y1qm1ai2fl3bgabscl0wn7m1kkscr9nzg";
sha256 = "cdbe4ca6d4b639fcd66a3d1cf9c2816b4755655c9d81bdd2417263f413aa7096";
};
buildInputs =

12
pkgs/applications/audio/cmus/default.nix
View File

@ -2,17 +2,17 @@
stdenv.mkDerivation rec {
name = "cmus-${version}";
version = "2.3.3";
version = "2.5.0";
src = fetchurl {
url = "mirror://sourceforge/cmus/cmus-v${version}.tar.bz2";
sha256 = "1pwd3jifv12yr0yr77hsv5c9y8ay6kn2b5a3s5i8v2c882vgl890";
};
configurePhase = "./configure prefix=$out";
buildInputs = [ ncurses pkgconfig alsaLib flac libmad ffmpeg libvorbis mpc mp4v2 ];
src = fetchurl {
url = "mirror://sourceforge/cmus/cmus-v${version}.tar.bz2";
sha256 = "13hc5d7h2ayjwnip345hc59rpjj9fgrp1i5spjw3s14prdqr733v";
};
meta = {
description = "cmus is a small, fast and powerful console music player for Linux and *BSD";
homepage = http://cmus.sourceforge.net;

23
pkgs/applications/audio/jack-rack/default.nix Normal file
View File

@ -0,0 +1,23 @@
{ stdenv, fetchurl, pkgconfig, jackaudio, ladspaH, gtk, alsaLib, libxml2, librdf }:
stdenv.mkDerivation rec {
name = "jack-rack-1.4.7";
src = fetchurl {
url = "mirror://sourceforge/jack-rack/${name}.tar.bz2";
sha256 = "1lmibx9gicagcpcisacj6qhq6i08lkl5x8szysjqvbgpxl9qg045";
};
buildInputs = [ pkgconfig jackaudio ladspaH gtk alsaLib libxml2 librdf ];
meta = {
description = ''An effects "rack" for the JACK low latency audio API'';
longDescription = ''
JACK Rack is an effects "rack" for the JACK low latency audio
API. The rack can be filled with LADSPA effects plugins and can
be controlled using the ALSA sequencer. It's phat; it turns your
computer into an effects box.
'';
homepage = http://jack-rack.sourceforge.net/;
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.astsmtl ];
platforms = stdenv.lib.platforms.linux;
};
}

49
pkgs/applications/audio/spotify/default.nix
View File

@ -1,8 +1,23 @@
{ fetchurl, stdenv, dpkg, xlibs, qt4, alsaLib, makeWrapper, openssl }:
{ fetchurl, stdenv, dpkg, xlibs, qt4, alsaLib, makeWrapper, openssl, freetype, glib, pango, cairo, atk, gdk_pixbuf, gtk, cups, nspr, nss, libpng12, GConf, libgcrypt, chromium, sqlite, gst_plugins_base, gstreamer }:
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
let version = "0.8.3.278"; in
let
version = "0.8.8.323";
qt4webkit =
if stdenv.system == "i686-linux" then
fetchurl {
name = "libqtwebkit4_2.2_i386.deb";
url = http://mirrors.us.kernel.org/ubuntu/pool/main/q/qtwebkit-source/libqtwebkit4_2.2~2011week36-0ubuntu1_i386.deb;
sha256 = "0hi6cwx2b2cwa4nv5phqqw526lc8p9x7kjkcza9x47ny3npw2924";
}
else
fetchurl {
name = "libqtwebkit4_2.2_amd64.deb";
url = http://ie.archive.ubuntu.com/ubuntu/pool/main/q/qtwebkit-source/libqtwebkit4_2.2~2011week36-0ubuntu1_amd64.deb;
sha256 = "0bvy6qz9y19ck391z8c049v07y4vdyvgykpxi7x1nvn078p1imiw";
};
in
stdenv.mkDerivation {
name = "spotify-${version}";
@ -10,13 +25,13 @@ stdenv.mkDerivation {
src =
if stdenv.system == "i686-linux" then
fetchurl {
url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}.g21c7566.632-1_i386.deb";
sha256 = "7f587585365498c5182bd7f3beafaf511d883102f5cece66cf84f4f94077765b";
url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}.gd143501.250-1_i386.deb";
sha256 = "13q803qlvq16yrr7f95izp9mqqdb8kpcsyrb5gc5i2pya68ra906";
}
else if stdenv.system == "x86_64-linux" then
fetchurl {
url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}.g21c7566.632-1_amd64.deb";
sha256 = "a37a13b1c1a8088a811054c732d85b9d6ccf0bd92ad4da75bfee6d70dc344b5e";
url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}.gd143501.250-1_amd64.deb";
sha256 = "0ny3z499wks1dhrd3qq4d6cp0zd33198z9vak8ffgm5x24sdpghf";
}
else throw "Spotify not supported on this platform.";
@ -28,25 +43,37 @@ stdenv.mkDerivation {
''
mkdir -p $out
dpkg-deb -x $src $out
mv $out/usr/* $out/
rmdir $out/usr
mv $out/opt/spotify/* $out/
rm -rf $out/usr $out/opt
# Work around Spotify referring to a specific minor version of
# OpenSSL.
mkdir $out/lib
ln -s ${openssl}/lib/libssl.so $out/lib/libssl.so.0.9.8
ln -s ${openssl}/lib/libcrypto.so $out/lib/libcrypto.so.0.9.8
ln -s ${nss}/lib/libnss3.so $out/lib/libnss3.so.1d
ln -s ${nss}/lib/libnssutil3.so $out/lib/libnssutil3.so.1d
ln -s ${nss}/lib/libsmime3.so $out/lib/libsmime3.so.1d
ln -s ${nspr}/lib/libnspr4.so $out/lib/libnspr4.so.0d
ln -s ${nspr}/lib/libplc4.so $out/lib/libplc4.so.0d
mkdir -p $out/bin
ln -s $out/spotify-client/spotify $out/bin/spotify
patchelf \
--interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
--set-rpath ${stdenv.lib.makeLibraryPath [ xlibs.libXScrnSaver xlibs.libX11 qt4 alsaLib openssl stdenv.gcc.gcc ]}:${stdenv.gcc.gcc}/lib64:$out/lib \
$out/bin/spotify
--set-rpath $out/lib:$out/spotify-client:${stdenv.lib.makeLibraryPath [ xlibs.libXScrnSaver xlibs.libX11 qt4 alsaLib stdenv.gcc.gcc freetype glib pango cairo atk gdk_pixbuf gtk GConf cups sqlite]}:${stdenv.gcc.gcc}/lib64 \
$out/spotify-client/spotify
dpkg-deb -x ${qt4webkit} ./
mkdir -p $out/lib/
cp -v usr/lib/*/* $out/lib/
preload=$out/libexec/spotify/libpreload.so
mkdir -p $out/libexec/spotify
gcc -shared ${./preload.c} -o $preload -ldl -DOUT=\"$out\" -fPIC
wrapProgram $out/bin/spotify --set LD_PRELOAD $preload
wrapProgram $out/bin/spotify --set LD_PRELOAD $preload --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ GConf libpng12 cups libgcrypt sqlite gst_plugins_base gstreamer]}:$out/lib"
''; # */
dontStrip = true;

2
pkgs/applications/editors/emacs-24/builder.sh
View File

@ -29,6 +29,4 @@ preConfigure() {
done
}
preBuild="make bootstrap"
genericBuild

6
pkgs/applications/editors/emacs-24/default.nix
View File

@ -9,13 +9,13 @@ assert (libXft != null) -> libpng != null; # probably a bug
assert stdenv.isDarwin -> libXaw != null; # fails to link otherwise
stdenv.mkDerivation rec {
name = "emacs-24.2";
name = "emacs-24.3";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://gnu/emacs/${name}.tar.bz2";
sha256 = "13wbjfjmz13qpjwssy44nw2230lllmkkgjsy0rqfm6am2cf87n3k";
url = "mirror://gnu/emacs/${name}.tar.xz";
sha256 = "1385qzs3bsa52s5rcncbrkxlydkw0ajzrvfxgv8rws5fx512kakh";
};
buildInputs =

35
pkgs/applications/graphics/viewnior/default.nix Normal file
View File

@ -0,0 +1,35 @@
{ stdenv, fetchurl, pkgconfig, gtk2, libpng, exiv2, lcms
, intltool, gettext, shared_mime_info, glib, gdk_pixbuf, perl}:
stdenv.mkDerivation rec {
name = "viewnior-1.3";
src = fetchurl {
url = "http://cloud.github.com/downloads/xsisqox/Viewnior/${name}.tar.gz";
sha256 = "46c97c1a85361519b42fe008cfb8911e66f709f3a3a988c11047ab3726889f10";
};
buildInputs =
[ pkgconfig gtk2 libpng exiv2 lcms intltool gettext
shared_mime_info glib gdk_pixbuf perl
];
meta = {
description = "Viewnior is a fast and simple image viewer for GNU/Linux";
longDescription =
'' Viewnior is insipred by big projects like Eye of Gnome, because of it's
usability and richness,and by GPicView, because of it's lightweight design and
minimal interface. So here comes Viewnior - small and light, with no compromise
with the quality of it's functions. The program is made with better integration
in mind (follows Gnome HIG2).
'';
license = "GPLv3";
homepage = http://xsisqox.github.com/Viewnior;
maintainers = [ stdenv.lib.maintainers.smironov ];
platforms = stdenv.lib.platforms.gnu;
};
}

9
pkgs/applications/misc/surf/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, makeWrapper, gtk, webkit, pkgconfig, glib, glib_networking, libsoup, patches ? null}:
{stdenv, fetchurl, makeWrapper, gtk, webkit, pkgconfig, glib, glib_networking, libsoup, gsettings_desktop_schemas, patches ? null}:
stdenv.mkDerivation rec {
name = "surf-${version}";
@ -19,10 +19,11 @@ stdenv.mkDerivation rec {
# `-lX11' to make sure libX11's store path is in the RPATH
NIX_LDFLAGS = "-lX11";
preConfigure = [ ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk'' ];
installPhase = ''
installPhase = ''
make PREFIX=/ DESTDIR=$out install
wrapProgram "$out/bin/surf" --prefix GIO_EXTRA_MODULES : \
${glib_networking}/lib/gio/modules
wrapProgram "$out/bin/surf" \
--prefix GIO_EXTRA_MODULES : ${glib_networking}/lib/gio/modules \
--prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share"
'';
meta = {

12
pkgs/applications/networking/browsers/elinks/default.nix
View File

@ -1,5 +1,8 @@
{ stdenv, fetchurl, python, perl, ncurses, x11, bzip2, zlib, openssl
, spidermonkey, guile, gpm }:
, spidermonkey, gpm
, enableGuile ? true, guile ? null }:
assert enableGuile -> guile != null;
stdenv.mkDerivation rec {
name = "elinks-0.12pre5";
@ -11,14 +14,15 @@ stdenv.mkDerivation rec {
patches = [ ./gc-init.patch ];
buildInputs = [ python perl ncurses x11 bzip2 zlib openssl spidermonkey guile gpm ];
buildInputs = [ python perl ncurses x11 bzip2 zlib openssl spidermonkey gpm ]
++ stdenv.lib.optional enableGuile guile;
configureFlags =
''
--enable-finger --enable-html-highlight --with-guile
--enable-finger --enable-html-highlight
--with-perl --with-python --enable-gopher --enable-cgi --enable-bittorrent
--enable-nntp --with-openssl=${openssl}
'';
'' + stdenv.lib.optionalString enableGuile " --with-guile";
crossAttrs = {
propagatedBuildInputs = [ ncurses.crossDrv zlib.crossDrv openssl.crossDrv ];

6
pkgs/applications/networking/browsers/firefox/19.0.nix
View File

@ -15,9 +15,9 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
rec {
firefoxVersion = "19.0.1";
firefoxVersion = "19.0.2";
xulVersion = "19.0.1"; # this attribute is used by other packages
xulVersion = "19.0.2"; # this attribute is used by other packages
src = fetchurl {
@ -27,7 +27,7 @@ rec {
# Fall back to this url for versions not available at releases.mozilla.org.
"ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"
];
sha1 = "6a3a965c165ceda8c5ba038e9fe0136fbd1690ff";
sha1 = "d108d356225379a86d69a4906c706289135f6342";
};
commonConfigureFlags =

18
pkgs/applications/networking/browsers/vimprobable2/default.nix
View File

@ -1,11 +1,12 @@
{ stdenv, fetchurl, makeWrapper, glib_networking, gtk, libsoup, libX11, perl,
pkgconfig, webkit }:
{ stdenv, fetchurl, makeWrapper, glib, glib_networking, gtk, libsoup, libX11, perl,
pkgconfig, webkit, gsettings_desktop_schemas }:
stdenv.mkDerivation {
name = "vimprobable2-1.2.0";
stdenv.mkDerivation rec {
version = "1.2.1";
name = "vimprobable2-${version}";
src = fetchurl {
url = "mirror://sourceforge/vimprobable/vimprobable2_1.2.0.tar.bz2";
sha256 = "0fjakrmz1syjwgx01j2icpdv69jgvfl2nlxbj8zxfr8mw0h2wg1f";
url = "mirror://sourceforge/vimprobable/vimprobable2_${version}.tar.bz2";
sha256 = "19zx1k3s2gnhzzd2wpyqsk151w9p52ifl64xaz9a6qkgvrxlli8p";
};
# Nixos default ca bundle
@ -17,8 +18,9 @@ stdenv.mkDerivation {
installPhase = ''
make PREFIX=/ DESTDIR=$out install
wrapProgram "$out/bin/vimprobable2" --prefix GIO_EXTRA_MODULES : \
${glib_networking}/lib/gio/modules
wrapProgram "$out/bin/vimprobable2" \
--prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \
--prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share"
'';
meta = {

11
pkgs/applications/networking/irc/bip/bip-0.8.8-yyparse.patch Normal file
View File

@ -0,0 +1,11 @@
--- bip-0.8.8/src/lex.l.orig
+++ bip-0.8.8/src/lex.l
@@ -16,7 +16,7 @@
int linec;
#include "util.h"
extern list_t *root_list;
-void yyparse(void);
+int yyparse(void);
void free_conf(list_t*);
int conf_error;
typedef struct bip bip_t;

4
pkgs/applications/networking/irc/bip/default.nix
View File

@ -36,6 +36,10 @@ in stdenv.mkDerivation {
}
];
postPatch = ''
patch -p1 < ${./bip-0.8.8-yyparse.patch}
'';
configureFlags = [ "--disable-pie" ];
buildInputs = [ bison flex autoconf automake openssl ];

17
pkgs/applications/networking/msmtp/default.nix
View File

@ -1,17 +1,18 @@
{stdenv, fetchurl, openssl}:
stdenv.mkDerivation {
name = "msmtp-1.4.21";
{ stdenv, fetchurl, openssl, pkgconfig, gnutls, gsasl, libidn }:
stdenv.mkDerivation rec {
name = "msmtp-1.4.30";
src = fetchurl {
url = mirror://sourceforge/msmtp/msmtp-1.4.21.tar.bz2;
sha256 = "1yjgy56n02qs25728psg296amhbdkxq2pv1q3l484f3r9pjrpcrg";
url = "mirror://sourceforge/msmtp/${name}.tar.bz2";
sha256 = "11lq82byx9xyfkf4nrcfjjfv5k8gk3bf8zlw0kml1qrndqlvjlpi";
};
buildInputs = [ openssl ];
buildInputs = [ openssl pkgconfig gnutls gsasl libidn ];
meta = {
description = "a MUA";
homepage = http://msmtp.sourceforge.net/;
license = "GPL";
homepage = "http://msmtp.sourceforge.net/";
license = stdenv.lib.licenses.gpl3;
maintainers = [ stdenv.lib.maintainers.garbas ];
};
}

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

@ -31,6 +31,9 @@ stdenv.mkDerivation {
docbook_xsl docbook_xml_dtd_45 libxslt ]
++ stdenv.lib.optionals guiSupport [tcl tk];
# required to support pthread_cancel()
NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
makeFlags = "prefix=\${out} PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell} "
+ (if pythonSupport then "PYTHON_PATH=${python}/bin/python" else "NO_PYTHON=1");

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

@ -2,7 +2,7 @@
, pkgconfig, cmake, gnumake, yasm, python
, boost
, gettext, pcre, yajl, fribidi
, openssl, gperf
, openssl, gperf, tinyxml2, taglib, libssh, swig, jre
, libX11, xproto, inputproto
, libXt, libXmu, libXext, xextproto
, libXinerama, libXrandr, randrproto
@ -30,11 +30,11 @@ assert sambaSupport -> samba != null;
assert vdpauSupport -> libvdpau != null && ffmpeg.vdpauSupport;
stdenv.mkDerivation rec {
name = "xbmc-11.0";
name = "xbmc-12.0";
src = fetchurl {
url = "http://mirrors.xbmc.org/releases/source/${name}.tar.gz";
sha256 = "1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19";
sha256 = "0vy1a38gfbp9vhbjvwqm11sd76gl3s9q0h7gwpsks85m2k88q0ak";
};
buildInputs = [
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
pkgconfig cmake gnumake yasm python
boost
gettext pcre yajl fribidi
openssl gperf
openssl gperf tinyxml2 taglib libssh swig jre
libX11 xproto inputproto
libXt libXmu libXext xextproto
libXinerama libXrandr randrproto
@ -86,5 +86,7 @@ stdenv.mkDerivation rec {
homepage = http://xbmc.org/;
description = "XBMC Media Center";
license = "GPLv2";
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.iElectric ];
};
}

5
pkgs/build-support/cabal/default.nix
View File

@ -92,13 +92,12 @@
# pass the '--enable-tests' flag to cabal in the configure stage
# and run any regression test suites the package might have
doCheck = true;
doCheck = stdenv.lib.versionOlder "7" ghc.ghcVersion;
extraConfigureFlags = [
(stdenv.lib.enableFeature enableLibraryProfiling "library-profiling")
(stdenv.lib.enableFeature self.enableSplitObjs "split-objs")
(stdenv.lib.enableFeature self.doCheck "tests")
];
] ++ stdenv.lib.optional (stdenv.lib.versionOlder "7" ghc.ghcVersion) (stdenv.lib.enableFeature self.doCheck "tests");
# compiles Setup and configures
configurePhase = ''

12
pkgs/build-support/vm/default.nix
View File

@ -1367,22 +1367,22 @@ rec {
};
debian60i386 = {
name = "debian-6.0.6-squeeze-i386";
fullName = "Debian 6.0.6 Squeeze (i386)";
name = "debian-6.0.7-squeeze-i386";
fullName = "Debian 6.0.7 Squeeze (i386)";
packagesList = fetchurl {
url = mirror://debian/dists/squeeze/main/binary-i386/Packages.bz2;
sha256 = "18c0473jacd877nkky1x21dkmp4992d8qra6wj07sq0yz5gdc9c4";
sha256 = "a770f26b5fce1a16460b68f135dfe97f4f4a9894b538ece0104a508c83ec65d5";
};
urlPrefix = mirror://debian;
packages = commonDebianPackages;
};
debian60x86_64 = {
name = "debian-6.0.6-squeeze-amd64";
fullName = "Debian 6.0.6 Squeeze (amd64)";
name = "debian-6.0.7-squeeze-amd64";
fullName = "Debian 6.0.7 Squeeze (amd64)";
packagesList = fetchurl {
url = mirror://debian/dists/squeeze/main/binary-amd64/Packages.bz2;
sha256 = "1n1h3pz6axcaraxq8gfzq0jywlpdrqand1dnd4q79dy6cl788bi2";
sha256 = "b2bb561bde59ac67e07c70aa7c86a33f237436e6891796a93c6ed6ffb032080e";
};
urlPrefix = mirror://debian;
packages = commonDebianPackages;

4
pkgs/desktops/xfce/core/xfdesktop.nix
View File

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
p_name = "xfdesktop";
ver_maj = "4.10";
ver_min = "1";
ver_min = "2";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "1bfl2xzmci7vqwwz2k2gp7ykysjnq9dcwpnzkwbpv5hv3qwgx0r8";
sha256 = "0zbrvfj4fxnjz593brxjsjy9pv5bbf12jnbydy4pwc1ya6zf19j9";
};
name = "${p_name}-${ver_maj}.${ver_min}";

2
pkgs/development/compilers/gcc/3.3/builder.sh
View File

@ -35,7 +35,7 @@ EOF
cd ../build
configureScript=../$sourceRoot/configure
configureFlags="--enable-languages=$langs"
configureFlags="--enable-languages=$langs --disable-multilib"
}

5
pkgs/development/compilers/gcc/3.3/default.nix
View File

@ -16,6 +16,11 @@ stdenv.mkDerivation {
md5 = "6936616a967da5a0b46f1e7424a06414";
};
# inspiration: https://aur.archlinux.org/packages/g77/
postPatch = ''
substituteInPlace gcc/config/i386/linux.h --replace 'struct siginfo' siginfo_t
'';
inherit noSysDirs langC langCC langFortran;
meta = {

7
pkgs/development/compilers/gcc/3.4/default.nix
View File

@ -15,7 +15,12 @@ stdenv.mkDerivation {
md5 = "4a21ac777d4b5617283ce488b808da7b";
};
patches = if noSysDirs then [./no-sys-dirs.patch] else [];
patches = stdenv.lib.optional noSysDirs ./no-sys-dirs.patch;
# inspiration: https://aur.archlinux.org/packages/g77/
postPatch = ''
substituteInPlace gcc/config/i386/linux.h --replace 'struct siginfo' siginfo_t
'';
inherit noSysDirs profiledCompiler;

4
pkgs/development/compilers/ghc/head.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, ghc, perl, gmp, ncurses }:
stdenv.mkDerivation rec {
version = "7.7.20121213";
version = "7.7.20130223";
name = "ghc-${version}";
src = fetchurl {
url = "http://haskell.org/ghc/dist/current/dist/${name}-src.tar.bz2";
sha256 = "0z9ld6271jzv3mx02vqaakirj79pm2vzxnv5a178r6v874qbzx3p";
sha256 = "1naw6x1mjij10h9k4biard2pkzi6zml26vv4h34asprv0h6ymdbg";
};
buildInputs = [ ghc perl gmp ncurses ];

17
pkgs/development/compilers/ghc/with-packages.nix
View File

@ -60,17 +60,22 @@ stdenv.mkDerivation rec {
echo -n .
done
for f in "$currentPath/etc/bash_completion.d/"*; do
mkdir -p $out/etc/bash_completion.d
mkdir -p $out/etc/bash_completion.d
ln -s $f $out/etc/bash_completion.d/
echo -n .
done
for s in 1 2 3 4 5 6 7 8 9; do
for f in "$currentPath/share/man/man$s/"*; do
mkdir -p $out/share/man/man$s
for s in 1 2 3 4 5 6 7 8 9; do
for f in "$currentPath/share/man/man$s/"*; do
mkdir -p $out/share/man/man$s
ln -sv $f $out/share/man/man$s/
echo -n .
done
done
done
done
for f in "$currentPath/share/emacs/site-lisp/"*; do
mkdir -p $out/share/emacs/site-lisp
ln -s $f $out/share/emacs/site-lisp/
echo -n .
done
for f in "$currentPkgDir/"*.conf; do
ln -s $f $linkedPkgDir
echo -n .

4
pkgs/development/compilers/idris/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "idris";
version = "0.9.6.1";
sha256 = "1wy79rrm5pvg77i9nvwkcg6swsdbmg2izch48n4lj4idj0ga5g62";
version = "0.9.7";
sha256 = "0y3rnxbs2s7kxlzlc347vwpylw2p0pdz50zgkyii21gd6klqvd45";
isLibrary = false;
isExecutable = true;
buildDepends = [

9
pkgs/development/compilers/jhc/default.nix
View File

@ -19,11 +19,12 @@ stdenv.mkDerivation rec {
];
meta = {
description = ''
A Haskell compiler which aims to produce the most efficient programs
'';
homepage = "http://repetae.net/computer/jhc/";
description = "A Haskell compiler which aims to produce the most efficient programs";
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.aforemny ];
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.aforemny stdenv.lib.maintainers.simons ];
};
}

32
pkgs/development/compilers/sdcc/default.nix Normal file
View File

@ -0,0 +1,32 @@
{ stdenv, fetchurl, bison, flex, boost, gputils ? null }:
stdenv.mkDerivation rec {
version = "3.2.0";
name = "sdcc-${version}";
src = fetchurl {
url = "mirror://sourceforge/sdcc/sdcc-src-${version}.tar.bz2";
sha256 = "15gdl04kqpvmwvvplss5nmp3bz8rhz48dhb0wmb2v9v9sn7qj01d";
};
# TODO: remove this comment when gputils != null is tested
buildInputs = [ bison flex boost gputils ];
configureFlags = ''
${if gputils == null then "--disable-pic14-port --disable-pic16-port" else ""}
'';
meta = {
description = "Small Device C Compiler";
longDescription = ''
SDCC is a retargettable, optimizing ANSI - C compiler suite that targets
the Intel MCS51 based microprocessors (8031, 8032, 8051, 8052, etc.), Maxim
(formerly Dallas) DS80C390 variants, Freescale (formerly Motorola) HC08 based
(hc08, s08) and Zilog Z80 based MCUs (z80, z180, gbz80, Rabbit 2000/3000,
Rabbit 3000A). Work is in progress on supporting the Microchip PIC16 and
PIC18 targets. It can be retargeted for other microprocessors.
'';
homepage = http://sdcc.sourceforge.net/;
license = stdenv.lib.licenses.gpl2;
};
}

4
pkgs/development/interpreters/python/docs/default.nix
View File

@ -3,6 +3,7 @@
let
pythonDocs = {
html = {
recurseForDerivations = true;
python33 = import ./3.3-html.nix {
inherit stdenv fetchurl lib;
};
@ -23,6 +24,7 @@ pythonDocs = {
};
};
pdf_a4 = {
recurseForDerivations = true;
python33 = import ./3.3-pdf-a4.nix {
inherit stdenv fetchurl lib;
};
@ -43,6 +45,7 @@ pythonDocs = {
};
};
pdf_letter = {
recurseForDerivations = true;
python33 = import ./3.3-pdf-letter.nix {
inherit stdenv fetchurl lib;
};
@ -63,6 +66,7 @@ pythonDocs = {
};
};
text = {
recurseForDerivations = true;
python33 = import ./3.3-text.nix {
inherit stdenv fetchurl lib;
};

6
pkgs/development/interpreters/python/docs/generate.sh
View File

@ -16,7 +16,11 @@ pythonDocs = {
EOF
for type in $TYPES; do
echo " ${type/-/_} = {" >> default.nix
cat >>default.nix <<EOF
${type/-/_} = {
recurseForDerivations = true;
EOF
for version in $VERSIONS; do
major=$(echo -n ${version}| cut -d. -f1)
minor=$(echo -n ${version}| cut -d. -f2)

261
pkgs/development/interpreters/ruby/generated.nix
View File

@ -10,23 +10,30 @@ g: # Get dependencies from patched gems
activerecord = g.activerecord_3_2_12;
activeresource = g.activeresource_3_2_12;
activesupport = g.activesupport_3_2_12;
addressable = g.addressable_2_3_3;
arel = g.arel_3_0_2;
atoulme_Antwrap = g.atoulme_Antwrap_0_7_4;
autotest_rails = g.autotest_rails_4_1_2;
aws_sdk = g.aws_sdk_1_8_3_1;
aws_sdk = g.aws_sdk_1_8_5;
bitbucket_backup = g.bitbucket_backup_0_2_2;
builder = g.builder_3_2_0;
buildr = g.buildr_1_4_10;
bundler = g.bundler_1_3_1;
bundler = g.bundler_1_3_4;
childprocess = g.childprocess_0_3_9;
chronic = g.chronic_0_9_1;
daemons = g.daemons_1_1_9;
diff_lcs = g.diff_lcs_1_1_3;
dimensions = g.dimensions_1_2_0;
em_resolv_replace = g.em_resolv_replace_1_1_3;
erubis = g.erubis_2_7_0;
eventmachine = g.eventmachine_1_0_1;
eventmachine = g.eventmachine_1_0_3;
eventmachine_tail = g.eventmachine_tail_0_6_4;
fakes3 = g.fakes3_0_1_5;
faraday = g.faraday_0_8_6;
faraday_middleware = g.faraday_middleware_0_8_8;
ffi = g.ffi_1_4_0;
foreman = g.foreman_0_61_0;
file_tail = g.file_tail_1_0_12;
foreman = g.foreman_0_62_0;
highline = g.highline_1_6_15;
hike = g.hike_1_2_1;
hoe = g.hoe_3_1_0;
@ -42,15 +49,18 @@ g: # Get dependencies from patched gems
mime_types = g.mime_types_1_21;
minitar = g.minitar_0_5_3;
multi_json = g.multi_json_1_6_1;
multipart_post = g.multipart_post_1_2_0;
net_sftp = g.net_sftp_2_0_5;
net_ssh = g.net_ssh_2_6_6;
nix = g.nix_0_1_1;
nokogiri = g.nokogiri_1_5_6;
papertrail = g.papertrail_0_9_7;
papertrail_cli = g.papertrail_cli_0_9_3;
parallel = g.parallel_0_6_2;
polyglot = g.polyglot_0_3_3;
rack = g.rack_1_5_2;
rack_cache = g.rack_cache_1_2;
rack_protection = g.rack_protection_1_4_0;
rack_protection = g.rack_protection_1_5_0;
rack_ssl = g.rack_ssl_1_3_3;
rack_test = g.rack_test_0_6_2;
rails = g.rails_3_2_12;
@ -59,6 +69,7 @@ g: # Get dependencies from patched gems
rb_fsevent = g.rb_fsevent_0_9_3;
rdiscount = g.rdiscount_2_0_7_1;
rdoc = g.rdoc_3_12_2;
remote_syslog = g.remote_syslog_1_6_13;
rjb = g.rjb_1_4_6;
rspec = g.rspec_2_11_0;
rspec_core = g.rspec_core_2_11_1;
@ -66,23 +77,27 @@ g: # Get dependencies from patched gems
rspec_mocks = g.rspec_mocks_2_11_3;
rubyforge = g.rubyforge_2_0_4;
rubyzip = g.rubyzip_0_9_9;
sass = g.sass_3_2_6;
sass = g.sass_3_2_7;
selenium_webdriver = g.selenium_webdriver_2_31_0;
servolux = g.servolux_0_10_0;
sinatra = g.sinatra_1_3_2;
sprockets = g.sprockets_2_2_2;
syslog_protocol = g.syslog_protocol_0_9_2;
systemu = g.systemu_2_5_2;
therubyracer = g.therubyracer_0_10_2;
thin = g.thin_1_5_0;
thor = g.thor_0_17_0;
tilt = g.tilt_1_3_4;
tilt = g.tilt_1_3_5;
tins = g.tins_0_7_2;
treetop = g.treetop_1_4_12;
tzinfo = g.tzinfo_0_3_36;
tzinfo = g.tzinfo_0_3_37;
uuid = g.uuid_2_3_7;
uuidtools = g.uuidtools_2_1_3;
websocket = g.websocket_1_0_7;
xml_simple = g.xml_simple_1_1_1;
yajl_ruby = g.yajl_ruby_1_1_0;
};
gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''fakes3'' ''foreman'' ''jsduck'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''thin'' ''uuid'' ];
gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''fakes3'' ''foreman'' ''jsduck'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''remote_syslog'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''thin'' ''uuid'' ];
gems = {
ZenTest_4_9_0 = {
basename = ''ZenTest'';
@ -156,7 +171,7 @@ installed versions.'';
longDescription = ''Databases on Rails. Build a persistent domain model by mapping database tables to Ruby classes. Strong conventions for associations, validations, aggregations, migrations, and testing come baked-in.'';
};
name = ''activerecord-3.2.12'';
requiredGems = [ g.activesupport_3_2_12 g.activemodel_3_2_12 g.arel_3_0_2 g.tzinfo_0_3_36 ];
requiredGems = [ g.activesupport_3_2_12 g.activemodel_3_2_12 g.arel_3_0_2 g.tzinfo_0_3_37 ];
sha256 = ''0fl8iyv3gcy72y79iv4ccyck8ik02rrl3pdy7yxfhlnqgryp8syi'';
};
activeresource_3_2_12 = {
@ -181,6 +196,20 @@ installed versions.'';
requiredGems = [ g.i18n_0_6_4 g.multi_json_1_6_1 ];
sha256 = ''1giqkprxjf5gyfyhn5nz9q8a5gi3v8irxhkpqr00zc5fw1azllsg'';
};
addressable_2_3_3 = {
basename = ''addressable'';
meta = {
description = ''URI Implementation'';
homepage = ''http://addressable.rubyforge.org/'';
longDescription = ''Addressable is a replacement for the URI implementation that is part of
Ruby's standard library. It more closely conforms to the relevant RFCs and
adds support for IRIs and URI templates.
'';
};
name = ''addressable-2.3.3'';
requiredGems = [ ];
sha256 = ''0nn583ba8kq4hhpr4lr2zzpm4r0mga0zfalxxpa6a4v27q71v5hh'';
};
arel_3_0_2 = {
basename = ''arel'';
meta = {
@ -233,16 +262,16 @@ rails support and extra plugins for migrations and fixtures.'';
requiredGems = [ g.ZenTest_4_9_0 ];
sha256 = ''1wkb5jayb39yx0i8ly7sibygf9f9c3w24jg2z1qgm135zlb070v4'';
};
aws_sdk_1_8_3_1 = {
aws_sdk_1_8_5 = {
basename = ''aws_sdk'';
meta = {
description = ''AWS SDK for Ruby'';
homepage = ''http://aws.amazon.com/sdkforruby'';
longDescription = ''AWS SDK for Ruby'';
};
name = ''aws-sdk-1.8.3.1'';
name = ''aws-sdk-1.8.5'';
requiredGems = [ g.uuidtools_2_1_3 g.nokogiri_1_5_6 g.json_1_7_7 ];
sha256 = ''1yiv2skrrwqw8ihznnqqznh4yax75hbv497xqllp7b5qqmnrpvy4'';
sha256 = ''0rhkkkfsw0qzckn99mnvpbnl7b1kysma3x8bbqwah2x438kwygpb'';
};
bitbucket_backup_0_2_2 = {
basename = ''bitbucket_backup'';
@ -316,19 +345,19 @@ for those one-off tasks, with a language that's a joy to use.
'';
};
name = ''buildr-1.4.10'';
requiredGems = [ g.rake_0_9_2_2 g.builder_3_1_3 g.net_ssh_2_6_0 g.net_sftp_2_0_5 g.rubyzip_0_9_9 g.highline_1_6_2 g.json_pure_1_7_5 g.rubyforge_2_0_4 g.hoe_3_1_0 g.rjb_1_4_2 g.atoulme_Antwrap_0_7_4 g.diff_lcs_1_1_3 g.rspec_expectations_2_11_3 g.rspec_mocks_2_11_3 g.rspec_core_2_11_1 g.rspec_2_11_0 g.xml_simple_1_1_1 g.minitar_0_5_3 g.bundler_1_3_1 ];
requiredGems = [ g.rake_0_9_2_2 g.builder_3_1_3 g.net_ssh_2_6_0 g.net_sftp_2_0_5 g.rubyzip_0_9_9 g.highline_1_6_2 g.json_pure_1_7_5 g.rubyforge_2_0_4 g.hoe_3_1_0 g.rjb_1_4_2 g.atoulme_Antwrap_0_7_4 g.diff_lcs_1_1_3 g.rspec_expectations_2_11_3 g.rspec_mocks_2_11_3 g.rspec_core_2_11_1 g.rspec_2_11_0 g.xml_simple_1_1_1 g.minitar_0_5_3 g.bundler_1_3_4 ];
sha256 = ''1x192r8ab5zr9rlp1i9b3pi3y74f9pj2w491wkgshgwj22akh6vn'';
};
bundler_1_3_1 = {
bundler_1_3_4 = {
basename = ''bundler'';
meta = {
description = ''The best way to manage your application's dependencies'';
homepage = ''http://gembundler.com'';
longDescription = ''Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably'';
};
name = ''bundler-1.3.1'';
name = ''bundler-1.3.4'';
requiredGems = [ ];
sha256 = ''1nmvfsk9148nkl0bdcs167kiihp89zwkyvjs0khvi4df6s9km725'';
sha256 = ''1vgrc71nhnqlrg08zvs63afa1z9kzn2vvn95b14dvy14k2br3qhj'';
};
childprocess_0_3_9 = {
basename = ''childprocess'';
@ -341,6 +370,17 @@ for those one-off tasks, with a language that's a joy to use.
requiredGems = [ g.ffi_1_4_0 ];
sha256 = ''0jbz2ix7ff9ry8717lhcq9w8j8yd45akw48giwgdqccay5mlph7d'';
};
chronic_0_9_1 = {
basename = ''chronic'';
meta = {
description = ''Natural language date/time parsing.'';
homepage = ''http://github.com/mojombo/chronic'';
longDescription = ''Chronic is a natural language date/time parser written in pure Ruby.'';
};
name = ''chronic-0.9.1'';
requiredGems = [ ];
sha256 = ''0kspaxpfy7yvyk1lvpx31w852qfj8wb9z04mcj5bzi70ljb9awqk'';
};
daemons_1_1_9 = {
basename = ''daemons'';
meta = {
@ -388,6 +428,16 @@ is the MIT license.'';
requiredGems = [ ];
sha256 = ''1pqb7yzjcpbgbyi196ifqbd1wy570cn12bkzcvpcha4xilhajja0'';
};
em_resolv_replace_1_1_3 = {
basename = ''em_resolv_replace'';
meta = {
description = ''EventMachine-aware DNS lookup for Ruby'';
homepage = ''http://github.com/mperham/em-resolv-replace'';
};
name = ''em-resolv-replace-1.1.3'';
requiredGems = [ ];
sha256 = ''1w5y4rzmp51ni56v05qwgay5wrs2i6i3q92pvlcrghmhxhgsbqg7'';
};
erubis_2_7_0 = {
basename = ''erubis'';
meta = {
@ -411,7 +461,7 @@ is the MIT license.'';
requiredGems = [ ];
sha256 = ''1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3'';
};
eventmachine_1_0_1 = {
eventmachine_1_0_3 = {
basename = ''eventmachine'';
meta = {
description = ''Ruby/EventMachine library'';
@ -427,9 +477,20 @@ are provided with the package, primarily to serve as examples. The real goal
of EventMachine is to enable programs to easily interface with other programs
using TCP/IP, especially if custom protocols are required.'';
};
name = ''eventmachine-1.0.1'';
name = ''eventmachine-1.0.3'';
requiredGems = [ ];
sha256 = ''1v7im8v9y5jb863794irgnlqzdg669w6v1g89sln0l511gjnjv52'';
sha256 = ''09sqlsb6x9ddlgfw5gsw7z0yjg5m2qfjiqkz2fx70zsizj3lqhil'';
};
eventmachine_tail_0_6_4 = {
basename = ''eventmachine_tail'';
meta = {
description = ''eventmachine tail - a file tail implementation with glob support'';
homepage = ''http://code.google.com/p/semicomplete/wiki/EventMachineTail'';
longDescription = ''Add file 'tail' implemented with EventMachine. Also includes a 'glob watch' class for watching a directory pattern for new matches, like /var/log/*.log'';
};
name = ''eventmachine-tail-0.6.4'';
requiredGems = [ g.eventmachine_1_0_3 ];
sha256 = ''1pvlb34vdzd81kf9f3xyibb4f55xjqm7lqqy28dgyci5cyv50y61'';
};
fakes3_0_1_5 = {
basename = ''fakes3'';
@ -441,6 +502,27 @@ using TCP/IP, especially if custom protocols are required.'';
requiredGems = [ g.thor_0_17_0 g.builder_3_2_0 ];
sha256 = ''1na5wrbarla6s414svqmr5spbpv6vmcgpswal444x4clcpmadhib'';
};
faraday_0_8_6 = {
basename = ''faraday'';
meta = {
description = ''HTTP/REST API client library.'';
homepage = ''https://github.com/lostisland/faraday'';
};
name = ''faraday-0.8.6'';
requiredGems = [ g.multipart_post_1_2_0 ];
sha256 = ''16jd0gnqfrh5v4v88nlasyjjm8cmf2w2p6gphxq64mvdxlcdy5jy'';
};
faraday_middleware_0_8_8 = {
basename = ''faraday_middleware'';
meta = {
description = ''Various middleware for Faraday'';
homepage = ''https://github.com/pengwynn/faraday_middleware'';
longDescription = ''Various middleware for Faraday'';
};
name = ''faraday_middleware-0.8.8'';
requiredGems = [ g.faraday_0_8_6 ];
sha256 = ''1n0g8pm7ynx6ffyqhscc1cqw97zhvd8isr31yfyj15335j1jsncz'';
};
ffi_1_4_0 = {
basename = ''ffi'';
meta = {
@ -452,16 +534,27 @@ using TCP/IP, especially if custom protocols are required.'';
requiredGems = [ ];
sha256 = ''06a29qvg487yk9pyi7wzyj5700mf7s3mjdqc6dsrh0467mjj9768'';
};
foreman_0_61_0 = {
file_tail_1_0_12 = {
basename = ''file_tail'';
meta = {
description = ''File::Tail for Ruby'';
homepage = ''http://github.com/flori/file-tail'';
longDescription = ''Library to tail files in Ruby'';
};
name = ''file-tail-1.0.12'';
requiredGems = [ g.tins_0_7_2 ];
sha256 = ''0mzxxnwj7k5pwxs0rdbmb3b41zgvzw7x40sf3qlkch4zdfx91i1j'';
};
foreman_0_62_0 = {
basename = ''foreman'';
meta = {
description = ''Process manager for applications with multiple components'';
homepage = ''http://github.com/ddollar/foreman'';
longDescription = ''Process manager for applications with multiple components'';
};
name = ''foreman-0.61.0'';
name = ''foreman-0.62.0'';
requiredGems = [ g.thor_0_17_0 ];
sha256 = ''1h9dmzq1cwz87qyzx2ibpjghsxjnnqbh485l3sdxyfh5k3v79k7z'';
sha256 = ''08i34rgs3bydk52zwpps4p0y2fvcnibp9lvfdhr75ppin7wv7lmr'';
};
highline_1_6_15 = {
basename = ''highline'';
@ -688,6 +781,17 @@ added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp
requiredGems = [ ];
sha256 = ''0p33swcl9i97wvv0cq9jkdl8q7xbc3j07apy35vsgldnhw99krcg'';
};
multipart_post_1_2_0 = {
basename = ''multipart_post'';
meta = {
description = ''A multipart form post accessory for Net::HTTP.'';
homepage = ''https://github.com/nicksieger/multipart-post'';
longDescription = ''Use with Net::HTTP to do multipart form posts. IO values that have #content_type, #original_filename, and #local_path will be posted as a binary file.'';
};
name = ''multipart-post-1.2.0'';
requiredGems = [ ];
sha256 = ''12p7lnmc52di1r4h73h6xrpppplzyyhani9p7wm8l4kgf1hnmwnc'';
};
net_sftp_2_0_5 = {
basename = ''net_sftp'';
meta = {
@ -747,6 +851,28 @@ enough of it.'';
requiredGems = [ ];
sha256 = ''1235h8k242f6yi5qgb8rfcx6gp7g99djwqgrz0vb6w12pbp9kar8'';
};
papertrail_0_9_7 = {
basename = ''papertrail'';
meta = {
description = ''Command-line client for Papertrail hosted log management service.'';
homepage = ''http://github.com/papertrail/papertrail-cli'';
longDescription = ''Command-line client for Papertrail hosted log management service. Tails and searches app server logs and system syslog. Supports Boolean search and works with grep and pipe output (Unix).'';
};
name = ''papertrail-0.9.7'';
requiredGems = [ g.addressable_2_3_3 g.yajl_ruby_1_1_0 g.chronic_0_9_1 g.faraday_0_8_6 g.faraday_middleware_0_8_8 ];
sha256 = ''0v0m1v0qabbr9pmyl77znz39qy1m7p0xwvf3lf9hyq6n524f2dwr'';
};
papertrail_cli_0_9_3 = {
basename = ''papertrail_cli'';
meta = {
description = ''Placeholder gem to point to new papertrail gem'';
homepage = ''http://github.com/papertrail/papertrail-cli-gem'';
longDescription = ''Placeholder gem to point to new papertrail gem.'';
};
name = ''papertrail-cli-0.9.3'';
requiredGems = [ g.papertrail_0_9_7 ];
sha256 = ''1914dcfqsmw5rl4xd1zwjrfbgwglyncxm8km06bgxaqn4wnaq5iv'';
};
parallel_0_6_2 = {
basename = ''parallel'';
meta = {
@ -818,16 +944,16 @@ Also see http://rack.github.com/.
requiredGems = [ g.rack_1_5_2 ];
sha256 = ''073ffpsqmy4nqxz178qisb3a4v3305c49ypj0jw6s9mkz02yvgq2'';
};
rack_protection_1_4_0 = {
rack_protection_1_5_0 = {
basename = ''rack_protection'';
meta = {
description = ''You should use protection!'';
homepage = ''http://github.com/rkh/rack-protection'';
longDescription = ''You should use protection!'';
};
name = ''rack-protection-1.4.0'';
name = ''rack-protection-1.5.0'';
requiredGems = [ g.rack_1_5_2 ];
sha256 = ''0dfydg04fzj9rz34npy6cpp0827lij440s7fls0db41lz4vb94k0'';
sha256 = ''10wm67f2mp9pryg0s8qapbyxd2lcrpb8ywsbicg29cv2xprhbl4j'';
};
rack_ssl_1_3_3 = {
basename = ''rack_ssl'';
@ -863,7 +989,7 @@ request helpers feature.'';
longDescription = ''Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity. It encourages beautiful code by favoring convention over configuration.'';
};
name = ''rails-3.2.12'';
requiredGems = [ g.activesupport_3_2_12 g.actionpack_3_2_12 g.activerecord_3_2_12 g.activeresource_3_2_12 g.actionmailer_3_2_12 g.railties_3_2_12 g.bundler_1_3_1 ];
requiredGems = [ g.activesupport_3_2_12 g.actionpack_3_2_12 g.activerecord_3_2_12 g.activeresource_3_2_12 g.actionmailer_3_2_12 g.railties_3_2_12 g.bundler_1_3_4 ];
sha256 = ''1jjnm74nzl5v3461c0mrbpa471yd6s8hnkmnxb64c2rm95c61wxz'';
};
railties_3_2_12 = {
@ -946,6 +1072,17 @@ See RDoc for a description of RDoc's markup and basic use.'';
requiredGems = [ g.json_1_7_7 ];
sha256 = ''1v9k4sp5yzj2bshngckdvivj6bszciskk1nd2r3wri2ygs7vgqm8'';
};
remote_syslog_1_6_13 = {
basename = ''remote_syslog'';
meta = {
description = ''Monitor plain text log file(s) for new entries and send to remote syslog collector'';
homepage = ''http://github.com/papertrail/remote_syslog'';
longDescription = ''Lightweight daemon to tail one or more log files and transmit UDP syslog messages to a remote syslog host (centralized log aggregation). Generates UDP packets itself instead of depending on a system syslog daemon, so it doesn't affect system-wide logging configuration.'';
};
name = ''remote_syslog-1.6.13'';
requiredGems = [ g.servolux_0_10_0 g.file_tail_1_0_12 g.eventmachine_1_0_3 g.eventmachine_tail_0_6_4 g.syslog_protocol_0_9_2 g.em_resolv_replace_1_1_3 ];
sha256 = ''0q35j02k2l3fw3fdzq0i3rd6chsqr982gj13f3m3lsxm7kms03nw'';
};
rjb_1_4_2 = {
basename = ''rjb'';
meta = {
@ -1042,7 +1179,7 @@ See RDoc for a description of RDoc's markup and basic use.'';
requiredGems = [ ];
sha256 = ''1khf6d903agnwd8965f5f8b353rzmfvygxp53z1199rqzw8h46q2'';
};
sass_3_2_6 = {
sass_3_2_7 = {
basename = ''sass'';
meta = {
description = ''A powerful but elegant CSS compiler that makes CSS fun again.'';
@ -1053,9 +1190,9 @@ See RDoc for a description of RDoc's markup and basic use.'';
command line tool or a web-framework plugin.
'';
};
name = ''sass-3.2.6'';
name = ''sass-3.2.7'';
requiredGems = [ ];
sha256 = ''10xy6k663399r881cj30fapbdsrq8jwzvnp97y8n3mhxmrvzpq28'';
sha256 = ''0c494gh1i4llk4lbi35vidsgclf3cgxind1a7nm499ac9sdz084s'';
};
selenium_webdriver_2_31_0 = {
basename = ''selenium_webdriver'';
@ -1068,6 +1205,20 @@ See RDoc for a description of RDoc's markup and basic use.'';
requiredGems = [ g.multi_json_1_6_1 g.rubyzip_0_9_9 g.childprocess_0_3_9 g.websocket_1_0_7 ];
sha256 = ''1nv3ff31g183kdb97jjz0y7ny3vdnccd09pgblpj87bzhrrdfv3r'';
};
servolux_0_10_0 = {
basename = ''servolux'';
meta = {
description = ''* {Homepage}[http://rubygems.'';
homepage = ''http://gemcutter.org/gems/servolux'';
longDescription = ''Serv-O-Lux is a collection of Ruby classes that are useful for daemon and
process management, and for writing your own Ruby services. The code is well
documented and tested. It works with Ruby and JRuby supporting both 1.8 and 1.9
interpreters.'';
};
name = ''servolux-0.10.0'';
requiredGems = [ ];
sha256 = ''08jdrk35f61ab8b48ffm85p9lgfpbnzq3n4is00gqhpcrrq72dhs'';
};
sinatra_1_3_2 = {
basename = ''sinatra'';
meta = {
@ -1076,7 +1227,7 @@ See RDoc for a description of RDoc's markup and basic use.'';
longDescription = ''Sinatra is a DSL for quickly creating web applications in Ruby with minimal effort.'';
};
name = ''sinatra-1.3.2'';
requiredGems = [ g.rack_1_5_2 g.rack_protection_1_4_0 g.tilt_1_3_4 ];
requiredGems = [ g.rack_1_5_2 g.rack_protection_1_5_0 g.tilt_1_3_5 ];
sha256 = ''05blf915zpiwyz7agcn9rwdmddwxz0z4l3gd4qlqmrgd2vkw4sxc'';
};
sprockets_2_2_2 = {
@ -1087,9 +1238,20 @@ See RDoc for a description of RDoc's markup and basic use.'';
longDescription = ''Sprockets is a Rack-based asset packaging system that concatenates and serves JavaScript, CoffeeScript, CSS, LESS, Sass, and SCSS.'';
};
name = ''sprockets-2.2.2'';
requiredGems = [ g.hike_1_2_1 g.multi_json_1_6_1 g.rack_1_5_2 g.tilt_1_3_4 ];
requiredGems = [ g.hike_1_2_1 g.multi_json_1_6_1 g.rack_1_5_2 g.tilt_1_3_5 ];
sha256 = ''15ngw3bjbyr31ygzmmdxxa30ylah6pdn8akgdy9w30vfx2vr7s7s'';
};
syslog_protocol_0_9_2 = {
basename = ''syslog_protocol'';
meta = {
description = ''Syslog protocol parser and generator'';
homepage = ''https://github.com/eric/syslog_protocol'';
longDescription = ''Syslog protocol parser and generator'';
};
name = ''syslog_protocol-0.9.2'';
requiredGems = [ ];
sha256 = ''1yb2cmbyj0zmb2yhkgnmghcngrkhcxs4g1svcmgfj90l2hs23nmc'';
};
systemu_2_5_2 = {
basename = ''systemu'';
meta = {
@ -1120,7 +1282,7 @@ See RDoc for a description of RDoc's markup and basic use.'';
longDescription = ''A thin and fast web server'';
};
name = ''thin-1.5.0'';
requiredGems = [ g.rack_1_5_2 g.eventmachine_1_0_1 g.daemons_1_1_9 ];
requiredGems = [ g.rack_1_5_2 g.eventmachine_1_0_3 g.daemons_1_1_9 ];
sha256 = ''14sd2qbbk6y108z6v723mh3f1mk8s4fwxmmn9f8dk4xkhk4rwvq1'';
};
thor_0_17_0 = {
@ -1134,16 +1296,27 @@ See RDoc for a description of RDoc's markup and basic use.'';
requiredGems = [ ];
sha256 = ''0gf46qafcfgmi20a2mnb3wkd9y6spgy2hq22h70377daj4zjxla2'';
};
tilt_1_3_4 = {
tilt_1_3_5 = {
basename = ''tilt'';
meta = {
description = ''Generic interface to multiple Ruby template engines'';
homepage = ''http://github.com/rtomayko/tilt/'';
longDescription = ''Generic interface to multiple Ruby template engines'';
};
name = ''tilt-1.3.4'';
name = ''tilt-1.3.5'';
requiredGems = [ ];
sha256 = ''0hw59shnf3vgpx1jv24mj0d48m72h5cm1d4bianhhkjj82mc406a'';
sha256 = ''081saxdxnal4ky38a904jw3n2837m80g211w0zm5rx6m712mb6qd'';
};
tins_0_7_2 = {
basename = ''tins'';
meta = {
description = ''Useful stuff.'';
homepage = ''http://flori.github.com/tins'';
longDescription = ''All the stuff that isn't good/big enough for a real library.'';
};
name = ''tins-0.7.2'';
requiredGems = [ ];
sha256 = ''142mvgn8218wikwdvd5gq4g6k3p24f273wlqvczzfhz02livrz90'';
};
treetop_1_4_12 = {
basename = ''treetop'';
@ -1155,16 +1328,16 @@ See RDoc for a description of RDoc's markup and basic use.'';
requiredGems = [ g.polyglot_0_3_3 g.polyglot_0_3_3 ];
sha256 = ''1jlfjq67n933sm0px0s2j965v1kl1rj8fbx6xk8y4yppkv6ygxc8'';
};
tzinfo_0_3_36 = {
tzinfo_0_3_37 = {
basename = ''tzinfo'';
meta = {
description = ''Daylight-savings aware timezone library'';
homepage = ''http://tzinfo.rubyforge.org/'';
longDescription = ''TZInfo is a Ruby library that uses the standard tz (Olson) database to provide daylight savings aware transformations between times in different time zones.'';
};
name = ''tzinfo-0.3.36'';
name = ''tzinfo-0.3.37'';
requiredGems = [ ];
sha256 = ''1dk7jnhrr5lbhckgq7bh6yxgy8j7vd13qb4kr4vlk76j5ngs2whv'';
sha256 = ''0pi2vabsg73h6z4wfwyd27k63issp2qp1nh0vd74rdk740gmb3kc'';
};
uuid_2_3_7 = {
basename = ''uuid'';
@ -1212,5 +1385,15 @@ See RDoc for a description of RDoc's markup and basic use.'';
requiredGems = [ ];
sha256 = ''0zlwz8kvpm45m227aazg369fapbqyhvd5v9aga8cvxyhqnq0b87i'';
};
yajl_ruby_1_1_0 = {
basename = ''yajl_ruby'';
meta = {
description = ''Ruby C bindings to the excellent Yajl JSON stream-based parser library.'';
homepage = ''http://github.com/brianmario/yajl-ruby'';
};
name = ''yajl-ruby-1.1.0'';
requiredGems = [ ];
sha256 = ''0sj46j47icb12hdhcfh76rnvddyiic5ifqzkh3kla1vcr505kf4m'';
};
};
}

4
pkgs/development/interpreters/ruby/patches.nix
View File

@ -1,5 +1,5 @@
{ fetchurl, writeScript, ruby, ncurses, sqlite, libxml2, libxslt, libffi
, zlib, libuuid, gems, jdk }:
, zlib, libuuid, gems, jdk, python }:
let
@ -15,6 +15,8 @@ in
{
sup = { buildInputs = [ gems.ncursesw ]; };
libv8 = { buildInputs = [ python ]; };
sqlite3 = { propagatedBuildInputs = [ sqlite ]; };
rails = { gemFlags = "--no-ri --no-rdoc"; };

2
pkgs/development/libraries/boost/1.53.nix
View File

@ -28,7 +28,7 @@ let
layout = if taggedLayout then "tagged" else "system";
cflags = if enablePIC && enableExceptions then
"cflags=-fPIC -fexceptions cxxflags=-fPIC linkflags=-fPIC"
"cflags=\"-fPIC -fexceptions\" cxxflags=-fPIC linkflags=-fPIC"
else if enablePIC then
"cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC"
else if enableExceptions then

85
pkgs/development/libraries/cairo/1.12.2.nix Normal file
View File

@ -0,0 +1,85 @@
{ postscriptSupport ? true
, pdfSupport ? true
, pngSupport ? true
, xcbSupport ? false
, gobjectSupport ? true, glib
, stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype, xlibs
, zlib, libpng, pixman, libxcb ? null, xcbutil ? null
, gettext, libiconvOrEmpty
}:
assert postscriptSupport -> zlib != null;
assert pngSupport -> libpng != null;
assert xcbSupport -> libxcb != null && xcbutil != null;
stdenv.mkDerivation rec {
name = "cairo-1.12.2";
src = fetchurl {
url = "http://cairographics.org/releases/${name}.tar.xz";
sha1 = "bc2ee50690575f16dab33af42a2e6cdc6451e3f9";
};
buildInputs =
[ pkgconfig x11 fontconfig xlibs.libXrender ]
++ stdenv.lib.optionals xcbSupport [ libxcb xcbutil ]
# On non-GNU systems we need GNU Gettext for libintl.
++ stdenv.lib.optional (!stdenv.isLinux) gettext
++ libiconvOrEmpty;
propagatedBuildInputs =
[ freetype pixman ] ++
stdenv.lib.optional gobjectSupport glib ++
stdenv.lib.optional postscriptSupport zlib ++
stdenv.lib.optional pngSupport libpng;
configureFlags =
[ "--enable-tee" ]
++ stdenv.lib.optional xcbSupport "--enable-xcb"
++ stdenv.lib.optional pdfSupport "--enable-pdf";
preConfigure = ''
# Work around broken `Requires.private' that prevents Freetype
# `-I' flags to be propagated.
sed -i "src/cairo.pc.in" \
-es'|^Cflags:\(.*\)$|Cflags: \1 -I${freetype}/include/freetype2 -I${freetype}/include|g'
''
# On FreeBSD, `-ldl' doesn't exist.
+ (stdenv.lib.optionalString stdenv.isFreeBSD
'' for i in "util/"*"/Makefile.in" boilerplate/Makefile.in
do
cat "$i" | sed -es/-ldl//g > t
mv t "$i"
done
'');
enableParallelBuilding = true;
# The default `--disable-gtk-doc' is ignored.
postInstall = "rm -rf $out/share/gtk-doc";
meta = {
description = "A 2D graphics library with support for multiple output devices";
longDescription = ''
Cairo is a 2D graphics library with support for multiple output
devices. Currently supported output targets include the X
Window System, Quartz, Win32, image buffers, PostScript, PDF,
and SVG file output. Experimental backends include OpenGL
(through glitz), XCB, BeOS, OS/2, and DirectFB.
Cairo is designed to produce consistent output on all output
media while taking advantage of display hardware acceleration
when available (e.g., through the X Render Extension).
'';
homepage = http://cairographics.org/;
licenses = [ "LGPLv2+" "MPLv1" ];
platforms = stdenv.lib.platforms.all;
};
}

3
pkgs/development/libraries/cairo/default.nix
View File

@ -24,7 +24,8 @@ stdenv.mkDerivation rec {
};
buildInputs = with xlibs;
[ pkgconfig x11 fontconfig libXrender expat ]
[ pkgconfig x11 fontconfig expat ]
++ stdenv.lib.optional (!stdenv.isDarwin) libXrender
++ stdenv.lib.optionals xcbSupport [ libxcb xcbutil ]
++ stdenv.lib.optionals glSupport [ mesa ]

15
pkgs/development/libraries/cyrus-sasl/default.nix
View File

@ -1,22 +1,25 @@
{ stdenv, fetchurl, openssl, db4, gettext, pam }:
stdenv.mkDerivation rec {
name = "cyrus-sasl-2.1.25";
name = "cyrus-sasl-2.1.26";
src = fetchurl {
url = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${name}.tar.gz";
sha256 = "418c16e6240a4f9b637cbe3d62937b9675627bad27c622191d47de8686fe24fe";
url = "ftp://ftp.cyrusimap.org/cyrus-sasl/${name}.tar.gz";
sha256 = "1hvvbcsg21nlncbgs0cgn3iwlnb3vannzwsp6rwvnn9ba4v53g4g";
};
buildInputs = [ openssl db4 gettext ] ++ stdenv.lib.optional stdenv.isLinux pam;
patches = [ ./missing-size_t.patch ]; # https://bugzilla.redhat.com/show_bug.cgi?id=906519
patchFlags = "-p0";
# Set this variable at build-time to make sure $out can be evaluated.
preConfigure = ''
configureFlagsArray=( --with-plugindir=$out/lib/sasl2
--with-configdir=$out/lib/sasl2
--with-saslauthd=/run/saslauthd
--enable-login
)
--with-saslauthd=/run/saslauthd
--enable-login
)
'';
meta = {

13
pkgs/development/libraries/cyrus-sasl/missing-size_t.patch Normal file
View File

@ -0,0 +1,13 @@
Gentoo bug #458790
--- include/sasl.h 2012-10-12 17:05:48.000000000 +0300
+++ include/sasl.h 2013-02-23 16:56:44.648786268 +0200
@@ -121,6 +121,9 @@
#ifndef SASL_H
#define SASL_H 1
+/* stddef.h to get size_t defined */
+#include <stddef.h>
+
/* Keep in sync with win32/common.mak */
#define SASL_VERSION_MAJOR 2
#define SASL_VERSION_MINOR 1

68
pkgs/development/libraries/gamin/deadlock.patch Normal file
View File

@ -0,0 +1,68 @@
Fix for a deadlock:
https://bugzilla.gnome.org/show_bug.cgi?id=667230
From cc14440eface093548cb3bc7814da11d9a99d283 Mon Sep 17 00:00:00 2001
From: Anssi Hannula <anssi@mageia.org>
Date: Wed, 4 Jan 2012 00:23:55 +0200
Subject: [PATCH] fix possible server deadlock in ih_sub_cancel
ih_sub_foreach() calls ih_sub_cancel() while inotify_lock is locked.
However, ih_sub_cancel() locks it again, and locking GMutex recursively
causes undefined behaviour.
Fix that by removing locking from ih_sub_cancel() as ih_sub_foreach()
is its only user. Also make the function static so that it won't
accidentally get used by other files without locking (inotify-helper.h
is an internal server header).
This should fix the intermittent deadlocks I've been experiencing
causing KDE applications to no longer start, and probably also
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=542361
---
server/inotify-helper.c | 7 ++-----
server/inotify-helper.h | 1 -
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/server/inotify-helper.c b/server/inotify-helper.c
index d77203e..0789fa4 100644
--- a/server/inotify-helper.c
+++ b/server/inotify-helper.c
@@ -123,13 +123,11 @@ ih_sub_add (ih_sub_t * sub)
/**
* Cancels a subscription which was being monitored.
+ * inotify_lock must be held when calling.
*/
-gboolean
+static gboolean
ih_sub_cancel (ih_sub_t * sub)
{
- G_LOCK(inotify_lock);
-
-
if (!sub->cancelled)
{
IH_W("cancelling %s\n", sub->pathname);
@@ -140,7 +138,6 @@ ih_sub_cancel (ih_sub_t * sub)
sub_list = g_list_remove (sub_list, sub);
}
- G_UNLOCK(inotify_lock);
return TRUE;
}
diff --git a/server/inotify-helper.h b/server/inotify-helper.h
index 5d3b6d0..d36b5fd 100644
--- a/server/inotify-helper.h
+++ b/server/inotify-helper.h
@@ -34,7 +34,6 @@ gboolean ih_startup (event_callback_t ecb,
found_callback_t fcb);
gboolean ih_running (void);
gboolean ih_sub_add (ih_sub_t *sub);
-gboolean ih_sub_cancel (ih_sub_t *sub);
/* Return FALSE from 'f' if the subscription should be cancelled */
void ih_sub_foreach (void *callerdata, gboolean (*f)(ih_sub_t *sub, void *callerdata));
--
1.7.7.2

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

@ -16,5 +16,5 @@ stdenv.mkDerivation rec {
# <sys/socket.h> with Glibc 2.9.
configureFlags = "--disable-debug --with-python=${python} CPPFLAGS=-D_GNU_SOURCE";
patches = map fetchurl (import ./debian-patches.nix);
patches = [ ./deadlock.patch ] ++ map fetchurl (import ./debian-patches.nix);
}

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

@ -143,7 +143,9 @@ stdenv.mkDerivation ({
configureScript="`pwd`/../$sourceRoot/configure"
makeFlags="$makeFlags BUILD_LDFLAGS=-Wl,-rpath,${stdenv.gcc.libc}/lib"
${stdenv.lib.optionalString (stdenv.gcc.libc != null)
''makeFlags="$makeFlags BUILD_LDFLAGS=-Wl,-rpath,${stdenv.gcc.libc}/lib"''
}
${preConfigure}
'';

2
pkgs/development/libraries/glibc/2.17/info.nix
View File

@ -19,7 +19,7 @@ build null {
# libc.info hasn't a Top node.
installPhase = ''
mkdir -p "$out/share/info"
cp -v "../$sourceRoot/manual/"*.info* "$out/share/info"
cp -v "manual/"*.info* "$out/share/info"
'';
meta.description = "GNU Info manual of the GNU C Library";

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "NumInstances";
version = "1.0";
sha256 = "1fmg3slwma5f88a2qxj54ny40s67qbdyvsyh506bkp11v54958fy";
version = "1.2";
sha256 = "0s26j3h0xg16lcz95qs21iyfnzx8q8w2k2lnq55gakkr1wl4ap59";
meta = {
description = "Instances of numeric classes for functions and tuples";
license = self.stdenv.lib.licenses.bsd3;

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "blaze-html";
version = "0.6.1.0";
sha256 = "1y2z2md62kpl57qcvwvswmrjq7zhkqwfv8zr2acdvcxcxnyc47fm";
version = "0.6.1.1";
sha256 = "08zfmkvahmm613r0nrabwl5zv9ragcrhdqsa8jfdrfdkrf6ckbrc";
buildDepends = [ blazeBuilder blazeMarkup text ];
testDepends = [
blazeBuilder blazeMarkup HUnit QuickCheck testFramework

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "blaze-markup";
version = "0.5.1.4";
sha256 = "0g316qhk7yv6y680w93613apfhm458a01g3jmq42yv4ndydkv4rr";
version = "0.5.1.5";
sha256 = "0g3smm1ym7h45bkzx94b77ssyg0z0gqfwbnap3ywa2381rb39l74";
buildDepends = [ blazeBuilder text ];
testDepends = [
blazeBuilder HUnit QuickCheck testFramework testFrameworkHunit

4
pkgs/development/libraries/haskell/citeproc-hs/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "citeproc-hs";
version = "0.3.7";
sha256 = "0ix9y7z8m8x4l10h96fgv820grywvwcp3019wxjja4y4w6irid3b";
version = "0.3.8";
sha256 = "0wlfwjxg852qcgx54m99xm7hxsmcw8c8r7fyrsxyxl3054xnfwz8";
buildDepends = [
filepath hexpat hsBibutils HTTP json mtl network pandocTypes parsec
syb time utf8String

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "conduit";
version = "1.0.2";
sha256 = "03hyryljvkbgyvwx63qrkvf2wm1qm8640rsm8yb4mahgzp4r130f";
version = "1.0.3";
sha256 = "1jvbm5v25h1m5a9gd0f417mhpabp3kcfzsjm8887gcyimp2d0z07";
buildDepends = [
liftedBase monadControl resourcet text transformers
transformersBase void

15
pkgs/development/libraries/haskell/constraints/default.nix Normal file
View File

@ -0,0 +1,15 @@
{ cabal, newtype }:
cabal.mkDerivation (self: {
pname = "constraints";
version = "0.3.2";
sha256 = "1fmjl6dh2iswvmq8r3izplp6zg9m8yq1c4rj0zpqjbv2iqsi4kl1";
buildDepends = [ newtype ];
meta = {
homepage = "http://github.com/ekmett/constraints/";
description = "Constraint manipulation";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "distributive";
version = "0.3";
sha256 = "0z6vwak2n91vpx9ps9j1pbiw0zlh9jmds84yx1yqssbqx8npi32f";
version = "0.3.1";
sha256 = "0zf3wq1xz9sbb0g6fg852jckrwkffsfkghq3zx03d2q9ginc6jbc";
buildDepends = [ transformers transformersCompat ];
testDepends = [ doctest filepath ];
meta = {

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

@ -13,8 +13,8 @@ cabal.mkDerivation (self: {
baseCompat deepseq filepath ghcPaths hspec HUnit QuickCheck setenv
silently stringbuilder syb transformers
];
doCheck = false;
jailbreak = true;
doCheck = false;
meta = {
homepage = "https://github.com/sol/doctest-haskell#readme";
description = "Test interactive Haskell examples";

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "ghc-mod";
version = "1.12.1";
sha256 = "0m876lfxi0k7v27rg4ipq3rpk7qvsrzfdflp5fayxvmi9wgdvm3r";
version = "1.12.2";
sha256 = "0kwf1szw26iz4sw2slv10birpngf1cfy9jzmllzr0nvybh1pv7a9";
isLibrary = false;
isExecutable = true;
buildDepends = [

5
pkgs/development/libraries/haskell/gitit/default.nix
View File

@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "gitit";
version = "0.10.2";
sha256 = "07zdc1qx429rmisb39gdamwn9b1jblvjg7py4fcxx3qj01b6mvxx";
version = "0.10.3";
sha256 = "1hz4ddym2vn01nd22gb995dya48fzc7nsmsqywdc8hjczmn93qyg";
isLibrary = true;
isExecutable = true;
buildDepends = [
@ -18,7 +18,6 @@ cabal.mkDerivation (self: {
safe SHA syb tagsoup text time url utf8String xhtml xml xssSanitize
zlib
];
jailbreak = true;
meta = {
homepage = "http://gitit.net";
description = "Wiki using happstack, git or darcs, and pandoc";

8
pkgs/development/libraries/haskell/hakyll/default.nix
View File

@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "hakyll";
version = "4.2.1.0";
sha256 = "05w5j8wc47j8g4x2lsm0zs3aspb4rjvgnrxbjlxps0mfz3csqfhh";
version = "4.2.1.2";
sha256 = "0b2jmi9hi5l72lkyjn2w3gwn52zvnvv7c10x5329hp000gzmwbvi";
isLibrary = true;
isExecutable = true;
buildDepends = [
@ -19,8 +19,8 @@ cabal.mkDerivation (self: {
testDepends = [
binary blazeHtml blazeMarkup citeprocHs cmdargs cryptohash deepseq
filepath httpConduit httpTypes HUnit lrucache mtl pandoc parsec
QuickCheck random regexBase regexTdfa tagsoup testFramework
testFrameworkHunit testFrameworkQuickcheck2 text time
QuickCheck random regexBase regexTdfa snapCore snapServer tagsoup
testFramework testFrameworkHunit testFrameworkQuickcheck2 text time
];
doCheck = false;
meta = {

4
pkgs/development/libraries/haskell/haskell-src-meta/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "haskell-src-meta";
version = "0.6.0.1";
sha256 = "181xjajvppipzgknmbhbb1i2r8rimbr5vzn6gf1ksddgw12sargd";
version = "0.6.0.2";
sha256 = "1msqnsavghsc5bil3mm9swpi9a54pki4162jdfwwvlzvdmfvk9hp";
buildDepends = [ haskellSrcExts syb thOrphans uniplate ];
meta = {
description = "Parse source to template-haskell abstract syntax";

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "hint";
version = "0.3.3.5";
sha256 = "09pd4b105c2ikf4ap96fz8091qra7hypq3k3ik0kay3bb532hmlq";
version = "0.3.3.6";
sha256 = "080wnds99lg9p4n2h9d4bpgvk73yzc3im2ysn1r8f3nqai4b2can";
buildDepends = [
extensibleExceptions filepath ghcMtl ghcPaths haskellSrc
MonadCatchIOMtl mtl random utf8String

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

@ -9,8 +9,8 @@
cabal.mkDerivation (self: {
pname = "http-conduit";
version = "1.9.1";
sha256 = "1ypwqd5f6m459kjw2x3knig924s93b6yiviy7jlaxllpaw2lrial";
version = "1.9.2.1";
sha256 = "1zzw9gdljn7pmp0d6k051gp1wiw9412c3gdbpwbpng6m5jhk079i";
buildDepends = [
asn1Data base64Bytestring blazeBuilder blazeBuilderConduit
caseInsensitive certificate conduit cookie cprngAes dataDefault

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "liblastfm";
version = "0.1.0.0";
sha256 = "1777p2zysha9z389dkzvc22wph5k2xa6f23xk1ckr8j1q5v9dg6x";
version = "0.1.1.0";
sha256 = "1yrgyb0m1gdhsrkv3b8a5a0qii67v9gx1kbv79ixlac60bsm4q95";
buildDepends = [
aeson cereal cryptoApi httpConduit httpTypes network pureMD5 text
];

4
pkgs/development/libraries/haskell/monad-logger/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "monad-logger";
version = "0.3.0.1";
sha256 = "05pwccs2f5qn22cwvzaiw6bflyxl3avrl89y737rjcsw6755r5sr";
version = "0.3.1.1";
sha256 = "11qqmflcydjfm5py7rkbi9qd0mkhw4kxzxff95wf0jmaia9knvx6";
buildDepends = [
conduit fastLogger monadControl mtl resourcet text transformers
transformersBase

7
pkgs/development/libraries/haskell/numbers/default.nix
View File

@ -2,14 +2,13 @@
cabal.mkDerivation (self: {
pname = "numbers";
version = "3000.1.0.1";
sha256 = "0r2s47nfdxasnp8j7giwpxls9v48f6ld0gc2hg2p7y2ar5xfrcc4";
version = "3000.1.0.3";
sha256 = "0w2m2m3vp3lpvnc7wkw6pqfz741a68dma4s0asl7cryykwf94xgz";
testDepends = [
QuickCheck testFramework testFrameworkQuickcheck2
];
doCheck = false;
meta = {
homepage = "https://github.com/DanBurton/numbers";
homepage = "https://github.com/DanBurton/numbers#readme";
description = "Various number types";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;

23
pkgs/development/libraries/haskell/pandoc/default.nix
View File

@ -1,13 +1,15 @@
{ cabal, base64Bytestring, blazeHtml, blazeMarkup, citeprocHs
, dataDefault, extensibleExceptions, filepath, highlightingKate
, HTTP, json, mtl, network, pandocTypes, parsec, random, syb
, tagsoup, temporary, texmath, text, time, xml, zipArchive, zlib
{ cabal, ansiTerminal, base64Bytestring, blazeHtml, blazeMarkup
, citeprocHs, dataDefault, Diff, extensibleExceptions, filepath
, highlightingKate, HTTP, HUnit, json, mtl, network, pandocTypes
, parsec, QuickCheck, random, syb, tagsoup, temporary
, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
, texmath, text, time, xml, zipArchive, zlib
}:
cabal.mkDerivation (self: {
pname = "pandoc";
version = "1.10.1";
sha256 = "127pxs1w99nr6hdancaajm20w3vgmch4xlj0v7221y7i9qcr1y1y";
version = "1.11";
sha256 = "1v32z6fmfkllwf5y64sjbk3ckss2kfcs71b64a7fjdhp82m4i4yh";
isLibrary = true;
isExecutable = true;
buildDepends = [
@ -16,10 +18,13 @@ cabal.mkDerivation (self: {
network pandocTypes parsec random syb tagsoup temporary texmath
text time xml zipArchive zlib
];
testDepends = [
ansiTerminal Diff filepath highlightingKate HUnit pandocTypes
QuickCheck syb testFramework testFrameworkHunit
testFrameworkQuickcheck2 text
];
configureFlags = "-fblaze_html_0_5";
patchPhase = ''
sed -r -i -e 's|blaze-html >= 0.5 && < 0.6,|blaze-html >= 0.5,|' pandoc.cabal
'';
patchPhase = "sed -i -e 's|QuickCheck >= 2.4 && < 2.6,|QuickCheck,|' pandoc.cabal";
doCheck = false;
meta = {
homepage = "http://johnmacfarlane.net/pandoc";

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "persistent-template";
version = "1.1.2.4";
sha256 = "0fsqyv5r6h356shmah6bs75fzds0fsmyizbnvj5ywzhc003jv5h9";
version = "1.1.2.5";
sha256 = "142b02ini1b5c566rzhykv45n4byzvhp9r6yyavy4zyvgdj7ligj";
buildDepends = [ aeson monadControl persistent text transformers ];
testDepends = [ aeson hspec persistent QuickCheck text ];
meta = {

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "publicsuffixlist";
version = "0.0.3";
sha256 = "1drsm1zp30629rzy0693ggzcx46b7ydzzafmf07mjanmn1kyyqci";
version = "0.0.4";
sha256 = "0qwx2739pmmjfy6w3iri1fgyin3295vzn6rvazh34qd89i5vi3pb";
buildDepends = [ cereal dataDefault text utf8String ];
testDepends = [ cereal dataDefault HUnit idna text utf8String ];
meta = {

1
pkgs/development/libraries/haskell/punycode/default.nix
View File

@ -6,6 +6,7 @@ cabal.mkDerivation (self: {
sha256 = "192jgfixnpxdj6jiiz92kx5bi6ij3c389b76q9f4vyfmvcajj1sr";
buildDepends = [ cereal mtl text ];
testDepends = [ cereal encoding HUnit mtl QuickCheck text ];
doCheck = false;
meta = {
homepage = "https://github.com/litherum/punycode";
description = "Encode unicode strings to ascii forms according to RFC 3492";

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "smallcheck";
version = "1.0.1";
sha256 = "1b8g7vgvwyz2smx16gbn73k749mazj2zmr2hjhqj4rk0433i6lpk";
version = "1.0.2";
sha256 = "09zlsvgbwgpjwkjhizbzzww2nvkyxvkf214yqxzfaa1cj9xzbbdi";
buildDepends = [ logict mtl ];
meta = {
homepage = "https://github.com/feuerbach/smallcheck";

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "stylish-haskell";
version = "0.5.6.0";
sha256 = "1cy40b7csna3fwq0bm5mx9d09x52vj517mf38yn8ymd0afff67sb";
version = "0.5.6.1";
sha256 = "0fxncnl9bvb7qjha3r06qli9qlzfljism6k688hrr9y6l06jdc2c";
isLibrary = true;
isExecutable = true;
buildDepends = [

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "threads";
version = "0.5.0.1";
sha256 = "0amyaxa70q6v021nab6v3cfqc40mwj5dr2fwla9d4bm6ppmq6lyy";
version = "0.5.0.2";
sha256 = "14ccmjg56429a3mzx11ccv18bvkqg56ph9kbpmhdx2ajar80g6jm";
buildDepends = [ baseUnicodeSymbols stm ];
testDepends = [
baseUnicodeSymbols concurrentExtra HUnit stm testFramework

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "void";
version = "0.5.11";
sha256 = "0fi8ccnhg0ckz5v3cgxhdd67p0v3g9yawin917ik4vxfbwz5j3v6";
version = "0.5.12";
sha256 = "03fqcap94saj7mx3y4pvvfj4z8dy6rsk2kvhgbnk2wvz5xm7xvci";
buildDepends = [ semigroups ];
meta = {
homepage = "http://github.com/ekmett/void";

4
pkgs/development/libraries/haskell/wai-extra/default.nix
View File

@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "wai-extra";
version = "1.3.2.4";
sha256 = "12hdg5h4bk04nhcmjm5mc62dng9np0dlik4b1w1syd2lxqv6pdb9";
version = "1.3.3.1";
sha256 = "0ss58s5m8yp326q0651znifbfl6kpimyhm479wx8r3zx3ndl47q9";
buildDepends = [
ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive
conduit dataDefault dateCache fastLogger httpTypes network

8
pkgs/development/libraries/haskell/wl-pprint-extras/default.nix
View File

@ -1,10 +1,10 @@
{ cabal, nats, semigroupoids, semigroups, utf8String }:
{ cabal, nats, semigroupoids, semigroups, text, utf8String }:
cabal.mkDerivation (self: {
pname = "wl-pprint-extras";
version = "3.3";
sha256 = "1q3wiw62k53yl9ny9l54b281zprrnshw94pd52rlcxbw9cgj8xzx";
buildDepends = [ nats semigroupoids semigroups utf8String ];
version = "3.4";
sha256 = "17vxyckx2pj4sc2d1yw1rcsxn1rp4nzdjp0hgpy78xsp9plccgsy";
buildDepends = [ nats semigroupoids semigroups text utf8String ];
meta = {
homepage = "http://github.com/ekmett/wl-pprint-extras/";
description = "A free monad based on the Wadler/Leijen pretty printer";

9
pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix
View File

@ -1,12 +1,13 @@
{ cabal, nats, semigroups, terminfo, transformers, wlPprintExtras
{ cabal, nats, semigroups, terminfo, text, transformers
, wlPprintExtras
}:
cabal.mkDerivation (self: {
pname = "wl-pprint-terminfo";
version = "3.4";
sha256 = "1wnlm74fwcn171a533bv15bvlhabrzh192wabala0wyvwgl8hwzk";
version = "3.6";
sha256 = "14dq0inv6i8pwjzrpys420iwi6002mard1n73z96k89zq5xhwlbg";
buildDepends = [
nats semigroups terminfo transformers wlPprintExtras
nats semigroups terminfo text transformers wlPprintExtras
];
meta = {
homepage = "http://github.com/ekmett/wl-pprint-terminfo/";

11
pkgs/development/libraries/haskell/yesod-json/default.nix
View File

@ -1,16 +1,17 @@
{ cabal, aeson, attoparsecConduit, blazeBuilder, conduit, safe
, shakespeareJs, text, transformers, vector, wai, waiExtra
, yesodCore, yesodRoutes
{ cabal, aeson, attoparsecConduit, blazeBuilder, conduit, hspec
, safe, shakespeareJs, text, transformers, vector, wai, waiExtra
, waiTest, yesodCore, yesodRoutes
}:
cabal.mkDerivation (self: {
pname = "yesod-json";
version = "1.1.2.1";
sha256 = "0vrhn3v26q7cqwds99hqyibq09vyxnviqzgyn7w5ldnl3ycg7dqd";
version = "1.1.2.2";
sha256 = "1bl4rs3biv2man0n8ijldil32lyswjqk5ykz0nv06qsaaafjpc3g";
buildDepends = [
aeson attoparsecConduit blazeBuilder conduit safe shakespeareJs
text transformers vector wai waiExtra yesodCore yesodRoutes
];
testDepends = [ hspec text waiTest yesodCore ];
meta = {
homepage = "http://www.yesodweb.com/";
description = "Generate content for Yesod using the aeson package";

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "yst";
version = "0.3.1";
sha256 = "1ax3j21b4ac9x4vvvfgnhz0sczd7l7ia6mcxnqhbc3166sn91vig";
version = "0.3.1.1";
sha256 = "1wc2s5aan4rqdrpqgqvka5pqm3d691si5hdf0m0wpi2hzkwl3qv3";
isLibrary = false;
isExecutable = true;
buildDepends = [

16
pkgs/development/libraries/libee/default.nix Normal file
View File

@ -0,0 +1,16 @@
{ stdenv, fetchurl, pkgconfig, libestr }:
stdenv.mkDerivation {
name = "libee-0.4.1";
src = fetchurl {
url = http://www.libee.org/download/files/download/libee-0.4.1.tar.gz;
md5 = "7bbf4160876c12db6193c06e2badedb2";
};
buildInputs = [pkgconfig libestr];
meta = {
homepage = "http://www.libee.org/";
description = "An Event Expression Library inspired by CEE";
};
}

8
pkgs/development/libraries/libestr/default.nix Normal file
View File

@ -0,0 +1,8 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation {
name = "libestr-0.1.4";
src = fetchurl {
url = http://libestr.adiscon.com/files/download/libestr-0.1.4.tar.gz;
sha256 = "1qw5vqryawdm434l9ql3r160ap2f5mmp7b6pciac7qli62y0a2z3";
};
}

26
pkgs/development/libraries/opencascade/oce.nix Normal file
View File

@ -0,0 +1,26 @@
{stdenv, fetchurl, mesa, tcl, tk, file, libXmu, cmake, libtool, qt4,
ftgl, freetype}:
stdenv.mkDerivation rec {
name = "opencascade-oce-0.13-dev";
src = fetchurl {
url = https://api.github.com/repos/tpaviot/oce/tarball/bd77743bfa0e765c3a57d116a62d75b50e1a455;
name = "${name}.tar.gz";
sha256 = "1w7z326la9427yb23hbalsksk6w4ma5xil4jscnvi8mk6g48wyxv";
};
buildInputs = [ mesa tcl tk file libXmu libtool qt4 ftgl freetype cmake ];
preConfigure = ''
cmakeFlags="$cmakeFlags -DOCE_INSTALL_PREFIX=$out"
'';
enableParallelBuilding = true;
meta = {
description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation";
homepage = http://www.opencascade.org/;
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
};
}

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng, harfbuzz }:
{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng, harfbuzz, fontconfig }:
stdenv.mkDerivation rec {
name = "pango-1.32.5"; #.6 needs a not-yet-stable fontconfig
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "08aqis6j8nd1lb4f2h4h9d9kjvp54iwf8zvqzss0qn4v7nfcjyvx";
};
buildInputs = stdenv.lib.optional stdenv.isDarwin gettext;
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ gettext fontconfig ];
nativeBuildInputs = [ pkgconfig ];

4
pkgs/development/libraries/tinyxml/2.6.2.nix
View File

@ -20,6 +20,10 @@ in stdenv.mkDerivation {
buildInputs = [ unzip ];
buildPhase = ''
# use STL (xbmc requires it)
sed '1i#define TIXML_USE_STL 1' -i tinyxml.h
sed '1i#define TIXML_USE_STL 1' -i xmltest.cpp
# build xmltest
make

2
pkgs/development/mobile/androidenv/build-app.nix
View File

@ -39,6 +39,6 @@ stdenv.mkDerivation {
mv bin/*-${if release then "release" else "debug"}.apk $out
mkdir -p $out/nix-support
echo "file binary-dist $(ls $out/*.apk)" > $out/nix-support/hydra-build-products
echo "file binary-dist $(echo $out/*.apk)" > $out/nix-support/hydra-build-products
'';
}

6
pkgs/development/mobile/titaniumenv/examples/default.nix
View File

@ -1,7 +1,9 @@
{ nixpkgs ? <nixpkgs> }:
{ nixpkgs ? <nixpkgs>
, system ? builtins.currentSystem
}:
let
pkgs = import nixpkgs {};
pkgs = import nixpkgs { inherit system; };
pkgs_darwin_x86_64 = import nixpkgs { system = "x86_64-darwin"; };
in
rec {

7
pkgs/development/mobile/xcodeenv/build-app.nix
View File

@ -1,6 +1,7 @@
{stdenv, xcodewrapper}:
{ name
, src
, sdkVersion ? "6.1"
, target ? null
, configuration ? null
, scheme ? null
@ -36,7 +37,7 @@ let
_sdk = if sdk == null
then
if release then "iphoneos6.0" else "iphonesimulator6.0"
if release then "iphoneos" + sdkVersion else "iphonesimulator" + sdkVersion
else sdk;
# The following is to prevent repetition
@ -79,6 +80,10 @@ stdenv.mkDerivation {
${stdenv.lib.optionalString generateIPA ''
# Produce an IPA file
xcrun -sdk iphoneos PackageApplication -v $out/*.app -o $out/${name}.ipa
# Add IPA to Hydra build products
mkdir -p $out/nix-support
echo "file binary-dist $(echo $out/*.ipa)" > $out/nix-support/hydra-build-products
''}
# Delete our temp keychain

5
pkgs/development/mobile/xcodeenv/xcodewrapper.nix
View File

@ -1,8 +1,5 @@
{stdenv}:
{stdenv, version ? "4.6"}:
let
version = "4.5.2";
in
stdenv.mkDerivation {
name = "xcode-wrapper-"+version;
buildCommand = ''

14
pkgs/development/python-modules/dbus/default.nix
View File

@ -1,16 +1,22 @@
{ stdenv, fetchurl, python, pkgconfig, dbus, dbus_glib }:
{ stdenv, fetchurl, python, pkgconfig, dbus, dbus_glib, dbus_tools }:
stdenv.mkDerivation rec {
name = "dbus-python-0.84.0";
name = "dbus-python-1.1.1";
src = fetchurl {
url = "http://dbus.freedesktop.org/releases/dbus-python/${name}.tar.gz";
sha256 = "01jrmj7ps79dkd6f8bzm17vxzpad1ixwmcb1liy64xm9y6mcfnxq";
sha256 = "122yj5y0mndk9axh735qvwwckck6s6x0q84dw6p97mplp17wl5w9";
};
buildInputs = [ python pkgconfig dbus dbus_glib ];
postPatch = "patchShebangs .";
buildInputs = [ python pkgconfig dbus dbus_glib ]
++ stdenv.lib.optional doCheck dbus_tools;
doCheck = false; # https://bugs.freedesktop.org/show_bug.cgi?id=57140
meta = {
description = "Python DBus bindings";
license = "MIT";
};
}

2
pkgs/development/tools/build-managers/cmake/setup-hook.sh
View File

@ -42,7 +42,7 @@ cmakeConfigurePhase() {
echo "cmake flags: $cmakeFlags ${cmakeFlagsArray[@]}"
cmake ${cmakeDir:-.} $cmakeFlags ${cmakeFlagsArray[@]}
cmake ${cmakeDir:-.} $cmakeFlags "${cmakeFlagsArray[@]}"
eval "$postConfigure"
}

4
pkgs/development/tools/misc/texinfo/5.0.nix → pkgs/development/tools/misc/texinfo/5.1.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, ncurses, perl }:
stdenv.mkDerivation rec {
name = "texinfo-5.0";
name = "texinfo-5.1";
src = fetchurl {
url = "mirror://gnu/texinfo/${name}.tar.xz";
sha256 = "1p34f68h9ggfj6ckgj0p62qlj7pmz3ha3vc91kh4hr44pnwm1pla";
sha256 = "0864v5i488x3mb3v5p6nhy2kw0mqkzpa3b0453iibj81zlpq078q";
};
buildInputs = [ ncurses perl ];

8
pkgs/development/tools/parsing/alex/3.0.4.nix → pkgs/development/tools/parsing/alex/3.0.5.nix
View File

@ -1,14 +1,14 @@
{ cabal, perl, QuickCheck }:
{ cabal, fetchurl, perl, QuickCheck }:
cabal.mkDerivation (self: {
pname = "alex";
version = "3.0.4";
sha256 = "0fgh7ziwxyb140wghh7dpndh41sixcssnba0q942cvkg77m6ah6d";
version = "3.0.5";
sha256 = "0ncnp7cl7dlfcrwzzcp8j59i9j5r66wim1yib9g3b3jkl0bn8cn3";
isLibrary = false;
isExecutable = true;
buildDepends = [ QuickCheck ];
buildTools = [ perl ];
doCheck = false;
patches = [ (fetchurl { url="https://github.com/simonmar/alex/pull/21.patch"; sha256="0apv3rk00gwkf5rqw3467bg6pnamr07zdksbp9khhzzi73k9aq4f"; }) ];
meta = {
homepage = "http://www.haskell.org/alex/";
description = "Alex is a tool for generating lexical analysers in Haskell";

24
pkgs/development/web/nodejs/default.nix
View File

@ -12,26 +12,36 @@ stdenv.mkDerivation rec {
configureFlags = [
"--openssl-includes=${openssl}/include"
"--openssl-libpath=${openssl}/lib"
]
++ (if !stdenv.isDarwin then [ # Shared V8 is broken on Mac OS X. Who can fix V8 on Darwin makes me very happy, but I gave up studying python-gyp.
"--shared-v8"
"--shared-v8-includes=${v8}/includes"
"--shared-v8-libpath=${v8}/lib"
];
] else []);
#patches = stdenv.lib.optional stdenv.isDarwin ./no-arch-flag.patch;
# Expose the host compiler on darwin, which is the only compiler capable of building it
preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
export OLDPATH=$PATH
export PATH=/usr/bin:$PATH
'';
prePatch = ''
sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i tools/{*.py,waf-light,node-waf} configure
'';
postInstall = ''
postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
export PATH=$OLDPATH
'' + ''
sed -e 's|^#!/usr/bin/env node$|#!'$out'/bin/node|' -i $out/lib/node_modules/npm/bin/npm-cli.js
'' + stdenv.lib.optionalString stdenv.isDarwin ''
'' /*+ stdenv.lib.optionalString stdenv.isDarwin ''
install_name_tool -change libv8.dylib ${v8}/lib/libv8.dylib $out/bin/node
'';
buildInputs = [ python openssl v8 zlib ] ++ stdenv.lib.optional stdenv.isLinux utillinux;
''*/;
buildInputs = [ python openssl zlib ]
++ stdenv.lib.optional stdenv.isLinux utillinux
++ stdenv.lib.optional (!stdenv.isDarwin) v8;
setupHook = ./setup-hook.sh;
meta = with stdenv.lib; {

1
pkgs/os-specific/linux/hostapd/default.nix
View File

@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
substituteInPlace Makefile --replace "/usr/local/bin" "$out/bin"
mv defconfig .config
echo CONFIG_LIBNL32=y | tee -a .config
echo CONFIG_IEEE80211N=y | tee -a .config
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags libnl-3.0)"
'';
preInstall = "mkdir -p $out/bin";

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

@ -251,7 +251,7 @@ in
import ./generic.nix (
rec {
version = "3.8.2";
version = "3.8.3";
testing = false;
preConfigure = ''
@ -260,7 +260,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
sha256 = "1i7r89ba79x6irr95gq1b0cnkbmdz3llh72vdamn83s3zh6cy1fv";
sha256 = "15jdsnsswpah8936xmq6r1jpfsp1kbq643i4l0bgc6n749f512ig";
};
config = configWithPlatform stdenv.platform;

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

@ -251,7 +251,7 @@ in
import ./generic.nix (
rec {
version = "3.9-rc1";
version = "3.9-rc2";
modDirVersion = "3.9.0-rc1";
testing = true;
@ -261,7 +261,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
sha256 = "1bm4fdk1v3dlhcqrzwzrf6fscvq7p7493f5ld5lbspaw8vb08690";
sha256 = "1aan14n6sw43qk9kpmdrpcakb1398kj2djqca8cvijc8g76973in";
};
config = configWithPlatform stdenv.platform;

10
pkgs/tools/compression/lzip/default.nix
View File

@ -1,13 +1,17 @@
{ stdenv, fetchurl }:
{ stdenv, fetchurl, texinfo }:
stdenv.mkDerivation rec {
name = "lzip-1.14-rc3";
name = "lzip-1.14";
buildInputs = [ texinfo ];
src = fetchurl {
url = "http://download.savannah.gnu.org/releases/lzip/${name}.tar.gz";
sha256 = "040mmfadvhry68bv10baqi1bs8g5wwbf5rx0widyz69llpn64mw9";
sha256 = "1rybhk2pxpfh2789ck9mrkdv3bpx7b7miwndlshb5vb02m9crxbz";
};
configureFlags = "CPPFLAGS=-DNDEBUG CFLAGS=-O3 CXXFLAGS=-O3";
doCheck = true;
meta = {

2
pkgs/tools/graphics/graphviz/default.nix
View File

@ -32,8 +32,10 @@ stdenv.mkDerivation rec {
sed -e 's@am__append_5 *=.*@am_append_5 =@' -i lib/gvc/Makefile
'';
# "command -v" is POSIX, "which" is not
postInstall = ''
sed -i 's|`which lefty`|"'$out'/bin/lefty"|' $out/bin/dotty
sed -i 's|which|command -v|' $out/bin/vimdot
'';
meta = {

27
pkgs/tools/misc/mktorrent/default.nix Normal file
View File

@ -0,0 +1,27 @@
{stdenv, fetchurl, openssl}:
stdenv.mkDerivation {
name = "mktorrent-1.0.0";
src = fetchurl {
url = mirror://sourceforge/mktorrent/mktorrent-1.0.tar.gz;
sha256 = "17qi3nfky240pq6qcmf5qg324mxm83vk9r3nvsdhsvinyqm5d3kg";
};
makeFlags = "CFLAGS=-lgcc_s USE_PTHREADS=1 USE_OPENSSL=1 USE_LONG_OPTIONS=1" +
stdenv.lib.optionalString stdenv.isi686 " USE_LARGE_FILES=1";
preInstall = ''
installFlags=PREFIX=$out
'';
buildInputs = [ openssl ];
meta = {
homepage = http://mktorrent.sourceforge.net/;
license = "GPLv2+";
description = "Command line utility to create BitTorrent metainfo files";
platforms = with stdenv.lib.platforms; linux;
maintainers = with stdenv.lib.maintainers; [viric];
};
}

BIN
pkgs/tools/networking/snx/snx_install.sh
View File

Binary file not shown.

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

@ -1,21 +1,22 @@
{stdenv, fetchurl, python, pygobject, pycairo, pyGtkGlade, pythonDBus,
wpa_supplicant, dhcp, dhcpcd, wirelesstools, nettools, openresolv, iproute,
wpa_supplicant, dhcp, dhcpcd, wirelesstools, nettools, openresolv, iproute, iputils,
locale ? "C" }:
# Wicd has a ncurses interface that we do not build because it depends
# on urwid which has not been packaged at this time (2009-12-27).
stdenv.mkDerivation rec {
name = "wicd-1.7.1-beta2";
name = "wicd-${version}";
version = "1.7.2.4";
src = fetchurl {
url = "mirror://sourceforge/wicd/wicd-1.7.1b2.tar.bz2";
sha256 = "13ga6a2ip8dy8h49wvv02jxxfvpk5q5sm2wz76dy62y1xsrm23c1";
url = "https://launchpad.net/wicd/1.7/${version}/+download/${name}.tar.gz";
sha256 = "15ywgh60xzmp5z8l1kzics7yi95isrjg1paz42dvp7dlpdfzpzfw";
};
buildInputs = [ python ];
patches = [ ./no-var-install.patch ./mkdir-networks.patch ./pygtk.patch ./no-optimization.patch ];
patches = [ ./no-var-install.patch ./no-trans.patch ./mkdir-networks.patch ./pygtk.patch ./no-optimization.patch ];
# Should I be using pygtk's propogated build inputs?
# !!! Should use makeWrapper.
@ -25,15 +26,15 @@ 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:${openresolv}/sbin:${iproute}/sbin" in/scripts=wicd.in
sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pythonDBus})" 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}/sbin:${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
sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-client.in
sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-client.in
sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-gtk.in
sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-gtk.in
sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-gtk.in
sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-cli.in
sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-cli.in
sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-cli.in
'';
configurePhase = ''
@ -57,11 +58,14 @@ stdenv.mkDerivation rec {
--suspend=$out/etc/acpi/suspend.d/ \
--pmutils=$out/lib/pm-utils/sleep.d/ \
--dbus=$out/etc/dbus-1/system.d/ \
--dbus-service=$out/etc/dbus-1/system-services/ \
--systemd=$out/lib/systemd/ \
--logrotate=$out/etc/logrotate.d/ \
--desktop=$out/share/applications/ \
--icons=$out/share/icons/hicolour/ \
--translations=$out/share/locale/ \
--autostart=$out/etc/xdg/autostart/ \
--varlib=/var/lib/wicd/ \
--varlib=$out/var/lib/ \
--docdir=$out/share/doc/ \
--mandir=$out/share/man/ \
--kdedir=$out/share/autostart/ \
@ -76,7 +80,7 @@ stdenv.mkDerivation rec {
'';
installPhase = ''
python setup.py install --prefix=$out
python setup.py install --prefix=$out --install-lib=$out/lib/${python.libPrefix}/site-packages
mkdir -p $out/share/other
cp other/dhclient.conf.template.default $out/share/other/dhclient.conf.template.default
@ -85,19 +89,6 @@ stdenv.mkDerivation rec {
# <http://wicd.net/punbb/viewtopic.php?id=87>.
cp -v "${./wpa2-ttls}" "$out/etc/encryption/templates/wpa2-ttls"
echo "wpa2-ttls" >> "$out/etc/encryption/templates/active"
# have wicd generate upstart events
echo '#!/bin/sh
initctl emit -n wicd-preconnect ITYPE="$1" ESSID="$2" BSSID="$3"' > $out/etc/scripts/preconnect/upstart-emit
echo '#!/bin/sh
initctl emit -n wicd-postconnect ITYPE="$1" ESSID="$2" BSSID="$3"
initctl emit -n ip-up' > $out/etc/scripts/postconnect/upstart-emit
echo '#!/bin/sh
initctl emit -n wicd-predisconnect ITYPE="$1" ESSID="$2" BSSID="$3"' > $out/etc/scripts/predisconnect/upstart-emit
echo '#!/bin/sh
initctl emit -n wicd-postdisconnect ITYPE="$1" ESSID="$2" BSSID="$3"
initctl emit -n ip-down' > $out/etc/scripts/postdisconnect/upstart-emit
chmod a+x $out/etc/scripts/*/upstart-emit
'';
meta = {

12
pkgs/tools/networking/wicd/no-optimization.patch
View File

@ -8,14 +8,14 @@ With optimizations on, python will overwrite the nix store.
-exec %PYTHON% -O %SHARE%daemon/wicd-daemon.py $@
+exec %PYTHON% -B %SHARE%daemon/wicd-daemon.py $@
--- wicd-1.7.1b2/wicd/wicd-daemon.py.old 2011-04-07 08:28:38.668311226 -0400
+++ wicd-1.7.1b2/wicd/wicd-daemon.py 2011-04-07 08:28:59.111311223 -0400
@@ -1806,7 +1806,7 @@
wicd_bus = dbus.service.BusName('org.wicd.daemon', bus=bus)
--- wicd-1.7.2.4/wicd/wicd-daemon.py 2012-04-30 21:19:45.000000000 +0200
+++ wicd-1.7.2.4/wicd/wicd-daemon.pynew 2013-03-14 21:35:23.250306592 +0100
@@ -1812,7 +1812,7 @@
daemon = WicdDaemon(wicd_bus, auto_connect=auto_connect)
child_pid = None
if not no_poll:
- child_pid = Popen([misc.find_path("python2"), "-O",
+ child_pid = Popen([misc.find_path("python2"), "-B",
- child_pid = Popen([wpath.python, "-O",
+ child_pid = Popen([wpath.python, "-B",
os.path.join(wpath.daemon, "monitor.py")],
shell=False, close_fds=True).pid
atexit.register(on_exit, child_pid)

15
pkgs/tools/networking/wicd/no-trans.patch Normal file
View File

@ -0,0 +1,15 @@
--- wicd-1.7.2.4/setup.py 2013-03-14 21:28:21.360580941 +0100
+++ wicd-1.7.2.4/setup.py 2013-03-14 21:22:50.125721943 +0100
@@ -599,12 +599,6 @@
if not wpath.no_install_pmutils:
data.append((wpath.pmutils, ['other/55wicd']))
print 'Using pid path', os.path.basename(wpath.pidfile)
- print 'Language support for',
- for pofile in glob('po/*.po'):
- language = pofile.replace('po/', '').replace('.po', '')
- print language,
- data.append((wpath.translations + language + '/LC_MESSAGES/',
- ['translations/' + language + '/LC_MESSAGES/wicd.mo']))
print
except Exception, e:
print str(e)

38
pkgs/tools/networking/wicd/no-var-install.patch
View File

@ -1,25 +1,17 @@
The install tries to create files in /var. This patch removes those steps.
--- wicd-1.7.0/setup.py 2010-01-14 23:49:11.000000000 -0500
+++ wicd-1.7.0/setup.py 2010-11-16 22:15:33.855977242 -0500
@@ -493,11 +493,8 @@
print "Using init file",(wpath.init, wpath.initfile)
data = [
(wpath.dbus, ['other/wicd.conf']),
- (wpath.log, [empty_file]),
- (wpath.etc, ['other/dhclient.conf.template.default']),
(wpath.encryption, [('encryption/templates/' + b) for b in
os.listdir('encryption/templates') if not b.startswith('.')]),
- (wpath.networks, [empty_file]),
(wpath.sbin, ['scripts/wicd']),
(wpath.daemon, ['wicd/monitor.py', 'wicd/wicd-daemon.py',
'wicd/suspend.py', 'wicd/autoconnect.py']),
@@ -558,7 +555,7 @@
if not wpath.no_install_docs:
data.append((wpath.docdir, ['INSTALL', 'LICENSE', 'AUTHORS',
'README', 'CHANGES', ]))
- data.append((wpath.varlib, ['other/WHEREAREMYFILES']))
+ data.append((wpath.share, ['other/WHEREAREMYFILES']))
if not wpath.no_install_kde:
if not wpath.no_install_gtk:
data.append((wpath.kdedir, ['other/wicd-tray.desktop']))
--- wicd-1.7.2.4/setup.py 2013-03-14 21:28:21.360580941 +0100
+++ wicd-1.7.2.4/setup.py 2013-03-14 21:22:50.125721943 +0100
@@ -505,11 +505,8 @@
(wpath.dbus_service, ['other/org.wicd.daemon.service']),
(wpath.systemd, ['other/wicd.service']),
(wpath.logrotate, ['other/wicd.logrotate']),
- (wpath.log, [empty_file]),
- (wpath.etc, ['other/dhclient.conf.template.default']),
(wpath.encryption, [('encryption/templates/' + b) for b in
os.listdir('encryption/templates') if not b.startswith('.')]),
- (wpath.networks, [empty_file]),
(wpath.sbin, ['scripts/wicd']),
(wpath.daemon, ['wicd/monitor.py', 'wicd/wicd-daemon.py',
'wicd/suspend.py', 'wicd/autoconnect.py']),

4
pkgs/tools/package-management/checkinstall/default.nix
View File

@ -29,6 +29,10 @@ stdenv.mkDerivation {
# Fix a `conflicting types for 'scandir'' error on Glibc 2.11.
./scandir.patch
# Force use of old memcpy so that installwatch works on Glibc <
# 2.14.
./use-old-memcpy.patch
];
buildInputs = [gettext];

2
pkgs/tools/package-management/checkinstall/glibc-check.patch
View File

@ -52,7 +52,7 @@ diff -x '*~' -rc checkinstall-1.6.2pre20081116-orig/installwatch/create-localdec
6)
echo '#define GLIBC_MINOR 6' >> $OUTFILE
SUBVERSION='glibc-2.6' ;;
! 7|8|9|10|11|12|13|14|15)
! 7|8|9|10|11|12|13|14|15|16|17|18)
echo '#define GLIBC_MINOR 7' >> $OUTFILE
SUBVERSION='glibc-2.7' ;;
*)

12
pkgs/tools/package-management/checkinstall/use-old-memcpy.patch Normal file
View File

@ -0,0 +1,12 @@
diff -ru -x '*~' checkinstall-1.6.2-orig/installwatch/installwatch.c checkinstall-1.6.2/installwatch/installwatch.c
--- checkinstall-1.6.2-orig/installwatch/installwatch.c 2008-11-16 17:20:53.000000000 +0100
+++ checkinstall-1.6.2/installwatch/installwatch.c 2013-03-15 13:50:12.717646381 +0100
@@ -28,6 +28,8 @@
* <mail@fredemmott.co.uk>
*/
+asm (".symver memcpy, memcpy@GLIBC_2.2.5");
+
#include <sys/param.h>
#include <sys/types.h>
#include <sys/stat.h>

22
pkgs/tools/system/rsyslog/default.nix Normal file
View File

@ -0,0 +1,22 @@
{stdenv, fetchurl, eventlog, pkgconfig, libestr, libee, json_c, libuuid, zlib, gnutls}:
stdenv.mkDerivation {
name = "rsyslog-7.2.6";
src = fetchurl {
url = http://www.rsyslog.com/files/download/rsyslog/rsyslog-7.2.6.tar.gz;
sha256 = "19a5c60816ebce6c86468eb8c5fe1c4cc1febf23c9167ce59d2327fe5e047ed9";
};
buildInputs = [pkgconfig libestr libee json_c libuuid zlib gnutls];
configureFlags = "--enable-gnutls";
meta = {
homepage = "http://www.rsyslog.com/";
description = "Rsyslog is an enhanced syslogd. It can be used as a drop-in replacement for stock sysklogd.";
license = "GPLv3";
platforms = stdenv.lib.platforms.linux;
};
}

4
pkgs/tools/system/smartmontools/default.nix
View File

@ -2,8 +2,8 @@
let
driverdb = fetchurl {
url = "http://smartmontools.svn.sourceforge.net/viewvc/smartmontools/trunk/smartmontools/drivedb.h?revision=3742";
sha256 = "04xsgxzc1mqn9szazyr6v3xcpw0pszi8vz7xcsb661rww5482rw0";
url = "http://smartmontools.svn.sourceforge.net/viewvc/smartmontools/trunk/smartmontools/drivedb.h?revision=3781";
sha256 = "0m39ji2kf80dsws5ksg2pmkpn8x00lrlvl5nlc6ldjfss7sjvc9x";
name = "smartmontools-drivedb.h";
};
in

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