diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 219 |
1 files changed, 99 insertions, 120 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6f53e44e64f..f13bdb6bc5d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -569,12 +569,16 @@ with pkgs; avfs = callPackage ../tools/filesystems/avfs { }; + aws-iam-authenticator = callPackage ../tools/security/aws-iam-authenticator {}; + awscli = callPackage ../tools/admin/awscli { }; awsebcli = callPackage ../tools/virtualization/awsebcli {}; awslogs = callPackage ../tools/admin/awslogs { }; + aws-okta = callPackage ../tools/security/aws-okta { }; + aws-rotate-key = callPackage ../tools/admin/aws-rotate-key { }; aws_shell = pythonPackages.callPackage ../tools/admin/aws_shell { }; @@ -1009,7 +1013,7 @@ with pkgs; executableToolDepends = [ makeWrapper ]; postInstall = '' wrapProgram $out/bin/stack2nix \ - --prefix PATH ":" "${git}/bin:${cabal2nix}/bin:${cabal-install}/bin:${stack}/bin" + --prefix PATH ":" "${git}/bin:${cabal-install}/bin" ''; }); @@ -1117,6 +1121,8 @@ with pkgs; codesearch = callPackage ../tools/text/codesearch { }; + codec2 = callPackage ../development/libraries/codec2 { }; + contacts = callPackage ../tools/misc/contacts { inherit (darwin.apple_sdk.frameworks) Foundation AddressBook; }; @@ -1547,8 +1553,6 @@ with pkgs; apparix = callPackage ../tools/misc/apparix { }; - appdata-tools = callPackage ../tools/misc/appdata-tools { }; - appleseed = callPackage ../tools/graphics/appleseed { }; arping = callPackage ../tools/networking/arping { }; @@ -4128,21 +4132,21 @@ with pkgs; networkmanager = callPackage ../tools/networking/network-manager { }; - networkmanager-iodine = callPackage ../tools/networking/network-manager/iodine.nix { }; + networkmanager-iodine = callPackage ../tools/networking/network-manager/iodine { }; networkmanager-openvpn = callPackage ../tools/networking/network-manager/openvpn { }; - networkmanager-l2tp = callPackage ../tools/networking/network-manager/l2tp.nix { }; + networkmanager-l2tp = callPackage ../tools/networking/network-manager/l2tp { }; - networkmanager-vpnc = callPackage ../tools/networking/network-manager/vpnc.nix { }; + networkmanager-vpnc = callPackage ../tools/networking/network-manager/vpnc { }; - networkmanager-openconnect = callPackage ../tools/networking/network-manager/openconnect.nix { }; + networkmanager-openconnect = callPackage ../tools/networking/network-manager/openconnect { }; - networkmanager-fortisslvpn = callPackage ../tools/networking/network-manager/fortisslvpn.nix { }; + networkmanager-fortisslvpn = callPackage ../tools/networking/network-manager/fortisslvpn { }; networkmanager_strongswan = callPackage ../tools/networking/network-manager/strongswan.nix { }; - networkmanagerapplet = newScope gnome2 ../tools/networking/network-manager/applet.nix { }; + networkmanagerapplet = callPackage ../tools/networking/network-manager/applet.nix { }; networkmanager_dmenu = callPackage ../tools/networking/network-manager/dmenu.nix { }; @@ -5553,6 +5557,8 @@ with pkgs; trickle = callPackage ../tools/networking/trickle {}; + inherit (nodePackages) triton; + triggerhappy = callPackage ../tools/inputmethods/triggerhappy {}; trousers = callPackage ../tools/security/trousers { }; @@ -5939,7 +5945,7 @@ with pkgs; volumeicon = callPackage ../tools/audio/volumeicon { }; - waf = callPackage ../development/tools/build-managers/waf { }; + waf = callPackage ../development/tools/build-managers/waf { python = python3; }; wakelan = callPackage ../tools/networking/wakelan { }; @@ -6344,10 +6350,10 @@ with pkgs; fpc = callPackage ../development/compilers/fpc { }; - gambit = callPackage ../development/compilers/gambit { }; - gambit-unstable = callPackage ../development/compilers/gambit/unstable.nix { }; - gerbil = callPackage ../development/compilers/gerbil { }; - gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { }; + gambit = callPackage ../development/compilers/gambit { stdenv = gccStdenv; }; + gambit-unstable = callPackage ../development/compilers/gambit/unstable.nix { stdenv = gccStdenv; }; + gerbil = callPackage ../development/compilers/gerbil { stdenv = gccStdenv; }; + gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { stdenv = gccStdenv; }; gccFun = callPackage ../development/compilers/gcc/7; gcc = gcc7; @@ -6444,14 +6450,6 @@ with pkgs; libc = libcCross1; }; - # Only needed for mingw builds - gccCrossMingw2 = assert targetPlatform != buildPlatform; wrapCCWith { - name = "gcc-cross-wrapper"; - cc = gccCrossStageStatic.gcc; - libc = windows.mingw_headers2; - inherit binutils; - }; - gcc48 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.8 { inherit noSysDirs; @@ -6840,6 +6838,8 @@ with pkgs; oraclejdk10distro = packageType: _: (callPackage ../development/compilers/oraclejdk/jdk10-linux.nix { inherit packageType; }); + javacard-devkit = pkgsi686Linux.callPackage ../development/compilers/javacard-devkit { }; + jikes = callPackage ../development/compilers/jikes { }; julia = callPackage ../development/compilers/julia { @@ -7016,6 +7016,8 @@ with pkgs; monoDLLFixer = callPackage ../build-support/mono-dll-fixer { }; + mosml = callPackage ../development/compilers/mosml { }; + mozart-binary = callPackage ../development/compilers/mozart/binary.nix { }; mozart = mozart-binary; @@ -7640,6 +7642,8 @@ with pkgs; ruby = ruby_2_4; + mruby = callPackage ../development/compilers/mruby { }; + scsh = callPackage ../development/interpreters/scsh { }; scheme48 = callPackage ../development/interpreters/scheme48 { }; @@ -7752,6 +7756,8 @@ with pkgs; guile = guile_2_0; }; + inav = callPackage ../development/misc/stm32/inav { }; + pharo-vms = callPackage ../development/pharo/vm { }; pharo = pharo-vms.multi-vm-wrapper; pharo-cog32 = pharo-vms.cog32; @@ -7785,6 +7791,7 @@ with pkgs; inherit (callPackages ../tools/admin/ansible {}) ansible_2_4 ansible_2_5 + ansible_2_6 ansible2 ansible; @@ -7853,6 +7860,7 @@ with pkgs; bazel_0_4 = callPackage ../development/tools/build-managers/bazel/0.4.nix { }; bazel = callPackage ../development/tools/build-managers/bazel { + inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; }; @@ -8316,6 +8324,8 @@ with pkgs; kube-aws = callPackage ../development/tools/kube-aws { }; + kubectx = callPackage ../development/tools/kubectx { }; + kustomize = callPackage ../development/tools/kustomize { }; Literate = callPackage ../development/tools/literate-programming/Literate {}; @@ -9588,12 +9598,16 @@ with pkgs; gtkmathview = callPackage ../development/libraries/gtkmathview { }; - glib = callPackage ../development/libraries/glib { - }; - glib-tested = glib.override { # checked version separate to break cycles - doCheck = true; - libffi = libffi.override { doCheck = true; }; - }; + glib = callPackage ../development/libraries/glib (let + glib-untested = glib.override { doCheck = false; }; + in { + # break dependency cycles + # these things are only used for tests, they don't get into the closure + shared-mime-info = shared-mime-info.override { glib = glib-untested; }; + desktop-file-utils = desktop-file-utils.override { glib = glib-untested; }; + dbus = dbus.override { systemd = null; }; + }); + glibmm = callPackage ../development/libraries/glibmm { }; glib-networking = callPackage ../development/libraries/glib-networking {}; @@ -10366,6 +10380,8 @@ with pkgs; libindicator-gtk3 = libindicator.override { gtkVersion = "3"; }; libindicator = callPackage ../development/libraries/libindicator { }; + libinotify-kqueue = callPackage ../development/libraries/libinotify-kqueue { }; + libiodbc = callPackage ../development/libraries/libiodbc { useGTK = config.libiodbc.gtk or false; }; @@ -10505,9 +10521,7 @@ with pkgs; libiec61883 = callPackage ../development/libraries/libiec61883 { }; - libinfinity = callPackage ../development/libraries/libinfinity { - inherit (gnome2) gtkdoc; - }; + libinfinity = callPackage ../development/libraries/libinfinity { }; libinput = callPackage ../development/libraries/libinput { graphviz = graphviz-nox; @@ -10664,6 +10678,8 @@ with pkgs; libpgf = callPackage ../development/libraries/libpgf { }; + libphonenumber = callPackage ../development/libraries/libphonenumber { }; + libpng = callPackage ../development/libraries/libpng { }; libpng_apng = libpng.override { apngSupport = true; }; libpng12 = callPackage ../development/libraries/libpng/12.nix { }; @@ -11029,19 +11045,16 @@ with pkgs; libGLDarwinOr = alternative: if stdenv.isDarwin then libGLDarwin else alternative; mesa_noglu = callPackage ../development/libraries/mesa { - # makes it slower, but during runtime we link against just mesa_drivers - # through /run/opengl-driver*, which is overriden according to config.grsecurity - # grsecEnabled = true; # no more support in nixpkgs ATM llvmPackages = llvmPackages_6; }; mesa_glu = callPackage ../development/libraries/mesa-glu { }; - mesa_drivers = - let mo = mesa_noglu.override { - grsecEnabled = config.grsecurity or false; - enableTextureFloats = true; - }; - in mo.drivers; + + # 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 @@ -11275,7 +11288,8 @@ with pkgs; inherit (callPackages ../development/libraries/libressl { }) libressl_2_6 - libressl_2_7; + libressl_2_7 + libressl_2_8; libressl = libressl_2_7; @@ -11746,6 +11760,8 @@ with pkgs; lvtk = callPackage ../development/libraries/audio/lvtk { }; + qradiolink = callPackage ../applications/misc/qradiolink { }; + qrupdate = callPackage ../development/libraries/qrupdate { }; resolv_wrapper = callPackage ../development/libraries/resolv_wrapper { }; @@ -13007,11 +13023,9 @@ with pkgs; }; pulseaudioFull = pulseaudio.override { - gconf = gnome2.GConf; x11Support = true; jackaudioSupport = true; airtunesSupport = true; - gconfSupport = true; bluetoothSupport = true; remoteControlSupport = true; zeroconfSupport = true; @@ -13860,6 +13874,16 @@ with pkgs; ]; }; + linux_4_18 = callPackage ../os-specific/linux/kernel/linux-4.18.nix { + kernelPatches = + [ kernelPatches.bridge_stp_helper + # 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 + ]; + }; + linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -14009,10 +14033,7 @@ with pkgs; sch_cake = callPackage ../os-specific/linux/sch_cake { }; - inherit (callPackage ../os-specific/linux/spl {}) - splStable splUnstable splLegacyCrypto; - - spl = splStable; + spl = callPackage ../os-specific/linux/spl { }; sysdig = callPackage ../os-specific/linux/sysdig {}; @@ -14043,7 +14064,7 @@ with pkgs; inherit (callPackage ../os-specific/linux/zfs { configFile = "kernel"; inherit kernel spl; - }) zfsStable zfsUnstable zfsLegacyCrypto; + }) zfsStable zfsUnstable; zfs = zfsStable; }); @@ -14053,7 +14074,7 @@ with pkgs; linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! - linuxPackages_latest = linuxPackages_4_17; + linuxPackages_latest = linuxPackages_4_18; linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. @@ -14064,6 +14085,7 @@ with pkgs; linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14); linuxPackages_4_17 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_17); + linuxPackages_4_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_18); # Don't forget to update linuxPackages_latest! # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds. @@ -14568,50 +14590,7 @@ with pkgs; vndr = callPackage ../development/tools/vndr { }; - windows = rec { - cygwinSetup = callPackage ../os-specific/windows/cygwin-setup { }; - - jom = callPackage ../os-specific/windows/jom { }; - - w32api = callPackage ../os-specific/windows/w32api { }; - - w32api_headers = callPackage ../os-specific/windows/w32api/headers { }; - - mingw_runtime = callPackage ../os-specific/windows/mingwrt { }; - - mingw_runtime_headers = callPackage ../os-specific/windows/mingwrt/headers.nix { }; - - mingw_headers1 = buildEnv { - name = "mingw-headers-1"; - paths = [ w32api_headers mingw_runtime_headers ]; - }; - - mingw_headers2 = buildEnv { - name = "mingw-headers-2"; - paths = [ w32api mingw_runtime_headers ]; - }; - - mingw_headers3 = buildEnv { - name = "mingw-headers-3"; - paths = [ w32api mingw_runtime ]; - }; - - mingw_w64 = callPackage ../os-specific/windows/mingw-w64 { - stdenv = crossLibcStdenv; - }; - - mingw_w64_headers = callPackage ../os-specific/windows/mingw-w64/headers.nix { }; - - mingw_w64_pthreads = callPackage ../os-specific/windows/mingw-w64/pthreads.nix { }; - - pthreads = callPackage ../os-specific/windows/pthread-w32 { - mingw_headers = mingw_headers3; - }; - - wxMSW = callPackage ../os-specific/windows/wxMSW-2.8 { }; - - libgnurx = callPackage ../os-specific/windows/libgnurx { }; - }; + windows = callPackages ../os-specific/windows {}; wirelesstools = callPackage ../os-specific/linux/wireless-tools { }; @@ -14633,7 +14612,7 @@ with pkgs; inherit (callPackage ../os-specific/linux/zfs { configFile = "user"; - }) zfsStable zfsUnstable zfsLegacyCrypto; + }) zfsStable zfsUnstable; zfs = zfsStable; @@ -15422,10 +15401,10 @@ with pkgs; (callPackage ../applications/science/electronics/bitscope/packages.nix { }); bitwig-studio1 = callPackage ../applications/audio/bitwig-studio/bitwig-studio1.nix { - inherit (gnome2) zenity; + inherit (gnome3) zenity; }; bitwig-studio2 = callPackage ../applications/audio/bitwig-studio/bitwig-studio2.nix { - inherit (gnome2) zenity; + inherit (gnome3) zenity; inherit (self) bitwig-studio1; }; bitwig-studio = bitwig-studio2; @@ -16550,9 +16529,7 @@ with pkgs; gocr = callPackage ../applications/graphics/gocr { }; - gobby5 = callPackage ../applications/editors/gobby { - inherit (gnome2) gtksourceview; - }; + gobby5 = callPackage ../applications/editors/gobby { }; gphoto2 = callPackage ../applications/misc/gphoto2 { }; @@ -16857,6 +16834,8 @@ with pkgs; inherit (nodePackages) imapnotify; + img2pdf = callPackage ../applications/misc/img2pdf { }; + # Impressive, formerly known as "KeyJNote". impressive = callPackage ../applications/office/impressive { }; @@ -16909,6 +16888,10 @@ with pkgs; jalv = callPackage ../applications/audio/jalv { }; + jameica = callPackage ../applications/office/jameica { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; + jamin = callPackage ../applications/audio/jamin { }; japa = callPackage ../applications/audio/japa { }; @@ -17646,6 +17629,8 @@ with pkgs; ncdc = callPackage ../applications/networking/p2p/ncdc { }; + ncview = callPackage ../tools/X11/ncview { } ; + ne = callPackage ../applications/editors/ne { }; nedit = callPackage ../applications/editors/nedit { }; @@ -17773,9 +17758,7 @@ with pkgs; panotools = callPackage ../applications/graphics/panotools { }; - paprefs = callPackage ../applications/audio/paprefs { - inherit (gnome2) libglademm gconfmm GConf; - }; + paprefs = callPackage ../applications/audio/paprefs { }; pavucontrol = callPackage ../applications/audio/pavucontrol { }; @@ -18020,7 +18003,7 @@ with pkgs; qsyncthingtray = libsForQt5.callPackage ../applications/misc/qsyncthingtray { }; - qstopmotion = callPackage ../applications/video/qstopmotion { }; + qstopmotion = libsForQt5.callPackage ../applications/video/qstopmotion { }; qsynth = libsForQt5.callPackage ../applications/audio/qsynth { }; @@ -18497,7 +18480,7 @@ with pkgs; }) subversion18 subversion19 subversion_1_10; - subversion = pkgs.subversion19; + subversion = subversion_1_10; subversionClient = appendToName "client" (pkgs.subversion.override { bdbSupport = false; @@ -18665,6 +18648,8 @@ with pkgs; todo-txt-cli = callPackage ../applications/office/todo.txt-cli { }; + toggldesktop = libsForQt5.callPackage ../applications/misc/toggldesktop { }; + tomahawk = callPackage ../applications/audio/tomahawk { taglib = taglib_1_9; enableXMPP = config.tomahawk.enableXMPP or true; @@ -18983,7 +18968,9 @@ with pkgs; inherit (luaPackages) cjson; }; - weechat-xmpp = callPackage ../applications/networking/instant-messengers/weechat-xmpp {}; + weechat-xmpp = callPackage ../applications/networking/instant-messengers/weechat-xmpp { + inherit (pythonPackages) pydns; + }; westonLite = weston.override { pango = null; @@ -19287,25 +19274,19 @@ with pkgs; packages = self: []; }; - xmonad_log_applet_gnome2 = xmonad_log_applet.override { - desktopSupport = "gnome2"; + xmonad_log_applet = callPackage ../applications/window-managers/xmonad/log-applet { + desktopSupport = "gnomeflashback"; inherit (xfce) libxfce4util xfce4-panel; - gnome2_panel = gnome2.gnome_panel; - GConf2 = gnome2.GConf; }; - xmonad_log_applet = callPackage ../applications/window-managers/xmonad/log-applet { - desktopSupport = "gnome3"; + xmonad_log_applet_mate = xmonad_log_applet.override { + desktopSupport = "mate"; inherit (xfce) libxfce4util xfce4-panel; - gnome2_panel = gnome2.gnome_panel; - GConf2 = gnome2.GConf; }; xmonad_log_applet_xfce = xmonad_log_applet.override { desktopSupport = "xfce4"; inherit (xfce) libxfce4util xfce4-panel; - gnome2_panel = gnome2.gnome_panel; - GConf2 = gnome2.GConf; }; xmpp-client = callPackage ../applications/networking/instant-messengers/xmpp-client { }; @@ -19548,7 +19529,7 @@ with pkgs; crafty = callPackage ../games/crafty { }; - crawlTiles = crawl.override { + crawlTiles = callPackage ../games/crawl { tileMode = true; }; @@ -21472,8 +21453,6 @@ with pkgs; nix-top = callPackage ../tools/package-management/nix-top { }; - nix-repl = callPackage ../tools/package-management/nix-repl { nix = nix1; }; - nix-review = callPackage ../tools/package-management/nix-review { }; nix-serve = callPackage ../tools/package-management/nix-serve { }; @@ -21513,7 +21492,7 @@ with pkgs; mnemonicode = callPackage ../misc/mnemonicode { }; - mysql-workbench = newScope gnome2 ../applications/misc/mysql-workbench (let mysql = mysql57; in { + mysql-workbench = callPackage ../applications/misc/mysql-workbench (let mysql = mysql57; in { gdal = gdal.override {mysql = mysql // {lib = {dev = mysql;};};}; mysql = mysql; pcre = pcre-cpp; @@ -21844,7 +21823,7 @@ with pkgs; }); winetricks = callPackage ../misc/emulators/wine/winetricks.nix { - inherit (gnome2) zenity; + inherit (gnome3) zenity; }; with-shell = callPackage ../applications/misc/with-shell { }; |