diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 150 |
1 files changed, 101 insertions, 49 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c7008bd86c0..49a8259e764 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -278,8 +278,9 @@ let }; buildFHSUserEnv = args: userFHSEnv { - env = buildFHSEnv (removeAttrs args [ "runScript" ]); + env = buildFHSEnv (removeAttrs args [ "runScript" "extraBindMounts" ]); runScript = args.runScript or "bash"; + extraBindMounts = args.extraBindMounts or []; }; buildMaven = callPackage ../build-support/build-maven.nix {}; @@ -601,6 +602,8 @@ let bonnie = callPackage ../tools/filesystems/bonnie { }; + djmount = callPackage ../tools/filesystems/djmount { }; + grc = callPackage ../tools/misc/grc { }; lastpass-cli = callPackage ../tools/security/lastpass-cli { }; @@ -713,7 +716,7 @@ let bochs = callPackage ../applications/virtualization/bochs { }; - borg = callPackage ../tools/backup/borg { }; + borgbackup = callPackage ../tools/backup/borg { }; boomerang = callPackage ../development/tools/boomerang { }; @@ -1204,7 +1207,9 @@ let darkstat = callPackage ../tools/networking/darkstat { }; - davfs2 = callPackage ../tools/filesystems/davfs2 { }; + davfs2 = callPackage ../tools/filesystems/davfs2 { + neon = neon_0_29; + }; dbench = callPackage ../development/tools/misc/dbench { }; @@ -1226,6 +1231,8 @@ let gtk = gtk3; }; + dex = callPackage ../tools/X11/dex { }; + ddccontrol = callPackage ../tools/misc/ddccontrol { }; ddccontrol-db = callPackage ../data/misc/ddccontrol-db { }; @@ -1320,7 +1327,7 @@ let duo-unix = callPackage ../tools/security/duo-unix { }; duplicity = callPackage ../tools/backup/duplicity { - inherit (pythonPackages) boto lockfile; + inherit (pythonPackages) boto lockfile paramiko ecdsa pycrypto; gnupg = gnupg1; }; @@ -2291,6 +2298,8 @@ let namazu = callPackage ../tools/text/namazu { }; + nasty = callPackage ../tools/security/nasty { }; + nbd = callPackage ../tools/networking/nbd { }; ndjbdns = callPackage ../tools/networking/ndjbdns { }; @@ -2985,6 +2994,8 @@ let smbnetfs = callPackage ../tools/filesystems/smbnetfs {}; + snabb = callPackage ../tools/networking/snabb { } ; + snort = callPackage ../applications/networking/ids/snort { }; solr = callPackage ../servers/search/solr { }; @@ -3044,6 +3055,8 @@ let sshpass = callPackage ../tools/networking/sshpass { }; + sslscan = callPackage ../tools/security/sslscan { }; + ssmtp = callPackage ../tools/networking/ssmtp { tlsSupport = true; }; @@ -3100,6 +3113,8 @@ let swaks = callPackage ../tools/networking/swaks { }; + swiften = callPackage ../development/libraries/swiften { }; + t = callPackage ../tools/misc/t { }; t1utils = callPackage ../tools/misc/t1utils { }; @@ -3169,7 +3184,9 @@ let torbutton = callPackage ../tools/security/torbutton { }; - torbrowser = callPackage ../tools/security/tor/torbrowser.nix { }; + torbrowser = callPackage ../tools/security/tor/torbrowser.nix { + stdenv = overrideCC stdenv gcc5; + }; touchegg = callPackage ../tools/inputmethods/touchegg { }; @@ -3565,6 +3582,8 @@ let # To expose more packages for Yi, override the extraPackages arg. yi = callPackage ../applications/editors/yi/wrapper.nix { }; + zbackup = callPackage ../tools/backup/zbackup {}; + zbar = callPackage ../tools/graphics/zbar { pygtk = lib.overrideDerivation pygtk (x: { gtk = gtk2; @@ -3707,7 +3726,7 @@ let closurecompiler = callPackage ../development/compilers/closure { }; - cmucl_binary = callPackage ../development/compilers/cmucl/binary.nix { }; + cmucl_binary = callPackage_i686 ../development/compilers/cmucl/binary.nix { }; compcert = callPackage ../development/compilers/compcert ( if system == "x86_64-linux" @@ -3991,6 +4010,8 @@ let gforth = callPackage ../development/compilers/gforth {}; + gtk-server = callPackage ../development/interpreters/gtk-server {}; + # Haskell and GHC haskell = callPackage ./haskell-packages.nix { }; @@ -4123,15 +4144,11 @@ let jikes = callPackage ../development/compilers/jikes { }; - julia02 = callPackage ../development/compilers/julia/0.2.nix { - llvm = llvm_33; - suitesparse = suitesparse_4_2; - }; - - julia03 = callPackage ../development/compilers/julia/0.3.nix { + julia = callPackage ../development/compilers/julia { + gmp = gmp6; llvm = llvm_33; + openblas = openblasCompat; }; - julia = julia03; lazarus = callPackage ../development/compilers/fpc/lazarus.nix { fpc = fpc; @@ -4214,7 +4231,7 @@ let ocaml_4_01_0 = callPackage ../development/compilers/ocaml/4.01.0.nix { }; - ocaml_4_02_1 = callPackage ../development/compilers/ocaml/4.02.1.nix { }; + ocaml_4_02 = callPackage ../development/compilers/ocaml/4.02.nix { }; orc = callPackage ../development/compilers/orc { }; @@ -4356,8 +4373,6 @@ let ctypes = callPackage ../development/ocaml-modules/ctypes { }; - deriving = callPackage ../development/tools/ocaml/deriving { }; - dolog = callPackage ../development/ocaml-modules/dolog { }; easy-format = callPackage ../development/ocaml-modules/easy-format { }; @@ -4463,6 +4478,8 @@ let mlgmp = callPackage ../development/ocaml-modules/mlgmp { }; + nocrypto = callPackage ../development/ocaml-modules/nocrypto { }; + ocaml_batteries = callPackage ../development/ocaml-modules/batteries { }; comparelib = callPackage ../development/ocaml-modules/comparelib { }; @@ -4655,15 +4672,15 @@ let // { camlimages = ocamlPackages_3_12_1.camlimages_4_0; }; ocamlPackages_4_00_1 = mkOcamlPackages ocaml_4_00_1 pkgs.ocamlPackages_4_00_1; ocamlPackages_4_01_0 = mkOcamlPackages ocaml_4_01_0 pkgs.ocamlPackages_4_01_0; - ocamlPackages_4_02_1 = mkOcamlPackages ocaml_4_02_1 pkgs.ocamlPackages_4_02_1; - ocamlPackages_latest = ocamlPackages_4_02_1; + ocamlPackages_4_02 = mkOcamlPackages ocaml_4_02 pkgs.ocamlPackages_4_02; + ocamlPackages_latest = ocamlPackages_4_02; ocaml_make = callPackage ../development/ocaml-modules/ocamlmake { }; ocaml-top = callPackage ../development/tools/ocaml/ocaml-top { }; opa = callPackage ../development/compilers/opa { - ocamlPackages = ocamlPackages_4_00_1; + nodejs = nodejs-0_10; }; opam_1_0_0 = callPackage ../development/tools/ocaml/opam/1.0.0.nix { }; @@ -5633,6 +5650,7 @@ let }; noweb = callPackage ../development/tools/literate-programming/noweb { }; + nuweb = callPackage ../development/tools/literate-programming/nuweb { tex = texlive.combined.scheme-small; }; omake = callPackage ../development/tools/ocaml/omake { }; omake_rc1 = callPackage ../development/tools/ocaml/omake/0.9.8.6-rc1.nix { }; @@ -6349,6 +6367,7 @@ let gmp4 = callPackage ../development/libraries/gmp/4.3.2.nix { }; # required by older GHC versions gmp5 = callPackage ../development/libraries/gmp/5.1.x.nix { }; + gmp6 = callPackage ../development/libraries/gmp/6.x.nix { }; gmp = gmp5; gmpxx = appendToName "with-cxx" (gmp.override { cxx = true; }); @@ -6428,6 +6447,8 @@ let gnupg1 = gnupg1orig; }; + gpgstats = callPackage ../tools/security/gpgstats { }; + grantlee = callPackage ../development/libraries/grantlee { }; grantlee5 = callPackage ../development/libraries/grantlee/5.x-old.nix { }; @@ -6644,9 +6665,9 @@ let kf510 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.10 { }); kf512 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.12 { }); + kf514 = recurseIntoAttrs (import ../development/libraries/kde-frameworks-5.14 { inherit pkgs; }); kf5_latest = kf512; kf5_stable = kf510; - kf513 = recurseIntoAttrs (import ../development/libraries/kde-frameworks-5.13 { inherit pkgs; }); kf5PackagesFun = self: with self; { @@ -6686,8 +6707,8 @@ let }; - kf513Packages = lib.makeScope kf513.newScope kf5PackagesFun; - kf5Packages = kf513Packages; + kf514Packages = lib.makeScope kf514.newScope kf5PackagesFun; + kf5Packages = kf514Packages; kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { }; @@ -7567,6 +7588,8 @@ let paths = [ mesa_noglu mesa_glu ]; }); + meterbridge = callPackage ../applications/audio/meterbridge { }; + metaEnvironment = recurseIntoAttrs (let callPackage = newScope pkgs.metaEnvironment; in rec { sdfLibrary = callPackage ../development/libraries/sdf-library { aterm = aterm28; }; toolbuslib = callPackage ../development/libraries/toolbuslib { aterm = aterm28; inherit (windows) w32api; }; @@ -7665,6 +7688,11 @@ let sslSupport = true; }; + neon_0_29 = callPackage ../development/libraries/neon/0.29.nix { + compressionSupport = true; + sslSupport = true; + }; + nethack = callPackage ../games/nethack { }; nettle = callPackage ../development/libraries/nettle { }; @@ -7681,6 +7709,8 @@ let nix = pkgs.nixUnstable; }; + non = callPackage ../applications/audio/non { }; + nspr = callPackage ../development/libraries/nspr { }; nss = lowPrio (callPackage ../development/libraries/nss { }); @@ -7789,6 +7819,8 @@ let }; }; + opensubdiv = callPackage ../development/libraries/opensubdiv { }; + openwsman = callPackage ../development/libraries/openwsman {}; ortp = callPackage ../development/libraries/ortp { }; @@ -7809,6 +7841,8 @@ let unicodeSupport = config.pcre.unicode or true; }; + pcre2 = callPackage ../development/libraries/pcre2 { }; + pdf2xml = callPackage ../development/libraries/pdf2xml {} ; phonon = callPackage ../development/libraries/phonon/qt4 {}; @@ -9235,7 +9269,7 @@ let rethinkdb = callPackage ../servers/nosql/rethinkdb { }; rippled = callPackage ../servers/rippled { - boost = boost155; + boost = boost159; }; ripple-rest = callPackage ../servers/rippled/ripple-rest.nix { }; @@ -9406,6 +9440,7 @@ let alsaUtils = callPackage ../os-specific/linux/alsa-utils { }; alsaOss = callPackage ../os-specific/linux/alsa-oss { }; + alsaTools = callPackage ../os-specific/linux/alsa-tools { }; microcodeAmd = callPackage ../os-specific/linux/microcode/amd.nix { }; @@ -9486,6 +9521,11 @@ let cctools = (callPackage ../os-specific/darwin/cctools/port.nix { inherit libobjc; }).native; + cf-private = callPackage ../os-specific/darwin/cf-private { + inherit (apple-source-releases) CF; + inherit osx_private_sdk; + }; + maloader = callPackage ../os-specific/darwin/maloader { inherit opencflite; }; @@ -10424,6 +10464,8 @@ let corefonts = callPackage ../data/fonts/corefonts { }; + culmus = callPackage ../data/fonts/culmus { }; + wrapFonts = paths : (callPackage ../data/fonts/fontWrap { inherit paths; }); clearlyU = callPackage ../data/fonts/clearlyU { }; @@ -11212,6 +11254,8 @@ let magit = callPackage ../applications/editors/emacs-modes/magit { }; + markdownMode = callPackage ../applications/editors/emacs-modes/markdown-mode { }; + maudeMode = callPackage ../applications/editors/emacs-modes/maude { }; metaweblog = callPackage ../applications/editors/emacs-modes/metaweblog { }; @@ -11369,6 +11413,7 @@ let fvwm = callPackage ../applications/window-managers/fvwm { }; geany = callPackage ../applications/editors/geany { }; + geany-with-vte = callPackage ../applications/editors/geany/with-vte.nix { }; gksu = callPackage ../applications/misc/gksu { }; @@ -11964,8 +12009,8 @@ let }; llpp = callPackage ../applications/misc/llpp { - inherit (ocamlPackages_4_02_1) lablgl findlib; - ocaml = ocaml_4_02_1; + inherit (ocamlPackages_4_02) lablgl findlib; + ocaml = ocaml_4_02; }; lmms = callPackage ../applications/audio/lmms { }; @@ -12025,6 +12070,7 @@ let mercurial = callPackage ../applications/version-management/mercurial { inherit (pythonPackages) curses docutils hg-git dulwich; inherit (darwin.apple_sdk.frameworks) ApplicationServices; + inherit (darwin) cf-private; guiSupport = false; # use mercurialFull to get hgk GUI }; @@ -12122,6 +12168,8 @@ let ncmpcpp = callPackage ../applications/audio/ncmpcpp { }; + nload = callPackage ../applications/networking/nload { }; + normalize = callPackage ../applications/audio/normalize { }; mplayer = callPackage ../applications/video/mplayer ({ @@ -12161,22 +12209,16 @@ let inherit (gnome) ORBit2 libbonobo libgnomeui GConf; }; - mumble = callPackage ../applications/networking/mumble { - avahi = avahi.override { - withLibdnssdCompat = true; - }; - celt = celt_0_7; - jackSupport = config.mumble.jackSupport or false; - speechdSupport = config.mumble.speechdSupport or false; - pulseSupport = config.pulseaudio or false; - }; - - murmur = callPackage ../applications/networking/mumble/murmur.nix { - avahi = avahi.override { - withLibdnssdCompat = true; - }; - iceSupport = config.murmur.iceSupport or true; - }; + inherit (callPackages ../applications/networking/mumble { + avahi = avahi.override { + withLibdnssdCompat = true; + }; + qt5 = qt54; # Mumble is not compatible with qt55 yet + jackSupport = config.mumble.jackSupport or false; + speechdSupport = config.mumble.speechdSupport or false; + pulseSupport = config.pulseaudio or false; + iceSupport = config.murmur.iceSupport or true; + }) mumble mumble_git murmur murmur_git; musescore = qt5Libs.callPackage ../applications/audio/musescore { }; @@ -12357,7 +12399,7 @@ let pencil = callPackage ../applications/graphics/pencil { }; - perseus = callPackage ../applications/science/math/perseus {}; + perseus = callPackage ../applications/science/math/perseus {}; petrifoo = callPackage ../applications/audio/petrifoo { inherit (gnome) libgnomecanvas; @@ -12396,14 +12438,16 @@ let plugins = []; }; - pidginlatex = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-latex { }; - - pidginlatexSF = pidginlatex; + pidginlatex = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-latex { + texLive = texlive.combined.scheme-basic; + }; pidginmsnpecan = callPackage ../applications/networking/instant-messengers/pidgin-plugins/msn-pecan { }; pidgin-mra = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-mra { }; + pidgin-skypeweb = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb { }; + pidginotr = callPackage ../applications/networking/instant-messengers/pidgin-plugins/otr { }; pidginsipe = callPackage ../applications/networking/instant-messengers/pidgin-plugins/sipe { }; @@ -12999,7 +13043,7 @@ let vim = callPackage ../applications/editors/vim { inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Foundation CoreData; - inherit (darwin) libobjc; + inherit (darwin) libobjc cf-private; }; macvim = callPackage ../applications/editors/vim/macvim.nix { stdenv = clangStdenv; }; @@ -14245,13 +14289,17 @@ let # standard BLAS and LAPACK. openblasCompat = openblas.override { blas64 = false; }; + openlibm = callPackage ../development/libraries/science/math/openlibm {}; + + openspecfun = callPackage ../development/libraries/science/math/openspecfun {}; + mathematica = callPackage ../applications/science/math/mathematica { }; mathematica9 = callPackage ../applications/science/math/mathematica/9.nix { }; - sage = callPackage ../applications/science/math/sage { }; - metis = callPackage ../development/libraries/science/math/metis {}; + sage = callPackage ../applications/science/math/sage { }; + suitesparse_4_2 = callPackage ../development/libraries/science/math/suitesparse/4.2.nix { }; suitesparse_4_4 = callPackage ../development/libraries/science/math/suitesparse {}; suitesparse = suitesparse_4_4; @@ -14356,6 +14404,8 @@ let coq = coq_8_5; + coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {}; + mathcomp = callPackage ../development/coq-modules/mathcomp { }; ssreflect = callPackage ../development/coq-modules/ssreflect { }; @@ -15011,6 +15061,8 @@ let wavegain = callPackage ../applications/audio/wavegain { }; + wcalc = callPackage ../applications/misc/wcalc { }; + wine = callPackage ../misc/emulators/wine { wineRelease = config.wine.release or "stable"; wineBuild = config.wine.build or "wine32"; @@ -15152,6 +15204,7 @@ aliases = with self; rec { xlibs = xorg; # added 2015-09 youtube-dl = pythonPackages.youtube-dl; # added 2015-06-07 youtubeDL = youtube-dl; # added 2014-10-26 + pidginlatexSF = pidginlatex; # added 2014-11-02 }; tweakAlias = _n: alias: with lib; @@ -15160,4 +15213,3 @@ tweakAlias = _n: alias: with lib; else alias; in lib.mapAttrs tweakAlias aliases // self; in pkgs - |