Merge remote-tracking branch 'upstream/master' into HEAD

.github/CODEOWNERS

@@ -38,3 +38,12 @@ pkgs/development/r-modules       @peti
 pkgs/stdenv/darwin/*    @copumpkin @LnL7
 pkgs/os-specific/darwin/*       @LnL7
 pkgs/os-specific/darwin/apple-source-releases/* @copumpkin
+
+# Beam-related (Erlang, Elixir, LFE, etc)
+pkgs/development/beam-modules/*	@gleber
+pkgs/development/interpreters/erlang/*	@gleber
+pkgs/development/interpreters/lfe/*	@gleber
+pkgs/development/interpreters/elixir/*	@gleber
+pkgs/development/tools/build-managers/rebar/*	@gleber
+pkgs/development/tools/build-managers/rebar3/*	@gleber
+pkgs/development/tools/erlang/*	@gleber

doc/submitting-changes.xml

@@ -61,7 +61,7 @@ $ git checkout -b 'fix/pkg-name-update'
 <listitem>
 <para>Format the commit in a following way:</para>
 <programlisting>
-(pkg-name | service-name): (from -> to | init at version | refactor | etc)
+(pkg-name | nixos/&lt;module>): (from -> to | init at version | refactor | etc)
 Additional information.
 </programlisting>
 
@@ -84,13 +84,13 @@ Additional information.
 
 <listitem>
 <para>
-<command>hydra service: add bazBaz option</command>
+<command>nixos/hydra: add bazBaz option</command>
 </para>
 </listitem>
 
 <listitem>
 <para>
-<command>nginx service: refactor config generation</command>
+<command>nixos/nginx: refactor config generation</command>
 </para>
 </listitem>
 </itemizedlist>
@@ -196,7 +196,7 @@ Additional information.
 
 <itemizedlist>
 <listitem>
-<para>Write the title in format <command>(pkg-name | service): improvement</command>.
+<para>Write the title in format <command>(pkg-name | nixos/&lt;module>): improvement</command>.
 
 <itemizedlist>
 <listitem>

lib/maintainers.nix

@@ -284,9 +284,9 @@
   johnramsden = "John Ramsden <johnramsden@riseup.net>";
   joko = "Ioannis Koutras <ioannis.koutras@gmail.com>";
   jonafato = "Jon Banafato <jon@jonafato.com>";
-  jpbernardy = "Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>";
   jpierre03 = "Jean-Pierre PRUNARET <nix@prunetwork.fr>";
   jpotier = "Martin Potier <jpo.contributes.to.nixos@marvid.fr>";
+  jyp = "Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>";
   jraygauthier = "Raymond Gauthier <jraygauthier@gmail.com>";
   jtojnar = "Jan Tojnar <jtojnar@gmail.com>";
   juliendehos = "Julien Dehos <dehos@lisic.univ-littoral.fr>";

lib/sources.nix

@@ -15,9 +15,10 @@ rec {
   cleanSourceFilter = name: type: let baseName = baseNameOf (toString name); in ! (
     # Filter out Subversion and CVS directories.
     (type == "directory" && (baseName == ".git" || baseName == ".svn" || baseName == "CVS" || baseName == ".hg")) ||
-    # Filter out backup files.
+    # Filter out editor backup / swap files.
     lib.hasSuffix "~" baseName ||
-    builtins.match "^.*\.sw[a-z]$" baseName != null ||
+    builtins.match "^\\.sw[a-z]$" baseName != null ||
+    builtins.match "^\\..*\\.sw[a-z]$" baseName != null ||
 
     # Filter out generates files.
     lib.hasSuffix ".o" baseName ||

lib/systems/default.nix

@@ -28,6 +28,15 @@ rec {
         else if final.isLinux  then "glibc"
         # TODO(@Ericson2314) think more about other operating systems
         else                        "native/impure";
+      extensions = {
+        sharedLibrary =
+          /**/ if final.isDarwin  then ".dylib"
+          else if final.isWindows then ".dll"
+          else                         ".so";
+        executable =
+          /**/ if final.isWindows then ".exe"
+          else                         "";
+      };
     } // mapAttrs (n: v: v final.parsed) inspect.predicates
       // args;
   in final;

nixos/modules/hardware/raid/hpsa.nix

@@ -24,7 +24,7 @@ let
 
       for file in $out/bin/*; do
         chmod +w $file
-        patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \
+        patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
                  --set-rpath ${lib.makeLibraryPath [ pkgs.stdenv.cc.cc ]} \
                  $file
       done

nixos/modules/services/misc/gitolite.nix

@@ -4,7 +4,8 @@ with lib;
 
 let
   cfg = config.services.gitolite;
-  pubkeyFile = pkgs.writeText "gitolite-admin.pub" cfg.adminPubkey;
+  # Use writeTextDir to not leak Nix store hash into file name
+  pubkeyFile = (pkgs.writeTextDir "gitolite-admin.pub" cfg.adminPubkey) + "/gitolite-admin.pub";
   hooks = lib.concatMapStrings (hook: "${hook} ") cfg.commonHooks;
 in
 {
@@ -70,6 +71,7 @@ in
     systemd.services."gitolite-init" = {
       description = "Gitolite initialization";
       wantedBy    = [ "multi-user.target" ];
+      unitConfig.RequiresMountsFor = cfg.dataDir;
 
       serviceConfig.User = "${cfg.user}";
       serviceConfig.Type = "oneshot";

nixos/modules/services/network-filesystems/openafs-client/default.nix

@@ -6,8 +6,8 @@ let
   cfg = config.services.openafsClient;
 
   cellServDB = pkgs.fetchurl {
-    url = http://dl.central.org/dl/cellservdb/CellServDB.2009-06-29;
+    url = http://dl.central.org/dl/cellservdb/CellServDB.2017-03-14;
-    sha256 = "be566f850e88130333ab8bc3462872ad90c9482e025c60a92f728b5bac1b4fa9";
+    sha256 = "1197z6c5xrijgf66rhaymnm5cvyg2yiy1i20y4ah4mrzmjx0m7sc";
   };
 
   afsConfig = pkgs.runCommand "afsconfig" {} ''

nixos/modules/services/network-filesystems/samba.nix

@@ -28,7 +28,7 @@ let
   configFile = pkgs.writeText "smb.conf"
     (if cfg.configText != null then cfg.configText else
     ''
-      [ global ]
+      [global]
       security = ${cfg.securityType}
       passwd program = /run/wrappers/bin/passwd %u
       pam password change = ${smbToString cfg.syncPasswordsByPam}

nixos/modules/services/networking/i2pd.nix

@@ -256,6 +256,14 @@ in
         '';
       };
 
+      nat = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Assume router is NATed. Enabled by default.
+        '';
+      };
+
       upnp = {
         enable = mkOption {
           type = types.bool;

nixos/modules/services/security/physlock.nix

@@ -99,6 +99,8 @@ in
       '';
     };
 
+    security.pam.services.physlock = {};
+
   };
 
 }

pkgs/applications/altcoins/bitcoin-xt.nix

@@ -1,22 +1,22 @@
 { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost
-, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, curl
+, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, curl, libevent
 , withGui }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec{
 
   name = "bitcoin" + (toString (optional (!withGui) "d")) + "-xt-" + version;
-  version = "0.11F";
+  version = "0.11G2";
 
   src = fetchFromGitHub {
     owner = "bitcoinxt";
     repo = "bitcoinxt";
     rev = "v${version}";
-    sha256 = "13s5k9mxmlbf49p5hc546x20y5dslfp6g9hi6nw5yja5bngbwr24";
+    sha256 = "071rljvsabyc9j64v248qfb7zfqpfl84hpsnvlavin235zljq8qs";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
-  buildInputs = [ openssl db48 boost zlib
+  buildInputs = [ openssl db48 boost zlib libevent
                   miniupnpc utillinux protobuf curl ]
                   ++ optionals withGui [ qt4 qrencode ];
 

pkgs/applications/altcoins/default.nix

@@ -8,8 +8,8 @@ rec {
   bitcoin-unlimited  = callPackage ./bitcoin-unlimited.nix { withGui = true; };
   bitcoind-unlimited = callPackage ./bitcoin-unlimited.nix { withGui = false; };
 
-  bitcoin-classic  = callPackage ./bitcoin-classic.nix { withGui = true; boost = boost162; };
+  bitcoin-classic  = callPackage ./bitcoin-classic.nix { withGui = true; };
-  bitcoind-classic = callPackage ./bitcoin-classic.nix { withGui = false; boost = boost162; };
+  bitcoind-classic = callPackage ./bitcoin-classic.nix { withGui = false; };
 
   bitcoin-xt  = callPackage ./bitcoin-xt.nix { withGui = true; };
   bitcoind-xt = callPackage ./bitcoin-xt.nix { withGui = false; };
@@ -26,8 +26,8 @@ rec {
   go-ethereum = callPackage ./go-ethereum.nix { };
   go-ethereum-classic = callPackage ./go-ethereum-classic { };
 
-  hivemind = callPackage ./hivemind.nix { withGui = true; boost = boost162; };
+  hivemind = callPackage ./hivemind.nix { withGui = true; };
-  hivemindd = callPackage ./hivemind.nix { withGui = false; boost = boost162; };
+  hivemindd = callPackage ./hivemind.nix { withGui = false; };
 
   litecoin  = callPackage ./litecoin.nix { withGui = true; };
   litecoind = callPackage ./litecoin.nix { withGui = false; };
@@ -35,8 +35,8 @@ rec {
   memorycoin  = callPackage ./memorycoin.nix { withGui = true; };
   memorycoind = callPackage ./memorycoin.nix { withGui = false; };
 
-  namecoin  = callPackage ./namecoin.nix  { inherit namecoind; };
+  namecoin  = callPackage ./namecoin.nix  { withGui = true; };
-  namecoind = callPackage ./namecoind.nix { };
+  namecoind = callPackage ./namecoin.nix { withGui = false; };
 
   ethabi = callPackage ./ethabi.nix { };
   ethrun = callPackage ./ethrun.nix { };

pkgs/applications/altcoins/namecoin.nix

@@ -1,20 +1,45 @@
-{ stdenv, db4, boost, openssl, qt4, qmake4Hook, miniupnpc, unzip, namecoind }:
+{ stdenv, lib, fetchFromGitHub, openssl, boost, libevent, autoreconfHook, db4, miniupnpc, eject, pkgconfig, qt4, protobuf, libqrencode
+, withGui }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
+  version = "nc0.13.0rc1";
+  name = "namecoin" + toString (optional (!withGui) "d") + "-" + version;
 
-  name = "namecoin-${version}";
+  src = fetchFromGitHub {
-  version = namecoind.version;
+    owner = "namecoin";
-  src = namecoind.src;
+    repo = "namecoin-core";
+    rev = version;
+    sha256 = "17zz0rm3js285w2assxp8blfx830rs0ambcsaqqfli9mnaik3m39";
+  };
 
-  buildInputs = [ db4 boost openssl unzip qt4 qmake4Hook miniupnpc ];
+  nativeBuildInputs = [
+    autoreconfHook
+    pkgconfig
+  ];
 
-  qmakeFlags = [ "USE_UPNP=-" ];
+  buildInputs = [
+    openssl
+    boost
+    libevent
+    db4
+    miniupnpc
+    eject
+  ] ++ optionals withGui [
+    qt4
+    protobuf
+    libqrencode
+  ];
 
-  installPhase = ''
+  configureFlags = [
-    mkdir -p $out/bin
+    "--with-boost-libdir=${boost.out}/lib"
-    cp namecoin-qt $out/bin
+  ];
-  '';
 
-  meta = namecoind.meta;
+  meta = {
+    description = "Decentralized open source information registration and transfer system based on the Bitcoin cryptocurrency";
+    homepage = https://namecoin.org;
+    license = licenses.mit;
+    maintainers = with maintainers; [ doublec AndersonTorres infinisil ];
+    platforms = platforms.linux;
+  };
 }

pkgs/applications/altcoins/namecoind.nix

@@ -1,35 +0,0 @@
-{ stdenv, fetchzip, db4, boost, openssl, miniupnpc, unzip }:
-
-with stdenv.lib;
-stdenv.mkDerivation rec {
-  version = "0.3.80";
-  name = "namecoind-${version}";
-
-  src = fetchzip {
-    url = "https://github.com/namecoin/namecoin/archive/nc${version}.tar.gz";
-    sha256 = "0mbkhj7y3f4vbqp5q3zk27bzqlk2kq71rcgivvj06w29fzd64mw6";
-  };
-
-  buildInputs = [ db4 boost openssl unzip miniupnpc ];
-
-  patchPhase = ''
-    sed -e 's/-Wl,-Bstatic//g' -e 's/-l gthread-2.0//g' -e 's/-l z//g' -i src/Makefile
-  '';
-
-  buildPhase = ''
-    make -C src INCLUDEPATHS= LIBPATHS=
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp src/namecoind $out/bin
-  '';
-
-  meta = {
-    description = "Decentralized open source information registration and transfer system based on the Bitcoin cryptocurrency";
-    homepage = http://namecoin.info;
-    license = licenses.mit;
-    maintainers = with maintainers; [ doublec AndersonTorres ];
-    platforms = platforms.linux;
-  };
-}

pkgs/applications/editors/aseprite/default.nix

@@ -1,47 +1,77 @@
-{ stdenv, fetchurl, cmake, pkgconfig
+{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig
-, giflib, libjpeg, zlib, libpng, tinyxml, allegro
+, curl, freetype, giflib, libjpeg, libpng, libwebp, pixman, tinyxml, zlib
-, libX11, libXext, libXcursor, libXpm, libXxf86vm, libXxf86dga
+, libX11, libXext, libXcursor, libXxf86vm
+, unfree ? false
+, cmark
 }:
 
-stdenv.mkDerivation rec {
+# Unfree version is not redistributable:
-  name = "aseprite-0.9.5";
+# https://dev.aseprite.org/2016/09/01/new-source-code-license/
+# Consider supporting the developer: https://aseprite.org/#buy
 
-  src = fetchurl {
+stdenv.mkDerivation rec {
-    url = "http://aseprite.googlecode.com/files/${name}.tar.xz";
+  name = "aseprite-${version}";
-    sha256 = "0m7i6ybj2bym4w9rybacnnaaq2jjn76vlpbp932xcclakl6kdq41";
+  version = if unfree then "1.2-beta12" else "1.1.7";
+
+  src = fetchFromGitHub {
+    owner = "aseprite";
+    repo = "aseprite";
+    rev = "v${version}";
+    fetchSubmodules = true;
+    sha256 = if unfree
+      then "1zgsr03d4vwdj2qyiwfwfqsbqngp85n13i3xwbkfkbja036c5yhc"
+      else "0gd49lns2bpzbkwax5jf9x1xmg1j8ij997kcxr2596cwiswnw4di";
   };
 
+  nativeBuildInputs = [ cmake pkgconfig ];
+
   buildInputs = [
-    cmake pkgconfig
+    curl freetype giflib libjpeg libpng libwebp pixman tinyxml zlib
-    giflib libjpeg zlib libpng tinyxml allegro
+    libX11 libXext libXcursor libXxf86vm
-    libX11 libXext libXcursor libXpm libXxf86vm libXxf86dga
+  ] ++ lib.optionals unfree [ cmark ];
+
+  cmakeFlags = [
+    "-DENABLE_UPDATER=OFF"
+    "-DUSE_SHARED_CURL=ON"
+    "-DUSE_SHARED_FREETYPE=ON"
+    "-DUSE_SHARED_GIFLIB=ON"
+    "-DUSE_SHARED_JPEGLIB=ON"
+    "-DUSE_SHARED_LIBPNG=ON"
+    "-DUSE_SHARED_LIBWEBP=ON"
+    "-DUSE_SHARED_PIXMAN=ON"
+    "-DUSE_SHARED_TINYXML=ON"
+    "-DUSE_SHARED_ZLIB=ON"
+    "-DWITH_DESKTOP_INTEGRATION=ON"
+    "-DWITH_WEBP_SUPPORT=ON"
+  ] ++ lib.optionals unfree [
+    "-DUSE_SHARED_CMARK=ON"
+    # Aseprite needs internal freetype headers.
+    "-DUSE_SHARED_FREETYPE=OFF"
+    # Disable libarchive programs.
+    "-DENABLE_CAT=OFF"
+    "-DENABLE_CPIO=OFF"
+    "-DENABLE_TAR=OFF"
   ];
 
-  patchPhase = ''
+  postInstall = ''
-    sed -i '/^find_unittests/d' src/CMakeLists.txt
+    # Install desktop icons.
-    sed -i '/include_directories(.*third_party\/gtest.*)/d' src/CMakeLists.txt
+    src="$out/share/aseprite/data/icons"
-    sed -i '/add_subdirectory(gtest)/d' third_party/CMakeLists.txt
+    for size in 16 32 48 64; do
-    sed -i 's/png_\(sizeof\)/\1/g' src/file/png_format.cpp
+      dst="$out"/share/icons/hicolor/"$size"x"$size"
+      install -Dm644 "$src"/ase"$size".png "$dst"/apps/aseprite.png
+      install -Dm644 "$src"/doc"$size".png "$dst"/mimetypes/aseprite.png
+    done
+    # Delete unneeded artifacts of bundled libraries.
+    rm -rf "$out"/include "$out"/lib
   '';
 
-  cmakeFlags = ''
+  enableParallelBuilding = true;
-    -DUSE_SHARED_GIFLIB=ON
-    -DUSE_SHARED_JPEGLIB=ON
-    -DUSE_SHARED_ZLIB=ON
-    -DUSE_SHARED_LIBPNG=ON
-    -DUSE_SHARED_LIBLOADPNG=ON
-    -DUSE_SHARED_TINYXML=ON
-    -DUSE_SHARED_GTEST=ON
-    -DUSE_SHARED_ALLEGRO4=ON
-    -DENABLE_UPDATER=OFF
-  '';
 
-  NIX_LDFLAGS = "-lX11";
+  meta = with lib; {
-
-  meta = {
-    description = "Animated sprite editor & pixel art tool";
     homepage = https://www.aseprite.org/;
-    license = stdenv.lib.licenses.gpl2Plus;
+    description = "Animated sprite editor & pixel art tool";
-    platforms = stdenv.lib.platforms.linux;
+    license = if unfree then licenses.unfree else licenses.gpl2;
+    maintainers = with maintainers; [ orivej ];
+    platforms = platforms.linux;
   };
 }

pkgs/applications/editors/emacs/default.nix

@@ -26,12 +26,12 @@ let
 in
 stdenv.mkDerivation rec {
   name = "emacs-${version}${versionModifier}";
-  version = "25.2";
+  version = "25.3";
   versionModifier = "";
 
   src = fetchurl {
     url = "mirror://gnu/emacs/${name}.tar.xz";
-    sha256 = "1ykkq0xl28ljdg61bm6gzy04ww86ajms98gix72qg6cpr6a53dar";
+    sha256 = "02y00y9q42g1iqgz5qhmsja75hwxd88yrn9zp14lanay0zkwafi5";
   };
 
   patches = (lib.optional stdenv.isDarwin ./at-fdcwd.patch);

pkgs/applications/misc/avrdudess/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, mono, avrgcclibc, avrdude, gtk2, xdg_utils }:
+{ stdenv, fetchurl, unzip, mono, avrbinutils, avrgcc, avrdude, gtk2, xdg_utils }:
 
 stdenv.mkDerivation rec {
   name = "avrdudess-2.2.20140102";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [gtk2 mono]}"
     # We need PATH from user env for xdg-open to find its tools, which
     # typically depend on the currently running desktop environment.
-    export PATH="${stdenv.lib.makeBinPath [ avrgcclibc avrdude xdg_utils ]}:\$PATH"
+    export PATH="${stdenv.lib.makeBinPath [ avrgcc avrbinutils avrdude xdg_utils ]}:\$PATH"
 
     # avrdudess must have its resource files in its current working directory
     cd $out/avrdudess && exec ${mono}/bin/mono "$out/avrdudess/avrdudess.exe" "\$@"

pkgs/applications/misc/blender/default.nix

@@ -11,11 +11,11 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "blender-2.78c";
+  name = "blender-2.79";
 
   src = fetchurl {
     url = "http://download.blender.org/source/${name}.tar.gz";
-    sha256 = "0f6k3m9yd5yhn7fq9srgzwh2gachlxm03bdrvn2r7xq00grqzab4";
+    sha256 = "16f84mdzkmwjmqahjj64kbyk4kagdj4mcr8qjazs1952d7kh7pm9";
   };
 
   buildInputs =

pkgs/applications/misc/cheat/default.nix

@@ -1,22 +1,24 @@
-{ python3Packages, fetchurl, lib }:
+{ stdenv, python3Packages, fetchurl }:
 
-python3Packages.buildPythonApplication rec {
+with python3Packages;
-  version = "2.2.0";
+buildPythonApplication rec {
-  name = "cheat-${version}";
+  name = "${pname}-${version}";
+  pname = "cheat";
+  version = "2.2.1";
 
   propagatedBuildInputs = with python3Packages; [ docopt pygments ];
 
-  src = fetchurl {
+  src = fetchPypi {
-    url = "mirror://pypi/c/cheat/${name}.tar.gz";
+    inherit pname version;
-    sha256 = "16pg1bgyfjvzpm2rbi411ckf3gljg9v1vzd5qhp23g69ch6yr138";
+    sha256 = "0w4k1h02p2gjv5wcr1c7r0ynb7v50qajx4hpyxz0ndh96f6x30pl";
   };
   # no tests available
   doCheck = false;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "cheat allows you to create and view interactive cheatsheets on the command-line";
-    maintainers = with lib.maintainers; [ mic92 ];
+    maintainers = with maintainers; [ mic92 ];
-    license = with lib.licenses; [gpl3 mit];
+    license = with licenses; [gpl3 mit];
     homepage = https://github.com/chrisallenlane/cheat;
   };
 }

pkgs/applications/misc/hugo/default.nix

@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "hugo-${version}";
-  version = "0.26";
+  version = "0.27";
 
   goPackagePath = "github.com/gohugoio/hugo";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "gohugoio";
     repo = "hugo";
     rev = "v${version}";
-    sha256 = "1g2brxhc6lyl2qa41lrqw2hadl601inmshsxlpmv99ax67sa19d1";
+    sha256 = "1r64pwk5g50gwriawmsgza6j8m4jymg8mwgwh1rplpsdfxqdfrbx";
   };
 
   goDeps = ./deps.nix;

pkgs/applications/networking/cluster/mesos/default.nix

@@ -8,7 +8,6 @@
 
 let
   mavenRepo = import ./mesos-deps.nix { inherit stdenv curl; };
-  soext = if stdenv.system == "x86_64-darwin" then "dylib" else "so";
   # `tar -z` requires gzip on $PATH, so wrap tar.
   # At some point, we should try to patch mesos so we add gzip to the PATH when
   # tar is invoked. I think that only needs to be done here:
@@ -193,7 +192,7 @@ in stdenv.mkDerivation rec {
     mkdir -p $out/share/java
     cp src/java/target/mesos-*.jar $out/share/java
 
-    MESOS_NATIVE_JAVA_LIBRARY=$out/lib/libmesos.${soext}
+    MESOS_NATIVE_JAVA_LIBRARY=$out/lib/libmesos${stdenv.hostPlatform.extensions.sharedLibrary}
 
     mkdir -p $out/nix-support
     touch $out/nix-support/setup-hook

pkgs/applications/networking/gopher/gopherclient/default.nix

@@ -0,0 +1,44 @@
+{ stdenv, buildGoPackage, fetchgit, makeWrapper, pkgconfig, qtbase, qtdeclarative, qtwebengine }:
+
+buildGoPackage rec {
+  name = "gopherclient-${version}";
+  version = "2016-10-02";
+  rev = "91c41b5542d08001636708e2a5054521a6004702";
+
+  goPackagePath = "github.com/prologic/gopherclient";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/prologic/gopherclient";
+    sha256 = "0b1gvxhv4zg930hvric9mmbfp0lnww0sqlkkfbzfkif3wz9ni5y9";
+  };
+
+  nativeBuildInputs = [ makeWrapper pkgconfig ];
+
+  buildInputs = [ qtbase qtdeclarative qtwebengine ];
+
+  preBuild = ''
+    # Generate gopherclient resources with genqrc.
+    ln -s ${goPackagePath}/vendor/gopkg.in go/src/
+    GOBIN="$(pwd)" go install -v gopkg.in/qml.v1/cmd/genqrc
+    PATH="$(pwd):$PATH" go generate ${goPackagePath}
+  '';
+
+  NIX_CFLAGS_COMPILE = [
+    # go-qml needs private Qt headers.
+    "-I${qtbase.dev}/include/QtCore/${qtbase.version}"
+  ];
+
+  postInstall = ''
+    # https://github.com/prologic/gopherclient/#usage
+    wrapProgram $bin/bin/gopherclient --prefix GODEBUG , cgocheck=0
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/prologic/gopherclient;
+    description = "Gopher Qt GUI client";
+    license = licenses.mit;
+    maintainers = with maintainers; [ orivej ];
+    platforms = platforms.linux;
+  };
+}

pkgs/applications/networking/instant-messengers/toxic/default.nix

@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
     description = "Reference CLI for Tox";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ viric jgeerds ];
-    platforms = platforms.all;
+    platforms = platforms.linux;
   };
 }

pkgs/applications/networking/seafile-client/default.nix

@@ -1,5 +1,8 @@
 { stdenv, fetchurl, writeScript, pkgconfig, cmake, qtbase, qttools
-, seafile-shared, ccnet, makeWrapper }:
+, seafile-shared, ccnet, makeWrapper
+, withShibboleth ? true, qtwebengine }:
+
+with stdenv.lib;
 
 stdenv.mkDerivation rec {
   version = "6.1.0";
@@ -11,7 +14,11 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig cmake makeWrapper ];
-  buildInputs = [ qtbase qttools seafile-shared ];
+  buildInputs = [ qtbase qttools seafile-shared ]
+    ++ optional withShibboleth qtwebengine;
+
+  cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]
+    ++ optional withShibboleth "-DBUILD_SHIBBOLETH_SUPPORT=ON";
 
   postInstall = ''
     wrapProgram $out/bin/seafile-applet \

pkgs/applications/video/mpv/default.nix

@@ -81,13 +81,13 @@ let
   };
 in stdenv.mkDerivation rec {
   name = "mpv-${version}";
-  version = "0.26.0";
+  version = "0.27.0";
 
   src = fetchFromGitHub {
     owner = "mpv-player";
     repo  = "mpv";
     rev    = "v${version}";
-    sha256 = "0d9pvsknjqmxj907y85fxh9xcbb5dafw2bh7rpwhgs9x4wdrbvv0";
+    sha256 = "0746kmsg69675y5c70vn8imcr9d1zpjz97f27xr1vx00yjpd518v";
   };
 
   patchPhase = ''

pkgs/applications/virtualization/OVMF/default.nix

@@ -10,11 +10,15 @@ let
     throw "Unsupported architecture";
 
   version = (builtins.parseDrvName edk2.name).version;
+
+  src = edk2.src;
 in
 
 stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" {
   name = "OVMF-${version}";
 
+  inherit src;
+
   outputs = [ "out" "fd" ];
 
   # TODO: properly include openssl for secureBoot
@@ -27,22 +31,22 @@ stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" {
     export OUTPUT_FD=$fd
 
     for file in \
-      "${edk2.src}"/{UefiCpuPkg,MdeModulePkg,IntelFrameworkModulePkg,PcAtChipsetPkg,FatBinPkg,EdkShellBinPkg,MdePkg,ShellPkg,OptionRomPkg,IntelFrameworkPkg,FatPkg,CryptoPkg,SourceLevelDebugPkg};
+      "${src}"/{UefiCpuPkg,MdeModulePkg,IntelFrameworkModulePkg,PcAtChipsetPkg,FatBinPkg,EdkShellBinPkg,MdePkg,ShellPkg,OptionRomPkg,IntelFrameworkPkg,FatPkg,CryptoPkg,SourceLevelDebugPkg};
     do
       ln -sv "$file" .
     done
 
     ${if (seabios == false) then ''
-        ln -sv ${edk2.src}/OvmfPkg .
+        ln -sv ${src}/OvmfPkg .
       '' else ''
-        cp -r ${edk2.src}/OvmfPkg .
+        cp -r ${src}/OvmfPkg .
         chmod +w OvmfPkg/Csm/Csm16
         cp ${seabios}/Csm16.bin OvmfPkg/Csm/Csm16/Csm16.bin
       ''}
 
     ${if (secureBoot == true) then ''
-        ln -sv ${edk2.src}/SecurityPkg .
+        ln -sv ${src}/SecurityPkg .
-        ln -sv ${edk2.src}/CryptoPkg .
+        ln -sv ${src}/CryptoPkg .
       '' else ''
       ''}
     '';

pkgs/applications/virtualization/seabios/default.nix

@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.seabios.org;
     license = licenses.lgpl3;
     maintainers = [ maintainers.tstrobel ];
-    platforms = platforms.linux;
+    platforms = [ "i686-linux" "x86_64-linux" ];
   };
 }
 

pkgs/applications/window-managers/yabar/build.nix

@@ -0,0 +1,51 @@
+{ stdenv, fetchFromGitHub, cairo, gdk_pixbuf, libconfig, pango, pkgconfig
+, xcbutilwm, alsaLib, wirelesstools, asciidoc, libxslt, makeWrapper, docbook_xsl
+, configFile ? null, lib
+, rev, sha256, version
+}:
+
+stdenv.mkDerivation {
+  name = "yabar-${version}";
+
+  src = fetchFromGitHub {
+    inherit rev sha256;
+
+    owner = "geommer";
+    repo  = "yabar";
+  };
+
+  hardeningDisable = [ "format" ];
+
+  buildInputs = [
+    cairo gdk_pixbuf libconfig pango pkgconfig xcbutilwm docbook_xsl
+    alsaLib wirelesstools asciidoc libxslt makeWrapper
+  ];
+
+  postPatch = ''
+    substituteInPlace ./Makefile \
+      --replace "\$(shell git describe)" "${version}" \
+      --replace "a2x" "${asciidoc}/bin/a2x --no-xmllint"
+  '';
+
+  makeFlags = [ "DESTDIR=$(out)" "PREFIX=/" ];
+
+  postInstall = ''
+    mkdir -p $out/share/yabar/examples
+    cp -v examples/*.config $out/share/yabar/examples
+
+    ${lib.optionalString (configFile != null)
+      ''
+        wrapProgram "$out/bin/yabar" \
+          --add-flags "-c ${configFile}"
+      ''
+    }
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A modern and lightweight status bar for X window managers";
+    homepage    = https://github.com/geommer/yabar;
+    license     = licenses.mit;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ ma27 ];
+  };
+}

pkgs/applications/window-managers/yabar/default.nix

@@ -1,38 +1,10 @@
-{ stdenv, fetchFromGitHub, cairo, gdk_pixbuf, libconfig, pango, pkgconfig, xcbutilwm }:
+{ callPackage, attrs ? {} }:
 
-stdenv.mkDerivation rec {
+let
-  name    = "yabar-${version}";
+  overrides = {
-  version = "0.4.0";
+    version = "0.4.0";
 
-  src = fetchFromGitHub {
+    rev = "746387f0112f9b7aa2e2e27b3d69cb2892d8c63b";
-    owner  = "geommer";
-    repo   = "yabar";
-    rev    = "746387f0112f9b7aa2e2e27b3d69cb2892d8c63b";
     sha256 = "1nw9dar1caqln5fr0dqk7dg6naazbpfwwzxwlkxz42shsc3w30a6";
-  };
+  } // attrs;
-
+in callPackage ./build.nix overrides
-  buildInputs = [ cairo gdk_pixbuf libconfig pango pkgconfig xcbutilwm ];
-
-  hardeningDisable = [ "format" ];
-
-  postPatch = ''
-    substituteInPlace ./Makefile --replace "\$(shell git describe)" "${version}"
-  '';
-
-  buildPhase = ''
-    make DESTDIR=$out PREFIX=/
-  '';
-
-  installPhase = ''
-    make DESTDIR=$out PREFIX=/ install
-    mkdir -p $out/share/yabar/examples
-    cp -v examples/*.config $out/share/yabar/examples
-  '';
-
-  meta = with stdenv.lib; {
-    description = "A modern and lightweight status bar for X window managers";
-    homepage    = "https://github.com/geommer/yabar";
-    license     = licenses.mit;
-    platforms   = platforms.linux;
-  };
-}

pkgs/applications/window-managers/yabar/unstable.nix

@@ -0,0 +1,10 @@
+{ callPackage, attrs ? {} }:
+
+let
+  overrides = {
+    version = "unstable-2017-09-09";
+
+    rev    = "d3934344ba27f5bdf122bf74daacee6d49284dab";
+    sha256 = "14zrlzva8i83ffg426mrf6yli8afwq6chvc7yi78ngixyik5gzhx";
+  } // attrs;
+in callPackage ./build.nix overrides

pkgs/build-support/docker/pull.sh

@@ -25,7 +25,7 @@ done
 # run docker daemon
 dockerd -H tcp://127.0.0.1:5555 -H unix:///var/run/docker.sock &
 
-until $(curl --output /dev/null --silent --connect-timeout 2 http://127.0.0.1:5555); do
+until docker ps 2>/dev/null; do
   printf '.'
   sleep 1
 done

pkgs/data/misc/dns-root-data/default.nix

@@ -4,7 +4,7 @@ let
 
   rootHints = fetchurl {
     url = "https://www.internic.net/domain/named.root";
-    sha256 = "0qsyxpj5b3i7n162qfyv76ljqbvnwjii7jk8mpfinklx0sk01473";
+    sha256 = "01n4bqf95kbvig1hahqzmmdkpn4v7mzfc1p944gq922i5j3fjr92";
   };
 
   rootKey = ./root.key;
@@ -13,7 +13,7 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "dns-root-data-2017-07-26";
+  name = "dns-root-data-2017-08-29";
 
   buildCommand = ''
     mkdir $out

pkgs/desktops/maxx/default.nix

@@ -47,7 +47,7 @@ in stdenv.mkDerivation {
 
   installPhase = ''
     maxx=$out/opt/MaXX
-    mkdir -p "$maxx" $out/share
+    mkdir -p "$maxx" $out/share $maxx/sbin
 
     mv -- ./* "$maxx"
     ln -s $maxx/share/icons $out/share
@@ -60,17 +60,18 @@ in stdenv.mkDerivation {
     while IFS= read -r -d ''$'\0' i; do
       if isELF "$i"; then
         bin=`patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$i"; echo $?`
-        patchelf --set-rpath "${stdenv.lib.makeLibraryPath deps}" "$i"
+        patchelf --set-rpath "$maxx/lib64:$maxx/OpenMotif-2.1.32/lib64:$maxx/OpenMotif-2.3.1/lib64:${stdenv.lib.makeLibraryPath deps}" "$i"
         if [ "$bin" -eq 0 ]; then
           wrapProgram "$i" \
             --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
-            --set NIX_REDIRECTS /opt/MaXX=$maxx
+            --set NIX_REDIRECTS /opt/MaXX=$maxx \
+            --prefix PATH : $maxx/sbin
         fi
       fi
     done < <(find "$maxx" -type f -print0)
 
-    cp ${gcc-unwrapped}/bin/cpp ${gcc-unwrapped}/libexec/gcc/*/*/cc1 $maxx/bin
+    cp ${gcc-unwrapped}/bin/cpp ${gcc-unwrapped}/libexec/gcc/*/*/cc1 $maxx/sbin
-    for i in $maxx/bin/cpp $maxx/bin/cc1
+    for i in $maxx/sbin/cpp $maxx/sbin/cc1
     do
       wrapProgram "$i" \
         --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
