diff options
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 35 | ||||
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/perl-packages.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/php-packages.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 80 |
6 files changed, 46 insertions, 86 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93130ddd25cf..a9916143be61 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -848,6 +848,8 @@ with pkgs; bluemix-cli = callPackage ../tools/admin/bluemix-cli { }; + charles = callPackage ../applications/networking/charles { }; + libqmatrixclient = libsForQt5.callPackage ../development/libraries/libqmatrixclient { }; quaternion = libsForQt5.callPackage ../applications/networking/instant-messengers/quaternion { }; @@ -1680,6 +1682,8 @@ with pkgs; ciopfs = callPackage ../tools/filesystems/ciopfs { }; + circleci-cli = callPackage ../development/tools/misc/circleci-cli { }; + citrix_receiver = callPackage ../applications/networking/remote/citrix-receiver { }; citrix_receiver_13_10_0 = citrix_receiver.override { version = "13.10.0"; }; citrix_receiver_13_9_1 = citrix_receiver.override { version = "13.9.1"; }; @@ -1946,7 +1950,7 @@ with pkgs; daq = callPackage ../applications/networking/ids/daq { }; - dar = callPackage ../tools/archivers/dar { }; + dar = callPackage ../tools/backup/dar { }; darkhttpd = callPackage ../servers/http/darkhttpd { }; @@ -2867,6 +2871,8 @@ with pkgs; gtkgnutella = callPackage ../tools/networking/p2p/gtk-gnutella { }; + gtkperf = callPackage ../development/tools/misc/gtkperf { }; + gtkvnc = callPackage ../tools/admin/gtk-vnc {}; gtmess = callPackage ../applications/networking/instant-messengers/gtmess { }; @@ -4043,7 +4049,7 @@ with pkgs; networkmanager-iodine = callPackage ../tools/networking/network-manager/iodine.nix { }; - networkmanager-openvpn = callPackage ../tools/networking/network-manager/openvpn.nix { }; + networkmanager-openvpn = callPackage ../tools/networking/network-manager/openvpn { }; networkmanager-l2tp = callPackage ../tools/networking/network-manager/l2tp.nix { }; @@ -4910,6 +4916,8 @@ with pkgs; s3cmd = callPackage ../tools/networking/s3cmd { }; + s4cmd = callPackage ../tools/networking/s4cmd { }; + s3gof3r = callPackage ../tools/networking/s3gof3r { }; s6Dns = callPackage ../tools/networking/s6-dns { }; @@ -5238,6 +5246,8 @@ with pkgs; subsonic = callPackage ../servers/misc/subsonic { }; + subfinder = callPackage ../tools/networking/subfinder { }; + surfraw = callPackage ../tools/networking/surfraw { }; swagger-codegen = callPackage ../tools/networking/swagger-codegen { }; @@ -7798,9 +7808,7 @@ with pkgs; bazel_0_4 = callPackage ../development/tools/build-managers/bazel/0.4.nix { }; bazel = callPackage ../development/tools/build-managers/bazel { - inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; - binutils = binutils-unwrapped; }; bazel-buildtools = callPackage ../development/tools/build-managers/bazel/buildtools { }; @@ -7981,7 +7989,7 @@ with pkgs; creduce = callPackage ../development/tools/misc/creduce { inherit (perlPackages) perl ExporterLite FileWhich GetoptTabular RegexpCommon TermReadKey; - inherit (llvmPackages_4) llvm clang-unwrapped; + inherit (llvmPackages_6) llvm clang-unwrapped; }; cscope = callPackage ../development/tools/misc/cscope { }; @@ -8098,8 +8106,6 @@ with pkgs; flow = callPackage ../development/tools/analysis/flow { inherit (darwin.apple_sdk.frameworks) CoreServices; inherit (darwin) cf-private; - inherit (ocamlPackages) ocaml findlib camlp4 sedlex ocamlbuild lwt_ppx - wtf8 dtoa; }; foreman = callPackage ../tools/system/foreman { }; @@ -10913,6 +10919,8 @@ with pkgs; mergerfs = callPackage ../tools/filesystems/mergerfs { }; + mergerfs-tools = callPackage ../tools/filesystems/mergerfs/tools.nix { }; + ## libGL/libGLU/Mesa stuff # Default libGL implementation, should provide headers and libGL.so/libEGL.so/... to link agains them @@ -13104,6 +13112,7 @@ with pkgs; prometheus-surfboard-exporter = callPackage ../servers/monitoring/prometheus/surfboard-exporter.nix { }; prometheus-unifi-exporter = callPackage ../servers/monitoring/prometheus/unifi-exporter { }; prometheus-varnish-exporter = callPackage ../servers/monitoring/prometheus/varnish-exporter.nix { }; + prometheus-jmx-httpserver = callPackage ../servers/monitoring/prometheus/jmx-httpserver.nix { }; psqlodbc = callPackage ../servers/sql/postgresql/psqlodbc { }; @@ -14302,6 +14311,8 @@ with pkgs; radeontop = callPackage ../os-specific/linux/radeontop { }; raspberrypifw = callPackage ../os-specific/linux/firmware/raspberrypi {}; + raspberrypiWirelessFirmware = callPackage ../os-specific/linux/firmware/raspberrypi-wireless { }; + raspberrypi-tools = callPackage ../os-specific/linux/firmware/raspberrypi/tools.nix {}; regionset = callPackage ../os-specific/linux/regionset { }; @@ -14713,6 +14724,8 @@ with pkgs; helvetica-neue-lt-std = callPackage ../data/fonts/helvetica-neue-lt-std { }; + hetzner-kube = callPackage ../applications/networking/cluster/hetzner-kube { }; + hicolor-icon-theme = callPackage ../data/icons/hicolor-icon-theme { }; hanazono = callPackage ../data/fonts/hanazono { }; @@ -15395,8 +15408,6 @@ with pkgs; cava = callPackage ../applications/audio/cava { }; - cask = callPackage ../development/tools/build-managers/cask { }; - cb2bib = libsForQt5.callPackage ../applications/office/cb2bib { }; cbatticon = callPackage ../applications/misc/cbatticon { }; @@ -19211,6 +19222,8 @@ with pkgs; xsd = callPackage ../development/libraries/xsd { }; + xscope = callPackage ../applications/misc/xscope { }; + xscreensaver = callPackage ../misc/screensavers/xscreensaver { inherit (gnome2) libglade; }; @@ -19725,7 +19738,7 @@ with pkgs; openxcom = callPackage ../games/openxcom { }; - orthorobot = callPackage ../games/orthorobot { love = love_0_7; }; + orthorobot = callPackage ../games/orthorobot { }; pacvim = callPackage ../games/pacvim { }; @@ -21868,7 +21881,7 @@ with pkgs; xrq = callPackage ../applications/misc/xrq { }; - nitrokey-app = callPackage ../tools/security/nitrokey-app { }; + nitrokey-app = libsForQt5.callPackage ../tools/security/nitrokey-app { }; nitrokey-udev-rules = callPackage ../tools/security/nitrokey-app/udev-rules.nix { }; fpm2 = callPackage ../tools/security/fpm2 { }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 7836f71e2eae..cca0b7ba3460 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -200,6 +200,7 @@ in rec { (pkgs.lib.attrNames packages); in pkgs.lib.genAttrs integerSimpleGhcNames (name: packages."${name}".override { ghc = bh.compiler.integer-simple."${name}"; + buildHaskellPackages = bh.packages.integer-simple."${name}"; overrides = _self : _super : { integer-simple = null; integer-gmp = null; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index fb51cb949442..a49d638dc47e 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -242,9 +242,7 @@ let estring = callPackage ../development/ocaml-modules/estring { }; - ezjsonm = callPackage ../development/ocaml-modules/ezjsonm { - lwt = ocaml_lwt; - }; + ezjsonm = callPackage ../development/ocaml-modules/ezjsonm { }; facile = callPackage ../development/ocaml-modules/facile { }; @@ -394,6 +392,10 @@ let ocaml_lwt = if lib.versionOlder "4.02" ocaml.version then lwt3 else lwt2; + lwt_log = callPackage ../development/ocaml-modules/lwt_log { + lwt = lwt3; + }; + lwt_ppx = callPackage ../development/ocaml-modules/lwt/ppx.nix { lwt = lwt3; }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c910c2852f0b..c489ff2fb20d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14408,12 +14408,12 @@ let self = _self // overrides; _self = with self; { }; SysVirt = buildPerlModule rec { - version = "4.4.0"; + version = "4.5.0"; name = "Sys-Virt-${version}"; src = assert version == pkgs.libvirt.version; pkgs.fetchgit { url = git://libvirt.org/libvirt-perl.git; rev = "v${version}"; - sha256 = "1swlbis7mk1dk36badyibi3s467vhrjii0hhvhbsn2n0l6wa49x6"; + sha256 = "18ns94i29c9x0j50pz9r1vcif6baayz769sa7b51v8kcvam9j52s"; }; nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ]; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 7861b2a231d0..a1761e68631e 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -383,11 +383,11 @@ let php-cs-fixer = pkgs.stdenv.mkDerivation rec { name = "php-cs-fixer-${version}"; - version = "2.12.1"; + version = "2.12.2"; src = pkgs.fetchurl { url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar"; - sha256 = "1ifwb30wddp5blqnrkdmf0x11dk7nbxj4z2v5403fn7wfhgvibd2"; + sha256 = "19cq04x1wi489259vyad15zy6y0k3qd7dj77pcf74gxqw92hgg5c"; }; phases = [ "installPhase" ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6ac09121fac2..f04e149bac97 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -205,6 +205,8 @@ in { aws-xray-sdk = callPackage ../development/python-modules/aws-xray-sdk { }; + aws-adfs = callPackage ../development/python-modules/aws-adfs { }; + # packages defined elsewhere amazon_kclpy = callPackage ../development/python-modules/amazon_kclpy { }; @@ -335,6 +337,8 @@ in { pdfminer = callPackage ../development/python-modules/pdfminer_six { }; + pdfx = callPackage ../development/python-modules/pdfx { }; + plantuml = callPackage ../tools/misc/plantuml { }; Pmw = callPackage ../development/python-modules/Pmw { }; @@ -2415,22 +2419,7 @@ in { }; }; - events = buildPythonPackage rec { - name = "Events-${version}"; - version = "0.2.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/E/Events/${name}.tar.gz"; - sha256 = "0rymyfvarjdi2fdhfz2iqmp4wgd2n2sm0p2mx44c3spm7ylnqzqa"; - }; - - meta = { - homepage = "http://events.readthedocs.org"; - description = "Bringing the elegance of C# EventHanlder to Python"; - license = licenses.bsd3; - }; - }; - + events = callPackage ../development/python-modules/events { }; eyeD3 = buildPythonPackage rec { version = "0.7.8"; @@ -6932,33 +6921,7 @@ in { koji = callPackage ../development/python-modules/koji { }; - kombu = buildPythonPackage rec { - name = "kombu-${version}"; - version = "4.0.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/k/kombu/${name}.tar.gz"; - sha256 = "18hiricdnbnlz6hx3hbaa4dni6npv8rbid4dhf7k02k16qm6zz6h"; - }; - - # Backport fix for python-3.6 from master (see issue https://github.com/celery/kombu/issues/675) - # TODO remove at next update - patches = [ (pkgs.fetchpatch { - url = "https://github.com/celery/kombu/commit/dc3fceff59d79ceac3f8f11a5d697beabb4b7a7f.patch"; - sha256 = "0s6gsihzjvmpffc7xrrcijw00r56yb74jg0sbjgng2v1324z1da9"; - name = "don-t-modify-dict-size-while-iterating-over-it"; - }) ]; - - buildInputs = with self; [ pytest case pytz ]; - - propagatedBuildInputs = with self; [ amqp ]; - - meta = { - description = "Messaging library for Python"; - homepage = "https://github.com/celery/kombu"; - license = licenses.bsd3; - }; - }; + kombu = callPackage ../development/python-modules/kombu { }; konfig = callPackage ../development/python-modules/konfig { }; @@ -9149,7 +9112,9 @@ in { cachetools_1 = callPackage ../development/python-modules/cachetools/1.nix {}; cachetools = callPackage ../development/python-modules/cachetools {}; - cmd2 = callPackage ../development/python-modules/cmd2 {}; + cmd2_8 = callPackage ../development/python-modules/cmd2/old.nix {}; + cmd2_9 = callPackage ../development/python-modules/cmd2 {}; + cmd2 = if isPy27 then self.cmd2_8 else self.cmd2_9; warlock = buildPythonPackage rec { name = "warlock-${version}"; @@ -14603,6 +14568,8 @@ in { }; }; + vega_datasets = callPackage ../development/python-modules/vega_datasets { }; + virtkey = callPackage ../development/python-modules/virtkey { }; virtual-display = callPackage ../development/python-modules/virtual-display { }; @@ -14774,30 +14741,7 @@ EOF imagemagick = pkgs.imagemagickBig; }; - wcwidth = buildPythonPackage rec { - name = "wcwidth-${version}"; - version = "0.1.6"; - - src = pkgs.fetchurl { - url = "mirror://pypi/w/wcwidth/${name}.tar.gz"; - sha256 = "02wjrpf001gjdjsaxxbzcwfg19crlk2dbddayrfc2v06f53yrcyw"; - }; - - # Checks fail due to missing tox.ini file: - doCheck = false; - - meta = { - description = "Measures number of Terminal column cells of wide-character codes"; - longDescription = '' - This API is mainly for Terminal Emulator implementors -- any Python - program that attempts to determine the printable width of a string on - a Terminal. It is implemented in python (no C library calls) and has - no 3rd-party dependencies. - ''; - homepage = https://github.com/jquast/wcwidth; - license = licenses.mit; - }; - }; + wcwidth = callPackage ../development/python-modules/wcwidth { }; web = buildPythonPackage rec { version = "0.37"; |