diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 120 |
1 files changed, 110 insertions, 10 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb2808892a58..afc25a2e3baa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -593,6 +593,8 @@ let enblendenfuse = callPackage ../tools/graphics/enblend-enfuse { }; + encfs = callPackage ../tools/filesystems/encfs { }; + enscript = callPackage ../tools/text/enscript { }; ethtool = callPackage ../tools/misc/ethtool { }; @@ -625,6 +627,8 @@ let finger_bsd = callPackage ../tools/networking/bsd-finger { }; + flvstreamer = callPackage ../tools/networking/flvstreamer { }; + fontforge = callPackage ../tools/misc/fontforge { }; fontforgeX = callPackage ../tools/misc/fontforge { @@ -1226,7 +1230,10 @@ let svnfs = callPackage ../tools/filesystems/svnfs { }; - system_config_printer = callPackage ../tools/misc/system-config-printer { }; + system_config_printer = callPackage ../tools/misc/system-config-printer { + inherit (pythonPackages) notify; + libxml2 = libxml2Python; + }; sitecopy = callPackage ../tools/networking/sitecopy { }; @@ -1247,6 +1254,8 @@ let extraFonts = true; }; + tmux = callPackage ../tools/misc/tmux { }; + tor = callPackage ../tools/security/tor { }; torsocks = callPackage ../tools/security/tor/torsocks.nix { }; @@ -1403,6 +1412,8 @@ let xclip = callPackage ../tools/misc/xclip { }; + xdelta = callPackage ../tools/compression/xdelta { }; + xfsprogs = callPackage ../tools/filesystems/xfsprogs { }; xmlroff = callPackage ../tools/typesetting/xmlroff { @@ -1447,6 +1458,20 @@ let dash = callPackage ../shells/dash { }; + ipython = callPackage ../shells/ipython { + # I did not find any better way of reusing buildPythonPackage+setuptools + # for a python with openssl support + buildPythonPackage = assert pythonFull.readlineSupport; + import ../development/python-modules/generic { + inherit makeWrapper lib; + python = pythonFull; + setuptools = builderDefsPackage (import ../development/python-modules/setuptools) { + inherit makeWrapper; + python = pythonFull; + }; + }; + }; + tcsh = callPackage ../shells/tcsh { }; rush = callPackage ../shells/rush { }; @@ -1938,9 +1963,7 @@ let jdk5 = ( assert system == "i686-linux" || system == "x86_64-linux"; - import ../development/compilers/jdk/default-5.nix { - inherit fetchurl stdenv unzip; - }); + callPackage ../development/compilers/jdk/default-5.nix { }); jdk = if stdenv.isDarwin then openjdkDarwin else jdkdistro true false; jre = jdkdistro false false; @@ -1993,6 +2016,45 @@ let ocaml_3_11_1 = callPackage ../development/compilers/ocaml/3.11.1.nix { }; + ocaml_3_12_0 = callPackage ../development/compilers/ocaml/3.12.0.nix { }; + + mkOcamlPackages = ocaml: self: let callPackage = newScope self; in rec { + inherit ocaml; + + camlzip = callPackage ../development/ocaml-modules/camlzip { }; + + camomile = camomile_0_7_3; + camomile_0_7_3 = callPackage ../development/ocaml-modules/camomile/0.7.3.nix { }; + camomile_0_8_1 = callPackage ../development/ocaml-modules/camomile/0.8.1.nix { }; + + cryptokit = callPackage ../development/ocaml-modules/cryptokit { }; + + findlib = callPackage ../development/tools/ocaml/findlib { }; + + menhir = callPackage ../development/ocaml-modules/menhir { }; + + ocaml_batteries = callPackage ../development/ocaml-modules/batteries { }; + + ocaml_cryptgps = callPackage ../development/ocaml-modules/cryptgps { }; + + ocaml_lwt = callPackage ../development/ocaml-modules/lwt { }; + + ocaml_pcre = callPackage ../development/ocaml-modules/pcre { + inherit pcre; + }; + + ocaml_react = callPackage ../development/ocaml-modules/react { }; + + ocaml_ssl = callPackage ../development/ocaml-modules/ssl { }; + + ounit = callPackage ../development/ocaml-modules/ounit { }; + }; + + ocamlPackages = recurseIntoAttrs ocamlPackages_3_11_1; + ocamlPackages_3_10_0 = mkOcamlPackages ocaml_3_10_0 pkgs.ocamlPackages_3_10_0; + ocamlPackages_3_11_1 = mkOcamlPackages ocaml_3_11_1 pkgs.ocamlPackages_3_11_1; + ocamlPackages_3_12_0 = mkOcamlPackages ocaml_3_12_0 pkgs.ocamlPackages_3_12_0; + opencxx = callPackage ../development/compilers/opencxx { gcc = gcc33; }; @@ -2621,6 +2683,8 @@ let agg = callPackage ../development/libraries/agg { }; + allegro = callPackage ../development/libraries/allegro {}; + amrnb = callPackage ../development/libraries/amrnb { }; amrwb = callPackage ../development/libraries/amrwb { }; @@ -2685,6 +2749,8 @@ let ccrtp = callPackage ../development/libraries/ccrtp { }; + cgui = callPackage ../development/libraries/cgui {}; + check = callPackage ../development/libraries/check { }; chipmunk = builderDefsPackage (import ../development/libraries/chipmunk) { @@ -3796,10 +3862,6 @@ let qt4 = pkgs.kde4.qt4; - qt45 = callPackage ../development/libraries/qt-4.x/4.5 { - inherit (gnome) glib; - }; - qt46 = callPackage ../development/libraries/qt-4.x/4.6 { inherit (gnome) glib; }; @@ -3852,6 +3914,8 @@ let jvm = gcj; }; + rlog = callPackage ../development/libraries/rlog { }; + rte = callPackage ../development/libraries/rte { }; rubberband = callPackage ../development/libraries/rubberband { @@ -4598,6 +4662,11 @@ let libcroup = callPackage ../os-specific/linux/libcg { }; + libnl = callPackage ../os-specific/linux/libnl { + flex = flex2535; + bison = bison24; + }; + linuxHeaders = linuxHeaders_2_6_32; linuxHeaders26Cross = forceBuildDrv (import ../os-specific/linux/kernel-headers/2.6.32.nix { @@ -4849,6 +4918,8 @@ let atheros = callPackage ../os-specific/linux/atheros/0.9.4.nix { }; + broadcom_sta = callPackage ../os-specific/linux/broadcom-sta/default.nix { }; + nvidia_x11 = callPackage ../os-specific/linux/nvidia-x11 { }; nvidia_x11_legacy96 = callPackage ../os-specific/linux/nvidia-x11/legacy96.nix { }; @@ -6187,6 +6258,8 @@ let nvi = callPackage ../applications/editors/nvi { }; + openbox = callPackage ../applications/window-managers/openbox { }; + openjump = callPackage ../applications/misc/openjump { }; openoffice = callPackage ../applications/office/openoffice { @@ -6671,6 +6744,8 @@ let libsigcxx = libsigcxx12; }; + atanks = callPackage ../games/atanks {}; + ballAndPaddle = callPackage ../games/ball-and-paddle { }; blackshades = callPackage ../games/blackshades { }; @@ -6692,6 +6767,8 @@ let crack_attack = callPackage ../games/crack-attack { }; + crrcsim = callPackage ../games/crrcsim {}; + dwarf_fortress = callPackage_i686 ../games/dwarf-fortress { gnomegtk = pkgsi686Linux.gnome.gtk; }; @@ -6719,6 +6796,8 @@ let gemrb = callPackage ../games/gemrb { }; + gl117 = callPackage ../games/gl-117 {}; + gltron = callPackage ../games/gltron { }; gnuchess = builderDefsPackage (import ../games/gnuchess) { @@ -6793,6 +6872,8 @@ let springLobby = callPackage ../games/spring/spring-lobby.nix { }; + stardust = callPackage ../games/stardust {}; + superTux = callPackage ../games/super-tux { }; superTuxKart = callPackage ../games/super-tux-kart { @@ -7006,6 +7087,8 @@ let camlp5 = camlp5_transitional; }; + cvc3 = callPackage ../applications/science/logic/cvc3 {}; + eprover = callPackage ../applications/science/logic/eProver { texLive = texLiveAggregationFun { paths = [ @@ -7028,8 +7111,22 @@ let inherit (pkgs.emacs23Packages) proofgeneral; }; + iprover = callPackage ../applications/science/logic/iprover {}; + + leo2 = callPackage ../applications/science/logic/leo2 {}; + + minisat = callPackage ../applications/science/logic/minisat {}; + + opensmt = callPackage ../applications/science/logic/opensmt { + flex = flex2535; + }; + prover9 = callPackage ../applications/science/logic/prover9 { }; + satallax = callPackage ../applications/science/logic/satallax {}; + + spass = callPackage ../applications/science/logic/spass {}; + ssreflect = callPackage ../applications/science/logic/ssreflect { camlp5 = camlp5_transitional; }; @@ -7060,6 +7157,10 @@ let wxmaxima = callPackage ../applications/science/math/wxmaxima { }; + pari = callPackage ../applications/science/math/pari {}; + + singular = callPackage ../applications/science/math/singular {}; + scilab = callPackage ../applications/science/math/scilab { withXaw3d = false; withTk = true; @@ -7110,8 +7211,7 @@ let dpkg = callPackage ../tools/package-management/dpkg { }; - ekiga = lib.callPackageWith (pkgs // pkgs.xorg // pkgs.gtkLibs // pkgs.gnome) - ../applications/networking/ekiga {}; + ekiga = newScope (pkgs.gtkLibs // pkgs.gnome) ../applications/networking/ekiga { }; electricsheep = callPackage ../misc/screensavers/electricsheep { }; |