diff options
Diffstat (limited to 'nixpkgs/pkgs/top-level/all-packages.nix')
| -rw-r--r-- | nixpkgs/pkgs/top-level/all-packages.nix | 260 |
1 files changed, 200 insertions, 60 deletions
diff --git a/nixpkgs/pkgs/top-level/all-packages.nix b/nixpkgs/pkgs/top-level/all-packages.nix index f28b60b01fa1..6948f10411c3 100644 --- a/nixpkgs/pkgs/top-level/all-packages.nix +++ b/nixpkgs/pkgs/top-level/all-packages.nix @@ -157,6 +157,8 @@ in deadcode = callPackage ../development/tools/deadcode { }; + proto-contrib = callPackage ../development/tools/proto-contrib {}; + demoit = callPackage ../servers/demoit { }; diffPlugins = (callPackage ../build-support/plugins.nix {}).diffPlugins; @@ -672,7 +674,9 @@ in bcachefs-tools = callPackage ../tools/filesystems/bcachefs-tools { }; - bitwarden_rs = callPackage ../tools/security/bitwarden_rs { }; + bitwarden_rs = callPackage ../tools/security/bitwarden_rs { + inherit (darwin.apple_sdk.frameworks) Security CoreServices; + }; bitwarden_rs-vault = callPackage ../tools/security/bitwarden_rs/vault.nix { }; @@ -712,6 +716,8 @@ in cozy = callPackage ../applications/audio/cozy-audiobooks { }; + ctrtool = callPackage ../tools/archivers/ctrtool { }; + crumbs = callPackage ../applications/misc/crumbs { }; deskew = callPackage ../applications/graphics/deskew { }; @@ -976,6 +982,8 @@ in metricbeat5 packetbeat5; + journalbeat5 = callPackage ../tools/system/journalbeat { }; + inherit (callPackages ../misc/logging/beats/6.x.nix { # XXX: this is failing with Go 1.12. Error is related to cgo, an # update to this package might fix it. @@ -1002,6 +1010,7 @@ in heartbeat = heartbeat6; metricbeat = metricbeat6; packetbeat = packetbeat6; + journalbeat = journalbeat6; bfr = callPackage ../tools/misc/bfr { }; @@ -1302,6 +1311,7 @@ in contacts = callPackage ../tools/misc/contacts { inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) Foundation AddressBook; + xcbuildHook = xcbuild6Hook; }; compsize = callPackage ../os-specific/linux/compsize { }; @@ -1324,6 +1334,8 @@ in csvkit = callPackage ../tools/text/csvkit { }; + csvs-to-sqlite = with python3Packages; toPythonApplication csvs-to-sqlite; + cucumber = callPackage ../development/tools/cucumber {}; daemontools = callPackage ../tools/admin/daemontools { }; @@ -1334,6 +1346,8 @@ in datamash = callPackage ../tools/misc/datamash { }; + datasette = with python3Packages; toPythonApplication datasette; + datefudge = callPackage ../tools/system/datefudge { }; dateutils = callPackage ../tools/misc/dateutils { }; @@ -1679,6 +1693,8 @@ in mp3blaster = callPackage ../applications/audio/mp3blaster { }; + mp3cat = callPackage ../tools/audio/mp3cat {}; + mp3fs = callPackage ../tools/filesystems/mp3fs { }; mpdas = callPackage ../tools/audio/mpdas { }; @@ -1738,12 +1754,18 @@ in pyznap = python3Packages.callPackage ../tools/backup/pyznap {}; + procs = callPackage ../tools/admin/procs { + inherit (darwin.apple_sdk.frameworks) Security; + }; + scour = with python3Packages; toPythonApplication scour; s2png = callPackage ../tools/graphics/s2png { }; shab = callPackage ../tools/text/shab { }; + shell-hist = callPackage ../tools/misc/shell-hist { }; + simg2img = callPackage ../tools/filesystems/simg2img { }; snipes = callPackage ../games/snipes { }; @@ -2014,6 +2036,8 @@ in checkinstall = callPackage ../tools/package-management/checkinstall { }; + chit = callPackage ../development/tools/chit { }; + chkrootkit = callPackage ../tools/security/chkrootkit { }; chrony = callPackage ../tools/networking/chrony { }; @@ -2636,25 +2660,44 @@ in evemu = callPackage ../tools/system/evemu { }; # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic. - elk5Version = "5.6.9"; - elk6Version = "6.7.1"; - elk7Version = "7.0.0"; + elk5Version = "5.6.16"; + elk6Version = "6.7.2"; + elk7Version = "7.0.1"; - elasticsearch5 = callPackage ../servers/search/elasticsearch/5.x.nix { }; - elasticsearch6 = callPackage ../servers/search/elasticsearch/6.x.nix { }; + elasticsearch5 = callPackage ../servers/search/elasticsearch/5.x.nix { + utillinux = utillinuxMinimal; + }; + elasticsearch6 = callPackage ../servers/search/elasticsearch/6.x.nix { + utillinux = utillinuxMinimal; + }; elasticsearch6-oss = callPackage ../servers/search/elasticsearch/6.x.nix { enableUnfree = false; + utillinux = utillinuxMinimal; + }; + elasticsearch7 = callPackage ../servers/search/elasticsearch/7.x.nix { + utillinux = utillinuxMinimal; }; - elasticsearch7 = callPackage ../servers/search/elasticsearch/7.x.nix { }; elasticsearch7-oss = callPackage ../servers/search/elasticsearch/7.x.nix { enableUnfree = false; + utillinux = utillinuxMinimal; }; elasticsearch = elasticsearch6; elasticsearch-oss = elasticsearch6-oss; elasticsearchPlugins = recurseIntoAttrs ( - callPackage ../servers/search/elasticsearch/plugins.nix { } + callPackage ../servers/search/elasticsearch/plugins.nix { + elasticsearch = elasticsearch-oss; + } ); + elasticsearch5Plugins = elasticsearchPlugins.override { + elasticsearch = elasticsearch5; + }; + elasticsearch6Plugins = elasticsearchPlugins.override { + elasticsearch = elasticsearch6-oss; + }; + elasticsearch7Plugins = elasticsearchPlugins.override { + elasticsearch = elasticsearch7-oss; + }; elasticsearch-curator = with (python3.override { packageOverrides = self: super: { @@ -2987,7 +3030,9 @@ in inherit (fdbPackages) foundationdb51 foundationdb52 - foundationdb60; + foundationdb60 + foundationdb61 + ; foundationdb = foundationdb60; @@ -3011,6 +3056,8 @@ in galen = callPackage ../development/tools/galen {}; + gallery-dl = callPackage ../applications/misc/gallery-dl { }; + gandi-cli = callPackage ../tools/networking/gandi-cli { }; gandom-fonts = callPackage ../data/fonts/gandom-fonts { }; @@ -3417,7 +3464,11 @@ in hdf4 = null; }; - haproxy = callPackage ../tools/networking/haproxy { }; + haproxy = callPackage ../tools/networking/haproxy { + stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; + }; + + hackertyper = callPackage ../tools/misc/hackertyper { }; haveged = callPackage ../tools/security/haveged { }; @@ -3778,8 +3829,6 @@ in joplin-desktop = callPackage ../applications/misc/joplin-desktop { }; - journalbeat = callPackage ../tools/system/journalbeat { }; - journaldriver = callPackage ../tools/misc/journaldriver { }; jp = callPackage ../development/tools/jp { }; @@ -4112,6 +4161,13 @@ in enableNpm = false; openssl = openssl_1_1; }; + nodejs-12_x = callPackage ../development/web/nodejs/v12.nix { + openssl = openssl_1_1; + }; + nodejs-slim-12_x = callPackage ../development/web/nodejs/v12.nix { + enableNpm = false; + openssl = openssl_1_1; + }; nodePackages_10_x = dontRecurseIntoAttrs (callPackage ../development/node-packages/default-v10.nix { nodejs = pkgs.nodejs-10_x; @@ -4481,6 +4537,8 @@ in withMinimal = false; }; + mkclean = callPackage ../applications/video/mkclean {}; + mkcue = callPackage ../tools/cd-dvd/mkcue { }; mkp224o = callPackage ../tools/security/mkp224o { }; @@ -4511,7 +4569,9 @@ in docbook-xsl = docbook_xsl; }; - mosh = callPackage ../tools/networking/mosh { }; + mosh = callPackage ../tools/networking/mosh { + stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; + }; motuclient = callPackage ../applications/science/misc/motu-client { }; @@ -4831,6 +4891,10 @@ in ola = callPackage ../applications/misc/ola { }; + olive-editor = libsForQt5.callPackage ../applications/video/olive-editor { + inherit (darwin.apple_sdk.frameworks) CoreFoundation; + }; + omping = callPackage ../applications/networking/omping { }; onioncircuits = callPackage ../tools/security/onioncircuits { }; @@ -4875,7 +4939,7 @@ in openresolv = callPackage ../tools/networking/openresolv { }; opensc = callPackage ../tools/security/opensc { - inherit (darwin.apple_sdk.frameworks) Carbon; + inherit (darwin.apple_sdk.frameworks) Carbon PCSC; }; opensm = callPackage ../tools/networking/opensm { }; @@ -4974,6 +5038,8 @@ in paper-gtk-theme = callPackage ../misc/themes/paper { }; + paperless = callPackage ../applications/office/paperless { }; + paperwork = callPackage ../applications/office/paperwork { }; papertrail = callPackage ../tools/text/papertrail { }; @@ -4988,6 +5054,8 @@ in patchutils = callPackage ../tools/text/patchutils { }; + patchutils_0_3_3 = callPackage ../tools/text/patchutils/0.3.3.nix { }; + parted = callPackage ../tools/misc/parted { }; paulstretch = callPackage ../applications/audio/paulstretch { }; @@ -5128,6 +5196,7 @@ in pinentry_mac = callPackage ../tools/security/pinentry/mac.nix { inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) Cocoa; + xcbuildHook = xcbuild6Hook; }; pingtcp = callPackage ../tools/networking/pingtcp { }; @@ -5301,7 +5370,9 @@ in remarshal = callPackage ../development/tools/remarshal { }; - rig = callPackage ../tools/misc/rig { }; + rig = callPackage ../tools/misc/rig { + stdenv = gccStdenv; + }; rocket = libsForQt5.callPackage ../tools/graphics/rocket { }; @@ -5822,7 +5893,7 @@ in fusesmb = callPackage ../tools/filesystems/fusesmb { samba = samba3; }; - sl = callPackage ../tools/misc/sl { }; + sl = callPackage ../tools/misc/sl { stdenv = gccStdenv; }; socat = callPackage ../tools/networking/socat { }; @@ -6200,7 +6271,8 @@ in libX11 = xorg.libX11; }; - twitterBootstrap3 = callPackage ../development/web/twitter-bootstrap {}; + twitterBootstrap3 = callPackage ../development/web/twitter-bootstrap/3.nix {}; + twitterBootstrap4 = callPackage ../development/web/twitter-bootstrap {}; twitterBootstrap = twitterBootstrap3; txr = callPackage ../tools/misc/txr { stdenv = clangStdenv; }; @@ -6819,6 +6891,8 @@ in zxing = callPackage ../tools/graphics/zxing {}; + zmap = callPackage ../tools/security/zmap { }; + ### SHELLS @@ -6956,7 +7030,9 @@ in inherit (buildPackages.darwin) bootstrap_cmds; }; - cdb = callPackage ../development/tools/database/cdb { }; + cdb = callPackage ../development/tools/database/cdb { + stdenv = gccStdenv; + }; chez = callPackage ../development/compilers/chez { inherit (darwin) cctools; @@ -6969,11 +7045,6 @@ in name = "clang-wrapper-with-reexport-hack"; bintools = darwin.binutils.override { useMacosReexportHack = true; - bintools = darwin.binutils.bintools.override { - cctools = darwin.cctools.override { - enableDumpNormalizedLibArgs = true; - }; - }; }; }; llvm-polly = llvmPackages_latest.llvm-polly; @@ -7019,7 +7090,10 @@ in cryptol = haskell.lib.justStaticExecutables haskellPackages.cryptol; - inherit (callPackages ../development/compilers/crystal {}) + inherit (callPackages ../development/compilers/crystal { + stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; + inherit (llvmPackages_6) clang llvm; + }) crystal_0_25 crystal_0_26 crystal; @@ -7077,6 +7151,7 @@ in gcc7Stdenv = overrideCC gccStdenv gcc7; gcc8Stdenv = overrideCC gccStdenv gcc8; + gcc9Stdenv = overrideCC gccStdenv gcc9; wrapCCMulti = cc: if stdenv.targetPlatform.system == "x86_64-linux" then let @@ -7231,6 +7306,17 @@ in isl = if !stdenv.isDarwin then isl_0_17 else null; })); + gcc9 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/9 { + inherit noSysDirs; + + # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion + profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); + + libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; + + isl = if !stdenv.isDarwin then isl_0_17 else null; + })); + gcc-snapshot = lowPrio (wrapCC (callPackage ../development/compilers/gcc/snapshot { inherit noSysDirs; @@ -7633,7 +7719,7 @@ in llvm_37 = llvmPackages_37.llvm; llvm_35 = llvmPackages_35.llvm; - llvmPackages = recurseIntoAttrs llvmPackages_5; + llvmPackages = recurseIntoAttrs llvmPackages_7; llvmPackages_35 = callPackage ../development/compilers/llvm/3.5 ({ isl = isl_0_14; @@ -7950,7 +8036,9 @@ in tinycc = callPackage ../development/compilers/tinycc { }; - tinyscheme = callPackage ../development/interpreters/tinyscheme { }; + tinyscheme = callPackage ../development/interpreters/tinyscheme { + stdenv = gccStdenv; + }; inherit (ocaml-ng.ocamlPackages_4_02) trv; @@ -8175,14 +8263,16 @@ in lush2 = callPackage ../development/interpreters/lush {}; - maude = callPackage ../development/interpreters/maude { }; + maude = callPackage ../development/interpreters/maude { + stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv; + }; me_cleaner = pythonPackages.callPackage ../tools/misc/me_cleaner { }; mesos = callPackage ../applications/networking/cluster/mesos { sasl = cyrus_sasl; inherit (pythonPackages) python boto setuptools wrapPython; - pythonProtobuf = pythonPackages.protobuf; + pythonProtobuf = pythonPackages.protobuf.override { protobuf = protobuf3_6; }; perf = linuxPackages.perf; }; @@ -8254,11 +8344,13 @@ in php = php72-unit; }); - php73Packages-unit = recurseIntoAttrs (callPackage ./php-packages.nix { + php73Packages-unit = recurseIntoAttrs (callPackage ./php-packages.nix { php = php73-unit; }); - inherit (callPackages ../development/interpreters/php { }) + inherit (callPackages ../development/interpreters/php { + stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; + }) php71 php72 php73; @@ -8383,7 +8475,7 @@ in svg2tikz = python27Packages.svg2tikz; pew = callPackage ../development/tools/pew {}; - pipenv = callPackage ../development/tools/pipenv {}; + pipenv = python3Packages.callPackage ../development/tools/pipenv {}; pipewire = callPackage ../development/libraries/pipewire {}; @@ -8684,13 +8776,16 @@ in bam = callPackage ../development/tools/build-managers/bam {}; - bazel_0_4 = callPackage ../development/tools/build-managers/bazel/0.4.nix { }; + bazel_0_4 = callPackage ../development/tools/build-managers/bazel/0.4.nix { + stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; + }; bazel = callPackage ../development/tools/build-managers/bazel { inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; buildJdk = jdk8; buildJdkName = "jdk8"; runJdk = jdk11; + stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; }; bazel-buildtools = callPackage ../development/tools/build-managers/bazel/buildtools { }; @@ -8752,6 +8847,8 @@ in buildkite-agent2 = callPackage ../development/tools/continuous-integration/buildkite-agent/2.x.nix { }; buildkite-agent3 = callPackage ../development/tools/continuous-integration/buildkite-agent/3.x.nix { }; + bpftool = callPackage ../os-specific/linux/bpftool { }; + byacc = callPackage ../development/tools/parsing/byacc { }; cadre = callPackage ../development/tools/cadre { }; @@ -8840,9 +8937,7 @@ in cmake_2_8 = callPackage ../development/tools/build-managers/cmake/2.8.nix { }; - cmake = libsForQt5.callPackage ../development/tools/build-managers/cmake { - inherit (darwin) cf-private; - }; + cmake = libsForQt5.callPackage ../development/tools/build-managers/cmake { }; cmakeCurses = cmake.override { useNcurses = true; }; @@ -8871,9 +8966,11 @@ in cpplint = callPackage ../development/tools/analysis/cpplint { }; cquery = callPackage ../development/tools/misc/cquery { - llvmPackages = llvmPackages_latest; + # 7 is the default, but only on Linux, so keep this for now + llvmPackages = llvmPackages_7; }; + ccls = callPackage ../development/tools/misc/ccls { llvmPackages = llvmPackages_7; stdenv = llvmPackages_7.stdenv; @@ -8882,7 +8979,7 @@ in credstash = with python3Packages; toPythonApplication credstash; creduce = callPackage ../development/tools/misc/creduce { - inherit (llvmPackages_6) llvm clang-unwrapped; + inherit (llvmPackages_7) llvm clang-unwrapped; }; cscope = callPackage ../development/tools/misc/cscope { }; @@ -9334,6 +9431,8 @@ in pants = callPackage ../development/tools/build-managers/pants {}; + parinfer-rust = callPackage ../development/tools/parinfer-rust {}; + parse-cli-bin = callPackage ../development/tools/parse-cli-bin { }; patchelf = callPackage ../development/tools/misc/patchelf { }; @@ -9614,11 +9713,17 @@ in xcodebuild = callPackage ../development/tools/xcbuild/wrapper.nix { inherit (darwin.apple_sdk.frameworks) CoreServices CoreGraphics ImageIO; }; + xcodebuild6 = xcodebuild.override { stdenv = llvmPackages_6.stdenv; }; xcbuild = xcodebuild; xcbuildHook = makeSetupHook { deps = [ xcbuild ]; } ../development/tools/xcbuild/setup-hook.sh ; + # xcbuild with llvm 6 + xcbuild6Hook = makeSetupHook { + deps = [ xcodebuild6 ]; + } ../development/tools/xcbuild/setup-hook.sh ; + xcpretty = callPackage ../development/tools/xcpretty { }; xmlindent = callPackage ../development/web/xmlindent {}; @@ -9894,9 +9999,13 @@ in cln = callPackage ../development/libraries/cln { }; - clucene_core_2 = callPackage ../development/libraries/clucene-core/2.x.nix { }; + clucene_core_2 = callPackage ../development/libraries/clucene-core/2.x.nix { + stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; + }; - clucene_core_1 = callPackage ../development/libraries/clucene-core { }; + clucene_core_1 = callPackage ../development/libraries/clucene-core { + stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; + }; clucene_core = clucene_core_1; @@ -10946,7 +11055,7 @@ in libao = callPackage ../development/libraries/libao { usePulseAudio = config.pulseaudio or stdenv.isLinux; - inherit (darwin.apple_sdk.frameworks) CoreAudio CoreServices AudioUnit; + inherit (darwin.apple_sdk.frameworks) CoreAudio CoreServices AudioUnit AudioToolbox; }; libaosd = callPackage ../development/libraries/libaosd { }; @@ -11022,7 +11131,7 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices; }; libcanberra-gtk3 = pkgs.libcanberra.override { - gtk = gtk3; + gtk = gtk3.override { x11Support = true; }; }; libcanberra-gtk2 = pkgs.libcanberra-gtk3.override { gtk = gtk2.override { gdktarget = "x11"; }; @@ -12052,6 +12161,7 @@ in libGLSupported = lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms; mesa_noglu = 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; @@ -12260,7 +12370,10 @@ in opencore-amr = callPackage ../development/libraries/opencore-amr { }; - opencsg = callPackage ../development/libraries/opencsg { }; + opencsg = callPackage ../development/libraries/opencsg { + inherit (qt5) qmake; + inherit (darwin.apple_sdk.frameworks) GLUT; + }; openct = callPackage ../development/libraries/openct { }; @@ -12575,6 +12688,7 @@ in inherit gtk3; inherit (gnome3) dconf; inherit (gst_all_1) gstreamer gst-plugins-base; + inherit llvmPackages_5; }); libsForQt511 = recurseIntoAttrs (lib.makeScope qt511.newScope mkLibsForQt5); @@ -12592,6 +12706,7 @@ in inherit gtk3; inherit (gnome3) dconf; inherit (gst_all_1) gstreamer gst-plugins-base; + inherit llvmPackages_5; }); libsForQt512 = recurseIntoAttrs (lib.makeScope qt512.newScope mkLibsForQt5); @@ -15086,6 +15201,7 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.modinst_arg_list_too_long + kernelPatches.export_kernel_fpu_functions ]; }; @@ -15093,6 +15209,7 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.modinst_arg_list_too_long + kernelPatches.export_kernel_fpu_functions ]; }; @@ -15100,6 +15217,7 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.modinst_arg_list_too_long + kernelPatches.export_kernel_fpu_functions ]; }; @@ -15982,6 +16100,8 @@ in documize-community = callPackage ../servers/documize-community { }; + doge = callPackage ../misc/doge { }; + doulos-sil = callPackage ../data/fonts/doulos-sil { }; cabin = callPackage ../data/fonts/cabin { }; @@ -16298,6 +16418,8 @@ in proggyfonts = callPackage ../data/fonts/proggyfonts { }; + public-sans = callPackage ../data/fonts/public-sans { }; + qogir-theme = callPackage ../data/themes/qogir { }; route159 = callPackage ../data/fonts/route159 { }; @@ -16324,6 +16446,8 @@ in signwriting = callPackage ../data/fonts/signwriting { }; + sierra-gtk-theme = callPackage ../data/themes/sierra { }; + soundfont-fluid = callPackage ../data/soundfonts/fluid { }; stdmanpages = callPackage ../data/documentation/std-man-pages { }; @@ -16333,7 +16457,7 @@ in stix-two = callPackage ../data/fonts/stix-two { }; inherit (callPackages ../data/fonts/gdouros { }) - symbola aegyptus akkadian anatolian maya unidings musica analecta textfonts aegan abydos; + aegan aegyptus akkadian assyrian eemusic maya symbola textfonts unidings; iana-etc = callPackage ../data/misc/iana-etc { }; @@ -16685,7 +16809,7 @@ in awesome-4-0 = callPackage ../applications/window-managers/awesome { cairo = cairo.override { xcbSupport = true; }; - luaPackages = luaPackages.override { inherit lua; }; + inherit (texFunctions) fontsConf; }; awesome = awesome-4-0; @@ -17684,6 +17808,8 @@ in wireshark-gtk = throw "Not supported anymore. Use wireshark-qt or wireshark-cli instead."; wireshark-cli = wireshark.override { withQt = false; }; + termshark = callPackage ../tools/networking/termshark { }; + fbida = callPackage ../applications/graphics/fbida { }; fdupes = callPackage ../tools/misc/fdupes { }; @@ -18006,7 +18132,7 @@ in gosmore = callPackage ../applications/misc/gosmore { }; - gpsbabel = libsForQt56.callPackage ../applications/misc/gpsbabel { + gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel { inherit (darwin) IOKit; }; @@ -19172,7 +19298,9 @@ in openbox = callPackage ../applications/window-managers/openbox { }; - openbox-menu = callPackage ../applications/misc/openbox-menu { }; + openbox-menu = callPackage ../applications/misc/openbox-menu { + stdenv = gccStdenv; + }; openbrf = libsForQt5.callPackage ../applications/misc/openbrf { }; @@ -19437,8 +19565,6 @@ in psol = callPackage ../development/libraries/psol { }; - pstree = callPackage ../applications/misc/pstree { }; - ptask = callPackage ../applications/misc/ptask { }; pulseaudio-ctl = callPackage ../applications/audio/pulseaudio-ctl { }; @@ -20008,9 +20134,7 @@ in sublime-merge-dev; inherit (callPackages ../applications/version-management/subversion { sasl = cyrus_sasl; }) - subversion18 subversion19 subversion_1_10 subversion_1_11; - - subversion = subversion_1_11; + subversion19 subversion_1_10 subversion; subversionClient = appendToName "client" (pkgs.subversion.override { bdbSupport = false; @@ -20526,6 +20650,8 @@ in xwayland = null; }; + chatterino2 = libsForQt5.callPackage ../applications/networking/instant-messengers/chatterino2 {}; + weston = callPackage ../applications/window-managers/weston { freerdp = freerdp_legacy; }; @@ -21026,6 +21152,8 @@ in atanks = callPackage ../games/atanks {}; + azimuth = callPackage ../games/azimuth {}; + ballAndPaddle = callPackage ../games/ball-and-paddle { guile = guile_1_8; }; @@ -21119,7 +21247,8 @@ in digikam = libsForQt5.callPackage ../applications/graphics/digikam { inherit (plasma5) oxygen; - inherit (kdeApplications) kcalcore; + inherit (kdeApplications) akonadi-contacts kcalcore; + ffmpeg = ffmpeg_4; opencv3 = opencv3WithoutCuda; }; @@ -21372,7 +21501,10 @@ in nethack = callPackage ../games/nethack { }; - nethack-qt = callPackage ../games/nethack { qtMode = true; }; + nethack-qt = callPackage ../games/nethack { + qtMode = true; + stdenv = gccStdenv; + }; nethack-x11 = callPackage ../games/nethack { x11Mode = true; }; @@ -21777,7 +21909,9 @@ in xtris = callPackage ../games/xtris { }; - inherit (callPackage ../games/quake2/yquake2 { }) + inherit (callPackage ../games/quake2/yquake2 { + inherit (darwin.apple_sdk.frameworks) Cocoa OpenAL; + }) yquake2 yquake2-ctf yquake2-ground-zero @@ -22344,6 +22478,7 @@ in coqPackages_8_7 coq_8_7 coqPackages_8_8 coq_8_8 coqPackages_8_9 coq_8_9 + coqPackages_8_10 coq_8_10 coqPackages coq ; @@ -22687,11 +22822,13 @@ in root = callPackage ../applications/science/misc/root { inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; + stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv; }; root5 = lowPrio (callPackage ../applications/science/misc/root/5.nix { inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; + stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv; }); rink = callPackage ../applications/science/misc/rink { }; @@ -22766,7 +22903,7 @@ in ### SCIENCE/ROBOTICS - apmplanner2 = libsForQt59.callPackage ../applications/science/robotics/apmplanner2 { }; + apmplanner2 = libsForQt511.callPackage ../applications/science/robotics/apmplanner2 { }; ### MISC @@ -23012,7 +23149,8 @@ in jack2 = callPackage ../misc/jackaudio { libopus = libopus.override { withCustomModes = true; }; - inherit (darwin.apple_sdk.frameworks) AudioToolbox CoreAudio CoreFoundation; + inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio Accelerate; + inherit (darwin) cf-private libobjc; }; libjack2 = jack2.override { prefix = "lib"; }; jack2Full = jack2; # TODO: move to aliases.nix @@ -23337,7 +23475,9 @@ in fsuae = callPackage ../misc/emulators/fs-uae { }; - putty = callPackage ../applications/networking/remote/putty { }; + putty = callPackage ../applications/networking/remote/putty { + gtk2 = gtk2-x11; + }; qMasterPassword = libsForQt5.callPackage ../applications/misc/qMasterPassword { }; @@ -23445,8 +23585,6 @@ in libsemanage = libsemanage.override { python = python3; }; }; - sierra-gtk-theme = callPackage ../misc/themes/sierra { }; - slock = callPackage ../misc/screensavers/slock { conf = config.slock.conf or null; }; @@ -23916,8 +24054,10 @@ in stdenv = crossLibcStdenv; }; - omnisharp-roslyn = callPackage ../development/tools/omnisharp-roslyn { }; + omnisharp-roslyn = callPackage ../development/tools/omnisharp-roslyn { }; wasmtime = callPackage ../development/interpreters/wasmtime {}; + bemenu = callPackage ../applications/misc/bemenu { }; + } |