@@ -88,7 +89,6 @@ in stdenv.mkDerivation {
     };
     maintainers = [ maintainers.gnidorah ];
     platforms = ["x86_64-linux"];
-    hydraPlatforms = [];
     longDescription = ''
       A clone of IRIX Interactive Desktop made in agreement with SGI. 
       Provides simple and fast retro desktop environment.

pkgs/development/arduino/ino/default.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchurl, python2Packages, picocom
-, avrdude, arduino-core, avrgcclibc }:
+, avrdude, arduino-core }:
 
 python2Packages.buildPythonApplication rec {
   name = "ino-0.3.6";

pkgs/development/beam-modules/default.nix

@@ -20,6 +20,8 @@ let
         inherit callPackage erlang;
         beamPackages = self;
 
+        hexRegistrySnapshot = callPackage ./hex-registry-snapshot.nix { };
+
         rebar = callPackage ../tools/build-managers/rebar { };
         rebar3-open = callPackage ../tools/build-managers/rebar3 {
           hermeticRebar3 = false;
@@ -28,7 +30,10 @@ let
           hermeticRebar3 = true;
         };
 
-        hexRegistrySnapshot = callPackage ./hex-registry-snapshot.nix { };
+        # rebar3 port compiler plugin is required by buildRebar3
+        pc_1_6_0 = callPackage ./pc {};
+        pc = pc_1_6_0;
+
         fetchHex = callPackage ./fetch-hex.nix { };
 
         buildRebar3 = callPackage ./build-rebar3.nix {};
@@ -57,12 +62,35 @@ let
         lfe = lfe_1_2;
         lfe_1_2 = lib.callLFE ../interpreters/lfe/1.2.nix { inherit erlang buildRebar3 buildHex; };
 
-        # Non hex packages
+        # We list all base hex packages for beam tooling explicitly to ensure
+        # tha the tooling does not break during hex-packages.nix updates.
+        erlware_commons_1_0_0 = buildHex {
+          name    = "erlware_commons";
+          version = "1.0.0";
+          sha256 = "0wkphbrjk19lxdwndy92v058qwcaz13bcgdzp33h21aa7vminzx7";
+          beamDeps = [ cf_0_2_2 ];
+        };
+        cf_0_2_2 = buildHex {
+          name = "cf";
+          version = "0.2.2";
+          sha256 = "08cvy7skn5d2k4manlx5k3anqgjdvajjhc5jwxbaszxw34q3na28";
+        };
+        getopt_0_8_2 = buildHex {
+          name = "getopt";
+          version = "0.8.2";
+          sha256 = "1xw30h59zbw957cyjd8n50hf9y09jnv9dyry6x3avfwzcyrnsvkk";
+        };
+
+        # Non hex packages. Examples how to build Rebar/Mix packages with and
+        # without helper functions buildRebar3 and buildMix.
         hex = callPackage ./hex {};
         webdriver = callPackage ./webdriver {};
-
-        hex2nix = callPackage ../tools/erlang/hex2nix {};
-        cuter = callPackage ../tools/erlang/cuter {};
         relxExe = callPackage ../tools/erlang/relx-exe {};
+
+        # The tool used to upgrade hex-packages.nix.
+        hex2nix = callPackage ../tools/erlang/hex2nix {};
+
+        # An example of Erlang/C++ package.
+        cuter = callPackage ../tools/erlang/cuter {};
       };
 in makeExtensible packages

pkgs/development/beam-modules/hex-registry-snapshot.nix

@@ -2,14 +2,15 @@
 
 stdenv.mkDerivation rec {
     name = "hex-registry";
-    rev = "e5e494a";
+    rev = "9f736e7";
     version = "0.0.0+build.${rev}";
 
+    # src = /home/gleber/code/erl/hex-pm-registry-snapshots;
     src = fetchFromGitHub {
         owner = "erlang-nix";
         repo = "hex-pm-registry-snapshots";
         inherit rev;
-        sha256 = "0877dragfxs22a05d8mv42z5535kfx9rs4y7fwwbd1ybphczf8za";
+        sha256 = "1xiw5yifyk3bbmr0cr82y1nc4c6zk11f6azdv07glb7yrgccrv79";
     };
 
     installPhase = ''

pkgs/development/beam-modules/hex/default.nix

@@ -1,10 +1,10 @@
-{stdenv, fetchFromGitHub, writeText, elixir }:
+{ stdenv, fetchFromGitHub, writeText, elixir }:
 
 let
   shell = drv: stdenv.mkDerivation {
-          name = "interactive-shell-${drv.name}";
+    name = "interactive-shell-${drv.name}";
-          buildInputs = [ drv ];
+    buildInputs = [ drv ];
-    };
+  };
 
   pkg = self: stdenv.mkDerivation rec {
     name = "hex";
@@ -53,6 +53,5 @@ let
     passthru = {
       env = shell self;
     };
-
 };
 in stdenv.lib.fix pkg

pkgs/development/beam-modules/pc/default.nix

@@ -0,0 +1,13 @@
+{ stdenv, buildHex }:
+
+buildHex {
+  name = "pc";
+  version = "1.6.0";
+  sha256 = "0xq411ig5ny3iilkkkqa4vm3w3dgjc9cfzkqwk8pm13dw9mcm8h0";
+
+  meta = {
+    description = ''a rebar3 port compiler for native code'';
+    license = stdenv.lib.licenses.mit;
+    homepage = "https://github.com/blt/port_compiler";
+  };
+}

pkgs/development/beam-modules/webdriver/default.nix

