diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 169 |
1 files changed, 92 insertions, 77 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 44a4bf27555..44b92c77c9c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -474,6 +474,8 @@ let ### TOOLS + _9pfs = callPackage ../tools/filesystems/9pfs { }; + "3dfsb" = callPackage ../applications/misc/3dfsb { glibc = glibc.override { debugSymbols = true; }; }; @@ -1730,13 +1732,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 @@ -2883,6 +2878,8 @@ let reaverwps = callPackage ../tools/networking/reaver-wps {}; + recordmydesktop = callPackage ../applications/video/recordmydesktop { }; + recutils = callPackage ../tools/misc/recutils { }; recoll = callPackage ../applications/search/recoll { }; @@ -6860,55 +6857,6 @@ let automake = automake111x; }; - kf515 = recurseIntoAttrs (import ../development/libraries/kde-frameworks-5.15 { inherit pkgs; }); - kf517 = recurseIntoAttrs (import ../development/libraries/kde-frameworks-5.17 { inherit pkgs; }); - kf5_stable = kf515; - kf5_latest = kf517; - - 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; - kf517Packages = lib.makeScope kf517.newScope kf5PackagesFun; - kf5Packages = kf515Packages; - kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { }; krb5Full = callPackage ../development/libraries/kerberos/krb5.nix { @@ -8115,8 +8063,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; }; @@ -11136,6 +11082,8 @@ let }; awesome = awesome-3-5; + awesomebump = callPackage ../applications/graphics/awesomebump { }; + inherit (gnome3) baobab; backintime-common = callPackage ../applications/networking/sync/backintime/common.nix { }; @@ -11508,6 +11456,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; @@ -12251,11 +12212,6 @@ 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; }; @@ -14183,9 +14139,7 @@ let libpng = libpng12; }; - mnemosyne = callPackage ../games/mnemosyne { - inherit (pythonPackages) matplotlib cherrypy sqlite3; - }; + mnemosyne = callPackage ../games/mnemosyne { }; mudlet = qt5Libs.callPackage ../games/mudlet { inherit (lua51Packages) luafilesystem lrexlib luazip luasqlite3; @@ -14532,7 +14486,7 @@ let libusb = libusb1; libcanberra = libcanberra_kde; boost = boost155; - kdelibs = kdeApps_15_08.kdelibs; + kdelibs = kde5.kdelibs; subversionClient = pkgs.subversion18.override { bdbSupport = false; perlBindings = true; @@ -14757,12 +14711,69 @@ 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; }; + }; + + fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { }; - kde5 = kf5_stable // plasma5_stable // kdeApps_stable; + 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; + }; + + }; + + 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; }; + merged = self: frameworks self // plasma self // apps self // kde5PackagesFun self; + in + recurseIntoAttrs (lib.makeScope qt55Libs.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; }; + merged = self: frameworks self // plasma self // apps self // kde5PackagesFun self; + in + recurseIntoAttrs (lib.makeScope qt55Libs.newScope merged); theme-vertex = callPackage ../misc/themes/vertex { }; @@ -15092,6 +15103,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 { @@ -15100,6 +15113,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 { }; @@ -15786,11 +15801,11 @@ aliases = with self; rec { lttngTools = lttng-tools; # added 2014-07-31 lttngUst = lttng-ust; # added 2014-07-31 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 + 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 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 |