diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 608 |
1 files changed, 366 insertions, 242 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 22f2a52ea77..b6c75b8a619 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -372,13 +372,7 @@ let inherit name sha256; url = "https://bitbucket.org/${owner}/${repo}/get/${rev}.tar.gz"; meta.homepage = "https://bitbucket.org/${owner}/${repo}/"; - }; - - # gitorious example - fetchFromGitorious = { owner, repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip { - inherit name sha256; - url = "https://gitorious.org/${owner}/${repo}/archive/${rev}.tar.gz"; - meta.homepage = "https://gitorious.org/${owner}/${repo}/"; + extraPostFetch = ''rm -f "$out"/.hg_archival.txt''; # impure file; see #12002 }; # cgit example, snapshot support is optional in cgit @@ -474,12 +468,16 @@ let ### TOOLS + _9pfs = callPackage ../tools/filesystems/9pfs { }; + "3dfsb" = callPackage ../applications/misc/3dfsb { glibc = glibc.override { debugSymbols = true; }; }; abduco = callPackage ../tools/misc/abduco { }; + acbuild = callPackage ../applications/misc/acbuild { }; + acct = callPackage ../tools/system/acct { }; acoustidFingerprinter = callPackage ../tools/audio/acoustid-fingerprinter { @@ -554,7 +552,7 @@ let withGui = false; }; - apitrace = callPackage ../applications/graphics/apitrace {}; + apitrace = qt5.callPackage ../applications/graphics/apitrace {}; argyllcms = callPackage ../tools/graphics/argyllcms {}; @@ -807,7 +805,7 @@ let deis = goPackages.deis.bin // { outputs = [ "bin" ]; }; - dfilemanager = callPackage ../applications/misc/dfilemanager { }; + dfilemanager = kde5.dfilemanager; diagrams-builder = callPackage ../tools/graphics/diagrams-builder { inherit (haskellPackages) ghcWithPackages diagrams-builder; @@ -815,6 +813,11 @@ let dialog = callPackage ../development/tools/misc/dialog { }; + ding = callPackage ../applications/misc/ding { + aspellDicts_de = aspellDicts.de; + aspellDicts_en = aspellDicts.en; + }; + direnv = callPackage ../tools/misc/direnv { }; discount = callPackage ../tools/text/discount { }; @@ -837,6 +840,8 @@ let linuxHeaders = linuxHeaders_3_18; }; + dynamic-colors = callPackage ../tools/misc/dynamic-colors { }; + edac-utils = callPackage ../os-specific/linux/edac-utils { }; eggdrop = callPackage ../tools/networking/eggdrop { }; @@ -1020,7 +1025,7 @@ let davix = callPackage ../tools/networking/davix { }; - cantata = qt5Libs.callPackage ../applications/audio/cantata { }; + cantata = qt5.callPackage ../applications/audio/cantata { }; can-utils = callPackage ../os-specific/linux/can-utils { }; @@ -1070,7 +1075,7 @@ let citrix_receiver = callPackage ../applications/networking/remote/citrix-receiver { }; - cmst = callPackage ../tools/networking/cmst { }; + cmst = qt5.callPackage ../tools/networking/cmst { }; colord = callPackage ../tools/misc/colord { }; @@ -1152,7 +1157,7 @@ let convmv = callPackage ../tools/misc/convmv { }; - cool-retro-term = qt5Libs.callPackage ../applications/misc/cool-retro-term { }; + cool-retro-term = qt5.callPackage ../applications/misc/cool-retro-term { }; coreutils = callPackage ../tools/misc/coreutils { aclSupport = stdenv.isLinux; @@ -1286,7 +1291,11 @@ let di = callPackage ../tools/system/di { }; - diffoscope = callPackage ../tools/misc/diffoscope { }; + diffoscope = callPackage ../tools/misc/diffoscope { + jdk = jdk7; + pythonPackages = python3Packages; + rpm = rpm.override { python = python3; }; + }; diffstat = callPackage ../tools/text/diffstat { }; @@ -1430,11 +1439,7 @@ let fabric = pythonPackages.fabric; - fail2ban = callPackage ../tools/security/fail2ban { - systemd = systemd.override { - pythonSupport = true; - }; - }; + fail2ban = callPackage ../tools/security/fail2ban { }; fakeroot = callPackage ../tools/system/fakeroot { }; @@ -1602,6 +1607,8 @@ let ggobi = callPackage ../tools/graphics/ggobi { }; + gibo = callPackage ../tools/misc/gibo { }; + gifsicle = callPackage ../tools/graphics/gifsicle { }; git-hub = callPackage ../applications/version-management/git-and-tools/git-hub { }; @@ -1653,7 +1660,7 @@ let gnupg20 = callPackage ../tools/security/gnupg/20.nix { }; - gnupg21 = callPackage ../tools/security/gnupg/21.nix { }; + gnupg21 = lowPrio (callPackage ../tools/security/gnupg/21.nix { }); gnupg = gnupg20; @@ -1674,6 +1681,8 @@ let go-mtpfs = goPackages.mtpfs.bin // { outputs = [ "bin" ]; }; + go-pup = goPackages.pup.bin // { outputs = [ "bin" ]; }; + googleAuthenticator = callPackage ../os-specific/linux/google-authenticator { }; google-cloud-sdk = callPackage ../tools/admin/google-cloud-sdk { }; @@ -1730,13 +1739,6 @@ let ghostscript = null; }; - calamares = callPackage ../tools/misc/calamares rec { - python = python3; - boost = pkgs.boost.override { python=python3; }; - libyamlcpp = callPackage ../development/libraries/libyaml-cpp { makePIC=true; boost=boost; }; - inherit (kf5_stable) extra-cmake-modules kconfig ki18n kcoreaddons solid; - }; - grub = callPackage_i686 ../tools/misc/grub { buggyBiosCDSupport = config.grub.buggyBiosCDSupport or true; automake = automake112x; # fails with 13 and 14 @@ -1744,6 +1746,8 @@ let trustedGrub = callPackage_i686 ../tools/misc/grub/trusted.nix { }; + trustedGrub-for-HP = callPackage_i686 ../tools/misc/grub/trusted.nix { for_HP_laptop = true; }; + grub2 = grub2_full; grub2_full = callPackage ../tools/misc/grub/2.0x.nix { }; @@ -1815,6 +1819,8 @@ let pigz = callPackage ../tools/compression/pigz { }; + pixz = callPackage ../tools/compression/pixz { }; + pxz = callPackage ../tools/compression/pxz { }; hans = callPackage ../tools/networking/hans { }; @@ -2018,7 +2024,7 @@ let kpcli = callPackage ../tools/security/kpcli { }; - kst = callPackage ../tools/graphics/kst { gsl = gsl_1; }; + kst = qt5.callPackage ../tools/graphics/kst { gsl = gsl_1; }; leocad = callPackage ../applications/graphics/leocad { }; @@ -2092,7 +2098,7 @@ let else nodejs-4_x; - nodePackages_5_x = recurseIntoAttrs (callPackage ./node-packages.nix { self = nodePackages_5_x; nodejs = nodejs-5_x; }); + nodePackages_5_x = callPackage ./node-packages.nix { self = nodePackages_5_x; nodejs = nodejs-5_x; }; nodePackages_4_x = recurseIntoAttrs (callPackage ./node-packages.nix { self = nodePackages_4_x; nodejs = nodejs-4_x; }); @@ -2264,7 +2270,7 @@ let mfoc = callPackage ../tools/security/mfoc { }; - mgba = callPackage ../misc/emulators/mgba { }; + mgba = qt5.callPackage ../misc/emulators/mgba { }; minissdpd = callPackage ../tools/networking/minissdpd { }; @@ -2315,7 +2321,7 @@ let msf = callPackage ../tools/security/metasploit { }; - mssys = callPackage ../tools/misc/mssys { }; + ms-sys = callPackage ../tools/misc/ms-sys { }; mtdutils = callPackage ../tools/filesystems/mtdutils { }; @@ -2682,6 +2688,8 @@ let pdfjam = callPackage ../tools/typesetting/pdfjam { }; + pdfmod = callPackage ../applications/misc/pdfmod { }; + jbig2enc = callPackage ../tools/graphics/jbig2enc { }; pdfread = callPackage ../tools/graphics/pdfread { @@ -2724,7 +2732,7 @@ let inherit qt4; }; - pinentry_qt5 = qt55Libs.callPackage ../tools/security/pinentry/qt5.nix { + pinentry_qt5 = qt5.callPackage ../tools/security/pinentry/qt5.nix { libcap = if stdenv.isDarwin then null else libcap; }; @@ -2872,6 +2880,8 @@ let read-edid = callPackage ../os-specific/linux/read-edid { }; + redir = callPackage ../tools/networking/redir { }; + redmine = callPackage ../applications/version-management/redmine { }; rtmpdump = callPackage ../tools/video/rtmpdump { }; @@ -2879,6 +2889,8 @@ let reaverwps = callPackage ../tools/networking/reaver-wps {}; + recordmydesktop = callPackage ../applications/video/recordmydesktop { }; + recutils = callPackage ../tools/misc/recutils { }; recoll = callPackage ../applications/search/recoll { }; @@ -2956,6 +2968,8 @@ let rubber = callPackage ../tools/typesetting/rubber { }; + runzip = callPackage ../tools/archivers/runzip { }; + rxp = callPackage ../tools/text/xml/rxp { }; rzip = callPackage ../tools/compression/rzip { }; @@ -2984,12 +2998,14 @@ let samplicator = callPackage ../tools/networking/samplicator { }; - screen = callPackage ../tools/misc/screen { }; + screen = callPackage ../tools/misc/screen { + inherit (darwin.apple_sdk.libs) utmp; + }; screen-message = callPackage ../tools/X11/screen-message { }; screencloud = callPackage ../applications/graphics/screencloud { - quazip = quazip.override { qt = qt4; }; + quazip = qt5.quazip.override { qt = qt4; }; }; scrot = callPackage ../tools/graphics/scrot { }; @@ -3024,7 +3040,7 @@ let siege = callPackage ../tools/networking/siege {}; - sigil = callPackage ../applications/editors/sigil { }; + sigil = qt5.callPackage ../applications/editors/sigil { }; # aka., gpg-tools signing-party = callPackage ../tools/security/signing-party { }; @@ -3223,7 +3239,7 @@ let thc-hydra = callPackage ../tools/security/thc-hydra { }; - tiled = callPackage ../applications/editors/tiled { }; + tiled = qt5.callPackage ../applications/editors/tiled { }; tinc = callPackage ../tools/networking/tinc { }; @@ -3495,6 +3511,8 @@ let xbrightness = callPackage ../tools/X11/xbrightness { }; + xprintidle-ng = callPackage ../tools/X11/xprintidle-ng {}; + xsettingsd = callPackage ../tools/X11/xsettingsd { }; xsensors = callPackage ../os-specific/linux/xsensors { }; @@ -3664,6 +3682,8 @@ let # To expose more packages for Yi, override the extraPackages arg. yi = callPackage ../applications/editors/yi/wrapper.nix { }; + yle-dl = callPackage ../tools/misc/yle-dl {}; + zbackup = callPackage ../tools/backup/zbackup {}; zbar = callPackage ../tools/graphics/zbar { @@ -3738,6 +3758,8 @@ let nix-zsh-completions = callPackage ../shells/nix-zsh-completions { }; + grml-zsh-config = callPackage ../shells/grml-zsh-config { }; + ### DEVELOPMENT / COMPILERS @@ -3814,6 +3836,8 @@ let closurecompiler = callPackage ../development/compilers/closure { }; + cmdstan = callPackage ../development/compilers/cmdstan { }; + cmucl_binary = callPackage_i686 ../development/compilers/cmucl/binary.nix { }; compcert = callPackage ../development/compilers/compcert ( @@ -3827,6 +3851,8 @@ let cython = pythonPackages.cython; cython3 = python3Packages.cython; + devpi-client = callPackage ../development/tools/devpi-client {}; + ecl = callPackage ../development/compilers/ecl { }; eql = callPackage ../development/compilers/eql {}; @@ -4104,7 +4130,7 @@ let haskell = callPackage ./haskell-packages.nix { }; - haskellPackages = haskell.packages.ghc7102.override { + haskellPackages = haskell.packages.ghc7103.override { overrides = config.haskellPackageOverrides or (self: super: {}); }; inherit (haskellPackages) ghc cabal-install stack; @@ -4514,6 +4540,8 @@ let ipaddr = callPackage ../development/ocaml-modules/ipaddr { }; + iso8601 = callPackage ../development/ocaml-modules/iso8601 { }; + javalib = callPackage ../development/ocaml-modules/javalib { extlib = ocaml_extlib_maximal; }; @@ -4659,6 +4687,8 @@ let re2 = callPackage ../development/ocaml-modules/re2 { }; + tuntap = callPackage ../development/ocaml-modules/tuntap { }; + tyxml = callPackage ../development/ocaml-modules/tyxml { }; ulex = callPackage ../development/ocaml-modules/ulex { }; @@ -5024,6 +5054,10 @@ let erlang_odbc_javac = erlangR18_odbc_javac; rebar = callPackage ../development/tools/build-managers/rebar { }; + rebar3 = callPackage ../development/tools/build-managers/rebar3 { }; + fetchHex = callPackage ../development/tools/build-managers/rebar3/fetch-hex.nix { }; + + erlangPackages = callPackage ../development/erlang-modules { }; elixir = callPackage ../development/interpreters/elixir { }; @@ -5519,6 +5553,8 @@ let ruby = ruby_2_0_0; }; + matter-compiler = callPackage ../development/compilers/matter-compiler {}; + cfr = callPackage ../development/tools/java/cfr { }; checkstyle = callPackage ../development/tools/analysis/checkstyle { }; @@ -5696,7 +5732,7 @@ let gotty = goPackages.gotty.bin // { outputs = [ "bin" ]; }; gradleGen = callPackage ../development/tools/build-managers/gradle { }; - gradle = self.gradleGen.gradle28; + gradle = self.gradleGen.gradleLatest; gradle25 = self.gradleGen.gradle25; gperf = callPackage ../development/tools/misc/gperf { }; @@ -5725,7 +5761,9 @@ let inherit (perlPackages) XMLSimple; }; - include-what-you-use = callPackage ../development/tools/analysis/include-what-you-use { }; + include-what-you-use = callPackage ../development/tools/analysis/include-what-you-use { + llvmPackages = llvmPackages_37; + }; indent = callPackage ../development/tools/misc/indent { }; @@ -5976,7 +6014,7 @@ let uncrustify = callPackage ../development/tools/misc/uncrustify { }; vagrant = callPackage ../development/tools/vagrant { - ruby = ruby_2_0_0; + ruby = ruby_2_2_2; }; gdb = callPackage ../development/tools/misc/gdb { @@ -6026,8 +6064,6 @@ let accountsservice = callPackage ../development/libraries/accountsservice { }; - accounts-qt = callPackage ../development/libraries/accounts-qt/old.nix {}; - acl = callPackage ../development/libraries/acl { }; activemq = callPackage ../development/libraries/apache-activemq { }; @@ -6548,6 +6584,8 @@ let gperftools = callPackage ../development/libraries/gperftools { }; + grib-api = callPackage ../development/libraries/grib-api { }; + gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer { callPackage = pkgs.newScope (pkgs // { libav = pkgs.ffmpeg; }); }); @@ -6617,8 +6655,6 @@ let grantlee = callPackage ../development/libraries/grantlee { }; - grantlee5 = callPackage ../development/libraries/grantlee/5.x-old.nix { }; - gsasl = callPackage ../development/libraries/gsasl { }; gsl = callPackage ../development/libraries/gsl { }; @@ -6641,9 +6677,10 @@ let }; glib = callPackage ../development/libraries/glib { }; - - glib-tested = glib.override { doCheck = true; }; # checked version separate to break cycles - + glib-tested = glib.override { # checked version separate to break cycles + doCheck = true; + libffi = libffi.override { doCheck = true; }; + }; glibmm = callPackage ../development/libraries/glibmm { }; glib_networking = callPackage ../development/libraries/glib-networking {}; @@ -6759,6 +6796,8 @@ let hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { }; + hyena = callPackage ../development/libraries/hyena { }; + icu = callPackage ../development/libraries/icu { }; id3lib = callPackage ../development/libraries/id3lib { }; @@ -6834,6 +6873,8 @@ let libjson = callPackage ../development/libraries/libjson { }; + libb64 = callPackage ../development/libraries/libb64 { }; + judy = callPackage ../development/libraries/judy { }; keybinder = callPackage ../development/libraries/keybinder { @@ -6845,54 +6886,6 @@ let automake = automake111x; }; - kf515 = recurseIntoAttrs (import ../development/libraries/kde-frameworks-5.15 { inherit pkgs; }); - kf516 = recurseIntoAttrs (import ../development/libraries/kde-frameworks-5.16 { inherit pkgs; }); - kf5_stable = kf515; - kf5_latest = kf516; - - kf5PackagesFun = self: with self; { - - fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { }; - - k9copy = callPackage ../applications/video/k9copy {}; - - quassel = callPackage ../applications/networking/irc/quassel/qt-5.nix { - monolithic = true; - daemon = false; - client = false; - withKDE = true; - dconf = gnome3.dconf; - tag = "-kf5"; - }; - - quasselClient = quassel.override { - monolithic = false; - client = true; - tag = "-client-kf5"; - }; - - quassel_qt5 = quassel.override { - withKDE = false; - tag = "-qt5"; - }; - - quasselClient_qt5 = quasselClient.override { - withKDE = false; - tag = "-client-qt5"; - }; - - quasselDaemon = quassel.override { - monolithic = false; - daemon = true; - tag = "-daemon-qt5"; - withKDE = false; - }; - - }; - - kf515Packages = lib.makeScope kf515.newScope kf5PackagesFun; - kf5Packages = kf515Packages; - kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { }; krb5Full = callPackage ../development/libraries/kerberos/krb5.nix { @@ -7058,8 +7051,6 @@ let libdbusmenu_qt = callPackage ../development/libraries/libdbusmenu-qt { }; - libdbusmenu_qt5 = callPackage ../development/libraries/libdbusmenu-qt/qt-5.4.nix { }; - libdc1394 = callPackage ../development/libraries/libdc1394 { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -7743,6 +7734,8 @@ let lightning = callPackage ../development/libraries/lightning { }; + lightlocker = callPackage ../misc/screensavers/light-locker { }; + lirc = callPackage ../development/libraries/lirc { }; liquidfun = callPackage ../development/libraries/liquidfun { }; @@ -7851,8 +7844,6 @@ let qt = qt4; }; - mlt-qt5 = callPackage ../development/libraries/mlt/qt-5.4.nix { }; - movit = callPackage ../development/libraries/movit { }; mosquitto = callPackage ../servers/mqtt/mosquitto { }; @@ -8008,16 +7999,21 @@ let ffmpeg = ffmpeg_0; }; - libressl_2_2 = callPackage ../development/libraries/libressl/2.2.nix { }; - libressl_2_3 = callPackage ../development/libraries/libressl/2.3.nix { }; # 2.3 breaks some backward-compability libressl = libressl_2_2; + libressl_2_2 = callPackage ../development/libraries/libressl/2.2.nix { + fetchurl = fetchurlBoot; + }; + libressl_2_3 = callPackage ../development/libraries/libressl/2.3.nix { + fetchurl = fetchurlBoot; + }; boringssl = callPackage ../development/libraries/boringssl { }; wolfssl = callPackage ../development/libraries/wolfssl { }; - openssl = callPackage ../development/libraries/openssl { + openssl = openssl_1_0_1; + openssl_1_0_1 = callPackage ../development/libraries/openssl { fetchurl = fetchurlBoot; cryptodevHeaders = linuxPackages.cryptodev.override { fetchurl = fetchurlBoot; @@ -8063,10 +8059,6 @@ let phonon_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc/qt4 {}; - phonon_qt5 = callPackage ../development/libraries/phonon/qt5/old.nix {}; - - phonon_qt5_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer/qt5/old.nix {}; - physfs = callPackage ../development/libraries/physfs { }; pipelight = callPackage ../tools/misc/pipelight { @@ -8092,8 +8084,6 @@ let polkit_qt4 = callPackage ../development/libraries/polkit-qt-1 { }; - polkit_qt5 = callPackage ../development/libraries/polkit-qt-1/old.nix { withQt5 = true; }; - policykit = callPackage ../development/libraries/policykit { }; poppler = callPackage ../development/libraries/poppler { lcms = lcms2; }; @@ -8108,8 +8098,6 @@ let suffix = "qt4"; }; - poppler_qt5 = qt5Libs.popplerQt; - poppler_utils = poppler.override { suffix = "utils"; utils = true; }; popt = callPackage ../development/libraries/popt { }; @@ -8145,18 +8133,12 @@ let qca2 = callPackage ../development/libraries/qca2 { qt = qt4; }; - qca-qt5 = callPackage ../development/libraries/qca-qt5/old.nix { }; - qimageblitz = callPackage ../development/libraries/qimageblitz {}; qjson = callPackage ../development/libraries/qjson { }; qoauth = callPackage ../development/libraries/qoauth { }; - quazip = callPackage ../development/libraries/quazip { - qt = qt5; - }; - qt3 = callPackage ../development/libraries/qt-3 { openglSupport = mesaSupported; libpng = libpng12; @@ -8178,8 +8160,13 @@ let developerBuild = true; }); - qt54 = recurseIntoAttrs (callPackage ../development/libraries/qt-5/5.4 {}); - qt55 = recurseIntoAttrs (import ../development/libraries/qt-5/5.5 { inherit pkgs; }); + qt54 = + let imported = import ../development/libraries/qt-5/5.4 { inherit pkgs; }; + in recurseIntoAttrs (imported.override (super: qt5LibsFun)); + + qt55 = + let imported = import ../development/libraries/qt-5/5.5 { inherit pkgs; }; + in recurseIntoAttrs (imported.override (super: qt5LibsFun)); qt5 = qt54; @@ -8193,21 +8180,21 @@ let libkeyfinder = callPackage ../development/libraries/libkeyfinder { }; - mlt = callPackage ../development/libraries/mlt/qt-5.5.nix {}; + mlt = callPackage ../development/libraries/mlt/qt-5.nix {}; openbr = callPackage ../development/libraries/openbr { }; phonon = callPackage ../development/libraries/phonon/qt5 { }; - phonon_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer/qt5 { }; + phonon-backend-gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer/qt5 { }; - phonon_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc/qt5 { }; + phonon-backend-vlc = callPackage ../development/libraries/phonon-backend-vlc/qt5 { }; - polkitQt = callPackage ../development/libraries/polkit-qt-1 { + polkit-qt = callPackage ../development/libraries/polkit-qt-1 { withQt5 = true; }; - popplerQt = callPackage ../development/libraries/poppler { + poppler = callPackage ../development/libraries/poppler { lcms = lcms2; qt5Support = true; suffix = "qt5"; @@ -8217,9 +8204,19 @@ let qmltermwidget = callPackage ../development/libraries/qmltermwidget { }; + qtcreator = callPackage ../development/qtcreator { + withDocumentation = true; + }; + + quazip = callPackage ../development/libraries/quazip { + qt = qtbase; + }; + + qwt = callPackage ../development/libraries/qwt/6.nix { }; + signon = callPackage ../development/libraries/signon { }; - telepathy = callPackage ../development/libraries/telepathy/qt5 { }; + telepathy = callPackage ../development/libraries/telepathy/qt { }; vlc = callPackage ../applications/video/vlc { qt4 = null; @@ -8228,20 +8225,8 @@ let }; - qt55Libs = lib.makeScope qt55.newScope qt5LibsFun; - qt5Libs = qt55Libs; - - qtEnv = callPackage ../development/libraries/qt-5/qt-env.nix {}; - - qt5Full = appendToName "full" (qtEnv { - qtbase = qt5.base; - paths = lib.filter lib.isDerivation (lib.attrValues qt5); - }); - - qtcreator = callPackage ../development/qtcreator { - qtLib = qt54; - withDocumentation = true; - }; + qtEnv = qt5.env; + qt5Full = qt5.full; qtkeychain = callPackage ../development/libraries/qtkeychain { }; @@ -8251,8 +8236,6 @@ let qwt = callPackage ../development/libraries/qwt {}; - qwt6 = callPackage ../development/libraries/qwt/6.nix { }; - qxt = callPackage ../development/libraries/qxt {}; rabbitmq-c = callPackage ../development/libraries/rabbitmq-c {}; @@ -8321,7 +8304,7 @@ let rubberband = callPackage ../development/libraries/rubberband { inherit (vamp) vampSDK; }; - + sad = callPackage ../applications/science/logic/sad { }; sbc = callPackage ../development/libraries/sbc { }; @@ -8391,8 +8374,6 @@ let sfml = callPackage ../development/libraries/sfml { }; - signon = callPackage ../development/libraries/signon/old.nix {}; - skalibs = callPackage ../development/libraries/skalibs { }; slang = callPackage ../development/libraries/slang { }; @@ -8532,9 +8513,7 @@ let telepathy_farstream = callPackage ../development/libraries/telepathy/farstream {}; - telepathy_qt = callPackage ../development/libraries/telepathy/qt { }; - - telepathy_qt5 = callPackage ../development/libraries/telepathy/qt5/old.nix {}; + telepathy_qt = callPackage ../development/libraries/telepathy/qt { qtbase = qt4; }; tevent = callPackage ../development/libraries/tevent { python = python2; @@ -9148,6 +9127,8 @@ let apacheHttpdPackages_2_2 = apacheHttpdPackagesFor pkgs.apacheHttpd_2_2 pkgs.apacheHttpdPackages_2_2; apacheHttpdPackages_2_4 = apacheHttpdPackagesFor pkgs.apacheHttpd_2_4 pkgs.apacheHttpdPackages_2_4; + archiveopteryx = callPackage ../servers/mail/archiveopteryx/default.nix { }; + cadvisor = callPackage ../servers/monitoring/cadvisor { }; cassandra_1_2 = callPackage ../servers/nosql/cassandra/1.2.nix { }; @@ -9584,7 +9565,9 @@ let storm = callPackage ../servers/computing/storm { }; - slurm-llnl = callPackage ../servers/computing/slurm { }; + slurm-llnl = callPackage ../servers/computing/slurm { gtk = null; }; + + slurm-llnl-full = appendToName "full" (callPackage ../servers/computing/slurm { }); tomcat5 = callPackage ../servers/http/tomcat/5.0.nix { }; @@ -9748,6 +9731,8 @@ let cramfsswap = callPackage ../os-specific/linux/cramfsswap { }; + crda = callPackage ../os-specific/linux/crda { }; + darwin = let cmdline = callPackage ../os-specific/darwin/command-line-tools {}; apple-source-releases = callPackage ../os-specific/darwin/apple-source-releases { }; @@ -10337,13 +10322,15 @@ let numactl = callPackage ../os-specific/linux/numactl { }; + numad = callPackage ../os-specific/linux/numad { }; + open-vm-tools = callPackage ../applications/virtualization/open-vm-tools { inherit (gnome) gtk gtkmm; }; gocode = goPackages.gocode.bin // { outputs = [ "bin" ]; }; - kgocode = callPackage ../applications/misc/kgocode { + kgocode = callPackage ../applications/misc/kgocode { inherit (pkgs.kde4) kdelibs; }; @@ -10585,6 +10572,8 @@ let udisks_glue = callPackage ../os-specific/linux/udisks-glue { }; + uksmtools = callPackage ../os-specific/linux/uksmtools { }; + untie = callPackage ../os-specific/linux/untie { }; upower = callPackage ../os-specific/linux/upower { }; @@ -10811,6 +10800,7 @@ let iosevka = callPackage ../data/fonts/iosevka { }; ipafont = callPackage ../data/fonts/ipafont {}; + ipaexfont = callPackage ../data/fonts/ipaexfont {}; junicode = callPackage ../data/fonts/junicode { }; @@ -10964,8 +10954,12 @@ let unifont_upper = callPackage ../data/fonts/unifont_upper { }; + vanilla-dmz = callPackage ../data/icons/vanilla-dmz { }; + vistafonts = callPackage ../data/fonts/vista-fonts { }; + wireless-regdb = callPackage ../data/misc/wireless-regdb { }; + wqy_microhei = callPackage ../data/fonts/wqy-microhei { }; wqy_zenhei = callPackage ../data/fonts/wqy-zenhei { }; @@ -10976,7 +10970,7 @@ let xlsx2csv = pythonPackages.xlsx2csv; - zeal = callPackage ../data/documentation/zeal { }; + zeal = qt5.callPackage ../data/documentation/zeal { }; ### APPLICATIONS @@ -11046,7 +11040,7 @@ let amsn = callPackage ../applications/networking/instant-messengers/amsn { }; - antimony = callPackage ../applications/graphics/antimony {}; + antimony = qt5.callPackage ../applications/graphics/antimony {}; antiword = callPackage ../applications/office/antiword {}; @@ -11122,6 +11116,8 @@ let }; awesome = awesome-3-5; + awesomebump = qt5.callPackage ../applications/graphics/awesomebump { }; + inherit (gnome3) baobab; backintime-common = callPackage ../applications/networking/sync/backintime/common.nix { }; @@ -11201,7 +11197,7 @@ let calcurse = callPackage ../applications/misc/calcurse { }; - calibre = callPackage ../applications/misc/calibre { + calibre = qt5.callPackage ../applications/misc/calibre { inherit (pythonPackages) pyqt5 sip_4_16; }; @@ -11279,7 +11275,7 @@ let cmatrix = callPackage ../applications/misc/cmatrix { }; - bomi = callPackage ../applications/video/bomi { + bomi = qt5.callPackage ../applications/video/bomi { youtube-dl = pythonPackages.youtube-dl; pulseSupport = config.pulseaudio or true; }; @@ -11299,6 +11295,8 @@ let constant-detune-chorus = callPackage ../applications/audio/constant-detune-chorus { }; + copyq = callPackage ../applications/misc/copyq { }; + coriander = callPackage ../applications/video/coriander { inherit (gnome) libgnomeui GConf; }; @@ -11334,6 +11332,15 @@ let cutecom = callPackage ../tools/misc/cutecom { }; + cutegram = + let cp = qt5.callPackage; + in cp ../applications/networking/instant-messengers/telegram/cutegram rec { + libqtelegram-aseman-edition = cp ../applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition { }; + telegram-qml = cp ../applications/networking/instant-messengers/telegram/telegram-qml { + inherit libqtelegram-aseman-edition; + }; + }; + cvs = callPackage ../applications/version-management/cvs { }; cvsps = callPackage ../applications/version-management/cvsps { }; @@ -11375,7 +11382,7 @@ let plugins = []; }; - dfasma = qt5Libs.callPackage ../applications/audio/dfasma { }; + dfasma = qt5.callPackage ../applications/audio/dfasma { }; dia = callPackage ../applications/graphics/dia { inherit (pkgs.gnome) libart_lgpl libgnomeui; @@ -11485,6 +11492,19 @@ let }); emacs24Macport = self.emacs24Macport_24_5; + emacs25pre = callPackage ../applications/editors/emacs-25 { + # use override to enable additional features + libXaw = xorg.libXaw; + Xaw3d = null; + gconf = null; + alsaLib = null; + imagemagick = null; + acl = null; + gpm = null; + inherit (darwin.apple_sdk.frameworks) AppKit Foundation; + inherit (darwin) libobjc; + }; + emacsPackagesGen = emacs: self: let callPackage = newScope self; in rec { inherit emacs; @@ -11644,10 +11664,12 @@ let emacs24Packages = recurseIntoAttrs (emacsPackagesGen emacs24 pkgs.emacs24Packages); - emacsPackagesNgGen = emacs: callPackage ./emacs-packages.nix { + emacsPackagesNgGen = emacs: import ./emacs-packages.nix { overrides = (config.emacsPackageOverrides or (p: {})) pkgs; - inherit emacs elpaPackages; + inherit lib newScope stdenv; + inherit fetchFromGitHub fetchgit fetchhg fetchurl; + inherit emacs texinfo makeWrapper; trivialBuild = callPackage ../build-support/emacs/trivial.nix { inherit emacs; @@ -11666,12 +11688,8 @@ let emacs24PackagesNg = recurseIntoAttrs (emacsPackagesNgGen emacs24); - elpaPackages = - let imported = import ../applications/editors/emacs-modes/elpa-packages.nix pkgs; - in recurseIntoAttrs (imported.override (super: self: { inherit emacs; })); - - emacsWithPackages = callPackage ../build-support/emacs/wrapper.nix { }; - emacs24WithPackages = emacsWithPackages.override { emacs = emacs24; }; + emacs24WithPackages = emacs24PackagesNg.emacsWithPackages; + emacsWithPackages = emacsPackagesNg.emacsWithPackages; inherit (gnome3) empathy; @@ -11707,6 +11725,8 @@ let keepass = callPackage ../applications/misc/keepass { }; + keepass-keefox = callPackage ../applications/misc/keepass-plugins/keefox { }; + exrdisplay = callPackage ../applications/graphics/exrdisplay { fltk = fltk20; }; @@ -11721,7 +11741,7 @@ let fluidsynth = callPackage ../applications/audio/fluidsynth { }; - fmit = qt5Libs.callPackage ../applications/audio/fmit { }; + fmit = qt5.callPackage ../applications/audio/fmit { }; focuswriter = callPackage ../applications/editors/focuswriter { }; @@ -11733,7 +11753,7 @@ let fribid = callPackage ../applications/networking/browsers/mozilla-plugins/fribid { }; - fritzing = callPackage ../applications/science/electronics/fritzing { }; + fritzing = qt5.callPackage ../applications/science/electronics/fritzing { }; fvwm = callPackage ../applications/window-managers/fvwm { }; @@ -11820,7 +11840,7 @@ let inherit (pkgs.gnome) libgnome libgnomeui; }; - firestr = callPackage ../applications/networking/p2p/firestr + firestr = qt5.callPackage ../applications/networking/p2p/firestr { boost = boost155; }; @@ -11940,7 +11960,7 @@ let libquvi = callPackage ../applications/video/quvi/library.nix { }; - linssid = callPackage ../applications/networking/linssid { }; + linssid = qt5.callPackage ../applications/networking/linssid { }; mi2ly = callPackage ../applications/audio/mi2ly {}; @@ -12033,12 +12053,14 @@ let gosmore = callPackage ../applications/misc/gosmore { }; - gpsbabel = callPackage ../applications/misc/gpsbabel { }; + gpsbabel = qt5.callPackage ../applications/misc/gpsbabel { }; gpscorrelate = callPackage ../applications/misc/gpscorrelate { }; gpsd = callPackage ../servers/gpsd { }; + gpsprune = callPackage ../applications/misc/gpsprune { }; + gtk2fontsel = callPackage ../applications/misc/gtk2fontsel { inherit (gnome2) gtk; }; @@ -12170,7 +12192,10 @@ let lua = lua5; }; - ipe = qt5Libs.callPackage ../applications/graphics/ipe { }; + ipe = qt5.callPackage ../applications/graphics/ipe { + ghostscript = ghostscriptX; + texlive = texlive.combine { inherit (texlive) scheme-small; }; + }; iptraf = callPackage ../applications/networking/iptraf { }; @@ -12209,6 +12234,8 @@ let joe = callPackage ../applications/editors/joe { }; + josm = callPackage ../applications/misc/josm { }; + jbrout = callPackage ../applications/graphics/jbrout { }; jumanji = callPackage ../applications/networking/browsers/jumanji { @@ -12223,20 +12250,15 @@ let boost = boost155; }; - kdeApps_15_08 = recurseIntoAttrs (import ../applications/kde-apps-15.08 { inherit pkgs; }); - kdeApps_15_12 = recurseIntoAttrs (import ../applications/kde-apps-15.12 { inherit pkgs; }); - kdeApps_stable = kdeApps_15_08; - kdeApps_latest = kdeApps_15_12; - keepnote = callPackage ../applications/office/keepnote { pygtk = pyGtkGlade; }; kermit = callPackage ../tools/misc/kermit { }; - keyfinder = qt5Libs.callPackage ../applications/audio/keyfinder { }; + keyfinder = qt5.callPackage ../applications/audio/keyfinder { }; - keyfinder-cli = qt5Libs.callPackage ../applications/audio/keyfinder-cli { }; + keyfinder-cli = qt5.callPackage ../applications/audio/keyfinder-cli { }; keymon = callPackage ../applications/video/key-mon { }; @@ -12367,7 +12389,7 @@ let webkit = webkitgtk2; }; - luminanceHDR = callPackage ../applications/graphics/luminance-hdr { }; + luminanceHDR = qt5.callPackage ../applications/graphics/luminance-hdr { }; lxdvdrip = callPackage ../applications/video/lxdvdrip { }; @@ -12484,12 +12506,22 @@ let mopidy = callPackage ../applications/audio/mopidy { }; + mopidy-gmusic = callPackage ../applications/audio/mopidy-gmusic { }; + mopidy-spotify = callPackage ../applications/audio/mopidy-spotify { }; mopidy-moped = callPackage ../applications/audio/mopidy-moped { }; mopidy-mopify = callPackage ../applications/audio/mopidy-mopify { }; + mopidy-spotify-tunigo = callPackage ../applications/audio/mopidy-spotify-tunigo { }; + + mopidy-youtube = callPackage ../applications/audio/mopidy-youtube { }; + + mopidy-soundcloud = callPackage ../applications/audio/mopidy-soundcloud { }; + + mopidy-musicbox-webclient = callPackage ../applications/audio/mopidy-musicbox-webclient { }; + mozplugger = callPackage ../applications/networking/browsers/mozilla-plugins/mozplugger {}; easytag = callPackage ../applications/audio/easytag { }; @@ -12562,7 +12594,7 @@ let iceSupport = config.murmur.iceSupport or true; }) mumble mumble_git murmur murmur_git; - musescore = qt5Libs.callPackage ../applications/audio/musescore { }; + musescore = qt5.callPackage ../applications/audio/musescore { }; mutt = callPackage ../applications/networking/mailreaders/mutt { }; mutt-with-sidebar = callPackage ../applications/networking/mailreaders/mutt { @@ -12596,11 +12628,11 @@ let stdenv = stdenv_32bit; }; - shotcut = callPackage ../applications/video/shotcut { mlt = mlt-qt5; }; + shotcut = qt5.callPackage ../applications/video/shotcut { }; - smplayer = callPackage ../applications/video/smplayer { }; + smplayer = qt5.callPackage ../applications/video/smplayer { }; - smtube = callPackage ../applications/video/smtube {}; + smtube = qt5.callPackage ../applications/video/smtube {}; sup = callPackage ../applications/networking/mailreaders/sup { ruby = ruby_1_9_3.override { cursesSupport = true; }; @@ -12695,7 +12727,7 @@ let inherit (gnome) libglade; }; - obs-studio = callPackage ../applications/video/obs-studio { + obs-studio = qt5.callPackage ../applications/video/obs-studio { pulseaudioSupport = config.pulseaudio or true; }; @@ -12764,9 +12796,9 @@ let inherit (gst_all_1) gstreamer gst-plugins-base; }; - photoqt = callPackage ../applications/graphics/photoqt { }; + photoqt = qt5.callPackage ../applications/graphics/photoqt { }; - phototonic = callPackage ../applications/graphics/phototonic { }; + phototonic = qt5.callPackage ../applications/graphics/phototonic { }; pianobar = callPackage ../applications/audio/pianobar { }; @@ -12894,9 +12926,9 @@ let qsynth = callPackage ../applications/audio/qsynth { }; - qtox = callPackage ../applications/networking/instant-messengers/qtox { }; + qtox = qt5.callPackage ../applications/networking/instant-messengers/qtox { }; - qtpass = callPackage ../applications/misc/qtpass { }; + qtpass = qt5.callPackage ../applications/misc/qtpass { }; qtpfsgui = callPackage ../applications/graphics/qtpfsgui { }; @@ -12914,7 +12946,7 @@ let gst_plugins_bad = null; }; - qutebrowser = callPackage ../applications/networking/browsers/qutebrowser { + qutebrowser = qt5.callPackage ../applications/networking/browsers/qutebrowser { inherit (python34Packages) buildPythonPackage python pyqt5 jinja2 pygments pyyaml pypeg2; }; @@ -12928,7 +12960,7 @@ let demo = false; }; - rapcad = callPackage ../applications/graphics/rapcad {}; + rapcad = qt5.callPackage ../applications/graphics/rapcad {}; rapidsvn = callPackage ../applications/version-management/rapidsvn { }; @@ -13102,15 +13134,11 @@ let copy-com = callPackage ../applications/networking/copy-com { }; - dropbox = callPackage ../applications/networking/dropbox { - qtbase = qt5.base; - qtdeclarative = qt5.declarative; - qtwebkit = qt5.webkit; - }; + dropbox = qt5.callPackage ../applications/networking/dropbox { }; dropbox-cli = callPackage ../applications/networking/dropbox-cli { }; - lightdm = qt5Libs.callPackage ../applications/display-managers/lightdm { + lightdm = qt5.callPackage ../applications/display-managers/lightdm { qt4 = null; withQt5 = false; }; @@ -13131,9 +13159,7 @@ let printrun = callPackage ../applications/misc/printrun { }; - sddm = qt5Libs.callPackage ../applications/display-managers/sddm { - themes = []; # extra themes, etc. - }; + sddm = kde5.sddm; slim = callPackage ../applications/display-managers/slim { libpng = libpng12; @@ -13153,7 +13179,7 @@ let sipp = callPackage ../development/tools/misc/sipp { }; - sonic-visualiser = qt5Libs.callPackage ../applications/audio/sonic-visualiser { + sonic-visualiser = qt5.callPackage ../applications/audio/sonic-visualiser { inherit (pkgs.vamp) vampSDK; }; @@ -13190,18 +13216,21 @@ let sublime3 = lowPrio (callPackage ../applications/editors/sublime3 { }); - subversion = callPackage ../applications/version-management/subversion/default.nix { - bdbSupport = true; - httpServer = false; - httpSupport = true; - pythonBindings = false; - perlBindings = false; - javahlBindings = false; - saslSupport = false; - sasl = cyrus_sasl; - }; + inherit (callPackages ../applications/version-management/subversion/default.nix { + bdbSupport = true; + httpServer = false; + httpSupport = true; + pythonBindings = false; + perlBindings = false; + javahlBindings = false; + saslSupport = false; + sasl = cyrus_sasl; + }) + subversion18 subversion19; + + subversion = pkgs.subversion19; - subversionClient = appendToName "client" (subversion.override { + subversionClient = appendToName "client" (pkgs.subversion.override { bdbSupport = false; perlBindings = true; pythonBindings = true; @@ -13247,7 +13276,7 @@ let gconf = gnome.GConf; }; - teamspeak_client = callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; + teamspeak_client = qt55.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { }; taskjuggler = callPackage ../applications/misc/taskjuggler { }; @@ -13258,7 +13287,7 @@ let taskserver = callPackage ../servers/misc/taskserver { }; - telegram-cli = callPackage ../applications/networking/instant-messengers/telegram-cli/default.nix { }; + telegram-cli = callPackage ../applications/networking/instant-messengers/telegram/telegram-cli/default.nix { }; telepathy_gabble = callPackage ../applications/networking/instant-messengers/telepathy/gabble { }; @@ -13328,9 +13357,11 @@ let tomahawk = callPackage ../applications/audio/tomahawk { inherit (pkgs.kde4) kdelibs; + taglib = taglib_1_9; enableXMPP = config.tomahawk.enableXMPP or true; enableKDE = config.tomahawk.enableKDE or false; enableTelepathy = config.tomahawk.enableTelepathy or false; + quazip = qt5.quazip.override { qt = qt4; }; }; torchat = callPackage ../applications/networking/instant-messengers/torchat { @@ -13364,7 +13395,7 @@ let twister = callPackage ../applications/networking/p2p/twister { }; - twmn = callPackage ../applications/misc/twmn { }; + twmn = qt5.callPackage ../applications/misc/twmn { }; twinkle = callPackage ../applications/networking/instant-messengers/twinkle { }; @@ -13454,7 +13485,7 @@ let neovim-pygui = pythonPackages.neovim_gui; - virtviewer = callPackage ../applications/virtualization/virt-viewer { + virt-viewer = callPackage ../applications/virtualization/virt-viewer { gtkvnc = gtkvnc.override { enableGTK3 = true; }; spice_gtk = spice_gtk.override { enableGTK3 = true; }; }; @@ -13506,7 +13537,7 @@ let libva = libva-full; # also wants libva-x11 }; - vlc_qt5 = qt5Libs.vlc; + vlc_qt5 = qt5.vlc; vmpk = callPackage ../applications/audio/vmpk { }; @@ -13982,7 +14013,7 @@ let chocolateDoom = callPackage ../games/chocolate-doom { }; - cockatrice = qt5Libs.callPackage ../games/cockatrice { }; + cockatrice = qt5.callPackage ../games/cockatrice { }; confd = goPackages.confd.bin // { outputs = [ "bin" ]; }; @@ -14050,7 +14081,7 @@ let fish-fillets-ng = callPackage ../games/fish-fillets-ng {}; - flightgear = qt5Libs.callPackage ../games/flightgear { }; + flightgear = qt5.callPackage ../games/flightgear { }; freecell-solver = callPackage ../games/freecell-solver { }; @@ -14125,7 +14156,7 @@ let lincity_ng = callPackage ../games/lincity/ng.nix {}; - liquidwar = builderDefsPackage (callPackage ../games/liquidwar) { + liquidwar = callPackage ../games/liquidwar { guile = guile_1_8; }; @@ -14151,11 +14182,9 @@ let libpng = libpng12; }; - mnemosyne = callPackage ../games/mnemosyne { - inherit (pythonPackages) matplotlib cherrypy sqlite3; - }; + mnemosyne = callPackage ../games/mnemosyne { }; - mudlet = qt5Libs.callPackage ../games/mudlet { + mudlet = qt5.callPackage ../games/mudlet { inherit (lua51Packages) luafilesystem lrexlib luazip luasqlite3; }; @@ -14309,6 +14338,8 @@ let tennix = callPackage ../games/tennix { }; + terraria-server = callPackage ../games/terraria-server/default.nix { }; + tibia = callPackage_i686 ../games/tibia { }; tintin = callPackage ../games/tintin { }; @@ -14418,8 +14449,15 @@ let xsokoban = callPackage ../games/xsokoban { }; - zandronum = callPackage ../games/zandronum { }; - zandronum-server = callPackage ../games/zandronum/server.nix { }; + zandronum = callPackage ../games/zandronum { + fmod = fmod42416; + cmake = cmake-2_8; + }; + + zandronum-server = zandronum.override { + serverOnly = true; + }; + zandronum-bin = callPackage ../games/zandronum/bin.nix { }; zangband = builderDefsPackage (callPackage ../games/zangband) {}; @@ -14491,8 +14529,12 @@ let libusb = libusb1; libcanberra = libcanberra_kde; boost = boost155; - kdelibs = kdeApps_15_08.kdelibs; - subversionClient = subversionClient.override { branch = "1.8"; }; + kdelibs = kde5.kdelibs; + subversionClient = pkgs.subversion18.override { + bdbSupport = false; + perlBindings = true; + pythonBindings = true; + }; } ../desktops/kde-4.14; @@ -14712,12 +14754,79 @@ let numix-gtk-theme = callPackage ../misc/themes/gtk3/numix-gtk-theme { }; - plasma54 = recurseIntoAttrs (import ../desktops/plasma-5.4 { inherit pkgs; }); - plasma55 = recurseIntoAttrs (import ../desktops/plasma-5.5 { inherit pkgs; }); - plasma5_stable = plasma54; - plasma5_latest = plasma55; + kde5PackagesFun = self: with self; { + + calamares = callPackage ../tools/misc/calamares rec { + python = python3; + boost = pkgs.boost.override { python=python3; }; + libyamlcpp = callPackage ../development/libraries/libyaml-cpp { makePIC=true; boost=boost; }; + }; + + dfilemanager = callPackage ../applications/misc/dfilemanager { }; + + fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { }; + + k9copy = callPackage ../applications/video/k9copy {}; + + quassel = callPackage ../applications/networking/irc/quassel/qt-5.nix { + monolithic = true; + daemon = false; + client = false; + withKDE = true; + dconf = gnome3.dconf; + tag = "-kf5"; + }; + + quasselClient = quassel.override { + monolithic = false; + client = true; + tag = "-client-kf5"; + }; + + quassel_qt5 = quassel.override { + withKDE = false; + tag = "-qt5"; + }; + + quasselClient_qt5 = quasselClient.override { + withKDE = false; + tag = "-client-qt5"; + }; - kde5 = kf5_stable // plasma5_stable // kdeApps_stable; + quasselDaemon = quassel.override { + monolithic = false; + daemon = true; + tag = "-daemon-qt5"; + withKDE = false; + }; + + sddm = callPackage ../applications/display-managers/sddm { + themes = []; # extra themes, etc. + }; + + }; + + kde5 = + let + frameworks = import ../development/libraries/kde-frameworks-5.17 { inherit pkgs; }; + plasma = import ../desktops/plasma-5.5 { inherit pkgs; }; + apps = import ../applications/kde-apps-15.12 { inherit pkgs; }; + named = self: { plasma = plasma self; frameworks = frameworks self; apps = apps self; }; + merged = self: + named self // frameworks self // plasma self // apps self // kde5PackagesFun self; + in + recurseIntoAttrs (lib.makeScope qt55.newScope merged); + + kde5_latest = + let + frameworks = import ../development/libraries/kde-frameworks-5.17 { inherit pkgs; }; + plasma = import ../desktops/plasma-5.5 { inherit pkgs; }; + apps = import ../applications/kde-apps-15.12 { inherit pkgs; }; + named = self: { plasma = plasma self; frameworks = frameworks self; apps = apps self; }; + merged = self: + named self // frameworks self // plasma self // apps self // kde5PackagesFun self; + in + recurseIntoAttrs (lib.makeScope qt55.newScope merged); theme-vertex = callPackage ../misc/themes/vertex { }; @@ -15049,6 +15158,8 @@ let geda = callPackage ../applications/science/electronics/geda { }; + gerbv = callPackage ../applications/science/electronics/gerbv { }; + gtkwave = callPackage ../applications/science/electronics/gtkwave { }; kicad = callPackage ../applications/science/electronics/kicad { @@ -15057,6 +15168,8 @@ let ngspice = callPackage ../applications/science/electronics/ngspice { }; + pcb = callPackage ../applications/science/electronics/pcb { }; + qucs = callPackage ../applications/science/electronics/qucs { }; xoscope = callPackage ../applications/science/electronics/xoscope { }; @@ -15178,7 +15291,7 @@ let ### MISC - antimicro = callPackage ../tools/misc/antimicro { }; + antimicro = qt5.callPackage ../tools/misc/antimicro { }; atari800 = callPackage ../misc/emulators/atari800 { }; @@ -15332,7 +15445,7 @@ let nixops = callPackage ../tools/package-management/nixops { }; - nixopsUnstable = nixops; + nixopsUnstable = callPackage ../tools/package-management/nixops/unstable.nix { }; nixui = callPackage ../tools/package-management/nixui { node_webkit = nwjs_0_12; }; @@ -15387,7 +15500,7 @@ let inherit (pythonPackages) pexpect paramiko; }; - robomongo = callPackage ../applications/misc/robomongo { }; + robomongo = qt5.callPackage ../applications/misc/robomongo { }; rucksack = callPackage ../development/tools/rucksack { }; @@ -15455,17 +15568,14 @@ let }; }; - saneBackends = callPackage ../applications/graphics/sane/backends.nix { + saneBackends = callPackage ../applications/graphics/sane/backends { gt68xxFirmware = config.sane.gt68xxFirmware or null; snapscanFirmware = config.sane.snapscanFirmware or null; - hotplugSupport = config.sane.hotplugSupport or true; - libusb = libusb1; }; - saneBackendsGit = callPackage ../applications/graphics/sane/backends-git.nix { + saneBackendsGit = callPackage ../applications/graphics/sane/backends/git.nix { gt68xxFirmware = config.sane.gt68xxFirmware or null; snapscanFirmware = config.sane.snapscanFirmware or null; - hotplugSupport = config.sane.hotplugSupport or true; }; mkSaneConfig = callPackage ../applications/graphics/sane/config.nix { }; @@ -15702,8 +15812,8 @@ let snes9x-gtk = callPackage ../misc/emulators/snes9x-gtk { }; higan = callPackage ../misc/emulators/higan { - profile = config.higan.profile or "performance"; - guiToolkit = config.higan.guiToolkit or "gtk"; + inherit (gnome) gtksourceview; + profile = config.higan.profile or "balanced"; }; misc = callPackage ../misc/misc.nix { }; @@ -15722,6 +15832,7 @@ let ### Deprecated aliases - for backward compatibility aliases = with self; rec { + accounts-qt = qt5.accounts-qt; # added 2015-12-19 adobeReader = adobe-reader; arduino_core = arduino-core; # added 2015-02-04 asciidocFull = asciidoc-full; # added 2014-06-22 @@ -15735,24 +15846,35 @@ aliases = with self; rec { exfat-utils = exfat; # 2015-09-11 firefoxWrapper = firefox-wrapper; fuse_exfat = exfat; # 2015-09-11 + grantlee5 = qt5.grantlee; # added 2015-12-19 htmlTidy = html-tidy; # added 2014-12-06 inherit (haskell.compiler) jhc uhc; # 2015-05-15 inotifyTools = inotify-tools; jquery_ui = jquery-ui; # added 2014-09-07 + libdbusmenu_qt5 = qt5.libdbusmenu; # added 2015-12-19 libtidy = html-tidy; # added 2014-12-21 lttngTools = lttng-tools; # added 2014-07-31 lttngUst = lttng-ust; # added 2014-07-31 + mlt-qt5 = qt5.mlt; # added 2015-12-19 nfsUtils = nfs-utils; # added 2014-12-06 - quassel_qt5 = kf5Packages.quassel_qt5; # added 2015-09-30 - quasselClient_qt5 = kf5Packages.quasselClient_qt5; # added 2015-09-30 - quasselDaemon_qt5 = kf5Packages.quasselDaemon; # added 2015-09-30 - quassel_kf5 = kf5Packages.quassel; # added 2015-09-30 - quasselClient_kf5 = kf5Packages.quasselClient; # added 2015-09-30 + phonon_qt5 = qt5.phonon; # added 2015-12-19 + phonon_qt5_backend_gstreamer = qt5.phonon-backend-gstreamer; # added 2015-12-19 + poppler_qt5 = qt5.poppler; # added 2015-12-19 + qca-qt5 = qt5.qca-qt5; # added 2015-12-19 + qtcreator = qt5.qtcreator; # added 2015-12-19 + quassel_qt5 = kde5.quassel_qt5; # added 2015-09-30 + quasselClient_qt5 = kde5.quasselClient_qt5; # added 2015-09-30 + quasselDaemon_qt5 = kde5.quasselDaemon; # added 2015-09-30 + quassel_kf5 = kde5.quassel; # added 2015-09-30 + quasselClient_kf5 = kde5.quasselClient; # added 2015-09-30 + qwt6 = qt5.qwt; # added 2015-12-19 rdiff_backup = rdiff-backup; # added 2014-11-23 rssglx = rss-glx; #added 2015-03-25 rxvt_unicode_with-plugins = rxvt_unicode-with-plugins; # added 2015-04-02 + signon = qt5.signon; # added 2015-12-19 speedtest_cli = speedtest-cli; # added 2015-02-17 sqliteInteractive = sqlite-interactive; # added 2014-12-06 + telepathy_qt5 = qt5.telepathy; # added 2015-12-19 x11 = xlibsWrapper; # added 2015-09 xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09 xlibs = xorg; # added 2015-09 @@ -15761,6 +15883,8 @@ aliases = with self; rec { pidginlatexSF = pidginlatex; # added 2014-11-02 tftp_hpa = tftp-hpa; # added 2015-04-03 manpages = man-pages; # added 2015-12-06 + mssys = ms-sys; # added 2015-12-13 + virtviewer = virt-viewer; # added 2015-12-24 }; tweakAlias = _n: alias: with lib; |