diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 265 |
1 files changed, 215 insertions, 50 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77563721c58..f3a40002f7c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -169,6 +169,10 @@ in demoit = callPackage ../servers/demoit { }; + deviceTree = callPackage ../os-specific/linux/device-tree {}; + + device-tree_rpi = callPackage ../os-specific/linux/device-tree/raspberrypi.nix {}; + diffPlugins = (callPackage ../build-support/plugins.nix {}).diffPlugins; dieHook = makeSetupHook {} ../build-support/setup-hooks/die.sh; @@ -273,9 +277,9 @@ in fetchhg = callPackage ../build-support/fetchhg { }; # `fetchurl' downloads a file from the network. - fetchurl = import ../build-support/fetchurl { + fetchurl = makeOverridable (import ../build-support/fetchurl) { inherit lib stdenvNoCC; - curl = buildPackages.curl.override rec { + curl = buildPackages.curl.override (old: rec { # break dependency cycles fetchurl = stdenv.fetchurlBoot; zlib = buildPackages.zlib.override { fetchurl = stdenv.fetchurlBoot; }; @@ -292,7 +296,12 @@ in }; # On darwin, libkrb5 needs bootstrap_cmds which would require # converting many packages to fetchurl_boot to avoid evaluation cycles. - gssSupport = !stdenv.isDarwin && !stdenv.hostPlatform.isWindows; + # So turn gssSupport off there, and on Windows. + # On other platforms, keep the previous value. + gssSupport = + if stdenv.isDarwin || stdenv.hostPlatform.isWindows + then false + else old.gssSupport or true; # `? true` is the default libkrb5 = buildPackages.libkrb5.override { fetchurl = stdenv.fetchurlBoot; inherit pkgconfig perl openssl; @@ -304,7 +313,7 @@ in c-ares = buildPackages.c-ares.override { fetchurl = stdenv.fetchurlBoot; }; libev = buildPackages.libev.override { fetchurl = stdenv.fetchurlBoot; }; }; - }; + }); }; fetchRepoProject = callPackage ../build-support/fetchrepoproject { }; @@ -555,6 +564,8 @@ in antora = callPackage ../development/tools/documentation/antora {}; + apfs-fuse = callPackage ../tools/filesystems/apfs-fuse { }; + apktool = callPackage ../development/tools/apktool { inherit (androidenv.androidPkgs_9_0) build-tools; }; @@ -573,7 +584,8 @@ in arandr = callPackage ../tools/X11/arandr { }; - arangodb = callPackage ../servers/nosql/arangodb { }; + inherit (callPackages ../servers/nosql/arangodb { }) arangodb_3_2 arangodb_3_3 arangodb_3_4 arangodb_3_5; + arangodb = arangodb_3_4; arcanist = callPackage ../development/tools/misc/arcanist {}; @@ -700,14 +712,16 @@ in bcachefs-tools = callPackage ../tools/filesystems/bcachefs-tools { }; + bitwarden = callPackage ../tools/security/bitwarden { }; + + bitwarden-cli = callPackage ../tools/security/bitwarden-cli { }; + bitwarden_rs = callPackage ../tools/security/bitwarden_rs { inherit (darwin.apple_sdk.frameworks) Security CoreServices; }; bitwarden_rs-vault = callPackage ../tools/security/bitwarden_rs/vault.nix { }; - bitwarden-cli = callPackage ../tools/security/bitwarden-cli { }; - bmap-tools = callPackage ../tools/misc/bmap-tools { }; bonnie = callPackage ../tools/filesystems/bonnie { }; @@ -744,12 +758,16 @@ in chkcrontab = callPackage ../tools/admin/chkcrontab { }; + codespell = with python3Packages; toPythonApplication codespell; + cozy = callPackage ../applications/audio/cozy-audiobooks { }; ctrtool = callPackage ../tools/archivers/ctrtool { }; crumbs = callPackage ../applications/misc/crumbs { }; + crc32c = callPackage ../development/libraries/crc32c { }; + cue = callPackage ../development/tools/cue { }; deskew = callPackage ../applications/graphics/deskew { }; @@ -798,10 +816,14 @@ in git-repo-updater = python3Packages.callPackage ../development/tools/git-repo-updater { }; + git-revise = with python3Packages; toPythonApplication git-revise; + git-town = callPackage ../tools/misc/git-town { }; github-changelog-generator = callPackage ../development/tools/github-changelog-generator { }; + github-commenter = callPackage ../development/tools/github-commenter { }; + gitless = callPackage ../applications/version-management/gitless { }; gitter = callPackage ../applications/networking/instant-messengers/gitter { }; @@ -1200,6 +1222,8 @@ in buildah = callPackage ../development/tools/buildah { }; + buildkit = callPackage ../development/tools/buildkit { }; + bukubrow = callPackage ../tools/networking/bukubrow { }; burpsuite = callPackage ../tools/networking/burpsuite {}; @@ -1367,6 +1391,8 @@ in colorls = callPackage ../tools/system/colorls { }; + coloursum = callPackage ../tools/text/coloursum { }; + compsize = callPackage ../os-specific/linux/compsize { }; coturn = callPackage ../servers/coturn { }; @@ -1570,6 +1596,8 @@ in firecracker = callPackage ../applications/virtualization/firecracker { }; + firestarter = callPackage ../applications/misc/firestarter { }; + fsmon = callPackage ../tools/misc/fsmon { }; fsql = callPackage ../tools/misc/fsql { }; @@ -1660,6 +1688,8 @@ in gscan2pdf = callPackage ../applications/graphics/gscan2pdf { }; + gsctl = callPackage ../applications/misc/gsctl { }; + gti = callPackage ../tools/misc/gti { }; hdate = callPackage ../applications/misc/hdate { }; @@ -1674,6 +1704,8 @@ in hid-listen = callPackage ../tools/misc/hid-listen { }; + hocr-tools = with python3Packages; toPythonApplication hocr-tools; + home-manager = callPackage ../tools/package-management/home-manager {}; hostsblock = callPackage ../tools/misc/hostsblock { }; @@ -1756,6 +1788,8 @@ in mkspiffs-presets = recurseIntoAttrs (callPackages ../tools/filesystems/mkspiffs/presets.nix { }); + mlarchive2maildir = callPackage ../applications/networking/mailreaders/mlarchive2maildir { }; + monetdb = callPackage ../servers/sql/monetdb { }; mousetweaks = callPackage ../applications/accessibility/mousetweaks { @@ -1796,6 +1830,8 @@ in nyx = callPackage ../tools/networking/nyx { }; + ocrmypdf = callPackage ../tools/text/ocrmypdf { }; + onboard = callPackage ../applications/misc/onboard { }; xkbd = callPackage ../applications/misc/xkbd { }; @@ -2441,6 +2477,8 @@ in curl_unix_socket = callPackage ../tools/networking/curl-unix-socket rec { }; + curlie = callPackage ../tools/networking/curlie { }; + cunit = callPackage ../tools/misc/cunit { }; bcunit = callPackage ../tools/misc/bcunit { }; @@ -3433,6 +3471,8 @@ in google-music-scripts = callPackage ../tools/audio/google-music-scripts { }; + google-cloud-cpp = callPackage ../development/libraries/google-cloud-cpp { }; + gopro = callPackage ../tools/video/gopro { }; gource = callPackage ../applications/version-management/gource { }; @@ -3485,6 +3525,10 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + ripgrep-all = callPackage ../tools/text/ripgrep-all { + inherit (darwin.apple_sdk.frameworks) Security; + }; + grive2 = callPackage ../tools/filesystems/grive2 { }; groff = callPackage ../tools/text/groff { @@ -3815,6 +3859,7 @@ in ifuse = callPackage ../tools/filesystems/ifuse { }; ideviceinstaller = callPackage ../tools/misc/ideviceinstaller { }; + idevicerestore = callPackage ../tools/misc/idevicerestore { }; inherit (callPackages ../tools/filesystems/irods rec { stdenv = llvmPackages_38.libcxxStdenv; @@ -3863,8 +3908,6 @@ in inetutils = callPackage ../tools/networking/inetutils { }; - infiniband-diags = callPackage ../tools/networking/infiniband-diags { }; - inform7 = callPackage ../development/compilers/inform7 { }; infamousPlugins = callPackage ../applications/audio/infamousPlugins { }; @@ -4757,8 +4800,6 @@ in mosh = callPackage ../tools/networking/mosh { }; - motuclient = callPackage ../applications/science/misc/motu-client { }; - mpage = callPackage ../tools/text/mpage { }; mprime = callPackage ../tools/misc/mprime { }; @@ -5486,6 +5527,8 @@ in pptpd = callPackage ../tools/networking/pptpd {}; + pre-commit = gitAndTools.pre-commit; + prettyping = callPackage ../tools/networking/prettyping { }; prey-bash-client = callPackage ../tools/security/prey { }; @@ -5932,7 +5975,9 @@ in seqdiag = with python3Packages; toPythonApplication seqdiag; - sequoia-tool = callPackage ../tools/security/sequoia-tool { inherit (llvmPackages) libclang; }; + sequoia = callPackage ../tools/security/sequoia { + pythonPackages = python3Packages; + }; sewer = callPackage ../tools/admin/sewer { }; @@ -6093,6 +6138,8 @@ in stdman = callPackage ../data/documentation/stdman { }; + stm32loader = with python3Packages; toPythonApplication stm32loader; + storebrowse = callPackage ../tools/system/storebrowse { }; stubby = callPackage ../tools/networking/stubby { }; @@ -6121,6 +6168,8 @@ in srcml = callPackage ../applications/version-management/srcml { }; + sourcehut = callPackage ../applications/version-management/sourcehut { }; + sshfs-fuse = callPackage ../tools/filesystems/sshfs-fuse { }; sshfs = sshfs-fuse; # added 2017-08-14 @@ -6355,6 +6404,8 @@ in tinyemu = callPackage ../applications/virtualization/tinyemu { }; + tinyprog = callPackage ../development/tools/misc/tinyprog { }; + tinyproxy = callPackage ../tools/networking/tinyproxy {}; tio = callPackage ../tools/misc/tio { }; @@ -7803,6 +7854,7 @@ in openjdk = openjdk11; }; + /* legacy jdk for use as needed by older apps */ openjdk8 = if stdenv.isDarwin then callPackage ../development/compilers/openjdk/darwin/8.nix { } @@ -7812,6 +7864,7 @@ in inherit (gnome2) GConf gnome_vfs; }; + /* currently maintained LTS JDK */ openjdk11 = if stdenv.isDarwin then callPackage ../development/compilers/openjdk/darwin/11.nix { } @@ -7821,6 +7874,26 @@ in inherit (gnome2) GConf gnome_vfs; }; + openjfx12 = + if stdenv.isDarwin then + null + else + callPackage ../development/compilers/openjdk/openjfx/12.nix { + openjdk = openjdk12; + bootjdk = openjdk11; + }; + + /* current JDK */ + openjdk12 = + if stdenv.isDarwin then + callPackage ../development/compilers/openjdk/darwin/default.nix { } + else + callPackage ../development/compilers/openjdk/default.nix { + openjfx = openjfx12; + inherit (gnome2) GConf gnome_vfs; + bootjdk = openjdk11; + }; + openjdk = openjdk8; jdk8 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejdk8 else openjdk8 // { outputs = [ "out" ]; }; @@ -7846,6 +7919,15 @@ in (lib.addMetaAttrs {} ((openjdk11.override { minimal = true; }) // {})); + jdk12 = openjdk12 // { outputs = [ "out" ]; }; + jdk12_headless = + if stdenv.isDarwin then + jdk12 + else + lib.setName "openjdk-${lib.getVersion pkgs.openjdk12}-headless" + (lib.addMetaAttrs {} + ((openjdk12.override { minimal = true; }) // {})); + jdk = jdk8; jre = if stdenv.isAarch32 || stdenv.isAarch64 then adoptopenjdk-jre-bin else jre8; jre_headless = jre8_headless; @@ -8210,6 +8292,8 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; + sagittarius-scheme = callPackage ../development/compilers/sagittarius-scheme {}; + sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {}; sbcl = callPackage ../development/compilers/sbcl {}; @@ -8651,7 +8735,7 @@ in python3 = python37; pypy = pypy2; pypy2 = pypy27; - pypy3 = pypy35; + pypy3 = pypy36; # Python interpreter that is build with all modules, including tkinter. # These are for compatibility and should not be used inside Nixpkgs. @@ -8670,7 +8754,7 @@ in python3Packages = python3.pkgs; pythonInterpreters = callPackage ./../development/interpreters/python {}; - inherit (pythonInterpreters) python27 python35 python36 python37 python38 pypy27 pypy35; + inherit (pythonInterpreters) python27 python35 python36 python37 python38 pypy27 pypy36; # Python package sets. python27Packages = lib.hiPrioSet (recurseIntoAttrs python27.pkgs); @@ -8964,6 +9048,8 @@ in awf = callPackage ../development/tools/misc/awf { }; + electron_6 = callPackage ../development/tools/electron/6.x.nix { }; + electron_5 = callPackage ../development/tools/electron/5.x.nix { }; electron_4 = callPackage ../development/tools/electron { }; @@ -9051,11 +9137,7 @@ in bison = bison3; yacc = bison; # TODO: move to aliases.nix - blackmagic = callPackage ../development/tools/misc/blackmagic { - stdenv = gcc6Stdenv; - gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; - binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; - }; + blackmagic = callPackage ../development/tools/misc/blackmagic { }; bloaty = callPackage ../development/tools/bloaty { }; @@ -9347,6 +9429,8 @@ in flootty = callPackage ../development/tools/flootty { }; + fffuu = haskell.lib.justStaticExecutables (haskellPackages.callPackage ../tools/misc/fffuu { }); + flow = callPackage ../development/tools/analysis/flow { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -9383,6 +9467,8 @@ in flex_2_5_35 = callPackage ../development/tools/parsing/flex/2.5.35.nix { }; flex = callPackage ../development/tools/parsing/flex { }; + flexibee = callPackage ../applications/office/flexibee { }; + flexcpp = callPackage ../development/tools/parsing/flexc++ { }; geis = callPackage ../development/libraries/geis { @@ -9419,12 +9505,18 @@ in gputils = callPackage ../development/tools/misc/gputils { }; - gradleGen = callPackage ../development/tools/build-managers/gradle { }; + gradleGen = callPackage ../development/tools/build-managers/gradle { + java = jdk; + }; gradle = res.gradleGen.gradle_latest; - gradle_2_14 = res.gradleGen.gradle_2_14; gradle_2_5 = res.gradleGen.gradle_2_5; + gradle_2_14 = res.gradleGen.gradle_2_14; gradle_3_5 = res.gradleGen.gradle_3_5; gradle_4_10 = res.gradleGen.gradle_4_10; + gradle_2 = gradle_2_14; + gradle_3 = gradle_3_5; + gradle_4 = gradle_4_10; + gradle_5 = res.gradleGen.gradle_5_3; gperf = callPackage ../development/tools/misc/gperf { }; # 3.1 changed some parameters from int to size_t, leading to mismatches. @@ -9643,7 +9735,9 @@ in gconf = pkgs.gnome2.GConf; }; + # NOTE: Override and set icon-lang = null to use Awk instead of Icon. noweb = callPackage ../development/tools/literate-programming/noweb { }; + nuweb = callPackage ../development/tools/literate-programming/nuweb { tex = texlive.combined.scheme-small; }; nrfutil = callPackage ../development/tools/misc/nrfutil { }; @@ -9704,7 +9798,7 @@ in pprof = callPackage ../development/tools/profiling/pprof { }; - pyprof2calltree = pythonPackages.callPackage ../development/tools/profiling/pyprof2calltree { }; + pyprof2calltree = with python3Packages; toPythonApplication pyprof2calltree; prelink = callPackage ../development/tools/misc/prelink { }; @@ -9851,6 +9945,8 @@ in spoofer-gui = callPackage ../tools/networking/spoofer { withGUI = true; }; + spooles = callPackage ../development/libraries/science/math/spooles {}; + sqlcheck = callPackage ../development/tools/database/sqlcheck { }; sqlitebrowser = libsForQt5.callPackage ../development/tools/database/sqlitebrowser { }; @@ -9868,6 +9964,7 @@ in swig1 = callPackage ../development/tools/misc/swig { }; swig2 = callPackage ../development/tools/misc/swig/2.x.nix { }; swig3 = callPackage ../development/tools/misc/swig/3.x.nix { }; + swig4 = callPackage ../development/tools/misc/swig/4.nix { }; swig = swig3; swigWithJava = swig; @@ -9883,6 +9980,8 @@ in teensy-loader-cli = callPackage ../development/tools/misc/teensy-loader-cli { }; + terracognita = callPackage ../development/tools/misc/terracognita { }; + terraform-lsp = callPackage ../development/tools/misc/terraform-lsp { }; texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { }; @@ -10192,7 +10291,7 @@ in c-blosc = callPackage ../development/libraries/c-blosc { }; - cachix = callPackage ../development/tools/cachix { }; + cachix = haskell.lib.justStaticExecutables haskellPackages.cachix; capnproto = callPackage ../development/libraries/capnproto { }; @@ -10204,9 +10303,7 @@ in cdk = callPackage ../development/libraries/cdk {}; - cdo = callPackage ../development/libraries/cdo { - stdenv = gccStdenv; - }; + cdo = callPackage ../development/libraries/cdo { }; cimg = callPackage ../development/libraries/cimg { }; @@ -10695,6 +10792,8 @@ in ghp-import = callPackage ../development/tools/ghp-import { }; + ghcid = haskellPackages.ghcid.bin; + icon-lang = callPackage ../development/interpreters/icon-lang { }; libgit2 = callPackage ../development/libraries/git2 { @@ -10966,7 +11065,7 @@ in gdk-pixbuf = callPackage ../development/libraries/gdk-pixbuf { }; - gnome-sharp = callPackage ../development/libraries/gnome-sharp { mono = mono4; }; + gnome-sharp = callPackage ../development/libraries/gnome-sharp { }; gnome-menus = callPackage ../development/libraries/gnome-menus { }; @@ -11649,6 +11748,8 @@ in inherit (darwin.apple_sdk.frameworks) AudioUnit; }; + libsystemtap = callPackage ../development/libraries/libsystemtap { }; + libgtop = callPackage ../development/libraries/libgtop {}; libLAS = callPackage ../development/libraries/libLAS { }; @@ -11767,6 +11868,8 @@ in inherit (darwin.apple_sdk.frameworks) Carbon; }; + libirecovery = callPackage ../development/libraries/libirecovery { }; + libivykis = callPackage ../development/libraries/libivykis { }; liblastfmSF = callPackage ../development/libraries/liblastfmSF { }; @@ -11825,10 +11928,6 @@ in libplist = callPackage ../development/libraries/libplist { }; - libqglviewer = callPackage ../development/libraries/libqglviewer { - inherit (darwin.apple_sdk.frameworks) AGL; - }; - libre = callPackage ../development/libraries/libre {}; librem = callPackage ../development/libraries/librem {}; @@ -11975,6 +12074,8 @@ in libmodplug = callPackage ../development/libraries/libmodplug {}; + libmodule = callPackage ../development/libraries/libmodule { }; + libmpcdec = callPackage ../development/libraries/libmpcdec { }; libmp3splt = callPackage ../development/libraries/libmp3splt { }; @@ -12234,7 +12335,7 @@ in inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreServices; }; - libv4l = lowPrio (v4l_utils.override { + libv4l = lowPrio (v4l-utils.override { withUtils = false; }); @@ -12247,6 +12348,9 @@ in libvdpau = callPackage ../development/libraries/libvdpau { }; + libmodulemd = callPackage ../development/libraries/libmodulemd { }; + libmodulemd_1 = callPackage ../development/libraries/libmodulemd/1.nix { }; + libvdpau-va-gl = callPackage ../development/libraries/libvdpau-va-gl { }; libversion = callPackage ../development/libraries/libversion { }; @@ -12694,7 +12798,6 @@ in opensaml-cpp = callPackage ../development/libraries/opensaml-cpp { }; openscenegraph = callPackage ../development/libraries/openscenegraph { }; - openscenegraph_3_4 = callPackage ../development/libraries/openscenegraph/3.4.0.nix { }; openslp = callPackage ../development/libraries/openslp {}; @@ -13047,6 +13150,10 @@ in libopenshot-audio = callPackage ../applications/video/openshot-qt/libopenshot-audio.nix { }; + libqglviewer = callPackage ../development/libraries/libqglviewer { + inherit (darwin.apple_sdk.frameworks) AGL; + }; + libqtav = callPackage ../development/libraries/libqtav { }; kpmcore = callPackage ../development/libraries/kpmcore { }; @@ -13306,7 +13413,7 @@ in inherit (darwin.apple_sdk.frameworks) GLUT; }; - simgear = callPackage ../development/libraries/simgear { openscenegraph = openscenegraph_3_4; }; + simgear = callPackage ../development/libraries/simgear { }; simp_le = callPackage ../tools/admin/simp_le { }; @@ -13603,6 +13710,10 @@ in inherit (pythonPackages) twisted; }; + thrift-0_10 = callPackage ../development/libraries/thrift/0.10.nix { + inherit (pythonPackages) twisted; + }; + tidyp = callPackage ../development/libraries/tidyp { }; tinyxml = tinyxml2; @@ -14598,6 +14709,8 @@ in openxpki = callPackage ../servers/openxpki { }; + openxr-loader = callPackage ../development/libraries/openxr-loader { }; + osrm-backend = callPackage ../servers/osrm-backend { }; p910nd = callPackage ../servers/p910nd { }; @@ -14708,6 +14821,12 @@ in boost = boost159; }; + mysql80 = callPackage ../servers/sql/mysql/8.0.x.nix { + inherit (darwin) cctools developer_cmds; + inherit (darwin.apple_sdk.frameworks) CoreServices; + boost = boost169; # Configure checks for specific version. + }; + mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { }; mssql_jdbc = callPackage ../servers/sql/mssql/jdbc { }; @@ -14790,6 +14909,7 @@ in ; postgresql = postgresql_9_6.override { this = postgresql; }; postgresqlPackages = recurseIntoAttrs postgresql.pkgs; + postgresql11Packages = recurseIntoAttrs postgresql_11.pkgs; postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { }; @@ -15990,6 +16110,8 @@ in ofp = callPackage ../os-specific/linux/ofp { }; + ofono = callPackage ../tools/networking/ofono { }; + openpam = callPackage ../development/libraries/openpam { }; openbsm = callPackage ../development/libraries/openbsm { }; @@ -16278,7 +16400,7 @@ in systemd = null; }) else utillinux; - v4l_utils = qt5.callPackage ../os-specific/linux/v4l-utils { }; + v4l-utils = qt5.callPackage ../os-specific/linux/v4l-utils { }; vndr = callPackage ../development/tools/vndr { }; @@ -17228,6 +17350,8 @@ in bitlbee-steam = callPackage ../applications/networking/instant-messengers/bitlbee-steam { }; + bitlbee-mastodon = callPackage ../applications/networking/instant-messengers/bitlbee-mastodon { }; + bitmeter = callPackage ../applications/audio/bitmeter { }; bitscope = recurseIntoAttrs @@ -17300,6 +17424,8 @@ in calcurse = callPackage ../applications/misc/calcurse { }; + calculix = callPackage ../applications/science/math/calculix {}; + calibre = libsForQt5.callPackage ../applications/misc/calibre { }; calligra = libsForQt5.callPackage ../applications/office/calligra { @@ -17385,6 +17511,10 @@ in cligh = python3Packages.callPackage ../development/tools/github/cligh {}; + clight = callPackage ../applications/misc/clight { }; + + clightd = callPackage ../applications/misc/clight/clightd.nix { }; + clipgrab = qt5.callPackage ../applications/video/clipgrab { }; clipmenu = callPackage ../applications/misc/clipmenu { }; @@ -17881,7 +18011,7 @@ in emacs26Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs26 pkgs.emacs26Packages); emacsPackagesNgFor = emacs: import ./emacs-packages.nix { - inherit lib newScope stdenv; + inherit lib newScope stdenv pkgs; inherit fetchFromGitHub fetchurl; inherit emacs texinfo makeWrapper runCommand writeText; inherit (xorg) lndir; @@ -17901,7 +18031,7 @@ in inherit autoconf automake editorconfig-core-c git libffi libpng pkgconfig poppler rtags w3m zlib substituteAll rustPlatform cmake llvmPackages - libtool zeromq; + libtool zeromq openssl; }; }; @@ -18288,7 +18418,7 @@ in fractal = callPackage ../applications/networking/instant-messengers/fractal { }; - freecad = callPackage ../applications/graphics/freecad { mpi = openmpi; }; + freecad = qt5.callPackage ../applications/graphics/freecad { mpi = openmpi; }; freemind = callPackage ../applications/misc/freemind { }; @@ -20020,6 +20150,10 @@ in qjackctl = libsForQt5.callPackage ../applications/audio/qjackctl { }; + qlandkartegt = libsForQt5.callPackage ../applications/misc/qlandkartegt {}; + + garmindev = callPackage ../applications/misc/qlandkartegt/garmindev.nix {}; + qmapshack = libsForQt5.callPackage ../applications/misc/qmapshack { }; qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview { }; @@ -20391,6 +20525,10 @@ in dropbox-cli = callPackage ../applications/networking/dropbox/cli.nix { }; + maestral = callPackage ../applications/networking/maestral { }; + + maestral-gui = libsForQt5.callPackage ../applications/networking/maestral { withGui = true; }; + insync = callPackage ../applications/networking/insync { }; libstrangle = callPackage ../tools/X11/libstrangle { @@ -20420,14 +20558,13 @@ in curaengine = curaengine_stable; }; - curaengine = callPackage ../applications/misc/curaengine { - inherit (python3.pkgs) libarcus; - }; + curaengine = callPackage ../applications/misc/curaengine { inherit (python3.pkgs) libarcus; }; + cura = qt5.callPackage ../applications/misc/cura { }; curaPlugins = callPackage ../applications/misc/cura/plugins.nix { }; - curaLulzbot = callPackage ../applications/misc/cura/lulzbot.nix { }; + curaLulzbot = qt5.callPackage ../applications/misc/cura/lulzbot/default.nix { }; curaByDagoma = callPackage ../applications/misc/curabydagoma { }; @@ -20557,6 +20694,8 @@ in surf = callPackage ../applications/networking/browsers/surf { gtk = gtk2; }; + surf-display = callPackage ../desktops/surf-display { }; + sunvox = callPackage ../applications/audio/sunvox { }; swh_lv2 = callPackage ../applications/audio/swh-lv2 { }; @@ -20650,6 +20789,8 @@ in telepathy-idle = callPackage ../applications/networking/instant-messengers/telepathy/idle {}; + tendermint = callPackage ../tools/networking/tendermint {}; + termdown = (newScope pythonPackages) ../applications/misc/termdown { }; terminal-notifier = callPackage ../applications/misc/terminal-notifier {}; @@ -20679,8 +20820,6 @@ in thinkingRock = callPackage ../applications/misc/thinking-rock { }; - nylas-mail-bin = callPackage ../applications/networking/mailreaders/nylas-mail-bin { }; - thonny = callPackage ../applications/editors/thonny { }; thunderbird = callPackage ../applications/networking/mailreaders/thunderbird { @@ -20823,6 +20962,8 @@ in unpaper = callPackage ../tools/graphics/unpaper { }; + unison-ucm = callPackage ../development/compilers/unison { }; + urh = callPackage ../applications/radio/urh { }; uuagc = haskell.lib.justStaticExecutables haskellPackages.uuagc; @@ -20928,7 +21069,7 @@ in virtscreen = callPackage ../tools/admin/virtscreen {}; - virtualbox = callPackage ../applications/virtualization/virtualbox { + virtualbox = libsForQt5.callPackage ../applications/virtualization/virtualbox { stdenv = stdenv_32bit; inherit (gnome2) libIDL; }; @@ -21683,6 +21824,8 @@ in cuyo = callPackage ../games/cuyo { }; + devilutionx = callPackage ../games/devilutionx {}; + dhewm3 = callPackage ../games/dhewm3 {}; digikam = libsForQt5.callPackage ../applications/graphics/digikam { @@ -21764,7 +21907,7 @@ in fish-fillets-ng = callPackage ../games/fish-fillets-ng {}; - flightgear = libsForQt5.callPackage ../games/flightgear { openscenegraph = openscenegraph_3_4; }; + flightgear = libsForQt5.callPackage ../games/flightgear { }; flock = callPackage ../development/tools/flock { }; @@ -21869,6 +22012,8 @@ in inherit (pythonPackages) rdflib; }; + ideogram = callPackage ../applications/graphics/ideogram { }; + instead = callPackage ../games/instead { lua = lua5; }; @@ -22242,7 +22387,6 @@ in # Torcs wants to make shared libraries linked with plib libraries (it provides static). # i686 is the only platform I know than can do that linking without plib built with -fPIC libpng = libpng12; - openscenegraph = openscenegraph_3_4; }; torcs = callPackage ../games/torcs { }; @@ -23334,7 +23478,7 @@ in g4py = callPackage ../development/libraries/physics/geant4/g4py { }; - hepmc = callPackage ../development/libraries/physics/hepmc { }; + hepmc2 = callPackage ../development/libraries/physics/hepmc2 { }; hepmc3 = callPackage ../development/libraries/physics/hepmc3 { }; @@ -23608,6 +23752,8 @@ in epkowa = callPackage ../misc/drivers/epkowa { }; + utsushi = callPackage ../misc/drivers/utsushi { }; + idsk = callPackage ../tools/filesystems/idsk { }; igraph = callPackage ../development/libraries/igraph { }; @@ -23635,7 +23781,12 @@ in kontemplate = callPackage ../applications/networking/cluster/kontemplate { }; - kops = callPackage ../applications/networking/cluster/kops { }; + inherit (callPackage ../applications/networking/cluster/kops {}) + mkKops + kops_1_12 + kops_1_13 + ; + kops = kops_1_13; lguf-brightness = callPackage ../misc/lguf-brightness { }; @@ -23817,6 +23968,10 @@ in in nixosTesting.makeTest calledTest; + nixosOptionsDoc = attrs: + (import ../../nixos/lib/make-options-doc/default.nix) + ({ inherit pkgs lib; } // attrs); + nixui = callPackage ../tools/package-management/nixui { node_webkit = nwjs_0_12; }; nixdoc = callPackage ../tools/nix/nixdoc {}; @@ -24063,6 +24218,10 @@ in sct = callPackage ../tools/X11/sct {}; + scylladb = callPackage ../servers/scylladb { + thrift = thrift-0_10; + }; + seafile-shared = callPackage ../misc/seafile-shared { }; serviio = callPackage ../servers/serviio {}; @@ -24100,6 +24259,8 @@ in jx = callPackage ../applications/networking/cluster/jx {}; + prow = callPackage ../applications/networking/cluster/prow {}; + inherit (callPackage ../applications/networking/cluster/terraform {}) terraform_0_11 terraform_0_11-full @@ -24218,7 +24379,9 @@ in vttest = callPackage ../tools/misc/vttest { }; - wasm-pack = callPackage ../development/tools/wasm-pack { }; + wasm-pack = callPackage ../development/tools/wasm-pack { + inherit (darwin.apple_sdk.frameworks) Security; + }; wavegain = callPackage ../applications/audio/wavegain { }; @@ -24579,4 +24742,6 @@ in kube3d = callPackage ../applications/networking/cluster/kube3d {}; zfs-replicate = python3Packages.callPackage ../tools/backup/zfs-replicate { }; + + runwayml = callPackage ../applications/graphics/runwayml {}; } |