diff options
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 85 | ||||
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 63 |
3 files changed, 111 insertions, 42 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ffc88d1cf48b..d5ce66d56b9a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1939,7 +1939,7 @@ in iasl = callPackage ../development/compilers/iasl { }; - iannix = callPackage ../applications/audio/iannix { }; + iannix = qt5.callPackage ../applications/audio/iannix { }; icecast = callPackage ../servers/icecast { }; @@ -2378,7 +2378,11 @@ in minixml = callPackage ../development/libraries/minixml { }; - mjpegtools = callPackage ../tools/video/mjpegtools { }; + mjpegtoolsFull = callPackage ../tools/video/mjpegtools { }; + + mjpegtools = self.mjpegtoolsFull.override { + withMinimal = true; + }; mkcue = callPackage ../tools/cd-dvd/mkcue { }; @@ -2779,6 +2783,8 @@ in patchage = callPackage ../applications/audio/patchage { }; + pcapfix = callPackage ../tools/networking/pcapfix { }; + pbzip2 = callPackage ../tools/compression/pbzip2 { }; pciutils = callPackage ../tools/system/pciutils { }; @@ -2970,13 +2976,10 @@ in qalculate-gtk = callPackage ../applications/science/math/qalculate-gtk { }; - qastools = callPackage ../tools/audio/qastools { - qt = qt4; - }; + qastools = callPackage ../tools/audio/qastools { }; qgifer = callPackage ../applications/video/qgifer { giflib = giflib_4_1; - qt = qt4; }; qhull = callPackage ../development/libraries/qhull { }; @@ -2987,9 +2990,7 @@ in qprint = callPackage ../tools/text/qprint { }; - qscintilla = callPackage ../development/libraries/qscintilla { - qt = qt4; - }; + qscintilla = callPackage ../development/libraries/qscintilla { }; qshowdiff = callPackage ../tools/text/qshowdiff { }; @@ -3146,7 +3147,7 @@ in screen-message = callPackage ../tools/X11/screen-message { }; screencloud = callPackage ../applications/graphics/screencloud { - quazip = qt5.quazip.override { qt = qt4; }; + quazip = qt5.quazip.override { qt = qt4; qmakeHook = qmake4Hook; }; }; scrot = callPackage ../tools/graphics/scrot { }; @@ -3676,6 +3677,8 @@ in xarchiver = callPackage ../tools/archivers/xarchiver { }; + xbanish = callPackage ../tools/X11/xbanish { }; + xbrightness = callPackage ../tools/X11/xbrightness { }; xfstests = callPackage ../tools/misc/xfstests { }; @@ -5692,10 +5695,7 @@ in astyle = callPackage ../development/tools/misc/astyle { }; - electron = callPackage ../development/tools/electron { - gconf = pkgs.gnome.GConf; - }; - + electron = callPackage ../development/tools/electron { }; autobuild = callPackage ../development/tools/misc/autobuild { }; @@ -7386,7 +7386,7 @@ in libcm = callPackage ../development/libraries/libcm { }; - libcommuni = callPackage ../development/libraries/libcommuni { }; + libcommuni = qt5.callPackage ../development/libraries/libcommuni { }; libconfuse = callPackage ../development/libraries/libconfuse { }; @@ -8440,7 +8440,7 @@ in pdf2xml = callPackage ../development/libraries/pdf2xml {} ; - phonon = callPackage ../development/libraries/phonon/qt4 {}; + phonon = callPackage ../development/libraries/phonon {}; phonon_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer/qt4 {}; @@ -8469,7 +8469,7 @@ in spidermonkey = spidermonkey_17; }; - polkit_qt4 = callPackage ../development/libraries/polkit-qt-1 { }; + polkit_qt4 = callPackage ../development/libraries/polkit-qt-1/qt-4.nix { }; poppler = callPackage ../development/libraries/poppler { lcms = lcms2; }; @@ -8539,8 +8539,17 @@ in # XXX: mariadb doesn't built on fbsd as of nov 2015 mysql = if (!stdenv.isFreeBSD) then mysql else null; + + inherit (pkgs.darwin) cf-private libobjc; + inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices OpenGL Cocoa AGL; }; + qmake48Hook = makeSetupHook + { substitutions = { qt4 = qt48; }; } + ../development/libraries/qt-4.x/4.8/qmake-hook.sh; + + qmake4Hook = qmake48Hook; + qt48Full = appendToName "full" (qt48.override { docs = true; demos = true; @@ -8572,15 +8581,13 @@ in openbr = callPackage ../development/libraries/openbr { }; - phonon = callPackage ../development/libraries/phonon/qt5 { }; + phonon = callPackage ../development/libraries/phonon { }; phonon-backend-gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer/qt5 { }; phonon-backend-vlc = callPackage ../development/libraries/phonon-backend-vlc/qt5 { }; - polkit-qt = callPackage ../development/libraries/polkit-qt-1 { - withQt5 = true; - }; + polkit-qt = callPackage ../development/libraries/polkit-qt-1/qt-5.nix { }; poppler = callPackage ../development/libraries/poppler { lcms = lcms2; @@ -8946,7 +8953,11 @@ in unicap = callPackage ../development/libraries/unicap {}; - tsocks = callPackage ../development/libraries/tsocks { }; + tsocks = callPackage ../development/libraries/tsocks { + stdenv = overrideCC stdenv ( + wrapCCWith (callPackage ../build-support/cc-wrapper) + musl "" gcc.cc); + }; unixODBC = callPackage ../development/libraries/unixODBC { }; @@ -9160,9 +9171,7 @@ in libusb = libusb1; }; - yubikey-personalization-gui = callPackage ../tools/misc/yubikey-personalization-gui { - qt = qt4; - }; + yubikey-personalization-gui = callPackage ../tools/misc/yubikey-personalization-gui { }; zeitgeist = callPackage ../development/libraries/zeitgeist { }; @@ -10649,6 +10658,8 @@ in cpupower = callPackage ../os-specific/linux/cpupower { }; + dpdk = callPackage ../os-specific/linux/dpdk { }; + e1000e = callPackage ../os-specific/linux/e1000e {}; v4l2loopback = callPackage ../os-specific/linux/v4l2loopback { }; @@ -11632,10 +11643,12 @@ in artha = callPackage ../applications/misc/artha { }; - atom = callPackage ../applications/editors/atom { + atomEnv = callPackage ../applications/editors/atom/env.nix { gconf = gnome.GConf; }; + atom = callPackage ../applications/editors/atom { }; + aseprite = callPackage ../applications/editors/aseprite { giflib = giflib_4_1; }; @@ -13649,13 +13662,9 @@ in remotebox = callPackage ../applications/virtualization/remotebox { }; - retroshare = callPackage ../applications/networking/p2p/retroshare { - qt = qt4; - }; + retroshare = callPackage ../applications/networking/p2p/retroshare { }; - retroshare06 = lowPrio (callPackage ../applications/networking/p2p/retroshare/0.6.nix { - qt = qt4; - }); + retroshare06 = lowPrio (callPackage ../applications/networking/p2p/retroshare/0.6.nix { }); RhythmDelay = callPackage ../applications/audio/RhythmDelay { }; @@ -14238,9 +14247,7 @@ in vorbis-tools = callPackage ../applications/audio/vorbis-tools { }; - vscode = callPackage ../applications/editors/vscode { - gconf = pkgs.gnome.GConf; - }; + vscode = callPackage ../applications/editors/vscode { }; vue = callPackage ../applications/misc/vue { }; @@ -14577,9 +14584,7 @@ in qgroundcontrol = qt55.callPackage ../applications/science/robotics/qgroundcontrol { }; - qtbitcointrader = callPackage ../applications/misc/qtbitcointrader { - qt = qt4; - }; + qtbitcointrader = callPackage ../applications/misc/qtbitcointrader { }; pahole = callPackage ../development/tools/misc/pahole {}; @@ -16596,9 +16601,11 @@ in mg = callPackage ../applications/editors/mg { }; + aucdtect = callPackage ../tools/audio/aucdtect { }; + togglesg-download = callPackage ../tools/misc/togglesg-download { }; discord = callPackage ../applications/networking/instant-messengers/discord { }; - #golden-cheetah = qt5.callPackage ../applications/misc/golden-cheetah {}; + golden-cheetah = qt5.callPackage ../applications/misc/golden-cheetah {}; } diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 766c57cc5777..0060b7e37d7a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -383,7 +383,10 @@ rec { lts-5_12 = packages.ghc7103.override { packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-5.12.nix { }; }; - lts-5 = packages.lts-5_12; + lts-5_13 = packages.ghc7103.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-5.13.nix { }; + }; + lts-5 = packages.lts-5_13; lts = packages.lts-5; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3d1e2026a823..c59bec38d3b8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -166,10 +166,9 @@ in modules // { pythonPackages = self; }; - pyqt5 = callPackage ../development/python-modules/pyqt/5.x.nix { + pyqt5 = pkgs.qt55.callPackage ../development/python-modules/pyqt/5.x.nix { sip = self.sip_4_16; pythonDBus = self.dbus; - inherit (pkgs.qt55) qtbase qtsvg qtwebkit; }; pyside = callPackage ../development/python-modules/pyside { }; @@ -26423,4 +26422,64 @@ in modules // { }; }; + w3lib = buildPythonPackage rec { + name = "w3lib-${version}"; + version = "1.14.2"; + + buildInputs = with self ; [ six pytest ]; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/w/w3lib/${name}.tar.gz"; + sha256 = "bd87eae62d208eef70869951abf05e96a8ee559714074a485168de4c5b190004"; + }; + + meta = { + description = "A library of web-related functions"; + homepage = "https://github.com/scrapy/w3lib"; + license = licenses.bsd3; + maintainers = with maintainers; [ drewkett ]; + }; + }; + + queuelib = buildPythonPackage rec { + name = "queuelib-${version}"; + version = "1.4.2"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/q/queuelib/${name}.tar.gz"; + sha256 = "a6829918157ed433fafa87b0bb1e93e3e63c885270166db5884a02c34c86f914"; + }; + + buildInputs = with self ; [ pytest ]; + + meta = { + description = "A collection of persistent (disk-based) queues for Python"; + homepage = "https://github.com/scrapy/queuelib"; + license = licenses.bsd3; + maintainers = with maintainers; [ drewkett ]; + }; + }; + + scrapy = buildPythonPackage rec { + name = "Scrapy-${version}"; + version = "1.0.5"; + + disabled = isPy3k; + + buildInputs = with self ; [ pytest ]; + propagatedBuildInputs = with self ; [ six twisted w3lib lxml cssselect queuelib pyopenssl service-identity ]; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/S/Scrapy/${name}.tar.gz"; + sha256 = "0a51c785a310d65f6e70285a2da56d48ef7d049bd7fd60a08eef05c52328ca96"; + }; + + meta = { + description = "A fast high-level web crawling and web scraping framework, used to crawl websites and extract structured data from their pages"; + homepage = "http://scrapy.org/"; + license = licenses.bsd3; + maintainers = with maintainers; [ drewkett ]; + platforms = platforms.linux; + }; + }; } |