* Sync with the trunk.

svn path=/nixpkgs/branches/stdenv-updates/; revision=33971
This commit is contained in:
Eelco Dolstra 2012-05-02 13:19:07 +00:00
commit 5bdea119d4
446 changed files with 4287 additions and 2692 deletions

1
STABLE
View file

@ -1 +0,0 @@
0

View file

@ -0,0 +1,27 @@
{ stdenv, fetchurl, alsaLib, dbus, jackaudio, pkgconfig, python }:
stdenv.mkDerivation rec {
name = "a2jmidid-${version}";
version = "7";
src = fetchurl {
url = "http://download.gna.org/a2jmidid/${name}.tar.bz2";
sha256 = "1pl91y7npirhmikzlizpbyx2vkfvdkvc6qvc2lv4capj3cp6ypx7";
};
buildInputs = [ alsaLib dbus jackaudio pkgconfig python ];
configurePhase = "python waf configure --prefix=$out";
buildPhase = "python waf";
installPhase = "python waf install";
meta = with stdenv.lib; {
homepage = http://home.gna.org/a2jmidid;
description = "daemon for exposing legacy ALSA sequencer applications in JACK MIDI system";
license = licenses.gpl2;
maintainers = [ maintainers.goibhniu ];
};
}

View file

@ -4,21 +4,15 @@
}:
stdenv.mkDerivation rec {
version = "1.3.13";
version = "2.0.0";
name = "audacity-${version}";
NIX_CFLAGS_COMPILE = "-fPIC -lgtk-x11-2.0 -lglib-2.0 -lgobject-2.0 -lz";
src = fetchurl {
url = "mirror://sourceforge/audacity/audacity-minsrc-${version}-beta.tar.bz2";
sha256 = "4c2eda638e16e16dfddd202e86ccbe1d170b04c26cfb2c12ffcba0b79e7e1e83";
url = "http://audacity.googlecode.com/files/audacity-minsrc-${version}.tar.bz2";
sha256 = "0spbib3f86b4qri0g13idyxvysg28hkpsglmjza681zrln62hjfq";
};
buildInputs = [ wxGTK pkgconfig gettext gtk glib zlib intltool perl
libogg libvorbis libmad alsaLib libsndfile libsamplerate flac lame
expat id3lib ffmpeg portaudio];
configureFlags = [
];
buildInputs = [ pkgconfig wxGTK libsndfile expat alsaLib libsamplerate
libvorbis libmad flac id3lib ffmpeg gettext ];
dontDisableStatic = true;

View file

@ -0,0 +1,22 @@
{ stdenv, fetchurl, pkgconfig, gtk, libid3tag, id3lib, libvorbis, libogg, flac }:
let
version = "2.1.7";
sha256 = "bfed34cbdce96aca299a0db2b531dbc66feb489b911a34f0a9c67f2eb6ee9301";
in stdenv.mkDerivation {
name = "easytag-${version}";
src = fetchurl {
url = "mirror://sourceforge/easytag/easytag-${version}.tar.bz2";
inherit sha256;
};
buildInputs = [ pkgconfig gtk libid3tag id3lib libvorbis libogg flac ];
meta = {
description = "an utility for viewing and editing tags for various audio files";
homepage = http://http://easytag.sourceforge.net/;
license = stdenv.lib.licenses.gpl2;
};
}

View file

@ -0,0 +1,30 @@
{ stdenv, fetchsvn, autoconf, automake, docbook_xml_dtd_45
, docbook_xsl, gtkmm, intltool, libgig, libsndfile, libtool, libxslt
, pkgconfig }:
stdenv.mkDerivation rec {
name = "gigedit-svn-${version}";
version = "2342";
src = fetchsvn {
url = "https://svn.linuxsampler.org/svn/gigedit/trunk";
rev = "${version}";
sha256 = "0wi94gymj0ns5ck9lq1d970gb4gnzrq4b57j5j7k3d6185yg2gjs";
};
patchPhase = "sed -e 's/which/type -P/g' -i Makefile.cvs";
preConfigure = "make -f Makefile.cvs";
buildInputs = [
autoconf automake docbook_xml_dtd_45 docbook_xsl gtkmm intltool
libgig libsndfile libtool libxslt pkgconfig
];
meta = with stdenv.lib; {
homepage = http://www.linuxsampler.org;
description = "Gigasampler file access library";
license = licenses.gpl2;
maintainers = [ maintainers.goibhniu ];
};
}

View file

@ -0,0 +1,40 @@
{ stdenv, fetchsvn, alsaLib, asio, autoconf, automake, bison
, jackaudio, libgig, libsndfile, libtool , pkgconfig }:
stdenv.mkDerivation rec {
name = "linuxsampler-svn-${version}";
version = "2340";
src = fetchsvn {
url = "https://svn.linuxsampler.org/svn/linuxsampler/trunk";
rev = "${version}";
sha256 = "0zsrvs9dwwhjx733m45vfi11yjkqv33z8qxn2i9qriq5zs1f0kd7";
};
patchPhase = "sed -e 's/which/type -P/g' -i scripts/generate_parser.sh";
preConfigure = "make -f Makefile.cvs";
buildInputs = [
alsaLib asio autoconf automake bison jackaudio libgig libsndfile
libtool pkgconfig
];
meta = with stdenv.lib; {
homepage = http://www.linuxsampler.org;
description = "Sampler backend";
longDescription = ''
Includes sampler engine, audio and MIDI drivers, network layer
(LSCP) API and native C++ API.
LinuxSampler is licensed under the GNU GPL with the exception
that USAGE of the source code, libraries and applications FOR
COMMERCIAL HARDWARE OR SOFTWARE PRODUCTS IS NOT ALLOWED without
prior written permission by the LinuxSampler authors. If you
have questions on the subject, that are not yet covered by the
FAQ, please contact us.
'';
license = licenses.gpl2;
maintainers = [ maintainers.goibhniu ];
};
}

View file

@ -0,0 +1,22 @@
{ stdenv, fetchurl, alsaLib, cmake, qt4 }:
stdenv.mkDerivation rec {
name = "pianobooster-${version}";
version = "0.6.4b";
src = fetchurl {
url = "mirror://sourceforge/pianobooster/pianobooster-src-0.6.4b.tar.gz";
sha256 = "1xwyap0288xcl0ihjv52vv4ijsjl0yq67scc509aia4plmlm6l35";
};
preConfigure = "cd src";
buildInputs = [ alsaLib cmake qt4 ];
meta = with stdenv.lib; {
description = "A MIDI file player that teaches you how to play the piano";
homepage = http://pianobooster.sourceforge.net;
license = licenses.gpl3;
maintainers = [ maintainers.goibhniu ];
};
}

View file

@ -1,14 +1,14 @@
{ stdenv, fetchurl, qt4, alsaLib, jackaudio, dbus }:
stdenv.mkDerivation rec {
version = "0.3.7";
version = "0.3.8";
name = "qjackctl-${version}";
# some dependencies such as killall have to be installed additionally
src = fetchurl {
url = "mirror://sourceforge/qjackctl/${name}.tar.gz";
sha256 = "1gynym21d8d4d38qyl817qg0v8360brcpga4wcdapccbgpaz3c28";
sha256 = "1rbipbknq7f8qfma33vwfv2ar3vxkz1p1ykp5mx6nirmcn1nj247";
};
buildInputs = [ qt4 alsaLib jackaudio dbus ];

View file

@ -0,0 +1,24 @@
{ stdenv, fetchsvn, autoconf, automake, liblscp, libtool, pkgconfig
, qt4 }:
stdenv.mkDerivation rec {
name = "qsampler-svn-${version}";
version = "2342";
src = fetchsvn {
url = "https://svn.linuxsampler.org/svn/qsampler/trunk";
rev = "${version}";
sha256 = "17w3vgpgfmvl11wsd5ndk9zdggl3gbzv3wbd45dyf2al4i0miqnx";
};
buildInputs = [ autoconf automake liblscp libtool pkgconfig qt4 ];
preConfigure = "make -f Makefile.svn";
meta = with stdenv.lib; {
homepage = http://www.linuxsampler.org;
description = "graphical frontend to LinuxSampler";
license = licenses.gpl2;
maintainers = [ maintainers.goibhniu ];
};
}

View file

@ -8,13 +8,13 @@ assert (libXft != null) -> libpng != null; # probably a bug
assert stdenv.isDarwin -> libXaw != null; # fails to link otherwise
stdenv.mkDerivation rec {
name = "emacs-23.3b";
name = "emacs-23.4";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://gnu/emacs/${name}.tar.bz2";
sha256 = "1vp6qbbjgh5zpd87j3ggsvgf8q6cax8z3cdx3syv5v2662dapp46";
sha256 = "1fc8x5p38qihg7l6z2b1hjc534lnjb8gqpwgywlwg5s3csg6ymr6";
};
buildInputs =

View file

@ -1,14 +1,14 @@
{ stdenv, fetchurl, emacs, texinfo }:
let
version = "1.1.0";
version = "1.1.1";
in
stdenv.mkDerivation {
name = "magit-${version}";
src = fetchurl {
url = "http://github.com/downloads/magit/magit/magit-${version}.tar.gz";
sha256 = "8e147e1f2e69938232f859daf712515b46aa367d7b7d90b42538e083f52a72b4";
sha256 = "0zp5qxippmalin2fr73w2alf2w7ilcahmybzdvgn4ch2s3dgvzcz";
};
buildInputs = [emacs texinfo];

View file

@ -1,34 +0,0 @@
{ stdenv, fetchurl, kdevplatform, cmake, pkgconfig, automoc4, shared_mime_info,
kdebase_workspace, gettext, perl, okteta }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
version = "4.3.0";
pname = "kdevelop";
src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2";
sha256 = "0vb2f5922r1da4va8sx2qn2i1lf2gqg7nfg594kncy98a9b1avnr";
};
buildInputs = [ kdevplatform kdebase_workspace okteta ];
buildNativeInputs = [ cmake pkgconfig automoc4 shared_mime_info gettext perl ];
NIX_CFLAGS_COMPILE = "-I${okteta}/include/KDE";
meta = with stdenv.lib; {
maintainers = [ maintainers.urkud ];
platforms = platforms.linux;
description = "KDE official IDE";
longDescription =
''
A free, opensource IDE (Integrated Development Environment)
for MS Windows, Mac OsX, Linux, Solaris and FreeBSD. It is a
feature-full, plugin extendable IDE for C/C++ and other
programing languages. It is based on KDevPlatform, KDE and Qt
libraries and is under development since 1998.
'';
homepage = http://www.kdevelop.org;
};
}

View file

@ -1,21 +1,19 @@
{ stdenv, fetchurl, kdevplatform, cmake, pkgconfig, automoc4, shared_mime_info,
kdebase_workspace, gettext, perl, kdeutils, kdesdk }:
kdebase_workspace, gettext, perl, okteta }:
let
okteta = if kdeutils ? okteta then kdeutils.okteta else kdesdk.okteta;
in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
version = "4.2.3";
version = "4.3.0";
pname = "kdevelop";
src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2";
sha256 = "0ay3d2s5442pvdsx9lyfzb986kh6848qhbls9ff982f0glzqdcya";
sha256 = "0vb2f5922r1da4va8sx2qn2i1lf2gqg7nfg594kncy98a9b1avnr";
};
buildInputs = [ kdevplatform cmake pkgconfig automoc4 shared_mime_info
kdebase_workspace gettext stdenv.gcc.libc perl okteta ];
buildInputs = [ kdevplatform kdebase_workspace okteta ];
buildNativeInputs = [ cmake pkgconfig automoc4 shared_mime_info gettext perl ];
NIX_CFLAGS_COMPILE = "-I${okteta}/include/KDE";

View file

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

View file

