diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 68 |
1 files changed, 42 insertions, 26 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa3ea4b6c217..015a49e326c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -770,6 +770,8 @@ in git-fire = callPackage ../tools/misc/git-fire { }; + git-repo-updater = python3Packages.callPackage ../development/tools/git-repo-updater { }; + git-town = callPackage ../tools/misc/git-town { }; github-changelog-generator = callPackage ../development/tools/github-changelog-generator { }; @@ -4212,10 +4214,12 @@ 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! @@ -5625,9 +5629,7 @@ in routino = callPackage ../tools/misc/routino { }; - rq = callPackage ../development/tools/rq { - v8 = v8.override { static = true; }; - }; + rq = callPackage ../development/tools/rq { }; rsnapshot = callPackage ../tools/backup/rsnapshot { }; @@ -6508,6 +6510,8 @@ in wal_e = callPackage ../tools/backup/wal-e { }; + wasabiwallet = callPackage ../applications/altcoins/wasabiwallet { }; + watchexec = callPackage ../tools/misc/watchexec { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -6721,7 +6725,7 @@ in deps = [ python ]; substitutions = { inherit waf; - crossFlags = lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) + 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; @@ -7971,6 +7975,7 @@ in cargo-web = callPackage ../development/tools/cargo-web { inherit (darwin.apple_sdk.frameworks) CoreServices Security; + inherit (darwin) cf-private; }; carnix = (callPackage ../build-support/rust/carnix.nix { }).carnix { }; @@ -8618,9 +8623,7 @@ in tcl-8_5 = callPackage ../development/interpreters/tcl/8.5.nix { }; tcl-8_6 = callPackage ../development/interpreters/tcl/8.6.nix { }; - proglodyte-wasm = callPackage ../development/interpreters/proglodyte-wasm { - v8_static = v8.override { static = true; }; - }; + proglodyte-wasm = callPackage ../development/interpreters/proglodyte-wasm { }; wasm-gc = callPackage ../development/interpreters/wasm-gc { }; @@ -10097,6 +10100,8 @@ in cre2 = callPackage ../development/libraries/cre2 { }; + croaring = callPackage ../development/libraries/croaring { }; + cryptopp = callPackage ../development/libraries/crypto++ { }; cryptominisat = callPackage ../applications/science/logic/cryptominisat { }; @@ -10206,9 +10211,10 @@ in elastix = callPackage ../development/libraries/science/biology/elastix { }; - enchant = callPackage ../development/libraries/enchant { }; + enchant1 = callPackage ../development/libraries/enchant/1.x.nix { }; enchant2 = callPackage ../development/libraries/enchant/2.x.nix { }; + enchant = enchant2; enet = callPackage ../development/libraries/enet { }; @@ -10806,7 +10812,7 @@ in gtksourceviewmm4 = callPackage ../development/libraries/gtksourceviewmm/4.x.nix { }; - gtkspell2 = callPackage ../development/libraries/gtkspell { }; + gtkspell2 = callPackage ../development/libraries/gtkspell { enchant = enchant1; }; gtkspell3 = callPackage ../development/libraries/gtkspell/3.nix { }; @@ -13291,7 +13297,7 @@ in subdl = callPackage ../applications/video/subdl { }; - subtitleeditor = callPackage ../applications/video/subtitleeditor { }; + subtitleeditor = callPackage ../applications/video/subtitleeditor { enchant = enchant1; }; suil = callPackage ../development/libraries/audio/suil { }; @@ -13479,11 +13485,7 @@ in stdenv = if stdenv.isDarwin then stdenv else overrideCC stdenv gcc5; }; - v8_6_x = callPackage ../development/libraries/v8/6_x.nix { - inherit (python2Packages) python; - }; - - v8 = callPackage ../development/libraries/v8 ({ + v8_5_x = callPackage ../development/libraries/v8/5_x.nix ({ inherit (python2Packages) python gyp; icu = icu58; # v8-5.4.232 fails against icu4c-59.1 } // lib.optionalAttrs stdenv.isLinux { @@ -13491,6 +13493,14 @@ in stdenv = overrideCC stdenv gcc6; }); + v8_6_x = v8; + v8 = callPackage ../development/libraries/v8 { + inherit (python2Packages) python; + } // lib.optionalAttrs stdenv.isLinux { + # doesn't build with gcc7 + stdenv = overrideCC stdenv gcc6; + }; + vaapiIntel = callPackage ../development/libraries/vaapi-intel { }; vaapi-intel-hybrid = callPackage ../development/libraries/vaapi-intel-hybrid { }; @@ -14204,6 +14214,8 @@ in grafana = callPackage ../servers/monitoring/grafana { }; + grafana-loki = callPackage ../servers/monitoring/loki { }; + grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { }; h2o = callPackage ../servers/http/h2o { }; @@ -14428,7 +14440,9 @@ in mariadb = callPackage ../servers/sql/mariadb { asio = asio_1_10; - jemalloc = jemalloc.override ({ disableInitExecTls = true; }); + # As per mariadb's cmake, "static jemalloc_pic.a can only be used up to jemalloc 4". + # https://jira.mariadb.org/browse/MDEV-15034 + jemalloc = jemalloc450.override ({ disableInitExecTls = true; }); inherit (darwin) cctools; inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; }; @@ -14950,11 +14964,7 @@ in cifs-utils = callPackage ../os-specific/linux/cifs-utils { }; - cockroachdb = callPackage ../servers/sql/cockroachdb { - # XXX: this is failing with Go 1.12. Error is related to cgo, an - # update to this package might fix it. - buildGoPackage = buildGo111Package; - }; + cockroachdb = callPackage ../servers/sql/cockroachdb { }; conky = callPackage ../os-specific/linux/conky ({ lua = lua5_3_compat; @@ -16406,6 +16416,8 @@ in nanum-gothic-coding = callPackage ../data/fonts/nanum-gothic-coding { }; + national-park-typeface = callPackage ../data/fonts/national-park { }; + nordic = callPackage ../data/themes/nordic { }; nordic-polar = callPackage ../data/themes/nordic-polar { }; @@ -17442,6 +17454,7 @@ in inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit ImageCaptureCore GSS ImageIO; + stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; }; emacsPackagesFor = emacs: self: let callPackage = newScope self; in rec { @@ -20056,10 +20069,6 @@ in resilio-sync = callPackage ../applications/networking/resilio-sync { }; - bittorrentSync = bittorrentSync14; - bittorrentSync14 = callPackage ../applications/networking/bittorrentsync/1.4.x.nix { }; - bittorrentSync20 = callPackage ../applications/networking/bittorrentsync/2.0.x.nix { }; - dropbox = callPackage ../applications/networking/dropbox { }; dropbox-cli = callPackage ../applications/networking/dropbox/cli.nix { }; @@ -21008,7 +21017,9 @@ in xmind = callPackage ../applications/misc/xmind { }; - xneur = callPackage ../applications/misc/xneur { }; + xneur = callPackage ../applications/misc/xneur { + enchant = enchant1; + }; gxneur = callPackage ../applications/misc/gxneur { inherit (gnome2) libglade GConf; @@ -21019,6 +21030,7 @@ in inherit (gnome2) libglade scrollkeeper; gtkhtml = gnome2.gtkhtml4; python = python27; + enchant = enchant1; }; xournal = callPackage ../applications/graphics/xournal { @@ -23224,6 +23236,10 @@ in hplipWithPlugin_3_16_11 = hplip_3_16_11.override { withPlugin = true; }; + hplip_3_18_5 = callPackage ../misc/drivers/hplip/3.18.5.nix { }; + + hplipWithPlugin_3_18_5 = hplip_3_18_5.override { withPlugin = true; }; + hyperfine = callPackage ../tools/misc/hyperfine { inherit (darwin.apple_sdk.frameworks) Security; }; |