diff options
Diffstat (limited to 'nixpkgs/pkgs/top-level/all-packages.nix')
| -rw-r--r-- | nixpkgs/pkgs/top-level/all-packages.nix | 413 |
1 files changed, 250 insertions, 163 deletions
diff --git a/nixpkgs/pkgs/top-level/all-packages.nix b/nixpkgs/pkgs/top-level/all-packages.nix index bb542b5f8968..29fe03cea9f6 100644 --- a/nixpkgs/pkgs/top-level/all-packages.nix +++ b/nixpkgs/pkgs/top-level/all-packages.nix @@ -151,6 +151,8 @@ in cmark = callPackage ../development/libraries/cmark { }; + conftest = callPackage ../development/tools/conftest {}; + corgi = callPackage ../development/tools/corgi { }; dhallToNix = callPackage ../build-support/dhall-to-nix.nix { @@ -161,6 +163,8 @@ in proto-contrib = callPackage ../development/tools/proto-contrib {}; + protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc {}; + demoit = callPackage ../servers/demoit { }; diffPlugins = (callPackage ../build-support/plugins.nix {}).diffPlugins; @@ -175,6 +179,8 @@ in dockerTools = callPackage ../build-support/docker { }; + snapTools = callPackage ../build-support/snap { }; + nix-prefetch-docker = callPackage ../build-support/docker/nix-prefetch-docker.nix { }; docker-compose = python3Packages.callPackage ../applications/virtualization/docker-compose {}; @@ -242,6 +248,8 @@ in packer = callPackage ../development/tools/packer { }; + packr = callPackage ../development/libraries/packr { }; + pet = callPackage ../development/tools/pet { }; mod = callPackage ../development/tools/mod { }; @@ -327,6 +335,8 @@ in inherit url; }; + lazydocker = callPackage ../tools/misc/lazydocker { }; + ld-is-cc-hook = makeSetupHook { name = "ld-is-cc-hook"; } ../build-support/setup-hooks/ld-is-cc-hook.sh; @@ -534,6 +544,8 @@ in ammonite = callPackage ../development/tools/ammonite {}; + amp = callPackage ../applications/editors/amp {}; + amtterm = callPackage ../tools/system/amtterm {}; analog = callPackage ../tools/admin/analog {}; @@ -673,7 +685,7 @@ in apt = callPackage ../tools/package-management/apt { # include/c++/6.4.0/cstdlib:75:25: fatal error: stdlib.h: No such file or directory - stdenv = overrideCC stdenv gcc5; + stdenv = gcc5Stdenv; }; apt-dater = callPackage ../tools/package-management/apt-dater { }; @@ -732,6 +744,8 @@ in crumbs = callPackage ../applications/misc/crumbs { }; + cue = callPackage ../development/tools/cue { }; + deskew = callPackage ../applications/graphics/deskew { }; detect-secrets = python3Packages.callPackage ../development/tools/detect-secrets { }; @@ -1085,9 +1099,7 @@ in blockdiag = with python3Packages; toPythonApplication blockdiag; - blsd = callPackage ../tools/misc/blsd { - libgit2 = libgit2_0_27; - }; + blsd = callPackage ../tools/misc/blsd { }; bluez-alsa = callPackage ../tools/bluetooth/bluez-alsa { }; @@ -1447,6 +1459,8 @@ in dtrx = callPackage ../tools/compression/dtrx { }; + dua = callPackage ../tools/misc/dua { }; + inherit (ocamlPackages) dune; duperemove = callPackage ../tools/filesystems/duperemove { }; @@ -1667,6 +1681,8 @@ in link-grammar = callPackage ../tools/text/link-grammar { }; + linuxptp = callPackage ../os-specific/linux/linuxptp { }; + loadwatch = callPackage ../tools/system/loadwatch { }; loccount = callPackage ../development/tools/misc/loccount { }; @@ -1691,6 +1707,8 @@ in massren = callPackage ../tools/misc/massren { }; + megasync = callPackage ../applications/misc/megasync { }; + meritous = callPackage ../games/meritous { }; opendune = callPackage ../games/opendune { }; @@ -1780,6 +1798,8 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + psrecord = python3Packages.callPackage ../tools/misc/psrecord {}; + scour = with python3Packages; toPythonApplication scour; s2png = callPackage ../tools/graphics/s2png { }; @@ -1914,7 +1934,7 @@ in enableExtraPlugins = true; }); - asciidoctor = callPackage ../tools/typesetting/asciidoctor { }; + asciidoctor = callPackage ../tools/typesetting/asciidoctor { kindlegen = null; }; asunder = callPackage ../applications/audio/asunder { }; @@ -2657,6 +2677,8 @@ in tridactyl-native = callPackage ../tools/networking/tridactyl-native { }; + trompeloeil = callPackage ../development/libraries/trompeloeil { }; + uudeview = callPackage ../tools/misc/uudeview { }; uutils-coreutils = callPackage ../tools/misc/uutils-coreutils { @@ -2811,7 +2833,7 @@ in exa = callPackage ../tools/misc/exa { }; exempi = callPackage ../development/libraries/exempi { - stdenv = if stdenv.isi686 then overrideCC stdenv gcc6 else stdenv; + stdenv = if stdenv.isi686 then gcc6Stdenv else stdenv; }; execline = skawarePackages.execline; @@ -3089,7 +3111,7 @@ in fusuma = callPackage ../tools/inputmethods/fusuma {}; fdbPackages = dontRecurseIntoAttrs (callPackage ../servers/foundationdb { - stdenv49 = overrideCC stdenv gcc49; + stdenv49 = gcc49Stdenv; }); inherit (fdbPackages) @@ -3258,7 +3280,7 @@ in gnash = callPackage ../misc/gnash { }; gnaural = callPackage ../applications/audio/gnaural { - stdenv = overrideCC stdenv gcc49; + stdenv = gcc49Stdenv; }; gnirehtet = callPackage ../tools/networking/gnirehtet { }; @@ -3421,7 +3443,7 @@ in grpcurl = callPackage ../tools/networking/grpcurl { }; grub = pkgsi686Linux.callPackage ../tools/misc/grub ({ - stdenv = overrideCC stdenv pkgsi686Linux.gcc6; + stdenv = overrideCC stdenv buildPackages.pkgsi686Linux.gcc6; } // (config.grub or {})); trustedGrub = pkgsi686Linux.callPackage ../tools/misc/grub/trusted.nix { }; @@ -3708,6 +3730,8 @@ in icecast = callPackage ../servers/icecast { }; + iceshelf = callPackage ../tools/backup/iceshelf { }; + darkice = callPackage ../tools/audio/darkice { }; deco = callPackage ../applications/misc/deco { }; @@ -3947,7 +3971,10 @@ in kalibrate-hackrf = callPackage ../applications/radio/kalibrate-hackrf { }; - kakoune = callPackage ../applications/editors/kakoune { }; + wrapKakoune = callPackage ../applications/editors/kakoune/wrapper.nix { }; + kakounePlugins = callPackage ../applications/editors/kakoune/plugins.nix { }; + kakoune-unwrapped = callPackage ../applications/editors/kakoune { }; + kakoune = wrapKakoune kakoune-unwrapped { }; kbdd = callPackage ../applications/window-managers/kbdd { }; @@ -3971,7 +3998,7 @@ in inherit (darwin.apple_sdk.frameworks) AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox; }; - kbfs = callPackage ../tools/security/kbfs { }; + kbfs = callPackage ../tools/security/keybase/kbfs.nix { }; keybase-gui = callPackage ../tools/security/keybase/gui.nix { }; @@ -4237,12 +4264,10 @@ in }; nodejs-12_x = callPackage ../development/web/nodejs/v12.nix { openssl = openssl_1_1; - icu = icu63; }; nodejs-slim-12_x = callPackage ../development/web/nodejs/v12.nix { enableNpm = false; openssl = openssl_1_1; - icu = icu63; }; # Update this when adding the newest nodejs major version! @@ -4834,9 +4859,7 @@ in noip = callPackage ../tools/networking/noip { }; - nomad = callPackage ../applications/networking/cluster/nomad { - buildGoPackage = buildGo110Package; - }; + nomad = callPackage ../applications/networking/cluster/nomad { }; notable = callPackage ../applications/misc/notable { }; @@ -5787,7 +5810,9 @@ in scrypt = callPackage ../tools/security/scrypt { }; - sd = callPackage ../tools/text/sd { }; + sd = callPackage ../tools/text/sd { + inherit (darwin.apple_sdk.frameworks) Security; + }; sdate = callPackage ../tools/misc/sdate { }; @@ -6212,6 +6237,8 @@ in timetrap = callPackage ../applications/office/timetrap { }; + timetable = callPackage ../applications/office/timetable { }; + tzupdate = callPackage ../applications/misc/tzupdate { }; tinc = callPackage ../tools/networking/tinc { }; @@ -6391,7 +6418,7 @@ in udptunnel = callPackage ../tools/networking/udptunnel { }; ufraw = callPackage ../applications/graphics/ufraw { - stdenv = overrideCC stdenv gcc6; # doesn't build with gcc7 + stdenv = gcc6Stdenv; # doesn't build with gcc7 }; uftrace = callPackage ../development/tools/uftrace { }; @@ -6464,6 +6491,8 @@ in vfdecrypt = callPackage ../tools/misc/vfdecrypt { }; + video2midi = callPackage ../tools/audio/video2midi { }; + vifm = callPackage ../applications/misc/vifm { }; viking = callPackage ../applications/misc/viking { @@ -6753,14 +6782,7 @@ in volumeicon = callPackage ../tools/audio/volumeicon { }; waf = callPackage ../development/tools/build-managers/waf { python = python3; }; - wafHook = makeSetupHook { - deps = [ python ]; - substitutions = { - inherit waf; - crossFlags = lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system) - ''--cross-compile "--cross-execute=${stdenv.targetPlatform.emulator pkgs}"''; - }; - } ../development/tools/build-managers/waf/setup-hook.sh; + wafHook = callPackage ../development/tools/build-managers/wafHook { }; wakelan = callPackage ../tools/networking/wakelan { }; @@ -6926,6 +6948,8 @@ in # To expose more packages for Yi, override the extraPackages arg. yi = callPackage ../applications/editors/yi/wrapper.nix { }; + yj = callPackage ../development/tools/yj { }; + yle-dl = callPackage ../tools/misc/yle-dl {}; you-get = python3Packages.callPackage ../tools/misc/you-get { }; @@ -7102,7 +7126,7 @@ in avian = callPackage ../development/compilers/avian { inherit (darwin.apple_sdk.frameworks) CoreServices Foundation; - stdenv = if stdenv.cc.isGNU then overrideCC stdenv gcc49 else stdenv; + stdenv = if stdenv.cc.isGNU then gcc49Stdenv else stdenv; }; bigloo = callPackage ../development/compilers/bigloo { }; @@ -7162,7 +7186,7 @@ in #Use this instead of stdenv to build with clang clangStdenv = if stdenv.cc.isClang then stdenv else lowPrio llvmPackages.stdenv; - clang-sierraHack-stdenv = overrideCC stdenv clang-sierraHack; + clang-sierraHack-stdenv = overrideCC stdenv buildPackages.clang-sierraHack; libcxxStdenv = if stdenv.isDarwin then stdenv else lowPrio llvmPackages.libcxxStdenv; clasp-common-lisp = callPackage ../development/compilers/clasp { @@ -7188,6 +7212,8 @@ in }) crystal_0_25 crystal_0_26 + crystal_0_27 + crystal_0_29 crystal; icr = callPackage ../development/tools/icr {}; @@ -7241,9 +7267,12 @@ in extraBuildInputs = lib.optional stdenv.hostPlatform.isDarwin clang.cc; }; - gcc7Stdenv = overrideCC gccStdenv gcc7; - gcc8Stdenv = overrideCC gccStdenv gcc8; - gcc9Stdenv = overrideCC gccStdenv gcc9; + gcc49Stdenv = overrideCC gccStdenv buildPackages.gcc49; + gcc5Stdenv = overrideCC gccStdenv buildPackages.gcc5; + gcc6Stdenv = overrideCC gccStdenv buildPackages.gcc6; + gcc7Stdenv = overrideCC gccStdenv buildPackages.gcc7; + gcc8Stdenv = overrideCC gccStdenv buildPackages.gcc8; + gcc9Stdenv = overrideCC gccStdenv buildPackages.gcc9; wrapCCMulti = cc: if stdenv.targetPlatform.system == "x86_64-linux" then let @@ -7280,8 +7309,8 @@ in gcc_multi = wrapCCMulti gcc; clang_multi = wrapClangMulti clang; - gccMultiStdenv = overrideCC stdenv gcc_multi; - clangMultiStdenv = overrideCC stdenv clang_multi; + gccMultiStdenv = overrideCC stdenv buildPackages.gcc_multi; + clangMultiStdenv = overrideCC stdenv buildPackages.clang_multi; multiStdenv = if stdenv.cc.isClang then clangMultiStdenv else gccMultiStdenv; gcc_debug = lowPrio (wrapCC (gcc.cc.override { @@ -7663,6 +7692,14 @@ in bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "10"; }; + openjfx11 = + if stdenv.isDarwin then + null + else + callPackage ../development/compilers/openjdk/openjfx/11.nix { + openjdk = openjdk11; + }; + openjdk8 = if stdenv.isDarwin then callPackage ../development/compilers/openjdk/darwin/8.nix { } @@ -7677,6 +7714,7 @@ in callPackage ../development/compilers/openjdk/darwin/11.nix { } else callPackage ../development/compilers/openjdk/11.nix { + openjfx = openjfx11; inherit (gnome2) GConf gnome_vfs; }; @@ -7815,7 +7853,7 @@ in llvmPackages_35 = callPackage ../development/compilers/llvm/3.5 ({ isl = isl_0_14; } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { - stdenv = overrideCC stdenv buildPackages.gcc6; + stdenv = gcc6Stdenv; }); llvmPackages_38 = callPackage ../development/compilers/llvm/3.8 ({ @@ -7823,7 +7861,7 @@ in buildLlvmTools = buildPackages.llvmPackages_38.tools; targetLlvmLibraries = targetPackages.llvmPackages_38.libraries; } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { - stdenv = overrideCC stdenv buildPackages.gcc6; + stdenv = gcc6Stdenv; }); llvmPackages_39 = callPackage ../development/compilers/llvm/3.9 ({ @@ -7831,7 +7869,7 @@ in buildLlvmTools = buildPackages.llvmPackages_39.tools; targetLlvmLibraries = targetPackages.llvmPackages_39.libraries; } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { - stdenv = overrideCC stdenv buildPackages.gcc6; + stdenv = gcc6Stdenv; }); llvmPackages_4 = callPackage ../development/compilers/llvm/4 ({ @@ -7839,7 +7877,7 @@ in buildLlvmTools = buildPackages.llvmPackages_4.tools; targetLlvmLibraries = targetPackages.llvmPackages_4.libraries; } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { - stdenv = overrideCC stdenv buildPackages.gcc6; + stdenv = gcc6Stdenv; }); llvmPackages_5 = callPackage ../development/compilers/llvm/5 ({ @@ -7847,7 +7885,7 @@ in buildLlvmTools = buildPackages.llvmPackages_5.tools; targetLlvmLibraries = targetPackages.llvmPackages_5.libraries; } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { - stdenv = overrideCC stdenv buildPackages.gcc6; # with gcc-7: undefined reference to `__divmoddi4' + stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' }); llvmPackages_6 = callPackage ../development/compilers/llvm/6 ({ @@ -7855,7 +7893,7 @@ in buildLlvmTools = buildPackages.llvmPackages_6.tools; targetLlvmLibraries = targetPackages.llvmPackages_6.libraries; } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { - stdenv = overrideCC stdenv buildPackages.gcc6; # with gcc-7: undefined reference to `__divmoddi4' + stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' }); llvmPackages_7 = callPackage ../development/compilers/llvm/7 ({ @@ -7863,7 +7901,7 @@ in buildLlvmTools = buildPackages.llvmPackages_7.tools; targetLlvmLibraries = targetPackages.llvmPackages_7.libraries; } // stdenv.lib.optionalAttrs (buildPackages.stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { - stdenv = overrideCC stdenv buildPackages.gcc6; # with gcc-7: undefined reference to `__divmoddi4' + stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' }); llvmPackages_8 = callPackage ../development/compilers/llvm/8 ({ @@ -7871,7 +7909,7 @@ in buildLlvmTools = buildPackages.llvmPackages_8.tools; targetLlvmLibraries = targetPackages.llvmPackages_8.libraries; } // stdenv.lib.optionalAttrs (buildPackages.stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { - stdenv = overrideCC stdenv buildPackages.gcc6; # with gcc-7: undefined reference to `__divmoddi4' + stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' }); llvmPackages_latest = llvmPackages_8; @@ -7979,7 +8017,7 @@ in pforth = callPackage ../development/compilers/pforth {}; picat = callPackage ../development/compilers/picat { - stdenv = overrideCC stdenv gcc49; + stdenv = gcc49Stdenv; }; ponyc = callPackage ../development/compilers/ponyc { @@ -7988,6 +8026,8 @@ in pony-stable = callPackage ../development/compilers/ponyc/pony-stable.nix { }; + qbe = callPackage ../development/compilers/qbe { }; + rgbds = callPackage ../development/compilers/rgbds { }; rtags = callPackage ../development/tools/rtags { @@ -8018,6 +8058,8 @@ in cargo-download = callPackage ../tools/package-management/cargo-download { }; cargo-edit = callPackage ../tools/package-management/cargo-edit { }; + cargo-graph = callPackage ../tools/package-management/cargo-graph { }; + cargo-license = callPackage ../tools/package-management/cargo-license { }; cargo-outdated = callPackage ../tools/package-management/cargo-outdated {}; cargo-release = callPackage ../tools/package-management/cargo-release { inherit (darwin.apple_sdk.frameworks) Security; @@ -8031,6 +8073,7 @@ in cargo-bloat = callPackage ../development/tools/rust/cargo-bloat { }; cargo-expand = callPackage ../development/tools/rust/cargo-expand { }; cargo-fuzz = callPackage ../development/tools/rust/cargo-fuzz { }; + cargo-inspect = callPackage ../development/tools/rust/cargo-inspect { }; cargo-make = callPackage ../development/tools/rust/cargo-make { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -8241,9 +8284,9 @@ in beam = callPackage ./beam-packages.nix { }; inherit (beam.interpreters) - erlang erlangR18 erlangR19 erlangR20 erlangR21 + erlang erlangR18 erlangR19 erlangR20 erlangR21 erlangR22 erlang_odbc erlang_javac erlang_odbc_javac erlang_nox erlang_basho_R16B02 - elixir elixir_1_8 elixir_1_7 elixir_1_6 elixir_1_5 elixir_1_4 + elixir elixir_1_9 elixir_1_8 elixir_1_7 elixir_1_6 elixir_1_5 lfe lfe_1_2; inherit (beam.packages.erlang) @@ -8410,10 +8453,6 @@ in php = php73; phpPackages = php73Packages; - php71Packages = recurseIntoAttrs (callPackage ./php-packages.nix { - php = php71; - }); - php72Packages = recurseIntoAttrs (callPackage ./php-packages.nix { php = php72; }); @@ -8424,10 +8463,6 @@ in phpPackages-unit = php72Packages-unit; - php71Packages-unit = recurseIntoAttrs (callPackage ./php-packages.nix { - php = php71-unit; - }); - php72Packages-unit = recurseIntoAttrs (callPackage ./php-packages.nix { php = php72-unit; }); @@ -8439,17 +8474,11 @@ in inherit (callPackages ../development/interpreters/php { stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; }) - php71 php72 php73; php-embed = php73-embed; - php71-embed = php71.override { - config.php.embed = true; - config.php.apxs2 = false; - }; - php72-embed = php72.override { config.php.embed = true; config.php.apxs2 = false; @@ -8462,15 +8491,6 @@ in php-unit = php73-unit; - php71-unit = php71.override { - config.php.embed = true; - config.php.apxs2 = false; - config.php.systemd = false; - config.php.phpdbg = false; - config.php.cgi = false; - config.php.fpm = false; - }; - php72-unit = php72.override { config.php.embed = true; config.php.apxs2 = false; @@ -8563,6 +8583,7 @@ in svg2tikz = python27Packages.svg2tikz; pew = callPackage ../development/tools/pew {}; + poetry = with python3Packages; toPythonApplication poetry; pipenv = python3Packages.callPackage ../development/tools/pipenv {}; pipewire = callPackage ../development/libraries/pipewire {}; @@ -8642,7 +8663,7 @@ in spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix ({ inherit (darwin) libobjc; } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { - stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' + stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); spidermonkey_52 = callPackage ../development/interpreters/spidermonkey/52.nix { }; spidermonkey_60 = callPackage ../development/interpreters/spidermonkey/60.nix { }; @@ -8669,6 +8690,26 @@ in ### DEVELOPMENT / MISC + amdadlsdk = callPackage ../development/misc/amdadl-sdk { }; + + amdappsdk26 = amdappsdk.override { + version = "2.6"; + }; + + amdappsdk27 = amdappsdk.override { + version = "2.7"; + }; + + amdappsdk28 = amdappsdk.override { + version = "2.8"; + }; + + amdappsdk = callPackage ../development/misc/amdapp-sdk { }; + + amdappsdkFull = amdappsdk.override { + samples = true; + }; + amtk = callPackage ../development/libraries/amtk { }; avrlibc = callPackage ../development/misc/avr/libc {}; @@ -8895,7 +8936,7 @@ in yacc = bison; # TODO: move to aliases.nix blackmagic = callPackage ../development/tools/misc/blackmagic { - stdenv = overrideCC stdenv gcc6; + stdenv = gcc6Stdenv; gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; }; @@ -8954,7 +8995,7 @@ in # should be owned by user root, group nixbld with permissions 0770. ccacheWrapper = makeOverridable ({ extraConfig ? "" }: wrapCC (ccache.links extraConfig)) {}; - ccacheStdenv = lowPrio (overrideCC stdenv ccacheWrapper); + ccacheStdenv = lowPrio (overrideCC stdenv buildPackages.ccacheWrapper); cccc = callPackage ../development/tools/analysis/cccc { }; @@ -8980,6 +9021,8 @@ in cl-launch = callPackage ../development/tools/misc/cl-launch {}; + cloud-nuke = callPackage ../development/tools/cloud-nuke { }; + cloudfoundry-cli = callPackage ../development/tools/cloudfoundry-cli { }; coan = callPackage ../development/tools/analysis/coan { }; @@ -9120,7 +9163,7 @@ in # distccWrapper = makeOverridable ({ extraConfig ? "" }: wrapCC (distcc.links extraConfig)) {}; - distccStdenv = lowPrio (overrideCC stdenv distccWrapper); + distccStdenv = lowPrio (overrideCC stdenv buildPackages.distccWrapper); distccMasquerade = if stdenv.isDarwin then null @@ -9152,6 +9195,8 @@ in drip = callPackage ../development/tools/drip { }; + drm_info = callPackage ../development/tools/drm_info { }; + drush = callPackage ../development/tools/misc/drush { }; editorconfig-core-c = callPackage ../development/tools/misc/editorconfig-core-c { }; @@ -10156,6 +10201,8 @@ in cryptominisat = callPackage ../applications/science/logic/cryptominisat { }; + ctypes_sh = callPackage ../development/libraries/ctypes_sh { }; + curlcpp = callPackage ../development/libraries/curlcpp { }; curlpp = callPackage ../development/libraries/curlpp { }; @@ -10230,7 +10277,7 @@ in # Multi-arch "drivers" which we want to build for i686. driversi686Linux = recurseIntoAttrs { inherit (pkgsi686Linux) - mesa_drivers + mesa vaapiIntel libvdpau-va-gl vaapiVdpau @@ -10526,10 +10573,6 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - libgit2_0_27 = callPackage ../development/libraries/git2/0.27.nix { - inherit (darwin.apple_sdk.frameworks) Security; - }; - libgit2-glib = callPackage ../development/libraries/libgit2-glib { }; glbinding = callPackage ../development/libraries/glbinding { }; @@ -10673,7 +10716,8 @@ in gsettings-qt = libsForQt5.callPackage ../development/libraries/gsettings-qt { }; gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer { - callPackage = newScope { libav = pkgs.ffmpeg; }; + callPackage = newScope { libav = pkgs.ffmpeg_4; }; + inherit (darwin.apple_sdk.frameworks) CoreServices; }); gstreamer = callPackage ../development/libraries/gstreamer/legacy/gstreamer { }; @@ -10949,27 +10993,27 @@ in 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' + stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); 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' + stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); 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' + stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); icu63 = callPackage ../development/libraries/icu/63.nix ({ nativeBuildRoot = buildPackages.icu63.override { buildRootOnly = true; }; } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { - stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' + stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); icu64 = callPackage ../development/libraries/icu/64.nix ({ nativeBuildRoot = buildPackages.icu64.override { buildRootOnly = true; }; } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { - stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' + stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); icu = icu64; @@ -12250,7 +12294,7 @@ in # libGL.so/libEGL.so/... to link agains them. Android NDK provides # an OpenGL implementation, we can just use that. libGL = if stdenv.hostPlatform.useAndroidPrebuilt then stdenv - else mesa_noglu.stubs; + else mesa.stubs; # Default libGLU libGLU = mesa_glu; @@ -12265,29 +12309,17 @@ in extraOutputsToInstall = [ "dev" ]; }; - # Default derivation with libGL.so.1 to link into /run/opengl-drivers (if need) - libGL_driver = mesa_drivers; - - libGLSupported = lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms; - - mesa_noglu = callPackage ../development/libraries/mesa { + mesa = callPackage ../development/libraries/mesa { # 7 is the default, but only on Linux, so keep this for now llvmPackages = llvmPackages_7; inherit (darwin.apple_sdk.frameworks) OpenGL; inherit (darwin.apple_sdk.libs) Xplugin; }; - mesa = mesa_noglu; mesa_glu = callPackage ../development/libraries/mesa-glu { inherit (darwin.apple_sdk.frameworks) ApplicationServices; }; - # NOTE: 2018-07-12: legacy alias: - # gcsecurity bussiness is done: https://www.theregister.co.uk/2018/02/08/bruce_perens_grsecurity_anti_slapp/ - # floating point textures patents are expired, - # so package reduced to alias - mesa_drivers = mesa_noglu.drivers; - ## End libGL/libGLU/Mesa stuff meterbridge = callPackage ../applications/audio/meterbridge { }; @@ -12520,7 +12552,7 @@ in opal = callPackage ../development/libraries/opal { ffmpeg = ffmpeg_2; - stdenv = overrideCC stdenv gcc6; + stdenv = gcc6Stdenv; }; openh264 = callPackage ../development/libraries/openh264 { }; @@ -12572,6 +12604,8 @@ in openrct2 = callPackage ../games/openrct2 { }; + orcania = callPackage ../development/libraries/orcania { }; + osm-gps-map = callPackage ../development/libraries/osm-gps-map { }; osinfo-db = callPackage ../data/misc/osinfo-db { }; @@ -12822,8 +12856,7 @@ in libsForQt512 = recurseIntoAttrs (lib.makeScope qt512.newScope mkLibsForQt5); - # TODO bump to 5.12 on darwin once it's not broken - qt5 = if stdenv.isDarwin then qt511 else qt512; + qt5 = qt512; libsForQt5 = if stdenv.isDarwin then libsForQt511 else libsForQt512; qt5ct = libsForQt5.callPackage ../tools/misc/qt5ct { }; @@ -13047,7 +13080,7 @@ in rlog = callPackage ../development/libraries/rlog { }; - rocksdb = callPackage ../development/libraries/rocksdb { jemalloc = jemalloc450; }; + rocksdb = callPackage ../development/libraries/rocksdb { }; rocksdb_lite = rocksdb.override { enableLite = true; }; @@ -13529,13 +13562,13 @@ in v8_3_14 = callPackage ../development/libraries/v8/3.14.nix { inherit (python2Packages) python gyp; cctools = darwin.cctools; - stdenv = overrideCC stdenv gcc5; + stdenv = gcc5Stdenv; }; v8_3_16_14 = callPackage ../development/libraries/v8/3.16.14.nix { inherit (python2Packages) python gyp; cctools = darwin.cctools; - stdenv = if stdenv.isDarwin then stdenv else overrideCC stdenv gcc5; + stdenv = if stdenv.isDarwin then stdenv else gcc5Stdenv; }; v8_5_x = callPackage ../development/libraries/v8/5_x.nix ({ @@ -13543,7 +13576,7 @@ in icu = icu58; # v8-5.4.232 fails against icu4c-59.1 } // lib.optionalAttrs stdenv.isLinux { # doesn't build with gcc7 - stdenv = overrideCC stdenv gcc6; + stdenv = gcc6Stdenv; }); v8_6_x = v8; @@ -13551,7 +13584,7 @@ in inherit (python2Packages) python; } // lib.optionalAttrs stdenv.isLinux { # doesn't build with gcc7 - stdenv = overrideCC stdenv gcc6; + stdenv = gcc6Stdenv; }; vaapiIntel = callPackage ../development/libraries/vaapi-intel { }; @@ -13635,7 +13668,7 @@ in vxl = callPackage ../development/libraries/vxl { libpng = libpng12; - stdenv = overrideCC stdenv gcc6; # upstream code incompatible with gcc7 + stdenv = gcc6Stdenv; # upstream code incompatible with gcc7 }; wavpack = callPackage ../development/libraries/wavpack { }; @@ -13653,7 +13686,7 @@ in webkitgtk = callPackage ../development/libraries/webkitgtk { harfbuzz = harfbuzzFull; inherit (gst_all_1) gst-plugins-base gst-plugins-bad; - stdenv = overrideCC stdenv gcc6; + stdenv = gcc6Stdenv; }; webkitgtk24x-gtk3 = callPackage ../development/libraries/webkitgtk/2.4.nix { @@ -13700,7 +13733,11 @@ in inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; }; - wxGTK31 = callPackage ../development/libraries/wxwidgets/3.1 {}; + wxGTK31 = callPackage ../development/libraries/wxwidgets/3.1 { + inherit (gnome2) GConf; + inherit (darwin.stubs) setfile; + inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; + }; wxmac = callPackage ../development/libraries/wxwidgets/3.0/mac.nix { inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel; @@ -13777,6 +13814,8 @@ in yajl = callPackage ../development/libraries/yajl { }; + yder = callPackage ../development/libraries/yder { }; + yojimbo = callPackage ../development/libraries/yojimbo { }; yubioath-desktop = libsForQt5.callPackage ../applications/misc/yubioath-desktop { }; @@ -14237,8 +14276,8 @@ in fingerd_bsd = callPackage ../servers/fingerd/bsd-fingerd { }; - firebird = callPackage ../servers/firebird { icu = null; stdenv = overrideCC stdenv gcc5; }; - firebirdSuper = firebird.override { icu = icu58; superServer = true; stdenv = overrideCC stdenv gcc5; }; + firebird = callPackage ../servers/firebird { icu = null; stdenv = gcc5Stdenv; }; + firebirdSuper = firebird.override { icu = icu58; superServer = true; stdenv = gcc5Stdenv; }; foswiki = callPackage ../servers/foswiki { }; @@ -14363,6 +14402,8 @@ in morty = callPackage ../servers/web-apps/morty { }; + mullvad-vpn = callPackage ../applications/networking/mullvad-vpn { }; + myserver = callPackage ../servers/http/myserver { }; nas = callPackage ../servers/nas { }; @@ -14372,7 +14413,6 @@ in neard = callPackage ../servers/neard { }; unit = callPackage ../servers/http/unit { - php71 = php71-unit; php72 = php72-unit; php73 = php73-unit; }; @@ -14528,11 +14568,6 @@ in influxdb = callPackage ../servers/nosql/influxdb { }; - mysql55 = callPackage ../servers/sql/mysql/5.5.x.nix { - inherit (darwin) cctools; - inherit (darwin.apple_sdk.frameworks) CoreServices; - }; - mysql56 = callPackage ../servers/sql/mysql/5.6.x.nix { inherit (darwin) cctools developer_cmds; inherit (darwin.apple_sdk.frameworks) CoreServices; @@ -14724,6 +14759,8 @@ in }; }; + roon-server = callPackage ../servers/roon-server { }; + s6 = skawarePackages.s6; s6-rc = skawarePackages.s6-rc; @@ -15183,6 +15220,8 @@ in iproute = callPackage ../os-specific/linux/iproute { }; + iproute_mptcp = callPackage ../os-specific/linux/iproute/mptcp.nix { }; + iputils = callPackage ../os-specific/linux/iputils { }; iptables = callPackage ../os-specific/linux/iptables { }; @@ -15217,7 +15256,7 @@ in kmscube = callPackage ../os-specific/linux/kmscube { }; kmsxx = callPackage ../development/libraries/kmsxx { - stdenv = overrideCC stdenv gcc6; + stdenv = gcc6Stdenv; }; latencytop = callPackage ../os-specific/linux/latencytop { }; @@ -15263,8 +15302,9 @@ in klibcShrunk = lowPrio (callPackage ../os-specific/linux/klibc/shrunk.nix { }); - linux_mptcp = linux_mptcp_94; - linux_mptcp_94 = callPackage ../os-specific/linux/kernel/linux-mptcp.nix { + linux_mptcp = linux_mptcp_95; + + linux_mptcp_94 = callPackage ../os-specific/linux/kernel/linux-mptcp-94.nix { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.cpu-cgroup-v2."4.11" @@ -15277,13 +15317,8 @@ in ]; }; - linux_mptcp_93 = callPackage ../os-specific/linux/kernel/linux-mptcp-93.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - kernelPatches.p9_fixes - kernelPatches.cpu-cgroup-v2."4.9" - kernelPatches.modinst_arg_list_too_long - ]; + linux_mptcp_95 = callPackage ../os-specific/linux/kernel/linux-mptcp-95.nix { + kernelPatches = linux_4_19.kernelPatches; }; linux_rpi = callPackage ../os-specific/linux/kernel/linux-rpi.nix { @@ -15320,6 +15355,7 @@ in # when adding a new linux version kernelPatches.cpu-cgroup-v2."4.11" kernelPatches.modinst_arg_list_too_long + kernelPatches.export_kernel_fpu_functions ]; }; @@ -15327,13 +15363,6 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.modinst_arg_list_too_long - ]; - }; - - linux_5_0 = callPackage ../os-specific/linux/kernel/linux-5.0.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - kernelPatches.modinst_arg_list_too_long kernelPatches.export_kernel_fpu_functions ]; }; @@ -15547,7 +15576,6 @@ in linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14); linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19); - linuxPackages_5_0 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_0); linuxPackages_5_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_1); # When adding to this list: @@ -15717,8 +15745,14 @@ in nettools = if stdenv.isLinux then callPackage ../os-specific/linux/net-tools { } else unixtools.nettools; + nettools_mptcp = callPackage ../os-specific/linux/net-tools/mptcp.nix { }; + nftables = callPackage ../os-specific/linux/nftables { }; + noah = callPackage ../os-specific/darwin/noah { + inherit (darwin.apple_sdk.frameworks) Hypervisor; + }; + numactl = callPackage ../os-specific/linux/numactl { }; numad = callPackage ../os-specific/linux/numad { }; @@ -15856,7 +15890,7 @@ in semodule-utils = callPackage ../os-specific/linux/semodule-utils { }; - powerdns = callPackage ../servers/dns/powerdns { }; + powerdns = callPackage ../servers/dns/powerdns { libressl = libressl_2_8; }; dnsdist = callPackage ../servers/dns/dnsdist { }; @@ -15873,6 +15907,8 @@ in procdump = callPackage ../os-specific/linux/procdump { }; + prototool = callPackage ../development/tools/prototool { }; + qemu_kvm = lowPrio (qemu.override { hostCpuOnly = true; }); # See `xenPackages` source for explanations. @@ -15950,6 +15986,8 @@ in smem = callPackage ../os-specific/linux/smem { }; + smimesign = callPackage ../os-specific/darwin/smimesign { }; + speedometer = callPackage ../os-specific/linux/speedometer { }; statik = callPackage ../development/tools/statik { }; @@ -16126,6 +16164,8 @@ in aileron = callPackage ../data/fonts/aileron { }; + amiri = callPackage ../data/fonts/amiri { }; + andagii = callPackage ../data/fonts/andagii { }; andika = callPackage ../data/fonts/andika { }; @@ -16810,7 +16850,7 @@ in afterstep = callPackage ../applications/window-managers/afterstep { fltk = fltk13; gtk = gtk2; - stdenv = overrideCC stdenv gcc49; + stdenv = gcc49Stdenv; }; agedu = callPackage ../tools/misc/agedu { }; @@ -17050,7 +17090,7 @@ in blender = callPackage ../applications/misc/blender { pythonPackages = python35Packages; - stdenv = overrideCC stdenv gcc6; + stdenv = gcc6Stdenv; }; bluefish = callPackage ../applications/editors/bluefish { @@ -17095,7 +17135,7 @@ in calf = callPackage ../applications/audio/calf { inherit (gnome2) libglade; - stdenv = overrideCC stdenv gcc5; + stdenv = gcc5Stdenv; }; calcurse = callPackage ../applications/misc/calcurse { }; @@ -17263,6 +17303,8 @@ in cubicsdr = callPackage ../applications/radio/cubicsdr { wxGTK = wxGTK31; }; + cum = callPackage ../applications/misc/cum { }; + cuneiform = callPackage ../tools/graphics/cuneiform {}; curseradio = callPackage ../applications/audio/curseradio { }; @@ -18642,7 +18684,7 @@ in k3d = callPackage ../applications/graphics/k3d { inherit (pkgs.gnome2) gtkglext; - stdenv = overrideCC stdenv gcc6; + stdenv = gcc6Stdenv; boost = boost166.override { enablePython = true; }; }; @@ -18753,8 +18795,6 @@ in ktorrent = libsForQt5.callPackage ../applications/networking/p2p/ktorrent { }; - ksonnet = callPackage ../applications/networking/cluster/ksonnet { }; - kubecfg = callPackage ../applications/networking/cluster/kubecfg { }; kubeval = callPackage ../applications/networking/cluster/kubeval { }; @@ -18918,8 +18958,7 @@ in }; luakit = callPackage ../applications/networking/browsers/luakit { - inherit (lua51Packages) luafilesystem; - lua5 = lua5_1; + inherit (luajitPackages) luafilesystem; }; looking-glass-client = callPackage ../applications/virtualization/looking-glass-client { }; @@ -19010,7 +19049,7 @@ in mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; }); - merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { }; + merkaartor = libsForQt59.callPackage ../applications/misc/merkaartor { }; meshlab = libsForQt5.callPackage ../applications/graphics/meshlab { }; @@ -19069,15 +19108,15 @@ in monero = callPackage ../applications/altcoins/monero { inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC; - boost = boost15x; + boost = boost16x; }; monero-gui = libsForQt5.callPackage ../applications/altcoins/monero-gui { - boost = boost15x; + boost = boost16x; }; xmr-stak = callPackage ../applications/misc/xmr-stak { - stdenvGcc6 = overrideCC stdenv gcc6; + stdenvGcc6 = gcc6Stdenv; }; xmrig = callPackage ../applications/misc/xmrig { }; @@ -19294,6 +19333,17 @@ in polybar = callPackage ../applications/misc/polybar { }; + polybarFull = callPackage ../applications/misc/polybar { + alsaSupport = true; + githubSupport = true; + mpdSupport = true; + pulseSupport = true; + iwSupport = true; + nlSupport = true; + i3Support = true; + i3GapsSupport = true; + }; + ptex = callPackage ../development/libraries/ptex {}; qtcurve = libsForQt5.callPackage ../misc/themes/qtcurve {}; @@ -19365,7 +19415,7 @@ in maxlib = callPackage ../applications/audio/pd-plugins/maxlib { }; maxscale = callPackage ../tools/networking/maxscale { - stdenv = overrideCC stdenv gcc6; + stdenv = gcc6Stdenv; }; pdfdiff = callPackage ../applications/misc/pdfdiff { }; @@ -19476,7 +19526,7 @@ in openfx = callPackage ../development/libraries/openfx {}; openimageio = callPackage ../applications/graphics/openimageio { - stdenv = overrideCC stdenv gcc6; + stdenv = gcc6Stdenv; }; openimageio2 = callPackage ../applications/graphics/openimageio/2.x.nix { }; @@ -19515,6 +19565,8 @@ in vivaldi-ffmpeg-codecs = callPackage ../applications/networking/browsers/vivaldi/ffmpeg-codecs.nix {}; + vivaldi-widevine = callPackage ../applications/networking/browsers/vivaldi/widevine.nix { }; + openmpt123 = callPackage ../applications/audio/openmpt123 { }; opusfile = callPackage ../applications/audio/opusfile { }; @@ -19534,7 +19586,7 @@ in palemoon = callPackage ../applications/networking/browsers/palemoon { # https://forum.palemoon.org/viewtopic.php?f=57&t=15296#p111146 - stdenv = overrideCC stdenv gcc49; + stdenv = gcc49Stdenv; }; pamix = callPackage ../applications/audio/pamix { }; @@ -19580,6 +19632,7 @@ in inherit (gnome2) libgnomecanvas; }; + pdfcpu = callPackage ../applications/graphics/pdfcpu { }; pdftk = callPackage ../tools/typesetting/pdftk { }; pdfgrep = callPackage ../tools/typesetting/pdfgrep { }; @@ -19767,6 +19820,7 @@ in qemu = callPackage ../applications/virtualization/qemu { inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Hypervisor; inherit (darwin.stubs) rez setfile; + python = python3; }; qgis-unwrapped = libsForQt5.callPackage ../applications/gis/qgis/unwrapped.nix { @@ -19820,8 +19874,6 @@ in qtpass = libsForQt5.callPackage ../applications/misc/qtpass { }; - qtpfsgui = callPackage ../applications/graphics/qtpfsgui { }; - qtractor = libsForQt5.callPackage ../applications/audio/qtractor { }; qtscrobbler = callPackage ../applications/audio/qtscrobbler { }; @@ -21118,7 +21170,9 @@ in inherit (gnome2) libgnomeprint libgnomeprintui libgnomecanvas; }; - xournalpp = callPackage ../applications/graphics/xournalpp { }; + xournalpp = callPackage ../applications/graphics/xournalpp { + lua = lua5_3; + }; apvlv = callPackage ../applications/misc/apvlv { }; @@ -21319,7 +21373,7 @@ in arena = callPackage ../games/arena {}; arx-libertatis = callPackage ../games/arx-libertatis { - stdenv = overrideCC stdenv gcc6; + stdenv = gcc6Stdenv; }; asc = callPackage ../games/asc { @@ -21424,6 +21478,9 @@ in crrcsim = callPackage ../games/crrcsim {}; + curseofwar = callPackage ../games/curseofwar { SDL = null; }; + curseofwar-sdl = callPackage ../games/curseofwar { ncurses = null; }; + cutemaze = libsForQt5.callPackage ../games/cutemaze {}; cuyo = callPackage ../games/cuyo { }; @@ -21522,6 +21579,11 @@ in sdlClient = false; }; + freeciv_qt = freeciv.override { + qtClient = true; + sdlClient = false; + }; + freedink = callPackage ../games/freedink { }; freeorion = callPackage ../games/freeorion { }; @@ -21679,7 +21741,7 @@ in mrrescue = callPackage ../games/mrrescue { }; mudlet = libsForQt5.callPackage ../games/mudlet { - inherit (lua51Packages) luafilesystem lrexlib luazip luasqlite3; + inherit (lua51Packages) luafilesystem lrexlib-pcre luazip luasql-sqlite3; }; n2048 = callPackage ../games/n2048 {}; @@ -21798,6 +21860,8 @@ in racer = callPackage ../games/racer { }; + redeclipse = callPackage ../games/redeclipse { }; + residualvm = callPackage ../games/residualvm { }; rftg = callPackage ../games/rftg { }; @@ -21967,6 +22031,8 @@ in tome4 = callPackage ../games/tome4 { }; + toppler = callPackage ../games/toppler { }; + trackballs = callPackage ../games/trackballs { }; tremulous = callPackage ../games/tremulous { }; @@ -22020,6 +22086,8 @@ in inherit (darwin.apple_sdk.frameworks) ApplicationServices; }; + vapoursynth-editor = libsForQt5.callPackage ../development/libraries/vapoursynth/editor.nix { }; + vapoursynth-mvtools = callPackage ../development/libraries/vapoursynth-mvtools { }; vassal = callPackage ../games/vassal { }; @@ -22113,6 +22181,8 @@ in zangband = callPackage ../games/zangband { }; + zaz = callPackage ../games/zaz { }; + zdbsp = callPackage ../games/zdoom/zdbsp.nix { }; zdoom = callPackage ../games/zdoom { }; @@ -22323,7 +22393,7 @@ in aragorn = callPackage ../applications/science/biology/aragorn { }; archimedes = callPackage ../applications/science/electronics/archimedes { - stdenv = overrideCC stdenv gcc49; + stdenv = gcc49Stdenv; }; bedtools = callPackage ../applications/science/biology/bedtools { }; @@ -22410,6 +22480,8 @@ in niftyseg = callPackage ../applications/science/biology/niftyseg { }; + octopus-caller = callPackage ../applications/science/biology/octopus { }; + paml = callPackage ../applications/science/biology/paml { }; picard-tools = callPackage ../applications/science/biology/picard-tools { }; @@ -22545,6 +22617,8 @@ in nauty = callPackage ../applications/science/math/nauty {}; + osi = callPackage ../development/libraries/science/math/osi { }; + or-tools = callPackage ../development/libraries/science/math/or-tools { pythonProtobuf = pythonPackages.protobuf; }; @@ -22797,6 +22871,8 @@ in else smlnj; }; + fast-downward = callPackage ../applications/science/logic/fast-downward { }; + twelf = callPackage ../applications/science/logic/twelf { smlnj = if stdenv.isDarwin then smlnjBootstrap @@ -22931,12 +23007,6 @@ in ecl-fasl = true; sbcl = null; }; - # old version temporarily kept for sage - maxima-ecl-5_41 = callPackage ../applications/science/math/maxima/5.41.nix { - ecl = ecl_16_1_2; - ecl-fasl = true; - sbcl = null; - }; mxnet = callPackage ../applications/science/math/mxnet { inherit (linuxPackages) nvidia_x11; @@ -23230,7 +23300,7 @@ in dumb = callPackage ../misc/dumb { }; emulationstation = callPackage ../misc/emulators/emulationstation { - stdenv = overrideCC stdenv gcc5; + stdenv = gcc5Stdenv; }; electricsheep = callPackage ../misc/screensavers/electricsheep { }; @@ -24130,7 +24200,20 @@ in togglesg-download = callPackage ../tools/misc/togglesg-download { }; - discord = callPackage ../applications/networking/instant-messengers/discord { }; + discord = import ../applications/networking/instant-messengers/discord { + branch = "stable"; + inherit pkgs; + }; + + discord-ptb = import ../applications/networking/instant-messengers/discord { + branch = "ptb"; + inherit pkgs; + }; + + discord-canary = import ../applications/networking/instant-messengers/discord { + branch = "canary"; + inherit pkgs; + }; golden-cheetah = libsForQt56.callPackage ../applications/misc/golden-cheetah {}; @@ -24144,6 +24227,8 @@ in iterm2 = callPackage ../applications/misc/iterm2 {}; + sccache = callPackage ../development/tools/misc/sccache { }; + sequeler = callPackage ../applications/misc/sequeler { }; sequelpro = callPackage ../applications/misc/sequelpro {}; @@ -24280,4 +24365,6 @@ in dapper = callPackage ../development/tools/dapper { }; + kube3d = callPackage ../applications/networking/cluster/kube3d {}; + } |