diff options
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/aliases.nix | 5 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 224 | ||||
-rw-r--r-- | pkgs/top-level/haskell-packages.nix | 13 | ||||
-rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/perl-packages.nix | 16 | ||||
-rw-r--r-- | pkgs/top-level/php-packages.nix | 15 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 59 | ||||
-rw-r--r-- | pkgs/top-level/stage.nix | 9 |
8 files changed, 261 insertions, 84 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 96396acb9e62..fac60ece8108 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -49,11 +49,6 @@ mapAliases ({ bashCompletion = bash-completion; # Added 2016-09-28 bridge_utils = bridge-utils; # added 2015-02-20 btrfsProgs = btrfs-progs; # added 2016-01-03 - buildbot = pythonPackages.buildbot; # added 2018-10-11 - buildbot-full = pythonPackages.buildbot-full; # added 2018-10-11 - buildbot-pkg = pythonPackages.buildbot-pkg; # added 2018-10-11 - buildbot-ui = pythonPackages.buildbot-ui; # added 2018-10-11 - buildbot-worker = pythonPackages.buildbot-worker; # added 2018-10-11 buildPerlPackage = perlPackages.buildPerlPackage; # added 2018-10-12 bundler_HEAD = bundler; # added 2015-11-15 cantarell_fonts = cantarell-fonts; # added 2018-03-03 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 30f875dd6925..980b5c44904e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -235,6 +235,10 @@ in pet = callPackage ../development/tools/pet { }; + mod = callPackage ../development/tools/mod { }; + + broadlink-cli = callPackage ../tools/misc/broadlink-cli {}; + mht2htm = callPackage ../tools/misc/mht2htm { }; fetchpatch = callPackage ../build-support/fetchpatch { }; @@ -505,6 +509,8 @@ in aldo = callPackage ../applications/radio/aldo { }; + almanah = callPackage ../applications/misc/almanah { }; + amazon-ecs-cli = callPackage ../tools/virtualization/amazon-ecs-cli { }; amazon-glacier-cmd-interface = callPackage ../tools/backup/amazon-glacier-cmd-interface { }; @@ -667,6 +673,11 @@ in bonfire = callPackage ../tools/misc/bonfire { }; + buildbot = with python3Packages; toPythonApplication buildbot; + buildbot-ui = with python3Packages; toPythonApplication buildbot-ui; + buildbot-full = with python3Packages; toPythonApplication buildbot-full; + buildbot-worker = with python3Packages; toPythonApplication buildbot-worker; + bunny = callPackage ../tools/package-management/bunny { }; chezmoi = callPackage ../tools/misc/chezmoi { }; @@ -819,6 +830,8 @@ in inherit (androidenv.androidPkgs_9_0) platform-tools; }; + anbox = callPackage ../os-specific/linux/anbox { }; + androidenv = callPackage ../development/mobile/androidenv { pkgs_i686 = pkgsi686Linux; }; @@ -866,6 +879,10 @@ in avahi = callPackage ../development/libraries/avahi (config.avahi or {}); + avahi-compat = callPackage ../development/libraries/avahi ((config.avahi or {}) // { + withLibdnssdCompat = true; + }); + avro-c = callPackage ../development/libraries/avro-c { }; avro-cpp = callPackage ../development/libraries/avro-c++ { boost = boost160; }; @@ -1109,6 +1126,8 @@ in boost = pkgs.boost.override { python = python3; }; }; + candle = libsForQt5.callPackage ../applications/misc/candle { }; + capstone = callPackage ../development/libraries/capstone { }; unicorn-emu = callPackage ../development/libraries/unicorn-emu { }; @@ -1244,6 +1263,8 @@ in crudini = callPackage ../tools/misc/crudini { }; + csvkit = callPackage ../tools/text/csvkit { }; + cucumber = callPackage ../development/tools/cucumber {}; daemontools = callPackage ../tools/admin/daemontools { }; @@ -1449,6 +1470,8 @@ in gh-ost = callPackage ../tools/misc/gh-ost { }; + ghidra-bin = callPackage ../tools/security/ghidra { }; + gif-for-cli = callPackage ../tools/misc/gif-for-cli { }; gist = callPackage ../tools/text/gist { }; @@ -1513,6 +1536,8 @@ in hostsblock = callPackage ../tools/misc/hostsblock { }; + hopper = callPackage ../development/tools/analysis/hopper {}; + hr = callPackage ../applications/misc/hr { }; hyx = callPackage ../tools/text/hyx { }; @@ -1521,6 +1546,8 @@ in interlock = callPackage ../servers/interlock {}; + jellyfin = callPackage ../servers/jellyfin { }; + kapacitor = callPackage ../servers/monitoring/kapacitor { }; kisslicer = callPackage ../tools/misc/kisslicer { }; @@ -1666,6 +1693,8 @@ in ring-daemon = callPackage ../applications/networking/instant-messengers/ring-daemon { }; + riot-desktop = callPackage ../applications/networking/instant-messengers/riot/riot-desktop.nix { }; + riot-web = callPackage ../applications/networking/instant-messengers/riot/riot-web.nix { conf = config.riot-web.conf or null; }; @@ -1715,6 +1744,8 @@ in mongodb-tools = callPackage ../tools/misc/mongodb-tools { }; + moosefs = callPackage ../tools/filesystems/moosefs { }; + mozlz4a = callPackage ../tools/compression/mozlz4a { }; msr-tools = callPackage ../os-specific/linux/msr-tools { }; @@ -2214,6 +2245,8 @@ in darkstat = callPackage ../tools/networking/darkstat { }; + dav1d = callPackage ../development/libraries/dav1d { }; + davfs2 = callPackage ../tools/filesystems/davfs2 { }; dbeaver = callPackage ../applications/misc/dbeaver { }; @@ -2394,6 +2427,8 @@ in duo-unix = callPackage ../tools/security/duo-unix { }; + duplicacy = callPackage ../tools/backup/duplicacy { }; + duplicati = callPackage ../tools/backup/duplicati { }; duplicity = callPackage ../tools/backup/duplicity { @@ -2512,6 +2547,18 @@ in callPackage ../servers/search/elasticsearch/plugins.nix { } ); + elasticsearch-curator = with (python3.override { + packageOverrides = self: super: { + click = super.click.overridePythonAttrs (oldAttrs: rec { + version = "6.7"; + src = oldAttrs.src.override { + inherit version; + sha256 = "f15516df478d5a56180fbf80e68f206010e6d160fc39fa508b65e035fd75130b"; + }; + }); + }; + }).pkgs; toPythonApplication elasticsearch-curator; + embree2 = callPackage ../development/libraries/embree/2.x.nix { }; emem = callPackage ../applications/misc/emem { }; @@ -2658,6 +2705,8 @@ in ferm = callPackage ../tools/networking/ferm { }; + ffsend = callPackage ../tools/misc/ffsend { }; + fgallery = callPackage ../tools/graphics/fgallery { }; flannel = callPackage ../tools/networking/flannel { }; @@ -2922,6 +2971,8 @@ in gifsicle = callPackage ../tools/graphics/gifsicle { }; + gifski = callPackage ../tools/graphics/gifski { }; + git-big-picture = callPackage ../applications/version-management/git-and-tools/git-big-picture { }; git-crecord = callPackage ../applications/version-management/git-crecord { }; @@ -3594,10 +3645,14 @@ in jnettop = callPackage ../tools/networking/jnettop { }; + junkie = callPackage ../tools/networking/junkie { }; + go-jira = callPackage ../applications/misc/go-jira { }; john = callPackage ../tools/security/john { }; + joplin-desktop = callPackage ../applications/misc/joplin-desktop { }; + journalbeat = callPackage ../tools/system/journalbeat { }; journaldriver = callPackage ../tools/misc/journaldriver { }; @@ -3624,6 +3679,8 @@ in jsduck = callPackage ../development/tools/jsduck { }; + jumpapp = callPackage ../tools/X11/jumpapp {}; + jucipp = callPackage ../applications/editors/jucipp { }; jupp = callPackage ../applications/editors/jupp { }; @@ -3744,6 +3801,8 @@ in libcroco = callPackage ../development/libraries/libcroco { }; + libcryptui = callPackage ../development/libraries/libcryptui { }; + libsmi = callPackage ../development/libraries/libsmi { }; lesspipe = callPackage ../tools/misc/lesspipe { }; @@ -3775,6 +3834,8 @@ in lolcat = callPackage ../tools/misc/lolcat { }; + lsd = callPackage ../tools/misc/lsd { }; + lsdvd = callPackage ../tools/cd-dvd/lsdvd {}; lsyncd = callPackage ../applications/networking/sync/lsyncd { @@ -4606,6 +4667,8 @@ in odt2txt = callPackage ../tools/text/odt2txt { }; + odyssey = callPackage ../tools/misc/odyssey { }; + offlineimap = callPackage ../tools/networking/offlineimap { }; oh-my-zsh = callPackage ../shells/zsh/oh-my-zsh { }; @@ -4771,6 +4834,8 @@ in parted = callPackage ../tools/misc/parted { }; + paulstretch = callPackage ../applications/audio/paulstretch { }; + pell = callPackage ../applications/misc/pell { }; pepper = callPackage ../tools/admin/salt/pepper { }; @@ -4828,6 +4893,8 @@ in pdfcrack = callPackage ../tools/security/pdfcrack { }; + pdfsandwich = callPackage ../tools/typesetting/pdfsandwich { }; + pdftag = callPackage ../tools/graphics/pdftag { }; pdf2svg = callPackage ../tools/graphics/pdf2svg { }; @@ -5167,6 +5234,8 @@ in redsocks = callPackage ../tools/networking/redsocks { }; + retext = callPackage ../applications/editors/retext { }; + richgo = callPackage ../development/tools/richgo { }; rst2html5 = callPackage ../tools/text/rst2html5 { }; @@ -5425,6 +5494,10 @@ in shadowsocks-libev = callPackage ../tools/networking/shadowsocks-libev { }; + shadowsocks-rust = callPackage ../tools/networking/shadowsocks-rust { + inherit (darwin.apple_sdk.frameworks) Security; + }; + sharutils = callPackage ../tools/archivers/sharutils { }; schema2ldif = callPackage ../tools/text/schema2ldif { }; @@ -5724,6 +5797,8 @@ in tarsnapper = callPackage ../tools/backup/tarsnapper { }; + tayga = callPackage ../tools/networking/tayga { }; + tcpcrypt = callPackage ../tools/security/tcpcrypt { }; tcptraceroute = callPackage ../tools/networking/tcptraceroute { }; @@ -6134,6 +6209,8 @@ in welkin = callPackage ../tools/graphics/welkin {}; + wf-recorder = callPackage ../applications/video/wf-recorder { }; + whipper = callPackage ../applications/audio/whipper { }; whois = callPackage ../tools/networking/whois { }; @@ -6174,6 +6251,8 @@ in rcm = callPackage ../tools/misc/rcm {}; + td = callPackage ../tools/misc/td { }; + tegola = callPackage ../servers/tegola {}; tftp-hpa = callPackage ../tools/networking/tftp-hpa {}; @@ -6697,9 +6776,10 @@ in }; }; }; - llvm-polly = llvmPackages_7.llvm-polly; - clang-polly = clang_7.override { cc = llvmPackages_7.clang-polly-unwrapped; }; + llvm-polly = llvmPackages_latest.llvm-polly; + clang-polly = llvmPackages_latest.clang.override { cc = llvmPackages_latest.clang-polly-unwrapped; }; + clang_8 = llvmPackages_8.clang; clang_7 = llvmPackages_7.clang; clang_6 = llvmPackages_6.clang; clang_5 = llvmPackages_5.clang; @@ -7093,8 +7173,8 @@ in all-cabal-hashes = callPackage ../data/misc/hackage { }; - # Build with ghc 8.4 due to https://github.com/NixOS/nixpkgs/issues/53597 - purescript = haskell.lib.justStaticExecutables haskell.packages.ghc844.purescript; + purescript = callPackage ../development/compilers/purescript/purescript { }; + psc-package = haskell.lib.justStaticExecutables (haskellPackages.callPackage ../development/compilers/purescript/psc-package { }); @@ -7321,16 +7401,19 @@ in lld_5 = llvmPackages_5.lld; lld_6 = llvmPackages_6.lld; lld_7 = llvmPackages_7.lld; + lld_8 = llvmPackages_8.lld; lldb = llvmPackages.lldb; lldb_4 = llvmPackages_4.lldb; lldb_5 = llvmPackages_5.lldb; lldb_6 = llvmPackages_6.lldb; lldb_7 = llvmPackages_7.lldb; + lldb_8 = llvmPackages_8.lldb; llvm = llvmPackages.llvm; llvm-manpages = llvmPackages.llvm-manpages; + llvm_8 = llvmPackages_8.llvm; llvm_7 = llvmPackages_7.llvm; llvm_6 = llvmPackages_6.llvm; llvm_5 = llvmPackages_5.llvm; @@ -8306,14 +8389,6 @@ in abi-dumper = callPackage ../development/tools/misc/abi-dumper { }; - activator = throw '' - Typesafe Activator was removed in 2017-05-08 as the actual package reaches end of life. - - See https://github.com/NixOS/nixpkgs/pull/25616 - and http://www.lightbend.com/community/core-tools/activator-and-sbt - for more information. - ''; - adtool = callPackage ../tools/admin/adtool { }; inherit (callPackage ../development/tools/alloy { }) @@ -8414,8 +8489,12 @@ in buildBazelPackage = buildBazelPackage.override { enableNixHacks = false; }; }; + bazel-remote = callPackage ../development/tools/build-managers/bazel/bazel-remote { }; + bazel-watcher = callPackage ../development/tools/bazel-watcher { }; + bazelisk = callPackage ../development/tools/bazelisk { }; + buildBazelPackage = callPackage ../build-support/build-bazel-package { }; bear = callPackage ../development/tools/build-managers/bear { }; @@ -8462,6 +8541,8 @@ in byacc = callPackage ../development/tools/parsing/byacc { }; + cadre = callPackage ../development/tools/cadre { }; + casperjs = callPackage ../development/tools/casperjs { inherit (texFunctions) fontsConf; }; @@ -8579,8 +8660,8 @@ in }; ccls = callPackage ../development/tools/misc/ccls { - llvmPackages = llvmPackages_latest; - stdenv = llvmPackages_latest.stdenv; + llvmPackages = llvmPackages_7; + stdenv = llvmPackages_7.stdenv; }; credstash = with python3Packages; toPythonApplication credstash; @@ -8714,6 +8795,8 @@ in findbugs = callPackage ../development/tools/analysis/findbugs { }; + findnewest = callPackage ../development/tools/misc/findnewest { }; + flootty = callPackage ../development/tools/flootty { }; flow = callPackage ../development/tools/analysis/flow { @@ -8911,6 +8994,8 @@ in libtool_2 = callPackage ../development/tools/misc/libtool/libtool2.nix { }; + libwhich = callPackage ../development/tools/misc/libwhich { }; + linuxkit = callPackage ../development/tools/misc/linuxkit { }; lit = callPackage ../development/tools/misc/lit { }; @@ -9331,6 +9416,8 @@ in mypy = with python3Packages; toPythonApplication mypy; + nsis = callPackage ../development/tools/nsis { }; + ### DEVELOPMENT / LIBRARIES a52dec = callPackage ../development/libraries/a52dec { }; @@ -10503,6 +10590,8 @@ in jbig2dec = callPackage ../development/libraries/jbig2dec { }; + jcal = callPackage ../development/libraries/jcal { }; + jbigkit = callPackage ../development/libraries/jbigkit { }; jemalloc = callPackage ../development/libraries/jemalloc { }; @@ -10772,9 +10861,7 @@ in libdbiDrivers = callPackage ../development/libraries/libdbi-drivers { }; - libunity = callPackage ../development/libraries/libunity { - inherit (gnome3) gnome-common; - }; + libunity = callPackage ../development/libraries/libunity { }; libdbusmenu = callPackage ../development/libraries/libdbusmenu { }; libdbusmenu-gtk2 = libdbusmenu.override { gtkVersion = "2"; }; @@ -12719,12 +12806,12 @@ in sqlite-replication = sqlite.overrideAttrs (oldAttrs: rec { name = "sqlite-${version}"; - version = "3.24.0+replication3"; + version = "3.27.2+replication3"; src = pkgs.fetchFromGitHub { owner = "CanonicalLtd"; repo = "sqlite"; rev = "version-${version}"; - sha256 = "19557b7aick1pxk0gw013cf5jy42i7539qn1ziza8dzy16a6zs8b"; + sha256 = "1aw1naa5y25ial251f74h039pgcz92p4b3994jvfzqpjlz06qwvw"; }; nativeBuildInputs = [ pkgs.tcl ]; configureFlags = oldAttrs.configureFlags ++ [ @@ -12733,8 +12820,8 @@ in "--disable-tcl" ]; preConfigure = '' - echo "D 2018-08-01T13:22:18" > manifest - echo -n "c94dbda1a570c1ab180e7694afd3cc7116268c06" > manifest.uuid + echo "D 2019-03-09T15:45:46" > manifest + echo -n "8250984a368079bb1838d48d99f8c1a6282e00bc" > manifest.uuid ''; }); @@ -13326,15 +13413,25 @@ in ### DEVELOPMENT / GO MODULES - buildGo110Package = callPackage ../development/go-modules/generic { + buildGo110Package = callPackage ../development/go-packages/generic { go = buildPackages.go_1_10; }; - buildGo111Package = callPackage ../development/go-modules/generic { + buildGo111Package = callPackage ../development/go-packages/generic { go = buildPackages.go_1_11; }; buildGoPackage = buildGo111Package; + buildGo111Module = callPackage ../development/go-modules/generic { + go = buildPackages.go_1_11; + }; + + buildGo112Module = callPackage ../development/go-modules/generic { + go = buildPackages.go_1_12; + }; + + buildGoModule = buildGo112Module; + go2nix = callPackage ../development/tools/go2nix { }; leaps = callPackage ../development/tools/leaps { }; @@ -14070,6 +14167,12 @@ in boost = boost167; }; + rippled-validator-keys-tool = callPackage ../servers/rippled/validator-keys-tool.nix { + boost = boost167.override { + enableStatic = true; + }; + }; + s6 = skawarePackages.s6; s6-rc = skawarePackages.s6-rc; @@ -14079,7 +14182,6 @@ in spamassassin = callPackage ../servers/mail/spamassassin { }; deadpixi-sam-unstable = callPackage ../applications/editors/deadpixi-sam { }; - deadpixi-sam = deadpixi-sam-unstable; samba3 = callPackage ../servers/samba/3.x.nix { }; @@ -14114,7 +14216,7 @@ in sambaFull = samba4Full; - shairplay = callPackage ../servers/shairplay { }; + shairplay = callPackage ../servers/shairplay { avahi = avahi-compat; }; shairport-sync = callPackage ../servers/shairport-sync { }; @@ -14667,13 +14769,6 @@ in ]; }; - linux_4_20 = callPackage ../os-specific/linux/kernel/linux-4.20.nix { - 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 @@ -14721,6 +14816,8 @@ in amdgpu-pro = callPackage ../os-specific/linux/amdgpu-pro { }; + anbox = callPackage ../os-specific/linux/anbox/kmod.nix { }; + batman_adv = callPackage ../os-specific/linux/batman-adv {}; bcc = callPackage ../os-specific/linux/bcc { @@ -14753,6 +14850,8 @@ in ixgbevf = callPackage ../os-specific/linux/ixgbevf {}; + it87 = callPackage ../os-specific/linux/it87 {}; + ena = callPackage ../os-specific/linux/ena {}; v4l2loopback = callPackage ../os-specific/linux/v4l2loopback { }; @@ -14858,7 +14957,7 @@ in }); # The current default kernel / kernel modules. - linuxPackages = linuxPackages_4_14; + linuxPackages = linuxPackages_4_19; linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! @@ -14872,7 +14971,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_4_20 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_20); linuxPackages_5_0 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_0); # When adding to this list: # - Update linuxPackages_latest to the latest version @@ -15278,6 +15376,8 @@ in speedometer = callPackage ../os-specific/linux/speedometer { }; + statik = callPackage ../development/tools/statik { }; + statifier = callPackage ../os-specific/linux/statifier { }; sysdig = callPackage ../os-specific/linux/sysdig { @@ -15984,6 +16084,8 @@ in inherit (callPackages ../data/fonts/tai-languages { }) tai-ahom; + tamsyn = callPackage ../data/fonts/tamsyn { }; + tango-icon-theme = callPackage ../data/icons/tango-icon-theme { gtk = res.gtk2; }; @@ -16060,7 +16162,7 @@ in xkeyboard_config = xorg.xkeyboardconfig; - xlsx2csv = pythonPackages.xlsx2csv; + xlsx2csv = with python3Packages; toPythonApplication xlsx2csv; xorg-rgb = callPackage ../data/misc/xorg-rgb {}; @@ -17705,10 +17807,13 @@ in orbment = callPackage ../applications/window-managers/orbment { }; sway = callPackage ../applications/window-managers/sway { }; - sway-beta = callPackage ../applications/window-managers/sway/beta.nix { }; swayidle = callPackage ../applications/window-managers/sway/idle.nix { }; swaylock = callPackage ../applications/window-managers/sway/lock.nix { }; + waybar = callPackage ../applications/misc/waybar { + pulseSupport = config.pulseaudio or false; + }; + velox = callPackage ../applications/window-managers/velox { stConf = config.st.conf or null; stPatches = config.st.patches or null; @@ -17754,6 +17859,8 @@ in wmfocus = callPackage ../applications/window-managers/i3/wmfocus.nix { }; + wmfs = callPackage ../applications/window-managers/wmfs/default.nix { }; + i810switch = callPackage ../os-specific/linux/i810switch { }; icewm = callPackage ../applications/window-managers/icewm {}; @@ -17859,6 +17966,7 @@ in ipe = libsForQt5.callPackage ../applications/graphics/ipe { ghostscript = ghostscriptX; texlive = texlive.combine { inherit (texlive) scheme-small; }; + lua5 = lua5_3; }; iptraf = callPackage ../applications/networking/iptraf { }; @@ -17932,6 +18040,8 @@ in kanboard = callPackage ../applications/misc/kanboard { }; + kanshi = callPackage ../tools/misc/kanshi { }; + kdeApplications = let mkApplications = import ../applications/kde; @@ -18057,8 +18167,6 @@ in caps = callPackage ../applications/audio/caps { }; - lastwatch = callPackage ../applications/audio/lastwatch { }; - lastfmsubmitd = callPackage ../applications/audio/lastfmsubmitd { }; lbdb = callPackage ../tools/misc/lbdb { abook = null; gnupg = null; goobook = null; khard = null; mu = null; }; @@ -18109,7 +18217,6 @@ in libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { libreoffice = callPackage ../applications/office/libreoffice/still.nix (libreoffice-args // { - poppler = poppler_0_61; }); }); libreoffice-still-unwrapped = libreoffice-still.libreoffice; @@ -18467,9 +18574,7 @@ in multimon-ng = callPackage ../applications/radio/multimon-ng { }; inherit (callPackages ../applications/networking/mumble { - avahi = avahi.override { - withLibdnssdCompat = true; - }; + avahi = avahi-compat; jackSupport = config.mumble.jackSupport or false; speechdSupport = config.mumble.speechdSupport or false; pulseSupport = config.pulseaudio or false; @@ -18477,9 +18582,7 @@ in }) mumble mumble_git murmur; inherit (callPackages ../applications/networking/mumble { - avahi = avahi.override { - withLibdnssdCompat = true; - }; + avahi = avahi-compat; jackSupport = config.mumble.jackSupport or false; speechdSupport = config.mumble.speechdSupport or false; pulseSupport = config.pulseaudio or false; @@ -18803,6 +18906,8 @@ in paraview = libsForQt5.callPackage ../applications/graphics/paraview { }; + parlatype = callPackage ../applications/audio/parlatype { }; + packet = callPackage ../development/tools/packet { }; pb_cli = callPackage ../tools/misc/pb_cli {}; @@ -18970,6 +19075,8 @@ in python = python3; } // (config.profanity or {})); + properties-cpp = callPackage ../development/libraries/properties-cpp { }; + protonmail-bridge = libsForQt511.callPackage ../applications/networking/protonmail-bridge { }; psi = callPackage ../applications/networking/instant-messengers/psi { }; @@ -19473,7 +19580,9 @@ in soulseekqt = libsForQt5.callPackage ../applications/networking/p2p/soulseekqt { }; - sox = callPackage ../applications/misc/audio/sox { }; + sox = callPackage ../applications/misc/audio/sox { + inherit (darwin.apple_sdk.frameworks) CoreAudio; + }; soxr = callPackage ../applications/misc/audio/soxr { }; @@ -19484,7 +19593,6 @@ in spotify = callPackage ../applications/audio/spotify { libgcrypt = libgcrypt_1_5; libpng = libpng12; - ffmpeg = ffmpeg_2; curl = curl.override { sslSupport = false; gnutlsSupport = true; }; @@ -20350,7 +20458,7 @@ in xmonad-with-packages = callPackage ../applications/window-managers/xmonad/wrapper.nix { inherit (haskellPackages) ghcWithPackages; - packages = self: []; + packages = self: [ haskellPackages.xmonad-contrib ]; }; xmonad_log_applet = callPackage ../applications/window-managers/xmonad/log-applet { @@ -20411,6 +20519,8 @@ in xtrace = callPackage ../tools/X11/xtrace { }; + xtruss = callPackage ../tools/X11/xtruss { }; + xmacro = callPackage ../tools/X11/xmacro { }; xmlcopyeditor = callPackage ../applications/editors/xmlcopyeditor { }; @@ -20645,7 +20755,7 @@ in drumkv1 = callPackage ../applications/audio/drumkv1 { }; - duckmarines = callPackage ../games/duckmarines { love = love_0_9; }; + duckmarines = callPackage ../games/duckmarines { love = love_0_10; }; dwarf-fortress-packages = recurseIntoAttrs (callPackage ../games/dwarf-fortress { }); @@ -20915,7 +21025,7 @@ in openjk = callPackage ../games/openjk { }; - openmw = callPackage ../games/openmw { }; + openmw = libsForQt5.callPackage ../games/openmw { }; openmw-tes3mp = libsForQt5.callPackage ../games/openmw/tes3mp.nix { }; @@ -21872,7 +21982,10 @@ in ifstat-legacy = callPackage ../tools/networking/ifstat-legacy { }; isabelle = callPackage ../applications/science/logic/isabelle { - polyml = polyml56; + polyml = stdenv.lib.overrideDerivation polyml (attrs: { + configureFlags = [ "--enable-intinf-as-int" "--with-gmp" "--disable-shared" ]; + }); + java = if stdenv.isLinux then jre else jdk; }; @@ -22237,7 +22350,7 @@ in ### SCIENCE/ROBOTICS - apmplanner2 = libsForQt5.callPackage ../applications/science/robotics/apmplanner2 { }; + apmplanner2 = libsForQt59.callPackage ../applications/science/robotics/apmplanner2 { }; ### MISC @@ -22525,6 +22638,8 @@ in muse = callPackage ../applications/audio/muse { }; + musly = callPackage ../applications/audio/musly { }; + mynewt-newt = callPackage ../tools/package-management/mynewt-newt { }; inherit (callPackage ../tools/package-management/nix { @@ -22868,6 +22983,7 @@ in mfcl8690cdwcupswrapper = callPackage ../misc/cups/drivers/mfcl8690cdwcupswrapper { }; mfcl8690cdwlpr = callPackage ../misc/cups/drivers/mfcl8690cdwlpr { }; + samsung-unified-linux-driver_1_00_36 = callPackage ../misc/cups/drivers/samsung/1.00.36/default.nix { }; samsung-unified-linux-driver_1_00_37 = callPackage ../misc/cups/drivers/samsung/1.00.37.nix { }; samsung-unified-linux-driver_4_00_39 = callPackage ../misc/cups/drivers/samsung/4.00.39 { }; samsung-unified-linux-driver_4_01_17 = callPackage ../misc/cups/drivers/samsung/4.01.17.nix { }; @@ -22881,6 +22997,8 @@ in brscan4 = callPackage ../applications/graphics/sane/backends/brscan4 { }; + dsseries = callPackage ../applications/graphics/sane/backends/dsseries { }; + mkSaneConfig = callPackage ../applications/graphics/sane/config.nix { }; sane-frontends = callPackage ../applications/graphics/sane/frontends.nix { }; @@ -23038,6 +23156,8 @@ in vokoscreen = libsForQt5.callPackage ../applications/video/vokoscreen { }; + vttest = callPackage ../tools/misc/vttest { }; + wavegain = callPackage ../applications/audio/wavegain { }; wcalc = callPackage ../applications/misc/wcalc { }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index aeb3b471a149..6551fb9aff17 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -59,12 +59,6 @@ in { buildLlvmPackages = buildPackages.llvmPackages_5; llvmPackages = pkgs.llvmPackages_5; }; - ghc863 = callPackage ../development/compilers/ghc/8.6.3.nix { - bootPkgs = packages.ghc822Binary; - inherit (buildPackages.python3Packages) sphinx; - buildLlvmPackages = buildPackages.llvmPackages_6; - llvmPackages = pkgs.llvmPackages_6; - }; ghc864 = callPackage ../development/compilers/ghc/8.6.4.nix { bootPkgs = packages.ghc822Binary; inherit (buildPackages.python3Packages) sphinx; @@ -85,7 +79,7 @@ in { ghcjsDepOverrides = callPackage ../development/compilers/ghcjs-ng/8.4/dep-overrides.nix {}; }; ghcjs86 = callPackage ../development/compilers/ghcjs-ng { - bootPkgs = packages.ghc863; + bootPkgs = packages.ghc864; ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.6/git.json; stage0 = ../development/compilers/ghcjs-ng/8.6/stage0.nix; ghcjsDepOverrides = callPackage ../development/compilers/ghcjs-ng/8.6/dep-overrides.nix {}; @@ -130,11 +124,6 @@ in { ghc = bh.compiler.ghc844; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { }; }; - ghc863 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc863; - ghc = bh.compiler.ghc863; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.x.nix { }; - }; ghc864 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc864; ghc = bh.compiler.ghc864; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 76de3197b1dc..cf0e942bbed7 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -381,6 +381,8 @@ let labltk = callPackage ../development/ocaml-modules/labltk { }; + lacaml = callPackage ../development/ocaml-modules/lacaml { }; + lambdaTerm-1_6 = callPackage ../development/ocaml-modules/lambda-term/1.6.nix { lwt = lwt2; }; lambdaTerm = if lib.versionOlder "4.02" ocaml.version @@ -522,6 +524,8 @@ let ocaml_sqlite3 = callPackage ../development/ocaml-modules/sqlite3 { }; + syslog = callPackage ../development/ocaml-modules/syslog { }; + ocaml_text = callPackage ../development/ocaml-modules/ocaml-text { }; ocf = callPackage ../development/ocaml-modules/ocf { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 40c645852a94..044fff3dedbc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2185,6 +2185,22 @@ let }; }; + ClassStdFast = buildPerlModule rec { + name = "${pname}-${version}"; + pname = "Class-Std-Fast"; + version = "0.0.8"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AC/ACID/${pname}-v${version}.tar.gz"; + sha256 = "1057rz95jsr66gam472i4zdv04v7bmzph3m3jwq1hwx3qrikgm0v"; + }; + propagatedBuildInputs = [ ClassStd ]; + checkInputs = [ TestPod TestPodCoverage ]; + meta = with stdenv.lib; { + description = "Faster but less secure than Class::Std"; + license = with licenses; [ artistic1 gpl1Plus ]; + }; + }; + ClassUnload = buildPerlPackage rec { name = "Class-Unload-0.11"; src = fetchurl { diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 8c7f48303633..ba4ce18f04df 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -253,23 +253,24 @@ let }; composer = pkgs.stdenv.mkDerivation rec { - name = "composer-${version}"; - version = "1.8.0"; + pname = "composer"; + version = "1.8.4"; src = pkgs.fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "19pg9ip2mpyf5cyq34fld7qwl77mshqw3c4nif7sxmpnar6sh089"; + sha256 = "12h5vqwhklxvwrplggzjl21n6kb972pwkj9ivmn2vbxyixn848hp"; }; unpackPhase = ":"; - buildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.makeWrapper ]; installPhase = '' mkdir -p $out/bin install -D $src $out/libexec/composer/composer.phar makeWrapper ${php}/bin/php $out/bin/composer \ - --add-flags "$out/libexec/composer/composer.phar" + --add-flags "$out/libexec/composer/composer.phar" \ + --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.unzip ]} ''; meta = with pkgs.lib; { @@ -423,11 +424,11 @@ let phpstan = pkgs.stdenv.mkDerivation rec { name = "phpstan-${version}"; - version = "0.11.2"; + version = "0.11.3"; src = pkgs.fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "0pkcak51vfrqlwivxbb5pdvc34pxia8pdraii97wmcg4z0d4i1rx"; + sha256 = "0wiyrjymnhh0bzf0di27k59j2dprczwxiq19spj9gyfkbfw8fgci"; }; phases = [ "installPhase" ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index be51e0673e4c..d3463a6a5ed1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -178,6 +178,8 @@ in { ansicolor = callPackage ../development/python-modules/ansicolor { }; + aplpy = callPackage ../development/python-modules/aplpy { }; + argon2_cffi = callPackage ../development/python-modules/argon2_cffi { }; asana = callPackage ../development/python-modules/asana { }; @@ -194,6 +196,10 @@ in { astropy = callPackage ../development/python-modules/astropy { }; + astropy-helpers = callPackage ../development/python-modules/astropy-helpers { }; + + astropy-healpix = callPackage ../development/python-modules/astropy-healpix { }; + astroquery = callPackage ../development/python-modules/astroquery { }; asttokens = callPackage ../development/python-modules/asttokens { }; @@ -382,6 +388,8 @@ in { face = callPackage ../development/python-modules/face { }; + fastparquet = callPackage ../development/python-modules/fastparquet { }; + fastpbkdf2 = callPackage ../development/python-modules/fastpbkdf2 { }; favicon = callPackage ../development/python-modules/favicon { }; @@ -794,6 +802,8 @@ in { relatorio = callPackage ../development/python-modules/relatorio { }; + reproject = callPackage ../development/python-modules/reproject { }; + remotecv = callPackage ../development/python-modules/remotecv { }; pyzufall = callPackage ../development/python-modules/pyzufall { }; @@ -989,8 +999,6 @@ in { astor = callPackage ../development/python-modules/astor {}; - asyncio = callPackage ../development/python-modules/asyncio {}; - asyncssh = callPackage ../development/python-modules/asyncssh { }; python-fontconfig = callPackage ../development/python-modules/python-fontconfig { }; @@ -1187,8 +1195,6 @@ in { csscompressor = callPackage ../development/python-modules/csscompressor {}; - csvkit = callPackage ../development/python-modules/csvkit { }; - cufflinks = callPackage ../development/python-modules/cufflinks { }; cupy = callPackage ../development/python-modules/cupy { @@ -1316,11 +1322,16 @@ in { canmatrix = callPackage ../development/python-modules/canmatrix {}; - cairocffi = callPackage ../development/python-modules/cairocffi {}; - cairosvg1 = callPackage ../development/python-modules/cairosvg/1_x.nix {}; + cairocffi = if isPy3k then + callPackage ../development/python-modules/cairocffi {} + else + callPackage ../development/python-modules/cairocffi/0_9.nix {}; - cairosvg = callPackage ../development/python-modules/cairosvg {}; + cairosvg = if isPy3k then + callPackage ../development/python-modules/cairosvg {} + else + callPackage ../development/python-modules/cairosvg/1_x.nix {}; carrot = callPackage ../development/python-modules/carrot {}; @@ -1330,6 +1341,8 @@ in { cbor = callPackage ../development/python-modules/cbor {}; + cbor2 = callPackage ../development/python-modules/cbor2 {}; + cassandra-driver = callPackage ../development/python-modules/cassandra-driver { }; cccolutils = callPackage ../development/python-modules/cccolutils {}; @@ -1520,6 +1533,8 @@ in { cffi = callPackage ../development/python-modules/cffi { }; + pyavm = callPackage ../development/python-modules/pyavm { }; + pycollada = callPackage ../development/python-modules/pycollada { }; pycontracts = callPackage ../development/python-modules/pycontracts { }; @@ -1734,11 +1749,15 @@ in { dmenu-python = callPackage ../development/python-modules/dmenu { }; + dnslib = callPackage ../development/python-modules/dnslib { }; + dnspython = callPackage ../development/python-modules/dnspython { }; dns = self.dnspython; # Alias for compatibility, 2017-12-10 docker = callPackage ../development/python-modules/docker {}; + dockerfile-parse = callPackage ../development/python-modules/dockerfile-parse {}; + docker-py = disabledIf isPy27 (callPackage ../development/python-modules/docker-py {}); dockerpty = callPackage ../development/python-modules/dockerpty {}; @@ -2679,9 +2698,21 @@ in { google-auth-httplib2 = callPackage ../development/python-modules/google-auth-httplib2 { }; + google-auth-oauthlib = callPackage ../development/python-modules/google-auth-oauthlib { }; + google_api_core = callPackage ../development/python-modules/google_api_core { }; - google_api_python_client = callPackage ../development/python-modules/google-api-python-client { }; + google_api_python_client = let + google_api_python_client = callPackage ../development/python-modules/google-api-python-client { }; + in if isPy3k then google_api_python_client else + # Python 2.7 support was deprecated but is still needed by weboob + google_api_python_client.overridePythonAttrs (old: rec { + version = "1.7.6"; + src = old.src.override { + inherit version; + sha256 = "14w5sdrp0bk9n0r2lmpqmrbf2zclpfq6q7giyahnskkfzdkb165z"; + }; + }); google_apputils = callPackage ../development/python-modules/google_apputils { }; @@ -3093,6 +3124,8 @@ in { marisa-trie = callPackage ../development/python-modules/marisa-trie { }; + Markups = callPackage ../development/python-modules/Markups { }; + markupsafe = callPackage ../development/python-modules/markupsafe { }; marshmallow = callPackage ../development/python-modules/marshmallow { }; @@ -3899,6 +3932,8 @@ in { purepng = callPackage ../development/python-modules/purepng { }; + pyhocon = callPackage ../development/python-modules/pyhocon { }; + pymaging = callPackage ../development/python-modules/pymaging { }; pymaging_png = callPackage ../development/python-modules/pymaging_png { }; @@ -3929,6 +3964,8 @@ in { pysvn = callPackage ../development/python-modules/pysvn { }; + python-markdown-math = callPackage ../development/python-modules/python-markdown-math { }; + python-ptrace = callPackage ../development/python-modules/python-ptrace { }; python-wifi = callPackage ../development/python-modules/python-wifi { }; @@ -3988,6 +4025,8 @@ in { retry_decorator = callPackage ../development/python-modules/retry_decorator { }; + qdarkstyle = callPackage ../development/python-modules/qdarkstyle { }; + quamash = callPackage ../development/python-modules/quamash { }; quandl = callPackage ../development/python-modules/quandl { }; @@ -4061,6 +4100,8 @@ in { restructuredtext_lint = callPackage ../development/python-modules/restructuredtext_lint { }; + retry = callPackage ../development/python-modules/retry { }; + robomachine = callPackage ../development/python-modules/robomachine { }; robotframework = callPackage ../development/python-modules/robotframework { }; @@ -4957,6 +4998,8 @@ in { potr = callPackage ../development/python-modules/potr {}; + pyregion = callPackage ../development/python-modules/pyregion {}; + python-u2flib-host = callPackage ../development/python-modules/python-u2flib-host { }; pluggy = callPackage ../development/python-modules/pluggy {}; diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 0ee5c25b0101..357ca5246c93 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -135,6 +135,9 @@ let # default GNU libc on Linux systems. Non-Linux systems are not # supported. pkgsMusl = if stdenv.hostPlatform.isLinux then nixpkgsFun { + overlays = [ (self': super': { + pkgsMusl = super'; + })] ++ overlays; ${if stdenv.hostPlatform == stdenv.buildPlatform then "localSystem" else "crossSystem"} = { parsed = stdenv.hostPlatform.parsed // { @@ -151,6 +154,9 @@ let # All packages built for i686 Linux. # Used by wine, firefox with debugging version of Flash, ... pkgsi686Linux = if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86 then nixpkgsFun { + overlays = [ (self': super': { + pkgsi686Linux = super'; + })] ++ overlays; ${if stdenv.hostPlatform == stdenv.buildPlatform then "localSystem" else "crossSystem"} = { parsed = stdenv.hostPlatform.parsed // { @@ -176,6 +182,9 @@ let # Fully static packages. # Currently uses Musl on Linux (couldn’t get static glibc to work). pkgsStatic = nixpkgsFun ({ + overlays = [ (self': super': { + pkgsStatic = super'; + })] ++ overlays; crossOverlays = [ (import ./static.nix) ]; } // lib.optionalAttrs stdenv.hostPlatform.isLinux { crossSystem = { |