diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-11-01 16:47:42 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-11-01 16:47:42 -0400 |
| commit | e3082c313b75f13e8e1049673efe6a42dcd1499f (patch) | |
| tree | 0d11815c9bed24ca9f27d3839ac0f9577d8308e5 /pkgs/top-level/all-packages.nix | |
| parent | f2ed7c7af9f5b2db5e88b78e192b470c47f4c4fd (diff) | |
| parent | cc41aefe4485dea399930b8d173c26e438cb5e22 (diff) | |
| download | nixlib-e3082c313b75f13e8e1049673efe6a42dcd1499f.tar nixlib-e3082c313b75f13e8e1049673efe6a42dcd1499f.tar.gz nixlib-e3082c313b75f13e8e1049673efe6a42dcd1499f.tar.bz2 nixlib-e3082c313b75f13e8e1049673efe6a42dcd1499f.tar.lz nixlib-e3082c313b75f13e8e1049673efe6a42dcd1499f.tar.xz nixlib-e3082c313b75f13e8e1049673efe6a42dcd1499f.tar.zst nixlib-e3082c313b75f13e8e1049673efe6a42dcd1499f.zip | |
Merge remote-tracking branch 'upstream/master' into release-lib-cleanup
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1309 |
1 files changed, 896 insertions, 413 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2e93f038c38..d00e5a236567 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 { @@ -573,6 +577,8 @@ with pkgs; avfs = callPackage ../tools/filesystems/avfs { }; + avldrums-lv2 = callPackage ../applications/audio/avldrums-lv2 { }; + aws-iam-authenticator = callPackage ../tools/security/aws-iam-authenticator {}; awscli = callPackage ../tools/admin/awscli { }; @@ -581,6 +587,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 +603,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 { }; @@ -627,6 +637,8 @@ with pkgs; stdenv = overrideCC stdenv gcc5; }; + apt-dater = callPackage ../tools/package-management/apt-dater { }; + autorevision = callPackage ../tools/misc/autorevision { }; bcachefs-tools = callPackage ../tools/filesystems/bcachefs-tools { }; @@ -647,6 +659,8 @@ with pkgs; chkcrontab = callPackage ../tools/admin/chkcrontab { }; + cozy = callPackage ../applications/audio/cozy-audiobooks { }; + djmount = callPackage ../tools/filesystems/djmount { }; dgsh = callPackage ../shells/dgsh { }; @@ -720,6 +734,8 @@ with pkgs; oracle-instantclient = callPackage ../development/libraries/oracle-instantclient { }; + goku = callPackage ../os-specific/darwin/goku { }; + kwakd = callPackage ../servers/kwakd { }; kwm = callPackage ../os-specific/darwin/kwm { }; @@ -728,6 +744,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 {}; @@ -754,6 +772,7 @@ with pkgs; androidenv = callPackage ../development/mobile/androidenv { pkgs_i686 = pkgsi686Linux; + licenseAccepted = (config.android_sdk.accept_license or false); }; inherit (androidenv) androidndk; @@ -814,7 +833,10 @@ with pkgs; libssl = openssl; }; - axoloti = callPackage ../applications/audio/axoloti { }; + axoloti = callPackage ../applications/audio/axoloti { + gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; + binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; + }; dfu-util-axoloti = callPackage ../applications/audio/axoloti/dfu-util.nix { }; libusb1-axoloti = callPackage ../applications/audio/axoloti/libusb1.nix { inherit (darwin) libobjc; @@ -843,7 +865,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 +949,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 +977,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; @@ -959,6 +987,9 @@ with pkgs; bruteforce-luks = callPackage ../tools/security/bruteforce-luks { }; + breakpointHook = assert stdenv.isLinux; + makeSetupHook { } ../build-support/setup-hooks/breakpoint-hook.sh; + bsod = callPackage ../misc/emulators/bsod { }; btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { }; @@ -1069,6 +1100,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 { }; @@ -1085,6 +1120,8 @@ with pkgs; cloud-init = callPackage ../tools/virtualization/cloud-init { }; + cloudflared = callPackage ../applications/networking/cloudflared { }; + cloudmonkey = callPackage ../tools/virtualization/cloudmonkey { }; clib = callPackage ../tools/package-management/clib { }; @@ -1141,6 +1178,8 @@ with pkgs; coursier = callPackage ../development/tools/coursier {}; + cppclean = callPackage ../development/tools/cppclean {}; + cri-tools = callPackage ../tools/virtualization/cri-tools {}; crip = callPackage ../applications/audio/crip { }; @@ -1175,6 +1214,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 { }; @@ -1234,6 +1275,8 @@ with pkgs; dtrx = callPackage ../tools/compression/dtrx { }; + dune = callPackage ../development/tools/ocaml/dune { }; + duperemove = callPackage ../tools/filesystems/duperemove { }; dylibbundler = callPackage ../tools/misc/dylibbundler { }; @@ -1266,6 +1309,8 @@ with pkgs; envconsul = callPackage ../tools/system/envconsul { }; + envsubst = callPackage ../tools/misc/envsubst { }; + eschalot = callPackage ../tools/security/eschalot { }; esptool = callPackage ../tools/misc/esptool { }; @@ -1276,6 +1321,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 { }; @@ -1310,6 +1357,8 @@ with pkgs; fsmark = callPackage ../tools/misc/fsmark { }; + futhark = haskell.lib.justStaticExecutables haskellPackages.futhark; + fwup = callPackage ../tools/misc/fwup { }; fzf = callPackage ../tools/misc/fzf { }; @@ -1322,6 +1371,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 { }; @@ -1352,6 +1403,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; }; @@ -1394,8 +1447,6 @@ with pkgs; interlock = callPackage ../servers/interlock {}; - jbuilder = callPackage ../development/tools/ocaml/jbuilder { }; - kapacitor = callPackage ../servers/monitoring/kapacitor { }; kisslicer = callPackage ../tools/misc/kisslicer { }; @@ -1412,6 +1463,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 { }; @@ -1440,6 +1493,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 { }; @@ -1458,6 +1515,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 { }; @@ -1472,8 +1533,12 @@ with pkgs; patdiff = callPackage ../tools/misc/patdiff { }; + pbpst = callPackage ../applications/misc/pbpst { }; + pbzx = callPackage ../tools/compression/pbzx { }; + pev = callPackage ../development/tools/analysis/pev { }; + photon = callPackage ../tools/networking/photon { }; playerctl = callPackage ../tools/audio/playerctl { }; @@ -1490,6 +1555,8 @@ with pkgs; simg2img = callPackage ../tools/filesystems/simg2img { }; + snipes = callPackage ../games/snipes { }; + socklog = callPackage ../tools/system/socklog { }; staccato = callPackage ../tools/text/staccato { }; @@ -1516,6 +1583,8 @@ with pkgs; conf = config.riot-web.conf or null; }; + roundcube = callPackage ../servers/roundcube { }; + rsbep = callPackage ../tools/backup/rsbep { }; rsyslog = callPackage ../tools/system/rsyslog { @@ -1630,6 +1699,8 @@ with pkgs; pythonPackages = python3Packages; }; + bento4 = callPackage ../tools/video/bento4 { }; + bepasty = callPackage ../tools/misc/bepasty { }; bettercap = callPackage ../tools/security/bettercap { }; @@ -1642,6 +1713,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; }; @@ -1786,6 +1861,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 { }; @@ -1895,6 +1972,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 { @@ -1955,11 +2038,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 { }; @@ -1984,8 +2064,12 @@ with pkgs; cudatoolkit_7 cudatoolkit_7_5 cudatoolkit_8 + cudatoolkit_9 cudatoolkit_9_0 - cudatoolkit_9; + cudatoolkit_9_1 + cudatoolkit_9_2 + cudatoolkit_10 + cudatoolkit_10_0; cudatoolkit = cudatoolkit_9; @@ -1995,7 +2079,11 @@ with pkgs; cudnn6_cudatoolkit_8 cudnn_cudatoolkit_8 cudnn_cudatoolkit_9 - cudnn_cudatoolkit_9_0; + cudnn_cudatoolkit_9_0 + cudnn_cudatoolkit_9_1 + cudnn_cudatoolkit_9_2 + cudnn_cudatoolkit_10 + cudnn_cudatoolkit_10_0; cudnn = cudnn_cudatoolkit_9; @@ -2012,7 +2100,7 @@ with pkgs; zlibSupport = true; sslSupport = zlibSupport; scpSupport = zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin; - gssSupport = true; + gssSupport = !stdenv.hostPlatform.isWindows; }; curl = callPackage ../tools/networking/curl rec { @@ -2021,7 +2109,7 @@ with pkgs; zlibSupport = true; sslSupport = zlibSupport; scpSupport = zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin; - gssSupport = true; + gssSupport = !stdenv.hostPlatform.isWindows; }; curl_unix_socket = callPackage ../tools/networking/curl-unix-socket rec { }; @@ -2287,6 +2375,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 { @@ -2299,6 +2389,10 @@ with pkgs; buildEmscriptenPackage = callPackage ../development/em-modules/generic { }; + carp = callPackage ../development/compilers/carp { }; + + cholmod-extra = callPackage ../development/libraries/science/math/cholmod-extra { }; + emscriptenVersion = "1.37.36"; emscripten = callPackage ../development/compilers/emscripten { }; @@ -2341,7 +2435,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; @@ -2379,9 +2475,11 @@ 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 = callPackage ../tools/misc/execline { }; + execline = skawarePackages.execline; exif = callPackage ../tools/graphics/exif { }; @@ -2469,6 +2567,8 @@ with pkgs; fdm = callPackage ../tools/networking/fdm {}; + featherpad = callPackage ../applications/editors/featherpad {}; + feedreader = callPackage ../applications/networking/feedreaders/feedreader {}; ferm = callPackage ../tools/networking/ferm { }; @@ -2541,6 +2641,8 @@ with pkgs; feedgnuplot = callPackage ../tools/graphics/feedgnuplot { }; + fbv = callPackage ../tools/graphics/fbv { }; + fim = callPackage ../tools/graphics/fim { }; flac123 = callPackage ../applications/audio/flac123 { }; @@ -2742,9 +2844,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 { }; @@ -2905,7 +3007,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 { }; @@ -2927,6 +3032,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 { }; @@ -3078,6 +3184,8 @@ with pkgs; hdapsd = callPackage ../os-specific/linux/hdapsd { }; + hdaps-gl = callPackage ../tools/misc/hdaps-gl { }; + hddtemp = callPackage ../tools/misc/hddtemp { }; hdf4 = callPackage ../tools/misc/hdf4 { @@ -3188,6 +3296,10 @@ with pkgs; hwinfo = callPackage ../tools/system/hwinfo { }; + hybridreverb2 = callPackage ../applications/audio/hybridreverb2 { }; + + hylafaxplus = callPackage ../servers/hylafaxplus { }; + i2c-tools = callPackage ../os-specific/linux/i2c-tools { }; i2p = callPackage ../tools/networking/i2p {}; @@ -3345,12 +3457,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 = mono514; }; jade = callPackage ../tools/text/sgml/jade { }; @@ -3374,6 +3484,8 @@ with pkgs; jira-cli = callPackage ../development/tools/jira_cli { }; + jitterentropy = callPackage ../development/libraries/jitterentropy { }; + jl = haskellPackages.callPackage ../development/tools/jl { }; jmespath = callPackage ../development/tools/jmespath { }; @@ -3526,8 +3638,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 { }; @@ -3565,6 +3676,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 { }; @@ -3597,8 +3710,6 @@ with pkgs; mmv = callPackage ../tools/misc/mmv { }; - morituri = callPackage ../applications/audio/morituri { }; - most = callPackage ../tools/misc/most { }; motion = callPackage ../applications/video/motion { }; @@ -3674,11 +3785,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 { @@ -3697,6 +3808,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 { @@ -3714,7 +3827,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 { }; @@ -3737,6 +3850,8 @@ with pkgs; libfann = callPackage ../development/libraries/libfann { }; + libgaminggear = callPackage ../development/libraries/libgaminggear { }; + libipfix = callPackage ../development/libraries/libipfix { }; libircclient = callPackage ../development/libraries/libircclient { }; @@ -3810,6 +3925,8 @@ with pkgs; libwebsockets = callPackage ../development/libraries/libwebsockets { }; + lidarr = callPackage ../servers/lidarr { }; + limesuite = callPackage ../applications/misc/limesuite { }; limesurvey = callPackage ../servers/limesurvey { }; @@ -3906,6 +4023,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. @@ -3989,6 +4108,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 { }; @@ -4046,6 +4167,8 @@ with pkgs; modemmanager = callPackage ../tools/networking/modem-manager {}; + modem-manager-gui = callPackage ../applications/networking/modem-manager-gui {}; + modsecurity_standalone = callPackage ../tools/security/modsecurity { }; molly-guard = callPackage ../os-specific/linux/molly-guard { }; @@ -4251,9 +4374,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 { }; @@ -4399,8 +4520,6 @@ with pkgs; openobex = callPackage ../tools/bluetooth/openobex { }; - openopc = callPackage ../tools/misc/openopc { }; - openresolv = callPackage ../tools/networking/openresolv { }; opensc = callPackage ../tools/security/opensc { @@ -4418,6 +4537,10 @@ with pkgs; openssh_hpn = pkgs.appendToName "with-hpn" (openssh.override { hpnSupport = true; }); + openssh_gssapi = pkgs.appendToName "with-gssapi" (openssh.override { + withGssapiPatches = true; + }); + opensp = callPackage ../tools/text/sgml/opensp { }; opentracker = callPackage ../applications/networking/p2p/opentracker { }; @@ -4436,6 +4559,8 @@ with pkgs; opae = callPackage ../development/libraries/opae { }; + opentracing-cpp = callPackage ../development/libraries/opentracing-cpp { }; + openvswitch = callPackage ../os-specific/linux/openvswitch { }; optipng = callPackage ../tools/graphics/optipng { @@ -4567,6 +4692,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 { }; @@ -4580,6 +4706,8 @@ with pkgs; pdfcrack = callPackage ../tools/security/pdfcrack { }; + pdftag = callPackage ../tools/graphics/pdftag { }; + pdf2svg = callPackage ../tools/graphics/pdf2svg { }; fmodex = callPackage ../games/zandronum/fmod.nix { }; @@ -4732,6 +4860,8 @@ with pkgs; pptpd = callPackage ../tools/networking/pptpd {}; + prettyping = callPackage ../tools/networking/prettyping { }; + prey-bash-client = callPackage ../tools/security/prey { }; profile-cleaner = callPackage ../tools/misc/profile-cleaner { }; @@ -4849,6 +4979,8 @@ with pkgs; qtikz = libsForQt5.callPackage ../applications/graphics/ktikz { }; + quickserve = callPackage ../tools/networking/quickserve { }; + quicktun = callPackage ../tools/networking/quicktun { }; quilt = callPackage ../development/tools/quilt { }; @@ -4891,10 +5023,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 { }; @@ -4941,9 +5075,7 @@ with pkgs; gsettings-desktop-schemas = gnome3.gsettings-desktop-schemas; }; - rename = callPackage ../tools/misc/rename { - inherit (perlPackages) buildPerlPackage; - }; + rename = callPackage ../tools/misc/rename { }; renameutils = callPackage ../tools/misc/renameutils { }; @@ -4982,7 +5114,7 @@ with pkgs; inherit (pythonPackages) sphinx; }; - rng_tools = callPackage ../tools/security/rng-tools { }; + rng-tools = callPackage ../tools/security/rng-tools { }; rnv = callPackage ../tools/text/xml/rnv { }; @@ -5058,13 +5190,13 @@ with pkgs; s3gof3r = callPackage ../tools/networking/s3gof3r { }; - s6-dns = callPackage ../tools/networking/s6-dns { }; + s6-dns = skawarePackages.s6-dns; - s6-linux-utils = callPackage ../os-specific/linux/s6-linux-utils { }; + s6-linux-utils = skawarePackages.s6-linux-utils; - s6-networking = callPackage ../tools/networking/s6-networking { }; + s6-networking = skawarePackages.s6-networking; - s6-portable-utils = callPackage ../tools/misc/s6-portable-utils { }; + s6-portable-utils = skawarePackages.s6-portable-utils; sablotron = callPackage ../tools/text/xml/sablotron { }; @@ -5142,6 +5274,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 { }; @@ -5178,6 +5312,8 @@ with pkgs; signal-desktop = callPackage ../applications/networking/instant-messengers/signal-desktop { }; + signify = callPackage ../tools/security/signify { }; + # aka., pgp-tools signing-party = callPackage ../tools/security/signing-party { }; @@ -5364,6 +5500,8 @@ with pkgs; tlsSupport = true; }; + ssocr = callPackage ../applications/misc/ssocr { }; + ssss = callPackage ../tools/security/ssss { }; stabber = callPackage ../misc/stabber { }; @@ -5423,6 +5561,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 { @@ -5465,11 +5605,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 { }; @@ -5517,12 +5661,16 @@ with pkgs; tie = callPackage ../development/tools/misc/tie { }; + tikzit = libsForQt5.callPackage ../tools/typesetting/tikzit { }; + tilix = callPackage ../applications/misc/tilix { }; tinc_pre = callPackage ../tools/networking/tinc/pre.nix { }; tiny8086 = callPackage ../applications/virtualization/8086tiny { }; + tinyemu = callPackage ../applications/virtualization/tinyemu { }; + tinyproxy = callPackage ../tools/networking/tinyproxy {}; tio = callPackage ../tools/misc/tio { }; @@ -5556,7 +5704,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; @@ -5565,7 +5713,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; @@ -5630,6 +5780,8 @@ with pkgs; tty-clock = callPackage ../tools/misc/tty-clock { }; + ttyplot = callPackage ../tools/misc/ttyplot { }; + ttyrec = callPackage ../tools/misc/ttyrec { }; ttylog = callPackage ../tools/misc/ttylog { }; @@ -5669,6 +5821,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 { }; @@ -5713,6 +5867,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 { }; @@ -5747,6 +5903,9 @@ with pkgs; vimer = callPackage ../tools/misc/vimer { }; + visidata = (newScope python3Packages) ../applications/misc/visidata { + }; + vit = callPackage ../applications/misc/vit { }; vnc2flv = callPackage ../tools/video/vnc2flv {}; @@ -5810,8 +5969,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 { }; @@ -5879,11 +6046,6 @@ with pkgs; libpng = libpng12; }; - truecrypt = callPackage ../applications/misc/truecrypt { - stdenv = overrideInStdenv stdenv [ useOldCXXAbi ]; - wxGUI = config.truecrypt.wxGUI or true; - }; - ttmkfdir = callPackage ../tools/misc/ttmkfdir { }; ttwatch = callPackage ../tools/misc/ttwatch { }; @@ -5988,7 +6150,7 @@ with pkgs; }; veracrypt = callPackage ../applications/misc/veracrypt { - wxGUI = true; + wxGTK = wxGTK30; }; vlan = callPackage ../tools/networking/vlan { }; @@ -6032,14 +6194,14 @@ 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 { }; wol = callPackage ../tools/networking/wol { }; + wolf-shaper = callPackage ../applications/audio/wolf-shaper { }; + wring = nodePackages.wring; wrk = callPackage ../tools/networking/wrk { }; @@ -6117,7 +6279,9 @@ with pkgs; libxml2 = libxml2Python; }; - xsecurelock = callPackage ../tools/X11/xsecurelock { }; + xsecurelock = callPackage ../tools/X11/xsecurelock { + xset = xorg.xset; + }; xsel = callPackage ../tools/misc/xsel { }; @@ -6195,6 +6359,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 { }; @@ -6216,9 +6382,11 @@ with pkgs; ### SHELLS - runtimeShell = "${runtimeShellPackage}/bin/bash"; + 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 @@ -6276,6 +6444,23 @@ with pkgs; abcl = callPackage ../development/compilers/abcl {}; + adoptopenjdk-bin-11-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk11-linux.nix; + adoptopenjdk-bin-11-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk11-darwin.nix; + + adoptopenjdk-hotspot-bin-11 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-11-packages-linux.jdk-hotspot {} + else callPackage adoptopenjdk-bin-11-packages-darwin.jdk-hotspot {}; + adoptopenjdk-jre-hotspot-bin-11 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-11-packages-linux.jre-hotspot {} + else callPackage adoptopenjdk-bin-11-packages-darwin.jre-hotspot {}; + + # no OpenJ9 for Darwin + adoptopenjdk-openj9-bin-11 = callPackage adoptopenjdk-bin-11-packages-linux.jdk-openj9 {}; + adoptopenjdk-jre-openj9-bin-11 = callPackage adoptopenjdk-bin-11-packages-linux.jre-openj9 {}; + + adoptopenjdk-bin = adoptopenjdk-hotspot-bin-11; + adoptopenjdk-jre-bin = adoptopenjdk-jre-hotspot-bin-11; + aldor = callPackage ../development/compilers/aldor { }; aliceml = callPackage ../development/compilers/aliceml { }; @@ -6300,10 +6485,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 { }; @@ -6322,6 +6503,8 @@ with pkgs; inherit (darwin) bootstrap_cmds; }; + cdb = callPackage ../development/tools/database/cdb { }; + chez = callPackage ../development/compilers/chez { inherit (darwin) cctools; }; @@ -6341,6 +6524,7 @@ with pkgs; }; }; + clang_7 = llvmPackages_7.clang; clang_6 = llvmPackages_6.clang; clang_5 = llvmPackages_5.clang; clang_4 = llvmPackages_4.clang; @@ -6382,7 +6566,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 {}; @@ -6658,35 +6851,6 @@ with pkgs; gcl_2_6_13_pre = callPackage ../development/compilers/gcl/2.6.13-pre.nix { }; - gcc-arm-embedded-4_7 = pkgsi686Linux.callPackage ../development/compilers/gcc-arm-embedded { - version = "4.7-2013q3-20130916"; - releaseType = "update"; - sha256 = "1bd9bi9q80xn2rpy0rn1vvj70rh15kb7dmah0qs4q2rv78fqj40d"; - ncurses = pkgsi686Linux.ncurses5; - }; - gcc-arm-embedded-4_8 = pkgsi686Linux.callPackage ../development/compilers/gcc-arm-embedded { - version = "4.8-2014q1-20140314"; - releaseType = "update"; - sha256 = "ce92859550819d4a3d1a6e2672ea64882b30afa2c08cf67fa8e1d93788c2c577"; - ncurses = pkgsi686Linux.ncurses5; - }; - gcc-arm-embedded-4_9 = pkgsi686Linux.callPackage ../development/compilers/gcc-arm-embedded { - version = "4.9-2015q1-20150306"; - releaseType = "update"; - sha256 = "c5e0025b065750bbd76b5357b4fc8606d88afbac9ff55b8a82927b4b96178154"; - ncurses = pkgsi686Linux.ncurses5; - }; - gcc-arm-embedded-5 = pkgs.pkgsi686Linux.callPackage ../development/compilers/gcc-arm-embedded { - dirName = "5.0"; - subdirName = "5-2016-q2-update"; - version = "5.4-2016q2-20160622"; - releaseType = "update"; - sha256 = "1r0rqbnw7rf94f5bsa3gi8bick4xb7qnp1dkvdjfbvqjvysvc44r"; - ncurses = pkgsi686Linux.ncurses5; - }; - gcc-arm-embedded-6 = callPackage ../development/compilers/gcc-arm-embedded/6 {}; - gcc-arm-embedded = gcc-arm-embedded-6; - gforth = callPackage ../development/compilers/gforth {}; gtk-server = callPackage ../development/interpreters/gtk-server {}; @@ -6773,6 +6937,8 @@ with pkgs; go-repo-root = callPackage ../development/tools/go-repo-root { }; + go-junit-report = callPackage ../development/tools/go-junit-report { }; + gox = callPackage ../development/tools/gox { }; gprolog = callPackage ../development/compilers/gprolog { }; @@ -6814,11 +6980,11 @@ with pkgs; inherit (gnome2) GConf gnome_vfs; }; - openjdk10 = + openjdk11 = if stdenv.isDarwin then - callPackage ../development/compilers/openjdk/darwin/10.nix { } + callPackage ../development/compilers/openjdk/darwin/11.nix { } else - callPackage ../development/compilers/openjdk/10.nix { + callPackage ../development/compilers/openjdk/11.nix { inherit (gnome2) GConf gnome_vfs; }; @@ -6838,19 +7004,14 @@ with pkgs; (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } ((openjdk8.override { minimal = true; }).jre // { outputs = [ "jre" ]; })); - jdk10 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejdk10 else openjdk10 // { outputs = [ "out" ]; }; - jre10 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejre10 else lib.setName "openjre-${lib.getVersion pkgs.openjdk10.jre}" - (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } - (openjdk10.jre // { outputs = [ "jre" ]; })); - jre10_headless = - if stdenv.isAarch32 || stdenv.isAarch64 then - oraclejre10 - else if stdenv.isDarwin then - jre10 + jdk11 = openjdk11 // { outputs = [ "out" ]; }; + jdk11_headless = + if stdenv.isDarwin then + jdk11 else - lib.setName "openjre-${lib.getVersion pkgs.openjdk10.jre}-headless" - (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } - ((openjdk10.override { minimal = true; }).jre // { outputs = [ "jre" ]; })); + lib.setName "openjdk-${lib.getVersion pkgs.openjdk11}-headless" + (lib.addMetaAttrs {} + ((openjdk11.override { minimal = true; }) // {})); jdk = jdk8; jre = jre8; @@ -6860,6 +7021,8 @@ with pkgs; openshot-qt = libsForQt5.callPackage ../applications/video/openshot-qt { }; + openspin = callPackage ../development/compilers/openspin { }; + oraclejdk = pkgs.jdkdistro true false; oraclejdk8 = pkgs.oraclejdk8distro true false; @@ -6899,7 +7062,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; @@ -6918,6 +7081,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; }; + julia = julia_06; + jwasm = callPackage ../development/compilers/jwasm { }; kotlin = callPackage ../development/compilers/kotlin { }; @@ -6936,15 +7101,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; @@ -7009,11 +7177,15 @@ with pkgs; stdenv = overrideCC stdenv buildPackages.gcc6; # with gcc-7: undefined reference to `__divmoddi4' }); - manticore = callPackage ../development/compilers/manticore { }; + 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' + }); - mentorToolchains = recurseIntoAttrs ( - pkgsi686Linux.callPackage ../development/compilers/mentor {} - ); + manticore = callPackage ../development/compilers/manticore { }; mercury = callPackage ../development/compilers/mercury { }; @@ -7035,22 +7207,18 @@ 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; mono4 = mono48; - mono40 = lowPrio (callPackage ../development/compilers/mono/4.0.nix { - inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) Foundation; - }); - - mono44 = lowPrio (callPackage ../development/compilers/mono/4.4.nix { - inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) Foundation; - }); - mono46 = lowPrio (callPackage ../development/compilers/mono/4.6.nix { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) Foundation; @@ -7108,6 +7276,8 @@ with pkgs; ocamlPackages = recurseIntoAttrs ocaml-ng.ocamlPackages; + ocamlformat = callPackage ../development/tools/ocaml/ocamlformat { }; + orc = callPackage ../development/compilers/orc { }; metaocaml_3_09 = callPackage ../development/compilers/ocaml/metaocaml-3.09.nix { }; @@ -7126,7 +7296,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; }; @@ -7147,17 +7318,22 @@ with pkgs; }; # For beta and nightly releases use the nixpkgs-mozilla overlay - rust = callPackage ../development/compilers/rust - (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { - stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' - }); + rust = callPackage ../development/compilers/rust ({ + inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; + } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' + }); inherit (rust) cargo rustc; - buildRustCrate = callPackage ../build-support/rust/build-rust-crate.nix { }; - + buildRustCrate = callPackage ../build-support/rust/build-rust-crate { }; + buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { }; + buildRustCrateTests = recurseIntoAttrs (callPackage ../build-support/rust/build-rust-crate/test { }).tests; + cratesIO = callPackage ../build-support/rust/crates-io.nix { }; 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 { }; @@ -7180,6 +7356,7 @@ with pkgs; }; }); + cargo-download = callPackage ../tools/package-management/cargo-download { }; cargo-edit = callPackage ../tools/package-management/cargo-edit { }; cargo-release = callPackage ../tools/package-management/cargo-release { }; cargo-tree = callPackage ../tools/package-management/cargo-tree { }; @@ -7188,12 +7365,15 @@ with pkgs; cargo-asm = callPackage ../development/tools/rust/cargo-asm { }; cargo-fuzz = callPackage ../development/tools/rust/cargo-fuzz { }; + pyo3-pack = callPackage ../development/tools/rust/pyo3-pack { }; rainicorn = callPackage ../development/tools/rust/rainicorn { }; rustfmt = callPackage ../development/tools/rust/rustfmt { }; rustracer = callPackage ../development/tools/rust/racer { }; rustracerd = callPackage ../development/tools/rust/racerd { }; rust-bindgen = callPackage ../development/tools/rust/bindgen { }; - rust-cbindgen = callPackage ../development/tools/rust/cbindgen { }; + rust-cbindgen = callPackage ../development/tools/rust/cbindgen { + inherit (darwin.apple_sdk.frameworks) Security; + }; rustup = callPackage ../development/tools/rust/rustup { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -7206,6 +7386,7 @@ with pkgs; scala_2_12 = callPackage ../development/compilers/scala { jre = jre8; }; scala = scala_2_12; + scalafix = callPackage ../development/tools/scalafix { }; scalafmt = callPackage ../development/tools/scalafmt { }; sdcc = callPackage ../development/compilers/sdcc { @@ -7455,8 +7636,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 { @@ -7540,7 +7719,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 { }; @@ -7762,7 +7941,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 @@ -7789,17 +7970,17 @@ with pkgs; amtk = callPackage ../development/libraries/amtk { }; - avrgcclibc = throw "avrgcclibs are now separate packages, install avrbinutils, avrgcc and avrlibc"; - - avrbinutils = callPackage ../development/misc/avr/binutils {}; - - avrgcc = callPackage ../development/misc/avr/gcc {}; - - avrlibc = callPackage ../development/misc/avr/libc {}; + avrlibc = callPackage ../development/misc/avr/libc {}; + avrlibcCross = callPackage ../development/misc/avr/libc { + stdenv = crossLibcStdenv; + }; avr8burnomat = callPackage ../development/misc/avr8-burn-omat { }; - betaflight = callPackage ../development/misc/stm32/betaflight { }; + betaflight = callPackage ../development/misc/stm32/betaflight { + gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; + binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; + }; sourceFromHead = callPackage ../build-support/source-from-head-fun.nix {}; @@ -7807,9 +7988,9 @@ with pkgs; jython = callPackage ../development/interpreters/jython {}; - guile-cairo = callPackage ../development/guile-modules/guile-cairo { - guile = guile_2_0; - }; + gImageReader = callPackage ../applications/misc/gImageReader { }; + + guile-cairo = callPackage ../development/guile-modules/guile-cairo { }; guile-fibers = callPackage ../development/guile-modules/guile-fibers { }; @@ -7837,7 +8018,10 @@ with pkgs; guile = guile_2_0; }; - inav = callPackage ../development/misc/stm32/inav { }; + inav = callPackage ../development/misc/stm32/inav { + gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; + binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; + }; pharo-vms = callPackage ../development/pharo/vm { }; pharo = pharo-vms.multi-vm-wrapper; @@ -7855,6 +8039,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. @@ -7863,10 +8051,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 {}) @@ -7891,12 +8082,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 {}; @@ -7944,6 +8136,11 @@ with pkgs; inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; }; + bazel_jdk11 = callPackage ../development/tools/build-managers/bazel { + inherit (darwin) cctools; + inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; + runJdk = jdk11; + }; bazel-buildtools = callPackage ../development/tools/build-managers/bazel/buildtools { }; buildifier = bazel-buildtools; @@ -7954,6 +8151,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 { }; @@ -7980,6 +8179,8 @@ with pkgs; blackmagic = callPackage ../development/tools/misc/blackmagic { stdenv = overrideCC stdenv gcc6; + gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; + binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; }; bloaty = callPackage ../development/tools/bloaty { }; @@ -7992,21 +8193,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 { }; @@ -8121,8 +8307,10 @@ with pkgs; cppcheck = callPackage ../development/tools/analysis/cppcheck { }; + cpplint = callPackage ../development/tools/analysis/cpplint { }; + cquery = callPackage ../development/tools/misc/cquery { - llvmPackages = llvmPackages_6; + llvmPackages = llvmPackages_7; }; creduce = callPackage ../development/tools/misc/creduce { @@ -8265,7 +8453,7 @@ with pkgs; funnelweb = callPackage ../development/tools/literate-programming/funnelweb { }; - gede = libsForQt5.callPackage ../development/tools/misc/gede { }; + gede = libsForQt59.callPackage ../development/tools/misc/gede { }; gdbgui = callPackage ../development/tools/misc/gdbgui { }; @@ -8345,7 +8533,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 { }; @@ -8364,7 +8554,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 { }; @@ -8407,14 +8597,20 @@ with pkgs; kcov = callPackage ../development/tools/analysis/kcov { }; + kind = callPackage ../development/tools/kind { }; + kube-aws = callPackage ../development/tools/kube-aws { }; kubectx = callPackage ../development/tools/kubectx { }; + kube-prompt = callPackage ../development/tools/kube-prompt { }; + kustomize = callPackage ../development/tools/kustomize { }; kythe = callPackage ../development/tools/kythe { }; + lazygit = callPackage ../development/tools/lazygit { }; + Literate = callPackage ../development/tools/literate-programming/Literate {}; lcov = callPackage ../development/tools/analysis/lcov { }; @@ -8468,7 +8664,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); @@ -8481,14 +8677,12 @@ 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 { }; nixbang = callPackage ../development/tools/misc/nixbang { - pythonPackages = python3Packages; + pythonPackages = python3Packages; }; nexus = callPackage ../development/tools/repository-managers/nexus { }; @@ -8497,6 +8691,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; @@ -8686,7 +8885,7 @@ with pkgs; sparse = callPackage ../development/tools/analysis/sparse { }; - speedtest-cli = callPackage ../tools/networking/speedtest-cli { }; + speedtest-cli = with python3Packages; toPythonApplication speedtest-cli; spin = callPackage ../development/tools/analysis/spin { }; @@ -8733,13 +8932,9 @@ with pkgs; texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { }; texinfo6 = callPackage ../development/tools/misc/texinfo/6.5.nix { }; texinfo = texinfo6; - texinfoInteractive = appendToName "interactive" (texinfo.override { - interactive = true; - # doCheck = true -> some xlocale.h problem with perl 5.28.0 - # (it's mistakenly trying to include the non-existent header) - perl = perl526; - buildPackages = buildPackages // { perl = buildPackages.perl526; }; - }); + texinfoInteractive = appendToName "interactive" ( + texinfo.override { interactive = true; } + ); texi2html = callPackage ../development/tools/misc/texi2html { }; @@ -8773,7 +8968,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; }; @@ -8781,10 +8975,6 @@ with pkgs; qcachegrind = libsForQt5.callPackage ../development/tools/analysis/qcachegrind {}; - verasco = ocaml-ng.ocamlPackages_4_02.verasco.override { - coq = coq_8_4; - }; - visualvm = callPackage ../development/tools/java/visualvm { }; vultr = callPackage ../development/tools/vultr { }; @@ -8793,6 +8983,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 { }; @@ -8958,6 +9150,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 { }; @@ -9285,23 +9478,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 @@ -9357,6 +9545,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 {}; @@ -9366,6 +9556,8 @@ with pkgs; frog = self.languageMachines.frog; + fstrcmp = callPackage ../development/libraries/fstrcmp { }; + fstrm = callPackage ../development/libraries/fstrm { }; cfitsio = callPackage ../development/libraries/cfitsio { }; @@ -9538,6 +9730,8 @@ with pkgs; /**/ if name == "glibc" then targetPackages.glibcCross or glibcCross else if name == "bionic" then targetPackages.bionic or bionic else if name == "uclibc" then targetPackages.uclibcCross or uclibcCross + else if name == "avrlibc" then targetPackages.avrlibcCross or avrlibcCross + else if name == "newlib" then targetPackages.newlibCross or newlibCross else if name == "musl" then targetPackages.muslCross or muslCross else if name == "msvcrt" then targetPackages.windows.mingw_w64 or windows.mingw_w64 else if stdenv.targetPlatform.useiOSPrebuilt then targetPackages.darwin.iosSdkPkgs.libraries or darwin.iosSdkPkgs.libraries @@ -9649,9 +9843,7 @@ with pkgs; gnonlin = callPackage ../development/libraries/gstreamer/legacy/gnonlin {}; - gusb = callPackage ../development/libraries/gusb { - inherit (gnome2) gtkdoc; - }; + gusb = callPackage ../development/libraries/gusb { }; qt-mobility = callPackage ../development/libraries/qt-mobility {}; @@ -9839,7 +10031,7 @@ with pkgs; heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; }; - libheimdal = heimdal.override { type = "lib"; }; + libheimdal = heimdal; harfbuzz = callPackage ../development/libraries/harfbuzz { inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreText; @@ -9999,9 +10191,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 { }; @@ -10090,6 +10280,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreAudio CoreServices AudioUnit; }; + libaosd = callPackage ../development/libraries/libaosd { }; + libabw = callPackage ../development/libraries/libabw { }; libamqpcpp = callPackage ../development/libraries/libamqpcpp { }; @@ -10155,7 +10347,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,12 +10579,18 @@ with pkgs; libgrss = callPackage ../development/libraries/libgrss { }; + libiio = callPackage ../development/libraries/libiio { }; + libseccomp = callPackage ../development/libraries/libseccomp { }; libsecret = callPackage ../development/libraries/libsecret { }; libserialport = callPackage ../development/libraries/libserialport { }; + libsignal-protocol-c = callPackage ../development/libraries/libsignal-protocol-c { }; + + libsignon-glib = callPackage ../development/libraries/libsignon-glib { }; + libsoundio = callPackage ../development/libraries/libsoundio { inherit (darwin.apple_sdk.frameworks) AudioUnit; }; @@ -10511,6 +10713,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 { }; @@ -10644,6 +10847,8 @@ with pkgs; libiec61883 = callPackage ../development/libraries/libiec61883 { }; + libimagequant = callPackage ../development/libraries/libimagequant {}; + libinfinity = callPackage ../development/libraries/libinfinity { }; libinput = callPackage ../development/libraries/libinput { @@ -11141,37 +11346,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 { }; @@ -11238,6 +11438,8 @@ with pkgs; mtpfs = callPackage ../tools/filesystems/mtpfs { }; + mtxclient = callPackage ../development/libraries/mtxclient { }; + mu = callPackage ../tools/networking/mu { texinfo = texinfo4; }; @@ -11292,7 +11494,9 @@ with pkgs; }; libnghttp2 = nghttp2.lib; - nix-plugins = callPackage ../development/libraries/nix-plugins {}; + nix-plugins = callPackage ../development/libraries/nix-plugins { + nix = nixUnstable; + }; nlohmann_json = callPackage ../development/libraries/nlohmann_json { }; @@ -11311,6 +11515,8 @@ with pkgs; nss_wrapper = callPackage ../development/libraries/nss_wrapper { }; + nsss = skawarePackages.nsss; + ntbtls = callPackage ../development/libraries/ntbtls { }; ntk = callPackage ../development/libraries/audio/ntk { }; @@ -11400,8 +11606,8 @@ with pkgs; openh264 = callPackage ../development/libraries/openh264 { }; openjpeg_1 = callPackage ../development/libraries/openjpeg/1.x.nix { }; - openjpeg_2_1 = callPackage ../development/libraries/openjpeg/2.1.nix { }; - openjpeg = openjpeg_2_1; + openjpeg_2 = callPackage ../development/libraries/openjpeg/2.x.nix { }; + openjpeg = openjpeg_2; openpa = callPackage ../development/libraries/openpa { }; @@ -11434,7 +11640,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 { @@ -11465,8 +11671,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 { @@ -11542,10 +11746,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"; }; @@ -11578,8 +11780,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 { }; @@ -11707,7 +11910,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 @@ -11837,6 +12040,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 { }; @@ -11891,6 +12096,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 { @@ -11986,7 +12193,11 @@ with pkgs; graphite2 = callPackage ../development/libraries/silgraphite/graphite2.nix {}; - simavr = callPackage ../development/tools/simavr { }; + simavr = callPackage ../development/tools/simavr { + avrgcc = pkgsCross.avr.buildPackages.gcc; + avrbinutils = pkgsCross.avr.buildPackages.binutils; + avrlibc = pkgsCross.avr.libcCross; + }; simgear = callPackage ../development/libraries/simgear { }; @@ -12003,7 +12214,27 @@ with pkgs; shibboleth-sp = callPackage ../development/libraries/shibboleth-sp { }; - skalibs = callPackage ../development/libraries/skalibs { }; + skaffold = callPackage ../development/tools/skaffold { }; + + skalibs = skawarePackages.skalibs; + + skawarePackages = recurseIntoAttrs { + buildPackage = callPackage ../build-support/skaware/build-skaware-package.nix { }; + + skalibs = callPackage ../development/libraries/skalibs { }; + execline = callPackage ../tools/misc/execline { }; + + s6 = callPackage ../tools/system/s6 { }; + s6-dns = callPackage ../tools/networking/s6-dns { }; + s6-linux-utils = callPackage ../os-specific/linux/s6-linux-utils { }; + s6-networking = callPackage ../tools/networking/s6-networking { }; + s6-portable-utils = callPackage ../tools/misc/s6-portable-utils { }; + s6-rc = callPackage ../tools/system/s6-rc { }; + + nsss = callPackage ../development/libraries/nsss { }; + utmps = callPackage ../development/libraries/utmps { }; + + }; skydive = callPackage ../tools/networking/skydive { }; @@ -12119,6 +12350,29 @@ with pkgs; sqlite-jdbc = callPackage ../servers/sql/sqlite/jdbc { }; + sqlite-replication = sqlite.overrideAttrs (oldAttrs: rec { + name = "sqlite-${version}"; + version = "3.24.0+replication3"; + src = pkgs.fetchFromGitHub { + owner = "CanonicalLtd"; + repo = "sqlite"; + rev = "version-${version}"; + sha256 = "19557b7aick1pxk0gw013cf5jy42i7539qn1ziza8dzy16a6zs8b"; + }; + nativeBuildInputs = [ pkgs.tcl ]; + configureFlags = oldAttrs.configureFlags ++ [ + "--enable-replication" + "--disable-amalgamation" + "--disable-tcl" + ]; + preConfigure = '' + echo "D 2018-08-01T13:22:18" > manifest + echo -n "c94dbda1a570c1ab180e7694afd3cc7116268c06" > manifest.uuid + ''; + }); + + dqlite = callPackage ../development/libraries/dqlite { }; + sqlcipher = lowPrio (callPackage ../development/libraries/sqlcipher { readline = null; ncurses = null; @@ -12210,6 +12464,8 @@ with pkgs; telepathy-qt = callPackage ../development/libraries/telepathy/qt { qtbase = qt4; }; + termbox = callPackage ../development/libraries/termbox { }; + tevent = callPackage ../development/libraries/tevent { python = python2; }; @@ -12291,6 +12547,8 @@ with pkgs; uthash = callPackage ../development/libraries/uthash { }; + utmps = skawarePackages.utmps; + ucommon = ucommon_openssl; ucommon_openssl = callPackage ../development/libraries/ucommon { @@ -12410,6 +12668,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; @@ -12454,6 +12719,7 @@ with pkgs; wxmac = callPackage ../development/libraries/wxwidgets/3.0/mac.nix { inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel; inherit (darwin.stubs) setfile rez derez; + inherit (darwin) cf-private; }; wxSVG = callPackage ../development/libraries/wxSVG { @@ -12530,6 +12796,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 { }; @@ -12575,7 +12843,7 @@ with pkgs; zmqpp = callPackage ../development/libraries/zmqpp { }; zig = callPackage ../development/compilers/zig { - llvmPackages = llvmPackages_6; + llvmPackages = llvmPackages_7; }; zimlib = callPackage ../development/libraries/zimlib { }; @@ -12588,6 +12856,17 @@ with pkgs; zziplib = callPackage ../development/libraries/zziplib { }; + gsignond = callPackage ../development/libraries/gsignond { + plugins = []; + }; + + gsignondPlugins = { + sasl = callPackage ../development/libraries/gsignond/plugins/sasl.nix { }; + oauth = callPackage ../development/libraries/gsignond/plugins/oauth.nix { }; + lastfm = callPackage ../development/libraries/gsignond/plugins/lastfm.nix { }; + mail = callPackages ../development/libraries/gsignond/plugins/mail.nix { }; + }; + ### DEVELOPMENT / LIBRARIES / AGDA agda = callPackage ../build-support/agda { @@ -12705,6 +12984,8 @@ with pkgs; leaps = callPackage ../development/tools/leaps { }; + vgo2nix = callPackage ../development/tools/vgo2nix { }; + ws = callPackage ../development/tools/ws { }; ### DEVELOPMENT / JAVA MODULES @@ -12748,32 +13029,26 @@ 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; - - perlXMLParser = perlPackages.XMLParser; + inherit (perlPackages) perl; ack = perlPackages.ack; - perlArchiveCpio = perlPackages.ArchiveCpio; - perlcritic = perlPackages.PerlCritic; sqitchPg = callPackage ../development/tools/misc/sqitch { @@ -12825,8 +13100,8 @@ with pkgs; rdf4store = callPackage ../servers/http/4store { }; - apacheHttpd = pkgs.apacheHttpd_2_4; apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { }; + apacheHttpd = pkgs.apacheHttpd_2_4; apacheHttpdPackagesFor = apacheHttpd: self: let callPackage = newScope self; in { inherit apacheHttpd; @@ -12850,8 +13125,8 @@ with pkgs; subversion = pkgs.subversion.override { httpServer = true; inherit apacheHttpd; }; }; - apacheHttpdPackages = apacheHttpdPackagesFor pkgs.apacheHttpd pkgs.apacheHttpdPackages; apacheHttpdPackages_2_4 = apacheHttpdPackagesFor pkgs.apacheHttpd_2_4 pkgs.apacheHttpdPackages_2_4; + apacheHttpdPackages = apacheHttpdPackages_2_4; appdaemon = callPackage ../servers/home-assistant/appdaemon.nix { }; @@ -12923,6 +13198,8 @@ with pkgs; dex-oidc = callPackage ../servers/dex { }; + doh-proxy = callPackage ../servers/dns/doh-proxy { }; + dgraph = callPackage ../servers/dgraph { }; dico = callPackage ../servers/dico { }; @@ -13099,6 +13376,8 @@ with pkgs; nas = callPackage ../servers/nas { }; + nats-streaming-server = callPackage ../servers/nats-streaming-server { }; + neard = callPackage ../servers/neard { }; nginx = nginxStable; @@ -13258,6 +13537,8 @@ with pkgs; mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { }; + miniflux = callPackage ../servers/miniflux { }; + nagios = callPackage ../servers/monitoring/nagios { }; munin = callPackage ../servers/monitoring/munin { }; @@ -13275,14 +13556,12 @@ 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 { }; + nullidentdmod = callPackage ../servers/identd/nullidentdmod {}; + riemann = callPackage ../servers/monitoring/riemann { }; riemann-dash = callPackage ../servers/monitoring/riemann-dash { }; @@ -13297,7 +13576,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; }; @@ -13307,26 +13586,29 @@ with pkgs; cbfstool = callPackage ../applications/virtualization/cbfstool { }; + nvramtool = callPackage ../tools/misc/nvramtool { }; + vmfs-tools = callPackage ../tools/filesystems/vmfs-tools { }; pgbouncer = callPackage ../servers/sql/pgbouncer { }; - pgpool93 = pgpool.override { postgresql = postgresql93; }; - pgpool94 = pgpool.override { postgresql = postgresql94; }; + pgpool93 = pgpool.override { postgresql = postgresql_9_3; }; + pgpool94 = pgpool.override { postgresql = postgresql_9_4; }; pgpool = callPackage ../servers/sql/pgpool { pam = if stdenv.isLinux then pam else null; libmemcached = null; # Detection is broken upstream }; - postgresql = postgresql96; + postgresql = postgresql_9_6; inherit (callPackages ../servers/sql/postgresql { }) - postgresql93 - postgresql94 - postgresql95 - postgresql96 - postgresql100; + postgresql_9_3 + postgresql_9_4 + postgresql_9_5 + postgresql_9_6 + postgresql_10 + postgresql_11; postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { }; @@ -13361,6 +13643,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 { }; @@ -13384,8 +13667,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 { }; @@ -13413,9 +13698,9 @@ with pkgs; boost = boost159; }; - s6 = callPackage ../tools/system/s6 { }; + s6 = skawarePackages.s6; - s6-rc = callPackage ../tools/system/s6-rc { }; + s6-rc = skawarePackages.s6-rc; supervise = callPackage ../tools/system/supervise { }; @@ -13449,7 +13734,6 @@ with pkgs; }); samba4Full = lowPrio (samba4.override { - enableInfiniband = true; enableLDAP = true; enablePrinting = true; enableMDNS = true; @@ -13480,6 +13764,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 { }; @@ -13551,6 +13841,8 @@ with pkgs; webmetro = callPackage ../servers/webmetro { }; + webhook = callPackage ../servers/http/webhook { }; + winstone = callPackage ../servers/http/winstone { }; xinetd = callPackage ../servers/xinetd { }; @@ -13667,6 +13959,8 @@ with pkgs; bluez5 = callPackage ../os-specific/linux/bluez { }; + pulseaudio-modules-bt = callPackage ../applications/audio/pulseaudio-modules-bt { }; + bluez = bluez5; inherit (python3Packages) bedup; @@ -13823,7 +14117,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 { }; @@ -13925,16 +14219,8 @@ with pkgs; ]; }; - linux_copperhead_lts = (linux_4_14.override { - kernelPatches = linux_4_14.kernelPatches ++ [ - kernelPatches.copperhead_4_14 - kernelPatches.tag_hardened - ]; - modDirVersionArg = linux_4_14.modDirVersion + "-hardened"; - }); - - # 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" @@ -14003,7 +14289,7 @@ with pkgs; ]; }; - linux_4_17 = callPackage ../os-specific/linux/kernel/linux-4.17.nix { + linux_4_18 = callPackage ../os-specific/linux/kernel/linux-4.18.nix { kernelPatches = [ kernelPatches.bridge_stp_helper # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md @@ -14013,7 +14299,7 @@ with pkgs; ]; }; - linux_4_18 = callPackage ../os-specific/linux/kernel/linux-4.18.nix { + linux_4_19 = callPackage ../os-specific/linux/kernel/linux-4.19.nix { kernelPatches = [ kernelPatches.bridge_stp_helper # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md @@ -14134,6 +14420,8 @@ with pkgs; ply = callPackage ../os-specific/linux/ply { }; + r8168 = callPackage ../os-specific/linux/r8168 { }; + rtl8192eu = callPackage ../os-specific/linux/rtl8192eu { }; rtl8723bs = callPackage ../os-specific/linux/rtl8723bs { }; @@ -14206,6 +14494,8 @@ with pkgs; }) zfsStable zfsUnstable; zfs = zfsStable; + + can-isotp = callPackage ../os-specific/linux/can-isotp { }; }); # The current default kernel / kernel modules. @@ -14213,7 +14503,7 @@ with pkgs; linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! - linuxPackages_latest = linuxPackages_4_18; + linuxPackages_latest = linuxPackages_4_19; linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. @@ -14223,8 +14513,8 @@ with pkgs; linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4); linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14); - linuxPackages_4_17 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_17); linuxPackages_4_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_18); + linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19); # Don't forget to update linuxPackages_latest! # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds. @@ -14270,12 +14560,13 @@ 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; })); - linuxPackages_copperhead_lts = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_copperhead_lts); - # Samus kernels linuxPackages_samus_4_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_samus_4_12); linuxPackages_samus_latest = linuxPackages_samus_4_12; @@ -14397,7 +14688,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; }; @@ -14432,12 +14723,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 { }; @@ -14517,10 +14808,10 @@ with pkgs; pmutils = callPackage ../os-specific/linux/pm-utils { }; - pmtools = callPackage ../os-specific/linux/pmtools { }; - policycoreutils = callPackage ../os-specific/linux/policycoreutils { }; + semodule-utils = callPackage ../os-specific/linux/semodule-utils { }; + powerdns = callPackage ../servers/dns/powerdns { }; dnsdist = callPackage ../servers/dns/dnsdist { }; @@ -14572,6 +14863,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 { }; @@ -14643,6 +14936,8 @@ with pkgs; ''; })); + systemd-wait = callPackage ../os-specific/linux/systemd-wait { }; + sysvinit = callPackage ../os-specific/linux/sysvinit { }; sysvtools = sysvinit.override { @@ -14660,6 +14955,8 @@ with pkgs; tunctl = callPackage ../os-specific/linux/tunctl { }; + twa = callPackage ../tools/networking/twa { }; + # Upstream U-Boots: inherit (callPackage ../misc/uboot {}) buildUBoot @@ -14673,6 +14970,7 @@ with pkgs; ubootNovena ubootOdroidXU3 ubootOrangePiPc + ubootOrangePiZeroPlus2H5 ubootPcduino3Nano ubootPine64 ubootQemuAarch64 @@ -14771,6 +15069,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 { }; @@ -14803,6 +15103,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 { }; @@ -14861,6 +15163,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 { }; @@ -14901,6 +15205,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 { }; @@ -14945,6 +15251,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 { }; @@ -14999,6 +15307,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 { }; @@ -15124,6 +15434,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 { }; @@ -15260,6 +15571,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 { }; @@ -15278,6 +15591,8 @@ with pkgs; vistafonts-chs = callPackage ../data/fonts/vista-fonts-chs { }; + weather-icons = callPackage ../data/fonts/weather-icons { }; + wireless-regdb = callPackage ../data/misc/wireless-regdb { }; wqy_microhei = callPackage ../data/fonts/wqy-microhei { }; @@ -15395,7 +15710,7 @@ with pkgs; inherit (vamp) vampSDK; }; - inherit (python34Packages) arelle; + inherit (python3Packages) arelle; ario = callPackage ../applications/audio/ario { }; @@ -15458,12 +15773,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; @@ -15479,6 +15789,8 @@ with pkgs; autopanosiftc = callPackage ../applications/graphics/autopanosiftc { }; + aesop = callPackage ../applications/office/aesop { }; + avidemux = libsForQt5.callPackage ../applications/video/avidemux { }; avrdudess = callPackage ../applications/misc/avrdudess { }; @@ -15514,11 +15826,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 { }; @@ -15590,6 +15897,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 { @@ -15601,13 +15914,13 @@ with pkgs; brackets = callPackage ../applications/editors/brackets { gconf = gnome2.GConf; }; + brave = callPackage ../applications/networking/browsers/brave { }; + notmuch-bower = callPackage ../applications/networking/mailreaders/notmuch-bower { }; bristol = callPackage ../applications/audio/bristol { }; - bs1770gain = callPackage ../applications/audio/bs1770gain { - ffmpeg = ffmpeg_2; - }; + bs1770gain = callPackage ../applications/audio/bs1770gain { }; bspwm = callPackage ../applications/window-managers/bspwm { }; @@ -15682,13 +15995,20 @@ with pkgs; browsh = callPackage ../applications/networking/browsers/browsh { }; - chromium = callPackage ../applications/networking/browsers/chromium { + bookworm = callPackage ../applications/office/bookworm { }; + + chromium = callPackage ../applications/networking/browsers/chromium ({ channel = "stable"; pulseSupport = config.pulseaudio or true; enablePepperFlash = config.chromium.enablePepperFlash or false; enableWideVine = config.chromium.enableWideVine or false; - gnome = gnome2; - }; + } // (if stdenv.isAarch64 then { + stdenv = gcc8Stdenv; + } else { + llvmPackages = llvmPackages_7; + stdenv = llvmPackages_7.stdenv; + }) + ); chronos = callPackage ../applications/networking/cluster/chronos { }; @@ -15735,6 +16055,8 @@ with pkgs; cni = callPackage ../applications/networking/cluster/cni {}; cni-plugins = callPackage ../applications/networking/cluster/cni/plugins.nix {}; + cntr = callPackage ../applications/virtualization/cntr { }; + communi = libsForQt5.callPackage ../applications/networking/irc/communi { }; confclerk = callPackage ../applications/misc/confclerk { }; @@ -15745,6 +16067,8 @@ with pkgs; inherit (gnome2) libgnomeui GConf; }; + csa = callPackage ../applications/audio/csa { }; + csound = callPackage ../applications/audio/csound { }; cinepaint = callPackage ../applications/graphics/cinepaint { @@ -15800,7 +16124,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"]; }); @@ -15817,6 +16141,8 @@ 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-trace-agent = callPackage ../tools/networking/dd-agent/datadog-trace-agent.nix { }; datadog-integrations-core = extras: callPackage ../tools/networking/dd-agent/integrations-core.nix { python = python27; extraIntegrations = extras; @@ -15872,6 +16198,8 @@ with pkgs; inherit (python3Packages) buildPythonApplication requests; }; + dmrconfig = callPackage ../applications/misc/dmrconfig { }; + dmtx-utils = callPackage (callPackage ../tools/graphics/dmtx-utils) { }; @@ -15958,7 +16286,7 @@ with pkgs; eaglemode = callPackage ../applications/misc/eaglemode { }; eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse { - jdk = jdk10; + jdk = jdk11; }); ecs-agent = callPackage ../applications/virtualization/ecs-agent { }; @@ -16028,7 +16356,7 @@ with pkgs; ImageCaptureCore GSS ImageIO; }; - emacsPackagesGen = emacs: self: let callPackage = newScope self; in rec { + emacsPackagesFor = emacs: self: let callPackage = newScope self; in rec { inherit emacs; autoComplete = callPackage ../applications/editors/emacs-modes/auto-complete { }; @@ -16041,6 +16369,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 { }; @@ -16171,10 +16501,10 @@ with pkgs; cask = callPackage ../applications/editors/emacs-modes/cask { }; }; - emacs25Packages = emacsPackagesGen emacs25 pkgs.emacs25Packages; - emacs26Packages = emacsPackagesGen emacs26 pkgs.emacs26Packages; + emacs25Packages = emacsPackagesFor emacs25 pkgs.emacs25Packages; + emacs26Packages = emacsPackagesFor emacs26 pkgs.emacs26Packages; - emacsPackagesNgGen = emacs: import ./emacs-packages.nix { + emacsPackagesNgFor = emacs: import ./emacs-packages.nix { inherit lib newScope stdenv; inherit fetchFromGitHub fetchgit fetchhg fetchurl fetchpatch; inherit emacs texinfo makeWrapper runCommand writeText; @@ -16196,9 +16526,9 @@ with pkgs; }; }; - emacs25PackagesNg = emacsPackagesNgGen emacs25; + emacs25PackagesNg = emacsPackagesNgFor emacs25; emacs25WithPackages = emacs25PackagesNg.emacsWithPackages; - emacs26PackagesNg = emacsPackagesNgGen emacs26; + emacs26PackagesNg = emacsPackagesNgFor emacs26; emacs26WithPackages = emacs26PackagesNg.emacsWithPackages; emacsWithPackages = emacsPackagesNg.emacsWithPackages; @@ -16233,6 +16563,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 { @@ -16282,6 +16614,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 { }; @@ -16289,8 +16623,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; @@ -16333,7 +16674,7 @@ with pkgs; gksu = callPackage ../applications/misc/gksu { }; - gnss-sdr = callPackage ../applications/misc/gnss-sdr { }; + gnss-sdr = callPackage ../applications/misc/gnss-sdr { boost=boost166; }; gnuradio = callPackage ../applications/misc/gnuradio { inherit (python2Packages) cheetah lxml Mako matplotlib numpy python pyopengl pyqt4 scipy wxPython pygtk; @@ -16344,7 +16685,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 { }; @@ -16353,6 +16694,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 { }; @@ -16532,6 +16875,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 { @@ -16824,6 +17169,8 @@ with pkgs; gxmessage = callPackage ../applications/misc/gxmessage { }; + gxplugins-lv2 = callPackage ../applications/audio/gxplugins-lv2 { }; + hackrf = callPackage ../applications/misc/hackrf { }; hakuneko = callPackage ../tools/misc/hakuneko { }; @@ -16832,6 +17179,8 @@ with pkgs; inherit (gnome2) gnome_python; }; + hashit = callPackage ../tools/misc/hashit { }; + hello = callPackage ../applications/misc/hello { }; hello-unfree = callPackage ../applications/misc/hello-unfree { }; @@ -16857,6 +17206,8 @@ with pkgs; gtk = gtk3; }; + howl = callPackage ../applications/editors/howl { }; + ht = callPackage ../applications/editors/ht { }; hubstaff = callPackage ../applications/misc/hubstaff { }; @@ -16887,9 +17238,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 { }; @@ -16897,15 +17246,21 @@ 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 { }; wlroots = callPackage ../development/libraries/wlroots { }; - rootston = wlroots.bin; + orbment = callPackage ../applications/window-managers/orbment { }; + sway = callPackage ../applications/window-managers/sway { }; + sway-beta = callPackage ../applications/window-managers/sway/beta.nix { }; velox = callPackage ../applications/window-managers/velox { stConf = config.st.conf or null; @@ -16948,6 +17303,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 {}; @@ -17116,6 +17473,8 @@ with pkgs; jwm = callPackage ../applications/window-managers/jwm { }; + jwm-settings-manager = callPackage ../applications/window-managers/jwm/jwm-settings-manager.nix { }; + k3d = callPackage ../applications/graphics/k3d { inherit (pkgs.gnome2) gtkglext; stdenv = overrideCC stdenv gcc6; @@ -17205,7 +17564,6 @@ with pkgs; krita = libsForQt5.callPackage ../applications/graphics/krita { openjpeg = openjpeg_1; - poppler_qt5 = libsForQt5.poppler; }; krusader = libsForQt5.callPackage ../applications/misc/krusader { }; @@ -17218,6 +17576,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: { @@ -17286,15 +17646,12 @@ with pkgs; harfbuzz = harfbuzz.override { withIcu = true; withGraphite2 = true; }; - # checking whether g++ supports C++14 or C++11... configure: error: no - # Still relevant: 2018-04-13 - stdenv = overrideCC stdenv gcc5; }; - libreoffice-unwrapped =callPackage ../applications/office/libreoffice + libreoffice-unwrapped = callPackage ../applications/office/libreoffice (libreoffice-args // { }); - libreoffice-still-unwrapped =callPackage ../applications/office/libreoffice/still.nix + libreoffice-still-unwrapped = callPackage ../applications/office/libreoffice/still.nix (libreoffice-args // { poppler = poppler_0_61; }); @@ -17356,6 +17713,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 { }; @@ -17410,6 +17769,8 @@ with pkgs; makeself = callPackage ../applications/misc/makeself { }; + mako = callPackage ../applications/misc/mako { }; + mapmap = libsForQt5.callPackage ../applications/video/mapmap { }; marathon = callPackage ../applications/networking/cluster/marathon { }; @@ -17433,6 +17794,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 { }; @@ -17443,6 +17806,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 @@ -17475,6 +17840,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) vmnet; }; + minishift = callPackage ../applications/networking/cluster/minishift { }; + minitube = libsForQt5.callPackage ../applications/video/minitube { }; mimic = callPackage ../applications/audio/mimic { @@ -17607,6 +17974,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 ({ @@ -17696,6 +18065,8 @@ with pkgs; pythonPackages = python3Packages; }; + neap = callPackage ../applications/misc/neap { }; + neomutt = callPackage ../applications/networking/mailreaders/neomutt { }; natron = callPackage ../applications/video/natron { }; @@ -17724,6 +18095,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 { }; @@ -17775,6 +18148,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 { }; @@ -17827,6 +18202,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 { }; @@ -17855,6 +18232,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 { }; @@ -17892,6 +18271,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 { }; @@ -17916,7 +18297,10 @@ with pkgs; opentimestamps-client = python3Packages.callPackage ../tools/misc/opentimestamps-client {}; - opentx = callPackage ../applications/misc/opentx { }; + opentx = callPackage ../applications/misc/opentx { + gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; + binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; + }; opera = callPackage ../applications/networking/browsers/opera {}; @@ -18182,6 +18566,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 { }; @@ -18261,6 +18646,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 { }; @@ -18326,6 +18713,8 @@ with pkgs; rclone = callPackage ../applications/networking/sync/rclone { }; + rclone-browser = libsForQt5.callPackage ../applications/networking/sync/rclone/browser.nix { }; + rcs = callPackage ../applications/version-management/rcs { }; rdesktop = callPackage ../applications/networking/remote/rdesktop { }; @@ -18567,6 +18956,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; }; @@ -18649,6 +19043,10 @@ with pkgs; apiKey = config.libspotify.apiKey or null; }; + sourcetrail = callPackage ../development/tools/sourcetrail { }; + + spotifywm = callPackage ../applications/audio/spotifywm { }; + squeezelite = callPackage ../applications/audio/squeezelite { }; ltunify = callPackage ../tools/misc/ltunify { }; @@ -18758,10 +19156,16 @@ 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 { }; + + tabula = callPackage ../applications/misc/tabula { }; tasknc = callPackage ../applications/misc/tasknc { }; @@ -18817,6 +19221,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; @@ -18919,9 +19325,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 { }; @@ -19118,6 +19522,8 @@ with pkgs; vnstat = callPackage ../applications/networking/vnstat { }; + vocal = callPackage ../applications/audio/vocal { }; + vogl = libsForQt5.callPackage ../development/tools/vogl { }; volnoti = callPackage ../applications/misc/volnoti { }; @@ -19183,13 +19589,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; @@ -19218,6 +19618,7 @@ with pkgs; winswitch = callPackage ../tools/X11/winswitch { }; wings = callPackage ../applications/graphics/wings { + esdl = esdl.override { erlang = erlangR18; }; erlang = erlangR18; }; @@ -19408,6 +19809,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 { }; @@ -19512,8 +19915,6 @@ with pkgs; xpra = callPackage ../tools/X11/xpra { }; libfakeXinerama = callPackage ../tools/X11/xpra/libfakeXinerama.nix { }; - #TODO: 'pil' is not available for python3, yet - xpraGtk3 = callPackage ../tools/X11/xpra/gtk3.nix { inherit (texFunctions) fontsConf; inherit (python3Packages) buildPythonApplication python cython pygobject3 pycairo; }; xrectsel = callPackage ../tools/X11/xrectsel { }; @@ -19529,6 +19930,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 { }; @@ -19575,6 +19978,8 @@ with pkgs; yate = callPackage ../applications/misc/yate { }; + ydiff = callPackage ../development/tools/ydiff { }; + yed = callPackage ../applications/graphics/yed {}; inherit (gnome3) yelp; @@ -19620,7 +20025,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 { }; @@ -19697,6 +20104,8 @@ with pkgs; blobby = callPackage ../games/blobby { }; + boohu = callPackage ../games/boohu { }; + braincurses = callPackage ../games/braincurses { }; brogue = callPackage ../games/brogue { }; @@ -19718,7 +20127,7 @@ with pkgs; chessdb = callPackage ../games/chessdb { }; - chessx = libsForQt5.callPackage ../games/chessx { }; + chessx = libsForQt59.callPackage ../games/chessx { }; chocolateDoom = callPackage ../games/chocolate-doom { }; @@ -19936,6 +20345,8 @@ with pkgs; instead-launcher = callPackage ../games/instead-launcher { }; + ivan = callPackage ../games/ivan { }; + ja2-stracciatella = callPackage ../games/ja2-stracciatella { }; klavaro = callPackage ../games/klavaro {}; @@ -19954,7 +20365,7 @@ with pkgs; }; liquidwar = callPackage ../games/liquidwar { - guile = guile_1_8; + guile = guile_2_0; }; liquidwar5 = callPackage ../games/liquidwar/5.nix { @@ -20060,9 +20471,9 @@ with pkgs; pong3d = callPackage ../games/pong3d { }; - pokerth = callPackage ../games/pokerth { }; + pokerth = libsForQt5.callPackage ../games/pokerth { }; - pokerth-server = pokerth.server; + pokerth-server = libsForQt5.callPackage ../games/pokerth { target = "server"; }; prboom = callPackage ../games/prboom { }; @@ -20126,7 +20537,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 { }; @@ -20146,6 +20563,12 @@ with pkgs; scummvm = callPackage ../games/scummvm { }; + inherit (callPackage ../games/scummvm/games.nix { }) + beneath-a-steel-sky + drascula-the-vampire-strikes-back + flight-of-the-amazon-queen + lure-of-the-temptress; + scorched3d = callPackage ../games/scorched3d { }; scrolls = callPackage ../games/scrolls { }; @@ -20170,7 +20593,7 @@ with pkgs; lua = lua5_1; }; - solarus = callPackage ../games/solarus { }; + solarus = libsForQt5.callPackage ../games/solarus { }; solarus-quest-editor = libsForQt5.callPackage ../development/tools/solarus-quest-editor { }; @@ -20203,6 +20626,8 @@ with pkgs; nativeOnly = true; }).run; + steamcmd = steamPackages.steamcmd; + linux-steam-integration = callPackage ../games/linux-steam-integration { gtk = pkgs.gtk3; }; @@ -20476,6 +20901,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; @@ -20486,6 +20913,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 { }; @@ -20570,6 +20999,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 { @@ -20580,6 +21021,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 { }; @@ -20608,6 +21053,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 { }; @@ -20689,6 +21136,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 { }; @@ -20749,10 +21198,14 @@ with pkgs; liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { }; + lrs = callPackage ../development/libraries/science/math/lrs { }; + m4ri = callPackage ../development/libraries/science/math/m4ri { }; 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 { }; @@ -20767,6 +21220,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 { @@ -20792,10 +21249,18 @@ with pkgs; nauty = callPackage ../applications/science/math/nauty {}; + or-tools = callPackage ../development/libraries/science/math/or-tools {}; + rubiks = callPackage ../development/libraries/science/math/rubiks { }; petsc = callPackage ../development/libraries/science/math/petsc { }; + parmetis = callPackage ../development/libraries/science/math/parmetis { + mpi = openmpi; + }; + + QuadProgpp = callPackage ../development/libraries/science/math/QuadProgpp { }; + scs = callPackage ../development/libraries/science/math/scs { liblapack = liblapackWithoutAtlas; }; @@ -20806,8 +21271,9 @@ with pkgs; sageWithDoc = sage.override { withDoc = true; }; suitesparse_4_2 = callPackage ../development/libraries/science/math/suitesparse/4.2.nix { }; - suitesparse_4_4 = callPackage ../development/libraries/science/math/suitesparse {}; - suitesparse = suitesparse_4_4; + suitesparse_4_4 = callPackage ../development/libraries/science/math/suitesparse/4.4.nix {}; + suitesparse_5_3 = callPackage ../development/libraries/science/math/suitesparse {}; + suitesparse = suitesparse_5_3; superlu = callPackage ../development/libraries/science/math/superlu {}; @@ -20870,6 +21336,8 @@ with pkgs; sherpa = callPackage ../applications/science/physics/sherpa {}; + xfitter = callPackage ../applications/science/physics/xfitter {}; + ### SCIENCE/PROGRAMMING dafny = dotnetPackages.Dafny; @@ -20888,9 +21356,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 {}; @@ -20899,12 +21365,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_5 coq_8_6 coq_8_7 coq_8_8 coqPackages_8_5 coqPackages_8_6 coqPackages_8_7 coqPackages_8_8 coqPackages coq ; @@ -20983,10 +21448,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 { }; @@ -21006,10 +21467,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 { }; @@ -21262,6 +21720,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 { }; @@ -21283,33 +21745,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 { }; @@ -21323,6 +21771,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 { }; @@ -21338,6 +21788,8 @@ with pkgs; withRootSupport = true; }); + qcdnum = callPackage ../development/libraries/physics/qcdnum { }; + ### SCIENCE/ROBOTICS apmplanner2 = libsForQt5.callPackage ../applications/science/robotics/apmplanner2 { }; @@ -21417,6 +21869,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 { }; @@ -21461,6 +21915,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 { }; @@ -21527,14 +21983,9 @@ with pkgs; gnome-breeze = callPackage ../misc/themes/gnome-breeze { }; gnuk = callPackage ../misc/gnuk { - gcc-arm-embedded = gcc-arm-embedded-4_9; + gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; + binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; }; - gnuk-unstable = lowPrio (callPackage ../misc/gnuk/unstable.nix { - gcc-arm-embedded = gcc-arm-embedded-4_9; - }); - gnuk-git = lowPrio (callPackage ../misc/gnuk/git.nix { - gcc-arm-embedded = gcc-arm-embedded-4_9; - }); greybird = callPackage ../misc/themes/greybird { }; @@ -21560,7 +22011,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 { }; @@ -21604,6 +22057,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 { }; @@ -21688,6 +22143,8 @@ with pkgs; nixui = callPackage ../tools/package-management/nixui { node_webkit = nwjs_0_12; }; + nixdoc = callPackage ../tools/nix/nixdoc {}; + nix-bundle = callPackage ../tools/package-management/nix-bundle { }; nix-delegate = haskell.lib.justStaticExecutables haskellPackages.nix-delegate; @@ -21699,7 +22156,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 { }; @@ -21840,6 +22299,8 @@ with pkgs; retrofe = callPackage ../misc/emulators/retrofe { }; + rfc-bibtex = python3Packages.callPackage ../development/python-modules/rfc-bibtex { }; + rpl = callPackage ../tools/text/rpl { pythonPackages = python3Packages; }; @@ -21888,9 +22349,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; @@ -21927,6 +22389,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; }; @@ -21950,6 +22416,8 @@ with pkgs; steamcontroller = callPackage ../misc/drivers/steamcontroller { }; + stern = callPackage ../applications/networking/cluster/stern { }; + streamripper = callPackage ../applications/audio/streamripper { }; sqsh = callPackage ../development/tools/sqsh { }; @@ -21962,21 +22430,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 { @@ -21989,6 +22456,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; @@ -22018,7 +22487,7 @@ with pkgs; unity3d = callPackage ../development/tools/unity3d { stdenv = stdenv_32bit; gcc_32bit = pkgsi686Linux.gcc; - inherit (gnome2) GConf libgnomeui gnome_vfs; + inherit (gnome2) GConf; }; urbit = callPackage ../misc/urbit { }; @@ -22031,9 +22500,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; @@ -22050,7 +22517,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; }); @@ -22220,13 +22686,18 @@ with pkgs; inherit (gnome2) gtksourceview; }; - bullet = callPackage ../development/libraries/bullet {}; + bullet = callPackage ../development/libraries/bullet { + inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; + }; + + inherit (callPackages ../development/libraries/spdlog { }) + spdlog_0 spdlog_1; - spdlog = callPackage ../development/libraries/spdlog { }; + 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 { }; @@ -22249,9 +22720,7 @@ with pkgs; tomb = callPackage ../os-specific/linux/tomb {}; - tomboy = callPackage ../applications/misc/tomboy { - mono = mono46; - }; + tomboy = callPackage ../applications/misc/tomboy { }; imatix_gsl = callPackage ../development/tools/imatix_gsl {}; @@ -22360,4 +22829,18 @@ with pkgs; alibuild = callPackage ../development/tools/build-managers/alibuild { python = python27; }; + + tsung = callPackage ../applications/networking/tsung {}; + + qmk_firmware = callPackage ../development/misc/qmk_firmware { + avrgcc = pkgsCross.avr.buildPackages.gcc; + avrbinutils = pkgsCross.avr.buildPackages.binutils; + gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; + binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; + }; + + newlib = callPackage ../development/misc/newlib { }; + newlibCross = callPackage ../development/misc/newlib { + stdenv = crossLibcStdenv; + }; } |