Merge branch 'ericson2314-cross-master' into staging

nixos-19.03
John Ericson 5 years ago
commit 5a754e75b4
  1. 20
      lib/customisation.nix
  2. 3
      lib/default.nix
  3. 1
      lib/maintainers.nix
  4. 14
      maintainers/scripts/rebuild-amount.sh
  5. 7
      nixos/doc/manual/release-notes/rl-1803.xml
  6. 6
      pkgs/applications/editors/eclipse/plugins.nix
  7. 46
      pkgs/applications/editors/rstudio/default.nix
  8. 15
      pkgs/applications/networking/apache-directory-studio/default.nix
  9. 2
      pkgs/applications/networking/instant-messengers/jackline/default.nix
  10. 29
      pkgs/applications/networking/instant-messengers/jackline/tls-0.9.0.patch
  11. 12
      pkgs/applications/networking/p2p/transmission/default.nix
  12. 4
      pkgs/applications/networking/sniffers/wireshark/default.nix
  13. 17
      pkgs/applications/office/mendeley/default.nix
  14. 60
      pkgs/applications/office/mendeley/update.nix
  15. 33
      pkgs/applications/science/biology/dcm2niix/default.nix
  16. 6
      pkgs/development/compilers/ispc/default.nix
  17. 8
      pkgs/development/compilers/mono/5.4.nix
  18. 4
      pkgs/development/compilers/ponyc/default.nix
  19. 6
      pkgs/development/compilers/solc/default.nix
  20. 2
      pkgs/development/libraries/kde-frameworks/fetch.sh
  21. 14
      pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-follow-symlinks.patch
  22. 21
      pkgs/development/libraries/kde-frameworks/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
  23. 4
      pkgs/development/libraries/kde-frameworks/plasma-framework.nix
  24. 608
      pkgs/development/libraries/kde-frameworks/srcs.nix
  25. 22
      pkgs/development/libraries/libvncserver/default.nix
  26. 24
      pkgs/development/ocaml-modules/asn1-combinators/default.nix
  27. 24
      pkgs/development/ocaml-modules/tls/default.nix
  28. 35
      pkgs/development/ocaml-modules/x509/default.nix
  29. 8
      pkgs/development/tools/analysis/snowman/default.nix
  30. 13
      pkgs/development/tools/misc/tokei/default.nix
  31. 8
      pkgs/os-specific/linux/kernel/generic.nix
  32. 6
      pkgs/os-specific/linux/kernel/linux-testing.nix
  33. 23
      pkgs/stdenv/generic/check-meta.nix
  34. 75
      pkgs/stdenv/generic/make-derivation.nix
  35. 2
      pkgs/tools/graphics/gnuplot/default.nix
  36. 11
      pkgs/tools/misc/svtplay-dl/default.nix
  37. 4
      pkgs/tools/networking/uget/default.nix
  38. 13
      pkgs/tools/security/spectre-meltdown-checker/default.nix
  39. 28
      pkgs/top-level/all-packages.nix
  40. 4
      pkgs/top-level/python-packages.nix