@@ -2,9 +2,9 @@
 
 let
   shell = drv: stdenv.mkDerivation {
-          name = "interactive-shell-${drv.name}";
+    name = "interactive-shell-${drv.name}";
-          buildInputs = [ drv ];
+    buildInputs = [ drv ];
-    };
+  };
 
   pkg = self: stdenv.mkDerivation rec {
     name = "webdriver";

pkgs/development/compilers/llvm/3.9/llvm.nix

@@ -26,7 +26,6 @@ assert (hostPlatform != buildPlatform) -> !enableSharedLibraries;
 
 let
   src = fetch "llvm" "1vi9sf7rx1q04wj479rsvxayb6z740iaz3qniwp266fgp5a07n8z";
-  shlib = if stdenv.isDarwin then "dylib" else "so";
 
   # Used when creating a version-suffixed symlink of libLLVM.dylib
   shortVersion = with stdenv.lib;
@@ -124,7 +123,7 @@ in stdenv.mkDerivation rec {
   postInstall = ""
   + stdenv.lib.optionalString (enableSharedLibraries) ''
     moveToOutput "lib/libLLVM-*" "$lib"
-    moveToOutput "lib/libLLVM.${shlib}" "$lib"
+    moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib"
     substituteInPlace "$out/lib/cmake/llvm/LLVMExports-release.cmake" \
       --replace "\''${_IMPORT_PREFIX}/lib/libLLVM-" "$lib/lib/libLLVM-"
   ''

pkgs/development/compilers/llvm/4/llvm.nix

@@ -23,7 +23,6 @@
 
 let
   src = fetch "llvm" "0l9bf7kdwhlj0kq1hawpyxhna1062z3h7qcz2y8nfl9dz2qksy6s";
-  shlib = if stdenv.isDarwin then "dylib" else "so";
 
   # Used when creating a version-suffixed symlink of libLLVM.dylib
   shortVersion = with stdenv.lib;
@@ -115,7 +114,7 @@ in stdenv.mkDerivation rec {
   ''
   + stdenv.lib.optionalString enableSharedLibraries ''
     moveToOutput "lib/libLLVM-*" "$lib"
-    moveToOutput "lib/libLLVM.${shlib}" "$lib"
+    moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib"
     substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
       --replace "\''${_IMPORT_PREFIX}/lib/libLLVM-" "$lib/lib/libLLVM-"
   ''

pkgs/development/compilers/microscheme/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, vim, avrdude, avrgcclibc, makeWrapper }:
+{ stdenv, fetchzip, vim, avrdude, avrbinutils, avrgcc, avrlibc, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "microscheme-${version}";
@@ -10,13 +10,15 @@ stdenv.mkDerivation rec {
     sha256 = "1r3ng4pw1s9yy1h5rafra1rq19d3vmb5pzbpcz1913wz22qdd976";
   };
 
+  # Just a guess
+  propagatedBuildInputs = [ avrlibc ];
   buildInputs = [ makeWrapper vim ];
 
   installPhase = ''
     make install PREFIX=$out
 
     wrapProgram $out/bin/microscheme \
-      --prefix PATH : "${stdenv.lib.makeBinPath [ avrdude avrgcclibc ]}"
+      --prefix PATH : "${stdenv.lib.makeBinPath [ avrdude avrgcc avrbinutils ]}"
   '';
 
   meta = with stdenv.lib; {

pkgs/development/libraries/armadillo/default.nix

@@ -12,10 +12,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
   buildInputs = [ openblasCompat superlu hdf5 ];
 
-  cmakeFlags = let
+  cmakeFlags = [
-    libSuff = if stdenv.isDarwin then "dylib" else "so";
+    "-DLAPACK_LIBRARY=${openblasCompat}/lib/libopenblas${stdenv.hostPlatform.extensions.sharedLibrary}"
-  in [
-    "-DLAPACK_LIBRARY=${openblasCompat}/lib/libopenblas.${libSuff}"
     "-DDETECT_HDF5=ON"
   ];
 

pkgs/development/libraries/chromaprint/default.nix

@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
     description = "AcoustID audio fingerprinting library";
     maintainers = with maintainers; [ ehmry ];
     license = licenses.lgpl21Plus;
-    platforms = platforms.all;
+    platforms = platforms.linux;
   };
 }

pkgs/development/libraries/jbigkit/default.nix

@@ -11,8 +11,9 @@ stdenv.mkDerivation rec {
   postPatch = ''
     sed -i 's/^\(CFLAGS.*\)$/\1 -fPIC/' Makefile
   '' + stdenv.lib.optionalString stdenv.cc.isClang ''
-    substituteInPlace Makefile libjbig/Makefile pbmtools/Makefile \
+    for f in Makefile libjbig/Makefile pbmtools/Makefile; do
-      --replace "CC = gcc" "CC = clang"
+        substituteInPlace $f --replace "CC = gcc" "CC = clang"
+    done
   '';
 
   installPhase = ''

pkgs/development/libraries/kde-frameworks/fetch.sh

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

pkgs/development/libraries/kde-frameworks/ktexteditor.nix

@@ -2,7 +2,7 @@
   mkDerivation, lib, copyPathsToStore,
   extra-cmake-modules, perl,
   karchive, kconfig, kguiaddons, ki18n, kiconthemes, kio, kparts, libgit2,
-  qtscript, qtxmlpatterns, sonnet, syntax-highlighting
+  qtscript, qtxmlpatterns, sonnet, syntax-highlighting, qtquickcontrols
 }:
 
 mkDerivation {
@@ -11,7 +11,7 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules perl ];
   buildInputs = [
     karchive kconfig kguiaddons ki18n kiconthemes kio libgit2 qtscript
-    qtxmlpatterns sonnet syntax-highlighting
+    qtxmlpatterns sonnet syntax-highlighting qtquickcontrols
   ];
   propagatedBuildInputs = [ kparts ];
 }

pkgs/development/libraries/kde-frameworks/srcs.nix

@@ -3,603 +3,603 @@
 
 {
   attica = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/attica-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/attica-5.38.0.tar.xz";
-      sha256 = "13jqk4w9crh8pca6n9334l1gb8bmwf86pa36k0mfh5j19dq72g2p";
+      sha256 = "12smdcd7lcyjqiw0bsk3lwivrl6cvmiqv5cqaw0gz8flhvk29w96";
-      name = "attica-5.37.0.tar.xz";
+      name = "attica-5.38.0.tar.xz";
     };
   };
   baloo = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/baloo-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/baloo-5.38.0.tar.xz";
-      sha256 = "19sl07lhjrri40vfi8wl6azgmg08lgfb98xx110j6spjbbbnww79";
+      sha256 = "14522akyxg36lclfblp65xai95i9hiydqjhkmfkadjbq82wm9s9i";
-      name = "baloo-5.37.0.tar.xz";
+      name = "baloo-5.38.0.tar.xz";
     };
   };
   bluez-qt = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/bluez-qt-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/bluez-qt-5.38.0.tar.xz";
-      sha256 = "1x6nj7vsn0sp9rckzkcbl6fwm7qzj5w98w2qys1fndb1spl7av8s";
+      sha256 = "0hanmygp4smbvczxn4dj997z3bln32p017z0r26z89m2p0b2ylwv";
-      name = "bluez-qt-5.37.0.tar.xz";
+      name = "bluez-qt-5.38.0.tar.xz";
     };
   };
   breeze-icons = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/breeze-icons-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/breeze-icons-5.38.0.tar.xz";
-      sha256 = "17nr2phd0nxyx49igvl170ksikapgc4365z26pw0dmmw41llcbxw";
+      sha256 = "09afi6c4h31ycs6aa85lqbmn392zi532zf8fp7ll43xxjv9isac9";
-      name = "breeze-icons-5.37.0.tar.xz";
+      name = "breeze-icons-5.38.0.tar.xz";
     };
   };
   extra-cmake-modules = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/extra-cmake-modules-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/extra-cmake-modules-5.38.0.tar.xz";
-      sha256 = "1jr7nmhh4kyz1g454qkldfhimfjvvylqa19zna5iak08bkq8q696";
+      sha256 = "0ci3vdzdbcrbnxpqvf4hcwcrzz1ijhifp8b99wh3k53rinnai231";
-      name = "extra-cmake-modules-5.37.0.tar.xz";
+      name = "extra-cmake-modules-5.38.0.tar.xz";
     };
   };
   frameworkintegration = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/frameworkintegration-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/frameworkintegration-5.38.0.tar.xz";
-      sha256 = "0pcy3hjqbahbx65yxz5bl0h2ah4y3fb7mq3pj1rrp2cpp92s135a";
+      sha256 = "0w1n3czgsnnmaqwypy3mpci8s4ppv9030zxw7ka7rsvwgkpqijq8";
-      name = "frameworkintegration-5.37.0.tar.xz";
+      name = "frameworkintegration-5.38.0.tar.xz";
     };
   };
   kactivities = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/kactivities-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/kactivities-5.38.0.tar.xz";
-      sha256 = "005xvzp10kvwcsl2w6ghcqgqnr2rdvv9w61i4y44y25vcb85g26v";
+      sha256 = "0grm0cilc80g5ih2hqhwgwm35mlfnrs343j6ixkd9s0mflv2b798";
-      name = "kactivities-5.37.0.tar.xz";
+      name = "kactivities-5.38.0.tar.xz";
     };
   };
   kactivities-stats = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/kactivities-stats-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/kactivities-stats-5.38.0.tar.xz";
-      sha256 = "09zsdzf77palmww7x3dzinl0hxrm4z0q0yc2fmf0d7z6cfl695y2";
+      sha256 = "0s57iz04n3m4fpqrqflda6vpk4l1mnf0nyz1iyza382fb375afd2";
-      name = "kactivities-stats-5.37.0.tar.xz";
+      name = "kactivities-stats-5.38.0.tar.xz";
     };
   };
   kapidox = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/kapidox-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/kapidox-5.38.0.tar.xz";
-      sha256 = "1xwkaamifxjghv158rwslndfd9z70rm9ixnp1mmkgw8radwsqg5v";
+      sha256 = "1j4k75lhqdnsxmgyvblla0627qvgabxivw6limfdb3rdpmqdxj76";
-      name = "kapidox-5.37.0.tar.xz";
+      name = "kapidox-5.38.0.tar.xz";
     };
   };
   karchive = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/karchive-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/karchive-5.38.0.tar.xz";
-      sha256 = "1599lql0kcx705313bfvbazr7rayr6vsiwrpiq6iwljzc7lli1im";
+      sha256 = "0n5nxd3v9ljjff0r6k4xrvy5hj057b7c7jzcq258harl359d8m4k";
-      name = "karchive-5.37.0.tar.xz";
+      name = "karchive-5.38.0.tar.xz";
     };
   };
   kauth = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/kauth-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/kauth-5.38.0.tar.xz";
-      sha256 = "0ciz28bvbvxlv0iz0cgs31x2m1czkki21ypzqj8rg2ix8jw2p65w";
+      sha256 = "12nyfbilz4v4b2i5x191iph3jj4lcpw7z1rh0xrv5y1v7dczk6i7";
-      name = "kauth-5.37.0.tar.xz";
+      name = "kauth-5.38.0.tar.xz";
     };
   };
   kbookmarks = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/kbookmarks-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/kbookmarks-5.38.0.tar.xz";
-      sha256 = "0l6rkj0b7hk2wg6dypj1dkl8pcd1vx89gaiixbhkd3vf7jp46n41";
+      sha256 = "0s230mcwmrg0qpz42sg804m96j2xpnwj4bdp0mfv08x3jasqpbrq";
-      name = "kbookmarks-5.37.0.tar.xz";
+      name = "kbookmarks-5.38.0.tar.xz";
     };
   };
   kcmutils = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/kcmutils-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/kcmutils-5.38.0.tar.xz";
-      sha256 = "1ik1505f16swsmvrv62dacis33f1ccnmkw3zbhb84vbrbqyskvzx";
+      sha256 = "0n6f2xvl5v8fwfxpdl6la1hb01dh4h1pcdrf05nn60v0rqg9f58b";
-      name = "kcmutils-5.37.0.tar.xz";
+      name = "kcmutils-5.38.0.tar.xz";
     };
   };
   kcodecs = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/kcodecs-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/kcodecs-5.38.0.tar.xz";
-      sha256 = "0kmk97b5vbnyb3xjxwmg3l47aka8mkf50g4p7wvr096qwplffbva";
+      sha256 = "0cnxhaj5jk7f3j9q4hzphc3nm3vdaqwy9xab5d4nvn1kv8vjv8ii";
-      name = "kcodecs-5.37.0.tar.xz";
+      name = "kcodecs-5.38.0.tar.xz";
     };
   };
   kcompletion = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/kcompletion-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/kcompletion-5.38.0.tar.xz";
-      sha256 = "0qhjkqmd1jjy50hlzsdxwgnjwpfdrz3njl5n88h3nzp83yjv1ljz";
+      sha256 = "0f955w67wrk15rdmglrk7k0xc5i6kah12bpb078xhzlyfackg52w";
-      name = "kcompletion-5.37.0.tar.xz";
+      name = "kcompletion-5.38.0.tar.xz";
     };
   };
   kconfig = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/kconfig-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/kconfig-5.38.0.tar.xz";
-      sha256 = "1f0y2gmwy05b17clr7vg1zp18l1z0fd757v02ha7cwd64yznyr5d";
+      sha256 = "0fi428dsr6qpa9336wcfic6hyix6l2p9s135w00qzdwhdkr4lx3r";
-      name = "kconfig-5.37.0.tar.xz";
+      name = "kconfig-5.38.0.tar.xz";
     };
   };
   kconfigwidgets = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/kconfigwidgets-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/kconfigwidgets-5.38.0.tar.xz";
-      sha256 = "001d1nj8q6xpl71rwm15rnvy5ajyxpvknvf4ic7p5pbik3021bs6";
+      sha256 = "0w319d94wxn90dbbdfw5zrn2ddnv9vb7wldkpvvycq7yxrhsfw0x";
-      name = "kconfigwidgets-5.37.0.tar.xz";
+      name = "kconfigwidgets-5.38.0.tar.xz";
     };
   };
   kcoreaddons = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/kcoreaddons-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/kcoreaddons-5.38.0.tar.xz";
-      sha256 = "0a45sz11d7b2d8sbr9z57mv337nbhd94fiqk3issw470n0y46g3y";
+      sha256 = "1m3mn9fhllwcidzji2l26k5yxzrqkbyjdly04nh3s5rf823dvqwv";
-      name = "kcoreaddons-5.37.0.tar.xz";
+      name = "kcoreaddons-5.38.0.tar.xz";
     };
   };
   kcrash = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/kcrash-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/kcrash-5.38.0.tar.xz";
-      sha256 = "16k2pwf3s3adgayd9vq7kk8c5gnq9g6wra4psrvs3a3c5k5am5y0";
+      sha256 = "1a8hvyhwa112wx4ldadlrxpyda6qpial387j07dr1jq1cnzr0p11";
-      name = "kcrash-5.37.0.tar.xz";
+      name = "kcrash-5.38.0.tar.xz";
     };
   };
   kdbusaddons = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/kdbusaddons-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/kdbusaddons-5.38.0.tar.xz";
-      sha256 = "0745arkp4wnpwyhjq02h7lfac049cmlg5qwhf96i7ss0w54vch4i";
+      sha256 = "1mw9sl82y2aj7l2xj1skrbxbyv55br60h6f61r4f1mqcaxaqj7qw";
-      name = "kdbusaddons-5.37.0.tar.xz";
+      name = "kdbusaddons-5.38.0.tar.xz";
     };
   };
   kdeclarative = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/kdeclarative-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/kdeclarative-5.38.0.tar.xz";
-      sha256 = "1ish46m2dpnpqjnf8g660clcg7ky65w11cbk2m79pwyhqvhxgggj";
+      sha256 = "1966sxzhdkzi2lwg5ixhrx0yg10plbvn9lsjgnj9crghaajsnf4b";
-      name = "kdeclarative-5.37.0.tar.xz";
+      name = "kdeclarative-5.38.0.tar.xz";
     };
   };
   kded = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/kded-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/kded-5.38.0.tar.xz";
-      sha256 = "162s5qx2qb0bi889f8jjvd3ci31azd8iwp25i04vwi0lzglwb8gy";
+      sha256 = "0xsjzj5jx4wsrq5fnbv6raqlr11shz20p2mvypf5wfvq2c1vb5lb";
-      name = "kded-5.37.0.tar.xz";
+      name = "kded-5.38.0.tar.xz";
     };
   };
   kdelibs4support = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/portingAids/kdelibs4support-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/portingAids/kdelibs4support-5.38.0.tar.xz";
-      sha256 = "1zz100m1sqfmg3ni7023b99qn79jhdd2ryw6534axl5zgn0sglh9";
+      sha256 = "06vlgziy212pwm4z9r8rbfa9ziwx3nkihy9b25m13gbh60baqapp";
-      name = "kdelibs4support-5.37.0.tar.xz";
+      name = "kdelibs4support-5.38.0.tar.xz";
     };
   };
   kdesignerplugin = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/kdesignerplugin-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/kdesignerplugin-5.38.0.tar.xz";
-      sha256 = "1197003bqcdpsyn6faasr2nhaadh7ryg92vjpqim78af3vwinsdw";
+      sha256 = "0rivjxgsxvsgk24lnzsqpzqr7m1i1faqnbby3rnkw2059z28l0y6";
-      name = "kdesignerplugin-5.37.0.tar.xz";
+      name = "kdesignerplugin-5.38.0.tar.xz";
     };
   };
   kdesu = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/kdesu-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/kdesu-5.38.0.tar.xz";
-      sha256 = "1qfhkzk6l9rfdyiad8y6k30zlhziz3q2dxvxkmnghxmkg98yhdza";
+      sha256 = "1c9j2zih7r0jph41kzxnxpri9snphm1k4w4rs1q6zawwz8a5kcr5";
-      name = "kdesu-5.37.0.tar.xz";
+      name = "kdesu-5.38.0.tar.xz";
     };
   };
   kdewebkit = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/kdewebkit-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/kdewebkit-5.38.0.tar.xz";
-      sha256 = "1ph3a50wix42hmsbc9jbfxla172aihjx9yzp9rza09j1a7va3hg1";
+      sha256 = "1cncbjkgrbrnvwx3izjqh9hqiw9bg6aqaq09f8bdryvr8537b0zf";
-      name = "kdewebkit-5.37.0.tar.xz";
+      name = "kdewebkit-5.38.0.tar.xz";
     };
   };
   kdnssd = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/kdnssd-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/kdnssd-5.38.0.tar.xz";
-      sha256 = "03rd6znn2qwndn4m3bb03slwyic06ry535rawgyh06lfps0fcc5z";
+      sha256 = "101gygxrq2m3yfz6j0ldspib3pm3jjvqz505j3h15zj59qcwqw0x";
-      name = "kdnssd-5.37.0.tar.xz";
+      name = "kdnssd-5.38.0.tar.xz";
     };
   };
   kdoctools = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/kdoctools-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/kdoctools-5.38.0.tar.xz";
-      sha256 = "0gbc5qqim6262hvkl9pf6rynnblxb3hsw3c4ars03ip7n761y0zl";
+      sha256 = "0fbv7i1930rl496psny7nfiixvsnaq535h1zggwkwv6i9dh7wpy9";
-      name = "kdoctools-5.37.0.tar.xz";
+      name = "kdoctools-5.38.0.tar.xz";
     };
   };
   kemoticons = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/kemoticons-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/kemoticons-5.38.0.tar.xz";
-      sha256 = "1cx978s1dm3v1jh4aymncxs44iizdqp174dqg9m5mf043fcvvinq";
+      sha256 = "1c0991yd8jx2diy5ynl11h5qqyapn1dsir2gy04y8m90h944vdd5";
-      name = "kemoticons-5.37.0.tar.xz";
+      name = "kemoticons-5.38.0.tar.xz";
     };
   };
   kfilemetadata = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/kfilemetadata-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/kfilemetadata-5.38.0.tar.xz";
-      sha256 = "17mbm6pdi6ac61kj2qzxf7y3rbxhxg9rwqr7qy766gh3img2vq8p";
+      sha256 = "1815r9lx99h9kzbk67bfk41jya3y2hsi112fsgpv3m4mg028pklm";
-      name = "kfilemetadata-5.37.0.tar.xz";
+      name = "kfilemetadata-5.38.0.tar.xz";
     };
   };
   kglobalaccel = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/kglobalaccel-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/kglobalaccel-5.38.0.tar.xz";
-      sha256 = "1d84q3r6q5n2lclym9a9m1brfqnq3p3dykfpzvhcba3bjxh3cdsb";
+      sha256 = "1rxmghm302ndn6qgrdgl1fccyi57bq8a0273p6wy8vs5pn2902ms";
-      name = "kglobalaccel-5.37.0.tar.xz";
+      name = "kglobalaccel-5.38.0.tar.xz";
     };
   };
   kguiaddons = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/kguiaddons-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/kguiaddons-5.38.0.tar.xz";
-      sha256 = "13g6nlw8fk135i6z3f8ichy8whxd6v4rycg80dlvm25h66rg6vn5";
+      sha256 = "1jks0hwn665hlypl0qfhi5r0prqzrg1gv4skc88zp1kgx05kb9h1";
-      name = "kguiaddons-5.37.0.tar.xz";
+      name = "kguiaddons-5.38.0.tar.xz";
     };
   };
   khtml = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/portingAids/khtml-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/portingAids/khtml-5.38.0.tar.xz";
-      sha256 = "1n0mx2xy9n5ffhvh58z3kn61aa7dhppsrwgxk697pybqy1h45ah2";
+      sha256 = "0fa61va3dbwml40y4scxks223swlb8vf5730wr7rijl91lz1adgy";
-      name = "khtml-5.37.0.tar.xz";
+      name = "khtml-5.38.0.tar.xz";
     };
   };
   ki18n = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/ki18n-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/ki18n-5.38.0.tar.xz";
-      sha256 = "1c1sy4pbhlwsajs2972brdmma5val72gkil6k0a0f58nfvvg952d";
+      sha256 = "0z9arj2s4fn04vavl6ad3avl1p5yr3mgr2n802lmvy2wlqicy314";
-      name = "ki18n-5.37.0.tar.xz";
+      name = "ki18n-5.38.0.tar.xz";
     };
   };
   kiconthemes = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/kiconthemes-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/kiconthemes-5.38.0.tar.xz";
-      sha256 = "1j7mgfsvxa24nf1d9xyn2jv9y9j523vghsvsm73x8d3ijibchfxq";
+      sha256 = "01xa30r2cx312vbmz2c3x8vvna1cqb6fx91cjp4aivp9q4jwaz9a";
-      name = "kiconthemes-5.37.0.tar.xz";
+      name = "kiconthemes-5.38.0.tar.xz";
     };
   };
   kidletime = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/kidletime-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/kidletime-5.38.0.tar.xz";
