diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 83 |
1 files changed, 72 insertions, 11 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dd25805d9eae..973378f0e503 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2654,7 +2654,9 @@ let mlton = callPackage ../development/compilers/mlton { }; - mono = callPackage ../development/compilers/mono { }; + mono = callPackage ../development/compilers/mono { + inherit (xlibs) libX11; + }; monoDLLFixer = callPackage ../build-support/mono-dll-fixer { }; @@ -2708,12 +2710,22 @@ let camomile_0_8_2 = callPackage ../development/ocaml-modules/camomile/0.8.2.nix { }; camomile = callPackage ../development/ocaml-modules/camomile { }; + camlimages = callPackage ../development/ocaml-modules/camlimages { }; + + ocaml_cairo = callPackage ../development/ocaml-modules/ocaml-cairo { }; + cryptokit = callPackage ../development/ocaml-modules/cryptokit { }; findlib = callPackage ../development/tools/ocaml/findlib { }; + dypgen = callPackage ../development/ocaml-modules/dypgen { }; + + patoline = callPackage ../tools/typesetting/patoline { }; + gmetadom = callPackage ../development/ocaml-modules/gmetadom { }; + lablgl = callPackage ../development/ocaml-modules/lablgl { }; + lablgtk = callPackage ../development/ocaml-modules/lablgtk { inherit (gnome) libgnomecanvas libglade gtksourceview; }; @@ -3400,6 +3412,7 @@ let noweb = callPackage ../development/tools/literate-programming/noweb { }; omake = callPackage ../development/tools/ocaml/omake { }; + omake_rc1 = callPackage ../development/tools/ocaml/omake/0.9.8.6-rc1.nix { }; openocd = callPackage ../development/tools/misc/openocd { }; @@ -4090,7 +4103,9 @@ let gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf { }; - gtk2 = callPackage ../development/libraries/gtk+/2.x.nix { }; + gtk2 = callPackage ../development/libraries/gtk+/2.x.nix { + cupsSupport = config.gtk2.cups or true; + }; gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3.x.nix { inherit (gnome3) at_spi2_atk; }); @@ -4643,7 +4658,11 @@ let libunique = callPackage ../development/libraries/libunique/default.nix { }; - libusb = callPackage ../development/libraries/libusb { }; + libusb = callPackage ../development/libraries/libusb { + stdenv = if stdenv.isDarwin + then overrideGCC stdenv gccApple + else stdenv; + }; libusb1 = callPackage ../development/libraries/libusb1 { }; @@ -6251,6 +6270,8 @@ let perf = callPackage ../os-specific/linux/kernel/perf.nix { }; + psmouse_alps = callPackage ../os-specific/linux/psmouse-alps { }; + spl = callPackage ../os-specific/linux/spl/default.nix { }; sysprof = callPackage ../development/tools/profiling/sysprof { @@ -7187,6 +7208,7 @@ let keepassx = callPackage ../applications/misc/keepassx { }; inherit (gnome3) evince; + keepass = callPackage ../applications/misc/keepass { }; evolution_data_server = newScope (gnome) ../servers/evolution-data-server { }; @@ -7785,6 +7807,21 @@ let mutt = callPackage ../applications/networking/mailreaders/mutt { }; + ruby_gpgme = callPackage ../development/libraries/ruby_gpgme { + ruby = ruby19; + hoe = rubyLibs.hoe; + }; + + ruby_ncursesw_sup = callPackage ../development/libraries/ruby_ncursesw_sup { }; + + sup = callPackage ../applications/networking/mailreaders/sup { + rake = rubyLibs.rake_10_0_4; + ruby = ruby19; + xapian_full_alaveteli = rubyLibs.xapian_full_alaveteli_1_2_9_5; + gpgme = ruby_gpgme; + ncursesw_sup = ruby_ncursesw_sup; + }; + msmtp = callPackage ../applications/networking/msmtp { }; imapfilter = callPackage ../applications/networking/mailreaders/imapfilter.nix { @@ -8222,18 +8259,20 @@ let vimHugeX = vim_configurable; - vim_configurable = callPackage (import ../applications/editors/vim/configurable.nix) { - inherit (pkgs) fetchurl stdenv ncurses pkgconfig gettext composableDerivation lib config; - inherit (pkgs.xlibs) libX11 libXext libSM libXpm libXt libXaw libXau libXmu libICE; - inherit (pkgs) glib gtk; + vim_configurable = callPackage ../applications/editors/vim/configurable.nix { + inherit (pkgs) fetchurl stdenv ncurses pkgconfig gettext + composableDerivation lib config glib gtk python perl tcl ruby; + inherit (pkgs.xlibs) libX11 libXext libSM libXpm libXt libXaw libXau libXmu + libICE; + features = "huge"; # one of tiny, small, normal, big or huge - # optional features by passing - # python - # TODO mzschemeinterp perlinterp - inherit (pkgs) python perl tcl ruby /*x11*/; lua = pkgs.lua5; + # optional features by flags flags = [ "python" "X11" ]; # only flag "X11" by now + + # so that we can use gccApple if we're building on darwin + inherit stdenvAdapters gccApple; }; vimLatest = vim_configurable.override { source = "latest"; }; vimNox = vim_configurable.override { source = "vim-nox"; }; @@ -9459,6 +9498,28 @@ let inherit (stdenv) mkDerivation; }; + # patoline requires a rather large ocaml compilation environment. + # this is why it is build as an environment and not just a normal package. + # remark : the emacs mode is also installed, but you have to adjust your load-path. + PatolineEnv = pack: myEnvFun { + name = "patoline"; + buildInputs = [ stdenv ncurses mesa freeglut libzip gcc + pack.ocaml pack.findlib pack.camomile + pack.dypgen pack.ocaml_sqlite3 pack.camlzip + pack.lablgtk pack.camlimages pack.ocaml_cairo + pack.lablgl pack.ocamlnet pack.cryptokit + pack.ocaml_pcre pack.patoline + ]; + # this is to circumvent the bug with libgcc_s.so.1 which is + # not found when using thread + extraCmds = '' + LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${gcc.gcc}/lib + export LD_LIBRARY_PATH + ''; + }; + + patoline = PatolineEnv ocamlPackages_4_00_1; + znc = callPackage ../applications/networking/znc { }; zsnes = callPackage_i686 ../misc/emulators/zsnes { |