diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 296 |
1 files changed, 128 insertions, 168 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6dd9427c2ce0..d50e812eaf00 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -50,7 +50,6 @@ with pkgs; inherit lib config; inherit (lib) lowPrio hiPrio appendToName makeOverridable; - inherit (misc) versionedDerivation; # Applying this to an attribute set will cause nix-env to look # inside the set for derivations. @@ -100,6 +99,8 @@ with pkgs; diffPlugins = (callPackage ../build-support/plugins.nix {}).diffPlugins; + dieHook = makeSetupHook {} ../build-support/setup-hooks/die.sh; + dockerTools = callPackage ../build-support/docker { }; docker_compose = pythonPackages.docker_compose; @@ -287,7 +288,8 @@ with pkgs; inherit contents compressor prepend; }; - makeWrapper = makeSetupHook { } ../build-support/setup-hooks/make-wrapper.sh; + makeWrapper = makeSetupHook { deps = [ dieHook ]; } + ../build-support/setup-hooks/make-wrapper.sh; makeModulesClosure = { kernel, rootModules, allowMissing ? false }: callPackage ../build-support/kernel/modules-closure.nix { @@ -611,9 +613,9 @@ with pkgs; inherit (androidenv) androidndk; - androidsdk = androidenv.androidsdk_7_1_1; + androidsdk = androidenv.androidsdk_8_0; - androidsdk_extras = self.androidenv.androidsdk_7_1_1_extras; + androidsdk_extras = self.androidenv.androidsdk_8_0_extras; arc-theme = callPackage ../misc/themes/arc { }; @@ -898,6 +900,8 @@ with pkgs; crudini = callPackage ../tools/misc/crudini { }; + cucumber = callPackage ../development/tools/cucumber {}; + daemontools = callPackage ../tools/admin/daemontools { }; dale = callPackage ../development/compilers/dale { }; @@ -999,9 +1003,7 @@ with pkgs; facedetect = callPackage ../tools/graphics/facedetect { }; - facter = callPackage ../tools/system/facter { - boost = boost160; - }; + facter = callPackage ../tools/system/facter { }; fasd = callPackage ../tools/misc/fasd { }; @@ -1041,6 +1043,8 @@ with pkgs; go-dependency-manager = callPackage ../development/tools/gdm { }; + geekbench = callPackage ../tools/misc/geekbench { }; + gencfsm = callPackage ../tools/security/gencfsm { }; genromfs = callPackage ../tools/filesystems/genromfs { }; @@ -1051,6 +1055,8 @@ with pkgs; glock = callPackage ../development/tools/glock { }; + glslviewer = callPackage ../development/tools/glslviewer { }; + gmic = callPackage ../tools/graphics/gmic { }; goa = callPackage ../development/tools/goa { }; @@ -1334,7 +1340,8 @@ with pkgs; clementine = callPackage ../applications/audio/clementine { boost = boost155; - gst_plugins = [ gst-plugins-base gst-plugins-good gst-plugins-ugly gst-ffmpeg ]; + gst_plugins = + with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly ]; }; clementineFree = clementine.free; @@ -1378,6 +1385,8 @@ with pkgs; libsigrok = libsigrok-0-3-0; # not compatible with >= 0.4.0 yet }; + collectd-data = callPackage ../tools/system/collectd/data.nix { }; + colormake = callPackage ../development/tools/build-managers/colormake { }; cpuminer = callPackage ../tools/misc/cpuminer { }; @@ -1816,6 +1825,8 @@ with pkgs; entr = callPackage ../tools/misc/entr { }; + envoy = callPackage ../tools/networking/envoy { }; + eot_utilities = callPackage ../tools/misc/eot-utilities { }; eplot = callPackage ../tools/graphics/eplot { }; @@ -2372,6 +2383,8 @@ with pkgs; gvolicon = callPackage ../tools/audio/gvolicon {}; + gwyddion = callPackage ../applications/science/chemistry/gwyddion {}; + gzip = callPackage ../tools/compression/gzip { }; gzrt = callPackage ../tools/compression/gzrt { }; @@ -2897,15 +2910,6 @@ with pkgs; enableNpm = false; }; - nodejs-7_x = callPackage ../development/web/nodejs/v7.nix { - libtool = darwin.cctools; - }; - - nodejs-slim-7_x = callPackage ../development/web/nodejs/v7.nix { - libtool = darwin.cctools; - enableNpm = false; - }; - nodejs-8_x = callPackage ../development/web/nodejs/v8.nix { libtool = darwin.cctools; }; @@ -2944,9 +2948,7 @@ with pkgs; leafpad = callPackage ../applications/editors/leafpad { }; - leatherman = callPackage ../development/libraries/leatherman { - boost = boost160; - }; + leatherman = callPackage ../development/libraries/leatherman { }; leela = callPackage ../tools/graphics/leela { }; @@ -2962,8 +2964,6 @@ with pkgs; libevdev = callPackage ../development/libraries/libevdev { }; - libevhtp = callPackage ../development/libraries/libevhtp { }; - libfann = callPackage ../development/libraries/libfann { }; libircclient = callPackage ../development/libraries/libircclient { }; @@ -3194,7 +3194,8 @@ with pkgs; minissdpd = callPackage ../tools/networking/minissdpd { }; - inherit (callPackage ../tools/networking/miniupnpc { }) + inherit (callPackage ../tools/networking/miniupnpc + { inherit (darwin) cctools; }) miniupnpc_1 miniupnpc_2; miniupnpc = miniupnpc_1; @@ -3505,6 +3506,8 @@ with pkgs; oh-my-zsh = callPackage ../shells/oh-my-zsh { }; + ola = callPackage ../applications/misc/ola { }; + opencc = callPackage ../tools/text/opencc { }; opencl-info = callPackage ../tools/system/opencl-info { }; @@ -3558,8 +3561,6 @@ with pkgs; opensp = callPackage ../tools/text/sgml/opensp { }; - spCompat = callPackage ../tools/text/sgml/opensp/compat.nix { }; - opentracker = callPackage ../applications/networking/p2p/opentracker { }; opentsdb = callPackage ../tools/misc/opentsdb {}; @@ -3826,9 +3827,7 @@ with pkgs; postscript-lexmark = callPackage ../misc/drivers/postscript-lexmark { }; - povray = callPackage ../tools/graphics/povray { - automake = automake113x; # fails with 14 - }; + povray = callPackage ../tools/graphics/povray { }; ppl = callPackage ../development/libraries/ppl { }; @@ -3906,7 +3905,9 @@ with pkgs; qarte = callPackage ../applications/video/qarte { }; - qnial = callPackage ../development/interpreters/qnial {}; + qlcplus = libsForQt5.callPackage ../applications/misc/qlcplus { }; + + qnial = callPackage ../development/interpreters/qnial { }; ocz-ssd-guru = callPackage ../tools/misc/ocz-ssd-guru { }; @@ -4472,8 +4473,6 @@ with pkgs; tiny8086 = callPackage ../applications/virtualization/8086tiny { }; - tlsdate = callPackage ../tools/networking/tlsdate { }; - tldr = callPackage ../tools/misc/tldr { }; tlspool = callPackage ../tools/networking/tlspool { }; @@ -5108,6 +5107,8 @@ with pkgs; oh = callPackage ../shells/oh { }; + oil = callPackage ../shells/oil { }; + pash = callPackage ../shells/pash { }; tcsh = callPackage ../shells/tcsh { }; @@ -5182,6 +5183,11 @@ with pkgs; clang = llvmPackages.clang; + clang-sierraHack = clang.override { + name = "clang-wrapper-with-reexport-hack"; + useMacosReexportHack = true; + }; + clang_4 = llvmPackages_4.clang; clang_39 = llvmPackages_39.clang; clang_38 = llvmPackages_38.clang; @@ -5209,6 +5215,7 @@ with pkgs; #Use this instead of stdenv to build with clang clangStdenv = if stdenv.isDarwin then stdenv else lowPrio llvmPackages.stdenv; + clang-sierraHack-stdenv = overrideCC stdenv clang-sierraHack; libcxxStdenv = lowPrio llvmPackages.libcxxStdenv; clean = callPackage ../development/compilers/clean { }; @@ -5219,13 +5226,10 @@ with pkgs; cmucl_binary = callPackage_i686 ../development/compilers/cmucl/binary.nix { }; - compcert = callPackage ../development/compilers/compcert (( - if system == "x86_64-linux" - then { tools = pkgsi686Linux.stdenv.cc; } - else {} - ) // { - coq = coq_8_6; - }); + compcert = callPackage ../development/compilers/compcert { + # Pin the version of coq used in compcert to 8.6 until the next release + coq = callPackage ../applications/science/logic/coq { version = "8.6"; }; + }; # Users installing via `nix-env` will likely be using the REPL, @@ -5589,9 +5593,18 @@ with pkgs; glslang = callPackage ../development/compilers/glslang { }; - go_bootstrap = callPackage ../development/compilers/go/1.4.nix { - inherit (darwin.apple_sdk.frameworks) Security; - }; + go_bootstrap = if stdenv.isAarch64 then + srcOnly { + name = "go-1.8-linux-arm64-bootstrap"; + src = fetchurl { + url = "https://cache.xor.us/go-1.8-linux-arm64-bootstrap.tar.xz"; + sha256 = "0sk6g03x9gbxk2k1djnrgy8rzw1zc5f6ssw0hbxk6kjr85lpmld6"; + }; + } + else + callPackage ../development/compilers/go/1.4.nix { + inherit (darwin.apple_sdk.frameworks) Security; + }; go_1_6 = callPackage ../development/compilers/go/1.6.nix { inherit (darwin.apple_sdk.frameworks) Security Foundation; @@ -6311,6 +6324,7 @@ with pkgs; pltScheme = racket; # just to be sure polyml = callPackage ../development/compilers/polyml { }; + polyml56 = callPackage ../development/compilers/polyml/5.6.nix { }; pure = callPackage ../development/interpreters/pure { llvm = llvm_35; @@ -6322,6 +6336,7 @@ with pkgs; python = python2; python2 = python27; python3 = python36; + pypy = pypy27; # Python interpreter that is build with all modules, including tkinter. # These are for compatibility and should not be used inside Nixpkgs. @@ -6329,7 +6344,6 @@ with pkgs; python2Full = python2.override{x11Support=true;}; python27Full = python27.override{x11Support=true;}; python3Full = python3.override{x11Support=true;}; - python33Full = python33.override{x11Support=true;}; python34Full = python34.override{x11Support=true;}; python35Full = python35.override{x11Support=true;}; python36Full = python36.override{x11Support=true;}; @@ -6343,10 +6357,6 @@ with pkgs; self = python27; inherit (darwin) CF configd; }; - python33 = callPackage ../development/interpreters/python/cpython/3.3 { - self = python33; - inherit (darwin) CF configd; - }; python34 = callPackage ../development/interpreters/python/cpython/3.4 { inherit (darwin) CF configd; self = python34; @@ -6360,17 +6370,22 @@ with pkgs; self = python36; }; - # Should eventually be moved inside Python interpreters. - python-setup-hook = callPackage ../development/interpreters/python/setup-hook.nix { }; - - pypy = pypy27; - pypy27 = callPackage ../development/interpreters/python/pypy/2.7 { self = pypy27; python = python27.override{x11Support=true;}; db = db.override { dbmSupport = true; }; }; + # Python package sets. + python27Packages = lib.hiPrioSet (recurseIntoAttrs python27.pkgs); + python34Packages = python34.pkgs; + python35Packages = python35.pkgs; + python36Packages = recurseIntoAttrs python36.pkgs; + pypyPackages = pypy.pkgs; + + # Should eventually be moved inside Python interpreters. + python-setup-hook = callPackage ../development/interpreters/python/setup-hook.nix { }; + python2nix = callPackage ../tools/package-management/python2nix { }; pythonDocs = recurseIntoAttrs (callPackage ../development/interpreters/python/cpython/docs {}); @@ -6594,12 +6609,6 @@ with pkgs; automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix { }; - automake112x = callPackage ../development/tools/misc/automake/automake-1.12.x.nix { }; - - automake113x = callPackage ../development/tools/misc/automake/automake-1.13.x.nix { }; - - automake114x = callPackage ../development/tools/misc/automake/automake-1.14.x.nix { }; - automake115x = callPackage ../development/tools/misc/automake/automake-1.15.x.nix { }; automoc4 = callPackage ../development/tools/misc/automoc4 { }; @@ -7103,6 +7112,10 @@ with pkgs; noweb = callPackage ../development/tools/literate-programming/noweb { }; nuweb = callPackage ../development/tools/literate-programming/nuweb { tex = texlive.combined.scheme-small; }; + obelisk = callPackage ../development/tools/ocaml/obelisk { + ocamlPackages = ocaml-ng.ocamlPackages_4_03; + }; + obuild = callPackage ../development/tools/ocaml/obuild { }; omake = callPackage ../development/tools/ocaml/omake { @@ -7135,7 +7148,7 @@ with pkgs; phantomjs = callPackage ../development/tools/phantomjs { }; - phantomjs2 = callPackage ../development/tools/phantomjs2 { }; + phantomjs2 = libsForQt5.callPackage ../development/tools/phantomjs2 { }; pmccabe = callPackage ../development/tools/misc/pmccabe { }; @@ -7469,6 +7482,8 @@ with pkgs; babl = callPackage ../development/libraries/babl { }; + backward-cpp = callPackage ../development/libraries/backward-cpp { }; + bctoolbox = callPackage ../development/libraries/bctoolbox { mbedtls = mbedtls_1_3; }; @@ -7517,8 +7532,6 @@ with pkgs; capnproto = callPackage ../development/libraries/capnproto { }; - ccnx = callPackage ../development/libraries/ccnx { }; - ndn-cxx = callPackage ../development/libraries/ndn-cxx { }; cddlib = callPackage ../development/libraries/cddlib {}; @@ -8033,6 +8046,9 @@ with pkgs; # A GMP fork mpir = callPackage ../development/libraries/mpir {}; + gns3-gui = callPackage ../applications/networking/gns3/gui.nix { }; + gns3-server = callPackage ../applications/networking/gns3/server.nix { }; + gobjectIntrospection = callPackage ../development/libraries/gobject-introspection { nixStoreDir = config.nix.storeDir or builtins.storeDir; inherit (darwin) cctools; @@ -8179,6 +8195,11 @@ with pkgs; cairomm = callPackage ../development/libraries/cairomm { }; pango = callPackage ../development/libraries/pango { }; + + pangolin = callPackage ../development/libraries/pangolin { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + }; + pangomm = callPackage ../development/libraries/pangomm { inherit (darwin.apple_sdk.frameworks) ApplicationServices; }; @@ -8749,10 +8770,6 @@ with pkgs; libexosip = callPackage ../development/libraries/exosip {}; - libexosip_3 = callPackage ../development/libraries/exosip/3.x.nix { - libosip = libosip_3; - }; - libextractor = callPackage ../development/libraries/libextractor { libmpeg2 = mpeg2dec; }; @@ -9031,8 +9048,6 @@ with pkgs; libmrss = callPackage ../development/libraries/libmrss { }; - libmsn = callPackage ../development/libraries/libmsn { }; - libmspack = callPackage ../development/libraries/libmspack { }; libmusicbrainz2 = callPackage ../development/libraries/libmusicbrainz/2.x.nix { }; @@ -9216,9 +9231,7 @@ with pkgs; libtap = callPackage ../development/libraries/libtap { }; - libtsm = callPackage ../development/libraries/libtsm { - automake = automake114x; - }; + libtsm = callPackage ../development/libraries/libtsm { }; libtunepimp = callPackage ../development/libraries/libtunepimp { }; @@ -9379,6 +9392,8 @@ with pkgs; lightlocker = callPackage ../misc/screensavers/light-locker { }; + lightstep-tracer-cpp = callPackage ../development/libraries/lightstep-tracer-cpp { }; + linenoise = callPackage ../development/libraries/linenoise { }; linenoise-ng = callPackage ../development/libraries/linenoise-ng { }; @@ -9633,6 +9648,8 @@ with pkgs; opencollada = callPackage ../development/libraries/opencollada { }; + opencore-amr = callPackage ../development/libraries/opencore-amr { }; + opencsg = callPackage ../development/libraries/opencsg { }; openct = callPackage ../development/libraries/openct { }; @@ -10061,6 +10078,8 @@ with pkgs; rabbitmq-java-client = callPackage ../development/libraries/rabbitmq-java-client {}; + rapidjson = callPackage ../development/libraries/rapidjson {}; + raul = callPackage ../development/libraries/audio/raul { }; readline = readline6; @@ -10077,7 +10096,7 @@ with pkgs; readosm = callPackage ../development/libraries/readosm { }; lambdabot = callPackage ../development/tools/haskell/lambdabot { - haskell-lib = haskell.lib; + haskellLib = haskell.lib; }; lambda-mod-zsh-theme = callPackage ../shells/lambda-mod-zsh-theme/default.nix { }; @@ -10573,8 +10592,6 @@ with pkgs; wt = callPackage ../development/libraries/wt { }; - wvstreams = callPackage ../development/libraries/wvstreams { }; - wxGTK = wxGTK28; wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 { @@ -10903,22 +10920,6 @@ with pkgs; sqitchModule = perlPackages.AppSqitch; }; - ### DEVELOPMENT / PYTHON MODULES - - # Python package sets. - - python27Packages = lib.hiPrioSet (recurseIntoAttrs python27.pkgs); - - python33Packages = python33.pkgs; - - python34Packages = python34.pkgs; - - python35Packages = python35.pkgs; - - python36Packages = recurseIntoAttrs python36.pkgs; - - pypyPackages = pypy.pkgs; - ### DEVELOPMENT / R MODULES R = callPackage ../applications/science/math/R { @@ -11360,6 +11361,8 @@ with pkgs; munin = callPackage ../servers/monitoring/munin { }; nagiosPluginsOfficial = callPackage ../servers/monitoring/nagios/plugins/official-2.x.nix { }; + + checkSSLCert = callPackage ../servers/monitoring/nagios/plugins/check_ssl_cert.nix { }; neo4j = callPackage ../servers/nosql/neo4j { }; @@ -11430,6 +11433,7 @@ with pkgs; prometheus-mysqld-exporter = callPackage ../servers/monitoring/prometheus/mysqld-exporter.nix { }; prometheus-nginx-exporter = callPackage ../servers/monitoring/prometheus/nginx-exporter.nix { }; prometheus-node-exporter = callPackage ../servers/monitoring/prometheus/node-exporter.nix { }; + prometheus-openvpn-exporter = callPackage ../servers/monitoring/prometheus/openvpn-exporter.nix { }; prometheus-pushgateway = callPackage ../servers/monitoring/prometheus/pushgateway.nix { }; prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { }; prometheus-statsd-bridge = callPackage ../servers/monitoring/prometheus/statsd-bridge.nix { }; @@ -11466,8 +11470,6 @@ with pkgs; restic = callPackage ../tools/backup/restic { }; - restund = callPackage ../servers/restund {}; - rethinkdb = callPackage ../servers/nosql/rethinkdb { libtool = darwin.cctools; }; @@ -11476,8 +11478,6 @@ with pkgs; boost = boost159; }; - #ripple-rest = callPackage ../servers/rippled/ripple-rest.nix { }; - s6 = callPackage ../tools/system/s6 { }; s6-rc = callPackage ../tools/system/s6-rc { }; @@ -11582,7 +11582,7 @@ with pkgs; tt-rss = callPackage ../servers/tt-rss { }; - searx = callPackages ../servers/web-apps/searx { }; + searx = callPackage ../servers/web-apps/searx { }; selfoss = callPackage ../servers/web-apps/selfoss { }; @@ -11936,7 +11936,6 @@ with pkgs; iproute = callPackage ../os-specific/linux/iproute { }; iputils = callPackage ../os-specific/linux/iputils { - sp = spCompat; inherit (perlPackages) SGMLSpm; }; @@ -11987,6 +11986,8 @@ with pkgs; linuxConsoleTools = callPackage ../os-specific/linux/consoletools { }; + openelec-dvb-firmware = callPackage ../os-specific/linux/firmware/openelec-dvb-firmware { }; + openiscsi = callPackage ../os-specific/linux/open-iscsi { }; openisns = callPackage ../os-specific/linux/open-isns { }; @@ -12001,14 +12002,6 @@ with pkgs; lkl = callPackage ../applications/virtualization/lkl { }; - linuxHeaders_2_4 = callPackage ../os-specific/linux/kernel-headers/2.4.nix { - cross = if targetPlatform != hostPlatform then targetPlatform else null; - }; - - linuxHeaders_2_6 = callPackage ../os-specific/linux/kernel-headers/4.4.nix { - cross = if targetPlatform != hostPlatform then targetPlatform else null; - }; - linuxHeaders_4_4 = callPackage ../os-specific/linux/kernel-headers/4.4.nix { cross = if targetPlatform != hostPlatform then targetPlatform else null; }; @@ -12018,8 +12011,6 @@ with pkgs; if targetPlatform != hostPlatform then { # switch - "2.4" = linuxHeaders_2_4; - "2.6" = linuxHeaders_2_6; "4.4" = linuxHeaders_4_4; }.${targetPlatform.platform.kernelMajor} or (throw "Unknown linux kernel version") @@ -12038,10 +12029,11 @@ with pkgs; kernelPatches.p9_fixes kernelPatches.modinst_arg_list_too_long kernelPatches.cpu-cgroup-v2."4.11" + kernelPatches.tag_hardened ]; extraConfig = import ../os-specific/linux/kernel/hardened-config.nix { inherit stdenv; - inherit (linux) version; + inherit (linux_hardened_copperhead) version; }; }; @@ -12064,34 +12056,6 @@ with pkgs; ]; }; - linux_3_10 = callPackage ../os-specific/linux/kernel/linux-3.10.nix { - kernelPatches = with kernelPatches; - [ bridge_stp_helper - p9_fixes - lguest_entry-linkage - packet_fix_race_condition_CVE_2016_8655 - DCCP_double_free_vulnerability_CVE-2017-6074 - ] - ++ lib.optionals ((platform.kernelArch or null) == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 - ]; - }; - - linux_4_4 = callPackage ../os-specific/linux/kernel/linux-4.4.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - kernelPatches.p9_fixes - kernelPatches.cpu-cgroup-v2."4.4" - ] - ++ lib.optionals ((platform.kernelArch or null) == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 - ]; - }; - linux_4_9 = callPackage ../os-specific/linux/kernel/linux-4.9.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -12307,8 +12271,6 @@ with pkgs; linuxPackages_hardened_copperhead = linuxPackagesFor pkgs.linux_hardened_copperhead; linuxPackages_mptcp = linuxPackagesFor pkgs.linux_mptcp; linuxPackages_rpi = linuxPackagesFor pkgs.linux_rpi; - linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10); - linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4); linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); linuxPackages_4_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_12); # Don't forget to update linuxPackages_latest! @@ -13034,6 +12996,8 @@ with pkgs; man-pages = callPackage ../data/documentation/man-pages { }; + material-icons = callPackage ../data/fonts/material-icons { }; + meslo-lg = callPackage ../data/fonts/meslo-lg {}; miscfiles = callPackage ../data/misc/miscfiles { }; @@ -13126,7 +13090,7 @@ with pkgs; stix-two = callPackage ../data/fonts/stix-two { }; inherit (callPackages ../data/fonts/gdouros { }) - symbola aegyptus akkadian anatolian maya unidings musica analecta; + symbola aegyptus akkadian anatolian maya unidings musica analecta textfonts aegan abydos; iana-etc = callPackage ../data/misc/iana-etc { }; @@ -13476,6 +13440,8 @@ with pkgs; bibletime = callPackage ../applications/misc/bibletime { }; + bitcoinarmory = callPackage ../applications/misc/bitcoinarmory { pythonPackages = python2Packages; }; + bitkeeper = callPackage ../applications/version-management/bitkeeper { gperf = gperf_3_0; }; @@ -14180,7 +14146,7 @@ with pkgs; gnuradio-osmosdr = callPackage ../applications/misc/gnuradio-osmosdr { }; - goldendict = libsForQt56.callPackage ../applications/misc/goldendict { }; + goldendict = libsForQt5.callPackage ../applications/misc/goldendict { }; inherit (ocamlPackages) google-drive-ocamlfuse; @@ -14240,8 +14206,6 @@ with pkgs; wireshark-qt = wireshark-cli.override { withQt = true; }; wireshark = wireshark-qt; - wvdial = callPackage ../os-specific/linux/wvdial { }; - fbida = callPackage ../applications/graphics/fbida { }; fdupes = callPackage ../tools/misc/fdupes { }; @@ -14961,10 +14925,6 @@ with pkgs; lci = callPackage ../applications/science/logic/lci {}; - ldcpp = callPackage ../applications/networking/p2p/ldcpp { - inherit (gnome2) libglade; - }; - lemonbar = callPackage ../applications/window-managers/lemonbar { }; lemonbar-xft = callPackage ../applications/window-managers/lemonbar/xft.nix { }; @@ -15527,6 +15487,8 @@ with pkgs; vivaldi = callPackage ../applications/networking/browsers/vivaldi {}; + vivaldi-ffmpeg-codecs = callPackage ../applications/networking/browsers/vivaldi/ffmpeg-codecs.nix {}; + openmpt123 = callPackage ../applications/audio/openmpt123 {}; opusfile = callPackage ../applications/audio/opusfile { }; @@ -15888,9 +15850,8 @@ with pkgs; remotebox = callPackage ../applications/virtualization/remotebox { }; - retroshare = callPackage ../applications/networking/p2p/retroshare { }; - - retroshare06 = lowPrio (callPackage ../applications/networking/p2p/retroshare/0.6.nix { }); + retroshare = libsForQt5.callPackage ../applications/networking/p2p/retroshare { }; + retroshare06 = retroshare; ricochet = libsForQt56.callPackage ../applications/networking/instant-messengers/ricochet { }; @@ -15972,7 +15933,7 @@ with pkgs; inherit (gnome2) libart_lgpl; }; - seafile-client = callPackage ../applications/networking/seafile-client { }; + seafile-client = libsForQt5.callPackage ../applications/networking/seafile-client { }; seeks = callPackage ../tools/networking/p2p/seeks { protobuf = protobuf2_5; @@ -16431,8 +16392,6 @@ with pkgs; utox = callPackage ../applications/networking/instant-messengers/utox { }; - vanitygen = callPackage ../applications/misc/vanitygen { }; - vanubi = callPackage ../applications/editors/vanubi { }; vbindiff = callPackage ../applications/editors/vbindiff { }; @@ -17254,8 +17213,6 @@ with pkgs; gl117 = callPackage ../games/gl-117 {}; - glestae = callPackage ../games/glestae {}; - globulation2 = callPackage ../games/globulation { boost = boost155; }; @@ -17336,6 +17293,8 @@ with pkgs; minecraft-server = callPackage ../games/minecraft-server { }; + moon-buggy = callPackage ../games/moon-buggy {}; + multimc = libsForQt5.callPackage ../games/multimc { }; minetest = callPackage ../games/minetest { @@ -17448,6 +17407,8 @@ with pkgs; openglSupport = mesaSupported; }; + rftg = callPackage ../games/rftg { }; + rigsofrods = callPackage ../games/rigsofrods { angelscript = angelscript_2_22; mygui = mygui.override { @@ -17592,14 +17553,7 @@ with pkgs; ultrastar-manager = libsForQt5.callPackage ../tools/misc/ultrastar-manager { }; - ultrastardx = callPackage ../games/ultrastardx/1.1.nix { - ffmpeg = ffmpeg_0; - lua = lua5; - }; - ultrastardx-beta = callPackage ../games/ultrastardx/1.3-beta.nix { - ffmpeg = ffmpeg_0; - lua = lua5; - }; + ultrastardx = callPackage ../games/ultrastardx/default.nix { }; unnethack = callPackage ../games/unnethack { }; @@ -17805,6 +17759,8 @@ with pkgs; numix-gtk-theme = callPackage ../misc/themes/numix { }; + numix-sx-gtk-theme = callPackage ../misc/themes/numix-sx { }; + theme-vertex = callPackage ../misc/themes/vertex { }; rox-filer = callPackage ../desktops/rox/rox-filer { @@ -18193,6 +18149,7 @@ with pkgs; tini = callPackage ../applications/virtualization/tini {}; isabelle = callPackage ../applications/science/logic/isabelle { + polyml = polyml56; java = if stdenv.isLinux then jre else jdk; }; @@ -18326,7 +18283,6 @@ with pkgs; geogebra = callPackage ../applications/science/math/geogebra { }; maxima = callPackage ../applications/science/math/maxima { - sbcl = sbcl_1_3_12; ecl = null; }; maxima-ecl = callPackage ../applications/science/math/maxima { @@ -18605,18 +18561,16 @@ with pkgs; flat-plat = callPackage ../misc/themes/flat-plat { }; + flockit = callPackage ../tools/backup/flockit { }; + foldingathome = callPackage ../misc/foldingathome { }; foo2zjs = callPackage ../misc/drivers/foo2zjs {}; foomatic-filters = callPackage ../misc/drivers/foomatic-filters {}; - freestyle = callPackage ../misc/freestyle { }; - gajim = callPackage ../applications/networking/instant-messengers/gajim { }; - gale = callPackage ../applications/networking/instant-messengers/gale { }; - gammu = callPackage ../applications/misc/gammu { }; gensgs = callPackage_i686 ../misc/emulators/gens-gs { }; @@ -18767,7 +18721,6 @@ with pkgs; mnemonicode = callPackage ../misc/mnemonicode { }; mysql-workbench = newScope gnome2 ../applications/misc/mysql-workbench (let mysql = mysql57; in { - automake = automake113x; gdal = gdal.override {mysql = mysql // {lib = {dev = mysql;};};}; mysql = mysql; pcre = pcre-cpp; @@ -18908,10 +18861,12 @@ with pkgs; inherit (callPackage ../applications/networking/cluster/terraform {}) terraform_0_8_5 terraform_0_8_8 - terraform_0_9_11; + terraform_0_9_11 + terraform_0_10_0; terraform_0_8 = terraform_0_8_8; terraform_0_9 = terraform_0_9_11; + terraform_0_10 = terraform_0_10_0; terraform = terraform_0_9; terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory {}; @@ -19160,8 +19115,6 @@ with pkgs; inherit (gnome2) gtksourceview; }; - misc = callPackage ../misc/misc.nix { }; - bullet = callPackage ../development/libraries/bullet {}; bullet283 = callPackage ../development/libraries/bullet/bullet283.nix {}; @@ -19222,6 +19175,8 @@ with pkgs; hy = callPackage ../development/interpreters/hy {}; + check-uptime = callPackage ../servers/monitoring/plugins/uptime.nix { }; + ghc-standalone-archive = callPackage ../os-specific/darwin/ghc-standalone-archive { inherit (darwin) cctools; }; chrome-gnome-shell = callPackage ../desktops/gnome-3/extensions/chrome-gnome-shell {}; @@ -19242,4 +19197,9 @@ with pkgs; houdini = callPackage ../applications/misc/houdini {}; xtermcontrol = callPackage ../applications/misc/xtermcontrol {}; + + # `recurseIntoAttrs` for sake of hydra, not nix-env + tests = recurseIntoAttrs { + macOSSierraShared = callPackage ../test/macos-sierra-shared {}; + }; } |