diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-01-20 19:39:28 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-01-20 19:39:28 +0100 |
| commit | ac6761c9081134baaa7dae18f06cbfaca38270d5 (patch) | |
| tree | a1ff0e93e8907624d65aff367496513d3dc47374 /pkgs | |
| parent | 177667eea987898097e854a54962ff90bbf4fa35 (diff) | |
| parent | 8088837dc8f35ef7853787f88bb1db7248900cc4 (diff) | |
Merge master into stdenv-updates
Conflicts: pkgs/applications/version-management/gource/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs')
114 files changed, 1375 insertions, 646 deletions
diff --git a/pkgs/applications/audio/hydrogen/default.nix b/pkgs/applications/audio/hydrogen/default.nix index bb10f24b90a25..74ff2a3407c48 100644 --- a/pkgs/applications/audio/hydrogen/default.nix +++ b/pkgs/applications/audio/hydrogen/default.nix @@ -2,12 +2,12 @@ , libarchive, liblrdf , libsndfile, pkgconfig, qt4, scons, subversion }: stdenv.mkDerivation rec { - version = "0.9.5"; + version = "0.9.5.1"; name = "hydrogen-${version}"; src = fetchurl { url = "mirror://sourceforge/hydrogen/hydrogen-${version}.tar.gz"; - sha256 = "1hyri49va2ss26skd6p9swkx0kbr7ggifbahkrcfgj8yj7pp6g4n"; + sha256 = "1fvyp6gfzcqcc90dmaqbm11p272zczz5pfz1z4lj33nfr7z0bqgb"; }; buildInputs = [ diff --git a/pkgs/applications/audio/jalv/default.nix b/pkgs/applications/audio/jalv/default.nix index fec9baa8695e9..6b15052769beb 100644 --- a/pkgs/applications/audio/jalv/default.nix +++ b/pkgs/applications/audio/jalv/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "jalv-${version}"; - version = "1.4.2"; + version = "1.4.4"; src = fetchurl { url = "http://download.drobilla.net/${name}.tar.bz2"; - sha256 = "132cq347xpa91d9m7nnmpla7gz4xg0njfw7kzwnp0gz172k0klp7"; + sha256 = "1iql1r52rmf87q6jkxhcxa3lpq7idzzg55ma91wphywyvh29q7lf"; }; buildInputs = [ diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix index 8cdb99412f441..5195ddd42a139 100644 --- a/pkgs/applications/audio/lmms/default.nix +++ b/pkgs/applications/audio/lmms/default.nix @@ -1,17 +1,20 @@ -{ stdenv, fetchurl, SDL, alsaLib, cmake, fftw, jackaudio, libogg, -libsamplerate, libsndfile, pkgconfig, pulseaudio, qt4 }: +{ stdenv, fetchurl, SDL, alsaLib, cmake, fftwSinglePrec, jackaudio, libogg +, libsamplerate, libsndfile, pkgconfig, pulseaudio, qt4 +}: stdenv.mkDerivation rec { name = "lmms-${version}"; - version = "0.4.10"; + version = "0.4.15"; src = fetchurl { url = "mirror://sourceforge/lmms/${name}.tar.bz2"; - sha256 = "035cqmxcbr9ipnicdv5l7h05q2hqbavxkbaxyq06ppnv2y7fxwrb"; + sha256 = "02q2gbsqwk3hf9kvzz58a5bxmlb4cfr2mzy41wdvbxxdm2pcl101"; }; - buildInputs = [ SDL alsaLib cmake fftw jackaudio libogg - libsamplerate libsndfile pkgconfig pulseaudio qt4 ]; + buildInputs = [ + SDL alsaLib cmake fftwSinglePrec jackaudio libogg libsamplerate + libsndfile pkgconfig pulseaudio qt4 + ]; meta = with stdenv.lib; { description = "Linux MultiMedia Studio"; diff --git a/pkgs/applications/audio/mda-lv2/default.nix b/pkgs/applications/audio/mda-lv2/default.nix index 8b7d5527372bb..9d3cdc2eea38c 100644 --- a/pkgs/applications/audio/mda-lv2/default.nix +++ b/pkgs/applications/audio/mda-lv2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mda-lv2-${version}"; - version = "1.0.0"; + version = "1.2.2"; src = fetchurl { url = "http://download.drobilla.net/${name}.tar.bz2"; - sha256 = "1dbgvpz9qvlwsfkq9c0dx45bm223wwrzgiddlyln1agpns3qbf0f"; + sha256 = "0hh40c5d2m0k5gb3vw031l6lqn59dg804an3mkmhkc7qv4gc6xm4"; }; buildInputs = [ fftwSinglePrec lv2 pkgconfig python ]; diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix index 96221348f88c2..05e6da223dad0 100644 --- a/pkgs/applications/audio/qsynth/default.nix +++ b/pkgs/applications/audio/qsynth/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "qsynth-${version}"; - version = "0.3.6"; + version = "0.3.8"; src = fetchurl { url = "mirror://sourceforge/qsynth/${name}.tar.gz"; - sha256 = "0g7vaffpgs7v2p71ml5p7fzxz50mhlaklgf9zk4wbfk1hslqv5mm"; + sha256 = "0wmq61cq93x2l00xwr871373mj3dwamz1dg6v62x7s8m1612ndrw"; }; buildInputs = [ alsaLib fluidsynth jackaudio qt4 ]; @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { description = "Fluidsynth GUI"; homepage = http://sourceforge.net/projects/qsynth; license = licenses.gpl2Plus; + platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; }; } diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix index 3c31aff4232c2..e04ad9ddd14c9 100644 --- a/pkgs/applications/audio/qtractor/default.nix +++ b/pkgs/applications/audio/qtractor/default.nix @@ -3,12 +3,12 @@ , libtool, libvorbis, pkgconfig, qt4, rubberband, stdenv }: stdenv.mkDerivation rec { - version = "0.5.4"; + version = "0.5.12"; name = "qtractor-${version}"; src = fetchurl { url = "mirror://sourceforge/qtractor/${name}.tar.gz"; - sha256 = "08vnvjl4w6z49s5shnip0qlwib0gwixw9wrqbazkh62i328fa05l"; + sha256 = "0yf2p9l3hj8pd550v3rbbjqkvxnvn8p6nsnm4aj2v5q4mgg2c8cc"; }; buildInputs = diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix index e2d7adc4a6573..8c73928c79a42 100644 --- a/pkgs/applications/audio/samplv1/default.nix +++ b/pkgs/applications/audio/samplv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "samplv1-${version}"; - version = "0.3.5"; + version = "0.3.6"; src = fetchurl { url = "mirror://sourceforge/samplv1/${name}.tar.gz"; - sha256 = "1q4ggcbbz9lfrjh0ybr3grgipjkq6w5fb9gz5k5cryzz92p7ihw9"; + sha256 = "1fgy9w3mp0p8i1v41a7gmpzzk268k7bp75d4sgzfprikjihc6ary"; }; buildInputs = [ jackaudio libsndfile lv2 qt4 ]; diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix index aadce32dda41c..c93c4c8522565 100644 --- a/pkgs/applications/audio/synthv1/default.nix +++ b/pkgs/applications/audio/synthv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "synthv1-${version}"; - version = "0.3.2"; + version = "0.3.6"; src = fetchurl { url = "mirror://sourceforge/synthv1/${name}.tar.gz"; - sha256 = "1230yf49qfw540yvp5n7sh6mf3k8590pzwc5mragd3nd6k6apgw9"; + sha256 = "1xj4dk1g546f9fv2c4i7g3f1axrxfrxzk9w1nidhj3686j79nyry"; }; buildInputs = [ qt4 jackaudio lv2 ]; diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index bce7e0ef5ee08..698c8dc0ddad2 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -1,19 +1,23 @@ -{ stdenv, fetchurl, alsaLib, boost, cmake, fftwSinglePrec, fltk -, jackaudio, libsndfile, mesa, minixml, pkgconfig, zlib }: +{ stdenv, fetchurl, alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk +, jackaudio, libsndfile, mesa, minixml, pkgconfig, zlib +}: assert stdenv ? glibc; stdenv.mkDerivation rec { name = "yoshimi-${version}"; - version = "0.060.12"; + version = "1.1.0"; src = fetchurl { url = "mirror://sourceforge/yoshimi/${name}.tar.bz2"; - sha256 = "14javywkw6af9z9c7jr06rzdgzncyaz2ab6f0v0k6bgdndlcgslc"; + sha256 = "0rb0q0bqsaaj3imdjgfaigj1kbjqkx1gm91nh2mdgy9i09rygsbv"; }; - buildInputs = [ alsaLib boost fftwSinglePrec fltk jackaudio libsndfile mesa - minixml zlib ]; + buildInputs = [ + alsaLib boost cairo fftwSinglePrec fltk jackaudio libsndfile mesa + minixml zlib + ]; + nativeBuildInputs = [ cmake pkgconfig ]; preConfigure = "cd src"; diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index fcec85b7fe577..378318fbf855b 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -1,26 +1,19 @@ -{ stdenv, fetchurl, alsaLib, cmake, fftw, fltk13, minixml, pkgconfig, zlib }: +{ stdenv, fetchurl, alsaLib, cmake, jackaudio, fftw, fltk13, minixml +, pkgconfig, zlib +}: stdenv.mkDerivation rec { name = "zynaddsubfx-${version}"; - version = "2.4.1"; + version = "2.4.3"; src = fetchurl { url = "mirror://sourceforge/zynaddsubfx/ZynAddSubFX-${version}.tar.bz2"; - sha256 = "1zn5lgh76rrbfj8d4jys2gc1j2pqrbdd18ywfdrk0s7jq4inwyfg"; + sha256 = "0kgmwyh4rhyqdfrdzhbzjjk2hzggkp9c4aac6sy3xv6cc1b5jjxq"; }; - buildInputs = [ alsaLib fftw fltk13 minixml zlib ]; + buildInputs = [ alsaLib jackaudio fftw fltk13 minixml zlib ]; nativeBuildInputs = [ cmake pkgconfig ]; - patches = [ - (fetchurl { - url = http://patch-tracker.debian.org/patch/series/dl/zynaddsubfx/2.4.0-1.2/09_fluid_1.3.patch; - sha256 = "06wl7fs44b24ls1fzh21596n6zzc3ywm2bcdfrkfiiwpzin3yjq6"; - }) - ]; - -#installPhase = "mkdir -pv $out/bin; cp -v zynaddsubfx $out/bin"; - meta = with stdenv.lib; { description = "high quality software synthesizer"; homepage = http://zynaddsubfx.sourceforge.net; diff --git a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix index 9db6e4cb73644..6d10244a87956 100644 --- a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix +++ b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix @@ -1,4 +1,4 @@ -{ clangStdenv, fetchgit, llvm, clangUnwrapped }: +{ clangStdenv, fetchgit, llvmFull }: clangStdenv.mkDerivation { name = "emacs-clang-complete-async-20130218"; @@ -8,7 +8,7 @@ clangStdenv.mkDerivation { sha256 = "1c8zqi6axbsb951azz9iqx3j52j30nd9ypv396hvids3g02cirrf"; }; - buildInputs = [ llvm clangUnwrapped ]; + buildInputs = [ llvmFull ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/graphics/hoodle/default.nix b/pkgs/applications/graphics/hoodle/default.nix new file mode 100644 index 0000000000000..e553875f756cd --- /dev/null +++ b/pkgs/applications/graphics/hoodle/default.nix @@ -0,0 +1,20 @@ +{ cabal, cmdargs, configurator, dyre, filepath, hoodleCore, mtl }: + +cabal.mkDerivation (self: { + pname = "hoodle"; + version = "0.2.2.1"; + sha256 = "1qkyyzfmprhniwarnq6cdmv1r6605b3h2lsc1rlalxhq6jh5gamd"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + cmdargs configurator dyre filepath hoodleCore mtl + ]; + jailbreak = true; + meta = { + homepage = "http://ianwookim.org/hoodle"; + description = "Executable for hoodle"; + license = self.stdenv.lib.licenses.gpl3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ianwookim ]; + }; +}) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 1e16e22c0fe67..7925e865b4a0c 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "calibre-1.17.0"; + name = "calibre-1.20.0"; src = fetchurl { url = "mirror://sourceforge/calibre/${name}.tar.xz"; - sha256 = "1g0kwfr0v4hgwik7hpajdvg1ganyi7hlq6wvq4r5218yvdq5mkzn"; + sha256 = "1i7sybl6in0js8an1zp3mzqv394xnwx79rmv1hj7g6abpsqhjpj7"; }; inherit python; diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/misc/spacefm/default.nix index fa3423cd8c4c9..6d52f63ff6b42 100644 --- a/pkgs/applications/misc/spacefm/default.nix +++ b/pkgs/applications/misc/spacefm/default.nix @@ -1,21 +1,27 @@ -{ pkgs, fetchurl, stdenv, gtk3, udev, desktop_file_utils, shared_mime_info, intltool, pkgconfig }: +{ pkgs, fetchurl, stdenv, gtk3, udev, desktop_file_utils, shared_mime_info +, intltool, pkgconfig, makeWrapper +}: let - name = "spacefm-${version}"; version = "0.9.2"; -in stdenv.mkDerivation { - inherit name; +in stdenv.mkDerivation rec { + name = "spacefm-${version}"; src = fetchurl { - url="https://github.com/IgnorantGuru/spacefm/blob/pkg/${version}/${name}.tar.xz?raw=true"; - sha256 ="3767137d74aa78597ffb42a6121784e91a4276efcd5d718b3793b9790f82268c"; + url = "https://github.com/IgnorantGuru/spacefm/blob/pkg/${version}/${name}.tar.xz?raw=true"; + sha256 = "3767137d74aa78597ffb42a6121784e91a4276efcd5d718b3793b9790f82268c"; }; - buildInputs = [ gtk3 udev desktop_file_utils shared_mime_info intltool pkgconfig ]; + buildInputs = [ gtk3 udev desktop_file_utils shared_mime_info intltool pkgconfig makeWrapper ]; + + postInstall = '' + wrapProgram "$out/bin/spacefm" \ + --prefix XDG_DATA_DIRS : "${gtk3}/share" + ''; meta = { - description = "SpaceFM is a multi-panel tabbed file and desktop manager for Linux with built-in VFS, udev- or HAL-based device manager, customizable menu system, and bash integration."; + description = "Multi-panel tabbed file and desktop manager for Linux with built-in VFS, udev- or HAL-based device manager, customizable menu system, and bash integration."; platforms = pkgs.lib.platforms.linux; license = pkgs.lib.licenses.gpl3; }; diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index 8ee5752f4aca3..b7a30ef63f7db 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -11,8 +11,8 @@ sha256 = "0d0kgy160pyg472ka43gxk7n09pqhhs9nd93jyxrp9qsyllfc425"; }; stable = { - version = "31.0.1650.57"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-31.0.1650.57.tar.xz"; - sha256 = "1xv7frf47hhvqm6f3n2l308yfrs4d8ri70q6pndx7hslhyiixzl9"; + version = "32.0.1700.77"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-32.0.1700.77.tar.xz"; + sha256 = "1mwqa5k32d168swpw0bdcnhglxwcqdsx766fq0iz22h3hd4ccdwa"; }; } diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 1618042364e8c..61db2656a4093 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -1,28 +1,34 @@ -{ stdenv, fetchurl, python, perl, ncurses, x11, bzip2, zlib, openssl +{ stdenv, fetchurl, perl, ncurses, x11, bzip2, zlib, openssl , spidermonkey, gpm -, enableGuile ? true, guile ? null }: +, enableGuile ? false, guile ? null # Incompatible licenses, LGPLv3 - GPLv2 +, enablePython ? false, python ? null +}: assert enableGuile -> guile != null; +assert enablePython -> python != null; stdenv.mkDerivation rec { - name = "elinks-0.12pre5"; + name = "elinks-0.12pre6"; src = fetchurl { - url = http://elinks.or.cz/download/elinks-0.12pre5.tar.bz2; - sha256 = "1li4vlbq8wvnigxlkzb15490y90jg6y9yzzrqpqcz2h965w5869d"; + url = http://elinks.or.cz/download/elinks-0.12pre6.tar.bz2; + sha256 = "1nnakbi01g7yd3zqwprchh5yp45br8086b0kbbpmnclabcvlcdiq"; }; patches = [ ./gc-init.patch ]; - buildInputs = [ python perl ncurses x11 bzip2 zlib openssl spidermonkey gpm ] - ++ stdenv.lib.optional enableGuile guile; + buildInputs = [ perl ncurses x11 bzip2 zlib openssl spidermonkey gpm ] + ++ stdenv.lib.optional enableGuile guile + ++ stdenv.lib.optional enablePython python; configureFlags = '' --enable-finger --enable-html-highlight - --with-perl --with-python --enable-gopher --enable-cgi --enable-bittorrent + --with-perl --enable-gopher --enable-cgi --enable-bittorrent + --with-spidermonkey=${spidermonkey} --enable-nntp --with-openssl=${openssl} - '' + stdenv.lib.optionalString enableGuile " --with-guile"; + '' + stdenv.lib.optionalString enableGuile " --with-guile" + + stdenv.lib.optionalString enablePython " --with-python"; crossAttrs = { propagatedBuildInputs = [ ncurses.crossDrv zlib.crossDrv openssl.crossDrv ]; @@ -37,5 +43,6 @@ stdenv.mkDerivation rec { meta = { description = "Full-featured text-mode web browser"; homepage = http://elinks.or.cz; + license = "GPLv2"; }; } diff --git a/pkgs/applications/science/math/fricas/default.nix b/pkgs/applications/science/math/fricas/default.nix new file mode 100644 index 0000000000000..1817c43ed7bef --- /dev/null +++ b/pkgs/applications/science/math/fricas/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, sbcl, libX11, libXpm, libICE, libSM, libXt, libXau, libXdmcp }: + +stdenv.mkDerivation rec { + name = "fricas-1.2.2"; + + src = fetchurl { + url = "http://sourceforge.net/projects/fricas/files/fricas/1.2.2/${name}-full.tar.bz2"; + sha256 = "87db64a1fd4211f3b776793acea931b4271d2e7a28396414c7d7397d833defe1"; + }; + + buildInputs = [ sbcl libX11 libXpm libICE libSM libXt libXau libXdmcp ]; + + dontStrip = true; + + meta = { + homepage = http://fricas.sourceforge.net/; + description = "Fricas CAS"; + license = stdenv.lib.licenses.bsd3; + + hydraPlatforms = stdenv.lib.platforms.linux; + maintainers = stdenv.lib.maintainers.sprock; + }; +} diff --git a/pkgs/applications/science/misc/root/cmake.patch b/pkgs/applications/science/misc/root/cmake.patch new file mode 100644 index 0000000000000..b6efd7444fe9d --- /dev/null +++ b/pkgs/applications/science/misc/root/cmake.patch @@ -0,0 +1,11 @@ +--- cmake/modules/RootBuildOptions.cmake 1969-12-31 20:30:01.000000000 -0330 ++++ cmake/modules/RootBuildOptions.cmake 2014-01-10 14:09:29.424937408 -0330 +@@ -149,7 +149,7 @@ + + #---General Build options---------------------------------------------------------------------- + # use, i.e. don't skip the full RPATH for the build tree +-set(CMAKE_SKIP_BUILD_RPATH FALSE) ++set(CMAKE_SKIP_BUILD_RPATH TRUE) + # when building, don't use the install RPATH already (but later on when installing) + set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) + # add the automatically determined parts of the RPATH diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix new file mode 100644 index 0000000000000..f4de3ba6eea0d --- /dev/null +++ b/pkgs/applications/science/misc/root/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, cmake, mesa, libX11, gfortran, libXpm, libXft, libXext, zlib }: + +stdenv.mkDerivation rec { + name = "root-${version}"; + version = "5.34.14"; + + src = fetchurl { + url = "ftp://root.cern.ch/root/root_v${version}.source.tar.gz"; + sha256 = "d5347ba1b614eb083cf08050b784d66a93c125ed89938708da1adb33323dee2b"; + }; + + buildInputs = [ cmake gfortran mesa libX11 libXpm libXft libXext zlib ]; + + # CMAKE_INSTALL_RPATH_USE_LINK_PATH is set to FALSE in + # <rootsrc>/cmake/modules/RootBuildOptions.cmake. + # This patch sets it to TRUE. + patches = [ ./cmake.patch ]; + patchFlags = "-p0"; + + enableParallelBuilding = true; + + meta = { + homepage = "http://root.cern.ch/drupal/"; + description = "A data analysis framework"; + platforms = stdenv.lib.platforms.mesaPlatforms; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index 63dd56d7e33ca..ce4d9f98596f7 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -1,23 +1,35 @@ -{ stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt, docbook_xml_xslt }: +{ stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt +, docbook_xml_xslt, pkgconfig, luajit +, gzip, bzip2, xz +}: stdenv.mkDerivation rec { - name = "cgit-0.9.2"; + name = "cgit-0.10"; src = fetchurl { url = "http://git.zx2c4.com/cgit/snapshot/${name}.tar.xz"; - sha256 = "0q177q1r7ssna32c760l4dx6p4aaz6kdv27zn2jb34bx98045h08"; + sha256 = "0ynywva0lrsasdm3nlk3dmd8k5bnrd9qlvmk4n42dfw9g1xj5i4h"; }; # cgit is is tightly coupled with git and needs a git source tree to build. - # The cgit-0.9.2 Makefile has GIT_VER = 1.8.3, so use that version. + # The cgit-0.10 Makefile has GIT_VER = 1.8.5, so use that version. # IMPORTANT: Remember to check which git version cgit needs on every version # bump. gitSrc = fetchurl { - url = https://git-core.googlecode.com/files/git-1.8.3.tar.gz; - sha256 = "0fn5xdx30dl8dl1cdpqif5hgc3qnxlqfpwyhm0sm1wgqhgbcdlzi"; + url = https://git-core.googlecode.com/files/git-1.8.5.tar.gz; + sha256 = "08vbq8y3jx1da417hkqmrkdkysac1sqjvrjmaj1v56dmkghm43w7"; }; - buildInputs = [ openssl zlib asciidoc libxml2 libxslt docbook_xml_xslt ]; + buildInputs = [ + openssl zlib asciidoc libxml2 libxslt docbook_xml_xslt pkgconfig luajit + ]; + + postPatch = '' + sed -e 's|"gzip"|"${gzip}/bin/gzip"|' \ + -e 's|"bzip2"|"${bzip2}/bin/bzip2"|' \ + -e 's|"xz"|"${xz}/bin/xz"|' \ + -i ui-snapshot.c + ''; # Give cgit a git source tree and pass configuration parameters (as make # variables). diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix index 1dab01c09fcb3..13c5547677430 100644 --- a/pkgs/applications/version-management/gource/default.nix +++ b/pkgs/applications/version-management/gource/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, SDL, ftgl, pkgconfig, libpng, libjpeg, pcre -, SDL_image, glew, mesa, boostHeaders +, SDL_image, glew, mesa, boost, glm }: stdenv.mkDerivation rec { @@ -11,16 +11,17 @@ stdenv.mkDerivation rec { }; buildInputs = [ - glew SDL ftgl pkgconfig libpng libjpeg pcre SDL_image mesa boostHeaders + glew SDL ftgl pkgconfig libpng libjpeg pcre SDL_image mesa boost glm ]; + configureFlags = "--with-boost-libdir=${boost}/lib"; + NIX_CFLAGS_COMPILE = "-fpermissive"; # fix build with newer gcc versions meta = { homepage = "http://code.google.com/p/gource/"; description = "software version control visualization tool"; license = stdenv.lib.licenses.gpl3Plus; - longDescription = '' Software projects are displayed by Gource as an animated tree with the root directory of the project at its centre. Directories @@ -31,7 +32,6 @@ stdenv.mkDerivation rec { Mercurial and Bazaar and SVN. Gource can also parse logs produced by several third party tools for CVS repositories. ''; - - broken = true; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/virtualization/virt-manager/custom_runner.py b/pkgs/applications/virtualization/virt-manager/custom_runner.py deleted file mode 100644 index 5322c20dd329a..0000000000000 --- a/pkgs/applications/virtualization/virt-manager/custom_runner.py +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/python -t -# this script was written to use /etc/nixos/nixpkgs/pkgs/development/python-modules/generic/wrap.sh -# which already automates python executable wrapping by extending the PATH/pythonPath - -# from http://docs.python.org/library/subprocess.html -# Warning Invoking the system shell with shell=True can be a security hazard if combined with untrusted input. See the warning under Frequently Used Arguments for details. - -from subprocess import Popen, PIPE, STDOUT - -cmd = 'PYTHON_EXECUTABLE_PATH -t THE_CUSTOM_PATH/share/virt-manager/THE_CUSTOM_PROGRAM.py' -p = Popen(cmd, shell=True, stdin=PIPE, stdout=PIPE, stderr=STDOUT, close_fds=True) -output = p.stdout.read() -print output diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 9eee8c2ca4eaa..fb2dde66442f0 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -41,10 +41,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper pythonPackages.wrapPython ]; - # patch the runner script in order to make wrapPythonPrograms work and run the program using a syscall - # example code: /etc/nixos/nixpkgs/pkgs/development/interpreters/spidermonkey/1.8.0-rc1.nix - customRunner = ./custom_runner.py; - # TODO # virt-manager -> import gtk.glade -> No module named glade --> fixed by removing 'pygtk' and by only using pyGtkGlade # -> import gconf -> ImportError: No module named gconf @@ -62,21 +58,13 @@ stdenv.mkDerivation rec { # -> fixed by http://nixos.org/wiki/Solve_GConf_errors_when_running_GNOME_applications & a restart # virt-manager-tui -> ImportError: No module named newt_syrup.dialogscreen - patchPhase = '' - cat ${customRunner} > src/virt-manager.in - substituteInPlace "src/virt-manager.in" --replace "THE_CUSTOM_PATH" "$out" - substituteInPlace "src/virt-manager.in" --replace "THE_CUSTOM_PROGRAM" "virt-manager" - substituteInPlace "src/virt-manager.in" --replace "PYTHON_EXECUTABLE_PATH" "${python}/bin/python" - - cat ${customRunner} > src/virt-manager-tui.in - substituteInPlace "src/virt-manager-tui.in" --replace "THE_CUSTOM_PATH" "$out" - substituteInPlace "src/virt-manager-tui.in" --replace "THE_CUSTOM_PROGRAM" "virt-manager-tui" - substituteInPlace "src/virt-manager-tui.in" --replace "PYTHON_EXECUTABLE_PATH" "${python}/bin/python" - ''; - - # /etc/nixos/nixpkgs/pkgs/development/python-modules/generic/wrap.sh installPhase = '' make install + + # A hack, but the most reliable method so far + echo "#!/usr/bin/env python" | cat - src/virt-manager.py > $out/bin/virt-manager + echo "#!/usr/bin/env python" | cat - src/virt-manager-tui.py > $out/bin/virt-manager-tui + wrapPythonPrograms ''; diff --git a/pkgs/build-support/clang-wrapper/builder.sh b/pkgs/build-support/clang-wrapper/builder.sh index 3f90b9d32bd04..0cdb2b96135eb 100644 --- a/pkgs/build-support/clang-wrapper/builder.sh +++ b/pkgs/build-support/clang-wrapper/builder.sh @@ -59,13 +59,16 @@ doSubstitute() { local src=$1 local dst=$2 local uselibcxx= + local uselibcxxabi= if test -n "$libcxx" && echo $dst | fgrep ++; then uselibcxx=$libcxx; fi + if test -n "$libcxxabi" && echo $dst | fgrep ++; then uselibcxxabi=$libcxxabi; fi # Can't use substitute() here, because replace may not have been # built yet (in the bootstrap). sed \ -e "s^@out@^$out^g" \ -e "s^@shell@^$shell^g" \ -e "s^@libcxx@^$uselibcxx^g" \ + -e "s^@libcxxabi@^$uselibcxxabi^g" \ -e "s^@clang@^$clang^g" \ -e "s^@clangProg@^$clangProg^g" \ -e "s^@binutils@^$binutils^g" \ diff --git a/pkgs/build-support/clang-wrapper/clang-wrapper.sh b/pkgs/build-support/clang-wrapper/clang-wrapper.sh index 84067844cad87..b39aa2d721e89 100644 --- a/pkgs/build-support/clang-wrapper/clang-wrapper.sh +++ b/pkgs/build-support/clang-wrapper/clang-wrapper.sh @@ -76,11 +76,12 @@ if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE"; then n=$((n + 1)) done params=("${rest[@]}") + NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE --sysroot=/var/empty" fi if test -n "@libcxx@"; then NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem@libcxx@/include/c++/v1 -stdlib=libc++" - NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -L@libcxx@/lib -stdlib=libc++ -lc++abi" + NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -L@libcxx@/lib -stdlib=libc++ -L@libcxxabi@/lib -lc++abi" fi # Add the flags for the C compiler proper. @@ -137,13 +138,6 @@ if test -n "$NIX_CLANG_WRAPPER_EXEC_HOOK"; then source "$NIX_CLANG_WRAPPER_EXEC_HOOK" fi -# We nuke LD_LIBRARY_PATH here, because clang dynamically links to LLVM. -# Unfortunately, when such clang is used to build LLVM again, it can get in -# trouble temporarily binding to the build-directory versions of the libraries -# (the buildsystem sets LD_LIBRARY_PATH). That is very undesirable and can -# cause mysterious failures. -LD_LIBRARY_PATH= - # Call the real `clang'. Filter out warnings from stderr about unused # `-B' flags, since they confuse some programs. Deep bash magic to # apply grep to stderr (by swapping stdin/stderr twice). diff --git a/pkgs/build-support/clang-wrapper/default.nix b/pkgs/build-support/clang-wrapper/default.nix index 1b2a02fa86a48..05b8194697e16 100644 --- a/pkgs/build-support/clang-wrapper/default.nix +++ b/pkgs/build-support/clang-wrapper/default.nix @@ -34,6 +34,9 @@ stdenv.mkDerivation { addFlags = ./add-flags; inherit nativeTools nativeLibc nativePrefix clang clangVersion libcxx; + + libcxxabi = libcxx.abi or null; + gcc = clang.gcc; libc = if nativeLibc then null else libc; binutils = if nativeTools then null else binutils; diff --git a/pkgs/build-support/clang-wrapper/ld-wrapper.sh b/pkgs/build-support/clang-wrapper/ld-wrapper.sh index 48378778ba9e8..ae45c62d460a7 100644 --- a/pkgs/build-support/clang-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/clang-wrapper/ld-wrapper.sh @@ -32,6 +32,9 @@ if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE" \ # We cannot skip this; barf. echo "impure path \`$p' used in link" >&2 exit 1 + elif test "${p:0:9}" = "--sysroot"; then + # Our ld is not built with sysroot support (Can we fix that?) + : else rest=("${rest[@]}" "$p") fi diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index df5f728174cc6..625f93c874f21 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -976,6 +976,32 @@ rec { unifiedSystemDir = true; }; + fedora20i386 = { + name = "fedora-20-i386"; + fullName = "Fedora 20 (i386)"; + packagesList = fetchurl { + url = mirror://fedora/linux/releases/20/Everything/i386/os/repodata/ae9c6ae73a12a64227e6b8e7b2d7e1c2a9515bd9c82f2af006c838e7a445dcb9-primary.xml.gz; + sha256 = "1ffw8njfff680vq2lby8v5dm3af2w7bv5rxqwqkl59hj7bknm75f"; + }; + urlPrefix = mirror://fedora/linux/releases/20/Everything/i386/os; + archs = ["noarch" "i386" "i586" "i686"]; + packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; + unifiedSystemDir = true; + }; + + fedora20x86_64 = { + name = "fedora-20-x86_64"; + fullName = "Fedora 20 (x86_64)"; + packagesList = fetchurl { + url = mirror://fedora/linux/releases/20/Everything/x86_64/os/repodata/d7777ea6ec66e1c86c3fe1900adf5bf8d877fb77dd06e439bd76bbbec4e82094-primary.xml.gz; + sha256 = "1510x32bxfvnplwy81nxfzxpgn7qbgghm4717xnciqb6xjk7wxyp"; + }; + urlPrefix = mirror://fedora/linux/releases/20/Everything/x86_64/os; + archs = ["noarch" "x86_64"]; + packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; + unifiedSystemDir = true; + }; + opensuse103i386 = { name = "opensuse-10.3-i586"; fullName = "openSUSE 10.3 (i586)"; diff --git a/pkgs/desktops/gnome-3/core/caribou/default.nix b/pkgs/desktops/gnome-3/core/caribou/default.nix new file mode 100644 index 0000000000000..41a997c1f714b --- /dev/null +++ b/pkgs/desktops/gnome-3/core/caribou/default.nix @@ -0,0 +1,27 @@ +{ fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, pythonPackages, libxml2 +, libxklavier, libXtst, gtk2, intltool, libxslt }: + + +stdenv.mkDerivation rec { + name = "caribou-0.4.12"; + + src = fetchurl { + url = "mirror://gnome/sources/caribou/0.4/${name}.tar.xz"; + sha256 = "0235sws58rg0kadxbp2nq5ha76zmhd4mr10n9qlbryf8p78qsvii"; + }; + + buildInputs = with gnome3; + [ glib pkgconfig gtk clutter at_spi2_core dbus pythonPackages.python pythonPackages.pygobject3 + libxml2 libXtst gtk2 intltool libxslt ]; + + propagatedBuildInputs = [ gnome3.libgee libxklavier ]; + + preBuild = '' + patchShebangs . + ''; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; + +} diff --git a/pkgs/desktops/gnome-3/core/geocode-glib/default.nix b/pkgs/desktops/gnome-3/core/geocode-glib/default.nix new file mode 100644 index 0000000000000..d3b21bef167a3 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/geocode-glib/default.nix @@ -0,0 +1,20 @@ +{ fetchurl, stdenv, pkgconfig, gnome3, intltool, libsoup, json_glib }: + + +stdenv.mkDerivation rec { + name = "geocode-glib-3.10.0"; + + + src = fetchurl { + url = "mirror://gnome/sources/geocode-glib/3.10/${name}.tar.xz"; + sha256 = "0dx6v9n4dsskcy6630s77cyb32xlykdall0d555976warycc3v8a"; + }; + + buildInputs = with gnome3; + [ intltool pkgconfig glib libsoup json_glib ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; + +} diff --git a/pkgs/desktops/gnome-3/core/gjs/default.nix b/pkgs/desktops/gnome-3/core/gjs/default.nix new file mode 100644 index 0000000000000..e4a0752eb4ae2 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gjs/default.nix @@ -0,0 +1,21 @@ +{ fetchurl, stdenv, pkgconfig, gnome3, gobjectIntrospection, spidermonkey_17 }: + + +stdenv.mkDerivation rec { + name = "gjs-1.38.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gjs/1.38/${name}.tar.xz"; + sha256 = "0xl1zc5ncaxqs5ww5j82rzqrg429l8pdapqclxiba7dxwyh6a83b"; + }; + + buildInputs = with gnome3; + [ gobjectIntrospection pkgconfig glib ]; + + propagatedBuildInputs = [ spidermonkey_17 ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; + +} diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix new file mode 100644 index 0000000000000..cce0ff46ca0ba --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix @@ -0,0 +1,35 @@ +{ fetchurl, stdenv, pkgconfig, gnome3, intltool, glib, libnotify, lcms2, libXtst +, libxkbfile, pulseaudio, libcanberra_gtk3, upower, colord, libgweather, polkit +, geoclue2, librsvg, xf86_input_wacom, udev, libwacom, libxslt, libtool +, docbook_xsl, docbook_xsl_ns, makeWrapper }: + +stdenv.mkDerivation rec { + name = "gnome-settings-daemon-3.10.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-settings-daemon/3.10/${name}.tar.xz"; + sha256 = "0r42lzlgk0w40ws4d3s7yayn6n8zqlnh5b6k88gvgv1lwk39k240"; + }; + + configureFlags = "--disable-ibus"; + + # fatal error: gio/gunixfdlist.h: No such file or directory + NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0"; + + buildInputs = with gnome3; + [ intltool pkgconfig gtk glib gsettings_desktop_schemas libnotify gnome_desktop + lcms2 libXtst libxkbfile pulseaudio libcanberra_gtk3 upower colord libgweather + polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libwacom libxslt + libtool docbook_xsl docbook_xsl_ns makeWrapper ]; + + postInstall = '' + wrapProgram "$out/libexec/gnome-settings-daemon-localeexec" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --prefix XDG_DATA_DIRS : "${gnome3.gtk}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share" + ''; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; + +} diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix new file mode 100644 index 0000000000000..5cb865bcefdfa --- /dev/null +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -0,0 +1,24 @@ +{ fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo +, pango, cogl, clutter }: + + +stdenv.mkDerivation rec { + name = "mutter-3.10.2"; + + src = fetchurl { + url = "mirror://gnome/sources/mutter/3.10/${name}.tar.xz"; + sha256 = "000iclb96mgc4rp2q0cy72nfwyfzl6avijl9nmk87f5sgyy670a3"; + }; + + # fatal error: gio/gunixfdlist.h: No such file or directory + NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + + buildInputs = with gnome3; + [ pkgconfig intltool glib gobjectIntrospection gtk gsettings_desktop_schemas upower + gnome_desktop cairo pango cogl clutter zenity ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; + +} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 2b3f95b20c818..47656da099256 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -18,16 +18,22 @@ rec { at_spi2_core = callPackage ./core/at-spi2-core { }; + caribou = callPackage ./core/caribou { }; + dconf = callPackage ./core/dconf { }; evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests gconf = callPackage ./core/gconf { }; + geocode_glib = callPackage ./core/geocode-glib { }; + gcr = callPackage ./core/gcr { }; # ToDo: tests fail gdm = callPackage ./core/gdm { }; + gjs = callPackage ./core/gjs { }; + gnome_icon_theme = callPackage ./core/gnome-icon-theme { }; gnome-menus = callPackage ./core/gnome-menus { }; @@ -39,6 +45,8 @@ rec { gnome_session = callPackage ./core/gnome-session { }; + gnome_settings_daemon = callPackage ./core/gnome-settings-daemon { }; + gnome_terminal = callPackage ./core/gnome-terminal { }; gnome_themes_standard = callPackage ./core/gnome-themes-standard { }; @@ -63,6 +71,8 @@ rec { libzapojit = callPackage ./core/libzapojit { }; + mutter = callPackage ./core/mutter { }; + nautilus = callPackage ./core/nautilus { }; rest = callPackage ./core/rest { }; diff --git a/pkgs/development/compilers/llvm/clang-purity.patch b/pkgs/development/compilers/llvm/clang-purity.patch deleted file mode 100644 index e82305189e8fb..0000000000000 --- a/pkgs/development/compilers/llvm/clang-purity.patch +++ /dev/null @@ -1,162 +0,0 @@ -diff -Naur cfe-3.3.src-orig/lib/Driver/ToolChains.cpp cfe-3.3.src/lib/Driver/ToolChains.cpp ---- cfe-3.3.src-orig/lib/Driver/ToolChains.cpp 2013-05-06 12:26:41.000000000 -0400 -+++ cfe-3.3.src/lib/Driver/ToolChains.cpp 2013-06-21 19:28:12.120364372 -0400 -@@ -2318,17 +2318,6 @@ - Paths); - } - } -- addPathIfExists(SysRoot + "/lib/" + MultiarchTriple, Paths); -- addPathIfExists(SysRoot + "/lib/../" + Multilib, Paths); -- addPathIfExists(SysRoot + "/usr/lib/" + MultiarchTriple, Paths); -- addPathIfExists(SysRoot + "/usr/lib/../" + Multilib, Paths); -- -- // Try walking via the GCC triple path in case of multiarch GCC -- // installations with strange symlinks. -- if (GCCInstallation.isValid()) -- addPathIfExists(SysRoot + "/usr/lib/" + GCCInstallation.getTriple().str() + -- "/../../" + Multilib, Paths); -- - // Add the non-multilib suffixed paths (if potentially different). - if (GCCInstallation.isValid()) { - const std::string &LibPath = GCCInstallation.getParentLibPath(); -@@ -2341,8 +2330,6 @@ - addPathIfExists(LibPath, Paths); - } - } -- addPathIfExists(SysRoot + "/lib", Paths); -- addPathIfExists(SysRoot + "/usr/lib", Paths); - - IsPIEDefault = SanitizerArgs(*this, Args).hasZeroBaseShadow(); - } -@@ -2395,9 +2382,6 @@ - if (DriverArgs.hasArg(options::OPT_nostdinc)) - return; - -- if (!DriverArgs.hasArg(options::OPT_nostdlibinc)) -- addSystemInclude(DriverArgs, CC1Args, SysRoot + "/usr/local/include"); -- - if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) { - llvm::sys::Path P(D.ResourceDir); - P.appendComponent("include"); -@@ -2479,26 +2463,6 @@ - "/usr/include/powerpc64-linux-gnu" - }; - ArrayRef<StringRef> MultiarchIncludeDirs; -- if (getTriple().getArch() == llvm::Triple::x86_64) { -- MultiarchIncludeDirs = X86_64MultiarchIncludeDirs; -- } else if (getTriple().getArch() == llvm::Triple::x86) { -- MultiarchIncludeDirs = X86MultiarchIncludeDirs; -- } else if (getTriple().getArch() == llvm::Triple::aarch64) { -- MultiarchIncludeDirs = AArch64MultiarchIncludeDirs; -- } else if (getTriple().getArch() == llvm::Triple::arm) { -- if (getTriple().getEnvironment() == llvm::Triple::GNUEABIHF) -- MultiarchIncludeDirs = ARMHFMultiarchIncludeDirs; -- else -- MultiarchIncludeDirs = ARMMultiarchIncludeDirs; -- } else if (getTriple().getArch() == llvm::Triple::mips) { -- MultiarchIncludeDirs = MIPSMultiarchIncludeDirs; -- } else if (getTriple().getArch() == llvm::Triple::mipsel) { -- MultiarchIncludeDirs = MIPSELMultiarchIncludeDirs; -- } else if (getTriple().getArch() == llvm::Triple::ppc) { -- MultiarchIncludeDirs = PPCMultiarchIncludeDirs; -- } else if (getTriple().getArch() == llvm::Triple::ppc64) { -- MultiarchIncludeDirs = PPC64MultiarchIncludeDirs; -- } - for (ArrayRef<StringRef>::iterator I = MultiarchIncludeDirs.begin(), - E = MultiarchIncludeDirs.end(); - I != E; ++I) { -@@ -2510,13 +2474,6 @@ - - if (getTriple().getOS() == llvm::Triple::RTEMS) - return; -- -- // Add an include of '/include' directly. This isn't provided by default by -- // system GCCs, but is often used with cross-compiling GCCs, and harmless to -- // add even when Clang is acting as-if it were a system compiler. -- addExternCSystemInclude(DriverArgs, CC1Args, SysRoot + "/include"); -- -- addExternCSystemInclude(DriverArgs, CC1Args, SysRoot + "/usr/include"); - } - - /// \brief Helper to add the three variant paths for a libstdc++ installation. -diff -Naur cfe-3.3.src-orig/lib/Driver/Tools.cpp cfe-3.3.src/lib/Driver/Tools.cpp ---- cfe-3.3.src-orig/lib/Driver/Tools.cpp 2013-05-30 14:01:30.000000000 -0400 -+++ cfe-3.3.src/lib/Driver/Tools.cpp 2013-06-21 19:30:51.604726574 -0400 -@@ -5976,43 +5976,6 @@ - } - } - -- if (ToolChain.getArch() == llvm::Triple::arm || -- ToolChain.getArch() == llvm::Triple::thumb || -- (!Args.hasArg(options::OPT_static) && -- !Args.hasArg(options::OPT_shared))) { -- CmdArgs.push_back("-dynamic-linker"); -- if (isAndroid) -- CmdArgs.push_back("/system/bin/linker"); -- else if (ToolChain.getArch() == llvm::Triple::x86) -- CmdArgs.push_back("/lib/ld-linux.so.2"); -- else if (ToolChain.getArch() == llvm::Triple::aarch64) -- CmdArgs.push_back("/lib/ld-linux-aarch64.so.1"); -- else if (ToolChain.getArch() == llvm::Triple::arm || -- ToolChain.getArch() == llvm::Triple::thumb) { -- if (ToolChain.getTriple().getEnvironment() == llvm::Triple::GNUEABIHF) -- CmdArgs.push_back("/lib/ld-linux-armhf.so.3"); -- else -- CmdArgs.push_back("/lib/ld-linux.so.3"); -- } -- else if (ToolChain.getArch() == llvm::Triple::mips || -- ToolChain.getArch() == llvm::Triple::mipsel) -- CmdArgs.push_back("/lib/ld.so.1"); -- else if (ToolChain.getArch() == llvm::Triple::mips64 || -- ToolChain.getArch() == llvm::Triple::mips64el) { -- if (hasMipsN32ABIArg(Args)) -- CmdArgs.push_back("/lib32/ld.so.1"); -- else -- CmdArgs.push_back("/lib64/ld.so.1"); -- } -- else if (ToolChain.getArch() == llvm::Triple::ppc) -- CmdArgs.push_back("/lib/ld.so.1"); -- else if (ToolChain.getArch() == llvm::Triple::ppc64 || -- ToolChain.getArch() == llvm::Triple::systemz) -- CmdArgs.push_back("/lib64/ld64.so.1"); -- else -- CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2"); -- } -- - CmdArgs.push_back("-o"); - CmdArgs.push_back(Output.getFilename()); - -diff -Naur cfe-3.3.src-orig/lib/Frontend/InitHeaderSearch.cpp cfe-3.3.src/lib/Frontend/InitHeaderSearch.cpp ---- cfe-3.3.src-orig/lib/Frontend/InitHeaderSearch.cpp 2013-04-29 21:21:43.000000000 -0400 -+++ cfe-3.3.src/lib/Frontend/InitHeaderSearch.cpp 2013-06-21 19:32:47.627016565 -0400 -@@ -225,20 +225,6 @@ - const HeaderSearchOptions &HSOpts) { - llvm::Triple::OSType os = triple.getOS(); - -- if (HSOpts.UseStandardSystemIncludes) { -- switch (os) { -- case llvm::Triple::FreeBSD: -- case llvm::Triple::NetBSD: -- case llvm::Triple::OpenBSD: -- case llvm::Triple::Bitrig: -- break; -- default: -- // FIXME: temporary hack: hard-coded paths. -- AddPath("/usr/local/include", System, false); -- break; -- } -- } -- - // Builtin includes use #include_next directives and should be positioned - // just prior C include dirs. - if (HSOpts.UseBuiltinIncludes) { -@@ -332,9 +318,6 @@ - default: - break; - } -- -- if ( os != llvm::Triple::RTEMS ) -- AddPath("/usr/include", ExternCSystem, false); - } - - void InitHeaderSearch:: diff --git a/pkgs/development/compilers/llvm/clang-tablegen-dir.patch b/pkgs/development/compilers/llvm/clang-tablegen-dir.patch deleted file mode 100644 index de6a468b239f6..0000000000000 --- a/pkgs/development/compilers/llvm/clang-tablegen-dir.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/utils/TableGen/CMakeLists.txt (revision 190146) -+++ b/utils/TableGen/CMakeLists.txt (working copy) -@@ -1,4 +1,5 @@ - set(LLVM_LINK_COMPONENTS Support) -+set(LLVM_TOOLS_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) - - add_tablegen(clang-tblgen CLANG - ClangASTNodesEmitter.cpp - diff --git a/pkgs/development/compilers/llvm/clang.nix b/pkgs/development/compilers/llvm/clang.nix deleted file mode 100644 index 8c178c9ce0371..0000000000000 --- a/pkgs/development/compilers/llvm/clang.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, perl, groff, llvm, cmake, libxml2, python }: - -let - version = "3.3"; - gccReal = if (stdenv.gcc.gcc or null) == null then stdenv.gcc else stdenv.gcc.gcc; -in - -stdenv.mkDerivation { - name = "clang-${version}"; - - buildInputs = [ perl llvm groff cmake libxml2 python ]; - - patches = [ ./clang-tablegen-dir.patch ] ++ - stdenv.lib.optional (stdenv.gcc.libc != null) ./clang-purity.patch; - - cmakeFlags = [ - "-DCLANG_PATH_TO_LLVM_BUILD=${llvm}" - "-DCMAKE_BUILD_TYPE=Release" - "-DLLVM_TARGETS_TO_BUILD=all" - "-DGCC_INSTALL_PREFIX=${gccReal}" - ] ++ stdenv.lib.optionals (stdenv.gcc.libc != null) [ - "-DC_INCLUDE_DIRS=${stdenv.gcc.libc}/include/" - ]; - - enableParallelBuilding = true; - - src = fetchurl { - url = "http://llvm.org/releases/${version}/cfe-${version}.src.tar.gz"; - sha256 = "15mrvw43s4frk1j49qr4v5viq68h8qlf10qs6ghd6mrsmgj5vddi"; - }; - - passthru = { gcc = stdenv.gcc.gcc; }; - - meta = { - homepage = http://clang.llvm.org/; - description = "A C language family frontend for LLVM"; - license = "BSD"; - maintainers = with stdenv.lib.maintainers; [viric shlevy]; - platforms = with stdenv.lib.platforms; all; - }; -} diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index fc5b5ff8d96f2..73eb7135ca445 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = http://llvm.org/; license = licenses.bsd3; - maintainers = with maintainers; [ lovek323 raskin shlevy viric ]; + maintainers = with maintainers; [ lovek323 raskin viric ]; platforms = platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/dragonegg.nix b/pkgs/development/compilers/llvm/dragonegg.nix index 737b9533a089b..38d3546d9819a 100644 --- a/pkgs/development/compilers/llvm/dragonegg.nix +++ b/pkgs/development/compilers/llvm/dragonegg.nix @@ -1,18 +1,18 @@ -{stdenv, fetchurl, llvm, gmp, mpfr, mpc}: +{stdenv, fetchurl, llvm, gmp, mpfr, mpc, ncurses, zlib}: stdenv.mkDerivation rec { - version = "3.3"; + version = "3.4"; name = "dragonegg-${version}"; src = fetchurl { url = "http://llvm.org/releases/${version}/${name}.src.tar.gz"; - sha256 = "1kfryjaz5hxh3q6m50qjrwnyjb3smg2zyh025lhz9km3x4kshlri"; + sha256 = "1733czbvby1ww3xkwcwmm0km0bpwhfyxvf56wb0zv5gksp3kbgrl"; }; # The gcc the plugin will be built for (the same used building dragonegg) GCC = "gcc"; - buildInputs = [ llvm gmp mpfr mpc ]; + buildInputs = [ llvm gmp mpfr mpc ncurses zlib ]; installPhase = '' mkdir -p $out/lib $out/share/doc/${name} diff --git a/pkgs/development/compilers/llvm/full.nix b/pkgs/development/compilers/llvm/full.nix new file mode 100644 index 0000000000000..9c63502d8cd0b --- /dev/null +++ b/pkgs/development/compilers/llvm/full.nix @@ -0,0 +1,89 @@ +{ stdenv +, fetchurl +, perl, groff +, cmake +, libxml2 +, python +, libffi +, zlib +, ncurses +, isl +, gmp +, doxygen +, binutils +, swig +, which +, libedit +, valgrind +}: + +let + version = "3.4"; + + fetch = name: sha256: fetchurl { + url = "http://llvm.org/releases/${version}/${name}-${version}.src.tar.gz"; + inherit sha256; + }; + + inherit (stdenv.lib) concatStrings mapAttrsToList; +in stdenv.mkDerivation { + name = "llvm-full-${version}"; + + unpackPhase = '' + unpackFile ${fetch "llvm" "0a169ba045r4apb9cv6ncrwl83l7yiajnzirkcdlhj1cd4nn3995"} + mv llvm-${version} llvm + sourceRoot=$PWD/llvm + ${concatStrings (mapAttrsToList (name: { location, sha256 }: '' + unpackFile ${fetch name sha256} + mv ${name}-${version} $sourceRoot/${location} + '') { + clang = { location = "tools/clang"; sha256 = "06rb4j1ifbznl3gfhl98s7ilj0ns01p7y7zap4p7ynmqnc6pia92"; }; + clang-tools-extra = { location = "tools/clang/tools/extra"; sha256 = "1d1822mwxxl9agmyacqjw800kzz5x8xr0sdmi8fgx5xfa5sii1ds"; }; + compiler-rt = { location = "projects/compiler-rt"; sha256 = "0p5b6varxdqn7q3n77xym63hhq4qqxd2981pfpa65r1w72qqjz7k"; }; + lld = { location = "tools/lld"; sha256 = "1sd4scqynryfrmcc4h0ljgwn2dgjmbbmf38z50ya6l0janpd2nxz"; }; + lldb = { location = "tools/lldb"; sha256 = "0h8cmjrhjhigk7k2qll1pcf6jfgmbdzkzfz2i048pkfg851s0x4g"; }; + polly = { location = "tools/polly"; sha256 = "1rqflmgzg1vzjm0r32c5ck8x3q0qm3g0hh8ggbjazh6x7nvmy6lz"; }; + })} + sed -i 's|/usr/bin/env||' \ + $sourceRoot/tools/lldb/scripts/Python/finish-swig-Python-LLDB.sh \ + $sourceRoot/tools/lldb/scripts/Python/build-swig-Python.sh + ''; + + buildInputs = [ perl + groff + cmake + libxml2 + python + libffi + zlib + ncurses + isl + gmp + doxygen + swig + which + libedit + valgrind + ]; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DLLVM_ENABLE_FFI=ON" + "-DGCC_INSTALL_PREFIX=${stdenv.gcc.gcc}" + "-DC_INCLUDE_DIRS=${stdenv.gcc.libc}/include/" + "-DLLVM_BINUTILS_INCDIR=${binutils}/include" + "-DCMAKE_CXX_FLAGS=-std=c++11" + ]; + + passthru.gcc = stdenv.gcc.gcc; + + enableParallelBuilding = true; + + meta = { + description = "Collection of modular and reusable compiler and toolchain technologies"; + homepage = http://llvm.org/; + license = stdenv.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.shlevy ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix new file mode 100644 index 0000000000000..a0c8b50ad3fa7 --- /dev/null +++ b/pkgs/development/compilers/rust/default.nix @@ -0,0 +1,51 @@ +{stdenv, fetchurl, which, file, perl, curl, python27, makeWrapper}: + +let snapshotName = "rust-stage0-2014-01-05-a6d3e57-linux-x86_64-aa8fbbacdb1d8a078f3a3fe3478dcbc506bd4090.tar.bz2"; in +stdenv.mkDerivation { + name = "rust-0.9"; + + src = fetchurl { + url = http://static.rust-lang.org/dist/rust-0.9.tar.gz; + sha256 = "1lfmgnn00wrc30nf5lgg52w58ir3xpsnpmzk2v5a35xp8lsir4f0"; + }; + + # We need rust to build rust. If we don't provide it, configure will try to download it + snapshot = fetchurl { + url = "http://static.rust-lang.org/stage0-snapshots/${snapshotName}"; + sha256 = "17inc23jpznqp0vnskvznm74mm24c1nffhz2bkadhvp2ww0vpjjx"; + }; + + # Put the snapshot where it is expected + postUnpack = '' + mkdir $sourceRoot/dl + ln -s $snapshot $sourceRoot/dl/${snapshotName} + ''; + + # Modify the snapshot compiler so that is can be executed + preBuild = if stdenv.isLinux then '' + make x86_64-unknown-linux-gnu/stage0/bin/rustc + patchelf --interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 \ + --set-rpath ${stdenv.gcc.gcc}/lib/ \ + x86_64-unknown-linux-gnu/stage0/bin/rustc + '' else null; + + # rustc requires cc + postInstall = '' + for f in $out/bin/*; do + wrapProgram $f --prefix PATH : "${stdenv.gcc}/bin" + done + ''; + + buildInputs = [ which file perl curl python27 makeWrapper ]; + enableParallelBuilding = true; + + meta = { + homepage = http://www.rust-lang.org/; + description = "A safe, concurrent, practical language"; + maintainers = [ stdenv.lib.maintainers.madjar ]; + license = map (builtins.getAttr "shortName") [ stdenv.lib.licenses.mit stdenv.lib.licenses.asl20 ]; + # platforms as per http://static.rust-lang.org/doc/master/tutorial.html#getting-started + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; + }; +} + diff --git a/pkgs/development/interpreters/spidermonkey/17.0.nix b/pkgs/development/interpreters/spidermonkey/17.0.nix new file mode 100644 index 0000000000000..3f484426a1064 --- /dev/null +++ b/pkgs/development/interpreters/spidermonkey/17.0.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, pkgconfig, nspr, perl, python, zip }: + +stdenv.mkDerivation rec { + version = "17.0.0"; + name = "spidermonkey-${version}"; + + src = fetchurl { + url = "http://ftp.mozilla.org/pub/mozilla.org/js/mozjs${version}.tar.gz"; + sha256 = "1fig2wf4f10v43mqx67y68z6h77sy900d1w0pz9qarrqx57rc7ij"; + }; + + propagatedBuildInputs = [ nspr ]; + + buildInputs = [ pkgconfig perl python zip ]; + + postUnpack = "sourceRoot=\${sourceRoot}/js/src"; + + preConfigure = '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr}/include/nspr" + export LIBXUL_DIST=$out + ''; + + configureFlags = [ "--enable-threadsafe" "--with-system-nspr" ]; + + # hack around a make problem, see https://github.com/NixOS/nixpkgs/issues/1279#issuecomment-29547393 + preBuild = "touch -- {.,shell,jsapi-tests}/{-lpthread,-ldl}"; + + enableParallelBuilding = true; + + doCheck = true; + preCheck = "rm jit-test/tests/sunspider/check-date-format-tofte.js"; # https://bugzil.la/600522 + + meta = with stdenv.lib; { + description = "Mozilla's JavaScript engine written in C/C++"; + homepage = https://developer.mozilla.org/en/SpiderMonkey; + # TODO: MPL/GPL/LGPL tri-license. + maintainers = [ maintainers.goibhniu ]; + }; +} + diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix index 1baa96cd6da82..9150df8da7d42 100644 --- a/pkgs/development/libraries/audio/lilv/default.nix +++ b/pkgs/development/libraries/audio/lilv/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "lilv-${version}"; - version = "0.16.0"; + version = "0.18.0"; src = fetchurl { url = "http://download.drobilla.net/${name}.tar.bz2"; - sha256 = "1ddrcikypi7gfmj5cqn975axzrgv7mhzif4h0ni9w5b4v64rvcyg"; + sha256 = "1k9wfc08ylgbkwbnvh1fx1bdzl3y59xrrx8gv0vk68yzcvcmv6am"; }; buildInputs = [ lv2 pkgconfig python serd sord sratom ]; diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix index bd6c64a9ee20d..f5d48df03f840 100644 --- a/pkgs/development/libraries/audio/lv2/default.nix +++ b/pkgs/development/libraries/audio/lv2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "lv2-${version}"; - version = "1.6.0"; + version = "1.8.0"; src = fetchurl { url = "http://lv2plug.in/spec/${name}.tar.bz2"; - sha256 = "0nxrkmcpsm4v25wp2l7lcw4n0823kbplilpv51fszf710qsn7k9v"; + sha256 = "1mxkp7gajh1alw6s358cqwf3qkpr1ld9wfxwswnqrxcd9a7hxjd4"; }; buildInputs = [ gtk libsndfile pkgconfig python ]; diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/pkgs/development/libraries/audio/sratom/default.nix index daaf780e45dac..5c78296af971c 100644 --- a/pkgs/development/libraries/audio/sratom/default.nix +++ b/pkgs/development/libraries/audio/sratom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sratom-${version}"; - version = "0.4.2"; + version = "0.4.4"; src = fetchurl { url = "http://download.drobilla.net/${name}.tar.bz2"; - sha256 = "16i5snknl9frz638mgr58lp11ap1xmkbrkb3l6f0ad8ddqpcjm3i"; + sha256 = "1q4044md8nmqah8ay5mf4lgdl6x0sfa4cjqyqk9da8nqzvs2j37s"; }; buildInputs = [ lv2 pkgconfig python serd sord ]; diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix index f5b68b7a84310..8af725b6b80ff 100644 --- a/pkgs/development/libraries/audio/suil/default.nix +++ b/pkgs/development/libraries/audio/suil/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "suil-${version}"; - version = "0.6.16"; + version = "0.8.0"; src = fetchurl { url = "http://download.drobilla.net/${name}.tar.bz2"; - sha256 = "101xq7pd8kvnqwm4viaj4ikhn65jxrlrkg79ca954yqrdb9p9w8v"; + sha256 = "0y5sbgaivb03vmr3jcpzj16wqxa5h744ml4w3ylzglbxs2bqgl7n"; }; buildInputs = [ gtk lv2 pkgconfig python qt4 serd sord sratom ]; diff --git a/pkgs/development/libraries/ffmpeg/2.x.nix b/pkgs/development/libraries/ffmpeg/2.x.nix index 4e975ea3d8220..dd29e1e9e6bca 100644 --- a/pkgs/development/libraries/ffmpeg/2.x.nix +++ b/pkgs/development/libraries/ffmpeg/2.x.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { speexSupport = config.ffmpeg.speex or true; theoraSupport = config.ffmpeg.theora or true; vorbisSupport = config.ffmpeg.vorbis or true; - vpxSupport = config.ffmpeg.vpx or false; + vpxSupport = config.ffmpeg.vpx or true; x264Support = config.ffmpeg.x264 or true; xvidSupport = config.ffmpeg.xvid or true; opusSupport = config.ffmpeg.opus or true; diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/development/libraries/glm/default.nix new file mode 100644 index 0000000000000..b35fe1e785596 --- /dev/null +++ b/pkgs/development/libraries/glm/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + name = "glm-0.9.5.1"; + + src = fetchurl { + url = "mirror://sourceforge/project/ogl-math/${name}/${name}.zip"; + sha256 = "1x8bpmqdszzkg21r411w7cy4mqd5dcvb9jghc8h3xrx7ldbicqjg"; + }; + + buildInputs = [ unzip ]; + + outputs = [ "out" "doc" ]; + + installPhase = '' + mkdir -p "$out/include" + cp -r glm "$out/include" + + mkdir -p "$doc/share/doc/glm" + cp -r doc/* "$doc/share/doc/glm" + ''; + + meta = with stdenv.lib; { + description = "OpenGL Mathematics library for C++"; + longDescription = '' + OpenGL Mathematics (GLM) is a header only C++ mathematics library for + graphics software based on the OpenGL Shading Language (GLSL) + specification and released under the MIT license. + ''; + homepage = http://glm.g-truc.net/; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/haskell/JuicyPixels/default.nix b/pkgs/development/libraries/haskell/JuicyPixels/default.nix index 485a80dadb3c6..d8d0ac69badd0 100644 --- a/pkgs/development/libraries/haskell/JuicyPixels/default.nix +++ b/pkgs/development/libraries/haskell/JuicyPixels/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "JuicyPixels"; - version = "3.1.2"; - sha256 = "19bal3g3cp4nn8g3zp4yi5g4zw5wnkbi74gcra8mxs4zy99bf8s2"; + version = "3.1.3"; + sha256 = "1zyrdd8mhgj0lchsznyhqhxb48ql8fhfqi5qs54qaxan514w6x70"; buildDepends = [ binary deepseq mtl primitive transformers vector zlib ]; diff --git a/pkgs/development/libraries/haskell/TypeCompose/default.nix b/pkgs/development/libraries/haskell/TypeCompose/default.nix new file mode 100644 index 0000000000000..b7c1a23d3d5ef --- /dev/null +++ b/pkgs/development/libraries/haskell/TypeCompose/default.nix @@ -0,0 +1,14 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "TypeCompose"; + version = "0.9.9"; + sha256 = "0i89r1yaglkcc1fdhn0m4hws5rqcpmkg32ddznch7a3rz1l9gqwg"; + meta = { + homepage = "https://github.com/conal/TypeCompose"; + description = "Type composition classes & instances"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ianwookim ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/aeson/default.nix b/pkgs/development/libraries/haskell/aeson/0.6.2.1.nix index edd2a21040e8f..edd2a21040e8f 100644 --- a/pkgs/development/libraries/haskell/aeson/default.nix +++ b/pkgs/development/libraries/haskell/aeson/0.6.2.1.nix diff --git a/pkgs/development/libraries/haskell/aeson/0.7.0.0.nix b/pkgs/development/libraries/haskell/aeson/0.7.0.0.nix new file mode 100644 index 0000000000000..41bbdbf5a0b92 --- /dev/null +++ b/pkgs/development/libraries/haskell/aeson/0.7.0.0.nix @@ -0,0 +1,26 @@ +{ cabal, attoparsec, deepseq, dlist, hashable, HUnit, mtl +, QuickCheck, scientific, syb, testFramework, testFrameworkHunit +, testFrameworkQuickcheck2, text, time, unorderedContainers, vector +}: + +cabal.mkDerivation (self: { + pname = "aeson"; + version = "0.7.0.0"; + sha256 = "14xh7i07ha2hgljq0y0v7f5gkn0pv2zqj8l9j92957mf7f17zwf6"; + buildDepends = [ + attoparsec deepseq dlist hashable mtl scientific syb text time + unorderedContainers vector + ]; + testDepends = [ + attoparsec HUnit QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 text time unorderedContainers vector + ]; + doCheck = false; + meta = { + homepage = "https://github.com/bos/aeson"; + description = "Fast JSON parsing and encoding"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/base16-bytestring/default.nix b/pkgs/development/libraries/haskell/base16-bytestring/default.nix index 3f81258f4263f..3de2bdf60ff23 100644 --- a/pkgs/development/libraries/haskell/base16-bytestring/default.nix +++ b/pkgs/development/libraries/haskell/base16-bytestring/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "base16-bytestring"; - version = "0.1.1.5"; - sha256 = "1fgd3zdzjfry6jaz8hwhim0p2c35l73cxxambh0ff7p5fqjrlwym"; + version = "0.1.1.6"; + sha256 = "0jf40m3yijqw6wd1rwwvviww46fasphaay9m9rgqyhf5aahnbzjs"; meta = { homepage = "http://github.com/bos/base16-bytestring"; description = "Fast base16 (hex) encoding and decoding for ByteStrings"; diff --git a/pkgs/development/libraries/haskell/case-insensitive/1.1.0.2.nix b/pkgs/development/libraries/haskell/case-insensitive/1.1.0.3.nix index 5fd438e320d51..45cc7c11fc284 100644 --- a/pkgs/development/libraries/haskell/case-insensitive/1.1.0.2.nix +++ b/pkgs/development/libraries/haskell/case-insensitive/1.1.0.3.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "case-insensitive"; - version = "1.1.0.2"; - sha256 = "0200jpz2xs67sw5dczfj8nlz2yp40k05bv3rk1phdc093n13kaww"; + version = "1.1.0.3"; + sha256 = "0fr69lfb976gflr8w6d68zn4pz86jfxbb2i49fw3mmam67k5y9bv"; buildDepends = [ deepseq hashable text ]; testDepends = [ HUnit testFramework testFrameworkHunit text ]; meta = { diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index 395b03d268309..9807911560710 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "conduit"; - version = "1.0.10"; - sha256 = "12vqh747rdldw3n42cxzd77rzb66129dc690n23q5xy7pbhzilfp"; + version = "1.0.11.1"; + sha256 = "115iqdhwmnn04bmby2bmbm6pykb2akaca0c3i79nvw1annml65lg"; buildDepends = [ liftedBase mmorph monadControl mtl resourcet text transformers transformersBase void diff --git a/pkgs/development/libraries/haskell/coroutine-object/default.nix b/pkgs/development/libraries/haskell/coroutine-object/default.nix new file mode 100644 index 0000000000000..ea316fd29e12e --- /dev/null +++ b/pkgs/development/libraries/haskell/coroutine-object/default.nix @@ -0,0 +1,19 @@ +{ cabal, cereal, either, lens, mtl, safecopy, transformers +, transformersFree, uuid +}: + +cabal.mkDerivation (self: { + pname = "coroutine-object"; + version = "0.2.0.0"; + sha256 = "1jl5glnk4ildjrxyxscxd0v7xfqbd9vpv5gaxygsfsbfr1zizp3s"; + buildDepends = [ + cereal either lens mtl safecopy transformers transformersFree uuid + ]; + jailbreak = true; + meta = { + description = "Object-oriented programming realization using coroutine"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ianwookim ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/cryptohash/default.nix b/pkgs/development/libraries/haskell/cryptohash/default.nix index 839bf4518a19b..b888ce6153abe 100644 --- a/pkgs/development/libraries/haskell/cryptohash/default.nix +++ b/pkgs/development/libraries/haskell/cryptohash/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "cryptohash"; - version = "0.11.1"; - sha256 = "0ww7bikl8i50m1pwkqp145bfsiy07npnjw48j3il4w2ia0b3axmy"; + version = "0.11.2"; + sha256 = "0az2p7lql1lchl85ca26b5sbvhqsv47daavyfqy84qmr3w3wyr28"; buildDepends = [ byteable ]; testDepends = [ byteable HUnit QuickCheck testFramework testFrameworkHunit diff --git a/pkgs/development/libraries/haskell/exceptions/default.nix b/pkgs/development/libraries/haskell/exceptions/default.nix index a15c2cc1e48f4..0665694212b6b 100644 --- a/pkgs/development/libraries/haskell/exceptions/default.nix +++ b/pkgs/development/libraries/haskell/exceptions/default.nix @@ -4,13 +4,12 @@ cabal.mkDerivation (self: { pname = "exceptions"; - version = "0.3.2"; - sha256 = "0c1d78wm8is9kyv26drbx3f1sq2bfcq5m6wfw2qzwgalb3z2kxlw"; + version = "0.3.3"; + sha256 = "1gng8zvsljm6xrb5gy501f1dl47z171wkic8bsivhn4rgp9lby9l"; buildDepends = [ mtl transformers ]; testDepends = [ mtl QuickCheck testFramework testFrameworkQuickcheck2 transformers ]; - doCheck = false; meta = { homepage = "http://github.com/ekmett/exceptions/"; description = "Extensible optionally-pure exceptions"; diff --git a/pkgs/development/libraries/haskell/gloss-raster/default.nix b/pkgs/development/libraries/haskell/gloss-raster/default.nix index 4d1b85669dab8..4a34c7195c204 100644 --- a/pkgs/development/libraries/haskell/gloss-raster/default.nix +++ b/pkgs/development/libraries/haskell/gloss-raster/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "gloss-raster"; - version = "1.8.1.1"; - sha256 = "0qqk2fizmv1zdvi8lljxiqdwlmfzni4qzsdvm2jbvgg5qjx9l9qp"; + version = "1.8.1.2"; + sha256 = "1cpibilv027rfx7xz957f1d7wy6b5z6dgfjrw425ck497r8gfgp4"; buildDepends = [ gloss repa ]; extraLibraries = [ llvm ]; meta = { diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix index 0f0777909e82e..223a72ec3818e 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.8.1.1"; - sha256 = "135rrgzx4xq8279zbsl4538hjn8np4g6409fgva2cb9shw8z5pmj"; + version = "1.8.1.2"; + sha256 = "1ky1gckvyww855dy3fzllf1ixbmc3jpdvz85hx719pcygy7qh71m"; buildDepends = [ bmp GLUT OpenGL ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/gnuidn/default.nix b/pkgs/development/libraries/haskell/gnuidn/default.nix index 6ae78cf49b6a4..9192f6bb29bb8 100644 --- a/pkgs/development/libraries/haskell/gnuidn/default.nix +++ b/pkgs/development/libraries/haskell/gnuidn/default.nix @@ -2,14 +2,14 @@ cabal.mkDerivation (self: { pname = "gnuidn"; - version = "0.2"; - sha256 = "0xk72p3z1lwlmab0jcf7m48p5pncgz00hb7l96naz1gdkbq7xizd"; + version = "0.2.1"; + sha256 = "1jii635wc3j1jnwwx24j9gg9xd91g2iw5967acn74p7db62lqx37"; buildDepends = [ text ]; buildTools = [ c2hs ]; extraLibraries = [ libidn ]; pkgconfigDepends = [ libidn ]; meta = { - homepage = "http://john-millikin.com/software/bindings/gnuidn/"; + homepage = "https://john-millikin.com/software/haskell-gnuidn/"; description = "Bindings for GNU IDN"; license = self.stdenv.lib.licenses.gpl3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 36e56de639c3e..ace860bcd1cb0 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "hakyll"; - version = "4.4.3.0"; - sha256 = "1ngjzqgyhdfkzikyg6cicqdb6cpw2bbfr4g73vgmzlg8spy1cyg5"; + version = "4.4.3.1"; + sha256 = "0k301mzy8sagrxdzkhz006j1i1zmsx9iy5ais9gif3gxj2sd3b2a"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -25,10 +25,10 @@ cabal.mkDerivation (self: { snapCore snapServer systemFilepath tagsoup testFramework testFrameworkHunit testFrameworkQuickcheck2 text time ]; - doCheck = false; patchPhase = '' sed -i -e 's|pandoc-citeproc >=.*,|pandoc-citeproc,|' hakyll.cabal ''; + doCheck = false; meta = { homepage = "http://jaspervdj.be/hakyll"; description = "A static website compiler library"; diff --git a/pkgs/development/libraries/haskell/heist/default.nix b/pkgs/development/libraries/haskell/heist/default.nix index 5ce91d688076c..9f0eb8981aeb3 100644 --- a/pkgs/development/libraries/haskell/heist/default.nix +++ b/pkgs/development/libraries/haskell/heist/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "heist"; - version = "0.13.0.4"; - sha256 = "15iixsjlx3zd44dcdxla5pgpl16995pk9g34zjqynmhcj7sfv5as"; + version = "0.13.0.5"; + sha256 = "17lpqiidy1s6yzhh865y7dhkcv34p7pxzljpn64yyfa2pc8885dj"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml directoryTree dlist errors filepath hashable MonadCatchIOTransformers mtl random text time diff --git a/pkgs/development/libraries/haskell/hoodle-builder/default.nix b/pkgs/development/libraries/haskell/hoodle-builder/default.nix new file mode 100644 index 0000000000000..d865de6ec9c1c --- /dev/null +++ b/pkgs/development/libraries/haskell/hoodle-builder/default.nix @@ -0,0 +1,18 @@ +{ cabal, blazeBuilder, doubleConversion, hoodleTypes, lens, strict +}: + +cabal.mkDerivation (self: { + pname = "hoodle-builder"; + version = "0.2.2"; + sha256 = "0gagfpjihf6lafi90r883n9agaj1pw4gygaaxv4xxfsc270855bq"; + buildDepends = [ + blazeBuilder doubleConversion hoodleTypes lens strict + ]; + jailbreak = true; + meta = { + description = "text builder for hoodle file format"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ianwookim ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/hoodle-core/default.nix b/pkgs/development/libraries/haskell/hoodle-core/default.nix new file mode 100644 index 0000000000000..f73733321befb --- /dev/null +++ b/pkgs/development/libraries/haskell/hoodle-core/default.nix @@ -0,0 +1,31 @@ +{ cabal, attoparsec, base64Bytestring, binary, cairo, cereal +, configurator, coroutineObject, dbus, Diff, dyre, either, errors +, filepath, fsnotify, gd, gtk, hoodleBuilder, hoodleParser +, hoodleRender, hoodleTypes, lens, libX11, libXi, monadLoops, mtl +, network, networkInfo, networkSimple, pango, poppler, pureMD5, stm +, strict, svgcairo, systemFilepath, text, time, transformers +, transformersFree, uuid, xournalParser +}: + +cabal.mkDerivation (self: { + pname = "hoodle-core"; + version = "0.13.0.0"; + sha256 = "1krq7i7kvymjhj9kar2rpy4qkbak8p4n1ifswdnk9r1dw7fr8vdx"; + buildDepends = [ + attoparsec base64Bytestring binary cairo cereal configurator + coroutineObject dbus Diff dyre either errors filepath fsnotify gd + gtk hoodleBuilder hoodleParser hoodleRender hoodleTypes lens + monadLoops mtl network networkInfo networkSimple pango poppler + pureMD5 stm strict svgcairo systemFilepath text time transformers + transformersFree uuid xournalParser + ]; + extraLibraries = [ libX11 libXi ]; + jailbreak = true; + meta = { + homepage = "http://ianwookim.org/hoodle"; + description = "Core library for hoodle"; + license = self.stdenv.lib.licenses.gpl3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ianwookim ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/hoodle-parser/default.nix b/pkgs/development/libraries/haskell/hoodle-parser/default.nix new file mode 100644 index 0000000000000..84d9e93aaa2bb --- /dev/null +++ b/pkgs/development/libraries/haskell/hoodle-parser/default.nix @@ -0,0 +1,21 @@ +{ cabal, attoparsec, either, hoodleTypes, lens, mtl, strict, text +, transformers, xournalTypes +}: + +cabal.mkDerivation (self: { + pname = "hoodle-parser"; + version = "0.2.2"; + sha256 = "1m0jf7820hkdq69866hwqd1cc6rv331jrar8ayr28692h09j02rm"; + buildDepends = [ + attoparsec either hoodleTypes lens mtl strict text transformers + xournalTypes + ]; + jailbreak = true; + meta = { + homepage = "http://ianwookim.org/hoodle"; + description = "Hoodle file parser"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ianwookim ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/hoodle-render/default.nix b/pkgs/development/libraries/haskell/hoodle-render/default.nix new file mode 100644 index 0000000000000..3666ef913987d --- /dev/null +++ b/pkgs/development/libraries/haskell/hoodle-render/default.nix @@ -0,0 +1,20 @@ +{ cabal, base64Bytestring, cairo, filepath, gd, hoodleTypes, lens +, monadLoops, mtl, poppler, strict, svgcairo, uuid +}: + +cabal.mkDerivation (self: { + pname = "hoodle-render"; + version = "0.3.2"; + sha256 = "1mmx27g1vqpndk26nz2hy7rckcgg68clvr5x31cqz9f8sifd8rsg"; + buildDepends = [ + base64Bytestring cairo filepath gd hoodleTypes lens monadLoops mtl + poppler strict svgcairo uuid + ]; + jailbreak = true; + meta = { + description = "Hoodle file renderer"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ianwookim ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/hoodle-types/default.nix b/pkgs/development/libraries/haskell/hoodle-types/default.nix new file mode 100644 index 0000000000000..55d7523151005 --- /dev/null +++ b/pkgs/development/libraries/haskell/hoodle-types/default.nix @@ -0,0 +1,15 @@ +{ cabal, cereal, lens, mtl, strict, uuid }: + +cabal.mkDerivation (self: { + pname = "hoodle-types"; + version = "0.2.2"; + sha256 = "0dw2ji676nq3idb7izzzfnxzhyngf84wkapc0la43g4w4hzv1zxz"; + buildDepends = [ cereal lens mtl strict uuid ]; + jailbreak = true; + meta = { + description = "Data types for programs for hoodle file format"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ianwookim ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/pipes-bytestring/default.nix b/pkgs/development/libraries/haskell/pipes-bytestring/default.nix index 83f08ecf148bd..4e085105c202a 100644 --- a/pkgs/development/libraries/haskell/pipes-bytestring/default.nix +++ b/pkgs/development/libraries/haskell/pipes-bytestring/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "pipes-bytestring"; - version = "1.0.2"; - sha256 = "09wzmi3xh9n69xsxw0ik4qf2ld1vksca88ggknqbzbnjxq82jjrr"; + version = "1.0.3"; + sha256 = "11jiaf5vs0jz8m0x9dlcvflh636131bj4jnlrj3r5nz1v7a64v6b"; buildDepends = [ pipes pipesParse transformers ]; meta = { description = "ByteString support for pipes"; diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index 28ce546ee1679..92c02a27f42c1 100644 --- a/pkgs/development/libraries/haskell/snap/snap.nix +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "snap"; - version = "0.13.2.0"; - sha256 = "1jwgl6dmi1ljfqvfjxcsv3q4h9lcqpmxk4zsjkxdx77z201lhm3b"; + version = "0.13.2.1"; + sha256 = "0jkjxyw7pcfl8r6gs0amzpkxardncvxsh20m7lad6aqjkcwh8r4l"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/stm-conduit/default.nix b/pkgs/development/libraries/haskell/stm-conduit/default.nix index 4ab74d23bc236..7e24db4476a4b 100644 --- a/pkgs/development/libraries/haskell/stm-conduit/default.nix +++ b/pkgs/development/libraries/haskell/stm-conduit/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "stm-conduit"; - version = "2.1.4"; - sha256 = "0xl3g96blawy5bkvialq6jxnf4wajxb5fg1sh7p9kvw1gvacqwqk"; + version = "2.2"; + sha256 = "14fz8izr8fxi3s78fhz4p5yfdkfcipcfpcj6dn5w0fkcd2hc2a66"; buildDepends = [ async conduit liftedAsync liftedBase monadControl monadLoops resourcet stm stmChans transformers diff --git a/pkgs/development/libraries/haskell/tasty-rerun/default.nix b/pkgs/development/libraries/haskell/tasty-rerun/default.nix new file mode 100644 index 0000000000000..e932a7b9307ff --- /dev/null +++ b/pkgs/development/libraries/haskell/tasty-rerun/default.nix @@ -0,0 +1,20 @@ +{ cabal, mtl, optparseApplicative, reducers, split, stm, tagged +, tasty, transformers +}: + +cabal.mkDerivation (self: { + pname = "tasty-rerun"; + version = "1.0.0"; + sha256 = "0vpgsb5fgvb9mx07zq53slqxxk2vvr2c9c9p1fhrm9qadfirsqc8"; + buildDepends = [ + mtl optparseApplicative reducers split stm tagged tasty + transformers + ]; + meta = { + homepage = "http://github.com/ocharles/tasty-rerun"; + description = "Run tests by filtering the test tree depending on the result of previous test runs"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/threepenny-gui/default.nix b/pkgs/development/libraries/haskell/threepenny-gui/default.nix new file mode 100644 index 0000000000000..70f96c8ac9d7d --- /dev/null +++ b/pkgs/development/libraries/haskell/threepenny-gui/default.nix @@ -0,0 +1,26 @@ +{ cabal, attoparsecEnumerator, dataDefault, deepseq, filepath +, hashable, json, MonadCatchIOTransformers, network, safe, snapCore +, snapServer, stm, text, time, transformers, unorderedContainers +, utf8String, vault, websockets, websocketsSnap +}: + +cabal.mkDerivation (self: { + pname = "threepenny-gui"; + version = "0.4.0.2"; + sha256 = "0dx6jrpxvd6ypz314hmq8nngy0wjx3bwx3r9h1c6y70id31lr9pg"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + attoparsecEnumerator dataDefault deepseq filepath hashable json + MonadCatchIOTransformers network safe snapCore snapServer stm text + time transformers unorderedContainers utf8String vault websockets + websocketsSnap + ]; + meta = { + homepage = "http://www.haskell.org/haskellwiki/Threepenny-gui"; + description = "GUI framework that uses the web browser as a display"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/timezone-olson/default.nix b/pkgs/development/libraries/haskell/timezone-olson/default.nix new file mode 100644 index 0000000000000..c46090cda9b10 --- /dev/null +++ b/pkgs/development/libraries/haskell/timezone-olson/default.nix @@ -0,0 +1,15 @@ +{ cabal, binary, extensibleExceptions, time, timezoneSeries }: + +cabal.mkDerivation (self: { + pname = "timezone-olson"; + version = "0.1.2"; + sha256 = "1dp0nppvx732c27pybbyqw6jkx4kdgfc6vnc539m0xv005afpq9y"; + buildDepends = [ binary extensibleExceptions time timezoneSeries ]; + meta = { + homepage = "http://projects.haskell.org/time-ng/"; + description = "A pure Haskell parser and renderer for binary Olson timezone files"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/timezone-series/default.nix b/pkgs/development/libraries/haskell/timezone-series/default.nix new file mode 100644 index 0000000000000..1ce1ca1f768ca --- /dev/null +++ b/pkgs/development/libraries/haskell/timezone-series/default.nix @@ -0,0 +1,15 @@ +{ cabal, time }: + +cabal.mkDerivation (self: { + pname = "timezone-series"; + version = "0.1.2"; + sha256 = "0clvm1kwmxid5bhb74vgrpzynn4sff2k6mfzb43i7737w5fy86gp"; + buildDepends = [ time ]; + meta = { + homepage = "http://projects.haskell.org/time-ng/"; + description = "Enhanced timezone handling for Data.Time"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/transformers-free/default.nix b/pkgs/development/libraries/haskell/transformers-free/default.nix new file mode 100644 index 0000000000000..da05e122e529c --- /dev/null +++ b/pkgs/development/libraries/haskell/transformers-free/default.nix @@ -0,0 +1,14 @@ +{ cabal, transformers }: + +cabal.mkDerivation (self: { + pname = "transformers-free"; + version = "1.0.1"; + sha256 = "0fbzkr7ifvqng8wqi3332vwvmx36f8z167angyskfdd0a5rik2z0"; + buildDepends = [ transformers ]; + meta = { + description = "Free monad transformers"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ianwookim ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/vector-space-points/default.nix b/pkgs/development/libraries/haskell/vector-space-points/default.nix index 2a5c1eb2fc427..2edb15beeda55 100644 --- a/pkgs/development/libraries/haskell/vector-space-points/default.nix +++ b/pkgs/development/libraries/haskell/vector-space-points/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "vector-space-points"; - version = "0.1.2.1"; - sha256 = "0prbmk48xdr2gbxqpv0g89xz5v3k9wps9v2gymkh32jag2lgzi66"; + version = "0.1.3"; + sha256 = "0bk2zrccf5bxh14dzhhv89mr755j801ziqyxgv69ksdyxh8hx2qg"; buildDepends = [ newtype vectorSpace ]; meta = { description = "A type for points, as distinct from vectors"; diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index c7b673ecbc9f8..78d8026925452 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "wai-extra"; - version = "2.0.2"; - sha256 = "1va9lds6vziid3kksyp1pl4bz1l02qjybm4x438q5a7n6yxmmd65"; + version = "2.0.3"; + sha256 = "18x5jcq4yl33ixl7rb79ncx107bw6y8dmw2gwcmxb93h5yiam7s5"; buildDepends = [ ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive conduit dataDefault fastLogger httpTypes liftedBase diff --git a/pkgs/development/libraries/haskell/xournal-parser/default.nix b/pkgs/development/libraries/haskell/xournal-parser/default.nix new file mode 100644 index 0000000000000..d874543a967a9 --- /dev/null +++ b/pkgs/development/libraries/haskell/xournal-parser/default.nix @@ -0,0 +1,22 @@ +{ cabal, attoparsec, attoparsecConduit, conduit, lens, mtl, strict +, text, transformers, xmlConduit, xmlTypes, xournalTypes +, zlibConduit +}: + +cabal.mkDerivation (self: { + pname = "xournal-parser"; + version = "0.5.0.2"; + sha256 = "1s9z7s6mcsn4s2krrcb1x63ca1d0rpyzdhb147w9524qw7gvbjin"; + buildDepends = [ + attoparsec attoparsecConduit conduit lens mtl strict text + transformers xmlConduit xmlTypes xournalTypes zlibConduit + ]; + jailbreak = true; + meta = { + homepage = "http://ianwookim.org/hoodle"; + description = "Xournal file parser"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ianwookim ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/xournal-types/default.nix b/pkgs/development/libraries/haskell/xournal-types/default.nix new file mode 100644 index 0000000000000..2281520703f26 --- /dev/null +++ b/pkgs/development/libraries/haskell/xournal-types/default.nix @@ -0,0 +1,15 @@ +{ cabal, cereal, lens, strict, TypeCompose }: + +cabal.mkDerivation (self: { + pname = "xournal-types"; + version = "0.5.0.2"; + sha256 = "1z1zxgwnd2bpgmiimil2jnz4xdcvvi59y2qdvqgy42b10db8rvkm"; + buildDepends = [ cereal lens strict TypeCompose ]; + jailbreak = true; + meta = { + description = "Data types for programs for xournal file format"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ianwookim ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index b261d22ace6ec..56048aeb6277b 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "1.2.5.2"; - sha256 = "13gvcwgpq4l3d50h855qdcn0k93a8cy918jg577ch3fqhwk70q8g"; + version = "1.2.5.3"; + sha256 = "0rpyx9p3si5453166v9paq18nz209w6lxz3hy5nxg1hyihwh8gy9"; buildDepends = [ aeson authenticate blazeHtml blazeMarkup dataDefault emailValidate fileEmbed hamlet httpConduit httpTypes liftedBase mimeMail network diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 66b2117ee8298..35b55bde887ae 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "1.3.4.2"; - sha256 = "06qw2hx0iv46xdmkbbw1sgwzvyr82h0v267dxfw19235s9yfzbfg"; + version = "1.3.4.3"; + sha256 = "1yf9kvnlkgfdpv44afj2zwdk8jh382lxj56jvafgw1bxa1hsn408"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi dataDefault emailValidate hamlet network persistent resourcet diff --git a/pkgs/development/libraries/haskell/yesod-platform/default.nix b/pkgs/development/libraries/haskell/yesod-platform/default.nix index 929dd698b7ddc..0c9c31778cad4 100644 --- a/pkgs/development/libraries/haskell/yesod-platform/default.nix +++ b/pkgs/development/libraries/haskell/yesod-platform/default.nix @@ -2,65 +2,67 @@ , attoparsecConduit, authenticate, base64Bytestring , baseUnicodeSymbols, blazeBuilder, blazeBuilderConduit, blazeHtml , blazeMarkup, byteable, byteorder, caseInsensitive, cereal -, certificate, cipherAes, cipherRc4, clientsession, conduit -, connection, controlMonadLoop, cookie, cprngAes, cryptoApi -, cryptoCipherTypes, cryptoConduit, cryptohash, cryptohashCryptoapi -, cryptoNumbers, cryptoPubkey, cryptoPubkeyTypes, cryptoRandom +, certificate, cipherAes, cipherBlowfish, cipherCamellia, cipherDes +, cipherRc4, clientsession, conduit, connection, controlMonadLoop +, cookie, cprngAes, cryptoApi, cryptocipher, cryptoCipherTypes +, cryptoConduit, cryptohash, cryptohashCryptoapi, cryptoNumbers +, cryptoPubkey, cryptoPubkeyTypes, cryptoRandom, cryptoRandomApi , cssText, dataDefault, dataDefaultClass, dataDefaultInstancesBase , dataDefaultInstancesContainers, dataDefaultInstancesDlist , dataDefaultInstancesOldLocale, dlist, emailValidate, entropy -, failure, fastLogger, fileEmbed, filesystemConduit, hamlet, hjsmin -, hspec, hspecExpectations, htmlConduit, httpAttoparsec, httpClient -, httpClientConduit, httpClientTls, httpConduit, httpDate -, httpTypes, languageJavascript, liftedBase, mimeMail, mimeTypes -, mmorph, monadControl, monadLogger, monadLoops, networkConduit -, pathPieces, pem, persistent, persistentTemplate, poolConduit -, primitive, processConduit, publicsuffixlist, pureMD5, pwstoreFast -, quickcheckIo, resourcePool, resourcet, safe, securemem -, semigroups, setenv, SHA, shakespeare, shakespeareCss -, shakespeareI18n, shakespeareJs, shakespeareText, silently -, simpleSendfile, skein, socks, stmChans, stringsearch -, systemFileio, systemFilepath, tagged, tagsoup, tagstreamConduit -, tls, tlsExtra, transformersBase, unixCompat, unorderedContainers -, utf8Light, utf8String, vector, void, wai, waiAppStatic, waiExtra -, waiLogger, waiTest, warp, word8, xmlConduit, xmlTypes -, xssSanitize, yaml, yesod, yesodAuth, yesodCore, yesodForm -, yesodPersistent, yesodRoutes, yesodStatic, yesodTest -, zlibBindings, zlibConduit +, esqueleto, failure, fastLogger, fileEmbed, filesystemConduit +, hamlet, hjsmin, hspec, hspecExpectations, htmlConduit +, httpAttoparsec, httpClient, httpClientConduit, httpClientTls +, httpConduit, httpDate, httpTypes, languageJavascript, liftedBase +, mimeMail, mimeTypes, mmorph, monadControl, monadLogger +, monadLoops, networkConduit, pathPieces, pem, persistent +, persistentTemplate, poolConduit, primitive, processConduit +, publicsuffixlist, pureMD5, pwstoreFast, quickcheckIo +, resourcePool, resourcet, safe, scientific, securemem, semigroups +, setenv, SHA, shakespeare, shakespeareCss, shakespeareI18n +, shakespeareJs, shakespeareText, silently, simpleSendfile, skein +, socks, stmChans, stringsearch, systemFileio, systemFilepath +, tagged, tagsoup, tagstreamConduit, tls, tlsExtra +, transformersBase, unixCompat, unorderedContainers, utf8Light +, utf8String, vector, void, wai, waiAppStatic, waiExtra, waiLogger +, waiTest, warp, warpTls, word8, xmlConduit, xmlTypes, xssSanitize +, yaml, yesod, yesodAuth, yesodCore, yesodForm, yesodPersistent +, yesodRoutes, yesodStatic, yesodTest, zlibBindings, zlibConduit }: cabal.mkDerivation (self: { pname = "yesod-platform"; - version = "1.2.5.3"; - sha256 = "0k9srgsnz9cgpxhdk04qz27lqp1xm97bprxjv93j1sxny92v6122"; + version = "1.2.6"; + sha256 = "15ixhxim14672hl9cl92sbi94yzv6g6zgg07jvkciixg0hd8xr6p"; buildDepends = [ aeson ansiTerminal asn1Data asn1Types attoparsec attoparsecConduit authenticate base64Bytestring baseUnicodeSymbols blazeBuilder blazeBuilderConduit blazeHtml blazeMarkup byteable byteorder - caseInsensitive cereal certificate cipherAes cipherRc4 - clientsession conduit connection controlMonadLoop cookie cprngAes - cryptoApi cryptoCipherTypes cryptoConduit cryptohash - cryptohashCryptoapi cryptoNumbers cryptoPubkey cryptoPubkeyTypes - cryptoRandom cssText dataDefault dataDefaultClass + caseInsensitive cereal certificate cipherAes cipherBlowfish + cipherCamellia cipherDes cipherRc4 clientsession conduit connection + controlMonadLoop cookie cprngAes cryptoApi cryptocipher + cryptoCipherTypes cryptoConduit cryptohash cryptohashCryptoapi + cryptoNumbers cryptoPubkey cryptoPubkeyTypes cryptoRandom + cryptoRandomApi cssText dataDefault dataDefaultClass dataDefaultInstancesBase dataDefaultInstancesContainers dataDefaultInstancesDlist dataDefaultInstancesOldLocale dlist - emailValidate entropy failure fastLogger fileEmbed + emailValidate entropy esqueleto failure fastLogger fileEmbed filesystemConduit hamlet hjsmin hspec hspecExpectations htmlConduit httpAttoparsec httpClient httpClientConduit httpClientTls httpConduit httpDate httpTypes languageJavascript liftedBase mimeMail mimeTypes mmorph monadControl monadLogger monadLoops networkConduit pathPieces pem persistent persistentTemplate poolConduit primitive processConduit publicsuffixlist pureMD5 - pwstoreFast quickcheckIo resourcePool resourcet safe securemem - semigroups setenv SHA shakespeare shakespeareCss shakespeareI18n - shakespeareJs shakespeareText silently simpleSendfile skein socks - stmChans stringsearch systemFileio systemFilepath tagged tagsoup - tagstreamConduit tls tlsExtra transformersBase unixCompat - unorderedContainers utf8Light utf8String vector void wai - waiAppStatic waiExtra waiLogger waiTest warp word8 xmlConduit - xmlTypes xssSanitize yaml yesod yesodAuth yesodCore yesodForm - yesodPersistent yesodRoutes yesodStatic yesodTest zlibBindings - zlibConduit + pwstoreFast quickcheckIo resourcePool resourcet safe scientific + securemem semigroups setenv SHA shakespeare shakespeareCss + shakespeareI18n shakespeareJs shakespeareText silently + simpleSendfile skein socks stmChans stringsearch systemFileio + systemFilepath tagged tagsoup tagstreamConduit tls tlsExtra + transformersBase unixCompat unorderedContainers utf8Light + utf8String vector void wai waiAppStatic waiExtra waiLogger waiTest + warp warpTls word8 xmlConduit xmlTypes xssSanitize yaml yesod + yesodAuth yesodCore yesodForm yesodPersistent yesodRoutes + yesodStatic yesodTest zlibBindings zlibConduit ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/isl/0.12.2.nix b/pkgs/development/libraries/isl/0.12.2.nix new file mode 100644 index 0000000000000..995cd0510b4c3 --- /dev/null +++ b/pkgs/development/libraries/isl/0.12.2.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, gmp }: + +stdenv.mkDerivation rec { + name = "isl-0.12.2"; # CLooG 0.16.3 fails to build with ISL 0.08. + + src = fetchurl { + url = "http://isl.gforge.inria.fr/${name}.tar.bz2"; + sha256 = "1d0zs64yw6fzs6b7kxq6nh9kvas16h8b43agwh30118jjzpdpczl"; + }; + + buildInputs = [ gmp ]; + + meta = { + homepage = http://www.kotnet.org/~skimo/isl/; + license = "LGPLv2.1"; + description = "A library for manipulating sets and relations of integer points bounded by linear constraints"; + maintainers = [ stdenv.lib.maintainers.shlevy ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index 005b9fac2e554..1380cec86ae57 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -1,18 +1,21 @@ -{ stdenv, fetchurl_gnome, glib, pkgconfig, gobjectIntrospection }: +{ stdenv, fetchurl_gnome, glib, pkgconfig, gobjectIntrospection, dbus }: stdenv.mkDerivation rec { name = src.pkgname; src = fetchurl_gnome { project = "json-glib"; - major = "0"; minor = "14"; patchlevel = "2"; extension = "xz"; - sha256 = "19wlpsbdnm3mq2a6yjpzj0cwrmlkarp2m5x6g63b0r2n7vxaa5mq"; + major = "0"; + minor = "16"; + patchlevel = "2"; + extension = "xz"; + sha256 = "0b22yw0n87mg7a5lkqw1d7xqnm8qj1bwy0wklv9b2yn29qv7am59"; }; - configureflags= " --with-introspection " ; + configureflags= "--with-introspection" ; - propagatedBuildInputs = [ glib ]; - nativeBuildInputs = [ pkgconfig gobjectIntrospection]; + propagatedBuildInputs = [ glib gobjectIntrospection ]; + nativeBuildInputs = [ pkgconfig ]; meta = { homepage = http://live.gnome.org/JsonGlib; diff --git a/pkgs/development/libraries/libc++/default.nix b/pkgs/development/libraries/libc++/default.nix index 1d4ef158113a8..964d3727f8f28 100644 --- a/pkgs/development/libraries/libc++/default.nix +++ b/pkgs/development/libraries/libc++/default.nix @@ -1,46 +1,26 @@ -{ stdenv, fetchsvn, cmake, libunwind }: +{ stdenv, fetchurl, fetchsvn, cmake, libcxxabi }: -let rev = "190100"; in +let + version = "3.4"; -stdenv.mkDerivation rec { - name = "libc++-pre${rev}"; +in stdenv.mkDerivation rec { + name = "libc++-${version}"; - src = fetchsvn { - url = "http://llvm.org/svn/llvm-project/libcxx/trunk"; - inherit rev; - sha256 = "0hnfvzzrkj797kp9sk2yncvbmiyx0d72k8bys3z7l6i47d37xv03"; + src = fetchurl { + url = "http://llvm.org/releases/${version}/libcxx-${version}.src.tar.gz"; + sha256 = "1sqd5qhqj7qnn9zjxx9bv7ky4f7xgmh9sbgd53y1kszhg41217xx"; }; - cxxabi = fetchsvn { - url = "http://llvm.org/svn/llvm-project/libcxxabi/trunk"; - inherit rev; - sha256 = "1kdyvngwd229cgmcqpawaf0qizas8bqc0g8s08fmbgwsrh1qrryp"; - }; - - buildInputs = [ cmake ]; - - preConfigure = '' - sed -i 's/;cxa_demangle.h//' CMakeLists.txt - cp -R ${cxxabi} cxxabi - chmod u+w -R cxxabi # umm - (export NIX_CFLAGS_COMPILE="-I${libunwind}/include -I$PWD/include"; - export NIX_CFLAGS_LINK="-L${libunwind}/lib -lunwind"; - cd cxxabi/lib - sed -e s,-lstdc++,, -i buildit # do not link to libstdc++! - ./buildit - mkdir -p $out/lib && cp libc++abi.so.1.0 $out/lib - cd $out/lib - ln -s libc++abi.so.1.0 libc++abi.so - ln -s libc++abi.so.1.0 libc++abi.so.1) - ''; + buildInputs = [ cmake libcxxabi ]; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" - "-DLIBCXX_LIBCXXABI_INCLUDE_PATHS=${cxxabi}/include" + "-DLIBCXX_LIBCXXABI_INCLUDE_PATHS=${libcxxabi}/include" "-DLIBCXX_CXX_ABI=libcxxabi" ]; - buildPhase = ''NIX_CFLAGS_LINK="-L$out/lib -lc++abi" make''; enableParallelBuilding = true; + passthru.abi = libcxxabi; + meta = { homepage = http://libcxx.llvm.org/; description = "A new implementation of the C++ standard library, targeting C++11"; @@ -49,4 +29,3 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.all; }; } - diff --git a/pkgs/development/libraries/libc++abi/default.nix b/pkgs/development/libraries/libc++abi/default.nix new file mode 100644 index 0000000000000..51d18a7b907f5 --- /dev/null +++ b/pkgs/development/libraries/libc++abi/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchsvn, libcxx, libunwind }: +let + rev = "199626"; +in stdenv.mkDerivation { + name = "libcxxabi-pre-${rev}"; + + src = fetchsvn { + url = http://llvm.org/svn/llvm-project/libcxxabi/trunk; + rev = "199626"; + sha256 = "0h1x1s40x5r65ar53rv34lmgcfil3zxaknqr64dka1mz29xhhrxy"; + }; + + NIX_CFLAGS_LINK="-L${libunwind}/lib -lunwind"; + + postUnpack = '' + unpackFile ${libcxx.src} + export NIX_CFLAGS_COMPILE="-I${libunwind}/include -I$PWD/include -I$(readlink -f libcxx-*)/include" + ''; + + installPhase = '' + install -d -m 755 $out/include $out/lib + install -m 644 lib/libc++abi.so.1.0 $out/lib + install -m 644 include/cxxabi.h $out/include + ln -s libc++abi.so.1.0 $out/lib/libc++abi.so + ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1 + ''; + + patchPhase = "sed -e s,-lstdc++,, -i lib/buildit"; + + buildPhase = "(cd lib; ./buildit)"; + + meta = { + homepage = http://libcxxabi.llvm.org/; + description = "A new implementation of low level support for a standard C++ library"; + license = "BSD"; + maintainers = stdenv.lib.maintainers.shlevy; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/libossp-uuid/default.nix b/pkgs/development/libraries/libossp-uuid/default.nix new file mode 100644 index 0000000000000..7f6335f649653 --- /dev/null +++ b/pkgs/development/libraries/libossp-uuid/default.nix @@ -0,0 +1,40 @@ +{stdenv, fetchurl}: + +let version = "1.6.2"; in + +stdenv.mkDerivation { + name = "libossp-uuid-${version}"; + + src = fetchurl { + url = "ftp://ftp.ossp.org/pkg/lib/uuid/uuid-${version}.tar.gz"; + sha256= "11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0"; + }; + + meta = { + homepage = http://www.ossp.org/pkg/lib/uuid/; + description = "OSSP uuid ISO-C and C++ shared library"; + longDescription = + '' + OSSP uuid is a ISO-C:1999 application programming interface + (API) and corresponding command line interface (CLI) for the + generation of DCE 1.1, ISO/IEC 11578:1996 and RFC 4122 + compliant Universally Unique Identifier (UUID). It supports + DCE 1.1 variant UUIDs of version 1 (time and node based), + version 3 (name based, MD5), version 4 (random number based) + and version 5 (name based, SHA-1). Additional API bindings are + provided for the languages ISO-C++:1998, Perl:5 and + PHP:4/5. Optional backward compatibility exists for the ISO-C + DCE-1.1 and Perl Data::UUID APIs. + + UUIDs are 128 bit numbers which are intended to have a high + likelihood of uniqueness over space and time and are + computationally difficult to guess. They are globally unique + identifiers which can be locally generated without contacting + a global registration authority. UUIDs are intended as unique + identifiers for both mass tagging objects with an extremely + short lifetime and to reliably identifying very persistent + objects across a network. + ''; + license = stdenv.lib.licenses.bsd2; + }; +} \ No newline at end of file diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index 46e73a121fe3a..aa869b4b19d85 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, bash, yasm, which, perl}: -let version = "1.2.0"; +let version = "1.3.0"; in stdenv.mkDerivation rec { name = "libvpx-" + version; src = fetchurl { # sadly, there's no official tarball for this release - url = "ftp://ftp.archlinux.org/other/libvpx/libvpx-${version}.tar.xz"; - sha256 = "02k9ylswgr2hvjqmg422fa9ggym0g94gzwb14nnckly698rvjc50"; + url = "http://webm.googlecode.com/files/libvpx-v1.3.0.tar.bz2"; + sha1 = "191b95817aede8c136cc3f3745fb1b8c50e6d5dc"; }; patchPhase = '' @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { [ "--disable-install-srcs" "--disable-install-docs" "--disable-examples" "--enable-vp8" "--enable-runtime-cpu-detect" "--enable-pic" ] # --enable-shared is only supported on ELF - ++ stdenv.lib.optional (!stdenv.isDarwin) "--enable-shared"; + ++ stdenv.lib.optional (!stdenv.isDarwin) "--disable-static --enable-shared"; installPhase = '' make quiet=false DIST_DIR=$out install diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix new file mode 100644 index 0000000000000..f6244cba5cb14 --- /dev/null +++ b/pkgs/development/libraries/libwacom/default.nix @@ -0,0 +1,19 @@ +{ fetchurl, stdenv, glib, pkgconfig, udev }: + +stdenv.mkDerivation rec { + name = "libwacom-0.7.1"; + + src = fetchurl { + url = "mirror://sourceforge/linuxwacom/libwacom/${name}.tar.bz2"; + sha256 = "1agdaa1bv5mp4l32qgsw63swnnv0p279jiy9madgw4y3d8d12dwm"; + }; + + buildInputs = [ glib pkgconfig udev ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + homepage = http://sourceforge.net/projects/linuxwacom/; + description = "libraries, configuration, and diagnostic tools for Wacom tablets running under Linux"; + }; + +} diff --git a/pkgs/development/libraries/phonon-backend-vlc/default.nix b/pkgs/development/libraries/phonon-backend-vlc/default.nix index 39f444dd58f85..060f4c45a4868 100644 --- a/pkgs/development/libraries/phonon-backend-vlc/default.nix +++ b/pkgs/development/libraries/phonon-backend-vlc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xz, qt4, vlc, automoc4, cmake, phonon }: +{ stdenv, fetchurl, xz, qt4, vlc, automoc4, cmake, pkgconfig, phonon }: let pname = "phonon-backend-vlc"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { sha256 = "1rhzc3d188l6ygxgfxwikscj71pyy0nchzikvkkq465r9ajavdgd"; }; - nativeBuildInputs = [ cmake automoc4 xz ]; + nativeBuildInputs = [ cmake pkgconfig automoc4 xz ]; buildInputs = [ qt4 vlc_ phonon ]; diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 1f1ab5d728230..1e1452f4578b8 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -4,14 +4,14 @@ }: let - version = "0.24.4"; # even major numbers are stable - sha256 = "1qh1gk6hq5cfpkqyxxgkpyl78na8dckmh6zbgsqbpw762yd518y8"; + version = "0.24.5"; # even major numbers are stable + sha256 = "114zfm4771iq25wa4bsg4nc2gnr6waaj8936wd23r4hc2084jrd2"; qtcairo_patches = - let qtcairo = fetchgit { # the version for poppler-0.22 + let qtcairo = fetchgit { # the version for poppler-0.24 url = "git://github.com/giddie/poppler-qt4-cairo-backend.git"; - rev = "ad9a9ba0628df33522f4b7722cb0cd027269babe"; - sha256 = "072p7x9902avg2r1ma5br97q8nm8sbk19y0qi4b4g9x2xj2fpajq"; + rev = "c4578cde09834e0d70873f63b1c2a410f66bb4f9"; + sha256 = "07bs2phmp7f4mqrwqz2bgyw2gw7s00mwsm548bsikyz1cbj7fl93"; }; in [ "${qtcairo}/0001-Cairo-backend-added-to-Qt4-wrapper.patch" "${qtcairo}/0002-Setting-default-Qt4-backend-to-Cairo.patch" diff --git a/pkgs/development/ocaml-modules/camomile/default.nix b/pkgs/development/ocaml-modules/camomile/default.nix index 1d4b98bf0e577..332230615d154 100644 --- a/pkgs/development/ocaml-modules/camomile/default.nix +++ b/pkgs/development/ocaml-modules/camomile/default.nix @@ -2,16 +2,14 @@ let ocaml_version = (builtins.parseDrvName ocaml.name).version; - version = "0.8.3"; in stdenv.mkDerivation { - name = "camomile-${version}"; + name = "camomile-0.8.5"; src = fetchurl { - url = "mirror://sourceforge/camomile/camomile-${version}.tar.bz2"; - #sha256 = "0x43pjxx70kgip86mmdn08s97k4qzdqc8i79xfyyx28smy1bsa00"; - sha256 = "0yzj6j88aqrkbcynqh1d7r54670m1sqf889vdcgk143w85fxdj4l"; + url = https://github.com/yoriyuki/Camomile/releases/download/rel-0.8.5/camomile-0.8.5.tar.bz2; + sha256 = "003ikpvpaliy5hblhckfmln34zqz0mk3y2m1fqvbjngh3h2np045"; }; buildInputs = [ocaml findlib]; @@ -19,9 +17,9 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = { - homepage = http://camomile.sourceforge.net/; + homepage = https://github.com/yoriyuki/Camomile/tree/master/Camomile; description = "A comprehensive Unicode library for OCaml"; - license = "LGPL"; + license = stdenv.lib.licenses.lgpl21; platforms = ocaml.meta.platforms; maintainers = [ stdenv.lib.maintainers.z77z diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix index 94b36fb665130..1f9e2b44e00ce 100644 --- a/pkgs/development/ocaml-modules/cryptokit/default.nix +++ b/pkgs/development/ocaml-modules/cryptokit/default.nix @@ -2,16 +2,14 @@ let ocaml_version = (builtins.parseDrvName ocaml.name).version; - version = "1.7"; in stdenv.mkDerivation { - name = "cryptokit-${version}"; + name = "cryptokit-1.9"; src = fetchurl { - url = "http://forge.ocamlcore.org/frs/download.php/1166/" + - "cryptokit-${version}.tar.gz"; - sha256 = "56a8c0339c47ca3cf43c8881d5b519d3bff68bc8a53267e9c5c9cbc9239600ca"; + url = http://forge.ocamlcore.org/frs/download.php/1166/cryptokit-1.9.tar.gz; + sha256 = "1jh0jqiwkjy9qplnfcm5r25zdgyk36sxb0c87ks3rjj7khrw1a2n"; }; buildInputs = [zlib ocaml findlib ncurses]; diff --git a/pkgs/development/ocaml-modules/menhir/default.nix b/pkgs/development/ocaml-modules/menhir/default.nix index d02516e410a3b..249ddc1cf5686 100644 --- a/pkgs/development/ocaml-modules/menhir/default.nix +++ b/pkgs/development/ocaml-modules/menhir/default.nix @@ -2,14 +2,13 @@ let ocaml_version = (builtins.parseDrvName ocaml.name).version; - version = "20120123"; in stdenv.mkDerivation { - name = "menhir-${version}"; + name = "menhir-20130116"; src = fetchurl { - url = "http://pauillac.inria.fr/~fpottier/menhir/menhir-${version}.tar.gz"; + url = http://pauillac.inria.fr/~fpottier/menhir/menhir-20130116.tar.gz; sha256 = "65cd9e4f813c62697c60c344963ca11bd461169f574ba3a866c2691541cb4682"; }; @@ -42,7 +41,7 @@ stdenv.mkDerivation { to OCaml code. Menhir was designed and implemented by François Pottier and Yann Régis-Gianas. ''; - license = "QPL,LGPL+linking exceptions"; + licenses = [ "QPL" /* generator */ "LGPLv2" /* library */ ]; platforms = ocaml.meta.platforms; maintainers = [ stdenv.lib.maintainers.z77z diff --git a/pkgs/development/ocaml-modules/ounit/default.nix b/pkgs/development/ocaml-modules/ounit/default.nix index 533f1ec8d1cd9..43ec474cf5e7d 100644 --- a/pkgs/development/ocaml-modules/ounit/default.nix +++ b/pkgs/development/ocaml-modules/ounit/default.nix @@ -5,11 +5,11 @@ let in stdenv.mkDerivation { - name = "ounit-1.1.2"; + name = "ounit-2.0.0"; src = fetchurl { - url = http://forge.ocamlcore.org/frs/download.php/886/ounit-1.1.2.tar.gz; - sha256 = "e6bc1b0cdbb5b5552d85bee653e23aafe20bb97fd7cd229c867d01ff999888e3"; + url = http://forge.ocamlcore.org/frs/download.php/886/ounit-2.0.0.tar.gz; + sha256 = "1qw8k2czy0bxhsf25kfpgywhpqmg7bi57rmyhlnmbddmvc61pg76"; }; buildInputs = [ocaml findlib]; diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix index 8139d6e28c787..11d81c3beb7cb 100644 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ b/pkgs/development/tools/build-managers/scons/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation { buildPhase = "python setup.py install --prefix=$out --install-data=$out/share --install-lib=$(toPythonPath $out) --symlink-scons -O1"; installPhase = "for n in $out/bin/*-${version}; do wrapProgram $n --suffix PYTHONPATH ':' \"$(toPythonPath $out)\"; done"; + pythonPath = []; + meta = { homepage = "http://scons.org/"; description = "An improved, cross-platform substitute for Make"; diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index d0d7e7b39b240..342eb3ecfd115 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "cabal2nix"; - version = "1.58"; - sha256 = "0xsp0f87583pcjdfhngbc9465yisk2m3sn6904s0szprkpi2p03x"; + version = "1.59"; + sha256 = "1prm07mnnasfn042635kc6h6mymvninic0y9zimii7k4rqblf598"; isLibrary = false; isExecutable = true; buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ]; diff --git a/pkgs/development/tools/haskell/hasktags/default.nix b/pkgs/development/tools/haskell/hasktags/default.nix index 8f72edb1f80ea..cd27fb5fbc4db 100644 --- a/pkgs/development/tools/haskell/hasktags/default.nix +++ b/pkgs/development/tools/haskell/hasktags/default.nix @@ -1,17 +1,17 @@ -{ cabal, filepath, HUnit, interlude, json }: +{ cabal, filepath, HUnit, json }: cabal.mkDerivation (self: { pname = "hasktags"; - version = "0.68.5"; - sha256 = "0yr7icaww5kiczmi64n2ypkwabs4yl8wl2kf67zmgclp12kqik81"; + version = "0.68.6"; + sha256 = "1r5vnn9n2jva1ccjv8vnp3j0z3bh3xsi7yjv9llnvj0jw308aq9r"; isLibrary = false; isExecutable = true; - buildDepends = [ filepath HUnit interlude json ]; + buildDepends = [ filepath json ]; + testDepends = [ filepath HUnit json ]; meta = { homepage = "http://github.com/MarcWeber/hasktags"; description = "Produces ctags \"tags\" and etags \"TAGS\" files for Haskell programs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index 74b3368293c11..8691e1b9d1117 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -7,11 +7,11 @@ in stdenv.mkDerivation { - name = "camlp5${if transitional then "_transitional" else ""}-6.06"; + name = "camlp5${if transitional then "_transitional" else ""}-6.11"; src = fetchurl { - url = http://pauillac.inria.fr/~ddr/camlp5/distrib/src/camlp5-6.06.tgz; - sha256 = "763f89ee6cde4ca063a50708c3fe252d55ea9f8037e3ae9801690411ea6180c5"; + url = http://pauillac.inria.fr/~ddr/camlp5/distrib/src/camlp5-6.11.tgz; + sha256 = "0dxb5id6imq502sic75l786q94dhplqx6yyhjkkw19kf64fiqlk5"; }; buildInputs = [ ocaml ]; diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index aee0040f81598..ec19d55c58ea8 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -5,11 +5,11 @@ let in stdenv.mkDerivation { - name = "ocaml-findlib-1.3.3"; + name = "ocaml-findlib-1.4"; src = fetchurl { - url = http://download.camlcity.org/download/findlib-1.3.3.tar.gz; - sha256 = "981f5c67118a2be015efa79f3af3cb0063376b93123b5d695e7cb5c586b1d45c"; + url = http://download.camlcity.org/download/findlib-1.4.tar.gz; + sha256 = "1y5xy6crldyh8pl9ca2cj31igbjfkicr9zqkq9p1fccxszjnah3f"; }; buildInputs = [m4 ncurses ocaml]; diff --git a/pkgs/development/tools/parsing/happy/1.19.3.nix b/pkgs/development/tools/parsing/happy/1.19.3.nix new file mode 100644 index 0000000000000..b1a03fa3b9f85 --- /dev/null +++ b/pkgs/development/tools/parsing/happy/1.19.3.nix @@ -0,0 +1,18 @@ +{ cabal, mtl, perl }: + +cabal.mkDerivation (self: { + pname = "happy"; + version = "1.19.3"; + sha256 = "1q3hipgcwvrf333wlyqmg4mgf24gwiagddlfyr9zgi4k42p2373x"; + isLibrary = false; + isExecutable = true; + buildDepends = [ mtl ]; + buildTools = [ perl ]; + meta = { + homepage = "http://www.haskell.org/happy/"; + description = "Happy is a parser generator for Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 01a605aac3090..8b96a321634d6 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -63,7 +63,9 @@ with stdenv.lib; # Networking options. IP_PNP n + ${optionalString (versionOlder version "3.13") '' IPV6_PRIVACY y + ''} NETFILTER_ADVANCED y IP_VS_PROTO_TCP y IP_VS_PROTO_UDP y @@ -176,7 +178,7 @@ with stdenv.lib; AIC79XX_DEBUG_ENABLE n AIC7XXX_DEBUG_ENABLE n AIC94XX_DEBUG n - ${optionalString (versionAtLeast version "3.3") '' + ${optionalString (versionAtLeast version "3.3" && versionOlder version "3.13") '' AUDIT_LOGINUID_IMMUTABLE y ''} B43_PCMCIA y diff --git a/pkgs/os-specific/linux/kernel/linux-3.13.nix b/pkgs/os-specific/linux/kernel/linux-3.13.nix new file mode 100644 index 0000000000000..967de85b7b3fc --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-3.13.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, ... } @ args: + +import ./generic.nix (args // rec { + version = "3.13"; + + modDirVersion = "3.13.0"; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; + sha256 = "4d5e5eee5f276424c32e9591f1b6c971baedc7b49f28ce03d1f48b1e5d6226a2"; + }; + + features.iwlwifi = true; + features.efiBootStub = true; + features.needsCifsUtils = true; + features.canDisableNetfilterConntrackHelpers = true; + features.netfilterRPFilter = true; +}) diff --git a/pkgs/os-specific/linux/libaio/default.nix b/pkgs/os-specific/linux/libaio/default.nix index 57137400b2fec..bf30530e9ad30 100644 --- a/pkgs/os-specific/linux/libaio/default.nix +++ b/pkgs/os-specific/linux/libaio/default.nix @@ -1,11 +1,12 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchgit }: stdenv.mkDerivation rec { name = "libaio-0.3.109"; - src = fetchurl { - url = "mirror://kernel/linux/libs/aio/${name}.tar.bz2"; - sha256 = "15772ki2wckf2mj4gm1vhrsmpd6rq20983nhlkfghjfblghgrkmm"; + src = fetchgit { + url = https://git.fedorahosted.org/git/libaio.git; + rev = "refs/tags/${name}"; + sha256 = "1wbziq0hqvnbckpxrz1cgr8dlw3mifs4xpy3qhnagbrrsmrq2rhi"; }; makeFlags = "prefix=$(out)"; diff --git a/pkgs/servers/sql/postgresql/9.3.x.nix b/pkgs/servers/sql/postgresql/9.3.x.nix new file mode 100644 index 0000000000000..cb33c6f2921c2 --- /dev/null +++ b/pkgs/servers/sql/postgresql/9.3.x.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, zlib, readline }: + +let version = "9.3.2"; in + +stdenv.mkDerivation rec { + name = "postgresql-${version}"; + + src = fetchurl { + url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; + sha256 = "700da51a71857e092f6af1c85fcd86b46d7d5cd2f2ba343cafb1f206c20232d7"; + }; + + buildInputs = [ zlib readline ]; + + enableParallelBuilding = true; + + makeFlags = [ "world" ]; + + patches = [ ./disable-resolve_symlinks.patch ]; + + installTargets = [ "install-world" ]; + + LC_ALL = "C"; + + passthru = { + inherit readline; + psqlSchema = "9.3"; + }; + + meta = { + homepage = http://www.postgresql.org/; + description = "A powerful, open source object-relational database system"; + license = "bsd"; + }; +} diff --git a/pkgs/tools/graphics/logstalgica/default.nix b/pkgs/tools/graphics/logstalgia/default.nix index bdde9daea9f17..bdde9daea9f17 100644 --- a/pkgs/tools/graphics/logstalgica/default.nix +++ b/pkgs/tools/graphics/logstalgia/default.nix diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index e6787ec76c8a4..525c3ba9f2c49 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -1,50 +1,24 @@ -{ stdenv, fetchurl, fetchgit +{ stdenv, fetchurl, fetchgit, bashCompletion , glib, polkit, pkgconfig, intltool, gusb, libusb1, lcms2, sqlite, systemd, dbus +, automake, autoconf, libtool, gtk_doc, which, gobjectIntrospection }: -, automake, autoconf, libtool, gtk_doc, which, gobjectIntrospection -, version ? "git" -}: +stdenv.mkDerivation rec { + name = "colord-1.1.5"; -# colord wants to write to the etc/colord.conf and var/run/colord/mapping.db -# thus they get symlinked to /etc and /var - -stdenv.mkDerivation (stdenv.lib.mergeAttrsByVersion "colord" version { - "0.1.33" = { - name = "colord-0.1.33"; - src = fetchurl { - url = http://www.freedesktop.org/software/colord/releases/colord-0.1.32.tar.xz; - sha256 = "1smbkh4z1c2jjwxg626f12sslv7ff3yzak1zqrc493cl467ll0y7"; - }; - }; - "git" = { - name = "colord-git-11dca"; - src = fetchgit { - url = "https://github.com/hughsie/colord.git"; - rev = "11dcaba034edff3955ceff53795df82c57c34adc"; - sha256 = "1280q7zbfm5wqql872kcxmk5rmwjs7cv7cgz8nx0i9g4ac8j2mrf"; - }; - - preConfigure = '' - ./autogen.sh - ''; - buildInputs = [ automake autoconf libtool gtk_doc which gobjectIntrospection ]; + src = fetchurl { + url = "http://www.freedesktop.org/software/colord/releases/${name}.tar.xz"; + sha256 = "1638pfv16bdrdxxprk6dp8d706571a8i3nlfv3m0ldx26xpy8z5j"; }; -} { enableParallelBuilding = true; - preConfigure = '' - configureFlags="$configureFlags --with-udevrulesdir=$out/lib/udev/rules.d --with-systemdsystemunitdir=$out/lib/udev/rules.d" - ''; + configureFlags = "--with-udevrulesdir=$out/lib/udev/rules.d --with-systemdsystemunitdir=$out/lib/udev/rules.d --disable-bash-completion"; - buildInputs = [glib polkit pkgconfig intltool gusb libusb1 lcms2 sqlite systemd dbus]; + buildInputs = [ glib polkit pkgconfig intltool gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection + bashCompletion ]; postInstall = '' - sed -i '/usb_id\|usb-db/d' $out/lib/udev/rules.d/69-cd-sensors.rules - mv $out/etc/colord.conf{,.default} - ln -s /etc/colord.conf $out/etc/colord.conf rm -fr $out/var/lib/colord - ln -s /var/lib/colord $out/var/lib/colord ''; meta = { @@ -54,4 +28,4 @@ stdenv.mkDerivation (stdenv.lib.mergeAttrsByVersion "colord" version { maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; }; -}) +} diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/tools/networking/filegive/default.nix index 443feee2ea032..a47a0397bf5a6 100644 --- a/pkgs/tools/networking/filegive/default.nix +++ b/pkgs/tools/networking/filegive/default.nix @@ -11,16 +11,13 @@ let sha256 = "1swwfyzaj3l40yh9np3x4fcracgs79nwryc85sxbdakx8wwxs2xb"; }; - version = "0.7.1"; - in stdenv.mkDerivation rec { - name = "filegive-${version}"; + name = "filegive-0.7.4"; src = fetchurl { - url = "http://viric.name/cgi-bin/filegive/tarball/${name}.tar.gz?uuid=v${version}"; - name = "${name}.tar.gz"; - sha256 = "14yyif6q89ihn28kliszaf19vywjg9f7192q1ak8823da1svbq8a"; + url = "http://viric.name/soft/filegive/${name}.tar.gz"; + sha256 = "1z3vyqfdp271qa5ah0i6jmn9gh3gb296wcm33sd2zfjqapyh12hy"; }; buildInputs = [ go ]; diff --git a/pkgs/tools/networking/siege/default.nix b/pkgs/tools/networking/siege/default.nix index ebbfcb5d36081..e29433adae3cf 100644 --- a/pkgs/tools/networking/siege/default.nix +++ b/pkgs/tools/networking/siege/default.nix @@ -1,51 +1,18 @@ -x@{builderDefsPackage - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; - - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="siege"; - version="2.70"; - name="${baseName}-${version}"; - url="ftp://ftp.joedog.org/pub/siege/${name}.tar.gz"; - hash="14fxfmfsqwyahc91w4vn3n8hvclf78n4k1xllqsrpvjb5asvrd1w"; +{ stdenv, fetchurl, lib }: +let + version = "3.0.5"; + baseName = "siege"; +in stdenv.mkDerivation rec { + name = "${baseName}-${version}"; + src = fetchurl { + url = "http://www.joedog.org/pub/siege/${name}.tar.gz"; + sha256 = "16faa6kappg23bdriyiy3ym94rmddpvw8cl8xgv5nxq2v17n4gi8"; }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; - }; - - inherit (sourceInfo) name version; - inherit buildInputs; - - /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "createDirs" "doMakeInstall"]; - - createDirs = a.fullDepEntry '' - mkdir -p "$out/"{bin,lib,share/man,etc} - '' ["defEnsureDir"]; - meta = { description = "HTTP load tester"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; - license = a.lib.licenses.gpl2Plus; - }; - passthru = { - updateInfo = { - downloadPage = "http://www.joedog.org/index/siege-home"; - }; + maintainers = with lib.maintainers; [ ocharles raskin ]; + platforms = with lib.platforms; linux; + license = with lib.licenses; gpl2Plus; }; -}) x - + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; +} diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/tools/text/silver-searcher/default.nix new file mode 100644 index 0000000000000..83a89cfb6028b --- /dev/null +++ b/pkgs/tools/text/silver-searcher/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchgit, autoreconfHook, pkgconfig, pcre, zlib, lzma}: + +let release = "0.18.1"; in +stdenv.mkDerivation { + name = "silver-searcher-${release}"; + + src = fetchgit { + url = "https://github.com/ggreer/the_silver_searcher.git"; + rev = "refs/tags/${release}"; + sha256 = "bf2c8f3c68895e0ee00d373c1d87201e806b413bb28373ee168e375f2a095ec5"; + }; + + buildInputs = [ autoreconfHook pkgconfig pcre zlib lzma ]; + + meta = { + homepage = https://github.com/ggreer/the_silver_searcher/; + description = "A code-searching tool similar to ack, but faster"; + maintainers = [ stdenv.lib.maintainers.madjar ]; + platforms = stdenv.lib.platforms.all; + license = stdenv.lib.licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d831463406c5c..897fae64af576 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1192,6 +1192,7 @@ let ised = callPackage ../tools/misc/ised {}; isl = callPackage ../development/libraries/isl { }; + isl_0_12 = callPackage ../development/libraries/isl/0.12.2.nix { }; isync = callPackage ../tools/networking/isync { }; @@ -1277,7 +1278,7 @@ let logrotate = callPackage ../tools/system/logrotate { }; - logstalgica = callPackage ../tools/graphics/logstalgica {}; + logstalgia = callPackage ../tools/graphics/logstalgia {}; lout = callPackage ../tools/typesetting/lout { }; @@ -1832,6 +1833,8 @@ let silc_server = callPackage ../servers/silc-server { }; + silver-searcher = callPackage ../tools/text/silver-searcher { }; + sleuthkit = callPackage ../tools/system/sleuthkit {}; slimrat = callPackage ../tools/networking/slimrat { @@ -2295,19 +2298,11 @@ let ccl = builderDefsPackage ../development/compilers/ccl {}; - clangUnwrapped = callPackage ../development/compilers/llvm/clang.nix { - stdenv = if stdenv.isDarwin - then stdenvAdapters.overrideGCC stdenv gccApple - else stdenv; - }; + clang = wrapClang llvmFull; - clang = wrapClang clangUnwrapped; + llvmFullSelf = clangWrapSelf (llvmFull.override { - libcxxLLVM = callPackage ../development/compilers/llvm { stdenv = libcxxStdenv; version="3.3"; }; - - clangSelf = clangWrapSelf (callPackage ../development/compilers/llvm/clang.nix { stdenv = libcxxStdenv; - llvm = libcxxLLVM; }); clangWrapSelf = build: (import ../build-support/clang-wrapper) { @@ -2323,8 +2318,7 @@ let #Use this instead of stdenv to build with clang clangStdenv = lowPrio (stdenvAdapters.overrideGCC stdenv clang); - - libcxxStdenv = stdenvAdapters.overrideGCC stdenv (clangWrapSelf clangUnwrapped); + libcxxStdenv = stdenvAdapters.overrideGCC stdenv (clangWrapSelf llvmFull); clean = callPackage ../development/compilers/clean { }; @@ -2713,11 +2707,14 @@ let else let openjdkBootstrap = callPackage ../development/compilers/openjdk/bootstrap.nix { }; - in callPackage ../development/compilers/openjdk { + in (callPackage ../development/compilers/openjdk { jdk = openjdkBootstrap; - }; + }) // { outputs = [ "out" ]; }; - openjre = pkgs.openjdk.jre; + # FIXME: Need a way to set per-output meta attributes. + openjre = (lib.setName "openjre-${lib.getVersion pkgs.openjdk.jre}" (lib.addMetaAttrs + { description = "The open-source Java Runtime Environment"; } + pkgs.openjdk.jre)) // { outputs = [ "jre" ]; }; jdk = if stdenv.isDarwin || stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then pkgs.openjdk @@ -2764,7 +2761,7 @@ let lessc = callPackage ../development/compilers/lessc { }; - llvm = llvm_33; # deprecated, depend on llvm_* directly + llvm = llvm_33; llvm_34 = callPackage ../development/compilers/llvm { version = "3.4"; stdenv = if stdenv.isDarwin @@ -2772,6 +2769,9 @@ let else stdenv; }; llvm_33 = llvm_34.override { version = "3.3"; }; + llvmFull = callPackage ../development/compilers/llvm/full.nix { + isl = isl_0_12; + }; mentorToolchains = recurseIntoAttrs ( callPackage_i686 ../development/compilers/mentor {} @@ -2951,8 +2951,7 @@ let roadsend = callPackage ../development/compilers/roadsend { }; - # TODO: the corresponding nix file is missing - # rust = pkgsi686Linux.callPackage ../development/compilers/rust {}; + rust = callPackage ../development/compilers/rust {}; sbcl = builderDefsPackage (import ../development/compilers/sbcl) { inherit makeWrapper; @@ -3016,9 +3015,9 @@ let }; wrapClangWith = clangWrapper: glibc: baseClang: clangWrapper { - nativeTools = stdenv ? gcc && stdenv.gcc.nativeTools; - nativeLibc = stdenv ? gcc && stdenv.gcc.nativeLibc; - nativePrefix = if stdenv ? gcc then stdenv.gcc.nativePrefix else ""; + nativeTools = stdenv.gcc.nativeTools or false; + nativeLibc = stdenv.gcc.nativeLibc or false; + nativePrefix = stdenv.gcc.nativePrefix or ""; clang = baseClang; libc = glibc; shell = bash; @@ -3252,6 +3251,7 @@ let spidermonkey = callPackage ../development/interpreters/spidermonkey { }; spidermonkey_1_8_0rc1 = callPackage ../development/interpreters/spidermonkey/1.8.0-rc1.nix { }; spidermonkey_185 = callPackage ../development/interpreters/spidermonkey/185-1.0.0.nix { }; + spidermonkey_17 = callPackage ../development/interpreters/spidermonkey/17.0.nix { }; supercollider = callPackage ../development/interpreters/supercollider { qt = qt4; @@ -3461,6 +3461,7 @@ let csslint = callPackage ../development/web/csslint { }; libcxx = callPackage ../development/libraries/libc++ { stdenv = pkgs.clangStdenv; }; + libcxxabi = callPackage ../development/libraries/libc++abi { stdenv = pkgs.clangStdenv; }; dejagnu = callPackage ../development/tools/misc/dejagnu { }; @@ -3960,7 +3961,7 @@ let dssi = callPackage ../development/libraries/dssi {}; - dragonegg = callPackage ../development/compilers/llvm/dragonegg.nix { }; + dragonegg = callPackage ../development/compilers/llvm/dragonegg.nix { llvm = llvmFull; }; dxflib = callPackage ../development/libraries/dxflib {}; @@ -4194,6 +4195,8 @@ let '' # */ ; + glm = callPackage ../development/libraries/glm { }; + glpk = callPackage ../development/libraries/glpk { }; glsurf = callPackage ../applications/science/math/glsurf { @@ -5045,6 +5048,8 @@ let ccrtp = ccrtp_1_8; }; + libwacom = callPackage ../development/libraries/libwacom { }; + lightning = callPackage ../development/libraries/lightning { }; lirc = callPackage ../development/libraries/lirc { }; @@ -6224,6 +6229,8 @@ let postgresql92 = callPackage ../servers/sql/postgresql/9.2.x.nix { }; + postgresql93 = callPackage ../servers/sql/postgresql/9.3.x.nix { }; + postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { }; psqlodbc = callPackage ../servers/sql/postgresql/psqlodbc { }; @@ -6429,6 +6436,8 @@ let python = pythonFull; }; + libossp_uuid = callPackage ../development/libraries/libossp-uuid { }; + libuuid = if crossSystem != null && crossSystem.config == "i586-pc-gnu" then (utillinux // { @@ -6663,6 +6672,18 @@ let ]; }; + linux_3_13 = makeOverridable (import ../os-specific/linux/kernel/linux-3.13.nix) { + inherit fetchurl stdenv perl linuxManualConfig; + kernelPatches = + [ + kernelPatches.sec_perm_2_6_24 + ] ++ lib.optionals ((platform.kernelArch or null) == "mips") + [ kernelPatches.mips_fpureg_emu + kernelPatches.mips_fpu_sigill + kernelPatches.mips_ext3_n32 + ]; + }; + /* Linux kernel modules are inherently tied to a specific kernel. So rather than provide specific instances of those packages for a @@ -6752,8 +6773,9 @@ let linuxPackages_3_11 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_11 linuxPackages_3_11); linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12); linuxPackages_3_12_grsecurity = linuxPackagesFor pkgs.linux_3_12_grsecurity linuxPackages_3_12_grsecurity; + linuxPackages_3_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_13 linuxPackages_3_13); # Update this when adding a new version! - linuxPackages_latest = pkgs.linuxPackages_3_12; + linuxPackages_latest = pkgs.linuxPackages_3_13; # The current default kernel / kernel modules. linux = linuxPackages.kernel; @@ -9653,25 +9675,6 @@ let ### SCIENCE - celestia = callPackage ../applications/science/astronomy/celestia { - lua = lua5_1; - inherit (xlibs) libXmu; - inherit (pkgs.gnome) gtkglext; - }; - - xplanet = callPackage ../applications/science/astronomy/xplanet { }; - - gravit = callPackage ../applications/science/astronomy/gravit { }; - - spyder = callPackage ../applications/science/spyder { - inherit (pythonPackages) pyflakes rope sphinx numpy scipy matplotlib; # recommended - inherit (pythonPackages) ipython pep8; # optional - inherit pylint; - }; - - stellarium = callPackage ../applications/science/astronomy/stellarium { }; - - ### SCIENCE/GEOMETRY drgeo = builderDefsPackage (import ../applications/science/geometry/drgeo) { @@ -9860,6 +9863,8 @@ let eukleides = callPackage ../applications/science/math/eukleides { }; + fricas = callPackage ../applications/science/math/fricas { }; + gap = callPackage ../applications/science/math/gap { }; maxima = callPackage ../applications/science/math/maxima { }; @@ -9905,14 +9910,33 @@ let boinc = callPackage ../applications/science/misc/boinc { }; + celestia = callPackage ../applications/science/astronomy/celestia { + lua = lua5_1; + inherit (xlibs) libXmu; + inherit (pkgs.gnome) gtkglext; + }; + + gravit = callPackage ../applications/science/astronomy/gravit { }; + golly = callPackage ../applications/science/misc/golly { }; + root = callPackage ../applications/science/misc/root { }; + simgrid = callPackage ../applications/science/misc/simgrid { }; + spyder = callPackage ../applications/science/spyder { + inherit (pythonPackages) pyflakes rope sphinx numpy scipy matplotlib; # recommended + inherit (pythonPackages) ipython pep8; # optional + inherit pylint; + }; + + stellarium = callPackage ../applications/science/astronomy/stellarium { }; + tulip = callPackage ../applications/science/misc/tulip { }; vite = callPackage ../applications/science/misc/vite { }; + xplanet = callPackage ../applications/science/astronomy/xplanet { }; ### MISC diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index c3addca97d1e8..798103153ecef 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -143,7 +143,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x inherit (self) cabal ghc; async = self.async_2_0_1_5; attoparsec = self.attoparsec_0_11_1_0; - caseInsensitive = self.caseInsensitive_1_1_0_2; + caseInsensitive = self.caseInsensitive_1_1_0_3; cgi = self.cgi_3001_1_8_4; fgl = self.fgl_5_4_2_4; GLUT = self.GLUT_2_5_0_2; @@ -176,7 +176,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x cabalInstall = self.cabalInstall_1_18_0_2; alex = self.alex_3_1_3; haddock = self.haddock_2_13_2_1; - happy = self.happy_1_19_2; + happy = self.happy_1_19_3; primitive = self.primitive_0_5_1_0; # semi-official, but specified }; @@ -522,7 +522,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x abstractPar = callPackage ../development/libraries/haskell/abstract-par {}; - aeson = callPackage ../development/libraries/haskell/aeson {}; + aeson_0_6_2_1 = callPackage ../development/libraries/haskell/aeson/0.6.2.1.nix {}; + aeson_0_7_0_0 = callPackage ../development/libraries/haskell/aeson/0.7.0.0.nix {}; + aeson = self.aeson_0_6_2_1; aesonLens = callPackage ../development/libraries/haskell/aeson-lens {}; @@ -699,8 +701,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x cassava = callPackage ../development/libraries/haskell/cassava {}; caseInsensitive_1_0_0_1 = callPackage ../development/libraries/haskell/case-insensitive/1.0.0.1.nix {}; - caseInsensitive_1_1_0_2 = callPackage ../development/libraries/haskell/case-insensitive/1.1.0.2.nix {}; - caseInsensitive = self.caseInsensitive_1_1_0_2; + caseInsensitive_1_1_0_3 = callPackage ../development/libraries/haskell/case-insensitive/1.1.0.3.nix {}; + caseInsensitive = self.caseInsensitive_1_1_0_3; cautiousFile = callPackage ../development/libraries/haskell/cautious-file {}; @@ -800,6 +802,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x cookie = callPackage ../development/libraries/haskell/cookie {}; + coroutineObject = callPackage ../development/libraries/haskell/coroutine-object {}; + cprngAes = callPackage ../development/libraries/haskell/cprng-aes {}; criterion = callPackage ../development/libraries/haskell/criterion {}; @@ -1005,7 +1009,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x eventList = callPackage ../development/libraries/haskell/event-list {}; - exPool = callPackage ../development/libraries/haskell/ex-pool { hashable = self.hashable_1_2_1_0; }; + exPool = callPackage ../development/libraries/haskell/ex-pool { }; exceptionMtl = callPackage ../development/libraries/haskell/exception-mtl {}; @@ -1325,6 +1329,18 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x hoauth = callPackage ../development/libraries/haskell/hoauth {}; + hoodle = callPackage ../applications/graphics/hoodle {}; + + hoodleBuilder = callPackage ../development/libraries/haskell/hoodle-builder {}; + + hoodleCore = callPackage ../development/libraries/haskell/hoodle-core {}; + + hoodleParser = callPackage ../development/libraries/haskell/hoodle-parser {}; + + hoodleRender = callPackage ../development/libraries/haskell/hoodle-render {}; + + hoodleTypes = callPackage ../development/libraries/haskell/hoodle-types {}; + hoogle = callPackage ../development/libraries/haskell/hoogle {}; hopenssl = callPackage ../development/libraries/haskell/hopenssl {}; @@ -2205,6 +2221,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x tastyQuickcheck = callPackage ../development/libraries/haskell/tasty-quickcheck {}; + tastyRerun = callPackage ../development/libraries/haskell/tasty-rerun {}; + tastySmallcheck = callPackage ../development/libraries/haskell/tasty-smallcheck {}; tastyTh = callPackage ../development/libraries/haskell/tasty-th {}; @@ -2265,12 +2283,18 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x thyme = callPackage ../development/libraries/haskell/thyme {}; + threepennyGui = callPackage ../development/libraries/haskell/threepenny-gui {}; + time_1_1_2_4 = callPackage ../development/libraries/haskell/time/1.1.2.4.nix {}; time_1_4_1 = callPackage ../development/libraries/haskell/time/1.4.1.nix {}; # time is in the core package set. It should only be necessary to # pass it explicitly in rare circumstances. time = null; + timezoneOlson = callPackage ../development/libraries/haskell/timezone-olson {}; + + timezoneSeries = callPackage ../development/libraries/haskell/timezone-series {}; + timeCompat = callPackage ../development/libraries/haskell/time-compat {}; tls = callPackage ../development/libraries/haskell/tls {}; @@ -2286,6 +2310,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x transformersCompat = callPackage ../development/libraries/haskell/transformers-compat {}; + transformersFree = callPackage ../development/libraries/haskell/transformers-free {}; + traverseWithClass = callPackage ../development/libraries/haskell/traverse-with-class {}; trifecta_1_1 = callPackage ../development/libraries/haskell/trifecta/1.1.nix { @@ -2296,6 +2322,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x tuple = callPackage ../development/libraries/haskell/tuple {}; + TypeCompose = callPackage ../development/libraries/haskell/TypeCompose {}; + typeEq = callPackage ../development/libraries/haskell/type-eq {}; typeEquality = callPackage ../development/libraries/haskell/type-equality {}; @@ -2475,6 +2503,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x xmlTypes = callPackage ../development/libraries/haskell/xml-types {}; + xournalParser = callPackage ../development/libraries/haskell/xournal-parser {}; + + xournalTypes = callPackage ../development/libraries/haskell/xournal-types {}; + xtest = callPackage ../development/libraries/haskell/xtest {}; xssSanitize = callPackage ../development/libraries/haskell/xss-sanitize {}; @@ -2602,7 +2634,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x happy_1_18_10 = callPackage ../development/tools/parsing/happy/1.18.10.nix {}; happy_1_18_11 = callPackage ../development/tools/parsing/happy/1.18.11.nix {}; happy_1_19_2 = callPackage ../development/tools/parsing/happy/1.19.2.nix {}; - happy = self.happy_1_19_2; + happy_1_19_3 = callPackage ../development/tools/parsing/happy/1.19.3.nix {}; + happy = self.happy_1_19_3; happyMeta = callPackage ../development/tools/haskell/happy-meta {}; diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index 82af1f439ff1f..8eb08d259834b 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -153,7 +153,6 @@ let cinepaint = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; ciopfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; clang = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - clangUnwrapped = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; clanlib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; classpath = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; clearsilver = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; |