diff --git a/doc/quick-start.xml b/doc/quick-start.xml index c0f96f87152..8d51f4c30e6 100644 --- a/doc/quick-start.xml +++ b/doc/quick-start.xml @@ -55,18 +55,18 @@ $ git add pkgs/development/libraries/libfoo/default.nix - GNU cpio: pkgs/tools/archivers/cpio/default.nix. - The simplest possible package. The generic builder in - stdenv does everything for you. It has - no dependencies beyond stdenv. + GNU Hello: pkgs/applications/misc/hello/ex-2/default.nix. + Trivial package, which specifies some meta + attributes which is good practice. - GNU Hello: pkgs/applications/misc/hello/ex-2/default.nix. - Also trivial, but it specifies some meta - attributes which is good practice. + GNU cpio: pkgs/tools/archivers/cpio/default.nix. + Also a simple package. The generic builder in + stdenv does everything for you. It has + no dependencies beyond stdenv. diff --git a/nixos/doc/manual/development/writing-modules.xml b/nixos/doc/manual/development/writing-modules.xml index 9cf29e5dc57..a699e74e5f6 100644 --- a/nixos/doc/manual/development/writing-modules.xml +++ b/nixos/doc/manual/development/writing-modules.xml @@ -158,7 +158,7 @@ let locatedb = "/var/cache/locatedb"; in script = '' mkdir -m 0755 -p $(dirname ${locatedb}) - exec updatedb --localuser=nobody --output=${locatedb} --prunepaths='/tmp /var/tmp /media /run' + exec updatedb --localuser=nobody --output=${locatedb} --prunepaths='/tmp /var/tmp /run' ''; }; @@ -172,4 +172,4 @@ let locatedb = "/var/cache/locatedb"; in - \ No newline at end of file + diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml index 0af85374566..0b7750b0591 100644 --- a/nixos/doc/manual/release-notes/rl-unstable.xml +++ b/nixos/doc/manual/release-notes/rl-unstable.xml @@ -171,6 +171,13 @@ nix-env -f "<nixpkgs>" -iA haskellPackages.cabal-install + + + The phpfpm is now using the default PHP version + (pkgs.php) instead of PHP 5.4 (pkgs.php54). + + + diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index a2dbe31e0d8..187ea7635eb 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -70,7 +70,7 @@ my @attrs = (); my @kernelModules = (); my @initrdKernelModules = (); my @modulePackages = (); -my @imports = (""); +my @imports; sub debug { @@ -245,6 +245,18 @@ if ($virt eq "qemu" || $virt eq "kvm" || $virt eq "bochs") { } +# Pull in NixOS configuration for containers. +if ($virt eq "systemd-nspawn") { + push @attrs, "boot.isContainer = true;"; +} + + +# Provide firmware for devices that are not detected by this script, +# unless we're in a VM/container. +push @imports, "" + if $virt eq "none"; + + # For a device name like /dev/sda1, find a more stable path like # /dev/disk/by-uuid/X or /dev/disk/by-label/Y. sub findStableDevPath { @@ -459,14 +471,14 @@ if ($showHardwareConfig) { if ($force || ! -e $fn) { print STDERR "writing $fn...\n"; - my $bootloaderConfig; + my $bootloaderConfig = ""; if (-e "/sys/firmware/efi/efivars") { $bootLoaderConfig = < http://get.adobe.com/flashplayer/ - version = "11.2.202.481"; + version = "11.2.202.491"; src = if stdenv.system == "x86_64-linux" then @@ -47,7 +47,7 @@ let else rec { inherit version; url = "http://fpdownload.adobe.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz"; - sha256 = "151di671xqywjif3v4hbsfw55jyd5x5qjq2zc92xw367pssi29yz"; + sha256 = "150zlnkq8jhhphfmyzdrpgi1y2sniqgx0a5ij994in3gvari9gpl"; } else if stdenv.system == "i686-linux" then if debug then @@ -60,7 +60,7 @@ let else rec { inherit version; url = "http://fpdownload.adobe.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz"; - sha256 = "05ydrw1ykp49b409bkpvizhf1bz1xmfxa7alfdnabvg90vkfvyvn"; + sha256 = "0lwff46gjazjv04fpck0nhv47b4z1x79n09q5444npm1w5zjfgxy"; } else throw "Flash Player is not supported on this platform"; diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index fed8f8ad31f..a96d0f9cc67 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages, makeWrapper, nettools, libtorrentRasterbar +{ stdenv, fetchurl, pythonPackages, makeWrapper, nettools, libtorrentRasterbar, imagemagick , enablePlayer ? false, vlc ? null }: @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { pythonPackages.python pythonPackages.wrapPython makeWrapper + imagemagick ]; pythonPath = [ @@ -36,6 +37,7 @@ stdenv.mkDerivation rec { installPhase = '' + find . -name '*.png' -exec convert -strip {} {} \; # Nasty hack; call wrapPythonPrograms to set program_PYTHONPATH. wrapPythonPrograms diff --git a/pkgs/applications/networking/znc/1.4.nix b/pkgs/applications/networking/znc/1.4.nix new file mode 100644 index 00000000000..fdd02aac0b5 --- /dev/null +++ b/pkgs/applications/networking/znc/1.4.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, openssl, pkgconfig +, withPerl ? false, perl +, withPython ? false, python3 +, withTcl ? false, tcl +, withCyrus ? true, cyrus_sasl +}: + +with stdenv.lib; +stdenv.mkDerivation rec { + name = "znc-1.4"; + + src = fetchurl { + url = "http://znc.in/releases/${name}.tar.gz"; + sha256 = "0lkv58pq4d5lzcyx8v8anzinx0sx0zw0js4jij13jb8qxp88zsc6"; + }; + + buildInputs = [ openssl pkgconfig ] + ++ optional withPerl perl + ++ optional withPython python3 + ++ optional withTcl tcl + ++ optional withCyrus cyrus_sasl; + + configureFlags = optionalString withPerl "--enable-perl " + + optionalString withPython "--enable-python " + + optionalString withTcl "--enable-tcl --with-tcl=${tcl}/lib " + + optionalString withCyrus "--enable-cyrus "; + + meta = with stdenv.lib; { + description = "Advanced IRC bouncer"; + homepage = http://wiki.znc.in/ZNC; + maintainers = with maintainers; [ viric ]; + license = licenses.asl20; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index 1a5b1f92276..36c3b7e899d 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, gtk, gperf, pkgconfig, bzip2, tcl, tk, judy, xz}: stdenv.mkDerivation rec { - name = "gtkwave-3.3.64"; + name = "gtkwave-3.3.66"; src = fetchurl { url = "mirror://sourceforge/gtkwave/${name}.tar.gz"; - sha256 = "05bisdh82rsbs0pj0687dzbp0s30p3wzq4gypb9bbjaxwnrmdsfs"; + sha256 = "17mrmgr6zzl1x1qml0wmjjhcbw7bg3w4mqy60rsy0z6gxd8hikh4"; }; buildInputs = [ gtk gperf pkgconfig bzip2 tcl tk judy xz ]; diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 1f5e92da88a..2f6a4d36327 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -153,7 +153,12 @@ rec { imagemagick = [ http://www.imagemagick.org/download/ ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ # also contains older versions removed from most mirrors + http://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ ftp://ftp.imagemagick.org/pub/ImageMagick/ + http://ftp.fifi.org/ImageMagick/ + ftp://ftp.fifi.org/ImageMagick/ + http://imagemagick.mirrorcatalogs.com/ + ftp://imagemagick.mirrorcatalogs.com/imagemagick ]; # CPAN mirrors. diff --git a/pkgs/desktops/plasma-5.3/default.nix b/pkgs/desktops/plasma-5.3/default.nix index c9e26f7264c..f9026b5843a 100644 --- a/pkgs/desktops/plasma-5.3/default.nix +++ b/pkgs/desktops/plasma-5.3/default.nix @@ -124,8 +124,8 @@ let } // # packages from nixpkgs (with pkgs; { - inherit attr bash cairo cmake dbus epoxy exiv2 ffmpeg freetype - glib gnugrep gnused gtk2 gtk3 libinput libssh + inherit attr bash cairo cmake coreutils dbus epoxy exiv2 ffmpeg + freetype glib gnugrep gnused gtk2 gtk3 libinput libssh modemmanager openconnect openexr pam pango qt4 samba socat substituteAll taglib utillinux wayland xapian xkeyboard_config xlibs xorg; @@ -233,7 +233,7 @@ let patches = [ ./plasma-workspace/0001-startkde-NixOS-patches.patch ]; buildInputs = with scope.xlibs; [ libSM libXcursor scope.pam ]; - inherit (scope) bash gnused gnugrep socat; + inherit (scope) bash coreutils gnused gnugrep socat; inherit (scope) kconfig kinit kservice qt5tools; inherit (scope.xorg) mkfontdir xmessage xprop xrdb xset xsetroot; dbus_tools = scope.dbus.tools; diff --git a/pkgs/desktops/plasma-5.3/packages.json b/pkgs/desktops/plasma-5.3/packages.json index 22f7c05de5a..ea8c47a4678 100644 --- a/pkgs/desktops/plasma-5.3/packages.json +++ b/pkgs/desktops/plasma-5.3/packages.json @@ -8,11 +8,11 @@ "propagatedBuildInputs": [ "qt5core" ], - "name": "bluez-qt-5.3.1", + "name": "bluez-qt-5.3.2", "src": { - "url": "stable/plasma/5.3.1/bluez-qt-5.3.1.tar.xz", - "name": "bluez-qt-5.3.1.tar.xz", - "sha256": "13i5ybmkf6xg49jh5fbbayxg3gp5h8g1gayc0mdc4cwzx1v6g70l" + "url": "stable/plasma/5.3.2/bluez-qt-5.3.2.tar.xz", + "name": "bluez-qt-5.3.2.tar.xz", + "sha256": "0bc9pi8zbfh66h3p9i76hq1jh7ygavax3zw2wygl269f1k92brlh" }, "buildInputs": [ "ecm", @@ -32,11 +32,11 @@ "propagatedNativeBuildInputs": [], "propagatedUserEnvPkgs": [], "propagatedBuildInputs": [], - "name": "kmenuedit-5.3.1", + "name": "kmenuedit-5.3.2", "src": { - "url": "stable/plasma/5.3.1/kmenuedit-5.3.1.tar.xz", - "name": "kmenuedit-5.3.1.tar.xz", - "sha256": "0vyy3xb32nb2qxfv3qvrrzlnck6gas0gwyncbn4rzimaygm2vzqz" + "url": "stable/plasma/5.3.2/kmenuedit-5.3.2.tar.xz", + "name": "kmenuedit-5.3.2.tar.xz", + "sha256": "13nsjh698h09ai6b7r8zi2hlkkxfv8c00b5b6dl0pb2b474a16di" }, "buildInputs": [ "ecm", @@ -62,11 +62,11 @@ "propagatedNativeBuildInputs": [], "propagatedUserEnvPkgs": [], "propagatedBuildInputs": [], - "name": "plasma-nm-5.3.1", + "name": "plasma-nm-5.3.2", "src": { - "url": "stable/plasma/5.3.1/plasma-nm-5.3.1.tar.xz", - "name": "plasma-nm-5.3.1.tar.xz", - "sha256": "0jgrz9j2228aya7n1dg4npicsbgv93f8n80b9yjax8mrd6qhq55k" + "url": "stable/plasma/5.3.2/plasma-nm-5.3.2.tar.xz", + "name": "plasma-nm-5.3.2.tar.xz", + "sha256": "0w3cs66rn7k4fzsr7qihzcgxjwmp2safnfr78lp69md59clc45ag" }, "buildInputs": [ "ecm", @@ -112,11 +112,11 @@ "propagatedNativeBuildInputs": [], "propagatedUserEnvPkgs": [], "propagatedBuildInputs": [], - "name": "khotkeys-5.3.1", + "name": "khotkeys-5.3.2", "src": { - "url": "stable/plasma/5.3.1/khotkeys-5.3.1.tar.xz", - "name": "khotkeys-5.3.1.tar.xz", - "sha256": "11mzrjzk2j9x32mg77d2al19b4iin0rfxs710mhsjbgriq144smv" + "url": "stable/plasma/5.3.2/khotkeys-5.3.2.tar.xz", + "name": "khotkeys-5.3.2.tar.xz", + "sha256": "0f7z6vwkmi54jbvvqgyxn1mvh1gjwmrihj3afd4w7zd4cbyf61ka" }, "buildInputs": [ "ecm", @@ -142,11 +142,11 @@ "propagatedNativeBuildInputs": [], "propagatedUserEnvPkgs": [], "propagatedBuildInputs": [], - "name": "plasma-workspace-wallpapers-5.3.1", + "name": "plasma-workspace-wallpapers-5.3.2", "src": { - "url": "stable/plasma/5.3.1/plasma-workspace-wallpapers-5.3.1.tar.xz", - "name": "plasma-workspace-wallpapers-5.3.1.tar.xz", - "sha256": "1y6gdzs0qxiw4hl9r6v3blcm8gq61wapagn6sj5ixagvwlhf2w5y" + "url": "stable/plasma/5.3.2/plasma-workspace-wallpapers-5.3.2.tar.xz", + "name": "plasma-workspace-wallpapers-5.3.2.tar.xz", + "sha256": "1h3w824dv5yyjz6l9vsi6lddlb5xxmmaqdvvacz7qypy06f808aa" }, "buildInputs": [ "ecm" @@ -159,11 +159,11 @@ "propagatedNativeBuildInputs": [], "propagatedUserEnvPkgs": [], "propagatedBuildInputs": [], - "name": "kscreen-5.3.1", + "name": "kscreen-5.3.2", "src": { - "url": "stable/plasma/5.3.1/kscreen-5.3.1.tar.xz", - "name": "kscreen-5.3.1.tar.xz", - "sha256": "008ys3glpvpcvjh7n2gls3m13q9qswmnc5l2lz4zs1dvcrk5z7yr" + "url": "stable/plasma/5.3.2/kscreen-5.3.2.tar.xz", + "name": "kscreen-5.3.2.tar.xz", + "sha256": "15dnraav3sn5rcz88nj3h6n95w4jiynn45n29pfv7yc3p41yahwd" }, "buildInputs": [ "ecm", @@ -187,11 +187,11 @@ "propagatedNativeBuildInputs": [], "propagatedUserEnvPkgs": [], "propagatedBuildInputs": [], - "name": "oxygen-fonts-5.3.1", + "name": "oxygen-fonts-5.3.2", "src": { - "url": "stable/plasma/5.3.1/oxygen-fonts-5.3.1.tar.xz", - "name": "oxygen-fonts-5.3.1.tar.xz", - "sha256": "0zp81c4s0xvr1d0nvlssk3k3456farz157sqnjvgbsarxnzmgppv" + "url": "stable/plasma/5.3.2/oxygen-fonts-5.3.2.tar.xz", + "name": "oxygen-fonts-5.3.2.tar.xz", + "sha256": "0x78fbllqd8ssxlr2d0xy76pvr4v6f5xans4mvr3f3aa6xhr05ya" }, "buildInputs": [ "ecm" @@ -204,11 +204,11 @@ "propagatedNativeBuildInputs": [], "propagatedUserEnvPkgs": [], "propagatedBuildInputs": [], - "name": "breeze-5.3.1", + "name": "breeze-5.3.2", "src": { - "url": "stable/plasma/5.3.1/breeze-5.3.1.tar.xz", - "name": "breeze-5.3.1.tar.xz", - "sha256": "0sh7vgg3dz0cs6mqs4c3ygw5qg4lcjm0vdh4mm4xfxnizagkqrr5" + "url": "stable/plasma/5.3.2/breeze-5.3.2.tar.xz", + "name": "breeze-5.3.2.tar.xz", + "sha256": "0rnw5cblz6rdcx4n6x2wwr0blrk2xlkkq1gsbr06c969hp9gq4iy" }, "buildInputs": [ "ecm", @@ -239,11 +239,11 @@ "propagatedNativeBuildInputs": [], "propagatedUserEnvPkgs": [], "propagatedBuildInputs": [], - "name": "oxygen-5.3.1", + "name": "oxygen-5.3.2", "src": { - "url": "stable/plasma/5.3.1/oxygen-5.3.1.tar.xz", - "name": "oxygen-5.3.1.tar.xz", - "sha256": "03b8rxgspkv5p8mfb53v92bi62cqp7rcma2fjarmgw4ri5w6cwx9" + "url": "stable/plasma/5.3.2/oxygen-5.3.2.tar.xz", + "name": "oxygen-5.3.2.tar.xz", + "sha256": "19z18n7zq8616r1dwvnw0s73wxh114d3z952x3p3z42dhl0lkrw0" }, "buildInputs": [ "ecm", @@ -278,11 +278,11 @@ "propagatedBuildInputs": [ "kf5sysguard" ], - "name": "plasma-workspace-5.3.1", + "name": "plasma-workspace-5.3.2", "src": { - "url": "stable/plasma/5.3.1/plasma-workspace-5.3.1.tar.xz", - "name": "plasma-workspace-5.3.1.tar.xz", - "sha256": "1cjg8rhwhm015fg36idn4shddcy6sjnb4y0x9vmxbsdvfx2nnhr1" + "url": "stable/plasma/5.3.2/plasma-workspace-5.3.2.tar.xz", + "name": "plasma-workspace-5.3.2.tar.xz", + "sha256": "1i2lz9acxl63nd6nlvgvnv7lm3nq4bvj2kyj2lmd97f5xx3sara1" }, "buildInputs": [ "dbusmenu-qt5", @@ -351,11 +351,11 @@ "propagatedNativeBuildInputs": [], "propagatedUserEnvPkgs": [], "propagatedBuildInputs": [], - "name": "kwrited-5.3.1", + "name": "kwrited-5.3.2", "src": { - "url": "stable/plasma/5.3.1/kwrited-5.3.1.tar.xz", - "name": "kwrited-5.3.1.tar.xz", - "sha256": "0qivfycr4ak5zsplnzv968sya2rc3vz9z6h8gv4b2scf99zjp2g8" + "url": "stable/plasma/5.3.2/kwrited-5.3.2.tar.xz", + "name": "kwrited-5.3.2.tar.xz", + "sha256": "1h499rpp7jss5vikapm1247xn1bg5axq4bwwfr6frlyq03vcpga1" }, "buildInputs": [ "ecm", @@ -378,11 +378,11 @@ "propagatedBuildInputs": [ "qt5core" ], - "name": "plasma-desktop-5.3.1", + "name": "plasma-desktop-5.3.2", "src": { - "url": "stable/plasma/5.3.1/plasma-desktop-5.3.1.tar.xz", - "name": "plasma-desktop-5.3.1.tar.xz", - "sha256": "079v2pbpgn1gr03l3qcxk3rsgbip318xpjbni4vxf08fhsh1ixlp" + "url": "stable/plasma/5.3.2/plasma-desktop-5.3.2.tar.xz", + "name": "plasma-desktop-5.3.2.tar.xz", + "sha256": "190g0nmm97a0403nvyp1478fpk8r3d7jkxpg0mif9nvws25qfvz1" }, "buildInputs": [ "boost", @@ -457,11 +457,11 @@ "propagatedNativeBuildInputs": [], "propagatedUserEnvPkgs": [], "propagatedBuildInputs": [], - "name": "systemsettings-5.3.1", + "name": "systemsettings-5.3.2", "src": { - "url": "stable/plasma/5.3.1/systemsettings-5.3.1.tar.xz", - "name": "systemsettings-5.3.1.tar.xz", - "sha256": "06m3r31dr0ivhn25fg0sg8pbxyzvm8slsmqkqsm4cbypg028axx0" + "url": "stable/plasma/5.3.2/systemsettings-5.3.2.tar.xz", + "name": "systemsettings-5.3.2.tar.xz", + "sha256": "0lgl15hfr3na3v1dry8r5bd7z3d8jlrzh6a3avq9l9297lwfgaxd" }, "buildInputs": [ "ecm", @@ -491,11 +491,11 @@ "propagatedBuildInputs": [ "qt5core" ], - "name": "libkscreen-5.3.1", + "name": "libkscreen-5.3.2", "src": { - "url": "stable/plasma/5.3.1/libkscreen-5.3.1.tar.xz", - "name": "libkscreen-5.3.1.tar.xz", - "sha256": "00g401yfiyqh09ajkinlkzhfpb7lsy0wpnrk1ba8vm4wmcvkp63l" + "url": "stable/plasma/5.3.2/libkscreen-5.3.2.tar.xz", + "name": "libkscreen-5.3.2.tar.xz", + "sha256": "1k6j4nxy41d2jgwydi0ah2v0idn6zhb1lmxziyrcshqpklhwiff2" }, "buildInputs": [ "doxygen", @@ -517,11 +517,11 @@ "propagatedNativeBuildInputs": [], "propagatedUserEnvPkgs": [], "propagatedBuildInputs": [], - "name": "plasma-sdk-5.3.1", + "name": "plasma-sdk-5.3.2", "src": { - "url": "stable/plasma/5.3.1/plasma-sdk-5.3.1.tar.xz", - "name": "plasma-sdk-5.3.1.tar.xz", - "sha256": "157742d7wm21y4g7gs0483jd4sd6q2a0ppyk3mr544nagydvpqfs" + "url": "stable/plasma/5.3.2/plasma-sdk-5.3.2.tar.xz", + "name": "plasma-sdk-5.3.2.tar.xz", + "sha256": "13vkxbayxggj4bx1l40rspck59j4l736gr5hg0sd1j7hmlwcys2z" }, "buildInputs": [ "activeapp", @@ -570,11 +570,11 @@ "propagatedNativeBuildInputs": [], "propagatedUserEnvPkgs": [], "propagatedBuildInputs": [], - "name": "kwin-5.3.1", + "name": "kwin-5.3.2", "src": { - "url": "stable/plasma/5.3.1/kwin-5.3.1.tar.xz", - "name": "kwin-5.3.1.tar.xz", - "sha256": "04bxf45lcbmnl8fks1k6j6i0sk7x5abzhmyrziliz2yx5kyi4m36" + "url": "stable/plasma/5.3.2/kwin-5.3.2.tar.xz", + "name": "kwin-5.3.2.tar.xz", + "sha256": "0p2pf6aq9zy0l4f7px2p0wj1kfgax8qjmal6yn3mifx1al244xvz" }, "buildInputs": [ "ecm", @@ -633,11 +633,11 @@ "propagatedNativeBuildInputs": [], "propagatedUserEnvPkgs": [], "propagatedBuildInputs": [], - "name": "kdeplasma-addons-5.3.1", + "name": "kdeplasma-addons-5.3.2", "src": { - "url": "stable/plasma/5.3.1/kdeplasma-addons-5.3.1.tar.xz", - "name": "kdeplasma-addons-5.3.1.tar.xz", - "sha256": "1myk3508jqgalyqa1rlx1dq5afppvhvsnd7irf4wywpgls20nwnv" + "url": "stable/plasma/5.3.2/kdeplasma-addons-5.3.2.tar.xz", + "name": "kdeplasma-addons-5.3.2.tar.xz", + "sha256": "08k3736ssir41r37y3f6bdf52l1whkr7q5qc2rfhbzm6c9lhqvn4" }, "buildInputs": [ "ecm", @@ -686,11 +686,11 @@ "propagatedNativeBuildInputs": [], "propagatedUserEnvPkgs": [], "propagatedBuildInputs": [], - "name": "sddm-kcm-5.3.1", + "name": "sddm-kcm-5.3.2", "src": { - "url": "stable/plasma/5.3.1/sddm-kcm-5.3.1.tar.xz", - "name": "sddm-kcm-5.3.1.tar.xz", - "sha256": "16viwz7b8s77g5fqw7g7asrrk44fif4fmmif7g3bkmq7rncd3hw9" + "url": "stable/plasma/5.3.2/sddm-kcm-5.3.2.tar.xz", + "name": "sddm-kcm-5.3.2.tar.xz", + "sha256": "17pk95xqr08gjn16i4gs7gnp2ksc6082myywdarywf66nz4whind" }, "buildInputs": [ "ecm", @@ -720,11 +720,11 @@ "propagatedNativeBuildInputs": [], "propagatedUserEnvPkgs": [], "propagatedBuildInputs": [], - "name": "khelpcenter-5.3.1", + "name": "khelpcenter-5.3.2", "src": { - "url": "stable/plasma/5.3.1/khelpcenter-5.3.1.tar.xz", - "name": "khelpcenter-5.3.1.tar.xz", - "sha256": "0dik353w6ri6mfkvkz3v5xva6x59zlbz1sj522li0gbd73x4bzf2" + "url": "stable/plasma/5.3.2/khelpcenter-5.3.2.tar.xz", + "name": "khelpcenter-5.3.2.tar.xz", + "sha256": "1nd4kj4zhw21lfdj6yrmww2rx629mia5w0fb769y5wdas82w9wb3" }, "buildInputs": [ "ecm", @@ -747,11 +747,11 @@ "propagatedNativeBuildInputs": [], "propagatedUserEnvPkgs": [], "propagatedBuildInputs": [], - "name": "bluedevil-5.3.1", + "name": "bluedevil-5.3.2", "src": { - "url": "stable/plasma/5.3.1/bluedevil-5.3.1.tar.xz", - "name": "bluedevil-5.3.1.tar.xz", - "sha256": "050hpiifrhm2vzab527anfncdf04cikz5149iabz3aflxcvabqpl" + "url": "stable/plasma/5.3.2/bluedevil-5.3.2.tar.xz", + "name": "bluedevil-5.3.2.tar.xz", + "sha256": "0pdm4fpr4piaqd52nbyv3plib4z6y9dr7qgbh1cfk3bzfwi1jwn8" }, "buildInputs": [ "ecm", @@ -782,11 +782,11 @@ "propagatedNativeBuildInputs": [], "propagatedUserEnvPkgs": [], "propagatedBuildInputs": [], - "name": "ksysguard-5.3.1", + "name": "ksysguard-5.3.2", "src": { - "url": "stable/plasma/5.3.1/ksysguard-5.3.1.tar.xz", - "name": "ksysguard-5.3.1.tar.xz", - "sha256": "1z1qgf5qskzf4r524lf75pdyw7gdwrx2yr8nac9622hvgrfh7yhj" + "url": "stable/plasma/5.3.2/ksysguard-5.3.2.tar.xz", + "name": "ksysguard-5.3.2.tar.xz", + "sha256": "1vf2gdihrvfjrlkg5dmpg9f5yqgxawqa2cf8h9f96n2n0cd46gq7" }, "buildInputs": [ "ecm", @@ -817,11 +817,11 @@ "qt5core", "xapian" ], - "name": "baloo-5.9.1", + "name": "baloo-5.9.2", "src": { - "url": "stable/plasma/5.3.1/baloo-5.9.1.tar.xz", - "name": "baloo-5.9.1.tar.xz", - "sha256": "0wx9n3l4f1ibddvhbiharhgd20s8hzs64b2c0686bm82qmbkkl7n" + "url": "stable/plasma/5.3.2/baloo-5.9.2.tar.xz", + "name": "baloo-5.9.2.tar.xz", + "sha256": "1rhrdri90xb4g23x92nv72x19lxrdzkzc16w5ivbglrnq5ipga8w" }, "buildInputs": [ "ecm", @@ -852,11 +852,11 @@ "propagatedNativeBuildInputs": [], "propagatedUserEnvPkgs": [], "propagatedBuildInputs": [], - "name": "kde-cli-tools-5.3.1", + "name": "kde-cli-tools-5.3.2", "src": { - "url": "stable/plasma/5.3.1/kde-cli-tools-5.3.1.tar.xz", - "name": "kde-cli-tools-5.3.1.tar.xz", - "sha256": "0x4k3yi4qccvfp4ia75alihcivk4slwsx8i0wdb00qjl1nj7jbc1" + "url": "stable/plasma/5.3.2/kde-cli-tools-5.3.2.tar.xz", + "name": "kde-cli-tools-5.3.2.tar.xz", + "sha256": "1ac36rhffw85yzck4mqj1l4yj20g6yrjxi40vrkakln5j26vxb3x" }, "buildInputs": [ "ecm", @@ -884,11 +884,11 @@ "propagatedNativeBuildInputs": [], "propagatedUserEnvPkgs": [], "propagatedBuildInputs": [], - "name": "milou-5.3.1", + "name": "milou-5.3.2", "src": { - "url": "stable/plasma/5.3.1/milou-5.3.1.tar.xz", - "name": "milou-5.3.1.tar.xz", - "sha256": "17xw62pngq3bb7vkbkn8c099ivsf1xmns0f65v7j112yqpz33b8a" + "url": "stable/plasma/5.3.2/milou-5.3.2.tar.xz", + "name": "milou-5.3.2.tar.xz", + "sha256": "1wlnis5ph7vxg7wj410qs8qvdc2b0s8ji1vgqpv0g19zhkph95kw" }, "buildInputs": [ "ecm", @@ -915,11 +915,11 @@ "propagatedNativeBuildInputs": [], "propagatedUserEnvPkgs": [], "propagatedBuildInputs": [], - "name": "powerdevil-5.3.1", + "name": "powerdevil-5.3.2", "src": { - "url": "stable/plasma/5.3.1/powerdevil-5.3.1.tar.xz", - "name": "powerdevil-5.3.1.tar.xz", - "sha256": "07kcqd7qzblapxnwczfdj4vwb8s6s8mp7qhl4mb663f2a0z6fn8l" + "url": "stable/plasma/5.3.2/powerdevil-5.3.2.tar.xz", + "name": "powerdevil-5.3.2.tar.xz", + "sha256": "1zyfqi9qppra2hw0i18wil1xym84pgqdgmh9yn577c778grr4kgk" }, "buildInputs": [ "ecm", @@ -959,11 +959,11 @@ "qt5network", "qt5widgets" ], - "name": "libksysguard-5.3.1", + "name": "libksysguard-5.3.2", "src": { - "url": "stable/plasma/5.3.1/libksysguard-5.3.1.tar.xz", - "name": "libksysguard-5.3.1.tar.xz", - "sha256": "115iwqq4y6pnhqsa5yn30q6wdpad5v48m7hjrn7jbpm3gsiwq1ym" + "url": "stable/plasma/5.3.2/libksysguard-5.3.2.tar.xz", + "name": "libksysguard-5.3.2.tar.xz", + "sha256": "137dr7p4q3aldm7fs2rldchq4d3irij4rpqc3c799blrgmdrp98p" }, "buildInputs": [ "ecm", @@ -998,11 +998,11 @@ "propagatedNativeBuildInputs": [], "propagatedUserEnvPkgs": [], "propagatedBuildInputs": [], - "name": "plasma-mediacenter-5.3.1", + "name": "plasma-mediacenter-5.3.2", "src": { - "url": "stable/plasma/5.3.1/plasma-mediacenter-5.3.1.tar.xz", - "name": "plasma-mediacenter-5.3.1.tar.xz", - "sha256": "0h8dpyszn7hk7b1y1m9qb83gzjnp8ymslpranxdan36r5bm2ayd8" + "url": "stable/plasma/5.3.2/plasma-mediacenter-5.3.2.tar.xz", + "name": "plasma-mediacenter-5.3.2.tar.xz", + "sha256": "0nlkzhyfi87k2r567h0hdlj1a9115mwxac55yjg7j3bpm7jr36g6" }, "buildInputs": [ "ecm", @@ -1041,11 +1041,11 @@ "propagatedBuildInputs": [ "qt5core" ], - "name": "kfilemetadata-5.9.1", + "name": "kfilemetadata-5.9.2", "src": { - "url": "stable/plasma/5.3.1/kfilemetadata-5.9.1.tar.xz", - "name": "kfilemetadata-5.9.1.tar.xz", - "sha256": "02gffgwbic4h8zdknp32cczplw3cc9ahg483aa3frhhgvgvrq8hs" + "url": "stable/plasma/5.3.2/kfilemetadata-5.9.2.tar.xz", + "name": "kfilemetadata-5.9.2.tar.xz", + "sha256": "070m5v54birqwh8cmik6n80nbcfjh38lay4w5i3ic0hqj6as2n89" }, "buildInputs": [ "ecm", @@ -1070,11 +1070,11 @@ "propagatedNativeBuildInputs": [], "propagatedUserEnvPkgs": [], "propagatedBuildInputs": [], - "name": "kde-gtk-config-5.3.1", + "name": "kde-gtk-config-5.3.2", "src": { - "url": "stable/plasma/5.3.1/kde-gtk-config-5.3.1.tar.xz", - "name": "kde-gtk-config-5.3.1.tar.xz", - "sha256": "1frykdckgrfbiyjshdkjv6hp8mrpfz3g461w6snb65yly02qjb5l" + "url": "stable/plasma/5.3.2/kde-gtk-config-5.3.2.tar.xz", + "name": "kde-gtk-config-5.3.2.tar.xz", + "sha256": "0rw4yv8svbjnv06pqva81m9xvpl75bvka53kckz0nqi6v96rdg2m" }, "buildInputs": [ "ecm", @@ -1103,11 +1103,11 @@ "propagatedBuildInputs": [ "qt5gui" ], - "name": "kwayland-5.3.1", + "name": "kwayland-5.3.2", "src": { - "url": "stable/plasma/5.3.1/kwayland-5.3.1.tar.xz", - "name": "kwayland-5.3.1.tar.xz", - "sha256": "1vsdsf00py6i16zwbwpplq1v7m3fy1j0dskvkb080wm0fskz1r8f" + "url": "stable/plasma/5.3.2/kwayland-5.3.2.tar.xz", + "name": "kwayland-5.3.2.tar.xz", + "sha256": "1z8k3vhrbfmnbaaji2akzgqvwm990cqk1jqd3crgzv26pbhinvci" }, "buildInputs": [ "ecm", @@ -1132,11 +1132,11 @@ "propagatedNativeBuildInputs": [], "propagatedUserEnvPkgs": [], "propagatedBuildInputs": [], - "name": "ksshaskpass-5.3.1", + "name": "ksshaskpass-5.3.2", "src": { - "url": "stable/plasma/5.3.1/ksshaskpass-5.3.1.tar.xz", - "name": "ksshaskpass-5.3.1.tar.xz", - "sha256": "0ids7vbi46bdd5dbjgv0wfv4rfv03kpln5vr3rwavah892q1dad2" + "url": "stable/plasma/5.3.2/ksshaskpass-5.3.2.tar.xz", + "name": "ksshaskpass-5.3.2.tar.xz", + "sha256": "1v4p02141pd7xkyfxmhf7lf5385krri2zdh3vb90d8pr802mv3g7" }, "buildInputs": [ "ecm", @@ -1157,11 +1157,11 @@ "propagatedNativeBuildInputs": [], "propagatedUserEnvPkgs": [], "propagatedBuildInputs": [], - "name": "kinfocenter-5.3.1", + "name": "kinfocenter-5.3.2", "src": { - "url": "stable/plasma/5.3.1/kinfocenter-5.3.1.tar.xz", - "name": "kinfocenter-5.3.1.tar.xz", - "sha256": "02gqlidh9pb924vhhaxnidpjz3cb32r6icikhcv7csrll13wgp1a" + "url": "stable/plasma/5.3.2/kinfocenter-5.3.2.tar.xz", + "name": "kinfocenter-5.3.2.tar.xz", + "sha256": "1w8q9xq2rl1g8axf7n7l7cq49ahhw0r1zc0sdgv4409k5iwsrikr" }, "buildInputs": [ "ecm", @@ -1203,11 +1203,11 @@ "propagatedNativeBuildInputs": [], "propagatedUserEnvPkgs": [], "propagatedBuildInputs": [], - "name": "polkit-kde-agent-1-5.3.1", + "name": "polkit-kde-agent-1-5.3.2", "src": { - "url": "stable/plasma/5.3.1/polkit-kde-agent-1-5.3.1.tar.xz", - "name": "polkit-kde-agent-1-5.3.1.tar.xz", - "sha256": "01ragaa1r144g25kqdc157d7lbq69cclanaljgwkvs2mn0ib031c" + "url": "stable/plasma/5.3.2/polkit-kde-agent-1-5.3.2.tar.xz", + "name": "polkit-kde-agent-1-5.3.2.tar.xz", + "sha256": "0khbkgd3s0b2xl062rcxqimym8f3c9y6xadl5av27d4d78ayqmfn" }, "buildInputs": [ "ecm", @@ -1237,11 +1237,11 @@ "propagatedBuildInputs": [ "qt5gui" ], - "name": "kdecoration-5.3.1", + "name": "kdecoration-5.3.2", "src": { - "url": "stable/plasma/5.3.1/kdecoration-5.3.1.tar.xz", - "name": "kdecoration-5.3.1.tar.xz", - "sha256": "19qxz5ivrjq9a1shk7mjin0r9v37g33l762nf7lb1xf29y13mhsn" + "url": "stable/plasma/5.3.2/kdecoration-5.3.2.tar.xz", + "name": "kdecoration-5.3.2.tar.xz", + "sha256": "192infj8s4rd3jwiy8fcvbg265zvng4xbmwj7a3bqz4h9jcrjc7v" }, "buildInputs": [ "ecm", @@ -1259,11 +1259,11 @@ "propagatedNativeBuildInputs": [], "propagatedUserEnvPkgs": [], "propagatedBuildInputs": [], - "name": "kio-extras-5.3.1", + "name": "kio-extras-5.3.2", "src": { - "url": "stable/plasma/5.3.1/kio-extras-5.3.1.tar.xz", - "name": "kio-extras-5.3.1.tar.xz", - "sha256": "1m1gc0m9xhapnchiicsn93spylczkggj8c79ixgk99b1ha7vbc87" + "url": "stable/plasma/5.3.2/kio-extras-5.3.2.tar.xz", + "name": "kio-extras-5.3.2.tar.xz", + "sha256": "1vfp203mmpqvwa9dqkkpgz9rgk07f11pwhg5drvkw03azi9hbjbw" }, "buildInputs": [ "ecm", @@ -1308,11 +1308,11 @@ "propagatedNativeBuildInputs": [], "propagatedUserEnvPkgs": [], "propagatedBuildInputs": [], - "name": "muon-5.3.1", + "name": "muon-5.3.2", "src": { - "url": "stable/plasma/5.3.1/muon-5.3.1.tar.xz", - "name": "muon-5.3.1.tar.xz", - "sha256": "0k2c625d9i5gyyvdzlajkb0kcvss60lhs7qssil1a4w34ch3zfmk" + "url": "stable/plasma/5.3.2/muon-5.3.2.tar.xz", + "name": "muon-5.3.2.tar.xz", + "sha256": "0c2c94yirfrkcxp30gf77xzy9gmgznx0kkhn93idggdhc4qdyf9z" }, "buildInputs": [ "akabeiclient", diff --git a/pkgs/desktops/plasma-5.3/packages.sh b/pkgs/desktops/plasma-5.3/packages.sh index 3c8e0757552..c43c47296d6 100755 --- a/pkgs/desktops/plasma-5.3/packages.sh +++ b/pkgs/desktops/plasma-5.3/packages.sh @@ -12,7 +12,7 @@ alias nix-build="nix-build --no-out-link \"$origin/../../..\"" # The extra slash at the end of the URL is necessary to stop wget # from recursing over the whole server! (No, it's not a bug.) $(nix-build -A autonix.manifest) \ - "${KDE_MIRROR}/stable/plasma/5.3.1/" \ + "${KDE_MIRROR}/stable/plasma/5.3.2/" \ "$@" -A '*.tar.xz' AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellngPackages.autonix-deps-kf5)/bin/kf5-deps"} diff --git a/pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch b/pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch index 86c6dd857be..bef2867f343 100644 --- a/pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch +++ b/pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch @@ -1,14 +1,14 @@ -From ff61c8ba856328a60e29938466b69d0bb38a357f Mon Sep 17 00:00:00 2001 +From f124d2204cff11ae0ff0d6c788d268b746180407 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel -Date: Tue, 2 Jun 2015 11:21:43 -0500 -Subject: [PATCH] startkde: NixOS patches +Date: Sat, 18 Jul 2015 12:13:08 -0500 +Subject: [PATCH] startkde NixOS patches --- - startkde/startkde.cmake | 218 ++++++++++++++++++++---------------------------- - 1 file changed, 89 insertions(+), 129 deletions(-) + startkde/startkde.cmake | 222 ++++++++++++++++++++---------------------------- + 1 file changed, 91 insertions(+), 131 deletions(-) diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake -index 24e5c1b..e7bdd32 100644 +index 6f93108..26cc2fc 100644 --- a/startkde/startkde.cmake +++ b/startkde/startkde.cmake @@ -1,8 +1,31 @@ @@ -62,7 +62,8 @@ index 24e5c1b..e7bdd32 100644 -fi - # Check if a KDE session already is running and whether it's possible to connect to X - kcheckrunning +-kcheckrunning ++@out@/bin/kcheckrunning kcheckrunning_result=$? if test $kcheckrunning_result -eq 0 ; then - echo "KDE seems to be already running on this display." @@ -129,7 +130,8 @@ index 24e5c1b..e7bdd32 100644 - } -fi - - kstartupconfig5 +-kstartupconfig5 ++@out@/bin/kstartupconfig5 returncode=$? if test $returncode -ne 0; then - xmessage -geometry 500x100 "kstartupconfig5 does not exist or fails. The error code is $returncode. Check your installation." @@ -141,7 +143,7 @@ index 24e5c1b..e7bdd32 100644 -if test "$kdeglobals_kscreen_scalefactor" -ne 1; then - export QT_DEVICE_PIXEL_RATIO=$kdeglobals_kscreen_scalefactor -fi -+XCURSOR_PATH=~/.icons:$(echo "$XDG_DATA_DIRS" | tr ":" "\n" | @gnused@/bin/sed 's,$,/icons,g' | tr "\n" ":") ++XCURSOR_PATH=~/.icons:$(echo "$XDG_DATA_DIRS" | @coreutils@/bin/tr ":" "\n" | @gnused@/bin/sed 's,$,/icons,g' | @coreutils@/bin/tr "\n" ":") +export XCURSOR_PATH # XCursor mouse theme needs to be applied here to work even for kded or ksmserver @@ -391,7 +393,7 @@ index 24e5c1b..e7bdd32 100644 for prefix in `echo "$scriptpath"`; do - for file in `ls "$prefix"/shutdown 2> /dev/null | egrep -v '(~|\.bak)$'`; do + for file in `ls "$prefix"/shutdown 2> /dev/null | @gnugrep@/bin/egrep -v '(~|\.bak)$'`; do - test -x "$prefix$file" && "$prefix$file" + test -x "$prefix/shutdown/$file" && "$prefix/shutdown/$file" done done @@ -405,5 +407,5 @@ index 24e5c1b..e7bdd32 100644 echo 'startkde: Done.' 1>&2 -- -2.4.1 +2.4.5 diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a59219786c9..837fa79859d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -619,10 +619,6 @@ self: super: { # https://github.com/jwiegley/simple-conduit/issues/2 simple-conduit = markBroken super.simple-conduit; - # https://github.com/srijs/hwsl2/issues/1 - hwsl2 = markBroken super.hwsl2; - hwsl2-reducers = dontDistribute super.hwsl2-reducers; - # https://code.google.com/p/linux-music-player/issues/detail?id=1 mp = markBroken super.mp; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index de0fdacb3f9..ca7c0f56bc1 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -268,4 +268,8 @@ self: super: { # Inexplicable haddock failure # https://github.com/gregwebs/aeson-applicative/issues/2 aeson-applicative = dontHaddock super.aeson-applicative; + + # GHC 7.10.1 is affected by https://github.com/srijs/hwsl2/issues/1. + hwsl2 = dontCheck super.hwsl2; + } diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index c0505d6e3c6..2af3d964619 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -6,9 +6,9 @@ , version, revision ? null , sha256 ? null , src ? fetchurl { url = "mirror://hackage/${pname}-${version}.tar.gz"; inherit sha256; } -, buildDepends ? [] +, buildDepends ? [], libraryHaskellDepends ? [], executableHaskellDepends ? [] , buildTarget ? "" -, buildTools ? [] +, buildTools ? [], libraryToolDepends ? [], executableToolDepends ? [], testToolDepends ? [] , configureFlags ? [] , description ? "" , doCheck ? stdenv.lib.versionOlder "7.4" ghc.version @@ -19,7 +19,7 @@ , enableSharedLibraries ? ((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version) , enableSplitObjs ? !stdenv.isDarwin # http://hackage.haskell.org/trac/ghc/ticket/4013 , enableStaticLibraries ? true -, extraLibraries ? [] +, extraLibraries ? [], librarySystemDepends ? [], executableSystemDepends ? [] , homepage ? "http://hackage.haskell.org/package/${pname}" , hydraPlatforms ? ghc.meta.hydraPlatforms or ghc.meta.platforms , hyperlinkSource ? true @@ -29,9 +29,9 @@ , maintainers ? [] , doHaddock ? true , passthru ? {} -, pkgconfigDepends ? [] +, pkgconfigDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? [] , platforms ? ghc.meta.platforms -, testDepends ? [] +, testDepends ? [], testHaskellDepends ? [], testSystemDepends ? [] , testTarget ? "" , broken ? false , preUnpack ? "", postUnpack ? "" @@ -84,7 +84,7 @@ let (optionalString (enableSharedExecutables && stdenv.isLinux) "--ghc-option=-optl=-Wl,-rpath=$out/lib/${ghc.name}/${pname}-${version}") (optionalString (enableSharedExecutables && stdenv.isDarwin) "--ghc-option=-optl=-Wl,-headerpad_max_install_names") (optionalString enableParallelBuilding "--ghc-option=-j$NIX_BUILD_CORES") - (optionalString (useCpphs) "--with-cpphs=${cpphs}/bin/cpphs --ghc-options=-cpp --ghc-options=-pgmP${cpphs}/bin/cpphs --ghc-options=-optP--cpp") + (optionalString useCpphs "--with-cpphs=${cpphs}/bin/cpphs --ghc-options=-cpp --ghc-options=-pgmP${cpphs}/bin/cpphs --ghc-options=-optP--cpp") (enableFeature enableSplitObjs "split-objs") (enableFeature enableLibraryProfiling "library-profiling") (enableFeature enableSharedLibraries "shared") @@ -105,11 +105,11 @@ let isHaskellPkg = x: (x ? pname) && (x ? version) && (x ? env); isSystemPkg = x: !isHaskellPkg x; - propagatedBuildInputs = buildDepends; - otherBuildInputs = extraLibraries ++ - buildTools ++ - optionals (pkgconfigDepends != []) ([pkgconfig] ++ pkgconfigDepends) ++ - optionals doCheck testDepends; + propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends; + otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ + buildTools ++ libraryToolDepends ++ executableToolDepends ++ + optionals (pkgconfigDepends != []) ([pkgconfig] ++ pkgconfigDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends) ++ + optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends); allBuildInputs = propagatedBuildInputs ++ otherBuildInputs; haskellBuildInputs = stdenv.lib.filter isHaskellPkg allBuildInputs; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 86a98e6f3f4..3d5a00e2d8c 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -241,8 +241,8 @@ self: { }: mkDerivation { pname = "ADPfusion"; - version = "0.4.1.0"; - sha256 = "1x75kb01080hkm00a26vsqy13qgmmsi7xjbcv180v14lh0dm7yjn"; + version = "0.4.1.1"; + sha256 = "06ff9f4wdf7dr0v2cwhzsjn00bmaijgqznhnyf5fp9jyw8ffbbzp"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -737,14 +737,13 @@ self: { }: mkDerivation { pname = "AlignmentAlgorithms"; - version = "0.0.1.2"; - sha256 = "1y9c0q34dc2y508sfxgyrgdjg39f4j7h9fjqaykx95dlv383xsjq"; + version = "0.0.2.0"; + sha256 = "110vhp7kdg9l5j3w19wbimmfpq4c05xgx680vb938r1pgpx9s76r"; buildDepends = [ ADPfusion base containers fmlist FormalGrammars GrammarProducts PrimitiveArray vector ]; - jailbreak = true; - homepage = "http://www.bioinf.uni-leipzig.de/Software/gADP/"; + homepage = "https://github.com/choener/AlignmentAlgorithms"; description = "Collection of alignment algorithms"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -1412,15 +1411,28 @@ self: { }) {}; "BiobaseTypes" = callPackage - ({ mkDerivation, base, primitive, vector }: + ({ mkDerivation, aeson, base, binary, cereal, cereal-text + , data-default, deepseq, hashable, log-domain, primitive + , PrimitiveArray, QuickCheck, stringable, test-framework + , test-framework-quickcheck2, test-framework-th, text, text-binary + , vector, vector-binary-instances, vector-th-unbox + }: mkDerivation { pname = "BiobaseTypes"; - version = "0.0.2.2"; - sha256 = "03h7a95njbsl67bbg7wfxjjlibsqhkm62f04hhv6s14cgrvh0b3g"; - buildDepends = [ base primitive vector ]; - jailbreak = true; - description = "(deprecated) Ring class, with several instances"; - license = stdenv.lib.licenses.gpl3; + version = "0.1.1.0"; + sha256 = "1z3vhxqqyc1bn1byvld21psi7am8zwmxsa7aiqshppw5hqyslwvl"; + buildDepends = [ + aeson base binary cereal cereal-text data-default deepseq hashable + log-domain primitive PrimitiveArray QuickCheck stringable text + text-binary vector vector-binary-instances vector-th-unbox + ]; + testDepends = [ + base QuickCheck test-framework test-framework-quickcheck2 + test-framework-th + ]; + homepage = "https://github.com/choener/BiobaseTypes"; + description = "Collection of types for bioinformatics"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -1443,24 +1455,23 @@ self: { "BiobaseXNA" = callPackage ({ mkDerivation, aeson, base, bimaps, binary, bytes, bytestring - , cereal, cereal-vector, cmdargs, containers, csv, file-embed - , hashable, lens, primitive, PrimitiveArray, split, text, tuple - , vector, vector-binary-instances, vector-th-unbox + , cereal, cereal-vector, cmdargs, containers, csv, deepseq + , file-embed, hashable, lens, primitive, PrimitiveArray, split + , text, tuple, vector, vector-binary-instances, vector-th-unbox }: mkDerivation { pname = "BiobaseXNA"; - version = "0.9.1.1"; - sha256 = "1r9axc6g4fqc3sb47km3pfadx193s68ign8ac4va9wj8a5hilbgq"; + version = "0.9.2.0"; + sha256 = "1ck6yba372w3cbzgifcbfdd2m4nfyy7zd8zygkji3zbxymz2ak18"; isLibrary = true; isExecutable = true; buildDepends = [ aeson base bimaps binary bytes bytestring cereal cereal-vector - cmdargs containers csv file-embed hashable lens primitive + cmdargs containers csv deepseq file-embed hashable lens primitive PrimitiveArray split text tuple vector vector-binary-instances vector-th-unbox ]; - jailbreak = true; - homepage = "http://www.bioinf.uni-leipzig.de/~choener/"; + homepage = "https://github.com/choener/BiobaseXNA"; description = "Efficient RNA/DNA representations"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -4915,8 +4926,8 @@ self: { }: mkDerivation { pname = "FormalGrammars"; - version = "0.2.0.0"; - sha256 = "0qx2r4gvims7s7ki7sanwvyws4ykf7cwxsxpwy3krr2rfqhmhp75"; + version = "0.2.1.0"; + sha256 = "10b7hcwzxnl31wdfdbakcaapihhnwx8lwj0znidvgkk7hyirnx2n"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -4925,8 +4936,7 @@ self: { template-haskell text transformers trifecta unordered-containers vector ]; - jailbreak = true; - homepage = "http://www.bioinf.uni-leipzig.de/Software/gADP/"; + homepage = "https://github.com/choener/FormalGrammars"; description = "(Context-free) grammars in formal language theory"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -4966,8 +4976,8 @@ self: { }: mkDerivation { pname = "Frames"; - version = "0.1.1.1"; - sha256 = "117nqwvxbvcdnma582801im0fp2bg129m0cick43qa7cn9ky1drz"; + version = "0.1.2"; + sha256 = "11444jhck56y2iclgn1daj087qpi99pznk3w82vhbya3pdvrkjac"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -5475,6 +5485,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "GenussFold" = callPackage + ({ mkDerivation, ADPfusion, ansi-wl-pprint, base, bytestring + , cmdargs, containers, data-default, FormalGrammars, lens, mtl + , PrimitiveArray, QuickCheck, semigroups, template-haskell + , test-framework, test-framework-quickcheck2, test-framework-th + , text, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "GenussFold"; + version = "0.0.0.2"; + sha256 = "1byshl3wa637nnvwxa80r9p1azgvgbczp5j77hpqaxacxkx1q0sm"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + ADPfusion ansi-wl-pprint base bytestring cmdargs containers + data-default FormalGrammars lens mtl PrimitiveArray semigroups + template-haskell text transformers unordered-containers vector + ]; + testDepends = [ + base QuickCheck test-framework test-framework-quickcheck2 + test-framework-th + ]; + homepage = "https://github.com/choener/GenussFold"; + description = "MCFGs for Genus-1 RNA Pseudoknots"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "GeoIp" = callPackage ({ mkDerivation, base, bytestring, bytestring-mmap, syb }: mkDerivation { @@ -5690,22 +5727,23 @@ self: { }) {}; "GrammarProducts" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers - , data-default, FormalGrammars, lens, newtype, parsers, semigroups - , template-haskell, transformers, trifecta + ({ mkDerivation, ADPfusion, ansi-wl-pprint, base, bytestring + , containers, data-default, FormalGrammars, lens, newtype, parsers + , PrimitiveArray, semigroups, template-haskell, transformers + , trifecta }: mkDerivation { pname = "GrammarProducts"; - version = "0.1.0.0"; - sha256 = "1is934sdflkhi8idprdihdb7knsi8gi0gd4rdnhn4cd8xjvkicgk"; + version = "0.1.1.0"; + sha256 = "026sjppwk0g10zyw64rds1fifdi7d6p7jzri35cl6hxc33fqdiy3"; isLibrary = true; isExecutable = true; buildDepends = [ - ansi-wl-pprint base bytestring containers data-default - FormalGrammars lens newtype parsers semigroups template-haskell - transformers trifecta + ADPfusion ansi-wl-pprint base bytestring containers data-default + FormalGrammars lens newtype parsers PrimitiveArray semigroups + template-haskell transformers trifecta ]; - homepage = "http://www.bioinf.uni-leipzig.de/gADP/"; + homepage = "https://github.com/choener/GrammarProducts"; description = "Grammar products and higher-dimensional grammars"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -14028,8 +14066,8 @@ self: { }: mkDerivation { pname = "Spock-digestive"; - version = "0.1.0.0"; - sha256 = "044cw2hfgwa21kjbmby5asfmdjahhadk8iyqk221pixddw7z6s67"; + version = "0.1.0.1"; + sha256 = "13766v5y43jmdh7m3q1790ppw2chwg3g29dfh1zacxw7n1gmhlyl"; buildDepends = [ base digestive-functors http-types mtl Spock text unordered-containers wai @@ -15012,13 +15050,16 @@ self: { }) {}; "Unique" = callPackage - ({ mkDerivation, base, containers, hashable, unordered-containers + ({ mkDerivation, base, containers, extra, hashable + , unordered-containers }: mkDerivation { pname = "Unique"; - version = "0.4"; - sha256 = "0la9gxr7kl0s606kl5szb1sw3xwh9pnd1ak6iwlxi7b0bm9syik1"; - buildDepends = [ base containers hashable unordered-containers ]; + version = "0.4.2"; + sha256 = "0riyn68bi6wxz2mhqlywva6a1ngfr4k3gglp12dkhcmllh5l3dc2"; + buildDepends = [ + base containers extra hashable unordered-containers + ]; jailbreak = true; description = "It provides the functionality like unix \"uniq\" utility"; license = stdenv.lib.licenses.bsd3; @@ -17030,6 +17071,18 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "acme-operators" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "acme-operators"; + version = "0.2.0.0"; + sha256 = "1wf12iphv12srygdvhy7xyja453dzjmm6kd9l2qp00fx986zd01w"; + buildDepends = [ base ]; + homepage = "https://github.com/phadej/acme-operators#readme"; + description = "Operators of base, all in one place!"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "acme-php" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -17712,8 +17765,8 @@ self: { }: mkDerivation { pname = "aeson-schema"; - version = "0.3.0.6"; - sha256 = "0q1ml5q99lwqgppih9zq24nx01z6idcflz30pvl6bljv0xr52wp2"; + version = "0.3.0.7"; + sha256 = "1r84ih3bhnzfl3hl6a4ph4x2l25ls11py3mrxqd04kcpyqzsll5g"; buildDepends = [ aeson attoparsec base bytestring containers ghc-prim mtl QuickCheck regex-base regex-compat regex-pcre scientific syb template-haskell @@ -18359,12 +18412,12 @@ self: { }) {}; "align" = callPackage - ({ mkDerivation, base, uglymemo, vector }: + ({ mkDerivation, base, containers, transformers, vector }: mkDerivation { pname = "align"; - version = "0.1.1.1"; - sha256 = "1a9a7vmv4sh0aps3cbx2i02i1n9k62pzcahs7swflw0r1b4gzdzv"; - buildDepends = [ base uglymemo vector ]; + version = "0.1.1.2"; + sha256 = "1bv7x687ga563kdnl23smrspljq32bkaarq4zdg071glqckrffq9"; + buildDepends = [ base containers transformers vector ]; description = "Sequence alignment algorithms"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -19577,16 +19630,15 @@ self: { }) {}; "angel" = callPackage - ({ mkDerivation, base, configurator, containers, hspec, mtl - , old-locale, optparse-applicative, process, stm, text, time - , transformers, unix, unordered-containers + ({ mkDerivation, base, configurator, containers, mtl, old-locale + , optparse-applicative, process, stm, tasty, tasty-hunit + , tasty-quickcheck, text, time, transformers, unix + , unordered-containers }: mkDerivation { pname = "angel"; - version = "0.6.1"; - revision = "1"; - sha256 = "1wkllv4ziggj3smhghdk5qsgccds9d69rhx1gi079ph7z533w2dc"; - editedCabalFile = "05dc467ec31281499d5902a77b957243d03ff87e0e4b51aaaa78306049560f28"; + version = "0.6.2"; + sha256 = "0n73w8lczsncagf2041lq1963mnsmw9albwy0n5qbhqx9030pzya"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -19594,8 +19646,9 @@ self: { process stm text time transformers unix unordered-containers ]; testDepends = [ - base configurator containers hspec mtl old-locale process stm text - time transformers unix unordered-containers + base configurator containers mtl old-locale process stm tasty + tasty-hunit tasty-quickcheck text time transformers unix + unordered-containers ]; homepage = "http://github.com/MichaelXavier/Angel"; description = "Process management and supervision daemon"; @@ -24420,17 +24473,14 @@ self: { }: mkDerivation { pname = "bimaps"; - version = "0.0.0.1"; - sha256 = "0d2gfgamfmgwqzhbv45s2irabqcchlymn151yyd0d0sfsvl26vl6"; - isLibrary = true; - isExecutable = true; + version = "0.0.0.2"; + sha256 = "1wipia9lil9r7lhsf9rk82k8ydy5c97qsixg0fia0ms5chmdr7qw"; buildDepends = [ aeson base binary cereal containers deepseq hashable primitive QuickCheck storable-tuple unordered-containers vector vector-binary-instances vector-th-unbox ]; - jailbreak = true; - homepage = "http://www.bioinf.uni-leipzig.de/~choener/"; + homepage = "https://github.com/choener/bimaps"; description = "bijections with multiple implementations"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -26733,7 +26783,7 @@ self: { }) {}; "bloodhound" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers + ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers , data-default-class, directory, doctest, doctest-prop, exceptions , filepath, hspec, http-client, http-types, mtl, QuickCheck , quickcheck-properties, semigroups, text, time, transformers @@ -26741,17 +26791,18 @@ self: { }: mkDerivation { pname = "bloodhound"; - version = "0.6.0.1"; - sha256 = "0xnq8iph7dmc3bd2lvbbjdqqgwjynqz7pywh7qkclqn8rz27flfi"; + version = "0.7.0.1"; + sha256 = "1r66nb6vbq1pbh2a97wmsk9iav16ac4ppj5yjv3s5l8qc0rydmjs"; buildDepends = [ - aeson base bytestring containers data-default-class exceptions - http-client http-types mtl semigroups text time transformers - uri-bytestring vector + aeson base blaze-builder bytestring containers data-default-class + exceptions http-client http-types mtl semigroups text time + transformers uri-bytestring vector ]; testDepends = [ - aeson base containers directory doctest doctest-prop filepath hspec - http-client http-types mtl QuickCheck quickcheck-properties - semigroups text time unordered-containers vector + aeson base bytestring containers directory doctest doctest-prop + filepath hspec http-client http-types mtl QuickCheck + quickcheck-properties semigroups text time unordered-containers + vector ]; homepage = "https://github.com/bitemyapp/bloodhound"; description = "ElasticSearch client library for Haskell"; @@ -30119,10 +30170,8 @@ self: { }: mkDerivation { pname = "cassava"; - version = "0.4.3.0"; - revision = "1"; - sha256 = "0pwcxv1mdn0p6hw2w5fiw4w75mnxphngzj62jw3nbd80bswdp2x3"; - editedCabalFile = "6410ddebd594ccd8c068cbfb6b064ac43bcebb48fb74cbc25078c89f55e051a7"; + version = "0.4.3.1"; + sha256 = "1b62zx6fna0nx3qvs316bwc39l8qan9fpm82f1p28ipkyq0ym2g3"; buildDepends = [ array attoparsec base blaze-builder bytestring containers deepseq hashable text unordered-containers vector @@ -32845,8 +32894,8 @@ self: { ({ mkDerivation, base, bytestring, HUnit, text }: mkDerivation { pname = "cmark"; - version = "0.3.4"; - sha256 = "0cmrh524s2in66vb51hzfrbxq7z8afh243c8x1378s9hxk0r6xya"; + version = "0.4.0.1"; + sha256 = "1kimba33r0f2ify0sxy7x9npqarb9xaw8hih1z6vvf1bkjsji0v3"; buildDepends = [ base bytestring text ]; testDepends = [ base HUnit text ]; homepage = "https://github.com/jgm/commonmark-hs"; @@ -34820,8 +34869,8 @@ self: { }: mkDerivation { pname = "configifier"; - version = "0.0.4"; - sha256 = "0wd32v9a0jmz9v732z2ph8spb2kh89zj48350kvvappfbqdfh09a"; + version = "0.0.5"; + sha256 = "0k3r8i2mb06kvrqfln0birwd92bwx8m55wpahnbbzs35i35p60vz"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -35156,6 +35205,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "consumers" = callPackage + ({ mkDerivation, base, containers, exceptions, hpqtypes + , lifted-base, lifted-threads, log, monad-control, mtl, stm, time + , transformers-base + }: + mkDerivation { + pname = "consumers"; + version = "0.1"; + sha256 = "0y977lhxcaxjw6c760fifmisxn62lji0qs8aqgyag6jmzmkfymdb"; + buildDepends = [ + base containers exceptions hpqtypes lifted-base lifted-threads log + monad-control mtl stm time transformers-base + ]; + homepage = "https://github.com/scrive/consumers"; + description = "Concurrent PostgreSQL data consumers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "container-classes" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -41424,8 +41491,8 @@ self: { }: mkDerivation { pname = "diagrams-builder"; - version = "0.7.0.4"; - sha256 = "1nxb6fpcjkcwyihhd0dj9zs72flhhg4g9g7r2xlbdi5l7j3kpkjg"; + version = "0.7.1"; + sha256 = "1cfmklds0l2jyn7p2hldq0riq4m01dxfg9cran6sx65a7d82x96d"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -42056,8 +42123,8 @@ self: { }: mkDerivation { pname = "digestive-functors-aeson"; - version = "1.1.15"; - sha256 = "19zjn3cykxyrk0dblmrvbrmggnsxigfxvhjnjmrq60z1iljvrqrr"; + version = "1.1.16"; + sha256 = "0v01applw92imi3yr6drd1bqig1l1mlps1ia2i1dcln1sh31ms9y"; buildDepends = [ aeson base containers digestive-functors lens lens-aeson safe text vector @@ -42066,7 +42133,6 @@ self: { aeson base bytestring digestive-functors HUnit mtl scientific tasty tasty-hunit text ]; - jailbreak = true; homepage = "http://github.com/ocharles/digestive-functors-aeson"; description = "Run digestive-functors forms against JSON"; license = stdenv.lib.licenses.gpl3; @@ -46208,8 +46274,8 @@ self: { }: mkDerivation { pname = "engine-io"; - version = "1.2.9"; - sha256 = "0ral95ywkni205gmn2q58fpibaf4a1y5dxawkc5rq5j0wnmh465j"; + version = "1.2.10"; + sha256 = "02wc4fdwrnaw934bxk39bfndzn2rjdcaa3rifcj84ap750fx16h0"; buildDepends = [ aeson async attoparsec base base64-bytestring bytestring either free monad-loops mwc-random stm stm-delay text transformers @@ -47014,8 +47080,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "2.2.7"; - sha256 = "1i5gm1riirz8wq2zr2a2fxlnxa7c5rrvywyigbx2gla9xi07dzs6"; + version = "2.2.10"; + sha256 = "0chxxcy52xrhdq7pgwzq3vk9filrrc3mdnx6j26r2ih56j1ac02l"; buildDepends = [ base conduit monad-logger persistent resourcet tagged text transformers unordered-containers @@ -51256,8 +51322,8 @@ self: { }: mkDerivation { pname = "free-http"; - version = "0.1.1.1"; - sha256 = "1gifjrz7bmrcyv6pc6gl55vw0vmnzjzjhvslwvj8p8c8xbv2fxrh"; + version = "0.1.1.3"; + sha256 = "1gmafmi0mrmbm7a08cxiz96s43k4sc38wvzrnmcrqcl44a1n38fm"; buildDepends = [ base bytestring free http-client http-types mtl QuickCheck text time transformers @@ -51569,8 +51635,8 @@ self: { ({ mkDerivation, base, containers, mtl, transformers }: mkDerivation { pname = "frpnow"; - version = "0.11"; - sha256 = "0lvlgn1bv9flhs9x3i5zf1zd6l7nd4i3asscc0nmqmpnidcmlkcn"; + version = "0.13"; + sha256 = "13dvyf1zwzvcpal7zp1jx5ns49a01jsjn3pz0iqdrph7qgll2aqr"; buildDepends = [ base containers mtl transformers ]; homepage = "https://github.com/atzeus/FRPNow"; description = "Principled practical FRP"; @@ -53177,8 +53243,8 @@ self: { }: mkDerivation { pname = "getopt-generics"; - version = "0.7.1.1"; - sha256 = "1zhglg3h6a6sx3chq9h6j2r279f2753j026mz8kb9v4lajj5vcn0"; + version = "0.8"; + sha256 = "0qxdr9y3dvr4w7hhbgkianaijsqfh36gfwh1blhbr1nf7cv9khmd"; buildDepends = [ base base-compat base-orphans generics-sop tagged ]; @@ -62790,18 +62856,18 @@ self: { "hat" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath - , haskeline, haskell-src-exts, old-locale, old-time, process - , random + , haskeline, haskell-src-exts, old-locale, old-time, polyparse + , process, random }: mkDerivation { pname = "hat"; - version = "2.8.0.0"; - sha256 = "06qb34g2kxsldkgpw02xs7cknhj6igfwgjxi2fxyr2856y8laj0j"; + version = "2.9.0.0"; + sha256 = "05sbgq1mliahdn4qj7flgw7klrm67r2mz7gxs03i6lx6mi3phm9f"; isLibrary = true; isExecutable = true; buildDepends = [ base bytestring containers directory filepath haskeline - haskell-src-exts old-locale old-time process random + haskell-src-exts old-locale old-time polyparse process random ]; homepage = "http://projects.haskell.org/hat/"; description = "The Haskell tracer, generating and viewing Haskell execution traces"; @@ -63040,8 +63106,8 @@ self: { }) {}; "hayland" = callPackage - ({ mkDerivation, base, data-flags, process, template-haskell, time - , wayland-client, wayland-cursor, wayland-egl, wayland-server, xml + ({ mkDerivation, base, data-flags, mesa, process, template-haskell + , time, wayland, xml }: mkDerivation { pname = "hayland"; @@ -63053,15 +63119,12 @@ self: { base data-flags process template-haskell time xml ]; testDepends = [ base process xml ]; - extraLibraries = [ - wayland-client wayland-cursor wayland-egl wayland-server - ]; + extraLibraries = [ mesa wayland ]; jailbreak = true; description = "Haskell bindings for the C Wayland library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) { wayland-client = null; wayland-cursor = null; - wayland-egl = null; wayland-server = null;}; + }) { inherit (pkgs) mesa; inherit (pkgs) wayland;}; "hayoo-cli" = callPackage ({ mkDerivation, aeson, base, bytestring, http-conduit, http-types @@ -68399,8 +68462,8 @@ self: { }: mkDerivation { pname = "hpack"; - version = "0.5.2"; - sha256 = "12671fsydxxkdpk47nmzm9qc5vlss6802bypx690z8c982s4vbr1"; + version = "0.5.4"; + sha256 = "1ghj80w5hx736hkr9z827s4f2fli5r4y0q3ka9ay706k5lj0g9xa"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -73566,8 +73629,8 @@ self: { }: mkDerivation { pname = "hwsl2"; - version = "0.3.0.1"; - sha256 = "1zs1wlnvh316n914mrlihrd4njbnq9n070ckq5f7hbax37v3h9p5"; + version = "0.3.2.0"; + sha256 = "0y3k9xlhzvscbwzrhxgiqf9s3724zak1nbnf6lcaynpzk4p8jmm1"; buildDepends = [ base bytestring ]; testDepends = [ base bytestring Cabal cabal-test-quickcheck QuickCheck @@ -73579,6 +73642,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hwsl2-bytevector" = callPackage + ({ mkDerivation, base, bytestring, fingertree, hwsl2 }: + mkDerivation { + pname = "hwsl2-bytevector"; + version = "0.1.0.0"; + sha256 = "0kfsc85k4vgdbkryrw80rgpjzzbavwqqzqylc95h80vm7xnlg2p9"; + buildDepends = [ base bytestring fingertree hwsl2 ]; + homepage = "https://github.com/srijs/hwsl2-haskell-bytevector"; + description = "A hashed byte-vector based on algebraic hashes and finger trees"; + license = stdenv.lib.licenses.mit; + }) {}; + "hwsl2-reducers" = callPackage ({ mkDerivation, base, bytestring, hwsl2, reducers, semigroups }: mkDerivation { @@ -74533,6 +74608,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ib-api" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, network }: + mkDerivation { + pname = "ib-api"; + version = "0.1.0.0"; + sha256 = "1030bj90myx5x3y297qmlmnzppfnh5d3cmwglqj1s7i6nyrh86k5"; + buildDepends = [ attoparsec base bytestring network ]; + jailbreak = true; + homepage = "https://github.com/rbermani/ib-api"; + description = "An API for the Interactive Brokers Trading Workstation written in pure Haskell"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "iban" = callPackage ({ mkDerivation, base, containers, HUnit, iso3166-country-codes , tasty, tasty-hunit, text, unordered-containers @@ -76068,12 +76156,58 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "instant-aeson" = callPackage + ({ mkDerivation, aeson, base, instant-generics, tasty + , tasty-quickcheck + }: + mkDerivation { + pname = "instant-aeson"; + version = "0.1"; + sha256 = "1idxwd0wxy6xziwlwnjwgbv9canpvwbnigrcjn3kvl0j7nld6wvj"; + buildDepends = [ aeson base instant-generics ]; + testDepends = [ + aeson base instant-generics tasty tasty-quickcheck + ]; + jailbreak = true; + description = "Generic Aeson instances through instant-generics"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "instant-bytes" = callPackage + ({ mkDerivation, base, bytes, instant-generics, tasty + , tasty-quickcheck + }: + mkDerivation { + pname = "instant-bytes"; + version = "0.1"; + sha256 = "0gjj7ix1dxlbk1im2ww3qpfx4m40vg0hl7n9ribnlx2krw53mmm1"; + buildDepends = [ base bytes instant-generics ]; + testDepends = [ + base bytes instant-generics tasty tasty-quickcheck + ]; + jailbreak = true; + description = "Generic Serial instances through instant-generics"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "instant-deepseq" = callPackage + ({ mkDerivation, base, deepseq, instant-generics }: + mkDerivation { + pname = "instant-deepseq"; + version = "0.1"; + sha256 = "13w4ilnjm6m9idqkxzp0l91f156n097zlhmpny1lamy5brvzpls0"; + buildDepends = [ base deepseq instant-generics ]; + jailbreak = true; + description = "Generic NFData instances through instant-generics"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "instant-generics" = callPackage ({ mkDerivation, base, containers, syb, template-haskell }: mkDerivation { pname = "instant-generics"; - version = "0.4.1"; - sha256 = "1jcs6spa3g8mazgpivn61gz4c740ks19rkz9sh24ns6n4q53zdvq"; + version = "0.5"; + sha256 = "174avn0jjxv4h04m6k85gvv6x3kvrlwhcbhqg9ih0ps5mp7crmvr"; buildDepends = [ base containers syb template-haskell ]; homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/InstantGenerics"; description = "Generic programming library with a sum of products view"; @@ -76081,6 +76215,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "instant-hashable" = callPackage + ({ mkDerivation, base, hashable, instant-generics }: + mkDerivation { + pname = "instant-hashable"; + version = "0.1"; + sha256 = "0bqn9na0pxkkffmwwz6p4rgv11fq2mn724sk4l7nxv44k7vrirz2"; + buildDepends = [ base hashable instant-generics ]; + jailbreak = true; + description = "Generic Hashable instances through instant-generics"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "instant-zipper" = callPackage ({ mkDerivation, base, instant-generics, mtl }: mkDerivation { @@ -78374,12 +78520,11 @@ self: { }: mkDerivation { pname = "json-assertions"; - version = "1.0.6"; - sha256 = "00bjmbx4rbbijdhcpbnbjilfm030ml2lpvsf4c89vx1fyzin1nrj"; + version = "1.0.7"; + sha256 = "1x73szyqb6w1hnhb4ab8dfc7hwn12avj4304jnr8lyxjg08hfaqa"; buildDepends = [ aeson base indexed indexed-free lens lens-aeson text ]; - jailbreak = true; homepage = "http://github.com/ocharles/json-assertions.git"; description = "Test that your (Aeson) JSON encoding matches your expectations"; license = stdenv.lib.licenses.bsd3; @@ -78393,8 +78538,8 @@ self: { }: mkDerivation { pname = "json-autotype"; - version = "1.0.6"; - sha256 = "1s8zizl0mxc4vy1s050sgfv8abzq8qp844ih5xywn2wccp090gc7"; + version = "1.0.7"; + sha256 = "11x6am3hqzhai0dm02pk20l5pk5bpj434z8ic4b8lksnv8l5zq46"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -78407,7 +78552,6 @@ self: { hashable hflags lens mtl pretty process QuickCheck scientific smallcheck text uniplate unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/mgajda/json-autotype"; description = "Automatic type declaration for JSON input data"; license = stdenv.lib.licenses.bsd3; @@ -82158,8 +82302,10 @@ self: { }: mkDerivation { pname = "lens"; - version = "4.12"; - sha256 = "195fhzw8z15zrbav7mdzia052g7sfy7zm5banjkk3azsb9mjvvan"; + version = "4.12.1"; + revision = "1"; + sha256 = "0rzi0z5vz78v99f1hk8izixhxf3linz3xjkancg8x65g03brwl33"; + editedCabalFile = "fedce7a783a5a622bb19e00145e775ff8ea7d797f71fd22c9eb2257672b7f741"; buildDepends = [ array base base-orphans bifunctors bytestring comonad containers contravariant distributive exceptions filepath free ghc-prim @@ -82207,9 +82353,9 @@ self: { mkDerivation { pname = "lens-aeson"; version = "1.0.0.4"; - revision = "1"; + revision = "2"; sha256 = "0zjl645y4bwg3pvld8z4vj9rdpdy6fja2cx63d85k37zp5n98y7v"; - editedCabalFile = "252661ca9f157ea5cb0aa6684c50fa1b84a2a3ed300c2eaec9ffb82eb18e7ddd"; + editedCabalFile = "f9ddeac68a237cb5dbe8ab7457fb7529bdeeb675c5e80bc122e196255072393d"; buildDepends = [ aeson attoparsec base bytestring lens scientific text unordered-containers vector @@ -83524,8 +83670,8 @@ self: { }: mkDerivation { pname = "linear"; - version = "1.19.1.2"; - sha256 = "1bxzy4735xc0zdxmwrspmjcn4p61kjwzxi8agjfx7w1dsyah2if3"; + version = "1.19.1.3"; + sha256 = "1hprmhs1nm6l81kpnnznz92l66j10z4asn3g3l9c47165q881592"; buildDepends = [ adjunctions base binary bytes cereal containers deepseq distributive ghc-prim hashable lens reflection semigroupoids @@ -83536,7 +83682,6 @@ self: { base binary bytestring directory doctest filepath HUnit lens simple-reflect test-framework test-framework-hunit ]; - jailbreak = true; homepage = "http://github.com/ekmett/linear/"; description = "Linear Algebra"; license = stdenv.lib.licenses.bsd3; @@ -86823,8 +86968,8 @@ self: { }: mkDerivation { pname = "mangopay"; - version = "1.11.2"; - sha256 = "06f1gj877cnhjp5dh4gxza9vr6x3l2c3ppschdhkyj1ly65q3z5q"; + version = "1.11.3"; + sha256 = "1w9p0na0am2hl8f32qgkdym00kjjnavv1wxp6f4vh9msa6cfw6yl"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -87341,10 +87486,8 @@ self: { }: mkDerivation { pname = "matrix"; - version = "0.3.4.3"; - revision = "1"; - sha256 = "1nshgxiza384xh7h22qgbwa75bylc1l3gh6dsm51axapr1ldi8gg"; - editedCabalFile = "f586a9d89c7279218a0436d0b8a6adaabc22414caca30774904821bd40cc5ace"; + version = "0.3.4.4"; + sha256 = "03aaw60x8849rsrcqc8n0d3k8a6dp8naxnqfq2xq776q5zbbcrpv"; buildDepends = [ base deepseq loop primitive vector ]; testDepends = [ base QuickCheck tasty tasty-quickcheck ]; description = "A native implementation of matrix operations"; @@ -89779,12 +89922,9 @@ self: { ({ mkDerivation, base, extensible-exceptions, transformers }: mkDerivation { pname = "monad-peel"; - version = "0.1.1"; - revision = "1"; - sha256 = "0n3cxa94wd3hjvy9jgf3d8p7qfb9jaaf29simjya7rlcb673pg3l"; - editedCabalFile = "64e1f99ea3e8c36d5d4e86794d1fc02966e7036b43ae4e1dcf01ade192962611"; + version = "0.2"; + sha256 = "1cg6j2qhh14ryn4766dwx57g50qalzcv79rx9ysdgkskkjs6fiix"; buildDepends = [ base extensible-exceptions transformers ]; - jailbreak = true; homepage = "http://andersk.mit.edu/haskell/monad-peel/"; description = "Lift control operations like exception catching through monad transformers"; license = stdenv.lib.licenses.bsd3; @@ -90444,8 +90584,8 @@ self: { }: mkDerivation { pname = "monoid-subclasses"; - version = "0.4.1"; - sha256 = "0wgy0cqi2x12xn1sbxwfbwzj6bii2b6rhf8gi4q2jja5nh04a4vz"; + version = "0.4.1.1"; + sha256 = "0r2ypb85qz88jz70pr4rgygwsdslaw781s0d3svd6s7xfibi9hww"; buildDepends = [ base bytestring containers primes text vector ]; testDepends = [ base bytestring containers primes QuickCheck quickcheck-instances @@ -97325,8 +97465,8 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "1.15.0.5"; - sha256 = "0js3k6kvq506yssx5d4wwx9hsd0pm81k8g0rpd7wi2aixibs2jj2"; + version = "1.15.0.6"; + sha256 = "0ipdy5wl2qb8nvmdka9si17hvxn38xmv5pzpb9v5lvaj8a0rcl6r"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -97455,14 +97595,14 @@ self: { }: mkDerivation { pname = "pandoc-types"; - version = "1.12.4.4"; - sha256 = "0qk62cn8j3ml0fc12ikfw0pp2b6gqlfn96n5jv9dvyajxqxrby5g"; + version = "1.12.4.5"; + sha256 = "0yw7mkhx63320vqabql2iqnmkrwh1qs670sicqpcvv73dchdp8c7"; buildDepends = [ aeson base bytestring containers deepseq-generics ghc-prim syb ]; homepage = "http://johnmacfarlane.net/pandoc"; description = "Types for representing a structured document"; - license = "GPL"; + license = stdenv.lib.licenses.bsd3; }) {}; "pandoc-unlit" = callPackage @@ -100223,8 +100363,8 @@ self: { }: mkDerivation { pname = "pipes-cliff"; - version = "0.10.0.2"; - sha256 = "1j912dshjf2pdj87rlib4nqd00i99hz74cxhrf2ddlaabml9fs98"; + version = "0.10.0.4"; + sha256 = "0czgzmfl5rs0p63x24zr4pcl01a0wy93hx8wpin9k61yfx7bb4ix"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -102292,6 +102432,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) adns; inherit (pkgs) openssl;}; + "potato-tool" = callPackage + ({ mkDerivation, base, binary, bytestring, split }: + mkDerivation { + pname = "potato-tool"; + version = "0.1.0.2"; + sha256 = "1d95y8nchzzy3zaq1dsm94b7nhrlxhwpq7yn9dr1nisz43f4j7bx"; + isLibrary = false; + isExecutable = true; + buildDepends = [ base binary bytestring split ]; + homepage = "https://github.com/RossMeikleham/Potato_Tool"; + description = "Command line Dreamcast VMU filesystem toolset"; + license = stdenv.lib.licenses.gpl2; + }) {}; + "potrace" = callPackage ({ mkDerivation, base, bindings-potrace, bytestring, containers , data-default, JuicyPixels, vector @@ -103995,8 +104149,8 @@ self: { }: mkDerivation { pname = "pseudo-boolean"; - version = "0.1.1.0"; - sha256 = "0j80pwmp8jpkmh0k76v9mqa3xcbdhb0r4sgq1nkfdf4gm5mn7v03"; + version = "0.1.2.0"; + sha256 = "13bgv7kkglajrvng7vcy7qv9x8xlm0nrv8in8zh5w5m6xl7i5wkz"; buildDepends = [ attoparsec base bytestring bytestring-builder containers deepseq dlist hashable parsec @@ -105555,11 +105709,10 @@ self: { }: mkDerivation { pname = "rainbow"; - version = "0.26.0.4"; - sha256 = "1ic6163igf0c815crccss42czdhnrg3y8rfqr05wqy0m4vza0nx4"; + version = "0.26.0.6"; + sha256 = "1v0za967cp1205fkbwglf28yn2pslp7dvyqb3rbym3j7r3pby3zc"; buildDepends = [ base bytestring lens process text ]; testDepends = [ base bytestring lens process QuickCheck text ]; - jailbreak = true; homepage = "https://www.github.com/massysett/rainbow"; description = "Print text to terminal with colors and effects"; license = stdenv.lib.licenses.bsd3; @@ -105582,16 +105735,16 @@ self: { }) {}; "rainbox" = callPackage - ({ mkDerivation, base, bytestring, containers, QuickCheck, rainbow - , tasty, tasty-quickcheck, text + ({ mkDerivation, base, bytestring, containers, lens, QuickCheck + , rainbow, tasty, tasty-quickcheck, text }: mkDerivation { pname = "rainbox"; - version = "0.16.0.0"; - sha256 = "0aihr386m1n5p0d4iym5rvg74ihdm180sm6b4mqmiihhl00lr1p2"; - buildDepends = [ base bytestring containers rainbow text ]; + version = "0.18.0.2"; + sha256 = "1dczbs4y8yzvp132cfy0fl1jv2zf2nm6d3zn4j4pmy2p8cxs1g4v"; + buildDepends = [ base bytestring containers lens rainbow text ]; testDepends = [ - base bytestring containers QuickCheck rainbow tasty + base bytestring containers lens QuickCheck rainbow tasty tasty-quickcheck text ]; homepage = "http://www.github.com/massysett/rainbox"; @@ -105599,6 +105752,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "rake" = callPackage + ({ mkDerivation, base, containers, text }: + mkDerivation { + pname = "rake"; + version = "0.0.1"; + sha256 = "0cn22xg7r80f61z8pf7i0rqqag4qx43rhlfpncgkv5b6vcrsafpn"; + buildDepends = [ base containers text ]; + homepage = "http://github.com/toschoo/Haskell-Libs"; + description = "Rapid Automatic Keyword Extraction (RAKE)"; + license = "LGPL"; + }) {}; + "rakhana" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, lens , mtl, pipes, scientific, transformers, vector, zlib @@ -108317,6 +108482,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "repa-linear-algebra" = callPackage + ({ mkDerivation, base, hmatrix, repa, vector }: + mkDerivation { + pname = "repa-linear-algebra"; + version = "0.0.0.0"; + sha256 = "1y16rmdygxay46xbm617g944aazml48izzmkx46avvqvjyql96w1"; + buildDepends = [ base hmatrix repa vector ]; + homepage = "https://github.com/marcinmrotek/repa-linear-algebra"; + description = "HMatrix operations for Repa"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "repa-plugin" = callPackage ({ mkDerivation, base, containers, ddc-base, ddc-core , ddc-core-flow, ddc-core-simpl, ghc, mtl @@ -108864,10 +109041,8 @@ self: { }: mkDerivation { pname = "rest-gen"; - version = "0.17.1.1"; - revision = "1"; - sha256 = "0gr5wv0gb2niq3i7ggzrr5g9hs3fwxss5hivw5ircrbp9s1xm7bl"; - editedCabalFile = "9d5c13bbf90373aed094821bd2005822fccd5949e0c88a2a63870d90f7c76ee4"; + version = "0.17.1.2"; + sha256 = "05imgbal0b6ab1i8b1896y1qm956ci7r0xx3qnkjbb6vxdl51vaa"; buildDepends = [ aeson base blaze-html Cabal code-builder directory fclabels filepath hashable haskell-src-exts HStringTemplate hxt json-schema @@ -114434,6 +114609,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "shortcut-links" = callPackage + ({ mkDerivation, base, text }: + mkDerivation { + pname = "shortcut-links"; + version = "0.3.0.0"; + sha256 = "14g1s2gb1jc52zifn00n1w35qckv7p620rqhpn7rfhymlz6b07rz"; + buildDepends = [ base text ]; + homepage = "http://github.com/aelve/shortcut-links"; + description = "Link shortcuts for use in text markup"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "shorten-strings" = callPackage ({ mkDerivation, base, text }: mkDerivation { @@ -116117,12 +116304,12 @@ self: { }) {}; "smoothie" = callPackage - ({ mkDerivation, aeson, base, linear, vector }: + ({ mkDerivation, aeson, base, linear, text, vector }: mkDerivation { pname = "smoothie"; - version = "0.3.3.2"; - sha256 = "0jkcy45rxq14ma11h4dakv8ixwzynlml02yd3nmncmlm8vzpah8n"; - buildDepends = [ aeson base linear vector ]; + version = "0.4"; + sha256 = "0j8nwc44q9l7wf4m3z7r32b7if7is21k3xgmi2206r4i1yxc869j"; + buildDepends = [ aeson base linear text vector ]; homepage = "https://github.com/phaazon/smoothie"; description = "Smooth curves via several interpolation modes"; license = stdenv.lib.licenses.bsd3; @@ -117573,8 +117760,8 @@ self: { }: mkDerivation { pname = "soap"; - version = "0.2.2.5"; - sha256 = "1imh9g2my0d981prai69yr9yf7linvaijcn80zlyaz44pasxnrw7"; + version = "0.2.2.7"; + sha256 = "02yirl0pr680pbwbh9z0awyk4blgdd0rir8x1gyydyn6v5dg736i"; buildDepends = [ base bytestring conduit configurator data-default exceptions http-client http-types iconv mtl resourcet text @@ -117689,8 +117876,8 @@ self: { }: mkDerivation { pname = "socket-io"; - version = "1.3.2"; - sha256 = "0bqrglnp54hd777lq92ia7z9vwmj1dq24m7lbiqhzvvb63p9mv4i"; + version = "1.3.3"; + sha256 = "1gy8g8bxjjj1hifkhvid6v8amml0gpp6gbfpih3v0grbi5aci0w7"; buildDepends = [ aeson attoparsec base bytestring engine-io mtl stm text transformers unordered-containers vector @@ -121098,10 +121285,10 @@ self: { mkDerivation { pname = "stripe-haskell"; version = "0.1.4.1"; - sha256 = "a0ffc70616d4eb86a9e0e0fcb1751cc48f3b6f618d07cf2bb96090276d64d218"; + sha256 = "066jcinjg430p4mwy1wdc5pkp3y43isv3z70w2lqdsyl2q3cgzx0"; buildDepends = [ - aeson base bytestring either HsOpenSSL http-streams io-streams mtl - random text time transformers unordered-containers + aeson base bytestring either HsOpenSSL hspec http-streams + io-streams mtl random text time transformers unordered-containers ]; testDepends = [ aeson base bytestring either HsOpenSSL hspec http-streams random @@ -125311,8 +125498,8 @@ self: { }: mkDerivation { pname = "text1"; - version = "0.0.1"; - sha256 = "15nb4izk4j0hg2hhynrjd5vjnpg240rlcp489w4hm4b4nmpdd4cj"; + version = "0.0.3"; + sha256 = "0l3xh8hv5xwfib63llikhnp4w3jx8nwc2rmj4sy7yd5acxgj39sc"; buildDepends = [ base binary lens semigroups text ]; testDepends = [ base directory doctest filepath QuickCheck template-haskell @@ -125678,8 +125865,8 @@ self: { }: mkDerivation { pname = "th-orphans"; - version = "0.12.1"; - sha256 = "11vndilqcx9scbb988xzpaj823g65a7b7vx6jzf9r3nb808kyb2j"; + version = "0.12.2"; + sha256 = "0435l20vzsr6p4app6riyf242hcqizbypf4f5v17wjy3ihw0jddb"; buildDepends = [ base mtl nats template-haskell th-lift th-reify-many ]; @@ -125738,18 +125925,18 @@ self: { }) {}; "th-typegraph" = callPackage - ({ mkDerivation, array, base, bytestring, containers, data-default - , deepseq, ghc-prim, haskell-src-exts, hspec, hspec-core, lens, mtl - , syb, template-haskell, text, th-desugar, th-orphans - , th-reify-many + ({ mkDerivation, array, base, base-compat, bytestring, containers + , data-default, deepseq, ghc-prim, haskell-src-exts, hspec + , hspec-core, lens, mtl, set-extra, syb, template-haskell, text + , th-desugar, th-orphans, th-reify-many }: mkDerivation { pname = "th-typegraph"; - version = "0.18"; - sha256 = "0z47q4sj5z3ajv17d4rda8zaqbbay36x1z6vy8i5c1g6971y8vs5"; + version = "0.21"; + sha256 = "1w4k466snhkcdg30kzzc2vwiz2p46ybks1bbyf3nazc322zxryq0"; buildDepends = [ - base containers data-default haskell-src-exts lens mtl syb - template-haskell th-desugar th-orphans + base base-compat containers data-default haskell-src-exts lens mtl + set-extra syb template-haskell th-desugar th-orphans ]; testDepends = [ array base bytestring containers data-default deepseq ghc-prim @@ -126783,12 +126970,11 @@ self: { }: mkDerivation { pname = "timers"; - version = "0.2.0.2"; - sha256 = "0ivlgpc45iss44pjmcxprwg98zh68fkpym0y19vx5ysacy6p04yh"; + version = "0.2.0.3"; + sha256 = "0q4w41jdhf5ildcdl94lgfn06fg275hf04dpah3l6vva24d8alj5"; buildDepends = [ base lifted-base monad-control suspend transformers-base ]; - jailbreak = true; description = "Simple package that implements timers"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -137212,8 +137398,8 @@ self: { }: mkDerivation { pname = "xml-conduit"; - version = "1.3.0"; - sha256 = "0kcwfr02gnldal4dq2am9kc36j76cjx0japi5r5wms2c1az95r1l"; + version = "1.3.1"; + sha256 = "094gkf3j7xk42km9zlkjdz0bicwxcf4207q1yalwi69zfnqmprhr"; buildDepends = [ attoparsec base blaze-builder blaze-html blaze-markup bytestring conduit conduit-extra containers data-default deepseq monad-control @@ -137225,7 +137411,7 @@ self: { ]; homepage = "http://github.com/snoyberg/xml"; description = "Pure-Haskell utilities for dealing with XML with the conduit package"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.mit; }) {}; "xml-conduit-parse" = callPackage @@ -139873,13 +140059,12 @@ self: { }: mkDerivation { pname = "yesod-sass"; - version = "0.1.1.0"; - sha256 = "19l93rx70xbyllwddyq0c8326cfqyvx13hpvj71k9mbwkis16ccx"; + version = "0.1.2.0"; + sha256 = "0mxk007csmzbrx169jlbg07vqm7ixjrfvjy6xa2lfd5g1xpc7s94"; buildDepends = [ base data-default hsass shakespeare template-haskell text yesod-core ]; - jailbreak = true; description = "A simple quasiquoter to include sass code in yesod"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -139990,8 +140175,8 @@ self: { }: mkDerivation { pname = "yesod-table"; - version = "1.0.0"; - sha256 = "0dy1rpwrccp6fcl91wb0f46djdkkzfdh870ylb9339msfgv9zchj"; + version = "1.0.1"; + sha256 = "0ixypahxrm23pahjq972r8kc4h2a14fidf1cx3wiip8wxfhc9jsi"; buildDepends = [ base containers contravariant text yesod-core ]; homepage = "https://github.com/andrewthad/yesod-table"; description = "HTML tables for Yesod"; @@ -140097,8 +140282,8 @@ self: { }: mkDerivation { pname = "yesod-transloadit"; - version = "0.2.0.0"; - sha256 = "0zr36i9bpf2x8jav31gb2gc3i8hyfn7k1yizvbk2zcjcp9iiphhw"; + version = "0.2.1.0"; + sha256 = "1x4sbjzlx5kxwcsywb90milk5s7shgggsqjsq7zrys28w079y00k"; buildDepends = [ aeson base byteable bytestring cryptohash lens lens-aeson old-locale shakespeare text time transformers yesod yesod-core @@ -140829,6 +141014,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "zero" = callPackage + ({ mkDerivation, base, semigroups }: + mkDerivation { + pname = "zero"; + version = "0.1.2"; + sha256 = "01hfsi29g42b4jj3ahddv1ry7qgav17pwpngipz8igq2w81v1y9p"; + buildDepends = [ base semigroups ]; + homepage = "https://github.com/phaazon/zero"; + description = "Semigroups with absorption"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "zeromq-haskell" = callPackage ({ mkDerivation, base, bytestring, containers, QuickCheck , test-framework, test-framework-quickcheck2, zeromq diff --git a/pkgs/development/libraries/cpptest/default.nix b/pkgs/development/libraries/cpptest/default.nix new file mode 100644 index 00000000000..8bffeebd024 --- /dev/null +++ b/pkgs/development/libraries/cpptest/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "cpptest-1.1.2"; + + src = fetchurl { + url = "http://downloads.sourceforge.net/project/cpptest/cpptest/${name}/${name}.tar.gz"; + sha256 = "09v070a9dv6zq6hgj4v67i31zsis3s96psrnhlq9g4vhdcaxykwy"; + }; + + meta = with stdenv.lib; { + homepage = http://cpptest.sourceforge.net/; + description = "Simple C++ unit testing framework"; + maintainers = with maintainers; [ bosu ]; + license = stdenv.lib.licenses.lgpl3; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.12/default.nix b/pkgs/development/libraries/kde-frameworks-5.12/default.nix new file mode 100644 index 00000000000..d8f51fe7eb7 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.12/default.nix @@ -0,0 +1,228 @@ +# Maintainer's Notes: +# +# Minor updates: +# 1. Edit ./manifest.sh to point to the updated URL. Upstream sometimes +# releases updates that include only the changed packages; in this case, +# multiple URLs can be provided and the results will be merged. +# 2. Run ./manifest.sh and ./dependencies.sh. +# 3. Build and enjoy. +# +# Major updates: +# We prefer not to immediately overwrite older versions with major updates, so +# make a copy of this directory first. After copying, be sure to delete ./tmp +# if it exists. Then follow the minor update instructions. + +{ pkgs, newScope, qt5 ? null, debug ? false }: + +let inherit (pkgs) autonix stdenv symlinkJoin; in + +with autonix; let inherit (stdenv) lib; in + +let + qt5_ = if qt5 != null then qt5 else pkgs.qt54; +in + +let + + qt5 = qt5_; + + super = + let json = builtins.fromJSON (builtins.readFile ./packages.json); + mirrorUrl = n: pkg: pkg // { + src = pkg.src // { url = "mirror://kde/${pkg.src.url}"; }; + }; + renames = builtins.fromJSON (builtins.readFile ./renames.json); + propagated = [ "extra-cmake-modules" ]; + native = [ + "bison" + "extra-cmake-modules" + "flex" + "kdoctools" + "ki18n" + "libxslt" + "perl" + "pythoninterp" + ]; + user = [ + "qt5" + "qt5core" + "qt5dbus" + "qt5gui" + "qt5qml" + "qt5quick" + "qt5svg" + "qt5webkitwidgets" + "qt5widgets" + "qt5x11extras" + "shareddesktopontologies" + "sharedmimeinfo" + ]; + in lib.fold (f: attrs: f attrs) json [ + (lib.mapAttrs kdePackage) + (userEnvDeps user) + (nativeDeps native) + (propagateDeps propagated) + (renameDeps renames) + (lib.mapAttrs mirrorUrl) + ]; + + kdePackage = name: pkg: + let defaultOverride = drv: drv // { + setupHook = ./setup-hook.sh; + cmakeFlags = + (drv.cmakeFlags or []) + ++ [ "-DBUILD_TESTING=OFF" ] + ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug"; + meta = { + license = with stdenv.lib.licenses; [ + lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 + ]; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ ttuegel ]; + homepage = "http://www.kde.org"; + }; + }; + callPackage = newScope { + inherit (stdenv) mkDerivation; + inherit (pkgs) fetchurl; + inherit scope; + }; + in mkPackage callPackage defaultOverride name pkg; + + scope = + # packages in this collection + self // + # packages pinned to this version of Qt 5 + { + dbusmenu-qt5 = pkgs.libdbusmenu_qt5.override { inherit qt5; }; + phonon4qt5 = pkgs.phonon_qt5.override { inherit qt5; }; + polkit_qt5 = pkgs.polkit_qt5.override { inherit qt5; }; + qt5 = qt5.base; + qt5core = qt5.base; + qt5dbus = qt5.base; + qt5gui = qt5.base; + qt5linguisttools = qt5.tools; + qt5qml = [qt5.declarative qt5.graphicaleffects]; + qt5quick = [qt5.quickcontrols qt5.graphicaleffects]; + qt5script = qt5.script; + qt5svg = qt5.svg; + qt5webkitwidgets = qt5.webkit; + qt5widgets = qt5.base; + qt5x11extras = qt5.x11extras; + qt5xmlpatterns = qt5.xmlpatterns; + } // + # packages from the nixpkgs collection + (with pkgs; + { + inherit acl cmake docbook_xml_dtd_45 docbook5_xsl epoxy fam gpgme + libgcrypt libgit2 modemmanager networkmanager perl + perlPackages qimageblitz xlibs zlib; + boost = boost156; + gif = giflib; + glib2 = glib; + jpeg = libjpeg; + libintl = gettext; + liblzma = lzma; + pythoninterp = python; + pythonlibrary = python; + sharedmimeinfo = shared_mime_info; + } + ); + + self = super // { + bluez-qt = overrideDerivation super.bluez-qt (drv: { + preConfigure = '' + substituteInPlace CMakeLists.txt \ + --replace /lib/udev/rules.d "$out/lib/udev/rules.d" + ''; + }); + + extra-cmake-modules = overrideDerivation super.extra-cmake-modules (drv: { + buildInputs = []; + nativeBuildInputs = []; + propagatedBuildInputs = []; + propagatedNativeBuildInputs = [ scope.cmake pkgs.pkgconfig qt5.tools ]; + propagatedUserEnvPkgs = []; + cmakeFlags = ["-DBUILD_TESTING=OFF"]; + patches = [./extra-cmake-modules/0001-extra-cmake-modules-paths.patch]; + meta = { + license = stdenv.lib.licenses.bsd2; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ ttuegel ]; + homepage = "http://www.kde.org"; + }; + }); + + frameworkintegration = extendDerivation super.frameworkintegration { + buildInputs = [ scope.xlibs.libXcursor ]; + }; + + kauth = extendDerivation super.kauth { + buildInputs = [ scope.polkit_qt5 ]; + patches = [ ./kauth/kauth-policy-install.patch ]; + }; + + kcmutils = extendDerivation super.kcmutils { + patches = [ ./kcmutils/kcmutils-pluginselector-follow-symlinks.patch ]; + }; + + kconfigwidgets = extendDerivation super.kconfigwidgets { + patches = [ ./kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch ]; + }; + + kdelibs4support = extendDerivation super.kdelibs4support { + buildInputs = [ scope.networkmanager scope.xlibs.libSM ]; + cmakeFlags = [ + "-DDocBookXML4_DTD_DIR=${pkgs.docbook_xml_dtd_45}/xml/dtd/docbook" + "-DDocBookXML4_DTD_VERSION=4.5" + ]; + }; + + kdoctools = extendDerivation super.kdoctools { + propagatedNativeBuildInputs = [ scope.perl scope.perlPackages.URI ]; + cmakeFlags = [ + "-DDocBookXML4_DTD_DIR=${scope.docbook_xml_dtd_45}/xml/dtd/docbook" + "-DDocBookXML4_DTD_VERSION=4.5" + "-DDocBookXSL_DIR=${scope.docbook5_xsl}/xml/xsl/docbook" + ]; + patches = [ ./kdoctools/kdoctools-no-find-docbook-xml.patch ]; + }; + + ki18n = extendDerivation super.ki18n { + propagatedNativeBuildInputs = with scope; [ libintl pythoninterp ]; + }; + + kimageformats = extendDerivation super.kimageformats { + NIX_CFLAGS_COMPILE = "-I${pkgs.ilmbase}/include/OpenEXR"; + }; + + kinit = extendDerivation super.kinit { + patches = [./kinit/0001-kinit-libpath.patch]; + }; + + kpackage = extendDerivation super.kpackage { + patches = [ ./kpackage/0001-allow-external-paths.patch ]; + }; + + kservice = extendDerivation super.kservice { + buildInputs = [ scope.kwindowsystem ]; + patches = [ + ./kservice/kservice-kbuildsycoca-follow-symlinks.patch + ./kservice/kservice-kbuildsycoca-no-canonicalize-path.patch + ]; + }; + + ktexteditor = extendDerivation super.ktexteditor { + patches = [ ./ktexteditor/0001-no-qcoreapplication.patch ]; + }; + + kwallet = extendDerivation super.kwallet { + buildInputs = [ scope.kdoctools ]; + }; + + networkmanager-qt = extendDerivation super.networkmanager-qt { + propagatedBuildInputs = [ scope.networkmanager ]; + }; + }; + +in self diff --git a/pkgs/development/libraries/kde-frameworks-5.12/dependencies.sh b/pkgs/development/libraries/kde-frameworks-5.12/dependencies.sh new file mode 100755 index 00000000000..2b220244c59 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.12/dependencies.sh @@ -0,0 +1,22 @@ +#!/bin/sh + +# This script rebuilds dependencies.nix. +# You must run manifest.sh first to download the packages. + +# Without arguments, this will use the version of autonix-deps-kf5 in nixpkgs. +# If you are working on the packages, this is probably what you want. + +# You can also pass the path to a source tree where you have built +# autonix-deps-kf5 yourself. If you are working on autonix-deps-kf5, this is +# probably what you want. + +manifestXML=$(nix-build -E 'with (import ../../../.. {}); autonix.writeManifestXML ./manifest.nix') + +autonixDepsKf5="" +if [[ -z $1 ]]; then + autonixDepsKF5=$(nix-build ../../../.. -A haskellngPackages.autonix-deps-kf5)/bin +else + autonixDepsKF5="$1/dist/build/kf5-deps" +fi + +exec ${autonixDepsKF5}/kf5-deps "${manifestXML}" diff --git a/pkgs/development/libraries/kde-frameworks-5.12/extra-cmake-modules/0001-extra-cmake-modules-paths.patch b/pkgs/development/libraries/kde-frameworks-5.12/extra-cmake-modules/0001-extra-cmake-modules-paths.patch new file mode 100644 index 00000000000..9717716faf5 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.12/extra-cmake-modules/0001-extra-cmake-modules-paths.patch @@ -0,0 +1,74 @@ +From 3cc148e878b69fc3e0228f3e3bf1bbe689dad87c Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Fri, 20 Feb 2015 23:17:39 -0600 +Subject: [PATCH] extra-cmake-modules paths + +--- + kde-modules/KDEInstallDirs.cmake | 37 ++++--------------------------------- + 1 file changed, 4 insertions(+), 33 deletions(-) + +diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake +index b7cd34d..2f868ac 100644 +--- a/kde-modules/KDEInstallDirs.cmake ++++ b/kde-modules/KDEInstallDirs.cmake +@@ -193,37 +193,8 @@ + # (To distribute this file outside of extra-cmake-modules, substitute the full + # License text for the above reference.) + +-# Figure out what the default install directory for libraries should be. +-# This is based on the logic in GNUInstallDirs, but simplified (the +-# GNUInstallDirs code deals with re-configuring, but that is dealt with +-# by the _define_* macros in this module). ++# The default library directory on NixOS is *always* /lib. + set(_LIBDIR_DEFAULT "lib") +-# Override this default 'lib' with 'lib64' iff: +-# - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling +-# - we are NOT on debian +-# - we are on a 64 bits system +-# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf +-# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if +-# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu" +-# See http://wiki.debian.org/Multiarch +-if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU") +- AND NOT CMAKE_CROSSCOMPILING) +- if (EXISTS "/etc/debian_version") # is this a debian system ? +- if(CMAKE_LIBRARY_ARCHITECTURE) +- set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}") +- endif() +- else() # not debian, rely on CMAKE_SIZEOF_VOID_P: +- if(NOT DEFINED CMAKE_SIZEOF_VOID_P) +- message(AUTHOR_WARNING +- "Unable to determine default LIB_INSTALL_LIBDIR directory because no target architecture is known. " +- "Please enable at least one language before including KDEInstallDirs.") +- else() +- if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") +- set(_LIBDIR_DEFAULT "lib64") +- endif() +- endif() +- endif() +-endif() + + set(_gnu_install_dirs_vars + BINDIR +@@ -445,15 +416,15 @@ if(KDE_INSTALL_USE_QT_SYS_PATHS) + "QtQuick2 imports" + QML_INSTALL_DIR) + else() +- _define_relative(QTPLUGINDIR LIBDIR "plugins" ++ _define_relative(QTPLUGINDIR LIBDIR "qt5/plugins" + "Qt plugins" + QT_PLUGIN_INSTALL_DIR) + +- _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "imports" ++ _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "qt5/imports" + "QtQuick1 imports" + IMPORTS_INSTALL_DIR) + +- _define_relative(QMLDIR LIBDIR "qml" ++ _define_relative(QMLDIR LIBDIR "qt5/qml" + "QtQuick2 imports" + QML_INSTALL_DIR) + endif() +-- +2.3.0 + diff --git a/pkgs/development/libraries/kde-frameworks-5.12/kauth/kauth-policy-install.patch b/pkgs/development/libraries/kde-frameworks-5.12/kauth/kauth-policy-install.patch new file mode 100644 index 00000000000..340155256f2 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.12/kauth/kauth-policy-install.patch @@ -0,0 +1,13 @@ +diff --git a/KF5AuthConfig.cmake.in b/KF5AuthConfig.cmake.in +index e859ec7..9a8ab18 100644 +--- a/KF5AuthConfig.cmake.in ++++ b/KF5AuthConfig.cmake.in +@@ -4,7 +4,7 @@ set(KAUTH_STUB_FILES_DIR "${PACKAGE_PREFIX_DIR}/@KF5_DATA_INSTALL_DIR@/kauth/") + + set(KAUTH_BACKEND_NAME "@KAUTH_BACKEND_NAME@") + set(KAUTH_HELPER_BACKEND_NAME "@KAUTH_HELPER_BACKEND_NAME@") +-set(KAUTH_POLICY_FILES_INSTALL_DIR "@KAUTH_POLICY_FILES_INSTALL_DIR@") ++set(KAUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions") + set(KAUTH_HELPER_INSTALL_DIR "@KAUTH_HELPER_INSTALL_DIR@") + + find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@") diff --git a/pkgs/development/libraries/kde-frameworks-5.12/kcmutils/kcmutils-pluginselector-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.12/kcmutils/kcmutils-pluginselector-follow-symlinks.patch new file mode 100644 index 00000000000..47b8dfad180 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.12/kcmutils/kcmutils-pluginselector-follow-symlinks.patch @@ -0,0 +1,13 @@ +diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp +index c63241b..2243f94 100644 +--- a/src/kpluginselector.cpp ++++ b/src/kpluginselector.cpp +@@ -304,7 +304,7 @@ void KPluginSelector::addPlugins(const QString &componentName, + QStringList desktopFileNames; + const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory); + Q_FOREACH (const QString &dir, dirs) { +- QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories); ++ QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); + while (it.hasNext()) { + desktopFileNames.append(it.next()); + } diff --git a/pkgs/development/libraries/kde-frameworks-5.12/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.12/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch new file mode 100644 index 00000000000..3bd946cbd84 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.12/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch @@ -0,0 +1,13 @@ +diff --git a/src/khelpclient.cpp b/src/khelpclient.cpp +index 53a331e..80fbb01 100644 +--- a/src/khelpclient.cpp ++++ b/src/khelpclient.cpp +@@ -48,7 +48,7 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname) + QString docPath; + const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation); + Q_FOREACH (const QString &dir, desktopDirs) { +- QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories); ++ QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); + while (it.hasNext()) { + const QString desktopPath(it.next()); + KDesktopFile desktopFile(desktopPath); diff --git a/pkgs/development/libraries/kde-frameworks-5.12/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/development/libraries/kde-frameworks-5.12/kdoctools/kdoctools-no-find-docbook-xml.patch new file mode 100644 index 00000000000..4e3a33efab3 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.12/kdoctools/kdoctools-no-find-docbook-xml.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5c4863c..f731775 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -46,7 +46,6 @@ set_package_properties(LibXml2 PROPERTIES + ) + + +-find_package(DocBookXML4 "4.5") + + set_package_properties(DocBookXML4 PROPERTIES + TYPE REQUIRED diff --git a/pkgs/development/libraries/kde-frameworks-5.12/kinit/0001-kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks-5.12/kinit/0001-kinit-libpath.patch new file mode 100644 index 00000000000..9c76079a382 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.12/kinit/0001-kinit-libpath.patch @@ -0,0 +1,42 @@ +From 723c9b1268a04127647a1c20eebe9804150566dd Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Sat, 13 Jun 2015 08:57:55 -0500 +Subject: [PATCH] kinit libpath + +--- + src/kdeinit/kinit.cpp | 18 ++++++++++-------- + 1 file changed, 10 insertions(+), 8 deletions(-) + +diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp +index 9e775b6..0ac5646 100644 +--- a/src/kdeinit/kinit.cpp ++++ b/src/kdeinit/kinit.cpp +@@ -660,15 +660,17 @@ static pid_t launch(int argc, const char *_name, const char *args, + if (!libpath.isEmpty()) { + if (!l.load()) { + if (libpath_relative) { +- // NB: Because Qt makes the actual dlopen() call, the +- // RUNPATH of kdeinit is *not* respected - see +- // https://sourceware.org/bugzilla/show_bug.cgi?id=13945 +- // - so we try hacking it in ourselves +- QString install_lib_dir = QFile::decodeName( +- CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/"); +- libpath = install_lib_dir + libpath; +- l.setFileName(libpath); ++ // Use QT_PLUGIN_PATH to find shared library directories ++ // For KF5, the plugin path is /lib/qt5/plugins/, so kdeinit5 ++ // shared libraries should be in /lib/qt5/plugins/../../ ++ const QRegExp pathSepRegExp(QString::fromLatin1("[:\b]")); ++ const QString up = QString::fromLocal8Bit("/../../"); ++ const QStringList paths = QString::fromLocal8Bit(qgetenv("QT_PLUGIN_PATH")).split(pathSepRegExp, QString::KeepEmptyParts); ++ Q_FOREACH (const QString &path, paths) { ++ l.setFileName(path + up + libpath); + l.load(); ++ if (l.isLoaded()) break; ++ } + } + } + if (!l.isLoaded()) { +-- +2.4.2 + diff --git a/pkgs/development/libraries/kde-frameworks-5.12/kpackage/0001-allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.12/kpackage/0001-allow-external-paths.patch new file mode 100644 index 00000000000..440e979c008 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.12/kpackage/0001-allow-external-paths.patch @@ -0,0 +1,25 @@ +From fbf10d2059fa1f19a0f0cfa2fda0abb6c435fa78 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Wed, 28 Jan 2015 07:15:30 -0600 +Subject: [PATCH] allow external paths + +--- + src/kpackage/package.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/kpackage/package.cpp b/src/kpackage/package.cpp +index eb4a09b..f70f1a1 100644 +--- a/src/kpackage/package.cpp ++++ b/src/kpackage/package.cpp +@@ -758,7 +758,7 @@ PackagePrivate::PackagePrivate() + : QSharedData(), + fallbackPackage(0), + metadata(0), +- externalPaths(false), ++ externalPaths(true), + valid(false), + checkedValid(false) + { +-- +2.1.4 + diff --git a/pkgs/development/libraries/kde-frameworks-5.12/kservice/kservice-kbuildsycoca-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.12/kservice/kservice-kbuildsycoca-follow-symlinks.patch new file mode 100644 index 00000000000..e9bc418544a --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.12/kservice/kservice-kbuildsycoca-follow-symlinks.patch @@ -0,0 +1,13 @@ +diff --git a/src/kbuildsycoca/kbuildsycoca.cpp b/src/kbuildsycoca/kbuildsycoca.cpp +index 69b1427..9c37a49 100644 +--- a/src/kbuildsycoca/kbuildsycoca.cpp ++++ b/src/kbuildsycoca/kbuildsycoca.cpp +@@ -227,7 +227,7 @@ bool KBuildSycoca::build() + QStringList relFiles; + const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, g_resourceSubdir, QStandardPaths::LocateDirectory); + Q_FOREACH (const QString &dir, dirs) { +- QDirIterator it(dir, QDirIterator::Subdirectories); ++ QDirIterator it(dir, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); + while (it.hasNext()) { + const QString filePath = it.next(); + Q_ASSERT(filePath.startsWith(dir)); // due to the line below... diff --git a/pkgs/development/libraries/kde-frameworks-5.12/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.12/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch new file mode 100644 index 00000000000..7e21ebfe86f --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.12/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch @@ -0,0 +1,13 @@ +diff --git a/src/kbuildsycoca/vfolder_menu.cpp b/src/kbuildsycoca/vfolder_menu.cpp +index 2eb1275..e39a36f 100644 +--- a/src/kbuildsycoca/vfolder_menu.cpp ++++ b/src/kbuildsycoca/vfolder_menu.cpp +@@ -412,7 +412,7 @@ VFolderMenu::absoluteDir(const QString &_dir, const QString &baseDir, bool keepR + } + + if (!relative) { +- QString resolved = QDir(dir).canonicalPath(); ++ QString resolved = QDir::cleanPath(dir); + if (!resolved.isEmpty()) { + dir = resolved; + } diff --git a/pkgs/development/libraries/kde-frameworks-5.12/ktexteditor/0001-no-qcoreapplication.patch b/pkgs/development/libraries/kde-frameworks-5.12/ktexteditor/0001-no-qcoreapplication.patch new file mode 100644 index 00000000000..c2e77a537c5 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.12/ktexteditor/0001-no-qcoreapplication.patch @@ -0,0 +1,48 @@ +From 71e28c7c6fdd1142f04c662f45cc8f779e457cda Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Sun, 15 Feb 2015 19:09:17 -0600 +Subject: [PATCH] no qcoreapplication + +--- + src/syntax/data/katehighlightingindexer.cpp | 11 ++++------- + 1 file changed, 4 insertions(+), 7 deletions(-) + +diff --git a/src/syntax/data/katehighlightingindexer.cpp b/src/syntax/data/katehighlightingindexer.cpp +index 3f02e8c..d1a865b 100644 +--- a/src/syntax/data/katehighlightingindexer.cpp ++++ b/src/syntax/data/katehighlightingindexer.cpp +@@ -49,19 +49,16 @@ QStringList readListing(const QString &fileName) + + int main(int argc, char *argv[]) + { +- // get app instance +- QCoreApplication app(argc, argv); +- + // ensure enough arguments are passed +- if (app.arguments().size() < 3) ++ if (argc < 3) + return 1; + + // open schema + QXmlSchema schema; +- if (!schema.load(QUrl::fromLocalFile(app.arguments().at(2)))) ++ if (!schema.load(QUrl::fromLocalFile(QString::fromLocal8Bit(argv[2])))) + return 2; + +- const QString hlFilenamesListing = app.arguments().value(3); ++ const QString hlFilenamesListing = QString::fromLocal8Bit(argv[3]); + if (hlFilenamesListing.isEmpty()) { + return 1; + } +@@ -127,7 +124,7 @@ int main(int argc, char *argv[]) + return anyError; + + // create outfile, after all has worked! +- QFile outFile(app.arguments().at(1)); ++ QFile outFile(QString::fromLocal8Bit(argv[1])); + if (!outFile.open(QIODevice::WriteOnly | QIODevice::Truncate)) + return 7; + +-- +2.1.4 + diff --git a/pkgs/development/libraries/kde-frameworks-5.12/packages.json b/pkgs/development/libraries/kde-frameworks-5.12/packages.json new file mode 100644 index 00000000000..f5951517266 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.12/packages.json @@ -0,0 +1,2116 @@ +{ + "kwallet": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "qt5gui" + ], + "name": "kwallet-5.12.0", + "src": { + "url": "stable/frameworks/5.12/kwallet-5.12.0.tar.xz", + "name": "kwallet-5.12.0.tar.xz", + "sha256": "0i45qf4j42172jr4mz3xzw589frp4xw86b2j3rhgzipfi26cx3zd" + }, + "buildInputs": [ + "ecm", + "gpgme", + "kf5config", + "kf5coreaddons", + "kf5dbusaddons", + "kf5gpgmepp", + "kf5i18n", + "kf5iconthemes", + "kf5notifications", + "kf5service", + "kf5widgetsaddons", + "kf5windowsystem", + "libgcrypt", + "qt5", + "qt5dbus", + "qt5gui", + "qt5test", + "qt5widgets" + ] + }, + "kdewebkit": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "qt5webkitwidgets" + ], + "name": "kdewebkit-5.12.0", + "src": { + "url": "stable/frameworks/5.12/kdewebkit-5.12.0.tar.xz", + "name": "kdewebkit-5.12.0.tar.xz", + "sha256": "09r0bvjgvb9ar13whr4ar21r4kzjwa4zipn6iqzx9n0xxwn2mxjv" + }, + "buildInputs": [ + "ecm", + "kf5config", + "kf5coreaddons", + "kf5jobwidgets", + "kf5kio", + "kf5parts", + "kf5service", + "kf5wallet", + "qt5", + "qt5core", + "qt5network", + "qt5webkitwidgets", + "qt5widgets" + ] + }, + "kbookmarks": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "kf5widgetsaddons", + "qt5widgets", + "qt5xml" + ], + "name": "kbookmarks-5.12.0", + "src": { + "url": "stable/frameworks/5.12/kbookmarks-5.12.0.tar.xz", + "name": "kbookmarks-5.12.0.tar.xz", + "sha256": "07xayi77h9wg2f4pnwgjbicbfqk42lphqvcha9sn97p0hnzl1g5h" + }, + "buildInputs": [ + "ecm", + "kf5codecs", + "kf5config", + "kf5configwidgets", + "kf5coreaddons", + "kf5iconthemes", + "kf5widgetsaddons", + "kf5xmlgui", + "qt5", + "qt5dbus", + "qt5test", + "qt5widgets", + "qt5xml" + ] + }, + "bluez-qt": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "qt5core" + ], + "name": "bluez-qt-5.12.0", + "src": { + "url": "stable/frameworks/5.12/bluez-qt-5.12.0.tar.xz", + "name": "bluez-qt-5.12.0.tar.xz", + "sha256": "1asgcvspwra52ywfk6v4mv1fdxkshyh5zyqnwljbbs1a1n8g8gl0" + }, + "buildInputs": [ + "ecm", + "qt5", + "qt5core", + "qt5dbus", + "qt5network", + "qt5qml", + "qt5quicktest", + "qt5test" + ] + }, + "threadweaver": { + "nativeBuildInputs": [ + "cmake", + "snippetextractor" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "qt5core" + ], + "name": "threadweaver-5.12.0", + "src": { + "url": "stable/frameworks/5.12/threadweaver-5.12.0.tar.xz", + "name": "threadweaver-5.12.0.tar.xz", + "sha256": "1xswh5k48n3nq5v8zgc3qyldky8pq3xgsbsgjg1is5pgayw4j08b" + }, + "buildInputs": [ + "ecm", + "kf5threadweaver", + "qt5", + "qt5core", + "qt5network", + "qt5test", + "qt5widgets", + "qt5xml" + ] + }, + "kcompletion": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "qt5widgets" + ], + "name": "kcompletion-5.12.0", + "src": { + "url": "stable/frameworks/5.12/kcompletion-5.12.0.tar.xz", + "name": "kcompletion-5.12.0.tar.xz", + "sha256": "0g4gvc9r0l7ng7jv0hkp8khhlckgwzpix5hsjjcmzggfkhsl4sj0" + }, + "buildInputs": [ + "ecm", + "kf5config", + "kf5widgetsaddons", + "qt5", + "qt5test", + "qt5widgets" + ] + }, + "kwidgetsaddons": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "qt5widgets" + ], + "name": "kwidgetsaddons-5.12.0", + "src": { + "url": "stable/frameworks/5.12/kwidgetsaddons-5.12.0.tar.xz", + "name": "kwidgetsaddons-5.12.0.tar.xz", + "sha256": "12n3c3j6nawrhgc9mqk627q1brjvbdxkm52g0mnm5c5ql953gqs6" + }, + "buildInputs": [ + "ecm", + "qt5", + "qt5test", + "qt5uitools", + "qt5widgets" + ] + }, + "kxmlrpcclient": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "kf5kio" + ], + "name": "kxmlrpcclient-5.12.0", + "src": { + "url": "stable/frameworks/5.12/kxmlrpcclient-5.12.0.tar.xz", + "name": "kxmlrpcclient-5.12.0.tar.xz", + "sha256": "1ysw61kcx0i6il6r782jdyr2a9n8hy0j5mgpd7slr57mrcfgsivd" + }, + "buildInputs": [ + "ecm", + "kf5i18n", + "kf5kio", + "qt5test" + ] + }, + "extra-cmake-modules": { + "nativeBuildInputs": [ + "cmake", + "qcollectiongenerator_executable", + "sphinx_executable" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [], + "name": "extra-cmake-modules-5.12.0", + "src": { + "url": "stable/frameworks/5.12/extra-cmake-modules-5.12.0.tar.xz", + "name": "extra-cmake-modules-5.12.0.tar.xz", + "sha256": "14n77sn493m8kzr42wv13mdgxpnbx7x64bvw37ircrx8wmf4002i" + }, + "buildInputs": [ + "agg", + "blitz", + "bluez", + "eigen2", + "enchant", + "ffmpeg", + "flac", + "flex", + "gobject", + "gstreamer", + "lcms", + "libart", + "libxslt", + "openexr", + "pcre", + "qca2", + "qimageblitz", + "qt5core", + "qt5linguisttools", + "sqlite", + "strigi", + "usb", + "xine", + "xmms" + ] + }, + "kidletime": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "qt5core" + ], + "name": "kidletime-5.12.0", + "src": { + "url": "stable/frameworks/5.12/kidletime-5.12.0.tar.xz", + "name": "kidletime-5.12.0.tar.xz", + "sha256": "1rpvj4q07sc17an4274pcszdsqjdl8x33ln3lmw5x2q27v5d22qc" + }, + "buildInputs": [ + "ecm", + "qt5", + "qt5dbus", + "qt5widgets", + "qt5x11extras", + "x11", + "x11_xcb", + "xcb" + ] + }, + "kitemmodels": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "qt5core" + ], + "name": "kitemmodels-5.12.0", + "src": { + "url": "stable/frameworks/5.12/kitemmodels-5.12.0.tar.xz", + "name": "kitemmodels-5.12.0.tar.xz", + "sha256": "0wmsb59svzk0iay9ynbjbdgqxph1cpvifvvnlxc67a5nzhgk5cms" + }, + "buildInputs": [ + "ecm", + "grantlee", + "qt5", + "qt5core", + "qt5quickwidgets", + "qt5script", + "qt5test", + "qt5widgets" + ] + }, + "attica": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "qt5core" + ], + "name": "attica-5.12.0", + "src": { + "url": "stable/frameworks/5.12/attica-5.12.0.tar.xz", + "name": "attica-5.12.0.tar.xz", + "sha256": "05311rr7zsfwzq3569gg2gkq6rksvhdji1x0jv8zxax5a1n40gc7" + }, + "buildInputs": [ + "ecm", + "qt5", + "qt5core", + "qt5network", + "qt5test", + "qt5widgets" + ] + }, + "kwindowsystem": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "qt5widgets" + ], + "name": "kwindowsystem-5.12.0", + "src": { + "url": "stable/frameworks/5.12/kwindowsystem-5.12.0.tar.xz", + "name": "kwindowsystem-5.12.0.tar.xz", + "sha256": "0fjxhf07r186cmp0mjvinrwxg4z90zlyvycqhy0n18fdp67szckl" + }, + "buildInputs": [ + "ecm", + "qt5", + "qt5test", + "qt5widgets", + "qt5winextras", + "qt5x11extras", + "x11", + "xcb" + ] + }, + "ki18n": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [], + "name": "ki18n-5.12.0", + "src": { + "url": "stable/frameworks/5.12/ki18n-5.12.0.tar.xz", + "name": "ki18n-5.12.0.tar.xz", + "sha256": "11bivhaiqk8rlnz288ghnbjp3i2kdivmrzscjjnyqw25rpjj4drz" + }, + "buildInputs": [ + "ecm", + "libintl", + "qt5", + "qt5concurrent", + "qt5core", + "qt5script", + "qt5test" + ] + }, + "knewstuff": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "kf5attica", + "kf5service", + "kf5xmlgui", + "qt5widgets" + ], + "name": "knewstuff-5.12.0", + "src": { + "url": "stable/frameworks/5.12/knewstuff-5.12.0.tar.xz", + "name": "knewstuff-5.12.0.tar.xz", + "sha256": "03zxj81a4hy46azh047xxfmr4mjp8ri7hzcxspi31hmr8gf1hxv9" + }, + "buildInputs": [ + "ecm", + "kf5archive", + "kf5attica", + "kf5completion", + "kf5config", + "kf5coreaddons", + "kf5i18n", + "kf5iconthemes", + "kf5itemviews", + "kf5kio", + "kf5service", + "kf5textwidgets", + "kf5widgetsaddons", + "kf5xmlgui", + "qt5", + "qt5test", + "qt5widgets", + "qt5xml" + ] + }, + "kdelibs4support": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "kdewin", + "kf5archive", + "kf5auth", + "kf5configwidgets", + "kf5coreaddons", + "kf5crash", + "kf5dbusaddons", + "kf5designerplugin", + "kf5doctools", + "kf5emoticons", + "kf5guiaddons", + "kf5iconthemes", + "kf5init", + "kf5itemmodels", + "kf5kdelibs4support", + "kf5notifications", + "kf5parts", + "kf5textwidgets", + "kf5unitconversion", + "kf5windowsystem", + "qt5dbus", + "qt5printsupport", + "qt5xml" + ], + "name": "kdelibs4support-5.12.0", + "src": { + "url": "stable/frameworks/5.12/portingAids/kdelibs4support-5.12.0.tar.xz", + "name": "kdelibs4support-5.12.0.tar.xz", + "sha256": "0hbs1gwqgx4sc8cma1q5pyanf2kj5brfz9dph5xcf32bijz2ds4f" + }, + "buildInputs": [ + "agg", + "blitz", + "bluez", + "docbookxml4", + "ecm", + "eigen2", + "enchant", + "ffmpeg", + "flac", + "gobject", + "gstreamer", + "kdewin", + "kf5completion", + "kf5config", + "kf5configwidgets", + "kf5crash", + "kf5dbusaddons", + "kf5designerplugin", + "kf5doctools", + "kf5globalaccel", + "kf5guiaddons", + "kf5i18n", + "kf5iconthemes", + "kf5kio", + "kf5notifications", + "kf5parts", + "kf5service", + "kf5textwidgets", + "kf5unitconversion", + "kf5widgetsaddons", + "kf5windowsystem", + "kf5xmlgui", + "lcms", + "libart", + "networkmanager", + "openexr", + "openssl", + "pcre", + "qca2", + "qimageblitz", + "qntrack", + "qt5", + "qt5concurrent", + "qt5dbus", + "qt5designer", + "qt5network", + "qt5printsupport", + "qt5svg", + "qt5test", + "qt5widgets", + "qt5x11extras", + "sqlite", + "usb", + "x11", + "xine", + "xmms" + ] + }, + "sonnet": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "qt5core" + ], + "name": "sonnet-5.12.0", + "src": { + "url": "stable/frameworks/5.12/sonnet-5.12.0.tar.xz", + "name": "sonnet-5.12.0.tar.xz", + "sha256": "1rr5dbs9477mf8lacmk5dcvw0h3s597l4miwm4j3rmn9jpvlcm1l" + }, + "buildInputs": [ + "aspell", + "ecm", + "enchant", + "hspell", + "hunspell", + "qt5", + "qt5test", + "qt5widgets", + "zlib" + ] + }, + "networkmanager-qt": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "qt5core" + ], + "name": "networkmanager-qt-5.12.0", + "src": { + "url": "stable/frameworks/5.12/networkmanager-qt-5.12.0.tar.xz", + "name": "networkmanager-qt-5.12.0.tar.xz", + "sha256": "0znwp1nyw47dpq48m1c1y250msm2lh9hipzjmgvh2mqr60vvy094" + }, + "buildInputs": [ + "ecm", + "networkmanager", + "qt4", + "qt5", + "qt5core", + "qt5dbus", + "qt5network", + "qt5test" + ] + }, + "solid": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "qt5core" + ], + "name": "solid-5.12.0", + "src": { + "url": "stable/frameworks/5.12/solid-5.12.0.tar.xz", + "name": "solid-5.12.0.tar.xz", + "sha256": "0s3xjrc5v350s0w26jpzb427h0nx6bhqldv7qswknrqir5x6zymj" + }, + "buildInputs": [ + "bison", + "ecm", + "flex", + "iokit", + "mediaplayerinfo", + "qt5", + "qt5concurrent", + "qt5dbus", + "qt5network", + "qt5qml", + "qt5test", + "qt5widgets", + "qt5xml", + "udev" + ] + }, + "modemmanager-qt": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "qt5core" + ], + "name": "modemmanager-qt-5.12.0", + "src": { + "url": "stable/frameworks/5.12/modemmanager-qt-5.12.0.tar.xz", + "name": "modemmanager-qt-5.12.0.tar.xz", + "sha256": "1s9ayfpkpkkrqss3x2swb2fzg5zxja8qkawwy59crf9xjfk3gwxi" + }, + "buildInputs": [ + "ecm", + "kf5modemmanagerqt", + "modemmanager", + "qt4", + "qt5", + "qt5core", + "qt5dbus", + "qt5test", + "qt5xml" + ] + }, + "kactivities": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "qt5core" + ], + "name": "kactivities-5.12.0", + "src": { + "url": "stable/frameworks/5.12/kactivities-5.12.0.tar.xz", + "name": "kactivities-5.12.0.tar.xz", + "sha256": "1rv5fb5gx7nkksy857aqbsvgkkw0fc0zs8yab3b4hyv4ybqx4j2q" + }, + "buildInputs": [ + "boost", + "ecm", + "kf5", + "kf5config", + "kf5coreaddons", + "kf5dbusaddons", + "kf5declarative", + "kf5globalaccel", + "kf5i18n", + "kf5kcmutils", + "kf5kio", + "kf5service", + "kf5windowsystem", + "kf5xmlgui", + "qt5", + "qt5core", + "qt5dbus", + "qt5gui", + "qt5qml", + "qt5quick", + "qt5quickwidgets", + "qt5sql", + "qt5test", + "qt5widgets" + ] + }, + "kpeople": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "qt5core" + ], + "name": "kpeople-5.12.0", + "src": { + "url": "stable/frameworks/5.12/kpeople-5.12.0.tar.xz", + "name": "kpeople-5.12.0.tar.xz", + "sha256": "0p8qamrxcfxb0f7fsrjn1k5vhi8hmd2iph6b5bjblfpwgw2f44r8" + }, + "buildInputs": [ + "ecm", + "kf5coreaddons", + "kf5i18n", + "kf5itemviews", + "kf5service", + "kf5widgetsaddons", + "qt5", + "qt5dbus", + "qt5gui", + "qt5qml", + "qt5quick", + "qt5sql", + "qt5test", + "qt5widgets" + ] + }, + "kcrash": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "qt5core" + ], + "name": "kcrash-5.12.0", + "src": { + "url": "stable/frameworks/5.12/kcrash-5.12.0.tar.xz", + "name": "kcrash-5.12.0.tar.xz", + "sha256": "00m69f0wrykrdhiyasfpwykrkh4r05hldr8yjvw2sn62gb1s45pg" + }, + "buildInputs": [ + "ecm", + "kf5coreaddons", + "kf5windowsystem", + "qt5", + "qt5core", + "qt5test", + "qt5widgets", + "qt5x11extras", + "x11" + ] + }, + "kglobalaccel": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "qt5dbus", + "qt5widgets" + ], + "name": "kglobalaccel-5.12.0", + "src": { + "url": "stable/frameworks/5.12/kglobalaccel-5.12.0.tar.xz", + "name": "kglobalaccel-5.12.0.tar.xz", + "sha256": "1p8kj31m4lyy6dr85383v6j8bg622xmw3x8kyiijlckd1zf2bmr8" + }, + "buildInputs": [ + "ecm", + "kf5config", + "kf5coreaddons", + "kf5crash", + "kf5dbusaddons", + "kf5windowsystem", + "qt5", + "qt5dbus", + "qt5test", + "qt5widgets", + "qt5x11extras", + "x11", + "xcb" + ] + }, + "kitemviews": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "qt5widgets" + ], + "name": "kitemviews-5.12.0", + "src": { + "url": "stable/frameworks/5.12/kitemviews-5.12.0.tar.xz", + "name": "kitemviews-5.12.0.tar.xz", + "sha256": "0swlp9kynsw708mm9b4bh2r9rcwqxqmkwaga4gg33cjchf0y8862" + }, + "buildInputs": [ + "ecm", + "qt5", + "qt5test", + "qt5widgets" + ] + }, + "kplotting": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "qt5widgets" + ], + "name": "kplotting-5.12.0", + "src": { + "url": "stable/frameworks/5.12/kplotting-5.12.0.tar.xz", + "name": "kplotting-5.12.0.tar.xz", + "sha256": "1xh0lbi7fxsz3gj2y762r9md85l8fp0l6kj5577444k4vswgaial" + }, + "buildInputs": [ + "ecm", + "qt5", + "qt5test", + "qt5widgets" + ] + }, + "kauth": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "kf5coreaddons" + ], + "name": "kauth-5.12.0", + "src": { + "url": "stable/frameworks/5.12/kauth-5.12.0.tar.xz", + "name": "kauth-5.12.0.tar.xz", + "sha256": "1ky3f16z4w0p97yzdfn3v4qs50wcir5p18cq6sakjhp95fxj1m2y" + }, + "buildInputs": [ + "ecm", + "kf5coreaddons", + "qt5", + "qt5dbus", + "qt5test", + "qt5widgets" + ] + }, + "plasma-framework": { + "nativeBuildInputs": [ + "cmake", + "sh" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "kf5package", + "kf5service" + ], + "name": "plasma-framework-5.12.0", + "src": { + "url": "stable/frameworks/5.12/plasma-framework-5.12.0.tar.xz", + "name": "plasma-framework-5.12.0.tar.xz", + "sha256": "07ma5nr3v3r9x9gc5sb3rhghci8cl0mm11f8dfawl3bvyzzhq3hm" + }, + "buildInputs": [ + "ecm", + "egl", + "gpgme", + "kactivities", + "kcoreaddons", + "kde4support", + "kdeclarative", + "kdepimlibs", + "kdesu", + "kf5", + "kf5activities", + "kf5archive", + "kf5auth", + "kf5bookmarks", + "kf5codecs", + "kf5completion", + "kf5config", + "kf5configwidgets", + "kf5coreaddons", + "kf5crash", + "kf5dbusaddons", + "kf5declarative", + "kf5doctools", + "kf5globalaccel", + "kf5guiaddons", + "kf5i18n", + "kf5iconthemes", + "kf5idletime", + "kf5init", + "kf5itemmodels", + "kf5itemviews", + "kf5jobwidgets", + "kf5js", + "kf5karchive", + "kf5kauth", + "kf5kbookmarks", + "kf5kcodecs", + "kf5kcompletion", + "kf5kconfig", + "kf5kconfigwidgets", + "kf5kcoreaddons", + "kf5kcrash", + "kf5kdbusaddons", + "kf5kde4support", + "kf5kdeclarative", + "kf5kdesu", + "kf5kdoctools", + "kf5kf5globalaccel", + "kf5kguiaddons", + "kf5ki18n", + "kf5kiconthemes", + "kf5kidletime", + "kf5kinit", + "kf5kio", + "kf5kjobwidgets", + "kf5kjs", + "kf5knotifications", + "kf5kparts", + "kf5kross", + "kf5kservice", + "kf5ktextwidgets", + "kf5kunitconversion", + "kf5kwallet", + "kf5kwidgetsaddons", + "kf5kwindowsystem", + "kf5notifications", + "kf5package", + "kf5parts", + "kf5service", + "kf5solid", + "kf5sonnet", + "kf5su", + "kf5textwidgets", + "kf5threadweaver", + "kf5unitconversion", + "kf5wallet", + "kf5widgetsaddons", + "kf5windowsystem", + "kf5xmlgui", + "opengl", + "qca2", + "qt5", + "qt5gui", + "qt5qml", + "qt5quick", + "qt5script", + "qt5sql", + "qt5svg", + "qt5test", + "qt5widgets", + "qt5x11extras", + "solid", + "x11", + "xcb" + ] + }, + "kguiaddons": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "qt5gui" + ], + "name": "kguiaddons-5.12.0", + "src": { + "url": "stable/frameworks/5.12/kguiaddons-5.12.0.tar.xz", + "name": "kguiaddons-5.12.0.tar.xz", + "sha256": "0s49vn617vaddnrpryivrpwmcdb95xincx2x86bsybdsss8nawp3" + }, + "buildInputs": [ + "ecm", + "qt5", + "qt5gui", + "qt5test", + "qt5widgets", + "qt5x11extras", + "x11", + "xcb" + ] + }, + "kservice": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "kf5config", + "kf5coreaddons" + ], + "name": "kservice-5.12.0", + "src": { + "url": "stable/frameworks/5.12/kservice-5.12.0.tar.xz", + "name": "kservice-5.12.0.tar.xz", + "sha256": "12zfxvzv34hbcwi325izlahr65cgd465hsj29ib3lgr0aadi8r0b" + }, + "buildInputs": [ + "ecm", + "kf5config", + "kf5coreaddons", + "kf5crash", + "kf5dbusaddons", + "kf5doctools", + "kf5i18n", + "qt5", + "qt5concurrent", + "qt5dbus", + "qt5test", + "qt5xml" + ] + }, + "khtml": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "kf5archive", + "kf5bookmarks", + "kf5globalaccel", + "kf5i18n", + "kf5iconthemes", + "kf5js", + "kf5kio", + "kf5notifications", + "kf5parts", + "kf5sonnet", + "kf5wallet", + "kf5widgetsaddons", + "kf5windowsystem", + "qt5core" + ], + "name": "khtml-5.12.0", + "src": { + "url": "stable/frameworks/5.12/portingAids/khtml-5.12.0.tar.xz", + "name": "khtml-5.12.0.tar.xz", + "sha256": "0f76x8zy81dd7y0qwkf7drwa3k2f4yzbr13w2i89yaa078l7p9sw" + }, + "buildInputs": [ + "ecm", + "gif", + "jpeg", + "kdewin", + "kf5archive", + "kf5codecs", + "kf5globalaccel", + "kf5i18n", + "kf5iconthemes", + "kf5js", + "kf5kio", + "kf5notifications", + "kf5parts", + "kf5sonnet", + "kf5textwidgets", + "kf5wallet", + "kf5widgetsaddons", + "kf5windowsystem", + "kf5xmlgui", + "openssl", + "perl", + "phonon4qt5", + "png", + "qt5", + "qt5test", + "qt5x11extras", + "x11" + ] + }, + "kded": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [], + "name": "kded-5.12.0", + "src": { + "url": "stable/frameworks/5.12/kded-5.12.0.tar.xz", + "name": "kded-5.12.0.tar.xz", + "sha256": "1876gc1kkz41kcmy78lnl212paygfhj0syvswbdpx3nq4gyyrkyx" + }, + "buildInputs": [ + "ecm", + "kf5config", + "kf5coreaddons", + "kf5crash", + "kf5dbusaddons", + "kf5doctools", + "kf5init", + "kf5service", + "qt5" + ] + }, + "kpty": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "kf5coreaddons" + ], + "name": "kpty-5.12.0", + "src": { + "url": "stable/frameworks/5.12/kpty-5.12.0.tar.xz", + "name": "kpty-5.12.0.tar.xz", + "sha256": "0gpvjdsag5fmdz5fmjna7wb6j64cpwzfk6rljg938xg0pidms6wc" + }, + "buildInputs": [ + "ecm", + "kf5coreaddons", + "kf5i18n", + "qt5", + "utempter" + ] + }, + "kross": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "kf5i18n", + "kf5iconthemes", + "kf5kio", + "kf5parts", + "kf5widgetsaddons", + "qt5script", + "qt5widgets", + "qt5xml" + ], + "name": "kross-5.12.0", + "src": { + "url": "stable/frameworks/5.12/portingAids/kross-5.12.0.tar.xz", + "name": "kross-5.12.0.tar.xz", + "sha256": "1s7vxsp992y8r39m1val4mylfcl084wsj391y5z333cdryr4wqwq" + }, + "buildInputs": [ + "ecm", + "kf5completion", + "kf5coreaddons", + "kf5doctools", + "kf5i18n", + "kf5iconthemes", + "kf5kio", + "kf5parts", + "kf5widgetsaddons", + "kf5xmlgui", + "qt5", + "qt5core", + "qt5script", + "qt5test", + "qt5uitools", + "qt5widgets", + "qt5xml" + ] + }, + "kxmlgui": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "kf5config", + "kf5configwidgets", + "qt5dbus", + "qt5widgets", + "qt5xml" + ], + "name": "kxmlgui-5.12.0", + "src": { + "url": "stable/frameworks/5.12/kxmlgui-5.12.0.tar.xz", + "name": "kxmlgui-5.12.0.tar.xz", + "sha256": "1v9nf3hrymikgy3d7lh9xcyw8dx1ndl8gsgmzfbxjli60fjniiyl" + }, + "buildInputs": [ + "ecm", + "kf5attica", + "kf5config", + "kf5configwidgets", + "kf5globalaccel", + "kf5i18n", + "kf5iconthemes", + "kf5itemviews", + "kf5textwidgets", + "kf5widgetsaddons", + "kf5windowsystem", + "qt5", + "qt5dbus", + "qt5network", + "qt5printsupport", + "qt5test", + "qt5widgets", + "qt5xml" + ] + }, + "kconfig": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "qt5xml" + ], + "name": "kconfig-5.12.0", + "src": { + "url": "stable/frameworks/5.12/kconfig-5.12.0.tar.xz", + "name": "kconfig-5.12.0.tar.xz", + "sha256": "1dxdf01kswigv7cdad9zjxg5iri479hi8gib3b72pwm24m0wc5ac" + }, + "buildInputs": [ + "ecm", + "qt5", + "qt5concurrent", + "qt5core", + "qt5gui", + "qt5test", + "qt5xml" + ] + }, + "kinit": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [], + "name": "kinit-5.12.0", + "src": { + "url": "stable/frameworks/5.12/kinit-5.12.0.tar.xz", + "name": "kinit-5.12.0.tar.xz", + "sha256": "19w1wgv9javrfmfq52bdvaazd3hqlf6hwdw09hc5935b043zx6cz" + }, + "buildInputs": [ + "ecm", + "kf5config", + "kf5crash", + "kf5doctools", + "kf5i18n", + "kf5kio", + "kf5service", + "kf5windowsystem", + "libcap", + "qt5", + "x11" + ] + }, + "kpackage": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "kf5coreaddons" + ], + "name": "kpackage-5.12.0", + "src": { + "url": "stable/frameworks/5.12/kpackage-5.12.0.tar.xz", + "name": "kpackage-5.12.0.tar.xz", + "sha256": "1a8cn1zqv930nmda8n45fnwc5al1iw7xdgqvydbgds7q0mqwg7l5" + }, + "buildInputs": [ + "ecm", + "kf5archive", + "kf5config", + "kf5coreaddons", + "kf5doctools", + "kf5i18n", + "qt5", + "qt5core", + "qt5test" + ] + }, + "karchive": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "qt5core" + ], + "name": "karchive-5.12.0", + "src": { + "url": "stable/frameworks/5.12/karchive-5.12.0.tar.xz", + "name": "karchive-5.12.0.tar.xz", + "sha256": "0dh6pskw1picj3f6a4bbhd9j9ki8l738x7f9dxfwcx05mzsliyl8" + }, + "buildInputs": [ + "bzip2", + "ecm", + "kf5archive", + "liblzma", + "qt5core", + "qt5test", + "zlib" + ] + }, + "kdesu": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "kf5pty" + ], + "name": "kdesu-5.12.0", + "src": { + "url": "stable/frameworks/5.12/kdesu-5.12.0.tar.xz", + "name": "kdesu-5.12.0.tar.xz", + "sha256": "1ks695j7wnb7j6vca7a3cb0ii0li4g7sdyksvqsmkxbb1rrpg11f" + }, + "buildInputs": [ + "ecm", + "kf5coreaddons", + "kf5i18n", + "kf5pty", + "kf5service", + "qt5core", + "x11" + ] + }, + "kimageformats": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [], + "name": "kimageformats-5.12.0", + "src": { + "url": "stable/frameworks/5.12/kimageformats-5.12.0.tar.xz", + "name": "kimageformats-5.12.0.tar.xz", + "sha256": "1h91xwj4xjv8z5a9hnid7zqcs35cwxv6hf3kwaag35vllm2cs0s7" + }, + "buildInputs": [ + "ecm", + "jasper", + "openexr", + "qt5gui", + "qt5printsupport", + "qt5test" + ] + }, + "kmediaplayer": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "kf5parts" + ], + "name": "kmediaplayer-5.12.0", + "src": { + "url": "stable/frameworks/5.12/portingAids/kmediaplayer-5.12.0.tar.xz", + "name": "kmediaplayer-5.12.0.tar.xz", + "sha256": "0yr5jjpfnjgfrzqpksl85k6jsgihdb5spf0k9478ryyzpzw3as15" + }, + "buildInputs": [ + "ecm", + "kf5parts", + "kf5xmlgui", + "qt5dbus", + "qt5test", + "qt5widgets" + ] + }, + "ktexteditor": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [], + "name": "ktexteditor-5.12.0", + "src": { + "url": "stable/frameworks/5.12/ktexteditor-5.12.0.tar.xz", + "name": "ktexteditor-5.12.0.tar.xz", + "sha256": "09fcyxanl744mrbpxw5sa1bvf18d9hcs305jaim8bgfw58gz7prl" + }, + "buildInputs": [ + "ecm", + "kf5archive", + "kf5config", + "kf5guiaddons", + "kf5i18n", + "kf5iconthemes", + "kf5kio", + "kf5parts", + "kf5sonnet", + "libgit2", + "perl", + "qt5", + "qt5core", + "qt5printsupport", + "qt5script", + "qt5test", + "qt5widgets", + "qt5xml", + "qt5xmlpatterns" + ] + }, + "kdesignerplugin": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [], + "name": "kdesignerplugin-5.12.0", + "src": { + "url": "stable/frameworks/5.12/kdesignerplugin-5.12.0.tar.xz", + "name": "kdesignerplugin-5.12.0.tar.xz", + "sha256": "05n5pfqabmmy5y8dvk7xz51nyky4k44vxhv7k9fq231cza07w3dg" + }, + "buildInputs": [ + "ecm", + "kf5completion", + "kf5config", + "kf5configwidgets", + "kf5coreaddons", + "kf5doctools", + "kf5iconthemes", + "kf5itemviews", + "kf5kio", + "kf5plotting", + "kf5sonnet", + "kf5textwidgets", + "kf5webkit", + "kf5widgetsaddons", + "kf5xmlgui", + "qt5core", + "qt5designer", + "qt5test", + "qt5widgets" + ] + }, + "kparts": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "kf5kio", + "kf5textwidgets", + "kf5xmlgui" + ], + "name": "kparts-5.12.0", + "src": { + "url": "stable/frameworks/5.12/kparts-5.12.0.tar.xz", + "name": "kparts-5.12.0.tar.xz", + "sha256": "075iqmjdmg8jlbmnpp4jjfr4way4i4c5zwg4c1d4cgd14rr9vm1r" + }, + "buildInputs": [ + "ecm", + "kf5config", + "kf5coreaddons", + "kf5i18n", + "kf5iconthemes", + "kf5jobwidgets", + "kf5kio", + "kf5notifications", + "kf5service", + "kf5textwidgets", + "kf5widgetsaddons", + "kf5xmlgui", + "qt5", + "qt5core", + "qt5test", + "qt5widgets", + "qt5xml" + ] + }, + "kcmutils": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "kf5configwidgets", + "kf5service" + ], + "name": "kcmutils-5.12.0", + "src": { + "url": "stable/frameworks/5.12/kcmutils-5.12.0.tar.xz", + "name": "kcmutils-5.12.0.tar.xz", + "sha256": "1bnrybzfzhb98ihxcvxjgd6agbr16grhdp8zrbq0lhqbaivyfrzd" + }, + "buildInputs": [ + "ecm", + "kf5configwidgets", + "kf5coreaddons", + "kf5declarative", + "kf5i18n", + "kf5iconthemes", + "kf5itemviews", + "kf5package", + "kf5service", + "kf5xmlgui", + "qt5", + "qt5dbus", + "qt5qml", + "qt5quick", + "qt5widgets" + ] + }, + "frameworkintegration": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "kf5configwidgets", + "kf5iconthemes" + ], + "name": "frameworkintegration-5.12.0", + "src": { + "url": "stable/frameworks/5.12/frameworkintegration-5.12.0.tar.xz", + "name": "frameworkintegration-5.12.0.tar.xz", + "sha256": "0pi1gsc2k681f7913ald5d4i53riv2nwj09plalkabydh8kcd55j" + }, + "buildInputs": [ + "ecm", + "kf5config", + "kf5configwidgets", + "kf5i18n", + "kf5iconthemes", + "kf5kio", + "kf5notifications", + "kf5widgetsaddons", + "oxygenfont", + "qt5", + "qt5dbus", + "qt5qml", + "qt5test", + "qt5widgets", + "qt5x11extras", + "x11", + "xcb" + ] + }, + "kiconthemes": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "qt5widgets" + ], + "name": "kiconthemes-5.12.0", + "src": { + "url": "stable/frameworks/5.12/kiconthemes-5.12.0.tar.xz", + "name": "kiconthemes-5.12.0.tar.xz", + "sha256": "0myaqpi1pavjyf2pyvkb2v87vwpyzwd2bvm5bh88va1p1kw747a5" + }, + "buildInputs": [ + "ecm", + "kf5configwidgets", + "kf5i18n", + "kf5itemviews", + "kf5widgetsaddons", + "qt5", + "qt5dbus", + "qt5svg", + "qt5test", + "qt5widgets" + ] + }, + "kjs": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "qt5core" + ], + "name": "kjs-5.12.0", + "src": { + "url": "stable/frameworks/5.12/portingAids/kjs-5.12.0.tar.xz", + "name": "kjs-5.12.0.tar.xz", + "sha256": "1ajcnpphn3vdkx4xwb762bvj0ws7l2h5sxq53cz3lzvznn9q99ps" + }, + "buildInputs": [ + "ecm", + "kf5doctools", + "pcre", + "perl", + "qt5core", + "qt5test" + ] + }, + "knotifyconfig": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "qt5widgets" + ], + "name": "knotifyconfig-5.12.0", + "src": { + "url": "stable/frameworks/5.12/knotifyconfig-5.12.0.tar.xz", + "name": "knotifyconfig-5.12.0.tar.xz", + "sha256": "0gznp2m7hlrbl6y7d3p8g6nwdgpk1h2iyy810cs6cjhs5n7b7bfk" + }, + "buildInputs": [ + "ecm", + "kf5completion", + "kf5config", + "kf5configwidgets", + "kf5i18n", + "kf5kio", + "kf5notifications", + "kf5widgetsaddons", + "kf5xmlgui", + "phonon4qt5", + "qt5", + "qt5dbus", + "qt5optional_components", + "qt5test", + "qt5texttospeech", + "qt5widgets" + ] + }, + "kio": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "kf5bookmarks", + "kf5completion", + "kf5config", + "kf5coreaddons", + "kf5itemviews", + "kf5jobwidgets", + "kf5service", + "kf5solid", + "kf5xmlgui", + "qt5network" + ], + "name": "kio-5.12.0", + "src": { + "url": "stable/frameworks/5.12/kio-5.12.0.tar.xz", + "name": "kio-5.12.0.tar.xz", + "sha256": "139jngyaa1rm159qj0ivjk9bd18rb6sp9n8290xsqwpfvs6ixn7w" + }, + "buildInputs": [ + "acl", + "ecm", + "gssapi", + "kf5archive", + "kf5bookmarks", + "kf5completion", + "kf5config", + "kf5configwidgets", + "kf5coreaddons", + "kf5dbusaddons", + "kf5doctools", + "kf5i18n", + "kf5iconthemes", + "kf5itemviews", + "kf5jobwidgets", + "kf5notifications", + "kf5service", + "kf5solid", + "kf5textwidgets", + "kf5wallet", + "kf5widgetsaddons", + "kf5windowsystem", + "kf5xmlgui", + "libxml2", + "libxslt", + "openssl", + "qt5", + "qt5concurrent", + "qt5core", + "qt5dbus", + "qt5network", + "qt5script", + "qt5test", + "qt5widgets", + "qt5x11extras", + "qt5xml", + "strigi", + "x11", + "zlib" + ] + }, + "kunitconversion": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "qt5core" + ], + "name": "kunitconversion-5.12.0", + "src": { + "url": "stable/frameworks/5.12/kunitconversion-5.12.0.tar.xz", + "name": "kunitconversion-5.12.0.tar.xz", + "sha256": "0gmxqjryjzhhr75clbs7swd765asfaf0b7ivnqk99j0dzdg1yh8m" + }, + "buildInputs": [ + "ecm", + "kf5i18n", + "qt5", + "qt5core", + "qt5network", + "qt5test", + "qt5xml" + ] + }, + "kdnssd": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "qt5network" + ], + "name": "kdnssd-5.12.0", + "src": { + "url": "stable/frameworks/5.12/kdnssd-5.12.0.tar.xz", + "name": "kdnssd-5.12.0.tar.xz", + "sha256": "1v8nml6fmabail6d9wybfqmg02kymg15x5ng4vc08z9wrn1jvxrd" + }, + "buildInputs": [ + "avahi", + "dnssd", + "ecm", + "qt5", + "qt5dbus", + "qt5network" + ] + }, + "knotifications": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "qt5widgets" + ], + "name": "knotifications-5.12.0", + "src": { + "url": "stable/frameworks/5.12/knotifications-5.12.0.tar.xz", + "name": "knotifications-5.12.0.tar.xz", + "sha256": "08clp98lpplk2k6c4r1l01yh16ssn4ipfc6w8wiahqipp6gzw1bv" + }, + "buildInputs": [ + "dbusmenu-qt5", + "ecm", + "kf5codecs", + "kf5config", + "kf5coreaddons", + "kf5iconthemes", + "kf5service", + "kf5windowsystem", + "phonon4qt5", + "qt5", + "qt5dbus", + "qt5optional_components", + "qt5test", + "qt5texttospeech", + "qt5widgets", + "qt5x11extras", + "x11" + ] + }, + "kdbusaddons": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "qt5dbus" + ], + "name": "kdbusaddons-5.12.0", + "src": { + "url": "stable/frameworks/5.12/kdbusaddons-5.12.0.tar.xz", + "name": "kdbusaddons-5.12.0.tar.xz", + "sha256": "1nfanafpsi67lmszf8lf3zyjghb3j0jfbc5s7vsa19zbxz9dsh3d" + }, + "buildInputs": [ + "ecm", + "qt5dbus", + "qt5test", + "qt5x11extras" + ] + }, + "kemoticons": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "kf5service", + "qt5gui" + ], + "name": "kemoticons-5.12.0", + "src": { + "url": "stable/frameworks/5.12/kemoticons-5.12.0.tar.xz", + "name": "kemoticons-5.12.0.tar.xz", + "sha256": "11wm832xv59vlwnlq314vr7j151mfv7s5xsgab1h0w1ypf8nbggv" + }, + "buildInputs": [ + "ecm", + "kf5archive", + "kf5config", + "kf5coreaddons", + "kf5service", + "qt5", + "qt5gui", + "qt5test", + "qt5widgets", + "qt5xml" + ] + }, + "kdoctools": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "qt5core" + ], + "name": "kdoctools-5.12.0", + "src": { + "url": "stable/frameworks/5.12/kdoctools-5.12.0.tar.xz", + "name": "kdoctools-5.12.0.tar.xz", + "sha256": "0if3lss9ywwkpcgb8k6vi6b35vl5xxy77gdsbmvd2w2r83p2s6n4" + }, + "buildInputs": [ + "docbookxml4", + "docbookxsl", + "ecm", + "kf5archive", + "kf5doctools", + "kf5i18n", + "libxml2", + "libxslt", + "qt5core" + ] + }, + "kapidox": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [], + "name": "kapidox-5.12.0", + "src": { + "url": "stable/frameworks/5.12/kapidox-5.12.0.tar.xz", + "name": "kapidox-5.12.0.tar.xz", + "sha256": "0pcmyp92l63klxjz3valpk9kr9rh3ny663hqlfj1qcbl5qx10fic" + }, + "buildInputs": [ + "pythoninterp" + ] + }, + "kcoreaddons": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "qt5core" + ], + "name": "kcoreaddons-5.12.0", + "src": { + "url": "stable/frameworks/5.12/kcoreaddons-5.12.0.tar.xz", + "name": "kcoreaddons-5.12.0.tar.xz", + "sha256": "1w113966p2wsr6ddwifzpc6lvx2hpr2qziq7kn4ycjpq3fc6whl7" + }, + "buildInputs": [ + "ecm", + "fam", + "qt5", + "qt5core", + "qt5test", + "qt5widgets", + "sharedmimeinfo" + ] + }, + "krunner": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "kf5plasma", + "qt5core" + ], + "name": "krunner-5.12.0", + "src": { + "url": "stable/frameworks/5.12/portingAids/krunner-5.12.0.tar.xz", + "name": "krunner-5.12.0.tar.xz", + "sha256": "167zz32q5ghxc672yp372livdr37wx24769726izhfhqh22gqbpz" + }, + "buildInputs": [ + "ecm", + "kf5config", + "kf5coreaddons", + "kf5i18n", + "kf5kio", + "kf5plasma", + "kf5service", + "kf5solid", + "kf5threadweaver", + "qt5", + "qt5gui", + "qt5quick", + "qt5test", + "qt5widgets" + ] + }, + "kjobwidgets": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "kf5coreaddons", + "qt5widgets" + ], + "name": "kjobwidgets-5.12.0", + "src": { + "url": "stable/frameworks/5.12/kjobwidgets-5.12.0.tar.xz", + "name": "kjobwidgets-5.12.0.tar.xz", + "sha256": "1vrxcsy4jad2dzjhwlb44l18fckb1h5p3f4w6q8493clribc27kj" + }, + "buildInputs": [ + "ecm", + "kf5coreaddons", + "kf5widgetsaddons", + "qt5", + "qt5dbus", + "qt5test", + "qt5widgets", + "qt5x11extras", + "x11" + ] + }, + "kcodecs": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "qt5core" + ], + "name": "kcodecs-5.12.0", + "src": { + "url": "stable/frameworks/5.12/kcodecs-5.12.0.tar.xz", + "name": "kcodecs-5.12.0.tar.xz", + "sha256": "1xwz1ipf53azhcpm91c8q1q1i5v4avbnfapgz45hr223ilfkdmpy" + }, + "buildInputs": [ + "ecm", + "qt5core", + "qt5test" + ] + }, + "kconfigwidgets": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "kf5auth", + "kf5codecs", + "kf5config", + "kf5widgetsaddons" + ], + "name": "kconfigwidgets-5.12.0", + "src": { + "url": "stable/frameworks/5.12/kconfigwidgets-5.12.0.tar.xz", + "name": "kconfigwidgets-5.12.0.tar.xz", + "sha256": "1xwk6alrfpgm3pblhdglzglazvjp9i5kzcg212ngad8q9z05c4jg" + }, + "buildInputs": [ + "ecm", + "kf5auth", + "kf5codecs", + "kf5config", + "kf5coreaddons", + "kf5doctools", + "kf5guiaddons", + "kf5i18n", + "kf5widgetsaddons", + "qt5", + "qt5test" + ] + }, + "kdeclarative": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "kf5config", + "kf5package", + "qt5qml" + ], + "name": "kdeclarative-5.12.0", + "src": { + "url": "stable/frameworks/5.12/kdeclarative-5.12.0.tar.xz", + "name": "kdeclarative-5.12.0.tar.xz", + "sha256": "0k6c6ar5xi0m2p4s81p0057i13zpihakniscx5v9yz1ncv7sl8gm" + }, + "buildInputs": [ + "activeapp", + "ecm", + "epoxy", + "kf5config", + "kf5globalaccel", + "kf5guiaddons", + "kf5i18n", + "kf5iconthemes", + "kf5kio", + "kf5package", + "kf5widgetsaddons", + "kf5windowsystem", + "qt5", + "qt5gui", + "qt5qml", + "qt5quick", + "qt5test" + ] + }, + "ktextwidgets": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "kf5i18n", + "kf5sonnet", + "qt5widgets" + ], + "name": "ktextwidgets-5.12.0", + "src": { + "url": "stable/frameworks/5.12/ktextwidgets-5.12.0.tar.xz", + "name": "ktextwidgets-5.12.0.tar.xz", + "sha256": "0m2813dm3xs9q2rwvbkynckgbbh0q51swhibhdyirggl1xc8vvf0" + }, + "buildInputs": [ + "ecm", + "kf5completion", + "kf5config", + "kf5configwidgets", + "kf5i18n", + "kf5iconthemes", + "kf5service", + "kf5sonnet", + "kf5widgetsaddons", + "kf5windowsystem", + "qt5", + "qt5optional_components", + "qt5test", + "qt5texttospeech", + "qt5widgets" + ] + }, + "kjsembed": { + "nativeBuildInputs": [ + "cmake" + ], + "propagatedNativeBuildInputs": [], + "propagatedUserEnvPkgs": [], + "propagatedBuildInputs": [ + "kf5i18n", + "kf5js" + ], + "name": "kjsembed-5.12.0", + "src": { + "url": "stable/frameworks/5.12/portingAids/kjsembed-5.12.0.tar.xz", + "name": "kjsembed-5.12.0.tar.xz", + "sha256": "0fmgpi0c62y2658xaf0d825azywmpy77vg97k788liqy0d1ykhvh" + }, + "buildInputs": [ + "ecm", + "kf5doctools", + "kf5i18n", + "kf5js", + "qt5" + ] + } +} \ No newline at end of file diff --git a/pkgs/development/libraries/kde-frameworks-5.12/packages.sh b/pkgs/development/libraries/kde-frameworks-5.12/packages.sh new file mode 100755 index 00000000000..7cce2d05fc9 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.12/packages.sh @@ -0,0 +1,22 @@ +#!/bin/sh + +set -x + +origin="$(pwd)" + +# if setting KDE_MIRROR, be sure to set --cut-dirs=N in MANIFEST_EXTRA_ARGS +KDE_MIRROR="${KDE_MIRROR:-http://download.kde.org}" + +alias nix-build="nix-build --no-out-link \"$origin/../../../..\"" + +# The extra slash at the end of the URL is necessary to stop wget +# from recursing over the whole server! (No, it's not a bug.) +$(nix-build -A autonix.manifest) \ + "${KDE_MIRROR}/stable/frameworks/5.12/" \ + "$@" -A '*.tar.xz' + +AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellngPackages.autonix-deps-kf5)/bin/kf5-deps"} + +$AUTONIX_DEPS_KF5 manifest.json + +rm manifest.json diff --git a/pkgs/development/libraries/kde-frameworks-5.12/plasma-framework/plasma-framework-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.12/plasma-framework/plasma-framework-external-paths.patch new file mode 100644 index 00000000000..9a22c0bdbcd --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.12/plasma-framework/plasma-framework-external-paths.patch @@ -0,0 +1,13 @@ +diff --git a/src/plasma/package.cpp b/src/plasma/package.cpp +index 07b3c90..84417e3 100644 +--- a/src/plasma/package.cpp ++++ b/src/plasma/package.cpp +@@ -791,7 +791,7 @@ PackagePrivate::PackagePrivate() + servicePrefix("plasma-applet-"), + fallbackPackage(0), + metadata(0), +- externalPaths(false), ++ externalPaths(true), + valid(false), + checkedValid(false) + { diff --git a/pkgs/development/libraries/kde-frameworks-5.12/renames.json b/pkgs/development/libraries/kde-frameworks-5.12/renames.json new file mode 100644 index 00000000000..e469d582b1c --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.12/renames.json @@ -0,0 +1,71 @@ +{ + "kf5widgetsaddons": "kwidgetsaddons", + "kf5texteditor": "ktexteditor", + "kf5designerplugin": "kdesignerplugin", + "kf5bookmarks": "kbookmarks", + "kf5frameworkintegration": "frameworkintegration", + "kf5package": "kpackage", + "kf5archive": "karchive", + "kf5plasma": "plasma-framework", + "kf5kcmutils": "kcmutils", + "kf5configwidgets": "kconfigwidgets", + "ctest": "attica", + "kf5kio": "kio", + "kf5networkmanagerqt": "networkmanager-qt", + "kf5coreaddons": "kcoreaddons", + "kf5guiaddons": "kguiaddons", + "kf5jobwidgets": "kjobwidgets", + "kf5modemmanagerqt": "modemmanager-qt", + "kf5runner": "krunner", + "kf5globalaccel": "kglobalaccel", + "kf5dbusaddons": "kdbusaddons", + "kf5crash": "kcrash", + "kf5itemviews": "kitemviews", + "kf5doctools": "kdoctools", + "kf5i18n": "ki18n", + "kf5webkit": "kdewebkit", + "kf5newstuff": "knewstuff", + "kded": "kded", + "kf5notifications": "knotifications", + "kf5activitiesexperimentalstats": "kactivities", + "kf5dnssd": "kdnssd", + "kf5notifyconfig": "knotifyconfig", + "kf5iconthemes": "kiconthemes", + "kf5js": "kjs", + "kf5kde4support": "kdelibs4support", + "kf5parts": "kparts", + "backend": "plasma-framework", + "kf5completion": "kcompletion", + "kf5threadweaver": "threadweaver", + "kf5mediaplayer": "kmediaplayer", + "kf5plasmaquick": "plasma-framework", + "kf5wallet": "kwallet", + "kf5xmlgui": "kxmlgui", + "kf5attica": "attica", + "kf5declarative": "kdeclarative", + "kf5config": "kconfig", + "kf5init": "kinit", + "kf5textwidgets": "ktextwidgets", + "kf5jsembed": "kjsembed", + "kf5codecs": "kcodecs", + "kf5service": "kservice", + "kf5sonnet": "sonnet", + "kf5kdelibs4support": "kdelibs4support", + "kf5pty": "kpty", + "kf5solid": "solid", + "kf5auth": "kauth", + "ecm": "extra-cmake-modules", + "kf5activities": "kactivities", + "kf5plotting": "kplotting", + "kf5people": "kpeople", + "kf5emoticons": "kemoticons", + "kf5kross": "kross", + "kf5su": "kdesu", + "kf5khtml": "khtml", + "kf5unitconversion": "kunitconversion", + "kf5idletime": "kidletime", + "kf5bluezqt": "bluez-qt", + "kf5windowsystem": "kwindowsystem", + "kf5xmlrpcclient": "kxmlrpcclient", + "kf5itemmodels": "kitemmodels" +} \ No newline at end of file diff --git a/pkgs/development/libraries/kde-frameworks-5.12/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.12/setup-hook.sh new file mode 100644 index 00000000000..a8d9b7e0e36 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.12/setup-hook.sh @@ -0,0 +1 @@ +addToSearchPath XDG_DATA_DIRS @out@/share diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix index ee92da283a6..18ff4dcb7c8 100644 --- a/pkgs/development/libraries/libao/default.nix +++ b/pkgs/development/libraries/libao/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libcap ] ++ - lib.optional stdenv.isLinux (if usePulseAudio then [ libpulseaudio ] else [ alsaLib ]); + lib.optional stdenv.isLinux (if usePulseAudio then libpulseaudio else alsaLib); meta = { longDescription = '' diff --git a/pkgs/development/libraries/uriparser/default.nix b/pkgs/development/libraries/uriparser/default.nix new file mode 100644 index 00000000000..76aec25a792 --- /dev/null +++ b/pkgs/development/libraries/uriparser/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, cpptest, pkgconfig, doxygen, graphviz }: + +stdenv.mkDerivation rec { + name = "uriparser-0.8.2"; + + src = fetchurl { + url = "http://downloads.sourceforge.net/project/uriparser/Sources/0.8.2/${name}.tar.bz2"; + sha256 = "13sh7slys3y5gfscc40g2r3hkjjywjvxlcqr77ifjrazc6q6cvkd"; + }; + + buildInputs = [ cpptest pkgconfig doxygen graphviz ]; + + meta = with stdenv.lib; { + homepage = http://uriparser.sourceforge.net/; + description = "Strictly RFC 3986 compliant URI parsing library"; + maintainers = with maintainers; [ bosu ]; + license = stdenv.lib.licenses.bsd3; + }; +} diff --git a/pkgs/development/tools/build-managers/boot/default.nix b/pkgs/development/tools/build-managers/boot/default.nix index d4fddbb1791..778019ea541 100644 --- a/pkgs/development/tools/build-managers/boot/default.nix +++ b/pkgs/development/tools/build-managers/boot/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/boot-clj/boot/releases/download/${version}/boot.sh"; - sha256 = "12c24aqvwq8kj6iiac18rp0n8vlzacl7dd95m983yz24w885chc0"; + sha256 = "0hvznr0z5ck32wpaqhjv2fr9365b8h0h8brnsmwijpv699l0rf1c"; }; inherit jdk; diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index 2f3230d148e..b19ccd8db8d 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "unifi-controller-${version}"; - version = "4.6.3"; + version = "4.6.6"; src = fetchurl { url = "http://dl.ubnt.com/unifi/${version}/UniFi.unix.zip"; - sha256 = "046qx7ghz5b1s4kg6aqvdiq7ck589c8x2cc3x03crcdjjj33rirq"; + sha256 = "0c9j5h4dyivfdic1y2q3nvhzajzagskzxyj7009icmy3fzgkv3y5"; }; buildInputs = [ unzip ]; diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix index fb289f640bb..51d25ac16a4 100644 --- a/pkgs/tools/networking/netsniff-ng/default.nix +++ b/pkgs/tools/networking/netsniff-ng/default.nix @@ -2,7 +2,7 @@ , libnetfilter_conntrack, libnl, libpcap, libsodium, liburcu, ncurses, perl , pkgconfig, zlib }: -let version = "0.5.9-27-g3beaa23"; in +let version = "0.5.9-34-g95c4582"; in stdenv.mkDerivation { name = "netsniff-ng-${version}"; @@ -10,8 +10,8 @@ stdenv.mkDerivation { src = fetchFromGitHub rec { repo = "netsniff-ng"; owner = repo; - rev = "3beaa23d4d33b51a392b56f110c8773151ac19cc"; - sha256 = "0k6p57zynrs0ffnvrhbcnfkmvrj6ay2bxpj44ggm7bv327ckdzm7"; + rev = "95c4582b742fd4fa58e5f14971164b941b0f730d"; + sha256 = "0anai392n8zx8vcjbjg776lbiwrv95x2dbd8rypbqfzmj8nhzric"; }; buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl diff --git a/pkgs/tools/networking/socat/2.x.nix b/pkgs/tools/networking/socat/2.x.nix index 9f9e8dbe374..2d4438b5759 100644 --- a/pkgs/tools/networking/socat/2.x.nix +++ b/pkgs/tools/networking/socat/2.x.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl }: stdenv.mkDerivation rec { - name = "socat-2.0.0-b7"; + name = "socat-2.0.0-b8"; src = fetchurl { url = "http://www.dest-unreach.org/socat/download/${name}.tar.bz2"; - sha256 = "0h6k9ccrnziw03j0if7myrd28vcc97nwz1bifmbrkp5jkpk69ygk"; + sha256 = "1slkv1hhcp9a6c88h6yl5cs0z9g60fp2ja6865s6kywqp6fmf168"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index bfa1a0ab9f4..525259bdb02 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchurl, libevent, openssl, zlib, torsocks }: +{ stdenv, fetchurl, libevent, openssl, zlib, torsocks, libseccomp }: stdenv.mkDerivation rec { - name = "tor-0.2.6.9"; + name = "tor-0.2.6.10"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/${name}.tar.gz"; - sha256 = "171gjhapymfzql3bbx5qndgkamcfdl6lincrqlr7i3d9i6njjv2a"; + sha256 = "0542c0efe43b86619337862fa7eb02c7a74cb23a79d587090628a5f0f1224b8d"; }; # Note: torsocks is specified as a dependency, as the distributed # 'torify' wrapper attempts to use it; although there is no # ./configure time check for any of this. - buildInputs = [ libevent openssl zlib torsocks ]; + buildInputs = [ libevent openssl zlib torsocks libseccomp ]; - CFLAGS = stdenv.lib.optionalString stdenv.cc.isGNU "-lgcc_s"; + NIX_CFLAGS_LINK = stdenv.lib.optionalString stdenv.cc.isGNU "-lgcc_s"; # Patch 'torify' to point directly to torsocks. patchPhase = '' diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 7e0a165ae89..fe8809e8263 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -1,7 +1,7 @@ args : with args; rec { - src = assert !config.inHydra or false; fetchurl { + src = assert config.allowTexliveBuilds or false; fetchurl { url = mirror://debian/pool/main/t/texlive-bin/texlive-bin_2014.20140926.35254.orig.tar.xz; sha256 = "1c39x059jhn5jsy6i9j3akjbkm1kmmzssy1jyi1aw20rl2vp86w3"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index df93687cc4e..14d256c277a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3194,6 +3194,8 @@ let upx = callPackage ../tools/compression/upx { }; + uriparser = callPackage ../development/libraries/uriparser {}; + urlview = callPackage ../applications/misc/urlview {}; usbmuxd = callPackage ../tools/misc/usbmuxd {}; @@ -5366,6 +5368,8 @@ let framac = callPackage ../development/tools/analysis/frama-c { }; + cpptest = callPackage ../development/libraries/cpptest { }; + cppi = callPackage ../development/tools/misc/cppi { }; cproto = callPackage ../development/tools/misc/cproto { }; @@ -6603,7 +6607,8 @@ let }; kf510 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.10 { }); - kf5_latest = kf510; + kf512 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.12 { }); + kf5_latest = kf512; kf5_stable = kf510; kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { }; @@ -15045,6 +15050,8 @@ let znc = callPackage ../applications/networking/znc { }; + znc_14 = callPackage ../applications/networking/znc/1.4.nix { }; + zncModules = recurseIntoAttrs ( callPackage ../applications/networking/znc/modules.nix { } ); diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix index 8c66964ba72..15380ea43c8 100644 --- a/pkgs/top-level/release-lib.nix +++ b/pkgs/top-level/release-lib.nix @@ -1,4 +1,4 @@ -{ supportedSystems, packageSet ? (import ./all-packages.nix) }: +{ supportedSystems, packageSet ? (import ./all-packages.nix), allowTexliveBuilds ? false }: with import ../../lib; @@ -7,6 +7,7 @@ rec { # Ensure that we don't build packages marked as unfree. allPackages = args: packageSet (args // { config.allowUnfree = false; + config.allowTexliveBuilds = allowTexliveBuilds; config.inHydra = true; });