-      sha256 = "01m4q3l2yq83f2dpbv6jry7cjkj6bqdgfpy5b8byaf1gf9w2firs";
+      sha256 = "1i91w9hcb2k5n9qz8q7k2z44z9ss7r9i2zsg9vnl8am7dqqhmlsv";
-      name = "kidletime-5.37.0.tar.xz";
+      name = "kidletime-5.38.0.tar.xz";
     };
   };
   kimageformats = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/kimageformats-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/kimageformats-5.38.0.tar.xz";
-      sha256 = "1knha6wjzjs0vnkljwpfinzg3hg2jyh9c07ifqvd47cprl96ickg";
+      sha256 = "0q78shcwgczdm5ylhbp9fnq70w3hqzkbynp2vpyyg5pjaam8xjlp";
-      name = "kimageformats-5.37.0.tar.xz";
+      name = "kimageformats-5.38.0.tar.xz";
     };
   };
   kinit = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/kinit-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/kinit-5.38.0.tar.xz";
-      sha256 = "0b7dyy4hqyf6wk7gg2l23ldnji2zl8vzyj5wd5qh4yi7rdl6js5r";
+      sha256 = "0k4i0zrwkz088vjkk7d7whwhkrjvqqhdigspzf58d1laryiy0jdf";
-      name = "kinit-5.37.0.tar.xz";
+      name = "kinit-5.38.0.tar.xz";
     };
   };
   kio = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/kio-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/kio-5.38.0.tar.xz";
-      sha256 = "0nxchbhs8p2d4243dyp7qa65g1p6r3ic2h6dz7w0aa0qzsy8wi29";
+      sha256 = "15qmr2ghrj7pgqxrgpvhdp9g5vaap9mzlmry6ayph75m1afb4fpl";
-      name = "kio-5.37.0.tar.xz";
+      name = "kio-5.38.0.tar.xz";
     };
   };
   kirigami2 = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/kirigami2-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/kirigami2-5.38.0.tar.xz";
-      sha256 = "1z42rsi8nzshrbv8m8vxkay4dq46kggglhgxbbgg2q00y8gjq9dd";
+      sha256 = "18k41j5ijmgmzgl2rv4ac0bnxlax3505zi1nmqm8bkdpznhfr13c";
-      name = "kirigami2-5.37.0.tar.xz";
+      name = "kirigami2-5.38.0.tar.xz";
     };
   };
   kitemmodels = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/kitemmodels-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/kitemmodels-5.38.0.tar.xz";
-      sha256 = "1nlpzzp4m0ghfz1p2hrwn4lbhjhxc8b8q8kbzqbh9hmwmimbzzrr";
+      sha256 = "0s20in4jjd2pvv9bn79lvgqqlf806hw014icp51f5hfknrhpdyjc";
-      name = "kitemmodels-5.37.0.tar.xz";
+      name = "kitemmodels-5.38.0.tar.xz";
     };
   };
   kitemviews = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/kitemviews-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/kitemviews-5.38.0.tar.xz";
-      sha256 = "17r7vnlyiiifhrz4gb4fifshn1jb4c67lhadczi8d301rzk7wwsm";
+      sha256 = "0ldi8qzs2sbhz8l57nshjrnwhjl9mhw90kcqw71cldp41wm0pps6";
-      name = "kitemviews-5.37.0.tar.xz";
+      name = "kitemviews-5.38.0.tar.xz";
     };
   };
   kjobwidgets = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/kjobwidgets-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/kjobwidgets-5.38.0.tar.xz";
-      sha256 = "1162dxhpspd7p1735npp0amrxr5b0j467f5651k2rv6mvqfmqr4b";
+      sha256 = "0vp6nc73c9788nrib742k9nzqbx4m8m77ipqh9dnnkx4ggrhsd55";
-      name = "kjobwidgets-5.37.0.tar.xz";
+      name = "kjobwidgets-5.38.0.tar.xz";
     };
   };
   kjs = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/portingAids/kjs-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/portingAids/kjs-5.38.0.tar.xz";
-      sha256 = "046hy8ji4i6p2xp5gnqa8dk82sv6sbh4xg67y79i82bbi97dvq9b";
+      sha256 = "0diw580k5kyv60bqhnxhqinlrn0b3p3n89iy0kdgjgnr6197fwy1";
-      name = "kjs-5.37.0.tar.xz";
+      name = "kjs-5.38.0.tar.xz";
     };
   };
   kjsembed = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/portingAids/kjsembed-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/portingAids/kjsembed-5.38.0.tar.xz";
-      sha256 = "0w2wk5azf1b45db58qj0cdc1l056x9s1xcd09ibavx5xmdvq6br0";
+      sha256 = "0nb07n54208gnmag7h3dhc8hri2s83ln1c9wq6c0xw7jchaz9z8a";
-      name = "kjsembed-5.37.0.tar.xz";
+      name = "kjsembed-5.38.0.tar.xz";
     };
   };
   kmediaplayer = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/portingAids/kmediaplayer-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/portingAids/kmediaplayer-5.38.0.tar.xz";
-      sha256 = "0fqxrkcwwzg11zsax9q169lisnfp9jsqg4ccd6xvv8kpkz3g04jp";
+      sha256 = "1qb2g8j871gf38i2dk2j9ags848fa3kqdjl3l4924hf28az0g736";
-      name = "kmediaplayer-5.37.0.tar.xz";
+      name = "kmediaplayer-5.38.0.tar.xz";
     };
   };
   knewstuff = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/knewstuff-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/knewstuff-5.38.0.tar.xz";
-      sha256 = "1scnxhxx4g8j4wml6x8i5v00rpaxyzzcm7vqbra2axbql5d8g8ny";
+      sha256 = "1l4cmfcsljg7v5l6341fxcp7c7i615l8351l941dwcmw4yng0lj0";
-      name = "knewstuff-5.37.0.tar.xz";
+      name = "knewstuff-5.38.0.tar.xz";
     };
   };
   knotifications = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/knotifications-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/knotifications-5.38.0.tar.xz";
-      sha256 = "0gvv6jal7n4m3y30ragjlyhghq3y2782d422im9klxqzlgdgvkb6";
+      sha256 = "1jvmv2hi3dbf0bd2b61l9s5lb1dx2rjl9z7pw1fb5j20910k6zgd";
-      name = "knotifications-5.37.0.tar.xz";
+      name = "knotifications-5.38.0.tar.xz";
     };
   };
   knotifyconfig = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/knotifyconfig-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/knotifyconfig-5.38.0.tar.xz";
-      sha256 = "14kjckynszv8015p17j578l3knmkmw25d8r8ks4wavgj3db9bik5";
+      sha256 = "05hgglm6ypbaplxr43632zh5fmgsz6543110169k9fbjnczyhcyk";
-      name = "knotifyconfig-5.37.0.tar.xz";
+      name = "knotifyconfig-5.38.0.tar.xz";
     };
   };
   kpackage = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/kpackage-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/kpackage-5.38.0.tar.xz";
-      sha256 = "1ikf55q2pk8vm70pqm7rmakja309zjh9z1lg0xqslq1pqd6xki7s";
+      sha256 = "0v4j3kqgg52rlmdxmd98aqw0hk7i2xqsw9mhhxfs9c7vm1x05sxn";
-      name = "kpackage-5.37.0.tar.xz";
+      name = "kpackage-5.38.0.tar.xz";
     };
   };
   kparts = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/kparts-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/kparts-5.38.0.tar.xz";
-      sha256 = "0jrd8idkz8nhkda2rwgf8rysqngiv4r5ajmrzp2kfz1pr91a6l5h";
+      sha256 = "19ba749pwnb7xvmr7lryn6z53zb49hqn0xq4j9fmbic95nh039zp";
-      name = "kparts-5.37.0.tar.xz";
+      name = "kparts-5.38.0.tar.xz";
     };
   };
   kpeople = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/kpeople-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/kpeople-5.38.0.tar.xz";
-      sha256 = "1qgp4wqp985ac1m9wakpsvk3c2driwkwrjkc3aic7dyr1p456qsf";
+      sha256 = "0yd29436bgfw6jjjr9n38hx8561mrlgl5vynci6ng9bx1jflay0x";
-      name = "kpeople-5.37.0.tar.xz";
+      name = "kpeople-5.38.0.tar.xz";
     };
   };
   kplotting = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/kplotting-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/kplotting-5.38.0.tar.xz";
-      sha256 = "0k4s0qvhjm9h1bmg16l32g4bsdrp2jrcila4dgzvrb56447px0zw";
+      sha256 = "1hvfqm6i5fsyssb51w3yybsil8h9cbqgd2n8k0wnz99m8xifzn72";
-      name = "kplotting-5.37.0.tar.xz";
+      name = "kplotting-5.38.0.tar.xz";
     };
   };
   kpty = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/kpty-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/kpty-5.38.0.tar.xz";
-      sha256 = "0wb873r1ycgi11s0qx3lhvz54703yz5sax6fb6wdmri5c05gzd5a";
+      sha256 = "0cgh8hixrplgc280652jlvk8ibcddmjvflwb0gjawd9iq7lcb66y";
-      name = "kpty-5.37.0.tar.xz";
+      name = "kpty-5.38.0.tar.xz";
     };
   };
   kross = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/portingAids/kross-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/portingAids/kross-5.38.0.tar.xz";
-      sha256 = "06pk6f6v82pd7x9rsmkhkp5r9sgcbrc503lqckl8d7argbb7j4k1";
+      sha256 = "1dccg214cqpyn3nninalpknglfmchz2k1fk4rlgq53wf4n6w23b7";
-      name = "kross-5.37.0.tar.xz";
+      name = "kross-5.38.0.tar.xz";
     };
   };
   krunner = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/krunner-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/krunner-5.38.0.tar.xz";
-      sha256 = "171qbhr1yszl2gcffm47p5wiwj71w9yhvk6srhvfpiwfyh61a4ld";
+      sha256 = "16fhl5zm8scyxk83mpkavvzkn23qgzcblg315jy6klr5bz9jxgcm";
-      name = "krunner-5.37.0.tar.xz";
+      name = "krunner-5.38.0.tar.xz";
     };
   };
   kservice = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/kservice-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/kservice-5.38.0.tar.xz";
-      sha256 = "1zxs5yzd3rmy33vsip4c4igk9g38kzaggw8c29sxmgr8vgdrnvhr";
+      sha256 = "0zaamvxhfx4xdy2m8spyhi0hdv6p0fn5hqn9pyi5l8xdixnwjc9d";
-      name = "kservice-5.37.0.tar.xz";
+      name = "kservice-5.38.0.tar.xz";
     };
   };
   ktexteditor = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/ktexteditor-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/ktexteditor-5.38.0.tar.xz";
-      sha256 = "0y04s1nwkf0np6iymjxf0jssin28qw2901kpb3iw8gd52ni5rrks";
+      sha256 = "195ygv1j4wfvly31g22wxz9sshhqyi1yyf2mv1v63d9ci88v7rri";
-      name = "ktexteditor-5.37.0.tar.xz";
+      name = "ktexteditor-5.38.0.tar.xz";
     };
   };
   ktextwidgets = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/ktextwidgets-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/ktextwidgets-5.38.0.tar.xz";
-      sha256 = "1p8ns75sbnapm6ds16hx36q9vlnz9phgy28rx0gm1ckxqvm4yzr5";
+      sha256 = "120jxab8w1vhqcckda51r0x2pmfb2qd2h6inhivl72c4m5x89w7f";
-      name = "ktextwidgets-5.37.0.tar.xz";
+      name = "ktextwidgets-5.38.0.tar.xz";
     };
   };
   kunitconversion = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/kunitconversion-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/kunitconversion-5.38.0.tar.xz";
-      sha256 = "1qvq61sbv9naj5ndi5xjwx7ami0xa6bqiajr912kbbbp2257cjsi";
+      sha256 = "10k0xfb11r7l1bdnlanqgdwwx8wrs8bmnswb2y85xxr7wwsqnlvc";
-      name = "kunitconversion-5.37.0.tar.xz";
+      name = "kunitconversion-5.38.0.tar.xz";
     };
   };
   kwallet = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/kwallet-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/kwallet-5.38.0.tar.xz";
-      sha256 = "1l7jl3y0rzx2whnbp6w5p6kg71vwyccp2nwxxgcxr6541m0nihsz";
+      sha256 = "1qysdj4nmkxywj7bzqdc78ifnqjnkrz9qbp4a49acpng2y4zw1nw";
-      name = "kwallet-5.37.0.tar.xz";
+      name = "kwallet-5.38.0.tar.xz";
     };
   };
   kwayland = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/kwayland-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/kwayland-5.38.0.tar.xz";
-      sha256 = "0d4c8l8k38pgj73kzlf1hsq52w31wy9wgpwph1bv0cq5yn2rjiyr";
+      sha256 = "0gd58nvyc39waj7vv2c68r59qqpv0jppm95548j2p924w48syjj0";
-      name = "kwayland-5.37.0.tar.xz";
+      name = "kwayland-5.38.0.tar.xz";
     };
   };
   kwidgetsaddons = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/kwidgetsaddons-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/kwidgetsaddons-5.38.0.tar.xz";
-      sha256 = "1jmk377r1h4is2il7chh6bq8wbj21psf4b1yiw84iivg38vlpid4";
+      sha256 = "1yh48qxdqz3rk020wr897vkzsi4nhh37lxbg6211xrlirn0lzvj5";
-      name = "kwidgetsaddons-5.37.0.tar.xz";
+      name = "kwidgetsaddons-5.38.0.tar.xz";
     };
   };
   kwindowsystem = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/kwindowsystem-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/kwindowsystem-5.38.0.tar.xz";
-      sha256 = "0pd2n0j5pdv1x7wf4mwcpimnah73g6l0xidhqbpg37p829jix2k2";
+      sha256 = "02xrin8lshvqkw12d0692z40h3g61f4crh28jcmi5zqlaxiyn5ic";
-      name = "kwindowsystem-5.37.0.tar.xz";
+      name = "kwindowsystem-5.38.0.tar.xz";
     };
   };
   kxmlgui = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/kxmlgui-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/kxmlgui-5.38.0.tar.xz";
-      sha256 = "0jrvjlxkg9knj61b2gj2w6l96jlmww9kn4ij808ir35365x3cdg2";
+      sha256 = "12cmyhm05nkr9xj7cpnqihrlndfqn1kjkzhcn1ywj20y1gd3mxv4";
-      name = "kxmlgui-5.37.0.tar.xz";
+      name = "kxmlgui-5.38.0.tar.xz";
     };
   };
   kxmlrpcclient = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/kxmlrpcclient-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/kxmlrpcclient-5.38.0.tar.xz";
-      sha256 = "1jn9v86dpfx43qcdcsp6lpnga9q6aa5vxjkkg4wg0wbxmw4w9gvq";
+      sha256 = "0g9ah59h8vq68yg4pfdbqx44xrs856wrr181rsdbsizj0qj3hyaa";
-      name = "kxmlrpcclient-5.37.0.tar.xz";
+      name = "kxmlrpcclient-5.38.0.tar.xz";
     };
   };
   modemmanager-qt = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/modemmanager-qt-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/modemmanager-qt-5.38.0.tar.xz";
-      sha256 = "1fqf43kvj1v1mcdlbfxbh6sh3ycvg35aml2ywh2a684iz4qzq1aq";
+      sha256 = "18ham8lrxblywc634n49237js5y5k6qgjf5zrjc8gzapn934l89w";
-      name = "modemmanager-qt-5.37.0.tar.xz";
+      name = "modemmanager-qt-5.38.0.tar.xz";
     };
   };
   networkmanager-qt = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/networkmanager-qt-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/networkmanager-qt-5.38.0.tar.xz";
-      sha256 = "01px9n97gyvyyfg3dp1k7dik9fprgx9i28hg8wjr2rb5dlr99jd1";
+      sha256 = "10d28nrkppmmfl9pwq2hkrvi461acf29djdzala4l37mp4dwvbf8";
-      name = "networkmanager-qt-5.37.0.tar.xz";
+      name = "networkmanager-qt-5.38.0.tar.xz";
     };
   };
   oxygen-icons5 = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/oxygen-icons5-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/oxygen-icons5-5.38.0.tar.xz";
-      sha256 = "1rns7n93f83qp5q11a7r5y87y0hvc0q95ar57cqy0fxsqrg4614h";
+      sha256 = "0fk97r3br5myqpnfalz67l5hkamxc5vc5swa68wpg1xih6jc3iid";
-      name = "oxygen-icons5-5.37.0.tar.xz";
+      name = "oxygen-icons5-5.38.0.tar.xz";
     };
   };
   plasma-framework = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/plasma-framework-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/plasma-framework-5.38.0.tar.xz";
-      sha256 = "0kamvxfzrbx3msn0cp3k20clqchz9jg5wlazz3h6p6zmrk5v16bh";
+      sha256 = "1dvhqfi34v44h0wj0m68k477hmx53x9zsf4mh03xq164w1yz68sg";
-      name = "plasma-framework-5.37.0.tar.xz";
+      name = "plasma-framework-5.38.0.tar.xz";
     };
   };
   prison = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/prison-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/prison-5.38.0.tar.xz";
-      sha256 = "1icsirwfh7zscm8x9g2gp7aqzhs81ahhjflwjcwpz9bh0r9f1wb7";
+      sha256 = "0prj3z6s3aighmk4qarfljca7j9cy7ypvgh8rv5di3jb2v4nbg4m";
-      name = "prison-5.37.0.tar.xz";
+      name = "prison-5.38.0.tar.xz";
     };
   };
   solid = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/solid-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/solid-5.38.0.tar.xz";
-      sha256 = "1gb9gnp1a11q5abl97b7sq1if2rqcrcs0f33sakpxf1z9y0ppg8l";
+      sha256 = "1b3c5drx4m1x4ai0ziz0yan16a5s3ghf0py37mb92qyimq586lhh";
-      name = "solid-5.37.0.tar.xz";
+      name = "solid-5.38.0.tar.xz";
     };
   };
   sonnet = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/sonnet-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/sonnet-5.38.0.tar.xz";
-      sha256 = "0sb6i464riadgb2q73nj0vy6xavr2m1sszrvghr20nj7i64f3kk0";
+      sha256 = "1355p88swnk828gsbnm3v4gryffnwbzjcdq49k8jwywzb65bnwxa";
-      name = "sonnet-5.37.0.tar.xz";
+      name = "sonnet-5.38.0.tar.xz";
     };
   };
   syntax-highlighting = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/syntax-highlighting-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/syntax-highlighting-5.38.0.tar.xz";
-      sha256 = "1l56pb84z7sy0qq8xkd5w5v5418bm9n4qds0vd39ch655d47bl72";
+      sha256 = "101ng0l3jfg8x9bns9z38jk3iayijwcb299kf860vfy0nki8gf6l";
-      name = "syntax-highlighting-5.37.0.tar.xz";
+      name = "syntax-highlighting-5.38.0.tar.xz";
     };
   };
   threadweaver = {
-    version = "5.37.0";
+    version = "5.38.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.37/threadweaver-5.37.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.38/threadweaver-5.38.0.tar.xz";
-      sha256 = "1hb3721r1zbbyj211886sfkcxk18k0rsdhcg9ssagx10f29rpxx4";
+      sha256 = "1d89l9lknc1q25cz9r8iwc1a102q788mj01ghnl6ydss65rclvfv";
-      name = "threadweaver-5.37.0.tar.xz";
+      name = "threadweaver-5.38.0.tar.xz";
     };
   };
 }

pkgs/development/libraries/kyotocabinet/default.nix

