diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 223 |
1 files changed, 142 insertions, 81 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3bfb7ab8f64a..8eb8a1c27be6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -121,7 +121,10 @@ with pkgs; dieHook = makeSetupHook {} ../build-support/setup-hooks/die.sh; - dockerTools = callPackage ../build-support/docker { }; + digitalbitbox = libsForQt5.callPackage ../applications/misc/digitalbitbox { }; + + # go 1.9 pin until https://github.com/moby/moby/pull/35739 + dockerTools = callPackage ../build-support/docker { go = go_1_9; }; docker_compose = pythonPackages.docker_compose; @@ -157,6 +160,12 @@ with pkgs; fetchdarcs = callPackage ../build-support/fetchdarcs { }; + fetchdocker = callPackage ../build-support/fetchdocker { }; + + fetchDockerConfig = callPackage ../build-support/fetchdocker/fetchDockerConfig.nix { }; + + fetchDockerLayer = callPackage ../build-support/fetchdocker/fetchDockerLayer.nix { }; + fetchfossil = callPackage ../build-support/fetchfossil { }; fetchgit = callPackage ../build-support/fetchgit { @@ -667,6 +676,10 @@ with pkgs; reattach-to-user-namespace = callPackage ../os-specific/darwin/reattach-to-user-namespace {}; + qes = callPackage ../os-specific/darwin/qes { + inherit (darwin.apple_sdk.frameworks) Carbon; + }; + xcodeenv = callPackage ../development/mobile/xcodeenv { }; titaniumenv = callPackage ../development/mobile/titaniumenv { @@ -725,6 +738,8 @@ with pkgs; qt4Support = config.avahi.qt4Support or false; }; + avro-c = callPackage ../development/libraries/avro-c { }; + avro-cpp = callPackage ../development/libraries/avro-c++ { boost = boost160; }; aws = callPackage ../tools/virtualization/aws { }; @@ -1323,7 +1338,11 @@ with pkgs; ring-daemon = callPackage ../applications/networking/instant-messengers/ring-daemon { }; - riot-web = callPackage ../applications/networking/instant-messengers/riot/riot-web.nix { }; + riot-web = callPackage ../applications/networking/instant-messengers/riot/riot-web.nix { + conf = config.riot-web.conf or null; + }; + + rsbep = callPackage ../tools/backup/rsbep { }; rsyslog = callPackage ../tools/system/rsyslog { hadoop = null; # Currently Broken @@ -1944,7 +1963,8 @@ with pkgs; inherit (darwin) cf-private; wxGTK = wxGTK31; }; - doomseeker = callPackage ../applications/misc/doomseeker { }; + + doomseeker = qt5.callPackage ../applications/misc/doomseeker { }; doom-bcc = callPackage ../games/zdoom/bcc-git.nix { }; @@ -2030,6 +2050,10 @@ with pkgs; uudeview = callPackage ../tools/misc/uudeview { }; + uutils-coreutils = callPackage ../tools/misc/uutils-coreutils { + inherit (pythonPackages) sphinx; + }; + zabbix-cli = callPackage ../tools/misc/zabbix-cli { }; ### DEVELOPMENT / EMSCRIPTEN @@ -2301,6 +2325,8 @@ with pkgs; franz = callPackage ../applications/networking/instant-messengers/franz { }; + freedroidrpg = callPackage ../games/freedroidrpg { }; + freeipmi = callPackage ../tools/system/freeipmi {}; freetalk = callPackage ../applications/networking/instant-messengers/freetalk { @@ -2913,6 +2939,8 @@ with pkgs; inetutils = callPackage ../tools/networking/inetutils { }; + infiniband-diags = callPackage ../tools/networking/infiniband-diags { }; + inform7 = callPackage ../development/compilers/inform7 { }; infamousPlugins = callPackage ../applications/audio/infamousPlugins { }; @@ -3127,6 +3155,8 @@ with pkgs; libscrypt = callPackage ../development/libraries/libscrypt { }; + libcloudproviders = callPackage ../development/libraries/libcloudproviders { }; + libsmi = callPackage ../development/libraries/libsmi { }; lesspipe = callPackage ../tools/misc/lesspipe { }; @@ -3262,9 +3292,6 @@ with pkgs; nodejs-slim = nodejs-slim-6_x; - nodejs-4_x = callPackage ../development/web/nodejs/v4.nix {}; - nodejs-slim-4_x = callPackage ../development/web/nodejs/v4.nix { enableNpm = false; }; - nodejs-6_x = callPackage ../development/web/nodejs/v6.nix {}; nodejs-slim-6_x = callPackage ../development/web/nodejs/v6.nix { enableNpm = false; }; @@ -3282,10 +3309,6 @@ with pkgs; nodejs = pkgs.nodejs-6_x; }; - nodePackages_4_x = callPackage ../development/node-packages/default-v4.nix { - nodejs = pkgs.nodejs-4_x; - }; - nodePackages = nodePackages_6_x; # Can be used as a user shell @@ -3299,6 +3322,8 @@ with pkgs; boost = boost165; }; + ispell = callPackage ../tools/text/ispell {}; + kindlegen = callPackage ../tools/typesetting/kindlegen { }; latex2html = callPackage ../tools/misc/latex2html { }; @@ -3974,6 +3999,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Carbon; }; + opensm = callPackage ../tools/networking/opensm { }; + openssh = callPackage ../tools/networking/openssh { hpnSupport = false; @@ -4037,14 +4064,14 @@ with pkgs; p7zip = callPackage ../tools/archivers/p7zip { }; - packagekit = callPackage ../tools/package-management/packagekit { - nix = nixUnstable; - }; + packagekit = callPackage ../tools/package-management/packagekit { }; packagekit-qt = libsForQt5.callPackage ../tools/package-management/packagekit/qt.nix { }; packetdrill = callPackage ../tools/networking/packetdrill { }; + pacman = callPackage ../tools/package-management/pacman { }; + padthv1 = callPackage ../applications/audio/padthv1 { }; pakcs = callPackage ../development/compilers/pakcs {}; @@ -4622,6 +4649,10 @@ with pkgs; quazip = quazip_qt4; }; + screenkey = python2Packages.callPackage ../applications/video/screenkey { + inherit (gnome3) defaultIconTheme; + }; + quazip_qt4 = libsForQt5.quazip.override { qtbase = qt4; qmake = qmake4Hook; }; @@ -4636,6 +4667,8 @@ with pkgs; sdl-jstest = callPackage ../tools/misc/sdl-jstest { }; + skim = callPackage ../tools/misc/skim { }; + sec = callPackage ../tools/admin/sec { }; seccure = callPackage ../tools/security/seccure { }; @@ -4775,6 +4808,8 @@ with pkgs; storebrowse = callPackage ../tools/system/storebrowse { }; + stubby = callPackage ../tools/networking/stubby { }; + syntex = callPackage ../tools/graphics/syntex {}; fusesmb = callPackage ../tools/filesystems/fusesmb { samba = samba3; }; @@ -5130,6 +5165,8 @@ with pkgs; untex = callPackage ../tools/text/untex { }; + untrunc = callPackage ../tools/video/untrunc { }; + upx = callPackage ../tools/compression/upx { }; uqmi = callPackage ../tools/networking/uqmi { }; @@ -5478,7 +5515,7 @@ with pkgs; xbursttools = assert stdenv ? glibc; callPackage ../tools/misc/xburst-tools rec { # It needs a cross compiler for mipsel to build the firmware it will # load into the Ben Nanonote - crossPrefix = "mips64el-unknown-linux-gnu"; + crossPrefix = "mipsel-unknown-linux-gnu"; gccCross = let pkgsCross = nixpkgsFun { @@ -6342,6 +6379,8 @@ with pkgs; jre = jre8; jre_headless = jre8_headless; + inherit (callPackages ../development/compilers/graalvm { }) mx jvmci8 graalvm8; + openshot-qt = libsForQt5.callPackage ../applications/video/openshot-qt { }; oraclejdk = pkgs.jdkdistro true false; @@ -6596,7 +6635,6 @@ with pkgs; ocsigen-i18n = callPackage ../development/tools/ocaml/ocsigen-i18n { }; opa = callPackage ../development/compilers/opa { - nodejs = nodejs-4_x; ocamlPackages = ocamlPackages_4_02; }; @@ -6823,7 +6861,7 @@ with pkgs; clooj = callPackage ../development/interpreters/clojure/clooj.nix { }; - dhall = haskell.lib.justStaticExecutables haskellPackages.dhall; + dhall = callPackage ../development/interpreters/dhall { }; dhall-nix = haskell.lib.justStaticExecutables haskellPackages.dhall-nix; @@ -6955,8 +6993,6 @@ with pkgs; mujs = callPackage ../development/interpreters/mujs { }; nix-exec = callPackage ../development/interpreters/nix-exec { - nix = nixUnstable; - git = gitMinimal; }; @@ -7148,6 +7184,8 @@ with pkgs; red = callPackage ../development/interpreters/red { }; + regextester = callPackage ../applications/misc/regextester { }; + regina = callPackage ../development/interpreters/regina { }; inherit (ocamlPackages) reason; @@ -8333,6 +8371,10 @@ with pkgs; libopcodes = callPackage ../development/libraries/libopcodes { }; + # TODO(@Ericson2314): Build bionic libc from source + bionic = assert hostPlatform.useAndroidPrebuilt; + androidenv.androidndkPkgs.libraries; + bobcat = callPackage ../development/libraries/bobcat { }; boehmgc = callPackage ../development/libraries/boehm-gc { }; @@ -8869,6 +8911,7 @@ with pkgs; # libc is hackily often used from the previous stage. This `or` # hack fixes the hack, *sigh*. /**/ if name == "glibc" then targetPackages.glibcCross or glibcCross + else if name == "bionic" then targetPackages.bionic else if name == "uclibc" then uclibcCross else if name == "musl" then targetPackages.muslCross or muslCross else if name == "msvcrt" then targetPackages.windows.mingw_w64 or windows.mingw_w64 @@ -8886,10 +8929,7 @@ with pkgs; glibc32 = pkgsi686Linux.glibc; }; - glm = callPackage ../development/libraries/glm - (lib.optionalAttrs stdenv.cc.isGNU { stdenv = overrideCC stdenv gcc6;/*maybe a hack*/ }); - - glm_0954 = callPackage ../development/libraries/glm/0954.nix { }; + glm = callPackage ../development/libraries/glm { }; globalplatform = callPackage ../development/libraries/globalplatform { }; gppcscconnectionplugin = @@ -9106,6 +9146,7 @@ with pkgs; gnome-sharp = callPackage ../development/libraries/gnome-sharp {}; granite = callPackage ../development/libraries/granite { }; + elementary-cmake-modules = callPackage ../development/libraries/elementary-cmake-modules { }; gtk2 = callPackage ../development/libraries/gtk+/2.x.nix { cupsSupport = config.gtk2.cups or stdenv.isLinux; @@ -9232,22 +9273,22 @@ with pkgs; hyena = callPackage ../development/libraries/hyena { }; - icu58 = callPackage (import ../development/libraries/icu/58.nix fetchurl) { + icu58 = callPackage (import ../development/libraries/icu/58.nix fetchurl) ({ nativeBuildRoot = buildPackages.icu58.override { buildRootOnly = true; }; } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' - }); - icu59 = callPackage ../development/libraries/icu/59.nix { + })); + icu59 = callPackage ../development/libraries/icu/59.nix ({ nativeBuildRoot = buildPackages.icu59.override { buildRootOnly = true; }; } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' - }); - icu60 = callPackage ../development/libraries/icu/60.nix { + })); + icu60 = callPackage ../development/libraries/icu/60.nix ({ nativeBuildRoot = buildPackages.icu60.override { buildRootOnly = true; }; } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' - }); + })); icu = icu59; @@ -9442,7 +9483,7 @@ with pkgs; libb2 = callPackage ../development/libraries/libb2 { }; libbap = callPackage ../development/libraries/libbap { - inherit (ocamlPackages_4_02) bap ocaml findlib ctypes; + inherit (ocamlPackages) bap ocaml findlib ctypes; }; libbass = (callPackage ../development/libraries/audio/libbass { }).bass; @@ -9644,10 +9685,6 @@ with pkgs; libgdata = gnome3.libgdata; - libgee_0_6 = callPackage ../development/libraries/libgee/0.6.nix { }; - - libgee_0_8 = callPackage ../development/libraries/libgee/0.8.nix { }; - libgig = callPackage ../development/libraries/libgig { }; libgnome-keyring = callPackage ../development/libraries/libgnome-keyring { }; @@ -9928,6 +9965,8 @@ with pkgs; graphviz = graphviz-nox; }; + libinput-gestures = callPackage ../tools/inputmethods/libinput-gestures {}; + libisofs = callPackage ../development/libraries/libisofs { }; libisoburn = callPackage ../development/libraries/libisoburn { }; @@ -10081,9 +10120,7 @@ with pkgs; libpfm = callPackage ../development/libraries/libpfm { }; - libpqxx = callPackage ../development/libraries/libpqxx { - gnused = gnused_422; - }; + libpqxx = callPackage ../development/libraries/libpqxx { }; libproxy = callPackage ../development/libraries/libproxy { inherit (darwin.apple_sdk.frameworks) SystemConfiguration CoreFoundation JavaScriptCore; @@ -10452,7 +10489,7 @@ with pkgs; ffmpeg = ffmpeg_2; }; - mkvtoolnix = callPackage ../applications/video/mkvtoolnix { }; + mkvtoolnix = libsForQt5.callPackage ../applications/video/mkvtoolnix { }; mkvtoolnix-cli = callPackage ../applications/video/mkvtoolnix { withGUI = false; @@ -10549,8 +10586,7 @@ with pkgs; }; libnghttp2 = nghttp2.lib; - nix-plugins = callPackage ../development/libraries/nix-plugins - { nix = nixUnstable; }; + nix-plugins = callPackage ../development/libraries/nix-plugins { }; nlohmann_json = callPackage ../development/libraries/nlohmann_json { }; @@ -11702,7 +11738,9 @@ with pkgs; xalanc = callPackage ../development/libraries/xalanc {}; - xgboost = callPackage ../development/libraries/xgboost { }; + xgboost = callPackage ../development/libraries/xgboost { + cudaSupport = config.cudaSupport or false; + }; xgeometry-select = callPackage ../tools/X11/xgeometry-select { }; @@ -12512,8 +12550,6 @@ with pkgs; psqlodbc = callPackage ../servers/sql/postgresql/psqlodbc { }; - pumpio = callPackage ../servers/web-apps/pump.io { }; - pure-ftpd = callPackage ../servers/ftp/pure-ftpd { }; pyIRCt = callPackage ../servers/xmpp/pyIRCt {}; @@ -12877,6 +12913,8 @@ with pkgs; fwupdate = callPackage ../os-specific/linux/firmware/fwupdate { }; + fwts = callPackage ../os-specific/linux/fwts { }; + libossp_uuid = callPackage ../development/libraries/libossp-uuid { }; libuuid = @@ -13126,22 +13164,6 @@ with pkgs; ]; }; - linux_4_13 = callPackage ../os-specific/linux/kernel/linux-4.13.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - kernelPatches.p9_fixes - # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md - # when adding a new linux version - kernelPatches.cpu-cgroup-v2."4.11" - kernelPatches.modinst_arg_list_too_long - ] - ++ lib.optionals ((platform.kernelArch or null) == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 - ]; - }; - linux_4_14 = callPackage ../os-specific/linux/kernel/linux-4.14.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -13373,7 +13395,6 @@ with pkgs; linuxPackages_rpi = linuxPackagesFor pkgs.linux_rpi; linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4); linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); - linuxPackages_4_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_13); linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14); linuxPackages_4_15 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_15); # Don't forget to update linuxPackages_latest! @@ -13798,7 +13819,7 @@ with pkgs; udisks1 = callPackage ../os-specific/linux/udisks/1-default.nix { }; udisks2 = callPackage ../os-specific/linux/udisks/2-default.nix { }; - udisks = udisks1; + udisks = udisks2; udisks_glue = callPackage ../os-specific/linux/udisks-glue { }; @@ -13937,7 +13958,7 @@ with pkgs; caladea = callPackage ../data/fonts/caladea {}; - cantarell_fonts = callPackage ../data/fonts/cantarell-fonts { }; + cantarell-fonts = callPackage ../data/fonts/cantarell-fonts { }; carlito = callPackage ../data/fonts/carlito {}; @@ -14945,7 +14966,8 @@ with pkgs; dmtx-utils = callPackage (callPackage ../tools/graphics/dmtx-utils) { }; - inherit (callPackage ../applications/virtualization/docker { }) + # go 1.9 pin until https://github.com/moby/moby/pull/35739 + inherit (callPackage ../applications/virtualization/docker { go = go_1_9; }) docker_17_12 docker_18_02; @@ -15821,6 +15843,11 @@ with pkgs; gv = callPackage ../applications/misc/gv { }; + gutenberg = callPackage ../applications/misc/gutenberg { + inherit (darwin.apple_sdk.frameworks) CoreServices; + inherit (darwin) cf-private; + }; + guvcview = callPackage ../os-specific/linux/guvcview { pulseaudioSupport = config.pulseaudio or true; ffmpeg = ffmpeg_2; @@ -16234,7 +16261,10 @@ with pkgs; bluez5 = bluez5_28; fontsConf = makeFontsConf { fontDirectories = [ + carlito dejavu_fonts freefont_ttf xorg.fontmiscmisc + liberation_ttf_v1_binary + liberation_ttf_v2_binary ]; }; clucene_core = clucene_core_2; @@ -16251,7 +16281,6 @@ with pkgs; inherit (gnome2) GConf ORBit2 gnome_vfs; inherit (gnome3) defaultIconTheme; zip = zip.override { enableNLS = false; }; - #glm = glm_0954; bluez5 = bluez5_28; fontsConf = makeFontsConf { fontDirectories = [ @@ -16294,6 +16323,8 @@ with pkgs; lighttable = callPackage ../applications/editors/lighttable {}; + libdsk = callPackage ../misc/emulators/libdsk { }; + links2 = callPackage ../applications/networking/browsers/links2 { }; linphone = callPackage ../applications/networking/instant-messengers/linphone rec { @@ -16535,6 +16566,8 @@ with pkgs; mm = callPackage ../applications/networking/instant-messengers/mm { }; + mpc-qt = libsForQt5.callPackage ../applications/video/mpc-qt { }; + mplayer = callPackage ../applications/video/mplayer ({ pulseSupport = config.pulseaudio or false; libdvdnav = libdvdnav_4_2_1; @@ -16547,11 +16580,19 @@ with pkgs; }; mpv = callPackage ../applications/video/mpv rec { - lua = lua5_1; - lua5_sockets = lua5_1_sockets; + inherit (luaPackages) luasocket; youtube-dl = pythonPackages.youtube-dl; - libva = libva-full; - waylandSupport = stdenv.isLinux; + libva = libva-full; + waylandSupport = stdenv.isLinux; + alsaSupport = !stdenv.isDarwin; + pulseSupport = !stdenv.isDarwin; + rubberbandSupport = !stdenv.isDarwin; + dvdreadSupport = !stdenv.isDarwin; + dvdnavSupport = !stdenv.isDarwin; + drmSupport = !stdenv.isDarwin; + x11Support = !stdenv.isDarwin; + xineramaSupport = !stdenv.isDarwin; + xvSupport = !stdenv.isDarwin; }; mpvScripts = { @@ -16806,6 +16847,8 @@ with pkgs; openscad = callPackage ../applications/graphics/openscad {}; + opentx = callPackage ../applications/misc/opentx { }; + opera = callPackage ../applications/networking/browsers/opera {}; orca = python3Packages.callPackage ../applications/misc/orca { @@ -17237,6 +17280,8 @@ with pkgs; }; rrsync = callPackage ../applications/networking/sync/rsync/rrsync.nix {}; + rtl_433 = callPackage ../applications/misc/rtl_433 { }; + rtl-sdr = callPackage ../applications/misc/rtl-sdr { }; rtv = callPackage ../applications/misc/rtv { }; @@ -17291,6 +17336,8 @@ with pkgs; scantailor = callPackage ../applications/graphics/scantailor { }; + scantailor-advanced = qt5.callPackage ../applications/graphics/scantailor/advanced.nix { }; + sc-im = callPackage ../applications/misc/sc-im { }; scite = callPackage ../applications/editors/scite { }; @@ -17634,11 +17681,6 @@ with pkgs; vte = gnome3.vte; }; - deepin-terminal = callPackage ../applications/misc/deepin-terminal { - inherit (gnome3) libgee vte; - wnck = libwnck3; - }; - termite = callPackage ../applications/misc/termite { vte = gnome3.vte-ng; }; @@ -18008,6 +18050,8 @@ with pkgs; wayv = callPackage ../tools/X11/wayv {}; + webtorrent_desktop = callPackage ../applications/video/webtorrent_desktop {}; + weechat = callPackage ../applications/networking/irc/weechat { inherit (darwin) libobjc; inherit (darwin) libresolv; @@ -18100,6 +18144,7 @@ with pkgs; ++ optional (cfg.enableFceumm or false) fceumm ++ optional (cfg.enableGambatte or false) gambatte ++ optional (cfg.enableGenesisPlusGX or false) genesis-plus-gx + ++ optional (cfg.enableHiganSFC or false) higan-sfc ++ optional (cfg.enableMAME or false) mame ++ optional (cfg.enableMGBA or false) mgba ++ optional (cfg.enableMupen64Plus or false) mupen64plus @@ -18706,6 +18751,8 @@ with pkgs; gnugo = callPackage ../games/gnugo { }; + gnujump = callPackage ../games/gnujump { }; + gogui = callPackage ../games/gogui {}; gtetrinet = callPackage ../games/gtetrinet { @@ -18957,6 +19004,8 @@ with pkgs; sienna = callPackage ../games/sienna { love = love_0_10; }; + sil = callPackage ../games/sil { }; + simutrans = callPackage ../games/simutrans { }; # get binaries without data built by Hydra simutrans_binaries = lowPrio simutrans.binaries; @@ -19187,6 +19236,8 @@ with pkgs; clearlooks-phenix = callPackage ../misc/themes/clearlooks-phenix { }; + deepin = recurseIntoAttrs (callPackage ../desktops/deepin { }); + enlightenment = recurseIntoAttrs (callPackage ../desktops/enlightenment { callPackage = newScope pkgs.enlightenment; }); @@ -19254,8 +19305,6 @@ with pkgs; orion = callPackage ../misc/themes/orion {}; - deepin-gtk-theme = callPackage ../misc/themes/deepin { }; - elementary-gtk-theme = callPackage ../misc/themes/elementary { }; albatross = callPackage ../misc/themes/albatross { }; @@ -19568,6 +19617,8 @@ with pkgs; cryptoverif = callPackage ../applications/science/logic/cryptoverif { }; + caprice32 = callPackage ../misc/emulators/caprice32 { }; + cubicle = callPackage ../applications/science/logic/cubicle { }; cvc3 = callPackage ../applications/science/logic/cvc3 { @@ -19694,6 +19745,8 @@ with pkgs; z3_4_5_0 = callPackage ../applications/science/logic/z3/4.5.0.nix {}; z3 = callPackage ../applications/science/logic/z3 { python = python2; }; + tlaplus = callPackage ../applications/science/logic/tlaplus {}; + aiger = callPackage ../applications/science/logic/aiger {}; avy = callPackage ../applications/science/logic/avy {}; @@ -20192,6 +20245,7 @@ with pkgs; stateDir = config.nix.stateDir or "/nix/var"; }) nix + nix1 nixStable nixUnstable; @@ -20203,7 +20257,7 @@ with pkgs; nixui = callPackage ../tools/package-management/nixui { node_webkit = nwjs_0_12; }; - nix-bundle = callPackage ../tools/package-management/nix-bundle { nix = nixUnstable; }; + nix-bundle = callPackage ../tools/package-management/nix-bundle { }; nix-delegate = haskell.lib.justStaticExecutables haskellPackages.nix-delegate; nix-deploy = haskell.lib.justStaticExecutables haskellPackages.nix-deploy; @@ -20226,7 +20280,7 @@ with pkgs; nix-template-rpm = callPackage ../build-support/templaterpm { inherit (pythonPackages) python toposort; }; - nix-repl = callPackage ../tools/package-management/nix-repl { }; + nix-repl = callPackage ../tools/package-management/nix-repl { nix = nix1; }; nix-serve = callPackage ../tools/package-management/nix-serve { }; @@ -20309,6 +20363,8 @@ with pkgs; pt = callPackage ../applications/misc/pt { }; + protocol = python3Packages.callPackage ../applications/networking/protocol { }; + pykms = callPackage ../tools/networking/pykms { }; pyload = callPackage ../applications/networking/pyload {}; @@ -20321,7 +20377,10 @@ with pkgs; redprl = callPackage ../applications/science/logic/redprl { }; - retroarchBare = callPackage ../misc/emulators/retroarch { }; + retroarchBare = callPackage ../misc/emulators/retroarch { + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) AppKit Foundation; + }; retroarch = wrapRetroArch { retroarch = retroarchBare; }; @@ -20456,8 +20515,6 @@ with pkgs; tewi-font = callPackage ../data/fonts/tewi {}; - tex4ht = callPackage ../tools/typesetting/tex/tex4ht { tetex = ""; }; - texFunctions = callPackage ../tools/typesetting/tex/nix pkgs; # TeX Live; see http://nixos.org/nixpkgs/manual/#sec-language-texlive @@ -20527,6 +20584,8 @@ with pkgs; vips = callPackage ../tools/graphics/vips { }; nip2 = callPackage ../tools/graphics/nip2 { }; + virglrenderer = callPackage ../development/libraries/virglrenderer { }; + vokoscreen = libsForQt5.callPackage ../applications/video/vokoscreen { }; wavegain = callPackage ../applications/audio/wavegain { }; @@ -20694,6 +20753,8 @@ with pkgs; zsnes = callPackage_i686 ../misc/emulators/zsnes { }; + xcpc = callPackage ../misc/emulators/xcpc { }; + zxcvbn-c = callPackage ../development/libraries/zxcvbn-c { }; snes9x-gtk = callPackage ../misc/emulators/snes9x-gtk { }; @@ -20829,7 +20890,7 @@ with pkgs; tlwg = callPackage ../data/fonts/tlwg { }; - safeDiscardStringContext = callPackage ../build-support/safe-discard-string-context.nix { }; - simplehttp2server = callPackage ../servers/simplehttp2server { }; + + diceware = callPackage ../tools/security/diceware { }; } |