diff --git a/STABLE b/STABLE deleted file mode 100644 index c227083464f..00000000000 --- a/STABLE +++ /dev/null @@ -1 +0,0 @@ -0 \ No newline at end of file diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix new file mode 100644 index 00000000000..ca8565ac323 --- /dev/null +++ b/pkgs/applications/audio/a2jmidid/default.nix @@ -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 ]; + + }; +} diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index f2e2a130c0a..72b58b5b33e 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -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; diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix new file mode 100644 index 00000000000..18a31460987 --- /dev/null +++ b/pkgs/applications/audio/easytag/default.nix @@ -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; + }; +} \ No newline at end of file diff --git a/pkgs/applications/audio/gigedit/default.nix b/pkgs/applications/audio/gigedit/default.nix new file mode 100644 index 00000000000..be6970f01e1 --- /dev/null +++ b/pkgs/applications/audio/gigedit/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/applications/audio/linuxsampler/default.nix b/pkgs/applications/audio/linuxsampler/default.nix new file mode 100644 index 00000000000..a100390c270 --- /dev/null +++ b/pkgs/applications/audio/linuxsampler/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/applications/audio/pianobooster/default.nix b/pkgs/applications/audio/pianobooster/default.nix new file mode 100644 index 00000000000..d5cdffbed95 --- /dev/null +++ b/pkgs/applications/audio/pianobooster/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index 4cdea1a21ce..01fa24a065e 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -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 ]; diff --git a/pkgs/applications/audio/qsampler/default.nix b/pkgs/applications/audio/qsampler/default.nix new file mode 100644 index 00000000000..7cfe73c9c75 --- /dev/null +++ b/pkgs/applications/audio/qsampler/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/applications/editors/emacs-23/default.nix b/pkgs/applications/editors/emacs-23/default.nix index a1a9aa4fa32..7b1ecf9d2fe 100644 --- a/pkgs/applications/editors/emacs-23/default.nix +++ b/pkgs/applications/editors/emacs-23/default.nix @@ -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 = diff --git a/pkgs/applications/editors/emacs-modes/magit/default.nix b/pkgs/applications/editors/emacs-modes/magit/default.nix index 1af31c2ba5c..f096d3b0057 100644 --- a/pkgs/applications/editors/emacs-modes/magit/default.nix +++ b/pkgs/applications/editors/emacs-modes/magit/default.nix @@ -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]; diff --git a/pkgs/applications/editors/kdevelop/4.3.0.nix b/pkgs/applications/editors/kdevelop/4.3.0.nix deleted file mode 100644 index 92b4da5280a..00000000000 --- a/pkgs/applications/editors/kdevelop/4.3.0.nix +++ /dev/null @@ -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; - }; -} diff --git a/pkgs/applications/editors/kdevelop/default.nix b/pkgs/applications/editors/kdevelop/default.nix index e5b749c3794..92b4da5280a 100644 --- a/pkgs/applications/editors/kdevelop/default.nix +++ b/pkgs/applications/editors/kdevelop/default.nix @@ -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"; diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix index 47d5aab04ee..0d765a0ad5c 100644 --- a/pkgs/applications/editors/zile/default.nix +++ b/pkgs/applications/editors/zile/default.nix @@ -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 ]; diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index d6e1a6c1119..4d3b1a12b62 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -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 = diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 9ee87fe3062..d8e69e29639 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -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"; diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index e4899bfc463..51e765bb690 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -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 diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index a92e2fd37b0..5a1fa56ddc6 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -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" ]; }; } diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix index aa8b1b2b29f..a1297d64a18 100644 --- a/pkgs/applications/misc/rxvt_unicode/default.nix +++ b/pkgs/applications/misc/rxvt_unicode/default.nix @@ -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 = diff --git a/pkgs/applications/misc/vue/default.nix b/pkgs/applications/misc/vue/default.nix index 8caa86a71cb..c90e4d24f37 100644 --- a/pkgs/applications/misc/vue/default.nix +++ b/pkgs/applications/misc/vue/default.nix @@ -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 { diff --git a/pkgs/applications/networking/browsers/firefox/9.0.nix b/pkgs/applications/networking/browsers/firefox/12.0.nix similarity index 94% rename from pkgs/applications/networking/browsers/firefox/9.0.nix rename to pkgs/applications/networking/browsers/firefox/12.0.nix index 327f454f578..d4b90d2726f 100644 --- a/pkgs/applications/networking/browsers/firefox/9.0.nix +++ b/pkgs/applications/networking/browsers/firefox/12.0.nix @@ -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 = { diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index b8cb5b11a6b..01f4fb901fd 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -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 ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/preload.c b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/preload.c index 2ebcc2a40b1..9c543fed758 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/preload.c +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/preload.c @@ -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); diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix index e4494f95656..071dcd37117 100644 --- a/pkgs/applications/networking/browsers/vimprobable2/default.nix +++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix @@ -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 "]; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.aforemny ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index f8d97a4f167..f1a906f9250 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -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; }; diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index dc4fee41fa0..9dd352857fb 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -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 ]; diff --git a/pkgs/applications/networking/mailreaders/thunderbird/11.x.nix b/pkgs/applications/networking/mailreaders/thunderbird/11.x.nix index c0de194ba99..0c8ba4b05ff 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/11.x.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/11.x.nix @@ -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; diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index 5d5d6128bb4..be67c289814 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -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 = '' diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix index 145414e5c3d..f86901d5dde 100644 --- a/pkgs/applications/networking/p2p/mldonkey/default.nix +++ b/pkgs/applications/networking/p2p/mldonkey/default.nix @@ -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 diff --git a/pkgs/applications/networking/p2p/mldonkey/gcc44mips64.patch b/pkgs/applications/networking/p2p/mldonkey/gcc44mips64.patch deleted file mode 100644 index 41449dcdd05..00000000000 --- a/pkgs/applications/networking/p2p/mldonkey/gcc44mips64.patch +++ /dev/null @@ -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 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 -+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 -+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)); diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index e3b042aa810..b6906c86afe 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/pkgs/applications/networking/sync/unison/default.nix @@ -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 { diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 7dcc3c0b006..dcf6ccd7d9b 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -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 ]; diff --git a/pkgs/applications/science/logic/lci/default.nix b/pkgs/applications/science/logic/lci/default.nix new file mode 100644 index 00000000000..e2aff9313e9 --- /dev/null +++ b/pkgs/applications/science/logic/lci/default.nix @@ -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; + }; +} diff --git a/pkgs/applications/science/logic/tptp/default.nix b/pkgs/applications/science/logic/tptp/default.nix index 11b8f7ce535..ecd70843e0f 100644 --- a/pkgs/applications/science/logic/tptp/default.nix +++ b/pkgs/applications/science/logic/tptp/default.nix @@ -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 { diff --git a/pkgs/applications/science/math/gap/default.nix b/pkgs/applications/science/math/gap/default.nix index 50457ff0353..f76640567f6 100644 --- a/pkgs/applications/science/math/gap/default.nix +++ b/pkgs/applications/science/math/gap/default.nix @@ -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 diff --git a/pkgs/applications/version-management/darcs/default.nix b/pkgs/applications/version-management/darcs/default.nix index 60b9309bbdc..4ce820b7876 100644 --- a/pkgs/applications/version-management/darcs/default.nix +++ b/pkgs/applications/version-management/darcs/default.nix @@ -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 = { diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 376e5286b05..6d69c9f8131 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -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; }; diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index ecdb0811996..82d333d1783 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -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"; diff --git a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix new file mode 100644 index 00000000000..5e6b9fdc243 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index f859dcf96b0..64f9cf36270 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -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 ]; diff --git a/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix new file mode 100644 index 00000000000..ae928fa2d4d --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix @@ -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]; + +} diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 19c7c0e9f91..24e1b95bf0c 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -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 diff --git a/pkgs/applications/version-management/tailor/default.nix b/pkgs/applications/version-management/tailor/default.nix index 67567679b90..54529503d82 100644 --- a/pkgs/applications/version-management/tailor/default.nix +++ b/pkgs/applications/version-management/tailor/default.nix @@ -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"; }; diff --git a/pkgs/applications/video/dvdauthor/build-against-libpng15.patch b/pkgs/applications/video/dvdauthor/build-against-libpng15.patch new file mode 100644 index 00000000000..8e62cef35af --- /dev/null +++ b/pkgs/applications/video/dvdauthor/build-against-libpng15.patch @@ -0,0 +1,27 @@ +commit c82aaa4eb1a1c36bf7e2b7ae3c9140d0bf8000b5 +Author: Lawrence D'Oliveiro +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 + + #include ++#include + + #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); diff --git a/pkgs/applications/video/dvdauthor/default.nix b/pkgs/applications/video/dvdauthor/default.nix index 8c64721bc7e..c72e9b892db 100644 --- a/pkgs/applications/video/dvdauthor/default.nix +++ b/pkgs/applications/video/dvdauthor/default.nix @@ -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"; diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix index f8415bbe22a..db6bde782b9 100644 --- a/pkgs/applications/video/gnash/default.nix +++ b/pkgs/applications/video/gnash/default.nix @@ -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", diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index b11016ae65d..51ef6c5b39e 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -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 : diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 350b73e339f..a2a8cff84d2 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -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 = diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index f9adf6132f5..a11e4ee8218 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -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 diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix new file mode 100644 index 00000000000..04e50f80827 --- /dev/null +++ b/pkgs/applications/window-managers/i3/default.nix @@ -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; + }; + +} diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix new file mode 100644 index 00000000000..a1d7409eaf2 --- /dev/null +++ b/pkgs/applications/window-managers/i3/lock.nix @@ -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; + }; + +} diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix new file mode 100644 index 00000000000..a60db1b3802 --- /dev/null +++ b/pkgs/applications/window-managers/i3/status.nix @@ -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; + }; + +} diff --git a/pkgs/applications/window-managers/xmonad/default.nix b/pkgs/applications/window-managers/xmonad/default.nix index c89088e400b..a490bc8018d 100644 --- a/pkgs/applications/window-managers/xmonad/default.nix +++ b/pkgs/applications/window-managers/xmonad/default.nix @@ -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"; diff --git a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix index ce3b9fed7b7..ac0be1e70c4 100644 --- a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix +++ b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix @@ -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"; diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix index 1bfada4fb62..63e4481e4e3 100644 --- a/pkgs/build-support/buildenv/default.nix +++ b/pkgs/build-support/buildenv/default.nix @@ -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" diff --git a/pkgs/build-support/clang-wrapper/default.nix b/pkgs/build-support/clang-wrapper/default.nix index 8e9fb4d9de4..165e3bace90 100644 --- a/pkgs/build-support/clang-wrapper/default.nix +++ b/pkgs/build-support/clang-wrapper/default.nix @@ -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") diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index cd52c1ce17c..0491e4994b6 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -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 = [ diff --git a/pkgs/build-support/gcc-wrapper/default.nix b/pkgs/build-support/gcc-wrapper/default.nix index f0062f8191e..d3fe5a0569f 100644 --- a/pkgs/build-support/gcc-wrapper/default.nix +++ b/pkgs/build-support/gcc-wrapper/default.nix @@ -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") diff --git a/pkgs/build-support/native-darwin-cctools-wrapper/builder.sh b/pkgs/build-support/native-darwin-cctools-wrapper/builder.sh index 2e2e125c649..f412ee7caf0 100644 --- a/pkgs/build-support/native-darwin-cctools-wrapper/builder.sh +++ b/pkgs/build-support/native-darwin-cctools-wrapper/builder.sh @@ -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" <> $out/nix-support/hydra-build-products done diff --git a/pkgs/build-support/release/source-tarball.nix b/pkgs/build-support/release/source-tarball.nix index 45a87156748..85d0b29f5b7 100644 --- a/pkgs/build-support/release/source-tarball.nix +++ b/pkgs/build-support/release/source-tarball.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation ( buildInputs = buildInputs ++ bootstrapBuildInputs; - postHook = '' + preUnpack = '' mkdir -p $out/nix-support ''; diff --git a/pkgs/build-support/substitute/substitute-all.nix b/pkgs/build-support/substitute/substitute-all.nix index 6c0f970a392..fb26894661d 100644 --- a/pkgs/build-support/substitute/substitute-all.nix +++ b/pkgs/build-support/substitute/substitute-all.nix @@ -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) diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index c8f0272daf8..474d43c30ff 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -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")" diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 5c3d66595af..b2fd4db4e75 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -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 diff --git a/pkgs/desktops/kde-4.7/kdegraphics/okular.nix b/pkgs/desktops/kde-4.7/kdegraphics/okular.nix index c322767eb43..0c5c7b49b17 100644 --- a/pkgs/desktops/kde-4.7/kdegraphics/okular.nix +++ b/pkgs/desktops/kde-4.7/kdegraphics/okular.nix @@ -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"; diff --git a/pkgs/desktops/kde-4.8/default.nix b/pkgs/desktops/kde-4.8/default.nix index 6404173bb12..7b85e8c198e 100644 --- a/pkgs/desktops/kde-4.8/default.nix +++ b/pkgs/desktops/kde-4.8/default.nix @@ -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 diff --git a/pkgs/desktops/kde-4.8/files/kde-base-artwork-nokde.patch b/pkgs/desktops/kde-4.8/files/kde-base-artwork-nokde.patch deleted file mode 100644 index a7bdeacf9f5..00000000000 --- a/pkgs/desktops/kde-4.8/files/kde-base-artwork-nokde.patch +++ /dev/null @@ -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 ) diff --git a/pkgs/desktops/kde-4.8/kde-base-artwork.nix b/pkgs/desktops/kde-4.8/kde-base-artwork.nix deleted file mode 100644 index 3a582c35489..00000000000 --- a/pkgs/desktops/kde-4.8/kde-base-artwork.nix +++ /dev/null @@ -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"; - }; -} diff --git a/pkgs/desktops/kde-4.8/kde-package/4.8.1.nix b/pkgs/desktops/kde-4.8/kde-package/4.8.1.nix deleted file mode 100644 index 42dadd9e434..00000000000 --- a/pkgs/desktops/kde-4.8/kde-package/4.8.1.nix +++ /dev/null @@ -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;} -]; -} diff --git a/pkgs/desktops/kde-4.8/kde-package/4.8.2.nix b/pkgs/desktops/kde-4.8/kde-package/4.8.2.nix new file mode 100644 index 00000000000..16878de7175 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kde-package/4.8.2.nix @@ -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;} +]; +} diff --git a/pkgs/desktops/kde-4.8/kde-runtime.nix b/pkgs/desktops/kde-4.8/kde-runtime.nix index 6f2e4cf0e65..a3b687404cc 100644 --- a/pkgs/desktops/kde-4.8/kde-runtime.nix +++ b/pkgs/desktops/kde-4.8/kde-runtime.nix @@ -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"; }; diff --git a/pkgs/desktops/kde-4.8/kde-wallpapers.nix b/pkgs/desktops/kde-4.8/kde-wallpapers.nix index 1cec814b81e..4fadc9edf00 100644 --- a/pkgs/desktops/kde-4.8/kde-wallpapers.nix +++ b/pkgs/desktops/kde-4.8/kde-wallpapers.nix @@ -9,7 +9,7 @@ kde { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "326b19180e1a03c9fbf5e99f1a3ee6d4dfd0bd6fde5c0ef4b7a5608b20e75a5f"; + outputHash = "69cbb2e8c6fd78931af7196c3a79918f87b5aed31c52521b8d4089eb98e7557b"; meta = { description = "Wallpapers for KDE"; diff --git a/pkgs/desktops/kde-4.8/kdegraphics/okular.nix b/pkgs/desktops/kde-4.8/kdegraphics/okular.nix index c322767eb43..0c5c7b49b17 100644 --- a/pkgs/desktops/kde-4.8/kdegraphics/okular.nix +++ b/pkgs/desktops/kde-4.8/kdegraphics/okular.nix @@ -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"; diff --git a/pkgs/desktops/kde-4.8/kdeutils/ksecrets-ftbfs.patch b/pkgs/desktops/kde-4.8/kdeutils/ksecrets-ftbfs.patch deleted file mode 100644 index 24a68e11440..00000000000 --- a/pkgs/desktops/kde-4.8/kdeutils/ksecrets-ftbfs.patch +++ /dev/null @@ -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 ############### - diff --git a/pkgs/desktops/kde-4.8/kdeutils/ksecrets.nix b/pkgs/desktops/kde-4.8/kdeutils/ksecrets.nix deleted file mode 100644 index da9b7f0861c..00000000000 --- a/pkgs/desktops/kde-4.8/kdeutils/ksecrets.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs, qca2 }: - -kde { - buildInputs = [ kdelibs qca2 ]; - - patches = [ ./ksecrets-ftbfs.patch ]; - - meta = { - description = "KDE implementation of SecretsService"; - }; -} diff --git a/pkgs/desktops/kde-4.8/l10n/manifest-4.8.1.nix b/pkgs/desktops/kde-4.8/l10n/manifest-4.8.1.nix deleted file mode 100644 index a9b64d21561..00000000000 --- a/pkgs/desktops/kde-4.8/l10n/manifest-4.8.1.nix +++ /dev/null @@ -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"; -} -] diff --git a/pkgs/desktops/kde-4.8/l10n/manifest-4.8.2.nix b/pkgs/desktops/kde-4.8/l10n/manifest-4.8.2.nix new file mode 100644 index 00000000000..20734ec9424 --- /dev/null +++ b/pkgs/desktops/kde-4.8/l10n/manifest-4.8.2.nix @@ -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"; +} +] diff --git a/pkgs/desktops/kde-4.8/oxygen-icons.nix b/pkgs/desktops/kde-4.8/oxygen-icons.nix index 7f02e1e9077..32af5be1799 100644 --- a/pkgs/desktops/kde-4.8/oxygen-icons.nix +++ b/pkgs/desktops/kde-4.8/oxygen-icons.nix @@ -3,7 +3,7 @@ kde { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "78f35ceba58bd34059ca4b2107bb55d4de56733e8932ba2ea22dcac18ee995ce"; + outputHash = "973f53b59e31e1e1dca41aa5abf0fc50e9cf0cbee57f156d90c2e754f33cc1b9"; buildNativeInputs = [ cmake ]; diff --git a/pkgs/development/compilers/ecl/src-for-default.nix b/pkgs/development/compilers/ecl/src-for-default.nix index 4de9821c3a7..1baaf4bbec4 100644 --- a/pkgs/development/compilers/ecl/src-for-default.nix +++ b/pkgs/development/compilers/ecl/src-for-default.nix @@ -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"; } diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix new file mode 100644 index 00000000000..bb9c6d75d44 --- /dev/null +++ b/pkgs/development/compilers/fsharp/default.nix @@ -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; + }; +} diff --git a/pkgs/development/compilers/gcc/4.2-apple64/default.nix b/pkgs/development/compilers/gcc/4.2-apple64/default.nix index 9f46f1da1e4..011086164ad 100644 --- a/pkgs/development/compilers/gcc/4.2-apple64/default.nix +++ b/pkgs/development/compilers/gcc/4.2-apple64/default.nix @@ -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; diff --git a/pkgs/development/compilers/gcc/4.2-apple64/no-sys-dirs.patch b/pkgs/development/compilers/gcc/4.2-apple64/no-sys-dirs.patch index b7b93d6944c..69f9d9d14c6 100644 --- a/pkgs/development/compilers/gcc/4.2-apple64/no-sys-dirs.patch +++ b/pkgs/development/compilers/gcc/4.2-apple64/no-sys-dirs.patch @@ -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 diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index bceaf2b4426..3955455df4c 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -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 diff --git a/pkgs/development/compilers/ghc/7.0.2.nix b/pkgs/development/compilers/ghc/7.0.2.nix index c0ba5f1fe09..426c8725d0b 100644 --- a/pkgs/development/compilers/ghc/7.0.2.nix +++ b/pkgs/development/compilers/ghc/7.0.2.nix @@ -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" diff --git a/pkgs/development/compilers/ghc/7.0.3.nix b/pkgs/development/compilers/ghc/7.0.3.nix index f6e4d81029a..ad80dd9e79d 100644 --- a/pkgs/development/compilers/ghc/7.0.3.nix +++ b/pkgs/development/compilers/ghc/7.0.3.nix @@ -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" diff --git a/pkgs/development/compilers/ghc/7.0.4.nix b/pkgs/development/compilers/ghc/7.0.4.nix index 7230b9069e7..1cafdd51bee 100644 --- a/pkgs/development/compilers/ghc/7.0.4.nix +++ b/pkgs/development/compilers/ghc/7.0.4.nix @@ -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" diff --git a/pkgs/development/compilers/ghc/7.2.1.nix b/pkgs/development/compilers/ghc/7.2.1.nix index f2c3acff59c..3938d608d33 100644 --- a/pkgs/development/compilers/ghc/7.2.1.nix +++ b/pkgs/development/compilers/ghc/7.2.1.nix @@ -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" diff --git a/pkgs/development/compilers/ghc/7.2.2.nix b/pkgs/development/compilers/ghc/7.2.2.nix index 358f41dcf08..0450537ad90 100644 --- a/pkgs/development/compilers/ghc/7.2.2.nix +++ b/pkgs/development/compilers/ghc/7.2.2.nix @@ -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" diff --git a/pkgs/development/compilers/ghc/7.4.1.nix b/pkgs/development/compilers/ghc/7.4.1.nix index 62d49910e9a..95590518a28 100644 --- a/pkgs/development/compilers/ghc/7.4.1.nix +++ b/pkgs/development/compilers/ghc/7.4.1.nix @@ -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" diff --git a/pkgs/development/compilers/ghc/7.4.2.nix b/pkgs/development/compilers/ghc/7.4.2.nix new file mode 100644 index 00000000000..1ea9e24a120 --- /dev/null +++ b/pkgs/development/compilers/ghc/7.4.2.nix @@ -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; + }; + +} diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 0a08cc3a4e7..66b939cdfed 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -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" diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix new file mode 100644 index 00000000000..afef8818405 --- /dev/null +++ b/pkgs/development/compilers/julia/default.nix @@ -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; + }; +} diff --git a/pkgs/development/compilers/llvm/clang.nix b/pkgs/development/compilers/llvm/clang.nix index 3319744ab48..663e1bfab28 100644 --- a/pkgs/development/compilers/llvm/clang.nix +++ b/pkgs/development/compilers/llvm/clang.nix @@ -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 ]; diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 01b16fcda8d..0fb1cf82cc2 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -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" ]; diff --git a/pkgs/development/compilers/mlton/default.nix b/pkgs/development/compilers/mlton/default.nix index c7217f820a7..770a6b17b15 100644 --- a/pkgs/development/compilers/mlton/default.nix +++ b/pkgs/development/compilers/mlton/default.nix @@ -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) diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix index 155523ebe56..44fe2d139d8 100644 --- a/pkgs/development/compilers/ocaml/3.12.1.nix +++ b/pkgs/development/compilers/ocaml/3.12.1.nix @@ -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 diff --git a/pkgs/development/compilers/ocaml/cvs.nix b/pkgs/development/compilers/ocaml/cvs.nix index 475a1d46d58..cc40ca9aac5 100644 --- a/pkgs/development/compilers/ocaml/cvs.nix +++ b/pkgs/development/compilers/ocaml/cvs.nix @@ -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 diff --git a/pkgs/development/compilers/sbcl/src-for-default.nix b/pkgs/development/compilers/sbcl/src-for-default.nix index beb4c61e377..66e389947a0 100644 --- a/pkgs/development/compilers/sbcl/src-for-default.nix +++ b/pkgs/development/compilers/sbcl/src-for-default.nix @@ -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"; } diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index f50c15a3a0b..340076cc137 100644 --- a/pkgs/development/compilers/scala/default.nix +++ b/pkgs/development/compilers/scala/default.nix @@ -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 = '' diff --git a/pkgs/development/compilers/uhc/default.nix b/pkgs/development/compilers/uhc/default.nix index d2fe6150374..b7b2cb4cb62 100644 --- a/pkgs/development/compilers/uhc/default.nix +++ b/pkgs/development/compilers/uhc/default.nix @@ -1,19 +1,18 @@ -{ stdenv, coreutils, glibc, fetchsvn, m4, libtool, ghc, uulib +{ stdenv, coreutils, glibc, fetchgit, m4, libtool, ghc, uulib , uuagc, mtl, network, binary, llvm, fgl, syb }: -let - revision = "2495"; -in stdenv.mkDerivation { - name = "uhc-svn-${revision}"; + name = "uhc-svn-git20120412"; - src = fetchsvn { - url = "https://subversion.cs.uu.nl/repos/project.UHC.pub/trunk/EHC"; - rev = revision; - sha256 = "0402cb05629454e29bdca02051406bc9e515d2525a785c85079469b674378fca"; + src = fetchgit { + url = "https://github.com/UU-ComputerScience/uhc.git"; + rev = "eef10f64d84bc0aa145121f2a61accea03b9bc76"; + sha256 = "c867d22423adb17396a28eef030c53f282b1443db2149aa7b8ab659ac7c18576"; }; + postUnpack = "sourceRoot=\${sourceRoot}/EHC"; + propagatedBuildInputs = [mtl network binary fgl syb]; buildInputs = [coreutils m4 ghc libtool uulib uuagc]; diff --git a/pkgs/development/interpreters/clojure/binary.nix b/pkgs/development/interpreters/clojure/binary.nix index 8cf350e7e97..3902d7f335c 100644 --- a/pkgs/development/interpreters/clojure/binary.nix +++ b/pkgs/development/interpreters/clojure/binary.nix @@ -1,19 +1,22 @@ {stdenv, fetchurl, unzip}: -stdenv.mkDerivation { - name = "clojure-binary-1.2.1"; +stdenv.mkDerivation rec { + version = "1.4.0"; + name = "clojure-binary-${version}"; src = fetchurl { - url = https://github.com/downloads/clojure/clojure/clojure-1.2.1.zip; - sha256 = "1warps9z2cm3gmp0nlh8plgsr40yccr2vzcsxsq3yawhjkicx7k1"; + url = "http://repo1.maven.org/maven2/org/clojure/clojure/${version}/clojure-${version}.zip"; + sha256 = "27a5a151d5cc1bc3e52dff47c66111e637fefeb42d9bedfa1284a1a31d080171"; }; + buildInputs = [ unzip ]; phases = "unpackPhase installPhase"; installPhase = " mkdir -p $out/lib/java + cp clojure-${version}.jar clojure.jar install -t $out/lib/java clojure.jar "; diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index f68b89f0398..6c20ca71406 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -1,11 +1,12 @@ {stdenv, fetchurl, unzip, ant}: -stdenv.mkDerivation { - name = "clojure-1.2.1"; +stdenv.mkDerivation rec { + version = "1.4.0"; + name = "clojure-${version}"; src = fetchurl { - url = https://github.com/downloads/clojure/clojure/clojure-1.2.1.zip; - sha256 = "1warps9z2cm3gmp0nlh8plgsr40yccr2vzcsxsq3yawhjkicx7k1"; + url = "http://repo1.maven.org/maven2/org/clojure/clojure/${version}/clojure-${version}.zip"; + sha256 = "27a5a151d5cc1bc3e52dff47c66111e637fefeb42d9bedfa1284a1a31d080171"; }; buildInputs = [ unzip ant ]; diff --git a/pkgs/development/interpreters/kona/default.nix b/pkgs/development/interpreters/kona/default.nix index 7e4f1e408b4..cec0d35bde5 100644 --- a/pkgs/development/interpreters/kona/default.nix +++ b/pkgs/development/interpreters/kona/default.nix @@ -14,12 +14,12 @@ rec { srcDrv = a.fetchgit { url = "https://github.com/kevinlawler/kona.git"; inherit rev; - sha256 = "165ff5f3d1b510a1ad73ec465b4ed1b8ef44d7affa94f952781fea212c72d891"; + sha256 = "a8189c94fca3e62a740eb6823ab3fc571c0960ff5e7a3eb0353e5cf36ef9fdcb"; }; src = "${srcDrv}/"; - rev = "fddc2688ef515a653fb6"; + rev = "81e95b395144f4b02fe8782ad87c1f218b511c43"; version = "git-${rev}"; name = "kona-${version}"; inherit buildInputs; diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 132b66a7d28..dbbb0324d14 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -24,4 +24,11 @@ stdenv.mkDerivation rec { postInstall = '' cp test/fntests.log $out/share/octave/${name}-fntests.log ''; + + meta = { + homepage = http://octave.org/; + license = "GPLv3+"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; + }; } diff --git a/pkgs/development/interpreters/perl/5.10/default.nix b/pkgs/development/interpreters/perl/5.10/default.nix index 76928d10448..92e3d00e02d 100644 --- a/pkgs/development/interpreters/perl/5.10/default.nix +++ b/pkgs/development/interpreters/perl/5.10/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { '' configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3" - ${stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") '' + ${stdenv.lib.optionalString stdenv.isArm '' configureFlagsArray=(-Dldflags="-lm -lrt") ''} ''; diff --git a/pkgs/development/interpreters/perl/5.14/default.nix b/pkgs/development/interpreters/perl/5.14/default.nix index 75b15da3efd..00eaac6b1da 100644 --- a/pkgs/development/interpreters/perl/5.14/default.nix +++ b/pkgs/development/interpreters/perl/5.14/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { '' configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3" - ${stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") '' + ${stdenv.lib.optionalString stdenv.isArm '' configureFlagsArray=(-Dldflags="-lm -lrt") ''} ''; diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 4e36bfa1742..f87e1e3810f 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -1,11 +1,8 @@ { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2 , sqlite, tcl, tk, x11, openssl, readline, db4, ncurses, gdbm -, darwinArchUtility ? null, darwinSwVersUtility ? null }: assert zlibSupport -> zlib != null; -assert stdenv.isDarwin -> darwinArchUtility != null; -assert stdenv.isDarwin -> darwinSwVersUtility != null; with stdenv.lib; @@ -33,8 +30,7 @@ let buildInputs = optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++ [ bzip2 ] - ++ optional zlibSupport zlib - ++ optionals stdenv.isDarwin [ darwinArchUtility darwinSwVersUtility ]; + ++ optional zlibSupport zlib; # Build the basic Python interpreter without modules that have diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 98693737676..e4d3d057570 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -1,11 +1,8 @@ { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2 , sqlite, tcl, tk, x11, openssl, readline, db4, ncurses, gdbm -, darwinArchUtility ? null, darwinSwVersUtility ? null }: assert zlibSupport -> zlib != null; -assert stdenv.isDarwin -> darwinArchUtility != null; -assert stdenv.isDarwin -> darwinSwVersUtility != null; with stdenv.lib; @@ -39,8 +36,7 @@ let buildInputs = optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++ [ bzip2 openssl ] - ++ optional zlibSupport zlib - ++ optionals stdenv.isDarwin [ darwinArchUtility darwinSwVersUtility ]; + ++ optional zlibSupport zlib; ensurePurity = '' @@ -172,6 +168,8 @@ let deps = [ sqlite ]; }; + ssl = null; + tkinter = buildInternalPythonModule { moduleName = "tkinter"; deps = [ tcl tk x11 ]; diff --git a/pkgs/development/interpreters/python/3.1/default.nix b/pkgs/development/interpreters/python/3.1/default.nix deleted file mode 100644 index 892af52a919..00000000000 --- a/pkgs/development/interpreters/python/3.1/default.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ stdenv, fetchurl -, zlib -, bzip2 -, gdbm -, sqlite -, db4 -, ncurses -, readline -, openssl -, tcl, tk -, libX11, xproto -, arch ? null, sw_vers ? null -}: - -assert stdenv.isDarwin -> arch != null; -assert stdenv.isDarwin -> sw_vers != null; -assert readline != null -> ncurses != null; - -with stdenv.lib; - -let - majorVersion = "3.1"; - version = "${majorVersion}.3"; - - buildInputs = filter (p: p != null) [ - zlib bzip2 gdbm sqlite db4 readline ncurses openssl tcl tk libX11 xproto arch sw_vers - ]; -in -stdenv.mkDerivation { - name = "python3-${version}"; - inherit majorVersion version; - - src = fetchurl { - url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2"; - sha256 = "1jsqapgwrcqcaskyi2qdn1xj7l8x5340a137hdfshk5ya4dg9xkp"; - }; - - inherit buildInputs; - patches = [ ./search-path.patch ]; - - C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs); - LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs); - configureFlags = "--enable-shared --with-threads --enable-unicode --with-wctype-functions"; - - preConfigure = '' - for i in /usr /sw /opt /pkg; do # improve purity - substituteInPlace ./setup.py --replace $i /no-such-path - done - ${optionalString (ncurses != null) ''export NIX_LDFLAGS="$NIX_LDFLAGS -lncurses"''} - ${optionalString stdenv.isDarwin ''export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"''} - ''; - - setupHook = ./setup-hook.sh; - - postInstall = '' - rm -rf "$out/lib/python${majorVersion}/test" - ''; - - passthru = { - zlibSupport = zlib != null; - sqliteSupport = sqlite != null; - db4Support = db4 != null; - readlineSupport = readline != null; - opensslSupport = openssl != null; - tkSupport = (tk != null) && (tcl != null); - libPrefix = "python${majorVersion}"; - }; - - enableParallelBuilding = true; - - meta = { - homepage = "http://python.org"; - description = "a high-level dynamically-typed programming language"; - longDescription = '' - Python is a remarkably powerful dynamic programming language that - is used in a wide variety of application domains. Some of its key - distinguishing features include: clear, readable syntax; strong - introspection capabilities; intuitive object orientation; natural - expression of procedural code; full modularity, supporting - hierarchical packages; exception-based error handling; and very - high level dynamic data types. - ''; - license = stdenv.lib.licenses.psfl; - platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ simons chaoflow ]; - }; - -} diff --git a/pkgs/development/interpreters/python/3.1/search-path.patch b/pkgs/development/interpreters/python/3.1/search-path.patch deleted file mode 100644 index 2e7b7526c0c..00000000000 --- a/pkgs/development/interpreters/python/3.1/search-path.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -rc Python-2.4.4-orig/setup.py Python-2.4.4/setup.py -*** Python-2.4.4-orig/setup.py 2006-10-08 19:41:25.000000000 +0200 ---- Python-2.4.4/setup.py 2007-05-27 16:04:54.000000000 +0200 -*************** -*** 279,288 **** - # Check for AtheOS which has libraries in non-standard locations - if platform == 'atheos': - lib_dirs += ['/system/libs', '/atheos/autolnk/lib'] -- lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep) - inc_dirs += ['/system/include', '/atheos/autolnk/include'] -- inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep) - - # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb) - if platform in ['osf1', 'unixware7', 'openunix8']: - lib_dirs += ['/usr/ccs/lib'] ---- 279,289 ---- - # Check for AtheOS which has libraries in non-standard locations - if platform == 'atheos': - lib_dirs += ['/system/libs', '/atheos/autolnk/lib'] - inc_dirs += ['/system/include', '/atheos/autolnk/include'] - -+ lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep) -+ inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep) -+ - # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb) - if platform in ['osf1', 'unixware7', 'openunix8']: - lib_dirs += ['/usr/ccs/lib'] diff --git a/pkgs/development/interpreters/python/3.1/setup-hook.sh b/pkgs/development/interpreters/python/3.1/setup-hook.sh deleted file mode 100644 index 09a086714bb..00000000000 --- a/pkgs/development/interpreters/python/3.1/setup-hook.sh +++ /dev/null @@ -1,15 +0,0 @@ -addPythonPath() { - addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python3.1/site-packages -} - -toPythonPath() { - local paths="$1" - local result= - for i in $paths; do - p="$i/lib/python3.1/site-packages" - result="${result}${result:+:}$p" - done - echo $result -} - -envHooks=(${envHooks[@]} addPythonPath) diff --git a/pkgs/development/interpreters/python/3.2/default.nix b/pkgs/development/interpreters/python/3.2/default.nix index 1ab115f0469..64442f2e35b 100644 --- a/pkgs/development/interpreters/python/3.2/default.nix +++ b/pkgs/development/interpreters/python/3.2/default.nix @@ -1,29 +1,26 @@ { stdenv, fetchurl -, zlib , bzip2 -, gdbm -, sqlite , db4 -, ncurses -, readline -, openssl -, tcl, tk +, gdbm , libX11, xproto -, arch ? null, sw_vers ? null +, ncurses +, openssl +, readline +, sqlite +, tcl, tk +, zlib }: -assert stdenv.isDarwin -> arch != null; -assert stdenv.isDarwin -> sw_vers != null; assert readline != null -> ncurses != null; with stdenv.lib; let majorVersion = "3.2"; - version = "${majorVersion}"; + version = "${majorVersion}.3"; buildInputs = filter (p: p != null) [ - zlib bzip2 gdbm sqlite db4 readline ncurses openssl tcl tk libX11 xproto arch sw_vers + zlib bzip2 gdbm sqlite db4 readline ncurses openssl tcl tk libX11 xproto ]; in stdenv.mkDerivation { @@ -32,21 +29,20 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2"; - sha256 = "06awxchnv8gai6415pgzz2x8f1xi38v8a4anz6n39ciwq7v5zzbv"; + sha256 = "5648ec81f93870fde2f0aa4ed45c8718692b15ce6fd9ed309bfb827ae12010aa"; }; - inherit buildInputs; - - C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs); - LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs); - configureFlags = "--enable-shared --with-threads --enable-unicode --with-wctype-functions"; - preConfigure = '' for i in /usr /sw /opt /pkg; do # improve purity substituteInPlace ./setup.py --replace $i /no-such-path done - ${optionalString (ncurses != null) ''export NIX_LDFLAGS="$NIX_LDFLAGS -lncurses"''} - ${optionalString stdenv.isDarwin ''export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"''} + ${optionalString stdenv.isDarwin ''export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"''} + + configureFlagsArray=( --enable-shared --with-threads + CPPFLAGS="${concatStringsSep " " (map (p: "-I${p}/include") buildInputs)}" + LDFLAGS="${concatStringsSep " " (map (p: "-L${p}/lib") buildInputs)}" + LIBS="-lcrypt ${optionalString (ncurses != null) "-lncurses"}" + ) ''; setupHook = ./setup-hook.sh; @@ -61,7 +57,7 @@ stdenv.mkDerivation { db4Support = db4 != null; readlineSupport = readline != null; opensslSupport = openssl != null; - tkSupport = (tk != null) && (tcl != null); + tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null); libPrefix = "python${majorVersion}"; }; diff --git a/pkgs/development/interpreters/python/3.2/setup-hook.sh b/pkgs/development/interpreters/python/3.2/setup-hook.sh index 09a086714bb..e6fa34bf54b 100644 --- a/pkgs/development/interpreters/python/3.2/setup-hook.sh +++ b/pkgs/development/interpreters/python/3.2/setup-hook.sh @@ -1,12 +1,12 @@ addPythonPath() { - addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python3.1/site-packages + addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python3.2/site-packages } toPythonPath() { local paths="$1" local result= for i in $paths; do - p="$i/lib/python3.1/site-packages" + p="$i/lib/python3.2/site-packages" result="${result}${result:+:}$p" done echo $result diff --git a/pkgs/development/interpreters/tcl/default.nix b/pkgs/development/interpreters/tcl/default.nix index c9aa16ce28d..060aa3b5a6b 100644 --- a/pkgs/development/interpreters/tcl/default.nix +++ b/pkgs/development/interpreters/tcl/default.nix @@ -19,4 +19,8 @@ stdenv.mkDerivation { description = "The Tcl scription language"; homepage = http://www.tcl.tk/; }; + + passthru = { + libdir = "lib/tcl8.5"; + }; } diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index 7730e403d58..0789ef0ea7c 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, libdaemon, dbus, perl, perlXMLParser -, expat, gettext, intltool, glib, qt4 ? null, lib +, expat, gettext, intltool, glib, qt4 ? null, libiconvOrEmpty , qt4Support ? false , withLibdnssdCompat ? false }: @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { patches = [ ./no-mkdir-localstatedir.patch ]; buildInputs = [ libdaemon dbus perl perlXMLParser glib expat ] - ++ (lib.optional qt4Support qt4); + ++ (stdenv.lib.optional qt4Support qt4) + ++ libiconvOrEmpty; buildNativeInputs = [ pkgconfig gettext intltool ]; diff --git a/pkgs/development/libraries/boost/1.49-headers.nix b/pkgs/development/libraries/boost/1.49-headers.nix new file mode 100644 index 00000000000..58c0c19a17b --- /dev/null +++ b/pkgs/development/libraries/boost/1.49-headers.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "boost-1.49.0-headers"; + + src = fetchurl { + url = "mirror://sourceforge/boost/boost_1_49_0.tar.bz2"; + sha256 = "0g0d33942rm073jgqqvj3znm3rk45b2y2lplfjpyg9q7amzqlx6x"; + }; + + phases = [ "installPhase" ]; + + installPhase = '' + mkdir -p $out/include + tar xvf $src -C $out/include --strip-components=1 boost_1_49_0/boost + ''; + + meta = { + homepage = "http://boost.org/"; + description = "Boost C++ Library Collection"; + license = "boost-license"; + + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.viric ]; + }; +} diff --git a/pkgs/development/libraries/ccrtp/default.nix b/pkgs/development/libraries/ccrtp/default.nix index 5610588ea41..a6e426b164a 100644 --- a/pkgs/development/libraries/ccrtp/default.nix +++ b/pkgs/development/libraries/ccrtp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, pkgconfig, libgcrypt, ucommon }: stdenv.mkDerivation { - name = "ccrtp-2.0.2"; + name = "ccrtp-2.0.3"; src = fetchurl { - url = mirror://gnu/ccrtp/ccrtp-2.0.2.tar.gz; - sha256 = "1n42nscqwryz9f0jpg8lnv22x9m8mzr6rqir9cvbgm1r2skwjh4f"; + url = mirror://gnu/ccrtp/ccrtp-2.0.3.tar.gz; + sha256 = "1p4zzqn02zvnyjy84khiq8v65pl422fb6ni946h9sxh4yw2lgn01"; }; buildInputs = [ openssl pkgconfig libgcrypt ucommon ]; diff --git a/pkgs/development/libraries/dbus-cplusplus/default.nix b/pkgs/development/libraries/dbus-cplusplus/default.nix new file mode 100644 index 00000000000..2704b9586b1 --- /dev/null +++ b/pkgs/development/libraries/dbus-cplusplus/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, dbus, glib, gtkmm, pkgconfig }: + +stdenv.mkDerivation rec { + name = "dbus-cplusplus-${version}"; + version = "0.9.0"; + + src = fetchurl { + url = "mirror://sourceforge/dbus-cplusplus/dbus-c%2B%2B/0.9.0/libdbus-c%2B%2B-0.9.0.tar.gz"; + name = "dbus-cplusplus.tar.gz"; + sha256 = "0qafmy2i6dzx4n1dqp6pygyy6gjljnb7hwjcj2z11c1wgclsq4dw"; + }; + + buildInputs = [ dbus glib gtkmm pkgconfig ]; + + configureFlags = "--disable-ecore"; + + meta = with stdenv.lib; { + homepage = http://dbus-cplusplus.sourceforge.net; + description = "C++ API for D-BUS"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.goibhniu ]; + }; +} diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix index 771ae0dff5e..6884aca16fc 100644 --- a/pkgs/development/libraries/eigen/default.nix +++ b/pkgs/development/libraries/eigen/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://bitbucket.org/eigen/eigen/get/${v}.tar.bz2"; name = "eigen-${v}.tar.bz2"; - sha256 = "04lzlhl7r1yqkpq9xabm1v5vgz0z9xqf1k7indgwdw8nfyma3qar"; + sha256 = "1akcb4g5hvc664gfc6sxb6f6jrm55fgks6017wg0smyvmm6k09v0"; }; buildNativeInputs = [ cmake ]; diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 895d2585b67..e53a3c297ff 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (rec { "-DFT_CONFIG_OPTION_SUBPIXEL_RENDERING=1"; # The asm for armel is written with the 'asm' keyword. - CFLAGS = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "-std=gnu99"; + CFLAGS = stdenv.lib.optionalString stdenv.isArm "-std=gnu99"; meta = { description = "A font rendering engine"; diff --git a/pkgs/development/libraries/glibc/2.13/common.nix b/pkgs/development/libraries/glibc/2.13/common.nix index 7d17f21a914..86004de640a 100644 --- a/pkgs/development/libraries/glibc/2.13/common.nix +++ b/pkgs/development/libraries/glibc/2.13/common.nix @@ -16,7 +16,8 @@ let needsPortsNative = stdenv.isMips || stdenv.isArm; needsPortsCross = cross.arch == "mips" || cross.arch == "arm"; - needsPorts = if (stdenv ? cross) && stdenv.cross != null then true + needsPorts = + if (stdenv ? cross) && stdenv.cross != null && hurdHeaders == null then true else if cross == null then needsPortsNative else needsPortsCross; @@ -108,7 +109,7 @@ stdenv.mkDerivation ({ (if cross.float == "soft" then "--without-fp" else "--with-fp") "--enable-kernel=2.6.0" "--with-__thread" - ] ++ stdenv.lib.optionals (stdenv.system == "armv5tel-linux") [ + ] ++ stdenv.lib.optionals stdenv.isArm [ "--host=arm-linux-gnueabi" "--build=arm-linux-gnueabi" "--without-fp" @@ -184,7 +185,8 @@ stdenv.mkDerivation ({ meta = { homepage = http://www.gnu.org/software/libc/; - description = "The GNU C Library"; + description = "The GNU C Library" + + stdenv.lib.optionalString (hurdHeaders != null) ", for GNU/Hurd"; longDescription = '' Any Unix-like operating system needs a C library: the library which diff --git a/pkgs/development/libraries/glibc/2.13/default.nix b/pkgs/development/libraries/glibc/2.13/default.nix index 1b4e43b1013..f80ed9372e6 100644 --- a/pkgs/development/libraries/glibc/2.13/default.nix +++ b/pkgs/development/libraries/glibc/2.13/default.nix @@ -14,7 +14,9 @@ let cross = if gccCross != null then gccCross.target else null; in build cross ({ - name = "glibc${if debugSymbols then "-debug" else ""}"; + name = "glibc" + + stdenv.lib.optionalString (hurdHeaders != null) "-hurd" + + stdenv.lib.optionalString debugSymbols "-debug"; inherit fetchurl stdenv kernelHeaders installLocales profilingLibraries gccCross; diff --git a/pkgs/development/libraries/glibc/2.14/common.nix b/pkgs/development/libraries/glibc/2.14/common.nix index fcc07b71cf9..a8d0f661b72 100644 --- a/pkgs/development/libraries/glibc/2.14/common.nix +++ b/pkgs/development/libraries/glibc/2.14/common.nix @@ -108,7 +108,7 @@ stdenv.mkDerivation ({ (if cross.float == "soft" then "--without-fp" else "--with-fp") "--enable-kernel=2.6.0" "--with-__thread" - ] ++ stdenv.lib.optionals (stdenv.system == "armv5tel-linux") [ + ] ++ stdenv.lib.optionals stdenv.isArm [ "--host=arm-linux-gnueabi" "--build=arm-linux-gnueabi" "--without-fp" diff --git a/pkgs/development/libraries/glibc/2.9/default.nix b/pkgs/development/libraries/glibc/2.9/default.nix index b778743147e..7d42825206e 100644 --- a/pkgs/development/libraries/glibc/2.9/default.nix +++ b/pkgs/development/libraries/glibc/2.9/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { "--enable-kernel=2.6.0" "--without-fp" "--with-__thread" - ] ++ (if (stdenv.system == "armv5tel-linux") then [ + ] ++ (if stdenv.isArm then [ "--host=arm-linux-gnueabi" "--build=arm-linux-gnueabi" "--without-fp" diff --git a/pkgs/development/libraries/glibc/2.9/headers.nix b/pkgs/development/libraries/glibc/2.9/headers.nix index adb9a22f481..7adeb11c8bc 100644 --- a/pkgs/development/libraries/glibc/2.9/headers.nix +++ b/pkgs/development/libraries/glibc/2.9/headers.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { "--disable-sanity-checks" "--enable-hacker-mode" (if profilingLibraries then "--enable-profile" else "--disable-profile") - ] ++ (if (stdenv.system == "armv5tel-linux") then [ + ] ++ (if stdenv.isArm then [ "--host=arm-linux-gnueabi" "--build=arm-linux-gnueabi" "--without-fp" diff --git a/pkgs/development/libraries/glibc/2.9/locales.nix b/pkgs/development/libraries/glibc/2.9/locales.nix index c7b1bb2bff0..a1fe9f82f14 100644 --- a/pkgs/development/libraries/glibc/2.9/locales.nix +++ b/pkgs/development/libraries/glibc/2.9/locales.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { "--enable-add-ons" "--without-headers" "--disable-profile" - ] ++ (if (stdenv.system == "armv5tel-linux") then [ + ] ++ (if stdenv.isArm then [ "--host=arm-linux-gnueabi" "--build=arm-linux-gnueabi" "--without-fp" diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 243b4b0191d..4bd0dfdc529 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -1,15 +1,15 @@ { fetchurl, stdenv, zlib, lzo, libtasn1, nettle -, guileBindings, guile, perl }: +, guileBindings, guile, perl, psmisc }: assert guileBindings -> guile != null; stdenv.mkDerivation rec { - name = "gnutls-3.0.11"; + name = "gnutls-3.0.18"; src = fetchurl { url = "mirror://gnu/gnutls/${name}.tar.xz"; - sha256 = "1l8k96hms7891zl43qjd7lngjh23kxdq22l6ahm1ham7fyhhrh9r"; + sha256 = "1ynqnj1j6rrzplk2i64dik34829r0y7lwk4qlvjx993q3mj7z863"; }; configurePhase = '' @@ -29,7 +29,13 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ nettle libtasn1 ]; - doCheck = true; + # XXX: Disable tests on non-Linux because of the `mini-loss-time' hack + # below, which is Linux-specific. + doCheck = stdenv.isLinux; + + postCheck = + # Kill a process that's left behind. + stdenv.lib.optionalString doCheck "${psmisc}/bin/killall mini-loss-time"; meta = { description = "The GNU Transport Layer Security Library"; diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 5f06c82c334..582208f08b6 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan }: stdenv.mkDerivation rec { - name = "gpgme-1.3.0"; + name = "gpgme-1.3.1"; src = fetchurl { url = "ftp://ftp.gnupg.org/gcrypt/gpgme/${name}.tar.bz2"; - sha256 = "18g6wgiacnbj437yfsczbjxaf041ljia48dnv2qgcqb0sky41q3l"; + sha256 = "1m7l7nicn6gd952cgspv9xr8whqivbg33nbg8kbpj3dffnl2gvqm"; }; propagatedBuildInputs = [ libgpgerror glib pth libassuan ]; diff --git a/pkgs/development/libraries/haskell/ConfigFile/default.nix b/pkgs/development/libraries/haskell/ConfigFile/default.nix index 70382d1cd63..29d417562cc 100644 --- a/pkgs/development/libraries/haskell/ConfigFile/default.nix +++ b/pkgs/development/libraries/haskell/ConfigFile/default.nix @@ -7,7 +7,6 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ MissingH mtl parsec ]; - noHaddock = true; meta = { homepage = "http://software.complete.org/configfile"; description = "Configuration file reading & writing"; diff --git a/pkgs/development/libraries/haskell/Graphalyze/default.nix b/pkgs/development/libraries/haskell/Graphalyze/default.nix index cdd071b2b67..d0258fd2698 100644 --- a/pkgs/development/libraries/haskell/Graphalyze/default.nix +++ b/pkgs/development/libraries/haskell/Graphalyze/default.nix @@ -1,24 +1,18 @@ -{ cabal, bktrees, extensibleExceptions, fgl, graphviz, pandoc -, random, text, time +{ cabal, bktrees, fgl, filepath, graphviz, pandoc, random, text +, time }: cabal.mkDerivation (self: { pname = "Graphalyze"; - version = "0.12.0.0"; - sha256 = "0lsbwf08flaifdddbg6d3ndrb2d1wzs943hk7n0m316bvahq6kgx"; + version = "0.13.0.0"; + sha256 = "1xh6xg2rw43cbi83rmpb0c2yib9cfj0pwg66nx5x5a0al2c9pdsr"; buildDepends = [ - bktrees extensibleExceptions fgl graphviz pandoc random text time + bktrees fgl filepath graphviz pandoc random text time ]; - patchPhase = '' - sed -i Graphalyze.cabal -e 's|pandoc == 1.8.\*|pandoc|' - ''; meta = { description = "Graph-Theoretic Analysis library"; license = "unknown"; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix index eb1b3b3ddaa..d5dca127ca1 100644 --- a/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix +++ b/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix @@ -8,7 +8,6 @@ cabal.mkDerivation (self: { isExecutable = true; buildDepends = [ HDBC mtl time utf8String ]; extraLibraries = [ odbc ]; - noHaddock = true; meta = { homepage = "http://software.complete.org/hdbc-odbc"; description = "ODBC driver for HDBC"; diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix new file mode 100644 index 00000000000..cff762864bc --- /dev/null +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix @@ -0,0 +1,15 @@ +{ cabal, mtl, network, parsec }: + +cabal.mkDerivation (self: { + pname = "HTTP"; + version = "4000.2.3"; + sha256 = "1z7s5rkyljwdl95cwqbqg64i207wjwxgpksrdmvcv82k39srzx80"; + buildDepends = [ mtl network parsec ]; + meta = { + homepage = "https://github.com/haskell/HTTP"; + description = "A library for client-side HTTP"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/HaskellForMaths/default.nix b/pkgs/development/libraries/haskell/HaskellForMaths/default.nix index 8b802e6579a..417ded6da54 100644 --- a/pkgs/development/libraries/haskell/HaskellForMaths/default.nix +++ b/pkgs/development/libraries/haskell/HaskellForMaths/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "HaskellForMaths"; - version = "0.4.4"; - sha256 = "1qijaich0jwlii5wdmv0rnr6skbyacxg09nzh0i7dhk86vimz6q8"; + version = "0.4.5"; + sha256 = "03j83gvxjjqjwl047j0acsf9j5vs3zpzbap036sw4slq31nza2p9"; buildDepends = [ random ]; meta = { homepage = "http://haskellformaths.blogspot.com/"; diff --git a/pkgs/development/libraries/haskell/Hipmunk/default.nix b/pkgs/development/libraries/haskell/Hipmunk/default.nix index ea2bc8cfc2c..d6c3b5ffc23 100644 --- a/pkgs/development/libraries/haskell/Hipmunk/default.nix +++ b/pkgs/development/libraries/haskell/Hipmunk/default.nix @@ -2,10 +2,9 @@ cabal.mkDerivation (self: { pname = "Hipmunk"; - version = "5.2.0.7"; - sha256 = "1cinxhz4qb8xcbygifx85q4zf6pmjwi90v01vqwyvwlfxmbk0j7k"; + version = "5.2.0.8"; + sha256 = "0xsckndxmzbp32fqb8i90k21rz0xjj3smxjijw742l637p3mv5zw"; buildDepends = [ StateVar transformers ]; - noHaddock = true; meta = { homepage = "http://patch-tag.com/r/felipe/hipmunk/home"; description = "A Haskell binding for Chipmunk"; diff --git a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix index a283acacd6d..20213051694 100644 --- a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix +++ b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "HsOpenSSL"; - version = "0.10.1.4"; - sha256 = "1zrmngxm1xs51ql5za46lw6xkiyczx6qyvpami9k13g8k6kznqbz"; + version = "0.10.3.1"; + sha256 = "0dilmaibx18mfg4c8g96c1svhynhkrq4i5zzv3wg0a550g3xc0py"; buildDepends = [ network time ]; extraLibraries = [ openssl ]; meta = { diff --git a/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix b/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix index 5ee945d2678..4edd801d08d 100644 --- a/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix +++ b/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "MonadCatchIO-transformers"; - version = "0.2.2.3"; - sha256 = "1qwy9rrmf3kl7rb7v46n81xmrwy4xl63lfnlsiz1qc0hybjkl7m6"; + version = "0.3.0.0"; + sha256 = "0v7k6npfr1x9s4bk409y6sc1vhzs5pm4mwpky356z7kdvz2z274c"; buildDepends = [ extensibleExceptions transformers ]; meta = { description = "Monad-transformer compatible version of the Control.Exception module"; diff --git a/pkgs/development/libraries/haskell/ObjectName/default.nix b/pkgs/development/libraries/haskell/ObjectName/default.nix old mode 100755 new mode 100644 diff --git a/pkgs/development/libraries/haskell/RSA/default.nix b/pkgs/development/libraries/haskell/RSA/default.nix index 173ddc31495..ed14a3e8d19 100644 --- a/pkgs/development/libraries/haskell/RSA/default.nix +++ b/pkgs/development/libraries/haskell/RSA/default.nix @@ -1,12 +1,16 @@ -{ cabal, binary, pureMD5, random, SHA }: +{ cabal, binary, cryptoApi, cryptoPubkeyTypes, monadcryptorandom +, pureMD5, SHA +}: cabal.mkDerivation (self: { pname = "RSA"; - version = "1.0.6.3"; - sha256 = "0lk3nsh6nvacv1xzrg2pxxhd5gglmy40dkb8a47c9r9px0q6yjpj"; + version = "1.2.1.0"; + sha256 = "14x53xjy4rqdgin6kyrm2b16hb0k599gfiwiwrsyri9mx3f3s1ca"; isLibrary = true; isExecutable = true; - buildDepends = [ binary pureMD5 random SHA ]; + buildDepends = [ + binary cryptoApi cryptoPubkeyTypes monadcryptorandom pureMD5 SHA + ]; meta = { description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1."; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/RepLib/default.nix b/pkgs/development/libraries/haskell/RepLib/default.nix index 833e5956b2b..1be11a557f8 100644 --- a/pkgs/development/libraries/haskell/RepLib/default.nix +++ b/pkgs/development/libraries/haskell/RepLib/default.nix @@ -2,10 +2,9 @@ cabal.mkDerivation (self: { pname = "RepLib"; - version = "0.5.2"; - sha256 = "1wcxvl40wlnva2x7z13pm95485lwxbpy5di1mb1din3id8dprxfr"; + version = "0.5.2.1"; + sha256 = "133zpiszfdb8s4hqd1xpgsiac98v04dclk3hivzxcg0h77m7qpcc"; buildDepends = [ mtl typeEquality ]; - noHaddock = true; meta = { homepage = "http://code.google.com/p/replib/"; description = "Generic programming library with representation types"; diff --git a/pkgs/development/libraries/haskell/StateVar/default.nix b/pkgs/development/libraries/haskell/StateVar/default.nix old mode 100755 new mode 100644 diff --git a/pkgs/development/libraries/haskell/Tensor/default.nix b/pkgs/development/libraries/haskell/Tensor/default.nix old mode 100755 new mode 100644 diff --git a/pkgs/development/libraries/haskell/aeson/default.nix b/pkgs/development/libraries/haskell/aeson/default.nix index 4cb67db36f6..c1cacb9eaa3 100644 --- a/pkgs/development/libraries/haskell/aeson/default.nix +++ b/pkgs/development/libraries/haskell/aeson/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "aeson"; - version = "0.6.0.0"; - sha256 = "1j8g1q7xr1pgyfyrkbh2zz7fhqshj0q5qg7fczrnsbbzf5k459zw"; + version = "0.6.0.2"; + sha256 = "04vyjpp3zi2g65rrkq4x4bddw0nfclniq5hhfq7l3jhybd8jxy51"; buildDepends = [ attoparsec blazeBuilder deepseq dlist hashable mtl syb text time unorderedContainers vector diff --git a/pkgs/development/libraries/haskell/alternative-io/default.nix b/pkgs/development/libraries/haskell/alternative-io/default.nix index 23c79325755..9daf9406742 100644 --- a/pkgs/development/libraries/haskell/alternative-io/default.nix +++ b/pkgs/development/libraries/haskell/alternative-io/default.nix @@ -3,13 +3,13 @@ cabal.mkDerivation (self: { pname = "alternative-io"; - version = "0.0.0"; - sha256 = "1nfwiw753m8ljrk47yi5cgncbfkddnr4fz44fk1pv501a86cmk8y"; + version = "0.0.1"; + sha256 = "01hypbci3hw2czkmx78ls51ycx518ich4k753jgv0z8ilrq8isch"; buildDepends = [ liftedBase monadControl transformers transformersBase ]; meta = { - description = "IO as Alternative instance"; + description = "IO as Alternative instance (deprecated)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; diff --git a/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix b/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix old mode 100755 new mode 100644 diff --git a/pkgs/development/libraries/haskell/async/default.nix b/pkgs/development/libraries/haskell/async/default.nix old mode 100755 new mode 100644 diff --git a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix index 59060ef0682..402c9a0a6b5 100644 --- a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix +++ b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "attoparsec-conduit"; - version = "0.2.0.1"; - sha256 = "1jxb2zanfmfqdmd5q770r4yz2s0giky9ify6fcsjwc8wiah4aji1"; + version = "0.4.0"; + sha256 = "1vlgpa90sgaym754w5wr3jjqjra9yrn3yn4fhi148v25y4ijrrc0"; buildDepends = [ attoparsec conduit text transformers ]; meta = { homepage = "http://github.com/snoyberg/conduit"; diff --git a/pkgs/development/libraries/haskell/authenticate/default.nix b/pkgs/development/libraries/haskell/authenticate/default.nix index f5359ee0d6a..9512e2bce8e 100644 --- a/pkgs/development/libraries/haskell/authenticate/default.nix +++ b/pkgs/development/libraries/haskell/authenticate/default.nix @@ -1,16 +1,17 @@ { cabal, aeson, attoparsec, blazeBuilder, blazeBuilderConduit -, caseInsensitive, conduit, httpConduit, httpTypes, network -, tagsoup, text, transformers, unorderedContainers, xmlConduit +, caseInsensitive, conduit, httpConduit, httpTypes, monadControl +, network, resourcet, tagsoup, text, transformers +, unorderedContainers, xmlConduit }: cabal.mkDerivation (self: { pname = "authenticate"; - version = "1.0.0.1"; - sha256 = "0wrbr7kwd4g8idd6i4ghvpd5q7nq0b8zx5qphqvkbs128m0r308d"; + version = "1.2.1"; + sha256 = "0ifx24129ahq1rb2601n4736w5j257w10wcym5m9kp0jjb4p7s83"; buildDepends = [ aeson attoparsec blazeBuilder blazeBuilderConduit caseInsensitive - conduit httpConduit httpTypes network tagsoup text transformers - unorderedContainers xmlConduit + conduit httpConduit httpTypes monadControl network resourcet + tagsoup text transformers unorderedContainers xmlConduit ]; meta = { homepage = "http://github.com/yesodweb/authenticate"; diff --git a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix index 5d92e3ba28d..63516f61681 100644 --- a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix +++ b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "blaze-builder-conduit"; - version = "0.2.0.1"; - sha256 = "0p6kq43avsf21biskjardv7k47bag16ki2gmwjpk8ram9mwlz0zg"; + version = "0.4.0.1"; + sha256 = "059i7k49vpwsd7dlm4di4k5xhiparq71h8qagssw8a4nsk9jglvp"; buildDepends = [ blazeBuilder conduit text transformers ]; meta = { homepage = "http://github.com/snoyberg/conduit"; diff --git a/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix b/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix index f8c63958860..a953d9f4525 100644 --- a/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "blaze-builder-enumerator"; - version = "0.2.0.3"; - sha256 = "00a9rly27sh49gi5askg7z3ji8ig9llxk4qcznsag01d1z0kb97n"; + version = "0.2.0.4"; + sha256 = "1zwp9hcjsmy5p5i436ajvl86zl1z4pzcfp6c57sj8vfr08rrrkq9"; buildDepends = [ blazeBuilder enumerator transformers ]; meta = { homepage = "https://github.com/meiersi/blaze-builder-enumerator"; diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix index e4772a1f51c..e3ec5167f36 100644 --- a/pkgs/development/libraries/haskell/blaze-html/default.nix +++ b/pkgs/development/libraries/haskell/blaze-html/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "blaze-html"; - version = "0.4.3.3"; - sha256 = "0a3g4s4k85h2qvs2kcalv83ma4z5arqdydla64q5d1qlk9c99mzg"; + version = "0.4.3.4"; + sha256 = "1xd8l28rriczd5zxgmjif393kjzqibrp68pfah0kknrjmc3ybn20"; buildDepends = [ blazeBuilder text ]; meta = { homepage = "http://jaspervdj.be/blaze"; diff --git a/pkgs/development/libraries/haskell/blaze-markup/default.nix b/pkgs/development/libraries/haskell/blaze-markup/default.nix new file mode 100644 index 00000000000..7a5adbf1079 --- /dev/null +++ b/pkgs/development/libraries/haskell/blaze-markup/default.nix @@ -0,0 +1,15 @@ +{ cabal, blazeBuilder, text }: + +cabal.mkDerivation (self: { + pname = "blaze-markup"; + version = "0.5.1.0"; + sha256 = "0vq0xzwa13sjybg6zdi3ynsn6yxyl1q6rbalvb9r6f3plrmik37a"; + buildDepends = [ blazeBuilder text ]; + meta = { + homepage = "http://jaspervdj.be/blaze"; + description = "A blazingly fast markup combinator library for Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/bytestring-mmap/default.nix b/pkgs/development/libraries/haskell/bytestring-mmap/default.nix old mode 100755 new mode 100644 diff --git a/pkgs/development/libraries/haskell/certificate/default.nix b/pkgs/development/libraries/haskell/certificate/default.nix index 8d5cc095937..7e77aa41f5e 100644 --- a/pkgs/development/libraries/haskell/certificate/default.nix +++ b/pkgs/development/libraries/haskell/certificate/default.nix @@ -1,15 +1,12 @@ -{ cabal, asn1Data, base64Bytestring, cryptoPubkeyTypes, mtl, time -}: +{ cabal, asn1Data, cryptoPubkeyTypes, mtl, pem, time }: cabal.mkDerivation (self: { pname = "certificate"; - version = "1.1.0"; - sha256 = "10xpszfr51nd72kqmr4l1fna3bc3a272h3vf5b5hlls6k9kxzddg"; + version = "1.2.1"; + sha256 = "0lhw38jqkiw7dwckwcqwmsi9br1insb5dp8wajcpgas6xn6cy2qy"; isLibrary = true; isExecutable = true; - buildDepends = [ - asn1Data base64Bytestring cryptoPubkeyTypes mtl time - ]; + buildDepends = [ asn1Data cryptoPubkeyTypes mtl pem time ]; meta = { homepage = "http://github.com/vincenthz/hs-certificate"; description = "Certificates and Key Reader/Writer"; diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix index 98bda13ddb7..08e81eaa98f 100644 --- a/pkgs/development/libraries/haskell/clientsession/default.nix +++ b/pkgs/development/libraries/haskell/clientsession/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "clientsession"; - version = "0.7.4.2"; - sha256 = "0b1afz9frky3kp2crrkmk8cvj77fnyyxrfv1ky0p0cb0lllvdhwp"; + version = "0.7.5"; + sha256 = "1q2zlq06s0d476ywvb1fkxw34aagcaiqw7jrrmr3lj89q3ylhivr"; buildDepends = [ base64Bytestring cereal cprngAes cryptoApi cryptocipher entropy skein tagged diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index 52345c9446f..89b06d1164f 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -1,13 +1,14 @@ -{ cabal, liftedBase, monadControl, text, transformers -, transformersBase +{ cabal, liftedBase, monadControl, resourcet, text, transformers +, transformersBase, void }: cabal.mkDerivation (self: { pname = "conduit"; - version = "0.2.2"; - sha256 = "1iwmf0zdrrxh8q3xja742j17nanj6va5zj9bs9a5m78whf8cc80j"; + version = "0.4.1.1"; + sha256 = "1y5bccjd3r1kakwiq0nlp3dk2jwrdsm3f8dncnfsmnlk093ajyxa"; buildDepends = [ - liftedBase monadControl text transformers transformersBase + liftedBase monadControl resourcet text transformers + transformersBase void ]; meta = { homepage = "http://github.com/snoyberg/conduit"; diff --git a/pkgs/development/libraries/haskell/continued-fractions/default.nix b/pkgs/development/libraries/haskell/continued-fractions/default.nix old mode 100755 new mode 100644 diff --git a/pkgs/development/libraries/haskell/converge/default.nix b/pkgs/development/libraries/haskell/converge/default.nix old mode 100755 new mode 100644 diff --git a/pkgs/development/libraries/haskell/cpu/default.nix b/pkgs/development/libraries/haskell/cpu/default.nix new file mode 100644 index 00000000000..832b7db0369 --- /dev/null +++ b/pkgs/development/libraries/haskell/cpu/default.nix @@ -0,0 +1,16 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "cpu"; + version = "0.1.0"; + sha256 = "020s1cv3qkhjq0gypxligg2x68izb3z82krv8y1m1k360554nqyg"; + isLibrary = true; + isExecutable = true; + meta = { + homepage = "http://github.com/vincenthz/hs-cpu"; + description = "Cpu information and properties helpers"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/crypto-api/default.nix b/pkgs/development/libraries/haskell/crypto-api/default.nix index 51b827c9e25..5f71e622250 100644 --- a/pkgs/development/libraries/haskell/crypto-api/default.nix +++ b/pkgs/development/libraries/haskell/crypto-api/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "crypto-api"; - version = "0.9"; - sha256 = "11372brnpiqdm6fdfp95wyyl8nvhbagnq0q2bdhn4xsskpnp4hnp"; + version = "0.10.2"; + sha256 = "06dbvdwyw2hf5cafpjfhasgyzzbigvvg74c47lafvqvgxvn9v4ms"; buildDepends = [ cereal entropy largeword tagged ]; meta = { homepage = "http://trac.haskell.org/crypto-api/wiki"; diff --git a/pkgs/development/libraries/haskell/crypto-conduit/default.nix b/pkgs/development/libraries/haskell/crypto-conduit/default.nix index 552a40b6659..747cbbf2864 100644 --- a/pkgs/development/libraries/haskell/crypto-conduit/default.nix +++ b/pkgs/development/libraries/haskell/crypto-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "crypto-conduit"; - version = "0.1.3.1"; - sha256 = "0b8n2njz2ccdb9gql79l96jgv1nlq4ls09d25a2yy9f69w7h1ww5"; + version = "0.3.2"; + sha256 = "09f6l60wcblp15hx3hppskjsyah9bh6jwqqr4dvl6j03011gx4id"; buildDepends = [ cereal conduit cryptoApi transformers ]; meta = { homepage = "https://github.com/meteficha/crypto-conduit"; diff --git a/pkgs/development/libraries/haskell/cryptocipher/default.nix b/pkgs/development/libraries/haskell/cryptocipher/default.nix index 904c33b7431..1b2dc44fbdd 100644 --- a/pkgs/development/libraries/haskell/cryptocipher/default.nix +++ b/pkgs/development/libraries/haskell/cryptocipher/default.nix @@ -1,15 +1,15 @@ -{ cabal, cereal, cryptoApi, cryptoPubkeyTypes, primitive, tagged -, vector +{ cabal, cereal, cpu, cryptoApi, cryptoPubkeyTypes, primitive +, tagged, vector }: cabal.mkDerivation (self: { pname = "cryptocipher"; - version = "0.3.0"; - sha256 = "17jbzssdbprspadz5ynyam60l5iw7s809irklfg1ii89x26mlyix"; + version = "0.3.1"; + sha256 = "14icn1p0mjg4y45q6pbh8qamw5hm1z2z7d424gmiknbf24nq8nmi"; isLibrary = true; isExecutable = true; buildDepends = [ - cereal cryptoApi cryptoPubkeyTypes primitive tagged vector + cereal cpu cryptoApi cryptoPubkeyTypes primitive tagged vector ]; meta = { homepage = "http://github.com/vincenthz/hs-cryptocipher"; diff --git a/pkgs/development/libraries/haskell/cryptohash/default.nix b/pkgs/development/libraries/haskell/cryptohash/default.nix index 26af168e8a4..77ecc4ef554 100644 --- a/pkgs/development/libraries/haskell/cryptohash/default.nix +++ b/pkgs/development/libraries/haskell/cryptohash/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cryptohash"; - version = "0.7.4"; - sha256 = "1nplmwihq40jmng4r3wiyfb0i33a8wx2gmlbqajc62wny98l7sab"; + version = "0.7.5"; + sha256 = "18x1k22m2mw0jx3p1mc68n0gg1vsnkp50qvmlkh3i34vdnjcdrqg"; isLibrary = true; isExecutable = true; buildDepends = [ cereal cryptoApi tagged ]; diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix index b3bb3408bcf..6f73cc48817 100644 --- a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix +++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "data-accessor"; - version = "0.2.2.1"; - sha256 = "1zb7z9fnlnxxlvjd655vadfscanzq9msvjv21cjmdric0ja24hxb"; + version = "0.2.2.2"; + sha256 = "1q9hx2bkp7dknr9ygx39lj93i846x8g9j7lkhkjijvsicih28yyi"; buildDepends = [ transformers ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Record_access"; diff --git a/pkgs/development/libraries/haskell/data-default/default.nix b/pkgs/development/libraries/haskell/data-default/default.nix index dbb5ce9fc41..41728d393f8 100644 --- a/pkgs/development/libraries/haskell/data-default/default.nix +++ b/pkgs/development/libraries/haskell/data-default/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "data-default"; - version = "0.3.0"; - sha256 = "0nbvknfa9kkc46fl1ffji0ghqb41wwsccmc55mya5zavfq9g05g9"; + version = "0.4.0"; + sha256 = "1pil8dxbk0zl2zw1xj9h2bpwpdriwfd7aj48kh0xpw9yazg3m802"; buildDepends = [ dlist ]; meta = { description = "A class for types with a default value"; diff --git a/pkgs/development/libraries/haskell/deepseq-th/default.nix b/pkgs/development/libraries/haskell/deepseq-th/default.nix index 36ab9f8a8e9..1072bcb9ca7 100644 --- a/pkgs/development/libraries/haskell/deepseq-th/default.nix +++ b/pkgs/development/libraries/haskell/deepseq-th/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "deepseq-th"; - version = "0.1.0.2"; - sha256 = "0f2hrp2rjb3iailnxh47wl1imgq6jqr9qj31vi7k8lgp5pwa90mc"; + version = "0.1.0.3"; + sha256 = "1xx88i55iskyxrpxbdg0srb64y5siqs1b8qj7bh3i1893qs9sha2"; buildDepends = [ deepseq ]; meta = { description = "Template Haskell based deriver for optimised NFData instances"; diff --git a/pkgs/development/libraries/haskell/edit-distance/default.nix b/pkgs/development/libraries/haskell/edit-distance/default.nix new file mode 100644 index 00000000000..07744765adb --- /dev/null +++ b/pkgs/development/libraries/haskell/edit-distance/default.nix @@ -0,0 +1,17 @@ +{ cabal, random }: + +cabal.mkDerivation (self: { + pname = "edit-distance"; + version = "0.2.1"; + sha256 = "1zhiyzgqmxi4mn7zn5q6rg03hgff9y5f9xizbs00069v7ncygi38"; + isLibrary = true; + isExecutable = true; + buildDepends = [ random ]; + meta = { + homepage = "http://github.com/batterseapower/edit-distance"; + description = "Levenshtein and restricted Damerau-Levenshtein edit distances"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/enumerator/default.nix b/pkgs/development/libraries/haskell/enumerator/default.nix index 9592b3009cb..5b44c9efc62 100644 --- a/pkgs/development/libraries/haskell/enumerator/default.nix +++ b/pkgs/development/libraries/haskell/enumerator/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "enumerator"; - version = "0.4.18"; - sha256 = "0xqgcn3xs0i7kdy73lizfhs4dzj8crf2x9pmb9d37kqrhdgznl9d"; + version = "0.4.19"; + sha256 = "1avxy55vbvkz6yj512bkb2b986y3m0b28c9c5lfc3wd2na7w1s5g"; buildDepends = [ text transformers ]; meta = { homepage = "https://john-millikin.com/software/enumerator/"; diff --git a/pkgs/development/libraries/haskell/explicit-exception/default.nix b/pkgs/development/libraries/haskell/explicit-exception/default.nix index 47c0f57252b..86d4cc50c3b 100644 --- a/pkgs/development/libraries/haskell/explicit-exception/default.nix +++ b/pkgs/development/libraries/haskell/explicit-exception/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "explicit-exception"; - version = "0.1.6"; - sha256 = "0pgdbaav952bwcmbfwg0fgvc15k57rlnw131bs3pnp8rqdbxfv39"; + version = "0.1.7"; + sha256 = "0pqh97fxs55554bd16dknggkr0yayqj1dz0sddp9b2svjy2q4vrm"; isLibrary = true; isExecutable = true; buildDepends = [ transformers ]; diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix index 6475d245ed6..5f62315a972 100644 --- a/pkgs/development/libraries/haskell/fclabels/default.nix +++ b/pkgs/development/libraries/haskell/fclabels/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "fclabels"; - version = "1.1.1.1"; - sha256 = "170lsalbak7l52fzdppdvq88ky8y06zzlxy6h18zpd1g18caa0q7"; + version = "1.1.3"; + sha256 = "1f8aav4gcpixmnnwcml0aqsqswb8fc0rp986nbyap22gmcw4hflx"; buildDepends = [ mtl transformers ]; meta = { description = "First class accessor labels"; diff --git a/pkgs/development/libraries/haskell/fgl-visualize/default.nix b/pkgs/development/libraries/haskell/fgl-visualize/default.nix new file mode 100644 index 00000000000..279f25eaca2 --- /dev/null +++ b/pkgs/development/libraries/haskell/fgl-visualize/default.nix @@ -0,0 +1,14 @@ +{ cabal, dotgen, fgl }: + +cabal.mkDerivation (self: { + pname = "fgl-visualize"; + version = "0.1"; + sha256 = "0ri6ywg7rj8qfyngjxvihw43s2h2l3w03fwq1ipn59cdcnah08bc"; + buildDepends = [ dotgen fgl ]; + meta = { + description = "Convert FGL graphs to dot (graphviz) files"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/file-embed/default.nix b/pkgs/development/libraries/haskell/file-embed/default.nix index 3cb11471baa..0e18777b5ba 100644 --- a/pkgs/development/libraries/haskell/file-embed/default.nix +++ b/pkgs/development/libraries/haskell/file-embed/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "file-embed"; - version = "0.0.4.1"; - sha256 = "156ydqljhxp16192s4pj6h8jcvrfmj2lnsvzy0zg394wi97bxpi2"; + version = "0.0.4.2"; + sha256 = "1nismycqm8shh6zgjjfysc0yhn5yrcdvw23k6adzizawsvr92bkw"; meta = { homepage = "http://github.com/snoyberg/file-embed/tree/master"; description = "Use Template Haskell to embed file contents directly"; diff --git a/pkgs/development/libraries/haskell/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix index 6b34efc2077..8462629a4be 100644 --- a/pkgs/development/libraries/haskell/filestore/default.nix +++ b/pkgs/development/libraries/haskell/filestore/default.nix @@ -1,10 +1,16 @@ -{ cabal, Diff, filepath, parsec, split, time, utf8String, xml }: +{ cabal, Diff, filepath, HUnit, mtl, parsec, split, time +, utf8String, xml +}: cabal.mkDerivation (self: { pname = "filestore"; - version = "0.4.1"; - sha256 = "02ki6b4rbmk463qmmqia7igkrsr7h1kxal94k6pikkikylx2f8r7"; - buildDepends = [ Diff filepath parsec split time utf8String xml ]; + version = "0.4.2"; + sha256 = "1zv5c1r82a77p6dadabj8853a0z7p8qrk0fdxvr9sr02zd95cg16"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + Diff filepath HUnit mtl parsec split time utf8String xml + ]; meta = { homepage = "http://johnmacfarlane.net/repos/filestore"; description = "Interface for versioning file stores"; diff --git a/pkgs/development/libraries/haskell/flexible-defaults/default.nix b/pkgs/development/libraries/haskell/flexible-defaults/default.nix old mode 100755 new mode 100644 diff --git a/pkgs/development/libraries/haskell/funcmp/default.nix b/pkgs/development/libraries/haskell/funcmp/default.nix old mode 100755 new mode 100644 diff --git a/pkgs/development/libraries/haskell/gamma/default.nix b/pkgs/development/libraries/haskell/gamma/default.nix old mode 100755 new mode 100644 diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix index 248387cf64c..b95d1e6d73b 100644 --- a/pkgs/development/libraries/haskell/ghc-mod/default.nix +++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "ghc-mod"; - version = "1.10.12"; - sha256 = "1r06phm9fjrzwga63065lzdd7dn24sqn3g4fkyh8s30n531672rg"; + version = "1.10.15"; + sha256 = "1ywsv8nxd5040k3v5r9kf4zb0myicnjg6yckxmp6xnvf5glylylm"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix index 61251bfabc3..14951eebbd5 100644 --- a/pkgs/development/libraries/haskell/gitit/default.nix +++ b/pkgs/development/libraries/haskell/gitit/default.nix @@ -1,5 +1,5 @@ -{ cabal, blazeHtml, cgi, ConfigFile, feed, filepath, filestore -, ghcPaths, happstackServer, happstackUtil, highlightingKate +{ cabal, base64Bytestring, blazeHtml, cgi, ConfigFile, feed +, filepath, filestore, ghcPaths, happstackServer, highlightingKate , hslogger, HStringTemplate, HTTP, json, mtl, network, pandoc , pandocTypes, parsec, random, recaptcha, safe, SHA, syb, tagsoup , text, time, url, utf8String, xhtml, xml, xssSanitize, zlib @@ -7,16 +7,16 @@ cabal.mkDerivation (self: { pname = "gitit"; - version = "0.9"; - sha256 = "00kjfmczj5m3b8r8djdpad8d27s44z7pf76yyc0sdja1f3bd4mlp"; + version = "0.9.0.1"; + sha256 = "1k1z6qvp72c61yhrfma3340wf4ysjkb80f8lqapaqsyhp96qjl3m"; isLibrary = true; isExecutable = true; buildDepends = [ - blazeHtml cgi ConfigFile feed filepath filestore ghcPaths - happstackServer happstackUtil highlightingKate hslogger - HStringTemplate HTTP json mtl network pandoc pandocTypes parsec - random recaptcha safe SHA syb tagsoup text time url utf8String - xhtml xml xssSanitize zlib + base64Bytestring blazeHtml cgi ConfigFile feed filepath filestore + ghcPaths happstackServer highlightingKate hslogger HStringTemplate + HTTP json mtl network pandoc pandocTypes parsec random recaptcha + safe SHA syb tagsoup text time url utf8String xhtml xml xssSanitize + zlib ]; meta = { homepage = "http://gitit.net"; diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix index d5b828cb0e7..08e08e29ec0 100644 --- a/pkgs/development/libraries/haskell/gloss/default.nix +++ b/pkgs/development/libraries/haskell/gloss/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "gloss"; - version = "1.7.1.1"; - sha256 = "0fmmcmmdcvc5vj33bm9xzzb2jpnnb7r89ghdqwgg2c5gxjqbcfbd"; + version = "1.7.4.1"; + sha256 = "01mxazdgmz3k8y4s2k2mj11g1m788dykx60i7bqbdwzbzc65hcfw"; buildDepends = [ bmp GLUT OpenGL ]; meta = { homepage = "http://gloss.ouroborus.net"; diff --git a/pkgs/development/libraries/haskell/graphviz/default.nix b/pkgs/development/libraries/haskell/graphviz/default.nix index 224cff2124a..fe6e811b902 100644 --- a/pkgs/development/libraries/haskell/graphviz/default.nix +++ b/pkgs/development/libraries/haskell/graphviz/default.nix @@ -1,16 +1,13 @@ -{ cabal, colour, dlist, extensibleExceptions, fgl, filepath -, polyparse, text, transformers, wlPprintText +{ cabal, colour, dlist, fgl, filepath, polyparse, text +, transformers, wlPprintText }: cabal.mkDerivation (self: { pname = "graphviz"; - version = "2999.12.0.4"; - sha256 = "02yg5c02k3sdrcq5srzpdvlzs6cnrns67576qzr8n7ynhpvard73"; - isLibrary = true; - isExecutable = true; + version = "2999.13.0.2"; + sha256 = "17b95zi8j7mnzrp3kybyfyqqpcdhbf0mdrk0sfnw3qp8fbyfrw1i"; buildDepends = [ - colour dlist extensibleExceptions fgl filepath polyparse text - transformers wlPprintText + colour dlist fgl filepath polyparse text transformers wlPprintText ]; meta = { homepage = "http://projects.haskell.org/graphviz/"; diff --git a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix b/pkgs/development/libraries/haskell/gtk2hs-buildtools/0.12.1.nix similarity index 100% rename from pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix rename to pkgs/development/libraries/haskell/gtk2hs-buildtools/0.12.1.nix diff --git a/pkgs/development/libraries/haskell/gtk2hs-buildtools/0.12.3.nix b/pkgs/development/libraries/haskell/gtk2hs-buildtools/0.12.3.nix new file mode 100644 index 00000000000..a9b5efe5877 --- /dev/null +++ b/pkgs/development/libraries/haskell/gtk2hs-buildtools/0.12.3.nix @@ -0,0 +1,18 @@ +{ cabal, alex, filepath, happy, random }: + +cabal.mkDerivation (self: { + pname = "gtk2hs-buildtools"; + version = "0.12.3"; + sha256 = "1129p2b0hvmin7zpq43ik670v2c63jv704bnmnh3cr0bw06qrrbi"; + isLibrary = false; + isExecutable = true; + buildDepends = [ filepath random ]; + buildTools = [ alex happy ]; + meta = { + homepage = "http://projects.haskell.org/gtk2hs/"; + description = "Tools to build the Gtk2Hs suite of User Interface libraries"; + license = self.stdenv.lib.licenses.gpl2; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 1d75a0e00e0..04375877bca 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "hakyll"; - version = "3.2.7.0"; - sha256 = "1jx4csfdr7icjrg9hvlw5pyi29qf3yyx0sjaw7nchz8jk43ikr2b"; + version = "3.2.7.2"; + sha256 = "1l37w3q2jhcxjkq3h0nh8hl21vscgvsj6jkkd2hni62kfzfrgqhw"; buildDepends = [ binary blazeHtml citeprocHs cryptohash filepath hamlet mtl pandoc parsec regexBase regexTdfa snapCore snapServer tagsoup time diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix index 57bd463fecb..5a13b3e888e 100644 --- a/pkgs/development/libraries/haskell/hamlet/default.nix +++ b/pkgs/development/libraries/haskell/hamlet/default.nix @@ -4,15 +4,15 @@ cabal.mkDerivation (self: { pname = "hamlet"; - version = "0.10.9.1"; - sha256 = "1z2g7ymb8ihx13dkfq0k0s2fn1k6nig8h306i8p4q76wy7ybw3g0"; + version = "1.0.1.2"; + sha256 = "1lb1q2nkih7z63gh1rdwl4656ybmpdqic1d09q5jqgm6bjqrgw53"; buildDepends = [ blazeBuilder blazeHtml failure parsec shakespeare text ]; meta = { - homepage = "http://www.yesodweb.com/book/templates"; + homepage = "http://www.yesodweb.com/book/shakespearean-templates"; description = "Haml-like template files that are compile-time checked"; - license = self.stdenv.lib.licenses.bsd3; + license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; diff --git a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix index 089905fd620..6c105b1e476 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "happstack-hamlet"; - version = "7.0.0"; - sha256 = "15r6xpyg193iwqin96mn7c9x5w7l8q9m3vbgiwv7bxvhdrl1dp7j"; + version = "7.0.1"; + sha256 = "13ayypl2x402h6a7yq7fvgd2mn21gl5gcw2hk7f5vr2bdlvwv53n"; buildDepends = [ hamlet happstackServer text ]; meta = { homepage = "http://www.happstack.com/"; diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix index 29ba6b50d8f..6ccf6d77a0c 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix @@ -1,19 +1,19 @@ { cabal, base64Bytestring, blazeHtml, extensibleExceptions , filepath, hslogger, html, monadControl, mtl, network, parsec -, sendfile, syb, text, time, transformers, transformersBase -, utf8String, xhtml, zlib +, sendfile, syb, systemFilepath, text, time, transformers +, transformersBase, utf8String, xhtml, zlib }: cabal.mkDerivation (self: { pname = "happstack-server"; - version = "6.6.5"; - sha256 = "1s0sa0sk2g6q55xwmzzdca327kp7mhxwc4dlg8lrdqa4dr3hm3gj"; + version = "7.0.1"; + sha256 = "0sjcfxcpv9sssk5fr5np57b10rajcid7x582s5ialf3yc9n1fshj"; isLibrary = true; isExecutable = true; buildDepends = [ base64Bytestring blazeHtml extensibleExceptions filepath hslogger - html monadControl mtl network parsec sendfile syb text time - transformers transformersBase utf8String xhtml zlib + html monadControl mtl network parsec sendfile syb systemFilepath + text time transformers transformersBase utf8String xhtml zlib ]; meta = { homepage = "http://happstack.com"; diff --git a/pkgs/development/libraries/haskell/hashtables/default.nix b/pkgs/development/libraries/haskell/hashtables/default.nix index a091d972a45..1f9e4b418e2 100644 --- a/pkgs/development/libraries/haskell/hashtables/default.nix +++ b/pkgs/development/libraries/haskell/hashtables/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hashtables"; - version = "1.0.1.3"; - sha256 = "1ad8psza13ff15sd4s862sryw6z8msiys1f7frnp4sibgr6bwdca"; + version = "1.0.1.6"; + sha256 = "071msa15447rk2zc5jbpms8sc1ml8yi1n5pycycrcik8dhsm3slb"; buildDepends = [ hashable primitive vector ]; meta = { homepage = "http://github.com/gregorycollins/hashtables"; diff --git a/pkgs/development/libraries/haskell/haskeline/default.nix b/pkgs/development/libraries/haskell/haskeline/default.nix index b29b73309ee..02f36e96266 100644 --- a/pkgs/development/libraries/haskell/haskeline/default.nix +++ b/pkgs/development/libraries/haskell/haskeline/default.nix @@ -8,6 +8,10 @@ cabal.mkDerivation (self: { buildDepends = [ extensibleExceptions filepath mtl terminfo utf8String ]; + configureFlags = "-fterminfo"; + patchPhase = '' + sed -i -e "s|mtl >= 1.1 && < 2.1|mtl|" haskeline.cabal + ''; meta = { homepage = "http://trac.haskell.org/haskeline"; description = "A command-line interface for user input, written in Haskell"; diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/1.13.0.nix b/pkgs/development/libraries/haskell/haskell-src-exts/1.13.2.nix similarity index 84% rename from pkgs/development/libraries/haskell/haskell-src-exts/1.13.0.nix rename to pkgs/development/libraries/haskell/haskell-src-exts/1.13.2.nix index 9f6c69669a0..108021564a1 100644 --- a/pkgs/development/libraries/haskell/haskell-src-exts/1.13.0.nix +++ b/pkgs/development/libraries/haskell/haskell-src-exts/1.13.2.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "haskell-src-exts"; - version = "1.13.0"; - sha256 = "1kkhv8frvrry9jb38p5xmsqij0wrz88gszz5zcndcmbhkr5d4b64"; + version = "1.13.2"; + sha256 = "1vq4qagbypm8lp4dr6zjd6mhgiv096a2cpyfvfs3yq06iqv5x602"; buildDepends = [ cpphs ]; buildTools = [ happy ]; meta = { diff --git a/pkgs/development/libraries/haskell/hfuse/default.nix b/pkgs/development/libraries/haskell/hfuse/default.nix index ef51afca0c7..8ff4f7fd275 100644 --- a/pkgs/development/libraries/haskell/hfuse/default.nix +++ b/pkgs/development/libraries/haskell/hfuse/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "HFuse"; - version = "0.2.4"; - sha256 = "1v3kfkm2rz7bvwk0j8p9rhnnsffbnkismnsq0fkgnzi5z0bz5sgv"; + version = "0.2.4.1"; + sha256 = "12k04dvh92kk2i68bcb70xnk378qxmh46f241k06di5rkcgwyg1k"; extraLibraries = [ fuse ]; preConfigure = '' @@ -11,7 +11,7 @@ cabal.mkDerivation (self: { ''; meta = { - homepage = "https://github.com/realdesktop/hfuse"; + homepage = "https://github.com/toothbrush/hfuse"; description = "HFuse is a binding for the Linux FUSE library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix index 4e8d4cb50ed..7799ae0c311 100644 --- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix +++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "highlighting-kate"; - version = "0.5.0.5"; - sha256 = "005k3yc406h4wz5jk47nk4g5qb409kd7dwyw7n9g31gjqxp73p8v"; + version = "0.5.0.6"; + sha256 = "068ksmi8kdjm00279lnnhih4sqs9yh8mnvvn71brwak5r361m056"; isLibrary = true; isExecutable = true; buildDepends = [ blazeHtml filepath mtl parsec regexPcreBuiltin ]; diff --git a/pkgs/development/libraries/haskell/hjsmin/default.nix b/pkgs/development/libraries/haskell/hjsmin/default.nix index 46aebc66e24..a61d798f429 100644 --- a/pkgs/development/libraries/haskell/hjsmin/default.nix +++ b/pkgs/development/libraries/haskell/hjsmin/default.nix @@ -2,10 +2,8 @@ cabal.mkDerivation (self: { pname = "hjsmin"; - version = "0.0.15"; - sha256 = "1bik3bvaz4zjhyx8nyghhs61l14zm71hndfhj4k0xvkw3h6hlj9k"; - isLibrary = true; - isExecutable = true; + version = "0.1.1"; + sha256 = "0v28z5l5fraf09b65j0fm75b702xp1s4ar8p5g9kigfn1wh8b62k"; buildDepends = [ blazeBuilder languageJavascript text ]; meta = { homepage = "http://github.com/alanz/hjsmin"; diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix index c03484b93f5..9db10b33b1d 100644 --- a/pkgs/development/libraries/haskell/hoogle/default.nix +++ b/pkgs/development/libraries/haskell/hoogle/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "hoogle"; - version = "4.2.10"; - sha256 = "0vb4jj9m512v476fclmjzlk725hgba8q5njx2h1xwb0a76qvj2mg"; + version = "4.2.11"; + sha256 = "0m708qlj3q8s9vywg51gj7bwwasz5nxqxqhqh8f0k96iawqd9gid"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/hsyslog/default.nix b/pkgs/development/libraries/haskell/hsyslog/default.nix old mode 100755 new mode 100644 diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index d49b0dde7d6..d4c6e27fa3d 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -1,21 +1,21 @@ { cabal, asn1Data, attoparsec, attoparsecConduit, base64Bytestring , blazeBuilder, blazeBuilderConduit, caseInsensitive, certificate , conduit, cookie, cprngAes, dataDefault, failure, httpTypes -, liftedBase, monadControl, mtl, network, regexCompat, socks, text -, time, tls, tlsExtra, transformers, transformersBase, utf8String -, zlibConduit +, liftedBase, monadControl, mtl, network, regexCompat, resourcet +, socks, text, time, tls, tlsExtra, transformers, transformersBase +, utf8String, void, zlibConduit }: cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.2.6"; - sha256 = "0gspqkydw5v4wb9s0ipy5s708nmqp3phkh3j95mzn6nlbk2r9kvn"; + version = "1.4.1.2"; + sha256 = "1ji7pdqrzhzlmy2ig21s8fcfcqa29lc9k56l29zkw9qqgdaq5x3s"; buildDepends = [ asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie cprngAes dataDefault failure httpTypes liftedBase monadControl mtl - network regexCompat socks text time tls tlsExtra transformers - transformersBase utf8String zlibConduit + network regexCompat resourcet socks text time tls tlsExtra + transformers transformersBase utf8String void zlibConduit ]; meta = { homepage = "http://www.yesodweb.com/book/http-conduit"; diff --git a/pkgs/development/libraries/haskell/http-enumerator/default.nix b/pkgs/development/libraries/haskell/http-enumerator/default.nix deleted file mode 100644 index 3346f2b3328..00000000000 --- a/pkgs/development/libraries/haskell/http-enumerator/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ cabal, asn1Data, attoparsec, attoparsecEnumerator -, base64Bytestring, blazeBuilder, blazeBuilderEnumerator -, caseInsensitive, certificate, cprngAes, dataDefault, enumerator -, failure, httpTypes, monadControl, network, tls, tlsExtra -, transformers, utf8String, zlibEnum -}: - -cabal.mkDerivation (self: { - pname = "http-enumerator"; - version = "0.7.3.1"; - sha256 = "0a4p9340g6bx3s7mj3lbkrgw3db2kxpjncbbnnpdcwqyswi2vm75"; - isLibrary = true; - isExecutable = true; - buildDepends = [ - asn1Data attoparsec attoparsecEnumerator base64Bytestring - blazeBuilder blazeBuilderEnumerator caseInsensitive certificate - cprngAes dataDefault enumerator failure httpTypes monadControl - network tls tlsExtra transformers utf8String zlibEnum - ]; - meta = { - homepage = "http://github.com/snoyberg/http-enumerator"; - description = "HTTP client package with enumerator interface and HTTPS support"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/instant-generics/default.nix b/pkgs/development/libraries/haskell/instant-generics/default.nix index 5893e0b9d05..648dfd7c315 100644 --- a/pkgs/development/libraries/haskell/instant-generics/default.nix +++ b/pkgs/development/libraries/haskell/instant-generics/default.nix @@ -5,7 +5,6 @@ cabal.mkDerivation (self: { version = "0.3.4"; sha256 = "0j3sfbw3j0izwmhvwcl8nxxvlrpfla5rngxx2yvl6w5i87wyhswi"; buildDepends = [ syb ]; - noHaddock = true; meta = { homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/InstantGenerics"; description = "Generic programming library with a sum of products view"; diff --git a/pkgs/development/libraries/haskell/iteratee/default.nix b/pkgs/development/libraries/haskell/iteratee/default.nix index 901f3c5e81a..2a2708f70ac 100644 --- a/pkgs/development/libraries/haskell/iteratee/default.nix +++ b/pkgs/development/libraries/haskell/iteratee/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "iteratee"; - version = "0.8.8.1"; - sha256 = "1d6b83j3k2idpa9xcii8h9wa6mvxngp7rymb4xy6w8lvrmi7rmwz"; + version = "0.8.8.2"; + sha256 = "1d76an95y8svaja5ksx8p05fk22z62hp3gfwnd1d917qccffw6ry"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/language-javascript/default.nix b/pkgs/development/libraries/haskell/language-javascript/default.nix index 053bbef01eb..3f04b3a9289 100644 --- a/pkgs/development/libraries/haskell/language-javascript/default.nix +++ b/pkgs/development/libraries/haskell/language-javascript/default.nix @@ -1,12 +1,10 @@ -{ cabal, happy, mtl, utf8Light }: +{ cabal, blazeBuilder, happy, mtl, utf8Light, utf8String }: cabal.mkDerivation (self: { pname = "language-javascript"; - version = "0.4.10"; - sha256 = "1bk5xrhj5cpacz2bcfjz28sldizdadg05daalppxq8vs830sdx5h"; - isLibrary = true; - isExecutable = true; - buildDepends = [ mtl utf8Light ]; + version = "0.5.4"; + sha256 = "0hjx12n3pkxcdkppqalv6sl68vjlib37gby89ksay807ndslvb9q"; + buildDepends = [ blazeBuilder mtl utf8Light utf8String ]; buildTools = [ happy ]; meta = { homepage = "http://github.com/alanz/language-javascript"; diff --git a/pkgs/development/libraries/haskell/libmpd/default.nix b/pkgs/development/libraries/haskell/libmpd/default.nix index f9deadd8537..c0ba821d5f1 100644 --- a/pkgs/development/libraries/haskell/libmpd/default.nix +++ b/pkgs/development/libraries/haskell/libmpd/default.nix @@ -1,12 +1,10 @@ -{ cabal, filepath, mtl, network, time, utf8String }: +{ cabal, filepath, mtl, network, text, time, utf8String }: cabal.mkDerivation (self: { pname = "libmpd"; - version = "0.7.2"; - sha256 = "109bm5fgwmydh3bi93wxr6ac3gkp7pcvp4a8z226c1wlgc995zap"; - isLibrary = true; - isExecutable = true; - buildDepends = [ filepath mtl network time utf8String ]; + version = "0.8.0"; + sha256 = "0sn9yqiqr011glb7q0f3xj24wkkvnib0khzf833npcas4420d0ya"; + buildDepends = [ filepath mtl network text time utf8String ]; meta = { homepage = "http://github.com/joachifm/libmpd-haskell"; description = "An MPD client library"; diff --git a/pkgs/development/libraries/haskell/lifted-base/default.nix b/pkgs/development/libraries/haskell/lifted-base/default.nix index bc4af6298de..7207c662d53 100644 --- a/pkgs/development/libraries/haskell/lifted-base/default.nix +++ b/pkgs/development/libraries/haskell/lifted-base/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "lifted-base"; - version = "0.1.0.3"; - sha256 = "1fk2jv8xwjb4xmzcx7h74nh14i3wf5mpifiki9rvq4hnrb7gdx36"; + version = "0.1.1"; + sha256 = "148631zwax809nzm01fqymmgvkscyv1kii36a12phkmg7sx014vm"; buildDepends = [ baseUnicodeSymbols monadControl transformersBase ]; diff --git a/pkgs/development/libraries/haskell/monad-control/0.2.0.3.nix b/pkgs/development/libraries/haskell/monad-control/0.2.0.3.nix deleted file mode 100644 index d313df8f65b..00000000000 --- a/pkgs/development/libraries/haskell/monad-control/0.2.0.3.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ cabal, baseUnicodeSymbols, transformers }: - -cabal.mkDerivation (self: { - pname = "monad-control"; - version = "0.2.0.3"; - sha256 = "0z7wjilrx6phqs2gxwv65dy1n3mc0j8hj3adshkwy6z8ggj283nh"; - buildDepends = [ baseUnicodeSymbols transformers ]; - meta = { - homepage = "https://github.com/basvandijk/monad-control/"; - description = "Lift control operations, like exception catching, through monad transformers"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/monad-control/0.3.1.nix b/pkgs/development/libraries/haskell/monad-control/0.3.1.nix deleted file mode 100644 index d04308a4aa2..00000000000 --- a/pkgs/development/libraries/haskell/monad-control/0.3.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ cabal, baseUnicodeSymbols, transformers, transformersBase }: - -cabal.mkDerivation (self: { - pname = "monad-control"; - version = "0.3.1"; - sha256 = "0laqvbnj1dfcdxrybxdnzw5g95drv34ys0cbwkcw47nl9w801p45"; - buildDepends = [ - baseUnicodeSymbols transformers transformersBase - ]; - meta = { - homepage = "https://github.com/basvandijk/monad-control"; - description = "Lift control operations, like exception catching, through monad transformers"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/monad-control/0.3.1.1.nix b/pkgs/development/libraries/haskell/monad-control/default.nix similarity index 85% rename from pkgs/development/libraries/haskell/monad-control/0.3.1.1.nix rename to pkgs/development/libraries/haskell/monad-control/default.nix index 67608ebbf81..69c55ba049b 100644 --- a/pkgs/development/libraries/haskell/monad-control/0.3.1.1.nix +++ b/pkgs/development/libraries/haskell/monad-control/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "monad-control"; - version = "0.3.1.1"; - sha256 = "09sr9zw6xzci4r86sjpslwnd64ickcsv6qs1fr6ig4w7mwacyx4x"; + version = "0.3.1.3"; + sha256 = "0sx0jr8hccqh519sgn428y4xfk6m5jpwfm9201vn8zj1cxlppjv9"; buildDepends = [ baseUnicodeSymbols transformers transformersBase ]; diff --git a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix new file mode 100644 index 00000000000..c1901f470fd --- /dev/null +++ b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix @@ -0,0 +1,15 @@ +{ cabal, cryptoApi, mtl, transformers }: + +cabal.mkDerivation (self: { + pname = "monadcryptorandom"; + version = "0.4.1"; + sha256 = "01x3zfr4m93bgx062rhxqk1d8qhn6s7rkfkm4yf00p89fclyjsg1"; + buildDepends = [ cryptoApi mtl transformers ]; + meta = { + homepage = "http://trac.haskell.org/crypto-api/wiki"; + description = "A monad for using CryptoRandomGen"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/mtl/2.1.1.nix b/pkgs/development/libraries/haskell/mtl/2.1.1.nix new file mode 100644 index 00000000000..b9298325c20 --- /dev/null +++ b/pkgs/development/libraries/haskell/mtl/2.1.1.nix @@ -0,0 +1,14 @@ +{ cabal, transformers }: + +cabal.mkDerivation (self: { + pname = "mtl"; + version = "2.1.1"; + sha256 = "143s0c5hygwnd72x14jwinpnd92gx4y9blhmv6086rxijqbq6l4j"; + buildDepends = [ transformers ]; + meta = { + description = "Monad classes, using functional dependencies"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/mtl/2.1.nix b/pkgs/development/libraries/haskell/mtl/2.1.nix new file mode 100644 index 00000000000..e231a3a1f3a --- /dev/null +++ b/pkgs/development/libraries/haskell/mtl/2.1.nix @@ -0,0 +1,14 @@ +{ cabal, transformers }: + +cabal.mkDerivation (self: { + pname = "mtl"; + version = "2.1"; + sha256 = "041fhi6vgddj43y26ljhxqjryjbsj0rb6m6gfpvrjynzp6c7c5n6"; + buildDepends = [ transformers ]; + meta = { + description = "Monad classes, using functional dependencies"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/multiarg/default.nix b/pkgs/development/libraries/haskell/multiarg/default.nix index 446c47a41dc..0d922c4c060 100644 --- a/pkgs/development/libraries/haskell/multiarg/default.nix +++ b/pkgs/development/libraries/haskell/multiarg/default.nix @@ -1,14 +1,10 @@ -{ cabal, explicitException, QuickCheck, text, transformers -, utf8String -}: +{ cabal, explicitException, text, transformers, utf8String }: cabal.mkDerivation (self: { pname = "multiarg"; - version = "0.1.0.0"; - sha256 = "010mph49fq0rdr5dmm4pdlbmfmaaas8wffa9p1cgprs2ic1hnx3g"; - buildDepends = [ - explicitException QuickCheck text transformers utf8String - ]; + version = "0.2.0.0"; + sha256 = "1jmhlh4ngmkddrkcafx0qcmzwbmi5crkmd6p8b07cfjpaq2pc6yx"; + buildDepends = [ explicitException text transformers utf8String ]; meta = { homepage = "https://github.com/massysett/multiarg"; description = "Combinators to build command line parsers"; diff --git a/pkgs/development/libraries/haskell/network-conduit/default.nix b/pkgs/development/libraries/haskell/network-conduit/default.nix new file mode 100644 index 00000000000..e16610fe348 --- /dev/null +++ b/pkgs/development/libraries/haskell/network-conduit/default.nix @@ -0,0 +1,18 @@ +{ cabal, conduit, liftedBase, monadControl, network, transformers +}: + +cabal.mkDerivation (self: { + pname = "network-conduit"; + version = "0.4.0"; + sha256 = "0h0s33nxihd4zy9mvy2vpdrpvjapacbl69ndsw5zrbqhwbpz3mzs"; + buildDepends = [ + conduit liftedBase monadControl network transformers + ]; + meta = { + homepage = "http://github.com/snoyberg/conduit"; + description = "Stream socket data using conduits"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/network/2.3.0.11.nix b/pkgs/development/libraries/haskell/network/2.3.0.11.nix deleted file mode 100644 index db53fef9394..00000000000 --- a/pkgs/development/libraries/haskell/network/2.3.0.11.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ cabal, parsec }: - -cabal.mkDerivation (self: { - pname = "network"; - version = "2.3.0.11"; - sha256 = "1ghm8rw0m3x71pnndbmzm9j99yh8bmmrlhz4ykslsk2my7ihmxdk"; - buildDepends = [ parsec ]; - meta = { - homepage = "http://github.com/haskell/network"; - description = "Low-level networking interface"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/network/2.3.0.7.nix b/pkgs/development/libraries/haskell/network/2.3.0.13.nix similarity index 80% rename from pkgs/development/libraries/haskell/network/2.3.0.7.nix rename to pkgs/development/libraries/haskell/network/2.3.0.13.nix index fa194ae4507..29452da7b2e 100644 --- a/pkgs/development/libraries/haskell/network/2.3.0.7.nix +++ b/pkgs/development/libraries/haskell/network/2.3.0.13.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "network"; - version = "2.3.0.7"; - sha256 = "1rlzdacgaq8nv0bwczsrkw47rw4aamf9y4ynm3xjw0r3w1xcg9yv"; + version = "2.3.0.13"; + sha256 = "0xw53czvcw8k49aqxmchc1rcd6pyxp4icwgp64625fnm3l4yjiq7"; buildDepends = [ parsec ]; meta = { homepage = "http://github.com/haskell/network"; diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index d7003cc82fc..4843c8afb80 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "pandoc"; - version = "1.9.1.2"; - sha256 = "0sjdcmf3k64y9q0x1g2y3p7km73ir7gk4xxrvvx37aqwk3v9yraj"; + version = "1.9.2"; + sha256 = "1hp51ddfwlg4pg5n16jhf7w8r4s074n5baiy55fi2p47lx278jsq"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/path-pieces/0.0.0.nix b/pkgs/development/libraries/haskell/path-pieces/0.0.0.nix deleted file mode 100755 index 6b5168e50c1..00000000000 --- a/pkgs/development/libraries/haskell/path-pieces/0.0.0.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ cabal, text }: - -cabal.mkDerivation (self: { - pname = "path-pieces"; - version = "0.0.0"; - sha256 = "09sk4wlzy37gaii7spisjy4a3pizis9si4kv389bki20gfwpaivf"; - buildDepends = [ text ]; - meta = { - homepage = "http://github.com/snoyberg/path-pieces"; - description = "Components of paths"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/path-pieces/0.1.0.nix b/pkgs/development/libraries/haskell/path-pieces/default.nix old mode 100755 new mode 100644 similarity index 69% rename from pkgs/development/libraries/haskell/path-pieces/0.1.0.nix rename to pkgs/development/libraries/haskell/path-pieces/default.nix index ea66d1d54bd..d4f52aef58e --- a/pkgs/development/libraries/haskell/path-pieces/0.1.0.nix +++ b/pkgs/development/libraries/haskell/path-pieces/default.nix @@ -1,10 +1,10 @@ -{ cabal, text }: +{ cabal, text, time }: cabal.mkDerivation (self: { pname = "path-pieces"; - version = "0.1.0"; - sha256 = "12dgiq2pz94pwa5v5wv96ps0nl5w23r44nnp4lm4cdhl063c9w8d"; - buildDepends = [ text ]; + version = "0.1.1"; + sha256 = "17ymk2azgz2c1hwnzqd9xy77hh51mvrgz4zs7lz4ik6rnvvihraz"; + buildDepends = [ text time ]; meta = { homepage = "http://github.com/snoyberg/path-pieces"; description = "Components of paths"; diff --git a/pkgs/development/libraries/haskell/pem/default.nix b/pkgs/development/libraries/haskell/pem/default.nix new file mode 100644 index 00000000000..ff9b91fe0da --- /dev/null +++ b/pkgs/development/libraries/haskell/pem/default.nix @@ -0,0 +1,15 @@ +{ cabal, attoparsec, base64Bytestring, cereal, mtl }: + +cabal.mkDerivation (self: { + pname = "pem"; + version = "0.1.1"; + sha256 = "0klb39w6mihx35xgdw5wvi1q6r61xgrsqvcqi4c5r6psv5z94cil"; + buildDepends = [ attoparsec base64Bytestring cereal mtl ]; + meta = { + homepage = "http://github.com/vincenthz/hs-pem"; + description = "Privacy Enhanced Mail (PEM) format reader and writer"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix index d1a067bcbb0..ed8d8094eb1 100644 --- a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix +++ b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix @@ -4,15 +4,15 @@ cabal.mkDerivation (self: { pname = "persistent-sqlite"; - version = "0.8.0"; - sha256 = "19dly53g4jzcqi9px49w9qaf2vnlpsxc6jf5xn63827ylmxlmk5q"; + version = "0.9.0.1"; + sha256 = "19bwkaazg3c822n3308awy70ml40jvncr4c3rvidq72zzdvql9c2"; buildDepends = [ aeson conduit monadControl persistent text transformers ]; meta = { homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using sqlite3"; - license = self.stdenv.lib.licenses.bsd3; + license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix index 22948d89946..b83a32385de 100644 --- a/pkgs/development/libraries/haskell/persistent-template/default.nix +++ b/pkgs/development/libraries/haskell/persistent-template/default.nix @@ -2,13 +2,13 @@ cabal.mkDerivation (self: { pname = "persistent-template"; - version = "0.8.2"; - sha256 = "0lmdp2gmrbgnp2ls4b76hnjcrllgmzrsiszkmbywkb2dmlxm5wdq"; + version = "0.9.0.1"; + sha256 = "0hxv69qifkmv36zkzlhlw40s6zzv4jf977iqim069b4v8824r9pc"; buildDepends = [ aeson monadControl persistent text transformers ]; meta = { homepage = "http://www.yesodweb.com/book/persistent"; description = "Type-safe, non-relational, multi-backend persistence"; - license = self.stdenv.lib.licenses.bsd3; + license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index 0ebb1d2d7c0..c632010f78c 100644 --- a/pkgs/development/libraries/haskell/persistent/default.nix +++ b/pkgs/development/libraries/haskell/persistent/default.nix @@ -1,23 +1,23 @@ { cabal, aeson, attoparsec, base64Bytestring, blazeHtml, conduit -, liftedBase, monadControl, mtl, pathPieces, poolConduit, sqlite -, text, time, transformers, transformersBase, unorderedContainers -, vector +, liftedBase, monadControl, pathPieces, poolConduit, resourcet +, sqlite, text, time, transformers, transformersBase +, unorderedContainers, vector }: cabal.mkDerivation (self: { pname = "persistent"; - version = "0.8.0.2"; - sha256 = "10v11fnx7dhj2gg09k3ji054iywbpazs789vhfxn56wfg6rz59wb"; + version = "0.9.0.3"; + sha256 = "07w2d5x4wlbs8smkq2mini4rkmdd38zmapwqcn59vna8cq9wslz6"; buildDepends = [ aeson attoparsec base64Bytestring blazeHtml conduit liftedBase - monadControl mtl pathPieces poolConduit text time transformers - transformersBase unorderedContainers vector + monadControl pathPieces poolConduit resourcet text time + transformers transformersBase unorderedContainers vector ]; extraLibraries = [ sqlite ]; meta = { homepage = "http://www.yesodweb.com/book/persistent"; description = "Type-safe, multi-backend data serialization"; - license = self.stdenv.lib.licenses.bsd3; + license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; diff --git a/pkgs/development/libraries/haskell/pool-conduit/default.nix b/pkgs/development/libraries/haskell/pool-conduit/default.nix index 4d4f9101456..abb5d83f5e7 100644 --- a/pkgs/development/libraries/haskell/pool-conduit/default.nix +++ b/pkgs/development/libraries/haskell/pool-conduit/default.nix @@ -1,14 +1,14 @@ -{ cabal, conduit, resourcePool, transformers }: +{ cabal, resourcePool, resourcet, transformers }: cabal.mkDerivation (self: { pname = "pool-conduit"; - version = "0.0.0.1"; - sha256 = "1im5fpwadg9hmajay6dkwmlzbp5rzn8hh9wh01iy23jgivkqk2q0"; - buildDepends = [ conduit resourcePool transformers ]; + version = "0.1.0.1"; + sha256 = "1a88x8yi5p99qpq262idfzn9f5cjjdq417rbayp0kknm5c6d9n5c"; + buildDepends = [ resourcePool resourcet transformers ]; meta = { homepage = "http://www.yesodweb.com/book/persistent"; description = "Resource pool allocations via ResourceT"; - license = self.stdenv.lib.licenses.bsd3; + license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; diff --git a/pkgs/development/libraries/haskell/random-source/default.nix b/pkgs/development/libraries/haskell/random-source/default.nix old mode 100755 new mode 100644 diff --git a/pkgs/development/libraries/haskell/reactive-banana/default.nix b/pkgs/development/libraries/haskell/reactive-banana/default.nix new file mode 100644 index 00000000000..c3a94e03673 --- /dev/null +++ b/pkgs/development/libraries/haskell/reactive-banana/default.nix @@ -0,0 +1,22 @@ +{ cabal, fclabels, hashable, QuickCheck, transformers +, unorderedContainers, vault +}: + +cabal.mkDerivation (self: { + pname = "reactive-banana"; + version = "0.5.0.2"; + sha256 = "10391b6vwgp5harzmiji66qs4zc5qipagak1mm2j8njhbqi8z0rb"; + buildDepends = [ + fclabels hashable QuickCheck transformers unorderedContainers vault + ]; + meta = { + homepage = "http://haskell.org/haskellwiki/Reactive-banana"; + description = "Practical library for functional reactive programming (FRP)"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.bluescreen303 + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/repa-algorithms/default.nix b/pkgs/development/libraries/haskell/repa-algorithms/default.nix index f9798196693..ca6059b68b3 100644 --- a/pkgs/development/libraries/haskell/repa-algorithms/default.nix +++ b/pkgs/development/libraries/haskell/repa-algorithms/default.nix @@ -1,10 +1,11 @@ -{ cabal, repa, vector }: +{ cabal, llvm, repa, vector }: cabal.mkDerivation (self: { pname = "repa-algorithms"; - version = "2.2.0.1"; - sha256 = "1ggxa2h2swgf7621nrzlqmmyi3h2v526w69zcwvms84kyd257p4p"; + version = "3.1.3.1"; + sha256 = "04d0r68k7dhk5ka9hzqf6wy9yyhjwc0rndp1ir1vllc6w6f8k4wl"; buildDepends = [ repa vector ]; + extraLibraries = [ llvm ]; meta = { homepage = "http://repa.ouroborus.net"; description = "Algorithms using the Repa array library"; diff --git a/pkgs/development/libraries/haskell/repa-bytestring/default.nix b/pkgs/development/libraries/haskell/repa-bytestring/default.nix deleted file mode 100644 index 1d03f5c6458..00000000000 --- a/pkgs/development/libraries/haskell/repa-bytestring/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ cabal, repa, vector }: - -cabal.mkDerivation (self: { - pname = "repa-bytestring"; - version = "2.2.0.1"; - sha256 = "0yc814wyiy5cb9j04515rv24mm4qd5xqyz2dxsmg1p46qb69hvsg"; - buildDepends = [ repa vector ]; - meta = { - homepage = "http://repa.ouroborus.net"; - description = "Conversions between Repa Arrays and ByteStrings"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/repa-examples/default.nix b/pkgs/development/libraries/haskell/repa-examples/default.nix index 18a8cb44bd6..9acc949042f 100644 --- a/pkgs/development/libraries/haskell/repa-examples/default.nix +++ b/pkgs/development/libraries/haskell/repa-examples/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "repa-examples"; - version = "2.2.0.1"; - sha256 = "0rqpq4v2ir86x9z0aw8pcz929imcw9lf415j88kg12x2rk451mm0"; + version = "3.1.3.1"; + sha256 = "15fg356a8sa48vmgn5fxgbj3s48hixsl1x4a8ds0mvvv8m0zlra8"; isLibrary = false; isExecutable = true; buildDepends = [ random repa repaAlgorithms repaIo vector ]; diff --git a/pkgs/development/libraries/haskell/repa-io/default.nix b/pkgs/development/libraries/haskell/repa-io/default.nix index 0d4772016fb..21844f15fc8 100644 --- a/pkgs/development/libraries/haskell/repa-io/default.nix +++ b/pkgs/development/libraries/haskell/repa-io/default.nix @@ -1,10 +1,10 @@ -{ cabal, binary, bmp, repa, repaBytestring, vector }: +{ cabal, binary, bmp, repa, vector }: cabal.mkDerivation (self: { pname = "repa-io"; - version = "2.2.0.1"; - sha256 = "1akp6xkfvbc7jmnzlrz4y5fncqrv9d06y981dndcv6lgxz4hv4j1"; - buildDepends = [ binary bmp repa repaBytestring vector ]; + version = "3.1.3.1"; + sha256 = "1ah5zqg3699p98820gs39xh1xipqdknlgkwxrdqsblnm33y1bqnb"; + buildDepends = [ binary bmp repa vector ]; meta = { homepage = "http://repa.ouroborus.net"; description = "Read and write Repa arrays in various formats"; diff --git a/pkgs/development/libraries/haskell/repa/default.nix b/pkgs/development/libraries/haskell/repa/default.nix index 5bb059a457c..10a9c2414ef 100644 --- a/pkgs/development/libraries/haskell/repa/default.nix +++ b/pkgs/development/libraries/haskell/repa/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "repa"; - version = "2.2.0.1"; - sha256 = "016cigxivjd17g0hysf76b3lznjpk478q0hg9hsy154ms7xap3dy"; + version = "3.1.3.3"; + sha256 = "108zifbgngwd5a3bkvkm4sh2nhds748wqk227mcsxcw9y085da0f"; buildDepends = [ QuickCheck vector ]; meta = { homepage = "http://repa.ouroborus.net"; diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix index a01055f47c5..adc6c2b40a8 100644 --- a/pkgs/development/libraries/haskell/resourcet/default.nix +++ b/pkgs/development/libraries/haskell/resourcet/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "resourcet"; - version = "0.3.2"; - sha256 = "0vaygw17cfx2y2lv32lmr7x0vch58dh19jmh8j7mcj11qy5v0nz8"; + version = "0.3.2.1"; + sha256 = "1gqcqbj9f13b9myrg7nhydrbbqnn80k69s65qsk3rc8wsqyk8i6g"; buildDepends = [ liftedBase monadControl transformers transformersBase ]; diff --git a/pkgs/development/libraries/haskell/rvar/default.nix b/pkgs/development/libraries/haskell/rvar/default.nix old mode 100755 new mode 100644 index 3f2f3915ddf..6f2ed95ab63 --- a/pkgs/development/libraries/haskell/rvar/default.nix +++ b/pkgs/development/libraries/haskell/rvar/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "rvar"; - version = "0.2"; - sha256 = "1in2qn1clv9b7ijyllhjflh9zdkna31hpyclhlkfnsc6899z3y1f"; + version = "0.2.0.1"; + sha256 = "17wgd4gc1hn04dck168nkyzn9jyipgbysxsznyzy2z36vafqqqbm"; buildDepends = [ MonadPrompt mtl randomSource transformers ]; meta = { homepage = "https://github.com/mokus0/random-fu"; diff --git a/pkgs/development/libraries/haskell/semigroups/default.nix b/pkgs/development/libraries/haskell/semigroups/default.nix old mode 100755 new mode 100644 index 6c070bc6d24..4c2def192b4 --- a/pkgs/development/libraries/haskell/semigroups/default.nix +++ b/pkgs/development/libraries/haskell/semigroups/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "semigroups"; - version = "0.8"; - sha256 = "12ly9f1lxzrxvwkcx25cjik7d1f1l2j1rkd0cabgpcg53hz4158c"; + version = "0.8.3"; + sha256 = "179m5vvhf8rf01fnq8b2lg7v8i70yx6yq975jiazghm0qnsm32ji"; meta = { homepage = "http://github.com/ekmett/semigroups/"; description = "Haskell 98 semigroups"; diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix index d24529425d0..1fd81d9d6a5 100644 --- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix @@ -2,13 +2,13 @@ cabal.mkDerivation (self: { pname = "shakespeare-css"; - version = "0.10.8"; - sha256 = "1c3a48rfrr5ifarr15zkcwg74zkqw08lhfk5fpkr5z6gxhwnbkas"; + version = "1.0.1.1"; + sha256 = "1janifi0sqdvxwq8ywk6g1y9r8qgy2jvizlm0drp09lnw1dlss25"; buildDepends = [ parsec shakespeare text ]; meta = { - homepage = "http://www.yesodweb.com/book/templates"; + homepage = "http://www.yesodweb.com/book/shakespearean-templates"; description = "Stick your haskell variables into css at compile time"; - license = self.stdenv.lib.licenses.bsd3; + license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; diff --git a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix index 47749bf0565..5ef05d877e3 100644 --- a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix @@ -2,13 +2,13 @@ cabal.mkDerivation (self: { pname = "shakespeare-i18n"; - version = "0.0.2.1"; - sha256 = "1gaxngqihz6wi5d6hyb9mdlhgcxnr4bvmm1si919zgjndwnms8z8"; + version = "1.0.0.1"; + sha256 = "1g4jczz3kvfvdk2w64kbphmv451g8khx5d1bxmhscqkmlh6zgqjz"; buildDepends = [ parsec shakespeare text ]; meta = { - homepage = "http://www.yesodweb.com/book/i18n"; + homepage = "http://www.yesodweb.com/book/shakespearean-templates"; description = "A type-based approach to internationalization"; - license = self.stdenv.lib.licenses.bsd3; + license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix index eb8d029496b..f6b7fbbea4b 100644 --- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix @@ -2,13 +2,13 @@ cabal.mkDerivation (self: { pname = "shakespeare-js"; - version = "0.11.2"; - sha256 = "1ck39bgl4wswd88w42b1fx5dlsd7r31d60ssv1lk11x6s4cjihgz"; + version = "1.0.0.1"; + sha256 = "13l1hsc6b87lbz10xhihvmzf1922mwmrbinr4rhkrn48hlxf2fii"; buildDepends = [ shakespeare text ]; meta = { - homepage = "http://www.yesodweb.com/book/templates"; + homepage = "http://www.yesodweb.com/book/shakespearean-templates"; description = "Stick your haskell variables into javascript/coffeescript at compile time"; - license = self.stdenv.lib.licenses.bsd3; + license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; diff --git a/pkgs/development/libraries/haskell/shakespeare-text/default.nix b/pkgs/development/libraries/haskell/shakespeare-text/default.nix index acf55d9d082..ad12fdd1d07 100644 --- a/pkgs/development/libraries/haskell/shakespeare-text/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-text/default.nix @@ -2,13 +2,13 @@ cabal.mkDerivation (self: { pname = "shakespeare-text"; - version = "0.11"; - sha256 = "02h8vi28kzvv44hy1ix9jc01x4jx302cp71bdj8blsjxzqyr6aq8"; + version = "1.0.0.1"; + sha256 = "0afbxjz6ma0fk4m3xp8cx9sfaxdnsxzbj3ikyfn6vmx4ivid299f"; buildDepends = [ shakespeare text ]; meta = { - homepage = "http://www.yesodweb.com/book/templates"; + homepage = "http://www.yesodweb.com/book/shakespearean-templates"; description = "Interpolation with quasi-quotation: put variables strings"; - license = self.stdenv.lib.licenses.bsd3; + license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix index 04305bbed22..f8a88002f71 100644 --- a/pkgs/development/libraries/haskell/shakespeare/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare/default.nix @@ -2,13 +2,13 @@ cabal.mkDerivation (self: { pname = "shakespeare"; - version = "0.11"; - sha256 = "0ksjgl2x97n5ci346vlmc2kd8plvsg6kn5cncbxkd8c6w4h28a4b"; + version = "1.0.0.1"; + sha256 = "1x682irbxr7wwrpz4ri2j4pl85r8s8hs0draf9bfaskagp14d522"; buildDepends = [ parsec text ]; meta = { - homepage = "http://www.yesodweb.com/book/templates"; + homepage = "http://www.yesodweb.com/book/shakespearean-templates"; description = "A toolkit for making compile-time interpolated templates"; - license = self.stdenv.lib.licenses.bsd3; + license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; diff --git a/pkgs/development/libraries/haskell/simple-sendfile/default.nix b/pkgs/development/libraries/haskell/simple-sendfile/default.nix index 3df9ac1a5e1..19ccce16ab2 100644 --- a/pkgs/development/libraries/haskell/simple-sendfile/default.nix +++ b/pkgs/development/libraries/haskell/simple-sendfile/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "simple-sendfile"; - version = "0.2.1"; - sha256 = "0mbnqdy7g9jp2d6x9mcrz315b4xhp92as28bxygf7jhc0aai66aq"; + version = "0.2.3"; + sha256 = "1i3jx90kwq504fdl2qbhz25psjvq9ldvwgx5cij82ajjqi61pfrv"; buildDepends = [ network ]; meta = { description = "Cross platform library for the sendfile system call"; diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix index a1123c793f3..143bf530d09 100644 --- a/pkgs/development/libraries/haskell/skein/default.nix +++ b/pkgs/development/libraries/haskell/skein/default.nix @@ -2,10 +2,11 @@ cabal.mkDerivation (self: { pname = "skein"; - version = "0.1.0.5"; - sha256 = "12hyyydznss802v4pwfcpjr0y7241114a9z82xxq60q8dval8fyb"; + version = "0.1.0.7"; + sha256 = "13yhbp17iq30cjh9fid3l0wkyvpj0f1b1bak9s7gfj96basg9ig2"; buildDepends = [ cereal cryptoApi tagged ]; meta = { + homepage = "https://github.com/meteficha/skein"; description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well."; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix index 21d95eca679..08616b1b841 100644 --- a/pkgs/development/libraries/haskell/snap/core.nix +++ b/pkgs/development/libraries/haskell/snap/core.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "snap-core"; - version = "0.8.0.1"; - sha256 = "0lw1c5gczb75878vr5acjck656aq5zg1hva9bfny321v0442azds"; + version = "0.8.1"; + sha256 = "11r4zd9z241qvzji7gcmynkib5w9b7c7wa8jx7al2z2aq4qhfx1b"; buildDepends = [ attoparsec attoparsecEnumerator base16Bytestring blazeBuilder blazeBuilderEnumerator bytestringMmap bytestringNums diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix index 028d8175861..37111f3b847 100644 --- a/pkgs/development/libraries/haskell/snap/server.nix +++ b/pkgs/development/libraries/haskell/snap/server.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "snap-server"; - version = "0.8.0.1"; - sha256 = "1648p0m4n4ha4976gw891z112rzxd9q4s7n4x3v0z3qb10aynxjb"; + version = "0.8.1.1"; + sha256 = "0k47z9fhc64bnv86ixaxvndwc7hk28ny3mf5ny9d5jmp77a3ws46"; buildDepends = [ attoparsec attoparsecEnumerator binary blazeBuilder blazeBuilderEnumerator bytestringNums caseInsensitive directoryTree diff --git a/pkgs/development/libraries/haskell/storable-record/default.nix b/pkgs/development/libraries/haskell/storable-record/default.nix index 61085b1c719..455d860ba5e 100644 --- a/pkgs/development/libraries/haskell/storable-record/default.nix +++ b/pkgs/development/libraries/haskell/storable-record/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "storable-record"; - version = "0.0.2.4"; - sha256 = "5ed2680dcfc4c3d4fe605d23e797b847fe047b7acd3f4acfd82155c93e72b280"; + version = "0.0.2.5"; + sha256 = "078vwwcr47d3dmzkhxr7ggjkq9d5rnxv4z8p049kdnmzfbcmisn3"; isLibrary = true; isExecutable = true; buildDepends = [ transformers utilityHt ]; diff --git a/pkgs/development/libraries/haskell/streamproc/default.nix b/pkgs/development/libraries/haskell/streamproc/default.nix old mode 100755 new mode 100644 diff --git a/pkgs/development/libraries/haskell/syb/0.3.6.nix b/pkgs/development/libraries/haskell/syb/0.3.6.1.nix similarity index 79% rename from pkgs/development/libraries/haskell/syb/0.3.6.nix rename to pkgs/development/libraries/haskell/syb/0.3.6.1.nix index 6d9393f60c2..7638ab3332f 100644 --- a/pkgs/development/libraries/haskell/syb/0.3.6.nix +++ b/pkgs/development/libraries/haskell/syb/0.3.6.1.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "syb"; - version = "0.3.6"; - sha256 = "1khb5h4gw1f9l9zhb7x1y9rf2qpypbvm9kmpf0b6xgggd2800s25"; + version = "0.3.6.1"; + sha256 = "1xyz6ahyvairzb5n1mrmryzrxrkd4m8ywxa6r6x5nqm2xa7zqv34"; meta = { homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB"; description = "Scrap Your Boilerplate"; diff --git a/pkgs/development/libraries/haskell/tagged/default.nix b/pkgs/development/libraries/haskell/tagged/default.nix index 07d671ac33d..2611c988d59 100644 --- a/pkgs/development/libraries/haskell/tagged/default.nix +++ b/pkgs/development/libraries/haskell/tagged/default.nix @@ -1,13 +1,12 @@ -{ cabal, dataDefault, semigroups }: +{ cabal }: cabal.mkDerivation (self: { pname = "tagged"; - version = "0.2.3.1"; - sha256 = "0ldc9w35yzlrz78kakkqial32g2c7da9b5v334jh5wpgsn7lrm3n"; - buildDepends = [ dataDefault semigroups ]; + version = "0.4.2"; + sha256 = "16c2006b7f87003z6vz13fisw18iiqncjqk9x0f4wwzj6i70wgbw"; meta = { homepage = "http://github.com/ekmett/tagged"; - description = "Provides newtype wrappers for phantom types to avoid unsafely passing dummy arguments"; + description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; diff --git a/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix b/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix index 50a79401290..d71e2a034d0 100644 --- a/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix +++ b/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "test-framework-quickcheck"; - version = "0.2.8"; - sha256 = "0ca6s7dnrdr9s2gdpfb74lswlj2lj091crk89m3yqjcadchkh3vl"; + version = "0.2.8.1"; + sha256 = "042vdq18mqw4rhsj3x51mz1iv9zbxvlz7jg6r9cni2xpw5m7v6dk"; buildDepends = [ deepseq extensibleExceptions QuickCheck random testFramework ]; diff --git a/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix b/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix index 34d5b6ae51f..1f1a45d4245 100644 --- a/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix +++ b/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "test-framework-quickcheck2"; - version = "0.2.12.1"; - sha256 = "03m6kf6lhi9nzymfyfqqimfgs6139bpa0pzbxzvz2nvizdnbmmcw"; + version = "0.2.12.2"; + sha256 = "08m8y78qy23imcwyqdqla7syxdf91iqrb0j8g6g7gwsg5asjq6ip"; buildDepends = [ extensibleExceptions QuickCheck random testFramework ]; diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix index 7391896817d..a519170ca85 100644 --- a/pkgs/development/libraries/haskell/texmath/default.nix +++ b/pkgs/development/libraries/haskell/texmath/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "texmath"; - version = "0.6.0.3"; - sha256 = "0vj1kh62qs7badv00lcda9m3j53kc069kmrv5lmz62a96y4kx5yi"; + version = "0.6.0.5"; + sha256 = "08zryp5y2llhzwbp93wbm37c1lykqgrbq8h23bv39ql8idpym0wq"; isLibrary = true; isExecutable = true; buildDepends = [ parsec syb xml ]; diff --git a/pkgs/development/libraries/haskell/text/0.11.2.0.nix b/pkgs/development/libraries/haskell/text/0.11.2.0.nix new file mode 100644 index 00000000000..213464f3f19 --- /dev/null +++ b/pkgs/development/libraries/haskell/text/0.11.2.0.nix @@ -0,0 +1,15 @@ +{ cabal, deepseq }: + +cabal.mkDerivation (self: { + pname = "text"; + version = "0.11.2.0"; + sha256 = "1fx5302m41awzbms410x3gcixsck36rl7i1ma7pz6l5d1pmi538p"; + buildDepends = [ deepseq ]; + meta = { + homepage = "https://github.com/bos/text"; + description = "An efficient packed Unicode text type"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix index 5a58a2002b1..349c4e05754 100644 --- a/pkgs/development/libraries/haskell/tls-extra/default.nix +++ b/pkgs/development/libraries/haskell/tls-extra/default.nix @@ -1,16 +1,16 @@ { cabal, certificate, cryptoApi, cryptocipher, cryptohash, mtl -, network, text, time, tls, vector +, network, pem, text, time, tls, vector }: cabal.mkDerivation (self: { pname = "tls-extra"; - version = "0.4.3"; - sha256 = "1qr7l70c5fgqpf9hnhsngghcss2cannhca1snlvbcrq074hc2f2n"; + version = "0.4.6"; + sha256 = "1xl55i4nr7kyc3qxi8zmq18m0xhlwlrx9fwkck22krshqgq2i6nn"; isLibrary = true; isExecutable = true; buildDepends = [ - certificate cryptoApi cryptocipher cryptohash mtl network text time - tls vector + certificate cryptoApi cryptocipher cryptohash mtl network pem text + time tls vector ]; meta = { homepage = "http://github.com/vincenthz/hs-tls-extra"; diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix index 31b261c920c..71067cd75ff 100644 --- a/pkgs/development/libraries/haskell/tls/default.nix +++ b/pkgs/development/libraries/haskell/tls/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tls"; - version = "0.9.1"; - sha256 = "0724xwk3mchb2hd6sq4zhrs7pyd18banr0ndxc6bhim75vci53sl"; + version = "0.9.5"; + sha256 = "1nbfimyxi546n239brhw5lrb7907svvhvy5zgy1f853h17vnli5y"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/type-equality/default.nix b/pkgs/development/libraries/haskell/type-equality/default.nix index f660ea6193a..66b8b1974ff 100644 --- a/pkgs/development/libraries/haskell/type-equality/default.nix +++ b/pkgs/development/libraries/haskell/type-equality/default.nix @@ -4,7 +4,6 @@ cabal.mkDerivation (self: { pname = "type-equality"; version = "0.1.0.2"; sha256 = "09m6vc5hglf3xdg0bg9lgbkgjffmbkfgcrqf5ii36l92c4dik32q"; - noHaddock = true; meta = { homepage = "http://github.com/hesselink/type-equality/"; description = "Type equality, coercion/cast and other operations"; diff --git a/pkgs/development/libraries/haskell/unbound/default.nix b/pkgs/development/libraries/haskell/unbound/default.nix index 1a186b4a508..b64aff3ae13 100644 --- a/pkgs/development/libraries/haskell/unbound/default.nix +++ b/pkgs/development/libraries/haskell/unbound/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "unbound"; - version = "0.4.0.1"; - sha256 = "0zb029wji85b643iqf4cnkd9d68accrjxnk8422xs82zik2kn6zf"; + version = "0.4.0.2"; + sha256 = "0vwbqrjrahg7ifsqgmq18ddmmczjxnsdz5w3kfgb4jpv1glwlxrh"; buildDepends = [ mtl RepLib transformers ]; meta = { homepage = "http://code.google.com/p/replib/"; diff --git a/pkgs/development/libraries/haskell/void/default.nix b/pkgs/development/libraries/haskell/void/default.nix new file mode 100644 index 00000000000..c2b56d95d98 --- /dev/null +++ b/pkgs/development/libraries/haskell/void/default.nix @@ -0,0 +1,15 @@ +{ cabal, semigroups }: + +cabal.mkDerivation (self: { + pname = "void"; + version = "0.5.5.1"; + sha256 = "1j8rss4b5j4213h40n4nl38p12z275lbsk46dvy4x5s96gqyximp"; + buildDepends = [ semigroups ]; + meta = { + homepage = "http://github.com/ekmett/void"; + description = "A Haskell 98 logically uninhabited data type"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/vty/default.nix b/pkgs/development/libraries/haskell/vty/default.nix index 39126b2c7fa..6cd63e8a873 100644 --- a/pkgs/development/libraries/haskell/vty/default.nix +++ b/pkgs/development/libraries/haskell/vty/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "vty"; - version = "4.7.0.10"; - sha256 = "03cvr4z0fvxfyrikgf89777cp1xqhy22yj83p0dysp0i5ds6cd9v"; + version = "4.7.0.12"; + sha256 = "0mmx8rhj6k8c56qhaz7ay2yf9x61h27zxs14mrkw2y4qag6d4bii"; buildDepends = [ deepseq mtl parallel parsec terminfo utf8String vector ]; diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index 0f181935cef..32f6ee0f610 100644 --- a/pkgs/development/libraries/haskell/wai-app-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "wai-app-static"; - version = "1.1.2"; - sha256 = "1nvzqg3wk7i2p1kcpb9f9wdzbrfl6gxid44l94mmvc7xjcmdl6qw"; + version = "1.2.0.2"; + sha256 = "15rd2vlx3ag5bavrivscah7yqm9lv14v68wr3p9incg2ksf8h7d7"; buildDepends = [ base64Bytestring blazeBuilder blazeHtml cryptohash fileEmbed httpDate httpTypes text time transformers unixCompat wai @@ -14,7 +14,7 @@ cabal.mkDerivation (self: { meta = { homepage = "http://www.yesodweb.com/book/wai"; description = "WAI application for static serving"; - license = self.stdenv.lib.licenses.bsd3; + license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index 077fd7ae24f..5786b8b7dec 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "wai-extra"; - version = "1.1.0.1"; - sha256 = "0kavvbywkkwj9914y622wsziwfca9qjaqz798mjhl1ip5bfy73b0"; + version = "1.2.0.3"; + sha256 = "0iigswknh5w5zi6r99jks3bppylnw9hca9by2klwr2biw07nf09d"; buildDepends = [ ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive conduit dataDefault fastLogger httpTypes network text time @@ -15,7 +15,7 @@ cabal.mkDerivation (self: { meta = { homepage = "http://github.com/yesodweb/wai"; description = "Provides some basic WAI handlers and middleware"; - license = self.stdenv.lib.licenses.bsd3; + license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix index e08981e9c9c..dcb2ee3bee3 100644 --- a/pkgs/development/libraries/haskell/wai/default.nix +++ b/pkgs/development/libraries/haskell/wai/default.nix @@ -4,15 +4,15 @@ cabal.mkDerivation (self: { pname = "wai"; - version = "1.1.0.1"; - sha256 = "0klyi3d4rivgvbasamxccvkz1w44ak0rcbx840ypdcjq8mbcb85f"; + version = "1.2.0.1"; + sha256 = "00f95r1g2s689s1b0div28v7dnjiqz01d66acz77acp28cm0bnmc"; buildDepends = [ blazeBuilder conduit httpTypes network text transformers vault ]; meta = { homepage = "https://github.com/yesodweb/wai"; description = "Web Application Interface"; - license = self.stdenv.lib.licenses.bsd3; + license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index 45632743e67..c723128ed7f 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -1,21 +1,21 @@ -{ cabal, blazeBuilder, blazeBuilderConduit, bytestringLexing -, caseInsensitive, conduit, httpTypes, liftedBase, network +{ cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive +, conduit, httpTypes, liftedBase, network, networkConduit , simpleSendfile, transformers, unixCompat, wai }: cabal.mkDerivation (self: { pname = "warp"; - version = "1.1.0.1"; - sha256 = "1bgjnnkqgcyj00jd4rgsnpmac0yfd1ydd6i61b252gyrr9dd0wm9"; + version = "1.2.0.1"; + sha256 = "0lbyi6xchjkf6fx3d7dh5hg8gfq041hb0yls6vq8svd75dr0x5nv"; buildDepends = [ - blazeBuilder blazeBuilderConduit bytestringLexing caseInsensitive - conduit httpTypes liftedBase network simpleSendfile transformers + blazeBuilder blazeBuilderConduit caseInsensitive conduit httpTypes + liftedBase network networkConduit simpleSendfile transformers unixCompat wai ]; meta = { homepage = "http://github.com/yesodweb/wai"; description = "A fast, light-weight web server for WAI applications"; - license = self.stdenv.lib.licenses.bsd3; + license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; diff --git a/pkgs/development/libraries/haskell/wxHaskell/wx.nix b/pkgs/development/libraries/haskell/wxHaskell/wx.nix index 6a7a10e0102..98dcc20feb0 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wx.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wx.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "wx"; - version = "0.13.2.1"; - sha256 = "0s5jmsrip26ahvz7mzf12m9rcibrk9is3kwbswz87h0sr0k11nbv"; + version = "0.90"; + sha256 = "01rr8n99mas5x0vfxh8wf01vbh29vil860waxnsn6xdqc9fm5jj2"; buildDepends = [ stm wxcore ]; meta = { homepage = "http://haskell.org/haskellwiki/WxHaskell"; diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix new file mode 100644 index 00000000000..b96ecfb4d9d --- /dev/null +++ b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix @@ -0,0 +1,21 @@ +{ cabal, libX11, mesa, wxdirect, wxGTK }: + +cabal.mkDerivation (self: { + pname = "wxc"; + version = "0.90.0.2"; + sha256 = "1vqs9517qacm04d2bxpbpcdgfmlhpblm6af45nmcdikvlfa1v0jp"; + buildDepends = [ wxdirect ]; + extraLibraries = [ libX11 mesa wxGTK ]; + noHaddock = true; + postInstall = '' + cp -v dist/build/libwxc.so.${self.version} $out/lib/libwxc.so + ''; + + meta = { + homepage = "http://haskell.org/haskellwiki/WxHaskell"; + description = "wxHaskell C++ wrapper"; + license = "unknown"; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix index ab90f6a1ebe..4627e7fcf1d 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix @@ -1,11 +1,12 @@ -{ cabal, filepath, libX11, mesa, parsec, stm, time, wxdirect, wxGTK +{ cabal, filepath, libX11, mesa, parsec, stm, time, wxc, wxdirect +, wxGTK }: cabal.mkDerivation (self: { pname = "wxcore"; - version = "0.13.2.1"; - sha256 = "0p0d9vxw2pyvnhswsgasdd62hj86w3ixbbsx41wkswzkjjjib9i6"; - buildDepends = [ filepath parsec stm time wxdirect ]; + version = "0.90"; + sha256 = "1vrv683576cdvxfiriw2aw5kw1gzrddd27pxa06rrg5nny0jni46"; + buildDepends = [ filepath parsec stm time wxc wxdirect ]; extraLibraries = [ libX11 mesa wxGTK ]; meta = { homepage = "http://haskell.org/haskellwiki/WxHaskell"; diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix index f6f487633a1..a1caaef1bc9 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "wxdirect"; - version = "0.13.1.2"; - sha256 = "1gn5si6939yizlkf7hzm2a2gff5sa98m7q5q1hz23av98zfa8pv7"; + version = "0.90.0.1"; + sha256 = "04jslgxw601g6wh8f2wrdnipzh6x0487kfxb89fkgfgjhxrkfyr3"; isLibrary = true; isExecutable = true; buildDepends = [ parsec strict time ]; diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix index 16d142ea955..dc49a5ef799 100644 --- a/pkgs/development/libraries/haskell/xml-conduit/default.nix +++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix @@ -1,16 +1,16 @@ { cabal, attoparsec, attoparsecConduit, blazeBuilder , blazeBuilderConduit, conduit, dataDefault, failure, monadControl -, systemFilepath, text, transformers, xmlTypes +, resourcet, systemFilepath, text, transformers, xmlTypes }: cabal.mkDerivation (self: { pname = "xml-conduit"; - version = "0.5.4"; - sha256 = "1apvh2xlh4wkrfak0yqycsadsnkybfwjb86zqalm8ni9w2p9lwr6"; + version = "0.7.0.1"; + sha256 = "0ikkdgzvvadz7787jii8hwx8rls95jwvk7p4g2lw3ib8372hz4ly"; buildDepends = [ attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit - conduit dataDefault failure monadControl systemFilepath text - transformers xmlTypes + conduit dataDefault failure monadControl resourcet systemFilepath + text transformers xmlTypes ]; meta = { homepage = "http://github.com/snoyberg/xml"; diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix index 0f41c7ace7b..a495ba4df3c 100644 --- a/pkgs/development/libraries/haskell/yaml/default.nix +++ b/pkgs/development/libraries/haskell/yaml/default.nix @@ -1,14 +1,14 @@ -{ cabal, aeson, attoparsec, conduit, text, transformers +{ cabal, aeson, attoparsec, conduit, resourcet, text, transformers , unorderedContainers, vector }: cabal.mkDerivation (self: { pname = "yaml"; - version = "0.5.2"; - sha256 = "1jhzycasfmjlfdpca1cflrggc16jp16852af7d6cwfsy342wh6gp"; + version = "0.7.0"; + sha256 = "10l5isiidmjn818zm05ac65yaidrkq0qcb1bcpwnvi0fgjr308n5"; buildDepends = [ - aeson attoparsec conduit text transformers unorderedContainers - vector + aeson attoparsec conduit resourcet text transformers + unorderedContainers vector ]; meta = { homepage = "http://github.com/snoyberg/yaml/"; diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index f656c17ffd1..4ee7f77e526 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "0.8.1.1"; - sha256 = "0wmvywyil6cnpxq777a0w4qknw4lr4i53nni4bcigrvmpg7gzgac"; + version = "1.0.2"; + sha256 = "1rbp62phyzlxm458xgqxg3qg5fvivmhcgzd8pprqy9ya0v58wwlr"; buildDepends = [ aeson authenticate blazeHtml hamlet httpConduit liftedBase mimeMail persistent persistentTemplate pureMD5 pwstoreFast random SHA @@ -18,7 +18,7 @@ cabal.mkDerivation (self: { meta = { homepage = "http://www.yesodweb.com/"; description = "Authentication for Yesod"; - license = self.stdenv.lib.licenses.bsd3; + license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 25dc59952c7..ac5f201a028 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -1,27 +1,26 @@ { cabal, aeson, blazeBuilder, blazeHtml, caseInsensitive, cereal , clientsession, conduit, cookie, failure, fastLogger, hamlet , httpTypes, liftedBase, monadControl, parsec, pathPieces, random -, shakespeare, shakespeareCss, shakespeareI18n, shakespeareJs, text -, time, transformers, transformersBase, vector, wai, waiExtra -, waiLogger, yesodRoutes +, resourcet, shakespeare, shakespeareCss, shakespeareI18n +, shakespeareJs, text, time, transformers, transformersBase, vector +, wai, waiExtra, waiLogger, yesodRoutes }: cabal.mkDerivation (self: { pname = "yesod-core"; - version = "0.10.3"; - sha256 = "1mw78h6h7b4g67kyg4y01rcgi5bpb97hhzx0yqk4bmq23mzisg9m"; + version = "1.0.1.1"; + sha256 = "05zspm7dfkjzb40839qnf002hxsav01vxkv3dccidvp0q340j0vz"; buildDepends = [ aeson blazeBuilder blazeHtml caseInsensitive cereal clientsession conduit cookie failure fastLogger hamlet httpTypes liftedBase - monadControl parsec pathPieces random shakespeare shakespeareCss - shakespeareI18n shakespeareJs text time transformers + monadControl parsec pathPieces random resourcet shakespeare + shakespeareCss shakespeareI18n shakespeareJs text time transformers transformersBase vector wai waiExtra waiLogger yesodRoutes ]; - noHaddock = true; meta = { homepage = "http://www.yesodweb.com/"; description = "Creation of type-safe, RESTful web applications"; - license = self.stdenv.lib.licenses.bsd3; + license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; diff --git a/pkgs/development/libraries/haskell/yesod-default/default.nix b/pkgs/development/libraries/haskell/yesod-default/default.nix index f839b5a16db..50896ae3c0e 100644 --- a/pkgs/development/libraries/haskell/yesod-default/default.nix +++ b/pkgs/development/libraries/haskell/yesod-default/default.nix @@ -1,19 +1,20 @@ -{ cabal, shakespeareCss, shakespeareJs, text, transformers -, unorderedContainers, wai, waiExtra, warp, yaml, yesodCore +{ cabal, networkConduit, shakespeareCss, shakespeareJs, text +, transformers, unorderedContainers, wai, waiExtra, warp, yaml +, yesodCore }: cabal.mkDerivation (self: { pname = "yesod-default"; - version = "0.6.1"; - sha256 = "0am5f8r2w7695zfc6vi0gy8yin9kfgj37qzr14r5v6wzhk1gq5da"; + version = "1.0.1"; + sha256 = "1b9qxfs9pbgn090cipnnbd6vf1ajyhs0xjfynkj87k8fx6j2lqb9"; buildDepends = [ - shakespeareCss shakespeareJs text transformers unorderedContainers - wai waiExtra warp yaml yesodCore + networkConduit shakespeareCss shakespeareJs text transformers + unorderedContainers wai waiExtra warp yaml yesodCore ]; meta = { homepage = "http://www.yesodweb.com/"; description = "Default config and main functions for your yesod application"; - license = self.stdenv.lib.licenses.bsd3; + license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 8be3b65b93f..85a6228e793 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "0.4.2.1"; - sha256 = "0zpmyqxbknz8pdib1gdf410jv4xndn4pphdigagqxl5m5c2hi1v2"; + version = "1.0.0.3"; + sha256 = "0xqgvmpxv9lrpl06qh3pqn53f5pa02k8v5c4z6brzb8s44ppw1pq"; buildDepends = [ blazeBuilder blazeHtml dataDefault emailValidate hamlet network persistent shakespeareCss shakespeareJs text time transformers wai @@ -15,7 +15,7 @@ cabal.mkDerivation (self: { meta = { homepage = "http://www.yesodweb.com/"; description = "Form handling support for Yesod Web Framework"; - license = self.stdenv.lib.licenses.bsd3; + license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; diff --git a/pkgs/development/libraries/haskell/yesod-json/default.nix b/pkgs/development/libraries/haskell/yesod-json/default.nix index 25a4ba34f16..debc3d7cb09 100644 --- a/pkgs/development/libraries/haskell/yesod-json/default.nix +++ b/pkgs/development/libraries/haskell/yesod-json/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "yesod-json"; - version = "0.3.1"; - sha256 = "17w82mfl364dc0k1zk1gqas3fyskz2jc50diq71fiw87apslva4v"; + version = "1.0.0"; + sha256 = "159j303yd3d5n2iqkbi55vj9d5d3jdnpnz115m9p6nf60qqmhj97"; buildDepends = [ aeson attoparsecConduit blazeBuilder conduit safe shakespeareJs text transformers vector wai waiExtra yesodCore yesodRoutes @@ -14,7 +14,7 @@ cabal.mkDerivation (self: { meta = { homepage = "http://www.yesodweb.com/"; description = "Generate content for Yesod using the aeson package"; - license = self.stdenv.lib.licenses.bsd3; + license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; diff --git a/pkgs/development/libraries/haskell/yesod-persistent/default.nix b/pkgs/development/libraries/haskell/yesod-persistent/default.nix index b50e34df8b3..42f3f93c507 100644 --- a/pkgs/development/libraries/haskell/yesod-persistent/default.nix +++ b/pkgs/development/libraries/haskell/yesod-persistent/default.nix @@ -2,15 +2,15 @@ cabal.mkDerivation (self: { pname = "yesod-persistent"; - version = "0.3.1"; - sha256 = "0pxzwqrq4wr9hdnppi5ri0iip2a8gg2y7lplmhn2791jc001ll7m"; + version = "1.0.0"; + sha256 = "1dawhs9ab2z5njq9m37p9zrr5wdzrmw4i0ixb2j4rhff8z50hjaf"; buildDepends = [ persistent persistentTemplate transformers yesodCore ]; meta = { homepage = "http://www.yesodweb.com/"; description = "Some helpers for using Persistent from Yesod"; - license = self.stdenv.lib.licenses.bsd3; + license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; diff --git a/pkgs/development/libraries/haskell/yesod-routes/default.nix b/pkgs/development/libraries/haskell/yesod-routes/default.nix index 78781dc3f74..adf9ed5f2c6 100644 --- a/pkgs/development/libraries/haskell/yesod-routes/default.nix +++ b/pkgs/development/libraries/haskell/yesod-routes/default.nix @@ -2,13 +2,13 @@ cabal.mkDerivation (self: { pname = "yesod-routes"; - version = "0.0.1"; - sha256 = "19bnww5idxr0j2l8g838idxkhhn73bhdz0bnvglinv7163fy8xhl"; + version = "1.0.1"; + sha256 = "12m2j7sl7gr8755xza7k5nlqxl4g7az3vin5vdl8km5aw754761w"; buildDepends = [ pathPieces text vector ]; meta = { homepage = "http://www.yesodweb.com/"; description = "Efficient routing for Yesod"; - license = self.stdenv.lib.licenses.bsd3; + license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index dc065b572b2..a921e621f5c 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "yesod-static"; - version = "0.10.1"; - sha256 = "07dapygk2n6d7sk39gwi06w96b13dqhxgx3l7ac198nil5x2m68m"; + version = "1.0.0.1"; + sha256 = "1zrpwd9dfqw5bzmrcsny4xkrw3y71ki8xhdfcyznf1bkmbnbim5n"; buildDepends = [ base64Bytestring cereal conduit cryptoConduit cryptohash fileEmbed httpTypes text transformers unixCompat wai waiAppStatic yesodCore @@ -14,7 +14,7 @@ cabal.mkDerivation (self: { meta = { homepage = "http://www.yesodweb.com/"; description = "Static file serving subsite for Yesod Web Framework"; - license = self.stdenv.lib.licenses.bsd3; + license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index f9320acc6e7..b8ffdba7c6e 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yesod"; - version = "0.10.2"; - sha256 = "15dswvhn9vz3bpdvbypg8x8gwhjkwj170b8mqznp10drccxyizs2"; + version = "1.0.1.5"; + sha256 = "1va0pq5gn10anh333fqv8a99gngjip5w5lwl4i5q7lbparz93iji"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -21,7 +21,7 @@ cabal.mkDerivation (self: { meta = { homepage = "http://www.yesodweb.com/"; description = "Creation of type-safe, RESTful web applications"; - license = self.stdenv.lib.licenses.bsd3; + license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; diff --git a/pkgs/development/libraries/haskell/zip-archive/default.nix b/pkgs/development/libraries/haskell/zip-archive/default.nix index a7029cc953e..050d48280d2 100644 --- a/pkgs/development/libraries/haskell/zip-archive/default.nix +++ b/pkgs/development/libraries/haskell/zip-archive/default.nix @@ -2,15 +2,15 @@ cabal.mkDerivation (self: { pname = "zip-archive"; - version = "0.1.1.7"; - sha256 = "1q52v18kl1j049kk3yb7rp0k27p6q7r72mg1vcbdid6qd7a9dh48"; + version = "0.1.1.8"; + sha256 = "0rq4jk1sxi6lrc7d7sh500lh83v2fxxrfh2gknqiyzxd3wh364y1"; isLibrary = true; isExecutable = true; buildDepends = [ binary digest filepath mtl utf8String zlib ]; meta = { homepage = "http://github.com/jgm/zip-archive"; description = "Library for creating and modifying zip archives"; - license = "GPL"; + license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; diff --git a/pkgs/development/libraries/haskell/zlib-bindings/0.0.3.2.nix b/pkgs/development/libraries/haskell/zlib-bindings/0.0.3.2.nix deleted file mode 100644 index ba2a14a23d0..00000000000 --- a/pkgs/development/libraries/haskell/zlib-bindings/0.0.3.2.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ cabal, zlib }: - -cabal.mkDerivation (self: { - pname = "zlib-bindings"; - version = "0.0.3.2"; - sha256 = "0x78fkjinfhhihhfihr0g5rc4d8jkhza3vw5qsyds74skd6rsy1q"; - buildDepends = [ zlib ]; - meta = { - homepage = "http://github.com/snoyberg/zlib-bindings"; - description = "Low-level bindings to the zlib package"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/zlib-bindings/0.1.0.1.nix b/pkgs/development/libraries/haskell/zlib-bindings/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/zlib-bindings/0.1.0.1.nix rename to pkgs/development/libraries/haskell/zlib-bindings/default.nix diff --git a/pkgs/development/libraries/haskell/zlib-conduit/default.nix b/pkgs/development/libraries/haskell/zlib-conduit/default.nix index 260ef687edb..1b68250b61e 100644 --- a/pkgs/development/libraries/haskell/zlib-conduit/default.nix +++ b/pkgs/development/libraries/haskell/zlib-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "zlib-conduit"; - version = "0.2.0.1"; - sha256 = "0css7cr9jj6rn829bw8mlbdl0d6iz9ckhsbrlrdcppx8k4gzb4rg"; + version = "0.4.0.1"; + sha256 = "07x0fgzxnwaaw5yg1ks2w9dc66biqbg50x79h84jpgb6d9pw2d7z"; buildDepends = [ conduit transformers zlibBindings ]; meta = { homepage = "http://github.com/snoyberg/conduit"; diff --git a/pkgs/development/libraries/haskell/zlib-enum/default.nix b/pkgs/development/libraries/haskell/zlib-enum/default.nix index 9ee7063317f..d4ec47410fc 100644 --- a/pkgs/development/libraries/haskell/zlib-enum/default.nix +++ b/pkgs/development/libraries/haskell/zlib-enum/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "zlib-enum"; - version = "0.2.1"; - sha256 = "0cnx7sbgj6s0gvq6pcqyi3xahx7x3bj47ap10z89qfbk0906rkq8"; + version = "0.2.2.1"; + sha256 = "02ava6h40bqfmby33683nxasfw5fmrgfvbx6kqgz1gqz5921gjx9"; isLibrary = true; isExecutable = true; buildDepends = [ enumerator transformers zlibBindings ]; diff --git a/pkgs/development/libraries/ilbc/default.nix b/pkgs/development/libraries/ilbc/default.nix index 4450c6e6ef7..3ab4e7e738c 100644 --- a/pkgs/development/libraries/ilbc/default.nix +++ b/pkgs/development/libraries/ilbc/default.nix @@ -4,8 +4,9 @@ stdenv.mkDerivation rec { name = "ilbc-rfc3951"; script = fetchurl { - url = http://ilbcfreeware.org/documentation/extract-cfile.awk; - sha256 = "155izy7p7azak1h6bgafvh84b1605zyw14k2s4pyl5nd4saap5c6"; + url = http://ilbcfreeware.org/documentation/extract-cfile.txt; + name = "extract-cfile.awk"; + sha256 = "0md76qlszaras9grrxaq7xfxn1yikmz4qqgnjj6y50jg31yr5wyd"; }; rfc3951 = fetchurl { diff --git a/pkgs/development/libraries/java/classpath/default.nix b/pkgs/development/libraries/java/classpath/default.nix index f3231ab4ee7..9bbfd381a0d 100644 --- a/pkgs/development/libraries/java/classpath/default.nix +++ b/pkgs/development/libraries/java/classpath/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, javac, jvm, antlr, pkgconfig, gtk, gconf }: stdenv.mkDerivation rec { - name = "classpath-0.98"; + name = "classpath-0.99"; src = fetchurl { url = "mirror://gnu/classpath/${name}.tar.gz"; - sha256 = "0gxcdysw36vk3dpylg6f44c0fc8g10ayyb521l8bcygz9p6ml6sh"; + sha256 = "1j7cby4k66f1nvckm48xcmh352b1d1b33qk7l6hi7dp9i9zjjagr"; }; patches = [ ./missing-casts.patch ]; diff --git a/pkgs/development/libraries/java/libmatthew-java/default.nix b/pkgs/development/libraries/java/libmatthew-java/default.nix index 785ba9ab9ea..0b77de56987 100644 --- a/pkgs/development/libraries/java/libmatthew-java/default.nix +++ b/pkgs/development/libraries/java/libmatthew-java/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, jdk}: stdenv.mkDerivation { - name = "libmatthew-java-0.7.2"; + name = "libmatthew-java-0.8"; src = fetchurl { - url = http://www.matthew.ath.cx/projects/java/libmatthew-java-0.7.2.tar.gz; - sha256 = "00zd6vplbvha64pf65bpw44abg2y8irblik30pbk35wcm86a0j4z"; + url = http://www.matthew.ath.cx/projects/java/libmatthew-java-0.8.tar.gz; + sha256 = "1yldkhsdzm0a41a0i881bin2jklhp85y3ah245jd6fz3npcx7l85"; }; JAVA_HOME=jdk; PREFIX=''''${out}''; diff --git a/pkgs/development/libraries/kdevplatform/1.3.0.nix b/pkgs/development/libraries/kdevplatform/1.3.0.nix deleted file mode 100644 index 10aa4c02028..00000000000 --- a/pkgs/development/libraries/kdevplatform/1.3.0.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchurl, cmake, kdelibs, subversion, qt4, automoc4, perl, phonon, - gettext, pkgconfig, apr, aprutil, boost, qjson }: - -stdenv.mkDerivation rec { - name = "kdevplatform-1.3.0"; - - src = fetchurl { - url = "mirror://kde/stable/kdevelop/4.3.0/src/${name}.tar.bz2"; - sha256 = "0afka8999csyj8hbgmcsbn8h2by04v7n8k4mrwkl0b79crdvwbcd"; - }; - - propagatedBuildInputs = [ kdelibs qt4 phonon ]; - buildInputs = [ apr aprutil subversion boost qjson ]; - - buildNativeInputs = [ cmake automoc4 gettext pkgconfig ]; - - meta = { - maintainers = [ stdenv.lib.maintainers.urkud ]; - platforms = stdenv.lib.platforms.linux; - description = "KDE libraries for IDE-like programs"; - longDescription = '' - A free, opensource set of libraries that can be used as a foundation for - IDE-like programs. It is programing-language independent, and is planned - to be used by programs like: KDevelop, Quanta, Kile, KTechLab ... etc." - ''; - }; -} diff --git a/pkgs/development/libraries/kdevplatform/default.nix b/pkgs/development/libraries/kdevplatform/default.nix index 7f28877b9f4..10aa4c02028 100644 --- a/pkgs/development/libraries/kdevplatform/default.nix +++ b/pkgs/development/libraries/kdevplatform/default.nix @@ -2,22 +2,21 @@ gettext, pkgconfig, apr, aprutil, boost, qjson }: stdenv.mkDerivation rec { - name = "kdevplatform-1.2.3"; + name = "kdevplatform-1.3.0"; src = fetchurl { - url = "mirror://kde/stable/kdevelop/4.2.3/src/${name}.tar.bz2"; - sha256 = "1h55lh7kkb8d9qgf4yyzmdwn7vq8l49lzlq92jccz7p79lxb2s08"; + url = "mirror://kde/stable/kdevelop/4.3.0/src/${name}.tar.bz2"; + sha256 = "0afka8999csyj8hbgmcsbn8h2by04v7n8k4mrwkl0b79crdvwbcd"; }; - propagatedBuildInputs = [ kdelibs subversion qt4 phonon ]; - buildInputs = - [ cmake automoc4 perl gettext pkgconfig apr aprutil boost - stdenv.gcc.libc qjson - ]; + propagatedBuildInputs = [ kdelibs qt4 phonon ]; + buildInputs = [ apr aprutil subversion boost qjson ]; - meta = with stdenv.lib; { - maintainers = [ maintainers.urkud ]; - platforms = platforms.linux; + buildNativeInputs = [ cmake automoc4 gettext pkgconfig ]; + + meta = { + maintainers = [ stdenv.lib.maintainers.urkud ]; + platforms = stdenv.lib.platforms.linux; description = "KDE libraries for IDE-like programs"; longDescription = '' A free, opensource set of libraries that can be used as a foundation for diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index 36e345043e3..fc554dcd875 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -1,5 +1,5 @@ -{fetchurl, stdenv, acl, openssl, libxml2, attr, zlib, bzip2, e2fsprogs -, sharutils}: +{ fetchurl, stdenv, acl, openssl, libxml2, attr, zlib, bzip2, e2fsprogs +, sharutils }: stdenv.mkDerivation rec { name = "libarchive-2.8.3"; @@ -9,10 +9,10 @@ stdenv.mkDerivation rec { sha256 = "16095d15334b3c8dbb02db5af3d415f12c1c3bdd4eb43af7bbc36ab7572c0b7a"; }; - propagatedBuildInputs = [libxml2 zlib bzip2 openssl] ++ - (if stdenv.isLinux then [e2fsprogs attr acl] else []); + propagatedBuildInputs = [ libxml2 zlib bzip2 openssl ] ++ + stdenv.lib.optionals stdenv.isLinux [ e2fsprogs attr acl ]; - buildInputs = [sharutils]; + buildInputs = [ sharutils ]; meta = { description = "A library for reading and writing streaming archives"; diff --git a/pkgs/development/libraries/libassuan/git.nix b/pkgs/development/libraries/libassuan/git.nix new file mode 100644 index 00000000000..743528d9265 --- /dev/null +++ b/pkgs/development/libraries/libassuan/git.nix @@ -0,0 +1,33 @@ +{ fetchgit, stdenv, pth, libgpgerror, autoconf, automake, libtool }: + +stdenv.mkDerivation rec { + name = "libassuan-2.1pre-git20120407"; + + src = fetchgit { + url = "git://git.gnupg.org/libassuan.git"; + rev = "5c00c7cc2901a879927a5756e1bb7ecf49439ebc"; + sha256 = "14ebcc65930360a067eea8cfbdaa5418c909bd9dfb27fe366edf78ad6c1aa69f"; + }; + + propagatedBuildInputs = [ pth libgpgerror ]; + buildInputs = [ autoconf automake libtool ]; + + doCheck = true; + + preConfigure = "autoreconf -v"; + + meta = { + description = "Libassuan, the IPC library used by GnuPG and related software"; + + longDescription = '' + Libassuan is a small library implementing the so-called Assuan + protocol. This protocol is used for IPC between most newer + GnuPG components. Both, server and client side functions are + provided. + ''; + + homepage = http://gnupg.org; + license = "LGPLv2+"; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/libconfig/default.nix b/pkgs/development/libraries/libconfig/default.nix new file mode 100644 index 00000000000..03b7b2cfb92 --- /dev/null +++ b/pkgs/development/libraries/libconfig/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "libconfig-${version}"; + version = "1.4.8"; + + src = fetchurl { + url = "http://www.hyperrealm.com/libconfig/${name}.tar.gz"; + sha256 = "1v817hy9y416i64ly17xdmgrn62qwj225wqakdzqr2j3pygm1c8q"; + }; + + meta = with stdenv.lib; { + homepage = http://www.hyperrealm.com/libconfig; + description = "a simple library for processing structured configuration files"; + license = licenses.lgpl3; + maintainers = [ maintainers.goibhniu ]; + }; +} diff --git a/pkgs/development/libraries/libgig/default.nix b/pkgs/development/libraries/libgig/default.nix new file mode 100644 index 00000000000..6129ef42f3d --- /dev/null +++ b/pkgs/development/libraries/libgig/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchsvn, autoconf, automake, libsndfile, libtool, pkgconfig }: + +stdenv.mkDerivation rec { + name = "libgig-svn-${version}"; + version = "2334"; + + src = fetchsvn { + url = "https://svn.linuxsampler.org/svn/libgig/trunk"; + rev = "${version}"; + sha256 = "0i7sj3zm6banl5avjdxblx0mlbxxzbsbr4x5hsl2fhrdsv5dnxhc"; + }; + + buildInputs = [ autoconf automake libsndfile libtool pkgconfig ]; + + preConfigure = "make -f Makefile.cvs"; + + meta = with stdenv.lib; { + homepage = http://www.linuxsampler.org; + description = "Gigasampler file access library"; + license = licenses.gpl2; + maintainers = [ maintainers.goibhniu ]; + }; +} diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix index ec2468aca1d..5e038ad8572 100644 --- a/pkgs/development/libraries/libksba/default.nix +++ b/pkgs/development/libraries/libksba/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libgpgerror }: stdenv.mkDerivation rec { - name = "libksba-1.0.7"; + name = "libksba-1.2.0"; src = fetchurl { url = "mirror://gnupg/libksba/${name}.tar.bz2"; - sha256 = "1biabl4ijaf0jyl4zf3qrhcs0iaq9pypjibp8wgnim3n3kg0bdda"; + sha256 = "0jwk7hm3x3g4hd7l12z3d79dy7359x7lc88dq6z7q0ixn1jwxbq9"; }; propagatedBuildInputs = [libgpgerror]; diff --git a/pkgs/development/libraries/liblscp/default.nix b/pkgs/development/libraries/liblscp/default.nix new file mode 100644 index 00000000000..33731e5d755 --- /dev/null +++ b/pkgs/development/libraries/liblscp/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchsvn, autoconf, automake, libtool, pkgconfig }: + +stdenv.mkDerivation rec { + name = "liblscp-svn-${version}"; + version = "2319"; + + src = fetchsvn { + url = "https://svn.linuxsampler.org/svn/liblscp/trunk"; + rev = "${version}"; + sha256 = "0jgdy9gi9n8x2pqrbll9158vhx8293lnxv8vzl0szcincslgk7hi"; + }; + + buildInputs = [ autoconf automake libtool pkgconfig ]; + + preConfigure = "make -f Makefile.svn"; + + meta = with stdenv.lib; { + homepage = http://www.linuxsampler.org; + description = "LinuxSampler Control Protocol (LSCP) wrapper library"; + license = licenses.gpl2; + maintainers = [ maintainers.goibhniu ]; + }; +} diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index edaae75a66b..f70f7d34801 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libtasn1-2.11"; + name = "libtasn1-2.12"; src = fetchurl { url = "mirror://gnu/libtasn1/${name}.tar.gz"; - sha256 = "1yws0xfys6fm7ywb3pr8ncl3gr37iky7454if8dbzsicq5vkrm7l"; + sha256 = "0p8w38l04fgm82iqgl1abhb1ajp04v116bi6fd7lc3n80657l98f"; }; doCheck = true; diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index ea657e8e43d..49e23017369 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -1,14 +1,18 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "libunwind-0.98.6"; + name = "libunwind-1.0.1"; src = fetchurl { url = "http://download.savannah.nongnu.org/releases/libunwind/${name}.tar.gz"; - sha256 = "1qfxqkyx4r5dmwajyhvsyyl8zwxs6n2rcg7a61fgfdfp0gxvpzgx"; + sha256 = "aa95fd184c0b90d95891c2f3bac2c7df708ff016d2a6ee8b2eabb769f864101f"; }; NIX_CFLAGS_COMPILE = if stdenv.system == "x86_64-linux" then "-fPIC" else ""; + preInstall = '' + mkdir -p "$out/lib" + touch "$out/lib/libunwind-generic.so" + ''; meta = { homepage = http://www.nongnu.org/libunwind; diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 2e7e4a57e9f..aee034c25da 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -1,21 +1,21 @@ { stdenv, fetchurl, pkgconfig, libxml2, gnutls, devicemapper, perl, python , iproute, iptables, readline, lvm2, utillinux, udev, libpciaccess, gettext -, libtasn1, ebtables, libgcrypt +, libtasn1, ebtables, libgcrypt, yajl }: -let version = "0.9.7"; in +let version = "0.9.11"; in stdenv.mkDerivation { name = "libvirt-${version}"; src = fetchurl { url = "http://libvirt.org/sources/libvirt-${version}.tar.gz"; - sha256 = "08xg0pfjqfia37xby9187ycsxkrxaz99w9rcq206cz8pwnzhbzr9"; + sha256 = "0qk0fsc5rxwwjp7801vdanmw61p89xqiy6q279i0kqc3bx1zx66f"; }; buildInputs = [ pkgconfig libxml2 gnutls devicemapper perl python readline lvm2 - utillinux udev libpciaccess gettext libtasn1 libgcrypt + utillinux udev libpciaccess gettext libtasn1 libgcrypt yajl ]; preConfigure = @@ -34,6 +34,8 @@ stdenv.mkDerivation { --replace "$out/bin" "${gettext}/bin" ''; + enableParallelBuilding = true; + meta = { homepage = http://libvirt.org/; description = "A toolkit to interact with the virtualization capabilities of recent versions of Linux (and other OSes)"; diff --git a/pkgs/development/libraries/libxcrypt/default.nix b/pkgs/development/libraries/libxcrypt/default.nix index 9122335b34a..536d30992bb 100644 --- a/pkgs/development/libraries/libxcrypt/default.nix +++ b/pkgs/development/libraries/libxcrypt/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl}: # I could not build it in armv5tel-linux or the fuloon2f -assert stdenv.system != "armv5tel-linux"; +assert !stdenv.isArm; assert stdenv.system != "mips64el-linux"; stdenv.mkDerivation { diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 55701cf18c9..219dc161761 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, flex, bison, pkgconfig, libdrm, file, expat, makedepend , libXxf86vm, libXfixes, libXdamage, glproto, dri2proto, libX11, libxcb, libXext , libXt, udev, enableTextureFloats ? false -, python, libxml2Python, lipo ? null }: +, python, libxml2Python }: if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then throw "unsupported platform for Mesa" @@ -32,7 +32,7 @@ stdenv.mkDerivation { + stdenv.lib.optionalString enableTextureFloats " --enable-texture-float"; buildInputs = [ expat libdrm libXxf86vm libXfixes libXdamage glproto dri2proto - libxml2Python libX11 libXext libxcb lipo libXt udev ]; + libxml2Python libX11 libXext libxcb libXt udev ]; buildNativeInputs = [ pkgconfig python makedepend file flex bison ]; diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 0278f62f65d..a6b9a69e6e1 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -27,7 +27,11 @@ stdenv.mkDerivation (rec { enableParallelBuilding = true; - preBuild = ''sed -e "s@\([[:space:]]\)sh @\1''${SHELL} @" -i */Makefile Makefile''; + preBuild = + # On Darwin, we end up using the native `sed' during bootstrap, and it + # fails to run this command, which isn't needed anyway. + stdenv.lib.optionalString (!stdenv.isDarwin) + ''sed -e "s@\([[:space:]]\)sh @\1''${SHELL} @" -i */Makefile Makefile''; # When building a wide-character (Unicode) build, create backward # compatibility links from the the "normal" libraries to the diff --git a/pkgs/development/libraries/npth/default.nix b/pkgs/development/libraries/npth/default.nix new file mode 100644 index 00000000000..a9f80fa9348 --- /dev/null +++ b/pkgs/development/libraries/npth/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchgit, autoconf, automake, libtool }: + +stdenv.mkDerivation rec { + name = "npth-git20120407"; + + src = fetchgit { + url = "git://git.gnupg.org/npth.git"; + rev = "cbb52bd5ada02bbd914869f4540221831358d077"; + sha256 = "1789b15bc49171d47bbd5a3bccbadc7dde1ae095bb2c205c7ec5d7a36573876d"; + }; + + buildInputs = [ autoconf automake libtool ]; + + preConfigure = "autoreconf -vfi"; + + meta = { + description = "The New GNU Portable Threads Library"; + longDescription = '' + This is a library to provide the GNU Pth API and thus a non-preemptive + threads implementation. + + In contrast to GNU Pth is is based on the system's standard threads + implementation. This allows the use of libraries which are not + compatible to GNU Pth. Experience with a Windows Pth emulation showed + that this is a solid way to provide a co-routine based framework. + ''; + homepage = http://www.gnupg.org; + license = "LGPLv3"; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index e7744f43e12..3a8e1c4ae55 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -1,62 +1,42 @@ -x@{builderDefsPackage - , mesa, cmake, automake, libtool, autoconf - , freetype, freeimage, zziplib, randrproto, libXrandr - , libXaw, freeglut, libXt, libpng, boost, ois - , xproto, libX11, libXmu, libSM, pkgconfig - , libXxf86vm, xf86vidmodeproto, libICE - , renderproto, libXrender - , nvidia_cg_toolkit - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ fetchurl, stdenv +, cmake, mesa +, freetype, freeimage, zziplib, randrproto, libXrandr +, libXaw, freeglut, libXt, libpng, boost, ois +, xproto, libX11, libXmu, libSM, pkgconfig +, libXxf86vm, xf86vidmodeproto, libICE +, renderproto, libXrender +, nvidia_cg_toolkit }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="ogre"; - majorVersion="1"; - minorVersion="7"; - patchLevel="2"; - version="${majorVersion}.${minorVersion}.${patchLevel}"; - name="${baseName}-${version}"; - project="${baseName}"; - url="mirror://sourceforge/project/${project}/${baseName}/${majorVersion}.${minorVersion}/${baseName}_src_v${majorVersion}-${minorVersion}-${patchLevel}.tar.bz2"; - hash="10q8jx842s4aws9py6q67rb4dh5vli5vvg54jl8manjb4f388jh5"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; +stdenv.mkDerivation { + name = "ogre-1.7.2"; + + src = fetchurl { + url = "mirror://sourceforge/ogre/1.7/ogre_src_v1-7-2.tar.bz2"; + sha256 = "10q8jx842s4aws9py6q67rb4dh5vli5vvg54jl8manjb4f388jh5"; }; - inherit (sourceInfo) name version; - inherit buildInputs; + cmakeFlags = [ "-DOGRE_INSTALL_SAMPLES=yes" ] + ++ (map (x: "-DOGRE_BUILD_PLUGIN_${x}=on") + [ "BSP" "CG" "OCTREE" "PCZ" "PFX" ]) + ++ (map (x: "-DOGRE_BUILD_RENDERSYSTEM_${x}=on") [ "GL" ]); - doMyBuild = a.fullDepEntry ("make -j4") ["doCmake"]; + enableParallelBuilding = true; - /* doConfigure should be removed if not needed */ - phaseNames = ["doCmake" "doMyBuild" "doMakeInstall"]; - - cmakeSkipRpath = false; + buildInputs = + [ cmake mesa + freetype freeimage zziplib randrproto libXrandr + libXaw freeglut libXt libpng boost ois + xproto libX11 libXmu libSM pkgconfig + libXxf86vm xf86vidmodeproto libICE + renderproto libXrender + nvidia_cg_toolkit + ]; meta = { description = "A 3D engine"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; + homepage = http://www.ogre3d.org/; + maintainers = [ stdenv.lib.maintainers.raskin ]; + platforms = stdenv.lib.platforms.linux; license = "MIT"; }; - passthru = { - updateInfo = { - downloadPage = "http://www.ogre3d.org/download/source"; - }; - }; -}) x - +} diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix index 5941c55ee55..89361bf3121 100644 --- a/pkgs/development/libraries/portaudio/default.nix +++ b/pkgs/development/libraries/portaudio/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, alsaLib, pkgconfig }: stdenv.mkDerivation rec { - name = "portaudio-19-20071207"; - + name = "portaudio-19-20111121"; + src = fetchurl { - url = http://www.portaudio.com/archives/pa_stable_v19_20071207.tar.gz; - sha256 = "0axz8xzkb6ynzj65p6cv6b0cl5csxsdfvqkd0dljlf3dslkpg886"; + url = http://www.portaudio.com/archives/pa_stable_v19_20111121.tgz; + sha256 = "168vmcag3c5y3zwf7h5298ydh83g72q5bznskrw9cr2h1lrx29lw"; }; buildInputs = [ alsaLib pkgconfig ]; diff --git a/pkgs/development/libraries/portaudio/svn-head.nix b/pkgs/development/libraries/portaudio/svn-head.nix index ca536530f1c..12b8257084b 100644 --- a/pkgs/development/libraries/portaudio/svn-head.nix +++ b/pkgs/development/libraries/portaudio/svn-head.nix @@ -1,17 +1,17 @@ { stdenv, fetchsvn, alsaLib, pkgconfig }: stdenv.mkDerivation rec { - revision = "1564"; + revision = "1788"; name = "portaudio-svn-r${revision}"; - + src = fetchsvn { - url = "https://www.portaudio.com/repos/portaudio/trunk"; + url = "https://subversion.assembla.com/svn/portaudio/portaudio/trunk"; rev = revision; sha256 = "0vhiy4lkmv0flhvkbbra71z5cfr3gbh27bbfcqqdc939b4z35lsi"; }; buildInputs = [ alsaLib pkgconfig ]; - + meta = { description = "Portable cross-platform Audio API"; homepage = http://www.portaudio.com/; diff --git a/pkgs/development/libraries/qhull/default.nix b/pkgs/development/libraries/qhull/default.nix index b9d9c19a10d..6d15ce576ff 100644 --- a/pkgs/development/libraries/qhull/default.nix +++ b/pkgs/development/libraries/qhull/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/download/${name}-src.tgz"; - sha256 = "19hb10vs7ww45ifn7mpvxykn470gd1g568d84mlld6v4pnz7gamv"; + sha256 = "127zpjp6sm8c101hz239k82lpxqcqf4ksdyfqc2py2sm22kclpm3"; }; buildNativeInputs = [ cmake ]; diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 5313c8afefa..a3a78af439a 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -12,7 +12,7 @@ }: let - v = "4.8.0"; + v = "4.8.1"; in # TODO: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "ftp://ftp.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${v}.tar.gz"; - sha256 = "0vhb6bysjqz8l0dygg2yypm4frsggma2g9877rdgf5ay917bg4lk"; + sha256 = "1s3sv2p8q4bjy0h6r81gdnd64apdx8kwm5jc7rxavd21m8v1m1gg"; }; patches = [ ( substituteAll { diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix index 74d20621089..2cca8d7d9c4 100644 --- a/pkgs/development/libraries/science/math/atlas/default.nix +++ b/pkgs/development/libraries/science/math/atlas/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gfortran, tolerateCpuTimingInaccuracy ? true }: +{ stdenv, fetchurl, gfortran, tolerateCpuTimingInaccuracy ? true, shared ? false }: let optionalString = stdenv.lib.optionalString; @@ -15,17 +15,27 @@ stdenv.mkDerivation { # Configure outside of the source directory. preConfigure = '' mkdir build; cd build; configureScript=../configure; ''; - # * The manual says you should pass -fPIC as configure arg. Not sure why, but - # it works. + # * -fPIC allows to build atlas inside shared objects, as octave does. # # * Atlas aborts the build if it detects that some kind of CPU frequency # scaling is active on the build machine because that feature offsets the # performance timings. We ignore that check, however, because with binaries # being pre-built on Hydra those timings aren't accurate for the local # machine in the first place. - configureFlags = "-Fa alg -fPIC" - + optionalString stdenv.isi686 " -b 32" - + optionalString tolerateCpuTimingInaccuracy " -Si cputhrchk 0"; + # * Atlas detects the cpu and does some tricks. For example, notices the + # hydra AMD Family 10h computer, and uses a SSE trick for it (bit 17 of MXCSR) + # available, for what I know, only in that family. So we hardcode K7 + # -A 31 = Athlon K7 + # -A 18 = Pentium II + # -V 192 = SSE1|SSE2 (Or it takes SSE3 somehow in my machine without SSE3) + # -V 1 = No SIMD (Pentium II does not have any SSE) + # -t 0 = No threading + configureFlags = "-Fa alg -fPIC -t 0" + + optionalString stdenv.isi686 " -b 32 -A 18 -V 1" + + optionalString stdenv.isx86_64 " -A 31 -V 192" + + optionalString tolerateCpuTimingInaccuracy " -Si cputhrchk 0" + + optionalString shared " --shared " + ; buildInputs = [ gfortran ]; diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index 28bfa4df801..e2b43b6b053 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -1,5 +1,8 @@ -{ stdenv, fetchurl, gfortran, atlas, cmake, python }: - +{ stdenv, fetchurl, gfortran, atlas, cmake, python, shared ? false }: +let + atlasMaybeShared = if shared then atlas.override {shared=true;} else atlas; + usedLibExtension = if shared then ".so" else ".a"; +in stdenv.mkDerivation { name = "liblapack-3.4.0"; src = fetchurl { @@ -7,18 +10,20 @@ stdenv.mkDerivation { sha256 = "1sf30v1ps5icg67dvw5sbx5yhypx13am470gqg2f7l04f3wrw4x7"; }; - propagatedBuildInputs = [ atlas ]; + propagatedBuildInputs = [ atlasMaybeShared ]; buildInputs = [ gfortran cmake ]; buildNativeInputs = [ python ]; cmakeFlags = [ "-DUSE_OPTIMIZED_BLAS=ON" - "-DBLAS_ATLAS_f77blas_LIBRARY=${atlas}/lib/libf77blas.a" - "-DBLAS_ATLAS_atlas_LIBRARY=${atlas}/lib/libatlas.a" + "-DBLAS_ATLAS_f77blas_LIBRARY=${atlasMaybeShared}/lib/libf77blas${usedLibExtension}" + "-DBLAS_ATLAS_atlas_LIBRARY=${atlasMaybeShared}/lib/libatlas${usedLibExtension}" "-DCMAKE_Fortran_FLAGS=-fPIC" - ]; + ] + ++ (stdenv.lib.optional shared "-DBUILD_SHARED_LIBS=ON") + ; - doCheck = true; + doCheck = ! shared; checkPhase = " sed -i 's,^#!.*,#!${python}/bin/python,' lapack_testing.py diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 5d256bc7024..e6f1249ffa2 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -3,11 +3,11 @@ assert readline != null -> ncurses != null; stdenv.mkDerivation { - name = "sqlite-3.7.9"; + name = "sqlite-3.7.11"; src = fetchurl { - url = http://www.sqlite.org/sqlite-autoconf-3070900.tar.gz; - sha1 = "a9da98a4bde4d9dae5c29a969455d11a03600e11"; + url = http://www.sqlite.org/sqlite-autoconf-3071100.tar.gz; + sha256 = "0ss7nd61jmfkz6piw9838c2msa14axjjlkf4d36rn91nqmfwgb9b"; }; buildInputs = [ readline ncurses ]; diff --git a/pkgs/development/libraries/sqlite/full.nix b/pkgs/development/libraries/sqlite/full.nix new file mode 100644 index 00000000000..ccb960643bd --- /dev/null +++ b/pkgs/development/libraries/sqlite/full.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl, tcl, readline ? null, ncurses ? null }: + +assert readline != null -> ncurses != null; + +stdenv.mkDerivation { + # I try to keep a version no newer than default.nix, and similar CFLAGS, + # for this to be compatible with it. + name = "sqlite-3.7.9-full"; + + src = fetchurl { + url = "http://www.sqlite.org/cgi/src/tarball/SQLite-3.7.9.tar.gz?uuid=version-3.7.9"; + sha256 = "0v11slxgjpx2nv7wp8c76wk2pa1dijs9v6zlcn2dj9jblp3bx8fk"; + }; + + buildInputs = [ readline ncurses ]; + buildNativeInputs = [ tcl ]; + + doCheck = true; + checkTarget = "test"; + + configureFlags = "--enable-threadsafe --enable-tempstore"; + + preConfigure = '' + ${ # The tests oserror-1.1.{1,2,3} need the fd limit < 2000 + # and on the builders in NixOS we have 4096 now. + if stdenv.isLinux then "ulimit -n 1024" else ""} + export TCLLIBDIR=$out/${tcl.libdir} + ''; + + CFLAGS = "-DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_SECURE_DELETE=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY=1"; + LDFLAGS = if readline != null then "-lncurses" else ""; + + postInstall = '' + make sqlite3_analyzer + cp sqlite3_analyzer $out/bin + ''; + + meta = { + homepage = http://www.sqlite.org/; + description = "A self-contained, serverless, zero-configuration, transactional SQL database engine"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; all; + }; +} diff --git a/pkgs/development/libraries/suitesparse/default.nix b/pkgs/development/libraries/suitesparse/default.nix index d1611cda623..b3fe6db059a 100644 --- a/pkgs/development/libraries/suitesparse/default.nix +++ b/pkgs/development/libraries/suitesparse/default.nix @@ -1,15 +1,11 @@ -{ stdenv -, fetchurl -, blas -, liblapack -}: +{ stdenv, fetchurl, blas, liblapack, gfortran } : stdenv.mkDerivation { - name = "suitespare"; + name = "suitesparse"; src = fetchurl { url = http://www.cise.ufl.edu/research/sparse/SuiteSparse/SuiteSparse-3.5.0.tar.gz ; sha256 = "0npn7c1j5qag5m2r0cmh3bwc42c1jk8k2yg2cfyxlcrp0h7wn4rc"; }; - buildInputs = [blas liblapack] ; + buildInputs = [blas liblapack gfortran] ; patches = [./disable-metis.patch]; preConfigure = '' diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix index 68d5eefa453..cfcb47dd54f 100644 --- a/pkgs/development/libraries/ucommon/default.nix +++ b/pkgs/development/libraries/ucommon/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, gnutls, pkgconfig, zlib, libgcrypt }: stdenv.mkDerivation rec { - name = "ucommon-5.1.2"; + name = "ucommon-5.2.2"; src = fetchurl { - url = mirror://gnu/commoncpp/ucommon-5.1.2.tar.gz; - sha256 = "1a6wfvrqpkk4w3l33jx5bdj38ljlyr92041aakvwmajpkczjf2q3"; + url = mirror://gnu/commoncpp/ucommon-5.2.2.tar.gz; + sha256 = "1s9r7yhvqnj57aiw7sklp2p6llfzn1jxvc3hwhpli5zq3r6kypwx"; }; buildInputs = [ pkgconfig gnutls zlib ]; diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 68215c555b7..b26bcf0aaeb 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -5,14 +5,14 @@ assert readline != null; let system = stdenv.system; arch = if system == "i686-linux" then "ia32" else if system == "x86_64-linux" || system == "x86_64-darwin" then "x64" else ""; - version = "3.6.6.20"; + version = "3.6.6.24"; in assert arch != ""; stdenv.mkDerivation rec { name = "v8-${version}"; src = fetchsvn { url = "http://v8.googlecode.com/svn/tags/${version}"; - sha256 = "68565086baa5a37a0fa15e1c0b7914210fa590b29a8196014cd83789da6a01ba"; + sha256 = "405c905f6240b37b0da14769781e7ec6444fe9153a02ddacd5d774713fe1eb41"; }; buildInputs = [python scons readline makeWrapper]; diff --git a/pkgs/development/libraries/vrpn/default.nix b/pkgs/development/libraries/vrpn/default.nix new file mode 100644 index 00000000000..3544e984077 --- /dev/null +++ b/pkgs/development/libraries/vrpn/default.nix @@ -0,0 +1,33 @@ +{ fetchurl, stdenv, unzip, cmake, mesa }: + +stdenv.mkDerivation { + name = "vrpn-07.30"; + + src = fetchurl { + url = "ftp://ftp.cs.unc.edu/pub/packages/GRIP/vrpn/vrpn_07_30.zip"; + sha256 = "1rysp08myv88q3a30dr7js7vg3hvq8zj2bjrpcgpp86fm3gjpvb4"; + }; + + buildInputs = [ unzip cmake mesa ]; + + doCheck = false; # FIXME: test failure + checkTarget = "test"; + + meta = { + description = "Virtual Reality Peripheral Network"; + + longDescription = + '' The Virtual-Reality Peripheral Network (VRPN) is a set of classes + within a library and a set of servers that are designed to implement + a network-transparent interface between application programs and the + set of physical devices (tracker, etc.) used in a virtual-reality + (VR) system. + ''; + + homepage = http://www.cs.unc.edu/Research/vrpn/; + + license = "BSL1.0"; # Boost Software License, + # see # + + }; +} diff --git a/pkgs/development/libraries/wxGTK-2.9/2.9.0.nix b/pkgs/development/libraries/wxGTK-2.9/2.9.0.nix deleted file mode 100644 index 619806fb7b2..00000000000 --- a/pkgs/development/libraries/wxGTK-2.9/2.9.0.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto -, gstreamer, gst_plugins_base, GConf -, withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true, -}: - -assert withMesa -> mesa != null; - -with stdenv.lib; - -stdenv.mkDerivation { - name = "wxwidgets-2.9.0"; - - src = fetchurl { - url = mirror://sourceforge/wxwindows/wxWidgets-2.9.0.tar.bz2; - sha256 = "10n75mpypd9411b29gxmi0g2s7dgbfwkgiyhxwkjsyrmyvfc3xcc"; - }; - - buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst_plugins_base GConf ] - ++ optional withMesa mesa; - - buildNativeInputs = [ pkgconfig ]; - - configureFlags = [ - "--enable-gtk2" - (if compat24 then "--enable-compat24" else "--disable-compat24") - (if compat26 then "--enable-compat26" else "--disable-compat26") - "--disable-precomp-headers" - (if unicode then "--enable-unicode" else "") - "--enable-mediactrl" - ] ++ optional withMesa "--with-opengl"; - - SEARCH_LIB = optionalString withMesa "${mesa}/lib"; - - preConfigure = " - substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' - substituteInPlace configure --replace 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB=' - substituteInPlace configure --replace /usr /no-such-path - "; - - postInstall = " - (cd $out/include && ln -s wx-*/* .) - "; - - passthru = {inherit gtk compat24 compat26 unicode;}; - - enableParallelBuilding = true; -} diff --git a/pkgs/development/libraries/wxGTK-2.9/2.9.1.nix b/pkgs/development/libraries/wxGTK-2.9/default.nix similarity index 87% rename from pkgs/development/libraries/wxGTK-2.9/2.9.1.nix rename to pkgs/development/libraries/wxGTK-2.9/default.nix index d59ab4880c3..a0e69bff0fe 100644 --- a/pkgs/development/libraries/wxGTK-2.9/2.9.1.nix +++ b/pkgs/development/libraries/wxGTK-2.9/default.nix @@ -8,11 +8,11 @@ assert withMesa -> mesa != null; with stdenv.lib; stdenv.mkDerivation { - name = "wxwidgets-2.9.1"; + name = "wxwidgets-2.9.3"; src = fetchurl { - url = mirror://sourceforge/wxwindows/wxWidgets-2.9.1.tar.bz2; - sha256 = "1f6pdlzjawhhs17hmimk0l1n3g4g48n2iqrgl181xqfrbxyz75b8"; + url = "mirror://sourceforge/wxwindows/wxWidgets-2.9.3.tar.bz2"; + sha256 = "739c31a360b5c46b55904a7fb086f5cdfff0816efbc491d8263349210bf323b2"; }; buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst_plugins_base GConf ] diff --git a/pkgs/development/libraries/yajl/default.nix b/pkgs/development/libraries/yajl/default.nix index 221344b9125..e58c6dcba12 100644 --- a/pkgs/development/libraries/yajl/default.nix +++ b/pkgs/development/libraries/yajl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cmake, ruby, darwinInstallNameToolUtility}: +{ stdenv, fetchurl, cmake, ruby }: stdenv.mkDerivation { name = "yajl-2.0.1"; @@ -9,8 +9,7 @@ stdenv.mkDerivation { sha256 = "08a7bgmdpvi6w9f9bxx5f42njwmwzdf6jz3w6ila7jgbl5mhknf2"; }; - buildInputs = [ cmake ruby ] - ++ stdenv.lib.optional stdenv.isDarwin darwinInstallNameToolUtility; + buildInputs = [ cmake ruby ]; meta = { description = "Yet Another JSON Library"; diff --git a/pkgs/development/ocaml-modules/menhir/default.nix b/pkgs/development/ocaml-modules/menhir/default.nix index ea706ef511f..d02516e410a 100644 --- a/pkgs/development/ocaml-modules/menhir/default.nix +++ b/pkgs/development/ocaml-modules/menhir/default.nix @@ -2,7 +2,7 @@ let ocaml_version = (builtins.parseDrvName ocaml.name).version; - version = "20090505"; + version = "20120123"; in stdenv.mkDerivation { @@ -10,13 +10,11 @@ stdenv.mkDerivation { src = fetchurl { url = "http://pauillac.inria.fr/~fpottier/menhir/menhir-${version}.tar.gz"; - sha256 = "1dsy80wp7k9wbxc89pjzy2izdkk4b72104m9ik747xzy23mssbyx"; + sha256 = "65cd9e4f813c62697c60c344963ca11bd461169f574ba3a866c2691541cb4682"; }; buildInputs = [ocaml findlib]; - configurePhase = "true"; # Skip configure - createFindlibDestdir = true; preBuild = '' diff --git a/pkgs/development/ocaml-modules/pycaml/default.nix b/pkgs/development/ocaml-modules/pycaml/default.nix index b6c0df5ac15..070bd270b11 100644 --- a/pkgs/development/ocaml-modules/pycaml/default.nix +++ b/pkgs/development/ocaml-modules/pycaml/default.nix @@ -1,46 +1,46 @@ -{stdenv, fetchurl, ocaml, findlib, python, ocaml_make}: +{stdenv, fetchurl, ocaml, findlib, ncurses, python, ocaml_make}: -# The actual version of pycaml is unclear, as it is the original -# 0.82 version with some patches applied in order to use it for -# the kompostilo type setter (see README). Apparently, some of -# the patches provide Python 3.1 support. -# This version also differs from the Debian version, which -# is also a heavily patched 0.82. -# Therefore, we may at some point try to find out what is -# actually the "real" version (if the library is still alive). +# This is the original pycaml version with patches from debian. -stdenv.mkDerivation { - name = "pycaml-0.82"; +let debian = fetchurl { + url = "mirror://debian/pool/main/p/pycaml/pycaml_0.82-14.debian.tar.gz"; + sha256 = "a763088ec1fa76c769bf586ed6692e7ac035b0a2bfd48a90a8e7a9539ec0c2f1"; + }; - src = fetchurl { - name = "pycaml.tar.gz"; - url = "http://github.com/chemoelectric/pycaml/tarball/master"; - sha256 = "ff6d863c42b4ef798f50ff5eff77b47b77b5c0d28b6f65364e8a436a216dc591"; - }; +in stdenv.mkDerivation { + name = "pycaml-0.82-14"; - buildInputs = [ocaml findlib python ocaml_make]; + srcs = [ + (fetchurl { + url = "mirror://debian/pool/main/p/pycaml/pycaml_0.82.orig.tar.gz"; + sha256 = "d57be559c8d586c575717d47817986bbdbcebe2ffd16ad6b291525c62868babe"; + }) + (fetchurl { + url = "mirror://debian/pool/main/p/pycaml/pycaml_0.82-14.debian.tar.gz"; + sha256 = "a763088ec1fa76c769bf586ed6692e7ac035b0a2bfd48a90a8e7a9539ec0c2f1"; + }) + ]; + + postPatch = '' + rm -f Makefile* configure* + cp ../debian/META ../debian/Makefile . + sed -i "Makefile" -e's|/usr/share/ocamlmakefile/OCamlMakefile|${ocaml_make}/include/OCamlMakefile|g' + ''; + + sourceRoot = "pycaml"; + patches = [ "../debian/patches/*.patch" ]; + + buildInputs = [ ncurses ocaml findlib python ocaml_make ]; createFindlibDestdir = true; - phases = [ "unpackPhase" "patchPhase" "buildPhase" "installPhase" ]; - - # fix some paths to the appropriate store paths. - patchPhase = '' - sed -i "Makefile" -e's|/usr/include/OCamlMakefile|${ocaml_make}/include/OCamlMakefile|g' - sed -i "Makefile" -e's|/usr|${python}|g' - ''; - - buildPhase = '' - make -f Makefile -j1 PYVER=`python -c 'import sys; print("{0}.{1}".format(sys.version_info.major, sys.version_info.minor));'` - ''; - # the Makefile is not shipped with an install target, hence we do it ourselves. installPhase = '' ocamlfind install pycaml \ - dllpycaml_stubs.so* libpycaml_stubs.a pycaml.a pycaml.cma \ - pycaml.cmi pycaml.cmo pycaml.cmx pycaml.cmxa pycaml.ml pycaml.mli \ - pycaml.o pycaml_stubs.c pycaml_stubs.h pycaml_stubs.o META - ''; + dllpycaml_stubs.so libpycaml_stubs.a pycaml.a pycaml.cma \ + pycaml.cmi pycaml.cmo pycaml.cmx pycaml.cmxa \ + META + ''; meta = { homepage = "http://github.com/chemoelectric/pycaml"; diff --git a/pkgs/development/ocaml-modules/sexplib/default.nix b/pkgs/development/ocaml-modules/sexplib/default.nix index d2df36ec38d..d999dc471bd 100644 --- a/pkgs/development/ocaml-modules/sexplib/default.nix +++ b/pkgs/development/ocaml-modules/sexplib/default.nix @@ -1,22 +1,18 @@ {stdenv, fetchurl, ocaml, findlib, ocaml_typeconv}: -# note: only works with ocaml>3.12 -# use version 5.2.0 if you still want an 3.11 version... - stdenv.mkDerivation { - name = "ocaml-sexplib-7.0.4"; + name = "ocaml-sexplib-7.0.5"; src = fetchurl { - url = "http://forge.ocamlcore.org/frs/download.php/699/sexplib-7.0.4.tar.gz"; - sha256 = "83c6c771f423d91bebc4f57202066358adf3775fb000dd780079f51436045a43"; + url = "http://forge.ocamlcore.org/frs/download.php/832/sexplib-7.0.5.tar.gz"; + sha256 = "b1022da052254581aae51fb634345920364439f715a2c786abcd0b828c2ce697"; }; - buildInputs = [ocaml findlib ocaml_typeconv]; + patches = [ ./sexp-3.10-compat.patch ]; + buildInputs = [ocaml findlib ocaml_typeconv ]; createFindlibDestdir = true; - configurePhase = "true"; - meta = { homepage = "http://forge.ocamlcore.org/projects/sexplib/"; description = "Library for serializing OCaml values to and from S-expressions."; diff --git a/pkgs/development/ocaml-modules/sexplib/sexp-3.10-compat.patch b/pkgs/development/ocaml-modules/sexplib/sexp-3.10-compat.patch new file mode 100644 index 00000000000..45e2abc6186 --- /dev/null +++ b/pkgs/development/ocaml-modules/sexplib/sexp-3.10-compat.patch @@ -0,0 +1,167 @@ +diff -ur orig/sexplib-7.0.5/lib/conv.ml sexplib-7.0.5/lib/conv.ml +--- orig/sexplib-7.0.5/lib/conv.ml 2012-03-20 17:41:54.000000000 +0100 ++++ sexplib-7.0.5/lib/conv.ml 2012-03-26 20:04:58.128032729 +0200 +@@ -665,7 +665,7 @@ + | Parse_error pe -> + let ppos = + match pe.parse_state with +- | `Sexp { parse_pos } | `Annot { parse_pos } -> parse_pos ++ | `Sexp { parse_pos = parse_pos } | `Annot { parse_pos = parse_pos } -> parse_pos + in + List [ + Atom "Sexplib.Sexp.Parse_error"; +diff -ur orig/sexplib-7.0.5/lib/pre_sexp.ml sexplib-7.0.5/lib/pre_sexp.ml +--- orig/sexplib-7.0.5/lib/pre_sexp.ml 2012-03-20 17:41:54.000000000 +0100 ++++ sexplib-7.0.5/lib/pre_sexp.ml 2012-03-26 20:04:58.129032741 +0200 +@@ -172,13 +172,7 @@ + (* Output of S-expressions to file *) + + let save_of_output ?perm output_function file sexp = +- let tmp_name, oc = +- let temp_dir = +- if Filename.is_relative file then "." +- else Filename.dir_sep +- in +- Filename.open_temp_file ~temp_dir file "tmp" +- in ++ let tmp_name, oc = Filename.open_temp_file file "tmp" in + try + output_function oc sexp; + close_out oc; +@@ -316,9 +310,9 @@ + else if text_char < 0 then fail "text_char < 0" + else if global_offset < 0 then fail "global_offset < 0" + else if buf_pos < 0 then fail "buf_pos < 0" +- else { text_line; text_char; global_offset; buf_pos } ++ else { text_line = text_line; text_char = text_char; global_offset = global_offset; buf_pos = buf_pos } + +- let with_buf_pos t buf_pos = { t with buf_pos } ++ let with_buf_pos t buf_pos = { t with buf_pos = buf_pos } + end + + type ('a, 't) parse_result = +@@ -347,11 +341,11 @@ + + exception Parse_error of parse_error + +-let bump_text_line { parse_pos } = ++let bump_text_line { parse_pos = parse_pos } = + parse_pos.Parse_pos.text_line <- parse_pos.Parse_pos.text_line + 1; + parse_pos.Parse_pos.text_char <- 0 + +-let bump_text_pos { parse_pos } = ++let bump_text_pos { parse_pos = parse_pos } = + parse_pos.Parse_pos.text_char <- parse_pos.Parse_pos.text_char + 1 + + let bump_pos_cont state str ~max_pos ~pos cont = +@@ -378,18 +372,18 @@ + parse_pos.Parse_pos.buf_pos <- buf_pos; + parse_pos.Parse_pos.global_offset <- parse_pos.Parse_pos.global_offset + len + +-let mk_parse_pos { parse_pos } buf_pos = ++let mk_parse_pos { parse_pos = parse_pos } buf_pos = + set_parse_pos parse_pos buf_pos; + parse_pos + + let raise_parse_error parse_state location buf_pos err_msg = + begin + match parse_state with +- | `Sexp { parse_pos } | `Annot { parse_pos } -> ++ | `Sexp { parse_pos = parse_pos } | `Annot { parse_pos = parse_pos } -> + set_parse_pos parse_pos buf_pos; + parse_pos.Parse_pos.text_char <- parse_pos.Parse_pos.text_char + 1; + end; +- let parse_error = { location; err_msg; parse_state } in ++ let parse_error = { location = location; err_msg = err_msg; parse_state = parse_state } in + raise (Parse_error parse_error) + + let raise_unexpected_char parse_state location buf_pos c = +@@ -657,7 +651,7 @@ + let max_pos = check_str_bounds "parse" ~pos ~len str in \ + let state = \ + { \ +- parse_pos; \ ++ parse_pos = parse_pos; \ + pstack = INIT_PSTACK; \ + pbuf = Buffer.create 128; \ + } \ +@@ -681,20 +675,20 @@ + + let mk_annot_pos + ({ Parse_pos.text_line = line; text_char = col } as parse_pos) pos = +- { Annot.line; col; offset = get_glob_ofs parse_pos pos } ++ { Annot.line = line; col = col; offset = get_glob_ofs parse_pos pos } + + let mk_annot_pos1 + ({ Parse_pos.text_line = line; text_char = col } as parse_pos) pos = +- { Annot.line; col = col + 1; offset = get_glob_ofs parse_pos pos } ++ { Annot.line = line; col = col + 1; offset = get_glob_ofs parse_pos pos } + +-let add_annot_pos { parse_pos; pstack } pos = ++let add_annot_pos { parse_pos = parse_pos; pstack = pstack } pos = + pstack.Annot.positions <- mk_annot_pos parse_pos pos :: pstack.Annot.positions + +-let add_annot_pos1 { parse_pos; pstack } pos = ++let add_annot_pos1 { parse_pos = parse_pos; pstack = pstack } pos = + pstack.Annot.positions <- + mk_annot_pos1 parse_pos pos :: pstack.Annot.positions + +-let get_annot_range { parse_pos; pstack } pos = ++let get_annot_range { parse_pos = parse_pos; pstack = pstack } pos = + let start_pos = + match pstack.Annot.positions with + | [] -> assert false (* impossible *) +@@ -708,7 +702,7 @@ + offset = get_glob_ofs parse_pos pos; + } + in +- { Annot.start_pos; end_pos } ++ { Annot.start_pos = start_pos; end_pos = end_pos } + + let mk_annot_atom parse_state str pos = + Annot.Atom (get_annot_range parse_state pos, Atom str) +@@ -780,7 +774,7 @@ + let rec loop this_parse ~pos ~len ~is_incomplete = + if len > 0 then + match this_parse ~pos ~len buf with +- | Done (sexp, ({ Parse_pos.buf_pos } as parse_pos)) -> ++ | Done (sexp, ({ Parse_pos.buf_pos = buf_pos } as parse_pos)) -> + rev_sexps_ref := sexp :: !rev_sexps_ref; + let n_parsed = buf_pos - pos in + let this_parse = mk_this_parse ~parse_pos my_parse in +@@ -813,7 +807,7 @@ + + let of_string_bigstring loc this_parse ws_buf get_len get_sub str = + match this_parse str with +- | Done (_, { Parse_pos.buf_pos }) when buf_pos <> get_len str -> ++ | Done (_, { Parse_pos.buf_pos = buf_pos }) when buf_pos <> get_len str -> + let prefix_len = min (get_len str - buf_pos) 20 in + let prefix = get_sub str buf_pos prefix_len in + let msg = +@@ -874,7 +868,7 @@ + failwith (sprintf "Sexplib.Sexp.gen_load_sexp: end of file: %s" file) + else + match this_parse ~pos:0 ~len buf with +- | Done (sexp, ({ Parse_pos.buf_pos } as parse_pos)) ++ | Done (sexp, ({ Parse_pos.buf_pos = buf_pos } as parse_pos)) + when strict -> + let rec strict_loop this_parse ~pos ~len = + match this_parse ~pos ~len buf with +@@ -938,7 +932,7 @@ + + let get_conv_exn ~file ~exc annot_sexp = + let range = get_range annot_sexp in +- let { start_pos = { line; col } } = range in ++ let { start_pos = { line = line; col = col } } = range in + let loc = sprintf "%s:%d:%d" file line col in + Of_sexp_error (Annot.Conv_exn (loc, exc), get_sexp annot_sexp) + end +@@ -1003,7 +997,7 @@ + let sexp = of_string str in + try f sexp + with Of_sexp_error (exc, sub_sexp) -> +- raise (Of_string_conv_exn.E { Of_string_conv_exn.exc; sexp; sub_sexp }) ++ raise (Of_string_conv_exn.E { Of_string_conv_exn.exc = exc; sexp = sexp; sub_sexp = sub_sexp }) + + let of_string_conv_exn str f = gen_of_string_conv_exn of_string str f + let of_bigstring_conv_exn bstr f = gen_of_string_conv_exn of_bigstring bstr f diff --git a/pkgs/development/ocaml-modules/typeconv/default.nix b/pkgs/development/ocaml-modules/typeconv/default.nix index c3ef8dd9856..299e7729b91 100644 --- a/pkgs/development/ocaml-modules/typeconv/default.nix +++ b/pkgs/development/ocaml-modules/typeconv/default.nix @@ -3,19 +3,17 @@ # note: works only with ocaml >3.12 stdenv.mkDerivation { - name = "ocaml-typeconv-3.0.4"; + name = "ocaml-typeconv-3.0.5"; src = fetchurl { - url = "http://forge.ocamlcore.org/frs/download.php/697/ocaml-type-conv-3.0.4.tar.gz"; - sha256 = "63b6f2872d29fb4c0b1448343bb5ec0649365126756128049d45a81238b59f12"; + url = "http://forge.ocamlcore.org/frs/download.php/821/type_conv-3.0.5.tar.gz"; + sha256 = "90ac6c401a600a23012a3f513def6f67d4979b11bd551f4d0af78f0f0b479198"; }; buildInputs = [ocaml findlib ]; createFindlibDestdir = true; - configurePhase = "true"; - meta = { homepage = "http://forge.ocamlcore.org/projects/type-conv/"; description = "Support library for OCaml preprocessor type conversions"; diff --git a/pkgs/development/python-modules/numpy/no_default_dirs.patch b/pkgs/development/python-modules/numpy/no_default_dirs.patch new file mode 100644 index 00000000000..8e1f58974f5 --- /dev/null +++ b/pkgs/development/python-modules/numpy/no_default_dirs.patch @@ -0,0 +1,28 @@ +diff -ur numpy-1.6.1-orig/numpy/distutils/system_info.py numpy-1.6.1/numpy/distutils/system_info.py +--- numpy-1.6.1-orig/numpy/distutils/system_info.py 2011-07-01 17:31:13.000000000 -0400 ++++ numpy-1.6.1/numpy/distutils/system_info.py 2012-04-27 14:10:38.000000000 -0400 +@@ -189,18 +189,12 @@ + default_x11_lib_dirs = [] + default_x11_include_dirs = [] + else: +- default_lib_dirs = libpaths(['/usr/local/lib','/opt/lib','/usr/lib', +- '/opt/local/lib','/sw/lib'], platform_bits) +- default_include_dirs = ['/usr/local/include', +- '/opt/include', '/usr/include', +- '/opt/local/include', '/sw/include', +- '/usr/include/suitesparse'] +- default_src_dirs = ['.','/usr/local/src', '/opt/src','/sw/src'] +- +- default_x11_lib_dirs = libpaths(['/usr/X11R6/lib','/usr/X11/lib', +- '/usr/lib'], platform_bits) +- default_x11_include_dirs = ['/usr/X11R6/include','/usr/X11/include', +- '/usr/include'] ++ default_lib_dirs = [] ++ default_include_dirs = [] ++ default_src_dirs = ['.'] ++ ++ default_x11_lib_dirs = [] ++ default_x11_include_dirs = [] + + if os.path.join(sys.prefix, 'lib') not in default_lib_dirs: + default_lib_dirs.insert(0,os.path.join(sys.prefix, 'lib')) diff --git a/pkgs/development/python-modules/pyqt/default.nix b/pkgs/development/python-modules/pyqt/default.nix index 5097e95f7e4..7081c28ddd8 100644 --- a/pkgs/development/python-modules/pyqt/default.nix +++ b/pkgs/development/python-modules/pyqt/default.nix @@ -4,7 +4,10 @@ stdenv.mkDerivation rec { name = "PyQt-x11-gpl-4.8.5"; src = fetchurl { - url = "http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/${name}.tar.gz"; + urls = [ + "http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/${name}.tar.gz" + "http://pkgs.fedoraproject.org/lookaside/pkgs/PyQt4/PyQt-x11-gpl-4.8.5.tar.gz/0e4264bb912edfbda319bb236ac84407/PyQt-x11-gpl-4.8.5.tar.gz" + ]; sha256 = "0838nfis6xj92n4gccih7j14yigfm3x7p59yr7qa5jy75wxdzqn9"; }; diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index d0c5e624d39..a625de6ffdc 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -59,21 +59,5 @@ stdenv.mkDerivation (rec { sed -i coregrind/link_tool_exe_darwin.in \ -e 's/^my \$archstr = .*/my $archstr = "x86_64";/g' ''; - - preConfigure = - # Shamelessly drag in MIG. - '' mkdir -p "$TMPDIR/impure-deps/bin" - - # MIG assumes the standard Darwin core utilities (e.g., `rm -d'), so - # let it see the impure directories. - cat > "$TMPDIR/impure-deps/bin/mig" <' -i src/CrossCorrelation.h + ''; + + meta = { + description = ''A blobby volleyball game.''; + license = with stdenv.lib.licenses; bsd3; + platforms = with stdenv.lib.platforms; linux; + maintainers = with stdenv.lib.maintainers; [raskin]; + }; +} diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix new file mode 100644 index 00000000000..171e73896c6 --- /dev/null +++ b/pkgs/games/minecraft/default.nix @@ -0,0 +1,36 @@ +{stdenv, fetchurl, jre, libX11, libXext, libXcursor, libXrandr, libXxf86vm +, mesa, openal}: + +stdenv.mkDerivation { + name = "minecraft-1.2.5"; + + src = fetchurl { + url = "https://s3.amazonaws.com/MinecraftDownload/launcher/minecraft.jar"; + sha256 = "0yp3wgy93wm746dkv6kbljhmzdqbcg4qhwkvnaaq4ml84mvvjp38"; + }; + + phases = "installPhase"; + + installPhase = '' + set -x + mkdir -pv $out/bin + cp -v $src $out/minecraft.jar + + cat > $out/bin/minecraft << EOF + #!${stdenv.shell} + + # wrapper for minecraft + export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${jre}/lib/${jre.architecture}/:${libX11}/lib/:${libXext}/lib/:${libXcursor}/lib/:${libXrandr}/lib/:${libXxf86vm}/lib/:${mesa}/lib/:${openal}/lib/ + ${jre}/bin/java -jar $out/minecraft.jar + EOF + + chmod +x $out/bin/minecraft + ''; + + meta = { + description = "A sandbox-building game"; + homepage = http://www.minecraft.net; + maintainers = [ "Carles Pagès " stdenv.lib.maintainers.shlevy ]; + license = "unfree-redistributable"; + }; +} diff --git a/pkgs/games/opentyrian/default.nix b/pkgs/games/opentyrian/default.nix new file mode 100644 index 00000000000..260b146217c --- /dev/null +++ b/pkgs/games/opentyrian/default.nix @@ -0,0 +1,37 @@ +{stdenv, fetchhg, fetchurl, unzip, SDL, SDL_net}: + +stdenv.mkDerivation rec { + name = "opentyrian-${version}"; + version = "0.0.955"; + + src = fetchhg { + url = "https://opentyrian.googlecode.com/hg/"; + tag = "13ef8ce47362"; + md5 = "95c8f9e7ff3d4207f1c692c7cec6c9b0"; + }; + + data = fetchurl { + url = http://sites.google.com/a/camanis.net/opentyrian/tyrian/tyrian21.zip; + md5 = "2a3b206a6de25ed4b771af073f8ca904"; + }; + + buildInputs = [SDL SDL_net unzip]; + + patchPhase = " + substituteInPlace src/file.c --replace /usr/share $out/share + "; + buildPhase = "make release"; + installPhase = " + ensureDir $out/bin + cp ./opentyrian $out/bin + ensureDir $out/share/opentyrian/data + unzip -j $data -d $out/share/opentyrian/data + "; + + meta = { + description = ''OpenTyrian is an open source port of the game "Tyrian".''; + homepage = https://opentyrian.googlecode.com/; + # This does not account of Tyrian data. + # license = stdenv.lib.licenses.gpl2; + }; +} diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix index f92b5775ab7..90ebab92942 100644 --- a/pkgs/games/rigsofrods/default.nix +++ b/pkgs/games/rigsofrods/default.nix @@ -1,4 +1,4 @@ -{ fetchsvn, fetchurl, stdenv, wxGTK290, freeimage, cmake, zziplib, mesa, boost, +{ fetchsvn, fetchurl, stdenv, wxGTK29, freeimage, cmake, zziplib, mesa, boost, pkgconfig, libuuid, openal, ogre, ois, curl, gtk, pixman, mygui, unzip, angelscript, caelum, ogrepaged, mysocketw, libxcb }: @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { patches = [ ./doubleslash.patch ./paths.patch ]; - buildInputs = [ wxGTK290 freeimage cmake zziplib mesa boost pkgconfig + buildInputs = [ wxGTK29 freeimage cmake zziplib mesa boost pkgconfig libuuid openal ogre ois curl gtk mygui unzip angelscript caelum ogrepaged mysocketw libxcb ]; diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix index 06c98411f5b..4e06c31442a 100644 --- a/pkgs/games/spring/springlobby.nix +++ b/pkgs/games/spring/springlobby.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "springlobby-${version}"; - version = "0.141"; + version = "0.146"; src = fetchurl { url = "http://www.springlobby.info/tarballs/springlobby-${version}.tar.bz2"; - sha256 = "37cf3aa1ed78a0ded782cc5c692301619dbb2cf4749bccbf059c51707daaf734"; + sha256 = "55899baf6732e48bfaa36d80974aa135c051d2cbb6fe92fbcffd80440639eedf"; }; buildInputs = [ cmake wxGTK openal pkgconfig curl gettext libtorrentRasterbar boost]; diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix index 74448cdad76..875dfc93bb1 100644 --- a/pkgs/games/urbanterror/default.nix +++ b/pkgs/games/urbanterror/default.nix @@ -10,21 +10,31 @@ stdenv.mkDerivation rec { url = "http://ftp.snt.utwente.nl/pub/games/urbanterror/iourbanterror/source/complete/ioUrbanTerrorSource_2007_12_20.zip"; sha256 = "1s1wq9m7shhvvk7s4400yrmz7dys501i4c9ln1mglc9dhmi8dmcn"; }; + buildInputs = [ unzip SDL mesa openal curl ]; unpackPhase = '' mkdir urbanterror cd urbanterror unzip $src1 unzip $src2 ''; + patches = [ ./l_script.patch ]; + patchPhase = '' + for d in ioUrbanTerrorClientSource ioUrbanTerrorServerSource + do + cd "$d" + patch -p 0 < "''${patches[0]}" + cd .. + done + ''; configurePhase = '' cd ioUrbanTerrorClientSource echo "USE_OPENAL = 1" > Makefile.local echo "USE_OPENAL_DLOPEN = 0" >> Makefile.local echo "USE_CURL = 1" >> Makefile.local echo "USE_CURL_DLOPEN = 0" >> Makefile.local + substituteInPlace code/tools/asm/Makefile --replace -Werror "" cd .. ''; - buildInputs = [ unzip SDL mesa openal curl ]; buildPhase = '' for d in ioUrbanTerrorClientSource ioUrbanTerrorServerSource do diff --git a/pkgs/games/urbanterror/l_script.patch b/pkgs/games/urbanterror/l_script.patch new file mode 100644 index 00000000000..8aa176cca8c --- /dev/null +++ b/pkgs/games/urbanterror/l_script.patch @@ -0,0 +1,21 @@ +diff -ur code/botlib/l_script.c kode/botlib/l_script.c +--- code/botlib/l_script.c 2007-10-09 02:47:26.000000000 +0400 ++++ kode/botlib/l_script.c 2012-04-16 02:02:55.170360236 +0400 +@@ -1118,7 +1118,7 @@ + { + if (*string == '\"') + { +- strcpy(string, string+1); ++ memmove(string, string+1, strlen(string) - 1); + } //end if + if (string[strlen(string)-1] == '\"') + { +@@ -1135,7 +1135,7 @@ + { + if (*string == '\'') + { +- strcpy(string, string+1); ++ memmove(string, string+1, strlen(string) - 1); + } //end if + if (string[strlen(string)-1] == '\'') + { diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index f9f1ddebc1d..2bac3cba198 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -1,34 +1,20 @@ -{ stdenv, fetchurl, automake, autoconf, SDL, SDL_image, SDL_mixer, SDL_net, SDL_ttf, pango +{ stdenv, fetchurl, cmake, SDL, SDL_image, SDL_mixer, SDL_net, SDL_ttf, pango , gettext, zlib, boost, freetype, libpng, pkgconfig, lua, dbus, fontconfig, libtool , fribidi, asciidoc }: stdenv.mkDerivation rec { pname = "wesnoth"; - version = "1.8.6"; + version = "1.10.2"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2"; - sha256 = "10c01ys846zsy831gprdy2nx3qlzv65s4jy99lw6misak3x07rjg"; + sha256 = "0hawzq85sq0kdddj0s7y6kpx043g1hsl7cvyw1xcxqh45hkgw2ix"; }; buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf pango gettext zlib boost fribidi - automake autoconf freetype libpng pkgconfig lua dbus fontconfig libtool ]; - - # The preInstall sed substitution fix errors which I - # believe arise from autotools version mismatches. Rather than - # hunt for the correct automake and autoconf versions these changes - # make the build work with the versions current in Nixpkgs. - preInstall = '' - sed -i -e s,@MKINSTALLDIRS@,`pwd`/config/mkinstalldirs, po/*/Makefile - ''; - - configurePhase = '' - ./autogen.sh --prefix=$out --with-boost=${boost} \ - --with-preferences-dir=.${pname} \ - --with-datadir-name=${pname} - ''; + cmake freetype libpng pkgconfig lua dbus fontconfig libtool ]; # Make the package build with the gcc currently available in Nixpkgs. NIX_CFLAGS_COMPILE = "-Wno-ignored-qualifiers"; diff --git a/pkgs/lib/attrsets.nix b/pkgs/lib/attrsets.nix index fcaf4f5c9b5..db4b9fb210c 100644 --- a/pkgs/lib/attrsets.nix +++ b/pkgs/lib/attrsets.nix @@ -78,6 +78,17 @@ rec { catAttrs = attr: l: fold (s: l: if hasAttr attr s then [(getAttr attr s)] ++ l else l) [] l; + /* Filter an attribute set by removing all attributes for which the + given predicate return false. + + Example: + filterAttrs (n: v: n == "foo") { foo = 1; bar = 2; } + => { foo = 1; } + */ + filterAttrs = pred: set: + listToAttrs (fold (n: ys: let v = getAttr n set; in if pred n v then [(nameValuePair n v)] ++ ys else ys) [] (attrNames set)); + + /* Recursively collect sets that verify a given predicate named `pred' from the set `attrs'. The recursion is stopped when the predicate is verified. diff --git a/pkgs/lib/lists.nix b/pkgs/lib/lists.nix index e5b47f0d9ce..67b0add50dc 100644 --- a/pkgs/lib/lists.nix +++ b/pkgs/lib/lists.nix @@ -27,11 +27,13 @@ rec { then nul else foldl op (op nul (head list)) (tail list); + # map with index: `imap (i: v: "${v}-${toString i}") ["a" "b"] == # ["a-1" "b-2"]' imap = f: list: zipListsWith f (range 1 (length list)) list; + # Concatenate a list of lists. concatLists = fold (x: y: x ++ y) []; @@ -54,12 +56,15 @@ rec { filter = pred: list: fold (x: y: if pred x then [x] ++ y else y) [] list; + # Remove elements 'e' from a list. Useful for buildInputs remove = e: filter (x: x != e); + # Given two lists, removes all elements of the first list from the second list removeList = l: filter (x: elem x l); + # Return true if `list' has an element `x': elem = x: list: fold (a: bs: x == a || bs) false list; @@ -145,17 +150,19 @@ rec { zipLists = zipListsWith (fst: snd: { inherit fst snd; }); - # invert the order of the elements of a list. + + # Reverse the order of the elements of a list. reverseList = l: let reverse_ = accu: l: if l == [] then accu else reverse_ ([(head l)] ++ accu) (tail l); in reverse_ [] l; - # Sort a list based on the `strictLess' function which compare the two - # elements and return true if the first argument is strictly below the - # second argument. The returned list is sorted in an increasing order. - # The implementation does a quick-sort. + + # Sort a list based on a comparator function which compares two + # elements and returns true if the first argument is strictly below + # the second argument. The returned list is sorted in an increasing + # order. The implementation does a quick-sort. sort = strictLess: list: let # This implementation only have one element lists on the left hand @@ -171,25 +178,29 @@ rec { qs list []; - # haskell's take: take 2 [1 2 3 4] yields [1 2] + # Return the first (at most) N elements of a list. take = count: list: if list == [] || count == 0 then [] else [ (head list) ] ++ take (builtins.sub count 1) (tail list); - # haskell's drop. drop count elements from head of list + + # Remove the first (at most) N elements of a list. drop = count: list: if count == 0 then list else drop (builtins.sub count 1) (tail list); + last = list: assert list != []; let loop = l: if tail l == [] then head l else loop (tail l); in loop list; + # Zip two lists together. zipTwoLists = xs: ys: if xs != [] && ys != [] then [ {first = head xs; second = head ys;} ] ++ zipTwoLists (tail xs) (tail ys) else []; + } diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix index e95d6a7ad0e..dcfc47a456a 100644 --- a/pkgs/lib/maintainers.nix +++ b/pkgs/lib/maintainers.nix @@ -4,7 +4,8 @@ /* Add your name and email address here. Keep the list alphabetically sorted. */ - all = "Nix Committers "; + aforemny = "Alexander Foremny "; + all = "Nix Committers "; andres = "Andres Loeh "; astsmtl = "Alexander Tsamutali "; bjg = "Brian Gough "; @@ -25,6 +26,7 @@ piotr = "Piotr Pietraszkiewicz "; qknight = "Joachim Schiele "; raskin = "Michael Raskin <7c6f434c@mail.ru>"; + rob = "Rob Vermaas "; roconnor = "Russell O'Connor "; sander = "Sander van der Burg "; shlevy = "Shea Levy "; diff --git a/pkgs/lib/modules.nix b/pkgs/lib/modules.nix index 8ecb04156e7..eb528f141fe 100644 --- a/pkgs/lib/modules.nix +++ b/pkgs/lib/modules.nix @@ -41,29 +41,31 @@ rec { # attributes. unifyModuleSyntax = m: let - getImports = m: + delayedModule = delayProperties m; + getImports = if m ? config || m ? options then attrByPath ["imports"] [] m else - toList (rmProperties (attrByPath ["require"] [] (delayProperties m))); + toList (rmProperties (attrByPath ["require"] [] delayedModule)); - getImportedPaths = m: filter isPath (getImports m); - getImportedSets = m: filter (x: !isPath x) (getImports m); + getImportedPaths = filter isPath getImports; + getImportedSets = filter (x: !isPath x) getImports; + + getConfig = + removeAttrs delayedModule ["require" "key"]; - getConfig = m: - removeAttrs (delayProperties m) ["require" "key"]; in if isModule m then { key = ""; } // m else { key = ""; - imports = getImportedPaths m; - config = getConfig m; + imports = getImportedPaths; + config = getConfig; } // ( - if getImportedSets m != [] then - assert tail (getImportedSets m) == []; - { options = head (getImportedSets m); } + if getImportedSets != [] then + assert tail getImportedSets == []; + { options = head getImportedSets; } else {} ); @@ -124,9 +126,25 @@ rec { value ) module; + # Handle mkMerge function left behind after a delay property. + moduleFlattenMerge = module: + if module ? config && + isProperty module.config && + isMerge module.config.property + then + (map (cfg: { key = module.key; config = cfg; }) module.config.content) + ++ [ (module // { config = {}; }) ] + else + [ module ]; + # Handle mkMerge attributes which are left behind by previous delay + # properties and convert them into a list of modules. Delay properties + # inside the config attribute of a module and create a second module if a + # mkMerge attribute was left behind. + # + # Module -> [ Module ] delayModule = module: - moduleApply { config = delayProperties; } module; + map (moduleApply { config = delayProperties; }) (moduleFlattenMerge module); evalDefinitions = opt: values: if opt ? type && opt.type.delayOnGlobalEval then @@ -170,7 +188,7 @@ rec { addName = name: if path == "" then name else path + "." + name; - modules = map delayModule modules_; + modules = concatLists (map delayModule modules_); modulesOf = name: filterModules name modules; declarationsOf = name: filter (m: m ? options) (modulesOf name); diff --git a/pkgs/lib/platforms.nix b/pkgs/lib/platforms.nix index c10d0e63a97..c79e8468b23 100644 --- a/pkgs/lib/platforms.nix +++ b/pkgs/lib/platforms.nix @@ -3,7 +3,7 @@ let lists = import ./lists.nix; in rec { gnu = linux; /* ++ hurd ++ kfreebsd ++ ... */ linux = ["i686-linux" "x86_64-linux" "powerpc-linux" "armv5tel-linux" - "mips64el-linux"]; + "armv7l-linux" "mips64el-linux"]; darwin = ["i686-darwin" "powerpc-darwin" "x86_64-darwin"]; freebsd = ["i686-freebsd" "x86_64-freebsd" "powerpc-freebsd"]; openbsd = ["i686-openbsd" "x86_64-openbsd"]; diff --git a/pkgs/lib/properties.nix b/pkgs/lib/properties.nix index d7df14f716f..0d864b0c553 100644 --- a/pkgs/lib/properties.nix +++ b/pkgs/lib/properties.nix @@ -82,7 +82,19 @@ rec { attrs; delayProperties = # implicit attrs argument. - delayPropertiesWithIter (f: p: v: lib.mapAttrs f v) ""; + let + # mapAttrs except that it also recurse into potential mkMerge + # functions. This may cause a strictness issue because looking the + # type of a string implies evaluating it. + iter = fun: path: value: + lib.mapAttrs (attr: val: + if isProperty val && isMerge val.property then + val // { content = map (fun attr) val.content; } + else + fun attr val + ) value; + in + delayPropertiesWithIter iter ""; # Call onDelay functions. triggerPropertiesDelay = name: attrs: @@ -179,6 +191,22 @@ rec { copyProperties = attrs: newAttrs: foldProperty id (x: newAttrs) attrs; + /* Merge. */ + + # Create "merge" statement which is skipped by the delayProperty function + # and interpreted by the underlying system using properties (modules). + + # Create a "Merge" property which only contains a condition. + isMerge = attrs: (typeOf attrs) == "merge"; + mkMerge = content: mkProperty { + property = { + _type = "merge"; + onDelay = name: val: throw "mkMerge is not the first of the list of properties."; + onEval = val: throw "mkMerge is not allowed on option definitions."; + }; + inherit content; + }; + /* If. ThenElse. Always. */ # create "if" statement that can be delayed on sets until a "then-else" or @@ -202,6 +230,7 @@ rec { isThenElse = attrs: (typeOf attrs) == "then-else"; mkThenElse = attrs: assert attrs ? thenPart && attrs ? elsePart; + __trace "Obsolete usage of mkThenElse, replace it by mkMerge." mkProperty { property = { _type = "then-else"; diff --git a/pkgs/lib/systems.nix b/pkgs/lib/systems.nix index 41fdaacde44..09d04042f1c 100644 --- a/pkgs/lib/systems.nix +++ b/pkgs/lib/systems.nix @@ -30,6 +30,7 @@ rec { setTypes "cpu-type" { arm = { bits = 32; significantByte = littleEndian; }; armv5tel = { bits = 32; significantByte = littleEndian; }; + armv7l = { bits = 32; significantByte = littleEndian; }; i686 = { bits = 32; significantByte = littleEndian; }; powerpc = { bits = 32; significantByte = bigEndian; }; x86_64 = { bits = 64; significantByte = littleEndian; }; diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 2470915ea8e..7447421fc94 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchurl, pkgconfig, alsaLib, python, dbus, pythonDBus, expat, makeWrapper }: +{ stdenv, fetchurl, alsaLib, dbus, expat, libsamplerate +, libsndfile, makeWrapper, pkgconfig, python, pythonDBus +, firewireSupport ? false, ffado ? null }: + +assert firewireSupport -> ffado != null; stdenv.mkDerivation rec { name = "jackdbus-${version}"; @@ -9,9 +13,15 @@ stdenv.mkDerivation rec { sha256 = "0788092zxrivcfnfg15brpjkf14x8ma8cwjz4k0b9xdxajn2wwac"; }; - buildInputs = [ pkgconfig alsaLib python dbus pythonDBus expat makeWrapper ]; + buildInputs = + [ alsaLib dbus expat libsamplerate libsndfile makeWrapper + pkgconfig python pythonDBus + ] ++ (stdenv.lib.optional firewireSupport ffado); - configurePhase = "cd jack-1.9.8 && python waf configure --prefix=$out --dbus --alsa"; + configurePhase = '' + cd jack-1.9.8 + python waf configure --prefix=$out --dbus --alsa ${if firewireSupport then "--firewire" else ""} + ''; buildPhase = "python waf build"; diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix index bb11e5d5f04..540735ab810 100644 --- a/pkgs/misc/jackaudio/jack1.nix +++ b/pkgs/misc/jackaudio/jack1.nix @@ -1,44 +1,26 @@ -# Perhaps we can get some ideas from here ? http://gentoo-wiki.com/HOWTO_Jack -# still much to test but it compiles now +{ stdenv, fetchurl, pkgconfig, alsaLib +, firewireSupport ? false, ffado ? null }: -{ composableDerivation, fetchurl, pkgconfig, alsaLib }: +assert firewireSupport -> ffado != null; -let inherit (composableDerivation) edf; in +stdenv.mkDerivation rec { + name = "jack-${version}"; + version = "0.121.3"; -composableDerivation.composableDerivation {} { - name = "jack-0.120.1"; - src = fetchurl { - url = "http://jackaudio.org/downloads/jack-audio-connection-kit-0.120.1.tar.gz"; - sha256 = "02h8536c67059gq2vsl323kvy9jak9dp0syi1h58awlkbgzlg80d"; + url = "http://jackaudio.org/downloads/jack-audio-connection-kit-${version}.tar.gz"; + sha256 = "1ypa3gjwy4vmaskin0vczmmdwybckkl42wmkfabx3v5yx8yms2dp"; }; - buildInputs = [ pkgconfig ]; - - flags = - # FIXME: tidy up - edf { name = "posix-shm"; } #use POSIX shm API - // edf { name = "timestamps"; } # allow clients to use the JACK timestamp API - // edf { name = "capabilities"; } #use libcap to gain realtime scheduling priviledges - // edf { name = "oldtrans"; } #remove old transport interfaces - // edf { name = "stripped-jackd"; } #strip jack before computing its md5 sum - // edf { name = "portaudio"; } #ignore PortAudio driver - // edf { name = "coreaudio"; } #ignore CoreAudio driver - // edf { name = "oss"; } #ignore OSS driver - // edf { name = "freebob"; } #ignore FreeBob driver - // edf { name = "alsa"; enable = { buildInputs = [ alsaLib ]; }; }; + preBuild = "echo ok"; - cfg = { - posix_shmSupport = true; - timestampsSupport = true; - alsaSupport = true; - }; - - # make sure the jackaudio is found by symlinking lib64 to lib - postInstall = '' - mkdir -p $out/lib - ln -s $out/lib{64,}/pkgconfig + configureFlags = '' + ${if firewireSupport then "--enable-firewire" else ""} ''; + + buildInputs = + [ pkgconfig alsaLib + ] ++ (stdenv.lib.optional firewireSupport ffado); meta = { description = "JACK audio connection kit"; diff --git a/pkgs/misc/misc.nix b/pkgs/misc/misc.nix index de23d6fa2c8..df4a0ce8102 100644 --- a/pkgs/misc/misc.nix +++ b/pkgs/misc/misc.nix @@ -109,14 +109,15 @@ in # build a debug version of a package debugVersion = pkg: lib.overrideDerivation pkg (attrs: { - prePhases = ["preHook"] ++ lib.optionals (pkgs ? prePhases) pkgs.prePhases; + prePhases = ["debugPhase"] ++ lib.optionals (attrs ? prePhases) attrs.prePhases; + postPhases = ["objectsPhase"] ++ lib.optionals (attrs ? postPhases) attrs.postPhases; dontStrip = true; CFLAGS="-ggdb -O0"; CXXFLAGS="-ggdb -O0"; - preHook = '' + debugPhase = '' s=$out/src mkdir -p $s; cd $s; export TMP=$s @@ -128,5 +129,38 @@ in echo "file should tell that executable has not been stripped" ''; + objectsPhase = '' + cd $out/src + find . -name "*.o" -exec rm {} \; + ''; + }); + + # build an optimized ersion of a package but with symbols and source + symbolsVersion = pkg: lib.overrideDerivation pkg (attrs: { + + prePhases = ["debugPhase"] ++ lib.optionals (attrs ? prePhases) attrs.prePhases; + postPhases = ["objectsPhase"] ++ lib.optionals (attrs ? postPhases) attrs.postPhases; + + dontStrip = true; + + CFLAGS="-g -O2"; + CXXFLAGS="-g -O2"; + + debugPhase = '' + s=$out/src + mkdir -p $s; cd $s; + export TMP=$s + export TEMP=$s + + for var in CFLAGS CXXFLAGS NIX_CFLAGS_COMPILE; do + declare -x "$var=''${!var} -g -O2" + done + echo "file should tell that executable has not been stripped" + ''; + + objectsPhase = '' + cd $out/src + find . -name "*.o" -exec rm {} \; + ''; }); } diff --git a/pkgs/misc/sane-backends/default.nix b/pkgs/misc/sane-backends/default.nix index 3f9ecdccb40..31372aa8418 100644 --- a/pkgs/misc/sane-backends/default.nix +++ b/pkgs/misc/sane-backends/default.nix @@ -6,11 +6,11 @@ in assert hotplugSupport -> (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"); stdenv.mkDerivation { - name = "sane-backends-1.0.21"; + name = "sane-backends-1.0.22"; src = fetchurl { - url = ftp://ftp.sane-project.org/pub/sane/sane-backends-1.0.21/sane-backends-1.0.21.tar.gz; - sha256 = "12wl4a86hxwlrx46lm5z6lw4id3j8wi82yv3khxcz5sqjai2ykp4"; + url = http://alioth.debian.org/frs/download.php/3503/sane-backends-1.0.22.tar.gz; + sha256 = "0m0cz4ljw9asqvpryl6gx1ndwf7ll2qinlvql9whnzs901la314z"; }; udevSupport = hotplugSupport; diff --git a/pkgs/misc/screensavers/slock/default.nix b/pkgs/misc/screensavers/slock/default.nix index acd8aa69905..b33ca25fb10 100644 --- a/pkgs/misc/screensavers/slock/default.nix +++ b/pkgs/misc/screensavers/slock/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, xproto, libX11, libXext }: stdenv.mkDerivation rec { - name = "slock-0.9"; + name = "slock-1.0"; src = fetchurl { url = "http://dl.suckless.org/tools/${name}.tar.gz"; - sha256 = "1gfp2ic2i63yz8wrf5cqzv9g422j9qs249y7g4chq0brpcybgpc9"; + sha256 = "b4e44ff1660f6f7eb270a0575d6ae1e0fbffcf0cdd96860a1695d57e89ae2df9"; }; buildInputs = [ xproto libX11 libXext ]; installFlags = "DESTDIR=\${out} PREFIX="; diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix index 46a28039e79..2df8f2fd97a 100644 --- a/pkgs/misc/screensavers/xlockmore/default.nix +++ b/pkgs/misc/screensavers/xlockmore/default.nix @@ -1,23 +1,22 @@ -{stdenv, fetchurl, pam ? null, x11, freetype}: +{ stdenv, fetchurl, pam ? null, x11 }: stdenv.mkDerivation rec { - # FIXME: Password authentication doesn't work! - name = "xlockmore-5.29"; + name = "xlockmore-5.38"; src = fetchurl { url = "http://www.tux.org/~bagleyd/xlock/${name}/${name}.tar.bz2"; - sha256 = "47700f74cdd6ada80717358fd9cbb4316a0b2350fd527cfcd1e9b018d3818db2"; + sha256 = "15x5l43zdjn881xf2m9psz9s2hvd2l8py2kzdhdh1v9m4ml20nf4"; }; - # Optionally, it can use GTK+ as well. - buildInputs = [pam x11 freetype]; + # Optionally, it can use GTK+. + buildInputs = [ pam x11 ]; # The `xlock' program needs to be linked against Glibc's # `libgcrypt', which contains `crypt(3)'. patches = [ ./makefile-libcrypt.patch ]; - # Don't try to install `xlock' setuid. Instead, the user should add - # it to `security.extraSetuidPrograms'. + # Don't try to install `xlock' setuid. Password authentication works + # fine via PAM without super user privileges. configureFlags = " --with-crypt" # TODO: set --enable-appdefaultdir to a suitable value + " --disable-setuid" @@ -41,7 +40,7 @@ stdenv.mkDerivation rec { meta = { description = "Xlockmore, a screen locker for the X Window System."; - homepage = http://www.tux.org/~bagleyd/xlockmore.html; + homepage = "http://www.tux.org/~bagleyd/xlockmore.html"; license = "GPL"; }; } diff --git a/pkgs/applications/graphics/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix similarity index 88% rename from pkgs/applications/graphics/xscreensaver/default.nix rename to pkgs/misc/screensavers/xscreensaver/default.nix index 7458626769a..2cd915c498e 100644 --- a/pkgs/applications/graphics/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "5.14"; + version = "5.15"; name = "xscreensaver-${version}"; src = fetchurl { url = "http://www.jwz.org/xscreensaver/${name}.tar.gz"; - sha256 = "08zhxccdny7198x4yi3hm7jrw98bi3mnc1c4fwhmf5rf8l7h9siy"; + sha256 = "4f6d1f1e4c15dbb74e2296f8fe57a73d47d602515178c248bbc838f779d5082d"; }; buildInputs = @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.jwz.org/xscreensaver/; + homepage = "http://www.jwz.org/xscreensaver/"; description = "A set of screensavers"; maintainers = with stdenv.lib.maintainers; [ raskin urkud ]; platforms = stdenv.lib.platforms.allBut "i686-cygwin"; diff --git a/pkgs/os-specific/darwin/arch/builder.sh b/pkgs/os-specific/darwin/arch/builder.sh deleted file mode 100755 index 1fb8be484ba..00000000000 --- a/pkgs/os-specific/darwin/arch/builder.sh +++ /dev/null @@ -1,3 +0,0 @@ -source $stdenv/setup -mkdir -p "$out/bin" -ln -s /usr/bin/arch "$out/bin/" diff --git a/pkgs/os-specific/darwin/arch/default.nix b/pkgs/os-specific/darwin/arch/default.nix deleted file mode 100644 index 59d00eaf2d1..00000000000 --- a/pkgs/os-specific/darwin/arch/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{stdenv}: - -assert stdenv.isDarwin; - -stdenv.mkDerivation { - name = "darwin-arch-utility"; - builder = ./builder.sh; -} diff --git a/pkgs/os-specific/darwin/install_name_tool/builder.sh b/pkgs/os-specific/darwin/install_name_tool/builder.sh deleted file mode 100755 index 15e84994497..00000000000 --- a/pkgs/os-specific/darwin/install_name_tool/builder.sh +++ /dev/null @@ -1,3 +0,0 @@ -source $stdenv/setup -mkdir -p "$out/bin" -ln -s /usr/bin/install_name_tool "$out/bin/" diff --git a/pkgs/os-specific/darwin/install_name_tool/default.nix b/pkgs/os-specific/darwin/install_name_tool/default.nix deleted file mode 100644 index d8ffa6d38cf..00000000000 --- a/pkgs/os-specific/darwin/install_name_tool/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{stdenv}: - -assert stdenv.isDarwin; - -stdenv.mkDerivation { - name = "darwin-install_name_tool-utility"; - builder = ./builder.sh; -} diff --git a/pkgs/os-specific/darwin/lipo/builder.sh b/pkgs/os-specific/darwin/lipo/builder.sh deleted file mode 100755 index aea54429677..00000000000 --- a/pkgs/os-specific/darwin/lipo/builder.sh +++ /dev/null @@ -1,3 +0,0 @@ -source $stdenv/setup -mkdir -p "$out/bin" -ln -s /usr/bin/lipo "$out/bin/" diff --git a/pkgs/os-specific/darwin/lipo/default.nix b/pkgs/os-specific/darwin/lipo/default.nix deleted file mode 100644 index a4f7cfc1e54..00000000000 --- a/pkgs/os-specific/darwin/lipo/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{stdenv}: - -assert stdenv.isDarwin; - -stdenv.mkDerivation { - name = "darwin-lipo-utility"; - builder = ./builder.sh; -} diff --git a/pkgs/os-specific/darwin/sw_vers/builder.sh b/pkgs/os-specific/darwin/sw_vers/builder.sh deleted file mode 100755 index 51e34e79aea..00000000000 --- a/pkgs/os-specific/darwin/sw_vers/builder.sh +++ /dev/null @@ -1,3 +0,0 @@ -source $stdenv/setup -mkdir -p "$out/bin" -ln -s /usr/bin/sw_vers "$out/bin/" diff --git a/pkgs/os-specific/darwin/sw_vers/default.nix b/pkgs/os-specific/darwin/sw_vers/default.nix deleted file mode 100644 index bf99c01686a..00000000000 --- a/pkgs/os-specific/darwin/sw_vers/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{stdenv}: - -assert stdenv.isDarwin; - -stdenv.mkDerivation { - name = "darwin-sw-vers-utility"; - builder = ./builder.sh; -} diff --git a/pkgs/os-specific/gnu/default.nix b/pkgs/os-specific/gnu/default.nix index 1c4af3bdbfb..0a42b83a46f 100644 --- a/pkgs/os-specific/gnu/default.nix +++ b/pkgs/os-specific/gnu/default.nix @@ -3,92 +3,104 @@ args@{ fetchgit, stdenv, autoconf, automake, automake111x, libtool , texinfo, glibcCross, hurdPartedCross, libuuid, samba_light , gccCrossStageStatic, gccCrossStageFinal -, forceBuildDrv, forceSystem, callPackage, platform, config, crossSystem }: +, forceBuildDrv, forceSystem, newScope, platform, config, crossSystem +, overrides ? {} }: with args; -rec { - hurdCross = forceBuildDrv(import ./hurd { - inherit fetchgit stdenv autoconf libtool texinfo machHeaders - mig glibcCross hurdPartedCross; - libuuid = libuuid.hostDrv; - automake = automake111x; - headersOnly = false; - cross = assert crossSystem != null; crossSystem; - gccCross = gccCrossStageFinal; - }); +let + callPackage = newScope gnu; - hurdCrossIntermediate = forceBuildDrv(import ./hurd { - inherit fetchgit stdenv autoconf libtool texinfo machHeaders - mig glibcCross; - automake = automake111x; - headersOnly = false; - cross = assert crossSystem != null; crossSystem; + gnu = { + hurdCross = forceBuildDrv(callPackage ./hurd { + inherit fetchgit stdenv autoconf libtool texinfo + glibcCross hurdPartedCross; + inherit (gnu) machHeaders mig; + libuuid = libuuid.hostDrv; + automake = automake111x; + headersOnly = false; + cross = assert crossSystem != null; crossSystem; + gccCross = gccCrossStageFinal; + }); - # The "final" GCC needs glibc and the Hurd libraries (libpthread in - # particular) so we first need an intermediate Hurd built with the - # intermediate GCC. - gccCross = gccCrossStageStatic; + hurdCrossIntermediate = forceBuildDrv(callPackage ./hurd { + inherit fetchgit stdenv autoconf libtool texinfo glibcCross; + inherit (gnu) machHeaders mig; + hurdPartedCross = null; + libuuid = null; + automake = automake111x; + headersOnly = false; + cross = assert crossSystem != null; crossSystem; - # This intermediate Hurd is only needed to build libpthread, which needs - # libihash, and to build Parted, which needs libstore and - # libshouldbeinlibc. - buildTarget = "libihash libstore libshouldbeinlibc"; - installTarget = "libihash-install libstore-install libshouldbeinlibc-install"; - }); + # The "final" GCC needs glibc and the Hurd libraries (libpthread in + # particular) so we first need an intermediate Hurd built with the + # intermediate GCC. + gccCross = gccCrossStageStatic; - hurdHeaders = callPackage ./hurd { - automake = automake111x; - headersOnly = true; - gccCross = null; - glibcCross = null; - libuuid = null; - hurdPartedCross = null; - }; + # This intermediate Hurd is only needed to build libpthread, which needs + # libihash, and to build Parted, which needs libstore and + # libshouldbeinlibc. + buildTarget = "libihash libstore libshouldbeinlibc"; + installTarget = "libihash-install libstore-install libshouldbeinlibc-install"; + }); - libpthreadHeaders = callPackage ./libpthread { - headersOnly = true; - hurd = null; - }; + hurdHeaders = callPackage ./hurd { + automake = automake111x; + headersOnly = true; + gccCross = null; + glibcCross = null; + libuuid = null; + hurdPartedCross = null; + }; - libpthreadCross = forceBuildDrv(import ./libpthread { - inherit fetchgit stdenv autoconf automake libtool - machHeaders hurdHeaders glibcCross; - hurd = hurdCrossIntermediate; - gccCross = gccCrossStageStatic; - cross = assert crossSystem != null; crossSystem; - }); + libpthreadHeaders = callPackage ./libpthread { + headersOnly = true; + hurd = null; + }; - # In theory GNU Mach doesn't have to be cross-compiled. However, since it - # has to be built for i586 (it doesn't work on x86_64), one needs a cross - # compiler for that host. - mach = callPackage ./mach { - automake = automake111x; - }; + libpthreadCross = forceBuildDrv(callPackage ./libpthread { + inherit fetchgit stdenv autoconf automake libtool glibcCross; + inherit (gnu) machHeaders hurdHeaders; + hurd = gnu.hurdCrossIntermediate; + gccCross = gccCrossStageStatic; + cross = assert crossSystem != null; crossSystem; + }); - machHeaders = callPackage ./mach { - automake = automake111x; - headersOnly = true; - mig = null; - }; + # In theory GNU Mach doesn't have to be cross-compiled. However, since it + # has to be built for i586 (it doesn't work on x86_64), one needs a cross + # compiler for that host. + mach = callPackage ./mach { + automake = automake111x; + }; - mig = callPackage ./mig { - # Build natively, but force use of a 32-bit environment because we're - # targeting `i586-pc-gnu'. - stdenv = (forceSystem "i686-linux").stdenv; - }; + machHeaders = callPackage ./mach { + automake = automake111x; + headersOnly = true; + mig = null; + }; - # XXX: Use this one for its `.hostDrv'. Using the one above from - # `x86_64-linux' leads to building a different cross-toolchain because of - # the `forceSystem'. - mig_raw = callPackage ./mig {}; + mig = callPackage ./mig { + # Build natively, but force use of a 32-bit environment because we're + # targeting `i586-pc-gnu'. + stdenv = (forceSystem "i686-linux").stdenv; + }; - smbfs = callPackage ./smbfs { - samba = samba_light; - hurd = hurdCross; - }; + # XXX: Use this one for its `.hostDrv'. Using the one above from + # `x86_64-linux' leads to building a different cross-toolchain because of + # the `forceSystem'. + mig_raw = callPackage ./mig {}; - unionfs = callPackage ./unionfs { - hurd = hurdCross; - }; -} + smbfs = callPackage ./smbfs { + samba = samba_light; + hurd = gnu.hurdCross; + }; + + unionfs = callPackage ./unionfs { + hurd = gnu.hurdCross; + }; + } + + # Allow callers to override elements of this attribute set. + // overrides; + +in gnu # we trust! diff --git a/pkgs/os-specific/gnu/hurd/default.nix b/pkgs/os-specific/gnu/hurd/default.nix index ca1c71053e5..0c9059a3008 100644 --- a/pkgs/os-specific/gnu/hurd/default.nix +++ b/pkgs/os-specific/gnu/hurd/default.nix @@ -40,9 +40,11 @@ stdenv.mkDerivation ({ then [ "--with-parted" ] else [ "--without-parted" ]); + # Use `preConfigure' only for `autoreconf', so that users know they can + # simply clear it when the autoconf phase is unneeded. preConfigure = "autoreconf -vfi"; - patchPhase = + postConfigure = '' echo "removing \`-o root' from makefiles..." for mf in {utils,daemons}/Makefile do @@ -50,8 +52,7 @@ stdenv.mkDerivation ({ done ''; - buildPhase = "make ${buildTarget}"; - installPhase = "make ${installTarget}"; + crossAttrs.dontPatchShebangs = true; meta = { description = "The GNU Hurd, GNU project's replacement for the Unix kernel"; @@ -74,6 +75,17 @@ stdenv.mkDerivation ({ // +(if !headersOnly && buildTarget != null + then assert installTarget != null; { + # Use the default `buildPhase' and `installPhase' so that the usual hooks + # can still be used. + buildFlags = buildTarget; + installTargets = installTarget; + } + else {}) + +// + (if headersOnly then { buildPhase = ":"; installPhase = "make install-headers"; } else (if (cross != null) diff --git a/pkgs/os-specific/linux/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-lib/default.nix index 5ebf5264439..36d9fa2ba9e 100644 --- a/pkgs/os-specific/linux/alsa-lib/default.nix +++ b/pkgs/os-specific/linux/alsa-lib/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "alsa-lib-1.0.23"; + name = "alsa-lib-1.0.25"; src = fetchurl { url = "ftp://ftp.alsa-project.org/pub/lib/${name}.tar.bz2"; - sha256 = "08zl1yvva6xsdl9pghbvyjdrzwkyll8hc606my1i6jjypb58w8xl"; + sha256 = "1rl6wa06d1jiqnrshyqh5qb1lwg6dh8m1ilyaink21j1y1f806js"; }; configureFlags = "--disable-xmlto"; diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix index 2ae39d4cf16..180f9153043 100644 --- a/pkgs/os-specific/linux/alsa-plugins/default.nix +++ b/pkgs/os-specific/linux/alsa-plugins/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, lib, pkgconfig, alsaLib, pulseaudio ? null, jackaudio ? null }: stdenv.mkDerivation rec { - name = "alsa-plugins-1.0.23"; + name = "alsa-plugins-1.0.25"; src = fetchurl { url = "ftp://ftp.alsa-project.org/pub/plugins/${name}.tar.bz2"; - sha256 = "10ri5dpmhk028r0qvajswh2xl40kjd600h7hykq03vrkmn8jf6sw"; + sha256 = "1assar5k8zb2srqdcph6a54daqfymlyygdm5fcs6isaydpyp9qx0"; }; buildInputs = diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix index ad092fa7821..ca3a45bddfd 100644 --- a/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-utils/default.nix @@ -1,17 +1,19 @@ {stdenv, fetchurl, alsaLib, gettext, ncurses}: stdenv.mkDerivation rec { - name = "alsa-utils-1.0.23"; + name = "alsa-utils-1.0.25"; src = fetchurl { url = "ftp://ftp.alsa-project.org/pub/utils/${name}.tar.bz2"; - sha256 = "1c7pl5k3d60wacnha8zfn2dixz7hiiaxvijis4559y15bs8mxl5p"; + sha256 = "0b1hbdq1bdkbz72zdfy5cgp75jqpysb0mqb0n9wy5gsbccpnlrrf"; }; buildInputs = [ alsaLib ncurses ]; buildNativeInputs = [ gettext ]; - configureFlags = "--disable-xmlto"; + configureFlags = "--disable-xmlto --with-udev-rules-dir=$(out)/lib/udev/rules.d"; + + installFlags = "ASOUND_STATE_DIR=$(TMPDIR)/dummy"; meta = { description = "ALSA, the Advanced Linux Sound Architecture utils"; diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix new file mode 100644 index 00000000000..3755bbe80bb --- /dev/null +++ b/pkgs/os-specific/linux/ffado/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchsvn, dbus, dbus_cplusplus, expat, glibmm, libconfig +, libavc1394, libiec61883, libraw1394, libxmlxx, makeWrapper, pkgconfig +, pyqt4, python, pythonDBus, qt4, scons }: + +stdenv.mkDerivation rec { + name = "libffado-svn-1995"; + + src = fetchsvn { + url = "http://subversion.ffado.org/ffado/trunk/libffado"; + rev = "1995"; + }; + + buildInputs = + [ dbus dbus_cplusplus expat glibmm libavc1394 libconfig + libiec61883 libraw1394 libxmlxx makeWrapper pkgconfig pyqt4 + python pythonDBus qt4 scons + ]; + + patches = [ ./enable-mixer-and-dbus.patch ]; + + preBuild = "export PYLIBSUFFIX=lib/${python.libPrefix}/site-packages"; + + # TODO fix ffado-diag, it doesn't seem to use PYPKGDIR + buildPhase = "scons PYPKGDIR=$out/$PYLIBSUFFIX"; + installPhase = '' + scons PREFIX=$out LIBDIR=$out/lib SHAREDIR=$out/share/libffado \ + PYPKGDIR=$out/$PYLIBSUFFIX install + + PYDIR=$out/$PYLIBSUFFIX + wrapProgram $out/bin/ffado-mixer --prefix PYTHONPATH : \ + $PYTHONPATH:$PYDIR:${pyqt4}/$LIBSUFFIX:${pythonDBus}/$LIBSUFFIX: + wrapProgram $out/bin/ffado-diag --prefix PYTHONPATH : \ + $PYTHONPATH:$PYDIR:$out/share/libffado/python:${pyqt4}/$LIBSUFFIX:${pythonDBus}/$LIBSUFFIX: + ''; + + meta = with stdenv.lib; { + homepage = http://www.ffado.org; + description = "FireWire audio drivers"; + license = licenses.gpl3; + maintainers = [ maintainers.goibhniu ]; + }; +} diff --git a/pkgs/os-specific/linux/ffado/enable-mixer-and-dbus.patch b/pkgs/os-specific/linux/ffado/enable-mixer-and-dbus.patch new file mode 100644 index 00000000000..44c0b991e0a --- /dev/null +++ b/pkgs/os-specific/linux/ffado/enable-mixer-and-dbus.patch @@ -0,0 +1,25 @@ +--- libffado-r2117/SConstruct 1970-01-01 01:00:01.000000000 +0100 ++++ libffado-r2117/SConstruct 2012-04-06 18:26:45.521100690 +0200 +@@ -314,10 +314,8 @@ + # + + # PyQT checks +-build_mixer = False +-if conf.CheckForApp( 'which pyuic4' ) and conf.CheckForPyModule( 'dbus' ) and conf.CheckForPyModule( 'PyQt4' ) and conf.CheckForPyModule( 'dbus.mainloop.qt' ): +- env['PYUIC4'] = True +- build_mixer = True ++env['PYUIC4'] = True ++build_mixer = True + + if conf.CheckForApp( 'xdg-desktop-menu --help' ): + env['XDG_TOOLS'] = True +@@ -348,7 +346,8 @@ + name2 = pkg.replace("+","").replace(".","").replace("-","").upper() + env['%s_FLAGS' % name2] = conf.GetPKGFlags( pkg, pkgs[pkg] ) + +-if not env['DBUS1_FLAGS'] or not env['DBUSC1_FLAGS'] or not conf.CheckForApp('which dbusxx-xml2cpp'): ++ ++if False: + env['DBUS1_FLAGS'] = "" + env['DBUSC1_FLAGS'] = "" + print """ diff --git a/pkgs/os-specific/linux/htop/default.nix b/pkgs/os-specific/linux/htop/default.nix index fcec5d988fd..52db202a15f 100644 --- a/pkgs/os-specific/linux/htop/default.nix +++ b/pkgs/os-specific/linux/htop/default.nix @@ -1,21 +1,19 @@ -{fetchurl, stdenv, ncurses}: +{ fetchurl, stdenv, ncurses }: -let - name = "htop-1.0"; -in -stdenv.mkDerivation { - inherit name; +stdenv.mkDerivation rec { + name = "htop-1.0.1"; src = fetchurl { url = "mirror://sourceforge/htop/${name}.tar.gz"; - sha256 = "242879b86db4b97e1090e7cd391247268ccbe90834ff34b6e8242926c9664852"; + sha256 = "1wh62mb102nxd5h3pnzakdf0lcyapv1yq44ndcc9wpw30az2rnq7"; }; - buildInputs = [ncurses]; + buildInputs = [ ncurses ]; meta = { description = "An interactive process viewer for Linux"; homepage = "http://htop.sourceforge.net"; platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.rob ]; }; } diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index cc95a6cff16..da45b39cee1 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # We get a warning in armv5tel-linux and the fuloong2f, # so we disable -Werror in it - patchPhase = if (stdenv.system == "armv5tel-linux" || + patchPhase = if (stdenv.isArm || stdenv.system == "mips64el-linux") then '' sed -i s/-Werror// src/Makefile.am diff --git a/pkgs/os-specific/linux/kernel-headers/2.4.nix b/pkgs/os-specific/linux/kernel-headers/2.4.nix index 32daf5633f7..c5926ff2e47 100644 --- a/pkgs/os-specific/linux/kernel-headers/2.4.nix +++ b/pkgs/os-specific/linux/kernel-headers/2.4.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then "i386" else if stdenv.system == "x86_64-linux" then "x86_64" else if stdenv.system == "powerpc-linux" then "powerpc" else - if stdenv.system == "armv5tel-linux" then "arm" else + if stdenv.isArm then "arm" else abort "don't know what the kernel include directory is called for this platform"; buildInputs = [perl]; diff --git a/pkgs/os-specific/linux/kernel-headers/2.6.28.nix b/pkgs/os-specific/linux/kernel-headers/2.6.28.nix index fdbe6cf1bce..b576b68773c 100644 --- a/pkgs/os-specific/linux/kernel-headers/2.6.28.nix +++ b/pkgs/os-specific/linux/kernel-headers/2.6.28.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then "i386" else if stdenv.system == "x86_64-linux" then "x86_64" else if stdenv.system == "powerpc-linux" then "powerpc" else - if stdenv.system == "armv5tel-linux" then "arm" else + if stdenv.isArm then "arm" else if stdenv.system == "mips64el-linux" then "mips" else abort "don't know what the kernel include directory is called for this platform"; diff --git a/pkgs/os-specific/linux/kernel-headers/2.6.32.nix b/pkgs/os-specific/linux/kernel-headers/2.6.32.nix index a7ec522b3d6..a2fc597eaac 100644 --- a/pkgs/os-specific/linux/kernel-headers/2.6.32.nix +++ b/pkgs/os-specific/linux/kernel-headers/2.6.32.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then "i386" else if stdenv.system == "x86_64-linux" then "x86_64" else if stdenv.system == "powerpc-linux" then "powerpc" else - if stdenv.system == "armv5tel-linux" then "arm" else + if stdenv.isArm then "arm" else if stdenv.platform ? kernelArch then stdenv.platform.kernelArch else abort "don't know what the kernel include directory is called for this platform"; diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index f5fec3d8620..3fb5ef8ef2d 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then "i386" else if stdenv.system == "x86_64-linux" then "x86_64" else if stdenv.system == "powerpc-linux" then "powerpc" else - if stdenv.system == "armv5tel-linux" then "arm" else + if stdenv.isArm then "arm" else if stdenv.platform ? kernelArch then stdenv.platform.kernelArch else abort "don't know what the kernel include directory is called for this platform"; diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 223a38da54e..9e8ee74acb1 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -46,7 +46,7 @@ }: assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" - || stdenv.system == "armv5tel-linux" || stdenv.system == "mips64el-linux"; + || stdenv.isArm || stdenv.system == "mips64el-linux"; assert stdenv.platform.name == "sheevaplug" -> stdenv.platform.uboot != null; @@ -101,7 +101,7 @@ stdenv.mkDerivation { if userModeLinux then "um" else if stdenv.system == "i686-linux" then "i386" else if stdenv.system == "x86_64-linux" then "x86_64" else - if stdenv.system == "armv5tel-linux" then "arm" else + if stdenv.isArm then "arm" else if stdenv.system == "mips64el-linux" then "mips" else abort "Platform ${stdenv.system} is not supported."; diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index c5d7dedb111..955c04f47e5 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -37,10 +37,12 @@ let IOSCHED_CFQ y BLK_CGROUP y # required by CFQ + # Enable NUMA. + NUMA? y + # Disable some expensive (?) features. FTRACE n KPROBES n - NUMA? n PM_TRACE_RTC n # Enable various subsystems. @@ -218,6 +220,12 @@ let CONNECTOR y PROC_EVENTS y + # Tracing + FTRACE y + FUNCTION_TRACER y + FTRACE_SYSCALLS y + SCHED_TRACER y + ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} ${extraConfig} ''; @@ -226,7 +234,7 @@ in import ./generic.nix ( rec { - version = "3.2.11"; + version = "3.2.16"; testing = false; modDirVersion = version; @@ -236,8 +244,8 @@ import ./generic.nix ( ''; src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.0/${if testing then "testing/" else ""}linux-${version}.tar.bz2"; - sha256 = "1hacfmf08ydzf4xlg6wkkckl5icj7w9h3nh17myz1s67bp7q61qs"; + url = "mirror://kernel/linux/kernel/v3.0/${if testing then "testing/" else ""}linux-${version}.tar.xz"; + sha256 = "0wkfg57xkpnmlcp8g1xkj8jf0x66s3acs9w8snfndcxbw225hqz1"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/linux-3.3.nix b/pkgs/os-specific/linux/kernel/linux-3.3.nix index ecdcfc86a88..b08f091014c 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.3.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.3.nix @@ -12,7 +12,7 @@ let TIMER_STATS y USB_SUSPEND y BACKTRACE_SELF_TEST n - CPU_NOTIFIER_ERROR_INJECT n + CPU_NOTIFIER_ERROR_INJECT? n DEBUG_DEVRES n DEBUG_NX_TEST n DEBUG_STACK_USAGE n @@ -37,10 +37,12 @@ let IOSCHED_CFQ y BLK_CGROUP y # required by CFQ + # Enable NUMA. + NUMA? y + # Disable some expensive (?) features. FTRACE n KPROBES n - NUMA? n PM_TRACE_RTC n # Enable various subsystems. @@ -217,6 +219,12 @@ let CONNECTOR y PROC_EVENTS y + # Tracing + FTRACE y + FUNCTION_TRACER y + FTRACE_SYSCALLS y + SCHED_TRACER y + ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} ${extraConfig} ''; @@ -225,19 +233,16 @@ in import ./generic.nix ( rec { - version = "3.3"; - + version = "3.3.4"; testing = false; - modDirVersion = "3.3.0"; - preConfigure = '' substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" ''; src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.0/${if testing then "testing/" else ""}linux-${version}.tar.bz2"; - sha256 = "0czk8bj46r3r95iz6gi7xkavhjx847s5p9248vabi0c1wjs6kmlg"; + url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; + sha256 = "0c3bayhbvlrmfqqq43s4vp194wc97lss2vwng1dhslll7yady286"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix index c75b8bec146..b97a55b2ab5 100644 --- a/pkgs/os-specific/linux/kmod/default.nix +++ b/pkgs/os-specific/linux/kmod/default.nix @@ -12,6 +12,15 @@ stdenv.mkDerivation { configureFlags = [ "--with-xz" "--with-zlib" ]; + patches = [ ./module-dir.patch ]; + + postInstall = '' + for prog in lsmod rmmod insmod modinfo modprobe depmod + do + ln -sv kmod $out/bin/$prog + done + ''; + meta = { homepage = http://www.kernel.org/pub/linux/utils/kernel/kmod/; description = "Tools for loading and managing Linux kernel modules"; diff --git a/pkgs/os-specific/linux/kmod/module-dir.patch b/pkgs/os-specific/linux/kmod/module-dir.patch new file mode 100644 index 00000000000..95d08da4580 --- /dev/null +++ b/pkgs/os-specific/linux/kmod/module-dir.patch @@ -0,0 +1,24 @@ +diff -Naur kmod-7-orig/libkmod/libkmod.c kmod-7/libkmod/libkmod.c +--- kmod-7-orig/libkmod/libkmod.c 2012-03-15 08:19:16.750010226 -0400 ++++ kmod-7/libkmod/libkmod.c 2012-04-04 15:21:29.532074313 -0400 +@@ -200,7 +200,7 @@ + static char *get_kernel_release(const char *dirname) + { + struct utsname u; +- char *p; ++ char *p, *dirname_prefix; + + if (dirname != NULL) + return path_make_absolute_cwd(dirname); +@@ -208,7 +208,10 @@ + if (uname(&u) < 0) + return NULL; + +- if (asprintf(&p, "%s/%s", dirname_default_prefix, u.release) < 0) ++ if ((dirname_prefix = getenv("MODULE_DIR")) == NULL) ++ dirname_prefix = dirname_default_prefix; ++ ++ if (asprintf(&p, "%s/%s", dirname_prefix, u.release) < 0) + return NULL; + + return p; diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 0243dcb88d4..4f06b3975ab 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -8,7 +8,7 @@ with stdenv.lib; -let versionNumber = "295.20"; in +let versionNumber = "295.40"; in stdenv.mkDerivation { name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}"; @@ -19,12 +19,12 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "006my8y7dkmzy1y3md1j2p9sy53cvhz7idkjgzizyg05jgac778g"; + sha256 = "0anffkx1p1yhcflmz6jv9b57xb9mnvqadnjhgwr50fl4vms6bm6c"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "1m69ki94szy7inqc5x2znab9jjqjfyjd4lwvx9qnazq918gdf1kx"; + sha256 = "0rs9nfkw8f9z52ippadap8r50zrrgldv9d9hdkm8g08cyif5g95w"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index 6ac14095103..c18ea2b1f2b 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { buildNativeInputs = [ flex ]; buildInputs = [ cracklib ] ++ stdenv.lib.optional - (stdenv.system != "armv5tel-linux" && stdenv.system != "mips64el-linux") + (!stdenv.isArm && stdenv.system != "mips64el-linux") libxcrypt; crossAttrs = { - # Skip libxcrypt cross-building, as it fails for mips and armv5tel + # Skip libxcrypt cross-building, as it fails for mips and arm propagatedBuildInputs = [ flex.hostDrv cracklib.hostDrv ]; preConfigure = preConfigure + '' ar x ${flex.hostDrv}/lib/libfl.a diff --git a/pkgs/os-specific/linux/pam_unix2/default.nix b/pkgs/os-specific/linux/pam_unix2/default.nix index d48598afd0d..c2eec4a2e4b 100644 --- a/pkgs/os-specific/linux/pam_unix2/default.nix +++ b/pkgs/os-specific/linux/pam_unix2/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "067xnyd3q8ik73glxwyx1lydk4bgl78lzq44mnqqp4jrpnpd04ml"; }; - buildInputs = [ pam ] ++ stdenv.lib.optional (stdenv.system != "armv5tel-linux") libxcrypt; + buildInputs = [ pam ] ++ stdenv.lib.optional (!stdenv.isArm) libxcrypt; meta = { homepage = ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2; diff --git a/pkgs/os-specific/linux/qemu-kvm/1.0.nix b/pkgs/os-specific/linux/qemu-kvm/1.0.nix deleted file mode 100644 index 162fcaee55a..00000000000 --- a/pkgs/os-specific/linux/qemu-kvm/1.0.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ stdenv, fetchurl, attr, zlib, SDL, alsaLib, pkgconfig, pciutils, libuuid, vde2 -, libjpeg, libpng, ncurses, python, glib }: - -assert stdenv.isLinux; - -let version = "1.0"; in -stdenv.mkDerivation rec { - name = "qemu-kvm-${version}"; - - src = fetchurl { - url = "mirror://sourceforge/kvm/qemu-kvm/${version}/${name}.tar.gz"; - sha256 = "0vhigv9r9yrhph4wc4mhg99a683iwf121kjigqzg92x2l3ayl4dp"; - }; - - patches = [ ./smb-tmpdir.patch ./qemu-img-fix-corrupt-vdi.patch ]; - postPatch = - '' for i in $(find kvm -type f) - do - sed -i "$i" \ - -e 's|/bin/bash|/bin/sh|g ; - s|/usr/bin/python|${python}/bin/python|g ; - s|/bin/rm|rm|g' - done - ''; - - configureFlags = - [ "--audio-drv-list=alsa" - "--smbd=smbd" # use `smbd' from $PATH - ]; - - enableParallelBuilding = true; - - buildInputs = - [ attr zlib SDL alsaLib pkgconfig pciutils libuuid vde2 libjpeg libpng - ncurses python glib - ]; - - postInstall = - '' - # Libvirt expects us to be called `qemu-kvm'. Otherwise it will - # set the domain type to "qemu" rather than "kvm", which can - # cause architecture selection to misbehave. - ln -sv $(cd $out/bin && echo qemu-system-*) $out/bin/qemu-kvm - ''; - - meta = { - homepage = http://www.linux-kvm.org/; - description = "A full virtualization solution for Linux on x86 hardware containing virtualization extensions"; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/os-specific/linux/qemu-kvm/default.nix b/pkgs/os-specific/linux/qemu-kvm/default.nix index c5c7e0b01f0..dd12e79bd69 100644 --- a/pkgs/os-specific/linux/qemu-kvm/default.nix +++ b/pkgs/os-specific/linux/qemu-kvm/default.nix @@ -3,16 +3,28 @@ assert stdenv.isLinux; +let version = "1.0.1"; in + stdenv.mkDerivation rec { - name = "qemu-kvm-0.15.1"; + name = "qemu-kvm-${version}"; src = fetchurl { - url = "mirror://sourceforge/kvm/${name}.tar.gz"; - sha256 = "0gkk96yid3nq8i4z8xbiarj0r9v7b2zavf5mnh0rc7kclzxa7mmf"; + url = "mirror://sourceforge/kvm/qemu-kvm/${version}/${name}.tar.gz"; + sha256 = "0kxzwaw8h71mqcm46angpyx8gd58ascrxnr861k068xg89ix5g2p"; }; patches = [ ./smb-tmpdir.patch ./qemu-img-fix-corrupt-vdi.patch ]; + postPatch = + '' for i in $(find kvm -type f) + do + sed -i "$i" \ + -e 's|/bin/bash|/bin/sh|g ; + s|/usr/bin/python|${python}/bin/python|g ; + s|/bin/rm|rm|g' + done + ''; + configureFlags = [ "--audio-drv-list=alsa" "--smbd=smbd" # use `smbd' from $PATH @@ -27,13 +39,10 @@ stdenv.mkDerivation rec { postInstall = '' - # extboot.bin isn't installed due to a bug in the Makefile. - cp pc-bios/optionrom/extboot.bin $out/share/qemu/ - # Libvirt expects us to be called `qemu-kvm'. Otherwise it will # set the domain type to "qemu" rather than "kvm", which can # cause architecture selection to misbehave. - ln -s $(cd $out/bin && echo qemu-system-*) $out/bin/qemu-kvm + ln -sv $(cd $out/bin && echo qemu-system-*) $out/bin/qemu-kvm ''; meta = { diff --git a/pkgs/os-specific/linux/udev/173.nix b/pkgs/os-specific/linux/udev/173.nix index 41b17777edc..795826cf6bf 100644 --- a/pkgs/os-specific/linux/udev/173.nix +++ b/pkgs/os-specific/linux/udev/173.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { url = https://bugs.archlinux.org/task/25356?getfile=7281; sha256 = "01xib1pfdbwacgx8dqxgrf67a0mwkpm4kxy9f9v3df93v0m4pmbm"; })] ++ - stdenv.lib.optional (stdenv.system == "armv5tel-linux") ./pre-accept4-kernel.patch; + stdenv.lib.optional stdenv.isArm ./pre-accept4-kernel.patch; meta = { homepage = http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html; diff --git a/pkgs/os-specific/linux/upstart/default.nix b/pkgs/os-specific/linux/upstart/default.nix index d8a6d7335ab..6ad255caef4 100644 --- a/pkgs/os-specific/linux/upstart/default.nix +++ b/pkgs/os-specific/linux/upstart/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pkgconfig, dbus, libnih }: -let version = "1.4"; in +let version = "1.5"; in stdenv.mkDerivation rec { name = "upstart-${version}"; src = fetchurl { url = "http://upstart.ubuntu.com/download/${version}/${name}.tar.gz"; - md5 = "3aa9ddf8459b56547a6238aa77c61815"; + md5 = "870920a75f8c13f3a3af4c35916805ac"; }; buildInputs = [ pkgconfig dbus libnih ]; diff --git a/pkgs/servers/http/joseki/default.nix b/pkgs/servers/http/joseki/default.nix index 1a7e6f6d16c..f23a6ce73eb 100644 --- a/pkgs/servers/http/joseki/default.nix +++ b/pkgs/servers/http/joseki/default.nix @@ -79,6 +79,8 @@ rec { chmod a+x "$TARGET/bin/"* mkdir -p "$out/bin" + sed -e 's/\r//g' -i "$TARGET/bin"/* + echo -e '#! /bin/sh\nls "'"$TARGET"'"/bin' > "$out/bin/jena-list-commands" echo '#! /bin/sh' >> "$out/bin/jena-command" echo 'export JENAROOT="'"$TARGET"'"' >> "$out/bin/jena-command" diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix index 6d34d1f64f5..39ccfa9184e 100644 --- a/pkgs/servers/samba/default.nix +++ b/pkgs/servers/samba/default.nix @@ -18,11 +18,11 @@ assert useKerberos -> kerberos != null; stdenv.mkDerivation rec { - name = "samba-3.6.3"; + name = "samba-3.6.4"; src = fetchurl { url = "http://us3.samba.org/samba/ftp/stable/${name}.tar.gz"; - sha256 = "0x30qv5y5m5cip077k44gf2khl0hk0s5hpy98ywmqkay5ngl1qk7"; + sha256 = "052r5c9pwqk6qnzc2g6wljxml6j3nkydbpisgfa0xmvdgzyc42jr"; }; patches = diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix index 60733275509..6779ac9e0c3 100644 --- a/pkgs/servers/shishi/default.nix +++ b/pkgs/servers/shishi/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libtasn1, libgcrypt, gnutls }: stdenv.mkDerivation rec { - name = "shishi-1.0.0"; + name = "shishi-1.0.1"; src = fetchurl { url = "mirror://gnu/shishi/${name}.tar.gz"; - sha256 = "1j8jbfsdpwqqfv7938gy4b6kvdai3l2nk8267sv18rbp95k9j7ig"; + sha256 = "13c6w9rpaqb3am65nrn86byvmll5r78pld2vb0i68491vww4fzlx"; }; buildInputs = [ libtasn1 libgcrypt gnutls ] ; diff --git a/pkgs/servers/sip/sipwitch/default.nix b/pkgs/servers/sip/sipwitch/default.nix index 51a7fe61cf6..7fa9a62e5e3 100644 --- a/pkgs/servers/sip/sipwitch/default.nix +++ b/pkgs/servers/sip/sipwitch/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, pkgconfig, ucommon, libosip, libexosip, gnutls, zlib }: stdenv.mkDerivation rec { - name = "sipwitch-1.2.1"; + name = "sipwitch-1.2.3"; src = fetchurl { url = "mirror://gnu/sipwitch/${name}.tar.gz"; - sha256 = "01364q67gyxpxx5fxrmf9kns3qgivnp41kzhi81jdq8sa48c7qbq"; + sha256 = "0vc7x061m2jdj8hwpw56yiz8ij07x058vm1rm1dz7w98slpkcj6d"; }; buildInputs = [ pkgconfig ucommon libosip libexosip gnutls zlib ]; diff --git a/pkgs/servers/sql/mysql51/default.nix b/pkgs/servers/sql/mysql51/default.nix index 71c9713e3bb..c6392589bb6 100644 --- a/pkgs/servers/sql/mysql51/default.nix +++ b/pkgs/servers/sql/mysql51/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "mysql-5.1.54"; src = fetchurl { - url = ftp://mirror.leaseweb.com/mysql/Downloads/MySQL-5.1/mysql-5.1.54.tar.gz; + url = https://downloads.mysql.com/archives/mysql-5.1/mysql-5.1.54.tar.gz; sha256 = "07xbnwk7h1xya8s6dw34nrv7ampzag8l0l1szd2pc9zyqkzhydw4"; }; diff --git a/pkgs/servers/sql/mysql55/default.nix b/pkgs/servers/sql/mysql55/default.nix index df390e4abf2..3f26ea1f98b 100644 --- a/pkgs/servers/sql/mysql55/default.nix +++ b/pkgs/servers/sql/mysql55/default.nix @@ -1,17 +1,17 @@ -{stdenv, fetchurl, cmake, bison, ncurses, openssl, readline, zlib, darwinInstallNameToolUtility, perl}: +{ stdenv, fetchurl, cmake, bison, ncurses, openssl, readline, zlib, perl }: # Note: zlib is not required; MySQL can use an internal zlib. stdenv.mkDerivation { - name = "mysql-5.5.20"; + name = "mysql-5.5.23"; src = fetchurl { - url = ftp://mirror.leaseweb.com/mysql/Downloads/MySQL-5.5/mysql-5.5.20.tar.gz; - sha256 = "03jl60mzrsd1jb8fvkz6c8j2239b37k8n1i07jk1q4yk58aq8ynh"; + url = ftp://ftp.inria.fr/pub/MySQL/Downloads/MySQL-5.5/mysql-5.5.23.tar.gz; + sha256 = "0sklcz6miff7nb6bi1pqncgjv819255y7if6jxcqgiqs50z319i0"; }; - buildInputs = [ cmake bison ncurses openssl readline zlib ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwinInstallNameToolUtility perl ]; - + buildInputs = [ cmake bison ncurses openssl readline zlib ]; + cmakeFlags = "-DWITH_SSL=yes -DWITH_READLINE=yes -DWITH_EMBEDDED_SERVER=yes -DWITH_ZLIB=yes -DINSTALL_SCRIPTDIR=bin -DHAVE_IPV6=yes"; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 517e0f11b63..46903124568 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -119,6 +119,11 @@ in ''; }; + x11perf = attrs: attrs // { + NIX_CFLAGS_COMPILE = "-I${args.freetype}/include/freetype2"; + buildInputs = attrs.buildInputs ++ [ args.freetype args.fontconfig ]; + }; + xf86inputevdev = attrs: attrs // { preBuild = "sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c"; buildInputs = attrs.buildInputs ++ [xorg.kbproto xorg.libxkbfile xorg.randrproto]; diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix index 03f14d6d57b..c454204f897 100644 --- a/pkgs/stdenv/default.nix +++ b/pkgs/stdenv/default.nix @@ -55,6 +55,7 @@ rec { if stdenvType == "i686-linux" then stdenvLinux else if stdenvType == "x86_64-linux" then stdenvLinux else if stdenvType == "armv5tel-linux" then stdenvLinux else + if stdenvType == "armv7l-linux" then stdenvLinux else if stdenvType == "mips64el-linux" then stdenvLinux else if stdenvType == "powerpc-linux" then /* stdenvLinux */ stdenvNative else if stdenvType == "i686-mingw" then stdenvMinGW else diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 2cfdf30a171..749de01deff 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -93,6 +93,7 @@ let || result.system == "x86_64-linux" || result.system == "powerpc-linux" || result.system == "armv5tel-linux" + || result.system == "armv7l-linux" || result.system == "mips64el-linux"; isGNU = result.system == "i686-gnu"; # GNU/Hurd isSunOS = result.system == "i686-solaris" @@ -120,7 +121,8 @@ let || result.system == "x86_64-darwin"; isMips = result.system == "mips-linux" || result.system == "mips64el-linux"; - isArm = result.system == "armv5tel-linux"; + isArm = result.system == "armv5tel-linux" + || result.system == "armv7l-linux"; # Utility function: allow stdenv to be easily regenerated with # a different setup script. (See all-packages.nix for an diff --git a/pkgs/stdenv/linux/bootstrap/armv7l/default.nix b/pkgs/stdenv/linux/bootstrap/armv7l/default.nix new file mode 100644 index 00000000000..0fc2002068e --- /dev/null +++ b/pkgs/stdenv/linux/bootstrap/armv7l/default.nix @@ -0,0 +1,3 @@ +# rely on ARM backward compatibility to build armv7l binaries with the +# bootstrap tools of armv5tel. +import ../armv5tel \ No newline at end of file diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 8b6599e6bc0..3105e76f817 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -16,6 +16,7 @@ rec { else if system == "x86_64-linux" then import ./bootstrap/x86_64 else if system == "powerpc-linux" then import ./bootstrap/powerpc else if system == "armv5tel-linux" then import ./bootstrap/armv5tel + else if system == "armv7l-linux" then import ./bootstrap/armv5tel else if system == "mips64el-linux" then import ./bootstrap/loongson2f else abort "unsupported platform for the pure Linux stdenv"; diff --git a/pkgs/stdenv/mingw/cygpath/default.nix b/pkgs/stdenv/mingw/cygpath/default.nix old mode 100755 new mode 100644 diff --git a/pkgs/stdenv/mingw/pkgs/default.nix b/pkgs/stdenv/mingw/pkgs/default.nix old mode 100755 new mode 100644 diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix index 473bb5af0af..5e242b6e3a1 100644 --- a/pkgs/stdenv/nix/default.nix +++ b/pkgs/stdenv/nix/default.nix @@ -28,7 +28,7 @@ import ../generic rec { import ../../build-support/native-darwin-cctools-wrapper {inherit stdenv;} else pkgs.binutils; - gcc = if stdenv.isDarwin then pkgs.gccApple.gcc else pkgs.gcc.gcc; + gcc = pkgs.gcc.gcc; coreutils = pkgs.coreutils; shell = pkgs.bash + "/bin/sh"; }; diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix index 3344bdfce49..98808c7d399 100644 --- a/pkgs/tools/X11/xnee/default.nix +++ b/pkgs/tools/X11/xnee/default.nix @@ -2,11 +2,11 @@ , gtk, libXi, inputproto, pkgconfig, recordproto, texinfo }: stdenv.mkDerivation rec { - name = "xnee-3.11"; + name = "xnee-3.12"; src = fetchurl { url = "mirror://gnu/xnee/${name}.tar.gz"; - sha256 = "1x4frrf5ayslbkmr5cwll7psssxk11r4acnadp4qdvd218x50xrq"; + sha256 = "10vxn0in0l2jir6x90grx5jc64x63l3b0f8liladdbplc8za8zmw"; }; patchPhase = diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index cb322e82f39..1db426669bb 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "gnutar-1.26"; src = fetchurl { @@ -32,4 +32,9 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.all; }; -} \ No newline at end of file +} + # May have some issues with root compilation because the bootstrap tool + # cannot be used as a login shell for now. +// stdenv.lib.optionalAttrs (stdenv.system == "armv7l-linux") { + FORCE_UNSAFE_CONFIGURE = 1; +}) diff --git a/pkgs/tools/cd-dvd/xorriso/default.nix b/pkgs/tools/cd-dvd/xorriso/default.nix index 4936bca1ba1..2c2eb2f80d1 100644 --- a/pkgs/tools/cd-dvd/xorriso/default.nix +++ b/pkgs/tools/cd-dvd/xorriso/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libcdio, zlib, bzip2, readline, acl }: stdenv.mkDerivation rec { - name = "xorriso-1.1.8"; + name = "xorriso-1.2.2"; src = fetchurl { url = "mirror://gnu/xorriso/${name}.tar.gz"; - sha256 = "1pnmjk2nvxg54zrm4mha6vvgi6sl5xzznqcfzrlrvgsdy5liwb4x"; + sha256 = "0kw4fiqn24vya3zhay6minzrbz10zlxm8sjs272z7l5s2kwcjypx"; }; doCheck = true; diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index 0e0ec13aaeb..6cc767d3e24 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libuuid }: stdenv.mkDerivation rec { - name = "e2fsprogs-1.42"; + name = "e2fsprogs-1.42.2"; src = fetchurl { url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz"; - sha256 = "0ijabrxxmmna4y4wmy7d002nrzq1ifl98i71bl7fpqn3rsq6vd2m"; + sha256 = "1gmq3h4hp4hz1zh8yznx9nb0p7yaykb52f7zkpsqbhjawg2zwdhx"; }; buildInputs = [ pkgconfig libuuid ]; diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index c070a73d1f1..4edec43e243 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libpng, libjpeg, expat, libXaw -, yacc, libtool, fontconfig, pango, gd, xlibs +, yacc, libtool, fontconfig, pango, gd, xlibs, gts }: stdenv.mkDerivation rec { @@ -12,9 +12,9 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libpng libjpeg expat libXaw yacc libtool fontconfig - pango gd + pango gd gts ] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibs xlibs.libXrender ]; - + configureFlags = [ "--with-pngincludedir=${libpng}/include" "--with-pnglibdir=${libpng}/lib" @@ -34,7 +34,19 @@ stdenv.mkDerivation rec { ''; meta = { - description = "A program for visualising graphs"; - homepage = http://www.graphviz.org/; + homepage = "http://www.graphviz.org/"; + description = "Open source graph visualization software"; + + longDescription = '' + Graphviz is open source graph visualization software. Graph + visualization is a way of representing structural information as + diagrams of abstract graphs and networks. It has important + applications in networking, bioinformatics, software engineering, + database and web design, machine learning, and in visual + interfaces for other technical domains. + ''; + + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/tools/misc/dbacl/default.nix b/pkgs/tools/misc/dbacl/default.nix new file mode 100644 index 00000000000..f433db68a64 --- /dev/null +++ b/pkgs/tools/misc/dbacl/default.nix @@ -0,0 +1,16 @@ +{fetchurl, stdenv}: + +stdenv.mkDerivation rec { + name = "dbacl-1.14"; + src = fetchurl { + url = "http://www.lbreyer.com/gpl/${name}.tar.gz"; + md5 = "85bfd88bc20f326dc0f31e794948e21c"; + }; + + meta = { + homepage = http://dbacl.sourceforge.net/; + longDescription = "a digramic Bayesian classifier for text recognition."; + maintainers = [ stdenv.lib.maintainers.garbas ]; + license = stdenv.lib.licenses.gpl3; + }; +} diff --git a/pkgs/tools/misc/file/511.nix b/pkgs/tools/misc/file/511.nix new file mode 100644 index 00000000000..4e62462b8b3 --- /dev/null +++ b/pkgs/tools/misc/file/511.nix @@ -0,0 +1,17 @@ +{stdenv, fetchurl, zlib}: + +stdenv.mkDerivation rec { + name = "file-5.11"; + + buildInputs = [ zlib ]; + + src = fetchurl { + url = "ftp://ftp.astron.com/pub/file/${name}.tar.gz"; + sha256 = "c70ae29a28c0585f541d5916fc3248c3e91baa481f63d7ccec53d1534cbcc9b7"; + }; + + meta = { + description = "A program that shows the type of files"; + homepage = "http://darwinsys.com/file"; + }; +} diff --git a/pkgs/tools/misc/file/python.patch b/pkgs/tools/misc/file/python.patch new file mode 100644 index 00000000000..8ecbc9a81fd --- /dev/null +++ b/pkgs/tools/misc/file/python.patch @@ -0,0 +1,11 @@ +--- file-5.11/python/magic.py 2011-09-22 18:57:41.000000000 +0200 ++++ file-5.11/python/magic.py.1 2012-04-30 15:00:31.750213810 +0200 +@@ -13,7 +13,7 @@ + Loads the shared library through ctypes and returns a library + L{ctypes.CDLL} instance + """ +- return ctypes.cdll.LoadLibrary(find_library('magic')) ++ return ctypes.CDLL('libmagic.so') + + _libraries = {} + _libraries['magic'] = _init() diff --git a/pkgs/tools/misc/fileschanged/default.nix b/pkgs/tools/misc/fileschanged/default.nix index 5619174f74f..d0a03f955a8 100644 --- a/pkgs/tools/misc/fileschanged/default.nix +++ b/pkgs/tools/misc/fileschanged/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { buildInputs = [ fam ]; + patches = [./unused-variables.debian.patch]; + doCheck = true; meta = { diff --git a/pkgs/tools/misc/fileschanged/unused-variables.debian.patch b/pkgs/tools/misc/fileschanged/unused-variables.debian.patch new file mode 100644 index 00000000000..73d307f9413 --- /dev/null +++ b/pkgs/tools/misc/fileschanged/unused-variables.debian.patch @@ -0,0 +1,48 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 07_unused_variables.dpatch by Colin Watson +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: GCC 4.6 warns about unused variables, and fileschanged builds with +## DP: -Werror, so deal with unused variable warnings. + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' fileschanged-0.6.5~/src/monitor.c fileschanged-0.6.5/src/monitor.c +--- fileschanged-0.6.5~/src/monitor.c 2006-04-19 20:42:29.000000000 +0100 ++++ fileschanged-0.6.5/src/monitor.c 2011-09-14 01:17:23.000000000 +0100 +@@ -84,6 +84,7 @@ + retval = FAMMonitorDirectory (c, node->filename, &node->request, + (void *) node); + //printf ("FAMMonitorDirectory returns %d (reqnum %d)\n", retval, node->request.reqnum); ++ (void) retval; + } + else if (S_ISREG (node->statbuf.st_mode)) + { +@@ -91,6 +92,7 @@ + retval = FAMMonitorFile (c, node->filename, &node->request, + (void *) node); + //printf ("FAMMonitorFile returns %d (reqnum %d)\n", retval, node->request.reqnum); ++ (void) retval; + } + monitor_handle_events (c, list, 0, 30); + } + +diff -r -U3 fileschanged-0.6.9-orig/src/main.c fileschanged-0.6.9/src/main.c +--- fileschanged-0.6.9-orig/src/main.c 2012-04-13 01:31:59.160601022 +0400 ++++ fileschanged-0.6.9/src/main.c 2012-04-13 01:32:47.549599643 +0400 +@@ -126,6 +126,7 @@ + { + retval = process_file (filelist, filelist_len, arguments.args[i]); + } ++ (void) retval; + return 0; + } + +@@ -168,6 +169,7 @@ + + if (fileptr != stdin) + fclose (fileptr); ++ (void) retval; + return 0; + } + int + diff --git a/pkgs/tools/misc/idutils/default.nix b/pkgs/tools/misc/idutils/default.nix index 00541c05339..4b81d48b027 100644 --- a/pkgs/tools/misc/idutils/default.nix +++ b/pkgs/tools/misc/idutils/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, emacs }: stdenv.mkDerivation rec { - name = "idutils-4.5"; - + name = "idutils-4.6"; + src = fetchurl { - url = "mirror://gnu/idutils/${name}.tar.gz"; - sha256 = "0j92k2dwg381kx2z556v9162l16mfra3xqbfcjrkdd2fw5jsgn2q"; + url = "mirror://gnu/idutils/${name}.tar.xz"; + sha256 = "1hmai3422iaqnp34kkzxdnywl7n7pvlxp11vrw66ybxn9wxg90c1"; }; buildInputs = stdenv.lib.optional stdenv.isLinux emacs; diff --git a/pkgs/tools/misc/memtest86/default.nix b/pkgs/tools/misc/memtest86/default.nix index 633d08e4c66..35395fc116f 100644 --- a/pkgs/tools/misc/memtest86/default.nix +++ b/pkgs/tools/misc/memtest86/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "memtest86+-4.20"; + name = "memtest86-4.0a"; src = fetchurl { - url = http://www.memtest.org/download/4.20/memtest86+-4.20.tar.gz; - sha256 = "0dw7kvfxiwqdmhapbz6ds1j9fralbky56hnzj4c6fsqfinbwwc2n"; + url = http://memtest86.com/memtest86-4.0a.tar.gz; + sha256 = "0d2n3nzyvna9k880zk6vl1z3b7wal1hrwcqay9vda8br7yp7634y"; }; preBuild = '' @@ -25,7 +25,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.memtest.org/; - description = "A tool to detect memory errors"; + homepage = http://memtest86.com/; + description = "A tool to detect memory errors, to be run from a bootloader"; }; } diff --git a/pkgs/tools/misc/memtest86/plus.nix b/pkgs/tools/misc/memtest86/plus.nix new file mode 100644 index 00000000000..262811d330d --- /dev/null +++ b/pkgs/tools/misc/memtest86/plus.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "memtest86+-4.20"; + + src = fetchurl { + url = http://www.memtest.org/download/4.20/memtest86+-4.20.tar.gz; + sha256 = "0dw7kvfxiwqdmhapbz6ds1j9fralbky56hnzj4c6fsqfinbwwc2n"; + }; + + preBuild = '' + # Really dirty hack to get Memtest to build without needing a Glibc + # with 32-bit libraries and headers. + if test "$system" = x86_64-linux; then + mkdir gnu + touch gnu/stubs-32.h + fi + ''; + + NIX_CFLAGS_COMPILE = "-I."; + + installPhase = '' + mkdir -p $out + cp memtest.bin $out/ + ''; + + meta = { + homepage = http://www.memtest.org/; + description = "A tool to detect memory errors, fork from memtest86"; + }; +} diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 2c46b116450..235cb70cd86 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl }: stdenv.mkDerivation rec { - name = "parallel-20111222"; + name = "parallel-20120322"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "0rip8hnby1c2kcz7w7h6c2kf0y63hyw8bwprsd8fnqw96lgypf1b"; + sha256 = "1nm3ljgaxh2rg2dfwpw9r31zs7k09ab9i14yvbm4wrqasa2bcrxj"; }; patchPhase = diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix index 3d217d2660c..1d0c4f2a9e7 100644 --- a/pkgs/tools/misc/parted/default.nix +++ b/pkgs/tools/misc/parted/default.nix @@ -2,11 +2,11 @@ , utillinux, check, enableStatic ? false, hurd ? null }: stdenv.mkDerivation rec { - name = "parted-3.0"; + name = "parted-3.1"; src = fetchurl { url = "mirror://gnu/parted/${name}.tar.xz"; - sha256 = "054ybvjkj1mbm4mpn1rl12jzhvqg37b0xwwr4ly1zisvzrjhi11a"; + sha256 = "05fa4m1bky9d13hqv91jlnngzlyn7y4rnnyq6d86w0dg3vww372y"; }; buildInputs = [ libuuid ] diff --git a/pkgs/tools/misc/ttf2pt1/default.nix b/pkgs/tools/misc/ttf2pt1/default.nix index 2deb8893f4e..379db7d533f 100644 --- a/pkgs/tools/misc/ttf2pt1/default.nix +++ b/pkgs/tools/misc/ttf2pt1/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation { ''; buildInputs = [ freetype ]; + buildNativeInputs = [ perl ]; patches = ./gentoo-makefile.patch; # also contains the freetype patch diff --git a/pkgs/tools/networking/altermime/altermime.patch b/pkgs/tools/networking/altermime/altermime.patch deleted file mode 100644 index 00ed513cf32..00000000000 --- a/pkgs/tools/networking/altermime/altermime.patch +++ /dev/null @@ -1,48 +0,0 @@ -AUR patch for fixing build - -diff -Naur altermime-0.3.10/qpe.c altermime-0.3.10-new/qpe.c ---- altermime-0.3.10/qpe.c 2008-11-16 09:45:45.000000000 +0100 -+++ altermime-0.3.10-new/qpe.c 2010-11-24 14:28:43.153334114 +0100 -@@ -97,7 +97,7 @@ - op+= strlen(paragraph);// +3; /** jump the output + =\r\n **/ - out_remaining-= (strlen(paragraph)); // Was +3, updated to fix Outlook problems - -- QPD fprintf(stdout, "Soft break (%d + %d > 76 char) for '%s'\n", current_line_length, charout_size, paragraph); -+ QPD fprintf(stdout, "Soft break (%zd + %d > 76 char) for '%s'\n", current_line_length, charout_size, paragraph); - - /** reinitialize the paragraph **/ - paragraph[0] = '\0'; -@@ -108,7 +108,7 @@ - } - - snprintf(pp, pp_remaining, "%s", charout); -- QPD fprintf(stdout,"charout='%s', size=%d, pp_remain=%d result='%s'\n", charout, charout_size, pp_remaining, paragraph); -+ QPD fprintf(stdout,"charout='%s', size=%d, pp_remain=%zd result='%s'\n", charout, charout_size, pp_remaining, paragraph); - pp += charout_size; - pp_remaining -= charout_size; - p++; -@@ -149,13 +149,13 @@ - out_size = in_size *3; - in_buffer = malloc( sizeof(char) *in_size +1); - if (in_buffer == NULL) { -- QPD fprintf(stdout,"Error allocating %d bytes for input buffer\n", in_size); -+ QPD fprintf(stdout,"Error allocating %zd bytes for input buffer\n", in_size); - return -1; - } - - out_buffer = malloc( sizeof(char) *out_size *3 +1); - if (in_buffer == NULL) { -- QPD fprintf(stdout,"Error allocating %d bytes for output buffer\n", out_size); -+ QPD fprintf(stdout,"Error allocating %zd bytes for output buffer\n", out_size); - return -1; - } - -@@ -169,7 +169,7 @@ - ** we segfault ;) **/ - *(in_buffer +in_size) = '\0'; - -- QPD fprintf(stdout,"file %s is loaded, size = %d\n", fname, in_size); -+ QPD fprintf(stdout,"file %s is loaded, size = %zd\n", fname, in_size); - - qp_encode( out_buffer, out_size, in_buffer, in_size ); - diff --git a/pkgs/tools/networking/altermime/debian-patches.nix b/pkgs/tools/networking/altermime/debian-patches.nix new file mode 100644 index 00000000000..cd0ae77511b --- /dev/null +++ b/pkgs/tools/networking/altermime/debian-patches.nix @@ -0,0 +1,18 @@ +# Generated by debian-patches.sh from debian-patches.txt +let + prefix = "http://patch-tracker.debian.org/patch/series/dl/altermime/0.3.10-7"; +in +[ + { + url = "${prefix}/15_fix_snprintf.diff"; + sha256 = "0fbi99s7pc2jvg9s2zldvg18i6g5ca3pcyaxy47kyabnz956dris"; + } + { + url = "${prefix}/10_fix_printk_warnings.diff"; + sha256 = "1fqsym07r3gv8zllg7c956g5a04gsxnr1ibbgkjr3yx6nm5ci1j7"; + } + { + url = "${prefix}/20_fix-unused-but-set-variables.diff"; + sha256 = "0ski67k44amrgg2g3gwdjzrlix2gjg60r5rs5wbjingvq1n7255r"; + } +] diff --git a/pkgs/tools/networking/altermime/debian-patches.txt b/pkgs/tools/networking/altermime/debian-patches.txt new file mode 100644 index 00000000000..77cb0ff10c1 --- /dev/null +++ b/pkgs/tools/networking/altermime/debian-patches.txt @@ -0,0 +1,4 @@ +altermime/0.3.10-7 +15_fix_snprintf.diff +10_fix_printk_warnings.diff +20_fix-unused-but-set-variables.diff diff --git a/pkgs/tools/networking/altermime/default.nix b/pkgs/tools/networking/altermime/default.nix index 8335b0eb8db..a80757faa1f 100644 --- a/pkgs/tools/networking/altermime/default.nix +++ b/pkgs/tools/networking/altermime/default.nix @@ -26,7 +26,7 @@ rec { inherit (sourceInfo) name version; inherit buildInputs; - patches = [./altermime.patch]; + patches = map a.fetchurl (import ./debian-patches.nix); phaseNames = ["doPatch" "fixTarget" "doMakeInstall"]; fixTarget = a.fullDepEntry ('' diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 9a862a461b6..dc2a8498223 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dhcpcd-5.5.4"; + name = "dhcpcd-5.5.6"; src = fetchurl { url = "http://roy.marples.name/downloads/dhcpcd/${name}.tar.bz2"; - sha256 = "1zhpm89s6bk29lx7hq5f6fqm7i6dq2wq9vv5m25rv5wv6747v0m6"; + sha256 = "1rz8n6crw6yh9hzqwdqjpl37v60i1szr7dbhf6gvm374gpf10zv5"; }; configureFlags = "--sysconfdir=/etc"; diff --git a/pkgs/tools/networking/lsh/default.nix b/pkgs/tools/networking/lsh/default.nix index c41ff1c1097..ab43813f923 100644 --- a/pkgs/tools/networking/lsh/default.nix +++ b/pkgs/tools/networking/lsh/default.nix @@ -22,6 +22,11 @@ stdenv.mkDerivation rec { s|/usr/bin/df|$(type -P df)|g ; s|/usr/bin/ipcs|$(type -P ipcs)|g ; s|/usr/bin/uptime|$(type -P uptime)|g" + + # Skip the `configure' script that checks whether /dev/ptmx & co. work as + # expected, because it relies on impurities (for instance, /dev/pts may + # be unavailable in chroots.) + export lsh_cv_sys_unix98_ptys=yes ''; buildInputs = [ gperf guile gmp zlib liboop readline gnum4 pam ]; diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix new file mode 100644 index 00000000000..60a9e5cab87 --- /dev/null +++ b/pkgs/tools/networking/mosh/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, zlib, boost, protobuf, ncurses, pkgconfig, IOTty +, makeWrapper, perl }: + +stdenv.mkDerivation rec { + name = "mosh-1.1.3"; + + src = fetchurl { + url = "https://github.com/downloads/keithw/mosh/${name}.tar.gz"; + sha256 = "1vkf7h8mcmfn9dgcwrww05mdijrl7321xv9wlhf7j99nwmklc8sk"; + }; + + buildInputs = [ boost protobuf ncurses zlib pkgconfig IOTty makeWrapper perl ]; + + postInstall = '' + wrapProgram $out/bin/mosh --prefix PERL5LIB : $PERL5LIB + ''; + + meta = { + homepage = http://mosh.mit.edu/; + description = "Remote terminal application that allows roaming, local echo, etc."; + license = "GPLv3+"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/tools/networking/ntop/default.nix b/pkgs/tools/networking/ntop/default.nix new file mode 100644 index 00000000000..945effabcfb --- /dev/null +++ b/pkgs/tools/networking/ntop/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, autoconf, automake, libtool, wget, libpcap, gdbm, zlib, openssl, rrdtool +, python, geoip }: + +stdenv.mkDerivation rec { + name = "ntop-4.1.0"; + + src = fetchurl { + url = "mirror://sourceforge/ntop/${name}.tar.gz"; + sha256 = "19440gnswnqwvkbzpay9hzmnfnhbyc2ifpl2jri8dhcyhxima7n7"; + }; + + preConfigure = '' + ./autogen.sh + cp ${libtool}/share/aclocal/libtool.m4 libtool.m4.in + ''; + + buildNativeInputs = [ autoconf automake libtool wget libpcap gdbm zlib openssl rrdtool + python geoip ]; + + meta = { + description = "Traffic analysis with NetFlow and sFlow support"; + + license = "GLPv3+"; + + homepage = http://www.ntop.org/products/ntop/; + + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index 007c8f7c6e0..5a8f6b8caae 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -1,18 +1,20 @@ { fetchurl, buildPythonPackage }: -buildPythonPackage { - name = "offlineimap-6.2.0.2"; +buildPythonPackage rec { + version = "6.5.3"; + name = "offlineimap-${version}"; src = fetchurl { - url = "http://ftp.de.debian.org/debian/pool/main/o/offlineimap/offlineimap_6.2.0.2.orig.tar.gz"; - sha256 = "1w69qv1dm37m53k8cd068lk5z3qjlscnjxr397gs8kdsfds67v7c"; + url = "https://github.com/spaetz/offlineimap/tarball/v${version}"; + name = "${name}.tar.bz"; + sha256 = "8717a56e6244b47b908b23b598efb3470d74450ecd881b6d3573d8aec4a5db38"; }; doCheck = false; meta = { - description = "IMAP to local files bridge"; - homepage = "http://software.complete.org/software/projects/show/offlineimap"; + description = "OfflineImap synchronizes emails between two repositories, so that you can read the same mailbox from multiple computers."; + homepage = "http://offlineimap.org"; license = "GPLv2+"; }; } diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index 98c3dd484dc..1310fb7d047 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -16,6 +16,15 @@ stdenv.mkDerivation rec { --with-iproute-path=${iproute}/sbin/ip ''; + postInstall = '' + mkdir -p $out/share/doc/openvpn/examples + cp -r sample-config-files/ $out/share/doc/openvpn/examples + cp -r sample-keys/ $out/share/doc/openvpn/examples + cp -r easy-rsa/ $out/share/doc/openvpn/examples + rm -r $out/share/doc/openvpn/examples/easy-rsa/Windows + cp -r sample-scripts/ $out/share/doc/openvpn/examples + ''; + meta = { description="OpenVPN is a robust and highly flexible tunneling application compatible with many OSes."; homepage="http://openvpn.net/"; diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index 1f3240997d9..6332ff8ad5d 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchurl, python, pygobject, pycairo, pyGtkGlade, pythonDBus, - wpa_supplicant, dhcp, wirelesstools, nettools, iproute, + wpa_supplicant, dhcp, dhcpcd, wirelesstools, nettools, iproute, locale ? "C" }: # Wicd has a ncurses interface that we do not build because it depends @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { substituteInPlace in/scripts=wicd.in --subst-var-by TEMPLATE-DEFAULT $out/share/other/dhclient.conf.template.default - sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin:${wpa_supplicant}/sbin:${dhcp}/sbin:${wirelesstools}/sbin:${nettools}/sbin:${iproute}/sbin" in/scripts=wicd.in + sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin:${wpa_supplicant}/sbin:${dhcpcd}/sbin:${dhcp}/sbin:${wirelesstools}/sbin:${nettools}/sbin:${iproute}/sbin" in/scripts=wicd.in sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pythonDBus})" in/scripts=wicd.in sed -i "4iexport LC_ALL=\\\"${locale}\\\"" in/scripts=wicd.in sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-client.in diff --git a/pkgs/tools/package-management/cabal-install/0.14.0.nix b/pkgs/tools/package-management/cabal-install/0.14.0.nix new file mode 100644 index 00000000000..ecbd46de52c --- /dev/null +++ b/pkgs/tools/package-management/cabal-install/0.14.0.nix @@ -0,0 +1,19 @@ +{ cabal, Cabal, filepath, HTTP, mtl, network, random, time, zlib }: + +cabal.mkDerivation (self: { + pname = "cabal-install"; + version = "0.14.0"; + sha256 = "1n2vvlmfgfrj3z4ag5bj278vmdh6fw7xb0ixbxxxcngzd41bbwpl"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + Cabal filepath HTTP mtl network random time zlib + ]; + meta = { + homepage = "http://www.haskell.org/cabal/"; + description = "The command-line interface for Cabal and Hackage"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index 13534b7dbd4..9c17b9b78f7 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, gettext, libiconv }: stdenv.mkDerivation { - name = "disnix-0.3pre30527"; + name = "disnix-0.3pre32254"; src = fetchurl { - url = http://hydra.nixos.org/build/1926928/download/4/disnix-0.3pre30527.tar.gz; - sha256 = "1mdcxyrz60nxcyn116i41nhh94r9hacvyilkjyjfiyf8d58pji1y"; + url = http://hydra.nixos.org/build/2368541/download/4/disnix-0.3pre32254.tar.gz; + sha256 = "1jznx4mb6vwpzzpbk4c16j73hjgng7v1nraq8yya7f7m1s2gyhcw"; }; buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable ] diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index f9c9aa8c593..93cd2f3f846 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, disnix, socat, pkgconfig }: stdenv.mkDerivation { - name = "disnixos-0.2pre31830"; + name = "disnixos-0.2pre33586"; src = fetchurl { - url = http://hydra.nixos.org/build/1934498/download/3/disnixos-0.2pre31830.tar.gz; - sha256 = "02f2b4lk1gr24rqs56az82b3h3mnqrk1m48bcj21x109g4vrlpmm"; + url = http://hydra.nixos.org/build/2368187/download/3/disnixos-0.2pre33586.tar.gz; + sha256 = "110vn4390447dws343py8ss6s8jizx8yg7yl38i64nlqh0bcn4ny"; }; buildInputs = [ socat pkgconfig disnix ]; diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index ce62eb1e562..912248b694c 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.0pre2632_b8fb0ce"; + name = "nix-1.0pre2668_46cdc6a"; src = fetchurl { - url = "http://hydra.nixos.org/build/2337744/download/4/${name}.tar.bz2"; - sha256 = "5f965a54ac4ef949b1531d21c3bc1c920552ea3103a39669a3b8a4f3187bd6da"; + url = "http://hydra.nixos.org/build/2492261/download/4/${name}.tar.bz2"; + sha256 = "d9a1cfbee1670bc700593d81211c47eb8d7623aa9699d18a414ecaddccabfa1a"; }; buildNativeInputs = [ perl pkgconfig ]; diff --git a/pkgs/tools/security/gnupg/default.nix b/pkgs/tools/security/gnupg/default.nix index 3d759d733ad..d3c9e3c13b6 100644 --- a/pkgs/tools/security/gnupg/default.nix +++ b/pkgs/tools/security/gnupg/default.nix @@ -13,11 +13,11 @@ assert useUsb -> (libusb != null); assert useCurl -> (curl != null); stdenv.mkDerivation rec { - name = "gnupg-2.0.18"; + name = "gnupg-2.0.19"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "0nxf5nbgxi5splnw6xww5iy6sw367kz9x1cy5aaznhx45ivdvbj8"; + sha256 = "08n636sfffs5qvg9ppiprvsh00q0dmdw425psg3m3nssja53m8pg"; }; buildInputs = [ readline zlib libgpgerror pth libgcrypt libassuan libksba ] diff --git a/pkgs/tools/security/gnupg/git.nix b/pkgs/tools/security/gnupg/git.nix new file mode 100644 index 00000000000..3d7db862dce --- /dev/null +++ b/pkgs/tools/security/gnupg/git.nix @@ -0,0 +1,57 @@ +# Remember to install Pinentry and +# 'echo "pinentry-program `which pinentry-gtk-2`" >> ~/.gnupg/gpg-agent.conf'. + +{ fetchgit, stdenv, readline, zlib, libgpgerror, npth, libgcrypt, libassuan +, libksba, coreutils, autoconf, automake, transfig, ghostscript, texinfo +, useLdap ? true, openldap ? null, useBzip2 ? true, bzip2 ? null, useUsb ? true +, libusb ? null, useCurl ? true, curl ? null +}: + +assert useLdap -> (openldap != null); +assert useBzip2 -> (bzip2 != null); +assert useUsb -> (libusb != null); +assert useCurl -> (curl != null); + +stdenv.mkDerivation rec { + name = "gnupg-2.1pre-git20120407"; + + src = fetchgit { + url = "git://git.gnupg.org/gnupg.git"; + rev = "f1e1387bee286c7434f0462185048872bcdb4484"; + sha256 = "8f5a14587beccdd3752f9e430e56c6ea2d393dddb7843bfc17029e1a309045bb"; + }; + + buildInputs = [ readline zlib libgpgerror npth libgcrypt libassuan libksba + autoconf automake transfig ghostscript texinfo ] + ++ stdenv.lib.optional useLdap openldap + ++ stdenv.lib.optional useBzip2 bzip2 + ++ stdenv.lib.optional useUsb libusb + ++ stdenv.lib.optional useCurl curl; + + patchPhase = '' + find tests -type f | xargs sed -e 's@/bin/pwd@${coreutils}&@g' -i + ''; + + preConfigure = "autoreconf -v"; + configureFlags = "--enable-maintainer-mode"; + + meta = { + description = "GNU Privacy Guard (GnuPG), GNU Project's implementation of the OpenPGP standard"; + + longDescription = '' + GnuPG is the GNU project's complete and free implementation of + the OpenPGP standard as defined by RFC4880. GnuPG allows to + encrypt and sign your data and communication, features a + versatile key managment system as well as access modules for all + kind of public key directories. GnuPG, also known as GPG, is a + command line tool with features for easy integration with other + applications. A wealth of frontend applications and libraries + are available. Version 2 of GnuPG also provides support for + S/MIME. + ''; + + homepage = http://gnupg.org/; + + license = "GPLv3+"; + }; +} diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index fe0bf0384db..62afb2fe078 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libgcrypt, readline }: stdenv.mkDerivation rec { - name = "freeipmi-1.1.1"; + name = "freeipmi-1.1.3"; src = fetchurl { url = "mirror://gnu/freeipmi/${name}.tar.gz"; - sha256 = "03q6wg1wdmr94dxh81lxllb53nmab0d637wgh2s1xn6rfmxf7ypf"; + sha256 = "11kawxzk8cp9g3q5hdm1sqgzanprc2gagjdnm33lyz5df8xjfkmk"; }; buildInputs = [ libgcrypt readline ]; diff --git a/pkgs/tools/text/gnupatch/darwin-fix.patch b/pkgs/tools/text/gnupatch/darwin-fix.patch new file mode 100644 index 00000000000..50d08534814 --- /dev/null +++ b/pkgs/tools/text/gnupatch/darwin-fix.patch @@ -0,0 +1,60 @@ +Fix builds on Darwin: +http://lists.gnu.org/archive/html/bug-patch/2010-01/msg00004.html . + + +commit 2c4e3ecddec8a686bd50d238f4cefebb950298b7 +Author: Andreas Gruenbacher +Date: Fri Jan 1 15:58:15 2010 +0100 + + * Makefile.in (LIBSRCS, LIBM4FILES): Add the missing files strnlen.c, + strnlen.m4, and safe-read.m4. + +diff --git a/Makefile.in b/Makefile.in +index 3b3d78a..26dc281 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -91,6 +91,7 @@ LIBSRCS = \ + gl/lib/stripslash.c \ + gl/lib/strncasecmp.c \ + gl/lib/strndup.c \ ++ gl/lib/strnlen.c \ + gl/lib/xmalloc.c \ + gl/lib/xstrndup.c + + +Add the missing bits from Gnulib. + +--- /dev/null 2012-04-23 08:54:35.747205543 +0200 ++++ b/gl/lib/strnlen.c 2012-01-16 22:35:02.000000000 +0100 +@@ -0,0 +1,31 @@ ++/* Find the length of STRING, but scan at most MAXLEN characters. ++ Copyright (C) 2005-2007, 2009-2012 Free Software Foundation, Inc. ++ Written by Simon Josefsson. ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 2, or (at your option) ++ any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software Foundation, ++ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ ++ ++#include ++ ++#include ++ ++/* Find the length of STRING, but scan at most MAXLEN characters. ++ If no '\0' terminator is found in that many characters, return MAXLEN. */ ++ ++size_t ++strnlen (const char *string, size_t maxlen) ++{ ++ const char *end = memchr (string, '\0', maxlen); ++ return end ? (size_t) (end - string) : maxlen; ++} diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/tools/text/gnupatch/default.nix index 782c0bec850..a7a166c95c3 100644 --- a/pkgs/tools/text/gnupatch/default.nix +++ b/pkgs/tools/text/gnupatch/default.nix @@ -1,19 +1,12 @@ { stdenv, fetchurl, ed }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "patch-2.6.1"; - src = - if stdenv.isDarwin - then fetchurl { - # Temporary fix for - # http://lists.gnu.org/archive/html/bug-patch/2010-01/msg00004.html . - url = "ftp://alpha.gnu.org/gnu/patch/patch-2.6.1.87-94d8.tar.gz"; - sha256 = "0jnw8p0nvkmwi1a2z56bssqik8fvkb71zd2cpzl1sklnrg1g3b6p"; - } else fetchurl { - url = "mirror://gnu/patch/${name}.tar.gz"; - sha256 = "1fc1jyq80nswkf492fiqdbl2bhvlw2wb44ghqlfd3zngx4qkfmni"; - }; + src = fetchurl { + url = "mirror://gnu/patch/${name}.tar.gz"; + sha256 = "1fc1jyq80nswkf492fiqdbl2bhvlw2wb44ghqlfd3zngx4qkfmni"; + }; buildInputs = (stdenv.lib.optional doCheck ed); @@ -40,3 +33,9 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.all; }; } + +// + +(stdenv.lib.optionalAttrs stdenv.isDarwin { + patches = [ ./darwin-fix.patch ]; +})) diff --git a/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix b/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix index d40fec073a7..b05596ed50a 100644 --- a/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix +++ b/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, unzip, ruby, openssl, makeWrapper }: stdenv.mkDerivation { - name = "ec2-ami-tools-1.4.0.5"; + name = "ec2-ami-tools-1.4.0.7"; buildInputs = [ unzip makeWrapper ]; src = fetchurl { url = http://s3.amazonaws.com/ec2-downloads/ec2-ami-tools.zip; - sha256 = "0vhdqmi076ipqj05dd7fn0drbhcvzccdcdhy8br9sp684scg9a75"; + sha256 = "0l8c623i1w30bh9k622cdjj5f57rlfc1zs0i01ya016ijyr08qip"; }; # Amazon EC2 requires that disk images are writable. If they're diff --git a/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix b/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix index 73b65a7e0fc..1d146aa449e 100644 --- a/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix +++ b/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, unzip, makeWrapper, jre }: stdenv.mkDerivation { - name = "ec2-api-tools-1.4.4.2"; + name = "ec2-api-tools-1.5.3.0"; src = fetchurl { url = http://s3.amazonaws.com/ec2-downloads/ec2-api-tools.zip; - sha256 = "03immxrrc7brbwm9nbp6dqw4bxpcb18l8rsj75nd6h2vanq2qlj4"; + sha256 = "0p0rk3bhk35b3dxdy8wjnbbj5zh1va63yfvdk5jxnzdzplds8v65"; }; buildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/tools/virtualization/euca2ools/default.nix b/pkgs/tools/virtualization/euca2ools/default.nix index 7992ced6d0c..ce84706c356 100644 --- a/pkgs/tools/virtualization/euca2ools/default.nix +++ b/pkgs/tools/virtualization/euca2ools/default.nix @@ -1,30 +1,16 @@ -{ stdenv, fetchurl, which, pythonPackages }: +{ stdenv, fetchgit, which, pythonPackages }: -stdenv.mkDerivation rec { - name = "euca2ools-1.3.1"; +pythonPackages.buildPythonPackage rec { + name = "euca2ools-2.0.0-pre-20111230"; namePrefix = ""; - src = fetchurl { - url = "http://eucalyptussoftware.com/downloads/releases/${name}.tar.gz"; - sha256 = "1k4hakbxqsv2gzcdrf6dbyrpnajcan9yilddhs47cg7lgqw7b41f"; + src = fetchgit { + url = https://github.com/eucalyptus/euca2ools.git; + rev = "0032f7c85603f34b728a6f8bc6f25d7e4892432e"; + sha256 = "ae3c3918d60411ebf15faefb6dc94e3a98ab73cf751d8180c52f51b19ed64c09"; }; - makeFlags = "PREFIX=$(out)"; - - buildInputs = [ which pythonPackages.python pythonPackages.wrapPython ]; - - # We need boto 1.9 for now. See https://bugs.launchpad.net/euca2ools/devel/+bug/623888 - pythonPath = [ pythonPackages.setuptools pythonPackages.boto_1_9 pythonPackages.m2crypto ]; - - preBuild = - '' - substituteInPlace Makefile --replace "-o root" "" - - substituteInPlace euca2ools/Makefile \ - --replace 'python setup.py install' "python setup.py install --prefix=$out" - ''; - - postInstall = "wrapPythonPrograms"; + pythonPath = [ pythonPackages.boto pythonPackages.m2crypto pythonPackages.ssl ]; meta = { homepage = http://open.eucalyptus.com/downloads; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aa52aed09de..a8fdae521e6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21,8 +21,12 @@ # null, the default standard environment is used. bootStdenv ? null +, # Darwin is an "impure" platform, with its libc outside of the store. + # Thus, GCC, GFortran, & co. must always look for files in standard system + # directories (/usr/include, etc.) + noSysDirs ? (system != "x86_64-darwin" && system != "i686-darwin") + # More flags for the bootstrapping of stdenv. -, noSysDirs ? true , gccWithCC ? true , gccWithProfiling ? true @@ -195,7 +199,7 @@ let allStdenvs = import ../stdenv { inherit system stdenvType platform; - allPackages = args: import ./all-packages.nix ({ inherit config; } // args); + allPackages = args: import ./all-packages.nix ({ inherit config system; } // args); }; defaultStdenv = allStdenvs.stdenv // { inherit platform; }; @@ -650,7 +654,7 @@ let ethtool = callPackage ../tools/misc/ethtool { }; - euca2ools = callPackage ../tools/virtualization/euca2ools { }; + euca2ools = callPackage ../tools/virtualization/euca2ools { pythonPackages = python26Packages; }; exif = callPackage ../tools/graphics/exif { }; @@ -670,6 +674,7 @@ let figlet = callPackage ../tools/misc/figlet { }; file = callPackage ../tools/misc/file { }; + file511 = callPackage ../tools/misc/file/511.nix { }; fileschanged = callPackage ../tools/misc/fileschanged { }; @@ -769,6 +774,10 @@ let gnupg = callPackage ../tools/security/gnupg { }; + gnupg2_1 = callPackage ../tools/security/gnupg/git.nix { + libassuan = libassuan2_1; + }; + gnuplot = callPackage ../tools/graphics/gnuplot { texLive = null; lua = null; @@ -939,6 +948,8 @@ let lftp = callPackage ../tools/networking/lftp { }; + libconfig = callPackage ../development/libraries/libconfig { }; + libtirpc = callPackage ../development/libraries/ti-rpc { }; libtorrent = callPackage ../tools/networking/p2p/libtorrent { }; @@ -979,6 +990,8 @@ let memtest86 = callPackage ../tools/misc/memtest86 { }; + memtest86plus = callPackage ../tools/misc/memtest86/plus.nix { }; + mc = callPackage ../tools/misc/mc { }; mcabber = callPackage ../applications/networking/instant-messengers/mcabber { }; @@ -991,6 +1004,8 @@ let mdbtools_git = callPackage ../tools/misc/mdbtools/git.nix { }; + minecraft = callPackage ../games/minecraft { }; + miniupnpc = callPackage ../tools/networking/miniupnpc { }; miniupnpd = callPackage ../tools/networking/miniupnpd { }; @@ -1011,6 +1026,11 @@ let inherit openssl flex bison; }; + mosh = callPackage ../tools/networking/mosh { + boost = boostHeaders; + inherit (perlPackages) IOTty; + }; + mpage = callPackage ../tools/text/mpage { }; mscgen = callPackage ../tools/graphics/mscgen { }; @@ -1085,6 +1105,8 @@ let nlopt = callPackage ../development/libraries/nlopt {}; + npth = callPackage ../development/libraries/npth {}; + nmap = callPackage ../tools/security/nmap { inherit (pythonPackages) pysqlite; }; @@ -1094,6 +1116,8 @@ let # ntfsprogs are merged into ntfs-3g ntfsprogs = pkgs.ntfs3g; + ntop = callPackage ../tools/networking/ntop { }; + ntp = callPackage ../tools/networking/ntp { }; nssmdns = callPackage ../tools/networking/nss-mdns { }; @@ -1164,17 +1188,20 @@ let hurdPartedCross = if crossSystem != null && crossSystem.config == "i586-pc-gnu" - then (callPackage ../tools/misc/parted { - # Needs the Hurd's libstore. - hurd = gnu.hurdCrossIntermediate; + then (makeOverridable + ({ hurd }: + (parted.override { + # Needs the Hurd's libstore. + inherit hurd; - # The Hurd wants a libparted.a. - enableStatic = true; + # The Hurd wants a libparted.a. + enableStatic = true; - gettext = null; - readline = null; - devicemapper = null; - }).hostDrv + gettext = null; + readline = null; + devicemapper = null; + }).hostDrv) + { hurd = gnu.hurdCrossIntermediate; }) else null; patch = gnupatch; @@ -1870,7 +1897,7 @@ let gettext which noSysDirs; # bootstrapping a profiled compiler does not work in the sheevaplug: # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944 - profiledCompiler = if stdenv.system == "armv5tel-linux" then false else true; + profiledCompiler = if stdenv.isArm then false else true; # When building `gcc.hostDrv' (a "Canadian cross", with host == target # and host != build), `cross' must be null but the cross-libc must still @@ -1899,7 +1926,7 @@ let # bootstrapping a profiled compiler does not work in the sheevaplug: # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944 - profiledCompiler = if stdenv.system == "armv5tel-linux" then false else true; + profiledCompiler = if stdenv.isArm then false else true; # When building `gcc.hostDrv' (a "Canadian cross", with host == target # and host != build), `cross' must be null but the cross-libc must still @@ -1942,8 +1969,12 @@ let (if stdenv.system == "i686-darwin" then import ../development/compilers/gcc/4.2-apple32 else import ../development/compilers/gcc/4.2-apple64) { - inherit fetchurl stdenv noSysDirs; + inherit fetchurl noSysDirs; profiledCompiler = true; + + # Since it fails to build with GCC 4.6, build it with the "native" + # Apple-GCC. + stdenv = allStdenvs.stdenvNative; }); gccupc40 = wrapGCCUPC (import ../development/compilers/gcc-upc-4.0 { @@ -1951,13 +1982,7 @@ let texinfo = texinfo49; }); - gfortran = - if stdenv.isDarwin - then wrapGCC (gccApple.gcc.override { - langF77 = true; - inherit gmp mpfr bison flex; - }) - else gfortran46; + gfortran = gfortran46; gfortran40 = wrapGCC (gcc40.gcc.override { langFortran = true; @@ -2135,7 +2160,8 @@ let gcl = builderDefsPackage ../development/compilers/gcl { inherit mpfr m4 binutils fetchcvs emacs zlib which - gmp texinfo; + texinfo; + gmp = gmp4; inherit (xlibs) libX11 xproto inputproto libXi libXext xextproto libXt libXaw libXmu; inherit stdenv; @@ -2288,12 +2314,19 @@ let (if stdenv.isDarwin then ghc704Binary else ghc6121Binary) (x : x.ghc741Prefs) false false lowPrio); + # Stable branch snapshot. + haskellPackages_ghc742 = + recurseIntoAttrs + (haskellPackagesFun ../development/compilers/ghc/7.4.2.nix + (if stdenv.isDarwin then ghc704Binary else ghc6121Binary) + (x : x.ghcHEADPrefs) false false lowPrio); + # Reasonably current HEAD snapshot. Should *always* be lowPrio. haskellPackages_ghcHEAD = recurseIntoAttrs (haskellPackagesFun ../development/compilers/ghc/head.nix # (haskellPackages_ghc704.ghcWithPackages (self : [ self.alex self.happy ])) - (if stdenv.isDarwin then ghc704Binary else ghc6121Binary) + ghc704Binary (x : x.ghcHEADPrefs) false false lowPrio); haxeDist = import ../development/compilers/haxe { @@ -2306,6 +2339,8 @@ let inherit cmake; }; + fsharp = callPackage ../development/compilers/fsharp {}; + go = callPackage ../development/compilers/go { }; gprolog = callPackage ../development/compilers/gprolog { }; @@ -2361,6 +2396,8 @@ let jikes = callPackage ../development/compilers/jikes { }; + julia = callPackage ../development/compilers/julia { }; + lazarus = builderDefsPackage (import ../development/compilers/fpc/lazarus.nix) { inherit makeWrapper gtk glib pango atk gdk_pixbuf; inherit (xlibs) libXi inputproto libX11 xproto libXext xextproto; @@ -2723,15 +2760,7 @@ let python27 = callPackage ../development/interpreters/python/2.7 { }; - python31 = callPackage ../development/interpreters/python/3.1 { - arch = if stdenv.isDarwin then pkgs.darwinArchUtility else null; - sw_vers = if stdenv.isDarwin then pkgs.darwinSwVersUtility else null; - }; - - python32 = callPackage ../development/interpreters/python/3.2 { - arch = if stdenv.isDarwin then pkgs.darwinArchUtility else null; - sw_vers = if stdenv.isDarwin then pkgs.darwinSwVersUtility else null; - }; + python32 = callPackage ../development/interpreters/python/3.2 { }; pythonFull = python27Full; @@ -2961,10 +2990,7 @@ let cmakeWithGui = cmakeCurses.override { useQt4 = true; }; - coccinelle = callPackage ../development/tools/misc/coccinelle { - ocamlPackages = ocamlPackages_3_12_1; - ocaml = ocaml_3_12_1; - }; + coccinelle = callPackage ../development/tools/misc/coccinelle { }; cppi = callPackage ../development/tools/misc/cppi { }; @@ -3176,7 +3202,14 @@ let target = crossSystem; }; - valgrind = callPackage ../development/tools/analysis/valgrind { }; + valgrind = callPackage ../development/tools/analysis/valgrind { + stdenv = + # On Darwin, Valgrind 3.7.0 expects Apple's GCC (for + # `__private_extern'.) + if stdenv.isDarwin + then overrideGCC stdenv gccApple + else stdenv; + }; valkyrie = callPackage ../development/tools/analysis/valkyrie { }; @@ -3259,6 +3292,9 @@ let boost149 = callPackage ../development/libraries/boost/1.49.nix { }; boost = boost149; + boostHeaders149 = callPackage ../development/libraries/boost/1.49-headers.nix { }; + boostHeaders = boostHeaders149; + # A Boost build with all library variants enabled. Very large (about 250 MB). boostFull = appendToName "full" (boost.override { enableDebug = true; @@ -3379,6 +3415,8 @@ let useX11 = true; }; + dbus_cplusplus = callPackage ../development/libraries/dbus-cplusplus { }; + dbus_glib = callPackage ../development/libraries/dbus-glib { }; dbus_java = callPackage ../development/libraries/java/dbus-java { }; @@ -3409,9 +3447,10 @@ let extremetuxracer = builderDefsPackage (import ../games/extremetuxracer) { inherit mesa tcl freeglut SDL SDL_mixer pkgconfig - libpng gettext intltool; + gettext intltool; inherit (xlibs) libX11 xproto libXi inputproto libXmu libXext xextproto libXt libSM libICE; + libpng = libpng12; }; eventlog = callPackage ../development/libraries/eventlog { }; @@ -3905,6 +3944,8 @@ let libassuan = callPackage ../development/libraries/libassuan { }; + libassuan2_1 = callPackage ../development/libraries/libassuan/git.nix { }; + libav = callPackage ../development/libraries/libav { }; libavc1394 = callPackage ../development/libraries/libavc1394 { }; @@ -3990,6 +4031,8 @@ let libgdata = (newScope gnome) ../development/libraries/libgdata {}; libgdata_0_6 = (newScope gnome) ../development/libraries/libgdata/0.6.nix {}; + libgig = callPackage ../development/libraries/libgig { }; + libgnome_keyring = callPackage ../development/libraries/libgnome-keyring { }; libgnome_keyring3 = callPackage ../development/libraries/libgnome-keyring/3.x.nix { }; @@ -4001,6 +4044,8 @@ let liblrdf = callPackage ../development/libraries/liblrdf {}; + liblscp = callPackage ../development/libraries/liblscp { }; + libev = builderDefsPackage ../development/libraries/libev { }; @@ -4082,9 +4127,11 @@ let libiconv = callPackage ../development/libraries/libiconv { }; + libiconvOrEmpty = if (libiconvOrNull == null) then [] else libiconv; + libiconvOrNull = if gcc ? libc then null else libiconv; - libiconvOrLibc = if gcc ? libc then gcc.libc else libiconv; + libiconvOrLibc = if (libiconvOrNull == null) then gcc.libc else libiconv; libid3tag = callPackage ../development/libraries/libid3tag { }; @@ -4344,9 +4391,7 @@ let system == "x86_64-darwin" || system == "i686-darwin"; - mesa = callPackage ../development/libraries/mesa { - lipo = if stdenv.isDarwin then darwinLipoUtility else null; - }; + mesa = callPackage ../development/libraries/mesa { }; metaEnvironment = recurseIntoAttrs (let callPackage = newScope pkgs.metaEnvironment; in rec { sdfLibrary = callPackage ../development/libraries/sdf-library { aterm = aterm28; }; @@ -4394,8 +4439,15 @@ let mysocketw = callPackage ../development/libraries/mysocketw { }; ncurses = makeOverridable (import ../development/libraries/ncurses) { - inherit fetchurl stdenv; + inherit fetchurl; unicode = system != "i686-cygwin"; + stdenv = + # On Darwin, NCurses uses `-no-cpp-precomp', which is specific to + # Apple-GCC. Since NCurses is part of stdenv, always use + # `stdenvNative' to build it. + if stdenv.isDarwin + then allStdenvs.stdenvNative + else stdenv; }; neon = neon029; @@ -4597,7 +4649,14 @@ let readline5 = callPackage ../development/libraries/readline/readline5.nix { }; - readline6 = callPackage ../development/libraries/readline/readline6.nix { }; + readline6 = callPackage ../development/libraries/readline/readline6.nix { + stdenv = + # On Darwin, Readline uses `-arch_only', which is specific to + # Apple-GCC. So give it what it expects. + if stdenv.isDarwin + then overrideGCC stdenv gccApple + else stdenv; + }; librdf_raptor = callPackage ../development/libraries/librdf/raptor.nix { }; @@ -4693,6 +4752,10 @@ let inherit readline ncurses; }); + sqliteFull = callPackage ../development/libraries/sqlite/full.nix { + inherit readline ncurses; + }; + stlport = callPackage ../development/libraries/stlport { }; strigi = callPackage ../development/libraries/strigi {}; @@ -4759,6 +4822,8 @@ let vmime = callPackage ../development/libraries/vmime { }; + vrpn = callPackage ../development/libraries/vrpn { }; + vtk = callPackage ../development/libraries/vtk { }; vxl = callPackage ../development/libraries/vxl { @@ -4782,7 +4847,7 @@ let perl = perl510; }; - webkit_gtk2 = + webkit_gtk2 = builderDefsPackage ../development/libraries/webkit/gtk2.nix { inherit (gnome) gtkdoc libsoup; inherit gtk atk pango glib; @@ -4822,12 +4887,7 @@ let withMesa = lib.elem system lib.platforms.mesaPlatforms; }; - wxGTK290 = callPackage ../development/libraries/wxGTK-2.9/2.9.0.nix { - inherit (gnome) GConf; - withMesa = lib.elem system lib.platforms.mesaPlatforms; - }; - - wxGTK291 = callPackage ../development/libraries/wxGTK-2.9/2.9.1.nix { + wxGTK29 = callPackage ../development/libraries/wxGTK-2.9/default.nix { inherit (gnome) GConf; withMesa = lib.elem system lib.platforms.mesaPlatforms; }; @@ -5254,12 +5314,12 @@ let cups = null; acl = null; openldap = null; + + # libunwind 1.0.1 is not ported to GNU/Hurd. + libunwind = null; }; - shishi = callPackage ../servers/shishi { - # GNU Shishi 1.0.0 fails to build with GnuTLS 3.x. - gnutls = gnutls2; - }; + shishi = callPackage ../servers/shishi { }; sipwitch = callPackage ../servers/sip/sipwitch { }; @@ -5357,14 +5417,6 @@ let cramfsswap = callPackage ../os-specific/linux/cramfsswap { }; - darwinArchUtility = callPackage ../os-specific/darwin/arch { }; - - darwinSwVersUtility = callPackage ../os-specific/darwin/sw_vers { }; - - darwinLipoUtility = callPackage ../os-specific/darwin/lipo { }; - - darwinInstallNameToolUtility = callPackage ../os-specific/darwin/install_name_tool { }; - devicemapper = lvm2; dmidecode = callPackage ../os-specific/linux/dmidecode { }; @@ -5412,6 +5464,8 @@ let eject = callPackage ../os-specific/linux/eject { }; + ffado = callPackage ../os-specific/linux/ffado { }; + fbterm = builderDefsPackage (import ../os-specific/linux/fbterm) { inherit fontconfig gpm freetype pkgconfig ncurses; }; @@ -5442,7 +5496,6 @@ let # GNU/Hurd core packages. gnu = recurseIntoAttrs (callPackage ../os-specific/gnu { - callPackage = newScope pkgs.gnu; inherit platform crossSystem; }); @@ -5641,7 +5694,6 @@ let kernelPatches.sec_perm_2_6_24 kernelPatches.aufs2_1_2_6_38 kernelPatches.cifs_timeout_2_6_38 - #kernelPatches.mips_restart_2_6_36 ]; }; @@ -5653,7 +5705,6 @@ let [ #kernelPatches.fbcondecor_2_6_38 kernelPatches.sec_perm_2_6_24 kernelPatches.aufs2_1_2_6_39 - #kernelPatches.mips_restart_2_6_36 ]; }; @@ -5664,7 +5715,6 @@ let kernelPatches.sec_perm_2_6_24 kernelPatches.aufs3_0 #kernelPatches.aufs2_1_3_0 - #kernelPatches.mips_restart_2_6_36 ]; }; @@ -5674,7 +5724,6 @@ let [ #kernelPatches.fbcondecor_2_6_38 kernelPatches.sec_perm_2_6_24 kernelPatches.aufs3_1 - #kernelPatches.mips_restart_2_6_36 ]; }; @@ -5684,7 +5733,7 @@ let [ #kernelPatches.fbcondecor_2_6_38 kernelPatches.sec_perm_2_6_24 kernelPatches.aufs3_2 - #kernelPatches.mips_restart_2_6_36 + kernelPatches.cifs_timeout_2_6_38 ]; }; @@ -5695,7 +5744,6 @@ let kernelPatches.sec_perm_2_6_24 kernelPatches.aufs3_3 kernelPatches.efi_bootstub_config_3_3 - #kernelPatches.mips_restart_2_6_36 ]; }; @@ -5830,7 +5878,7 @@ let # The current default kernel / kernel modules. linux = linuxPackages.kernel; - linuxPackages = linuxPackages_2_6_35; + linuxPackages = linuxPackages_3_2; keyutils = callPackage ../os-specific/linux/keyutils { }; @@ -5957,7 +6005,6 @@ let pwdutils = callPackage ../os-specific/linux/pwdutils { }; qemu_kvm = callPackage ../os-specific/linux/qemu-kvm { }; - qemu_kvm_1_0 = callPackage ../os-specific/linux/qemu-kvm/1.0.nix { }; firmwareLinuxNonfree = callPackage ../os-specific/linux/firmware/firmware-linux-nonfree { }; @@ -6286,6 +6333,7 @@ let ### APPLICATIONS + a2jmidid = callPackage ../applications/audio/a2jmidid { }; aangifte2005 = callPackage_i686 ../applications/taxes/aangifte-2005 { }; @@ -6325,10 +6373,7 @@ let audacious = callPackage ../applications/audio/audacious { }; - audacity = callPackage ../applications/audio/audacity { - portaudio = portaudioSVN; - ffmpeg = ffmpeg_0_6_90; - }; + audacity = callPackage ../applications/audio/audacity { }; aumix = callPackage ../applications/audio/aumix { gtkGUI = false; @@ -6503,20 +6548,35 @@ let emacs = emacs23; emacs22 = callPackage ../applications/editors/emacs-22 { - /* Using cpp 4.5, we get: + stdenv = + if stdenv.isDarwin - make[1]: Entering directory `/tmp/nix-build-dhbj8qqmqxwp3iw6sjcgafsrwlwrix1f-emacs-22.3.drv-0/emacs-22.3/lib-src' - Makefile:148: *** recipe commences before first target. Stop. + /* On Darwin, use Apple-GCC, otherwise: + configure: error: C preprocessor "cc -E -no-cpp-precomp" fails sanity check */ + then overrideGCC stdenv gccApple + + /* Using cpp 4.5, we get: + + make[1]: Entering directory `/tmp/nix-build-dhbj8qqmqxwp3iw6sjcgafsrwlwrix1f-emacs-22.3.drv-0/emacs-22.3/lib-src' + Makefile:148: *** recipe commences before first target. Stop. + + Apparently, this is because `lib-src/Makefile' is generated by + processing `lib-src/Makefile.in' with cpp, and the escaping rules for + literal backslashes have changed. */ + else overrideGCC stdenv gcc44; - Apparently, this is because `lib-src/Makefile' is generated by - processing `lib-src/Makefile.in' with cpp, and the escaping rules for - literal backslashes have changed. */ - stdenv = overrideGCC stdenv gcc44; xaw3dSupport = getConfig [ "emacs" "xaw3dSupport" ] false; gtkGUI = getConfig [ "emacs" "gtkSupport" ] true; }; emacs23 = callPackage ../applications/editors/emacs-23 { + stdenv = + if stdenv.isDarwin + /* On Darwin, use Apple-GCC, otherwise: + configure: error: C preprocessor "cc -E -no-cpp-precomp" fails sanity check */ + then overrideGCC stdenv gccApple + else stdenv; + # use override to select the appropriate gui toolkit libXaw = if stdenv.isDarwin then xlibs.libXaw else null; Xaw3d = null; @@ -6685,7 +6745,7 @@ let firefoxWrapper = wrapFirefox { browser = pkgs.firefox; }; - firefoxPkgs = pkgs.firefox11Pkgs; + firefoxPkgs = pkgs.firefox12Pkgs; firefox36Pkgs = callPackage ../applications/networking/browsers/firefox/3.6.nix { inherit (gnome) libIDL; @@ -6693,12 +6753,6 @@ let firefox36Wrapper = wrapFirefox { browser = firefox36Pkgs.firefox; }; - firefox9Pkgs = callPackage ../applications/networking/browsers/firefox/9.0.nix { - inherit (gnome) libIDL; - }; - - firefox9Wrapper = wrapFirefox { browser = firefox9Pkgs.firefox; }; - firefox10Pkgs = callPackage ../applications/networking/browsers/firefox/10.0.nix { inherit (gnome) libIDL; }; @@ -6711,6 +6765,12 @@ let firefox11Wrapper = wrapFirefox { browser = firefox11Pkgs.firefox; }; + firefox12Pkgs = callPackage ../applications/networking/browsers/firefox/12.0.nix { + inherit (gnome) libIDL; + }; + + firefox12Wrapper = wrapFirefox { browser = firefox12Pkgs.firefox; }; + flac = callPackage ../applications/audio/flac { }; flashplayer = flashplayer11; @@ -6792,7 +6852,7 @@ let gmu = callPackage ../applications/audio/gmu { }; gnash = callPackage ../applications/video/gnash { - xulrunner = icecatXulrunner3; + xulrunner = firefoxPkgs.xulrunner; inherit (gnome) gtkglext; }; @@ -6846,6 +6906,8 @@ let geeqie = callPackage ../applications/graphics/geeqie { }; + gigedit = callPackage ../applications/audio/gigedit { }; + gqview = callPackage ../applications/graphics/gqview { }; gmtk = callPackage ../applications/networking/browsers/mozilla-plugins/gmtk { @@ -6882,6 +6944,14 @@ let hydrogen = callPackage ../applications/audio/hydrogen { }; + i3 = callPackage ../applications/window-managers/i3 { }; + + i3lock = callPackage ../applications/window-managers/i3/lock.nix { + cairo = cairo.override { xcbSupport = true; }; + }; + + i3status = callPackage ../applications/window-managers/i3/status.nix { }; + i810switch = callPackage ../os-specific/linux/i810switch { }; icecat3 = lowPrio (callPackage ../applications/networking/browsers/icecat-3 { @@ -6984,6 +7054,8 @@ let fftw = fftwSinglePrec; }; + lci = callPackage ../applications/science/logic/lci {}; + ldcpp = callPackage ../applications/networking/p2p/ldcpp { inherit (gnome) libglade; }; @@ -7016,6 +7088,8 @@ let inherit (gnome) libglade; }; + linuxsampler = callPackage ../applications/audio/linuxsampler { }; + lmms = callPackage ../applications/audio/lmms { }; lxdvdrip = callPackage ../applications/video/lxdvdrip { }; @@ -7100,6 +7174,8 @@ let inherit (xlibs) libX11 xproto; }; + easytag = callPackage ../applications/audio/easytag { }; + mp3info = callPackage ../applications/audio/mp3info { }; mpc123 = callPackage ../applications/audio/mpc123 { }; @@ -7213,6 +7289,8 @@ let pdftk = callPackage ../tools/typesetting/pdftk { }; + pianobooster = callPackage ../applications/audio/pianobooster { }; + pidgin = callPackage ../applications/networking/instant-messengers/pidgin { openssl = if (getConfig ["pidgin" "openssl"] true) then openssl else null; gnutls = if (getConfig ["pidgin" "gnutls"] false) then gnutls else null; @@ -7268,6 +7346,8 @@ let qemuImage = callPackage ../applications/virtualization/qemu/linux-img { }; + qsampler = callPackage ../applications/audio/qsampler { }; + qsynth = callPackage ../applications/audio/qsynth { }; qtpfsgui = callPackage ../applications/graphics/qtpfsgui { }; @@ -7655,7 +7735,7 @@ let pyrex = pyrex095; }; - xscreensaver = callPackage ../applications/graphics/xscreensaver { + xscreensaver = callPackage ../misc/screensavers/xscreensaver { inherit (gnome) libglade; }; @@ -7717,6 +7797,8 @@ let blackshadeselite = callPackage ../games/blackshadeselite { }; + blobby = callPackage ../games/blobby {}; + bsdgames = callPackage ../games/bsdgames { }; btanks = callPackage ../games/btanks { }; @@ -7817,6 +7899,8 @@ let zlib = zlibStatic; }; + opentyrian = callPackage ../games/opentyrian { }; + pioneers = callPackage ../games/pioneers { }; pong3d = callPackage ../games/pong3d { }; @@ -8043,12 +8127,8 @@ let kdesvn = callPackage ../applications/version-management/kdesvn { }; kdevelop = callPackage ../applications/editors/kdevelop { }; - kdevelop_4_3 = callPackage ../applications/editors/kdevelop/4.3.0.nix { - kdevplatform = self.kdevplatform_1_3; - }; kdevplatform = callPackage ../development/libraries/kdevplatform { }; - kdevplatform_1_3 = callPackage ../development/libraries/kdevplatform/1.3.0.nix { }; kdiff3 = callPackage ../tools/text/kdiff3 { }; @@ -8359,6 +8439,8 @@ let darcnes = callPackage ../misc/emulators/darcnes { }; + dbacl = callPackage ../tools/misc/dbacl { }; + dblatex = callPackage ../tools/typesetting/tex/dblatex { }; dosbox = callPackage ../misc/emulators/dosbox { }; @@ -8443,6 +8525,11 @@ let nixUnstable = callPackage ../tools/package-management/nix/unstable.nix { storeDir = getConfig [ "nix" "storeDir" ] "/nix/store"; stateDir = getConfig [ "nix" "stateDir" ] "/nix/var"; + stdenv = + if stdenv.isDarwin + # When building the Perl bindings, `-no-cpp-precomp' is used. + then overrideGCC stdenv gccApple + else stdenv; }; nixSqlite = nixUnstable; @@ -8608,6 +8695,7 @@ let vimprobable2 = callPackage ../applications/networking/browsers/vimprobable2 { inherit (gnome) libsoup; + webkit = webkit_gtk2; }; vimprobable2Wrapper = wrapFirefox diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b7271f41898..7ae1a202c70 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -140,24 +140,24 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haskellSrc = self.haskellSrc_1_0_1_5; # 7.4.1 ok html = self.html_1_0_1_2; # 7.4.1 ok HUnit = self.HUnit_1_2_4_2; # 7.4.1 ok - network = self.network_2_3_0_11; # 7.4.1 ok + network = self.network_2_3_0_13; # 7.4.1 ok OpenGL = self.OpenGL_2_5_0_0; # 7.4.1 ok parallel = self.parallel_3_2_0_2; # 7.4.1 ok parsec = self.parsec_3_1_2; # 7.4.1 ok QuickCheck = self.QuickCheck_2_4_2; # 7.4.1 ok regexBase = self.regexBase_0_93_2; # 7.4.1 ok - regexCompat = self.regexCompat_0_93_1; # 7.4.1 ok + regexCompat = self.regexCompat_0_95_1; # 7.4.1 ok regexPosix = self.regexPosix_0_95_1; # 7.4.1 ok stm = self.stm_2_3; # 7.4.1 ok - syb = self.syb_0_3_6; # 7.4.1 ok + syb = self.syb_0_3_6_1; # 7.4.1 ok xhtml = self.xhtml_3000_2_0_5; # 7.4.1 ok zlib = self.zlib_0_5_3_3; # 7.4.1 ok - HTTP = self.HTTP_4000_2_2; # 7.4.1 ok - text = self.text_0_11_1_13; # 7.4.1 ok + HTTP = self.HTTP_4000_2_3; # 7.4.1 ok + text = self.text_0_11_2_0; # 7.4.1 ok transformers = self.transformers_0_2_2_0; # 7.4.1 ok mtl = self.mtl_2_0_1_0; # 7.4.1 ok random = self.random_1_0_1_1; # 7.4.1 ok - cabalInstall = self.cabalInstall_0_10_2; # 7.4.1 fails + cabalInstall = self.cabalInstall_0_14_0; # 7.4.1 ok alex = self.alex_3_0_1; # 7.4.1 ok happy = self.happy_1_18_9; # 7.4.1 ok haddock = self.haddock_2_10_0; # 7.4.1 ok @@ -210,6 +210,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haskellPlatform = self.haskellPlatform_2011_4_0_0; mtl1 = self.mtl_1_1_1_1; repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u + cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; }; }; haskellPlatform_2011_4_0_0 = @@ -252,6 +253,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haskellPlatform = self.haskellPlatform_2011_2_0_1; mtl1 = self.mtl_1_1_1_1; repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u + cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; }; }; haskellPlatform_2011_2_0_1 = @@ -294,6 +296,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haskellPlatform = self.haskellPlatform_2011_2_0_0; mtl1 = self.mtl_1_1_1_1; repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u + cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; }; }; haskellPlatform_2011_2_0_0 = @@ -332,6 +335,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); self : self.haskellPlatformArgs_2010_2_0_0 self // { haskellPlatform = self.haskellPlatform_2010_2_0_0; repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u + cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; }; deepseq = self.deepseq_1_1_0_2; # deviating from Haskell platform here, to make some packages (notably statistics) compile }; @@ -412,6 +416,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); extensibleExceptions = self.extensibleExceptions_0_1_1_0; text = self.text_0_11_0_6; repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u + cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; }; deepseq = self.deepseq_1_1_0_2; # deviating from Haskell platform here, to make some packages (notably statistics) compile }; @@ -487,6 +492,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); blazeHtml = callPackage ../development/libraries/haskell/blaze-html {}; + blazeMarkup = callPackage ../development/libraries/haskell/blaze-markup {}; + blazeTextual = callPackage ../development/libraries/haskell/blaze-textual {}; bloomfilter = callPackage ../development/libraries/haskell/bloomfilter {}; @@ -564,10 +571,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cprngAes = callPackage ../development/libraries/haskell/cprng-aes {}; - criterion = callPackage ../development/libraries/haskell/criterion { - mtl = self.mtl2; - parsec = self.parsec3; - }; + criterion = callPackage ../development/libraries/haskell/criterion {}; Crypto = callPackage ../development/libraries/haskell/Crypto {}; @@ -587,6 +591,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); curl = callPackage ../development/libraries/haskell/curl { curl = pkgs.curl; }; + cpu = callPackage ../development/libraries/haskell/cpu {}; + dataAccessor = callPackage ../development/libraries/haskell/data-accessor/data-accessor.nix {}; dataAccessorTemplate = callPackage ../development/libraries/haskell/data-accessor/data-accessor-template.nix {}; @@ -637,6 +643,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); dstring = callPackage ../development/libraries/haskell/dstring {}; + editDistance = callPackage ../development/libraries/haskell/edit-distance {}; + editline = callPackage ../development/libraries/haskell/editline {}; emailValidate = callPackage ../development/libraries/haskell/email-validate {}; @@ -681,6 +689,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); fgl_5_4_2_4 = callPackage ../development/libraries/haskell/fgl/5.4.2.4.nix {}; fgl = self.fgl_5_4_2_4; + fglVisualize = callPackage ../development/libraries/haskell/fgl-visualize {}; + fingertree = callPackage ../development/libraries/haskell/fingertree {}; gamma = callPackage ../development/libraries/haskell/gamma {}; @@ -751,7 +761,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); libc = pkgs.stdenv.gcc.libc; }; - gtk2hsBuildtools = callPackage ../development/libraries/haskell/gtk2hs-buildtools {}; + gtk2hsBuildtools_0_12_1 = callPackage ../development/libraries/haskell/gtk2hs-buildtools/0.12.1.nix {}; + gtk2hsBuildtools_0_12_3 = callPackage ../development/libraries/haskell/gtk2hs-buildtools/0.12.3.nix {}; + gtk2hsBuildtools = self.gtk2hsBuildtools_0_12_1; gtk2hsC2hs = self.gtk2hsBuildtools; gtksourceview2 = callPackage ../development/libraries/haskell/gtksourceview2 { @@ -796,8 +808,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haskellSrc = self.haskellSrc_1_0_1_5; haskellSrcExts_1_11_1 = callPackage ../development/libraries/haskell/haskell-src-exts/1.11.1.nix {}; - haskellSrcExts_1_13_0 = callPackage ../development/libraries/haskell/haskell-src-exts/1.13.0.nix {}; - haskellSrcExts = self.haskellSrcExts_1_13_0; + haskellSrcExts_1_13_2 = callPackage ../development/libraries/haskell/haskell-src-exts/1.13.2.nix {}; + haskellSrcExts = self.haskellSrcExts_1_13_2; haskellSrcMeta = callPackage ../development/libraries/haskell/haskell-src-meta {}; @@ -809,7 +821,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); HTTP_4000_1_2 = callPackage ../development/libraries/haskell/HTTP/4000.1.2.nix {}; HTTP_4000_2_1 = callPackage ../development/libraries/haskell/HTTP/4000.2.1.nix {}; HTTP_4000_2_2 = callPackage ../development/libraries/haskell/HTTP/4000.2.2.nix {}; - HTTP = self.HTTP_4000_2_2; + HTTP_4000_2_3 = callPackage ../development/libraries/haskell/HTTP/4000.2.3.nix {}; + HTTP = self.HTTP_4000_2_3; hackageDb = callPackage ../development/libraries/haskell/hackage-db {}; @@ -897,8 +910,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); httpDate = callPackage ../development/libraries/haskell/http-date {}; - httpEnumerator = callPackage ../development/libraries/haskell/http-enumerator {}; - httpTypes = callPackage ../development/libraries/haskell/http-types {}; HUnit_1_2_0_3 = callPackage ../development/libraries/haskell/HUnit/1.2.0.3.nix {}; @@ -986,9 +997,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); MonadCatchIOTransformers = callPackage ../development/libraries/haskell/MonadCatchIO-transformers {}; - monadControl_0_2_0_3 = callPackage ../development/libraries/haskell/monad-control/0.2.0.3.nix {}; - monadControl_0_3_1_1 = callPackage ../development/libraries/haskell/monad-control/0.3.1.1.nix {}; - monadControl = self.monadControl_0_3_1_1; + monadControl = callPackage ../development/libraries/haskell/monad-control {}; + + monadcryptorandom = callPackage ../development/libraries/haskell/monadcryptorandom {}; monadLoops = callPackage ../development/libraries/haskell/monad-loops {}; @@ -1002,18 +1013,19 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); monadsTf = callPackage ../development/libraries/haskell/monads-tf {}; - mongoDB = callPackage ../development/libraries/haskell/mongoDB { - monadControl = self.monadControl_0_2_0_3; - }; + mongoDB = callPackage ../development/libraries/haskell/mongoDB {}; mpppc = callPackage ../development/libraries/haskell/mpppc {}; mtl_1_1_0_2 = callPackage ../development/libraries/haskell/mtl/1.1.0.2.nix {}; mtl_1_1_1_1 = callPackage ../development/libraries/haskell/mtl/1.1.1.1.nix {}; mtl_2_0_1_0 = callPackage ../development/libraries/haskell/mtl/2.0.1.0.nix {}; + mtl_2_1_1 = callPackage ../development/libraries/haskell/mtl/2.1.1.nix { + transformers = self.transformers_0_3_0_0; + }; mtl1 = self.mtl_1_1_0_2; - mtl2 = self.mtl_2_0_1_0; - mtl = self.mtl1; + mtl2 = self.mtl_2_1_1; + mtl = self.mtl2; mtlparse = callPackage ../development/libraries/haskell/mtlparse {}; @@ -1035,8 +1047,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); network_2_2_1_7 = callPackage ../development/libraries/haskell/network/2.2.1.7.nix {}; network_2_3_0_2 = callPackage ../development/libraries/haskell/network/2.3.0.2.nix {}; network_2_3_0_5 = callPackage ../development/libraries/haskell/network/2.3.0.5.nix {}; - network_2_3_0_11 = callPackage ../development/libraries/haskell/network/2.3.0.11.nix {}; - network = self.network_2_3_0_11; + network_2_3_0_13 = callPackage ../development/libraries/haskell/network/2.3.0.13.nix {}; + network = self.network_2_3_0_13; + + networkConduit = callPackage ../development/libraries/haskell/network-conduit {}; nonNegative = callPackage ../development/libraries/haskell/non-negative {}; @@ -1061,9 +1075,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); OpenGLRaw = callPackage ../development/libraries/haskell/OpenGLRaw {}; - pathPieces_0_0_0 = callPackage ../development/libraries/haskell/path-pieces/0.0.0.nix {}; - pathPieces_0_1_0 = callPackage ../development/libraries/haskell/path-pieces/0.1.0.nix {}; - pathPieces = self.pathPieces_0_1_0; + pathPieces = callPackage ../development/libraries/haskell/path-pieces {}; pandoc = callPackage ../development/libraries/haskell/pandoc {}; @@ -1097,6 +1109,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); pcreLight = callPackage ../development/libraries/haskell/pcre-light {}; + pem = callPackage ../development/libraries/haskell/pem {}; + permutation = callPackage ../development/libraries/haskell/permutation {}; persistent = callPackage ../development/libraries/haskell/persistent {}; @@ -1158,6 +1172,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); rvar = callPackage ../development/libraries/haskell/rvar {}; + reactiveBanana = callPackage ../development/libraries/haskell/reactive-banana {}; + readline = callPackage ../development/libraries/haskell/readline { inherit (pkgs) readline; }; @@ -1200,13 +1216,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); regular = callPackage ../development/libraries/haskell/regular {}; repa = callPackage ../development/libraries/haskell/repa {}; - repaAlgorithms = callPackage ../development/libraries/haskell/repa-algorithms {}; - - repaBytestring = callPackage ../development/libraries/haskell/repa-bytestring {}; - repaExamples = callPackage ../development/libraries/haskell/repa-examples {}; - repaIo = callPackage ../development/libraries/haskell/repa-io {}; RepLib = callPackage ../development/libraries/haskell/RepLib {}; @@ -1250,11 +1261,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); stringCombinators = callPackage ../development/libraries/haskell/string-combinators {}; syb_0_2_2 = callPackage ../development/libraries/haskell/syb/0.2.2.nix {}; - syb_0_3 = callPackage ../development/libraries/haskell/syb/0.3.nix {}; + syb_0_3 = callPackage ../development/libraries/haskell/syb/0.3.nix {}; syb_0_3_3 = callPackage ../development/libraries/haskell/syb/0.3.3.nix {}; - syb_0_3_6 = callPackage ../development/libraries/haskell/syb/0.3.6.nix {}; - syb = null; # by default, we assume that syb ships with GHC, which is - # true for the older GHC versions + syb_0_3_6_1 = callPackage ../development/libraries/haskell/syb/0.3.6.1.nix {}; + syb = null; # by default, we assume that syb ships with GHC, which is + # true for the older GHC versions sybWithClass = callPackage ../development/libraries/haskell/syb/syb-with-class.nix {}; @@ -1354,7 +1365,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); text_0_11_0_6 = callPackage ../development/libraries/haskell/text/0.11.0.6.nix {}; text_0_11_1_5 = callPackage ../development/libraries/haskell/text/0.11.1.5.nix {}; text_0_11_1_13 = callPackage ../development/libraries/haskell/text/0.11.1.13.nix {}; - text = self.text_0_11_1_13; + text_0_11_2_0 = callPackage ../development/libraries/haskell/text/0.11.2.0.nix {}; + text = self.text_0_11_2_0; thespian = callPackage ../development/libraries/haskell/thespian {}; @@ -1423,9 +1435,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); vectorSpace = callPackage ../development/libraries/haskell/vector-space {}; - vty = callPackage ../development/libraries/haskell/vty { - mtl = self.mtl2; - }; + void = callPackage ../development/libraries/haskell/void {}; + + vty = callPackage ../development/libraries/haskell/vty {}; wai = callPackage ../development/libraries/haskell/wai {}; @@ -1460,11 +1472,17 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); wx = callPackage ../development/libraries/haskell/wxHaskell/wx.nix {}; - wxcore = callPackage ../development/libraries/haskell/wxHaskell/wxcore.nix { - wxGTK = pkgs.wxGTK28; + wxc = callPackage ../development/libraries/haskell/wxHaskell/wxc.nix { + wxGTK = pkgs.wxGTK29; }; - wxdirect = callPackage ../development/libraries/haskell/wxHaskell/wxdirect.nix {}; + wxcore = callPackage ../development/libraries/haskell/wxHaskell/wxcore.nix { + wxGTK = pkgs.wxGTK29; + }; + + wxdirect = callPackage ../development/libraries/haskell/wxHaskell/wxdirect.nix { + time = self.time_1_2_0_5; + }; X11_1_5_0_1 = callPackage ../development/libraries/haskell/X11/1.5.0.1.nix {}; X11_1_6_0 = callPackage ../development/libraries/haskell/X11/1.6.0.nix {}; @@ -1493,9 +1511,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); yesodAuth = callPackage ../development/libraries/haskell/yesod-auth {}; - yesodCore = callPackage ../development/libraries/haskell/yesod-core { - pathPieces = self.pathPieces_0_0_0; - }; + yesodCore = callPackage ../development/libraries/haskell/yesod-core {}; yesodDefault = callPackage ../development/libraries/haskell/yesod-default {}; @@ -1531,15 +1547,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); }; zlib = self.zlib_0_5_3_3; - zlibBindings_0_0_3_2 = callPackage ../development/libraries/haskell/zlib-bindings/0.0.3.2.nix {}; - zlibBindings_0_1_0_1 = callPackage ../development/libraries/haskell/zlib-bindings/0.1.0.1.nix {}; - zlibBindings = self.zlibBindings_0_0_3_2; + zlibBindings = callPackage ../development/libraries/haskell/zlib-bindings {}; zlibConduit = callPackage ../development/libraries/haskell/zlib-conduit {}; - zlibEnum = callPackage ../development/libraries/haskell/zlib-enum { - zlibBindings = self.zlibBindings_0_0_3_2; - }; + zlibEnum = callPackage ../development/libraries/haskell/zlib-enum {}; Zwaluw = callPackage ../development/libraries/haskell/Zwaluw {}; @@ -1602,7 +1614,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); hslogger = callPackage ../development/tools/haskell/hslogger {}; - SourceGraph = callPackage ../development/tools/haskell/SourceGraph {}; + SourceGraph = callPackage ../development/tools/haskell/SourceGraph { + haskellSrcExts = self.haskellSrcExts_1_11_1; + }; tar_0_3_2_0 = callPackage ../development/tools/haskell/tar/0.3.2.0.nix {}; tar_0_4_0_0 = callPackage ../development/tools/haskell/tar/0.4.0.0.nix {}; @@ -1617,7 +1631,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); # Applications. darcs = callPackage ../applications/version-management/darcs { - regexCompat = self.regexCompat93; tar = self.tar_0_3_2_0; }; @@ -1632,9 +1645,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); }; }; - xmobar = callPackage ../applications/misc/xmobar { - parsec = self.parsec3; - }; + xmobar = callPackage ../applications/misc/xmobar {}; xmonad = callPackage ../applications/window-managers/xmonad { X11 = self.X11_1_5_0_1; @@ -1659,7 +1670,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cabalInstall_0_8_0 = callPackage ../tools/package-management/cabal-install/0.8.0.nix {}; cabalInstall_0_8_2 = callPackage ../tools/package-management/cabal-install/0.8.2.nix {}; cabalInstall_0_10_2 = callPackage ../tools/package-management/cabal-install/0.10.2.nix {}; - cabalInstall = self.cabalInstall_0_6_2; + cabalInstall_0_14_0 = callPackage ../tools/package-management/cabal-install/0.14.0.nix {}; + cabalInstall = self.cabalInstall_0_14_0; lhs2tex = callPackage ../tools/typesetting/lhs2tex {}; diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index fad3993ddc1..9f97b49ebb0 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -69,6 +69,7 @@ releaseTools.makeSourceTarball { mkdir -p $out/tarballs mkdir ../$releaseName cp -prd . ../$releaseName + echo nixpkgs > ../$releaseName/channel-name (cd .. && tar cfa $out/tarballs/$releaseName.tar.bz2 $releaseName) || false (cd .. && tar cfa $out/tarballs/$releaseName.tar.lzma $releaseName) || false diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9e38bbba10d..bfd90c4cf5c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -213,10 +213,10 @@ rec { }; CacheFastMmap = buildPerlPackage rec { - name = "Cache-FastMmap-1.39"; + name = "Cache-FastMmap-1.40"; src = fetchurl { url = "mirror://cpan/modules/by-module/Cache/${name}.tar.gz"; - sha256 = "0dq93pz6lqya26pzgpgfa7c7i67h8rg0ylshzmvqzq4brqjpbqsk"; + sha256 = "0h3ckr04cdn6dvl40m4m97vl5ybf30v1lwhw3jvkr92kpksvq4hd"; }; }; @@ -478,10 +478,10 @@ rec { }; CatalystPluginSession = buildPerlPackage rec { - name = "Catalyst-Plugin-Session-0.32"; + name = "Catalyst-Plugin-Session-0.34"; src = fetchurl { url = "mirror://cpan/modules/by-module/Catalyst/${name}.tar.gz"; - sha256 = "1pyrvwfan3qiaixbii57q4g34r9i1v61c5rfri6c25wryfh4f2bj"; + sha256 = "0vgm3pjymzxqnjn8cj8ld1wprwj3hq15n26djvjmnx6pwyf2ffgz"; }; buildInputs = [ TestMockObject TestDeep ]; propagatedBuildInputs = @@ -499,10 +499,10 @@ rec { }; CatalystPluginSessionStoreFastMmap = buildPerlPackage rec { - name = "Catalyst-Plugin-Session-Store-FastMmap-0.14"; + name = "Catalyst-Plugin-Session-Store-FastMmap-0.16"; src = fetchurl { url = "mirror://cpan/modules/by-module/Catalyst/${name}.tar.gz"; - sha256 = "1ywm96k1kpw9vbh7ihrxlfnfc5s4frb37cbix7xxlfz2vk10jw0d"; + sha256 = "0x3j6zv3wr41jlwr6yb2jpmcx019ibyn11y8653ffnwhpzbpzsxs"; }; propagatedBuildInputs = [ PathClass CatalystPluginSession CacheFastMmap MROCompat ]; @@ -1597,7 +1597,7 @@ rec { Graph = buildPerlPackage rec { name = "Graph-0.94"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JH/JHI/modules/${name}.tar.gz"; + url = "mirror://cpan/authors/id/J/JH/JHI/${name}.tar.gz"; sha256 = "1lyfl9s4mkhahnpxk2z5v6j750jqb4sls56b9rnkl5lni9ms7xgn"; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 32505c106b4..5580386bbbd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4,7 +4,7 @@ let pythonPackages = python.modules // rec { inherit python; - inherit (pkgs) fetchurl fetchsvn stdenv; + inherit (pkgs) fetchurl fetchsvn fetchgit stdenv; buildPythonPackage = import ../development/python-modules/generic { @@ -32,6 +32,60 @@ let pythonPackages = python.modules // rec { ../development/python-modules/generic/wrap.sh; + afew = buildPythonPackage rec { + rev = "a3ea63d7048faedb6cc58b4abcb6d4ecfddfb5db"; + name = "afew-1.0pre${rev}"; + src = fetchurl { + url = "https://github.com/teythoon/afew/tarball/${rev}"; + name = "${name}.tar.bz"; + sha256 = "4e8850242a3845602331cabb47299b5a3af21993036a715c83e8dd698ab5d716"; + }; + + propagatedBuildInputs = [ notmuch pkgs.dbacl ]; + + doCheck = false; + + postInstall = '' + wrapProgram $out/bin/afew \ + --prefix LD_LIBRARY_PATH : ${pkgs.notmuch}/lib + ''; + + meta = { + homepage = https://github.com/teythoon/afew; + description = "afew is an initial tagging script for notmuch mail."; + maintainers = [ stdenv.lib.maintainers.garbas ]; + platforms = python.meta.platforms; + }; + }; + + + alot = buildPythonPackage rec { + name = "alot-0.3"; + + src = fetchurl { + url = "https://github.com/pazz/alot/tarball/0.3"; + name = "${name}.tar.bz"; + md5 = "fa4944a1a7e9e380da0ee75ea3571a79"; + }; + + doCheck = false; + + propagatedBuildInputs = [ notmuch urwid twisted magic configobj ]; + + postInstall = '' + wrapProgram $out/bin/alot \ + --prefix LD_LIBRARY_PATH : ${pkgs.notmuch}/lib:${pkgs.file511}/lib + ''; + + meta = { + homepage = https://github.com/pazz/alot; + description = "Terminal MUA using notmuch mail"; + maintainers = [ stdenv.lib.maintainers.garbas ]; + platforms = python.meta.platforms; + }; + }; + + anyjson = buildPythonPackage rec { name = "anyjson-0.3.1"; @@ -201,6 +255,25 @@ let pythonPackages = python.modules // rec { }; + bugz = buildPythonPackage (rec { + name = "bugz-0.9.3"; + + src = fetchgit { + url = "git://github.com/williamh/pybugz.git"; + rev = "refs/tags/0.9.3"; + }; + + propagatedBuildInputs = [ argparse python.modules.ssl ]; + + doCheck = false; + + meta = { + homepage = http://www.liquidx.net/pybugz/; + description = "Command line interface for Bugzilla"; + }; + }); + + carrot = buildPythonPackage rec { name = "carrot-0.10.7"; @@ -273,6 +346,25 @@ let pythonPackages = python.modules // rec { }; }); + configobj = buildPythonPackage (rec { + name = "configobj-4.7.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/c/configobj/${name}.tar.gz"; + md5 = "201dbaa732a9049c839f9bb6c27fc7b5"; + }; + + doCheck = false; + + meta = { + description = "Config file reading, writing and validation."; + homepage = http://pypi.python.org/pypi/configobj; + license = pkgs.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.garbas ]; + platforms = python.meta.platforms; + }; + }); + cssutils = buildPythonPackage (rec { name = "cssutils-0.9.7a6"; @@ -368,6 +460,41 @@ let pythonPackages = python.modules // rec { }; }; + dulwich = buildPythonPackage rec { + name = "dulwich-0.8.1"; + + src = fetchurl { + url = "http://samba.org/~jelmer/dulwich/${name}.tar.gz"; + sha256 = "1a1619e9c7e63fe9bdc93356ee893be1016b7ea12ad953f4e1f1f5c0c5056ee8"; + }; + + buildPhase = "make build"; + installCommand = '' + python setup.py install --prefix="$out" --root=/ --record="$out/lib/${python.libPrefix}/site-packages/dulwich/list.txt" --single-version-externally-managed + ''; + doCheck = false; + + meta = { + description = "Simple Python implementation of the Git file formats and protocols."; + homepage = http://samba.org/~jelmer/dulwich/; + }; + }; + + hggit = buildPythonPackage rec { + name = "hg-git-0.3.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/h/hg-git/${name}.tar.gz"; + md5 = "4b15867a07abb0be985177581ce64cee"; + }; + + propagatedBuildInputs = [ dulwich ]; + + meta = { + description = "Push and pull from a Git server using Mercurial."; + homepage = http://hg-git.github.com/; + }; + }; docutils = buildPythonPackage rec { name = "docutils-0.8.1"; @@ -719,17 +846,20 @@ let pythonPackages = python.modules // rec { magic = pkgs.stdenv.mkDerivation rec { - name = "python-${pkgs.file.name}"; + name = "python-${pkgs.file511.name}"; - src = pkgs.file.src; + src = pkgs.file511.src; - buildInputs = [ python pkgs.file ]; + patches = [ ../tools/misc/file/python.patch ]; + buildInputs = [ python pkgs.file511 ]; configurePhase = "cd python"; buildPhase = "python setup.py build"; - installPhase = "python setup.py install --prefix=$out"; + installPhase = '' + python setup.py install --prefix=$out + ''; meta = { description = "A Python wrapper around libmagic"; @@ -1019,6 +1149,28 @@ let pythonPackages = python.modules // rec { }; }); + notmuch = pkgs.stdenv.mkDerivation rec { + name = "python-${pkgs.notmuch.name}"; + + src = pkgs.notmuch.src; + + buildInputs = [ python pkgs.notmuch ]; + #propagatedBuildInputs = [ python pkgs.notmuch ]; + + configurePhase = "cd bindings/python"; + + buildPhase = "python setup.py build"; + + installPhase = "python setup.py install --prefix=$out"; + + meta = { + description = "A Python wrapper around notmuch"; + homepage = http://notmuchmail.org/; + maintainers = [ stdenv.lib.maintainers.garbas ]; + platforms = python.meta.platforms; + }; + }; + numpy = buildPythonPackage ( rec { name = "numpy-1.6.1"; @@ -1027,9 +1179,10 @@ let pythonPackages = python.modules // rec { sha256 = "1pawfmf7j7pd3mjzhmmw9hkglc2qdirrkvv29m5nsmpf2b3ip2vq"; }; - # TODO: add ATLAS=${pkgs.atlas} + patches = [ ../development/python-modules/numpy/no_default_dirs.patch ]; + installCommand = '' - export BLAS=${pkgs.blas} LAPACK=${pkgs.liblapack} + export BLAS=${pkgs.blas} LAPACK=${pkgs.liblapack} ATLAS=${pkgs.atlas} python setup.py build --fcompiler="gnu95" python setup.py install --prefix=$out ''; @@ -1256,6 +1409,7 @@ let pythonPackages = python.modules // rec { }; }; + pyasn1 = buildPythonPackage ({ name = "pyasn1-0.0.11a"; @@ -1275,6 +1429,26 @@ let pythonPackages = python.modules // rec { }; }); + Babel = buildPythonPackage (rec { + name = "Babel-0.9.6"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/B/Babel/${name}.tar.gz"; + sha256 = "4a3a085ecf1fcd2736573538ffa114f1f4331b3bbbdd69381e6e172c49c9750f"; + }; + + doCheck = false; + + meta = { + homepage = http://babel.edgewall.org; + description = "A collection of tools for internationalizing Python applications."; + license = "BSD"; + maintainers = [ stdenv.lib.maintainers.garbas ]; + platforms = stdenv.lib.platforms.linux; + }; + }); + + pycryptopp = buildPythonPackage (rec { name = "pycryptopp-0.5.29"; @@ -1531,11 +1705,11 @@ let pythonPackages = python.modules // rec { pysvn = pkgs.stdenv.mkDerivation { - name = "pysvn-1.7.2"; + name = "pysvn-1.7.6"; src = fetchurl { - url = "http://pysvn.barrys-emacs.org/source_kits/pysvn-1.7.2.tar.gz"; - sha256 = "2b2980d200515e754e00a12d99dbce25c1ea90fddf8cba2bfa354c9305c5e455"; + url = "http://pysvn.barrys-emacs.org/source_kits/pysvn-1.7.6.tar.gz"; + sha256 = "0wwb9h3rw2r8hzqya8mv5z8pgjpa6y3i15a3cccdv2mil44289a7"; }; buildInputs = [ python pkgs.subversion pkgs.apr pkgs.aprutil pkgs.expat pkgs.neon pkgs.openssl ] @@ -1549,6 +1723,7 @@ let pythonPackages = python.modules // rec { python setup.py backport python setup.py configure \ --apr-inc-dir=${pkgs.apr}/include/apr-1 \ + --apu-inc-dir=${pkgs.aprutil}/include/apr-1 \ --apr-lib-dir=${pkgs.apr}/lib \ --svn-root-dir=${pkgs.subversion} '' + (if !stdenv.isDarwin then "" else '' @@ -1947,6 +2122,20 @@ let pythonPackages = python.modules // rec { }; }; + svneverever = buildPythonPackage rec { + name = "svneverever-778489a8"; + + src = pkgs.fetchgit { + url = git://git.goodpoint.de/svneverever.git; + rev = "778489a8c6f07825fb18c9da3892a781c3d659ac"; + sha256 = "41c9da1dab2be7b60bff87e618befdf5da37c0a56287385cb0cbd3f91e452bb6"; + }; + + propagatedBuildInputs = [ pysvn argparse ]; + + doCheck = false; + }; + taskcoach = buildPythonPackage rec { name = "TaskCoach-1.3.8"; @@ -2061,6 +2250,25 @@ let pythonPackages = python.modules // rec { }; }; + urwid = buildPythonPackage (rec { + name = "urwid-1.0.1"; + + doCheck = false; + + src = fetchurl { + url = "http://excess.org/urwid/${name}.tar.gz"; + md5 = "828f7144b94920205e755c249d2e297f"; + }; + + meta = { + description = "A full-featured console (xterm et al.) user interface library"; + homepage = http://excess.org/urwid; + license = pkgs.lib.licenses.lgpl21; + maintainers = [ stdenv.lib.maintainers.garbas ]; + platforms = python.meta.platforms; + }; + }); + virtualenv = buildPythonPackage rec { name = "virtualenv-1.6.4"; src = fetchurl { diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 571f468aa0d..67aec37a821 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -40,8 +40,6 @@ with (import ./release-lib.nix); bitlbee = linux; bittorrent = linux; blender = linux; - boost = all; - boostFull = all; bsdiff = all; btrfsProgs = linux; bvi = all; @@ -364,6 +362,7 @@ with (import ./release-lib.nix); firefox36Pkgs.firefox = linux; firefox10Pkgs.firefox = linux; firefox11Pkgs.firefox = linux; + firefox12Pkgs.firefox = linux; gnome = { gnome_panel = linux;