@@ -17,7 +17,11 @@ stdenv.mkDerivation rec {
       --replace tr1::unordered_set std::unordered_set
 
     substituteInPlace lab/kcdict/Makefile --replace stdc++ c++
-    substituteInPlace configure --replace stdc++ c++
+    substituteInPlace configure \
+        --replace /usr/local/bin:/usr/local/sbin: "" \
+        --replace /usr/bin:/usr/sbin: "" \
+        --replace /bin:/sbin: "" \
+        --replace stdc++ c++
   '';
 
   patches = [(fetchurl {

pkgs/development/libraries/libffcall/default.nix

@@ -2,29 +2,27 @@
 
 stdenv.mkDerivation rec {
   name = "libffcall-${version}";
-  version = "1.10";
+  version = "2.0";
 
   src = fetchurl {
-    urls = [
+    url = "mirror://gnu/libffcall/libffcall-${version}.tar.gz";
-      # Europe
+    sha256 = "0v0rh3vawb8z5q40fs3kr2f9zp06n2fq4rr2ww4562nr96sd5aj1";
-      "http://www.haible.de/bruno/gnu/ffcall-${version}.tar.gz"
-      # USA
-      "ftp://ftp.santafe.edu/pub/gnu/ffcall-${version}.tar.gz"
-    ];
-    sha256 = "0gcqljx4f8wrq59y13zzigwzaxdrz3jf9cbzcd8h0b2br27mn6vg";
   };
 
-  NIX_CFLAGS_COMPILE = "-Wa,--noexecstack";
+  enableParallelBuilding = false;
 
-  configureFlags = [
+  outputs = [ "dev" "out" "doc" "man" ];
-    "--enable-shared"
-    "--disable-static"
-  ];
 
-  meta = {
+  postInstall = ''
+    mkdir -p $doc/share/doc/libffcall
+    mv $out/share/html $doc/share/doc/libffcall
+    rm -rf $out/share
+  '';
+
+  meta = with stdenv.lib; {
     description = "Foreign function call library";
-    homepage = https://www.haible.de/bruno/packages-ffcall.html;
+    homepage = https://www.gnu.org/software/libffcall/;
-    license = stdenv.lib.licenses.gpl2;
+    license = licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.unix;
+    platforms = platforms.unix;
   };
 }

pkgs/development/libraries/libhdhomerun/default.nix

@@ -14,11 +14,9 @@ stdenv.mkDerivation {
     substituteInPlace Makefile --replace "-arch i386" ""
   '';
 
-  installPhase = let
+  installPhase = ''
-    libSuff = if stdenv.isDarwin then "dylib" else "so";
-  in ''
     mkdir -p $out/{bin,lib,include/hdhomerun}
-    install -Dm444 libhdhomerun.${libSuff} $out/lib
+    install -Dm444 libhdhomerun${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib
     install -Dm555 hdhomerun_config $out/bin
     cp *.h $out/include/hdhomerun
   '';

pkgs/development/libraries/libsvm/default.nix

@@ -15,11 +15,11 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = let
-    libSuff = if stdenv.isDarwin then "dylib" else "so";
+    libSuff = stdenv.hostPlatform.extensions.sharedLibrary;
   in ''
     mkdir -p $out/lib $out/bin $out/include;
-    cp libsvm.so.2 $out/lib/libsvm.2.${libSuff};
+    cp libsvm.so.2 $out/lib/libsvm.2${libSuff};
-    ln -s $out/lib/libsvm.2.${libSuff} $out/lib/libsvm.${libSuff};
+    ln -s $out/lib/libsvm.2${libSuff} $out/lib/libsvm${libSuff};
     cp svm-scale svm-train svm-predict $out/bin;
     cp svm.h $out/include;
   '';

pkgs/development/libraries/science/math/cudnn/8.0-6.0/default.nix

@@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
     description = "NVIDIA CUDA Deep Neural Network library (cuDNN)";
     homepage = https://developer.nvidia.com/cudnn;
     license = stdenv.lib.licenses.unfree;
-    maintainers = with maintainers; [ jpbernardy ];
+    maintainers = with maintainers; [ jyp ];
   };
 }

pkgs/development/libraries/science/math/suitesparse/default.nix

@@ -7,7 +7,7 @@ let
   name = "suitesparse-${version}";
 
   int_t = if openblas.blas64 then "int64_t" else "int32_t";
-  SHLIB_EXT = if stdenv.isDarwin then "dylib" else "so";
+  SHLIB_EXT = stdenv.hostPlatform.extensions.sharedLibrary;
 in
 stdenv.mkDerivation {
   inherit name;
@@ -64,10 +64,10 @@ stdenv.mkDerivation {
         for i in "$out"/lib/lib*.a; do
           ar -x $i
         done
-        ${if enableCuda then cudatoolkit else stdenv.cc.outPath}/bin/${if enableCuda then "nvcc" else "cc"} *.o ${if stdenv.isDarwin then "-dynamiclib" else "--shared"} -o "$out/lib/libsuitesparse.${SHLIB_EXT}" -lopenblas ${stdenv.lib.optionalString enableCuda "-lcublas"}
+        ${if enableCuda then cudatoolkit else stdenv.cc.outPath}/bin/${if enableCuda then "nvcc" else "cc"} *.o ${if stdenv.isDarwin then "-dynamiclib" else "--shared"} -o "$out/lib/libsuitesparse${SHLIB_EXT}" -lopenblas ${stdenv.lib.optionalString enableCuda "-lcublas"}
     )
     for i in umfpack cholmod amd camd colamd spqr; do
-      ln -s libsuitesparse.${SHLIB_EXT} "$out"/lib/lib$i.${SHLIB_EXT}
+      ln -s libsuitesparse${SHLIB_EXT} "$out"/lib/lib$i${SHLIB_EXT}
     done
 
     # Install documentation

pkgs/development/libraries/tbb/default.nix

@@ -1,8 +1,5 @@
 { stdenv, fetchurl }:
 
-let
-  SHLIB_EXT = if stdenv.isDarwin then "dylib" else "so";
-in
 stdenv.mkDerivation {
   name = "tbb-4.4-u2";
 
@@ -16,7 +13,7 @@ stdenv.mkDerivation {
 
   installPhase = ''
     mkdir -p $out/{lib,share/doc}
-    cp "build/"*release*"/"*${SHLIB_EXT}* $out/lib/
+    cp "build/"*release*"/"*${stdenv.hostPlatform.extensions.sharedLibrary}* $out/lib/
     mv include $out/
     rm $out/include/index.html
     mv doc/html $out/share/doc/tbb

pkgs/development/libraries/tinyxml/2.6.2.nix

@@ -2,7 +2,7 @@
 
 let
   version = "2.6.2";
-  SHLIB_EXT = if stdenv.isDarwin then "dylib" else "so";
+  SHLIB_EXT = stdenv.hostPlatform.extensions.sharedLibrary;
 in stdenv.mkDerivation {
   name = "tinyxml-${version}";
 
@@ -38,7 +38,7 @@ in stdenv.mkDerivation {
     # build the lib as a shared library
     ''${CXX} -Wall -O2 -shared -fpic tinyxml.cpp \
     tinyxmlerror.cpp tinyxmlparser.cpp      \
-    tinystr.cpp -o libtinyxml.${SHLIB_EXT}
+    tinystr.cpp -o libtinyxml${SHLIB_EXT}
   '';
 
   doCheck = true;
@@ -55,7 +55,7 @@ in stdenv.mkDerivation {
     mkdir -pv $out/lib/pkgconfig/
     mkdir -pv $out/share/doc/tinyxml/
 
-    cp -v libtinyxml.${SHLIB_EXT} $out/lib/
+    cp -v libtinyxml${SHLIB_EXT} $out/lib/
     cp -v *.h $out/include/
 
     substituteInPlace tinyxml.pc --replace "@out@" "$out"

pkgs/development/libraries/vapoursynth-mvtools/default.nix

@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "vapoursynth-mvtools-${version}";
-  version = "17";
+  version = "19";
 
   src = fetchFromGitHub {
     owner = "dubhater";
     repo  = "vapoursynth-mvtools";
-    rev    = "a2f5607420af8b8e76c0a6a06a517649bfa2c187";
+    rev    = "v${version}";
-    sha256 = "06nq46jjyfpv74i27w2m6j64avs6shl99mk601m5h5mmdgm2mvcg";
+    sha256 = "1wjwf1lgfkqz87s0j251g625mw9xmx79zzgrjyhq3wlii73m6qwp";
   };
 
   buildInputs = [

pkgs/development/libraries/vapoursynth/default.nix

@@ -1,36 +1,39 @@
 { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook,
-  glibc, zimg, imagemagick, libass, yasm, python3,
+  zimg, libass, yasm, python3,
-  ocrSupport ? false, tesseract
+  ocrSupport ?  false, tesseract,
+  imwriSupport? true,  imagemagick7
 }:
 
-assert ocrSupport -> tesseract != null;
+assert ocrSupport   -> tesseract != null;
+assert imwriSupport -> imagemagick7 != null;
 
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "vapoursynth-${version}";
-  version = "R36";
+  version = "R38";
 
   src = fetchFromGitHub {
     owner  = "vapoursynth";
     repo   = "vapoursynth";
     rev    = version;
-    sha256 = "10yiccj7yd4bd3a6k15xahb5y3ymcagyaqavh0wal2rwzfck9k8c";
+    sha256 = "0nabl6949s7awy7rnr4ck52v50xr0hwr280fyzsqixgp8w369jn0";
   };
 
   buildInputs = [
     pkgconfig autoreconfHook
-    zimg imagemagick libass glibc tesseract yasm
+    zimg libass tesseract yasm
     (python3.withPackages (ps: with ps; [ sphinx cython ]))
-  ] ++ optional ocrSupport tesseract;
+  ] ++ optional ocrSupport   tesseract
+    ++ optional imwriSupport imagemagick7;
 
   configureFlags = [
-    "--enable-imwri"
     "--disable-static"
-    (optionalString (!ocrSupport) "--disable-ocr")
+    (optionalString (!ocrSupport)   "--disable-ocr")
+    (optionalString (!imwriSupport) "--disable-imwri")
   ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A video processing framework with the future in mind";
     homepage    = http://www.vapoursynth.com/;
     license     = licenses.lgpl21;

pkgs/development/misc/avr-gcc-with-avr-libc/default.nix

@@ -1,76 +0,0 @@
-{ stdenv, fetchurl, texinfo, gmp, mpfr, libmpc, zlib }:
-
-stdenv.mkDerivation {
-  name = "avr-gcc-libc";
-
-  srcs = [
-    (fetchurl {
-        url = "mirror://gnu/binutils/binutils-2.26.tar.bz2";
-        sha256 = "1ngc2h3knhiw8s22l8y6afycfaxr5grviqy7mwvm4bsl14cf9b62";
-    })
-
-    (fetchurl {
-          url = "mirror://gcc/releases/gcc-5.3.0/gcc-5.3.0.tar.bz2";
-          sha256 = "1ny4smkp5bzs3cp8ss7pl6lk8yss0d9m4av1mvdp72r1x695akxq";
-    })
-
-    (fetchurl {
-        url = http://download.savannah.gnu.org/releases/avr-libc/avr-libc-2.0.0.tar.bz2;
-        sha256 = "15svr2fx8j6prql2il2fc0ppwlv50rpmyckaxx38d3gxxv97zpdj";
-    })
-  ];
-
-  sourceRoot = ".";
-
-  nativeBuildInputs = [ texinfo ];
-
-  buildInputs = [ gmp mpfr libmpc zlib ];
-
-  hardeningDisable = [ "format" ];
-
-  # Make sure we don't strip the libraries in lib/gcc/avr.
-  stripDebugList= [ "bin" "avr/bin" "libexec" ];
-
-  installPhase = ''
-    # important, without this gcc won't find the binutils executables
-    export PATH=$PATH:$out/bin
-
-    # Binutils.
-    pushd binutils-*/
-    mkdir obj-avr
-    cd obj-avr
-    ../configure --target=avr --prefix="$out" --disable-nls --disable-debug --disable-dependency-tracking
-    make $MAKE_FLAGS
-    make install
-    popd
-
-    # GCC.
-    pushd gcc-*
-    mkdir obj-avr
-    cd obj-avr
-    ../configure --target=avr --prefix="$out" --disable-nls --disable-libssp --with-dwarf2 --disable-install-libiberty --with-system-zlib --enable-languages=c,c++
-    make $MAKE_FLAGS
-    make install
-    popd
-
-    # We don't want avr-libc to use the native compiler.
-    export BUILD_CC=$CC
-    export BUILD_CXX=$CXX
-    unset CC
-    unset CXX
-
-    # AVR-libc.
-    pushd avr-libc-*
-    ./configure --prefix="$out" --build=`./config.guess` --host=avr
-    make $MAKE_FLAGS
-    make install
-    popd
-  '';
-
-  meta = with stdenv.lib; {
-    description = "AVR development environment including binutils, avr-gcc and avr-libc";
-    # I've tried compiling the packages separately.. too much hassle. This just works. Fine.
-    license =  ["GPL" "LGPL"]; # see single packages ..
-    platforms = platforms.linux;
-  };
-}

pkgs/development/misc/avr/binutils/default.nix

@@ -0,0 +1,22 @@
+{ stdenv, fetchurl }:
+
+let
+  version = "2.26";
+in
+stdenv.mkDerivation {
+  name = "avr-binutils-${version}";
+
+  src = fetchurl {
+    url = "mirror://gnu/binutils/binutils-${version}.tar.bz2";
+    sha256 = "1ngc2h3knhiw8s22l8y6afycfaxr5grviqy7mwvm4bsl14cf9b62";
+  };
+  configureFlags = "--target=avr --enable-languages=c,c++";
+
+  meta = with stdenv.lib; {
+    description = "the GNU Binutils for AVR microcontrollers";
+    homepage = http://www.gnu.org/software/binutils/;
+    license = licenses.gpl3Plus;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ mguentner ];
+  };
+}

pkgs/development/misc/avr/gcc/default.nix

@@ -0,0 +1,50 @@
+{ stdenv, fetchurl, gmp, mpfr, libmpc, zlib, avrbinutils, texinfo }:
+
+let
+  version = "5.4.0";
+in
+stdenv.mkDerivation {
+
+  name = "avr-gcc-${version}";
+  src = fetchurl {
+    url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.bz2";
+    sha256 = "0fihlcy5hnksdxk0sn6bvgnyq8gfrgs8m794b1jxwd1dxinzg3b0";
+  };
+
+  buildInputs = [ gmp mpfr libmpc zlib avrbinutils ];
+
+  nativeBuildInputs = [ texinfo ];
+
+  hardeningDisable = [ "format" ];
+
+  stripDebugList= [ "bin" "libexec" ];
+
+  enableParallelBuilding = true;
+
+  configurePhase = ''
+    mkdir gcc-build
+    cd gcc-build
+    ../configure   \
+    --prefix=$out  \
+    --host=$CHOST  \
+    --build=$CHOST \
+    --target=avr   \
+    --with-as=${avrbinutils}/bin/avr-as \
+    --with-gnu-as  \
+    --with-gnu-ld  \
+    --with-ld=${avrbinutils}/bin/avr-ld \
+    --with-system-zlib \
+    --disable-install-libiberty \
+    --disable-nls \
+    --disable-libssp \
+    --with-dwarf2 \
+    --enable-languages=c,c++'';
+
+  meta = with stdenv.lib; {
+    description = "GNU Compiler Collection, version ${version} for AVR microcontrollers";
+    homepage = http://gcc.gnu.org;
+    license = licenses.gpl3Plus;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ mguentner ];
+  };
+}

pkgs/development/misc/avr/libc/default.nix

@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, avrgcc, avrbinutils, automake, autoconf }:
+
+let
+  version = "2.0.0";
+in
+stdenv.mkDerivation {
+  name = "avr-libc-${version}";
+
+  src = fetchurl {
+    url = http://download.savannah.gnu.org/releases/avr-libc/avr-libc-2.0.0.tar.bz2;
+    sha256 = "15svr2fx8j6prql2il2fc0ppwlv50rpmyckaxx38d3gxxv97zpdj";
+  };
+
+  buildInputs = [ avrgcc avrbinutils automake autoconf ];
+  configurePhase = ''
+    unset LD
+    unset AS
+    unset AR
+    unset CC
+    unset CXX
+    unset RANLIB
+    unset STRIP
+
+    ./configure --prefix=$out --build=$(./config.guess) --host=avr
+  '';
+
+  # Make sure we don't strip the libraries in lib/gcc/avr.
+  stripDebugList= "bin";
+  dontPatchELF = true;
+
+  meta = with stdenv.lib; {
+    description = "a C runtime library for AVR microcontrollers";
+    homepage = http://savannah.nongnu.org/projects/avr-libc/;
+    license = licenses.bsd3;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ mguentner ];
+  };
+}

pkgs/development/node-packages/README.md

@@ -5,7 +5,7 @@ To add a package from [NPM](https://www.npmjs.com/) to nixpkgs:
  1. Modify `pkgs/development/node-packages/node-packages-v6.json` to add, update
     or remove package entries. (Or `pkgs/development/node-packages/node-packages-v4.json`
     for packagages depending on Node.js 4.x)
- 2. Run the script: `cd pkgs/development/node-packages && ./generate.sh`.
+ 2. Run the script: `(cd pkgs/development/node-packages && ./generate.sh)`.
  3. Build your new package to test your changes:
     `cd /path/to/nixpkgs && nix-build -A nodePackages.<new-or-updated-package>`.
     To build against a specific Node.js version (e.g. 4.x):

pkgs/development/node-packages/node-packages-v4.nix

@@ -940,13 +940,13 @@ let
         sha1 = "b2c376cfb11f35513badd173ef0bb6e3a388391c";
       };
     };
-    "regex-cache-0.4.3" = {
+    "regex-cache-0.4.4" = {
       name = "regex-cache";
       packageName = "regex-cache";
-      version = "0.4.3";
+      version = "0.4.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz";
+        url = "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz";
-        sha1 = "9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145";
+        sha512 = "1crfmf19zkv0imnbbkj7bwrcyin3zxa88cs86b6apkxj8qrsmkxnydhsy2ia75q4ld10rhi2s2c36h7g77a997mh9c2z453s311jllx";
       };
     };
     "arr-flatten-1.1.0" = {
@@ -2029,13 +2029,13 @@ let
         sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
       };
     };
-    "mime-types-2.1.16" = {
+    "mime-types-2.1.17" = {
       name = "mime-types";
       packageName = "mime-types";
-      version = "2.1.16";
+      version = "2.1.17";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.16.tgz";
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz";
-        sha1 = "2b858a52e5ecd516db897ac2be87487830698e23";
+        sha1 = "09d7a393f03e995a79f8af857b70a9e0ab16557a";
       };
     };
     "oauth-sign-0.8.2" = {
@@ -2326,13 +2326,13 @@ let
         sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d";
       };
     };
-    "mime-db-1.29.0" = {
+    "mime-db-1.30.0" = {
       name = "mime-db";
       packageName = "mime-db";
-      version = "1.29.0";
+      version = "1.30.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.29.0.tgz";
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz";
-        sha1 = "48d26d235589651704ac5916ca06001914266878";
+        sha1 = "74c643da2dd9d6a45399963465b26d5ca7d71f01";
       };
     };
     "punycode-1.4.1" = {
@@ -2614,13 +2614,13 @@ let
         sha1 = "17eb2807987f76952e9c0485fc311d06a826a2e0";
       };
     };
-    "big-integer-1.6.24" = {
+    "big-integer-1.6.25" = {
       name = "big-integer";
       packageName = "big-integer";
-      version = "1.6.24";
+      version = "1.6.25";
       src = fetchurl {
-        url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.24.tgz";
+        url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.25.tgz";
-        sha1 = "1ed84d018ac3c1c72b307e7f7d94008e8ee20311";
+        sha1 = "1de45a9f57542ac20121c682f8d642220a34e823";
       };
     };
     "camelcase-keys-2.1.0" = {
@@ -3595,15 +3595,6 @@ let
         sha1 = "b47df53493ef911df75731e70a9ded0189db40c9";
       };
     };
-    "fstream-npm-1.2.1" = {
-      name = "fstream-npm";
-      packageName = "fstream-npm";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fstream-npm/-/fstream-npm-1.2.1.tgz";
-        sha512 = "07r7qvmx5fjjk2ra3hjrz31ciy4vhfq2k8a3wjscjl7y52885zwfvz4caa5xr3kab8l3y4c9rsz1nkpjl530irrs6q5l3z6yadyj4c8";
-      };
-    };
     "iferr-0.1.5" = {
       name = "iferr";
       packageName = "iferr";
@@ -3631,13 +3622,13 @@ let
         sha1 = "84ddc4b370679ba8bd4cdcfa4c06b43d57111147";
       };
     };
-    "libnpx-9.2.3" = {
+    "libnpx-9.6.0" = {
       name = "libnpx";
       packageName = "libnpx";
-      version = "9.2.3";
+      version = "9.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/libnpx/-/libnpx-9.2.3.tgz";
+        url = "https://registry.npmjs.org/libnpx/-/libnpx-9.6.0.tgz";
-        sha512 = "0ki52cm2pf27r9pkpfbrx6y1myg7yx1mghwnvv6mw4kmgscif08qlj0xzlc88kpfl549xip4z1ap64s22l7v3q26ygz6x12cch87wsr";
+        sha512 = "28v6bsd92dcqj92yr2bk9r29ajwbqx46fd46mriva2934nr7s6hhkxy6f7xbf4nd7p93fxsbpzfx0ghq0y788x1zj8gnh1iswgd89sz";
       };
     };
     "lockfile-1.0.3" = {
@@ -3703,6 +3694,15 @@ let
         sha512 = "1xz91sizgyzh8plz5jx1labzpygapm6xy3qpxriaj00yvnhy4lnmhqcb20qln4lh80c5g3yzp4j5i6g63njq1r5sl9c0zlkh9xjk2xb";
       };
     };
+    "meant-1.0.1" = {
+      name = "meant";
+      packageName = "meant";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/meant/-/meant-1.0.1.tgz";
+        sha512 = "2b6yi25bkxg4hd38w2cpfjy0xyka4iqiyzhsnkklx3nxwbgnzr4hfl07xxpflccjvnb03zvnssw0y9fspxdk2fmq3abd4fab0n1baai";
+      };
+    };
     "mississippi-1.3.0" = {
       name = "mississippi";
       packageName = "mississippi";
@@ -3748,6 +3748,15 @@ let
         sha1 = "d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7";
       };
     };