@ -8,12 +8,12 @@
assert stdenv ? glibc;
stdenv.mkDerivation rec {
version = "0.9.3";
version = "1.0";
name = "darktable-${version}";
src = fetchurl {
url = "mirror://sourceforge/darktable/darktable-${version}.tar.gz";
sha256 = "0al9fxifqv9vg8rj6vybjsn6f25pq5ij9367imlhpmsv6m9m5mqw";
sha256 = "0wjv2x62kf25db61ivbn8y8xr9hr8hdlcjq6l1qxfqn2bn8a3qkm";
};
buildInputs =

View file

@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
name = "calibre-0.8.32";
name = "calibre-0.8.48";
src = fetchurl {
url = "http://calibre-ebook.googlecode.com/files/${name}.tar.xz";
sha256 = "0d0zq4sr0qm8jarg0ps24lfizb4hyb57pjsp81y1sb5nzjki7jml";
sha256 = "0i2js6d64ribflvcwjj8xbyq2zicj484pl19jl6spprw4ny5im42";
};
inherit python;
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
done
'';
meta = {
meta = {
description = "Comprehensive e-book software";
homepage = http://calibre-ebook.com;
license = "GPLv3";

View file

@ -12,14 +12,14 @@ assert monotoneSupport -> (monotone != null);
let
name = "ikiwiki";
version = "3.20120202";
version = "3.20120419";
in
stdenv.mkDerivation {
name = "${name}-${version}";
src = fetchurl {
url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz";
sha256 = "0bada9a98e0990c6d99e8ca978e42926578aec36d033d6a273e415349a6cbb48";
sha256 = "0d4fd709f4b3d33336d2dfa27f08e1473019d87869d9c1ffcb77f3ca9c434eaf";
};
buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate

View file

@ -72,6 +72,6 @@ exec 19> $FIFOCTL
homepage = http://wb.mysql.com/;
license = licenses.gpl2;
maintainers = [ maintainers.kkallio ];
platforms = platforms.linux;
platforms = [ "x86_64-linux" ];
};
}

View file

@ -3,7 +3,7 @@
let
name = "rxvt-unicode";
version = "9.10";
version = "9.15";
n = "${name}-${version}";
in
@ -13,7 +13,7 @@ stdenv.mkDerivation (rec {
src = fetchurl {
url = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${version}.tar.bz2";
sha256 = "1c238f7e545b1a8da81239b826fb2a7d196c73effbcbd211db7a50995a0a067a";
sha256 = "ec1aa2932da844979ed8140bd92223defb12042aa5e877e05ac31139ca81f2b1";
};
buildInputs =

View file

@ -11,10 +11,10 @@ let
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="vue";
version="3.1.1";
version="3.1.2";
name="${baseName}-${version}";
url="http://releases.atech.tufts.edu/vue/v${version}/VUE_3_1_1.zip";
hash="1wq2mdvfm7c4vhs9ivl7n3w9ncwyrjgdgycbapzd6l1nym5iz76y";
url="http://releases.atech.tufts.edu/vue/v${version}/VUE_3_1_2.zip";
hash="0ga98gnp4qhcrb31cb8j0mwbrh6ym6hr4k5y4blxvyfff9c0vq47";
};
in
rec {

View file

@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
rec {
firefoxVersion = "9.0.1";
firefoxVersion = "12.0";
xulVersion = "9.0.1"; # this attribute is used by other packages
xulVersion = "12.0"; # this attribute is used by other packages
src = fetchurl {
url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
sha1 = "e0748d86753eead5c0929d74158c601bf33b5db0";
sha1 = "0177185e54b7d63dc36bd5bd5c80ba6afd52e199";
};
commonConfigureFlags =
@ -35,7 +35,7 @@ rec {
"--with-system-nspr"
# "--with-system-nss"
# "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
"--enable-system-cairo"
# "--enable-system-cairo" # disabled for the moment because our Cairo is too old
"--enable-system-sqlite"
"--disable-crashreporter"
"--disable-tests"
@ -139,7 +139,7 @@ rec {
[ "--enable-application=browser"
"--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
"--enable-chrome-format=jar"
"--disable-elf-hack"
"--disable-elf-hack"
]
++ commonConfigureFlags
++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
@ -170,6 +170,7 @@ rec {
meta = {
description = "Mozilla Firefox - the browser, reloaded";
homepage = http://www.mozilla.com/en-US/firefox/;
maintainers = [ stdenv.lib.maintainers.eelco ];
};
passthru = {

View file

@ -48,8 +48,12 @@ stdenv.mkDerivation {
url = "http://dl.google.com/linux/direct/google-talkplugin_current_x86_64.rpm";
sha256 = "15909wnhspjci0fspvh5j87v1xl7dfix36zrpvk6fpc3m0vys0nh";
}
else
throw "Google Talk does not support your platform.";
else if stdenv.system == "i686-linux" then
fetchurl {
url = "http://dl.google.com/linux/direct/google-talkplugin_current_i386.rpm";
sha256 = "0sclsj6mcaynkw28kipgmcj6sx5vbyrz1rwwyx89ll48n46k65ya";
}
else throw "Google Talk does not support your platform.";
buildInputs = [ rpm cpio ];

View file

@ -25,7 +25,6 @@ const char * rewrite(const char * path, char * buf)
int execvp(const char * path, char * const argv[])
{
fprintf(stderr, "foo %s\n", path);
int (*_execvp) (const char *, char * const argv[]) = dlsym(RTLD_NEXT, "execvp");
char buf[PATH_MAX];
return _execvp(rewrite(path, buf), argv);

View file

@ -1,13 +1,13 @@
{stdenv, fetchurl, makeWrapper, perl, pkgconfig, webkit_gtk2, gtk, libX11, libsoup,
glib_networking}:
{ stdenv, fetchurl, makeWrapper, glib_networking, gtk, libsoup, libX11, perl,
pkgconfig, webkit }:
stdenv.mkDerivation {
name = "vimprobable2-0.9.12.0";
name = "vimprobable2-1.0.0";
src = fetchurl {
url = "mirror://sourceforge/vimprobable/vimprobable2_0.9.12.0.tar.bz2";
sha256 = "1b6xs6rd4rxy9kdsva13bbx7pd2gy159ad8ncd4pplsqr46hw8fb";
url = "mirror://sourceforge/vimprobable/vimprobable2_1.0.0.tar.bz2";
sha256 = "1jlx8ssgk42vg1d70n0aa86lr5zixdkkagmcxjc4c7pjvh8vq3gn";
};
buildInputs = [ makeWrapper perl pkgconfig libX11 libsoup webkit_gtk2 gtk ];
buildInputs = [ makeWrapper gtk libsoup libX11 perl pkgconfig webkit ];
installPhase = ''
make PREFIX=/ DESTDIR=$out install
wrapProgram "$out/bin/vimprobable2" --prefix GIO_EXTRA_MODULES : \
@ -28,8 +28,8 @@ stdenv.mkDerivation {
being completely featureless.
'';
homepage = "http://sourceforge.net/apps/trac/vimprobable";
license = "MIT";
maintainers = ["Alexander Foremny <alexanderforemny@googlemail.com>"];
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.aforemny ];
platforms = with stdenv.lib.platforms; linux;
};
}

View file

@ -21,8 +21,8 @@ assert stdenv.system == "x86_64-linux";
let
version = "1.2.52";
sha256 = "72aeaf00727da9f3fe39386dcf883bb303de928ba43c738fcc5bb62b93eca252";
version = "1.4.0";
sha256 = "93933d95cce5956ed99342fa342d01ce2bde8d2e4339afb97f23e0c0ec98875e";
# relative location where the dropbox libraries are stored
appdir = "opt/dropbox";
@ -50,7 +50,10 @@ in stdenv.mkDerivation {
name = "dropbox-${version}-bin";
src = fetchurl {
name = "dropbox-${version}.tar.gz";
url = "http://www.dropbox.com/download?plat=lnx.x86_64";
# using version-specific URL so if the version is no longer available,
# build will fail without having to finish downloading first
# url = "http://www.dropbox.com/download?plat=lnx.x86_64";
url = "http://dl-web.dropbox.com/u/17/dropbox-lnx.x86_64-${version}.tar.gz";
inherit sha256;
};

View file

@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
name = "notmuch-0.11.1";
name = "notmuch-0.12";
src = fetchurl {
url = "http://notmuchmail.org/releases/${name}.tar.gz";
sha256 = "d9896ae295fd8e5471c49b0ba39872ccfdfc3488a8e7ba6fd68ba1686bc52706";
sha256 = "1dbbbbba3567df9c67ecc642d1e63269a527952c557f6b0c8bafcd4e37893992";
};
buildInputs = [ bash emacs gdb glib gmime gnupg1 pkgconfig talloc xapian ];

View file

@ -12,7 +12,7 @@
}:
let version = "11.0";
let version = "11.0.1";
# This patch may become necessary when we use a more recent version of libpng
# for now, it's actually not needed
@ -27,7 +27,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2";
sha256 = "0lrp7ngi3ni70m9v11f0l8xvp3s8sc50isxbgy8vj677fzb1qn2s";
sha1 = "037344b451b1c031472d92f96d401b15d8e3e7d3";
};
enableParallelBuilding = true;

View file

@ -1,23 +1,23 @@
{ stdenv, fetchurl, libextractor, libmicrohttpd, libgcrypt
, zlib, gmp, curl, libtool, adns, sqlite, pkgconfig
, libxml2, ncurses, gettext
, libxml2, ncurses, gettext, libunistring
, gtkSupport ? false, gtk ? null, libglade ? null
, makeWrapper }:
assert gtkSupport -> (gtk != null) && (libglade != null);
stdenv.mkDerivation rec {
name = "gnunet-0.9.1";
name = "gnunet-0.9.2";
src = fetchurl {
url = "mirror://gnu/gnunet/${name}.tar.gz";
sha256 = "0ipx027lzcgdv70adfk8f4h0zrzm9mlhy3vj9cgc0ck8x52llfpq";
sha256 = "1sa7xc85l7lkd0s7vyxnqhnm7cngnycrvp7zc6yj4b3qjg5z3x94";
};
buildInputs = [
libextractor libmicrohttpd libgcrypt gmp curl libtool
zlib adns sqlite libxml2 ncurses
pkgconfig gettext makeWrapper
pkgconfig gettext libunistring makeWrapper
] ++ (if gtkSupport then [ gtk libglade ] else []);
preConfigure = ''

View file

@ -1,11 +1,11 @@
{stdenv, fetchurl, ocaml, zlib, bzip2, ncurses, file, gd, libpng }:
stdenv.mkDerivation (rec {
name = "mldonkey-3.1.0";
name = "mldonkey-3.1.1";
src = fetchurl {
url = "mirror://sourceforge/mldonkey/${name}.tar.bz2";
sha256 = "02038nhh6lbb714ariy2xw1vgfycr1w750zplbgwk5pa3cm163zx";
sha256 = "1cj0xvfx03jnpifcqxcgfjhkl3f70r86d8zn2flj9wvlnam98qlr";
};
meta = {
@ -13,8 +13,6 @@ stdenv.mkDerivation (rec {
homepage = http://mldonkey.sourceforge.net/;
};
patches = [ ./gcc44mips64.patch ];
buildInputs = [ ocaml zlib ncurses bzip2 file gd libpng ];
configureFlags = [ "--disable-gui" ];
} // (if (stdenv.system != "i686-linux" && stdenv.system != "x86_64-linux") then

View file

@ -1,103 +0,0 @@
Patch fixing CryptoPP so:
- it builds properly in mips64 with gcc 4.4 (gcc 4.4 does not have the 'h' asm constraint)
- it runs properly in mips64 (where lack of templated *Precision functions gave wrong numbers).
An assertion check failed without this.
diff --git a/src/utils/lib/CryptoPP.cc b/src/utils/lib/CryptoPP.cc
index 9208e1c..6b12b0a 100644
--- a/src/utils/lib/CryptoPP.cc
+++ b/src/utils/lib/CryptoPP.cc
@@ -890,35 +890,6 @@ unsigned int Parity(unsigned long value)
return (unsigned int)value&1;
}
-unsigned int BytePrecision(unsigned long value)
-{
- unsigned int i;
- for (i=sizeof(value); i; --i)
- if (value >> (i-1)*8)
- break;
-
- return i;
-}
-
-unsigned int BitPrecision(unsigned long value)
-{
- if (!value)
- return 0;
-
- unsigned int l=0, h=8*sizeof(value);
-
- while (h-l > 1)
- {
- unsigned int t = (l+h)/2;
- if (value >> t)
- l = t;
- else
- h = t;
- }
-
- return h;
-}
-
unsigned long Crop(unsigned long value, unsigned int size)
{
if (size < 8*sizeof(value))
@@ -1880,7 +1851,10 @@ public:
#elif defined(__x86_64__)
__asm__("mulq %3" : "=d" (r.m_halfs.high), "=a" (r.m_halfs.low) : "a" (a), "rm" (b) : "cc");
#elif defined(__mips64)
- __asm__("dmultu %2,%3" : "=h" (r.m_halfs.high), "=l" (r.m_halfs.low) : "r" (a), "r" (b));
+ //typedef unsigned int uint128_t __attribute__((mode(TI)));
+ __uint128_t tmp = (__uint128_t) a * b;
+ r.m_halfs.high = tmp >> 64;
+ r.m_halfs.low = tmp;
#elif defined(_M_IX86)
// for testing
word64 t = (word64)a * b;
diff --git a/src/utils/lib/CryptoPP.h b/src/utils/lib/CryptoPP.h
index d2ec1b2..775a898 100644
--- a/src/utils/lib/CryptoPP.h
+++ b/src/utils/lib/CryptoPP.h
@@ -1869,10 +1869,39 @@ template <class T> inline const T& STDMAX(const T& a, const T& b)
// #define GETBYTE(x, y) (((byte *)&(x))[y])
CRYPTOPP_DLL unsigned int Parity(unsigned long);
-CRYPTOPP_DLL unsigned int BytePrecision(unsigned long);
-CRYPTOPP_DLL unsigned int BitPrecision(unsigned long);
CRYPTOPP_DLL unsigned long Crop(unsigned long, unsigned int size);
+template <typename T>
+unsigned int BitPrecision(const T &value)
+{
+ if (!value)
+ return 0;
+
+ unsigned int l=0, h=8*sizeof(value);
+
+ while (h-l > 1)
+ {
+ unsigned int t = (l+h)/2;
+ if (value >> t)
+ l = t;
+ else
+ h = t;
+ }
+
+ return h;
+}
+
+template <typename T>
+unsigned int BytePrecision(const T &value)
+{
+ unsigned int i;
+ for (i=sizeof(value); i; --i)
+ if (value >> (i-1)*8)
+ break;
+
+ return i;
+}
+
inline unsigned int BitsToBytes(unsigned int bitCount)
{
return ((bitCount+7)/(8));

View file

@ -2,7 +2,7 @@
, enableX11 ? true}:
let
nativeCode = if stdenv.system == "armv5tel-linux" then false else true;
nativeCode = if stdenv.isArm then false else true;
in
stdenv.mkDerivation (rec {

View file

@ -1,14 +1,14 @@
{stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, qt4, perl, libiconv}:
let
name = "stellarium-0.11.1";
name = "stellarium-0.11.2";
in
stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = "mirror://sourceforge/stellarium/${name}.tar.gz";
sha256 = "1lrz52g2li92yjsrnxqqfmgjy2jmcqszwqpaq9rz9319nd1f2zpl";
sha256 = "1qk26s0gal2pqr8zy95270fiszxsc6znzzrj5jap91zzibn17945";
};
buildInputs = [ cmake freetype libpng mesa gettext openssl qt4 perl libiconv ];

View file

@ -0,0 +1,16 @@
{stdenv, fetchurl, readline}:
stdenv.mkDerivation rec {
version = "0.6";
name = "lci-${version}";
src = fetchurl {
url = "mirror://sourceforge/lci/${name}.tar.gz";
sha256="204f1ca5e2f56247d71ab320246811c220ed511bf08c9cb7f305cf180a93948e";
};
buildInputs = [readline];
meta = {
description = ''Lambda calculus interpreter'';
maintainers = with stdenv.lib.maintainers; [raskin];
platforms = with stdenv.lib.platforms; linux;
license = with stdenv.lib.licenses; gpl3;
};
}

View file

@ -11,10 +11,10 @@ let
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="TPTP";
version="5.1.0";
version="5.3.0";
name="${baseName}-${version}";
url="http://www.cs.miami.edu/~tptp/TPTP/Distribution/TPTP-v${version}.tgz";
hash="1wh2k575nn51ykg1jnwfwjqhg5x42k5vvn2spq09px26vhs4yksy";
hash="0xzybh332x53q4cmb3i47ygln0x6rd2nx810la1hmja9d1ixnz9b";
};
in
rec {

View file

@ -1,5 +1,5 @@
x@{builderDefsPackage
, pari ? null
, ...}:
builderDefsPackage
(a :
@ -15,6 +15,9 @@ let
name="${baseName}-${version}";
url="ftp://ftp.gap-system.org/pub/gap/gap4/tar.gz/${baseName}${version}.tar.gz";
hash="0flap5lbkvpms3zznq1zwxyxyj0ax3fk7m24f3bvhvr37vyxnf40";
pkgVer="2012_01_12-10_47_UTC";
pkgURL="ftp://ftp.gap-system.org/pub/gap/gap4/tar.bz2/packages-${pkgVer}.tar.bz2";
pkgHash="0z9ncy1m5gvv4llkclxd1vpcgpb0b81a2pfmnhzvw8x708frhmnb";
};
in
rec {
@ -23,6 +26,11 @@ rec {
sha256 = sourceInfo.hash;
};
pkgSrc = a.fetchurl {
url=sourceInfo.pkgURL;
sha256=sourceInfo.pkgHash;
};
inherit (sourceInfo) name version;
inherit buildInputs;
@ -34,6 +42,11 @@ rec {
cp -r . "$out/share/gap/build-dir"
tar xf "${pkgSrc}" -C "$out/share/gap/build-dir/pkg"
${if a.pari != null then
''sed -e '2iexport PATH=$PATH:${pari}/bin' -i "$out/share/gap/build-dir/bin/gap.sh" ''
else ""}
sed -e "/GAP_DIR=/aGAP_DIR='$out/share/gap/build-dir/'" -i "$out/share/gap/build-dir/bin/gap.sh"
ln -s "$out/share/gap/build-dir/bin/gap.sh" "$out/bin"
@ -47,7 +60,7 @@ rec {
];
platforms = with a.lib.platforms;
linux;
license = "GPLv2+";
license = "GPLv2";
homepage = "http://gap-system.org/";
};
}) x

View file

@ -1,17 +1,18 @@
{ cabal, curl, extensibleExceptions, filepath, hashedStorage
, haskeline, html, HTTP, mmap, mtl, network, parsec, random
, regexCompat, tar, terminfo, text, zlib
, regexCompat, tar, terminfo, text, vector, zlib
}:
cabal.mkDerivation (self: {
pname = "darcs";
version = "2.5.2";
sha256 = "11mk1xcrxk2x5c0s96s19wb4xvhjl9s59bdqcrj8f4w09zbgjlw9";
version = "2.8.0";
sha256 = "10yfab7qb20hzikwrgra7zhx7ad2j0s6l7zksmvczf4xm6hw458l";
isLibrary = true;
isExecutable = true;
buildDepends = [
extensibleExceptions filepath hashedStorage haskeline html HTTP
mmap mtl network parsec random regexCompat tar terminfo text zlib
mmap mtl network parsec random regexCompat tar terminfo text vector
zlib
];
extraLibraries = [ curl ];
meta = {

View file

@ -23,6 +23,13 @@ rec {
];
};
# support for bugzilla
gitBz = import ./git-bz {
inherit fetchgit stdenv makeWrapper python asciidoc xmlto # docbook2x docbook_xsl docbook_xml_dtd_45 libxslt
;
inherit (pythonPackages) pysqlite;
};
# Git with SVN support, but without GUI.
gitSVN = lowPrio (appendToName "with-svn" (git.override {
svnSupport = true;
@ -39,7 +46,7 @@ rec {
inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which coreutils;
inherit (haskellPackages_ghc741) ghc MissingH utf8String pcreLight SHA dataenc
HTTP testpack hS3 mtl network hslogger hxt json liftedBase monadControl IfElse
QuickCheck2 bloomfilter;
QuickCheck2 bloomfilter editDistance;
};
qgit = import ./qgit {
@ -93,6 +100,8 @@ rec {
git = gitSVN;
};
svn2git_kde = callPackage ./svn2git-kde { };
gitSubtree = import ./git-subtree {
inherit stdenv fetchurl git asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt;
};

View file

@ -1,18 +1,18 @@
{ stdenv, fetchurl, curl, dataenc, findutils, ghc, git, hS3, hslogger, HTTP, hxt
, ikiwiki, json, libuuid, MissingH, monadControl, mtl, network, pcreLight, perl
, QuickCheck2, rsync, SHA, testpack, utf8String, which, liftedBase, coreutils
, IfElse, bloomfilter
, IfElse, bloomfilter, editDistance
}:
let
version = "3.20120315";
version = "3.20120430";
in
stdenv.mkDerivation {
name = "git-annex-${version}";
src = fetchurl {
url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=refs/tags/${version}";
sha256 = "eeefca150f7f86a9373ac60cef9be22fe6fcb03fd13fda54793a4f8d46b747a1";
sha256 = "74540ef25461b91acc2e1733ade169e54492fa96370f6ec22554524078e0c7dd";
name = "git-annex-${version}.tar.gz";
};
@ -20,6 +20,7 @@ stdenv.mkDerivation {
curl dataenc findutils ghc git hS3 hslogger HTTP hxt ikiwiki json
libuuid MissingH monadControl mtl network pcreLight perl QuickCheck2
rsync SHA testpack utf8String which liftedBase IfElse bloomfilter
editDistance
];
checkTarget = "test";

View file

@ -0,0 +1,53 @@
{ stdenv, fetchgit, python, asciidoc, xmlto, pysqlite, makeWrapper }:
let
version = "3.20110902";
in
stdenv.mkDerivation {
name = "git-bz";
src = fetchgit {
url = "git://git.fishsoup.net/git-bz";
rev = "refs/heads/master";
};
buildInputs = [
makeWrapper python pysqlite # asciidoc xmlto
];
buildPhase = ''
true
# make git-bz.1
'';
installPhase = ''
ensureDir $out
ensureDir $out/bin
cp git-bz $out/bin
wrapProgram $out/bin/git-bz \
--prefix PYTHONPATH : "$(toPythonPath $python):$(toPythonPath $pysqlite)"
'';
meta = {
homepage = "http://git.fishsoup.net/cgit/git-bz/";
description = "integration of git with Bugzilla";
license = stdenv.lib.licenses.gpl2;
longDescription = ''
git-bz is a tool for integrating the Git command line with the
Bugzilla bug-tracking system. Operations such as attaching patches to
bugs, applying patches in bugs to your current tree, and closing bugs
once you've pushed the fixes publically can be done completely from
the command line without having to go to your web browser.
Authentication for git-bz is done by reading the cookies for the
Bugzilla host from your web browser. In order to do this, git-bz needs
to know how to access the cookies for your web browser; git-bz
currently is able to do this for Firefox, Epiphany, Galeon and
Chromium on Linux.
'';
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.pierron ];
};
}

View file

@ -8,7 +8,7 @@
}:
let
version = "1.7.9.4";
version = "1.7.9.5";
svn = subversionClient.override { perlBindings = true; };
in
stdenv.mkDerivation {
@ -16,7 +16,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://git-core.googlecode.com/files/git-${version}.tar.gz";
sha256 = "c59f4c1e37a99f00022b491a6674f633a00164513efdc269e74ed20537f71c39";
sha256 = "0nap6z8kfl61hx0h64ylk0x8786fxk31prdv7zk14ljbihs55p9x";
};
patches = [ ./docbook2texi.patch ];

View file

@ -0,0 +1,25 @@
{ stdenv, fetchgit, qt47, subversion, apr}:
stdenv.mkDerivation rec {
name = "svn2git";
src = fetchgit {
url = http://git.gitorious.org/svn2git/svn2git.git;
rev = "197979b6a641b8b5fa4856c700b1235491c73a41";
sha256 = "7be1a8f5822aff2d4ea7f415dce0b4fa8c6a82310acf24e628c5f1ada2d2d613";
};
buildPhase = ''
sed -i 's|/bin/cat|cat|' ./src/repository.cpp
qmake
make CXXFLAGS='-I${apr}/include/apr-1 -I${subversion}/include/subversion-1 -DVER="\"${src.rev}\""'
'';
installPhase = ''
ensureDir $out/bin
cp svn-all-fast-export $out/bin
'';
buildInputs = [subversion apr qt47];
}

View file

@ -2,14 +2,14 @@
, guiSupport ? false, tk ? null, curses }:
let
name = "mercurial-2.0.2";
name = "mercurial-2.1.2";
in
stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = "http://mercurial.selenic.com/release/${name}.tar.gz";
sha256 = "ca8b8fb93f2e3e8c3cdf2f81d87e92592f5f20c5bfcaaeb6a75550d4a69572c9";
sha256 = "11lqjnbal667rkbafby9qvb7hyxfycyc7h3hw04p4s4mw64lhkci";
};
inherit python; # pass it so that the same version can be used in hg2git
@ -17,6 +17,8 @@ stdenv.mkDerivation {
buildInputs = [ python makeWrapper docutils unzip ];
PYTHONPATH = "${python}/lib/python2.6/site-packages:${python}/lib/python2.7/site-packages:${docutils}/lib/python2.5/site-packages:${docutils}/lib/python2.6/site-packages:${docutils}/lib/python2.7/site-packages";
makeFlags = "PREFIX=$(out)";
postInstall = (stdenv.lib.optionalString guiSupport

View file

@ -2,7 +2,7 @@ args : with args;
let version = if args ? version then args.version else "0.9.35"; in
rec {
src = fetchurl {
url = "http://darcs.arstecnica.it/tailor-${version}.tar.gz";
url = "http://darcs.arstecnica.it/tailor/tailor-${version}.tar.gz";
sha256 = "061acapxxn5ab3ipb5nd3nm8pk2xj67bi83jrfd6lqq3273fmdjh";
};

View file

@ -0,0 +1,27 @@
commit c82aaa4eb1a1c36bf7e2b7ae3c9140d0bf8000b5
Author: Lawrence D'Oliveiro <ldo@geek-central.gen.nz>
Date: Wed Jan 26 00:48:37 2011 +0000
fix to build against png-1.5 (thanks to Thomas Klausner)
diff --git a/src/spuunmux.c b/src/spuunmux.c
index 5e565d1..9ad2371 100644
--- a/src/spuunmux.c
+++ b/src/spuunmux.c
@@ -39,6 +39,7 @@
#include <netinet/in.h>
#include <png.h>
+#include <zlib.h>
#include "rgb.h"
#include "common.h"
@@ -610,7 +611,7 @@ static int write_png
png_destroy_write_struct(&png_ptr, (png_infopp)NULL);
return -1;
} /*if*/
- if (setjmp(png_ptr->jmpbuf))
+ if (setjmp(png_jmpbuf(png_ptr)))
{
png_destroy_write_struct(&png_ptr, &info_ptr);
fclose(fp);

View file

@ -1,14 +1,17 @@
{ stdenv, fetchurl, imagemagick, libdvdread, libxml2, freetype, fribidi, libpng }:
{ stdenv, fetchurl, imagemagick, libdvdread, libxml2, freetype, fribidi, libpng, zlib }:
stdenv.mkDerivation {
name = "dvdauthor-0.6.14";
name = "dvdauthor-0.7.0";
src = fetchurl {
url = mirror://sourceforge/dvdauthor/dvdauthor-0.6.14.tar.gz;
sha256 = "1x4flj3ja7m8rbc956a6ha3qk0k6zxd1y6sl826r6r7dyc91a6yx";
url = mirror://sourceforge/dvdauthor/dvdauthor-0.7.0.tar.gz;
sha256 = "1l1l5zya7lirwa1783pa7h22wrfcq8hibbf5kpx8z8zbk5xsz9mf";
};
buildInputs = [ imagemagick libdvdread libxml2 freetype fribidi libpng ];
buildInputs = [ imagemagick libdvdread libxml2 freetype fribidi libpng zlib ];
# Does not build against recent versions of libpng without patch.
patches = [ ./build-against-libpng15.patch ];
meta = {
description = "Tools for generating DVD files to be played on standalone DVD players";

View file

@ -10,14 +10,14 @@
assert stdenv ? glibc;
let version = "0.8.9"; in
let version = "0.8.10"; in
stdenv.mkDerivation rec {
name = "gnash-${version}";
src = fetchurl {
url = "mirror://gnu/gnash/${version}/${name}.tar.bz2";
sha256 = "1ga8khwaympj4fphhpyqx6ddcikv0zmcpnlykcipny1xy33bs3gr";
sha256 = "090j5lly5r6jzbnvlc3mhay6dsrd9sfrkjcgqaibm4nz8lp0f9cn";
};
patchPhase = ''
@ -61,6 +61,7 @@ stdenv.mkDerivation rec {
--with-sdl-incl=${SDL}/include/SDL \
--with-npapi-plugindir=$out/plugins \
--enable-media=gst \
--without-gconf
--enable-gui=gtk"
# In `libmedia', Gnash compiles with "-I$gst_plugins_base/include",

View file

@ -1,6 +1,6 @@
x@{builderDefsPackage
, gnome, gtk, glib, libxml2, pkgconfig, libvirt, gtkvnc, cyrus_sasl, libtasn1
, gnupg, libgcrypt, perl, nettle
, gnupg, libgcrypt, perl, nettle, yajl
, ...}:
builderDefsPackage
(a :

View file

@ -8,7 +8,7 @@
with stdenv.lib;
let version = "4.1.10"; in
let version = "4.1.12"; in
stdenv.mkDerivation {
name = "virtualbox-${version}-${kernel.version}";
@ -17,7 +17,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
sha256 = "1gsp3arp79x6gmh403sayh4lzr3l8fc3anp664fyl1dl0ykgmqs7";
sha256 = "00hx7cl8n4qdmipxxx8a96x8yw6yim9bz3fjbyzcrs8yls0r2jsf";
};
buildInputs =

View file

@ -1,13 +1,13 @@
{ stdenv, fetchurl, lib, patchelf, cdrkit, kernel, which, makeWrapper
, libX11, libXt, libXext, libXmu, libXcomposite, libXfixes, libXrandr, libXcursor}:
let version = "4.1.0"; in
let version = "4.1.12"; in
stdenv.mkDerivation {
name = "VirtualBox-GuestAdditions-${version}";
src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
sha256 = "0azj08l0457cjl5v2ddgb5kz8gblsi7cgjgdmyiszvlqpyfbh98w";
sha256 = "0if2q188zf608p1dkq6pd46dafhslqcxmfpmarypbd68k7fi7kkx";
};
KERN_DIR = "${kernel}/lib/modules/*/build";
buildInputs = [ patchelf cdrkit makeWrapper ];
@ -98,16 +98,13 @@ stdenv.mkDerivation {
# Install desktop file
mkdir -p $out/share/autostart
cp -v share/VBoxGuestAdditions/vboxclient.desktop $out/share/autostart
# Install HAL FDI file
mkdir -p $out/share/hal/fdi/policy
install -m 644 share/VBoxGuestAdditions/90-vboxguest.fdi $out/share/hal/fdi/policy
# Install Xorg drivers
mkdir -p $out/lib/xorg/modules/{drivers,input}
install -m 644 lib/VBoxGuestAdditions/vboxvideo_drv_19.so $out/lib/xorg/modules/drivers/vboxvideo_drv.so
install -m 644 lib/VBoxGuestAdditions/vboxmouse_drv_19.so $out/lib/xorg/modules/input/vboxmouse_drv.so
# There doesn't appear to be a vboxmouse driver for Xorg 1.9. Was there ever?
# install -m 644 lib/VBoxGuestAdditions/vboxmouse_drv_19.so $out/lib/xorg/modules/input/vboxmouse_drv.so
# Install kernel modules
cd src

View file

@ -0,0 +1,32 @@
{ fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutil, bison,
xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl, flex,
libXcursor, coreutils, perl }:
stdenv.mkDerivation rec {
name = "i3-4.2";
src = fetchurl {
url = "http://i3wm.org/downloads/${name}.tar.bz2";
sha256 = "e02c832820e8922a44e744e555294f8580c2f8e218c5c1029e52f1bde048732b";
};
buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutil bison xcbutilwm
libstartup_notification libX11 pcre libev yajl flex libXcursor perl ];
prePatch = ''
sed s,/usr/bin/env,${coreutils}/bin/env, -i generate-command-parser.pl
sed s,/usr/bin/env,${coreutils}/bin/env, -i i3-migrate-config-to-v4
sed s,/usr/bin/env,${coreutils}/bin/env, -i i3-wsbar
'';
makeFlags = "all";
installFlags = "PREFIX=\${out}";
meta = {
description = "i3 is a tiling window manager";
homepage = http://i3wm.org;
maintainers = [ stdenv.lib.maintainers.garbas ];
license = stdenv.lib.licenses.bsd3;
};
}

View file

@ -0,0 +1,25 @@
{ fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutilimage,
pam, libX11, libev, cairo }:
stdenv.mkDerivation rec {
name = "i3lock-2.4";
src = fetchurl {
url = "http://i3wm.org/i3lock/${name}.tar.bz2";
sha256 = "ce6a47aaa25357ef6214628ddb992b5ba1562a116f63621a6095d422e5001229";
};
buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutilimage pam libX11
libev cairo ];
makeFlags = "all";
installFlags = "PREFIX=\${out} SYSCONFDIR=\${out}/etc";
meta = {
description = "i3 is a tiling window manager";
homepage = http://i3wm.org;
maintainers = [ stdenv.lib.maintainers.garbas ];
license = stdenv.lib.licenses.bsd3;
};
}

View file

@ -0,0 +1,24 @@
{ fetchurl, stdenv, confuse, alsaLib, wirelesstools
}:
stdenv.mkDerivation rec {
name = "i3status-2.4";
src = fetchurl {
url = "http://i3wm.org/i3status/${name}.tar.bz2";
sha256 = "620f3768dc4e9ea391ca5b5e358d018ca5d2820da1fce71a71664ca554778abd";
};
buildInputs = [ confuse alsaLib wirelesstools ];
makeFlags = "all";
installFlags = "PREFIX=\${out}";
meta = {
description = "i3 is a tiling window manager";
homepage = http://i3wm.org;
maintainers = [ stdenv.lib.maintainers.garbas ];
license = stdenv.lib.licenses.bsd3;
};
}

View file

@ -7,7 +7,6 @@ cabal.mkDerivation (self: {
isLibrary = true;
isExecutable = true;
buildDepends = [ extensibleExceptions mtl utf8String X11 ];
noHaddock = true;
meta = {
homepage = "http://xmonad.org";
description = "A tiling window manager";

View file

@ -10,7 +10,6 @@ cabal.mkDerivation (self: {
hint HList libmpd mtl network parsec random regexPosix split X11
xmonad xmonadContrib
];
noHaddock = true;
meta = {
homepage = "http://projects.haskell.org/xmonad-extras";
description = "Third party extensions for xmonad with wacky dependencies";

View file

@ -26,7 +26,9 @@
}:
runCommand name
{ inherit manifest paths ignoreCollisions pathsToLink postBuild; }
{ inherit manifest paths ignoreCollisions pathsToLink postBuild;
preferLocalBuild = true;
}
''
${perl}/bin/perl -w ${./builder.pl}
eval "$postBuild"

View file

@ -76,7 +76,7 @@ stdenv.mkDerivation {
if !nativeLibc then
(if stdenv.system == "i686-linux" then "ld-linux.so.2" else
if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2" else
if stdenv.system == "armv5tel-linux" then "ld-linux.so.3" else
if stdenv.isArm then "ld-linux.so.3" else
if stdenv.system == "powerpc-linux" then "ld.so.1" else
if stdenv.system == "mips64el-linux" then "ld.so.1" else
abort "don't know the name of the dynamic linker for this platform")

View file

@ -36,6 +36,7 @@ rec {
ftp://mirror.cict.fr/gnu/
ftp://ftp.cs.tu-berlin.de/pub/gnu/
ftp://ftp.chg.ru/pub/gnu/
ftp://ftp.funet.fi/pub/mirrors/ftp.gnu.org/gnu/
];
# GCC.
@ -96,11 +97,10 @@ rec {
# kernel.org's /pub (/pub/{linux,software}) tree.
kernel = [
http://www.all.kernel.org/pub/
http://www.eu.kernel.org/pub/
http://www.de.kernel.org/pub/
http://ramses.wh2.tu-dresden.de/pub/mirrors/kernel.org/
http://linux-kernel.uio.no/pub/
http://kernel.osuosl.org/pub/
ftp://ftp.funet.fi/pub/mirrors/ftp.kernel.org/pub/
];
# Mirrors of ftp://ftp.kde.org/pub/kde/.
@ -109,6 +109,7 @@ rec {
http://ftp.gwdg.de/pub/x11/kde/
ftp://ftp.heanet.ie/mirrors/ftp.kde.org/
ftp://ftp.kde.org/pub/kde/
ftp://ftp.funet.fi/pub/mirrors/ftp.kde.org/pub/kde/
];
# Gentoo files.
@ -168,6 +169,7 @@ rec {
ftp://ftp.ru.debian.org/debian/
ftp://ftp.debian.org/debian/
http://archive.debian.org/debian-archive/debian/
ftp://ftp.funet.fi/pub/mirrors/ftp.debian.org/debian/
];
# Ubuntu.
@ -242,6 +244,7 @@ rec {
http://mirror.cc.columbia.edu/pub/software/apache/
http://www.apache.org/dist/
http://archive.apache.org/dist/ # fallback for old releases
ftp://ftp.funet.fi/pub/mirrors/apache.org/
];
postgresql = [

View file

@ -84,7 +84,7 @@ stdenv.mkDerivation {
if !nativeLibc then
(if stdenv.system == "i686-linux" then "ld-linux.so.2" else
if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2" else
if stdenv.system == "armv5tel-linux" then "ld-linux.so.3" else
if stdenv.isArm then "ld-linux.so.3" else
if stdenv.system == "powerpc-linux" then "ld.so.1" else
if stdenv.system == "mips64el-linux" then "ld.so.1" else
abort "don't know the name of the dynamic linker for this platform")

View file

@ -1,6 +1,16 @@
source $stdenv/setup
mkdir -p $out/bin
for i in ar as c++filt gprof ld nm nmedit ranlib size strings strip dsymutil libtool; do
ln -s /usr/bin/$i $out/bin/
for i in $binaries
do
ln -s "/usr/bin/$i" "$out/bin/"
done
# MIG assumes the standard Darwin core utilities (e.g., `rm -d'), so
# let it see the impure directories.
cat > "$out/bin/mig" <<EOF
#!/bin/sh
export PATH="/usr/bin:/bin:\$PATH"
exec /usr/bin/mig "\$@"
EOF
chmod +x "$out/bin/mig"

View file

@ -2,5 +2,14 @@
stdenv.mkDerivation {
name = "native-darwin-cctools-wrapper";
# Standard binaries normally found under /usr/bin (MIG is omitted here, and
# handled specially in ./builder.sh).
binaries =
[ "ar" "as" "c++filt" "gprof" "ld" "nm" "nmedit" "ranlib"
"size" "strings" "strip" "dsymutil" "libtool" "lipo"
"install_name_tool" "arch" "sw_vers"
];
builder = ./builder.sh;
}

View file

@ -32,14 +32,19 @@ vmTools.buildRPM (
echo "installing $i..."
rpm -ip "$i" --excludepath /nix/store
fi
done
eval "$postRPMInstall"
for i in $out/rpms/*/*.rpm; do
if echo $i | grep -vq "\.src\.rpm$"; then
rpmName="$(rpm -qp "$i")"
echo "uninstalling $rpmName..."
rpm -e "$rpmName"
fi
done
for i in $out/rpms/*/*.src.rpm; do
echo "file srpm $i" >> $out/nix-support/hydra-build-products
done

View file

@ -90,7 +90,7 @@ stdenv.mkDerivation (
buildInputs = buildInputs ++ bootstrapBuildInputs;
postHook = ''
preUnpack = ''
mkdir -p $out/nix-support
'';

View file

@ -1,4 +1,4 @@
{stdenv}:
{ stdenv }:
args:
@ -6,4 +6,5 @@ stdenv.mkDerivation ({
name = if args ? name then args.name else baseNameOf (toString args.src);
builder = ./substitute-all.sh;
inherit (args) src;
preferLocalBuild = true;
} // args)

View file

@ -18,7 +18,11 @@ rec {
, executable ? false # run chmod +x ?
, destination ? "" # relative path appended to $out eg "/bin/foo"
}:
runCommand name {inherit text executable; }
runCommand name
{ inherit text executable;
# Pointless to do this on a remote machine.
preferLocalBuild = true;
}
''
n=$out${destination}
mkdir -p "$(dirname "$n")"

View file

@ -1,7 +1,10 @@
{ pkgs
, linuxKernel ? pkgs.linux
, img ? "bzImage"
, rootModules ? [ "cifs" "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "nls_utf8" "ext2" "ext3" "unix" ]
, rootModules ?
[ "cifs" "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "nls_utf8" "ext2" "ext3"
"unix" "hmac" "md4" "ecb" "des_generic"
]
}:
with pkgs;
@ -208,7 +211,8 @@ rec {
qemuCommandLinux = ''
${kvm}/bin/qemu-system-x86_64 \
${kvm}/bin/qemu-kvm \
${lib.optionalString (pkgs.stdenv.system == "x86_64-linux") "-cpu kvm64"} \
-nographic -no-reboot \
-net nic,model=virtio \
-chardev socket,id=samba,path=./samba \
@ -404,7 +408,7 @@ rec {
qemuCommandGeneric = ''
PATH="${samba}/sbin:$PATH" \
${kvm}/bin/qemu-system-x86_64 \
${kvm}/bin/qemu-kvm \
-nographic -no-reboot \
-smb $(pwd) -hda $diskImage \
$QEMU_OPTS

View file

@ -1,9 +1,9 @@
{ chmlib, djvulibre, ebook_tools, kde, kdelibs, libspectre, popplerQt4, qca2
, qimageblitz }:
, qimageblitz, pkgconfig }:
kde {
buildInputs =
[ chmlib djvulibre ebook_tools kdelibs libspectre popplerQt4 qca2 qimageblitz ];
[ chmlib djvulibre ebook_tools kdelibs libspectre popplerQt4 qca2 qimageblitz pkgconfig ];
meta = {
description = "Okular, the KDE document viewer";

View file

@ -1,7 +1,7 @@
{ callPackage, callPackageOrig, stdenv, qt48 }:
let
release = "4.8.1";
release = "4.8.2";
# Need callPackageOrig to avoid infinite cycle
kde = callPackageOrig ./kde-package {
@ -10,6 +10,8 @@ let
# The list of igored individual modules
ignoreList = {
# Doesn't work yet
kdeutils = [ "ksecrets" ];
# kdeadmin/strigi-analyzer has no real code
kdeadmin = [ "strigi-analyzer" ];
# kdesdk/kioslave is splitted into kioslave-svn and kioslave-git

View file

@ -1,13 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 04d2142..294b9a8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,6 @@
-find_package(KDE4 REQUIRED)
-include(KDE4Defaults)
+if(NOT DATA_INSTALL_DIR)
+ find_package(KDE4 REQUIRED)
+ include(KDE4Defaults)
+endif()
add_subdirectory( ksplashx-themes )

View file

@ -1,17 +0,0 @@
{ kde, cmake }:
kde {
buildNativeInputs = [ cmake ];
patches = [ ./files/kde-base-artwork-nokde.patch ];
cmakeFlags = "-DDATA_INSTALL_DIR=share";
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "2ab8942ba6813c21859077faa2c9fea88ec9a2d7af73bb5911cc4edbe1a04a04";
meta = {
description = "KDE KSplashx themes";
};
}

View file

@ -1,301 +0,0 @@
{stable=true;
hashes=builtins.listToAttrs[
{name="analitza";value="0hz8bryfxbf0ri0572drf79v582pjbhyag076nr7k80cbsvgcb95";}
{name="ark";value="1l5jrhj303fcbn34zpgcczajaknrj3ynqqw1kfsdz2jzan7pi620";}
{name="blinken";value="04dk6kdigmbaysi3q5f6qgy1aqigflf465np5waav9ydm6yfx9xr";}
{name="cantor";value="0gz338d5vi89i9c6r8lcrkvm3a0fi7kjfp5ql530p70rmyj0h4g5";}
{name="filelight";value="0fqxpx7zm6x601ph1n46mamwpgiffbkv5vqyy06z5cb6hbhip3g5";}
{name="gwenview";value="0f1knjmg2k5g0nikz4jxhf5d8ipp6qc6aw34yi0zanyg3h3jicql";}
{name="jovie";value="116yr8hhc18fl176lv8pqz1qjah7rlzavx7kcxq6ghvmaiv0yfxr";}
{name="kaccessible";value="167x5cmzspsriim8162lf361xs3g9ancfy88arwlvp5kwrs61ply";}
{name="kactivities";value="04sz2rjs15p2yhi9wchdkiclcc4pgd3bpsi20kcnnn5jwx2rvgim";}
{name="kalgebra";value="11fisig1zay8kb2i4sr4sba7889np3qbg46l823a89v7rwm6qc32";}
{name="kalzium";value="0n63s85y3ddr93wiyhhrfg3h2nv68f7rzfxdd200y0gjrkfb1yxs";}
{name="kamera";value="1fv1zr5zfs68yd09lg2gapha9cjh7lljvyrrcmhyn7yjkz2kn7r0";}
{name="kanagram";value="00h9ljx518sp950wc8h40c2qn1xh3499isy8hm1danal1y3m3n2v";}
{name="kate";value="0d35mydj6fzzjzk2qm6amlpb6hdg46cf1iqp52fj7d3i7vhwvzz7";}
{name="kbruch";value="1d9n2pbimkq56a0sc1khh8zvnaf84c1r9s96qs71nv93ka3248qw";}
{name="kcalc";value="11bailcjvlx7ggjj7jahh3l1p85w7s3wp1001cchm36qdmisbhyg";}
{name="kcharselect";value="10fzkh142b7k5rvar200zzpds6pgjbz3rapa7l8hcxpcgb9fxqvf";}
{name="kcolorchooser";value="04h8g2g47780jcrbnwdjivgkxb6sabqr2hr57dlycw7lsmxfj2v3";}
{name="kdeadmin";value="11fndxajknxwsshrmxa4hsbx8ycysbcq8kc4p0zqq508s9z0p4wf";}
{name="kdeartwork";value="0g3s1cn9w0mkrcwg8f6qc3v8iy3qxf1mkj8jaqdh98c7k8q906m9";}
{name="kde-baseapps";value="0gdfiw6bjhijvp8jf5ny8979km0fabjs6jp8fqdqnb0ybc6yi3sh";}
{name="kde-base-artwork";value="0qd1yc1g8wzi01hmrwfbyp80drk42k3h5g46hzk3y81pb3gg5490";}
{name="kdegames";value="0jbvr9baspdh7z9gxjhbz316097c99wkvhiniwx8wfbrj3nfsvkx";}
{name="kdegraphics-mobipocket";value="03gx1y9xdrc5imbc5hb3r17i693vgfcix4slm8i7xs7fz3f9x6jx";}
{name="kdegraphics-strigi-analyzer";value="0g674b0ba0bmgnaq8qspasbw40r7i60s0n27imh3f46isj34w0d2";}
{name="kdegraphics-thumbnailers";value="01a79779hjv19q3fxmwr05flcz75fpmivjysv3bj32jz72f4fk79";}
{name="kdelibs";value="1v2zkj76bf62fl3ykzx6r24c37amf2a8v1qrvhi2ibq7g7nfnasa";}
{name="kdemultimedia";value="0656135yq3d9j9hc974bm6zqszcq3prllhk7dfxd9wxkyf1jbifq";}
{name="kdenetwork";value="00f9284y2rb0b0f8j9a17kn8i1k7zdm8nypxf6hg51zphn91hnib";}
{name="kdepim";value="0fvvnab971k2a9gaavf17k7hvvz4n6dyrx9q0w9af821pf77asbm";}
{name="kdepimlibs";value="1jzw9ad5bzhcpfjgmqfzk8hjj8g6ivm7y31psckhgcasni7lv4hx";}
{name="kdepim-runtime";value="1k0hnmg73i02f5pddpva47mnfnnl9ydsdycnb4kaslyv8lzb7p19";}
{name="kdeplasma-addons";value="178y3h8j1nn0j421rp49b9q7jphhhrqd37y4jcisx37lky8dgdmb";}
{name="kde-runtime";value="06y5g7vfwdfin6xyia0j5flk5bbwa82ki3lnaz9zz4sz0x8swb8z";}
{name="kdesdk";value="1q4rcm7zagam44dr07mjr08drmncfk1w50kia159kgsx74n0rsqp";}
{name="kdetoys";value="0i49zvq2h2md4xmbzbw9s23yd3y7vmbp6y7b121j1pv9v8jkpa8c";}
{name="kde-wallpapers";value="131j2217c50addi02qldyx83y8afxwqaazldmvbfbk5ampkszkwr";}
{name="kdewebdev";value="1yjibwk4nihrwzbcz8bmylx0paprklgxkky9iy86pp20a4ndzy2x";}
{name="kde-workspace";value="1czlxxnldarp45yl2n5yin298rs8zdwjl9bzm55l5x27xaw5zlfq";}
{name="kdf";value="1gs57qnrhnxq8xbypn9dp8rpk9xz1rv29d4l0n23fbnhfw42fzw9";}
{name="kfloppy";value="09v7zv0s93qmir3vlkh4vf45v11k92jd6cv6j14hmgx3lpr289yj";}
{name="kgamma";value="169d2rjk45zr1a58fnn81myydzj1pjxjfglk3lyd9g21mwka8nng";}
{name="kgeography";value="087cz0wm2pfrh803kc8a0hh6nhk82w42fchpll0bv953adqi2dww";}
{name="kgpg";value="1mghmnjpy8jzzp43bg6z1nqlyir22wsa2nz7bpzigc1zv7i85pf9";}
{name="khangman";value="11m1s9rzlvg5p7wzy1zlgm3f743k4m7jfwv08g82mk3k9dcqnbq7";}
{name="kig";value="1kd042d7v56daxjwvvi026kh3bi7p8prxf5a3rpdmnbr2awd8qb6";}
{name="kimono";value="00vif9dmlp1lmv3fyjacd4jp8w84kq3fxsmsv72fbvxs66pa3a9y";}
{name="kiten";value="0xl1pqb5la2cnpi39npyal65yrqf87nqkxcbxli4ynw37k1x95pm";}
{name="klettres";value="0g1wryfhbaphmhkj3nisfgadray1nnrn3m1fd5rq774rhk7rnlfr";}
{name="kmag";value="12cfx5mj22lwbqnmd8sbjyfxxmgnql4q2hmgj4hx7izfl91zw4fb";}
{name="kmousetool";value="0ynr2zdxmisvs1jancisc0a2djap345b2bhp8dpssx48pxbf72r0";}
{name="kmouth";value="06wnsgrirdnk9h2vdxhfkcvf950hhryzg8qmwpm4pg53gsqfm3sb";}
{name="kmplot";value="0yr7mgcbr54djk521g5mxj87slps41473rfmf8hv0rbymnv5qfmf";}
{name="kolourpaint";value="148sp5bzkrlaq6mnh4996zm52m0jncbrldd93qkpbms1b0qpx0fk";}
{name="konsole";value="1lcj9bbfmyw2bv9cvhfsv9fk3szgvd2kmmrxsf3r1hcb6a1x3ab5";}
{name="korundum";value="0dfkl5wya041yrq9zhbrfklzlc41kp19icn34bjsgin4gfw2bds1";}
{name="kremotecontrol";value="05pzq3n5a75ccdznrw93ic0gadh24r9bjl9cdz8caj1skhyyzqcg";}
{name="kross-interpreters";value="1ix67rcyxqyaacfkmx3nccy2pyirsx0ykc4lycjhv5d7zlc2682c";}
{name="kruler";value="1k73wm2lca3p9x504il73sk5k21fm8f57m5a8d46cp5xh3hcyz54";}
{name="ksaneplugin";value="1zwmzl4bqmjnvbapcdy60avydgbidrhr87q4cb79wbqbif8g3941";}
{name="ksecrets";value="1b4ld8snnw42yg54sndlrv9j1rjryxlsbx6pdjwsrg35x4cf3l8x";}
{name="ksnapshot";value="1c64igffxz9lgl6izqxi9j5ahpcl34gm06i5bz42mwgwffsyqdkk";}
{name="kstars";value="0ids1mpscvrcdjjns6pvishr16ack160q6bp628sw53gx6f0cf3i";}
{name="ktimer";value="0zqwnjpql6qan6z2dlb9y3irs3785cnav6zcpnxrgi0i5n0v4kyx";}
{name="ktouch";value="0r050awybjz5cjcjy8ivj0h8f95m1mqqcrvpg0gk07fphs68i2na";}
{name="kturtle";value="0bdyyf0dfwmqc42d7xx82bkaygj2znzxbidwfza1w9lzizsmmkqv";}
{name="kwallet";value="1jpxalr8k2mydias4xgifacswy8f6ma4dcf2kpx49sq7hlnx4rdi";}
{name="kwordquiz";value="1zi6pkn55cf62f8bmhfdxpykxk2hcl5bc9zqcp2gcapg5ap58gj8";}
{name="libkdcraw";value="0imyxfppk75zf97p8y7mnzx40vg7wbdqf6qlp1m9yraz4ply9bf1";}
{name="libkdeedu";value="19x0hajs82kimm8i80vxdzz5xkdhhv2vjnv1anx1nkb9fpgmz22y";}
{name="libkexiv2";value="020k8lbh4ad67ybfj5hvbpb0qp6kcwq4yb63as2hgvpvajny0rzr";}
{name="libkipi";value="040wsm35sbbfkdp9yak496w6h2wc3mswab17240c3xl7mbfx405h";}
{name="libksane";value="15cf360jxd27098g7rx7g2rnd3ffpbrj8flkn1913ibccbc44kvn";}
{name="marble";value="0kpln6nhyv6vvy2x64lr4dmf7scvq4k8i6f60flyrc0vll51w0xv";}
{name="okular";value="0jgg6ar1b9zahh1cgkz0yksxq55vjyflp8xc6m9fy0diw4cjhi2i";}
{name="oxygen-icons";value="045fh2609fyn8q22r0w14xa3b0ji9k1xkhh2yb25nnjyh3b10a8w";}
{name="parley";value="00ab2xvmlxzn4rdbnp56yf3jsx02rjxf9f6m4516sb5dgf0gmsvq";}
{name="perlkde";value="138hq7njf9394564addslwy1zibmy7pnsj3ckzwhacab4497pyj4";}
{name="perlqt";value="0lrdf2gl8kw3rkyhy1a1fwnazpziai57w3k1nr0bv1g7s49ri84r";}
{name="printer-applet";value="00c5nh6rm3ixfqn1ahb2hcdijnkdrj2381m1m9l4vxikdchb6whl";}
{name="pykde4";value="087srnqva1kqmgqvsyc54yr8i19xaxl1ax7w6acdk00bz0pyw76i";}
{name="qtruby";value="0imy1afh0w5rx97cxcp4bg2h95wn687sj7dlm09nd6hrpr31ivqd";}
{name="qyoto";value="1gndimc95s6b6m2bgh3z7pwb9p9jlj8z7sypz72py9aza5hkxiyn";}
{name="rocs";value="13gj83a4j202f0980v3ihlw3w5w4f5xh610plc5fnnba5csrpil4";}
{name="smokegen";value="08jz7v86lr6n743cr1ig9lb05wq9f0fyrrgwnn9wzmnfyrlqny0z";}
{name="smokekde";value="1z6hwkv6c5kx12gzi2kld2596az8gyc1aw83091bkkcj7885sai3";}
{name="smokeqt";value="0s3dz9vyhkazd68j9185rgjk3rkwgdfg53pxq10fqldv7pavw230";}
{name="step";value="0xgv7cbs540sk18915v3m4hq09j8j844briic5wy7mgn46gwlycc";}
{name="superkaramba";value="0gck0v9nrg4040w011yhwpj282kkhk2mwdwd0vkgl4760qqfgr2j";}
{name="svgpart";value="1yzrniz0h36v9xw0nglylv043gzlzcm7zzcv7j4p9faicl154vb8";}
{name="sweeper";value="1xyg2qwmwi5jajijamavgq7qqb52iphg6xad3y5r7i52172j7am1";}
];
modules=[
{
module="kdegraphics";
split=true;
pkgs=[
{ name="gwenview"; }
{ name="kamera"; }
{ name="kcolorchooser"; }
{ name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; }
{ name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; }
{ name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; }
{ name="kgamma"; }
{ name="kolourpaint"; }
{ name="kruler"; }
{ name="ksaneplugin"; }
{ name="ksnapshot"; }
{ name="libkdcraw"; }
{ name="libkexiv2"; }
{ name="libkipi"; }
{ name="libksane"; }
{ name="okular"; }
{ name="svgpart"; }
];
}
{
module="kdeutils";
split=true;
pkgs=[
{ name="ark"; }
{ name="filelight"; }
{ name="kcalc"; }
{ name="kcharselect"; }
{ name="kdf"; }
{ name="kfloppy"; }
{ name="kgpg"; }
{ name="kremotecontrol"; }
{ name="ksecrets"; }
{ name="ktimer"; }
{ name="kwallet"; }
{ name="printer-applet"; sane="printer_applet"; }
{ name="superkaramba"; }
{ name="sweeper"; }
];
}
{
module="kdeedu";
split=true;
pkgs=[
{ name="analitza"; }
{ name="blinken"; }
{ name="cantor"; }
{ name="kalgebra"; }
{ name="kalzium"; }
{ name="kanagram"; }
{ name="kbruch"; }
{ name="kgeography"; }
{ name="khangman"; }
{ name="kig"; }
{ name="kiten"; }
{ name="klettres"; }
{ name="kmplot"; }
{ name="kstars"; }
{ name="ktouch"; }
{ name="kturtle"; }
{ name="kwordquiz"; }
{ name="libkdeedu"; }
{ name="marble"; }
{ name="parley"; }
{ name="rocs"; }
{ name="step"; }
];
}
{
module="kdebindings";
split=true;
pkgs=[
{ name="kimono"; }
{ name="korundum"; }
{ name="kross-interpreters"; sane="kross_interpreters"; }
{ name="perlkde"; }
{ name="perlqt"; }
{ name="pykde4"; }
{ name="qtruby"; }
{ name="qyoto"; }
{ name="smokegen"; }
{ name="smokekde"; }
{ name="smokeqt"; }
];
}
{
module="kdeaccessibility";
split=true;
pkgs=[
{ name="jovie"; }
{ name="kaccessible"; }
{ name="kmag"; }
{ name="kmousetool"; }
{ name="kmouth"; }
];
}
{
module="kde-baseapps";
sane="kde_baseapps"; split=true;
pkgs=[
{ name="kate"; }
{ name="kde-baseapps"; sane="kde_baseapps"; }
{ name="konsole"; }
];
}
{ module="kactivities"; split=false;}
{ module="kdeadmin"; split=false;
pkgs=[
{ name="strigi-analyzer"; sane="strigi_analyzer";}
{ name="kuser"; }
{ name="kcron"; }
{ name="ksystemlog"; }
{ name="system-config-printer-kde"; sane="system_config_printer_kde";}
];
}
{ module="kdeartwork"; split=false;
pkgs=[
{ name="ColorSchemes"; }
{ name="IconThemes"; }
{ name="emoticons"; }
{ name="kscreensaver"; }
{ name="kwin-styles"; sane="kwin_styles";}
{ name="sounds"; }
{ name="styles"; }
{ name="wallpapers"; }
{ name="HighResolutionWallpapers"; }
{ name="WeatherWallpapers"; }
{ name="desktopthemes"; }
{ name="aurorae"; }
];
}
{ module="kde-base-artwork"; sane="kde_base_artwork"; split=false;}
{ module="kdegames"; split=false;}
{ module="kdelibs"; split=false;}
{ module="kdemultimedia"; split=false;}
{ module="kdenetwork"; split=false;
pkgs=[
{ name="kfile-plugins"; sane="kfile_plugins";}
{ name="kget"; }
{ name="kopete"; }
{ name="krdc"; }
{ name="kppp"; }
{ name="krfb"; }
{ name="kdnssd"; }
{ name="filesharing"; }
];
}
{ module="kdepim"; split=false;}
{ module="kdepimlibs"; split=false;}
{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;}
{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;}
{ module="kde-runtime"; sane="kde_runtime"; split=false;}
{ module="kdesdk"; split=false;
pkgs=[
{ name="cervisia"; }
{ name="lokalize"; }
{ name="kdeaccounts-plugin"; sane="kdeaccounts_plugin";}
{ name="dolphin-plugins-svn"; sane="dolphin_plugins_svn";subdir="dolphin-plugins/svn"; }
{ name="dolphin-plugins-git"; sane="dolphin_plugins_git";subdir="dolphin-plugins/git"; }
{ name="dolphin-plugins-hg"; sane="dolphin_plugins_hg";subdir="dolphin-plugins/hg"; }
{ name="dolphin-plugins-bazaar"; sane="dolphin_plugins_bazaar";subdir="dolphin-plugins/bazaar"; }
{ name="kcachegrind"; }
{ name="kapptemplate"; }
{ name="kpartloader"; }
{ name="strigi-analyzer"; sane="strigi_analyzer";}
{ name="kioslave"; }
{ name="okteta"; }
{ name="kmtrace"; }
{ name="kompare"; }
{ name="kprofilemethod"; }
{ name="kstartperf"; }
{ name="kuiviewer"; }
{ name="poxml"; }
{ name="scripts"; }
{ name="umbrello"; }
];
}
{ module="kdetoys"; split=false;
pkgs=[
{ name="kteatime"; }
{ name="ktux"; }
{ name="amor"; }
];
}
{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;}
{ module="kdewebdev"; split=false;
pkgs=[
{ name="klinkstatus"; }
{ name="kfilereplace"; }
{ name="kimagemapeditor"; }
{ name="kommander"; }
];
}
{ module="kde-workspace"; sane="kde_workspace"; split=false;}
{ module="oxygen-icons"; sane="oxygen_icons"; split=false;}
];
}

View file

@ -0,0 +1,299 @@
{stable=true;
hashes=builtins.listToAttrs[
{name="analitza";value="0dkz8y16qjjwq81rnnz7r8nchcqlk8rs0vlz9vlib2fsd85y2rm3";}
{name="ark";value="11adynnzli5w3g82g9mbl1gl9n4kph7n746sw0bc3hdwfzzy361c";}
{name="blinken";value="13b88f08c1p76k5067bhkbivgwi1zx05gwxp8yx22rx03ql5114i";}
{name="cantor";value="1di1lbqzz1i0ijd8bl1dyn29vkz2d7968a5lnzz226dhgzkkacx3";}
{name="filelight";value="0r1ay89hci5pkgk2gl2f5mmj91acsd3qqjh5286sv2s06fnwx9yw";}
{name="gwenview";value="1qfisab89bkqcxnj80d57bfl0b2ps3kz8hxxqpp7srp8x0wmwlr4";}
{name="jovie";value="0jxav473r1bcsjlccykihnmnjw6pcdgrc29q6lv6gw41d0dwl1a1";}
{name="kaccessible";value="0czgqnzv74fx5nrgfld2ii04k694dn6wp75zq0yxq0642pjla8xc";}
{name="kactivities";value="1hnpspy4xsmany48babzi7y88xmjihhb7smv6gmhqbwqpnrzn7dy";}
{name="kalgebra";value="1028gjmdlirm2mc5l72c7wlmhhkclfmx4pkscxywfa5a6cafkxxy";}
{name="kalzium";value="14xcrq2p3rhr66xvf6fxapf1xc5w72wf3yc3fl2g902g655d3li1";}
{name="kamera";value="03smprvzrvdi3j8h9zn76rjwhzsqi44wg2bs95c31mxa7kydxz2r";}
{name="kanagram";value="022il9rkxzpdhb8wr0gyv4dsys5zvsazq1k390gv2r5m0h13bdzb";}
{name="kate";value="1ady49ipndsvk6b43msllmpvygn299d6hmhpx8lzlhxxyvp5k3gk";}
{name="kbruch";value="1icm1f0lp4hyh5dp413dgnq709jkz5xr5bp1v05l4gfwk4gcmh7f";}
{name="kcalc";value="057cqdmxj0j6kp4q1lx830kypp52ph56lhdhg6cz32xz64igvk75";}
{name="kcharselect";value="0wblkfmg7lbnfnl042d2k7rgdh2pfm0pw4l691adaxvczm031ig2";}
{name="kcolorchooser";value="168kfmam4vxf7g120c9gsjwr78cs7l7pfl3q1zcna0ysd9cz9v4y";}
{name="kdeadmin";value="0cxkq2gq3gv5apb6yg8phnkn0ln1mdq6cq6s5icsf5qz5m7b9996";}
{name="kdeartwork";value="16iip7ys2kah3xnlj8n972530kd58f4baihhcgdmlr6x0dlxviqq";}
{name="kde-baseapps";value="0fd2amnlx3vg06k8xkarg13zksjzvwz1bqdhqmpj4hqjq04s7pkh";}
{name="kdegames";value="1plvrdj46ldgc7plx3b3g252a5l24hkdwdxwf848bja78717mp8w";}
{name="kdegraphics-mobipocket";value="0x4c0pb4a0rwvwk6xnq0c73px0p9ha4dyrym78gs22m7j8wh44zb";}
{name="kdegraphics-strigi-analyzer";value="10nkkqvipzmh8lyc5rwsclk5y4y0q6l9x6q14ybcyi9sjrdp16xj";}
{name="kdegraphics-thumbnailers";value="12434z4c5hvqqkii2lbmfay09pl4pmcdh2xf248j75jdis0wxr03";}
{name="kdelibs";value="0ic0f8d2qx77z971rkmkll2095alaz0ih5mnx9xfh51zjprrxqk8";}
{name="kdemultimedia";value="0lrn0v44pr5k169g21q3gx059n9aspaj77x44vrr2iaqdbqzipjj";}
{name="kdenetwork";value="04knna0rfvxj5d90mpwln341fspagyh1hpprb0gw7ambjzpicv1n";}
{name="kdepim";value="17wgnf3l4zhwr0lr0d05ik419ik1s18c7fd2d3fd8mmgcj0k8s8q";}
{name="kdepimlibs";value="1w3qz42rhj4spi88lp6dn3i92c1dx89004mwpakjcbh0bb10fyc2";}
{name="kdepim-runtime";value="0gl0qa0nyvf403fwb16v9bg2d98c8y1xnkfgwrf7f26ww8mink46";}
{name="kdeplasma-addons";value="05dfp0l8n7k5hplfrr47y15xq2qbl8km6m06m91hb0v5ds6zsjhn";}
{name="kde-runtime";value="0sx46fwl07s0z6bb0sadnv6w6p8x735kbwzgvm004m9y1fdn3pp8";}
{name="kdesdk";value="0aly8br19y4acj3ah61aypxqpig3cf25xdnr9drgqgl2519rb0bk";}
{name="kdetoys";value="1wjwibf0aqwnjwysc9khriwg8h80fyzcgprrvam0a82b3xzns43v";}
{name="kde-wallpapers";value="07l035jhrysn56nbivxnkgyrayfczbk2b6idij5pfr29c9nha7xk";}
{name="kdewebdev";value="0768x2c70xr9fybjw24aw9n53517496hrlhx5ww2p5lbxd71m9hp";}
{name="kde-workspace";value="0a4rn3j8aardsdn9qp20i7f3dijsyhh691cac2z9djkcx0zb4fxd";}
{name="kdf";value="0d7pp1l86qwp40zkj575ispxszsjm3nsg5c0x2f6i2bagi9wnrq8";}
{name="kfloppy";value="0mcs7fnj0y505nwbg76fgq2n107vwhf0ypw3v4y0gyswvcg6lv5f";}
{name="kgamma";value="09jqqrqnpc1n0pkm3mw1qh0i7l1f1v8a7wqg2x0cawd0vqiqjd8n";}
{name="kgeography";value="1a0dxqzz8z5ndnnznmafgs8i6kz7jqsgl8ra0nqclbghzpxjbl55";}
{name="kgpg";value="0w2hfg5bi5cdr8rh783m1ygx6f1w9674gp7knifhiv037zc47xn8";}
{name="khangman";value="0rkaawjv3g5jnlnqkaxcg1946zrmmxr5x6g24ip0syvwrasaa98z";}
{name="kig";value="1mjppcj8rbalhaafr4m9xbc2ydagfmdwwhdcjrwxnk84xr1p5a53";}
{name="kimono";value="1ayx8zbrjq4j78970k0pifs3m7z1a2szh6d6qk2bajr3dav708cb";}
{name="kiten";value="10mmfys6bg16whpgidjmbwqcd9hcq30gn3vkyasq8kblvkig2g7m";}
{name="klettres";value="0w4zhan6q9rsilvhf724b0nrj03szrf91zc861vbizch64a7glw2";}
{name="kmag";value="1vgwpfiy5n1kjrd6f87ikxg6hmnj85qcn8nsgsbg4c4wwg325mhp";}
{name="kmousetool";value="0aiznlb7nkq6im14zfr6iikkrhv62c96cnq5iqax55w432bqjx7x";}
{name="kmouth";value="1nnvhb29q9s55byns0bk4xj165dlk7mypzama6l9ayc734qpcib8";}
{name="kmplot";value="1ic4g3g87fg7shmr8lw7xnyqpkgc0ha9rji9a64knanv94c21jfz";}
{name="kolourpaint";value="096xqwnx54s37lbzdgqgdi3lvc0dw3xgpvbmn2zbchk98rfccrbg";}
{name="konsole";value="05w05c6579hvs98iajf3vw3rck2a90nvy1bapyrb0hhwz651p1n7";}
{name="korundum";value="1wqshxypn9v3jlcx518xqbmmcng71fk1nb7xq3q9m2dqn81p7095";}
{name="kremotecontrol";value="0ry7jr09klkkfa446yg820dc5j3wivkyz6z9h117wiccacpfylxl";}
{name="kross-interpreters";value="0wcmaac003h5gc0z29sqkzczgap1i7abir75gpp5y67qkvb52zbn";}
{name="kruler";value="14f209gh2rbjvjvv9pjlcl6vhfnfr4s0rnc57vzirk0cb5wjfjx9";}
{name="ksaneplugin";value="15p822y8nn817b4qsmxfb1cz928dnk14mr3667ysvynjfa9l0kkc";}
{name="ksecrets";value="1i87ccjdvmlpvqlqsyihxcb9r7xg8ybhc9y8z91fn0y0dihvysfs";}
{name="ksnapshot";value="1p4krsbkgmzgsa0q6xrs4anq35qzxzdx1g0mv129p5wg6570yr0c";}
{name="kstars";value="15dan9l18wm25i2lkdlgxrmn6rkznhq1riag3kd83i4qwc2rzzdj";}
{name="ktimer";value="1pwxilhr3ymqghii00vmpsjrmzivv8j9jn6aypzs9z1qhp9v7gi7";}
{name="ktouch";value="0m08zgr6phkp8c8k04sj67m4d6him0c6pirijdb4z8ki0b5sgmp6";}
{name="kturtle";value="1701nb2p78yyl5j7f9cq0i6maddy0pjkrxjs4v8r92n2bl0wpl8b";}
{name="kwallet";value="1p7krlp824v7v0hlafgwx139i7g42x2x7raqjyyw5l22gy6qq05l";}
{name="kwordquiz";value="175pm548vkdfpiiq9c66jsw9p1h3m6bi6q6b8df5kknap914radi";}
{name="libkdcraw";value="12brv1wlgcghhcha1h65902rgpcdl2hfh5vaaysmvczs72j18rvf";}
{name="libkdeedu";value="085qfp84r2ck4b1rzh5qqk0cr5z6g7b4xnw3cgnqr6z93901llic";}
{name="libkexiv2";value="1mcvm7ffjy5brybbpr3pdcfh0prkd55323023rjysv3iyv4lylp8";}
{name="libkipi";value="0mhqaaxglh1ksc9fga3llvnmi66d0xkpnp8pcq1k3xc03f9gay3w";}
{name="libksane";value="0cxamj8djmhqn2xcx8672y06zq511l92p56ic32bpq8337xf9gzl";}
{name="marble";value="13ndxh8jdydz7adslkc4bzrq741hw3w0w16vys0ps0829sqbqpzn";}
{name="okular";value="038b1c9d7w3hyzfinzirixfmakxva4hyhbsrkjn3kgxmndmp2rrn";}
{name="oxygen-icons";value="1a15rjma3wgb36c6v1x58m8dv6ndgsp6k9a958vyack57775xri9";}
{name="parley";value="1bf2zc8qcx4m3yam1wsydmhs5z0830zfdl1s7zy84nffnslmszn6";}
{name="perlkde";value="0lkpvnqfjspl9c61avczvc1lbl515vkpr82vxa0bdkrnjijn2zz9";}
{name="perlqt";value="04sp4ricpwvaz856lyf6r7aal9pbr2chn8w8x77ydhy9pm6lpr3c";}
{name="printer-applet";value="0c5bazz3xa5scxiih11fx2z4qakcvmgnbnla3hy7hyc5xygzicpz";}
{name="pykde4";value="1rg0zikjdldm7vnrnhi4z10f89b3ka8lsghkwvjqmi742rqa097v";}
{name="qtruby";value="0nbn1lm55sxaiq5xkdqnph8kd9v831lq15h6niyard744133fhir";}
{name="qyoto";value="11ispw0a60dzxn9v9m1l6g61q7242z5jr95s3lf2ajl13gmrx0l9";}
{name="rocs";value="1jgpigcirjdyvpryvgba76qy46lnxsvr2x2d5chf7jzgzy3l5753";}
{name="smokegen";value="1qy7qj47rlsp56j3ghc1a077k2qydsy9lv1d09i48cn8xf3r0mcs";}
{name="smokekde";value="0fxfplcdndcvb7lsp6f3va5nn1x9knk1qi76wrmfwm1h4ahb0jsr";}
{name="smokeqt";value="0whw8r6hx8qza9an9x4yil8klmdicwxp3gsh2pq4bxavlgrw1f28";}
{name="step";value="06kf1vc6bxs8sg0j691cyprkv6bkaw8fmi3ikna9d54s33mnq5cj";}
{name="superkaramba";value="02k9f1jr9bvlf2zg8wm47qwch3i4ps24mhp6j2i25rpj9l8g7pm1";}
{name="svgpart";value="0sl94xia81hqjqy0ydqlqffpwsdybyaam9an4w6qa6sszmx7kbyj";}
{name="sweeper";value="0yin8jbpxjkdxv1sg3n8nysfm4hvfr37m15bxhn92bgjdkbh2zdz";}
];
modules=[
{
module="kdegraphics";
split=true;
pkgs=[
{ name="gwenview"; }
{ name="kamera"; }
{ name="kcolorchooser"; }
{ name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; }
{ name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; }
{ name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; }
{ name="kgamma"; }
{ name="kolourpaint"; }
{ name="kruler"; }
{ name="ksaneplugin"; }
{ name="ksnapshot"; }
{ name="libkdcraw"; }
{ name="libkexiv2"; }
{ name="libkipi"; }
{ name="libksane"; }
{ name="okular"; }
{ name="svgpart"; }
];
}
{
module="kdeutils";
split=true;
pkgs=[
{ name="ark"; }
{ name="filelight"; }
{ name="kcalc"; }
{ name="kcharselect"; }
{ name="kdf"; }
{ name="kfloppy"; }
{ name="kgpg"; }
{ name="kremotecontrol"; }
{ name="ksecrets"; }
{ name="ktimer"; }
{ name="kwallet"; }
{ name="printer-applet"; sane="printer_applet"; }
{ name="superkaramba"; }
{ name="sweeper"; }
];
}
{
module="kdeedu";
split=true;
pkgs=[
{ name="analitza"; }
{ name="blinken"; }
{ name="cantor"; }
{ name="kalgebra"; }
{ name="kalzium"; }
{ name="kanagram"; }
{ name="kbruch"; }
{ name="kgeography"; }
{ name="khangman"; }
{ name="kig"; }
{ name="kiten"; }
{ name="klettres"; }
{ name="kmplot"; }
{ name="kstars"; }
{ name="ktouch"; }
{ name="kturtle"; }
{ name="kwordquiz"; }
{ name="libkdeedu"; }
{ name="marble"; }
{ name="parley"; }
{ name="rocs"; }
{ name="step"; }
];
}
{
module="kdebindings";
split=true;
pkgs=[
{ name="kimono"; }
{ name="korundum"; }
{ name="kross-interpreters"; sane="kross_interpreters"; }
{ name="perlkde"; }
{ name="perlqt"; }
{ name="pykde4"; }
{ name="qtruby"; }
{ name="qyoto"; }
{ name="smokegen"; }
{ name="smokekde"; }
{ name="smokeqt"; }
];
}
{
module="kdeaccessibility";
split=true;
pkgs=[
{ name="jovie"; }
{ name="kaccessible"; }
{ name="kmag"; }
{ name="kmousetool"; }
{ name="kmouth"; }
];
}
{
module="kde-baseapps";
sane="kde_baseapps"; split=true;
pkgs=[
{ name="kate"; }
{ name="kde-baseapps"; sane="kde_baseapps"; }
{ name="konsole"; }
];
}
{ module="kactivities"; split=false;}
{ module="kdeadmin"; split=false;
pkgs=[
{ name="strigi-analyzer"; sane="strigi_analyzer";}
{ name="kuser"; }
{ name="kcron"; }
{ name="ksystemlog"; }
{ name="system-config-printer-kde"; sane="system_config_printer_kde";}
];
}
{ module="kdeartwork"; split=false;
pkgs=[
{ name="ColorSchemes"; }
{ name="IconThemes"; }
{ name="emoticons"; }
{ name="kscreensaver"; }
{ name="kwin-styles"; sane="kwin_styles";}
{ name="sounds"; }
{ name="styles"; }
{ name="wallpapers"; }
{ name="HighResolutionWallpapers"; }
{ name="WeatherWallpapers"; }
{ name="desktopthemes"; }
{ name="aurorae"; }
];
}
{ module="kdegames"; split=false;}
{ module="kdelibs"; split=false;}
{ module="kdemultimedia"; split=false;}
{ module="kdenetwork"; split=false;
pkgs=[
{ name="kfile-plugins"; sane="kfile_plugins";}
{ name="kget"; }
{ name="kopete"; }
{ name="krdc"; }
{ name="kppp"; }
{ name="krfb"; }
{ name="kdnssd"; }
{ name="filesharing"; }
];
}
{ module="kdepim"; split=false;}
{ module="kdepimlibs"; split=false;}
{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;}
{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;}
{ module="kde-runtime"; sane="kde_runtime"; split=false;}
{ module="kdesdk"; split=false;
pkgs=[
{ name="cervisia"; }
{ name="lokalize"; }
{ name="kdeaccounts-plugin"; sane="kdeaccounts_plugin";}
{ name="dolphin-plugins-svn"; sane="dolphin_plugins_svn";subdir="dolphin-plugins/svn"; }
{ name="dolphin-plugins-git"; sane="dolphin_plugins_git";subdir="dolphin-plugins/git"; }
{ name="dolphin-plugins-hg"; sane="dolphin_plugins_hg";subdir="dolphin-plugins/hg"; }
{ name="dolphin-plugins-bazaar"; sane="dolphin_plugins_bazaar";subdir="dolphin-plugins/bazaar"; }
{ name="kcachegrind"; }
{ name="kapptemplate"; }
{ name="kpartloader"; }
{ name="strigi-analyzer"; sane="strigi_analyzer";}
{ name="kioslave"; }
{ name="okteta"; }
{ name="kmtrace"; }
{ name="kompare"; }
{ name="kprofilemethod"; }
{ name="kstartperf"; }
{ name="kuiviewer"; }
{ name="poxml"; }
{ name="scripts"; }
{ name="umbrello"; }
];
}
{ module="kdetoys"; split=false;
pkgs=[
{ name="kteatime"; }
{ name="ktux"; }
{ name="amor"; }
];
}
{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;}
{ module="kdewebdev"; split=false;
pkgs=[
{ name="klinkstatus"; }
{ name="kfilereplace"; }
{ name="kimagemapeditor"; }
{ name="kommander"; }
];
}
{ module="kde-workspace"; sane="kde_workspace"; split=false;}
{ module="oxygen-icons"; sane="oxygen_icons"; split=false;}
];
}

View file

@ -10,13 +10,6 @@ kde {
passthru.propagatedUserEnvPackages = [ virtuoso ];
patches = map fetchurl [{
# See https://bugs.kde.org/show_bug.cgi?id=289932
url = "http://bugsfiles.kde.org/attachment.cgi?id=69386";
name = "resourceidentifier.patch";
sha256 = "1fpjg1yc191i6ga9sz6r530q9zwh790m3qahsp0i6kzajwpi7jwz";
}];
meta = {
license = "LGPL";
};

View file

@ -9,7 +9,7 @@ kde {
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "326b19180e1a03c9fbf5e99f1a3ee6d4dfd0bd6fde5c0ef4b7a5608b20e75a5f";
outputHash = "69cbb2e8c6fd78931af7196c3a79918f87b5aed31c52521b8d4089eb98e7557b";
meta = {
description = "Wallpapers for KDE";

View file

@ -1,9 +1,9 @@
{ chmlib, djvulibre, ebook_tools, kde, kdelibs, libspectre, popplerQt4, qca2
, qimageblitz }:
, qimageblitz, pkgconfig }:
kde {
buildInputs =
[ chmlib djvulibre ebook_tools kdelibs libspectre popplerQt4 qca2 qimageblitz ];
[ chmlib djvulibre ebook_tools kdelibs libspectre popplerQt4 qca2 qimageblitz pkgconfig ];
meta = {
description = "Okular, the KDE document viewer";

View file

@ -1,43 +0,0 @@
diff --git a/ksecrets/CMakeLists.txt b/ksecrets/CMakeLists.txt
index 040b55f..a1e04c3 100644
--- a/ksecrets/CMakeLists.txt
+++ b/ksecrets/CMakeLists.txt
@@ -5,7 +5,6 @@ PROJECT (ksecrets)
include(MacroLibrary)
include(KDE4Defaults)
-include(PkgConfigGetVar)
INCLUDE_DIRECTORIES (
${KDE4_INCLUDES}
diff --git a/ksecretsserviced/CMakeLists.txt b/ksecretsserviced/CMakeLists.txt
index d2feb41..339225b 100644
--- a/ksecretsserviced/CMakeLists.txt
+++ b/ksecretsserviced/CMakeLists.txt
@@ -2,7 +2,6 @@ PROJECT (ksecretsserviced)
include(MacroLibrary)
include(KDE4Defaults)
-include(PkgConfigGetVar)
INCLUDE_DIRECTORIES (
${KDE4_INCLUDES}
@@ -38,4 +37,5 @@ TARGET_LINK_LIBRARIES (ksecretsserviced
install( TARGETS ksecretsserviced ${INSTALL_TARGETS_DEFAULT_ARGS})
install( FILES ksecretsserviced.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-dbus_add_activation_service(org.kde.ksecretsserviced.service.in)
+configure_file(org.kde.ksecretsserviced.service.in org.kde.ksecretsserviced.service)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.ksecretsserviced.service DESTINATION ${DBUS_SERVICES_INSTALL_DIR} )
diff --git a/kwl2kss/CMakeLists.txt b/kwl2kss/CMakeLists.txt
index 41d8ec0..4cedb0e 100644
--- a/kwl2kss/CMakeLists.txt
+++ b/kwl2kss/CMakeLists.txt
@@ -3,7 +3,6 @@ project(kwl2kss)
include(MacroLibrary)
include(KDE4Defaults)
-include(PkgConfigGetVar)
########### Configure checks for kwalletbackend ###############

View file

@ -1,11 +0,0 @@
{ kde, kdelibs, qca2 }:
kde {
buildInputs = [ kdelibs qca2 ];
patches = [ ./ksecrets-ftbfs.patch ];
meta = {
description = "KDE implementation of SecretsService";
};
}

View file

@ -1,277 +0,0 @@
[
{
lang = "ar";
saneName = "ar";
sha256 = "0yzirmv6275479xifhipajdrmnf85xlb7nr00b9r73ghz5y9i8la";
}
{
lang = "bg";
saneName = "bg";
sha256 = "14fkmr0ixnrn4v2xs3hffiipk4dfdw2c2nyldlljlls3wim9kg5k";
}
{
lang = "bs";
saneName = "bs";
sha256 = "11f2n5rb5vq64lj2w913xkfvbw0rn31nnf1bpaywd86jh4sr4h6v";
}
{
lang = "ca";
saneName = "ca";
sha256 = "1c2j18gjlj778f97k44xk1pnxx696gsmlqjjsmanw9r0jnbkvp6z";
}
{
lang = "ca@valencia";
saneName = "ca_valencia";
sha256 = "1zhpbk2bdw40hss80zfnhq3ml9s9hlyayg6gsqg1jqwkfjxy0fdi";
}
{
lang = "cs";
saneName = "cs";
sha256 = "04jpi5lhx5lj15vxlh22g08zjqwzp7fjj2hy84axjm2q57vmgxfh";
}
{
lang = "da";
saneName = "da";
sha256 = "14qivzzhzv5z7yc3l8xvhwvspn1834r6zvf7pfiqmb4anhf3k26q";
}
{
lang = "de";
saneName = "de";
sha256 = "1l2s1yzi58f6nixw86k0rg0irpj786hcb07q3b1n7p991a0x34ij";
}
{
lang = "el";
saneName = "el";
sha256 = "044r8c0w3avcfb7wl7v8zaw05hyvif9cdp482fwrggg6v61fz0h6";
}
{
lang = "en_GB";
saneName = "en_GB";
sha256 = "15z1w8vkfq19z6wyi0zlbbh4ysv66jf74y68qz544d6riqzj61ii";
}
{
lang = "es";
saneName = "es";
sha256 = "1154wmjcgasvh48cli8zdbf1bqk9w3jvrq12g03jdr66mqgs2fry";
}
{
lang = "et";
saneName = "et";
sha256 = "0yww5pa7bm0fdcai1w1jrfvcwjcrzw0yp2r5vxggwlwjlslahzsp";
}
{
lang = "eu";
saneName = "eu";
sha256 = "1xrd91d0k14mk826a6277sghbaji2lr7yjlggbjshh59qrwnmm5f";
}
{
lang = "fa";
saneName = "fa";
sha256 = "0zy0slm6zn3b3zhvygfac0cnsgnc3bfx4wzd0rdiy2270idkvk9s";
}
{
lang = "fi";
saneName = "fi";
sha256 = "1nazarjvf7w1pvwca9igsp0w1fa2qgk2h45rrm4vpq05r2j9pd16";
}
{
lang = "fr";
saneName = "fr";
sha256 = "1b17lbjqaflz21ciijs4d2dr8r2jc781yf62gk6pgw3r91wd9gla";
}
{
lang = "ga";
saneName = "ga";
sha256 = "1wq67fi3r09ymz95pxc5nrjs01kdf7xlb2z11snzvjfbpyxg0fpp";
}
{
lang = "gl";
saneName = "gl";
sha256 = "046kvzqgxs2phgrdx736ydv4q9jc594hb32lj2qaysm378w67hz3";
}
{
lang = "he";
saneName = "he";
sha256 = "1ywfd2fv806v4ilin3b99rcajwsczbmghl8y152nkyza8vak33rv";
}
{
lang = "hr";
saneName = "hr";
sha256 = "0r77sh2s5kvh7pb1v7fvl8cxckx7jh8i46lrrli6hyvfi8gwdzl0";
}
{
lang = "hu";
saneName = "hu";
sha256 = "0jjm1kl2lc2pdyhyxz6jljsbdc8b6msyp01bwyldgd9pannrixfi";
}
{
lang = "ia";
saneName = "ia";
sha256 = "0sl28a39v9gb7fj7rfyrn2wqn41l7q1zzfkhgjac273wb9cwisfq";
}
{
lang = "id";
saneName = "id";
sha256 = "0whbnl3rglv9bwp4x2f6p8v6w0ns87l6fkz74qgwqq9xf5h7cq8w";
}
{
lang = "is";
saneName = "is";
sha256 = "0951lcd6if6ylwx2gpq0kg08134g02wfnwpvi9w7jsxia6c3byv9";
}
{
lang = "it";
saneName = "it";
sha256 = "0radqz2nicji3sm2nhr9sy250s015vccx7g1k6zz30qfs6v7d081";
}
{
lang = "ja";
saneName = "ja";
sha256 = "0n5hhq0h7xvxnxmd3k2wv6p5n5raqyq667f1x1vvfx3gjgl8l6za";
}
{
lang = "kk";
saneName = "kk";
sha256 = "12fd76wcr141pqd9lcpwzi0fvd8r66551vcd3rz1p5gkl41wnzih";
}
{
lang = "km";
saneName = "km";
sha256 = "0y7gaa19ycbp4v97rwf7h2ijam68fjzpx62iab4q8p925d5bf5gz";
}
{
lang = "ko";
saneName = "ko";
sha256 = "1bvlw16wvj9k82c00p6vbwvc1f6y4lgq7yfwi3d62wjmq34ry9y3";
}
{
lang = "lt";
saneName = "lt";
sha256 = "10zjs4a8chsf6i8v9xbzqikz7j1kqwaxv6hbzphz5qlabxx1vfhh";
}
{
lang = "lv";
saneName = "lv";
sha256 = "0bzh4j9m8jmandrx6y7pl2dm8xlp0m4vw5lnz0mhbzrpbf9y91f5";
}
{
lang = "nb";
saneName = "nb";
sha256 = "1imkd6540npybpg34vz00z7x3c2vgzigkjz0ha8xhsnsrbsyph1c";
}
{
lang = "nds";
saneName = "nds";
sha256 = "1jqpmqma7pwgpfhlz5rf9jbda3y6psd9ikbpl0r18kwbjxmmydbf";
}
{
lang = "nl";
saneName = "nl";
sha256 = "0rv81v06m27kk922d7cy58jm7rxx3lwhy7hnwc3iym0kzlb1kn8k";
}
{
lang = "nn";
saneName = "nn";
sha256 = "1z9wysi99sb7whrqbjsywvzr99bbph8ajlrpgjx2sc6r0pq9kiz2";
}
{
lang = "pa";
saneName = "pa";
sha256 = "1cj65wnkzrkd9bpjaihgzqhcjmjrjlfzvcc5w66wy976lj3bmhbj";
}
{
lang = "pl";
saneName = "pl";
sha256 = "17ilmmdjzlk16avr6v37fwx50gn70ds0s66i1pr6bgfjwzirhbwr";
}
{
lang = "pt";
saneName = "pt";
sha256 = "0c3ibrnhfhgpn51bzkx9skqzhbc3y3b9z8x9mqfj8qb88y8daxr6";
}
{
lang = "pt_BR";
saneName = "pt_BR";
sha256 = "07aazd6326jnl98xsw60d2a23cgqz9hlhr3359ing0f85y0h4553";
}
{
lang = "ro";
saneName = "ro";
sha256 = "18d8xmvppp8y01g9kbfchd4ppbgc0xzd0s2xhicglsjq0mxgsl1d";
}
{
lang = "ru";
saneName = "ru";
sha256 = "0mxrikinff8a94pjag1dw6d4ywx1f8niy6160cfy9yhzww7kxdid";
}
{
lang = "si";
saneName = "si";
sha256 = "1a8wqihfxqvwxpz1x46kq88jwh3gbilqiba6sk9bq2mszp4p67rm";
}
{
lang = "sk";
saneName = "sk";
sha256 = "0x07css69r5ji9k3xz6b86945zawhnx3cxx8mjc21yhb88ns9abg";
}
{
lang = "sl";
saneName = "sl";
sha256 = "157b1qbv68455gxjfw0a16pn754cwsslr7rjj98m3wxb0x2l6jm6";
}
{
lang = "sr";
saneName = "sr";
sha256 = "1hj0z12g6srhhl3rim8ch2a51jxmzgbrd3wz9x1dcbb280qvx7dh";
}
{
lang = "sv";
saneName = "sv";
sha256 = "0caji21v1lb6kqb12rrd0ff4pi4kr5533x686c8aqmj82dldc0i1";
}
{
lang = "tg";
saneName = "tg";
sha256 = "0v4kggr5k0nl0kj2y2diw37mdi51p76wmwxjldlhvkxind40sab9";
}
{
lang = "th";
saneName = "th";
sha256 = "13vvfl1nkm8a3vd1h95rs73cvh4q84vdgnvy1144v2lfg62qz2wr";
}
{
lang = "tr";
saneName = "tr";
sha256 = "0nc8c68y6ykplkhh0pij2lwwq5pa0sgwdiarwmjlwiy2rzyjm49c";
}
{
lang = "ug";
saneName = "ug";
sha256 = "1rw2jq6899xkn39ij6w6k7qgnv94w6rivx56czwpldxslzw5aikf";
}
{
lang = "uk";
saneName = "uk";
sha256 = "0w42f4fg4pk4ny1sldhv4nsganid5jayc0n5m1slsvd70f89l4cq";
}
{
lang = "vi";
saneName = "vi";
sha256 = "093d4fsf38kxlpr99yf7nnr4amvlwsj92h9ix3hh2mql1vcrjzxh";
}
{
lang = "wa";
saneName = "wa";
sha256 = "048awkb3a07bxd2kbfv05ig49r2hix6glag5wdjsmn3dmjlf7lam";
}
{
lang = "zh_CN";
saneName = "zh_CN";
sha256 = "0hkrj9j6rzxnprvdsf6b0xy2i6mngrq5sgsg6k9dqxwjfnnfd1g5";
}
{
lang = "zh_TW";
saneName = "zh_TW";
sha256 = "096mwkla69sj4236f05grhv7wrvfxfq7m7gyq3r58nar37b5nrkz";
}
]

View file

@ -0,0 +1,277 @@
[
{
lang = "ar";
saneName = "ar";
sha256 = "0xg4rp3k7zcvrrs7y2c3rxmb07mlmkfxnw5vnhgj0hp67zsa0xqc";
}
{
lang = "bg";
saneName = "bg";
sha256 = "13xh14bknqp0yfy093y70bkkazbfi81x190m0mqbc03npp7f0fny";
}
{
lang = "bs";
saneName = "bs";
sha256 = "1wdkxij7w04f73ha8aqqrh5awvad1flsv2yhl5qd5yrsf0f47pcn";
}
{
lang = "ca";
saneName = "ca";
sha256 = "03ngb8jidmh5xsfgrbcsgs387cwrqlb5bclyrx7x66ig2a6cj293";
}
{
lang = "ca@valencia";
saneName = "ca_valencia";
sha256 = "1lnir36hv69a2lr70l3gc787r4dmkwfm4cnygkajwz13hh02a5yw";
}
{
lang = "cs";
saneName = "cs";
sha256 = "0zrmcmxkcc31sys9svnvqdhls9z121hy6x4649hlvqykjy906wsx";
}
{
lang = "da";
saneName = "da";
sha256 = "18zwx64wsrlfamhq81573ss4zci4jsh9fzfiibqfnailyq7vh6af";
}
{
lang = "de";
saneName = "de";
sha256 = "14fm8lmwqzs741s9vpp6avq0xv41g528glj1inq53p9shxnnyqii";
}
{
lang = "el";
saneName = "el";
sha256 = "1282cf55vb6j1p7xj6k5yjvs5js6j2ia82qrk1lbilrp0z2i0gmv";
}
{
lang = "en_GB";
saneName = "en_GB";
sha256 = "03irsv325yl552afa6cwzvm51bsdhlvkk7p3j09bld64jdafsy51";
}
{
lang = "es";
saneName = "es";
sha256 = "1a2jwbzx1nygygsmhpiwchrm4lsfji0823dbhmi5a7nccdz8qcl7";
}
{
lang = "et";
saneName = "et";
sha256 = "0h3a2kpf2658mgix1p8l84mh64vd4d3pd57s9s0hhgkqz393rfyw";
}
{
lang = "eu";
saneName = "eu";
sha256 = "0mzyq0z6kjpp442i4y2v2xkfygd816ija2p9s4rmh8p83z3m4vf3";
}
{
lang = "fa";
saneName = "fa";
sha256 = "1ha1rnqki9ydlqyb8m9kxpvj706rg6jzzqpsy5dd3jwmbq9p3hih";
}
{
lang = "fi";
saneName = "fi";
sha256 = "0wljp5ka2mm4xxmf6gplsh06ynibw3vcn62dxhawpw04xpj561z0";
}
{
lang = "fr";
saneName = "fr";
sha256 = "18dihln161rrh8269j0c2pypxwhddigd6qgscjqypkhh3nclc158";
}
{
lang = "ga";
saneName = "ga";
sha256 = "0r8hv5lnrjjxbzbpxfsipaj0nd8lmlwf69073x0nyxvins6yl8r8";
}
{
lang = "gl";
saneName = "gl";
sha256 = "1qh81dqz5wm7viqvx9mkb6v5m11c67igqz2n44ax8f87m4d2n14n";
}
{
lang = "he";
saneName = "he";
sha256 = "1ld68csc2dxwmql2j79xnnbi7ib1hjs9hd28bbqcn3v240jmfrhc";
}
{
lang = "hr";
saneName = "hr";
sha256 = "00m40mxfgm8ymfq1l51i3kd1493cmddn0my6sahh6hy21zhbfb7p";
}
{
lang = "hu";
saneName = "hu";
sha256 = "0vxanrd8q8ykmzhyz9h2a38izccfyssmck2gvrm2r53hli3zfnl5";
}
{
lang = "ia";
saneName = "ia";
sha256 = "0ys5ysq15aazifmjx26sd73801bdfl5hsaranbwarrmky2w0ahmw";
}
{
lang = "id";
saneName = "id";
sha256 = "0lw4gi3p4cms519l36p1xa7hpavwmbvl60chw8ji1xyh29fkylz8";
}
{
lang = "is";
saneName = "is";
sha256 = "09lzndfxck7s5bryn7i9w8pya18wiy9y27rzqaq8sa9hmjswmkc7";
}
{
lang = "it";
saneName = "it";
sha256 = "1s2b9rrwj4yfx4xk323wcyzvidxiipb3sfws3hsb56vdvhkmr7hs";
}
{
lang = "ja";
saneName = "ja";
sha256 = "0gzishadvm9s863r0z6xbi35qgcl5da5l2nn8b5dqdjz61ndj7w7";
}
{
lang = "kk";
saneName = "kk";
sha256 = "1yy3yaifcgj8203wajnqvr7li42w8zvy02gqirxjb5n2kshcjnm3";
}
{
lang = "km";
saneName = "km";
sha256 = "1a717bsxp75xb8wrxg6a1817d69a9zdvhsha9dlrxqif8krvg8kw";
}
{
lang = "ko";
saneName = "ko";
sha256 = "1965ai6hchhmdsi8lz68zwgb0hynzdpv60vx7z716428qki4kaxy";
}
{
lang = "lt";
saneName = "lt";
sha256 = "15d6r4jyp3qkf64wfqixrkc899a27s7vkgzgaxr6qpln5nhwxhiz";
}
{
lang = "lv";
saneName = "lv";
sha256 = "0y6xdl7rpb78s4mdisr33afvmhvk2pn0x13vylv7rxcxa34qzgp0";
}
{
lang = "nb";
saneName = "nb";
sha256 = "1llf9w22ys3kr1gbff60rqr8x55b8rjchxwk3zx8sidpflfj2jxx";
}
{
lang = "nds";
saneName = "nds";
sha256 = "1qixvdl916lriar5cq5s2ssin9klavy1kap6n4mlj2v1pwzqncv0";
}
{
lang = "nl";
saneName = "nl";
sha256 = "1bq6dshbbl36pd1kik60kdqpm3fj95409wrz07rvw21bc5wn4ng0";
}
{
lang = "nn";
saneName = "nn";
sha256 = "085vkfx26sfqz2vg1zs38fri99h344gmjfg9p64l82csx9fkr6d3";
}
{
lang = "pa";
saneName = "pa";
sha256 = "01q6kirkn7ah0m9hkd5i90la52p9cdjs01q0a99ic6jyfkjnzdms";
}
{
lang = "pl";
saneName = "pl";
sha256 = "1ixrfkb8lklh0475j2w97s21hwxcsf1vqafq5hg0819g6qd2aijl";
}
{
lang = "pt";
saneName = "pt";
sha256 = "0hcbfhxw66vilad81rmw88wybbsalidq50wfy4c2cb415cfqi1sr";
}
{
lang = "pt_BR";
saneName = "pt_BR";
sha256 = "0pwzmhkk2acmkqfvsbv2r58wjfrikqzpy5j74prpwk7w3ikch683";
}
{
lang = "ro";
saneName = "ro";
sha256 = "0xs9m6hqiqgknbm139wv46g4gwz595bqdnhzxibaadibrpaby8yq";
}
{
lang = "ru";
saneName = "ru";
sha256 = "0j2nb2nwipm8y894s0dqxs46slwcwgj5c6j62xw40jxr3zl726xc";
}
{
lang = "si";
saneName = "si";
sha256 = "1np69csgvfmg9nr07jxy45z1hpr0s7x0cfyv4gzidgwgrrjgy9rx";
}
{
lang = "sk";
saneName = "sk";
sha256 = "0f46d1wkac2mnl9wmzg3xhak5jxs1rdnqafk26zvg84ksdapy9ji";
}
{
lang = "sl";
saneName = "sl";
sha256 = "1ca7z7n4hsf6x9dh1xy9if1i8x7vdmapwl03q67752rvms60zgpc";
}
{
lang = "sr";
saneName = "sr";
sha256 = "0vqhy5s3pw53h0mh0vqwicg9yxb7dc45qa1y37lrb3rxbl0hf4b2";
}
{
lang = "sv";
saneName = "sv";
sha256 = "0f864y58jg3cm7wl2almljqhdcspyxcxb0ig2axb4ynmk1m7qfwd";
}
{
lang = "tg";
saneName = "tg";
sha256 = "1xybl1cp7hivzyw2j4s3j3ahv18kpxx54zpi8qn9nfpsxwz6nzzm";
}
{
lang = "th";
saneName = "th";
sha256 = "06n7r9pc44y53qs3lkmywsh40g0mmlq91sn6ma1j4nxbyglyk851";
}
{
lang = "tr";
saneName = "tr";
sha256 = "1ibypwg8wgwsgwp6s7n56wa3j4paxl948cmbhmiahmclpyhs8g3k";
}
{
lang = "ug";
saneName = "ug";
sha256 = "0z99bs4yxr4w6d5xxbr4k8h6494b64g00i3fkv4r1lrbldp0nsmi";
}
{
lang = "uk";
saneName = "uk";
sha256 = "05jrypr1gwlv15yymk3qmh6y982256lz2jyyw6jak4pwv2l4pdp1";
}
{
lang = "vi";
saneName = "vi";
sha256 = "1wzrdgp6w33qzy6w4jk0w9yk4v1pbx31lnjg1423c3f4byb4rx8s";
}
{
lang = "wa";
saneName = "wa";
sha256 = "0grlfffq3qzh2l0pnxwil0812l1a628i9gsi7zm1p6rp6hhv9fwp";
}
{
lang = "zh_CN";
saneName = "zh_CN";
sha256 = "18q6nhk12fi10i582vm6sdbhirq81702pfc1793dww4s8ys8lf1x";
}
{
lang = "zh_TW";
saneName = "zh_TW";
sha256 = "0x4yq975xwn2igyzdw0ygc1qiwcg30fvdhwnv15md6bfwk2m813l";
}
]

View file

@ -3,7 +3,7 @@
kde {
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "78f35ceba58bd34059ca4b2107bb55d4de56733e8932ba2ea22dcac18ee995ce";
outputHash = "973f53b59e31e1e1dca41aa5abf0fc50e9cf0cbee57f156d90c2e754f33cc1b9";
buildNativeInputs = [ cmake ];

View file

@ -1,9 +1,7 @@
rec {
version="11.1.1";
name="ecl-11.1.1";
hash="01rvxpa5cwggq1p39qgjm0sdixx3l6vlnhm2h9qrwji69s3wxb18";
url="http://downloads.sourceforge.net/project/ecls/ecls/11.1/ecl-${version}.tar.gz";
advertisedUrl="http://downloads.sourceforge.net/project/ecls/ecls/11.1/ecl-11.1.1.tar.gz";
version="12.2.1";
name="ecl-12.2.1";
hash="dbb3f83c27f3d2565ca22c1c6b4ab497bbfdd0d0a7b09dee76338f378621f091";
url="http://downloads.sourceforge.net/project/ecls/ecls/12.2/ecl-${version}.tgz";
advertisedUrl="http://downloads.sourceforge.net/project/ecls/ecls/12.2/ecl-12.2.1.tgz";
}

View file

@ -0,0 +1,28 @@
{ stdenv, fetchurl, mono, unzip, pkgconfig
} :
stdenv.mkDerivation rec {
pname = "fsharp";
date = "2011-08-10";
name = "${pname}-${date}";
src = fetchurl {
url = "http://download.mono-project.com/sources/fsharp/fsharp-cc126f2.zip";
sha256 = "03j2ypnfddl2zpvg8ivhafjy8dlz49b38rdy89l8c3irxdsb7k6i";
};
buildInputs = [mono unzip pkgconfig];
sourceRoot = "fsharp";
# To fix this error when running:
# The file "/nix/store/path/whatever.exe" is an not a valid CIL image
dontStrip = true;
meta = {
description = "A functional CLI language";
homepage = "http://tryfsharp.org/";
license = stdenv.lib.licenses.asl20;
maintainers = [ stdenv.lib.maintainers.raskin ];
platforms = with stdenv.lib.platforms; linux;
};
}

View file

@ -34,8 +34,9 @@ stdenv.mkDerivation {
sourceRoot = "gcc-${revision}/";
patches =
[ ./pass-cxxcpp.patch ./fix-libstdc++-link.patch ]
++ stdenv.lib.optional noSysDirs [ ./no-sys-dirs.patch ];
[ ./pass-cxxcpp.patch ]
++ stdenv.lib.optional noSysDirs ./no-sys-dirs.patch
++ stdenv.lib.optional langCC ./fix-libstdc++-link.patch;
inherit noSysDirs langCC langF77 langObjC;
langC = true;

View file

@ -1,17 +1,3 @@
diff -ruN gcc-4.1.0/gcc/cppdefault.c gcc-4.1.0.new/gcc/cppdefault.c
--- gcc-4.1.0/gcc/cppdefault.c 2005-06-25 04:02:01.000000000 +0200
+++ gcc-4.1.0.new/gcc/cppdefault.c 2006-03-01 18:48:58.000000000 +0100
@@ -41,6 +41,10 @@
# undef CROSS_INCLUDE_DIR
#endif
+#undef LOCAL_INCLUDE_DIR
+#undef SYSTEM_INCLUDE_DIR
+#undef STANDARD_INCLUDE_DIR
+
const struct default_include cpp_include_defaults[]
#ifdef INCLUDE_DEFAULTS
= INCLUDE_DEFAULTS;
diff -ruN gcc-4.1.0/gcc/Makefile.in gcc-4.1.0.new/gcc/Makefile.in
--- gcc-4.1.0/gcc/Makefile.in 2006-02-16 16:23:24.000000000 +0100
+++ gcc-4.1.0.new/gcc/Makefile.in 2006-03-01 18:55:12.000000000 +0100
@ -55,20 +41,7 @@ diff -ruN gcc-4.1.0/gcc/Makefile.in gcc-4.1.0.new/gcc/Makefile.in
-DCROSS_INCLUDE_DIR=\"$(CROSS_SYSTEM_HEADER_DIR)\" \
-DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \
@TARGET_SYSTEM_ROOT_DEFINE@
diff -ruN gcc-4.1.0/libstdc++-v3/include/Makefile.in gcc-4.1.0.new/libstdc++-v3/include/Makefile.in
--- gcc-4.1.0/libstdc++-v3/include/Makefile.in 2006-01-10 18:14:00.000000000 +0100
+++ gcc-4.1.0.new/libstdc++-v3/include/Makefile.in 2006-03-01 18:57:32.000000000 +0100
@@ -1257,8 +1257,8 @@
if [ ! -d "${pch_output_builddir}" ]; then \
mkdir -p ${pch_output_builddir}; \
fi; \
- $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) ${pch_source} -O0 -g -o ${pch_output_builddir}/O0g.gch; \
- $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) ${pch_source} -O2 -g -o ${pch_output_builddir}/O2g.gch;
+ $(CXX) $(CFLAGS) $(PCHFLAGS) $(AM_CPPFLAGS) ${pch_source} -O0 -g -o ${pch_output_builddir}/O0g.gch; \
+ $(CXX) $(CFLAGS) $(PCHFLAGS) $(AM_CPPFLAGS) ${pch_source} -O2 -g -o ${pch_output_builddir}/O2g.gch;
# For robustness sake (in light of junk files or in-source
# configuration), copy from the build or source tree to the install
diff -ruN gcc-4.1.0/ltcf-cxx.sh gcc-4.1.0.new/ltcf-cxx.sh
--- gcc-4.1.0/ltcf-cxx.sh 2005-07-16 04:30:53.000000000 +0200
+++ gcc-4.1.0.new/ltcf-cxx.sh 2006-03-01 18:58:15.000000000 +0100

View file

@ -28,6 +28,7 @@
, gnat ? null
, libpthread ? null, libpthreadCross ? null # required for GNU/Hurd
, stripped ? true
, gnused ? null
}:
assert langJava -> zip != null && unzip != null
@ -39,6 +40,9 @@ assert langVhdl -> gnat != null;
# LTO needs libelf and zlib.
assert libelf != null -> zlib != null;
# Make sure we get GNU sed.
assert stdenv.isDarwin -> gnused != null;
with stdenv.lib;
with builtins;
@ -226,6 +230,10 @@ stdenv.mkDerivation ({
++ (optionals (cross != null) [binutilsCross])
++ (optionals langAda [gnatboot])
++ (optionals langVhdl [gnat])
# The builder relies on GNU sed (for instance, Darwin's `sed' fails with
# "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
++ (optional stdenv.isDarwin gnused)
;
configureFlagsArray = stdenv.lib.optionals

View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}:
{ stdenv, fetchurl, ghc, perl, gmp, ncurses }:
stdenv.mkDerivation rec {
version = "7.0.2";
@ -9,8 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "f0551f1af2f008a8a14a888b70c0557e00dd04f9ae309ac91897306cd04a6668";
};
buildInputs = [ghc perl gmp ncurses] ++
(if stdenv.isDarwin then [darwinInstallNameToolUtility] else []);
buildInputs = [ ghc perl gmp ncurses ];
buildMK = ''
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"

View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}:
{ stdenv, fetchurl, ghc, perl, gmp, ncurses }:
stdenv.mkDerivation rec {
version = "7.0.3";
@ -9,8 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1nfc2c6bdcdfg3f3d9q5v109jrrwhz6by3qa4qi7k0xbip16jq8m";
};
buildInputs = [ghc perl gmp ncurses] ++
(if stdenv.isDarwin then [darwinInstallNameToolUtility] else []);
buildInputs = [ ghc perl gmp ncurses ];
buildMK = ''
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"

View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}:
{ stdenv, fetchurl, ghc, perl, gmp, ncurses }:
stdenv.mkDerivation rec {
version = "7.0.4";
@ -9,8 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1a9b78d9d66c9c21de6c0932e36bb87406a4856f1611bf83bd44539bdc6ed0ed";
};
buildInputs = [ghc perl gmp ncurses] ++
(if stdenv.isDarwin then [darwinInstallNameToolUtility] else []);
buildInputs = [ ghc perl gmp ncurses ];
buildMK = ''
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"

View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}:
{ stdenv, fetchurl, ghc, perl, gmp, ncurses }:
stdenv.mkDerivation rec {
version = "7.2.1";
@ -9,8 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "099w2bvx07jq4b1k8f1hspri30wbk35dz6ilsivxr2xg661c2qjm";
};
buildInputs = [ghc perl gmp ncurses] ++
(if stdenv.isDarwin then [darwinInstallNameToolUtility] else []);
buildInputs = [ ghc perl gmp ncurses ];
buildMK = ''
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"

View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}:
{ stdenv, fetchurl, ghc, perl, gmp, ncurses }:
stdenv.mkDerivation rec {
version = "7.2.2";
@ -9,8 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0g87d3z9275dniaqzkf56qfgzp1msd89nqqhhm2gkc6iga072spz";
};
buildInputs = [ghc perl gmp ncurses] ++
(if stdenv.isDarwin then [darwinInstallNameToolUtility] else []);
buildInputs = [ ghc perl gmp ncurses ];
buildMK = ''
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"

View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}:
{ stdenv, fetchurl, ghc, perl, gmp, ncurses }:
stdenv.mkDerivation rec {
version = "7.4.1";
@ -9,8 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0ycscsagyy9n796a59q6761s6ar50d8inibvnrcp96siksj0j73j";
};
buildInputs = [ghc perl gmp ncurses] ++
(if stdenv.isDarwin then [darwinInstallNameToolUtility] else []);
buildInputs = [ ghc perl gmp ncurses ];
buildMK = ''
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"

View file

@ -0,0 +1,44 @@
{ stdenv, fetchurl, ghc, perl, gmp, ncurses }:
stdenv.mkDerivation rec {
version = "7.4.1.20120412";
name = "ghc-${version}";
src = fetchurl {
url = "http://haskell.org/ghc/dist/stable/dist/${name}-src.tar.bz2";
sha256 = "0hpzd51s5nvlsjk3wza45ji5v6m0szqjzch45fvv7wfzllrm595l";
};
buildInputs = [ ghc perl gmp ncurses ];
buildMK = ''
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include"
'';
preConfigure = ''
echo "${buildMK}" > mk/build.mk
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
'';
configureFlags=[
"--with-gcc=${stdenv.gcc}/bin/gcc"
];
# required, because otherwise all symbols from HSffi.o are stripped, and
# that in turn causes GHCi to abort
stripDebugFlags=["-S" "--keep-file-symbols"];
meta = {
homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler";
maintainers = [
stdenv.lib.maintainers.marcweber
stdenv.lib.maintainers.andres
stdenv.lib.maintainers.simons
];
platforms = ghc.meta.platforms;
};
}

View file

@ -1,17 +1,16 @@
{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}:
{ stdenv, fetchurl, ghc, perl, gmp, ncurses }:
stdenv.mkDerivation rec {
version = "7.4.0.20120126";
version = "7.5.20120419";
name = "ghc-${version}";
src = fetchurl {
url = "http://haskell.org/ghc/dist/7.4.1-rc2/${name}-src.tar.bz2";
sha256 = "0arnvzhwjzk2z3m2891b4z13p4v1c84f31jgyj13a1fbfpylgs64";
url = "http://haskell.org/ghc/dist/current/dist/${name}-src.tar.bz2";
sha256 = "0fwq2s3syk3l4xx0m8x6h67snldlf3qk9bjjkvx46sgr0q3xjd05";
};
buildInputs = [ghc perl gmp ncurses] ++
(if stdenv.isDarwin then [darwinInstallNameToolUtility] else []);
buildInputs = [ ghc perl gmp ncurses ];
buildMK = ''
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"

View file

@ -0,0 +1,120 @@
{ stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre, blas, liblapack
, readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl
, ncurses, libunistring, lighttpd, patchelf
} :
let
liblapackShared = liblapack.override{shared=true;};
realGcc = stdenv.gcc.gcc;
in
stdenv.mkDerivation rec {
pname = "julia";
date = "20120501";
name = "${pname}-git-${date}";
grisu_ver = "1.1";
dsfmt_ver = "2.1";
arpack_ver = "3.1.0";
clp_ver = "1.14.5";
lighttpd_ver = "1.4.29";
grisu_src = fetchurl {
url = "http://double-conversion.googlecode.com/files/double-conversion-${grisu_ver}.tar.gz";
sha256 = "addee31d11350e4dde2b19c749eda648cb0ab38a68b0dd0d0a45dc49c7346fe7";
};
dsfmt_src = fetchurl {
url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmt_ver}.tar.gz";
name = "dsfmt-${dsfmt_ver}.tar.gz";
sha256 = "e9d3e04bc984ec3b14033342f5ebdcd5202d8d8e40128dd737f566945612378f";
};
arpack_src = fetchurl {
url = "http://forge.scilab.org/index.php/p/arpack-ng/downloads/376/get/";
name = "arpack-ng_${arpack_ver}.tar.gz";
sha256 = "65b7856126f06ecbf9ec450d50df92ca9260d4b0d21baf02497554ac230d6feb";
};
clp_src = fetchurl {
url = "http://www.coin-or.org/download/source/Clp/Clp-${clp_ver}.tgz";
name = "clp-${clp_ver}.tar.gz";
sha256 = "e6cabe8b4319c17a9bbe6fe172194ab6cd1fe6e376f5e9969d3040636ea3a817";
};
lighttpd_src = fetchurl {
url = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${lighttpd_ver}.tar.gz";
sha256 = "ff9f4de3901d03bb285634c5b149191223d17f1c269a16c863bac44238119c85";
};
src = fetchgit {
url = "git://github.com/JuliaLang/julia.git";
rev = "990ffabb00f0e51d326911888facdbc473fb634d";
sha256 = "dfcf41b2d7b62dd490bfd6f6fb962713c920de3f00afaee47423bd26eba7e3b2";
};
buildInputs = [ gfortran perl m4 gmp pcre llvm blas liblapackShared readline
fftw fftwSinglePrec libunwind suitesparse glpk ncurses libunistring patchelf
];
configurePhase = ''
for i in GMP LLVM PCRE BLAS LAPACK READLINE FFTW LIBUNWIND SUITESPARSE GLPK;
do
sed -e "s@USE_SYSTEM_$i=0@USE_SYSTEM_$i=1@" -i Make.inc;
done
sed -e 's@-lcurses@@g' -i Make.inc
copy_kill_hash(){
cp "$1" "$2/$(basename "$1" | sed -e 's/^[a-z0-9]*-//')"
}
for i in "${grisu_src}" "${dsfmt_src}" "${arpack_src}" "${clp_src}" "${lighttpd_src}" ; do
copy_kill_hash "$i" deps
done
copy_kill_hash "${dsfmt_src}" deps/random
sed -e '/cd SuiteSparse-SYSTEM/,+1s@find /lib /usr/lib /usr/local/lib@find ${suitesparse}/lib@' -i deps/Makefile
${if realGcc ==null then "" else
''export NIX_LDFLAGS="$NIX_LDFLAGS -L${realGcc}/lib -L${realGcc}/lib64 -lpcre -llapack -lm -lfftw3f -lfftw3 -lglpk -lunistring "''}
sed -e 's@ cpp @ gcc -E @g' -i base/Makefile
sed -e '1s@#! */bin/bash@#!${stdenv.shell}@' -i deps/*.sh
export LDFLAGS="-L${suitesparse}/lib"
mkdir -p "$out/lib"
sed -e "s@/usr/local/lib@$out/lib@g" -i deps/Makefile
sed -e "s@/usr/lib@$out/lib@g" -i deps/Makefile
sed -e '/libumfpack.a/s@find @find ${suitesparse}/lib @' -i deps/Makefile
export makeFlags="$makeFlags PREFIX=\"$out\" USR=\"$out\""
sed -e 's@openblas@blas@' -i base/*.jl
sed -e '/install -v julia-release-webserver/d' -i Makefile
export dontPatchELF=1
'';
postInstall = ''
ln -s "$out/share/julia/julia" "$out/bin"
mkdir -p "$out/share/julia/ui/"
cp -r ui/website "$out/share/julia/ui/"
cp deps/lighttpd.conf "$out/share/julia/ui/"
mkdir -p "$out/share/julia/ui/webserver/"
cp -r ui/webserver/{*.jl,*.h} "$out/share/julia/ui/webserver/"
echo -e '#!/bin/sh' >> "$out/bin/julia-webserver"
echo -e "cd \"$out/share/julia\"" >> "$out/bin/julia-webserver"
echo -e '${lighttpd}/sbin/lighttpd -D -f ./ui/lighttpd.conf &' >> "$out/bin/julia-webserver"
echo -e '../../bin/julia-release-webserver -p 2001' >> "$out/bin/julia-webserver"
chmod a+x "$out/bin/julia-webserver"
'';
meta = {
description = "High-level performance-oriented dynamical language for technical computing.";
homepage = "http://julialang.org/";
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.raskin ];
platforms = with stdenv.lib.platforms; linux;
};
}

View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, perl, groff, llvm, cmake, darwinInstallNameToolUtility }:
{ stdenv, fetchurl, perl, groff, llvm, cmake }:
let version = "3.0"; in
stdenv.mkDerivation {
name = "clang-${version}";
buildInputs = [ perl llvm groff cmake ] ++ stdenv.lib.optional stdenv.isDarwin darwinInstallNameToolUtility;
buildInputs = [ perl llvm groff cmake ];
patches = stdenv.lib.optionals (stdenv.gcc.libc != null)
[ ./clang-include-paths.patch ./clang-ld-flags.patch ];

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, perl, groff, darwinSwVersUtility, darwinInstallNameToolUtility, cmake }:
{ stdenv, fetchurl, perl, groff, cmake }:
let version = "3.0"; in
@ -10,8 +10,7 @@ stdenv.mkDerivation {
sha256 = "0xq4gi7lflv8ilfckslhfvnja5693xjii1yvzz39kklr6hfv37ji";
};
buildInputs = [ perl groff cmake ] ++
stdenv.lib.optionals stdenv.isDarwin [ darwinSwVersUtility darwinInstallNameToolUtility ];
buildInputs = [ perl groff cmake ];
cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ];

View file

@ -5,18 +5,18 @@ stdenv.mkDerivation rec {
binSrc =
if stdenv.system == "i686-linux" then (fetchurl {
url = "http://mlton.org/pages/Download/attachments/${name}-1.x86-linux.static.tgz";
url = "http://sourceforge.net/projects/mlton/files/mlton/20100608/${name}-1.x86-linux.static.tgz";
sha256 = "16qg8df9hg2pmnsblkgxp6bgm7334rsqkxqzskv5fl21wivmnwfw";
})
else if stdenv.system == "x86_64-linux" then (fetchurl {
url = "http://mlton.org/pages/Download/attachments/${name}-1.amd64-linux.static.tgz";
url = "http://sourceforge.net/projects/mlton/files/mlton/20100608/${name}-1.amd64-linux.static.tgz";
sha256 = "0i6ic8f6prl0cigrmf6bj9kqz3plzappxn17lz1rg2v832nfbw9r";
})
else throw "Architecture not supported";
codeSrc =
fetchurl {
url = "http://mlton.org/pages/Download/attachments/${name}.src.tgz";
url = "http://sourceforge.net/projects/mlton/files/mlton/20100608/${name}.src.tgz";
sha256 = "0cqb3k6ld9965hyyfyayi510f205vqzd5qqm3crh13nasvq2rjzj";
};
@ -30,9 +30,7 @@ stdenv.mkDerivation rec {
configurePhase = ''
# Fix paths in the source.
for f in $(find $(pwd) -type f ) ; do
substituteInPlace $f --replace '/usr/bin/env bash' $(type -p bash)
done
find . -type f | grep -v -e '\.tgz''$' | xargs sed -i "s@/usr/bin/env bash@$(type -p bash)@"
substituteInPlace $(pwd)/Makefile --replace '/bin/cp' $(type -p cp)

View file

@ -1,8 +1,8 @@
{ stdenv, fetchurl, ncurses, x11 }:
let
useX11 = stdenv.system != "armv5tel-linux";
useNativeCompilers = stdenv.system != "armv5tel-linux";
useX11 = !stdenv.isArm;
useNativeCompilers = !stdenv.isArm;
inherit (stdenv.lib) optionals optionalString;
in

View file

@ -14,9 +14,9 @@ stdenv.mkDerivation (rec {
prefixKey = "-prefix ";
configureFlags = ["-no-tk"];
buildFlags = "world" +
(if (stdenv.system != "armv5tel-linux") then "bootstrap world.opt" else "");
(if !stdenv.isArm then "bootstrap world.opt" else "");
buildInputs = [ncurses];
installTargets = "install" + (if (stdenv.system != "armv5tel-linux") then "installopt" else "");
installTargets = "install" + (if !stdenv.isArm then "installopt" else "");
patchPhase = ''
CAT=$(type -tp cat)
sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang

View file

@ -1,9 +1,9 @@
rec {
version="1.0.55";
name="sbcl-1.0.55";
hash="1b87s99d000khjpg8i7bcp28mph8812axwfh64a6qarhkixnl8g3";
url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.55/sbcl-1.0.55-source.tar.bz2";
advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.55/sbcl-1.0.55-source.tar.bz2";
version="1.0.56";
name="sbcl-1.0.56";
hash="0cq5hyzv3nnva0y1y6zjyd7rfdwwpxswnvmbfmqvhihz72ivyl1w";
url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.56/sbcl-1.0.56-source.tar.bz2";
advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.56/sbcl-1.0.56-source.tar.bz2";
}

View file

@ -3,11 +3,11 @@
# at runtime, need jre or jdk
stdenv.mkDerivation rec {
name = "scala-2.8.1";
name = "scala-2.9.2";
src = fetchurl {
url = "http://www.scala-lang.org/downloads/distrib/files/${name}.final.tgz";
sha256 = "0lf76fclvd5l2as3gvzx9jc1b9narx4j046111bmbkcwqw7iw8bl";
url = "http://www.scala-lang.org/downloads/distrib/files/${name}.tgz";
sha256 = "0s1shpzw2hyz7bwxdqq19rcrzbpq4d7b0kvdvjvhy7h05x496b46";
};
installPhase = ''

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