diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 804 |
1 files changed, 568 insertions, 236 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d667b25e58be..2197b19a804f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -81,8 +81,7 @@ with pkgs; { deps = [ autoconf264 automake111x gettext libtool ]; } ../build-support/setup-hooks/autoreconf.sh; - autoPatchelfHook = makeSetupHook - { name = "auto-patchelf-hook"; deps = [ file ]; } + autoPatchelfHook = makeSetupHook { name = "auto-patchelf-hook"; } ../build-support/setup-hooks/auto-patchelf.sh; ensureNewerSourcesHook = { year }: makeSetupHook {} @@ -129,8 +128,7 @@ with pkgs; digitalbitbox = libsForQt5.callPackage ../applications/misc/digitalbitbox { }; - # go 1.9 pin until https://github.com/moby/moby/pull/35739 - dockerTools = callPackage ../build-support/docker { go = go_1_9; }; + dockerTools = callPackage ../build-support/docker { }; docker_compose = pythonPackages.docker_compose; @@ -152,6 +150,8 @@ with pkgs; ebook2cw = callPackage ../applications/misc/ebook2cw { }; + etBook = callPackage ../data/fonts/et-book { }; + fetchbower = callPackage ../build-support/fetchbower { inherit (nodePackages) bower2nix; }; @@ -288,13 +288,13 @@ with pkgs; # gitlab example fetchFromGitLab = { - owner, repo, rev, domain ? "gitlab.com", name ? "source", + owner, repo, rev, domain ? "gitlab.com", name ? "source", group ? null, ... # For hash agility }@args: fetchzip ({ inherit name; - url = "https://${domain}/api/v4/projects/${owner}%2F${repo}/repository/archive.tar.gz?sha=${rev}"; - meta.homepage = "https://${domain}/${owner}/${repo}/"; - } // removeAttrs args [ "domain" "owner" "repo" "rev" ]) // { inherit rev; }; + url = "https://${domain}/api/v4/projects/${lib.optionalString (group != null) "${group}%2F"}${owner}%2F${repo}/repository/archive.tar.gz?sha=${rev}"; + meta.homepage = "https://${domain}/${lib.optionalString (group != null) "${group}/"}${owner}/${repo}/"; + } // removeAttrs args [ "domain" "owner" "group" "repo" "rev" ]) // { inherit rev; }; # gitweb example, snapshot support is optional in gitweb fetchFromRepoOrCz = { @@ -365,6 +365,8 @@ with pkgs; nukeReferences = callPackage ../build-support/nuke-references { }; + referencesByPopularity = callPackage ../build-support/references-by-popularity { }; + removeReferencesTo = callPackage ../build-support/remove-references-to { }; vmTools = callPackage ../build-support/vm { }; @@ -425,6 +427,8 @@ with pkgs; acct = callPackage ../tools/system/acct { }; + accuraterip-checksum = callPackage ../tools/audio/accuraterip-checksum { }; + acme-sh = callPackage ../tools/admin/acme.sh { }; acoustidFingerprinter = callPackage ../tools/audio/acoustid-fingerprinter { @@ -581,6 +585,8 @@ with pkgs; awslogs = callPackage ../tools/admin/awslogs { }; + aws-env = callPackage ../tools/admin/aws-env { }; + aws-okta = callPackage ../tools/security/aws-okta { }; aws-rotate-key = callPackage ../tools/admin/aws-rotate-key { }; @@ -595,6 +601,8 @@ with pkgs; azure-cli = nodePackages.azure-cli; + azure-storage-azcopy = callPackage ../development/tools/azcopy { }; + azure-vhd-utils = callPackage ../tools/misc/azure-vhd-utils { }; awless = callPackage ../tools/virtualization/awless { }; @@ -647,6 +655,8 @@ with pkgs; chkcrontab = callPackage ../tools/admin/chkcrontab { }; + cozy = callPackage ../applications/audio/cozy-audiobooks { }; + djmount = callPackage ../tools/filesystems/djmount { }; dgsh = callPackage ../shells/dgsh { }; @@ -728,6 +738,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; + luigi = callPackage ../applications/networking/cluster/luigi { }; + m-cli = callPackage ../os-specific/darwin/m-cli { }; reattach-to-user-namespace = callPackage ../os-specific/darwin/reattach-to-user-namespace {}; @@ -843,7 +855,9 @@ with pkgs; bashmount = callPackage ../tools/filesystems/bashmount {}; - bat = callPackage ../tools/misc/bat { }; + bat = callPackage ../tools/misc/bat { + inherit (darwin.apple_sdk.frameworks) Security; + }; bc = callPackage ../tools/misc/bc { }; @@ -925,6 +939,8 @@ with pkgs; libgit2 = libgit2_0_27; }; + bluez-alsa = callPackage ../tools/bluetooth/bluez-alsa { }; + bluez-tools = callPackage ../tools/bluetooth/bluez-tools { }; bmon = callPackage ../tools/misc/bmon { }; @@ -951,6 +967,8 @@ with pkgs; brasero = callPackage ../tools/cd-dvd/brasero/wrapper.nix { }; + brigand = callPackage ../development/libraries/brigand { }; + brltty = callPackage ../tools/misc/brltty { alsaSupport = (!stdenv.isDarwin); systemdSupport = stdenv.isLinux; @@ -1073,6 +1091,10 @@ with pkgs; cddl = callPackage ../development/tools/cddl { }; + cedille = callPackage ../applications/science/logic/cedille + { inherit (haskellPackages) alex happy Agda ghcWithPackages; + }; + cfdyndns = callPackage ../applications/networking/dyndns/cfdyndns { }; ckbcomp = callPackage ../tools/X11/ckbcomp { }; @@ -1179,6 +1201,8 @@ with pkgs; deja-dup = callPackage ../applications/backup/deja-dup { }; + desync = callPackage ../applications/networking/sync/desync { }; + devmem2 = callPackage ../os-specific/linux/devmem2 { }; dbus-broker = callPackage ../os-specific/linux/dbus-broker { }; @@ -1238,6 +1262,8 @@ with pkgs; dtrx = callPackage ../tools/compression/dtrx { }; + dune = callPackage ../development/tools/ocaml/dune { }; + duperemove = callPackage ../tools/filesystems/duperemove { }; dylibbundler = callPackage ../tools/misc/dylibbundler { }; @@ -1270,6 +1296,8 @@ with pkgs; envconsul = callPackage ../tools/system/envconsul { }; + envsubst = callPackage ../tools/misc/envsubst { }; + eschalot = callPackage ../tools/security/eschalot { }; esptool = callPackage ../tools/misc/esptool { }; @@ -1280,6 +1308,8 @@ with pkgs; et = callPackage ../applications/misc/et {}; + ejson = callPackage ../development/tools/ejson {}; + eternal-terminal = callPackage ../tools/networking/eternal-terminal {}; f3 = callPackage ../tools/filesystems/f3 { }; @@ -1314,6 +1344,8 @@ with pkgs; fsmark = callPackage ../tools/misc/fsmark { }; + futhark = haskell.lib.justStaticExecutables haskellPackages.futhark; + fwup = callPackage ../tools/misc/fwup { }; fzf = callPackage ../tools/misc/fzf { }; @@ -1326,6 +1358,8 @@ with pkgs; gdrive = callPackage ../applications/networking/gdrive { }; + go-2fa = callPackage ../tools/security/2fa {}; + go-dependency-manager = callPackage ../development/tools/gdm { }; geckodriver = callPackage ../development/tools/geckodriver { }; @@ -1356,6 +1390,8 @@ with pkgs; gmic = callPackage ../tools/graphics/gmic { }; + gmic_krita_qt = libsForQt5.callPackage ../tools/graphics/gmic_krita_qt { }; + goa = callPackage ../development/tools/goa { buildGoPackage = buildGo110Package; }; @@ -1398,8 +1434,6 @@ with pkgs; interlock = callPackage ../servers/interlock {}; - jbuilder = callPackage ../development/tools/ocaml/jbuilder { }; - kapacitor = callPackage ../servers/monitoring/kapacitor { }; kisslicer = callPackage ../tools/misc/kisslicer { }; @@ -1416,6 +1450,8 @@ with pkgs; libxnd = callPackage ../development/libraries/libxnd { }; + link-grammar = callPackage ../tools/text/link-grammar { }; + loadwatch = callPackage ../tools/system/loadwatch { }; loccount = callPackage ../development/tools/misc/loccount { }; @@ -1444,6 +1480,10 @@ with pkgs; metabase = callPackage ../servers/metabase { }; + mkspiffs = callPackage ../tools/filesystems/mkspiffs { }; + + mkspiffs-presets = recurseIntoAttrs (callPackages ../tools/filesystems/mkspiffs/presets.nix { }); + monetdb = callPackage ../servers/sql/monetdb { }; mp3blaster = callPackage ../applications/audio/mp3blaster { }; @@ -1462,6 +1502,10 @@ with pkgs; noteshrink = callPackage ../tools/misc/noteshrink { }; + noti = callPackage ../tools/misc/noti { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; + nrsc5 = callPackage ../applications/misc/nrsc5 { }; nwipe = callPackage ../tools/security/nwipe { }; @@ -1478,6 +1522,8 @@ with pkgs; pbzx = callPackage ../tools/compression/pbzx { }; + pev = callPackage ../development/tools/analysis/pev { }; + photon = callPackage ../tools/networking/photon { }; playerctl = callPackage ../tools/audio/playerctl { }; @@ -1494,6 +1540,8 @@ with pkgs; simg2img = callPackage ../tools/filesystems/simg2img { }; + snipes = callPackage ../games/snipes { }; + socklog = callPackage ../tools/system/socklog { }; staccato = callPackage ../tools/text/staccato { }; @@ -1520,6 +1568,8 @@ with pkgs; conf = config.riot-web.conf or null; }; + roundcube = callPackage ../servers/roundcube { }; + rsbep = callPackage ../tools/backup/rsbep { }; rsyslog = callPackage ../tools/system/rsyslog { @@ -1646,6 +1696,10 @@ with pkgs; biber = callPackage ../tools/typesetting/biber { }; + blastem = callPackage ../misc/emulators/blastem { + inherit (python27Packages) pillow; + }; + blueman = callPackage ../tools/bluetooth/blueman { withPulseAudio = config.pulseaudio or true; }; @@ -1790,6 +1844,8 @@ with pkgs; cmst = libsForQt5.callPackage ../tools/networking/cmst { }; + codimd = callPackage ../servers/web-apps/codimd { }; + colord = callPackage ../tools/misc/colord { }; colord-gtk = callPackage ../tools/misc/colord-gtk { }; @@ -1899,6 +1955,12 @@ with pkgs; }; uniemoji = callPackage ../tools/inputmethods/ibus-engines/ibus-uniemoji { }; + + typing-booster-unwrapped = callPackage ../tools/inputmethods/ibus-engines/ibus-typing-booster { }; + + typing-booster = callPackage ../tools/inputmethods/ibus-engines/ibus-typing-booster/wrapper.nix { + typing-booster = ibus-engines.typing-booster-unwrapped; + }; }; ibus-with-plugins = callPackage ../tools/inputmethods/ibus/wrapper.nix { @@ -1959,11 +2021,8 @@ with pkgs; cool-retro-term = libsForQt5.callPackage ../applications/misc/cool-retro-term { }; - coreutils = callPackage ../tools/misc/coreutils { - aclSupport = stdenv.isLinux; - attrSupport = stdenv.isLinux; - }; - + coreutils = callPackage ../tools/misc/coreutils { }; + coreutils-full = coreutils.override { minimal = false; }; coreutils-prefixed = coreutils.override { withPrefix = true; singleBinary = false; }; corkscrew = callPackage ../tools/networking/corkscrew { }; @@ -2291,6 +2350,8 @@ with pkgs; tealdeer = callPackage ../tools/misc/tealdeer { }; + teamocil = callPackage ../tools/misc/teamocil { }; + uudeview = callPackage ../tools/misc/uudeview { }; uutils-coreutils = callPackage ../tools/misc/uutils-coreutils { @@ -2303,6 +2364,8 @@ with pkgs; buildEmscriptenPackage = callPackage ../development/em-modules/generic { }; + carp = callPackage ../development/compilers/carp { }; + emscriptenVersion = "1.37.36"; emscripten = callPackage ../development/compilers/emscripten { }; @@ -2345,7 +2408,9 @@ with pkgs; enblend-enfuse = callPackage ../tools/graphics/enblend-enfuse { }; - cryfs = callPackage ../tools/filesystems/cryfs { }; + cryfs = callPackage ../tools/filesystems/cryfs { + spdlog = spdlog_0; + }; encfs = callPackage ../tools/filesystems/encfs { tinyxml2 = tinyxml-2; @@ -2383,7 +2448,9 @@ with pkgs; exa = callPackage ../tools/misc/exa { }; - exempi = callPackage ../development/libraries/exempi { }; + exempi = callPackage ../development/libraries/exempi { + stdenv = if stdenv.isi686 then overrideCC stdenv gcc6 else stdenv; + }; execline = skawarePackages.execline; @@ -2545,6 +2612,8 @@ with pkgs; feedgnuplot = callPackage ../tools/graphics/feedgnuplot { }; + fbv = callPackage ../tools/graphics/fbv { }; + fim = callPackage ../tools/graphics/fim { }; flac123 = callPackage ../applications/audio/flac123 { }; @@ -2746,9 +2815,9 @@ with pkgs; gitkraken = callPackage ../applications/version-management/gitkraken { }; gitlab = callPackage ../applications/version-management/gitlab { }; + gitlab-ee = callPackage ../applications/version-management/gitlab { gitlabEnterprise = true; }; gitlab-runner = callPackage ../development/tools/continuous-integration/gitlab-runner { }; - gitlab-runner_1_11 = callPackage ../development/tools/continuous-integration/gitlab-runner/v1.nix { }; gitlab-shell = callPackage ../applications/version-management/gitlab-shell { }; @@ -2909,7 +2978,10 @@ with pkgs; }) (x: { configureFlags = x.configureFlags ++ ["--with-cgraph=no"];}); grin = callPackage ../tools/text/grin { }; - ripgrep = callPackage ../tools/text/ripgrep { }; + + ripgrep = callPackage ../tools/text/ripgrep { + inherit (darwin.apple_sdk.frameworks) Security; + }; grive2 = callPackage ../tools/filesystems/grive2 { }; @@ -2931,6 +3003,7 @@ with pkgs; grub = pkgsi686Linux.callPackage ../tools/misc/grub { buggyBiosCDSupport = config.grub.buggyBiosCDSupport or true; + stdenv = overrideCC stdenv pkgsi686Linux.gcc6; }; trustedGrub = pkgsi686Linux.callPackage ../tools/misc/grub/trusted.nix { }; @@ -3194,6 +3267,8 @@ with pkgs; hwinfo = callPackage ../tools/system/hwinfo { }; + hylafaxplus = callPackage ../servers/hylafaxplus { }; + i2c-tools = callPackage ../os-specific/linux/i2c-tools { }; i2p = callPackage ../tools/networking/i2p {}; @@ -3351,12 +3426,10 @@ with pkgs; isync = callPackage ../tools/networking/isync { }; isyncUnstable = callPackage ../tools/networking/isync/unstable.nix { }; - ivan = callPackage ../games/ivan { }; - jaaa = callPackage ../applications/audio/jaaa { }; jackett = callPackage ../servers/jackett { - mono = mono50; + mono = mono5; }; jade = callPackage ../tools/text/sgml/jade { }; @@ -3532,8 +3605,7 @@ with pkgs; lesspipe = callPackage ../tools/misc/lesspipe { }; liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix { - ffmpeg = ffmpeg_2; - ocamlPackages = ocaml-ng.ocamlPackages_4_02; + ffmpeg = ffmpeg-full; }; lksctp-tools = callPackage ../os-specific/linux/lksctp-tools { }; @@ -3571,6 +3643,8 @@ with pkgs; lvmsync = callPackage ../tools/backup/lvmsync { }; + kdbg = libsForQt5.callPackage ../development/tools/misc/kdbg { }; + kippo = callPackage ../servers/kippo { }; kzipmix = pkgsi686Linux.callPackage ../tools/compression/kzipmix { }; @@ -3603,8 +3677,6 @@ with pkgs; mmv = callPackage ../tools/misc/mmv { }; - morituri = callPackage ../applications/audio/morituri { }; - most = callPackage ../tools/misc/most { }; motion = callPackage ../applications/video/motion { }; @@ -3680,11 +3752,11 @@ with pkgs; nodejs-slim-8_x = callPackage ../development/web/nodejs/v8.nix { enableNpm = false; }; nodejs-10_x = callPackage ../development/web/nodejs/v10.nix { - openssl = openssl_1_1_0; + openssl = openssl_1_1; }; nodejs-slim-10_x = callPackage ../development/web/nodejs/v10.nix { enableNpm = false; - openssl = openssl_1_1_0; + openssl = openssl_1_1; }; nodePackages_10_x = callPackage ../development/node-packages/default-v10.nix { @@ -3703,6 +3775,8 @@ with pkgs; npm2nix = nodePackages.npm2nix; + now-cli = callPackage ../development/web/now-cli {}; + file-rename = callPackage ../tools/filesystems/file-rename { }; kea = callPackage ../tools/networking/kea { @@ -3720,7 +3794,7 @@ with pkgs; ldapvi = callPackage ../tools/misc/ldapvi { }; ldns = callPackage ../development/libraries/ldns { - openssl = openssl_1_1_0; + openssl = openssl_1_1; }; leafpad = callPackage ../applications/editors/leafpad { }; @@ -3743,6 +3817,8 @@ with pkgs; libfann = callPackage ../development/libraries/libfann { }; + libgaminggear = callPackage ../development/libraries/libgaminggear { }; + libipfix = callPackage ../development/libraries/libipfix { }; libircclient = callPackage ../development/libraries/libircclient { }; @@ -3816,6 +3892,8 @@ with pkgs; libwebsockets = callPackage ../development/libraries/libwebsockets { }; + lidarr = callPackage ../servers/lidarr { }; + limesuite = callPackage ../applications/misc/limesuite { }; limesurvey = callPackage ../servers/limesurvey { }; @@ -3912,6 +3990,8 @@ with pkgs; makerpm = callPackage ../development/tools/makerpm { }; + makefile2graph = callPackage ../development/tools/analysis/makefile2graph { }; + # See https://github.com/NixOS/nixpkgs/issues/15849. I'm switching on isLinux because # it looks like gnulib is broken on non-linux, so it seems likely that this would cause # trouble on bsd and/or cygwin as well. @@ -3995,6 +4075,8 @@ with pkgs; mgba = libsForQt5.callPackage ../misc/emulators/mgba { }; + midisheetmusic = callPackage ../applications/audio/midisheetmusic { }; + mikutter = callPackage ../applications/networking/instant-messengers/mikutter { }; mimeo = callPackage ../tools/misc/mimeo { }; @@ -4257,9 +4339,7 @@ with pkgs; pulsemixer = callPackage ../tools/audio/pulsemixer { }; - pwsafe = callPackage ../applications/misc/pwsafe { - wxGTK = wxGTK30; - }; + pwsafe = callPackage ../applications/misc/pwsafe { }; niff = callPackage ../tools/package-management/niff { }; @@ -4573,6 +4653,7 @@ with pkgs; pcsc-cyberjack = callPackage ../tools/security/pcsc-cyberjack { }; pcsc-scm-scl011 = callPackage ../tools/security/pcsc-scm-scl011 { }; + ifdnfc = callPackage ../tools/security/ifdnfc { }; pdd = python3Packages.callPackage ../tools/misc/pdd { }; @@ -4586,6 +4667,8 @@ with pkgs; pdfcrack = callPackage ../tools/security/pdfcrack { }; + pdftag = callPackage ../tools/graphics/pdftag { }; + pdf2svg = callPackage ../tools/graphics/pdf2svg { }; fmodex = callPackage ../games/zandronum/fmod.nix { }; @@ -4857,6 +4940,8 @@ with pkgs; qtikz = libsForQt5.callPackage ../applications/graphics/ktikz { }; + quickserve = callPackage ../tools/networking/quickserve { }; + quicktun = callPackage ../tools/networking/quicktun { }; quilt = callPackage ../development/tools/quilt { }; @@ -4899,10 +4984,12 @@ with pkgs; redir = callPackage ../tools/networking/redir { }; - redmine = callPackage ../applications/version-management/redmine { }; + redmine = callPackage ../applications/version-management/redmine { ruby = pkgs.ruby_2_4; }; redsocks = callPackage ../tools/networking/redsocks { }; + richgo = callPackage ../development/tools/richgo { }; + rst2html5 = callPackage ../tools/text/rst2html5 { }; rt = callPackage ../servers/rt { }; @@ -5150,6 +5237,8 @@ with pkgs; seqdiag = with python3Packages; toPythonApplication seqdiag; + sewer = callPackage ../tools/admin/sewer { }; + screenfetch = callPackage ../tools/misc/screenfetch { }; sg3_utils = callPackage ../tools/system/sg3_utils { }; @@ -5372,6 +5461,8 @@ with pkgs; tlsSupport = true; }; + ssocr = callPackage ../applications/misc/ssocr { }; + ssss = callPackage ../tools/security/ssss { }; stabber = callPackage ../misc/stabber { }; @@ -5431,6 +5522,8 @@ with pkgs; staruml = callPackage ../tools/misc/staruml { inherit (gnome2) GConf; libgcrypt = libgcrypt_1_5; }; + systrayhelper = callPackage ../tools/misc/systrayhelper {}; + otter-browser = qt5.callPackage ../applications/networking/browsers/otter {}; privoxy = callPackage ../tools/networking/privoxy { @@ -5473,11 +5566,15 @@ with pkgs; teamviewer = libsForQt5.callPackage ../applications/networking/remote/teamviewer { }; + teleconsole = callPackage ../tools/misc/teleconsole { }; + telegraf = callPackage ../servers/monitoring/telegraf { }; teleport = callPackage ../servers/teleport {}; - telepresence = callPackage ../tools/networking/telepresence { }; + telepresence = callPackage ../tools/networking/telepresence { + pythonPackages = python3Packages; + }; termplay = callPackage ../tools/misc/termplay { }; @@ -5531,6 +5628,8 @@ with pkgs; tiny8086 = callPackage ../applications/virtualization/8086tiny { }; + tinyemu = callPackage ../applications/virtualization/tinyemu { }; + tinyproxy = callPackage ../tools/networking/tinyproxy {}; tio = callPackage ../tools/misc/tio { }; @@ -5564,7 +5663,7 @@ with pkgs; tokei = callPackage ../development/tools/misc/tokei { }; tor = callPackage ../tools/security/tor { - openssl = openssl_1_1_0; + openssl = openssl_1_1; # remove this, when libevent's openssl is upgraded to 1_1_0 or newer. libevent = libevent.override { sslSupport = false; @@ -5573,7 +5672,9 @@ with pkgs; tor-arm = callPackage ../tools/security/tor/tor-arm.nix { }; - tor-browser-bundle-bin = callPackage ../applications/networking/browsers/tor-browser-bundle-bin { }; + tor-browser-bundle-bin = callPackage ../applications/networking/browsers/tor-browser-bundle-bin { + inherit (gnome3) defaultIconTheme; + }; tor-browser-bundle = callPackage ../applications/networking/browsers/tor-browser-bundle { stdenv = stdenvNoCC; @@ -5677,6 +5778,8 @@ with pkgs; stdenv = overrideCC stdenv gcc6; # doesn't build with gcc7 }; + uftrace = callPackage ../development/tools/uftrace { }; + uget = callPackage ../tools/networking/uget { }; uget-integrator = callPackage ../tools/networking/uget-integrator { }; @@ -5721,6 +5824,8 @@ with pkgs; vampire = callPackage ../applications/science/logic/vampire {}; + vk-messenger = callPackage ../applications/networking/instant-messengers/vk-messenger {}; + volatility = callPackage ../tools/security/volatility { }; vbetool = callPackage ../tools/system/vbetool { }; @@ -5818,8 +5923,16 @@ with pkgs; wbox = callPackage ../tools/networking/wbox {}; + webassemblyjs-cli = nodePackages."@webassemblyjs/cli"; + webassemblyjs-repl = nodePackages."@webassemblyjs/repl"; + wasm-strip = nodePackages."@webassemblyjs/wasm-strip"; + wasm-text-gen = nodePackages."@webassemblyjs/wasm-text-gen"; + wast-refmt = nodePackages."@webassemblyjs/wast-refmt"; + welkin = callPackage ../tools/graphics/welkin {}; + whipper = callPackage ../applications/audio/whipper { }; + whois = callPackage ../tools/networking/whois { }; wireguard-tools = callPackage ../tools/networking/wireguard-tools { }; @@ -6040,9 +6153,7 @@ with pkgs; wireguard-go = callPackage ../tools/networking/wireguard-go { }; - wkhtmltopdf = callPackage ../tools/graphics/wkhtmltopdf { - overrideDerivation = lib.overrideDerivation; - }; + wkhtmltopdf = callPackage ../tools/graphics/wkhtmltopdf { }; wml = callPackage ../development/web/wml { }; @@ -6125,7 +6236,9 @@ with pkgs; libxml2 = libxml2Python; }; - xsecurelock = callPackage ../tools/X11/xsecurelock { }; + xsecurelock = callPackage ../tools/X11/xsecurelock { + xset = xorg.xset; + }; xsel = callPackage ../tools/misc/xsel { }; @@ -6203,6 +6316,8 @@ with pkgs; zsh-git-prompt = callPackage ../shells/zsh/zsh-git-prompt { }; + zsh-history-substring-search = callPackage ../shells/zsh/zsh-history-substring-search { }; + zsh-navigation-tools = callPackage ../tools/misc/zsh-navigation-tools { }; zsh-syntax-highlighting = callPackage ../shells/zsh/zsh-syntax-highlighting { }; @@ -6227,6 +6342,8 @@ with pkgs; runtimeShell = "${runtimeShellPackage}${runtimeShellPackage.shellPath}"; runtimeShellPackage = bash; + any-nix-shell = callPackage ../shells/any-nix-shell { }; + bash = lowPrio (callPackage ../shells/bash/4.4.nix { }); # WARNING: this attribute is used by nix-shell so it shouldn't be removed/renamed @@ -6308,10 +6425,6 @@ with pkgs; binaryen = callPackage ../development/compilers/binaryen { }; - boo = callPackage ../development/compilers/boo { - inherit (gnome2) gtksourceview; - }; - colm = callPackage ../development/compilers/colm { }; fetchegg = callPackage ../build-support/fetchegg { }; @@ -6349,6 +6462,7 @@ with pkgs; }; }; + clang_7 = llvmPackages_7.clang; clang_6 = llvmPackages_6.clang; clang_5 = llvmPackages_5.clang; clang_4 = llvmPackages_4.clang; @@ -6390,7 +6504,16 @@ with pkgs; ''; }); - crystal = callPackage ../development/compilers/crystal { }; + inherit (callPackages ../development/compilers/crystal {}) + crystal_0_25 + crystal_0_26 + crystal; + + icr = callPackage ../development/tools/icr {}; + + scry = callPackage ../development/tools/scry {}; + + dbmate = callPackage ../development/tools/database/dbmate { }; devpi-client = callPackage ../development/tools/devpi-client {}; @@ -6488,7 +6611,6 @@ with pkgs; libcCross1 = if stdenv.targetPlatform.libc == "msvcrt" then targetPackages.windows.mingw_w64_headers else if stdenv.targetPlatform.libc == "libSystem" then darwin.xcode - else if stdenv.targetPlatform.libc == "musl" then musl else null; binutils1 = wrapBintoolsWith { bintools = binutils-unwrapped; @@ -6694,7 +6816,8 @@ with pkgs; ncurses = pkgsi686Linux.ncurses5; }; gcc-arm-embedded-6 = callPackage ../development/compilers/gcc-arm-embedded/6 {}; - gcc-arm-embedded = gcc-arm-embedded-6; + gcc-arm-embedded-7 = callPackage ../development/compilers/gcc-arm-embedded/7 {}; + gcc-arm-embedded = gcc-arm-embedded-7; gforth = callPackage ../development/compilers/gforth {}; @@ -6910,7 +7033,7 @@ with pkgs; jikes = callPackage ../development/compilers/jikes { }; - julia = callPackage ../development/compilers/julia { + julia_06 = callPackage ../development/compilers/julia { gmp = gmp6; openblas = openblasCompat; inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; @@ -6929,6 +7052,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; }; + julia = julia_06; + jwasm = callPackage ../development/compilers/jwasm { }; kotlin = callPackage ../development/compilers/kotlin { }; @@ -6947,15 +7072,18 @@ with pkgs; lld_4 = llvmPackages_4.lld; lld_5 = llvmPackages_5.lld; lld_6 = llvmPackages_6.lld; + lld_7 = llvmPackages_7.lld; lldb = llvmPackages.lldb; lldb_4 = llvmPackages_4.lldb; lldb_5 = llvmPackages_5.lldb; lldb_6 = llvmPackages_6.lldb; + lldb_7 = llvmPackages_7.lldb; llvm = llvmPackages.llvm; llvm-manpages = llvmPackages.llvm-manpages; + llvm_7 = llvmPackages_7.llvm; llvm_6 = llvmPackages_6.llvm; llvm_5 = llvmPackages_5.llvm; llvm_4 = llvmPackages_4.llvm; @@ -7020,6 +7148,14 @@ with pkgs; stdenv = overrideCC stdenv buildPackages.gcc6; # with gcc-7: undefined reference to `__divmoddi4' }); + llvmPackages_7 = callPackage ../development/compilers/llvm/7 ({ + inherit (stdenvAdapters) overrideCC; + buildLlvmTools = buildPackages.llvmPackages_7.tools; + targetLlvmLibraries = targetPackages.llvmPackages_7.libraries; + } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + stdenv = overrideCC stdenv buildPackages.gcc6; # with gcc-7: undefined reference to `__divmoddi4' + }); + manticore = callPackage ../development/compilers/manticore { }; mentorToolchains = recurseIntoAttrs ( @@ -7046,7 +7182,13 @@ with pkgs; mkcl = callPackage ../development/compilers/mkcl {}; - mlton = callPackage ../development/compilers/mlton { }; + inherit (callPackage ../development/compilers/mlton {}) + mlton20130715 + mlton20180207Binary + mlton20180207 + mltonHEAD; + + mlton = mlton20180207; mono = mono5; mono5 = mono58; @@ -7137,7 +7279,8 @@ with pkgs; opaline = callPackage ../development/tools/ocaml/opaline { }; - opam = callPackage ../development/tools/ocaml/opam { + opam = callPackage ../development/tools/ocaml/opam { }; + opam_1_2 = callPackage ../development/tools/ocaml/opam/1.2.2.nix { inherit (ocaml-ng.ocamlPackages_4_05) ocaml; }; @@ -7164,11 +7307,14 @@ with pkgs; }); inherit (rust) cargo rustc; - buildRustCrate = callPackage ../build-support/rust/build-rust-crate.nix { }; + buildRustCrate = callPackage ../build-support/rust/build-rust-crate { }; + buildRustCrateTests = recurseIntoAttrs (callPackage ../build-support/rust/build-rust-crate/test { }).tests; cargo-vendor = callPackage ../build-support/rust/cargo-vendor { }; - cargo-web = callPackage ../development/tools/cargo-web { }; + cargo-web = callPackage ../development/tools/cargo-web { + inherit (darwin.apple_sdk.frameworks) CoreServices Security; + }; carnix = (callPackage ../build-support/rust/carnix.nix { }).carnix { }; @@ -7467,8 +7613,6 @@ with pkgs; ### LUA MODULES - lua4 = callPackage ../development/interpreters/lua-4 { }; - lua5_0 = callPackage ../development/interpreters/lua-5/5.0.3.nix { }; lua5_1 = callPackage ../development/interpreters/lua-5/5.1.nix { }; lua5_2 = callPackage ../development/interpreters/lua-5/5.2.nix { }; lua5_2_compat = callPackage ../development/interpreters/lua-5/5.2.nix { @@ -7552,7 +7696,7 @@ with pkgs; ocropus = callPackage ../applications/misc/ocropus { }; - inherit (callPackages ../development/interpreters/perl {}) perl522 perl524 perl526 perl528; + inherit (callPackages ../development/interpreters/perl {}) perl526 perl528 perldevel; pachyderm = callPackage ../applications/networking/cluster/pachyderm { }; @@ -7774,7 +7918,9 @@ with pkgs; tcl-8_5 = callPackage ../development/interpreters/tcl/8.5.nix { }; tcl-8_6 = callPackage ../development/interpreters/tcl/8.6.nix { }; - wasm = callPackage ../development/interpreters/wasm { }; + proglodyte-wasm = callPackage ../development/interpreters/proglodyte-wasm { }; + + wasm-gc = callPackage ../development/interpreters/wasm-gc { }; ### DEVELOPMENT / MISC @@ -7819,9 +7965,7 @@ with pkgs; jython = callPackage ../development/interpreters/jython {}; - guile-cairo = callPackage ../development/guile-modules/guile-cairo { - guile = guile_2_0; - }; + guile-cairo = callPackage ../development/guile-modules/guile-cairo { }; guile-fibers = callPackage ../development/guile-modules/guile-fibers { }; @@ -7867,6 +8011,10 @@ with pkgs; ### DEVELOPMENT / TOOLS + abi-compliance-checker = callPackage ../development/tools/misc/abi-compliance-checker { }; + + 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. @@ -7875,10 +8023,13 @@ with pkgs; for more information. ''; - alloy = callPackage ../development/tools/alloy { }; - adtool = callPackage ../tools/admin/adtool { }; + inherit (callPackage ../development/tools/alloy { }) + alloy4 + alloy5 + alloy; + augeas = callPackage ../tools/system/augeas { }; inherit (callPackages ../tools/admin/ansible {}) @@ -7903,12 +8054,13 @@ with pkgs; apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { }; ant = apacheAnt; - apacheKafka = apacheKafka_1_1; + apacheKafka = apacheKafka_2_0; apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; }; apacheKafka_0_10 = callPackage ../servers/apache-kafka { majorVersion = "0.10"; }; apacheKafka_0_11 = callPackage ../servers/apache-kafka { majorVersion = "0.11"; }; apacheKafka_1_0 = callPackage ../servers/apache-kafka { majorVersion = "1.0"; }; apacheKafka_1_1 = callPackage ../servers/apache-kafka { majorVersion = "1.1"; }; + apacheKafka_2_0 = callPackage ../servers/apache-kafka { majorVersion = "2.0"; }; kt = callPackage ../tools/misc/kt {}; @@ -7956,6 +8108,11 @@ with pkgs; inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; }; + bazel_jdk10 = callPackage ../development/tools/build-managers/bazel { + inherit (darwin) cctools; + inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; + runJdk = jdk10; + }; bazel-buildtools = callPackage ../development/tools/build-managers/bazel/buildtools { }; buildifier = bazel-buildtools; @@ -7966,6 +8123,8 @@ with pkgs; buildBazelPackage = buildBazelPackage.override { enableNixHacks = false; }; }; + bazel-watcher = callPackage ../development/tools/bazel-watcher { }; + buildBazelPackage = callPackage ../build-support/build-bazel-package { }; bear = callPackage ../development/tools/build-managers/bear { }; @@ -8004,21 +8163,6 @@ with pkgs; buck = callPackage ../development/tools/build-managers/buck { }; - buildbot = callPackage ../development/tools/build-managers/buildbot { - pythonPackages = python2Packages; - }; - buildbot-worker = callPackage ../development/tools/build-managers/buildbot/worker.nix { - pythonPackages = python2Packages; - }; - buildbot-pkg = callPackage ../development/tools/build-managers/buildbot/pkg.nix { - inherit (python2Packages) buildPythonPackage fetchPypi setuptools; - }; - buildbot-plugins = callPackages ../development/tools/build-managers/buildbot/plugins.nix { - pythonPackages = python2Packages; - }; - buildbot-ui = buildbot.withPlugins (with self.buildbot-plugins; [ www ]); - buildbot-full = buildbot.withPlugins (with self.buildbot-plugins; [ www console-view waterfall-view grid-view wsgi-dashboards ]); - buildkite-agent = buildkite-agent2; buildkite-agent2 = callPackage ../development/tools/continuous-integration/buildkite-agent/2.x.nix { }; buildkite-agent3 = callPackage ../development/tools/continuous-integration/buildkite-agent/3.x.nix { }; @@ -8133,6 +8277,8 @@ with pkgs; cppcheck = callPackage ../development/tools/analysis/cppcheck { }; + cpplint = callPackage ../development/tools/analysis/cpplint { }; + cquery = callPackage ../development/tools/misc/cquery { llvmPackages = llvmPackages_6; }; @@ -8357,7 +8503,9 @@ with pkgs; inherit (perlPackages) LocaleGettext; }; - heroku = callPackage ../development/tools/heroku { }; + heroku = callPackage ../development/tools/heroku { + nodejs = nodejs-10_x; + }; htmlunit-driver = callPackage ../development/tools/selenium/htmlunit-driver { }; @@ -8376,7 +8524,7 @@ with pkgs; }; include-what-you-use = callPackage ../development/tools/analysis/include-what-you-use { - llvmPackages = llvmPackages_4; + llvmPackages = llvmPackages_6; }; indent = callPackage ../development/tools/misc/indent { }; @@ -8427,6 +8575,8 @@ with pkgs; kythe = callPackage ../development/tools/kythe { }; + lazygit = callPackage ../development/tools/lazygit { }; + Literate = callPackage ../development/tools/literate-programming/Literate {}; lcov = callPackage ../development/tools/analysis/lcov { }; @@ -8480,7 +8630,7 @@ with pkgs; msitools = callPackage ../development/tools/misc/msitools { }; - multi-ghc-travis = haskell.lib.justStaticExecutables haskellPackages.multi-ghc-travis; + haskell-ci = haskell.lib.justStaticExecutables haskellPackages.haskell-ci; neoload = callPackage ../development/tools/neoload { licenseAccepted = (config.neoload.accept_license or false); @@ -8493,8 +8643,6 @@ with pkgs; nailgun = callPackage ../development/tools/nailgun { }; - nant = callPackage ../development/tools/build-managers/nant { }; - ninja = callPackage ../development/tools/build-managers/ninja { }; gn = callPackage ../development/tools/build-managers/gn { }; @@ -8509,6 +8657,11 @@ with pkgs; gconf = pkgs.gnome2.GConf; }; + nwjs-sdk = callPackage ../development/tools/nwjs { + gconf = pkgs.gnome2.GConf; + sdk = true; + }; + # only kept for nixui, see https://github.com/matejc/nixui/issues/27 nwjs_0_12 = callPackage ../development/tools/node-webkit/nw12.nix { gconf = pkgs.gnome2.GConf; @@ -8781,7 +8934,6 @@ with pkgs; valgrind = callPackage ../development/tools/analysis/valgrind { inherit (darwin) xnu bootstrap_cmds cctools; - llvm = llvm_39; }; valgrind-light = self.valgrind.override { gdb = null; }; @@ -8801,6 +8953,8 @@ with pkgs; pythonPackages = python3Packages; }; + vtable-dumper = callPackage ../development/tools/misc/vtable-dumper { }; + watson-ruby = callPackage ../development/tools/misc/watson-ruby {}; xc3sprog = callPackage ../development/tools/misc/xc3sprog { }; @@ -8966,6 +9120,7 @@ with pkgs; bobcat = callPackage ../development/libraries/bobcat { }; boehmgc = callPackage ../development/libraries/boehm-gc { }; + boehmgc_766 = callPackage ../development/libraries/boehm-gc/7.6.6.nix { }; boolstuff = callPackage ../development/libraries/boolstuff { }; @@ -9293,23 +9448,18 @@ with pkgs; ffmpeg_0_10 = callPackage ../development/libraries/ffmpeg/0.10.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; - stdenv = gccStdenv; }; ffmpeg_1_2 = callPackage ../development/libraries/ffmpeg/1.2.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; - stdenv = gccStdenv; }; ffmpeg_2_8 = callPackage ../development/libraries/ffmpeg/2.8.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; - stdenv = gccStdenv; }; ffmpeg_3_4 = callPackage ../development/libraries/ffmpeg/3.4.nix { inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia; - stdenv = gccStdenv; }; ffmpeg_4 = callPackage ../development/libraries/ffmpeg/4.nix { inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia; - stdenv = gccStdenv; }; # Aliases @@ -9365,6 +9515,8 @@ with pkgs; flyway = callPackage ../development/tools/flyway { }; + fmt = callPackage ../development/libraries/fmt/default.nix { }; + fplll = callPackage ../development/libraries/fplll {}; fplll_20160331 = callPackage ../development/libraries/fplll/20160331.nix {}; @@ -9516,6 +9668,14 @@ with pkgs; installLocales = config.glibc.locales or false; }; + # Provided by libc on Operating Systems that use the Extensible Linker Format. + elf-header = + if stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf" + then null + else elf-header-real; + + elf-header-real = callPackage ../development/libraries/elf-header { }; + glibc_memusage = callPackage ../development/libraries/glibc { installLocales = false; withGd = true; @@ -9999,9 +10159,7 @@ with pkgs; jsoncpp = callPackage ../development/libraries/jsoncpp { }; - jsonnet = callPackage ../development/compilers/jsonnet { - emscripten = emscripten.override {python=python2;}; - }; + jsonnet = callPackage ../development/compilers/jsonnet { }; jsonrpc-glib = callPackage ../development/libraries/jsonrpc-glib { }; @@ -10155,7 +10313,11 @@ with pkgs; inherit (xorg) libX11 libXext; }; - libcanberra = callPackage ../development/libraries/libcanberra { }; + libcacard = callPackage ../development/libraries/libcacard { }; + + libcanberra = callPackage ../development/libraries/libcanberra { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; libcanberra-gtk3 = pkgs.libcanberra.override { gtk = gtk3; }; @@ -10383,6 +10545,8 @@ with pkgs; libgrss = callPackage ../development/libraries/libgrss { }; + libiio = callPackage ../development/libraries/libiio { }; + libseccomp = callPackage ../development/libraries/libseccomp { }; libsecret = callPackage ../development/libraries/libsecret { }; @@ -10513,6 +10677,7 @@ with pkgs; libiodbc = callPackage ../development/libraries/libiodbc { useGTK = config.libiodbc.gtk or false; + inherit (darwin.apple_sdk.frameworks) Carbon; }; libivykis = callPackage ../development/libraries/libivykis { }; @@ -10646,6 +10811,8 @@ with pkgs; libiec61883 = callPackage ../development/libraries/libiec61883 { }; + libimagequant = callPackage ../development/libraries/libimagequant {}; + libinfinity = callPackage ../development/libraries/libinfinity { }; libinput = callPackage ../development/libraries/libinput { @@ -11143,37 +11310,32 @@ with pkgs; ## libGL/libGLU/Mesa stuff # Default libGL implementation, should provide headers and libGL.so/libEGL.so/... to link agains them - libGL = libGLDarwinOr mesa_noglu.stubs; + libGL = mesa_noglu.stubs; # Default libGLU - libGLU = libGLDarwinOr mesa_glu; + libGLU = mesa_glu; # Combined derivation, contains both libGL and libGLU # Please, avoid using this attribute. It was meant as transitional hack # for packages that assume that libGLU and libGL live in the same prefix. # libGLU_combined propagates both libGL and libGLU - libGLU_combined = libGLDarwinOr (buildEnv { + libGLU_combined = buildEnv { name = "libGLU-combined"; paths = [ libGL libGLU ]; extraOutputsToInstall = [ "dev" ]; - }); + }; # Default derivation with libGL.so.1 to link into /run/opengl-drivers (if need) - libGL_driver = libGLDarwinOr mesa_drivers; + libGL_driver = mesa_drivers; libGLSupported = lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms; - libGLDarwin = callPackage ../development/libraries/mesa-darwin { - inherit (darwin.apple_sdk.frameworks) OpenGL; - inherit (darwin.apple_sdk.libs) Xplugin; - inherit (darwin) apple_sdk; - }; - - libGLDarwinOr = alternative: if stdenv.isDarwin then libGLDarwin else alternative; - mesa_noglu = callPackage ../development/libraries/mesa { llvmPackages = llvmPackages_6; + inherit (darwin.apple_sdk.frameworks) OpenGL; + inherit (darwin.apple_sdk.libs) Xplugin; }; + mesa = mesa_noglu; mesa_glu = callPackage ../development/libraries/mesa-glu { }; @@ -11240,6 +11402,8 @@ with pkgs; mtpfs = callPackage ../tools/filesystems/mtpfs { }; + mtxclient = callPackage ../development/libraries/mtxclient { }; + mu = callPackage ../tools/networking/mu { texinfo = texinfo4; }; @@ -11438,7 +11602,7 @@ with pkgs; }; }) openssl_1_0_2 - openssl_1_1_0; + openssl_1_1; openssl-chacha = callPackage ../development/libraries/openssl/chacha.nix { cryptodevHeaders = linuxPackages.cryptodev.override { @@ -11469,8 +11633,6 @@ with pkgs; paperkey = callPackage ../tools/security/paperkey { }; - parquet-cpp = callPackage ../development/libraries/parquet-cpp {}; - pangoxsl = callPackage ../development/libraries/pangoxsl { }; pcaudiolib = callPackage ../development/libraries/pcaudiolib { @@ -11546,10 +11708,8 @@ with pkgs; introspectionSupport = true; }); - poppler_min = poppler_0_61.override { # TODO: maybe reduce even more + poppler_min = poppler.override { # TODO: maybe reduce even more # this is currently only used by texlive.bin. - # pinned to 0.61 because texlive 2017 doesn't build w/poppler 0.64 - # TODO: review poppler version for texlive 2018 minimal = true; suffix = "min"; }; @@ -11582,8 +11742,9 @@ with pkgs; postgis = callPackage ../development/libraries/postgis { }; - protobuf = protobuf3_4; + protobuf = protobuf3_6; + protobuf3_6 = callPackage ../development/libraries/protobuf/3.6.nix { }; protobuf3_5 = callPackage ../development/libraries/protobuf/3.5.nix { }; protobuf3_4 = callPackage ../development/libraries/protobuf/3.4.nix { }; protobuf3_1 = callPackage ../development/libraries/protobuf/3.1.nix { }; @@ -11711,7 +11872,7 @@ with pkgs; kservice ktexteditor ktextwidgets kunitconversion kwallet kwayland kwidgetsaddons kwindowsystem kxmlgui kxmlrpcclient modemmanager-qt networkmanager-qt plasma-framework prison solid sonnet syntax-highlighting - threadweaver kirigami2 kholidays kpurpose; + syndication threadweaver kirigami2 kholidays kpurpose; ### KDE PLASMA 5 @@ -11841,6 +12002,8 @@ with pkgs; rabbitmq-java-client = callPackage ../development/libraries/rabbitmq-java-client {}; + rapidcheck = callPackage ../development/libraries/rapidcheck {}; + rapidjson = callPackage ../development/libraries/rapidjson {}; raul = callPackage ../development/libraries/audio/raul { }; @@ -11895,6 +12058,8 @@ with pkgs; qrupdate = callPackage ../development/libraries/qrupdate { }; + qgnomeplatform = libsForQt5.callPackage ../development/libraries/qgnomeplatform { }; + resolv_wrapper = callPackage ../development/libraries/resolv_wrapper { }; rhino = callPackage ../development/libraries/java/rhino { @@ -12023,6 +12188,7 @@ with pkgs; s6-rc = callPackage ../tools/system/s6-rc { }; nsss = callPackage ../development/libraries/nsss { }; + utmps = callPackage ../development/libraries/utmps { }; }; @@ -12231,6 +12397,8 @@ with pkgs; telepathy-qt = callPackage ../development/libraries/telepathy/qt { qtbase = qt4; }; + termbox = callPackage ../development/libraries/termbox { }; + tevent = callPackage ../development/libraries/tevent { python = python2; }; @@ -12312,6 +12480,8 @@ with pkgs; uthash = callPackage ../development/libraries/uthash { }; + utmps = skawarePackages.utmps; + ucommon = ucommon_openssl; ucommon_openssl = callPackage ../development/libraries/ucommon { @@ -12431,6 +12601,13 @@ with pkgs; stdenv = overrideCC stdenv gcc6; }; + webkitgtk222x = callPackage ../development/libraries/webkitgtk/2.22.nix { + harfbuzz = harfbuzzFull; + inherit (gst_all_1) gst-plugins-base gst-plugins-bad; + stdenv = overrideCC stdenv gcc6; + }; + + webkitgtk24x-gtk2 = webkitgtk24x-gtk3.override { withGtk2 = true; enableIntrospection = false; @@ -12551,6 +12728,8 @@ with pkgs; yajl = callPackage ../development/libraries/yajl { }; + yojimbo = callPackage ../development/libraries/yojimbo { }; + yubioath-desktop = callPackage ../applications/misc/yubioath-desktop { }; yubico-piv-tool = callPackage ../tools/misc/yubico-piv-tool { }; @@ -12596,7 +12775,7 @@ with pkgs; zmqpp = callPackage ../development/libraries/zmqpp { }; zig = callPackage ../development/compilers/zig { - llvmPackages = llvmPackages_6; + llvmPackages = llvmPackages_7; }; zimlib = callPackage ../development/libraries/zimlib { }; @@ -12769,22 +12948,20 @@ with pkgs; ### DEVELOPMENT / PERL MODULES - perl522Packages = recurseIntoAttrs (callPackage ./perl-packages.nix { - perl = perl522; - overrides = (config.perlPackageOverrides or (p: {})) pkgs; - }); - perl524Packages = recurseIntoAttrs (callPackage ./perl-packages.nix { - perl = perl524; - overrides = (config.perlPackageOverrides or (p: {})) pkgs; - }); perl526Packages = recurseIntoAttrs (callPackage ./perl-packages.nix { perl = perl526; overrides = (config.perlPackageOverrides or (p: {})) pkgs; }); + # the latest Maint version perl528Packages = recurseIntoAttrs (callPackage ./perl-packages.nix { perl = perl528; overrides = (config.perlPackageOverrides or (p: {})) pkgs; }); + # the latest Devel version + perldevelPackages = recurseIntoAttrs (callPackage ./perl-packages.nix { + perl = perldevel; + overrides = (config.perlPackageOverrides or (p: {})) pkgs; + }); perlPackages = perl528Packages; inherit (perlPackages) perl buildPerlPackage; @@ -13120,6 +13297,8 @@ with pkgs; nas = callPackage ../servers/nas { }; + nats-streaming-server = callPackage ../servers/nats-streaming-server { }; + neard = callPackage ../servers/neard { }; nginx = nginxStable; @@ -13296,11 +13475,7 @@ with pkgs; check-esxi-hardware = callPackage ../servers/monitoring/plugins/esxi.nix {}; - net_snmp = callPackage ../servers/monitoring/net-snmp { - # https://sourceforge.net/p/net-snmp/bugs/2712/ - # remove after net-snmp > 5.7.3 - perl = perl522; - }; + net_snmp = callPackage ../servers/monitoring/net-snmp { }; newrelic-sysmond = callPackage ../servers/monitoring/newrelic-sysmond { }; @@ -13320,7 +13495,7 @@ with pkgs; softether_4_25 = callPackage ../servers/softether/4.25.nix { }; softether = softether_4_25; - qboot = callPackage ../applications/virtualization/qboot { stdenv = stdenv_32bit; }; + qboot = pkgsi686Linux.callPackage ../applications/virtualization/qboot { }; OVMF = callPackage ../applications/virtualization/OVMF { seabios = null; openssl = null; }; OVMF-CSM = OVMF.override { openssl = null; }; @@ -13330,6 +13505,8 @@ with pkgs; cbfstool = callPackage ../applications/virtualization/cbfstool { }; + nvramtool = callPackage ../tools/misc/nvramtool { }; + vmfs-tools = callPackage ../tools/filesystems/vmfs-tools { }; pgbouncer = callPackage ../servers/sql/pgbouncer { }; @@ -13384,6 +13561,7 @@ with pkgs; prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { buildGoPackage = buildGo110Package; }; + prometheus-tor-exporter = callPackage ../servers/monitoring/prometheus/tor-exporter.nix { }; prometheus-statsd-exporter = callPackage ../servers/monitoring/prometheus/statsd-bridge.nix { }; prometheus-surfboard-exporter = callPackage ../servers/monitoring/prometheus/surfboard-exporter.nix { }; prometheus-unifi-exporter = callPackage ../servers/monitoring/prometheus/unifi-exporter { }; @@ -13407,8 +13585,10 @@ with pkgs; quagga = callPackage ../servers/quagga { }; - rabbitmq_server = callPackage ../servers/amqp/rabbitmq-server { + rabbitmq-server = callPackage ../servers/amqp/rabbitmq-server { inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa; + elixir = elixir_1_6; + erlang = erlang_nox; }; radicale1 = callPackage ../servers/radicale/1.x.nix { }; @@ -13503,6 +13683,12 @@ with pkgs; # see also openssl, which has/had this same trick }; + sickbeard = callPackage ../servers/sickbeard { }; + + sickgear = callPackage ../servers/sickbeard/sickgear.nix { }; + + sickrage = callPackage ../servers/sickbeard/sickrage.nix { }; + sipcmd = callPackage ../applications/networking/sipcmd { }; sipwitch = callPackage ../servers/sip/sipwitch { }; @@ -13574,6 +13760,8 @@ with pkgs; webmetro = callPackage ../servers/webmetro { }; + webhook = callPackage ../servers/http/webhook { }; + winstone = callPackage ../servers/http/winstone { }; xinetd = callPackage ../servers/xinetd { }; @@ -13692,6 +13880,8 @@ with pkgs; bluez5 = callPackage ../os-specific/linux/bluez { }; + pulseaudio-modules-bt = callPackage ../applications/audio/pulseaudio-modules-bt { }; + bluez = bluez5; inherit (python3Packages) bedup; @@ -13848,7 +14038,7 @@ with pkgs; hwdata = callPackage ../os-specific/linux/hwdata { }; - i7z = callPackage ../os-specific/linux/i7z { }; + i7z = qt5.callPackage ../os-specific/linux/i7z { }; pcm = callPackage ../os-specific/linux/pcm { }; @@ -13950,8 +14140,8 @@ with pkgs; ]; }; - # linux mptcp is based on the 4.4 kernel - linux_mptcp = callPackage ../os-specific/linux/kernel/linux-mptcp.nix { + linux_mptcp = linux_mptcp_94; + linux_mptcp_94 = callPackage ../os-specific/linux/kernel/linux-mptcp.nix { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.cpu-cgroup-v2."4.11" @@ -14027,18 +14217,6 @@ with pkgs; # when adding a new linux version # kernelPatches.cpu-cgroup-v2."4.11" kernelPatches.modinst_arg_list_too_long - - # https://github.com/NixOS/nixpkgs/issues/45165 - # TODO: remove this patch once it is merged upstream and released. - (rec { - name = "hid-core-fix-grouping-by-application"; - patch = fetchpatch { - name = name + ".patch"; - # https://patchwork.kernel.org/patch/10587369/ - url = https://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git/patch/?id=0d6c3011409135ea84e2a231b013a22017ff999a; - sha256 = "0bdrv0aqjh0rdjlaaaqpdgrnd9452fa4ggaa1nq2kmik3q00cq4m"; - }; - }) ]; }; @@ -14225,6 +14403,8 @@ with pkgs; }) zfsStable zfsUnstable; zfs = zfsStable; + + can-isotp = callPackage ../os-specific/linux/can-isotp { }; }); # The current default kernel / kernel modules. @@ -14288,6 +14468,9 @@ with pkgs; linuxPackages_latest_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_latest); linux_latest_hardened = linuxPackages_latest_hardened.kernel; + linuxPackages_testing_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_testing); + linux_testing_hardened = linuxPackages_testing_hardened.kernel; + linuxPackages_xen_dom0_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor (pkgs.linux.override { features.xen_dom0=true; })); linuxPackages_latest_xen_dom0_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; })); @@ -14413,7 +14596,7 @@ with pkgs; nvme-cli = callPackage ../os-specific/linux/nvme-cli { }; open-vm-tools = callPackage ../applications/virtualization/open-vm-tools { - inherit (gnome2) gtk gtkmm; + inherit (gnome3) gtk gtkmm; }; open-vm-tools-headless = open-vm-tools.override { withX = false; }; @@ -14448,12 +14631,12 @@ with pkgs; godef = callPackage ../development/tools/godef { }; - goimports = callPackage ../development/tools/goimports { }; - gopkgs = callPackage ../development/tools/gopkgs { }; govers = callPackage ../development/tools/govers { }; + govendor = callPackage ../development/tools/govendor { }; + gotools = callPackage ../development/tools/gotools { }; gotop = callPackage ../tools/system/gotop { }; @@ -14537,6 +14720,8 @@ with pkgs; policycoreutils = callPackage ../os-specific/linux/policycoreutils { }; + semodule-utils = callPackage ../os-specific/linux/semodule-utils { }; + powerdns = callPackage ../servers/dns/powerdns { }; dnsdist = callPackage ../servers/dns/dnsdist { }; @@ -14588,6 +14773,8 @@ with pkgs; payload = "${linux_riscv}/vmlinux"; }; + roccat-tools = callPackage ../os-specific/linux/roccat-tools { }; + rtkit = callPackage ../os-specific/linux/rtkit { }; rt5677-firmware = callPackage ../os-specific/linux/firmware/rt5677 { }; @@ -14659,6 +14846,8 @@ with pkgs; ''; })); + systemd-wait = callPackage ../os-specific/linux/systemd-wait { }; + sysvinit = callPackage ../os-specific/linux/sysvinit { }; sysvtools = sysvinit.override { @@ -14676,6 +14865,8 @@ with pkgs; tunctl = callPackage ../os-specific/linux/tunctl { }; + twa = callPackage ../tools/networking/twa { }; + # Upstream U-Boots: inherit (callPackage ../misc/uboot {}) buildUBoot @@ -14689,6 +14880,7 @@ with pkgs; ubootNovena ubootOdroidXU3 ubootOrangePiPc + ubootOrangePiZeroPlus2H5 ubootPcduino3Nano ubootPine64 ubootQemuAarch64 @@ -14787,6 +14979,8 @@ with pkgs; andagii = callPackage ../data/fonts/andagii { }; + andika = callPackage ../data/fonts/andika { }; + android-udev-rules = callPackage ../os-specific/linux/android-udev-rules { }; anonymousPro = callPackage ../data/fonts/anonymous-pro { }; @@ -14819,6 +15013,8 @@ with pkgs; carlito = callPackage ../data/fonts/carlito {}; + charis-sil = callPackage ../data/fonts/charis-sil { }; + comfortaa = callPackage ../data/fonts/comfortaa {}; comic-neue = callPackage ../data/fonts/comic-neue { }; @@ -14877,6 +15073,8 @@ with pkgs; documentation-highlighter = callPackage ../misc/documentation-highlighter { }; + doulos-sil = callPackage ../data/fonts/doulos-sil { }; + cabin = callPackage ../data/fonts/cabin { }; camingo-code = callPackage ../data/fonts/camingo-code { }; @@ -14917,6 +15115,8 @@ with pkgs; envypn-font = callPackage ../data/fonts/envypn-font { }; + envdir = callPackage ../tools/misc/envdir-go { }; + fantasque-sans-mono = callPackage ../data/fonts/fantasque-sans-mono {}; fira = callPackage ../data/fonts/fira { }; @@ -14961,6 +15161,8 @@ with pkgs; hanazono = callPackage ../data/fonts/hanazono { }; + hyperscrypt-font = callPackage ../data/fonts/hyperscrypt { }; + ia-writer-duospace = callPackage ../data/fonts/ia-writer-duospace { }; ibm-plex = callPackage ../data/fonts/ibm-plex { }; @@ -15015,6 +15217,8 @@ with pkgs; libertinus = callPackage ../data/fonts/libertinus { }; + libratbag = callPackage ../os-specific/linux/libratbag { }; + libre-baskerville = callPackage ../data/fonts/libre-baskerville { }; libre-bodoni = callPackage ../data/fonts/libre-bodoni { }; @@ -15140,6 +15344,7 @@ with pkgs; powerline-rs = callPackage ../tools/misc/powerline-rs { inherit (darwin.apple_sdk.frameworks) Security; + openssl = openssl_1_1; }; profont = callPackage ../data/fonts/profont { }; @@ -15276,6 +15481,8 @@ with pkgs; ucs-fonts = callPackage ../data/fonts/ucs-fonts { }; + ultimate-oldschool-pc-font-pack = callPackage ../data/fonts/ultimate-oldschool-pc-font-pack { }; + uni-vga = callPackage ../data/fonts/uni-vga { }; unifont = callPackage ../data/fonts/unifont { }; @@ -15411,7 +15618,7 @@ with pkgs; inherit (vamp) vampSDK; }; - inherit (python34Packages) arelle; + inherit (python3Packages) arelle; ario = callPackage ../applications/audio/ario { }; @@ -15474,12 +15681,7 @@ with pkgs; go-ethereum = self.altcoins.go-ethereum; - ethsign = self.altcoins.ethsign; ethabi = self.altcoins.ethabi; - ethrun = self.altcoins.ethrun; - seth = self.altcoins.seth; - dapp = self.altcoins.dapp; - hevm = self.altcoins.hevm; parity = self.altcoins.parity; parity-beta = self.altcoins.parity-beta; @@ -15495,6 +15697,8 @@ with pkgs; autopanosiftc = callPackage ../applications/graphics/autopanosiftc { }; + aesop = callPackage ../applications/office/aesop { }; + avidemux = libsForQt5.callPackage ../applications/video/avidemux { }; avrdudess = callPackage ../applications/misc/avrdudess { }; @@ -15530,11 +15734,6 @@ with pkgs; barrier = callPackage ../applications/misc/barrier {}; - banshee = callPackage ../applications/audio/banshee { - gconf = pkgs.gnome2.GConf; - libgpod = pkgs.libgpod.override { monoSupport = true; }; - }; - bashSnippets = callPackage ../applications/misc/bashSnippets { }; batik = callPackage ../applications/graphics/batik { }; @@ -15606,6 +15805,12 @@ with pkgs; bluejeans = callPackage ../applications/networking/browsers/mozilla-plugins/bluejeans { }; + bluejeans-gui = callPackage ../applications/networking/instant-messengers/bluejeans { + gconf = pkgs.gnome2.GConf; + inherit (pkgs.xorg) libX11 libXrender libXtst libXdamage + libXi libXext libXfixes libXcomposite; + }; + bombono = callPackage ../applications/video/bombono {}; bomi = libsForQt5.callPackage ../applications/video/bomi { @@ -15698,6 +15903,8 @@ with pkgs; browsh = callPackage ../applications/networking/browsers/browsh { }; + bookworm = callPackage ../applications/office/bookworm { }; + chromium = callPackage ../applications/networking/browsers/chromium { channel = "stable"; pulseSupport = config.pulseaudio or true; @@ -15761,6 +15968,8 @@ with pkgs; inherit (gnome2) libgnomeui GConf; }; + csa = callPackage ../applications/audio/csa { }; + csound = callPackage ../applications/audio/csound { }; cinepaint = callPackage ../applications/graphics/cinepaint { @@ -15816,7 +16025,7 @@ with pkgs; cyclone = callPackage ../applications/audio/pd-plugins/cyclone { }; - darcs = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskell.packages.ghc802.darcs) (drv: { + darcs = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskellPackages.darcs) (drv: { configureFlags = (stdenv.lib.remove "-flibrary" drv.configureFlags or []) ++ ["-f-library"]; }); @@ -15833,6 +16042,7 @@ with pkgs; datadog-agent = callPackage ../tools/networking/dd-agent/6.nix { pythonPackages = datadog-integrations-core {}; }; + datadog-process-agent = callPackage ../tools/networking/dd-agent/datadog-process-agent.nix { }; datadog-integrations-core = extras: callPackage ../tools/networking/dd-agent/integrations-core.nix { python = python27; extraIntegrations = extras; @@ -16057,6 +16267,8 @@ with pkgs; calfw = callPackage ../applications/editors/emacs-modes/calfw { }; + cedille = callPackage ../applications/editors/emacs-modes/cedille { cedille = pkgs.cedille; }; + coffee = callPackage ../applications/editors/emacs-modes/coffee { }; colorTheme = callPackage ../applications/editors/emacs-modes/color-theme { }; @@ -16249,6 +16461,8 @@ with pkgs; eterm = callPackage ../applications/misc/eterm { }; + eteroj.lv2 = libsForQt5.callPackage ../applications/audio/eteroj.lv2 { }; + etherape = callPackage ../applications/networking/sniffers/etherape { }; evilvte = callPackage ../applications/misc/evilvte { @@ -16298,6 +16512,8 @@ with pkgs; fig2dev = callPackage ../applications/graphics/fig2dev { }; + FIL-plugins = callPackage ../applications/audio/FIL-plugins { }; + flacon = callPackage ../applications/audio/flacon { }; flexget = callPackage ../applications/networking/flexget { }; @@ -16305,8 +16521,15 @@ with pkgs; fldigi = callPackage ../applications/audio/fldigi { }; flink = callPackage ../applications/networking/cluster/flink { }; - flink_1_3 = flink.override { version = "1.3"; }; - flink_1_4 = flink.override { version = "1.4"; }; + flink_1_5 = flink.override { version = "1.5"; }; + + fllog = callPackage ../applications/misc/fllog { }; + + flmsg = callPackage ../applications/misc/flmsg { }; + + flrig = callPackage ../applications/misc/flrig { }; + + flwrap = callPackage ../applications/misc/flwrap { }; fluidsynth = callPackage ../applications/audio/fluidsynth { inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio CoreMIDI CoreServices; @@ -16360,7 +16583,7 @@ with pkgs; gnuradio-with-packages = callPackage ../applications/misc/gnuradio/wrapper.nix { inherit (python2Packages) python; - extraPackages = [ gnuradio-nacl gnuradio-osmosdr gnuradio-gsm gnuradio-ais gnuradio-rds ]; + extraPackages = [ gnuradio-nacl gnuradio-osmosdr gnuradio-gsm gnuradio-ais gnuradio-rds gnuradio-limesdr ]; }; gnuradio-nacl = callPackage ../applications/misc/gnuradio/nacl.nix { }; @@ -16369,6 +16592,8 @@ with pkgs; gnuradio-ais = callPackage ../applications/misc/gnuradio/ais.nix { }; + gnuradio-limesdr = callPackage ../applications/misc/gnuradio/limesdr.nix { }; + gnuradio-rds = callPackage ../applications/misc/gnuradio/rds.nix { }; gnuradio-osmosdr = callPackage ../applications/misc/gnuradio/osmosdr.nix { }; @@ -16548,6 +16773,8 @@ with pkgs; flac = callPackage ../applications/audio/flac { }; + redoflacs = callPackage ../applications/audio/redoflacs { }; + flameshot = libsForQt5.callPackage ../tools/misc/flameshot { }; flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer { @@ -16784,7 +17011,7 @@ with pkgs; googleearth = callPackage ../applications/misc/googleearth { }; - google-chrome = callPackage ../applications/networking/browsers/google-chrome { gconf = gnome2.GConf; }; + google-chrome = callPackage ../applications/networking/browsers/google-chrome { gconf = gnome2.GConf; patchelf = patchelfUnstable; }; google-chrome-beta = google-chrome.override { chromium = chromiumBeta; channel = "beta"; }; @@ -16848,6 +17075,8 @@ with pkgs; inherit (gnome2) gnome_python; }; + hashit = callPackage ../tools/misc/hashit { }; + hello = callPackage ../applications/misc/hello { }; hello-unfree = callPackage ../applications/misc/hello-unfree { }; @@ -16873,6 +17102,8 @@ with pkgs; gtk = gtk3; }; + howl = callPackage ../applications/editors/howl { }; + ht = callPackage ../applications/editors/ht { }; hubstaff = callPackage ../applications/misc/hubstaff { }; @@ -16903,9 +17134,7 @@ with pkgs; extra-packages = [ csound ]; }; - jackline = callPackage ../applications/networking/instant-messengers/jackline { - ocamlPackages = ocaml-ng.ocamlPackages_4_05; - }; + jackline = callPackage ../applications/networking/instant-messengers/jackline { }; slack = callPackage ../applications/networking/instant-messengers/slack { }; @@ -16913,8 +17142,12 @@ with pkgs; singularity = callPackage ../applications/virtualization/singularity { }; + spectmorph = callPackage ../applications/audio/spectmorph { }; + spectrwm = callPackage ../applications/window-managers/spectrwm { }; + spectral = qt5.callPackage ../applications/networking/instant-messengers/spectral { }; + super-productivity = callPackage ../applications/networking/super-productivity { }; wlc = callPackage ../development/libraries/wlc { }; @@ -16964,6 +17197,8 @@ with pkgs; i3-wk-switch = callPackage ../applications/window-managers/i3/wk-switch.nix { }; + wmfocus = callPackage ../applications/window-managers/i3/wmfocus.nix { }; + i810switch = callPackage ../os-specific/linux/i810switch { }; icewm = callPackage ../applications/window-managers/icewm {}; @@ -17221,7 +17456,6 @@ with pkgs; krita = libsForQt5.callPackage ../applications/graphics/krita { openjpeg = openjpeg_1; - poppler_qt5 = libsForQt5.poppler; }; krusader = libsForQt5.callPackage ../applications/misc/krusader { }; @@ -17234,6 +17468,8 @@ with pkgs; kubecfg = callPackage ../applications/networking/cluster/kubecfg { }; + kubeval = callPackage ../applications/networking/cluster/kubeval { }; + kubernetes = callPackage ../applications/networking/cluster/kubernetes { }; kubectl = (kubernetes.override { components = [ "cmd/kubectl" ]; }).overrideAttrs(oldAttrs: { @@ -17369,6 +17605,8 @@ with pkgs; lrzsz = callPackage ../tools/misc/lrzsz { }; + lsp-plugins = callPackage ../applications/audio/lsp-plugins { }; + luminanceHDR = libsForQt5.callPackage ../applications/graphics/luminance-hdr { }; lxdvdrip = callPackage ../applications/video/lxdvdrip { }; @@ -17446,6 +17684,8 @@ with pkgs; mediathekview = callPackage ../applications/video/mediathekview { }; + meteo = callPackage ../applications/networking/weather/meteo { }; + meld = callPackage ../applications/version-management/meld { }; meme = callPackage ../applications/graphics/meme { }; @@ -17456,6 +17696,8 @@ with pkgs; gconf = pkgs.gnome2.GConf; }; + menumaker = callPackage ../applications/misc/menumaker { }; + mercurial = callPackage ../applications/version-management/mercurial { inherit (darwin.apple_sdk.frameworks) ApplicationServices; guiSupport = false; # use mercurialFull to get hgk GUI @@ -17620,6 +17862,8 @@ with pkgs; mm = callPackage ../applications/networking/instant-messengers/mm { }; + matrique = libsForQt5.callPackage ../applications/networking/instant-messengers/matrique { }; + mpc-qt = libsForQt5.callPackage ../applications/video/mpc-qt { }; mplayer = callPackage ../applications/video/mplayer ({ @@ -17709,6 +17953,8 @@ with pkgs; pythonPackages = python3Packages; }; + neap = callPackage ../applications/misc/neap { }; + neomutt = callPackage ../applications/networking/mailreaders/neomutt { }; natron = callPackage ../applications/video/natron { }; @@ -17737,6 +17983,8 @@ with pkgs; pijul = callPackage ../applications/version-management/pijul {}; + piper = callPackage ../os-specific/linux/piper { }; + plank = callPackage ../applications/misc/plank { }; planner = callPackage ../applications/office/planner { }; @@ -17788,6 +18036,8 @@ with pkgs; typora = callPackage ../applications/editors/typora { }; + taxi = callPackage ../applications/networking/ftp/taxi { }; + librep = callPackage ../development/libraries/librep { }; rep-gtk = callPackage ../development/libraries/rep-gtk { }; @@ -17840,6 +18090,8 @@ with pkgs; nanoblogger = callPackage ../applications/misc/nanoblogger { }; + nanorc = callPackage ../applications/editors/nano/nanorc { }; + navipowm = callPackage ../applications/misc/navipowm { }; navit = libsForQt5.callPackage ../applications/misc/navit { }; @@ -17868,6 +18120,8 @@ with pkgs; gmime = gmime3; }; + notejot = callPackage ../applications/misc/notejot { }; + notmuch-mutt = callPackage ../applications/networking/mailreaders/notmuch/mutt.nix { }; muchsync = callPackage ../applications/networking/mailreaders/notmuch/muchsync.nix { }; @@ -17905,6 +18159,8 @@ with pkgs; ogmtools = callPackage ../applications/video/ogmtools { }; + omegat = callPackage ../applications/misc/omegat.nix { }; + omxplayer = callPackage ../applications/video/omxplayer { }; openbox = callPackage ../applications/window-managers/openbox { }; @@ -18195,6 +18451,7 @@ with pkgs; qgis = callPackage ../applications/gis/qgis { inherit (darwin.apple_sdk.frameworks) IOKit ApplicationServices; + saga = saga_2_3_2; }; qgroundcontrol = libsForQt5.callPackage ../applications/science/robotics/qgroundcontrol { }; @@ -18274,6 +18531,8 @@ with pkgs; quirc = callPackage ../tools/graphics/quirc {}; + quilter = callPackage ../applications/editors/quilter { }; + quiterss = libsForQt5.callPackage ../applications/networking/newsreaders/quiterss {}; falkon = libsForQt5.callPackage ../applications/networking/browsers/falkon { }; @@ -18580,6 +18839,11 @@ with pkgs; lightdm_qt = lightdm.override { withQt5 = true; }; + lightdm-enso-os-greeter = callPackage ../applications/display-managers/lightdm-enso-os-greeter { + inherit (gnome3) libgee; + inherit (xorg) libX11 libXdmcp libpthreadstubs; + }; + lightdm_gtk_greeter = callPackage ../applications/display-managers/lightdm/gtk-greeter.nix { inherit (xfce) exo; }; @@ -18662,6 +18926,8 @@ with pkgs; apiKey = config.libspotify.apiKey or null; }; + spotifywm = callPackage ../applications/audio/spotifywm { }; + squeezelite = callPackage ../applications/audio/squeezelite { }; ltunify = callPackage ../tools/misc/ltunify { }; @@ -18771,10 +19037,14 @@ with pkgs; gconf = gnome2.GConf; }; + tambura = callPackage ../applications/audio/tambura { }; + teamspeak_client = libsForQt5.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { }; - uaskjuggler = callPackage ../applications/misc/taskjuggler { }; + taskell = callPackage ../applications/misc/taskell { }; + + taskjuggler = callPackage ../applications/misc/taskjuggler { }; tasknc = callPackage ../applications/misc/tasknc { }; @@ -18830,6 +19100,8 @@ with pkgs; nylas-mail-bin = callPackage ../applications/networking/mailreaders/nylas-mail-bin { }; + thonny = callPackage ../applications/editors/thonny { }; + thunderbird = callPackage ../applications/networking/mailreaders/thunderbird { inherit (gnome2) libIDL; libpng = libpng_apng; @@ -18932,9 +19204,7 @@ with pkgs; tree = callPackage ../tools/system/tree {}; - treesheets = callPackage ../applications/office/treesheets { wxGTK = wxGTK30; }; - - trezor-bridge = callPackage ../applications/networking/browsers/mozilla-plugins/trezor { }; + treesheets = callPackage ../applications/office/treesheets { wxGTK = wxGTK31; }; tribler = callPackage ../applications/networking/p2p/tribler { }; @@ -19131,6 +19401,8 @@ with pkgs; vnstat = callPackage ../applications/networking/vnstat { }; + vocal = callPackage ../applications/audio/vocal { }; + vogl = libsForQt5.callPackage ../development/tools/vogl { }; volnoti = callPackage ../applications/misc/volnoti { }; @@ -19196,13 +19468,7 @@ with pkgs; guile = guile_2_0; }; - weechat-matrix-bridge = callPackage ../applications/networking/instant-messengers/weechat-matrix-bridge { - inherit (luaPackages) cjson; - }; - - weechat-xmpp = callPackage ../applications/networking/instant-messengers/weechat-xmpp { - inherit (pythonPackages) pydns; - }; + weechatScripts = callPackage ../applications/networking/irc/weechat/scripts { }; westonLite = weston.override { pango = null; @@ -19421,6 +19687,8 @@ with pkgs; xdaliclock = callPackage ../tools/misc/xdaliclock {}; + xdg-dbus-proxy = callPackage ../development/libraries/xdg-dbus-proxy { }; + xdg-desktop-portal = callPackage ../development/libraries/xdg-desktop-portal { }; xdg-desktop-portal-gtk = callPackage ../development/libraries/xdg-desktop-portal-gtk { }; @@ -19542,6 +19810,8 @@ with pkgs; xss-lock = callPackage ../misc/screensavers/xss-lock { }; + xloadimage = callPackage ../tools/X11/xloadimage { }; + xssproxy = callPackage ../misc/screensavers/xssproxy { }; xsynth_dssi = callPackage ../applications/audio/xsynth-dssi { }; @@ -19588,6 +19858,8 @@ with pkgs; yate = callPackage ../applications/misc/yate { }; + ydiff = callPackage ../development/tools/ydiff { }; + yed = callPackage ../applications/graphics/yed {}; inherit (gnome3) yelp; @@ -19633,7 +19905,9 @@ with pkgs; zim = callPackage ../applications/office/zim { }; - zoom-us = libsForQt5.callPackage ../applications/networking/instant-messengers/zoom-us { }; + zita-njbridge = callPackage ../applications/audio/zita-njbridge { }; + + zoom-us = libsForQt59.callPackage ../applications/networking/instant-messengers/zoom-us { }; zotero = callPackage ../applications/office/zotero { }; @@ -19710,6 +19984,8 @@ with pkgs; blobby = callPackage ../games/blobby { }; + boohu = callPackage ../games/boohu { }; + braincurses = callPackage ../games/braincurses { }; brogue = callPackage ../games/brogue { }; @@ -19731,7 +20007,7 @@ with pkgs; chessdb = callPackage ../games/chessdb { }; - chessx = libsForQt5.callPackage ../games/chessx { }; + chessx = libsForQt59.callPackage ../games/chessx { }; chocolateDoom = callPackage ../games/chocolate-doom { }; @@ -19949,6 +20225,8 @@ with pkgs; instead-launcher = callPackage ../games/instead-launcher { }; + ivan = callPackage ../games/ivan { }; + ja2-stracciatella = callPackage ../games/ja2-stracciatella { }; klavaro = callPackage ../games/klavaro {}; @@ -19967,7 +20245,7 @@ with pkgs; }; liquidwar = callPackage ../games/liquidwar { - guile = guile_1_8; + guile = guile_2_0; }; liquidwar5 = callPackage ../games/liquidwar/5.nix { @@ -20073,7 +20351,9 @@ with pkgs; pong3d = callPackage ../games/pong3d { }; - pokerth = callPackage ../games/pokerth { }; + pokerth = callPackage ../games/pokerth { + protobuf = protobuf3_4; + }; pokerth-server = pokerth.server; @@ -20139,7 +20419,13 @@ with pkgs; rrootage = callPackage ../games/rrootage { }; - saga = callPackage ../applications/gis/saga { }; + saga = callPackage ../applications/gis/saga { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; + + saga_2_3_2 = callPackage ../applications/gis/saga/lts.nix { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; samplv1 = callPackage ../applications/audio/samplv1 { }; @@ -20216,6 +20502,8 @@ with pkgs; nativeOnly = true; }).run; + steamcmd = steamPackages.steamcmd; + linux-steam-integration = callPackage ../games/linux-steam-integration { gtk = pkgs.gtk3; }; @@ -20489,6 +20777,8 @@ with pkgs; pantheon-terminal = callPackage ../desktops/pantheon/apps/pantheon-terminal { }; }; + plasma-applet-volumewin7mixer = libsForQt5.callPackage ../applications/misc/plasma-applet-volumewin7mixer { }; + redshift = callPackage ../applications/misc/redshift { inherit (python3Packages) python pygobject3 pyxdg wrapPython; inherit (darwin.apple_sdk.frameworks) CoreLocation ApplicationServices Foundation Cocoa; @@ -20499,6 +20789,8 @@ with pkgs; latte-dock = libsForQt5.callPackage ../applications/misc/latte-dock { }; + adwaita-qt = libsForQt5.callPackage ../misc/themes/adwaita-qt { }; + orion = callPackage ../misc/themes/orion {}; elementary-gtk-theme = callPackage ../misc/themes/elementary { }; @@ -20583,6 +20875,18 @@ with pkgs; pymol = callPackage ../applications/science/chemistry/pymol { }; + quantum-espresso = callPackage ../applications/science/chemistry/quantum-espresso { }; + + quantum-espresso-mpi = callPackage ../applications/science/chemistry/quantum-espresso { + mpi = openmpi; + }; + + siesta = callPackage ../applications/science/chemistry/siesta { }; + + siesta-mpi = callPackage ../applications/science/chemistry/siesta { + mpi = openmpi; + }; + ### SCIENCE/GEOMETRY drgeo = callPackage ../applications/science/geometry/drgeo { @@ -20593,6 +20897,10 @@ with pkgs; tetgen = callPackage ../applications/science/geometry/tetgen { }; # AGPL3+ tetgen_1_4 = callPackage ../applications/science/geometry/tetgen/1.4.nix { }; # MIT + ### SCIENCE/BENCHMARK + + papi = callPackage ../development/libraries/science/benchmark/papi { }; + ### SCIENCE/BIOLOGY alliance = callPackage ../applications/science/electronics/alliance { }; @@ -20621,6 +20929,8 @@ with pkgs; ezminc = callPackage ../applications/science/biology/EZminc { }; + hisat2 = callPackage ../applications/science/biology/hisat2 { }; + htslib = callPackage ../development/libraries/science/biology/htslib { }; igv = callPackage ../applications/science/biology/igv { }; @@ -20702,6 +21012,8 @@ with pkgs; strelka = callPackage ../applications/science/biology/strelka { }; + seaview = callPackage ../applications/science/biology/seaview { }; + varscan = callPackage ../applications/science/biology/varscan { }; hmmer = callPackage ../applications/science/biology/hmmer { }; @@ -20766,6 +21078,8 @@ with pkgs; m4rie = callPackage ../development/libraries/science/math/m4rie { }; + mkl = callPackage ../development/libraries/science/math/mkl { }; + nasc = callPackage ../applications/science/math/nasc { }; openblas = callPackage ../development/libraries/science/math/openblas { }; @@ -20780,6 +21094,10 @@ with pkgs; planarity = callPackage ../development/libraries/science/math/planarity { }; + scalapack = callPackage ../development/libraries/science/math/scalapack { + mpi = openmpi; + }; + rankwidth = callPackage ../development/libraries/science/math/rankwidth { }; fenics = callPackage ../development/libraries/science/math/fenics { @@ -20809,6 +21127,10 @@ with pkgs; petsc = callPackage ../development/libraries/science/math/petsc { }; + parmetis = callPackage ../development/libraries/science/math/parmetis { + mpi = openmpi; + }; + scs = callPackage ../development/libraries/science/math/scs { liblapack = liblapackWithoutAtlas; }; @@ -20883,6 +21205,8 @@ with pkgs; sherpa = callPackage ../applications/science/physics/sherpa {}; + xfitter = callPackage ../applications/science/physics/xfitter {}; + ### SCIENCE/PROGRAMMING dafny = dotnetPackages.Dafny; @@ -20901,9 +21225,7 @@ with pkgs; ocamlPackages = ocaml-ng.ocamlPackages_4_05; }; - alt-ergo = callPackage ../applications/science/logic/alt-ergo { - ocamlPackages = ocaml-ng.ocamlPackages_4_05; - }; + alt-ergo = callPackage ../applications/science/logic/alt-ergo {}; aspino = callPackage ../applications/science/logic/aspino {}; @@ -20912,12 +21234,11 @@ with pkgs; boogie = dotnetPackages.Boogie; inherit (callPackage ./coq-packages.nix { - inherit (ocaml-ng) ocamlPackages_3_12_1 - ocamlPackages_4_02 + inherit (ocaml-ng) ocamlPackages_4_02 ocamlPackages_4_05 ; }) mkCoqPackages - coq_8_3 coq_8_4 coq_8_5 coq_8_6 coq_8_7 coq_8_8 + coq_8_4 coq_8_5 coq_8_6 coq_8_7 coq_8_8 coqPackages_8_5 coqPackages_8_6 coqPackages_8_7 coqPackages_8_8 coqPackages coq ; @@ -20996,10 +21317,6 @@ with pkgs; ltl2ba = callPackage ../applications/science/logic/ltl2ba {}; - inherit (ocaml-ng.ocamlPackages_3_11_2) matita; - - matita_130312 = lowPrio ocamlPackages.matita_130312; - metis-prover = callPackage ../applications/science/logic/metis-prover { }; mcrl2 = callPackage ../applications/science/logic/mcrl2 { }; @@ -21019,10 +21336,7 @@ with pkgs; libpoly = callPackage ../applications/science/logic/poly {}; - prooftree = (with ocaml-ng.ocamlPackages_4_01_0; - callPackage ../applications/science/logic/prooftree { - camlp5 = camlp5_transitional; - }); + prooftree = callPackage ../applications/science/logic/prooftree {}; prover9 = callPackage ../applications/science/logic/prover9 { }; @@ -21275,6 +21589,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; }; + root5 = lowPrio (callPackage ../applications/science/misc/root/5.nix { + inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; + }); + simgrid = callPackage ../applications/science/misc/simgrid { }; spyder = callPackage ../applications/science/spyder { }; @@ -21296,33 +21614,19 @@ with pkgs; ### SCIENCE / PHYSICS - fastjet = callPackage ../development/libraries/physics/fastjet { }; + apfelgrid = callPackage ../development/libraries/physics/apfelgrid { }; - fastnlo = callPackage ../development/libraries/physics/fastnlo { }; + apfel = callPackage ../development/libraries/physics/apfel { }; - geant4 = callPackage ../development/libraries/physics/geant4 { - enableMultiThreading = true; - enableG3toG4 = false; - enableInventor = false; - enableGDML = false; - enableQT = false; - enableXM = false; - enableOpenGLX11 = true; - enableRaytracerX11 = false; + applgrid = callPackage ../development/libraries/physics/applgrid { }; - # Optional system packages, otherwise internal GEANT4 packages are used. - clhep = null; - zlib = null; + hoppet = callPackage ../development/libraries/physics/hoppet { }; - # For enableGDML. - xercesc = null; + fastjet = callPackage ../development/libraries/physics/fastjet { }; - # For enableQT. - qt = null; # qt4SDK or qt5SDK + fastnlo = callPackage ../development/libraries/physics/fastnlo { }; - # For enableXM. - motif = null; # motif or lesstif - }; + geant4 = libsForQt5.callPackage ../development/libraries/physics/geant4 { }; cernlib = callPackage ../development/libraries/physics/cernlib { }; @@ -21336,6 +21640,8 @@ with pkgs; mcgrid = callPackage ../development/libraries/physics/mcgrid { }; + mela = callPackage ../development/libraries/physics/mela { }; + nlojet = callPackage ../development/libraries/physics/nlojet { }; pythia = callPackage ../development/libraries/physics/pythia { }; @@ -21351,6 +21657,8 @@ with pkgs; withRootSupport = true; }); + qcdnum = callPackage ../development/libraries/physics/qcdnum { }; + ### SCIENCE/ROBOTICS apmplanner2 = libsForQt5.callPackage ../applications/science/robotics/apmplanner2 { }; @@ -21430,6 +21738,8 @@ with pkgs; cups-brother-hl1110 = pkgsi686Linux.callPackage ../misc/cups/drivers/hl1110 { }; + cups-googlecloudprint = callPackage ../misc/cups/drivers/googlecloudprint { }; + # this driver ships with pre-compiled 32-bit binary libraries cnijfilter_2_80 = pkgsi686Linux.callPackage ../misc/cups/drivers/cnijfilter_2_80 { }; @@ -21474,6 +21784,8 @@ with pkgs; electricsheep = callPackage ../misc/screensavers/electricsheep { }; + equilux-theme = callPackage ../misc/themes/equilux-theme { }; + flam3 = callPackage ../tools/graphics/flam3 { }; glee = callPackage ../tools/graphics/glee { }; @@ -21573,7 +21885,9 @@ with pkgs; hplipWithPlugin_3_16_11 = hplip_3_16_11.override { withPlugin = true; }; - hyperfine = callPackage ../tools/misc/hyperfine { }; + hyperfine = callPackage ../tools/misc/hyperfine { + inherit (darwin.apple_sdk.frameworks) Security; + }; epkowa = callPackage ../misc/drivers/epkowa { }; @@ -21617,6 +21931,8 @@ with pkgs; martyr = callPackage ../development/libraries/martyr { }; + matcha = callPackage ../misc/themes/matcha { }; + # previously known as flat-plat materia-theme = callPackage ../misc/themes/materia-theme { }; @@ -21712,7 +22028,9 @@ with pkgs; nix-info = callPackage ../tools/nix/info { }; nix-info-tested = nix-info.override { doCheck = true; }; - nix-index = callPackage ../tools/package-management/nix-index { }; + nix-index = callPackage ../tools/package-management/nix-index { + inherit (darwin.apple_sdk.frameworks) Security; + }; nix-pin = callPackage ../tools/package-management/nix-pin { }; @@ -21853,6 +22171,8 @@ with pkgs; retrofe = callPackage ../misc/emulators/retrofe { }; + rfc-bibtex = python3Packages.callPackage ../development/python-modules/rfc-bibtex { }; + rpl = callPackage ../tools/text/rpl { pythonPackages = python3Packages; }; @@ -21901,9 +22221,10 @@ with pkgs; mfcl8690cdwcupswrapper = callPackage ../misc/cups/drivers/mfcl8690cdwcupswrapper { }; mfcl8690cdwlpr = callPackage ../misc/cups/drivers/mfcl8690cdwlpr { }; - samsung-unified-linux-driver_1_00_37 = callPackage ../misc/cups/drivers/samsung { }; + 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 { }; - samsung-unified-linux-driver = callPackage ../misc/cups/drivers/samsung/4.00.39 { }; + samsung-unified-linux-driver = self.samsung-unified-linux-driver_4_01_17; sane-backends = callPackage ../applications/graphics/sane/backends { gt68xxFirmware = config.sane.gt68xxFirmware or null; @@ -21940,6 +22261,10 @@ with pkgs; libsemanage = libsemanage.override { python = python3; }; }; + shades-of-gray-theme = callPackage ../misc/themes/shades-of-gray { }; + + sierra-gtk-theme = callPackage ../misc/themes/sierra { }; + slock = callPackage ../misc/screensavers/slock { conf = config.slock.conf or null; }; @@ -21963,6 +22288,8 @@ with pkgs; steamcontroller = callPackage ../misc/drivers/steamcontroller { }; + stern = callPackage ../applications/networking/cluster/stern { }; + streamripper = callPackage ../applications/audio/streamripper { }; sqsh = callPackage ../development/tools/sqsh { }; @@ -21975,21 +22302,20 @@ with pkgs; terraform_0_10-full terraform_0_11 terraform_0_11-full + terraform_plugins_test ; terraform = terraform_0_11; terraform-full = terraform_0_11-full; - terraform-provider-ibm = callPackage ../applications/networking/cluster/terraform-provider-ibm {}; + terraform-providers = recurseIntoAttrs ( + callPackage ../applications/networking/cluster/terraform-providers {} + ); terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory {}; - terraform-provider-nixos = callPackage ../applications/networking/cluster/terraform-provider-nixos {}; - 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 { @@ -22002,6 +22328,8 @@ with pkgs; tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; }; + tetra-gtk-theme = callPackage ../misc/themes/tetra { }; + tewi-font = callPackage ../data/fonts/tewi {}; texFunctions = callPackage ../tools/typesetting/tex/nix pkgs; @@ -22044,9 +22372,7 @@ with pkgs; valauncher = callPackage ../applications/misc/valauncher { }; - vault = callPackage ../tools/security/vault { - go = go_1_10; - }; + vault = callPackage ../tools/security/vault { }; vaultenv = haskellPackages.vaultenv; @@ -22063,7 +22389,6 @@ with pkgs; vimUtils = callPackage ../misc/vim-plugins/vim-utils.nix { }; vimPlugins = recurseIntoAttrs (callPackage ../misc/vim-plugins { - inherit (darwin.apple_sdk.frameworks) Cocoa CoreFoundation CoreServices; llvmPackages = llvmPackages_39; }); @@ -22233,13 +22558,18 @@ with pkgs; inherit (gnome2) gtksourceview; }; - bullet = callPackage ../development/libraries/bullet {}; + bullet = callPackage ../development/libraries/bullet { + inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; + }; - spdlog = callPackage ../development/libraries/spdlog { }; + inherit (callPackages ../development/libraries/spdlog { }) + spdlog_0 spdlog_1; + + spdlog = spdlog_1; dart = callPackage ../development/interpreters/dart { }; - dart_stable = dart.override { version = "1.24.3"; }; - dart_old = dart.override { version = "1.16.1"; }; + dart_stable = dart.override { version = "2.0.0"; }; + dart_old = dart.override { version = "1.24.3"; }; dart_dev = dart.override { version = "2.0.0-dev.26.0"; }; httrack = callPackage ../tools/backup/httrack { }; @@ -22373,4 +22703,6 @@ with pkgs; alibuild = callPackage ../development/tools/build-managers/alibuild { python = python27; }; + + tsung = callPackage ../applications/networking/tsung {}; } |