diff options
author | Shea Levy <shea@shealevy.com> | 2018-03-28 09:36:47 -0400 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2018-03-28 09:36:47 -0400 |
commit | 05e375d7103ac51e2da917965c37246c99f1ae4f (patch) | |
tree | 7ec4e9a2f5b7b1e2dea7c3e059f5b40e1dac1569 /pkgs/top-level/all-packages.nix | |
parent | 335934a073d6024d54c71bf82d5f8baab13abe75 (diff) | |
parent | c7d7abc51e5f9b9c7481a83c47b37508bf08b05b (diff) | |
download | nixpkgs-05e375d7103ac51e2da917965c37246c99f1ae4f.tar nixpkgs-05e375d7103ac51e2da917965c37246c99f1ae4f.tar.gz nixpkgs-05e375d7103ac51e2da917965c37246c99f1ae4f.tar.bz2 nixpkgs-05e375d7103ac51e2da917965c37246c99f1ae4f.tar.lz nixpkgs-05e375d7103ac51e2da917965c37246c99f1ae4f.tar.xz nixpkgs-05e375d7103ac51e2da917965c37246c99f1ae4f.tar.zst nixpkgs-05e375d7103ac51e2da917965c37246c99f1ae4f.zip |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 151 |
1 files changed, 93 insertions, 58 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d71a05a3db3..975815daed7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -941,7 +941,7 @@ with pkgs; caddy = callPackage ../servers/caddy { }; traefik = callPackage ../servers/traefik { }; - calamares = libsForQt59.callPackage ../tools/misc/calamares { + calamares = libsForQt5.callPackage ../tools/misc/calamares { python = python3; boost = pkgs.boost.override { python = python3; }; libyamlcpp = callPackage ../development/libraries/libyaml-cpp { inherit boost; }; @@ -2574,6 +2574,7 @@ with pkgs; gocryptfs = callPackage ../tools/filesystems/gocrypfs { }; godot = callPackage ../development/tools/godot {}; + godot_headers = callPackage ../development/libraries/godot_headers {}; goklp = callPackage ../tools/networking/goklp {}; @@ -3131,9 +3132,7 @@ with pkgs; keepalived = callPackage ../tools/networking/keepalived { }; - kexectools = if hostPlatform.isKexecable - then callPackage ../os-specific/linux/kexectools { } - else null; + kexectools = callPackage ../os-specific/linux/kexectools { }; keybase = callPackage ../tools/security/keybase { }; @@ -3434,6 +3433,8 @@ with pkgs; libnabo = callPackage ../development/libraries/libnabo { }; + libngspice = callPackage ../development/libraries/libngspice { }; + libpointmatcher = callPackage ../development/libraries/libpointmatcher { }; libtorrent = callPackage ../tools/networking/p2p/libtorrent { }; @@ -6423,6 +6424,20 @@ with pkgs; (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } ((openjdk9.override { minimal = true; }).jre // { outputs = [ "jre" ]; })); + jdk10 = if stdenv.isArm || stdenv.isAarch64 then oraclejdk10 else openjdk10 // { outputs = [ "out" ]; }; + jre10 = if stdenv.isArm || stdenv.isAarch64 then oraclejre10 else lib.setName "openjre-${lib.getVersion pkgs.openjdk10.jre}" + (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } + (openjdk10.jre // { outputs = [ "jre" ]; })); + jre10_headless = + if stdenv.isArm || stdenv.isAarch64 then + oraclejre10 + else if stdenv.isDarwin then + jre10 + else + lib.setName "openjre-${lib.getVersion pkgs.openjdk10.jre}-headless" + (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } + ((openjdk10.override { minimal = true; }).jre // { outputs = [ "jre" ]; })); + jdk = jdk8; jre = jre8; jre_headless = jre8_headless; @@ -7593,7 +7608,9 @@ with pkgs; cl-launch = callPackage ../development/tools/misc/cl-launch {}; - cloudfoundry-cli = callPackage ../development/tools/cloudfoundry-cli { }; + cloudfoundry-cli = callPackage ../development/tools/cloudfoundry-cli { + go = go_1_9; + }; coan = callPackage ../development/tools/analysis/coan { }; @@ -7759,7 +7776,7 @@ with pkgs; flow = callPackage ../development/tools/analysis/flow { inherit (darwin.apple_sdk.frameworks) CoreServices; inherit (darwin) cf-private; - inherit (ocamlPackages) ocaml findlib camlp4 sedlex ocamlbuild ocaml_lwt + inherit (ocamlPackages) ocaml findlib camlp4 sedlex ocamlbuild lwt_ppx wtf8 dtoa; }; @@ -8143,7 +8160,7 @@ with pkgs; shards = callPackage ../development/tools/build-managers/shards { }; - shellcheck = haskellPackages.ShellCheck; + shellcheck = haskell.lib.justStaticExecutables haskellPackages.ShellCheck; schemaspy = callPackage ../development/tools/database/schemaspy { }; @@ -9038,6 +9055,8 @@ with pkgs; grpc = callPackage ../development/libraries/grpc { }; + gsettings-qt = libsForQt5.callPackage ../development/libraries/gsettings-qt { }; + gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer { callPackage = pkgs.newScope (pkgs // { libav = pkgs.ffmpeg; }); }); @@ -9758,9 +9777,7 @@ with pkgs; libgroove = callPackage ../development/libraries/libgroove { }; - libseccomp = if hostPlatform.isSeccomputable - then callPackage ../development/libraries/libseccomp { } - else null; + libseccomp = callPackage ../development/libraries/libseccomp { }; libsecret = callPackage ../development/libraries/libsecret { }; @@ -10949,7 +10966,8 @@ with pkgs; flatbuffers = callPackage ../development/libraries/flatbuffers { }; - pth = callPackage ../development/libraries/pth { }; + gnupth = callPackage ../development/libraries/pth { }; + pth = if stdenv.hostPlatform.isMusl then npth else gnupth; ptlib = callPackage ../development/libraries/ptlib {}; @@ -11335,6 +11353,8 @@ with pkgs; sblim-sfcc = callPackage ../development/libraries/sblim-sfcc {}; + selinux-sandbox = callPackage ../os-specific/linux/selinux-sandbox { }; + serd = callPackage ../development/libraries/serd {}; serf = callPackage ../development/libraries/serf {}; @@ -12650,6 +12670,7 @@ with pkgs; qpid-cpp = callPackage ../servers/amqp/qpid-cpp { boost = boost155; + inherit (pythonPackages) buildPythonPackage qpid-python; }; quagga = callPackage ../servers/quagga { }; @@ -13398,7 +13419,6 @@ with pkgs; nvidiaPackages = callPackage ../os-specific/linux/nvidia-x11 { }; - nvidia_x11_legacy173 = nvidiaPackages.legacy_173; nvidia_x11_legacy304 = nvidiaPackages.legacy_304; nvidia_x11_legacy340 = nvidiaPackages.legacy_340; nvidia_x11_beta = nvidiaPackages.beta; @@ -14138,6 +14158,8 @@ with pkgs; docbook5_xsl = docbook_xsl_ns; + documentation-highlighter = callPackage ../misc/documentation-highlighter { }; + cabin = callPackage ../data/fonts/cabin { }; camingo-code = callPackage ../data/fonts/camingo-code { }; @@ -16394,51 +16416,52 @@ with pkgs; libreoffice = hiPrio libreoffice-still; - libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice { - inherit (perlPackages) ArchiveZip CompressZlib; - inherit (gnome2) GConf ORBit2 gnome_vfs; - inherit (gnome3) defaultIconTheme; - zip = zip.override { enableNLS = false; }; - 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; - lcms = lcms2; - harfbuzz = harfbuzz.override { - withIcu = true; withGraphite2 = true; - }; - # checking whether g++ supports C++14 or C++11... configure: error: no - stdenv = overrideCC stdenv gcc5; - }); - - libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/still.nix { - inherit (perlPackages) ArchiveZip CompressZlib; - inherit (gnome2) GConf ORBit2 gnome_vfs; - inherit (gnome3) defaultIconTheme; - zip = zip.override { enableNLS = false; }; - bluez5 = bluez5_28; - poppler = poppler_0_61; - fontsConf = makeFontsConf { - fontDirectories = [ - freefont_ttf xorg.fontmiscmisc - ]; - }; - clucene_core = clucene_core_2; - lcms = lcms2; - harfbuzz = harfbuzz.override { - withIcu = true; withGraphite2 = true; - }; - icu = icu58; - # checking whether g++ supports C++14 or C++11... configure: error: no - stdenv = overrideCC stdenv gcc5; - }); - + libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix + { libreoffice = callPackage ../applications/office/libreoffice { + inherit (perlPackages) ArchiveZip CompressZlib; + inherit (gnome2) GConf ORBit2 gnome_vfs; + inherit (gnome3) defaultIconTheme; + zip = zip.override { enableNLS = false; }; + 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; + lcms = lcms2; + harfbuzz = harfbuzz.override { + withIcu = true; withGraphite2 = true; + }; + # checking whether g++ supports C++14 or C++11... configure: error: no + stdenv = overrideCC stdenv gcc5; + };}); + + libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix + { libreoffice = callPackage ../applications/office/libreoffice/still.nix { + inherit (perlPackages) ArchiveZip CompressZlib; + inherit (gnome2) GConf ORBit2 gnome_vfs; + inherit (gnome3) defaultIconTheme; + zip = zip.override { enableNLS = false; }; + bluez5 = bluez5_28; + poppler = poppler_0_61; + fontsConf = makeFontsConf { + fontDirectories = [ + freefont_ttf xorg.fontmiscmisc + ]; + }; + clucene_core = clucene_core_2; + lcms = lcms2; + harfbuzz = harfbuzz.override { + withIcu = true; withGraphite2 = true; + }; + icu = icu58; + # checking whether g++ supports C++14 or C++11... configure: error: no + stdenv = overrideCC stdenv gcc5; + };}); liferea = callPackage ../applications/networking/newsreaders/liferea { inherit (gnome3) libpeas gsettings-desktop-schemas dconf; @@ -16624,6 +16647,7 @@ with pkgs; monero = callPackage ../applications/altcoins/monero { inherit (darwin.apple_sdk.frameworks) IOKit; + boost = boost15x; }; monero-gui = libsForQt5.callPackage ../applications/altcoins/monero-gui { }; @@ -16632,6 +16656,8 @@ with pkgs; hwloc = hwloc-nox; }; + xmrig = callPackage ../applications/misc/xmrig { }; + monkeysAudio = callPackage ../applications/audio/monkeys-audio { }; monkeysphere = callPackage ../tools/security/monkeysphere { }; @@ -19425,10 +19451,12 @@ with pkgs; dash-to-dock = callPackage ../desktops/gnome-3/extensions/dash-to-dock { }; dash-to-panel = callPackage ../desktops/gnome-3/extensions/dash-to-panel { }; icon-hider = callPackage ../desktops/gnome-3/extensions/icon-hider { }; + impatience = callPackage ../desktops/gnome-3/extensions/impatience.nix { }; mediaplayer = callPackage ../desktops/gnome-3/extensions/mediaplayer { }; nohotcorner = callPackage ../desktops/gnome-3/extensions/nohotcorner { }; no-title-bar = callPackage ../desktops/gnome-3/extensions/no-title-bar { }; remove-dropdown-arrows = callPackage ../desktops/gnome-3/extensions/remove-dropdown-arrows { }; + system-monitor = callPackage ../desktops/gnome-3/extensions/system-monitor { }; taskwhisperer = callPackage ../desktops/gnome-3/extensions/taskwhisperer { }; timepp = callPackage ../desktops/gnome-3/extensions/timepp { }; topicons-plus = callPackage ../desktops/gnome-3/extensions/topicons-plus { }; @@ -20496,7 +20524,7 @@ with pkgs; pcre = pcre-cpp; }); - redis-desktop-manager = libsForQt59.callPackage ../applications/misc/redis-desktop-manager { }; + redis-desktop-manager = libsForQt5.callPackage ../applications/misc/redis-desktop-manager { }; robo3t = callPackage ../applications/misc/robo3t { }; @@ -20636,6 +20664,11 @@ with pkgs; seafile-shared = callPackage ../misc/seafile-shared { }; serviio = callPackage ../servers/serviio {}; + selinux-python = callPackage ../os-specific/linux/selinux-python { + # needs python3 bindings + libselinux = libselinux.override { python = python3; }; + libsemanage = libsemanage.override { python = python3; }; + }; slock = callPackage ../misc/screensavers/slock { conf = config.slock.conf or null; @@ -20681,6 +20714,8 @@ with pkgs; terraform-landscape = callPackage ../applications/networking/cluster/terraform-landscape {}; + terraform-provider-libvirt = callPackage ../applications/networking/cluster/terraform-provider-libvirt {}; + terragrunt = callPackage ../applications/networking/cluster/terragrunt {}; terragrunt_0_11_1 = callPackage ../applications/networking/cluster/terragrunt/0.11.1.nix { |