@ -36,7 +36,7 @@ rec {
overrideDerivation = drv: f:
let
newDrv = derivation (drv.drvAttrs // (f drv));
in addPassthru newDrv (
in lib.flip (extendDerivation true) newDrv (
{ meta = drv.meta or {};
passthru = if drv ? passthru then drv.passthru else {};
}
@ -131,8 +131,8 @@ rec {
/* Add attributes to each output of a derivation without changing
the derivation itself. */
addPassthru = drv: passthru:
the derivation itself and check a given condition when evaluating. */
extendDerivation = condition: passthru: drv:
let
outputs = drv.outputs or [ "out" ];
@ -142,13 +142,23 @@ rec {
outputToAttrListElement = outputName:
{ name = outputName;
value = commonAttrs // {
inherit (drv.${outputName}) outPath drvPath type outputName;
inherit (drv.${outputName}) type outputName;
drvPath = assert condition; drv.${outputName}.drvPath;
outPath = assert condition; drv.${outputName}.outPath;
};
};
outputsList = map outputToAttrListElement outputs;
in commonAttrs // { outputUnspecified = true; };
in commonAttrs // {
outputUnspecified = true;
drvPath = assert condition; drv.drvPath;
outPath = assert condition; drv.outPath;
};
/* Add attributes to each output of a derivation without changing
the derivation itself. */
addPassthru = lib.warn "`addPassthru` is deprecated, replace with `extendDerivation true`"
(extendDerivation true);
/* Strip a derivation of all non-essential attributes, returning
only those needed by hydra-eval-jobs. Also strictly evaluate the

@ -87,7 +87,8 @@ let
inherit (stringsWithDeps) textClosureList textClosureMap
noDepEntry fullDepEntry packEntry stringAfter;
inherit (customisation) overrideDerivation makeOverridable
callPackageWith callPackagesWith addPassthru hydraJob makeScope;
callPackageWith callPackagesWith extendDerivation addPassthru
hydraJob makeScope;
inherit (meta) addMetaAttrs dontDistribute setName updateName
appendToName mapDerivationAttrset lowPrio lowPrioSet hiPrio
hiPrioSet;

@ -60,6 +60,7 @@
arobyn = "Alexei Robyn <shados@shados.net>";
artuuge = "Artur E. Ruuge <artuuge@gmail.com>";
ashalkhakov = "Artyom Shalkhakov <artyom.shalkhakov@gmail.com>";
ashgillman = "Ashley Gillman <gillmanash@gmail.com>";
aske = "Kirill Boltaev <aske@fmap.me>";
asppsa = "Alastair Pharo <asppsa@gmail.com>";
astsmtl = "Alexander Tsamutali <astsmtl@yandex.ru>";

@ -1,9 +1,16 @@
#!/usr/bin/env bash
set -e
# --print: avoid dependency on environment
optPrint=
if [ "$1" == "--print" ]; then
optPrint=true
shift
fi
if [ "$#" != 1 ] && [ "$#" != 2 ]; then
cat <<-EOF
Usage: $0 commit-spec [commit-spec]
Usage: $0 [--print] commit-spec [commit-spec]
You need to be in a git-controlled nixpkgs tree.
The current state of the tree will be used if the second commit is missing.
EOF
@ -113,3 +120,8 @@ newPkgs "${tree[1]}" "${tree[2]}" '--argstr system "x86_64-linux"' > "$newlist"
sed -n 's/\([^. ]*\.\)*\([^. ]*\) .*$/\2/p' < "$newlist" \
| sort | uniq -c
if [ -n "$optPrint" ]; then
echo
cat "$newlist"
fi

@ -113,7 +113,7 @@ following incompatible changes:</para>
</listitem>
<listitem>
<para>
<literal>cc-wrapper</literal>has been split in two; there is now also a <literal>bintools-wrapper</literal>.
<literal>cc-wrapper</literal> has been split in two; there is now also a <literal>bintools-wrapper</literal>.
The most commonly used files in <filename>nix-support</filename> are now split between the two wrappers.
Some commonly used ones, like <filename>nix-support/dynamic-linker</filename>, are duplicated for backwards compatability, even though they rightly belong only in <literal>bintools-wrapper</literal>.
Other more obscure ones are just moved.
@ -131,6 +131,11 @@ following incompatible changes:</para>
Other types dependencies should be unaffected.
</para>
</listitem>
<listitem>
<para>
<literal>lib.addPassthru</literal> is removed. Use <literal>lib.extendDerivation true</literal> instead. <emphasis role="strong">TODO: actually remove it before branching 18.03 off.</emphasis>
</para>
</listitem>
<listitem>
<para>
The <literal>memcached</literal> service no longer accept dynamic socket

@ -192,12 +192,12 @@ rec {
checkstyle = buildEclipseUpdateSite rec {
name = "checkstyle-${version}";
version = "8.5.1.201712211522";
version = "8.7.0.201801131309";
src = fetchzip {
stripRoot = false;
url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/8.5.1/net.sf.eclipsecs-updatesite_${version}.zip";
sha256 = "0nid4a4qib9vx34ddry7sylj20p2d47dd0vn4zqqmj5dgqx1a1ab";
url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/8.7.0/net.sf.eclipsecs-updatesite_${version}.zip";
sha256 = "07fymk705x4mwq7vh2i6frsf67jql4bzrkdzhb4n74zb0g1dib60";
};
meta = with stdenv.lib; {

@ -1,10 +1,10 @@
{ stdenv, fetchurl, fetchpatch, makeDesktopItem, cmake, boost, zlib, openssl
, R, qtbase, qtwebkit, qtwebchannel, libuuid, hunspellDicts, unzip, ant, jdk
, gnumake, makeWrapper, pandoc
{ stdenv, fetchurl, fetchFromGitHub, makeDesktopItem, cmake, boost
, zlib, openssl, R, qtbase, qtwebkit, qtwebchannel, libuuid, hunspellDicts
, unzip, ant, jdk, gnumake, makeWrapper, pandoc
}:
let
version = "1.1.383";
version = "1.1.414";
ginVer = "1.5";
gwtVer = "2.7.0";
in
@ -15,19 +15,15 @@ stdenv.mkDerivation rec {
buildInputs = [ boost zlib openssl R qtbase qtwebkit qtwebchannel libuuid ];
src = fetchurl {
url = "https://github.com/rstudio/rstudio/archive/v${version}.tar.gz";
sha256 = "06680l9amq03b4jarmzfr605bijhb79fip9rk464zab6hgwqbp3f";
src = fetchFromGitHub {
owner = "rstudio";
repo = "rstudio";
rev = "v${version}";
sha256 = "1rr2zkv53r8swhq5d745jpp0ivxpsizzh7srf34isqpkn5pgx3v8";
};
# Hack RStudio to only use the input R.
patches = [
./r-location.patch
(fetchpatch {
url = https://aur.archlinux.org/cgit/aur.git/plain/socketproxy-openssl.patch?h=rstudio-desktop-git;
sha256 = "0ywq9rk14s5961l6hvd3cw70jsm73r16h0bsh4yp52vams7cwy9d";
})
];
patches = [ ./r-location.patch ];
postPatch = "substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace '@R@' ${R}";
inherit ginVer;
@ -49,14 +45,18 @@ stdenv.mkDerivation rec {
sha256 = "0wbcqb9rbfqqvvhqr1pbqax75wp8ydqdyhp91fbqfqp26xzjv6lk";
};
rmarkdownSrc = fetchurl {
url = "https://github.com/rstudio/rmarkdown/archive/95b8b1fa64f78ca99f225a67fff9817103be56.zip";
sha256 = "12fa65qr04rwsprkmyl651mkaqcbn1znwsmcjg4qsk9n5nxg0fah";
rmarkdownSrc = fetchFromGitHub {
owner = "rstudio";
repo = "rmarkdown";
rev = "v1.8";
sha256 = "1blqxdr1vp2z5wd52nmf8hq36sdd4s2pyms441dqj50v35f8girb";
};
rsconnectSrc = fetchurl {
url = "https://github.com/rstudio/rsconnect/archive/425f3767b3142bc6b81c9eb62c4722f1eedc9781.zip";
sha256 = "1sgf9dj9wfk4c6n5p1jc45386pf0nj2alg2j9qx09av3can1dy9p";
rsconnectSrc = fetchFromGitHub {
owner = "rstudio";
repo = "rsconnect";
rev = "953c945779dd180c1bfe68f41c173c13ec3e222d";
sha256 = "1yxwd9v4mvddh7m5rbljicmssw7glh1lhin7a9f01vxxa92vpj7z";
};
rstudiolibclang = fetchurl {
@ -88,8 +88,10 @@ stdenv.mkDerivation rec {
done
unzip $mathJaxSrc -d dependencies/common/mathjax-26
unzip $rmarkdownSrc -d dependencies/common/rmarkdown
unzip $rsconnectSrc -d dependencies/common/rsconnect
mkdir -p dependencies/common/rmarkdown
ln -s $rmarkdownSrc dependencies/common/rmarkdown/
mkdir -p dependencies/common/rsconnect
ln -s $rsconnectSrc dependencies/common/rsconnect/
mkdir -p dependencies/common/libclang/3.5
unzip $rstudiolibclang -d dependencies/common/libclang/3.5
mkdir -p dependencies/common/libclang/builtin-headers

@ -1,9 +1,20 @@
{ stdenv, fetchurl, xorg, jre, makeWrapper }:
{ stdenv, fetchurl, xorg, jre, makeWrapper, makeDesktopItem }:
let
rpath = stdenv.lib.makeLibraryPath (with xorg; [
libXtst
]);
desktopItem = makeDesktopItem {
name = "apache-directory-studio";
exec = "ApacheDirectoryStudio";
icon = "apache-directory-studio";
comment = "Eclipse-based LDAP browser and directory client";
desktopName = "Apache Directory Studio";
genericName = "Apache Directory Studio";
categories = "Java;Network";
};
in
stdenv.mkDerivation rec {
name = "apache-directory-studio-${version}";
@ -36,6 +47,8 @@ stdenv.mkDerivation rec {
"$out/bin/ApacheDirectoryStudio" \
--prefix PATH : "${jre}/bin" \
--prefix LD_LIBRARY_PATH : "${rpath}"
install -D icon.xpm "$out/share/pixmaps/apache-directory-studio.xpm"
install -D -t "$out/share/applications" ${desktopItem}/share/applications/*
'';
meta = with stdenv.lib; {

@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
sha256 = "05z9kvd7gwr59ic7hnmbayhwyyqd41xxz01cvdlcgplk3z7zlwg5";
};
patches = [ ./tls-0.9.0.patch ];
buildInputs = with ocamlPackages; [
ocaml ocamlbuild findlib topkg ppx_sexp_conv
erm_xmpp_0_3 tls nocrypto x509 ocaml_lwt otr astring

@ -0,0 +1,29 @@
diff --git a/cli/cli_config.ml b/cli/cli_config.ml
index 991ee77..59a0edb 100644
--- a/cli/cli_config.ml
+++ b/cli/cli_config.ml
@@ -207,7 +207,9 @@ let configure term () =
ask above "CA file: " (fun x -> x) (fun x -> if Sys.file_exists x then `Ok x else `Invalid) term >>= fun trust_anchor ->
Lwt_unix.access trust_anchor [ Unix.F_OK ; Unix.R_OK ] >>= fun () ->
X509_lwt.certs_of_pem trust_anchor >>= fun tas ->
- (match X509.Validation.valid_cas ~time:(Unix.time ()) tas with
+ let time = match Ptime.of_float_s (Unix.time ())
+ with Some time -> time | None -> assert false in
+ (match X509.Validation.valid_cas ~time tas with
| [] -> Lwt.fail (Invalid_argument "trust anchor file is empty!")
| _ -> Lwt.return (`Trust_anchor trust_anchor))
| Some fp -> Lwt.return (`Fingerprint fp) ) >>= fun authenticator ->
diff --git a/cli/cli_state.ml b/cli/cli_state.ml
index d5db502..91540c9 100644
--- a/cli/cli_state.ml
+++ b/cli/cli_state.ml
@@ -262,7 +262,8 @@ module Connect = struct
(match config.Xconfig.authenticator with
| `Trust_anchor x -> X509_lwt.authenticator (`Ca_file x)
| `Fingerprint fp ->
- let time = Unix.gettimeofday () in
+ let time = match Ptime.of_float_s (Unix.gettimeofday ())
+ with Some time -> time | None -> assert false in
let fp =
Nocrypto.Uncommon.Cs.of_hex
(String.map (function ':' -> ' ' | x -> x) fp)

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, file, wrapGAppsHook
{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, file, wrapGAppsHook
, openssl, curl, libevent, inotify-tools, systemd, zlib
, enableGTK3 ? false, gtk3
, enableSystemd ? stdenv.isLinux
@ -27,6 +27,16 @@ stdenv.mkDerivation rec {
++ optionals enableSystemd [ systemd ]
++ optionals stdenv.isLinux [ inotify-tools ];
patches = [
(fetchpatch {
# See https://github.com/transmission/transmission/pull/468
# Patch from: https://github.com/transmission/transmission/pull/468#issuecomment-357098126
name = "transmission-fix-dns-rebinding-vuln.patch";
url = https://github.com/transmission/transmission/files/1624507/transmission-fix-dns-rebinding-vuln.patch.txt;
sha256 = "1p9m20kp4kdyp5jjr3yp5px627n8cfa29mg5n3wzsdfv0qzk9gy4";
})
];
postPatch = ''
substituteInPlace ./configure \
--replace "libsystemd-daemon" "libsystemd" \

@ -12,7 +12,7 @@ assert withQt -> !withGtk && qt5 != null;
with stdenv.lib;
let
version = "2.4.3";
version = "2.4.4";
variant = if withGtk then "gtk" else if withQt then "qt" else "cli";
in stdenv.mkDerivation {
@ -20,7 +20,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
sha256 = "0bpiby916k3k8bm7q8b1dflva6zs0a4ircskrck0d538dfcrb50q";
sha256 = "0n3g28hrhifnchlz4av0blq4ykm4zaxwwxbzdm9wsba27677b6h4";
};
cmakeFlags = [

@ -31,6 +31,8 @@
# will leave entries on your system after uninstalling mendeley.
# (they can be removed by running '$out/bin/install-mendeley-link-handler.sh -u')
, autorunLinkHandler ? true
# Update script
, writeScript
}:
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
@ -43,14 +45,14 @@ let
then "i386"
else "amd64";
shortVersion = "1.17.12-stable";
shortVersion = "1.17.13-stable";
version = "${shortVersion}_${arch}";
url = "http://desktop-download.mendeley.com/download/apt/pool/main/m/mendeleydesktop/mendeleydesktop_${version}.deb";
sha256 = if stdenv.system == arch32
then "09n910ny8k103g1v8m19f9n827l2y0kmz79cwgy95k6acf2rkc2x"
else "11z65mj1a2rw6cwfarl8r1vzpcz4ww5mgvd5fyv31l60mbmnqkap";
then "0q4x62k00whmq8lskphpcxc610cvclxzcr5k0v7pxjxs9sx5yx43"
else "01ylyily1hip35z0d4qkdpbzp5yn4r015psc5773xsqlgrnlwjm3";
deps = [
qtbase
@ -133,11 +135,14 @@ stdenv.mkDerivation {
dontStrip = true;
dontPatchElf = true;
meta = {
updateScript = import ./update.nix { inherit writeScript; };
meta = with stdenv.lib; {
homepage = http://www.mendeley.com;
description = "A reference manager and academic social network";
license = stdenv.lib.licenses.unfree;
platforms = stdenv.lib.platforms.linux;
license = licenses.unfree;
platforms = platforms.linux;
maintainers = with maintainers; [ dtzWill ];
};
}

@ -0,0 +1,60 @@
{ writeScript }:
writeScript "update-mendeley" ''
function follow() {
local URL=$1
while true; do
NEWURL=$(curl -m20 -sI "$URL" -o /dev/null -w '%{redirect_url}')
[ -z "$NEWURL" ] && break
[[ $NEWURL = $URL ]] && (echo "redirect loop?!"; exit 1)
echo "Following $URL -> $NEWURL ..." >&2
URL=$NEWURL
done
echo $URL
}
amd64URL=$(follow https://www.mendeley.com/repositories/ubuntu/stable/amd64/mendeleydesktop-latest)
amd64V=$(basename $amd64URL|grep -m1 -o "[0-9]\+\.[0-9]\+\.[0-9]\+")
i386URL=$(follow https://www.mendeley.com/repositories/ubuntu/stable/i386/mendeleydesktop-latest)
i386V=$(basename $i386URL|grep -m1 -o "[0-9]\+\.[0-9]\+\.[0-9]\+")
echo "amd64 version: $amd64V"
echo "i386 version: $i386V"
if [[ $amd64V != $i386V ]]; then
echo "Versions not the same!"
exit 1
fi
if grep -q -F "$amd64V" ${./default.nix}; then
echo "No new version yet, nothing to do."
echo "Have a nice day!"
exit 0
fi
amd64OldHash=$(nix-instantiate --eval --strict -A "mendeley.src.drvAttrs.outputHash" --argstr system "x86_64-linux"| tr -d '"')
i386OldHash=$(nix-instantiate --eval --strict -A "mendeley.src.drvAttrs.outputHash" --argstr system "i686-linux"| tr -d '"')
echo "Prefetching amd64..."
amd64NewHash=$(nix-prefetch-url $amd64URL)
echo "Prefetching i386..."
i386NewHash=$(nix-prefetch-url $i386URL)
# Don't actually update, just report that an update is available
cat <<EOF
Time to update to $amd64V !
32bit (i386):
Old: $i386OldHash
New: $i386NewHash
64bit (amd64):
Old: $amd64OldHash
New: $amd64NewHash
Exiting so this information is seen...
(no update is actually performed here)
EOF
exit 1
''

@ -0,0 +1,33 @@
{ stdenv
, fetchFromGitHub
, cmake
, libyamlcpp
}:
stdenv.mkDerivation rec {
version = "1.0.20170130";
name = "dcm2niix-${version}";
src = fetchFromGitHub {
owner = "rordenlab";
repo = "dcm2niix";
rev = "v${version}";
sha256 = "1f2nzd8flp1rfn725bi64z7aw3ccxyyygzarxijw6pvgl476i532";
};
enableParallelBuilding = true;
nativeBuildInputs = [ cmake ];
buildInputs = [ libyamlcpp ];
meta = with stdenv.lib; {
description = "dcm2niix DICOM to NIfTI converter";
longDescription = ''
dcm2niix is a designed to convert neuroimaging data from the
DICOM format to the NIfTI format.
'';
homepage = https://www.nitrc.org/projects/dcm2nii;
license = licenses.bsd3;
maintainers = [ maintainers.ashgillman ];
platforms = platforms.all;
};
}

@ -3,8 +3,8 @@ testedTargets ? ["sse2" "host"] # the default test target is sse4, but that is n
}:
stdenv.mkDerivation rec {
version = "20170807";
rev = "6e0fc2f148e95afad998a7c7f4d7908d29fd8e44";
version = "1.9.2";
rev = "v${version}";
inherit testedTargets;
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
owner = "ispc";
repo = "ispc";
inherit rev;
sha256 = "17fwnfm8a329lgfhjwcvji4h1fm4iqmc28wz23hvgqbpj8lk6qgh";
sha256 = "0zaw7mwvly1csbdcbz9j8ry89n0r1fag1m1f579l4mgg1x6ksqry";
};
# there are missing dependencies in the Makefile, causing sporadic build failures

@ -0,0 +1,8 @@
{ stdenv, callPackage, Foundation, libobjc }:
callPackage ./generic-cmake.nix (rec {
inherit Foundation libobjc;
version = "5.4.1.6";
sha256 = "1pv5lmyxjr8z9s17jx19850k43ylzqlbzsgr5jxj1knmkbza1zdx";
enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65820147
})

@ -3,13 +3,13 @@
stdenv.mkDerivation ( rec {
name = "ponyc-${version}";
version = "0.21.2";
version = "0.21.3";
src = fetchFromGitHub {
owner = "ponylang";
repo = "ponyc";
rev = version;
sha256 = "0gdkm1mihn266km3q5ma7nhvjpzwdzmy39cxb7kkz8aal2nmvwri";
sha256 = "0cdp6wbpirl3jnlqkm0hbxyz67v00nwhi4hvk4sq2g74f36j2bnm";
};
buildInputs = [ llvm makeWrapper which ];

@ -1,9 +1,9 @@
{ stdenv, fetchzip, fetchgit, boost, cmake, z3 }:
let
version = "0.4.17";
rev = "bdeb9e52a2211510644fb53df93fb98258b40a65";
sha256 = "1x6q2rlq6gxggidgsy6li7m4phwr1hcfi65pq9yimz64ddqfiira";
version = "0.4.19";
rev = "c4cbbb054b5ed3b8ceaa21ee5b47b0704762ff40";
sha256 = "1h2ziwdswghj4aa3vd3k3y2ckfiwjk6x38w2kp4m324k2ydxd15c";
jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.7.7.tar.gz;
jsoncpp = fetchzip {
url = jsoncppURL;

@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/frameworks/5.41/ -A '*.tar.xz' )
WGET_ARGS=( https://download.kde.org/stable/frameworks/5.42/ -A '*.tar.xz' )

@ -1,13 +1,13 @@
Index: kcmutils-5.33.0/src/kpluginselector.cpp
===================================================================
--- kcmutils-5.33.0.orig/src/kpluginselector.cpp
+++ kcmutils-5.33.0/src/kpluginselector.cpp
@@ -305,7 +305,7 @@ void KPluginSelector::addPlugins(const Q
diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp
index 137c865..097ab75 100644
--- a/src/kpluginselector.cpp
+++ b/src/kpluginselector.cpp
@@ -303,7 +303,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) {
for (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);
+ QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
while (it.hasNext()) {
desktopFileNames.append(it.next());
}

@ -1,25 +1,18 @@
From 4f84780893d505b2d62a14633dd983baa8ec6e28 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 14 Oct 2015 06:47:01 -0500
Subject: [PATCH] qdiriterator follow symlinks
---
src/khelpclient.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/khelpclient.cpp b/src/khelpclient.cpp
index 53a331e..80fbb01 100644
index fbbc0fa..cb78741 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) {
for (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);
--
2.5.2
@@ -75,4 +75,3 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname)
// launch khelpcenter, or a browser for URIs not handled by khelpcenter
QDesktopServices::openUrl(url);
}
-

@ -4,7 +4,7 @@
kactivities, karchive, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons,
kdeclarative, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio,
knotifications, kpackage, kservice, kwayland, kwindowsystem, kxmlgui,
qtbase, qtdeclarative, qtscript, qtx11extras,
qtbase, qtdeclarative, qtscript, qtx11extras, kirigami2
}:
mkDerivation {
@ -14,7 +14,7 @@ mkDerivation {
buildInputs = [
kactivities karchive kconfig kconfigwidgets kcoreaddons kdbusaddons
kdeclarative kglobalaccel kguiaddons ki18n kiconthemes kio knotifications
kwayland kwindowsystem kxmlgui qtdeclarative qtscript qtx11extras
kwayland kwindowsystem kxmlgui qtdeclarative qtscript qtx11extras kirigami2
];
propagatedBuildInputs = [ kpackage kservice qtbase ];
}

@ -3,611 +3,611 @@
{
attica = {
version = "5.41.0";
version = "5.42.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.41/attica-5.41.0.tar.xz";
sha256 = "1l97qhf053z7grl8d77p9zajdvaw3zicllwna9p2vyzbb6n6qyq7";
name = "attica-5.41.0.tar.xz";
url = "${mirror}/stable/frameworks/5.42/attica-5.42.0.tar.xz";
sha256 = "0icjsk5sbri6nwybb2301wc6ysc1h4p35rxqp0adifyksq8akyxd";
name = "attica-5.42.0.tar.xz";
};
};
baloo = {
version = "5.41.0";
version = "5.42.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.41/baloo-5.41.0.tar.xz";
sha256 = "1kl4xs09r21bi11b5dzjkmc8igh5iv8nvq0gxd00n7qjghpxa399";
name = "baloo-5.41.0.tar.xz";
url = "${mirror}/stable/frameworks/5.42/baloo-5.42.0.tar.xz";
sha256 = "18yknkcls1ypsp8n5l254bhlffiq4as5w1wgcjzhnf49cacys8nl";
name = "baloo-5.42.0.tar.xz";
};
};
bluez-qt = {
version = "5.41.0";
version = "5.42.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.41/bluez-qt-5.41.0.tar.xz";
sha256 = "08wlsmr12n3whqr65zm3l9hmzbaca2jkkhb1wwq5ilqm3gvxxz0n";
name = "bluez-qt-5.41.0.tar.xz";
url = "${mirror}/stable/frameworks/5.42/bluez-qt-5.42.0.tar.xz";
sha256 = "0pbb0nn70hbsnp9q8jvqr3s85gh4bnnh1mp8xfkia2hp4c63ws9f";
name = "bluez-qt-5.42.0.tar.xz";
};
};
breeze-icons = {
version = "5.41.0";
version = "5.42.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.41/breeze-icons-5.41.0.tar.xz";
sha256 = "1k06ms48cnnwnlrh9wdabsms581jy70nz5narwg1zpzb6clf9p4w";
name = "breeze-icons-5.41.0.tar.xz";
url = "${mirror}/stable/frameworks/5.42/breeze-icons-5.42.0.tar.xz";
sha256 = "0mrj0b022yfy669qqby09k4ij6aqyky23gpnjcp85df9saq0x44r";
name = "breeze-icons-5.42.0.tar.xz";
};
};
extra-cmake-modules = {
version = "5.41.0";
version = "5.42.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.41/extra-cmake-modules-5.41.0.tar.xz";
sha256 = "0rwz2rdyxr424z0mra29p8i6gf0b1402ifi94qrq7y4z1fa61bxs";
name = "extra-cmake-modules-5.41.0.tar.xz";
url = "${mirror}/stable/frameworks/5.42/extra-cmake-modules-5.42.0.tar.xz";
sha256 = "1ml6s3ssr5izm3vnzlg5gn2nkcbz5l5nmapvyr4ml7n0089b43a3";
name = "extra-cmake-modules-5.42.0.tar.xz";
};
};
frameworkintegration = {
version = "5.41.0";
version = "5.42.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.41/frameworkintegration-5.41.0.tar.xz";
sha256 = "1k67hkzc2jw5im7vc8j64fqsxz5m8fnlq696hm5dh4fbclyckh5s";
name = "frameworkintegration-5.41.0.tar.xz";
url = "${mirror}/stable/frameworks/5.42/frameworkintegration-5.42.0.tar.xz";
sha256 = "17fyny3c5chv7bipr19ayfjmd1amp2nms4ba5r7mwjp97xkphry7";
name = "frameworkintegration-5.42.0.tar.xz";
};
};
kactivities = {
version = "5.41.0";
version = "5.42.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.41/kactivities-5.41.0.tar.xz";
sha256 = "1zxwmizq48kk6pd9y350gzszqi87wjbqni8z4mxa1kmw9lq01xlc";
name = "kactivities-5.41.0.tar.xz";
url = "${mirror}/stable/frameworks/5.42/kactivities-5.42.0.tar.xz";
sha256 = "0z0ac426npq99s1b8yzrqkjjjc34nbxlpw8pw388yj7fa41hw21r";
name = "kactivities-5.42.0.tar.xz";
};
};
kactivities-stats = {
version = "5.41.0";
version = "5.42.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.41/kactivities-stats-5.41.0.tar.xz";
sha256 = "1nm34ln222x6mm4zpmvn8prqk9fr3jxyppn18kwlv0nfw16qmppq";
name = "kactivities-stats-5.41.0.tar.xz";
url = "${mirror}/stable/frameworks/5.42/kactivities-stats-5.42.0.tar.xz";
sha256 = "0si70hayf4brr83jzdjdsfvp8nc1sb7vdk0q532liafhf8hw9mq8";
name = "kactivities-stats-5.42.0.tar.xz";
};
};
kapidox = {
version = "5.41.0";
version = "5.42.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.41/kapidox-5.41.0.tar.xz";
sha256 = "0jdphs536ymaj5f9gh5ycfgq1d41sas6bx4dzzjg13y26w6afyy6";
name = "kapidox-5.41.0.tar.xz";
url = "${mirror}/stable/frameworks/5.42/kapidox-5.42.0.tar.xz";
sha256 = "0izyd66p5403gl09l7irzy97mb9b14n4zyjrwap800zjlpwh41pz";
name = "kapidox-5.42.0.tar.xz";
};
};
karchive = {
version = "5.41.0";
version = "5.42.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.41/karchive-5.41.0.tar.xz";
sha256 = "0hd7jy9517m53ijvprl9ci97kjx7nd42ga33af71kqx5x030zi23";
name = "karchive-5.41.0.tar.xz";
url = "${mirror}/stable/frameworks/5.42/karchive-5.42.0.tar.xz";
sha256 = "1vq2ngdxmdl6hzjwdcrv66ban8v9s5jiqwy1mgdqv4ak14l31qbi";
name = "karchive-5.42.0.tar.xz";
};
};
kauth = {
version = "5.41.0";
version = "5.42.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.41/kauth-5.41.0.tar.xz";
sha256 = "1hkaf83p3xwcwkhlfbrdbg7b7nhw0gh0yw4lv8y3vpryn7pcd32l";
name = "kauth-5.41.0.tar.xz";
url = "${mirror}/stable/frameworks/5.42/kauth-5.42.0.tar.xz";
sha256 = "04kqb2hhr9lkpkxiaqlnyk0kmk6p89z5fgp5i5g83hsi8maz7swi";
name = "kauth-5.42.0.tar.xz";
};
};
kbookmarks = {
version = "5.41.0";
version = "5.42.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.41/kbookmarks-5.41.0.tar.xz";
sha256 = "173rf85msrp1awmf2zsxwv6jjfkz7yc2pbh4jq0hfcgnqk46s9v0";
name = "kbookmarks-5.41.0.tar.xz";
url = "${mirror}/stable/frameworks/5.42/kbookmarks-5.42.0.tar.xz";
sha256 = "08q413mr5ib04gwnqznvm9vkkfmnh16rgf6rqdvclnci9w7ml5x2";
name = "kbookmarks-5.42.0.tar.xz";
};
};
kcmutils = {
version = "5.41.0";
version = "5.42.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.41/kcmutils-5.41.0.tar.xz";
sha256 = "165b5hk0cv769kk9dqqggc6ji6gzln8zns5k6rv12rz825aysnhs";
name = "kcmutils-5.41.0.tar.xz";
url = "${mirror}/stable/frameworks/5.42/kcmutils-5.42.0.tar.xz";
sha256 = "1q67b0m6w3xvm22kq8b0b0rib1jzf25gf6dz7h286987zfbbs5n7";
name = "kcmutils-5.42.0.tar.xz";
};
};
kcodecs = {
version = "5.41.0";
version = "5.42.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.41/kcodecs-5.41.0.tar.xz";
sha256 = "0y96mbp9j083kwkqxk0qgrjyhylp8f7f0ngcqcvhh8s6sgpb8xq9";
name = "kcodecs-5.41.0.tar.xz";
url = "${mirror}/stable/frameworks/5.42/kcodecs-5.42.0.tar.xz";
sha256 = "0b19z432r9dnyjknvwffhcmrg969yhydjvy4qrkrf22026f4smwc";
name = "kcodecs-5.42.0.tar.xz";
};
};
kcompletion = {
version = "5.41.0";
version = "5.42.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.41/kcompletion-5.41.0.tar.xz";
sha256 = "0b6bh5l4s5q8yi6vls11c8b8dpscykh138kydfi925nxkrms7yv3";
name = "kcompletion-5.41.0.tar.xz";
url = "${mirror}/stable/frameworks/5.42/kcompletion-5.42.0.tar.xz";
sha256 = "0yqci2v0dk5v1mz4n3gca599a7mpihy563zc6sl8hsa30ld8li0f";
name = "kcompletion-5.42.0.tar.xz";
};
};
kconfig = {
version = "5.41.0";
version = "5.42.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.41/kconfig-5.41.0.tar.xz";
sha256 = "1jch9bpqshigwvc2qs46qa0mclr1hdn0sqlkxbl4b2xb5xj28nzn";
name = "kconfig-5.41.0.tar.xz";
url = "${mirror}/stable/frameworks/5.42/kconfig-5.42.0.tar.xz";
sha256 = "08gg0d20c09j7hyxm8ydpzk2yf30c87g9ag7a9nfykrmi6cqirdq";
name = "kconfig-5.42.0.tar.xz";
};
};
kconfigwidgets = {
version = "5.41.0";
version = "5.42.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.41/kconfigwidgets-5.41.0.tar.xz";
sha256 = "1lbpjkhxmpah32ig1wlxkr1v1l3fqicnnvj6lhwpk0bxys8cdnd2";
name = "kconfigwidgets-5.41.0.tar.xz";
url = "${mirror}/stable/frameworks/5.42/kconfigwidgets-5.42.0.tar.xz";
sha256 = "191zm24q2n001b65hcnfh2639k4iqhxwdmgdw29php3n2648xq4z";
name = "kconfigwidgets-5.42.0.tar.xz";
};
};
kcoreaddons = {
version = "5.41.0";
version = "5.42.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.41/kcoreaddons-5.41.0.tar.xz";
sha256 = "1f45x4adql708903x4g27x1wbzvbwd809ibiqa5kiijayaqkjxqf";
name = "kcoreaddons-5.41.0.tar.xz";
url = "${mirror}/stable/frameworks/5.42/kcoreaddons-5.42.0.tar.xz";
sha256 = "17qv7r6z72mm9a0hyx5dgk90ikhhgm41bkvnq2hjal0py2lsnrs9";
name = "kcoreaddons-5.42.0.tar.xz";
};
};
kcrash = {
version = "5.41.0";
version = "5.42.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.41/kcrash-5.41.0.tar.xz";
sha256 = "1jp06hz33mpcy2y93w4j3yqcvkphigiwq6j89mvgi9h21pahpjvy";
name = "kcrash-5.41.0.tar.xz";
url = "${mirror}/stable/frameworks/5.42/kcrash-5.42.0.tar.xz";
sha256 = "049y0xdyw37y0qid3d3plj8szfys5gw98j7lhcakiini8mn5cins";
name = "kcrash-5.42.0.tar.xz";
};
};
kdbusaddons = {
version = "5.41.0";
version = "5.42.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.41/kdbusaddons-5.41.0.tar.xz";
sha256 = "02d6zv43vpz5h8si100zlsf5yfgjajsgwldcxblckyjr0qn42xny";
name = "kdbusaddons-5.41.0.tar.xz";
url = "${mirror}/stable/frameworks/5.42/kdbusaddons-5.42.0.tar.xz";
sha256 = "1613pc3r70jnzvpwm1xjdbdsmcpx28jwvcs2qq9swlywr5qr9hbd";
name = "kdbusaddons-5.42.0.tar.xz";
};
};
kdeclarative = {
version = "5.41.0";
version = "5.42.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.41/kdeclarative-5.41.0.tar.xz";
sha256 = "1hxfrz4d7xjm63b9kawhf382gz1xykvdi9q4syhkjfbpyacxfjga";
name = "kdeclarative-5.41.0.tar.xz";
url = "${mirror}/stable/frameworks/5.42/kdeclarative-5.42.0.tar.xz";
sha256 = "1w604jy6vg2247vggz0ivl7wy2h5iapkz2z86mah3aw99f7dqa22";
name = "kdeclarative-5.42.0.tar.xz";
};
};
kded = {
version = "5.41.0";
version = "5.42.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.41/kded-5.41.0.tar.xz";
sha256 = "10wmj3nb8vn90h1j0s5kfr8iydk7k853gg9v6hxivm92v6zr6l9g";
name = "kded-5.41.0.tar.xz";
url = "${mirror}/stable/frameworks/5.42/kded-5.42.0.tar.xz";
sha256 = "0w25dl4pnvby28gz0yvij32vi9n3p8si4nm4x45j7zsi2cb70j4l";
name = "kded-5.42.0.tar.xz";
};
};
kdelibs4support = {
version = "5.41.0";
version = "5.42.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.41/portingAids/kdelibs4support-5.41.0.tar.xz";
sha256 = "1mkp3w8h8cyskbfxcwsl72v87376x66n20ig7b3b6ply36578br4";
name = "kdelibs4support-5.41.0.tar.xz";
url = "${mirror}/stable/frameworks/5.42/portingAids/kdelibs4support-5.42.0.tar.xz";
sha256 = "0aiig8akn6bdxrqdl96xjjy2pxw8hhfrsalbkkzyhh06j794snfb";
name = "kdelibs4support-5.42.0.tar.xz";
};
};
kdesignerplugin = {
version = "5.41.0";
version = "5.42.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.41/kdesignerplugin-5.41.0.tar.xz";
sha256 = "1c1pnjgp9nifynwvsyjp7c45j40i111xnmjp89bb1jk9fv9g2f99";
name = "kdesignerplugin-5.41.0.tar.xz";
url = "${mirror}/stable/frameworks/5.42/kdesignerplugin-5.42.0.tar.xz";
sha256 = "004axa1fkj954d65x7l9z8dmw04209hb368rwa4gjzb8naf13ib6";
name = "kdesignerplugin-5.42.0.tar.xz";
};
};
kdesu = {
version = "5.41.0";
version = "5.42.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.41/kdesu-5.41.0.tar.xz";
sha256 = "126m7by50zzkmk0r778xlkqfbfpihwd6d3wzd4hbqkh9km18l1rb";
name = "kdesu-5.41.0.tar.xz";
url = "${mirror}/stable/frameworks/5.42/kdesu-5.42.0.tar.xz";
sha256 = "0402p1h7wifk6sppg7ca9w0zfjllbhc1j5gsxj7ypq55g94np7hx";
name = "kdesu-5.42.0.tar.xz";
};
};
kdewebkit = {
version = "5.41.0";
version = "5.42.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.41/kdewebkit-5.41.0.tar.xz";
sha256 = "1rnixlm37x5k4cdwckml2zdmm30k938nklkd7qnbaal230dzvj6d";
name = "kdewebkit-5.41.0.tar.xz";
url = "${mirror}/stable/