+    "npm-lifecycle-1.0.3" = {
+      name = "npm-lifecycle";
+      packageName = "npm-lifecycle";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-lifecycle/-/npm-lifecycle-1.0.3.tgz";
+        sha512 = "0iapgirmdb46ia3apm6fsb9qv9c0hi4k9jflrxlgnrm0jhliqgas49lmpz06xafncx1sxgjngl0fw3gr472c7kapzdvpivf0fp5miqa";
+      };
+    };
     "npm-package-arg-5.1.2" = {
       name = "npm-package-arg";
       packageName = "npm-package-arg";
@@ -3757,6 +3766,15 @@ let
         sha512 = "36g1gm57qcvdgb4lm6ibl9pgma8lgx8l8i2jzap6w3v36wfzsqa7vb411zd26yp9rgcq23951vl5j6pac22qd5h9x7jm9raznnnr460";
       };
     };
+    "npm-packlist-1.1.8" = {
+      name = "npm-packlist";
+      packageName = "npm-packlist";
+      version = "1.1.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.8.tgz";
+        sha512 = "3wbyrf8k8ziygg8lyaj5v0kfpw9mhz4an8hqznapf7n0g2ik02shn91607274zvvayl5zcgmfkf17yy4vgz67lsdjmhzwi8rmrzapv4";
+      };
+    };
     "npm-registry-client-8.4.0" = {
       name = "npm-registry-client";
       packageName = "npm-registry-client";
@@ -3784,13 +3802,13 @@ let
         sha1 = "5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8";
       };
     };
-    "pacote-2.7.38" = {
+    "pacote-6.0.2" = {
       name = "pacote";
       packageName = "pacote";
-      version = "2.7.38";
+      version = "6.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pacote/-/pacote-2.7.38.tgz";
+        url = "https://registry.npmjs.org/pacote/-/pacote-6.0.2.tgz";
-        sha512 = "0a0ar6lns179qdszia13prhj7gjpdjy334xafq791h48q00259lr6gpkzp17dagfcnff9pgcgxm7b68nidpj5qs0yah1v81fk4d84az";
+        sha512 = "2721b5lapgglck02ikkhxgkmg5gs1l8ld712ixb94d86zrspvzn3z81678kcpqvpvs7a0ykgganm9nb1p2668zss7cdib5z6jrg7j9y";
       };
     };
     "path-is-inside-1.0.2" = {
@@ -3919,6 +3937,15 @@ let
         sha1 = "a8479022eb1ac368a871389b635262c505ee368f";
       };
     };
+    "tar-4.0.1" = {
+      name = "tar";
+      packageName = "tar";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tar/-/tar-4.0.1.tgz";
+        sha512 = "3j6x1q724j4y32xqgmnafwr0063xlr4bw5ra92zsar6iyqikcfy02lpc98h4ss75vxywza639m3b9cps9z4xdlr2cpy6g5kyvxm86jw";
+      };
+    };
     "text-table-0.2.0" = {
       name = "text-table";
       packageName = "text-table";
@@ -3964,31 +3991,22 @@ let
         sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e";
       };
     };
-    "which-1.2.14" = {
+    "worker-farm-1.5.0" = {
-      name = "which";
-      packageName = "which";
-      version = "1.2.14";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/which/-/which-1.2.14.tgz";
-        sha1 = "9a87c4378f03e827cecaf1acdf56c736c01c14e5";
-      };
-    };
-    "worker-farm-1.4.1" = {
       name = "worker-farm";
       packageName = "worker-farm";
-      version = "1.4.1";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.4.1.tgz";
+        url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.5.0.tgz";
-        sha512 = "0vh5z2d6q3zgf7j3g5ngyq4piqq1y613wacfyildfnm2c2klb4h2gw32grgk6pv9ssyiliyfvj4p4alpaa85cqcj2nznb4q0fv400dn";
+        sha512 = "2lrlysxfbyzywla6i1q07xncmw30w1icgq18c4bra25dl6wvcd3mxg1lqbf88w5h7mqnf98j8ll657wnqwjq9rwd7pbmd9i11964x0c";
       };
     };
-    "write-file-atomic-2.1.0" = {
+    "write-file-atomic-2.3.0" = {
       name = "write-file-atomic";
       packageName = "write-file-atomic";
-      version = "2.1.0";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.1.0.tgz";
+        url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz";
-        sha512 = "0jpbx5znf640m7icywa21hdgyss5h6c811z27mzk7mh1yhv8sqcqd2y0cwgkrnigx57k2chv5cqwv0z8ff8z32gpdw8jw5imz8pcdni";
+        sha512 = "2sgqxmcqzjd7nq9gjh6jz7vfb0gs0ag4jvqzdq93afq3bw3jrm88mhxql9sryyb04f3ipw5jkgjfiigsmdwlz9fgsnnm3cxhcmxxqy6";
       };
     };
     "debuglog-1.0.1" = {
@@ -4558,6 +4576,24 @@ let
         sha1 = "e848396f057d223f24386924618e25694161ec47";
       };
     };
+    "ignore-walk-3.0.0" = {
+      name = "ignore-walk";
+      packageName = "ignore-walk";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.0.tgz";
+        sha512 = "0ly2gpx2q4zi46dbnwhp2g329vfhqrbfh1piy5hvgfzpasbq61ymaxg64qsxiqx6qqv396m0ad7abs3q3sv702w42xfli8qpm1yp8dl";
+      };
+    };
+    "npm-bundled-1.0.3" = {
+      name = "npm-bundled";
+      packageName = "npm-bundled";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.3.tgz";
+        sha512 = "0xk8ky1cjf8q2wkbgfzplpn04sm9xnl6i71dwnc29rfh8m2glan5nd6l4k3q7ikci7xpwfpcmyy3frr873zndjmhbr344grkyh3f907";
+      };
+    };
     "make-fetch-happen-2.5.0" = {
       name = "make-fetch-happen";
       packageName = "make-fetch-happen";
@@ -4594,24 +4630,6 @@ let
         sha1 = "fe4874d8c7913366cfd9ead12453a22cd3657f8e";
       };
     };
-    "tar-fs-1.15.3" = {
-      name = "tar-fs";
-      packageName = "tar-fs";
-      version = "1.15.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tar-fs/-/tar-fs-1.15.3.tgz";
-        sha1 = "eccf935e941493d8151028e636e51ce4c3ca7f20";
-      };
-    };
-    "tar-stream-1.5.4" = {
-      name = "tar-stream";
-      packageName = "tar-stream";
-      version = "1.5.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.4.tgz";
-        sha1 = "36549cf04ed1aee9b2a30c0143252238daf94016";
-      };
-    };
     "agentkeepalive-3.3.0" = {
       name = "agentkeepalive";
       packageName = "agentkeepalive";
@@ -4774,15 +4792,6 @@ let
         sha1 = "ed10041f2e4a7f1b0a38466d17a5c3e27df1dfc1";
       };
     };
-    "bl-1.2.1" = {
-      name = "bl";
-      packageName = "bl";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bl/-/bl-1.2.1.tgz";
-        sha1 = "cac328f7bee45730d404b692203fcb590e172d5e";
-      };
-    };
     "mute-stream-0.0.7" = {
       name = "mute-stream";
       packageName = "mute-stream";
@@ -4828,6 +4837,33 @@ let
         sha1 = "2bd7c77296c1702a46488b8ad41f79865eecd4e1";
       };
     };
+    "minipass-2.2.1" = {
+      name = "minipass";
+      packageName = "minipass";
+      version = "2.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minipass/-/minipass-2.2.1.tgz";
+        sha512 = "3yy9s65iwrx5hndcqbxrks88xi9cf8hra6zalgf8xfr4ahpp31s0i8lv6jpyb42p0y7z55ac3390sbqxcgcvan3xls449agbjb98mmv";
+      };
+    };
+    "minizlib-1.0.3" = {
+      name = "minizlib";
+      packageName = "minizlib";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minizlib/-/minizlib-1.0.3.tgz";
+        sha1 = "d5c1abf77be154619952e253336eccab9b2a32f5";
+      };
+    };
+    "yallist-3.0.2" = {
+      name = "yallist";
+      packageName = "yallist";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz";
+        sha1 = "8452b4bb7e83c7c188d8041c1a837c773d6d8bb9";
+      };
+    };
     "unique-slug-2.0.0" = {
       name = "unique-slug";
       packageName = "unique-slug";
@@ -5996,10 +6032,13 @@ in
                       sources."is-dotfile-1.0.3"
                     ];
                   })
-                  (sources."regex-cache-0.4.3" // {
+                  (sources."regex-cache-0.4.4" // {
                     dependencies = [
-                      sources."is-equal-shallow-0.1.3"
+                      (sources."is-equal-shallow-0.1.3" // {
-                      sources."is-primitive-2.0.0"
+                        dependencies = [
+                          sources."is-primitive-2.0.0"
+                        ];
+                      })
                     ];
                   })
                 ];
@@ -6424,9 +6463,9 @@ in
           sources."is-typedarray-1.0.0"
           sources."isstream-0.1.2"
           sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.16" // {
+          (sources."mime-types-2.1.17" // {
             dependencies = [
-              sources."mime-db-1.29.0"
+              sources."mime-db-1.30.0"
             ];
           })
           sources."oauth-sign-0.8.2"
@@ -6522,7 +6561,7 @@ in
                 dependencies = [
                   (sources."bplist-parser-0.1.1" // {
                     dependencies = [
-                      sources."big-integer-1.6.24"
+                      sources."big-integer-1.6.25"
                     ];
                   })
                   (sources."meow-3.7.0" // {
@@ -6664,9 +6703,9 @@ in
         dependencies = [
           (sources."accepts-1.3.4" // {
             dependencies = [
-              (sources."mime-types-2.1.16" // {
+              (sources."mime-types-2.1.17" // {
                 dependencies = [
-                  sources."mime-db-1.29.0"
+                  sources."mime-db-1.30.0"
                 ];
               })
               sources."negotiator-0.6.1"
@@ -6722,9 +6761,9 @@ in
           (sources."type-is-1.6.15" // {
             dependencies = [
               sources."media-typer-0.3.0"
-              (sources."mime-types-2.1.16" // {
+              (sources."mime-types-2.1.17" // {
                 dependencies = [
-                  sources."mime-db-1.29.0"
+                  sources."mime-db-1.30.0"
                 ];
               })
             ];
@@ -6921,9 +6960,9 @@ in
                   sources."is-typedarray-1.0.0"
                   sources."isstream-0.1.2"
                   sources."json-stringify-safe-5.0.1"
-                  (sources."mime-types-2.1.16" // {
+                  (sources."mime-types-2.1.17" // {
                     dependencies = [
-                      sources."mime-db-1.29.0"
+                      sources."mime-db-1.30.0"
                     ];
                   })
                   sources."oauth-sign-0.8.2"
@@ -7167,9 +7206,9 @@ in
                   sources."is-typedarray-1.0.0"
                   sources."isstream-0.1.2"
                   sources."json-stringify-safe-5.0.1"
-                  (sources."mime-types-2.1.16" // {
+                  (sources."mime-types-2.1.17" // {
                     dependencies = [
-                      sources."mime-db-1.29.0"
+                      sources."mime-db-1.30.0"
                     ];
                   })
                   sources."oauth-sign-0.8.2"
@@ -7486,9 +7525,9 @@ in
           sources."is-typedarray-1.0.0"
           sources."isstream-0.1.2"
           sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.16" // {
+          (sources."mime-types-2.1.17" // {
             dependencies = [
-              sources."mime-db-1.29.0"
+              sources."mime-db-1.30.0"
             ];
           })
           sources."oauth-sign-0.8.2"
@@ -7607,10 +7646,10 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "5.3.0";
+    version = "5.4.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-5.3.0.tgz";
+      url = "https://registry.npmjs.org/npm/-/npm-5.4.1.tgz";
-      sha512 = "29izly6jqqdaslak9xz3i3bsr7qgg5vjcbzf55as0hh630z4aml48n5a7dz6skqn34d02fg3bk2zwkq7n67z787wn14vr3na9chx6v4";
+      sha512 = "0vb3ad2wgv4y52jwbz8xpzg36hzimbbnlad594kblfq2mjfnaw9v4zzgd19ghan4a622s4zcrap51l2fww79lbl6n2qfv26allyg26z";
     };
     dependencies = [
       (sources."JSONStream-1.3.1" // {
@@ -7666,25 +7705,6 @@ in
       sources."editor-1.0.0"
       sources."fs-vacuum-1.2.10"
       sources."fs-write-stream-atomic-1.0.10"
-      sources."fstream-1.0.11"
-      (sources."fstream-npm-1.2.1" // {
-        dependencies = [
-          (sources."fstream-ignore-1.0.5" // {
-            dependencies = [
-              (sources."minimatch-3.0.4" // {
-                dependencies = [
-                  (sources."brace-expansion-1.1.8" // {
-                    dependencies = [
-                      sources."balanced-match-1.0.0"
-                      sources."concat-map-0.0.1"
-                    ];
-                  })
-                ];
-              })
-            ];
-          })
-        ];
-      })
       (sources."glob-7.1.2" // {
         dependencies = [
           sources."fs.realpath-1.0.0"
@@ -7714,7 +7734,7 @@ in
         ];
       })
       sources."lazy-property-1.0.0"
-      (sources."libnpx-9.2.3" // {
+      (sources."libnpx-9.6.0" // {
         dependencies = [
           sources."dotenv-4.0.0"
           sources."y18n-3.2.1"
@@ -7853,6 +7873,7 @@ in
           sources."yallist-2.1.2"
         ];
       })
+      sources."meant-1.0.1"
       (sources."mississippi-1.3.0" // {
         dependencies = [
           (sources."concat-stream-1.6.0" // {
@@ -7900,6 +7921,7 @@ in
       })
       (sources."node-gyp-3.6.2" // {
         dependencies = [
+          sources."fstream-1.0.11"
           (sources."minimatch-3.0.4" // {
             dependencies = [
               (sources."brace-expansion-1.1.8" // {
@@ -7911,6 +7933,12 @@ in
             ];
           })
           sources."nopt-3.0.6"
+          sources."semver-5.3.0"
+          (sources."tar-2.2.1" // {
+            dependencies = [
+              sources."block-stream-0.0.9"
+            ];
+          })
         ];
       })
       sources."nopt-4.0.1"
@@ -7925,7 +7953,27 @@ in
       })
       sources."npm-cache-filename-1.0.2"
       sources."npm-install-checks-3.0.0"
+      sources."npm-lifecycle-1.0.3"
       sources."npm-package-arg-5.1.2"
+      (sources."npm-packlist-1.1.8" // {
+        dependencies = [
+          (sources."ignore-walk-3.0.0" // {
+            dependencies = [
+              (sources."minimatch-3.0.4" // {
+                dependencies = [
+                  (sources."brace-expansion-1.1.8" // {
+                    dependencies = [
+                      sources."balanced-match-1.0.0"
+                      sources."concat-map-0.0.1"
+                    ];
+                  })
+                ];
+              })
+            ];
+          })
+          sources."npm-bundled-1.0.3"
+        ];
+      })
       (sources."npm-registry-client-8.4.0" // {
         dependencies = [
           (sources."concat-stream-1.6.0" // {
@@ -7977,7 +8025,7 @@ in
           sources."os-tmpdir-1.0.2"
         ];
       })
-      (sources."pacote-2.7.38" // {
+      (sources."pacote-6.0.2" // {
         dependencies = [
           (sources."make-fetch-happen-2.5.0" // {
             dependencies = [
@@ -8079,22 +8127,6 @@ in
               sources."genfun-4.0.1"
             ];
           })
-          (sources."tar-fs-1.15.3" // {
-            dependencies = [
-              (sources."pump-1.0.2" // {
-                dependencies = [
-                  sources."end-of-stream-1.4.0"
-                ];
-              })
-            ];
-          })
-          (sources."tar-stream-1.5.4" // {
-            dependencies = [
-              sources."bl-1.2.1"
-              sources."end-of-stream-1.4.0"
-              sources."xtend-4.0.1"
-            ];
-          })
         ];
       })
       sources."path-is-inside-1.0.2"
@@ -8198,9 +8230,9 @@ in
           sources."is-typedarray-1.0.0"
           sources."isstream-0.1.2"
           sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.16" // {
+          (sources."mime-types-2.1.17" // {
             dependencies = [
-              sources."mime-db-1.29.0"
+              sources."mime-db-1.30.0"
             ];
           })
           sources."oauth-sign-0.8.2"
@@ -8218,7 +8250,7 @@ in
       sources."retry-0.10.1"
       sources."rimraf-2.6.1"
       sources."safe-buffer-5.1.1"
-      sources."semver-5.3.0"
+      sources."semver-5.4.1"
       sources."sha-2.0.1"
       sources."slide-1.1.6"
       sources."sorted-object-2.0.1"
@@ -8244,9 +8276,11 @@ in
       })
       sources."ssri-4.1.6"
       sources."strip-ansi-4.0.0"
-      (sources."tar-2.2.1" // {
+      (sources."tar-4.0.1" // {
         dependencies = [
-          sources."block-stream-0.0.9"
+          sources."minipass-2.2.1"
+          sources."minizlib-1.0.3"
+          sources."yallist-3.0.2"
         ];
       })
       sources."text-table-0.2.0"
@@ -8437,12 +8471,12 @@ in
           sources."builtins-1.0.3"
         ];
       })
-      (sources."which-1.2.14" // {
+      (sources."which-1.3.0" // {
         dependencies = [
           sources."isexe-2.0.0"
         ];
       })
-      (sources."worker-farm-1.4.1" // {
+      (sources."worker-farm-1.5.0" // {
         dependencies = [
           (sources."errno-0.1.4" // {
             dependencies = [
@@ -8453,7 +8487,11 @@ in
         ];
       })
       sources."wrappy-1.0.2"
-      sources."write-file-atomic-2.1.0"
+      (sources."write-file-atomic-2.3.0" // {
+        dependencies = [
+          sources."signal-exit-3.0.2"
+        ];
+      })
       sources."debuglog-1.0.1"
       sources."imurmurhash-0.1.4"
       sources."lodash._baseindexof-3.1.0"
@@ -8684,9 +8722,9 @@ in
           sources."is-typedarray-1.0.0"
           sources."isstream-0.1.2"
           sources."json-stringify-safe-5.0.1"
-          (sources."mime-types-2.1.16" // {
+          (sources."mime-types-2.1.17" // {
             dependencies = [
-              sources."mime-db-1.29.0"
+              sources."mime-db-1.30.0"
             ];
           })
           sources."oauth-sign-0.8.2"

pkgs/development/node-packages/node-packages-v6.json

@@ -26,6 +26,7 @@
 , "gulp"
 , "hipache"
 , "htmlhint"
+, "ionic"
 , "ios-deploy"
 , "istanbul"
 , "javascript-typescript-langserver"

pkgs/development/python-modules/Wand/default.nix

@@ -7,12 +7,12 @@
 , psutil
 , memory_profiler
 , pytest_xdist
-, sharedLibraryExtension
 }:
 
 let
-  magick_wand_library = "${imagemagick}/lib/libMagickWand-6.Q16${sharedLibraryExtension}";
+  soext = stdenv.hostPlatform.extensions.sharedLibrary;
-  imagemagick_library = "${imagemagick}/lib/libMagickCore-6.Q16${sharedLibraryExtension}";
+  magick_wand_library = "${imagemagick}/lib/libMagickWand-6.Q16${soext}";
+  imagemagick_library = "${imagemagick}/lib/libMagickCore-6.Q16${soext}";
 in buildPythonPackage rec {
   pname = "Wand";
   version = "0.4.4";

pkgs/development/python-modules/backports_weakref/default.nix

@@ -28,6 +28,6 @@ buildPythonPackage rec {
   meta = with stdenv.lib; {
     description = "Backports of new features in Python’s weakref module";
     license = licenses.psfl;
-    maintainers = with maintainers; [ jpbernardy ];
+    maintainers = with maintainers; [ jyp ];
   };
 }

pkgs/development/python-modules/bz2file/default.nix

@@ -20,6 +20,6 @@ buildPythonPackage rec {
   meta = {
     description = "Bz2file is a Python library for reading and writing bzip2-compressed files";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ jpbernardy ];
+    maintainers = with lib.maintainers; [ jyp ];
   };
 }

pkgs/development/python-modules/ftfy/default.nix

@@ -10,11 +10,12 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "ftfy";
-  version = "5.1.1";
+  # latest is 5.1.1, buy spaCy requires 4.4.3
+  version = "4.4.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "67a29a2fad5f72aec2d8a0a7084e4f499ed040455133ee96b1c458609fc29e78";        
+    sha256 = "152xdb56rhs1q4r0ck1n557sbphw7zq18r75a7kkd159ckdnc01w";
   };
 
   propagatedBuildInputs = [ html5lib wcwidth];

pkgs/development/python-modules/gensim/default.nix

@@ -38,6 +38,6 @@ buildPythonPackage rec {
     description = "Topic-modelling library";
     homepage = https://radimrehurek.com/gensim/;
     license = lib.licenses.lgpl21;
-    maintainers = with lib.maintainers; [ jpbernardy ];
+    maintainers = with lib.maintainers; [ jyp ];
   };
 }

pkgs/development/python-modules/joblib/default.nix

@@ -0,0 +1,36 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nose
+, sphinx
+, numpydoc
+, isPy3k
+, stdenv
+}:
+
+
+buildPythonPackage rec {
+  pname = "joblib";
+  name = "${pname}-${version}";
+  version = "0.10.3";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "29b2965a9efbc90a5fe66a389ae35ac5b5b0c1feabfc7cab7fd5d19f429a071d";
+  };
+
+  checkInputs = [ nose sphinx numpydoc ];
+
+  # Failing test on Python 3.x and Darwin
+  postPatch = '''' + lib.optionalString (isPy3k || stdenv.isDarwin) ''
+    sed -i -e '70,84d' joblib/test/test_format_stack.py
+    # test_nested_parallel_warnings: ValueError: Non-zero return code: -9.
+    # Not sure why but it's nix-specific. Try removing for new joblib releases.
+    rm joblib/test/test_parallel.py
+  '';
+
+  meta = {
+    description = "Lightweight pipelining: using Python functions as pipeline jobs";
+    homepage = http://pythonhosted.org/joblib/;
+    license = lib.licenses.bsd3;
+  };
+}

pkgs/development/python-modules/jupyter_console/default.nix

@@ -0,0 +1,40 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nose
+, jupyter_client
+, ipython
+, ipykernel
+, prompt_toolkit
+, pygments
+}:
+
+buildPythonPackage rec {
+  pname = "jupyter_console";
+  version = "5.2.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "545dedd3aaaa355148093c5609f0229aeb121b4852995c2accfa64fe3e0e55cd";
+  };
+
+  checkInputs = [ nose ];
+  propagatedBuildInputs = [
+    jupyter_client
+    ipython
+    ipykernel
+    prompt_toolkit
+    pygments
+  ];
+
+  # ValueError: underlying buffer has been detached
+  doCheck = false;
+
+  meta = {
+    description = "Jupyter terminal console";
+    homepage = "http://jupyter.org/";
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.all;
+  };
+}

pkgs/development/python-modules/keyring/default.nix

@@ -21,6 +21,8 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ secretstorage ];
 
+  doCheck = !stdenv.isDarwin;
+
   checkPhase = ''
     py.test $out
   '';

pkgs/development/python-modules/secretstorage/default.nix

@@ -21,7 +21,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/mitya57/secretstorage";
     description = "Python bindings to FreeDesktop.org Secret Service API";
     license = licenses.bsdOriginal;
-    platforms = platforms.linux;
     maintainer = with maintainers; [ teto ];
   };
 }

pkgs/development/python-modules/shapely/default.nix

@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchPypi
-, geos, glibcLocales, pytest, cython, sharedLibraryExtension
+, geos, glibcLocales, pytest, cython
 , numpy
 }:
 
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   patchPhase = let
     libc = if stdenv.isDarwin then "libc.dylib" else "libc.so.6";
   in ''
-    sed -i "s|_lgeos = load_dll('geos_c', fallbacks=.*)|_lgeos = load_dll('geos_c', fallbacks=['${geos}/lib/libgeos_c${sharedLibraryExtension}'])|" shapely/geos.py
+    sed -i "s|_lgeos = load_dll('geos_c', fallbacks=.*)|_lgeos = load_dll('geos_c', fallbacks=['${geos}/lib/libgeos_c${stdenv.hostPlatform.extensions.sharedLibrary}'])|" shapely/geos.py
     sed -i "s|free = load_dll('c').free|free = load_dll('c', fallbacks=['${stdenv.cc.libc}/lib/${stdenv.cc.libc}']).free|" shapely/geos.py
   '';
 

pkgs/development/python-modules/smart_open/default.nix

@@ -23,6 +23,6 @@ buildPythonPackage rec {
   meta = {
     license = lib.licenses.mit;
     description = "smart_open is a Python 2 & Python 3 library for efficient streaming of very large file";
-    maintainers = with lib.maintainers; [ jpbernardy ];
+    maintainers = with lib.maintainers; [ jyp ];
   };
 }

pkgs/development/python-modules/tensorflow/default.nix

@@ -1,7 +1,7 @@
 { stdenv
 , fetchurl
 , buildPythonPackage
-, isPy35, isPy27
+, isPy36, isPy35, isPy27
 , cudaSupport ? false
 , cudatoolkit ? null
 , cudnn ? null
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   version = "1.1.0";
   name = "${pname}-${version}";
   format = "wheel";
-  disabled = ! (isPy35 || isPy27);
+  disabled = ! (isPy36 || isPy35 || isPy27);
 
   src = let
       tfurl = sys: proc: pykind:
@@ -59,33 +59,47 @@ buildPythonPackage rec {
             url = tfurl "linux" "cpu" "cp27-none-linux_x86_64";
             sha256 = "0ld3hqx3idxk0zcrvn3p9yqnmx09zsj3mw66jlfw6fkv5hznx8j2";
           };
-          py3 = {
+          py35 = {
             url = tfurl "linux" "cpu" "cp35-cp35m-linux_x86_64";
             sha256 = "0ahz9222rzqrk43lb9w4m351klkm6mlnnvw8xfqip28vbmymw90b";
           };
+          py36 = {
+            url = tfurl "linux" "cpu" "cp36-cp36m-linux_x86_64";
+            sha256 = "1a2cc8ihl94iqff76nxg6bq85vfb7sj5cvvi9sxy2f43k32fi4lv";
+          };
+
         };
         linux-x86_64.cuda = {
           py2 = {
             url = tfurl "linux" "gpu" "cp27-none-linux_x86_64";
             sha256 = "1baa9jwr6f8f62dyx6isbw8yyrd0pi1dz1srjblfqsyk1x3pnfvh";
           };
-          py3 = {
+          py35 = {
             url = tfurl "linux" "gpu" "cp35-cp35m-linux_x86_64";
             sha256 = "0606m2awy0ifhniy8lsyhd0xc388dgrwksn87989xlgy90wpxi92";
           };
+          py36 = {
+            url = tfurl "linux" "gpu" "cp36-cp36m-linux_x86_64";
+            sha256 = "0lvbmfa87qzrajadpsf13gi3l71vryzkryzqfvkykivqrdjsvj8q";
+          };
+
         };
       };
     in
     fetchurl (
       if stdenv.isDarwin then
-        if isPy35 then
+        if isPy27 then
-          dls.darwin.cpu.py3
-        else
           dls.darwin.cpu.py2
+        else
+          dls.darwin.cpu.py3
+      else if isPy36 then
+        if cudaSupport then
+          dls.linux-x86_64.cuda.py36
+        else dls.linux-x86_64.cpu.py36
       else if isPy35 then
         if cudaSupport then
-          dls.linux-x86_64.cuda.py3
+          dls.linux-x86_64.cuda.py35
-        else dls.linux-x86_64.cpu.py3
+        else dls.linux-x86_64.cpu.py35
       else
         if cudaSupport then
           dls.linux-x86_64.cuda.py2
@@ -119,7 +133,7 @@ buildPythonPackage rec {
     description = "TensorFlow helps the tensors flow";
     homepage = http://tensorflow.org;
     license = licenses.asl20;
-    maintainers = with maintainers; [ jpbernardy ];
+    maintainers = with maintainers; [ jyp ];
     platforms = with platforms; if cudaSupport then linux else linux ++ darwin;
   };
 }

pkgs/development/ruby-modules/gem-config/default.nix

@@ -194,7 +194,7 @@ in
   rbnacl = spec: {
     postInstall = ''
     sed -i $(cat $out/nix-support/gem-meta/install-path)/lib/rbnacl.rb -e "2a \
-    RBNACL_LIBSODIUM_GEM_LIB_PATH = '${libsodium.out}/lib/libsodium.${if stdenv.isDarwin then "dylib" else "so"}'
+    RBNACL_LIBSODIUM_GEM_LIB_PATH = '${libsodium.out}/lib/libsodium${stdenv.hostPlatform.extensions.sharedLibrary}'
     "
     '';
   };

pkgs/development/tools/analysis/spin/default.nix

@@ -7,15 +7,12 @@ let
 
 in stdenv.mkDerivation rec {
   name = "spin-${version}";
-  version = "6.4.6";
+  version = "6.4.7";
   url-version = stdenv.lib.replaceChars ["."] [""] version;
 
   src = fetchurl {
-    # The homepage is behind CloudFlare anti-DDoS protection, which blocks cURL.
+    url = "http://spinroot.com/spin/Src/spin${url-version}.tar.gz";
-    # Dropbox mirror from developers:
+    sha256 = "17m2xaag0jns8hsa4466zxq35ylg9fnzynzvjjmx4ympbiil6mqv";
-    # https://www.dropbox.com/sh/fgzipzp4wpo3qc1/AADZPqS4aoR-pjNF6OQXRLQHa
-    url = "https://www.dropbox.com/sh/fgzipzp4wpo3qc1/AAA-vBeJ7xty-CDZgk7OB58Ta/spin646.tar.gz?raw=1";
-    sha256 = "1n33qzlb7g30vhr5yxssw210b2m0242y9j21c7fqpn9z6b0rbhjp";
   };
 
   nativeBuildInputs = [ makeWrapper ];

pkgs/development/tools/build-managers/buildbot/plugins.nix

@@ -4,11 +4,11 @@ let
   buildbot-pkg = pythonPackages.buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "buildbot-pkg";
-    version = "0.9.9.post2";
+    version = "0.9.11";
 
     src = pythonPackages.fetchPypi {
       inherit pname version;
-      sha256 = "1h24fzyr4kfm1nb2627hgg9nl5mwv1gihc3f2wb5000gxmjdasg8";
+      sha256 = "1gh7wj9z7n7yfs219jbv9pdd2w8dwj6qpa090ffjkfpgd3xana33";
     };
 
     propagatedBuildInputs = with pythonPackages; [ setuptools ];
@@ -25,14 +25,14 @@ in {
   www = pythonPackages.buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "buildbot_www";
-    version = "0.9.9.post2";
+    version = buildbot-pkg.version;
 
     # NOTE: wheel is used due to buildbot circular dependency
     format = "wheel";
 
     src = pythonPackages.fetchPypi {
       inherit pname version format;
-      sha256 = "1yzk3sy9i8g8wz9vvghhxnafs5dzsd3sybmm8lg043129rh116b9";
+      sha256 = "0fk1swdncg4nha744mzkf6jqh1zv1cfhnqvd19669kjcyjx9i68d";
     };
 
     meta = with stdenv.lib; {
@@ -46,11 +46,11 @@ in {
   console-view = pythonPackages.buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "buildbot-console-view";
-    version = "0.9.9.post2";
+    version = buildbot-pkg.version;
 
     src = pythonPackages.fetchPypi {
       inherit pname version;
-      sha256 = "0mmlxzlzl0r97jf0g98m7k1b13mzzy80445i0biazkj0vzkpwxza";
+      sha256 = "16wxgnh35916c2gw34971ynx319lnm9addhqvii885vid44pqim0";
     };
 
     propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];
@@ -66,11 +66,11 @@ in {
   waterfall-view = pythonPackages.buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "buildbot-waterfall-view";
-    version = "0.9.9.post2";
+    version = buildbot-pkg.version;
 
     src = pythonPackages.fetchPypi {
       inherit pname version;
-      sha256 = "0pq45gddwjd61nxmr48cl8s533i4gy3wg9wzbj3g1yb30yrz8qf4";
+      sha256 = "1hcr8xsc0ajfg2vz2h8g5s8ypsp32kdplgqp21jh8z5y0a6nzqsl";
     };
 
     propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];
@@ -86,11 +86,11 @@ in {
   grid-view = pythonPackages.buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "buildbot-grid-view";
-    version = "0.9.9.post2";
+    version = buildbot-pkg.version;
 
     src = pythonPackages.fetchPypi {
       inherit pname version;
-      sha256 = "16y7br1yniby8yp932ildn14cxvbw5ywx36d703c4d98dmnlrpaw";
+      sha256 = "0aw1073xq549q5jkjk31zhqpasp8jiy4gch0fjyw8qy0dax8hc7r";
     };
 
     propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];
@@ -103,4 +103,24 @@ in {
     };
   };
 
+  wsgi-dashboards = pythonPackages.buildPythonPackage rec {
+    name = "${pname}-${version}";
+    pname = "buildbot-wsgi-dashboards";
+    version = buildbot-pkg.version;
+
+    src = pythonPackages.fetchPypi {
+      inherit pname version;
+      sha256 = "0x99mdmn1ngcnmkxr40hwqafsq48jybdz45y5kpc0yw68n0bfwmv";
+    };
+
+    propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];
+
+    meta = with stdenv.lib; {
+      homepage = http://buildbot.net/;
+      description = "Buildbot WSGI dashboards Plugin";
+      maintainers = with maintainers; [ akazakov ];
+      license = licenses.gpl2;
+    };
+  };
+
 }

pkgs/development/tools/build-managers/rebar3/default.nix

@@ -3,64 +3,64 @@
   tree, fetchFromGitHub, hexRegistrySnapshot }:
 
 let
-  version = "3.3.2";
+  version = "3.4.3";
 
   bootstrapper = ./rebar3-nix-bootstrap;
 
-  bbmustache = fetchHex {
+  erlware_commons = fetchHex {
-    pkg = "bbmustache";
+    pkg = "erlware_commons";
-    version = "1.3.0";
+    version = "1.0.0";
-    sha256 = "042pfgss8kscq6ssg8gix8ccmdsrx0anjczsbrn2a6c36ljrx2p6";
+    sha256 = "0wkphbrjk19lxdwndy92v058qwcaz13bcgdzp33h21aa7vminzx7";
+  };
+  ssl_verify_fun = fetchHex {
+    pkg = "ssl_verify_fun";
+    version = "1.1.2";
+    sha256 = "0qdyx70v09fydv4wzz1djnkixqj62ny40yjjhv2q6mh47lns2arj";
   };
   certifi = fetchHex {
     pkg = "certifi";
-    version = "0.4.0";
+    version = "2.0.0";
-    sha256 = "04bnvsbssdcf6b9h9bfglflds7j0gx6q5igl1xxhx6fnwaz37hhw";
+    sha256 = "075v7cvny52jbhnskchd3fp68fxgp7qfvdls0haamcycxrn0dipx";
-  };
-  cf = fetchHex {
-    pkg = "cf";
-    version = "0.2.1";
-    sha256 = "19d0yvg8wwa57cqhn3vqfvw978nafw8j2rvb92s3ryidxjkrmvms";
-  };
-  cth_readable = fetchHex {
-    pkg = "cth_readable";
-    version = "1.2.3";
-    sha256 = "0wfpfismzi2q0nzvx9qyllch4skwmsk6yqffw8iw2v48ssbfvfhz";
-  };
-  erlware_commons = fetchHex {
-    pkg = "erlware_commons";
-    version = "0.21.0";
-    sha256 = "0gxb011m637rca2g0vhm1q9krm3va50rz1py6zf8k92q4iv9a2p7";
-  };
-  eunit_formatters = fetchHex {
-    pkg = "eunit_formatters";
-    version = "0.3.1";
-    sha256 = "0cg9dasv60v09q3q4wja76pld0546mhmlpb0khagyylv890hg934";
-  };
-  getopt = fetchHex {
-    pkg = "getopt";
-    version = "0.8.2";
-    sha256 = "1xw30h59zbw957cyjd8n50hf9y09jnv9dyry6x3avfwzcyrnsvkk";
   };
   providers = fetchHex {
     pkg = "providers";
     version = "1.6.0";
     sha256 = "0byfa1h57n46jilz4q132j0vk3iqc0v1vip89li38gb1k997cs0g";
   };
-  ssl_verify_fun = fetchHex {
+  getopt = fetchHex {
-    pkg = "ssl_verify_fun";
+    pkg = "getopt";
-    version = "1.1.1";
+    version = "0.8.2";
-    sha256 = "0pnnan9xf4r6pr34hi28zdyv501i39jwnrwk6pr9r4wabkmhb22g";
+    sha256 = "1xw30h59zbw957cyjd8n50hf9y09jnv9dyry6x3avfwzcyrnsvkk";
+  };
+  bbmustache = fetchHex {
+    pkg = "bbmustache";
+    version = "1.3.0";
+    sha256 = "042pfgss8kscq6ssg8gix8ccmdsrx0anjczsbrn2a6c36ljrx2p6";
   };
   relx = fetchHex {
     pkg = "relx";
-    version = "3.21.1";
+    version = "3.23.1";
-    sha256 = "00590aqy0rfzgsnzxqgwbmn90imxxqlzmnmapy6bq76vw2rynvb8";
+    sha256 = "13j7wds2d7b8v3r9pwy3zhwhzywgwhn6l9gm3slqzyrs1jld0a9d";
+  };
+  cf = fetchHex {
+    pkg = "cf";
+    version = "0.2.2";
+    sha256 = "08cvy7skn5d2k4manlx5k3anqgjdvajjhc5jwxbaszxw34q3na28";
+  };
+  cth_readable = fetchHex {
+    pkg = "cth_readable";
+    version = "1.3.0";
+    sha256 = "1s7bqj6f2zpbyjmbfq2mm6vcz1jrxjr2nd0531wshsx6fnshqhvs";
+  };
+  eunit_formatters = fetchHex {
+    pkg = "eunit_formatters";
+    version = "0.3.1";
+    sha256 = "0cg9dasv60v09q3q4wja76pld0546mhmlpb0khagyylv890hg934";
   };
   rebar3_hex = fetchHex {
     pkg = "rebar3_hex";
-    version = "1.12.0";
+    version = "4.0.0";
-    sha256 = "45467e93ae8d776c6038fdaeaffbc55d8f2f097f300a54dab9b81c6d1cf21f73";
+    sha256 = "0k0ykx1lz62r03dpbi2zxsvrxgnr5hj67yky0hjrls09ynk4682v";
   };
 
 in
@@ -70,22 +70,20 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://github.com/rebar/rebar3/archive/${version}.tar.gz";
-    sha256 = "14nhc1bmna3b4y9qmd0lzpi0jdaw92r7ljg7vlghn297awsjgg6c";
+    sha256 = "1a05gpxxc3mx5v33kzpb5xnq5vglmjl0q8hrcvpinjlazcwbg531";
   };
 
   inherit bootstrapper;
 
   patches = if hermeticRebar3 == true
-  then  [ ./hermetic-bootstrap.patch ./hermetic-rebar3.patch ]
+  then  [ ./hermetic-rebar3.patch ]
   else [];
 
   buildInputs = [ erlang tree  ];
   propagatedBuildInputs = [ hexRegistrySnapshot ];
 
   postPatch = ''
-    echo postPatch
     ${erlang}/bin/escript ${bootstrapper} registry-only
-    echo "$ERL_LIBS"
     mkdir -p _build/default/lib/
     mkdir -p _build/default/plugins
     cp --no-preserve=mode -R ${erlware_commons} _build/default/lib/erlware_commons

pkgs/development/tools/build-managers/rebar3/hermetic-bootstrap.patch

@@ -1,169 +0,0 @@
-diff --git a/bootstrap b/bootstrap
-index c36fddb..9fcb718 100755
---- a/bootstrap
-+++ b/bootstrap
-@@ -7,9 +7,11 @@ main(_) ->
-     application:start(asn1),
-     application:start(public_key),
-     application:start(ssl),
--    inets:start(),
--    inets:start(httpc, [{profile, rebar}]),
--    set_httpc_options(),
-+    %% Removed for hermeticity on Nix
-+    %%
-+    %% inets:start(),
-+    %% inets:start(httpc, [{profile, rebar}]),
-+    %% set_httpc_options(),
- 
-     %% Fetch and build deps required to build rebar3
-     BaseDeps = [{providers, []}
-@@ -73,13 +75,13 @@ default_registry_file() ->
-     CacheDir = filename:join([Home, ".cache", "rebar3"]),
-     filename:join([CacheDir, "hex", "default", "registry"]).
- 
--fetch_and_compile({Name, ErlFirstFiles}, Deps) ->
--    case lists:keyfind(Name, 1, Deps) of
--        {Name, Vsn} ->
--            ok = fetch({pkg, atom_to_binary(Name, utf8), list_to_binary(Vsn)}, Name);
--        {Name, _, Source} ->
--            ok = fetch(Source, Name)
--    end,
-+fetch_and_compile({Name, ErlFirstFiles}, _Deps) ->
-+    %% case lists:keyfind(Name, 1, Deps) of
-+    %%     {Name, Vsn} ->
-+    %%         ok = fetch({pkg, atom_to_binary(Name, utf8), list_to_binary(Vsn)}, Name);
-+    %%     {Name, _, Source} ->
-+    %%         ok = fetch(Source, Name)
-+    %% end,
- 
-     %% Hack: erlware_commons depends on a .script file to check if it is being built with
-     %% rebar2 or rebar3. But since rebar3 isn't built yet it can't get the vsn with get_key.
-@@ -88,67 +90,67 @@ fetch_and_compile({Name, ErlFirstFiles}, Deps) ->
- 
-     compile(Name, ErlFirstFiles).
- 
--fetch({pkg, Name, Vsn}, App) ->
--    Dir = filename:join([filename:absname("_build/default/lib/"), App]),
--    case filelib:is_dir(Dir) of
--        false ->
--            CDN = "https://repo.hex.pm/tarballs",
--            Package = binary_to_list(<<Name/binary, "-", Vsn/binary, ".tar">>),
--            Url = string:join([CDN, Package], "/"),
--            case request(Url) of
--                {ok, Binary} ->
--                    {ok, Contents} = extract(Binary),
--                    ok = erl_tar:extract({binary, Contents}, [{cwd, Dir}, compressed]);
--                _ ->
--                    io:format("Error: Unable to fetch package ~p ~p~n", [Name, Vsn])
--            end;
--        true ->
--            io:format("Dependency ~s already exists~n", [Name])
--    end.
--
--extract(Binary) ->
--    {ok, Files} = erl_tar:extract({binary, Binary}, [memory]),
--    {"contents.tar.gz", Contents} = lists:keyfind("contents.tar.gz", 1, Files),
--    {ok, Contents}.
--
--request(Url) ->
--    case httpc:request(get, {Url, []},
--                       [{relaxed, true}],
--                       [{body_format, binary}],
--                       rebar) of
--        {ok, {{_Version, 200, _Reason}, _Headers, Body}} ->
--            {ok, Body};
--        Error ->
--            Error
--    end.
--
--get_rebar_config() ->
--    {ok, [[Home]]} = init:get_argument(home),
--    ConfDir = filename:join(Home, ".config/rebar3"),
--    case file:consult(filename:join(ConfDir, "rebar.config")) of
--        {ok, Config} ->
--            Config;
--        _ ->
--            []
--    end.
--
--get_http_vars(Scheme) ->
--    OS = case os:getenv(atom_to_list(Scheme)) of
--        Str when is_list(Str) -> Str;
--        _ -> []
--    end,
--    proplists:get_value(Scheme, get_rebar_config(), OS).
--
--set_httpc_options() ->
--    set_httpc_options(https_proxy, get_http_vars(https_proxy)),
--    set_httpc_options(proxy, get_http_vars(http_proxy)).
--
--set_httpc_options(_, []) ->
--    ok;
--
--set_httpc_options(Scheme, Proxy) ->
--    {ok, {_, _, Host, Port, _, _}} = http_uri:parse(Proxy),
--    httpc:set_options([{Scheme, {{Host, Port}, []}}], rebar).
-+%% fetch({pkg, Name, Vsn}, App) ->
-+%%     Dir = filename:join([filename:absname("_build/default/lib/"), App]),
-+%%     case filelib:is_dir(Dir) of
-+%%         false ->
-+%%             CDN = "https://repo.hex.pm/tarballs",
-+%%             Package = binary_to_list(<<Name/binary, "-", Vsn/binary, ".tar">>),
-+%%             Url = string:join([CDN, Package], "/"),
-+%%             case request(Url) of
-+%%                 {ok, Binary} ->
-+%%                     {ok, Contents} = extract(Binary),
-+%%                     ok = erl_tar:extract({binary, Contents}, [{cwd, Dir}, compressed]);
-+%%                 _ ->
-+%%                     io:format("Error: Unable to fetch package ~p ~p~n", [Name, Vsn])
-+%%             end;
-+%%         true ->
-+%%             io:format("Dependency ~s already exists~n", [Name])
-+%%     end.
-+
-+%% extract(Binary) ->
-+%%     {ok, Files} = erl_tar:extract({binary, Binary}, [memory]),
-+%%     {"contents.tar.gz", Contents} = lists:keyfind("contents.tar.gz", 1, Files),
-+%%     {ok, Contents}.
-+
-+%% request(Url) ->
-+%%     case httpc:request(get, {Url, []},
-+%%                        [{relaxed, true}],
-+%%                        [{body_format, binary}],
-+%%                        rebar) of
-+%%         {ok, {{_Version, 200, _Reason}, _Headers, Body}} ->
-+%%             {ok, Body};
-+%%         Error ->
-+%%             Error
-+%%     end.
-+
-+%% get_rebar_config() ->
-+%%     {ok, [[Home]]} = init:get_argument(home),
-+%%     ConfDir = filename:join(Home, ".config/rebar3"),
-+%%     case file:consult(filename:join(ConfDir, "rebar.config")) of
-+%%         {ok, Config} ->
-+%%             Config;
-+%%         _ ->
-+%%             []
-+%%     end.
-+
-+%% get_http_vars(Scheme) ->
-+%%     OS = case os:getenv(atom_to_list(Scheme)) of
-+%%         Str when is_list(Str) -> Str;
-+%%         _ -> []
-+%%     end,
-+%%     proplists:get_value(Scheme, get_rebar_config(), OS).
-+
-+%% set_httpc_options() ->
-+%%     set_httpc_options(https_proxy, get_http_vars(https_proxy)),
-+%%     set_httpc_options(proxy, get_http_vars(http_proxy)).
-+
-+%% set_httpc_options(_, []) ->
-+%%     ok;
-+
-+%% set_httpc_options(Scheme, Proxy) ->
-+%%     {ok, {_, _, Host, Port, _, _}} = http_uri:parse(Proxy),
-+%%     httpc:set_options([{Scheme, {{Host, Port}, []}}], rebar).
- 
- compile(App, FirstFiles) ->
-     Dir = filename:join(filename:absname("_build/default/lib/"), App),

pkgs/development/tools/build-managers/rebar3/hermetic-rebar3.patch

@@ -1,22 +1,16 @@
-diff --git a/src/rebar3.erl b/src/rebar3.erl
+diff --git a/bootstrap b/bootstrap
-index 47dc25a..edda250 100644
+index 7c56bab..16c1be5 100755
---- a/src/rebar3.erl
+--- a/bootstrap
-+++ b/src/rebar3.erl
++++ b/bootstrap
-@@ -304,9 +304,11 @@ start_and_load_apps(Caller) ->
+@@ -101,7 +101,7 @@ extract(Binary) ->
-     ensure_running(crypto, Caller),
+ request(Url) ->
-     ensure_running(asn1, Caller),
+     HttpOptions = [{relaxed, true} | get_proxy_auth()],
-     ensure_running(public_key, Caller),
--    ensure_running(ssl, Caller),
--    inets:start(),
--    inets:start(httpc, [{profile, rebar}]).
-+    ensure_running(ssl, Caller).
-+%%  Removed due to the hermicity requirements of Nix
-+%%
-+%% inets:start(),
-+%% inets:start(httpc, [{profile, rebar}]).
  
- ensure_running(App, Caller) ->
+-    case httpc:request(get, {Url, []},
-     case application:start(App) of
++    case rebar_hermeticity:request(get, {Url, []},
+                        HttpOptions,
+                        [{body_format, binary}],
+                        rebar) of
 diff --git a/src/rebar_hermeticity.erl b/src/rebar_hermeticity.erl
 new file mode 100644
 index 0000000..8f6cc7d
@@ -66,23 +60,32 @@ index 0000000..8f6cc7d
 +    ?ERROR("Request: ~p ~s", [Method, Url]),
 +    erlang:halt(1).
 diff --git a/src/rebar_pkg_resource.erl b/src/rebar_pkg_resource.erl
-index 5817817..2ea1703 100644
+index d588f24..9ac8ad4 100644
 --- a/src/rebar_pkg_resource.erl
 +++ b/src/rebar_pkg_resource.erl
-@@ -107,7 +107,7 @@ make_vsn(_) ->
+@@ -109,7 +109,7 @@ make_vsn(_) ->
-     {error, "Replacing version of type pkg not supported."}.
- 
  request(Url, ETag) ->
+     HttpOptions = [{ssl, ssl_opts(Url)}, {relaxed, true} | rebar_utils:get_proxy_auth()],
+ 
 -    case httpc:request(get, {Url, [{"if-none-match", ETag} || ETag =/= false]++[{"User-Agent", rebar_utils:user_agent()}]},
 +    case rebar_hermeticity:request(get, {Url, [{"if-none-match", ETag} || ETag =/= false]++[{"User-Agent", rebar_utils:user_agent()}]},
-                        [{ssl, ssl_opts(Url)}, {relaxed, true}],
+                        HttpOptions,
                         [{body_format, binary}],
                         rebar) of
 diff --git a/src/rebar_prv_update.erl b/src/rebar_prv_update.erl
-index 75c609e..4283c23 100644
+index a019c5a..697cbab 100644
 --- a/src/rebar_prv_update.erl
 +++ b/src/rebar_prv_update.erl
-@@ -52,7 +52,7 @@ do(State) ->
+@@ -38,6 +38,8 @@ init(State) ->
+     {ok, State1}.
+ 
+ -spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
++do(State) -> {ok, State}.
++-ifdef(non_hermetic).
+ do(State) ->
+     try
+         case rebar_packages:registry_dir(State) of
+@@ -52,7 +54,7 @@ do(State) ->
                  case rebar_utils:url_append_path(CDN, ?REMOTE_REGISTRY_FILE) of
                      {ok, Url} ->
                          ?DEBUG("Fetching registry from ~p", [Url]),
@@ -91,3 +94,11 @@ index 75c609e..4283c23 100644
                                             [], [{stream, TmpFile}, {sync, true}],
                                             rebar) of
                              {ok, saved_to_file} ->
+@@ -76,6 +78,7 @@ do(State) ->
+             ?DEBUG("Error creating package index: ~p ~p", [C, erlang:get_stacktrace()]),
+             throw(?PRV_ERROR(package_index_write))
+     end.
++-endif.
+ 
+ -spec format_error(any()) -> iolist().
+ format_error({package_parse_cdn, Uri}) ->

pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap

@@ -94,7 +94,7 @@ bootstrap_plugins(#data{plugins = Plugins}) ->
 
 -spec bootstrap_libs(#data{}) -> ok.
 bootstrap_libs(#data{erl_libs = ErlLibs}) ->
-    io:format("Bootstrapping dependent librariesXXXX~n"),
+    io:format("Bootstrapping dependent libraries~n"),
     Target = "_build/default/lib/",
     Paths = string:tokens(ErlLibs, ":"),
     CopiableFiles =

pkgs/development/tools/build-managers/sbt/scala-native.nix

@@ -3,6 +3,10 @@
 sbt.overrideDerivation(old: {
   nativeBuildInputs = [ makeWrapper ];
 
+  version = "0.13.16";
+
+  sha256 = "033nvklclvbirhpsiy28d3ccmbm26zcs9vb7j8jndsc1ln09awi2";
+
   postFixup = ''
     wrapProgram $out/bin/sbt \
       --set CLANG_PATH      "${llvmPackages.clang}/bin/clang" \

pkgs/development/tools/erlang/hex2nix/default.nix

@@ -1,19 +1,34 @@
-{stdenv, fetchFromGitHub, buildRebar3, ibrowse, jsx, erlware_commons, getopt }:
+{ stdenv, fetchFromGitHub, buildRebar3, buildHex
 
+, getopt_0_8_2, erlware_commons_1_0_0 }:
+
+let
+  ibrowse_4_4_0 = buildHex {
+    name = "ibrowse";
+    version = "4.4.0";
+    sha256 = "1hpic1xgksfm00mbl1kwmszca6jmjca32s7gdd8g11i0hy45k3ka";
+  };
+  jsx_2_8_2 = buildHex {
+    name = "jsx";
+    version = "2.8.2";
+    sha256 = "0k7lnmwqbgpmh90wy30kc0qlddkbh9r3sjlyayaqsz1r1cix7idl";
+  };
+
+in
 buildRebar3 rec {
     name = "hex2nix";
-    version = "0.0.5";
+    version = "0.0.6";
 
     src = fetchFromGitHub {
       owner = "erlang-nix";
       repo = "hex2nix";
       rev = "${version}";
-      sha256 = "07bk18nib4xms8q1i4sv53drvlyllm47map4c95669lsh0j08sax";
+      sha256 = "17rkzg836v7z2xf0i5m8zqfvr23dbmw1bi3c83km92f9glwa1dbf";
     };
 
-    beamDeps = [ ibrowse jsx erlware_commons getopt ];
+    beamDeps = [ ibrowse_4_4_0 jsx_2_8_2 erlware_commons_1_0_0 getopt_0_8_2 ];
 
-    DEBUG=1;
+    enableDebugInfo = true;
 
     installPhase = ''
       runHook preInstall

pkgs/development/tools/erlang/relx-exe/default.nix

@@ -1,38 +1,49 @@
-{ stdenv, beamPackages, makeWrapper, fetchHex, erlang }:
+{ stdenv, beamPackages, buildRebar3, buildHex, fetchHex
-  beamPackages.buildRebar3 {
-    name = "relx-exe";
-    version = "3.18.0";
-    src = fetchHex {
-      pkg = "relx";
-      version = "3.18.0";
-      sha256 =
-        "e76e0446b8d1b113f2b7dcc713f032ccdf1dbda33d76edfeb19c2b6b686dcad7";
-    };
 
-    buildInputs = [ makeWrapper erlang ];
+, getopt_0_8_2, erlware_commons_1_0_0, cf_0_2_2 }:
 
-    beamDeps  = with beamPackages; [
+let
-      providers_1_6_0
+  providers_1_6_0 = buildHex {
-      getopt_0_8_2
+    name = "providers";
-      erlware_commons_0_19_0
+    version = "1.6.0";
-      cf_0_2_1
+    sha256 = "0byfa1h57n46jilz4q132j0vk3iqc0v1vip89li38gb1k997cs0g";
-      bbmustache_1_0_4
+    beamDeps = [ getopt_0_8_2 ];
-    ];
+  };
+  bbmustache_1_0_4 = buildHex {
+    name = "bbmustache";
+    version = "1.0.4";
+    sha256 = "04lvwm7f78x8bys0js33higswjkyimbygp4n72cxz1kfnryx9c03";
+  };
 
-    postBuild = ''
+in
-      HOME=. rebar3 escriptize
+buildHex rec {
-    '';
+  name = "relx-exe";
+  version = "3.23.1";
+  hexPkg = "relx";
+  sha256 = "13j7wds2d7b8v3r9pwy3zhwhzywgwhn6l9gm3slqzyrs1jld0a9d";
 
-    postInstall = ''
+  beamDeps = [
-      mkdir -p "$out/bin"
+    providers_1_6_0
-      cp -r "_build/default/bin/relx" "$out/bin/relx"
+    getopt_0_8_2
-    '';
+    erlware_commons_1_0_0
+    cf_0_2_2
+    bbmustache_1_0_4
+  ];
 
-    meta = {
+  postBuild = ''
-      description = "Executable command for Relx";
+    HOME=. rebar3 escriptize
-      license = stdenv.lib.licenses.asl20;
+  '';
-      homepage = https://github.com/erlware/relx;
-      maintainers = with stdenv.lib.maintainers; [ ericbmerritt ];
-    };
 
-  }
+  postInstall = ''
+    mkdir -p "$out/bin"
+    cp -r "_build/default/bin/relx" "$out/bin/relx"
+  '';
+
+  meta = {
+    description = "Executable command for Relx";
+    license = stdenv.lib.licenses.asl20;
+    homepage = "https://github.com/erlware/relx";
+    maintainers = with stdenv.lib.maintainers; [ ericbmerritt ];
+  };
+
+}

pkgs/development/tools/misc/prelink/default.nix

@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
     homepage = http://people.redhat.com/jakub/prelink/;
     license = "GPL";
     description = "ELF prelinking utility to speed up dynamic linking";
-    platforms = stdenv.lib.platforms.all;
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/development/tools/simavr/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, avrgcclibc, libelf, which, git, pkgconfig, freeglut
+{ stdenv, fetchFromGitHub, avrbinutils, avrgcc, avrlibc, libelf, which, git, pkgconfig, freeglut
 , mesa }:
 
 stdenv.mkDerivation rec {
@@ -15,9 +15,14 @@ stdenv.mkDerivation rec {
   # ld: cannot find -lsimavr
   enableParallelBuilding = false;
 
-  buildFlags = "AVR_ROOT=${avrgcclibc}/avr SIMAVR_VERSION=${version}";
+  preConfigure = ''
+    substituteInPlace Makefile.common --replace "-I../simavr/sim/avr -I../../simavr/sim/avr" \
+    "-I${avrlibc}/avr/include -L${avrlibc}/avr/lib/avr5  -B${avrlibc}/avr/lib -I../simavr/sim/avr -I../../simavr/sim/avr"
+  '';
+  buildFlags = "AVR_ROOT=${avrlibc}/avr SIMAVR_VERSION=${version}";
   installFlags = buildFlags + " DESTDIR=$(out)";
 
+  
   # Hack to avoid TMPDIR in RPATHs.
   preFixup = ''rm -rf "$(pwd)" && mkdir "$(pwd)" '';
 
@@ -26,7 +31,7 @@ stdenv.mkDerivation rec {
     patchelf --set-rpath "$(patchelf --print-rpath "$target"):$out/lib" "$target"
   '';
 
-  buildInputs = [ which git avrgcclibc libelf pkgconfig freeglut mesa ];
+  buildInputs = [ which git avrbinutils avrgcc avrlibc libelf pkgconfig freeglut mesa ];
 
   meta = with stdenv.lib; {
     description = "A lean and mean Atmel AVR simulator";

pkgs/misc/screensavers/physlock/default.nix

@@ -1,23 +1,27 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub, pam, systemd }:
 
 stdenv.mkDerivation rec {
-  version = "0.5";
+  version = "11-dev";
   name = "physlock-v${version}";
   src = fetchFromGitHub {
     owner = "muennich";
     repo = "physlock";
-    rev = "v${version}";
+    rev = "31cc383afc661d44b6adb13a7a5470169753608f";
-    sha256 = "102kdixrf7xxsxr69lbz73i1ss7959716cmdf8d5kbnhmk6argv7";
+    sha256 = "0j6v8li3vw9y7vwh9q9mk1n1cnwlcy3bgr1jgw5gcv2am2yi4vx3";
   };
 
+  buildInputs = [ pam systemd ];
+
   preConfigure = ''
     substituteInPlace Makefile \
       --replace /usr/local $out \
       --replace "-m 4755 -o root -g root" ""
   '';
 
+  makeFlags = "SESSION=systemd";
+
   meta = with stdenv.lib; {
-    description = "A secure suspend/hibernate-friendly alternative to `vlock -an` without PAM support";
+    description = "A secure suspend/hibernate-friendly alternative to `vlock -an`";
     license = licenses.gpl2;
     platforms = platforms.linux;
   };

pkgs/misc/themes/arc/default.nix

@@ -27,9 +27,8 @@ in stdenv.mkDerivation rec {
   postInstall = ''
     mkdir -p $out/share/plank/themes
     cp -r extra/*-Plank $out/share/plank/themes
-    mkdir -p $out/share/doc/$pname/Chrome
+    install -Dm644 -t $out/share/doc/${pname}/Chrome extra/Chrome/*.crx
-    cp -r extra/Chrome/*.crx $out/share/doc/$pname/Chrome
+    install -Dm644 -t $out/share/doc/${pname}        AUTHORS *.md
-    cp AUTHORS README.md $out/share/doc/$pname/
   '';
 
   meta = with stdenv.lib; {

pkgs/os-specific/linux/915resolution/default.nix

@@ -14,6 +14,6 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = http://915resolution.mango-lang.org/;
     description = "A tool to modify Intel 800/900 video BIOS";
-    platforms = platforms.linux;
+    platforms = [ "i686-linux" "x86_64-linux" ];
   };
 }

pkgs/os-specific/linux/btfs/default.nix

@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "btfs-${version}";
-  version = "2.13";
+  version = "2.17";
 
   src = fetchFromGitHub {
     owner  = "johang";
     repo   = "btfs";
     rev    = "v${version}";
-    sha256 = "1nd021xbxrikd8p0w9816xjwlrs9m1nc6954q23qxfw2jbmszlk2";
+    sha256 = "0v0mypwnx832f7vg52wmiw0lyz7rrkhqsgi7zc261ak1gfaw4nwd";
   };
 
   buildInputs = [

pkgs/os-specific/linux/dpdk/default.nix

@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
-    make install-runtime install-sdk DESTDIR=$out prefix= includedir=/include datadir=/
+    make install-runtime DESTDIR=$out prefix= includedir=/include datadir=/
     make install-sdk DESTDIR=$out prefix= includedir=/include datadir=/
     make install-kmod DESTDIR=$kmod
   '';

pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix

@@ -4,8 +4,8 @@ with stdenv.lib;
 
 let
   version = "4.13.1";
-  revision = "a";
+  revision = "b";
-  sha256 = "19x3rg75r4xm67wbr54iypbjsrfka7mz2vp3yswp4x4x94g457bh";
+  sha256 = "0l64r4978ynwpikw9fvhzzyrhvxhl7chwkbns1064c1dhr6j0zg6";
 
   # modVersion needs to be x.y.z, will automatically add .0 if needed
   modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));

pkgs/os-specific/linux/libsmbios/default.nix

@@ -30,6 +30,6 @@ stdenv.mkDerivation {
     homepage = http://linux.dell.com/libsmbios/main;
     description = "A library to obtain BIOS information";
     license = stdenv.lib.licenses.gpl2Plus; # alternatively, under the Open Software License version 2.1
-    platforms = stdenv.lib.platforms.linux;
+    platforms = [ "i686-linux" "x86_64-linux" ];
   };
 }

pkgs/os-specific/linux/policycoreutils/default.nix

@@ -26,6 +26,9 @@ stdenv.mkDerivation rec {
 
     # Fix sepolicy install
     sed -i "s,\(setup.py install\).*,\1 --prefix=$out,g" sepolicy/Makefile
+
+    # Fix setuid install
+    sed -i 's|-m 4755|-m 755|' sandbox/Makefile
   '';
 
   nativeBuildInputs = [ pythonPackages.python gettext ];

pkgs/os-specific/linux/reptyr/default.nix

@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = ["PREFIX=$(out)"];
   meta = {
-    platforms = stdenv.lib.platforms.linux;
+    platforms = [ "i686-linux" "x86_64-linux" ];
     maintainers = with stdenv.lib.maintainers; [raskin];
     license = stdenv.lib.licenses.mit;
     description = ''A Linux tool to change controlling pty of a process'';