From 86cd055477ab91a6134a0bc437c3f6e24e0ac602 Mon Sep 17 00:00:00 2001 From: Eduard Bachmakov Date: Sat, 27 Dec 2014 21:43:04 +0100 Subject: [PATCH 001/197] Add option to display git revision to nixos-version Example use case: git checkout `nixos-version --hash` --- nixos/modules/installer/tools/nixos-version.sh | 10 +++++++++- nixos/modules/installer/tools/tools.nix | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/nixos/modules/installer/tools/nixos-version.sh b/nixos/modules/installer/tools/nixos-version.sh index 5dbf277fe4c..51aa2dd8232 100644 --- a/nixos/modules/installer/tools/nixos-version.sh +++ b/nixos/modules/installer/tools/nixos-version.sh @@ -1,2 +1,10 @@ #! @shell@ -echo "@nixosVersion@ (@nixosCodeName@)" + +case "$1" in + --hash|--revision) + echo "@nixosRevision@" + ;; + *) + echo "@nixosVersion@ (@nixosCodeName@)" + ;; +esac diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index 2c796250a98..2ba1dc0841e 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -50,7 +50,7 @@ let nixos-version = makeProg { name = "nixos-version"; src = ./nixos-version.sh; - inherit (config.system) nixosVersion nixosCodeName; + inherit (config.system) nixosVersion nixosCodeName nixosRevision; }; /* From ac4f15b28274c46a4ed5d6c2e82c94a3decec353 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 30 Nov 2014 11:13:47 -0200 Subject: [PATCH 002/197] Altcoins - a new category of applications Here, I present a new level of hierarchy on Nixpkgs: the Altcoins. The idea is to put a single cryptocurrency per file, and build them using expressions like altcoins.bitcoin. I believe this ordering is clearer and more maintainable that the current one. --- pkgs/applications/altcoins/bitcoin.nix | 36 ++++++++ pkgs/applications/altcoins/darkcoin.nix | 40 +++++++++ pkgs/applications/altcoins/default.nix | 19 +++++ pkgs/applications/altcoins/dogecoin.nix | 47 +++++++++++ pkgs/applications/altcoins/litecoin.nix | 41 ++++++++++ pkgs/applications/altcoins/namecoin.nix | 26 ++++++ pkgs/applications/altcoins/namecoind.nix | 35 ++++++++ pkgs/applications/misc/bitcoin/altcoins.nix | 82 ------------------- pkgs/applications/misc/bitcoin/default.nix | 52 ------------ pkgs/applications/misc/bitcoin/dogecoin.nix | 70 ---------------- pkgs/applications/misc/bitcoin/litecoin.nix | 60 -------------- .../misc/bitcoin/namecoin_dynamic.patch | 11 --- pkgs/applications/misc/namecoin/default.nix | 37 --------- pkgs/applications/misc/namecoin/qt.nix | 33 -------- pkgs/top-level/all-packages.nix | 15 +--- 15 files changed, 247 insertions(+), 357 deletions(-) create mode 100644 pkgs/applications/altcoins/bitcoin.nix create mode 100644 pkgs/applications/altcoins/darkcoin.nix create mode 100644 pkgs/applications/altcoins/default.nix create mode 100644 pkgs/applications/altcoins/dogecoin.nix create mode 100644 pkgs/applications/altcoins/litecoin.nix create mode 100644 pkgs/applications/altcoins/namecoin.nix create mode 100644 pkgs/applications/altcoins/namecoind.nix delete mode 100644 pkgs/applications/misc/bitcoin/altcoins.nix delete mode 100644 pkgs/applications/misc/bitcoin/default.nix delete mode 100644 pkgs/applications/misc/bitcoin/dogecoin.nix delete mode 100644 pkgs/applications/misc/bitcoin/litecoin.nix delete mode 100644 pkgs/applications/misc/bitcoin/namecoin_dynamic.patch delete mode 100644 pkgs/applications/misc/namecoin/default.nix delete mode 100644 pkgs/applications/misc/namecoin/qt.nix diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix new file mode 100644 index 00000000000..a69c68f346e --- /dev/null +++ b/pkgs/applications/altcoins/bitcoin.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost +, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode +, withGui }: + +with stdenv.lib; +stdenv.mkDerivation rec{ + + name = "bitcoin" + (toString (optional (!withGui) "d")) + "-" + version; + version = "0.9.3"; + + src = fetchurl { + url = "https://github.com/bitcoin/bitcoin/archive/v${version}.tar.gz"; + sha256 = "0a6lkfzsmqqcbz2cc0cg8dccd990b5y7qi8mw358fhfb4f1jxn9y"; + }; + + buildInputs = [ pkgconfig autoreconfHook openssl db48 boost zlib + miniupnpc utillinux protobuf ] + ++ optionals withGui [ qt4 qrencode ]; + + configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ] + ++ optionals withGui [ "--with-gui=qt4" ]; + + meta = { + description = "Peer-to-peer electronic cash system"; + longDescription= '' + Bitcoin is a free open source peer-to-peer electronic cash system that is + completely decentralized, without the need for a central server or trusted + parties. Users hold the crypto keys to their own money and transact directly + with each other, with the help of a P2P network to check for double-spending. + ''; + homepage = "http://www.bitcoin.org/"; + maintainers = with maintainers; [ roconnor AndersonTorres ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/altcoins/darkcoin.nix b/pkgs/applications/altcoins/darkcoin.nix new file mode 100644 index 00000000000..fb8c863de25 --- /dev/null +++ b/pkgs/applications/altcoins/darkcoin.nix @@ -0,0 +1,40 @@ +{ fetchurl, stdenv, pkgconfig +, openssl, db48, boost, zlib, miniupnpc, qt4, qrencode, glib, protobuf +, utillinux +, withGui }: + +with stdenv.lib; +stdenv.mkDerivation rec { + + name = "darkcoin" + (toString (optional (!withGui) "d")) + "-" + version; + version = "0.9.13.15"; + + src = fetchurl { + url = "https://github.com/darkcoin/darkcoin/archive/v${version}.tar.gz"; + sha256 = "1kly2y3g4dr1jwwf81smqvc7k662x6rvg4ggmxva1yaifb67bgjb"; + }; + + buildInputs = [ pkgconfig glib openssl db48 boost zlib miniupnpc ] + ++ optionals withGui [ qt4 qrencode ]; + + configurePhase = optional withGui "qmake"; + + preBuild = optional (!withGui) "cd src; cp makefile.unix Makefile"; + + installPhase = + if withGui + then "install -D darkcoin-qt $out/bin/darkcoin-qt" + else "install -D darkcoind $out/bin/darkcoind"; + + meta = with stdenv.lib; { + description = "A decentralized key/value registration and transfer system"; + longDescription = '' + Darkcoin (DRK) is an open sourced, privacy-centric digital + currency. It allows you keep your finances private as you make + transactions, similar to cash. + ''; + homepage = http://darkcoin.io; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix new file mode 100644 index 00000000000..d97b10cadc3 --- /dev/null +++ b/pkgs/applications/altcoins/default.nix @@ -0,0 +1,19 @@ +{ callPackage, pkgs }: + +rec { + + bitcoin = callPackage ./bitcoin.nix { withGui = true; }; + bitcoind = callPackage ./bitcoin.nix { withGui = false; }; + + darkcoin = callPackage ./darkcoin.nix { withGui = true; }; + darkcoind = callPackage ./darkcoin.nix { withGui = false; }; + + dogecoin = callPackage ./dogecoin.nix { withGui = true; }; + dogecoind = callPackage ./dogecoin.nix { withGui = false; }; + + litecoin = callPackage ./litecoin.nix { withGui = true; }; + litecoind = callPackage ./litecoin.nix { withGui = false; }; + + namecoin = callPackage ./namecoin.nix { inherit namecoind; }; + namecoind = callPackage ./namecoind.nix { }; +} diff --git a/pkgs/applications/altcoins/dogecoin.nix b/pkgs/applications/altcoins/dogecoin.nix new file mode 100644 index 00000000000..2d1c3aedc25 --- /dev/null +++ b/pkgs/applications/altcoins/dogecoin.nix @@ -0,0 +1,47 @@ +{ stdenv , fetchurl +, pkgconfig, autoreconfHook +, db5, openssl, boost, zlib, miniupnpc +, glib, protobuf, utillinux, qt4, qrencode +, withGui }: + +with stdenv.lib; +stdenv.mkDerivation rec { + + name = "dogecoin" + (toString (optional (!withGui) "d")) + "-" + version; + version = "1.8.0"; + + src = fetchurl { + url = "https://github.com/dogecoin/dogecoin/archive/v${version}.tar.gz"; + sha256 = "8a33958c04213cd621aa3c86910477813af22512f03b47c98995d20d31f3f935"; + }; + + buildInputs = [ autoreconfHook pkgconfig openssl + db5 openssl utillinux protobuf boost zlib miniupnpc ] + ++ optionals withGui [ qt4 qrencode ]; + + # BSD DB5 location + patchPhase = '' + sed -i \ + -e 's,BDB_CPPFLAGS=$,BDB_CPPFLAGS="-I${db5}/include",g' \ + -e 's,BDB_LIBS=$,BDB_LIBS="-L${db5}/lib",g' \ + -e 's,bdbdirlist=$,bdbdirlist="${db5}/include",g' \ + src/m4/dogecoin_find_bdb51.m4 + ''; + + configureFlags = [ "--with-incompatible-bdb" + "--with-boost-libdir=${boost.lib}/lib" ] + ++ optionals withGui [ "--with-gui" ]; + + meta = { + description = "Wow, such coin, much shiba, very rich"; + longDescription = '' + Dogecoin is a decentralized, peer-to-peer digital currency that + enables you to easily send money online. Think of it as "the + internet currency." + It is named after a famous Internet meme, the "Doge" - a Shiba Inu dog. + ''; + homepage = http://www.dogecoin.com/; + license = licenses.mit; + maintainers = with maintainers; [ edwtjo offline AndersonTorres ]; + }; +} diff --git a/pkgs/applications/altcoins/litecoin.nix b/pkgs/applications/altcoins/litecoin.nix new file mode 100644 index 00000000000..f2235abaaae --- /dev/null +++ b/pkgs/applications/altcoins/litecoin.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl +, pkgconfig, autoreconfHook +, openssl, db48, boost, zlib, miniupnpc +, glib, protobuf, utillinux, qt4, qrencode +, withGui }: + +with stdenv.lib; +stdenv.mkDerivation rec { + + name = "litecoin" + (toString (optional (!withGui) "d")) + "-" + version; + version = "0.9.3-preview5"; + + src = fetchurl { + url = "https://github.com/litecoin-project/litecoin/archive/v${version}.tar.gz"; + sha256 = "0nnfz4s2g28jb5fqy6cabsryp3h2amzlyslr6g6k8r1vmzvx5ym6"; + }; + + buildInputs = [ pkgconfig autoreconfHook openssl + openssl db48 boost zlib miniupnpc glib protobuf utillinux ] + ++ optionals withGui [ qt4 qrencode ]; + + configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ] + ++ optionals withGui [ "--with-gui=qt4" ]; + + meta = with stdenv.lib; { + description = "A lite version of Bitcoin using scrypt as a proof-of-work algorithm"; + longDescription= '' + Litecoin is a peer-to-peer Internet currency that enables instant payments + to anyone in the world. It is based on the Bitcoin protocol but differs + from Bitcoin in that it can be efficiently mined with consumer-grade hardware. + Litecoin provides faster transaction confirmations (2.5 minutes on average) + and uses a memory-hard, scrypt-based mining proof-of-work algorithm to target + the regular computers and GPUs most people already have. + The Litecoin network is scheduled to produce 84 million currency units. + ''; + homepage = https://litecoin.org/; + platforms = platforms.unix; + license = licenses.mit; + maintainers = with maintainers; [ offline AndersonTorres ]; + }; +} diff --git a/pkgs/applications/altcoins/namecoin.nix b/pkgs/applications/altcoins/namecoin.nix new file mode 100644 index 00000000000..f2e2aae698e --- /dev/null +++ b/pkgs/applications/altcoins/namecoin.nix @@ -0,0 +1,26 @@ +{ stdenv, db4, boost, openssl, qt4, miniupnpc, unzip, namecoind }: + +with stdenv.lib; +stdenv.mkDerivation rec { + + name = "namecoin-${version}"; + version = namecoind.version; + src = namecoind.src; + + buildInputs = [ db4 boost openssl unzip qt4 miniupnpc ]; + + configurePhase = '' + qmake USE_UPNP=- + ''; + + buildPhase = '' + make + ''; + + installPhase = '' + mkdir -p $out/bin + cp namecoin-qt $out/bin + ''; + + meta = namecoind.meta; +} diff --git a/pkgs/applications/altcoins/namecoind.nix b/pkgs/applications/altcoins/namecoind.nix new file mode 100644 index 00000000000..582e5ce960c --- /dev/null +++ b/pkgs/applications/altcoins/namecoind.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, db4, boost, openssl, miniupnpc, unzip }: + +with stdenv.lib; +stdenv.mkDerivation rec { + version = "0.3.76"; + name = "namecoind-${version}"; + + src = fetchurl { + url = "https://github.com/namecoin/namecoin/archive/nc${version}.tar.gz"; + sha256 = "007372j47hb7p89smh3w0p6z70gii9gd4v6agpycqiv4r3n9sv5v"; + }; + + 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; + }; +} diff --git a/pkgs/applications/misc/bitcoin/altcoins.nix b/pkgs/applications/misc/bitcoin/altcoins.nix deleted file mode 100644 index 4b7d81ba882..00000000000 --- a/pkgs/applications/misc/bitcoin/altcoins.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ fetchurl, stdenv, pkgconfig -, openssl, db48, boost, zlib, miniupnpc, qt4, qrencode, glib, protobuf -, utillinux, autogen, autoconf, autobuild, automake, autoreconfHook, db }: - -with stdenv.lib; - -let - buildAltcoin = makeOverridable ({walletName, gui ? true, ...}@a: - stdenv.mkDerivation ({ - name = "${walletName}${toString (optional (!gui) "d")}-${a.version}"; - buildInputs = [ pkgconfig openssl db48 boost zlib miniupnpc ] - ++ optionals gui [ qt4 qrencode ] ++ a.extraBuildInputs or []; - - configurePhase = optional gui "qmake"; - - preBuild = optional (!gui) "cd src"; - makefile = optional (!gui) "makefile.unix"; - - installPhase = if gui then '' - install -D "${walletName}-qt" "$out/bin/${walletName}-qt" - '' else '' - install -D "${walletName}d" "$out/bin/${walletName}d" - ''; - - passthru.walletName = walletName; - - meta = { - platforms = platforms.unix; - license = license.mit; - maintainers = [ maintainers.offline ] ++ a.extraMaintainers; - }; - } // a) - ); - -in rec { - inherit buildAltcoin; - - namecoin = buildAltcoin rec { - walletName = "namecoin"; - version = "0.3.51.00"; - gui = false; - - src = fetchurl { - url = "https://github.com/namecoin/namecoin/archive/nc${version}.tar.gz"; - sha256 = "0r6zjzichfjzhvpdy501gwy9h3zvlla3kbgb38z1pzaa0ld9siyx"; - }; - - patches = [ ./namecoin_dynamic.patch ]; - - extraBuildInputs = [ glib ]; - - meta = { - description = "A decentralized key/value registration and transfer system based on Bitcoin technology"; - homepage = http://namecoin.info; - }; - }; - - darkcoin = buildAltcoin rec { - walletName = "darkcoin"; - version = "0.9.13.15"; - - src = fetchurl { - url = "https://github.com/darkcoin/darkcoin/archive/v${version}.tar.gz"; - sha256 = "1kly2y3g4dr1jwwf81smqvc7k662x6rvg4ggmxva1yaifb67bgjb"; - }; - - extraBuildInputs = [ glib ]; - - meta = { - description = "A decentralized key/value registration and transfer system"; - longDescription = '' - Darkcoin (DRK) is an open sourced, privacy-centric digital - currency. It allows you keep your finances private as you make - transactions, similar to cash. - ''; - homepage = http://darkcoin.io; - extraMaintainers = [ maintainers.AndersonTorres ]; - }; - }; - darkcoind = darkcoin.override { gui = false; }; - -} diff --git a/pkgs/applications/misc/bitcoin/default.nix b/pkgs/applications/misc/bitcoin/default.nix deleted file mode 100644 index c886cf3c270..00000000000 --- a/pkgs/applications/misc/bitcoin/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ fetchurl, stdenv, openssl, db48, boost, zlib, miniupnpc, qt4, utillinux -, pkgconfig, protobuf, qrencode, gui ? true }: - -with stdenv.lib; - -stdenv.mkDerivation rec { - version = "0.9.3"; - name = "bitcoin${toString (optional (!gui) "d")}-${version}"; - - src = fetchurl { - url = "https://bitcoin.org/bin/${version}/bitcoin-${version}-linux.tar.gz"; - sha256 = "1kb59w7232qzfh952rz6vvjri2w26n9cq7baml0vifdsdhxph9f4"; - }; - - # hexdump from utillinux is required for tests - buildInputs = [ - openssl db48 boost zlib miniupnpc utillinux pkgconfig protobuf - ] ++ optionals gui [ qt4 qrencode ]; - - unpackPhase = '' - mkdir tmp-extract && (cd tmp-extract && tar xf $src) - tar xf tmp-extract/bitcoin*/src/bitcoin*.tar* - cd bitcoin* - ''; - - preCheck = '' - # At least one test requires writing in $HOME - HOME=$TMPDIR - ''; - - configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ]; - - doCheck = true; - - enableParallelBuilding = true; - - passthru.walletName = "bitcoin"; - - meta = { - description = "Peer-to-peer electronic cash system"; - longDescription= '' - Bitcoin is a free open source peer-to-peer electronic cash system that is - completely decentralized, without the need for a central server or trusted - parties. Users hold the crypto keys to their own money and transact directly - with each other, with the help of a P2P network to check for double-spending. - ''; - homepage = "http://www.bitcoin.org/"; - maintainers = [ maintainers.roconnor ]; - license = licenses.mit; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/misc/bitcoin/dogecoin.nix b/pkgs/applications/misc/bitcoin/dogecoin.nix deleted file mode 100644 index 21da32104d3..00000000000 --- a/pkgs/applications/misc/bitcoin/dogecoin.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ fetchurl, stdenv, pkgconfig -, openssl, boost, zlib, miniupnpc, qt4, qrencode, glib, protobuf -, utillinux, autogen, autoconf, autobuild, automake, db }: - -with stdenv.lib; - -let - - mkAutotoolCoin = - { name, version, withGui, src, meta }: - - stdenv.mkDerivation { - inherit src meta; - - name = name + (toString (optional (!withGui) "d")) + "-" + version; - - buildInputs = [ autogen autoconf automake pkgconfig openssl - boost zlib miniupnpc db utillinux protobuf ] - ++ optionals withGui [ qt4 qrencode ]; - - patchPhase = '' - sed -i \ - -e 's,BDB_CPPFLAGS=$,BDB_CPPFLAGS="-I${db}/include",g' \ - -e 's,BDB_LIBS=$,BDB_LIBS="-L${db}/lib",g' \ - -e 's,bdbdirlist=$,bdbdirlist="${db}/include",g' \ - src/m4/dogecoin_find_bdb51.m4 - ''; - - configurePhase = '' - ./autogen.sh \ - && ./configure --prefix=$out \ - --with-incompatible-bdb \ - ${ if withGui then "--with-gui" else "" } - ''; - - installPhase = '' - install -D "src/dogecoin-cli" "$out/bin/dogecoin-cli" - install -D "src/dogecoind" "$out/bin/dogecoind" - ${ if withGui then "install -D src/qt/dogecoin-qt $out/bin/dogecoin-qt" else "" } - ''; - - }; - - mkDogeCoin = { withGui }: - - mkAutotoolCoin rec { - name = "dogecoin"; - version = "1.8.0"; - inherit withGui; - - src = fetchurl { - url = "https://github.com/dogecoin/dogecoin/archive/v${version}.tar.gz"; - sha256 = "8a33958c04213cd621aa3c86910477813af22512f03b47c98995d20d31f3f935"; - }; - - meta = { - description = "Wow, such coin, much shiba, very rich"; - longDescription = "wow"; - homepage = http://www.dogecoin.com/; - license = licenses.mit; - maintainers = with maintainers; [ edwtjo offline ]; - }; - }; - -in { - - dogecoin = mkDogeCoin { withGui = true; }; - dogecoind = mkDogeCoin { withGui = false; }; - -} diff --git a/pkgs/applications/misc/bitcoin/litecoin.nix b/pkgs/applications/misc/bitcoin/litecoin.nix deleted file mode 100644 index 3e5d9427cf3..00000000000 --- a/pkgs/applications/misc/bitcoin/litecoin.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ stdenv, fetchurl, pkgconfig -, openssl, db48, boost, zlib, miniupnpc, qt4, qrencode, glib, protobuf -, utillinux, autogen, autoreconfHook }: - -with stdenv.lib; - -let - mkAutoreconfCoin = - { name, version, withGui, src, meta }: - - stdenv.mkDerivation { - - inherit src meta; - - name = name + (toString (optional (!withGui) "d")) + "-" + version; - - buildInputs = [ autogen autoreconfHook pkgconfig openssl - boost zlib miniupnpc db48 glib utillinux protobuf ] - ++ optionals withGui [ qt4 qrencode protobuf ]; - - configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ] ++ optionals withGui [ "--with-gui=qt4" ]; - }; - - mkLitecoin = { withGui }: - - mkAutoreconfCoin rec { - - name = "litecoin"; - version = "0.9.3-preview5"; - inherit withGui; - - src = fetchurl { - url = "https://github.com/litecoin-project/litecoin/archive/v${version}.tar.gz"; - sha256 = "0nnfz4s2g28jb5fqy6cabsryp3h2amzlyslr6g6k8r1vmzvx5ym6"; - }; - - meta = with stdenv.lib; { - description = "A lite version of Bitcoin using scrypt as a proof-of-work algorithm"; - longDescription= '' - Litecoin is a peer-to-peer Internet currency that enables instant payments - to anyone in the world. It is based on the Bitcoin protocol but differs - from Bitcoin in that it can be efficiently mined with consumer-grade hardware. - Litecoin provides faster transaction confirmations (2.5 minutes on average) - and uses a memory-hard, scrypt-based mining proof-of-work algorithm to target - the regular computers and GPUs most people already have. - The Litecoin network is scheduled to produce 84 million currency units. - ''; - homepage = https://litecoin.org/; - platforms = platforms.unix; - license = licenses.mit; - maintainers = [ maintainers.offline maintainers.AndersonTorres ]; - }; - }; - -in { - - litecoin = mkLitecoin { withGui = true; }; - litecoind = mkLitecoin { withGui = false; }; - -} diff --git a/pkgs/applications/misc/bitcoin/namecoin_dynamic.patch b/pkgs/applications/misc/bitcoin/namecoin_dynamic.patch deleted file mode 100644 index ef4184ede73..00000000000 --- a/pkgs/applications/misc/bitcoin/namecoin_dynamic.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -u -r a/src/makefile.unix b/src/makefile.unix ---- a/src/makefile.unix 2014-01-22 22:07:59.801601964 -0800 -+++ b/src/makefile.unix 2014-01-22 22:08:07.980332839 -0800 -@@ -12,7 +12,6 @@ - - # for boost 1.37, add -mt to the boost libraries - LIBS= \ -- -Wl,-Bstatic \ - -l boost_system \ - -l boost_filesystem \ - -l boost_program_options \ diff --git a/pkgs/applications/misc/namecoin/default.nix b/pkgs/applications/misc/namecoin/default.nix deleted file mode 100644 index d9e09923c3b..00000000000 --- a/pkgs/applications/misc/namecoin/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ fetchgit, stdenv, db4, boost, openssl, unzip }: - -stdenv.mkDerivation rec { - version = "0.3.76"; - name = "namecoin-${version}"; - - src = fetchgit { - url = "https://github.com/namecoin/namecoin"; - rev = "224175ca3bba6eea6f6b1bdb007b482eb2bd2aee"; - sha256 = "3ccfb6fdda1b9d105e775eb19c696be7fec1b3671f9b4f43d02fa14a4c6848dd"; - }; - - # Don't build with miniupnpc due to namecoin using a different verison that - # ships with NixOS and it is API incompatible. - buildInputs = [ db4 boost openssl unzip ]; - - 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 = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.doublec ]; - platforms = with stdenv.lib.platforms; linux; - }; -} diff --git a/pkgs/applications/misc/namecoin/qt.nix b/pkgs/applications/misc/namecoin/qt.nix deleted file mode 100644 index 2a83a4d11d6..00000000000 --- a/pkgs/applications/misc/namecoin/qt.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ fetchgit, stdenv, db4, boost, openssl, qt4, unzip, namecoin }: - -stdenv.mkDerivation rec { - version = namecoin.version; - name = "namecoin-qt-${version}"; - - src = namecoin.src; - - # Don't build with miniupnpc due to namecoin using a different verison that - # ships with NixOS and it is API incompatible. - buildInputs = [ db4 boost openssl unzip qt4 ]; - - configurePhase = '' - qmake USE_UPNP=- - ''; - - buildPhase = '' - make - ''; - - installPhase = '' - mkdir -p $out/bin - cp namecoin-qt $out/bin - ''; - - meta = { - description = "Decentralized open source information registration and transfer system based on the Bitcoin cryptocurrency"; - homepage = "http://namecoin.info"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.doublec ]; - platforms = with stdenv.lib.platforms; linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e73cdd56d1..97ff8f30d05 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9158,6 +9158,9 @@ let schismtracker = callPackage ../applications/audio/schismtracker { }; + altcoins = recurseIntoAttrs ( callPackage ../applications/altcoins { } ); + bitcoin = altcoins.bitcoin; + aumix = callPackage ../applications/audio/aumix { gtkGUI = false; }; @@ -9215,15 +9218,6 @@ let bibletime = callPackage ../applications/misc/bibletime { }; - bitcoin = callPackage ../applications/misc/bitcoin {}; - bitcoind = callPackage ../applications/misc/bitcoin { gui = false; }; - - altcoins = recurseIntoAttrs ( - (callPackage ../applications/misc/bitcoin/altcoins.nix {}) // - (callPackage ../applications/misc/bitcoin/dogecoin.nix {}) // - (callPackage ../applications/misc/bitcoin/litecoin.nix {}) - ); - bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { }; blender = callPackage ../applications/misc/blender { @@ -10422,9 +10416,6 @@ let withSidebar = true; }; - namecoin = callPackage ../applications/misc/namecoin { }; - namecoinqt = callPackage ../applications/misc/namecoin/qt.nix { }; - pcmanfm = callPackage ../applications/misc/pcmanfm { }; ruby_gpgme = callPackage ../development/libraries/ruby_gpgme { From 968376db4458862406eaf6b64949c70c637f6885 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 20 Dec 2014 14:56:21 -0200 Subject: [PATCH 003/197] Memorycoin (v0.8.5): altcoin for the masses Memorycoin is an altcoin easily minerable by anyone, using only PC-based hardware, unlike other ASIC'd altcoins. --- pkgs/applications/altcoins/default.nix | 3 ++ pkgs/applications/altcoins/memorycoin.nix | 50 +++++++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 pkgs/applications/altcoins/memorycoin.nix diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index d97b10cadc3..1196e6d5ebd 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -14,6 +14,9 @@ rec { litecoin = callPackage ./litecoin.nix { withGui = true; }; litecoind = callPackage ./litecoin.nix { withGui = false; }; + memorycoin = callPackage ./memorycoin.nix { withGui = true; }; + memorycoind = callPackage ./memorycoin.nix { withGui = false; }; + namecoin = callPackage ./namecoin.nix { inherit namecoind; }; namecoind = callPackage ./namecoind.nix { }; } diff --git a/pkgs/applications/altcoins/memorycoin.nix b/pkgs/applications/altcoins/memorycoin.nix new file mode 100644 index 00000000000..4e5e24e3062 --- /dev/null +++ b/pkgs/applications/altcoins/memorycoin.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchurl, pkgconfig, openssl, db48, boost +, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode +, withGui }: + +with stdenv.lib; +stdenv.mkDerivation rec{ + + name = "memorycoin" + (toString (optional (!withGui) "d")) + "-" + version; + version = "0.8.5"; + + src = fetchurl { + url = "https://github.com/memorycoin/memorycoin/archive/v${version}.tar.gz"; + sha256 = "1iyh6dqrg0mirwci5br5n5qw3ghp2cs23wd8ygr56bh9ml4dr1m8"; + }; + + buildInputs = [ pkgconfig openssl db48 boost zlib + miniupnpc utillinux protobuf ] + ++ optionals withGui [ qt4 qrencode ]; + + configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ] + ++ optionals withGui [ "--with-gui=qt4" ]; + + configurePhase = optional withGui "qmake"; + + preBuild = optional (!withGui) "cd src; cp makefile.unix Makefile"; + + installPhase = + if withGui + then "install -D bitcoin-qt $out/bin/memorycoin-qt" + else "install -D bitcoind $out/bin/memorycoind"; + + meta = { + description = "Peer-to-peer, CPU-based electronic cash system"; + longDescription= '' + Memorycoin is a cryptocurrency that aims to empower the + economically and financially marginalized. It allows individuals + to participate in the internet economy even when they live in + countries where credit card companies and PayPal(R) refuse to + operate. Individuals can store and transfer wealth with just a + memorized pass phrase. + + Memorycoin is based on the Bitcoin code, but with some key + differences. + ''; + homepage = "http://www.bitcoin.org/"; + maintainers = with maintainers; [ AndersonTorres ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} From df8d1d0ccbce45e68b5b86ac65f4ed8eeee243eb Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 1 Jan 2015 18:23:02 -0200 Subject: [PATCH 004/197] Darkcoin: update to 0.10.99.99 --- pkgs/applications/altcoins/darkcoin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/altcoins/darkcoin.nix b/pkgs/applications/altcoins/darkcoin.nix index fb8c863de25..56d22d0b53b 100644 --- a/pkgs/applications/altcoins/darkcoin.nix +++ b/pkgs/applications/altcoins/darkcoin.nix @@ -7,11 +7,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "darkcoin" + (toString (optional (!withGui) "d")) + "-" + version; - version = "0.9.13.15"; + version = "0.10.99.99"; src = fetchurl { url = "https://github.com/darkcoin/darkcoin/archive/v${version}.tar.gz"; - sha256 = "1kly2y3g4dr1jwwf81smqvc7k662x6rvg4ggmxva1yaifb67bgjb"; + sha256 = "1a05a7l878klg4wqk9ykndkhyknrd7jp75v38k99qgk5fi8wa752"; }; buildInputs = [ pkgconfig glib openssl db48 boost zlib miniupnpc ] From ddd963d1af896365a43d9140388a9f65f2a8efcc Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Fri, 2 Jan 2015 09:40:59 -0200 Subject: [PATCH 005/197] Dogecoin: update to 1.8.1 --- pkgs/applications/altcoins/dogecoin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/altcoins/dogecoin.nix b/pkgs/applications/altcoins/dogecoin.nix index 2d1c3aedc25..80137de33b3 100644 --- a/pkgs/applications/altcoins/dogecoin.nix +++ b/pkgs/applications/altcoins/dogecoin.nix @@ -8,11 +8,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "dogecoin" + (toString (optional (!withGui) "d")) + "-" + version; - version = "1.8.0"; + version = "1.8.1"; src = fetchurl { url = "https://github.com/dogecoin/dogecoin/archive/v${version}.tar.gz"; - sha256 = "8a33958c04213cd621aa3c86910477813af22512f03b47c98995d20d31f3f935"; + sha256 = "0h3jn400dj6qxl1gd4max7wl30cib2wczf9dd3qnbw42wngpdvx2"; }; buildInputs = [ autoreconfHook pkgconfig openssl From c5a6367baaf006cf12d5c7b98b17a08c4004afa2 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Fri, 2 Jan 2015 09:58:25 -0200 Subject: [PATCH 006/197] Namecoin: update to 0.3.80 --- pkgs/applications/altcoins/namecoind.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/altcoins/namecoind.nix b/pkgs/applications/altcoins/namecoind.nix index 582e5ce960c..baf6ba0dbc0 100644 --- a/pkgs/applications/altcoins/namecoind.nix +++ b/pkgs/applications/altcoins/namecoind.nix @@ -2,12 +2,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "0.3.76"; + version = "0.3.80"; name = "namecoind-${version}"; src = fetchurl { url = "https://github.com/namecoin/namecoin/archive/nc${version}.tar.gz"; - sha256 = "007372j47hb7p89smh3w0p6z70gii9gd4v6agpycqiv4r3n9sv5v"; + sha256 = "1755mqxpg91wg9hf0ibpj59sdzfmhh73yrpi7hfi2ipabkwmlpiz"; }; buildInputs = [ db4 boost openssl unzip miniupnpc ]; From c1e8fb446c8fac3b00cddd7444f8dec3f2fbc70a Mon Sep 17 00:00:00 2001 From: Ben Moseley Date: Tue, 30 Dec 2014 13:26:50 +0000 Subject: [PATCH 007/197] Postgis 2.1.4 support --- .../development/libraries/postgis/default.nix | 83 ++++++++++++------- 1 file changed, 53 insertions(+), 30 deletions(-) diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/development/libraries/postgis/default.nix index 03dc4b8f1f8..a6422c85127 100644 --- a/pkgs/development/libraries/postgis/default.nix +++ b/pkgs/development/libraries/postgis/default.nix @@ -1,4 +1,4 @@ -args@{fetchurl, composableDerivation, stdenv, perl, libxml2, postgresql, geos, proj, flex, ...}: +args@{fetchurl, composableDerivation, stdenv, perl, libxml2, postgresql, geos, proj, flex, gdal, pkgconfig, file, ...}: /* @@ -7,6 +7,8 @@ args@{fetchurl, composableDerivation, stdenv, perl, libxml2, postgresql, geos, p services.posgresql.extraPlugins = [ pkgs.postgis.v_1_5_1 ]; + services.postgresql.extraPlugins = [ (pkgs.postgis.override { postgresql = pkgs.postgresql94; }).v_2_1_4 ]; # BM - 2015/01/01 + or if you want to install 1.5.x and 1.3.x at the same time (which works because the .sql and .so files have different names): @@ -52,7 +54,7 @@ let name = "postgis-${version}"; src = fetchurl { - url = "http://download.osgeo.org/postgis/source/postgis-${fix.fixed.version}.tar.gz"; + url = "http://postgis.refractions.net/download/postgis-${fix.fixed.version}.tar.gz"; inherit (fix.fixed) sha256; }; @@ -64,36 +66,12 @@ let makeFlags="PERL=${perl}/bin/perl datadir=$out/share pkglibdir=$out/lib bindir=$out/bin" ''; - pg_db_postgis_enable = ./pg_db_postgis_enable.sh; - - scriptNames = [ "pg_db_postgis_enable" ]; # helper scripts - - # prepare fixed parameters for script and create pg_db_postgis_enable script. - # The script just loads postgis features into a list of given databases - postgisEnableScript = '' - s=$out/bin/pg_db_postgis_enable - - sql_comments=$out/share/postgis-${version}/comments.sql - mkdir -p $(dirname $sql_comments) - cp $(find -iname ${fix.fixed.sql_comments}) $sql_comments - - for script in $scriptNames; do - tg=$out/bin/$script - substituteAll ''${!script} $tg - chmod +x $tg - done - ''; - - # create a script enabling postgis features - # also create aliases for all commands adding version information + # create aliases for all commands adding version information postInstall = '' sql_srcs=$(for sql in ${builtins.toString fix.fixed.sql_srcs}; do echo -n "$(find $out -iname "$sql") "; done ) - eval "$postgisEnableScript" - eval "$postgisFixLibScript" - - for prog in $out/bin/*; do + for prog in $out/bin/*; do # */ ln -s $prog $prog-${version} done @@ -113,6 +91,12 @@ let }; }); + pgDerivationBaseNewer = pgDerivationBase.merge (fix: { + src = fetchurl { + url = "http://download.osgeo.org/postgis/source/postgis-${builtins.toString fix.fixed.version}.tar.gz"; + inherit (fix.fixed) sha256; + }; + }); in rec { @@ -141,10 +125,49 @@ in rec { sha256 = "0i6inyiwc5zgf5a4ssg0y774f8vn45zn5c38ccgnln9r6i54vc6k"; }); - v_1_5_8 = pgDerivationBase.merge ( fix : { + v_1_5_1 = pgDerivationBase.merge ( fix : { + version = "1.5.1"; + sha256 = "0nymvqqi6pp4nh4dcshzqm76x4sraf119jp7l27c2q1lygm6p6jr"; + sql_srcs = ["postgis.sql" "spatial_ref_sys.sql"]; + }); + + v_1_5_8 = pgDerivationBaseNewer.merge ( fix : { version = "1.5.8"; sha256 = "016qn2hk3w8rg60rqn91l2nfk9zcsw0pv2s5rb1qhjw15ypgv5j8"; sql_srcs = ["postgis.sql" "spatial_ref_sys.sql"]; }); -} + v_2_0_6 = pgDerivationBaseNewer.merge ( fix : { + version = "2.0.6"; + sha256 = "129lyd1crv1bbjadyisjm3wv2vkj1v1nnxyns9z57300ip7wk3s3"; + sql_srcs = ["postgis.sql" "spatial_ref_sys.sql"]; + builtInputs = [gdal pkgconfig]; + + preConfigure = '' + sed -i 's@/usr/bin/file@${file}/bin/file@' configure + configureFlags="$configureFlags --with-gdalconfig=${gdal}/bin/gdal-config" + ''; + }); + + v_2_1_4 = pgDerivationBaseNewer.merge ( fix : { + version = "2.1.4"; + sha256 = "1z00n5654r7l38ydkn2grbwl5gg0mravjwxfdipp7j18hjiw4wyd"; + sql_srcs = ["postgis.sql" "spatial_ref_sys.sql"]; + builtInputs = [gdal pkgconfig]; + dontDisableStatic = true; + preConfigure = '' + sed -i 's@/usr/bin/file@${file}/bin/file@' configure + configureFlags="$configureFlags --with-gdalconfig=${gdal}/bin/gdal-config" + ''; + postConfigure = '' + sed -i "s|@mkdir -p \$(DESTDIR)\$(PGSQL_BINDIR)||g ; + s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix|g + " \ + "raster/loader/Makefile"; + sed -i "s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix|g + " \ + "raster/scripts/python/Makefile"; + ''; + }); + +} \ No newline at end of file From a828f6332b9ad2bd49f26eb37491f4f74d63f743 Mon Sep 17 00:00:00 2001 From: Ben Moseley Date: Wed, 28 Jan 2015 08:33:03 +0000 Subject: [PATCH 008/197] Postgis. raster. $prefix -> $prefix/bin --- pkgs/development/libraries/postgis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/development/libraries/postgis/default.nix index a6422c85127..8d588a2cbef 100644 --- a/pkgs/development/libraries/postgis/default.nix +++ b/pkgs/development/libraries/postgis/default.nix @@ -161,10 +161,10 @@ in rec { ''; postConfigure = '' sed -i "s|@mkdir -p \$(DESTDIR)\$(PGSQL_BINDIR)||g ; - s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix|g + s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix/bin|g " \ "raster/loader/Makefile"; - sed -i "s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix|g + sed -i "s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix/bin|g " \ "raster/scripts/python/Makefile"; ''; From 926e5aa70a28ab41db8260b33e7dff01671b5f81 Mon Sep 17 00:00:00 2001 From: Ben Moseley Date: Mon, 9 Feb 2015 15:57:19 +0000 Subject: [PATCH 009/197] Remove old PostGis versions. --- .../development/libraries/postgis/default.nix | 69 +------------------ 1 file changed, 2 insertions(+), 67 deletions(-) diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/development/libraries/postgis/default.nix index 8d588a2cbef..2d1400a2fcb 100644 --- a/pkgs/development/libraries/postgis/default.nix +++ b/pkgs/development/libraries/postgis/default.nix @@ -5,22 +5,7 @@ args@{fetchurl, composableDerivation, stdenv, perl, libxml2, postgresql, geos, p ### NixOS - usage: ================== - services.posgresql.extraPlugins = [ pkgs.postgis.v_1_5_1 ]; - - services.postgresql.extraPlugins = [ (pkgs.postgis.override { postgresql = pkgs.postgresql94; }).v_2_1_4 ]; # BM - 2015/01/01 - - or if you want to install 1.5.x and 1.3.x at the same time (which works - because the .sql and .so files have different names): - - services.postgis.extraPlugins = [ (pkgs.buildEnv { - name = "postgis-plugins"; - ignoreCollisions = 1; # scripts will collide - but there are aliases with version suffixes - paths = [ pkgs.postgis.v_1_3_5 pkgs.postgis.v_1_5_1 ]; - })]; - - By now it is only supported installing one of the 1.3.x verions because - their shared libraries don't differ in naming. - + services.postgresql.extraPlugins = [ (pkgs.postgis.override { postgresql = pkgs.postgresql94; }).v_2_1_4 ]; ### important Postgis implementation details: @@ -31,7 +16,7 @@ args@{fetchurl, composableDerivation, stdenv, perl, libxml2, postgresql, geos, p CREATE FUNCTION [...] AS '[..]liblwgeom', 'lwhistogram2d_in' LANGUAGE 'C' IMMUTABLE STRICT; -- WITH (isstrict); - + where liblwgeom is the shared library. Postgis < 1.5 used absolute paths, in NixOS $libdir is always used. @@ -39,7 +24,6 @@ args@{fetchurl, composableDerivation, stdenv, perl, libxml2, postgresql, geos, p systems you have to adopt the library path. - ### TODO: ========= the bin commands to have gtk gui: @@ -100,55 +84,6 @@ let in rec { - # these builders just add some custom informaton to the receipe above - - v_1_3_5 = pgDerivationBase.merge ( fix: { - version = "1.3.5"; - buildInputs = [ flex ]; - sha256 = "102d5ybn0db1wrb249dga2v8347vysd4f1brc8zb82d7vdd34wyq"; - sql_srcs = ["lwpostgis.sql" "spatial_ref_sys.sql"]; - - pg_db_postgis_fix_or_load_sql_dump = ./pg_db_postgis_fix_or_load_sql_dump.sh; - libName = "liblwgeom"; - scriptNames = [ "pg_db_postgis_enable" "pg_db_postgis_fix_or_load_sql_dump"]; # helper scripts - - # sql_srcs is defined in postInstall source above - # if store path changes sql should not break. So replace absolute path to - # shared library by path relatve to $libdir known by Postgres. - postInstall = '' - sed -i "s@AS '$out/lib/liblwgeom@AS '\$libdir/liblwgeom@" $sql_srcs $out/share/lwpostgis_upgrade.sql - ''; - }); - - v_1_3_6 = v_1_3_5.merge ({ - version = "1.3.6"; - sha256 = "0i6inyiwc5zgf5a4ssg0y774f8vn45zn5c38ccgnln9r6i54vc6k"; - }); - - v_1_5_1 = pgDerivationBase.merge ( fix : { - version = "1.5.1"; - sha256 = "0nymvqqi6pp4nh4dcshzqm76x4sraf119jp7l27c2q1lygm6p6jr"; - sql_srcs = ["postgis.sql" "spatial_ref_sys.sql"]; - }); - - v_1_5_8 = pgDerivationBaseNewer.merge ( fix : { - version = "1.5.8"; - sha256 = "016qn2hk3w8rg60rqn91l2nfk9zcsw0pv2s5rb1qhjw15ypgv5j8"; - sql_srcs = ["postgis.sql" "spatial_ref_sys.sql"]; - }); - - v_2_0_6 = pgDerivationBaseNewer.merge ( fix : { - version = "2.0.6"; - sha256 = "129lyd1crv1bbjadyisjm3wv2vkj1v1nnxyns9z57300ip7wk3s3"; - sql_srcs = ["postgis.sql" "spatial_ref_sys.sql"]; - builtInputs = [gdal pkgconfig]; - - preConfigure = '' - sed -i 's@/usr/bin/file@${file}/bin/file@' configure - configureFlags="$configureFlags --with-gdalconfig=${gdal}/bin/gdal-config" - ''; - }); - v_2_1_4 = pgDerivationBaseNewer.merge ( fix : { version = "2.1.4"; sha256 = "1z00n5654r7l38ydkn2grbwl5gg0mravjwxfdipp7j18hjiw4wyd"; From e7a161d4f22fdce9fceb649e94fdd5e53edc1dff Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Fri, 13 Feb 2015 15:58:29 +0100 Subject: [PATCH 010/197] New package PLM: Programmer's Learning Machine --- .../science/programming/plm/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/applications/science/programming/plm/default.nix diff --git a/pkgs/applications/science/programming/plm/default.nix b/pkgs/applications/science/programming/plm/default.nix new file mode 100644 index 00000000000..0e35a0b2264 --- /dev/null +++ b/pkgs/applications/science/programming/plm/default.nix @@ -0,0 +1,36 @@ +{stdenv, fetchurl, makeWrapper, jre, gcc, valgrind}: +# gcc and valgrind are not strict dependencies, they could be made +# optional. They are here because plm can only help you learn C if you +# have them installed. +stdenv.mkDerivation rec { + major = "2"; + minor = "5"; + version = "${major}-${minor}"; + name = "plm-${version}"; + + src = fetchurl { + url = "http://webloria.loria.fr/~quinson/Teaching/PLM/plm-${major}_${minor}.jar"; + sha256 = "0m17cxa3nxi2cbswqvlfzp0mlfi3wrkw8ry2xhkxy6aqzm2mlgcc"; + name = "${name}.jar"; + }; + + buildInputs = [ makeWrapper jre gcc valgrind ]; + + phases = [ "installPhase" ]; + + installPhase = '' + mkdir -p "$prefix/bin" + + makeWrapper ${jre}/bin/java $out/bin/plm \ + --add-flags "-jar $src" \ + --prefix PATH : "$PATH" + ''; + + meta = with stdenv.lib; { + description = "Free cross-platform programming exerciser"; + Homepage = http://webloria.loria.fr/~quinson/Teaching/PLM/; + license = licenses.gpl3; + maintainers = [ maintainers.DamienCassou ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82e86264c5d..faf2a78702e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12637,6 +12637,9 @@ let cmake = cmakeCurses; }); + ### SCIENCE/PROGRAMMING + + plm = callPackage ../applications/science/programming/plm { }; ### SCIENCE/LOGIC From c61ff9b51edb2c282124c45d4fae0645e137f145 Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Mon, 16 Feb 2015 20:19:44 +0100 Subject: [PATCH 011/197] Fix grubTarget on nodev installs --- nixos/modules/system/boot/loader/grub/grub.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index fd6523c0ece..a166709d39a 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -34,7 +34,7 @@ let shell = "${pkgs.stdenv.shell}"; fullVersion = (builtins.parseDrvName realGrub.name).version; grubEfi = f grubEfi; - grubTargetEfi = if cfg.efiSupport && (cfg.version == 2) then f grubEfi.grubTarget else ""; + grubTargetEfi = if cfg.efiSupport && (cfg.version == 2) then f (grubEfi.grubTarget or "") else ""; inherit (efi) efiSysMountPoint canTouchEfiVariables; inherit (cfg) version extraConfig extraPerEntryConfig extraEntries From eb97dc0013005250b3bc89fb1c5017523b30e062 Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Tue, 10 Feb 2015 16:53:03 +0100 Subject: [PATCH 012/197] Add kernel config for dom0 of Xen --- .../linux/kernel/common-config.nix | 20 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 +++ 2 files changed, 23 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 2afbed13cae..3e92e9c3fa6 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -319,6 +319,26 @@ with stdenv.lib; ''} XEN? y XEN_DOM0? y + ${optionalString ((versionAtLeast version "3.18") && (features.xen_dom0 or false)) '' + PCI_XEN? y + HVC_XEN? y + HVC_XEN_FRONTEND? y + XEN_SYS_HYPERVISOR? y + SWIOTLB_XEN? y + XEN_BACKEND? y + XEN_BALLOON? y + XEN_BALLOON_MEMORY_HOTPLUG? y + XEN_EFI? y + XEN_HAVE_PVMMU? y + XEN_MCE_LOG? y + XEN_PVH? y + XEN_PVHVM? y + XEN_SAVE_RESTORE? y + XEN_SCRUB_PAGES? y + XEN_SELFBALLOONING? y + XEN_STUB? y + XEN_TMEM? y + ''} KSM y ${optionalString (!stdenv.is64bit) '' HIGHMEM64G? y # We need 64 GB (PAE) support for Xen guest support. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 19e3eb8b6b9..e48a6fa57f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8889,6 +8889,9 @@ let linuxPackages_self); in recurseIntoAttrs linuxPackages_self; + # Build a kernel for Xen dom0 + linuxPackages_latest_xen_dom0 = recurseIntoAttrs (linuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; }) linuxPackages_latest); + # grsecurity flavors # Stable kernels linuxPackages_grsec_stable_desktop = grPackage grFlavors.linux_grsec_stable_desktop; From c42bcab582a7e4b46ab48031e77f1b82794b9a36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lengyel=20Bal=C3=A1zs?= Date: Tue, 17 Feb 2015 01:33:28 +0100 Subject: [PATCH 013/197] Update: usb-mdeswitch 2.2.0 -> 2.2.1 --- .../tools/misc/usb-modeswitch/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/usb-modeswitch/default.nix b/pkgs/development/tools/misc/usb-modeswitch/default.nix index bba7ef7fad0..cc28b011829 100644 --- a/pkgs/development/tools/misc/usb-modeswitch/default.nix +++ b/pkgs/development/tools/misc/usb-modeswitch/default.nix @@ -1,11 +1,15 @@ { stdenv, fetchurl, pkgconfig, libusb1 }: -stdenv.mkDerivation rec { - name = "usb-modeswitch-2.2.0"; +let + version = "2.2.1"; +in - src =fetchurl { +stdenv.mkDerivation rec { + name = "usb-modeswitch-${version}"; + + src = fetchurl { url = "http://www.draisberghof.de/usb_modeswitch/${name}.tar.bz2"; - sha256 = "0flaj3mq0xhzk72kkpclwglf77kcw5rkwvkaimn5zvbiw4yi0li7"; + sha256 = "1jqih1g0y78w03rchpw7fjvzwjfakak61qjp7hbr1m5nnsh2dn9p"; }; # make clean: we always build from source. It should be necessary on x86_64 only From 1b26e2584561a6f478c1ecde7c97e22cc948cb42 Mon Sep 17 00:00:00 2001 From: codyopel Date: Tue, 17 Feb 2015 02:01:10 -0500 Subject: [PATCH 014/197] xvidcore: refactor & 1.3.2 -> 1.3.3 --- .../libraries/xvidcore/default.nix | 44 ++++++++++--------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/pkgs/development/libraries/xvidcore/default.nix b/pkgs/development/libraries/xvidcore/default.nix index fd5efdcc3d1..57c66f310fb 100644 --- a/pkgs/development/libraries/xvidcore/default.nix +++ b/pkgs/development/libraries/xvidcore/default.nix @@ -1,42 +1,46 @@ -{ stdenv, fetchurl, nasm, autoconf, automake, libtool }: +{ stdenv, fetchurl, yasm, autoconf, automake, libtool }: +with stdenv.lib; stdenv.mkDerivation rec { - name = "xvidcore-1.3.2"; + name = "xvidcore-${version}"; + version = "1.3.3"; src = fetchurl { url = "http://downloads.xvid.org/downloads/${name}.tar.bz2"; - sha256 = "1x0b2rq6fv99ramifhkakycd0prjc93lbzrffbjgjwg7w4s17hfn"; + sha256 = "0m5g75qvapr7xpywg6a83v5x19kw1nm9l2q48lg7jvvpba0bmqdh"; }; preConfigure = '' + # Configure script is not in the root of the source directory cd build/generic - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + optionalString stdenv.isDarwin '' + # Undocumented darwin hack substituteInPlace configure --replace "-no-cpp-precomp" "" ''; - configureFlags = stdenv.lib.optionals stdenv.isDarwin - [ "--enable-macosx_module" "--disable-assembly" ]; + configureFlags = [ ] + # Undocumented darwin hack (assembly is probably disabled due to an + # issue with nasm, however yasm is now used) + ++ optional stdenv.isDarwin "--enable-macosx_module --disable-assembly"; - buildInputs = [ nasm ] - ++ stdenv.lib.optionals stdenv.isDarwin [ autoconf automake libtool ]; + nativeBuildInputs = [ ] + ++ optional (!stdenv.isDarwin) yasm; - # don't delete the '.a' files on darwin -- they're needed to compile ffmpeg - # (and perhaps other things) - postInstall = stdenv.lib.optionalString (!stdenv.isDarwin) '' + buildInputs = [ ] + # Undocumented darwin hack + ++ optionals stdenv.isDarwin [ autoconf automake libtool ]; + + # Don't remove static libraries (e.g. 'libs/*.a') on darwin. They're needed to + # compile ffmpeg (and perhaps other things). + postInstall = optionalString (!stdenv.isDarwin) '' rm $out/lib/*.a - '' + '' - cd $out/lib - ln -s *.so.4.* libxvidcore.so - if [ ! -e libxvidcore.so.4 ]; then - ln -s *.so.4.* libxvidcore.so.4 - fi ''; - meta = with stdenv.lib; { + meta = { description = "MPEG-4 video codec for PC"; - homepage = http://www.xvid.org/; + homepage = https://www.xvid.com/; license = licenses.gpl2; - maintainers = with maintainers; [ lovek323 ]; + maintainers = with maintainers; [ codyopel lovek323 ]; platforms = platforms.all; }; } From 69e75d0bfb61ddf94a36690b5b4e8b61e781011a Mon Sep 17 00:00:00 2001 From: Brian McKenna Date: Tue, 17 Feb 2015 11:19:14 -0700 Subject: [PATCH 015/197] Add consul-template package --- pkgs/servers/consul/deps.nix | 18 ++++++++++++++++++ pkgs/servers/consul/template.nix | 29 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 49 insertions(+) create mode 100644 pkgs/servers/consul/template.nix diff --git a/pkgs/servers/consul/deps.nix b/pkgs/servers/consul/deps.nix index fcfc3e911ec..4faf1d3abc2 100644 --- a/pkgs/servers/consul/deps.nix +++ b/pkgs/servers/consul/deps.nix @@ -56,6 +56,24 @@ let sha256 = "0fqrhmzi0jbbwylv7c1l0ywqr67aqlv6s891f4inp0y4abd7shc7"; }; } + { + root = "github.com/hashicorp/go-multierror"; + src = fetchFromGitHub { + owner = "hashicorp"; + repo = "go-multierror"; + rev = "fcdddc395df1ddf4247c69bd436e84cfa0733f7e"; + sha256 = "1gvrm2bqi425mfg55m01z9gppfd7v4ljz1z8bykmh2sc82fj25jz"; + }; + } + { + root = "github.com/hashicorp/consul-template"; + src = fetchFromGitHub { + owner = "hashicorp"; + repo = "consul-template"; + rev = "v0.5.1"; + sha256 = "1h8sqmzf73bn12bj1yqldp9gl46gz766c3zrymwgl8p0mb74dllf"; + }; + } { root = "github.com/hashicorp/go-checkpoint"; src = fetchFromGitHub { diff --git a/pkgs/servers/consul/template.nix b/pkgs/servers/consul/template.nix new file mode 100644 index 00000000000..2b44fc8b8a6 --- /dev/null +++ b/pkgs/servers/consul/template.nix @@ -0,0 +1,29 @@ +{ stdenv, lib, go, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "consul-template-${version}"; + version = "0.5.1"; + + src = import ./deps.nix { + inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub; + }; + + buildInputs = [ go ]; + + buildPhase = '' + GOPATH=$src go build -v -o consul-template github.com/hashicorp/consul-template + ''; + + installPhase = '' + mkdir -p $out/bin + cp consul-template $out/bin + ''; + + meta = with lib; { + description = "Generic template rendering and notifications with Consul"; + homepage = https://github.com/hashicorp/consul-template; + license = licenses.mpl20; + maintainers = with maintainers; [ puffnfresh ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e323a82e41..fdce91c45b9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -713,6 +713,8 @@ let consul-alerts = callPackage ../servers/consul/alerts.nix { }; + consul-template = callPackage ../servers/consul/template.nix { }; + corosync = callPackage ../servers/corosync { }; cherrytree = callPackage ../applications/misc/cherrytree { }; From 25c9b8499446d31d23e27c94a3f0c054df8f7659 Mon Sep 17 00:00:00 2001 From: codyopel Date: Tue, 17 Feb 2015 16:15:03 -0500 Subject: [PATCH 016/197] rtmpdump: refactor & bump commit --- pkgs/tools/video/rtmpdump/default.nix | 42 +++++++++++++++++---------- 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix index 4dec3282fce..b64bedd720c 100644 --- a/pkgs/tools/video/rtmpdump/default.nix +++ b/pkgs/tools/video/rtmpdump/default.nix @@ -1,26 +1,38 @@ -{stdenv, fetchgit, zlib, gnutls, libgcrypt}: +{ stdenv, fetchgit, zlib +, gnutlsSupport ? true, gnutls ? null +, opensslSupport ? false, openssl ? null +}: + +# Must have an ssl library enabled +assert (gnutlsSupport || opensslSupport); +assert gnutlsSupport -> ((gnutlsSupport != null) && (!opensslSupport)); +assert opensslSupport -> ((openssl != null) && (!gnutlsSupport)); + +with stdenv.lib; +stdenv.mkDerivation rec { + name = "rtmpdump-${version}"; + version = "2.4"; -stdenv.mkDerivation { - name = "rtmpdump-2.4"; src = fetchgit { url = git://git.ffmpeg.org/rtmpdump; - rev = "79459a2b43f41ac44a2ec001139bcb7b1b8f7497"; - sha256 = "5af22362004566794035f989879b13d721f85d313d752abd10a7e45806e3944c"; + # Currently the latest commit is used (a release has not been made since 2011, i.e. '2.4') + rev = "a107cef9b392616dff54fabfd37f985ee2190a6f"; + sha256 = "178h5j7w20g2h9mn6cb7dfr3fa4g4850hpl1lzxmi0nk3blzcsvl"; }; - buildInputs = [ zlib gnutls libgcrypt ]; + makeFlags = [ ''prefix=$(out)'' ] + ++ optional gnutlsSupport "CRYPTO=GNUTLS" + ++ optional opensslSupport "CRYPTO=OPENSSL"; - makeFlags = "CRYPTO=GNUTLS"; - - configurePhase = '' - sed -i s,/usr/local,$out, Makefile librtmp/Makefile - ''; + buildInputs = [ zlib ] + ++ optional gnutlsSupport gnutls + ++ optional opensslSupport openssl; meta = { - homepage = http://rtmpdump.mplayerhq.hu/; description = "Toolkit for RTMP streams"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers. viric ]; - platforms = stdenv.lib.platforms.linux; + homepage = http://rtmpdump.mplayerhq.hu/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ codyopel viric ]; }; } From 39c647c218ee88e778aad33355dbc07dc614e841 Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Sun, 8 Feb 2015 16:29:48 -0800 Subject: [PATCH 017/197] add package.el-based emacs package builder --- .../editors/emacs-24/packages/default.nix | 647 ++++++++ .../editors/emacs-24/packages/melpa.nix | 99 ++ .../editors/emacs-24/packages/melpa2nix.el | 36 + .../emacs-24/packages/package-build.el | 1333 +++++++++++++++++ .../editors/emacs-24/packages/setup-hook.sh | 7 + pkgs/top-level/all-packages.nix | 7 + 6 files changed, 2129 insertions(+) create mode 100644 pkgs/applications/editors/emacs-24/packages/default.nix create mode 100644 pkgs/applications/editors/emacs-24/packages/melpa.nix create mode 100644 pkgs/applications/editors/emacs-24/packages/melpa2nix.el create mode 100644 pkgs/applications/editors/emacs-24/packages/package-build.el create mode 100644 pkgs/applications/editors/emacs-24/packages/setup-hook.sh diff --git a/pkgs/applications/editors/emacs-24/packages/default.nix b/pkgs/applications/editors/emacs-24/packages/default.nix new file mode 100644 index 00000000000..e97250690cf --- /dev/null +++ b/pkgs/applications/editors/emacs-24/packages/default.nix @@ -0,0 +1,647 @@ +{ pkgs, stdenv, fetchurl, fetchFromGitHub, fetchgit +, emacs, texinfo + +# non-emacs packages +, external +}: + +# package.el-based emacs packages + +## init.el +# (require 'package) +# (setq package-archives nil +# package-user-dir "~/.nix-profile/share/emacs/site-lisp/elpa") +# (package-initialize) + + +let + melpa = import ./melpa.nix { + inherit stdenv fetchurl emacs texinfo; + }; +in + +rec { + ace-jump-mode = melpa.mkDerivation (self: { + pname = "ace-jump-mode"; + version = "20140616"; + src = fetchFromGitHub { + owner = "winterTTr"; + repo = self.pname; + rev = "8351e2df4fbbeb2a4003f2fb39f46d33803f3dac"; + sha256 = "17axrgd99glnl6ma4ls3k01ysdqmiqr581wnrbsn3s4gp53mm2x6"; + }; + }); + + ag = melpa.mkDerivation (self: { + pname = "ag"; + version = "0.44"; + src = fetchFromGitHub { + owner = "Wilfred"; + repo = "${self.pname}.el"; + rev = self.version; + sha256 = "19y5w9m2flp4as54q8yfngrkri3kd7fdha9pf2xjgx6ryflqx61k"; + }; + packageRequires = [ dash s ]; + }); + + async = melpa.mkDerivation (self: { + pname = "async"; + version = "1.2"; + src = fetchFromGitHub { + owner = "jwiegley"; + repo = "emacs-async"; + rev = "v${self.version}"; + sha256 = "1j6mbvvbnm2m1gpsy9ipxiv76b684nn57yssbqdyiwyy499cma6q"; + }; + }); + + auctex = melpa.mkDerivation (self: { + pname = "auctex"; + version = "11.87.7"; + src = fetchurl { + url = "http://elpa.gnu.org/packages/${self.fname}.tar"; + sha256 = "07bhw8zc3d1f2basjy80njmxpsp4f70kg3ynkch9ghlai3mm2b7n"; + }; + buildPhase = '' + cp $src ${self.fname}.tar + ''; + }); + + auto-complete = melpa.mkDerivation (self: { + pname = "auto-complete-1.3.1"; + src = fetchurl { + url = "http://cx4a.org/pub/auto-complete/${self.pname}.tar.bz2"; + sha256 = "124qxfp0pcphwlmrasbfrci48brxnrzc38h4wcf2sn20x1mvcrlj"; + }; + meta = { + description = "Auto-complete extension for Emacs"; + homepage = http://cx4a.org/software/auto-complete/; + license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.all; + }; + }); + + bind-key = melpa.mkDerivation (self: { + pname = "bind-key"; + version = "20141013"; + src = fetchFromGitHub { + owner = "jwiegley"; + repo = "use-package"; + rev = "d43af5e0769a92f77e01dea229e376d9006722ef"; + sha256 = "1m4v5h52brg2g9rpbqfq9m3m8fv520vg5mjwppnbw6099d17msqd"; + }; + files = [ "bind-key.el" ]; + }); + + change-inner = melpa.mkDerivation (self: { + pname = "change-inner"; + version = "20130208"; + src = fetchFromGitHub { + owner = "magnars"; + repo = "${self.pname}.el"; + rev = "6374b745ee1fd0302ad8596cdb7aca1bef33a730"; + sha256 = "1fv8630bqbmfr56zai08f1q4dywksmghhm70084bz4vbs6rzdsbq"; + }; + packageRequires = [ expand-region ]; + }); + + circe = melpa.mkDerivation (self: { + pname = "circe"; + version = "1.5"; + src = fetchFromGitHub { + owner = "jorgenschaefer"; + repo = "circe"; + rev = "v${self.version}"; + sha256 = "08dsv1dzgb9jx076ia7xbpyjpaxn1w87h6rzlb349spaydq7ih24"; + }; + packageRequires = [ lcs lui ]; + fileSpecs = [ "lisp/circe*.el" ]; + }); + + company-mode = melpa.mkDerivation (self: { + pname = "company-mode"; + version = "0.8.6"; + src = fetchFromGitHub { + owner = "company-mode"; + repo = "company-mode"; + rev = self.version; + sha256 = "1xwxyqg5dan8m1qkdxyzm066ryf24h07karpdlm3s09izfdny33f"; + }; + }); + + dash = melpa.mkDerivation (self: { + pname = "dash"; + version = "2.9.0"; + src = fetchFromGitHub { + owner = "magnars"; + repo = "${self.pname}.el"; + rev = self.version; + sha256 = "1lg31s8y6ljsz6ps765ia5px39wim626xy8fbc4jpk8fym1jh7ay"; + }; + }); + + diminish = melpa.mkDerivation (self: { + pname = "diminish"; + version = "0.44"; + src = fetchFromGitHub { + owner = "emacsmirror"; + repo = self.pname; + rev = self.version; + sha256 = "0hshw7z5f8pqxvgxw74kbj6nvprsgfvy45fl854xarnkvqcara09"; + }; + }); + + epl = melpa.mkDerivation (self: { + pname = "epl"; + version = "20140823"; + src = fetchFromGitHub { + owner = "cask"; + repo = self.pname; + rev = "63c78c08e345455f3d4daa844fdc551a2c18024e"; + sha256 = "04a2aq8dj2cmy77vw142wcmnjvqdbdsp6z0psrzz2qw0b0am03li"; + }; + }); + + evil-god-state = melpa.mkDerivation (self: { + pname = "evil-god-state"; + version = "20140830"; + src = fetchFromGitHub { + owner = "gridaphobe"; + repo = self.pname; + rev = "234a9b6f500ece89c3dfb5c1df5baef6963e4566"; + sha256 = "16v6dpw1hibrkf9hga88gv5axvp1pajd67brnh5h4wpdy9qvwgyy"; + }; + packageRequires = [ evil god-mode ]; + }); + + evil-surround = melpa.mkDerivation (self: { + pname = "evil-surround"; + version = "20140616"; + src = fetchFromGitHub { + owner = "timcharper"; + repo = self.pname; + rev = "71f380b6b6ed38f739c0a4740b3d6de0c52f915a"; + sha256 = "0wrmlmgr4mwxlmmh8blplddri2lpk4g8k3l1vpb5c6a975420qvn"; + }; + packageRequires = [ evil ]; + }); + + evil = melpa.mkDerivation (self: { + pname = "evil"; + version = "20141020"; + src = fetchgit { + url = "git://gitorious.org/evil/evil"; + rev = "999ec15587f85100311c031aa8efb5d50c35afe4"; + sha256 = "0yiqpzsm5sr7xdkixdvfg312dk9vsdcmj69gizk744d334yn8rsz"; + }; + packageRequires = [ goto-chg undo-tree ]; + }); + + exec-path-from-shell = melpa.mkDerivation (self: { + pname = "exec-path-from-shell"; + version = "20141022"; + src = fetchFromGitHub { + owner = "purcell"; + repo = self.pname; + rev = "e4af0e9b44738e7474c89ed895200b42e6541515"; + sha256 = "0lxikiqf1jik88lf889q4f4f8kdgg3npciz298x605nhbfd5snbd"; + }; + }); + + expand-region = melpa.mkDerivation (self: { + pname = "expand-region"; + version = "20141012"; + src = fetchFromGitHub { + owner = "magnars"; + repo = "${self.pname}.el"; + rev = "fa413e07c97997d950c92d6012f5442b5c3cee78"; + sha256 = "04k0518wfy72wpzsswmncnhd372fxa0r8nbfhmbyfmns8n7sr045"; + }; + }); + + flycheck-pos-tip = melpa.mkDerivation (self: { + pname = "flycheck-pos-tip"; + version = "20140813"; + src = fetchFromGitHub { + owner = "flycheck"; + repo = self.pname; + rev = "5b3a203bbdb03e4f48d1654efecd71f44376e199"; + sha256 = "0b4x24aq0jh4j4bjv0fqyaz6hzh3gqf57k9763jj9rl32cc3dpnp"; + }; + packageRequires = [ flycheck popup ]; + }); + + flycheck = melpa.mkDerivation (self: { + pname = "flycheck"; + version = "0.20"; + src = fetchFromGitHub { + owner = self.pname; + repo = self.pname; + rev = self.version; + sha256 = "0cq7y7ssm6phvx5pfv2yqq4j0yqmm0lhjav7v4a8ql7094cd790a"; + }; + packageRequires = [ dash pkg-info ]; + }); + + ghc-mod = melpa.mkDerivation (self: { + pname = "ghc"; + version = external.ghc-mod.version; + src = external.ghc-mod.src; + fileSpecs = [ "elisp/*.el" ]; + }); + + git-commit-mode = melpa.mkDerivation (self: { + pname = "git-commit-mode"; + version = "0.15.0"; + src = fetchFromGitHub { + owner = "magit"; + repo = "git-modes"; + rev = self.version; + sha256 = "1x03276yq63cddc89n8i47k1f6p26b7a5la4hz66fdf15gmr8496"; + }; + files = [ "git-commit-mode.el" ]; + }); + + git-rebase-mode = melpa.mkDerivation (self: { + pname = "git-rebase-mode"; + version = "0.15.0"; + src = fetchFromGitHub { + owner = "magit"; + repo = "git-modes"; + rev = self.version; + sha256 = "1x03276yq63cddc89n8i47k1f6p26b7a5la4hz66fdf15gmr8496"; + }; + files = [ "git-rebase-mode.el" ]; + }); + + gitattributes-mode = melpa.mkDerivation (self: { + pname = "gitattributes-mode"; + version = "0.15.0"; + src = fetchFromGitHub { + owner = "magit"; + repo = "git-modes"; + rev = self.version; + sha256 = "1x03276yq63cddc89n8i47k1f6p26b7a5la4hz66fdf15gmr8496"; + }; + files = [ "gitattributes-mode.el" ]; + }); + + gitconfig-mode = melpa.mkDerivation (self: { + pname = "gitconfig-mode"; + version = "0.15.0"; + src = fetchFromGitHub { + owner = "magit"; + repo = "git-modes"; + rev = self.version; + sha256 = "1x03276yq63cddc89n8i47k1f6p26b7a5la4hz66fdf15gmr8496"; + }; + files = [ "gitconfig-mode.el" ]; + }); + + gitignore-mode = melpa.mkDerivation (self: { + pname = "gitignore-mode"; + version = "0.15.0"; + src = fetchFromGitHub { + owner = "magit"; + repo = "git-modes"; + rev = self.version; + sha256 = "1x03276yq63cddc89n8i47k1f6p26b7a5la4hz66fdf15gmr8496"; + }; + files = [ "gitignore-mode.el" ]; + }); + + gnus = melpa.mkDerivation (self: { + pname = "gnus"; + version = "20140501"; + src = fetchgit { + url = "http://git.gnus.org/gnus.git"; + rev = "4228cffcb7afb77cf39678e4a8988a57753502a5"; + sha256 = "0qd0wpxkz47irxghmdpa524c9626164p8vgqs26wlpbdwyvm64a0"; + }; + fileSpecs = [ "lisp/*.el" "texi/*.texi" ]; + preBuild = '' + (cd lisp && make gnus-load.el) + ''; + }); + + god-mode = melpa.mkDerivation (self: { + pname = "god-mode"; + version = "20140811"; + src = fetchFromGitHub { + owner = "chrisdone"; + repo = self.pname; + rev = "6b7ae259a58ca1d7776aa4eca9f1092e4c0033e6"; + sha256 = "1amr98nq82g2d3f3f5wlqm9g38j64avygnsi9rrlbfqz4f71vq7x"; + }; + }); + + goto-chg = melpa.mkDerivation (self: { + pname = "goto-chg"; + version = "1.6"; + src = fetchgit { + url = "git://gitorious.org/evil/evil"; + rev = "999ec15587f85100311c031aa8efb5d50c35afe4"; + sha256 = "0yiqpzsm5sr7xdkixdvfg312dk9vsdcmj69gizk744d334yn8rsz"; + }; + files = [ "lib/goto-chg.el" ]; + }); + + haskell-mode = melpa.mkDerivation (self: { + pname = "haskell-mode"; + version = "20150101"; + src = fetchFromGitHub { + owner = "haskell"; + repo = self.pname; + rev = "0db5efaaeb3b22e5a3fdafa600729e14c1716ee2"; + sha256 = "0d63cgzj579cr8zbrnl0inyy35b26sxinqxr7bgrjsngpmhm52an"; + }; + }); + + helm-swoop = melpa.mkDerivation (self: { + pname = "helm-swoop"; + version = "20141224"; + src = fetchFromGitHub { + owner = "ShingoFukuyama"; + repo = self.pname; + rev = "06a251f7d7fce2a5719e0862e5855972cd8ab1ae"; + sha256 = "0nq33ldhbvfbm6jnsxqdf3vwaqrsr2gprkzll081gcyl2s1x0l2m"; + }; + packageRequires = [ helm ]; + }); + + helm = melpa.mkDerivation (self: { + pname = "helm"; + version = "20150105"; + src = fetchFromGitHub { + owner = "emacs-helm"; + repo = self.pname; + rev = "e5608ad86e7ca72446a4b1aa0faf604200ffe895"; + sha256 = "0n2kr6pyzcsi8pq6faxz2y8kicz1gmvj98fzzlq3a107dqqp25ay"; + }; + packageRequires = [ async ]; + }); + + idris-mode = melpa.mkDerivation (self: { + pname = "idris-mode"; + version = "0.9.15"; + src = fetchFromGitHub { + owner = "idris-hackers"; + repo = "idris-mode"; + rev = self.version; + sha256 = "00pkgk1zxan89i8alsa2dpa9ls7imqk5zb1kbjwzrlbr0gk4smdb"; + }; + packageRequires = [ flycheck ]; + }); + + lcs = melpa.mkDerivation (self: { + pname = "lcs"; + version = "1.5"; + src = fetchFromGitHub { + owner = "jorgenschaefer"; + repo = "circe"; + rev = "v${self.version}"; + sha256 = "08dsv1dzgb9jx076ia7xbpyjpaxn1w87h6rzlb349spaydq7ih24"; + }; + fileSpecs = [ "lisp/lcs*.el" ]; + }); + + lui = melpa.mkDerivation (self: { + pname = "lui"; + version = "1.5"; + src = fetchFromGitHub { + owner = "jorgenschaefer"; + repo = "circe"; + rev = "v${self.version}"; + sha256 = "08dsv1dzgb9jx076ia7xbpyjpaxn1w87h6rzlb349spaydq7ih24"; + }; + packageRequires = [ tracking ]; + fileSpecs = [ "lisp/lui*.el" ]; + }); + + magit = melpa.mkDerivation (self: { + pname = "magit"; + version = "20141025"; + src = fetchFromGitHub { + owner = "magit"; + repo = "magit"; + rev = "50c08522c8a3c67e0f3b821fe4df61e8bd456ff9"; + sha256 = "0mzyx72pidzvla1x2qszn3c60n2j0n8i5k875c4difvd1n4p0vsk"; + }; + packageRequires = [ git-commit-mode git-rebase-mode ]; + }); + + markdown-mode = melpa.mkDerivation (self: { + pname = "markdown-mode"; + version = "2.0"; + src = fetchFromGitHub { + owner = "defunkt"; + repo = self.pname; + rev = "v${self.version}"; + sha256 = "1l2w0j9xl8pipz61426s79jq2yns42vjvysc6yjc29kbsnhalj29"; + }; + }); + + org-plus-contrib = melpa.mkDerivation (self: { + pname = "org-plus-contrib"; + version = "20141020"; + src = fetchurl { + url = "http://orgmode.org/elpa/${self.fname}.tar"; + sha256 = "02njxmdbmias2f5psvwqc115dyakcwm2g381gfdv8qz4sqav0r77"; + }; + buildPhase = '' + cp $src ${self.fname}.tar + ''; + }); + + pkg-info = melpa.mkDerivation (self: { + pname = "pkg-info"; + version = "20140610"; + src = fetchFromGitHub { + owner = "lunaryorn"; + repo = "${self.pname}.el"; + rev = "475cdeb0b8d44f9854e506c429eeb445787014ec"; + sha256 = "0x4nz54f2shgcw3gx66d265vxwdpdirn64gzii8dpxhsi7v86n0p"; + }; + packageRequires = [ epl ]; + }); + + popup = melpa.mkDerivation (self: { + pname = "popup"; + version = "0.5.0"; + src = fetchFromGitHub { + owner = "auto-complete"; + repo = "${self.pname}-el"; + rev = "v${self.version}"; + sha256 = "0836ayyz1syvd9ry97ya06l8mpr88c6xbgb4d98szj6iwbypcj7b"; + }; + }); + + projectile = melpa.mkDerivation (self: { + pname = "projectile"; + version = "20141020"; + src = fetchFromGitHub { + owner = "bbatsov"; + repo = self.pname; + rev = "13580d83374e0c17c55b3a680b816dfae407657e"; + sha256 = "10c28h2g53sg68lwamhak0shdhh26h5xaipipz3n4281sr1fwg58"; + }; + packageRequires = [ dash helm s pkg-info epl ]; + }); + + rich-minority = melpa.mkDerivation (self: { + pname = "rich-minority"; + version = "0.1.1"; + src = fetchFromGitHub { + owner = "Bruce-Connor"; + repo = self.pname; + rev = self.version; + sha256 = "0kvhy4mgs9llihwsb1a9n5a85xzjiyiyawxnz0axy2bvwcxnp20k"; + }; + packageRequires = [ dash ]; + }); + + s = melpa.mkDerivation (self: { + pname = "s"; + version = "20140910"; + src = fetchFromGitHub { + owner = "magnars"; + repo = "${self.pname}.el"; + rev = "1f85b5112f3f68169ddaa2911fcfa030f979eb4d"; + sha256 = "9d871ea84f98c51099528a03eddf47218cf70f1431d4c35c19c977d9e73d421f"; + }; + }); + + shorten = melpa.mkDerivation (self: { + pname = "shorten"; + version = "1.5"; + src = fetchFromGitHub { + owner = "jorgenschaefer"; + repo = "circe"; + rev = "v${self.version}"; + sha256 = "08dsv1dzgb9jx076ia7xbpyjpaxn1w87h6rzlb349spaydq7ih24"; + }; + fileSpecs = [ "lisp/shorten*.el" ]; + }); + + smart-mode-line = melpa.mkDerivation (self: { + pname = "smart-mode-line"; + version = "2.6"; + src = fetchFromGitHub { + owner = "Bruce-Connor"; + repo = self.pname; + rev = self.version; + sha256 = "17nav2jbvbd13xzgp29x396mc617n2dh6whjk4wnyvsyv7r0s9f6"; + }; + packageRequires = [ dash rich-minority ]; + }); + + smartparens = melpa.mkDerivation (self: { + pname = "smartparens"; + version = "1.6.2"; + src = fetchFromGitHub { + owner = "Fuco1"; + repo = self.pname; + rev = self.version; + sha256 = "16pzd740vd1r3qfmxia2ibiarinm6xpja0mjv3nni5dis5s4r9gc"; + }; + packageRequires = [ dash ]; + }); + + structured-haskell-mode = melpa.mkDerivation (self: { + pname = "shm"; + version = external.structured-haskell-mode.version; + src = external.structured-haskell-mode.src; + packageRequires = [ haskell-mode ]; + fileSpecs = [ "elisp/*.el" ]; + meta = { + homepage = "https://github.com/chrisdone/structured-haskell-mode"; + description = "Structured editing Emacs mode for Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; + }); + + switch-window = melpa.mkDerivation (self: { + pname = "switch-window"; + version = "20140919"; + src = fetchFromGitHub { + owner = "dimitri"; + repo = self.pname; + rev = "3ffbe68e584f811e891f96afa1de15e0d9c1ebb5"; + sha256 = "09221128a0f55a575ed9addb3a435cfe01ab6bdd0cca5d589ccd37de61ceccbd"; + }; + }); + + tracking = melpa.mkDerivation (self: { + pname = "tracking"; + version = "1.5"; + src = fetchFromGitHub { + owner = "jorgenschaefer"; + repo = "circe"; + rev = "v${self.version}"; + sha256 = "08dsv1dzgb9jx076ia7xbpyjpaxn1w87h6rzlb349spaydq7ih24"; + }; + packageRequires = [ shorten ]; + fileSpecs = [ "lisp/tracking*.el" ]; + }); + + undo-tree = melpa.mkDerivation (self: { + pname = "undo-tree"; + version = "0.6.4"; + src = fetchgit { + url = "http://www.dr-qubit.org/git/${self.pname}.git"; + rev = "a3e81b682053a81e082139300ef0a913a7a610a2"; + sha256 = "1qla7njkb7gx5aj87i8x6ni8jfk1k78ivwfiiws3gpbnyiydpx8y"; + }; + }); + + use-package = melpa.mkDerivation (self: { + pname = "use-package"; + version = "20141013"; + src = fetchFromGitHub { + owner = "jwiegley"; + repo = self.pname; + rev = "d43af5e0769a92f77e01dea229e376d9006722ef"; + sha256 = "1m4v5h52brg2g9rpbqfq9m3m8fv520vg5mjwppnbw6099d17msqd"; + }; + packageRequires = [ bind-key diminish ]; + files = [ "use-package.el" ]; + }); + + volatile-highlights = melpa.mkDerivation (self: { + pname = "volatile-highlights"; + version = "1.11"; + src = fetchFromGitHub { + owner = "k-talo"; + repo = "${self.pname}.el"; + rev = "fb2abc2d4d4051a9a6b7c8de2fe7564161f01f24"; + sha256 = "1v0chqj5jir4685jd8ahw86g9zdmi6xd05wmzhyw20rbk924fcqf"; + }; + }); + + weechat = melpa.mkDerivation (self: { + pname = "weechat.el"; + version = "20141016"; + src = fetchFromGitHub { + owner = "the-kenny"; + repo = self.pname; + rev = "4cb2ced1eda5167ce774e04657d2cd077b63c706"; + sha256 = "003sihp7irm0qqba778dx0gf8xhkxd1xk7ig5kgkryvl2jyirk28"; + }; + postPatch = stdenv.lib.optionalString (!stdenv.isLinux) '' + rm weechat-sauron.el weechat-secrets.el + ''; + packageRequires = [ s ]; + }); + + wgrep = melpa.mkDerivation (self: { + pname = "wgrep"; + version = "20141017"; + src = fetchFromGitHub { + owner = "mhayashi1120"; + repo = "Emacs-wgrep"; + rev = "7ef26c51feaef8a5ec0929737130ab8ba326983c"; + sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4"; + }; + }); +} diff --git a/pkgs/applications/editors/emacs-24/packages/melpa.nix b/pkgs/applications/editors/emacs-24/packages/melpa.nix new file mode 100644 index 00000000000..45d97b74e51 --- /dev/null +++ b/pkgs/applications/editors/emacs-24/packages/melpa.nix @@ -0,0 +1,99 @@ +# generic builder for Emacs packages + +{ stdenv, fetchurl, emacs, texinfo +, extension ? (self : super : {}) +}: + +let + enableFeature = stdenv.lib.enableFeature; + versionOlder = stdenv.lib.versionOlder; + optional = stdenv.lib.optional; + optionals = stdenv.lib.optionals; + optionalString = stdenv.lib.optionalString; + filter = stdenv.lib.filter; + +in + +{ + mkDerivation = + args : # arguments for the individual package, can modify the defaults + let # Stuff happening after the user preferences have been processed. We remove + # internal attributes and strip null elements from the dependency lists, all + # in the interest of keeping hashes stable. + postprocess = + x : x // { + buildInputs = filter (y : ! (y == null)) x.buildInputs; + propagatedBuildInputs = filter (y : ! (y == null)) x.propagatedBuildInputs; + propagatedUserEnvPkgs = filter (y : ! (y == null)) x.propagatedUserEnvPkgs; + doCheck = x.doCheck; + }; + + defaults = + self : { # self is the final version of the attribute set + + # pname should be defined by the client to be the package basename + # version should be defined by the client to be the package version + + # fname is the internal full name of the package + fname = "${self.pname}-${self.version}"; + + # name is the external full name of the package; usually we prefix + # all packages with emacs- to avoid name clashes for libraries; + # if that is not desired (for applications), name can be set to + # fname. + name = "emacs-${self.pname}-${self.version}"; + + + buildInputs = [emacs texinfo] ++ self.packageRequires; + + propagatedBuildInputs = self.packageRequires; + + propagatedUserEnvPkgs = self.packageRequires; + + packageRequires = []; + + doCheck = false; + + files = []; + + setupHook = ./setup-hook.sh; + + fileSpecs = [ "*.el" "*.el.in" "dir" + "*.info" "*.texi" "*.texinfo" + "doc/dir" "doc/*.info" "doc/*.texi" "doc/*.texinfo" + ]; + + targets = stdenv.lib.concatStringsSep " " + (if self.files == [] + then self.fileSpecs + else self.files); + + buildPhase = '' + eval "$preBuild" + + emacs --batch -Q -l ${./package-build.el} -l ${./melpa2nix.el} \ + -f melpa2nix-build-package \ + ${self.pname} ${self.version} ${self.targets} + + eval "$postBuild" + ''; + + installPhase = '' + eval "$preInstall" + + emacs --batch -Q -l ${./package-build.el} -l ${./melpa2nix.el} \ + -f melpa2nix-install-package \ + ${self.fname}.* $out/share/emacs/site-lisp/elpa + + eval "$postInstall" + ''; + + # We inherit stdenv and emacs so that they can be used + # in melpa derivations. + inherit stdenv emacs texinfo; + }; + in + stdenv.mkDerivation (postprocess (let super = defaults self // args self; + self = super // extension self super; + in self)); +} diff --git a/pkgs/applications/editors/emacs-24/packages/melpa2nix.el b/pkgs/applications/editors/emacs-24/packages/melpa2nix.el new file mode 100644 index 00000000000..d54e9d21e25 --- /dev/null +++ b/pkgs/applications/editors/emacs-24/packages/melpa2nix.el @@ -0,0 +1,36 @@ +(require 'package) +(package-initialize) + +(require 'package-build) + +(setq package-build-working-dir (expand-file-name ".") + package-build-archive-dir (expand-file-name ".")) + +(defun melpa2nix-install-package () + (if (not noninteractive) + (error "`melpa2nix-install-package' is to be used only with -batch")) + (pcase command-line-args-left + (`(,archive ,elpa) + (progn (setq package-user-dir elpa) + (package-install-file archive))))) + +(defun melpa2nix-build-package () + (if (not noninteractive) + (error "`melpa2nix-build-package' is to be used only with -batch")) + (pcase command-line-args-left + (`(,package ,version . ,files) + (melpa2nix-package-build-archive package version files)))) + +(defun melpa2nix-package-build-archive (name version files) + "Build a package archive for package NAME." + (pb/message "\n;;; %s\n" name) + (let* ((start-time (current-time)) + (archive-entry (package-build-package name + version + files + package-build-working-dir + package-build-archive-dir))) + + (pb/message "Built in %.3fs, finished at %s" + (time-to-seconds (time-since start-time)) + (current-time-string)))) diff --git a/pkgs/applications/editors/emacs-24/packages/package-build.el b/pkgs/applications/editors/emacs-24/packages/package-build.el new file mode 100644 index 00000000000..c4554de8366 --- /dev/null +++ b/pkgs/applications/editors/emacs-24/packages/package-build.el @@ -0,0 +1,1333 @@ +;;; package-build.el --- Tools for assembling a package archive + +;; Copyright (C) 2011-2013 Donald Ephraim Curtis +;; Copyright (C) 2012-2014 Steve Purcell +;; Copyright (C) 2009 Phil Hagelberg + +;; Author: Donald Ephraim Curtis +;; Created: 2011-09-30 +;; Version: 0.1 +;; Keywords: tools +;; Package-Requires: ((cl-lib "0.2")) + +;; This file is not (yet) part of GNU Emacs. +;; However, it is distributed under the same license. + +;; GNU Emacs is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 3, or (at your option) +;; any later version. + +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. + +;;; Commentary: + +;; This file allows a curator to publish an archive of Emacs packages. + +;; The archive is generated from a set of recipes which describe elisp +;; projects and repositories from which to get them. The term +;; "package" here is used to mean a specific version of a project that +;; is prepared for download and installation. + +;;; Code: + +(require 'cl-lib) + +(require 'package) +(require 'lisp-mnt) +(require 'json) + +(defconst pb/this-dir (file-name-directory (or load-file-name (buffer-file-name)))) + +(defgroup package-build nil + "Facilities for building package.el-compliant packages from upstream source code." + :group 'development) + +(defcustom package-build-working-dir (expand-file-name "working/" pb/this-dir) + "Directory in which to keep checkouts." + :group 'package-build + :type 'string) + +(defcustom package-build-archive-dir (expand-file-name "packages/" pb/this-dir) + "Directory in which to keep compiled archives." + :group 'package-build + :type 'string) + +(defcustom package-build-recipes-dir (expand-file-name "recipes/" pb/this-dir) + "Directory containing recipe files." + :group 'package-build + :type 'string) + +(defcustom package-build-verbose t + "When non-nil, `package-build' feels free to print information about its progress." + :group 'package-build + :type 'boolean) + +(defcustom package-build-stable nil + "When non-nil, `package-build' tries to build packages from versions-tagged code." + :group 'package-build + :type 'boolean) + +(defcustom package-build-timeout-executable + (let ((prog (or (executable-find "timeout") + (executable-find "gtimeout")))) + (when (and prog + (string-match-p "^ *-k" (shell-command-to-string (concat prog " --help")))) + prog)) + "Path to a GNU coreutils \"timeout\" command if available. +This must be a version which supports the \"-k\" option." + :group 'package-build + :type '(file :must-match t)) + +(defcustom package-build-tar-executable + (or (executable-find "gtar") + (executable-find "tar")) + "Path to a (preferably GNU) tar command. +Certain package names (e.g. \"@\") may not work properly with a BSD tar." + :group 'package-build + :type '(file :must-match t)) + +(defcustom package-build-write-melpa-badge-images nil + "When non-nil, write MELPA badge images alongside packages, for use on github pages etc." + :group 'package-build + :type 'boolean) + +;;; Internal Variables + +(defvar pb/recipe-alist nil + "Internal list of package build specs. + +Do not use this directly. Use `package-build-recipe-alist' +function.") + +(defvar pb/recipe-alist-initialized nil + "Determines if `pb/recipe-alist` has been initialized.") + +(defvar pb/archive-alist nil + "Internal list of already-built packages, in the standard package.el format. + +Do not use this directly. Use `package-build-archive-alist' +function for access to this function") + +(defvar pb/archive-alist-initialized nil + "Determines if pb/archive-alist has been initialized.") + +(defconst package-build-default-files-spec + '("*.el" "*.el.in" "dir" + "*.info" "*.texi" "*.texinfo" + "doc/dir" "doc/*.info" "doc/*.texi" "doc/*.texinfo" + (:exclude ".dir-locals.el" "tests.el" "*-test.el" "*-tests.el")) + "Default value for :files attribute in recipes.") + +(defun pb/message (format-string &rest args) + "Log a message using FORMAT-STRING and ARGS as per `message'." + (when package-build-verbose + (apply 'message format-string args))) + +(defun pb/slurp-file (file-name) + "Return the contents of FILE-NAME as a string, or nil if no such file exists." + (when (file-exists-p file-name) + (with-temp-buffer + (insert-file-contents file-name) + (buffer-substring-no-properties (point-min) (point-max))))) + +(defun pb/string-rtrim (str) + "Remove trailing whitespace from `STR'." + (replace-regexp-in-string "[ \t\n]*$" "" str)) + +(defun pb/parse-time (str) + "Parse STR as a time, and format as a YYYYMMDD.HHMM string." + ;; We remove zero-padding the HH portion, as it is lost + ;; when stored in the archive-contents + (let* ((s (substring-no-properties str)) + (time (date-to-time + (if (string-match "^\\([0-9]\\{4\\}\\)/\\([0-9]\\{2\\}\\)/\\([0-9]\\{2\\}\\) \\([0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\}\\)$" str) + (concat (match-string 1 str) "-" (match-string 2 str) "-" + (match-string 3 str) " " (match-string 4 str)) + str)))) + (concat (format-time-string "%Y%m%d." time) + (format "%d" (or (string-to-number (format-time-string "%H%M" time)) 0))))) + +(defun pb/string-match-all (regex str &rest groups) + "Find every match for `REGEX' within `STR'. +Return a list containing the full match string and match for +groups `GROUPS'. The return list is of the form + ((FULL GROUP1 GROUP2 ...) ...) +where FULL is the complete regexp match and +GROUP1, GROUP2, ... are the regex groups specified by the +`GROUPS' argument. If `GROUPS' is nil then FULL and GROUP1 will +be identical." + (let (result + (pos 0) + (groups (or groups '(0)))) + (while (string-match regex str pos) + (push (cons (match-string 0 str) (mapcar + (lambda (group) + (match-string group str)) + groups)) + result) + (setq pos (match-end 0))) + result)) + +(defun pb/find-parse-time (regex &optional bound) + "Find REGEX in current buffer and format as a time version, optionally looking only as far as BOUND." + (pb/parse-time (progn (re-search-backward regex bound) + (match-string-no-properties 1)))) + +(defun pb/valid-version-string (str) + "Return true if STR is a valid version, otherwise return nil." + (ignore-errors (version-to-list str))) + +(defun pb/find-tag-version-newest (regex &optional bound &rest additional-groups) + "Find the newest version matching REGEX, optionally looking only as far as BOUND." + (let* ((text (buffer-substring-no-properties + (or bound (point-min)) (point))) + (tags (cl-remove-if-not + (lambda (tag-version) + (pb/valid-version-string (cadr tag-version))) + (apply 'pb/string-match-all regex text 1 additional-groups)))) + (car (nreverse (sort tags (lambda (v1 v2) + (version< (cadr v1) (cadr v2)))))))) + +(defun pb/find-parse-time-latest (regex &optional bound) + "Find the latest timestamp matching REGEX, optionally looking only as far as BOUND." + (let* ((text (buffer-substring-no-properties + (or bound (point-min)) (point))) + (times (mapcar 'pb/parse-time + (mapcar 'cadr (pb/string-match-all regex text 1))))) + (car (nreverse (sort times 'string<))))) + +(defun pb/run-process (dir command &rest args) + "In DIR (or `default-directory' if unset) run COMMAND with ARGS. +Output is written to the current buffer." + (let* ((default-directory (file-name-as-directory (or dir default-directory))) + (argv (if package-build-timeout-executable + (append (list package-build-timeout-executable "-k" "60" "600" command) args) + (cons command args)))) + (unless (file-directory-p default-directory) + (error "Can't run process in non-existent directory: %s" default-directory)) + (let ((exit-code (apply 'process-file (car argv) nil (current-buffer) t (cdr argv)))) + (or (zerop exit-code) + (error "Command '%s' exited with non-zero status %d: %s" + argv exit-code (buffer-string)))))) + +(defun pb/run-process-match (regex dir prog &rest args) + "Find match for REGEX when - in DIR, or `default-directory' if unset - we run PROG with ARGS." + (with-temp-buffer + (apply 'pb/run-process dir prog args) + (goto-char (point-min)) + (re-search-forward regex) + (match-string-no-properties 1))) + +(defun package-build-checkout (package-name config working-dir) + "Check out source for PACKAGE-NAME with CONFIG under WORKING-DIR. +In turn, this function uses the :fetcher option in the CONFIG to +choose a source-specific fetcher function, which it calls with +the same arguments. + +Returns a last-modification timestamp for the :files listed in +CONFIG, if any, or `package-build-default-files-spec' otherwise." + (let ((repo-type (plist-get config :fetcher))) + (pb/message "Fetcher: %s" repo-type) + (unless (eq 'wiki repo-type) + (pb/message "Source: %s\n" (or (plist-get config :repo) (plist-get config :url)))) + (funcall (intern (format "pb/checkout-%s" repo-type)) + package-name config (file-name-as-directory working-dir)))) + +(defvar pb/last-wiki-fetch-time 0 + "The time at which an emacswiki URL was last requested. +This is used to avoid exceeding the rate limit of 1 request per 2 +seconds; the server cuts off after 10 requests in 20 seconds.") + +(defvar pb/wiki-min-request-interval 3 + "The shortest permissible interval between successive requests for Emacswiki URLs.") + +(defmacro pb/with-wiki-rate-limit (&rest body) + "Rate-limit BODY code passed to this macro to match EmacsWiki's rate limiting." + (let ((now (cl-gensym)) + (elapsed (cl-gensym))) + `(let* ((,now (float-time)) + (,elapsed (- ,now pb/last-wiki-fetch-time))) + (when (< ,elapsed pb/wiki-min-request-interval) + (let ((wait (- pb/wiki-min-request-interval ,elapsed))) + (pb/message "Waiting %.2f secs before hitting Emacswiki again" wait) + (sleep-for wait))) + (unwind-protect + (progn ,@body) + (setq pb/last-wiki-fetch-time (float-time)))))) + +(defun pb/grab-wiki-file (filename) + "Download FILENAME from emacswiki, returning its last-modified time." + (let* ((download-url + (format "http://www.emacswiki.org/emacs/download/%s" filename)) + (wiki-url + (format "http://www.emacswiki.org/emacs/%s" filename))) + (pb/with-wiki-rate-limit + (url-copy-file download-url filename t)) + (when (zerop (nth 7 (file-attributes filename))) + (error "Wiki file %s was empty - has it been removed?" filename)) + ;; The Last-Modified response header for the download is actually + ;; correct for the file, but we have no access to that + ;; header. Instead, we must query the non-raw emacswiki page for + ;; the file. + ;; Since those Emacswiki lookups are time-consuming, we maintain a + ;; foo.el.stamp file containing ("SHA1" . "PARSED_TIME") + (let* ((new-content-hash (secure-hash 'sha1 (pb/slurp-file filename))) + (stamp-file (concat filename ".stamp")) + (stamp-info (pb/read-from-file stamp-file)) + (prev-content-hash (car stamp-info))) + (if (and prev-content-hash + (string-equal new-content-hash prev-content-hash)) + ;; File has not changed, so return old timestamp + (progn + (pb/message "%s is unchanged" filename) + (cdr stamp-info)) + (pb/message "%s has changed - checking mod time" filename) + (let ((new-timestamp + (with-current-buffer (pb/with-wiki-rate-limit + (url-retrieve-synchronously wiki-url)) + (unless (= 200 url-http-response-status) + (error "HTTP error %s fetching %s" url-http-response-status wiki-url)) + (goto-char (point-max)) + (pb/find-parse-time + "Last edited \\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} [0-9]\\{2\\}:[0-9]\\{2\\} [A-Z]\\{3\\}\\)" + url-http-end-of-headers)))) + (pb/dump (cons new-content-hash new-timestamp) stamp-file) + new-timestamp))))) + +(defun pb/checkout-wiki (name config dir) + "Checkout package NAME with config CONFIG from the EmacsWiki into DIR." + (unless package-build-stable + (with-current-buffer (get-buffer-create "*package-build-checkout*") + (unless (file-exists-p dir) + (make-directory dir)) + (let ((files (or (plist-get config :files) + (list (format "%s.el" name)))) + (default-directory dir)) + (car (nreverse (sort (mapcar 'pb/grab-wiki-file files) 'string-lessp))))))) + +(defun pb/darcs-repo (dir) + "Get the current darcs repo for DIR." + (pb/run-process-match "Default Remote: \\(.*\\)" dir "darcs" "show" "repo")) + +(defun pb/checkout-darcs (name config dir) + "Check package NAME with config CONFIG out of darcs into DIR." + (unless package-build-stable + (let ((repo (plist-get config :url))) + (with-current-buffer (get-buffer-create "*package-build-checkout*") + (cond + ((and (file-exists-p (expand-file-name "_darcs" dir)) + (string-equal (pb/darcs-repo dir) repo)) + (pb/princ-exists dir) + (pb/run-process dir "darcs" "pull")) + (t + (when (file-exists-p dir) + (delete-directory dir t)) + (pb/princ-checkout repo dir) + (pb/run-process nil "darcs" "get" repo dir))) + (apply 'pb/run-process dir "darcs" "changes" "--max-count" "1" + (pb/expand-source-file-list dir config)) + (pb/find-parse-time + "\\([a-zA-Z]\\{3\\} [a-zA-Z]\\{3\\} \\( \\|[0-9]\\)[0-9] [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\} [A-Za-z]\\{3\\} [0-9]\\{4\\}\\)"))))) + +(defun pb/fossil-repo (dir) + "Get the current fossil repo for DIR." + (pb/run-process-match "\\(.*\\)" dir "fossil" "remote-url")) + +(defun pb/checkout-fossil (name config dir) + "Check package NAME with config CONFIG out of fossil into DIR." + (unless package-build-stable + (let ((repo (plist-get config :url))) + (with-current-buffer (get-buffer-create "*package-build-checkout*") + (cond + ((and (or (file-exists-p (expand-file-name ".fslckout" dir)) + (file-exists-p (expand-file-name "_FOSSIL_" dir))) + (string-equal (pb/fossil-repo dir) repo)) + (pb/princ-exists dir) + (pb/run-process dir "fossil" "update")) + (t + (when (file-exists-p dir) + (delete-directory dir t)) + (pb/princ-checkout repo dir) + (make-directory dir) + (pb/run-process dir "fossil" "clone" repo "repo.fossil") + (pb/run-process dir "fossil" "open" "repo.fossil"))) + (pb/run-process dir "fossil" "timeline" "-n" "1" "-t" "ci") + (or (pb/find-parse-time + "=== \\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} ===\n[0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\}\\) ") + (error "No valid timestamps found!")))))) + +(defun pb/svn-repo (dir) + "Get the current svn repo for DIR." + (pb/run-process-match "URL: \\(.*\\)" dir "svn" "info")) + +(defun pb/trim (str &optional chr) + "Return a copy of STR without any trailing CHR (or space if unspecified)." + (if (equal (elt str (1- (length str))) (or chr ? )) + (substring str 0 (1- (length str))) + str)) + +(defun pb/princ-exists (dir) + "Print a message that the contents of DIR will be updated." + (pb/message "Updating %s" dir)) + +(defun pb/princ-checkout (repo dir) + "Print a message that REPO will be checked out into DIR." + (pb/message "Cloning %s to %s" repo dir)) + +(defun pb/checkout-svn (name config dir) + "Check package NAME with config CONFIG out of svn into DIR." + (unless package-build-stable + (with-current-buffer (get-buffer-create "*package-build-checkout*") + (let ((repo (pb/trim (plist-get config :url) ?/)) + (bound (goto-char (point-max)))) + (cond + ((and (file-exists-p (expand-file-name ".svn" dir)) + (string-equal (pb/svn-repo dir) repo)) + (pb/princ-exists dir) + (pb/run-process dir "svn" "up")) + (t + (when (file-exists-p dir) + (delete-directory dir t)) + (pb/princ-checkout repo dir) + (pb/run-process nil "svn" "checkout" repo dir))) + (apply 'pb/run-process dir "svn" "info" + (pb/expand-source-file-list dir config)) + (or (pb/find-parse-time-latest "Last Changed Date: \\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\}\\( [+-][0-9]\\{4\\}\\)?\\)" bound) + (error "No valid timestamps found!")))))) + + +(defun pb/cvs-repo (dir) + "Get the current CVS root and repository for DIR. + +Return a cons cell whose `car' is the root and whose `cdr' is the repository." + (apply 'cons + (mapcar (lambda (file) + (pb/string-rtrim (pb/slurp-file (expand-file-name file dir)))) + '("CVS/Root" "CVS/Repository")))) + +(defun pb/checkout-cvs (name config dir) + "Check package NAME with config CONFIG out of cvs into DIR." + (unless package-build-stable + (with-current-buffer (get-buffer-create "*package-build-checkout*") + (let ((root (pb/trim (plist-get config :url) ?/)) + (repo (or (plist-get config :module) (symbol-name name))) + (bound (goto-char (point-max)))) + (cond + ((and (file-exists-p (expand-file-name "CVS" dir)) + (equal (pb/cvs-repo dir) (cons root repo))) + (pb/princ-exists dir) + (pb/run-process dir "cvs" "update" "-dP")) + (t + (when (file-exists-p dir) + (delete-directory dir t)) + (pb/princ-checkout (format "%s from %s" repo root) dir) + ;; CVS insists on relative paths as target directory for checkout (for + ;; whatever reason), and puts "CVS" directories into every subdirectory + ;; of the current working directory given in the target path. To get CVS + ;; to just write to DIR, we need to execute CVS from the parent + ;; directory of DIR, and specific DIR as relative path. Hence all the + ;; following mucking around with paths. CVS is really horrid. + (let* ((dir (directory-file-name dir)) + (working-dir (file-name-directory dir)) + (target-dir (file-name-nondirectory dir))) + (pb/run-process working-dir "env" "TZ=UTC" "cvs" "-z3" "-d" root "checkout" + "-d" target-dir repo)))) + (apply 'pb/run-process dir "cvs" "log" + (pb/expand-source-file-list dir config)) + (or (pb/find-parse-time-latest "date: \\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\}\\( [+-][0-9]\\{4\\}\\)?\\)" bound) + (pb/find-parse-time-latest "date: \\([0-9]\\{4\\}/[0-9]\\{2\\}/[0-9]\\{2\\} [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\}\\);" bound) + (error "No valid timestamps found!")) + )))) + + +(defun pb/git-repo (dir) + "Get the current git repo for DIR." + (pb/run-process-match + "Fetch URL: \\(.*\\)" dir "git" "remote" "show" "-n" "origin")) + +(defun pb/git-head-branch (dir) + "Get the current git repo for DIR." + (or (ignore-errors + (pb/run-process-match + "HEAD branch: \\(.*\\)" dir "git" "remote" "show" "origin")) + "master")) + +(defun pb/checkout-git (name config dir) + "Check package NAME with config CONFIG out of git into DIR." + (let ((repo (plist-get config :url)) + (commit (or (plist-get config :commit) + (let ((branch (plist-get config :branch))) + (when branch + (concat "origin/" branch)))))) + (with-current-buffer (get-buffer-create "*package-build-checkout*") + (goto-char (point-max)) + (cond + ((and (file-exists-p (expand-file-name ".git" dir)) + (string-equal (pb/git-repo dir) repo)) + (pb/princ-exists dir) + (pb/run-process dir "git" "remote" "update")) + (t + (when (file-exists-p dir) + (delete-directory dir t)) + (pb/princ-checkout repo dir) + (pb/run-process nil "git" "clone" repo dir))) + (if package-build-stable + (let* ((bound (goto-char (point-max))) + (tag-version (and (pb/run-process dir "git" "tag") + (or (pb/find-tag-version-newest + "^\\(?:v[.-]?\\)?\\([0-9]+[^ \t\n]*\\)$" bound) + (error + "No valid stable versions found for %s" + name))))) + ;; Using reset --hard here to comply with what's used for + ;; unstable, but maybe this should be a checkout? + (pb/run-process dir "git" "reset" "--hard" (concat "tags/" (car tag-version))) + (pb/run-process dir "git" "submodule" "update" "--init" "--recursive") + (cadr tag-version)) + (pb/run-process dir "git" "reset" "--hard" + (or commit (concat "origin/" (pb/git-head-branch dir)))) + (pb/run-process dir "git" "submodule" "update" "--init" "--recursive") + (apply 'pb/run-process dir "git" "log" "--first-parent" "-n1" "--pretty=format:'\%ci'" + (pb/expand-source-file-list dir config)) + (pb/find-parse-time + "\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\}\\( [+-][0-9]\\{4\\}\\)?\\)"))))) + +(defun pb/checkout-github (name config dir) + "Check package NAME with config CONFIG out of github into DIR." + (let* ((url (format "git://github.com/%s.git" (plist-get config :repo)))) + (pb/checkout-git name (plist-put (copy-sequence config) :url url) dir))) + +(defun pb/bzr-expand-repo (repo) + "Get REPO expanded name." + (pb/run-process-match "\\(?:branch root\\|repository branch\\): \\(.*\\)" nil "bzr" "info" repo)) + +(defun pb/bzr-repo (dir) + "Get the current bzr repo for DIR." + (pb/run-process-match "parent branch: \\(.*\\)" dir "bzr" "info")) + +(defun pb/checkout-bzr (name config dir) + "Check package NAME with config CONFIG out of bzr into DIR." + (unless package-build-stable + (let ((repo (pb/bzr-expand-repo (plist-get config :url)))) + (with-current-buffer (get-buffer-create "*package-build-checkout*") + (goto-char (point-max)) + (cond + ((and (file-exists-p (expand-file-name ".bzr" dir)) + (string-equal (pb/bzr-repo dir) repo)) + (pb/princ-exists dir) + (pb/run-process dir "bzr" "merge")) + (t + (when (file-exists-p dir) + (delete-directory dir t)) + (pb/princ-checkout repo dir) + (pb/run-process nil "bzr" "branch" repo dir))) + (apply 'pb/run-process dir "bzr" "log" "-l1" + (pb/expand-source-file-list dir config)) + (pb/find-parse-time + "\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\}\\( [+-][0-9]\\{4\\}\\)?\\)"))))) + +(defun pb/hg-repo (dir) + "Get the current hg repo for DIR." + (pb/run-process-match "default = \\(.*\\)" dir "hg" "paths")) + +(defun pb/checkout-hg (name config dir) + "Check package NAME with config CONFIG out of hg into DIR." + (let ((repo (plist-get config :url))) + (with-current-buffer (get-buffer-create "*package-build-checkout*") + (goto-char (point-max)) + (cond + ((and (file-exists-p (expand-file-name ".hg" dir)) + (string-equal (pb/hg-repo dir) repo)) + (pb/princ-exists dir) + (pb/run-process dir "hg" "pull") + (pb/run-process dir "hg" "update")) + (t + (when (file-exists-p dir) + (delete-directory dir t)) + (pb/princ-checkout repo dir) + (pb/run-process nil "hg" "clone" repo dir))) + (if package-build-stable + (let* ((bound (goto-char (point-max))) + (tag-version (and (pb/run-process dir "hg" "tags") + (or (pb/find-tag-version-newest + "^\\(?:v[.-]?\\)?\\([0-9]+[^ \t\n]*\\)[ \t]*[0-9]+:\\([[:xdigit:]]+\\)$" + bound + 2) + (error + "No valid stable versions found for %s" + name))))) + (pb/run-process dir "hg" "update" (nth 2 tag-version)) + (cadr tag-version)) + (apply 'pb/run-process dir "hg" "log" "--style" "compact" "-l1" + (pb/expand-source-file-list dir config)) + (pb/find-parse-time + "\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} [0-9]\\{2\\}:[0-9]\\{2\\}\\( [+-][0-9]\\{4\\}\\)?\\)"))))) + +(defun pb/dump (data file &optional pretty-print) + "Write DATA to FILE as a Lisp sexp. +Optionally PRETTY-PRINT the data." + (with-temp-file file + (pb/message "File: %s" file) + (if pretty-print + (pp data (current-buffer)) + (print data (current-buffer))))) + +(defun pb/write-pkg-file (pkg-file pkg-info) + "Write PKG-FILE containing PKG-INFO." + (with-temp-file pkg-file + (pp + `(define-package + ,(aref pkg-info 0) + ,(aref pkg-info 3) + ,(aref pkg-info 2) + ',(mapcar + (lambda (elt) + (list (car elt) + (package-version-join (cadr elt)))) + (aref pkg-info 1)) + ;; Append our extra information + ,@(apply #'append (mapcar (lambda (entry) + (let ((value (cdr entry))) + (when (or (symbolp value) (listp value)) + ;; We must quote lists and symbols, + ;; because Emacs 24.3 and earlier evaluate + ;; the package information, which would + ;; break for unquoted symbols or lists + (setq value (list 'quote value))) + (list (car entry) value))) + (when (> (length pkg-info) 4) + (aref pkg-info 4))))) + (current-buffer)) + (princ ";; Local Variables:\n;; no-byte-compile: t\n;; End:\n" (current-buffer)))) + +(defun pb/read-from-file (file-name) + "Read and return the Lisp data stored in FILE-NAME, or nil if no such file exists." + (when (file-exists-p file-name) + (car (read-from-string (pb/slurp-file file-name))))) + +(defun pb/create-tar (file dir &optional files) + "Create a tar FILE containing the contents of DIR, or just FILES if non-nil." + (apply 'process-file + package-build-tar-executable nil + (get-buffer-create "*package-build-checkout*") + nil "-cvf" + file + "--exclude=.svn" + "--exclude=CVS" + "--exclude=.git*" + "--exclude=_darcs" + "--exclude=.fslckout" + "--exclude=_FOSSIL_" + "--exclude=.bzr" + "--exclude=.hg" + (or (mapcar (lambda (fn) (concat dir "/" fn)) files) (list dir)))) + + +(defun pb/find-package-commentary (file-path) + "Get commentary section from FILE-PATH." + (when (file-exists-p file-path) + (with-temp-buffer + (insert-file-contents file-path) + (lm-commentary)))) + +(defun pb/write-pkg-readme (target-dir commentary file-name) + "In TARGET-DIR, write COMMENTARY to a -readme.txt file prefixed with FILE-NAME." + (when commentary + (with-temp-buffer + (insert commentary) + ;; Adapted from `describe-package-1'. + (goto-char (point-min)) + (save-excursion + (when (re-search-forward "^;;; Commentary:\n" nil t) + (replace-match "")) + (while (re-search-forward "^\\(;+ ?\\)" nil t) + (replace-match "")) + (goto-char (point-min)) + (when (re-search-forward "\\`\\( *\n\\)+" nil t) + (replace-match ""))) + (delete-trailing-whitespace) + (let ((coding-system-for-write buffer-file-coding-system)) + (write-region nil nil + (pb/readme-file-name target-dir file-name)))))) + +(defun pb/readme-file-name (target-dir file-name) + "Name of the readme file in TARGET-DIR for the package FILE-NAME." + (expand-file-name (concat file-name "-readme.txt") + target-dir)) + +(defun pb/update-or-insert-version (version) + "Ensure current buffer has a \"Version: VERSION\" header." + (goto-char (point-min)) + (if (re-search-forward "^;;;* *Version: *" nil t) + (progn + (move-beginning-of-line nil) + (search-forward "V" nil t) + (backward-char) + (insert "X-Original-") + (move-beginning-of-line nil)) + (forward-line)) + (insert (format ";; Version: %s" version)) + (newline)) + +(defun pb/ensure-ends-here-line (file-path) + "Add a 'FILE-PATH ends here' trailing line if missing." + (save-excursion + (goto-char (point-min)) + (let* ((fname (file-name-nondirectory file-path)) + (trailer (concat ";;; " fname " ends here"))) + (unless (search-forward trailer nil t) + (goto-char (point-max)) + (newline) + (insert trailer) + (newline))))) + +(defun pb/get-package-info (file-path) + "Get a vector of package info from the docstrings in FILE-PATH." + (when (file-exists-p file-path) + (ignore-errors + (with-temp-buffer + (insert-file-contents file-path) + ;; next few lines are a hack for some packages that aren't + ;; commented properly. + (pb/update-or-insert-version "0") + (pb/ensure-ends-here-line file-path) + (cl-flet ((package-strip-rcs-id (str) "0")) + (pb/package-buffer-info-vec)))))) + +(defun pb/get-pkg-file-info (file-path) + "Get a vector of package info from \"-pkg.el\" file FILE-PATH." + (when (file-exists-p file-path) + (let ((package-def (pb/read-from-file file-path))) + (if (eq 'define-package (car package-def)) + (let ((pkgfile-info (cdr package-def))) + (vector + (nth 0 pkgfile-info) + (mapcar + (lambda (elt) + (list (car elt) (version-to-list (cadr elt)))) + (eval (nth 3 pkgfile-info))) + (nth 2 pkgfile-info) + (nth 1 pkgfile-info))) + (error "No define-package found in %s" file-path))))) + +(defun pb/merge-package-info (pkg-info name version) + "Return a version of PKG-INFO updated with NAME, VERSION and info from CONFIG. +If PKG-INFO is nil, an empty one is created." + (let* ((merged (or (copy-sequence pkg-info) + (vector name nil "No description available." version)))) + (aset merged 0 name) + (aset merged 3 version) + merged)) + +(defun pb/archive-entry (pkg-info type) + "Return the archive-contents cons cell for PKG-INFO and TYPE." + (let* ((name (intern (aref pkg-info 0))) + (requires (aref pkg-info 1)) + (desc (or (aref pkg-info 2) "No description available.")) + (version (aref pkg-info 3)) + (extras (when (> (length pkg-info) 4) + (aref pkg-info 4)))) + (cons name + (vector (version-to-list version) + requires + desc + type + extras)))) + +(defun pb/archive-file-name (archive-entry) + "Return the path of the file in which the package for ARCHIVE-ENTRY is stored." + (let* ((name (car archive-entry)) + (pkg-info (cdr archive-entry)) + (version (package-version-join (aref pkg-info 0))) + (flavour (aref pkg-info 3))) + (expand-file-name + (format "%s-%s.%s" name version (if (eq flavour 'single) "el" "tar")) + package-build-archive-dir))) + +(defun pb/entry-file-name (archive-entry) + "Return the path of the file in which the package for ARCHIVE-ENTRY is stored." + (let* ((name (car archive-entry)) + (pkg-info (cdr archive-entry)) + (version (package-version-join (aref pkg-info 0)))) + (expand-file-name + (format "%s-%s.entry" name version) + package-build-archive-dir))) + +(defun pb/delete-file-if-exists (file) + "Delete FILE if it exists." + (when (file-exists-p file) + (delete-file file))) + +(defun pb/remove-archive-files (archive-entry) + "Remove ARCHIVE-ENTRY from archive-contents, and delete associated file. +Note that the working directory (if present) is not deleted by +this function, since the archive list may contain another version +of the same-named package which is to be kept." + (pb/message "Removing archive: %s" archive-entry) + (mapcar 'pb/delete-file-if-exists + (list (pb/archive-file-name archive-entry) + (pb/entry-file-name archive-entry)))) + +(defun pb/read-recipe (file-name) + "Return the plist of recipe info for the package called FILE-NAME." + (let ((pkg-info (pb/read-from-file file-name))) + (if (string= (symbol-name (car pkg-info)) + (file-name-nondirectory file-name)) + pkg-info + (error "Recipe '%s' contains mismatched package name '%s'" + (file-name-nondirectory file-name) + (car pkg-info))))) + +(defun pb/read-recipes () + "Return a list of data structures for all recipes in `package-build-recipes-dir'." + (cl-loop for file-name in (directory-files package-build-recipes-dir t "^[^.]") + collect (pb/read-recipe file-name))) + +(defun pb/read-recipes-ignore-errors () + "Return a list of data structures for all recipes in `package-build-recipes-dir'." + (cl-loop for file-name in (directory-files package-build-recipes-dir t "^[^.]") + for pkg-info = (condition-case err (pb/read-recipe file-name) + (error (pb/message "Error reading recipe %s: %s" + file-name + (error-message-string err)) + nil)) + when pkg-info + collect pkg-info)) + + +(defun package-build-expand-file-specs (dir specs &optional subdir allow-empty) + "In DIR, expand SPECS, optionally under SUBDIR. +The result is a list of (SOURCE . DEST), where SOURCE is a source +file path and DEST is the relative path to which it should be copied. + +If the resulting list is empty, an error will be reported. Pass t +for ALLOW-EMPTY to prevent this error." + (let ((default-directory dir) + (prefix (if subdir (format "%s/" subdir) "")) + (lst)) + (dolist (entry specs lst) + (setq lst + (if (consp entry) + (if (eq :exclude (car entry)) + (cl-nset-difference lst + (package-build-expand-file-specs dir (cdr entry) nil t) + :key 'car + :test 'equal) + (nconc lst + (package-build-expand-file-specs + dir + (cdr entry) + (concat prefix (car entry)) + t))) + (nconc + lst (mapcar (lambda (f) + (let ((destname))) + (cons f + (concat prefix + (replace-regexp-in-string + "\\.in\\'" + "" + (file-name-nondirectory f))))) + (file-expand-wildcards entry)))))) + (when (and (null lst) (not allow-empty)) + (error "No matching file(s) found in %s: %s" dir specs)) + lst)) + + +(defun pb/config-file-list (config) + "Get the :files spec from CONFIG, or return `package-build-default-files-spec'." + (or (plist-get config :files) package-build-default-files-spec)) + +(defun pb/expand-source-file-list (dir config) + "Shorthand way to expand paths in DIR for source files listed in CONFIG." + (mapcar 'car (package-build-expand-file-specs dir (pb/config-file-list config)))) + +(defun pb/generate-info-files (files source-dir target-dir) + "Create .info files from any .texi files listed in FILES. + +The source and destination file paths are expanded in SOURCE-DIR +and TARGET-DIR respectively. + +Any of the original .texi(nfo) files found in TARGET-DIR are +deleted." + (dolist (spec files) + (let* ((source-file (car spec)) + (source-path (expand-file-name source-file source-dir)) + (dest-file (cdr spec)) + (info-path (expand-file-name + (concat (file-name-sans-extension dest-file) ".info") + target-dir))) + (when (string-match ".texi\\(nfo\\)?$" source-file) + (when (not (file-exists-p info-path)) + (with-current-buffer (get-buffer-create "*package-build-info*") + (ignore-errors + (pb/run-process + (file-name-directory source-path) + "makeinfo" + source-path + "-o" + info-path) + (pb/message "Created %s" info-path)))) + (pb/message "Removing %s" (expand-file-name dest-file target-dir)) + (delete-file (expand-file-name dest-file target-dir)))))) + +(defun pb/generate-dir-file (files target-dir) + "Create dir file from any .info files listed in FILES in TARGET-DIR." + (dolist (spec files) + (let* ((source-file (car spec)) + (dest-file (cdr spec)) + (info-path (expand-file-name + (concat (file-name-sans-extension dest-file) ".info") + target-dir))) + (when (and (or (string-match ".info$" source-file) + (string-match ".texi\\(nfo\\)?$" source-file)) + (file-exists-p info-path)) + (with-current-buffer (get-buffer-create "*package-build-info*") + (ignore-errors + (pb/run-process + nil + "install-info" + (concat "--dir=" (expand-file-name "dir" target-dir)) + info-path))))))) + +(defun pb/copy-package-files (files source-dir target-dir) + "Copy FILES from SOURCE-DIR to TARGET-DIR. +FILES is a list of (SOURCE . DEST) relative filepath pairs." + (cl-loop for (source-file . dest-file) in files + do (pb/copy-file + (expand-file-name source-file source-dir) + (expand-file-name dest-file target-dir)))) + +(defun pb/copy-file (file newname) + "Copy FILE to NEWNAME and create parent directories for NEWNAME if they don't exist." + (let ((newdir (file-name-directory newname))) + (unless (file-exists-p newdir) + (make-directory newdir t))) + (cond + ((file-regular-p file) + (pb/message "%s -> %s" file newname) + (copy-file file newname)) + ((file-directory-p file) + (pb/message "%s => %s" file newname) + (copy-directory file newname)))) + + +(defun pb/package-name-completing-read () + "Prompt for a package name, returning a symbol." + (intern (completing-read "Package: " (package-build-recipe-alist)))) + +(defun pb/find-source-file (target files) + "Search for source of TARGET in FILES." + (let* ((entry (rassoc target files))) + (when entry (car entry)))) + +(defun pb/find-package-file (name) + "Return the filename of the most recently built package of NAME." + (pb/archive-file-name (assoc name (package-build-archive-alist)))) + +(defun pb/package-buffer-info-vec () + "Return a vector of package info. +`package-buffer-info' returns a vector in older Emacs versions, +and a cl struct in Emacs HEAD. This wrapper normalises the results." + (let ((desc (package-buffer-info)) + (keywords (lm-keywords-list))) + (if (fboundp 'package-desc-create) + (let ((extras (package-desc-extras desc))) + (when (and keywords (not (assq :keywords extras))) + ;; Add keywords to package properties, if not already present + (push (cons :keywords keywords) extras)) + (vector (package-desc-name desc) + (package-desc-reqs desc) + (package-desc-summary desc) + (package-desc-version desc) + extras)) + ;; The regexp and the processing is taken from `lm-homepage' in Emacs 24.4 + (let* ((page (lm-header "\\(?:x-\\)?\\(?:homepage\\|url\\)")) + (homepage (if (and page (string-match "^<.+>$" page)) + (substring page 1 -1) + page)) + extras) + (when keywords (push (cons :keywords keywords) extras)) + (when homepage (push (cons :url homepage) extras)) + (vector (aref desc 0) + (aref desc 1) + (aref desc 2) + (aref desc 3) + extras))))) + + +;;; Public interface +;;;###autoload +(defun package-build-archive (name) + "Build a package archive for package NAME." + (interactive (list (pb/package-name-completing-read))) + (let* ((file-name (symbol-name name)) + (rcp (or (cdr (assoc name (package-build-recipe-alist))) + (error "Cannot find package %s" file-name))) + (pkg-working-dir + (file-name-as-directory + (expand-file-name file-name package-build-working-dir)))) + + (unless (file-exists-p package-build-archive-dir) + (pb/message "Creating directory %s" package-build-archive-dir) + (make-directory package-build-archive-dir)) + + (pb/message "\n;;; %s\n" file-name) + (let* ((version (package-version-join + (version-to-list + (or (package-build-checkout name rcp pkg-working-dir) + (error "No valid package version found!"))))) + (default-directory package-build-working-dir) + (start-time (current-time)) + (archive-entry (package-build-package (symbol-name name) + version + (pb/config-file-list rcp) + pkg-working-dir + package-build-archive-dir))) + (pb/dump archive-entry (pb/entry-file-name archive-entry)) + (when package-build-write-melpa-badge-images + (pb/write-melpa-badge-image (symbol-name name) version package-build-archive-dir)) + (pb/message "Built in %.3fs, finished at %s" + (time-to-seconds (time-since start-time)) + (current-time-string)) + file-name))) + +;;;###autoload +(defun package-build-package (package-name version file-specs source-dir target-dir) + "Create PACKAGE-NAME with VERSION. + +The information in FILE-SPECS is used to gather files from +SOURCE-DIR. + +The resulting package will be stored as a .el or .tar file in +TARGET-DIR, depending on whether there are multiple files. + +Argument FILE-SPECS is a list of specs for source files, which +should be relative to SOURCE-DIR. The specs can be wildcards, +and optionally specify different target paths. They extended +syntax is currently only documented in the MELPA README. You can +simply pass `package-build-default-files-spec' in most cases. + +Returns the archive entry for the package." + (when (symbolp package-name) + (setq package-name (symbol-name package-name))) + (let ((files (package-build-expand-file-specs source-dir file-specs))) + (unless (equal file-specs package-build-default-files-spec) + (when (equal files (package-build-expand-file-specs + source-dir package-build-default-files-spec nil t)) + (pb/message "Note: this :files spec is equivalent to the default."))) + (cond + ((not version) + (error "Unable to check out repository for %s" package-name)) + ((= 1 (length files)) + (pb/build-single-file-package package-name version (caar files) source-dir target-dir)) + ((< 1 (length files)) + (pb/build-multi-file-package package-name version files source-dir target-dir)) + (t (error "Unable to find files matching recipe patterns"))))) + +(defun pb/build-single-file-package (package-name version file source-dir target-dir) + (let* ((pkg-source (expand-file-name file source-dir)) + (pkg-target (expand-file-name + (concat package-name "-" version ".el") + target-dir)) + (pkg-info (pb/merge-package-info + (pb/get-package-info pkg-source) + package-name + version))) + (unless (string-equal (downcase (concat package-name ".el")) + (downcase (file-name-nondirectory pkg-source))) + (error "Single file %s does not match package name %s" + (file-name-nondirectory pkg-source) package-name)) + (when (file-exists-p pkg-target) + (delete-file pkg-target)) + (copy-file pkg-source pkg-target) + (let ((enable-local-variables nil) + (make-backup-files nil)) + (with-current-buffer (find-file pkg-target) + (pb/update-or-insert-version version) + (pb/ensure-ends-here-line pkg-source) + (write-file pkg-target nil) + (condition-case err + (pb/package-buffer-info-vec) + (error + (pb/message "Warning: %S" err))) + (kill-buffer))) + + (pb/write-pkg-readme target-dir + (pb/find-package-commentary pkg-source) + package-name) + (pb/archive-entry pkg-info 'single))) + +(defun pb/build-multi-file-package (package-name version files source-dir target-dir) + (let* ((tmp-dir (file-name-as-directory (make-temp-file package-name t))) + (pkg-dir-name (concat package-name "-" version)) + (pkg-tmp-dir (expand-file-name pkg-dir-name tmp-dir)) + (pkg-file (concat package-name "-pkg.el")) + (pkg-file-source (or (pb/find-source-file pkg-file files) + pkg-file)) + (file-source (concat package-name ".el")) + (pkg-source (or (pb/find-source-file file-source files) + file-source)) + (pkg-info (pb/merge-package-info + (let ((default-directory source-dir)) + (or (pb/get-pkg-file-info pkg-file-source) + ;; some packages (like magit) provide name-pkg.el.in + (pb/get-pkg-file-info + (expand-file-name (concat pkg-file ".in") + (file-name-directory pkg-source))) + (pb/get-package-info pkg-source))) + package-name + version))) + (pb/copy-package-files files source-dir pkg-tmp-dir) + (pb/write-pkg-file (expand-file-name pkg-file + (file-name-as-directory pkg-tmp-dir)) + pkg-info) + + (pb/generate-info-files files source-dir pkg-tmp-dir) + (pb/generate-dir-file files pkg-tmp-dir) + + (let ((default-directory tmp-dir)) + (pb/create-tar (expand-file-name (concat package-name "-" version ".tar") + target-dir) + pkg-dir-name)) + + (let ((default-directory source-dir)) + (pb/write-pkg-readme target-dir + (pb/find-package-commentary pkg-source) + package-name)) + + (delete-directory pkg-tmp-dir t nil) + (pb/archive-entry pkg-info 'tar))) + + +;; In future we should provide a hook, and perform this step in a separate package. +;; Note also that it would be straightforward to generate the SVG ourselves, which would +;; save the network overhead. +(defun pb/write-melpa-badge-image (package-name version target-dir) + (url-copy-file + (concat "http://img.shields.io/badge/" + (if package-build-stable "melpa stable" "melpa") + "-" + (url-hexify-string version) + "-" + (if package-build-stable "3e999f" "922793") + ".svg") + (expand-file-name (concat package-name "-badge.svg") target-dir) + t)) + + +;;; Helpers for recipe authors + +(defvar package-build-minor-mode-map + (let ((m (make-sparse-keymap))) + (define-key m (kbd "C-c C-c") 'package-build-current-recipe) + m) + "Keymap for `package-build-minor-mode'.") + +(define-minor-mode package-build-minor-mode + "Helpful functionality for building packages." + nil + " PBuild" + package-build-minor-mode-map) + +;;;###autoload +(defun package-build-create-recipe (name fetcher) + "Create a new recipe for package NAME using FETCHER." + (interactive + (list (intern (read-string "Package name: ")) + (intern + (let ((fetcher-types (mapcar #'symbol-name '(github git wiki bzr hg cvs svn)))) + (completing-read + "Fetcher: " + fetcher-types + nil t nil nil (car fetcher-types)))))) + (let ((recipe-file (expand-file-name (symbol-name name) package-build-recipes-dir))) + (when (file-exists-p recipe-file) + (error "Recipe already exists")) + (find-file recipe-file) + (let* ((extra-params + (cond + ((eq 'github fetcher) '(:repo "USER/REPO")) + ((eq 'wiki fetcher) '()) + (t '(:url "SCM_URL_HERE")))) + (template `(,name :fetcher ,fetcher ,@extra-params))) + (insert (pp-to-string template)) + (emacs-lisp-mode) + (package-build-minor-mode) + (goto-char (point-min))))) + +;;;###autoload +(defun package-build-current-recipe () + "Build archive for the recipe defined in the current buffer." + (interactive) + (unless (and (buffer-file-name) + (file-equal-p (file-name-directory (buffer-file-name)) + package-build-recipes-dir)) + (error "Buffer is not visiting a recipe")) + (when (buffer-modified-p) + (if (y-or-n-p (format "Save file %s? " buffer-file-name)) + (save-buffer) + (error "Aborting"))) + (check-parens) + (package-build-reinitialize) + (let ((pkg-name (intern (file-name-nondirectory (buffer-file-name))))) + (package-build-archive pkg-name) + (package-build-dump-archive-contents) + (let ((output-buffer-name "*package-build-result*")) + (with-output-to-temp-buffer output-buffer-name + (princ ";; Please check the following package descriptor.\n") + (princ ";; If the correct package description or dependencies are missing,\n") + (princ ";; then the source .el file is likely malformed, and should be fixed.\n") + (pp (assoc pkg-name (package-build-archive-alist)))) + (with-current-buffer output-buffer-name + (emacs-lisp-mode) + (view-mode))) + (when (yes-or-no-p "Install new package? ") + (package-install-file (pb/find-package-file pkg-name))))) + +(defun package-build-archive-ignore-errors (pkg) + "Build archive for package PKG, ignoring any errors." + (interactive (list (pb/package-name-completing-read))) + (let* ((debug-on-error t) + (debug-on-signal t) + (pb/debugger-return nil) + (debugger (lambda (&rest args) + (setq pb/debugger-return (with-output-to-string + (backtrace)))))) + (condition-case err + (package-build-archive pkg) + (error + (pb/message "%s" (error-message-string err)) + nil)))) + + + +;;;###autoload +(defun package-build-all () + "Build all packages in the `package-build-recipe-alist'." + (interactive) + (let ((failed (cl-loop for pkg in (mapcar 'car (package-build-recipe-alist)) + when (not (package-build-archive-ignore-errors pkg)) + collect pkg))) + (if (not failed) + (princ "\nSuccessfully Compiled All Packages\n") + (princ "\nFailed to Build the Following Packages\n") + (princ (mapconcat 'symbol-name failed "\n")) + (princ "\n"))) + (package-build-cleanup)) + +(defun package-build-cleanup () + "Remove previously-built packages that no longer have recipes." + (interactive) + (let* ((known-package-names (mapcar 'car (package-build-recipe-alist))) + (stale-archives (cl-loop for built in (pb/archive-entries) + when (not (memq (car built) known-package-names)) + collect built))) + (mapc 'pb/remove-archive-files stale-archives) + (package-build-dump-archive-contents))) + +(defun package-build-recipe-alist () + "Retun the list of avalailable packages." + (unless pb/recipe-alist-initialized + (setq pb/recipe-alist (pb/read-recipes-ignore-errors) + pb/recipe-alist-initialized t)) + pb/recipe-alist) + +(defun package-build-archive-alist () + "Return the archive list." + (cdr (pb/read-from-file + (expand-file-name "archive-contents" + package-build-archive-dir)))) + +(defun package-build-reinitialize () + "Forget any information about packages which have already been built." + (interactive) + (setq pb/recipe-alist-initialized nil)) + +(defun package-build-dump-archive-contents (&optional file-name) + "Dump the list of built packages to FILE-NAME. + +If FILE-NAME is not specified, the default archive-contents file is used." + (pb/dump (cons 1 (pb/archive-entries)) + (or file-name + (expand-file-name "archive-contents" package-build-archive-dir)))) + +(defun pb/archive-entries () + "Read all .entry files from the archive directory and return a list of all entries." + (let ((entries '())) + (dolist (new (mapcar 'pb/read-from-file + (directory-files package-build-archive-dir t + ".*\.entry$")) + entries) + (let ((old (assq (car new) entries))) + (when old + (when (version-list-< (elt (cdr new) 0) + (elt (cdr old) 0)) + ;; swap old and new + (cl-rotatef old new)) + (pb/remove-archive-files old) + (setq entries (remove old entries))) + (add-to-list 'entries new))))) + + + +;;; Exporting data as json + +(defun package-build-recipe-alist-as-json (file-name) + "Dump the recipe list to FILE-NAME as json." + (interactive) + (with-temp-file file-name + (insert (json-encode (package-build-recipe-alist))))) + +(defun pb/sym-to-keyword (s) + "Return a version of symbol S as a :keyword." + (intern (concat ":" (symbol-name s)))) + +(defun pb/pkg-info-for-json (info) + "Convert INFO into a data structure which will serialize to JSON in the desired shape." + (let* ((ver (elt info 0)) + (deps (elt info 1)) + (desc (elt info 2)) + (type (elt info 3)) + (props (when (> (length info) 4) (elt info 4)))) + (list :ver ver + :deps (apply 'append + (mapcar (lambda (dep) + (list (pb/sym-to-keyword (car dep)) + (cadr dep))) + deps)) + :desc desc + :type type + :props props))) + +(defun pb/archive-alist-for-json () + "Return the archive alist in a form suitable for JSON encoding." + (apply 'append + (mapcar (lambda (entry) + (list (pb/sym-to-keyword (car entry)) + (pb/pkg-info-for-json (cdr entry)))) + (package-build-archive-alist)))) + +(defun package-build-archive-alist-as-json (file-name) + "Dump the build packages list to FILE-NAME as json." + (interactive) + (with-temp-file file-name + (insert (json-encode (pb/archive-alist-for-json))))) + +(provide 'package-build) + +;; Local Variables: +;; coding: utf-8 +;; eval: (checkdoc-minor-mode 1) +;; End: + +;;; package-build.el ends here diff --git a/pkgs/applications/editors/emacs-24/packages/setup-hook.sh b/pkgs/applications/editors/emacs-24/packages/setup-hook.sh new file mode 100644 index 00000000000..defef45b55f --- /dev/null +++ b/pkgs/applications/editors/emacs-24/packages/setup-hook.sh @@ -0,0 +1,7 @@ +addEmacsVars () { + if test -d $1/share/emacs/site-lisp; then + export EMACSLOADPATH="$1/share/emacs/site-lisp:$EMACSLOADPATH" + fi +} + +envHooks+=(addEmacsVars) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f0c98ce6c2f..6d3c8729956 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9908,6 +9908,13 @@ let }); emacs24Macport = self.emacs24Macport_24_4; + emacsMelpa = import ../applications/editors/emacs-24/packages { + inherit stdenv pkgs fetchurl fetchgit fetchFromGitHub emacs texinfo; + external = { + inherit (haskellngPackages) ghc-mod structured-haskell-mode; + }; + }; + emacsPackages = emacs: self: let callPackage = newScope self; in rec { inherit emacs; From 9a77480b0ea3e5123849569c3b9f18673eee0a35 Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Sun, 8 Feb 2015 17:27:06 -0800 Subject: [PATCH 018/197] pull package-build.el from github --- .../editors/emacs-24/packages/melpa.nix | 11 +- .../emacs-24/packages/package-build.el | 1333 ----------------- 2 files changed, 8 insertions(+), 1336 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-24/packages/package-build.el diff --git a/pkgs/applications/editors/emacs-24/packages/melpa.nix b/pkgs/applications/editors/emacs-24/packages/melpa.nix index 45d97b74e51..23db8f1c5a3 100644 --- a/pkgs/applications/editors/emacs-24/packages/melpa.nix +++ b/pkgs/applications/editors/emacs-24/packages/melpa.nix @@ -11,6 +11,11 @@ let optionals = stdenv.lib.optionals; optionalString = stdenv.lib.optionalString; filter = stdenv.lib.filter; + + packageBuild = fetchurl { + url = https://raw.githubusercontent.com/milkypostman/melpa/12a862e5c5c62ce627dab83d7cf2cca6e8b56c47/package-build.el; + sha256 = "1nviyyprypz7nmam9rwli4yv3kxh170glfbznryrp4czxkrjjdhk"; + }; in @@ -71,7 +76,7 @@ in buildPhase = '' eval "$preBuild" - emacs --batch -Q -l ${./package-build.el} -l ${./melpa2nix.el} \ + emacs --batch -Q -l $packageBuild -l ${./melpa2nix.el} \ -f melpa2nix-build-package \ ${self.pname} ${self.version} ${self.targets} @@ -81,7 +86,7 @@ in installPhase = '' eval "$preInstall" - emacs --batch -Q -l ${./package-build.el} -l ${./melpa2nix.el} \ + emacs --batch -Q -l $packageBuild -l ${./melpa2nix.el} \ -f melpa2nix-install-package \ ${self.fname}.* $out/share/emacs/site-lisp/elpa @@ -90,7 +95,7 @@ in # We inherit stdenv and emacs so that they can be used # in melpa derivations. - inherit stdenv emacs texinfo; + inherit stdenv emacs texinfo packageBuild; }; in stdenv.mkDerivation (postprocess (let super = defaults self // args self; diff --git a/pkgs/applications/editors/emacs-24/packages/package-build.el b/pkgs/applications/editors/emacs-24/packages/package-build.el deleted file mode 100644 index c4554de8366..00000000000 --- a/pkgs/applications/editors/emacs-24/packages/package-build.el +++ /dev/null @@ -1,1333 +0,0 @@ -;;; package-build.el --- Tools for assembling a package archive - -;; Copyright (C) 2011-2013 Donald Ephraim Curtis -;; Copyright (C) 2012-2014 Steve Purcell -;; Copyright (C) 2009 Phil Hagelberg - -;; Author: Donald Ephraim Curtis -;; Created: 2011-09-30 -;; Version: 0.1 -;; Keywords: tools -;; Package-Requires: ((cl-lib "0.2")) - -;; This file is not (yet) part of GNU Emacs. -;; However, it is distributed under the same license. - -;; GNU Emacs is free software; you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation; either version 3, or (at your option) -;; any later version. - -;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. - -;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -;; Boston, MA 02110-1301, USA. - -;;; Commentary: - -;; This file allows a curator to publish an archive of Emacs packages. - -;; The archive is generated from a set of recipes which describe elisp -;; projects and repositories from which to get them. The term -;; "package" here is used to mean a specific version of a project that -;; is prepared for download and installation. - -;;; Code: - -(require 'cl-lib) - -(require 'package) -(require 'lisp-mnt) -(require 'json) - -(defconst pb/this-dir (file-name-directory (or load-file-name (buffer-file-name)))) - -(defgroup package-build nil - "Facilities for building package.el-compliant packages from upstream source code." - :group 'development) - -(defcustom package-build-working-dir (expand-file-name "working/" pb/this-dir) - "Directory in which to keep checkouts." - :group 'package-build - :type 'string) - -(defcustom package-build-archive-dir (expand-file-name "packages/" pb/this-dir) - "Directory in which to keep compiled archives." - :group 'package-build - :type 'string) - -(defcustom package-build-recipes-dir (expand-file-name "recipes/" pb/this-dir) - "Directory containing recipe files." - :group 'package-build - :type 'string) - -(defcustom package-build-verbose t - "When non-nil, `package-build' feels free to print information about its progress." - :group 'package-build - :type 'boolean) - -(defcustom package-build-stable nil - "When non-nil, `package-build' tries to build packages from versions-tagged code." - :group 'package-build - :type 'boolean) - -(defcustom package-build-timeout-executable - (let ((prog (or (executable-find "timeout") - (executable-find "gtimeout")))) - (when (and prog - (string-match-p "^ *-k" (shell-command-to-string (concat prog " --help")))) - prog)) - "Path to a GNU coreutils \"timeout\" command if available. -This must be a version which supports the \"-k\" option." - :group 'package-build - :type '(file :must-match t)) - -(defcustom package-build-tar-executable - (or (executable-find "gtar") - (executable-find "tar")) - "Path to a (preferably GNU) tar command. -Certain package names (e.g. \"@\") may not work properly with a BSD tar." - :group 'package-build - :type '(file :must-match t)) - -(defcustom package-build-write-melpa-badge-images nil - "When non-nil, write MELPA badge images alongside packages, for use on github pages etc." - :group 'package-build - :type 'boolean) - -;;; Internal Variables - -(defvar pb/recipe-alist nil - "Internal list of package build specs. - -Do not use this directly. Use `package-build-recipe-alist' -function.") - -(defvar pb/recipe-alist-initialized nil - "Determines if `pb/recipe-alist` has been initialized.") - -(defvar pb/archive-alist nil - "Internal list of already-built packages, in the standard package.el format. - -Do not use this directly. Use `package-build-archive-alist' -function for access to this function") - -(defvar pb/archive-alist-initialized nil - "Determines if pb/archive-alist has been initialized.") - -(defconst package-build-default-files-spec - '("*.el" "*.el.in" "dir" - "*.info" "*.texi" "*.texinfo" - "doc/dir" "doc/*.info" "doc/*.texi" "doc/*.texinfo" - (:exclude ".dir-locals.el" "tests.el" "*-test.el" "*-tests.el")) - "Default value for :files attribute in recipes.") - -(defun pb/message (format-string &rest args) - "Log a message using FORMAT-STRING and ARGS as per `message'." - (when package-build-verbose - (apply 'message format-string args))) - -(defun pb/slurp-file (file-name) - "Return the contents of FILE-NAME as a string, or nil if no such file exists." - (when (file-exists-p file-name) - (with-temp-buffer - (insert-file-contents file-name) - (buffer-substring-no-properties (point-min) (point-max))))) - -(defun pb/string-rtrim (str) - "Remove trailing whitespace from `STR'." - (replace-regexp-in-string "[ \t\n]*$" "" str)) - -(defun pb/parse-time (str) - "Parse STR as a time, and format as a YYYYMMDD.HHMM string." - ;; We remove zero-padding the HH portion, as it is lost - ;; when stored in the archive-contents - (let* ((s (substring-no-properties str)) - (time (date-to-time - (if (string-match "^\\([0-9]\\{4\\}\\)/\\([0-9]\\{2\\}\\)/\\([0-9]\\{2\\}\\) \\([0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\}\\)$" str) - (concat (match-string 1 str) "-" (match-string 2 str) "-" - (match-string 3 str) " " (match-string 4 str)) - str)))) - (concat (format-time-string "%Y%m%d." time) - (format "%d" (or (string-to-number (format-time-string "%H%M" time)) 0))))) - -(defun pb/string-match-all (regex str &rest groups) - "Find every match for `REGEX' within `STR'. -Return a list containing the full match string and match for -groups `GROUPS'. The return list is of the form - ((FULL GROUP1 GROUP2 ...) ...) -where FULL is the complete regexp match and -GROUP1, GROUP2, ... are the regex groups specified by the -`GROUPS' argument. If `GROUPS' is nil then FULL and GROUP1 will -be identical." - (let (result - (pos 0) - (groups (or groups '(0)))) - (while (string-match regex str pos) - (push (cons (match-string 0 str) (mapcar - (lambda (group) - (match-string group str)) - groups)) - result) - (setq pos (match-end 0))) - result)) - -(defun pb/find-parse-time (regex &optional bound) - "Find REGEX in current buffer and format as a time version, optionally looking only as far as BOUND." - (pb/parse-time (progn (re-search-backward regex bound) - (match-string-no-properties 1)))) - -(defun pb/valid-version-string (str) - "Return true if STR is a valid version, otherwise return nil." - (ignore-errors (version-to-list str))) - -(defun pb/find-tag-version-newest (regex &optional bound &rest additional-groups) - "Find the newest version matching REGEX, optionally looking only as far as BOUND." - (let* ((text (buffer-substring-no-properties - (or bound (point-min)) (point))) - (tags (cl-remove-if-not - (lambda (tag-version) - (pb/valid-version-string (cadr tag-version))) - (apply 'pb/string-match-all regex text 1 additional-groups)))) - (car (nreverse (sort tags (lambda (v1 v2) - (version< (cadr v1) (cadr v2)))))))) - -(defun pb/find-parse-time-latest (regex &optional bound) - "Find the latest timestamp matching REGEX, optionally looking only as far as BOUND." - (let* ((text (buffer-substring-no-properties - (or bound (point-min)) (point))) - (times (mapcar 'pb/parse-time - (mapcar 'cadr (pb/string-match-all regex text 1))))) - (car (nreverse (sort times 'string<))))) - -(defun pb/run-process (dir command &rest args) - "In DIR (or `default-directory' if unset) run COMMAND with ARGS. -Output is written to the current buffer." - (let* ((default-directory (file-name-as-directory (or dir default-directory))) - (argv (if package-build-timeout-executable - (append (list package-build-timeout-executable "-k" "60" "600" command) args) - (cons command args)))) - (unless (file-directory-p default-directory) - (error "Can't run process in non-existent directory: %s" default-directory)) - (let ((exit-code (apply 'process-file (car argv) nil (current-buffer) t (cdr argv)))) - (or (zerop exit-code) - (error "Command '%s' exited with non-zero status %d: %s" - argv exit-code (buffer-string)))))) - -(defun pb/run-process-match (regex dir prog &rest args) - "Find match for REGEX when - in DIR, or `default-directory' if unset - we run PROG with ARGS." - (with-temp-buffer - (apply 'pb/run-process dir prog args) - (goto-char (point-min)) - (re-search-forward regex) - (match-string-no-properties 1))) - -(defun package-build-checkout (package-name config working-dir) - "Check out source for PACKAGE-NAME with CONFIG under WORKING-DIR. -In turn, this function uses the :fetcher option in the CONFIG to -choose a source-specific fetcher function, which it calls with -the same arguments. - -Returns a last-modification timestamp for the :files listed in -CONFIG, if any, or `package-build-default-files-spec' otherwise." - (let ((repo-type (plist-get config :fetcher))) - (pb/message "Fetcher: %s" repo-type) - (unless (eq 'wiki repo-type) - (pb/message "Source: %s\n" (or (plist-get config :repo) (plist-get config :url)))) - (funcall (intern (format "pb/checkout-%s" repo-type)) - package-name config (file-name-as-directory working-dir)))) - -(defvar pb/last-wiki-fetch-time 0 - "The time at which an emacswiki URL was last requested. -This is used to avoid exceeding the rate limit of 1 request per 2 -seconds; the server cuts off after 10 requests in 20 seconds.") - -(defvar pb/wiki-min-request-interval 3 - "The shortest permissible interval between successive requests for Emacswiki URLs.") - -(defmacro pb/with-wiki-rate-limit (&rest body) - "Rate-limit BODY code passed to this macro to match EmacsWiki's rate limiting." - (let ((now (cl-gensym)) - (elapsed (cl-gensym))) - `(let* ((,now (float-time)) - (,elapsed (- ,now pb/last-wiki-fetch-time))) - (when (< ,elapsed pb/wiki-min-request-interval) - (let ((wait (- pb/wiki-min-request-interval ,elapsed))) - (pb/message "Waiting %.2f secs before hitting Emacswiki again" wait) - (sleep-for wait))) - (unwind-protect - (progn ,@body) - (setq pb/last-wiki-fetch-time (float-time)))))) - -(defun pb/grab-wiki-file (filename) - "Download FILENAME from emacswiki, returning its last-modified time." - (let* ((download-url - (format "http://www.emacswiki.org/emacs/download/%s" filename)) - (wiki-url - (format "http://www.emacswiki.org/emacs/%s" filename))) - (pb/with-wiki-rate-limit - (url-copy-file download-url filename t)) - (when (zerop (nth 7 (file-attributes filename))) - (error "Wiki file %s was empty - has it been removed?" filename)) - ;; The Last-Modified response header for the download is actually - ;; correct for the file, but we have no access to that - ;; header. Instead, we must query the non-raw emacswiki page for - ;; the file. - ;; Since those Emacswiki lookups are time-consuming, we maintain a - ;; foo.el.stamp file containing ("SHA1" . "PARSED_TIME") - (let* ((new-content-hash (secure-hash 'sha1 (pb/slurp-file filename))) - (stamp-file (concat filename ".stamp")) - (stamp-info (pb/read-from-file stamp-file)) - (prev-content-hash (car stamp-info))) - (if (and prev-content-hash - (string-equal new-content-hash prev-content-hash)) - ;; File has not changed, so return old timestamp - (progn - (pb/message "%s is unchanged" filename) - (cdr stamp-info)) - (pb/message "%s has changed - checking mod time" filename) - (let ((new-timestamp - (with-current-buffer (pb/with-wiki-rate-limit - (url-retrieve-synchronously wiki-url)) - (unless (= 200 url-http-response-status) - (error "HTTP error %s fetching %s" url-http-response-status wiki-url)) - (goto-char (point-max)) - (pb/find-parse-time - "Last edited \\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} [0-9]\\{2\\}:[0-9]\\{2\\} [A-Z]\\{3\\}\\)" - url-http-end-of-headers)))) - (pb/dump (cons new-content-hash new-timestamp) stamp-file) - new-timestamp))))) - -(defun pb/checkout-wiki (name config dir) - "Checkout package NAME with config CONFIG from the EmacsWiki into DIR." - (unless package-build-stable - (with-current-buffer (get-buffer-create "*package-build-checkout*") - (unless (file-exists-p dir) - (make-directory dir)) - (let ((files (or (plist-get config :files) - (list (format "%s.el" name)))) - (default-directory dir)) - (car (nreverse (sort (mapcar 'pb/grab-wiki-file files) 'string-lessp))))))) - -(defun pb/darcs-repo (dir) - "Get the current darcs repo for DIR." - (pb/run-process-match "Default Remote: \\(.*\\)" dir "darcs" "show" "repo")) - -(defun pb/checkout-darcs (name config dir) - "Check package NAME with config CONFIG out of darcs into DIR." - (unless package-build-stable - (let ((repo (plist-get config :url))) - (with-current-buffer (get-buffer-create "*package-build-checkout*") - (cond - ((and (file-exists-p (expand-file-name "_darcs" dir)) - (string-equal (pb/darcs-repo dir) repo)) - (pb/princ-exists dir) - (pb/run-process dir "darcs" "pull")) - (t - (when (file-exists-p dir) - (delete-directory dir t)) - (pb/princ-checkout repo dir) - (pb/run-process nil "darcs" "get" repo dir))) - (apply 'pb/run-process dir "darcs" "changes" "--max-count" "1" - (pb/expand-source-file-list dir config)) - (pb/find-parse-time - "\\([a-zA-Z]\\{3\\} [a-zA-Z]\\{3\\} \\( \\|[0-9]\\)[0-9] [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\} [A-Za-z]\\{3\\} [0-9]\\{4\\}\\)"))))) - -(defun pb/fossil-repo (dir) - "Get the current fossil repo for DIR." - (pb/run-process-match "\\(.*\\)" dir "fossil" "remote-url")) - -(defun pb/checkout-fossil (name config dir) - "Check package NAME with config CONFIG out of fossil into DIR." - (unless package-build-stable - (let ((repo (plist-get config :url))) - (with-current-buffer (get-buffer-create "*package-build-checkout*") - (cond - ((and (or (file-exists-p (expand-file-name ".fslckout" dir)) - (file-exists-p (expand-file-name "_FOSSIL_" dir))) - (string-equal (pb/fossil-repo dir) repo)) - (pb/princ-exists dir) - (pb/run-process dir "fossil" "update")) - (t - (when (file-exists-p dir) - (delete-directory dir t)) - (pb/princ-checkout repo dir) - (make-directory dir) - (pb/run-process dir "fossil" "clone" repo "repo.fossil") - (pb/run-process dir "fossil" "open" "repo.fossil"))) - (pb/run-process dir "fossil" "timeline" "-n" "1" "-t" "ci") - (or (pb/find-parse-time - "=== \\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} ===\n[0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\}\\) ") - (error "No valid timestamps found!")))))) - -(defun pb/svn-repo (dir) - "Get the current svn repo for DIR." - (pb/run-process-match "URL: \\(.*\\)" dir "svn" "info")) - -(defun pb/trim (str &optional chr) - "Return a copy of STR without any trailing CHR (or space if unspecified)." - (if (equal (elt str (1- (length str))) (or chr ? )) - (substring str 0 (1- (length str))) - str)) - -(defun pb/princ-exists (dir) - "Print a message that the contents of DIR will be updated." - (pb/message "Updating %s" dir)) - -(defun pb/princ-checkout (repo dir) - "Print a message that REPO will be checked out into DIR." - (pb/message "Cloning %s to %s" repo dir)) - -(defun pb/checkout-svn (name config dir) - "Check package NAME with config CONFIG out of svn into DIR." - (unless package-build-stable - (with-current-buffer (get-buffer-create "*package-build-checkout*") - (let ((repo (pb/trim (plist-get config :url) ?/)) - (bound (goto-char (point-max)))) - (cond - ((and (file-exists-p (expand-file-name ".svn" dir)) - (string-equal (pb/svn-repo dir) repo)) - (pb/princ-exists dir) - (pb/run-process dir "svn" "up")) - (t - (when (file-exists-p dir) - (delete-directory dir t)) - (pb/princ-checkout repo dir) - (pb/run-process nil "svn" "checkout" repo dir))) - (apply 'pb/run-process dir "svn" "info" - (pb/expand-source-file-list dir config)) - (or (pb/find-parse-time-latest "Last Changed Date: \\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\}\\( [+-][0-9]\\{4\\}\\)?\\)" bound) - (error "No valid timestamps found!")))))) - - -(defun pb/cvs-repo (dir) - "Get the current CVS root and repository for DIR. - -Return a cons cell whose `car' is the root and whose `cdr' is the repository." - (apply 'cons - (mapcar (lambda (file) - (pb/string-rtrim (pb/slurp-file (expand-file-name file dir)))) - '("CVS/Root" "CVS/Repository")))) - -(defun pb/checkout-cvs (name config dir) - "Check package NAME with config CONFIG out of cvs into DIR." - (unless package-build-stable - (with-current-buffer (get-buffer-create "*package-build-checkout*") - (let ((root (pb/trim (plist-get config :url) ?/)) - (repo (or (plist-get config :module) (symbol-name name))) - (bound (goto-char (point-max)))) - (cond - ((and (file-exists-p (expand-file-name "CVS" dir)) - (equal (pb/cvs-repo dir) (cons root repo))) - (pb/princ-exists dir) - (pb/run-process dir "cvs" "update" "-dP")) - (t - (when (file-exists-p dir) - (delete-directory dir t)) - (pb/princ-checkout (format "%s from %s" repo root) dir) - ;; CVS insists on relative paths as target directory for checkout (for - ;; whatever reason), and puts "CVS" directories into every subdirectory - ;; of the current working directory given in the target path. To get CVS - ;; to just write to DIR, we need to execute CVS from the parent - ;; directory of DIR, and specific DIR as relative path. Hence all the - ;; following mucking around with paths. CVS is really horrid. - (let* ((dir (directory-file-name dir)) - (working-dir (file-name-directory dir)) - (target-dir (file-name-nondirectory dir))) - (pb/run-process working-dir "env" "TZ=UTC" "cvs" "-z3" "-d" root "checkout" - "-d" target-dir repo)))) - (apply 'pb/run-process dir "cvs" "log" - (pb/expand-source-file-list dir config)) - (or (pb/find-parse-time-latest "date: \\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\}\\( [+-][0-9]\\{4\\}\\)?\\)" bound) - (pb/find-parse-time-latest "date: \\([0-9]\\{4\\}/[0-9]\\{2\\}/[0-9]\\{2\\} [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\}\\);" bound) - (error "No valid timestamps found!")) - )))) - - -(defun pb/git-repo (dir) - "Get the current git repo for DIR." - (pb/run-process-match - "Fetch URL: \\(.*\\)" dir "git" "remote" "show" "-n" "origin")) - -(defun pb/git-head-branch (dir) - "Get the current git repo for DIR." - (or (ignore-errors - (pb/run-process-match - "HEAD branch: \\(.*\\)" dir "git" "remote" "show" "origin")) - "master")) - -(defun pb/checkout-git (name config dir) - "Check package NAME with config CONFIG out of git into DIR." - (let ((repo (plist-get config :url)) - (commit (or (plist-get config :commit) - (let ((branch (plist-get config :branch))) - (when branch - (concat "origin/" branch)))))) - (with-current-buffer (get-buffer-create "*package-build-checkout*") - (goto-char (point-max)) - (cond - ((and (file-exists-p (expand-file-name ".git" dir)) - (string-equal (pb/git-repo dir) repo)) - (pb/princ-exists dir) - (pb/run-process dir "git" "remote" "update")) - (t - (when (file-exists-p dir) - (delete-directory dir t)) - (pb/princ-checkout repo dir) - (pb/run-process nil "git" "clone" repo dir))) - (if package-build-stable - (let* ((bound (goto-char (point-max))) - (tag-version (and (pb/run-process dir "git" "tag") - (or (pb/find-tag-version-newest - "^\\(?:v[.-]?\\)?\\([0-9]+[^ \t\n]*\\)$" bound) - (error - "No valid stable versions found for %s" - name))))) - ;; Using reset --hard here to comply with what's used for - ;; unstable, but maybe this should be a checkout? - (pb/run-process dir "git" "reset" "--hard" (concat "tags/" (car tag-version))) - (pb/run-process dir "git" "submodule" "update" "--init" "--recursive") - (cadr tag-version)) - (pb/run-process dir "git" "reset" "--hard" - (or commit (concat "origin/" (pb/git-head-branch dir)))) - (pb/run-process dir "git" "submodule" "update" "--init" "--recursive") - (apply 'pb/run-process dir "git" "log" "--first-parent" "-n1" "--pretty=format:'\%ci'" - (pb/expand-source-file-list dir config)) - (pb/find-parse-time - "\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\}\\( [+-][0-9]\\{4\\}\\)?\\)"))))) - -(defun pb/checkout-github (name config dir) - "Check package NAME with config CONFIG out of github into DIR." - (let* ((url (format "git://github.com/%s.git" (plist-get config :repo)))) - (pb/checkout-git name (plist-put (copy-sequence config) :url url) dir))) - -(defun pb/bzr-expand-repo (repo) - "Get REPO expanded name." - (pb/run-process-match "\\(?:branch root\\|repository branch\\): \\(.*\\)" nil "bzr" "info" repo)) - -(defun pb/bzr-repo (dir) - "Get the current bzr repo for DIR." - (pb/run-process-match "parent branch: \\(.*\\)" dir "bzr" "info")) - -(defun pb/checkout-bzr (name config dir) - "Check package NAME with config CONFIG out of bzr into DIR." - (unless package-build-stable - (let ((repo (pb/bzr-expand-repo (plist-get config :url)))) - (with-current-buffer (get-buffer-create "*package-build-checkout*") - (goto-char (point-max)) - (cond - ((and (file-exists-p (expand-file-name ".bzr" dir)) - (string-equal (pb/bzr-repo dir) repo)) - (pb/princ-exists dir) - (pb/run-process dir "bzr" "merge")) - (t - (when (file-exists-p dir) - (delete-directory dir t)) - (pb/princ-checkout repo dir) - (pb/run-process nil "bzr" "branch" repo dir))) - (apply 'pb/run-process dir "bzr" "log" "-l1" - (pb/expand-source-file-list dir config)) - (pb/find-parse-time - "\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\}\\( [+-][0-9]\\{4\\}\\)?\\)"))))) - -(defun pb/hg-repo (dir) - "Get the current hg repo for DIR." - (pb/run-process-match "default = \\(.*\\)" dir "hg" "paths")) - -(defun pb/checkout-hg (name config dir) - "Check package NAME with config CONFIG out of hg into DIR." - (let ((repo (plist-get config :url))) - (with-current-buffer (get-buffer-create "*package-build-checkout*") - (goto-char (point-max)) - (cond - ((and (file-exists-p (expand-file-name ".hg" dir)) - (string-equal (pb/hg-repo dir) repo)) - (pb/princ-exists dir) - (pb/run-process dir "hg" "pull") - (pb/run-process dir "hg" "update")) - (t - (when (file-exists-p dir) - (delete-directory dir t)) - (pb/princ-checkout repo dir) - (pb/run-process nil "hg" "clone" repo dir))) - (if package-build-stable - (let* ((bound (goto-char (point-max))) - (tag-version (and (pb/run-process dir "hg" "tags") - (or (pb/find-tag-version-newest - "^\\(?:v[.-]?\\)?\\([0-9]+[^ \t\n]*\\)[ \t]*[0-9]+:\\([[:xdigit:]]+\\)$" - bound - 2) - (error - "No valid stable versions found for %s" - name))))) - (pb/run-process dir "hg" "update" (nth 2 tag-version)) - (cadr tag-version)) - (apply 'pb/run-process dir "hg" "log" "--style" "compact" "-l1" - (pb/expand-source-file-list dir config)) - (pb/find-parse-time - "\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} [0-9]\\{2\\}:[0-9]\\{2\\}\\( [+-][0-9]\\{4\\}\\)?\\)"))))) - -(defun pb/dump (data file &optional pretty-print) - "Write DATA to FILE as a Lisp sexp. -Optionally PRETTY-PRINT the data." - (with-temp-file file - (pb/message "File: %s" file) - (if pretty-print - (pp data (current-buffer)) - (print data (current-buffer))))) - -(defun pb/write-pkg-file (pkg-file pkg-info) - "Write PKG-FILE containing PKG-INFO." - (with-temp-file pkg-file - (pp - `(define-package - ,(aref pkg-info 0) - ,(aref pkg-info 3) - ,(aref pkg-info 2) - ',(mapcar - (lambda (elt) - (list (car elt) - (package-version-join (cadr elt)))) - (aref pkg-info 1)) - ;; Append our extra information - ,@(apply #'append (mapcar (lambda (entry) - (let ((value (cdr entry))) - (when (or (symbolp value) (listp value)) - ;; We must quote lists and symbols, - ;; because Emacs 24.3 and earlier evaluate - ;; the package information, which would - ;; break for unquoted symbols or lists - (setq value (list 'quote value))) - (list (car entry) value))) - (when (> (length pkg-info) 4) - (aref pkg-info 4))))) - (current-buffer)) - (princ ";; Local Variables:\n;; no-byte-compile: t\n;; End:\n" (current-buffer)))) - -(defun pb/read-from-file (file-name) - "Read and return the Lisp data stored in FILE-NAME, or nil if no such file exists." - (when (file-exists-p file-name) - (car (read-from-string (pb/slurp-file file-name))))) - -(defun pb/create-tar (file dir &optional files) - "Create a tar FILE containing the contents of DIR, or just FILES if non-nil." - (apply 'process-file - package-build-tar-executable nil - (get-buffer-create "*package-build-checkout*") - nil "-cvf" - file - "--exclude=.svn" - "--exclude=CVS" - "--exclude=.git*" - "--exclude=_darcs" - "--exclude=.fslckout" - "--exclude=_FOSSIL_" - "--exclude=.bzr" - "--exclude=.hg" - (or (mapcar (lambda (fn) (concat dir "/" fn)) files) (list dir)))) - - -(defun pb/find-package-commentary (file-path) - "Get commentary section from FILE-PATH." - (when (file-exists-p file-path) - (with-temp-buffer - (insert-file-contents file-path) - (lm-commentary)))) - -(defun pb/write-pkg-readme (target-dir commentary file-name) - "In TARGET-DIR, write COMMENTARY to a -readme.txt file prefixed with FILE-NAME." - (when commentary - (with-temp-buffer - (insert commentary) - ;; Adapted from `describe-package-1'. - (goto-char (point-min)) - (save-excursion - (when (re-search-forward "^;;; Commentary:\n" nil t) - (replace-match "")) - (while (re-search-forward "^\\(;+ ?\\)" nil t) - (replace-match "")) - (goto-char (point-min)) - (when (re-search-forward "\\`\\( *\n\\)+" nil t) - (replace-match ""))) - (delete-trailing-whitespace) - (let ((coding-system-for-write buffer-file-coding-system)) - (write-region nil nil - (pb/readme-file-name target-dir file-name)))))) - -(defun pb/readme-file-name (target-dir file-name) - "Name of the readme file in TARGET-DIR for the package FILE-NAME." - (expand-file-name (concat file-name "-readme.txt") - target-dir)) - -(defun pb/update-or-insert-version (version) - "Ensure current buffer has a \"Version: VERSION\" header." - (goto-char (point-min)) - (if (re-search-forward "^;;;* *Version: *" nil t) - (progn - (move-beginning-of-line nil) - (search-forward "V" nil t) - (backward-char) - (insert "X-Original-") - (move-beginning-of-line nil)) - (forward-line)) - (insert (format ";; Version: %s" version)) - (newline)) - -(defun pb/ensure-ends-here-line (file-path) - "Add a 'FILE-PATH ends here' trailing line if missing." - (save-excursion - (goto-char (point-min)) - (let* ((fname (file-name-nondirectory file-path)) - (trailer (concat ";;; " fname " ends here"))) - (unless (search-forward trailer nil t) - (goto-char (point-max)) - (newline) - (insert trailer) - (newline))))) - -(defun pb/get-package-info (file-path) - "Get a vector of package info from the docstrings in FILE-PATH." - (when (file-exists-p file-path) - (ignore-errors - (with-temp-buffer - (insert-file-contents file-path) - ;; next few lines are a hack for some packages that aren't - ;; commented properly. - (pb/update-or-insert-version "0") - (pb/ensure-ends-here-line file-path) - (cl-flet ((package-strip-rcs-id (str) "0")) - (pb/package-buffer-info-vec)))))) - -(defun pb/get-pkg-file-info (file-path) - "Get a vector of package info from \"-pkg.el\" file FILE-PATH." - (when (file-exists-p file-path) - (let ((package-def (pb/read-from-file file-path))) - (if (eq 'define-package (car package-def)) - (let ((pkgfile-info (cdr package-def))) - (vector - (nth 0 pkgfile-info) - (mapcar - (lambda (elt) - (list (car elt) (version-to-list (cadr elt)))) - (eval (nth 3 pkgfile-info))) - (nth 2 pkgfile-info) - (nth 1 pkgfile-info))) - (error "No define-package found in %s" file-path))))) - -(defun pb/merge-package-info (pkg-info name version) - "Return a version of PKG-INFO updated with NAME, VERSION and info from CONFIG. -If PKG-INFO is nil, an empty one is created." - (let* ((merged (or (copy-sequence pkg-info) - (vector name nil "No description available." version)))) - (aset merged 0 name) - (aset merged 3 version) - merged)) - -(defun pb/archive-entry (pkg-info type) - "Return the archive-contents cons cell for PKG-INFO and TYPE." - (let* ((name (intern (aref pkg-info 0))) - (requires (aref pkg-info 1)) - (desc (or (aref pkg-info 2) "No description available.")) - (version (aref pkg-info 3)) - (extras (when (> (length pkg-info) 4) - (aref pkg-info 4)))) - (cons name - (vector (version-to-list version) - requires - desc - type - extras)))) - -(defun pb/archive-file-name (archive-entry) - "Return the path of the file in which the package for ARCHIVE-ENTRY is stored." - (let* ((name (car archive-entry)) - (pkg-info (cdr archive-entry)) - (version (package-version-join (aref pkg-info 0))) - (flavour (aref pkg-info 3))) - (expand-file-name - (format "%s-%s.%s" name version (if (eq flavour 'single) "el" "tar")) - package-build-archive-dir))) - -(defun pb/entry-file-name (archive-entry) - "Return the path of the file in which the package for ARCHIVE-ENTRY is stored." - (let* ((name (car archive-entry)) - (pkg-info (cdr archive-entry)) - (version (package-version-join (aref pkg-info 0)))) - (expand-file-name - (format "%s-%s.entry" name version) - package-build-archive-dir))) - -(defun pb/delete-file-if-exists (file) - "Delete FILE if it exists." - (when (file-exists-p file) - (delete-file file))) - -(defun pb/remove-archive-files (archive-entry) - "Remove ARCHIVE-ENTRY from archive-contents, and delete associated file. -Note that the working directory (if present) is not deleted by -this function, since the archive list may contain another version -of the same-named package which is to be kept." - (pb/message "Removing archive: %s" archive-entry) - (mapcar 'pb/delete-file-if-exists - (list (pb/archive-file-name archive-entry) - (pb/entry-file-name archive-entry)))) - -(defun pb/read-recipe (file-name) - "Return the plist of recipe info for the package called FILE-NAME." - (let ((pkg-info (pb/read-from-file file-name))) - (if (string= (symbol-name (car pkg-info)) - (file-name-nondirectory file-name)) - pkg-info - (error "Recipe '%s' contains mismatched package name '%s'" - (file-name-nondirectory file-name) - (car pkg-info))))) - -(defun pb/read-recipes () - "Return a list of data structures for all recipes in `package-build-recipes-dir'." - (cl-loop for file-name in (directory-files package-build-recipes-dir t "^[^.]") - collect (pb/read-recipe file-name))) - -(defun pb/read-recipes-ignore-errors () - "Return a list of data structures for all recipes in `package-build-recipes-dir'." - (cl-loop for file-name in (directory-files package-build-recipes-dir t "^[^.]") - for pkg-info = (condition-case err (pb/read-recipe file-name) - (error (pb/message "Error reading recipe %s: %s" - file-name - (error-message-string err)) - nil)) - when pkg-info - collect pkg-info)) - - -(defun package-build-expand-file-specs (dir specs &optional subdir allow-empty) - "In DIR, expand SPECS, optionally under SUBDIR. -The result is a list of (SOURCE . DEST), where SOURCE is a source -file path and DEST is the relative path to which it should be copied. - -If the resulting list is empty, an error will be reported. Pass t -for ALLOW-EMPTY to prevent this error." - (let ((default-directory dir) - (prefix (if subdir (format "%s/" subdir) "")) - (lst)) - (dolist (entry specs lst) - (setq lst - (if (consp entry) - (if (eq :exclude (car entry)) - (cl-nset-difference lst - (package-build-expand-file-specs dir (cdr entry) nil t) - :key 'car - :test 'equal) - (nconc lst - (package-build-expand-file-specs - dir - (cdr entry) - (concat prefix (car entry)) - t))) - (nconc - lst (mapcar (lambda (f) - (let ((destname))) - (cons f - (concat prefix - (replace-regexp-in-string - "\\.in\\'" - "" - (file-name-nondirectory f))))) - (file-expand-wildcards entry)))))) - (when (and (null lst) (not allow-empty)) - (error "No matching file(s) found in %s: %s" dir specs)) - lst)) - - -(defun pb/config-file-list (config) - "Get the :files spec from CONFIG, or return `package-build-default-files-spec'." - (or (plist-get config :files) package-build-default-files-spec)) - -(defun pb/expand-source-file-list (dir config) - "Shorthand way to expand paths in DIR for source files listed in CONFIG." - (mapcar 'car (package-build-expand-file-specs dir (pb/config-file-list config)))) - -(defun pb/generate-info-files (files source-dir target-dir) - "Create .info files from any .texi files listed in FILES. - -The source and destination file paths are expanded in SOURCE-DIR -and TARGET-DIR respectively. - -Any of the original .texi(nfo) files found in TARGET-DIR are -deleted." - (dolist (spec files) - (let* ((source-file (car spec)) - (source-path (expand-file-name source-file source-dir)) - (dest-file (cdr spec)) - (info-path (expand-file-name - (concat (file-name-sans-extension dest-file) ".info") - target-dir))) - (when (string-match ".texi\\(nfo\\)?$" source-file) - (when (not (file-exists-p info-path)) - (with-current-buffer (get-buffer-create "*package-build-info*") - (ignore-errors - (pb/run-process - (file-name-directory source-path) - "makeinfo" - source-path - "-o" - info-path) - (pb/message "Created %s" info-path)))) - (pb/message "Removing %s" (expand-file-name dest-file target-dir)) - (delete-file (expand-file-name dest-file target-dir)))))) - -(defun pb/generate-dir-file (files target-dir) - "Create dir file from any .info files listed in FILES in TARGET-DIR." - (dolist (spec files) - (let* ((source-file (car spec)) - (dest-file (cdr spec)) - (info-path (expand-file-name - (concat (file-name-sans-extension dest-file) ".info") - target-dir))) - (when (and (or (string-match ".info$" source-file) - (string-match ".texi\\(nfo\\)?$" source-file)) - (file-exists-p info-path)) - (with-current-buffer (get-buffer-create "*package-build-info*") - (ignore-errors - (pb/run-process - nil - "install-info" - (concat "--dir=" (expand-file-name "dir" target-dir)) - info-path))))))) - -(defun pb/copy-package-files (files source-dir target-dir) - "Copy FILES from SOURCE-DIR to TARGET-DIR. -FILES is a list of (SOURCE . DEST) relative filepath pairs." - (cl-loop for (source-file . dest-file) in files - do (pb/copy-file - (expand-file-name source-file source-dir) - (expand-file-name dest-file target-dir)))) - -(defun pb/copy-file (file newname) - "Copy FILE to NEWNAME and create parent directories for NEWNAME if they don't exist." - (let ((newdir (file-name-directory newname))) - (unless (file-exists-p newdir) - (make-directory newdir t))) - (cond - ((file-regular-p file) - (pb/message "%s -> %s" file newname) - (copy-file file newname)) - ((file-directory-p file) - (pb/message "%s => %s" file newname) - (copy-directory file newname)))) - - -(defun pb/package-name-completing-read () - "Prompt for a package name, returning a symbol." - (intern (completing-read "Package: " (package-build-recipe-alist)))) - -(defun pb/find-source-file (target files) - "Search for source of TARGET in FILES." - (let* ((entry (rassoc target files))) - (when entry (car entry)))) - -(defun pb/find-package-file (name) - "Return the filename of the most recently built package of NAME." - (pb/archive-file-name (assoc name (package-build-archive-alist)))) - -(defun pb/package-buffer-info-vec () - "Return a vector of package info. -`package-buffer-info' returns a vector in older Emacs versions, -and a cl struct in Emacs HEAD. This wrapper normalises the results." - (let ((desc (package-buffer-info)) - (keywords (lm-keywords-list))) - (if (fboundp 'package-desc-create) - (let ((extras (package-desc-extras desc))) - (when (and keywords (not (assq :keywords extras))) - ;; Add keywords to package properties, if not already present - (push (cons :keywords keywords) extras)) - (vector (package-desc-name desc) - (package-desc-reqs desc) - (package-desc-summary desc) - (package-desc-version desc) - extras)) - ;; The regexp and the processing is taken from `lm-homepage' in Emacs 24.4 - (let* ((page (lm-header "\\(?:x-\\)?\\(?:homepage\\|url\\)")) - (homepage (if (and page (string-match "^<.+>$" page)) - (substring page 1 -1) - page)) - extras) - (when keywords (push (cons :keywords keywords) extras)) - (when homepage (push (cons :url homepage) extras)) - (vector (aref desc 0) - (aref desc 1) - (aref desc 2) - (aref desc 3) - extras))))) - - -;;; Public interface -;;;###autoload -(defun package-build-archive (name) - "Build a package archive for package NAME." - (interactive (list (pb/package-name-completing-read))) - (let* ((file-name (symbol-name name)) - (rcp (or (cdr (assoc name (package-build-recipe-alist))) - (error "Cannot find package %s" file-name))) - (pkg-working-dir - (file-name-as-directory - (expand-file-name file-name package-build-working-dir)))) - - (unless (file-exists-p package-build-archive-dir) - (pb/message "Creating directory %s" package-build-archive-dir) - (make-directory package-build-archive-dir)) - - (pb/message "\n;;; %s\n" file-name) - (let* ((version (package-version-join - (version-to-list - (or (package-build-checkout name rcp pkg-working-dir) - (error "No valid package version found!"))))) - (default-directory package-build-working-dir) - (start-time (current-time)) - (archive-entry (package-build-package (symbol-name name) - version - (pb/config-file-list rcp) - pkg-working-dir - package-build-archive-dir))) - (pb/dump archive-entry (pb/entry-file-name archive-entry)) - (when package-build-write-melpa-badge-images - (pb/write-melpa-badge-image (symbol-name name) version package-build-archive-dir)) - (pb/message "Built in %.3fs, finished at %s" - (time-to-seconds (time-since start-time)) - (current-time-string)) - file-name))) - -;;;###autoload -(defun package-build-package (package-name version file-specs source-dir target-dir) - "Create PACKAGE-NAME with VERSION. - -The information in FILE-SPECS is used to gather files from -SOURCE-DIR. - -The resulting package will be stored as a .el or .tar file in -TARGET-DIR, depending on whether there are multiple files. - -Argument FILE-SPECS is a list of specs for source files, which -should be relative to SOURCE-DIR. The specs can be wildcards, -and optionally specify different target paths. They extended -syntax is currently only documented in the MELPA README. You can -simply pass `package-build-default-files-spec' in most cases. - -Returns the archive entry for the package." - (when (symbolp package-name) - (setq package-name (symbol-name package-name))) - (let ((files (package-build-expand-file-specs source-dir file-specs))) - (unless (equal file-specs package-build-default-files-spec) - (when (equal files (package-build-expand-file-specs - source-dir package-build-default-files-spec nil t)) - (pb/message "Note: this :files spec is equivalent to the default."))) - (cond - ((not version) - (error "Unable to check out repository for %s" package-name)) - ((= 1 (length files)) - (pb/build-single-file-package package-name version (caar files) source-dir target-dir)) - ((< 1 (length files)) - (pb/build-multi-file-package package-name version files source-dir target-dir)) - (t (error "Unable to find files matching recipe patterns"))))) - -(defun pb/build-single-file-package (package-name version file source-dir target-dir) - (let* ((pkg-source (expand-file-name file source-dir)) - (pkg-target (expand-file-name - (concat package-name "-" version ".el") - target-dir)) - (pkg-info (pb/merge-package-info - (pb/get-package-info pkg-source) - package-name - version))) - (unless (string-equal (downcase (concat package-name ".el")) - (downcase (file-name-nondirectory pkg-source))) - (error "Single file %s does not match package name %s" - (file-name-nondirectory pkg-source) package-name)) - (when (file-exists-p pkg-target) - (delete-file pkg-target)) - (copy-file pkg-source pkg-target) - (let ((enable-local-variables nil) - (make-backup-files nil)) - (with-current-buffer (find-file pkg-target) - (pb/update-or-insert-version version) - (pb/ensure-ends-here-line pkg-source) - (write-file pkg-target nil) - (condition-case err - (pb/package-buffer-info-vec) - (error - (pb/message "Warning: %S" err))) - (kill-buffer))) - - (pb/write-pkg-readme target-dir - (pb/find-package-commentary pkg-source) - package-name) - (pb/archive-entry pkg-info 'single))) - -(defun pb/build-multi-file-package (package-name version files source-dir target-dir) - (let* ((tmp-dir (file-name-as-directory (make-temp-file package-name t))) - (pkg-dir-name (concat package-name "-" version)) - (pkg-tmp-dir (expand-file-name pkg-dir-name tmp-dir)) - (pkg-file (concat package-name "-pkg.el")) - (pkg-file-source (or (pb/find-source-file pkg-file files) - pkg-file)) - (file-source (concat package-name ".el")) - (pkg-source (or (pb/find-source-file file-source files) - file-source)) - (pkg-info (pb/merge-package-info - (let ((default-directory source-dir)) - (or (pb/get-pkg-file-info pkg-file-source) - ;; some packages (like magit) provide name-pkg.el.in - (pb/get-pkg-file-info - (expand-file-name (concat pkg-file ".in") - (file-name-directory pkg-source))) - (pb/get-package-info pkg-source))) - package-name - version))) - (pb/copy-package-files files source-dir pkg-tmp-dir) - (pb/write-pkg-file (expand-file-name pkg-file - (file-name-as-directory pkg-tmp-dir)) - pkg-info) - - (pb/generate-info-files files source-dir pkg-tmp-dir) - (pb/generate-dir-file files pkg-tmp-dir) - - (let ((default-directory tmp-dir)) - (pb/create-tar (expand-file-name (concat package-name "-" version ".tar") - target-dir) - pkg-dir-name)) - - (let ((default-directory source-dir)) - (pb/write-pkg-readme target-dir - (pb/find-package-commentary pkg-source) - package-name)) - - (delete-directory pkg-tmp-dir t nil) - (pb/archive-entry pkg-info 'tar))) - - -;; In future we should provide a hook, and perform this step in a separate package. -;; Note also that it would be straightforward to generate the SVG ourselves, which would -;; save the network overhead. -(defun pb/write-melpa-badge-image (package-name version target-dir) - (url-copy-file - (concat "http://img.shields.io/badge/" - (if package-build-stable "melpa stable" "melpa") - "-" - (url-hexify-string version) - "-" - (if package-build-stable "3e999f" "922793") - ".svg") - (expand-file-name (concat package-name "-badge.svg") target-dir) - t)) - - -;;; Helpers for recipe authors - -(defvar package-build-minor-mode-map - (let ((m (make-sparse-keymap))) - (define-key m (kbd "C-c C-c") 'package-build-current-recipe) - m) - "Keymap for `package-build-minor-mode'.") - -(define-minor-mode package-build-minor-mode - "Helpful functionality for building packages." - nil - " PBuild" - package-build-minor-mode-map) - -;;;###autoload -(defun package-build-create-recipe (name fetcher) - "Create a new recipe for package NAME using FETCHER." - (interactive - (list (intern (read-string "Package name: ")) - (intern - (let ((fetcher-types (mapcar #'symbol-name '(github git wiki bzr hg cvs svn)))) - (completing-read - "Fetcher: " - fetcher-types - nil t nil nil (car fetcher-types)))))) - (let ((recipe-file (expand-file-name (symbol-name name) package-build-recipes-dir))) - (when (file-exists-p recipe-file) - (error "Recipe already exists")) - (find-file recipe-file) - (let* ((extra-params - (cond - ((eq 'github fetcher) '(:repo "USER/REPO")) - ((eq 'wiki fetcher) '()) - (t '(:url "SCM_URL_HERE")))) - (template `(,name :fetcher ,fetcher ,@extra-params))) - (insert (pp-to-string template)) - (emacs-lisp-mode) - (package-build-minor-mode) - (goto-char (point-min))))) - -;;;###autoload -(defun package-build-current-recipe () - "Build archive for the recipe defined in the current buffer." - (interactive) - (unless (and (buffer-file-name) - (file-equal-p (file-name-directory (buffer-file-name)) - package-build-recipes-dir)) - (error "Buffer is not visiting a recipe")) - (when (buffer-modified-p) - (if (y-or-n-p (format "Save file %s? " buffer-file-name)) - (save-buffer) - (error "Aborting"))) - (check-parens) - (package-build-reinitialize) - (let ((pkg-name (intern (file-name-nondirectory (buffer-file-name))))) - (package-build-archive pkg-name) - (package-build-dump-archive-contents) - (let ((output-buffer-name "*package-build-result*")) - (with-output-to-temp-buffer output-buffer-name - (princ ";; Please check the following package descriptor.\n") - (princ ";; If the correct package description or dependencies are missing,\n") - (princ ";; then the source .el file is likely malformed, and should be fixed.\n") - (pp (assoc pkg-name (package-build-archive-alist)))) - (with-current-buffer output-buffer-name - (emacs-lisp-mode) - (view-mode))) - (when (yes-or-no-p "Install new package? ") - (package-install-file (pb/find-package-file pkg-name))))) - -(defun package-build-archive-ignore-errors (pkg) - "Build archive for package PKG, ignoring any errors." - (interactive (list (pb/package-name-completing-read))) - (let* ((debug-on-error t) - (debug-on-signal t) - (pb/debugger-return nil) - (debugger (lambda (&rest args) - (setq pb/debugger-return (with-output-to-string - (backtrace)))))) - (condition-case err - (package-build-archive pkg) - (error - (pb/message "%s" (error-message-string err)) - nil)))) - - - -;;;###autoload -(defun package-build-all () - "Build all packages in the `package-build-recipe-alist'." - (interactive) - (let ((failed (cl-loop for pkg in (mapcar 'car (package-build-recipe-alist)) - when (not (package-build-archive-ignore-errors pkg)) - collect pkg))) - (if (not failed) - (princ "\nSuccessfully Compiled All Packages\n") - (princ "\nFailed to Build the Following Packages\n") - (princ (mapconcat 'symbol-name failed "\n")) - (princ "\n"))) - (package-build-cleanup)) - -(defun package-build-cleanup () - "Remove previously-built packages that no longer have recipes." - (interactive) - (let* ((known-package-names (mapcar 'car (package-build-recipe-alist))) - (stale-archives (cl-loop for built in (pb/archive-entries) - when (not (memq (car built) known-package-names)) - collect built))) - (mapc 'pb/remove-archive-files stale-archives) - (package-build-dump-archive-contents))) - -(defun package-build-recipe-alist () - "Retun the list of avalailable packages." - (unless pb/recipe-alist-initialized - (setq pb/recipe-alist (pb/read-recipes-ignore-errors) - pb/recipe-alist-initialized t)) - pb/recipe-alist) - -(defun package-build-archive-alist () - "Return the archive list." - (cdr (pb/read-from-file - (expand-file-name "archive-contents" - package-build-archive-dir)))) - -(defun package-build-reinitialize () - "Forget any information about packages which have already been built." - (interactive) - (setq pb/recipe-alist-initialized nil)) - -(defun package-build-dump-archive-contents (&optional file-name) - "Dump the list of built packages to FILE-NAME. - -If FILE-NAME is not specified, the default archive-contents file is used." - (pb/dump (cons 1 (pb/archive-entries)) - (or file-name - (expand-file-name "archive-contents" package-build-archive-dir)))) - -(defun pb/archive-entries () - "Read all .entry files from the archive directory and return a list of all entries." - (let ((entries '())) - (dolist (new (mapcar 'pb/read-from-file - (directory-files package-build-archive-dir t - ".*\.entry$")) - entries) - (let ((old (assq (car new) entries))) - (when old - (when (version-list-< (elt (cdr new) 0) - (elt (cdr old) 0)) - ;; swap old and new - (cl-rotatef old new)) - (pb/remove-archive-files old) - (setq entries (remove old entries))) - (add-to-list 'entries new))))) - - - -;;; Exporting data as json - -(defun package-build-recipe-alist-as-json (file-name) - "Dump the recipe list to FILE-NAME as json." - (interactive) - (with-temp-file file-name - (insert (json-encode (package-build-recipe-alist))))) - -(defun pb/sym-to-keyword (s) - "Return a version of symbol S as a :keyword." - (intern (concat ":" (symbol-name s)))) - -(defun pb/pkg-info-for-json (info) - "Convert INFO into a data structure which will serialize to JSON in the desired shape." - (let* ((ver (elt info 0)) - (deps (elt info 1)) - (desc (elt info 2)) - (type (elt info 3)) - (props (when (> (length info) 4) (elt info 4)))) - (list :ver ver - :deps (apply 'append - (mapcar (lambda (dep) - (list (pb/sym-to-keyword (car dep)) - (cadr dep))) - deps)) - :desc desc - :type type - :props props))) - -(defun pb/archive-alist-for-json () - "Return the archive alist in a form suitable for JSON encoding." - (apply 'append - (mapcar (lambda (entry) - (list (pb/sym-to-keyword (car entry)) - (pb/pkg-info-for-json (cdr entry)))) - (package-build-archive-alist)))) - -(defun package-build-archive-alist-as-json (file-name) - "Dump the build packages list to FILE-NAME as json." - (interactive) - (with-temp-file file-name - (insert (json-encode (pb/archive-alist-for-json))))) - -(provide 'package-build) - -;; Local Variables: -;; coding: utf-8 -;; eval: (checkdoc-minor-mode 1) -;; End: - -;;; package-build.el ends here From 04509a3c3656e5f99f13b1f6d8ff57be6c7655f5 Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Sun, 8 Feb 2015 17:39:10 -0800 Subject: [PATCH 019/197] fix auto-complete --- pkgs/applications/editors/emacs-24/packages/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs-24/packages/default.nix b/pkgs/applications/editors/emacs-24/packages/default.nix index e97250690cf..249fa739356 100644 --- a/pkgs/applications/editors/emacs-24/packages/default.nix +++ b/pkgs/applications/editors/emacs-24/packages/default.nix @@ -68,9 +68,10 @@ rec { }); auto-complete = melpa.mkDerivation (self: { - pname = "auto-complete-1.3.1"; + pname = "auto-complete"; + version = "1.3.1"; src = fetchurl { - url = "http://cx4a.org/pub/auto-complete/${self.pname}.tar.bz2"; + url = "http://cx4a.org/pub/auto-complete/${self.fname}.tar.bz2"; sha256 = "124qxfp0pcphwlmrasbfrci48brxnrzc38h4wcf2sn20x1mvcrlj"; }; meta = { From 4676d0137ba19cf2e57116273a0e8a7099bd1774 Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Sun, 8 Feb 2015 20:17:17 -0800 Subject: [PATCH 020/197] add hi2 haskell-indentation mode --- .../editors/emacs-24/packages/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/applications/editors/emacs-24/packages/default.nix b/pkgs/applications/editors/emacs-24/packages/default.nix index 249fa739356..8f9c1647d8e 100644 --- a/pkgs/applications/editors/emacs-24/packages/default.nix +++ b/pkgs/applications/editors/emacs-24/packages/default.nix @@ -382,6 +382,17 @@ rec { packageRequires = [ async ]; }); + hi2 = melpa.mkDerivation (self: { + pname = "hi2"; + version = "1.0"; + src = fetchFromGitHub { + owner = "nilcons"; + repo = self.pname; + rev = self.version; + sha256 = "1s08sgbh5v59lqskd0s1dscs6dy7z5mkqqkabs3gd35agbfvbmlf"; + }; + }); + idris-mode = melpa.mkDerivation (self: { pname = "idris-mode"; version = "0.9.15"; From 07ebc363c829f5ccc2ff829e9ca28f7a3cc008c3 Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Tue, 10 Feb 2015 13:46:02 -0800 Subject: [PATCH 021/197] emacs: add ac-haskell-process and update auto-complete --- .../editors/emacs-24/packages/default.nix | 23 +++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/emacs-24/packages/default.nix b/pkgs/applications/editors/emacs-24/packages/default.nix index 8f9c1647d8e..8b757621238 100644 --- a/pkgs/applications/editors/emacs-24/packages/default.nix +++ b/pkgs/applications/editors/emacs-24/packages/default.nix @@ -21,6 +21,18 @@ let in rec { + ac-haskell-process = melpa.mkDerivation (self: { + pname = "ac-haskell-process"; + version = "0.5"; + src = fetchFromGitHub { + owner = "purcell"; + repo = self.pname; + rev = self.version; + sha256 = "0dlrhc1dmzgrjvcnlqvm6clyv0r6zray6qqliqngy14880grghbm"; + }; + packageRequires = [ auto-complete haskell-mode ]; + }); + ace-jump-mode = melpa.mkDerivation (self: { pname = "ace-jump-mode"; version = "20140616"; @@ -69,11 +81,14 @@ rec { auto-complete = melpa.mkDerivation (self: { pname = "auto-complete"; - version = "1.3.1"; - src = fetchurl { - url = "http://cx4a.org/pub/auto-complete/${self.fname}.tar.bz2"; - sha256 = "124qxfp0pcphwlmrasbfrci48brxnrzc38h4wcf2sn20x1mvcrlj"; + version = "1.4.0"; + src = fetchFromGitHub { + owner = self.pname; + repo = self.pname; + rev = "v${self.version}"; + sha256 = "050lb8qjq7ra35mqp6j6qkwbvq5zj3yhz73aym5kf1vjd42rmjcw"; }; + packageRequires = [ popup ]; meta = { description = "Auto-complete extension for Emacs"; homepage = http://cx4a.org/software/auto-complete/; From 76a501acdb6b38689aa24e0c331d83149499aabc Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Tue, 17 Feb 2015 15:06:27 -0800 Subject: [PATCH 022/197] reorganize emacs packages and add some meta info --- .../editors/emacs-24/packages/melpa.nix | 104 ----- pkgs/build-support/melpa/default.nix | 104 +++++ .../melpa}/melpa2nix.el | 0 .../melpa}/setup-hook.sh | 0 pkgs/top-level/all-packages.nix | 2 +- .../emacs-melpa-packages.nix} | 416 ++++++++++-------- 6 files changed, 341 insertions(+), 285 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-24/packages/melpa.nix create mode 100644 pkgs/build-support/melpa/default.nix rename pkgs/{applications/editors/emacs-24/packages => build-support/melpa}/melpa2nix.el (100%) rename pkgs/{applications/editors/emacs-24/packages => build-support/melpa}/setup-hook.sh (100%) rename pkgs/{applications/editors/emacs-24/packages/default.nix => top-level/emacs-melpa-packages.nix} (71%) diff --git a/pkgs/applications/editors/emacs-24/packages/melpa.nix b/pkgs/applications/editors/emacs-24/packages/melpa.nix deleted file mode 100644 index 23db8f1c5a3..00000000000 --- a/pkgs/applications/editors/emacs-24/packages/melpa.nix +++ /dev/null @@ -1,104 +0,0 @@ -# generic builder for Emacs packages - -{ stdenv, fetchurl, emacs, texinfo -, extension ? (self : super : {}) -}: - -let - enableFeature = stdenv.lib.enableFeature; - versionOlder = stdenv.lib.versionOlder; - optional = stdenv.lib.optional; - optionals = stdenv.lib.optionals; - optionalString = stdenv.lib.optionalString; - filter = stdenv.lib.filter; - - packageBuild = fetchurl { - url = https://raw.githubusercontent.com/milkypostman/melpa/12a862e5c5c62ce627dab83d7cf2cca6e8b56c47/package-build.el; - sha256 = "1nviyyprypz7nmam9rwli4yv3kxh170glfbznryrp4czxkrjjdhk"; - }; - -in - -{ - mkDerivation = - args : # arguments for the individual package, can modify the defaults - let # Stuff happening after the user preferences have been processed. We remove - # internal attributes and strip null elements from the dependency lists, all - # in the interest of keeping hashes stable. - postprocess = - x : x // { - buildInputs = filter (y : ! (y == null)) x.buildInputs; - propagatedBuildInputs = filter (y : ! (y == null)) x.propagatedBuildInputs; - propagatedUserEnvPkgs = filter (y : ! (y == null)) x.propagatedUserEnvPkgs; - doCheck = x.doCheck; - }; - - defaults = - self : { # self is the final version of the attribute set - - # pname should be defined by the client to be the package basename - # version should be defined by the client to be the package version - - # fname is the internal full name of the package - fname = "${self.pname}-${self.version}"; - - # name is the external full name of the package; usually we prefix - # all packages with emacs- to avoid name clashes for libraries; - # if that is not desired (for applications), name can be set to - # fname. - name = "emacs-${self.pname}-${self.version}"; - - - buildInputs = [emacs texinfo] ++ self.packageRequires; - - propagatedBuildInputs = self.packageRequires; - - propagatedUserEnvPkgs = self.packageRequires; - - packageRequires = []; - - doCheck = false; - - files = []; - - setupHook = ./setup-hook.sh; - - fileSpecs = [ "*.el" "*.el.in" "dir" - "*.info" "*.texi" "*.texinfo" - "doc/dir" "doc/*.info" "doc/*.texi" "doc/*.texinfo" - ]; - - targets = stdenv.lib.concatStringsSep " " - (if self.files == [] - then self.fileSpecs - else self.files); - - buildPhase = '' - eval "$preBuild" - - emacs --batch -Q -l $packageBuild -l ${./melpa2nix.el} \ - -f melpa2nix-build-package \ - ${self.pname} ${self.version} ${self.targets} - - eval "$postBuild" - ''; - - installPhase = '' - eval "$preInstall" - - emacs --batch -Q -l $packageBuild -l ${./melpa2nix.el} \ - -f melpa2nix-install-package \ - ${self.fname}.* $out/share/emacs/site-lisp/elpa - - eval "$postInstall" - ''; - - # We inherit stdenv and emacs so that they can be used - # in melpa derivations. - inherit stdenv emacs texinfo packageBuild; - }; - in - stdenv.mkDerivation (postprocess (let super = defaults self // args self; - self = super // extension self super; - in self)); -} diff --git a/pkgs/build-support/melpa/default.nix b/pkgs/build-support/melpa/default.nix new file mode 100644 index 00000000000..11cb14f93db --- /dev/null +++ b/pkgs/build-support/melpa/default.nix @@ -0,0 +1,104 @@ +# generic builder for Emacs packages + +{ stdenv, fetchurl, emacs, texinfo +, extension ? (self : super : {}) +}: + +{ pname +, version +, src +, packageRequires ? [] +, extraBuildInputs ? [] + +, files ? null +, fileSpecs ? [ "*.el" "*.el.in" "dir" + "*.info" "*.texi" "*.texinfo" + "doc/dir" "doc/*.info" "doc/*.texi" "doc/*.texinfo" + ] + +, meta ? {} + +, preUnpack ? "", postUnpack ? "" +, patches ? [], patchPhase ? "", prePatch ? "", postPatch ? "" +, configureFlags ? [], preConfigure ? "", postConfigure ? "" +, buildPhase ? "", preBuild ? "", postBuild ? "" +, preInstall ? "", postInstall ? "" +, doCheck ? false, checkPhase ? "", preCheck ? "", postCheck ? "" +, preFixup ? "", postFixup ? "" +}: + +let + inherit (stdenv.lib) concatStringsSep optionalAttrs; + + packageBuild = fetchurl { + url = https://raw.githubusercontent.com/milkypostman/melpa/12a862e5c5c62ce627dab83d7cf2cca6e8b56c47/package-build.el; + sha256 = "1nviyyprypz7nmam9rwli4yv3kxh170glfbznryrp4czxkrjjdhk"; + }; + + fname = "${pname}-${version}"; + + targets = concatStringsSep " " (if files == null then fileSpecs else files); + + defaultMeta = { + broken = false; + homepage = "http://melpa.org/#/${pname}"; + platforms = emacs.meta.platforms; + }; + +in + +stdenv.mkDerivation ({ + name = "emacs-${fname}"; + + inherit src packageBuild; + + buildInputs = [emacs texinfo] ++ packageRequires ++ extraBuildInputs; + propagatedBuildInputs = packageRequires; + propagatedUserEnvPkgs = packageRequires; + + setupHook = ./setup-hook.sh; + + buildPhase = '' + runHook preBuild + + emacs --batch -Q -l $packageBuild -l ${./melpa2nix.el} \ + -f melpa2nix-build-package \ + ${pname} ${version} ${targets} + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + emacs --batch -Q -l $packageBuild -l ${./melpa2nix.el} \ + -f melpa2nix-install-package \ + ${fname}.* $out/share/emacs/site-lisp/elpa + + runHook postInstall + ''; + + meta = defaultMeta // meta; +} + +// optionalAttrs (preUnpack != "") { inherit preUnpack; } +// optionalAttrs (postUnpack != "") { inherit postUnpack; } +// optionalAttrs (configureFlags != []) { inherit configureFlags; } +// optionalAttrs (patches != []) { inherit patches; } +// optionalAttrs (patchPhase != "") { inherit patchPhase; } +// optionalAttrs (prePatch != "") { inherit prePatch; } +// optionalAttrs (postPatch != "") { inherit postPatch; } +// optionalAttrs (preConfigure != "") { inherit preConfigure; } +// optionalAttrs (postConfigure != "") { inherit postConfigure; } +// optionalAttrs (buildPhase != "") { inherit buildPhase; } +// optionalAttrs (preBuild != "") { inherit preBuild; } +// optionalAttrs (postBuild != "") { inherit postBuild; } +// optionalAttrs (doCheck) { inherit doCheck; } +// optionalAttrs (checkPhase != "") { inherit checkPhase; } +// optionalAttrs (preCheck != "") { inherit preCheck; } +// optionalAttrs (postCheck != "") { inherit postCheck; } +// optionalAttrs (preInstall != "") { inherit preInstall; } +// optionalAttrs (postInstall != "") { inherit postInstall; } +// optionalAttrs (preFixup != "") { inherit preFixup; } +// optionalAttrs (postFixup != "") { inherit postFixup; } +) diff --git a/pkgs/applications/editors/emacs-24/packages/melpa2nix.el b/pkgs/build-support/melpa/melpa2nix.el similarity index 100% rename from pkgs/applications/editors/emacs-24/packages/melpa2nix.el rename to pkgs/build-support/melpa/melpa2nix.el diff --git a/pkgs/applications/editors/emacs-24/packages/setup-hook.sh b/pkgs/build-support/melpa/setup-hook.sh similarity index 100% rename from pkgs/applications/editors/emacs-24/packages/setup-hook.sh rename to pkgs/build-support/melpa/setup-hook.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d3c8729956..4af8f9143c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9908,7 +9908,7 @@ let }); emacs24Macport = self.emacs24Macport_24_4; - emacsMelpa = import ../applications/editors/emacs-24/packages { + emacsMelpa = import ./emacs-melpa-packages.nix { inherit stdenv pkgs fetchurl fetchgit fetchFromGitHub emacs texinfo; external = { inherit (haskellngPackages) ghc-mod structured-haskell-mode; diff --git a/pkgs/applications/editors/emacs-24/packages/default.nix b/pkgs/top-level/emacs-melpa-packages.nix similarity index 71% rename from pkgs/applications/editors/emacs-24/packages/default.nix rename to pkgs/top-level/emacs-melpa-packages.nix index 8b757621238..e8f965a784a 100644 --- a/pkgs/applications/editors/emacs-24/packages/default.nix +++ b/pkgs/top-level/emacs-melpa-packages.nix @@ -13,91 +13,98 @@ # package-user-dir "~/.nix-profile/share/emacs/site-lisp/elpa") # (package-initialize) +with stdenv.lib.licences; let - melpa = import ./melpa.nix { + melpaBuild = import ../build-support/melpa { inherit stdenv fetchurl emacs texinfo; }; in rec { - ac-haskell-process = melpa.mkDerivation (self: { + ac-haskell-process = melpaBuild rec { pname = "ac-haskell-process"; version = "0.5"; src = fetchFromGitHub { owner = "purcell"; - repo = self.pname; - rev = self.version; + repo = pname; + rev = version; sha256 = "0dlrhc1dmzgrjvcnlqvm6clyv0r6zray6qqliqngy14880grghbm"; }; packageRequires = [ auto-complete haskell-mode ]; - }); + meta = { licence = gpl3Plus; }; + }; - ace-jump-mode = melpa.mkDerivation (self: { + ace-jump-mode = melpaBuild rec { pname = "ace-jump-mode"; version = "20140616"; src = fetchFromGitHub { owner = "winterTTr"; - repo = self.pname; + repo = pname; rev = "8351e2df4fbbeb2a4003f2fb39f46d33803f3dac"; sha256 = "17axrgd99glnl6ma4ls3k01ysdqmiqr581wnrbsn3s4gp53mm2x6"; }; - }); + meta = { licence = gpl3Plus; }; + }; - ag = melpa.mkDerivation (self: { + ag = melpaBuild rec { pname = "ag"; version = "0.44"; src = fetchFromGitHub { owner = "Wilfred"; - repo = "${self.pname}.el"; - rev = self.version; + repo = "${pname}.el"; + rev = version; sha256 = "19y5w9m2flp4as54q8yfngrkri3kd7fdha9pf2xjgx6ryflqx61k"; }; packageRequires = [ dash s ]; - }); - - async = melpa.mkDerivation (self: { + meta = { licence = gpl3Plus; }; + }; + + async = melpaBuild rec { pname = "async"; version = "1.2"; src = fetchFromGitHub { owner = "jwiegley"; repo = "emacs-async"; - rev = "v${self.version}"; + rev = "v${version}"; sha256 = "1j6mbvvbnm2m1gpsy9ipxiv76b684nn57yssbqdyiwyy499cma6q"; }; - }); + meta = { licence = gpl3Plus; }; + }; - auctex = melpa.mkDerivation (self: { + auctex = melpaBuild rec { pname = "auctex"; version = "11.87.7"; src = fetchurl { - url = "http://elpa.gnu.org/packages/${self.fname}.tar"; + url = "http://elpa.gnu.org/packages/${pname}-${version}.tar"; sha256 = "07bhw8zc3d1f2basjy80njmxpsp4f70kg3ynkch9ghlai3mm2b7n"; }; buildPhase = '' - cp $src ${self.fname}.tar + cp $src ${pname}-${version}.tar ''; - }); - - auto-complete = melpa.mkDerivation (self: { + meta = { licence = gpl3Plus; }; + }; + + auto-complete = melpaBuild rec { pname = "auto-complete"; version = "1.4.0"; src = fetchFromGitHub { - owner = self.pname; - repo = self.pname; - rev = "v${self.version}"; + owner = pname; + repo = pname; + rev = "v${version}"; sha256 = "050lb8qjq7ra35mqp6j6qkwbvq5zj3yhz73aym5kf1vjd42rmjcw"; }; packageRequires = [ popup ]; + meta = { description = "Auto-complete extension for Emacs"; homepage = http://cx4a.org/software/auto-complete/; - license = stdenv.lib.licenses.gpl3Plus; + license = gpl3Plus; platforms = stdenv.lib.platforms.all; }; - }); + }; - bind-key = melpa.mkDerivation (self: { + bind-key = melpaBuild { pname = "bind-key"; version = "20141013"; src = fetchFromGitHub { @@ -107,102 +114,111 @@ rec { sha256 = "1m4v5h52brg2g9rpbqfq9m3m8fv520vg5mjwppnbw6099d17msqd"; }; files = [ "bind-key.el" ]; - }); + meta = { licence = gpl3Plus; }; + }; - change-inner = melpa.mkDerivation (self: { + change-inner = melpaBuild rec { pname = "change-inner"; version = "20130208"; src = fetchFromGitHub { owner = "magnars"; - repo = "${self.pname}.el"; + repo = "${pname}.el"; rev = "6374b745ee1fd0302ad8596cdb7aca1bef33a730"; sha256 = "1fv8630bqbmfr56zai08f1q4dywksmghhm70084bz4vbs6rzdsbq"; }; packageRequires = [ expand-region ]; - }); + meta = { licence = gpl3Plus; }; + }; - circe = melpa.mkDerivation (self: { + circe = melpaBuild rec { pname = "circe"; version = "1.5"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "v${self.version}"; + rev = "v${version}"; sha256 = "08dsv1dzgb9jx076ia7xbpyjpaxn1w87h6rzlb349spaydq7ih24"; }; packageRequires = [ lcs lui ]; fileSpecs = [ "lisp/circe*.el" ]; - }); + meta = { licence = gpl3Plus; }; + }; - company-mode = melpa.mkDerivation (self: { - pname = "company-mode"; + company = melpaBuild rec { + pname = "company"; version = "0.8.6"; src = fetchFromGitHub { owner = "company-mode"; repo = "company-mode"; - rev = self.version; + rev = version; sha256 = "1xwxyqg5dan8m1qkdxyzm066ryf24h07karpdlm3s09izfdny33f"; }; - }); + meta = { licence = gpl3Plus; }; + }; - dash = melpa.mkDerivation (self: { + dash = melpaBuild rec { pname = "dash"; version = "2.9.0"; src = fetchFromGitHub { owner = "magnars"; - repo = "${self.pname}.el"; - rev = self.version; + repo = "${pname}.el"; + rev = version; sha256 = "1lg31s8y6ljsz6ps765ia5px39wim626xy8fbc4jpk8fym1jh7ay"; }; - }); + meta = { licence = gpl3Plus; }; + }; - diminish = melpa.mkDerivation (self: { + diminish = melpaBuild rec { pname = "diminish"; version = "0.44"; src = fetchFromGitHub { owner = "emacsmirror"; - repo = self.pname; - rev = self.version; + repo = pname; + rev = version; sha256 = "0hshw7z5f8pqxvgxw74kbj6nvprsgfvy45fl854xarnkvqcara09"; }; - }); + meta = { licence = gpl3Plus; }; + }; - epl = melpa.mkDerivation (self: { + epl = melpaBuild rec { pname = "epl"; version = "20140823"; src = fetchFromGitHub { owner = "cask"; - repo = self.pname; + repo = pname; rev = "63c78c08e345455f3d4daa844fdc551a2c18024e"; sha256 = "04a2aq8dj2cmy77vw142wcmnjvqdbdsp6z0psrzz2qw0b0am03li"; }; - }); + meta = { licence = gpl3Plus; }; + }; - evil-god-state = melpa.mkDerivation (self: { + evil-god-state = melpaBuild rec { pname = "evil-god-state"; version = "20140830"; src = fetchFromGitHub { owner = "gridaphobe"; - repo = self.pname; + repo = pname; rev = "234a9b6f500ece89c3dfb5c1df5baef6963e4566"; sha256 = "16v6dpw1hibrkf9hga88gv5axvp1pajd67brnh5h4wpdy9qvwgyy"; }; packageRequires = [ evil god-mode ]; - }); + meta = { licence = gpl3Plus; }; + }; - evil-surround = melpa.mkDerivation (self: { + evil-surround = melpaBuild rec { pname = "evil-surround"; version = "20140616"; src = fetchFromGitHub { owner = "timcharper"; - repo = self.pname; + repo = pname; rev = "71f380b6b6ed38f739c0a4740b3d6de0c52f915a"; sha256 = "0wrmlmgr4mwxlmmh8blplddri2lpk4g8k3l1vpb5c6a975420qvn"; }; packageRequires = [ evil ]; - }); + meta = { licence = gpl3Plus; }; + }; - evil = melpa.mkDerivation (self: { + evil = melpaBuild { pname = "evil"; version = "20141020"; src = fetchgit { @@ -211,122 +227,133 @@ rec { sha256 = "0yiqpzsm5sr7xdkixdvfg312dk9vsdcmj69gizk744d334yn8rsz"; }; packageRequires = [ goto-chg undo-tree ]; - }); + meta = { licence = gpl3Plus; }; + }; - exec-path-from-shell = melpa.mkDerivation (self: { + exec-path-from-shell = melpaBuild rec { pname = "exec-path-from-shell"; version = "20141022"; src = fetchFromGitHub { owner = "purcell"; - repo = self.pname; + repo = pname; rev = "e4af0e9b44738e7474c89ed895200b42e6541515"; sha256 = "0lxikiqf1jik88lf889q4f4f8kdgg3npciz298x605nhbfd5snbd"; }; - }); + meta = { licence = gpl3Plus; }; + }; - expand-region = melpa.mkDerivation (self: { + expand-region = melpaBuild rec { pname = "expand-region"; version = "20141012"; src = fetchFromGitHub { owner = "magnars"; - repo = "${self.pname}.el"; + repo = "${pname}.el"; rev = "fa413e07c97997d950c92d6012f5442b5c3cee78"; sha256 = "04k0518wfy72wpzsswmncnhd372fxa0r8nbfhmbyfmns8n7sr045"; }; - }); + meta = { licence = gpl3Plus; }; + }; - flycheck-pos-tip = melpa.mkDerivation (self: { + flycheck-pos-tip = melpaBuild rec { pname = "flycheck-pos-tip"; version = "20140813"; src = fetchFromGitHub { owner = "flycheck"; - repo = self.pname; + repo = pname; rev = "5b3a203bbdb03e4f48d1654efecd71f44376e199"; sha256 = "0b4x24aq0jh4j4bjv0fqyaz6hzh3gqf57k9763jj9rl32cc3dpnp"; }; packageRequires = [ flycheck popup ]; - }); + meta = { licence = gpl3Plus; }; + }; - flycheck = melpa.mkDerivation (self: { + flycheck = melpaBuild rec { pname = "flycheck"; version = "0.20"; src = fetchFromGitHub { - owner = self.pname; - repo = self.pname; - rev = self.version; + owner = pname; + repo = pname; + rev = version; sha256 = "0cq7y7ssm6phvx5pfv2yqq4j0yqmm0lhjav7v4a8ql7094cd790a"; }; packageRequires = [ dash pkg-info ]; - }); + meta = { licence = gpl3Plus; }; + }; - ghc-mod = melpa.mkDerivation (self: { + ghc-mod = melpaBuild rec { pname = "ghc"; version = external.ghc-mod.version; src = external.ghc-mod.src; fileSpecs = [ "elisp/*.el" ]; - }); + meta = { licence = bsd3; }; + }; - git-commit-mode = melpa.mkDerivation (self: { + git-commit-mode = melpaBuild rec { pname = "git-commit-mode"; version = "0.15.0"; src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; - rev = self.version; + rev = version; sha256 = "1x03276yq63cddc89n8i47k1f6p26b7a5la4hz66fdf15gmr8496"; }; files = [ "git-commit-mode.el" ]; - }); + meta = { licence = gpl3Plus; }; + }; - git-rebase-mode = melpa.mkDerivation (self: { + git-rebase-mode = melpaBuild rec { pname = "git-rebase-mode"; version = "0.15.0"; src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; - rev = self.version; + rev = version; sha256 = "1x03276yq63cddc89n8i47k1f6p26b7a5la4hz66fdf15gmr8496"; }; files = [ "git-rebase-mode.el" ]; - }); + meta = { licence = gpl3Plus; }; + }; - gitattributes-mode = melpa.mkDerivation (self: { + gitattributes-mode = melpaBuild rec { pname = "gitattributes-mode"; version = "0.15.0"; src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; - rev = self.version; + rev = version; sha256 = "1x03276yq63cddc89n8i47k1f6p26b7a5la4hz66fdf15gmr8496"; }; files = [ "gitattributes-mode.el" ]; - }); + meta = { licence = gpl3Plus; }; + }; - gitconfig-mode = melpa.mkDerivation (self: { + gitconfig-mode = melpaBuild rec { pname = "gitconfig-mode"; version = "0.15.0"; src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; - rev = self.version; + rev = version; sha256 = "1x03276yq63cddc89n8i47k1f6p26b7a5la4hz66fdf15gmr8496"; }; files = [ "gitconfig-mode.el" ]; - }); + meta = { licence = gpl3Plus; }; + }; - gitignore-mode = melpa.mkDerivation (self: { + gitignore-mode = melpaBuild rec { pname = "gitignore-mode"; version = "0.15.0"; src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; - rev = self.version; + rev = version; sha256 = "1x03276yq63cddc89n8i47k1f6p26b7a5la4hz66fdf15gmr8496"; }; files = [ "gitignore-mode.el" ]; - }); + meta = { licence = gpl3Plus; }; + }; - gnus = melpa.mkDerivation (self: { + gnus = melpaBuild rec { pname = "gnus"; version = "20140501"; src = fetchgit { @@ -338,20 +365,22 @@ rec { preBuild = '' (cd lisp && make gnus-load.el) ''; - }); + meta = { licence = gpl3Plus; }; + }; - god-mode = melpa.mkDerivation (self: { + god-mode = melpaBuild rec { pname = "god-mode"; version = "20140811"; src = fetchFromGitHub { owner = "chrisdone"; - repo = self.pname; + repo = pname; rev = "6b7ae259a58ca1d7776aa4eca9f1092e4c0033e6"; sha256 = "1amr98nq82g2d3f3f5wlqm9g38j64avygnsi9rrlbfqz4f71vq7x"; }; - }); + meta = { licence = gpl3Plus; }; + }; - goto-chg = melpa.mkDerivation (self: { + goto-chg = melpaBuild rec { pname = "goto-chg"; version = "1.6"; src = fetchgit { @@ -360,92 +389,100 @@ rec { sha256 = "0yiqpzsm5sr7xdkixdvfg312dk9vsdcmj69gizk744d334yn8rsz"; }; files = [ "lib/goto-chg.el" ]; - }); + meta = { licence = gpl3Plus; }; + }; - haskell-mode = melpa.mkDerivation (self: { + haskell-mode = melpaBuild rec { pname = "haskell-mode"; version = "20150101"; src = fetchFromGitHub { owner = "haskell"; - repo = self.pname; + repo = pname; rev = "0db5efaaeb3b22e5a3fdafa600729e14c1716ee2"; sha256 = "0d63cgzj579cr8zbrnl0inyy35b26sxinqxr7bgrjsngpmhm52an"; }; - }); + meta = { licence = gpl3Plus; }; + }; - helm-swoop = melpa.mkDerivation (self: { + helm-swoop = melpaBuild rec { pname = "helm-swoop"; version = "20141224"; src = fetchFromGitHub { owner = "ShingoFukuyama"; - repo = self.pname; + repo = pname; rev = "06a251f7d7fce2a5719e0862e5855972cd8ab1ae"; sha256 = "0nq33ldhbvfbm6jnsxqdf3vwaqrsr2gprkzll081gcyl2s1x0l2m"; }; packageRequires = [ helm ]; - }); + meta = { licence = gpl3Plus; }; + }; - helm = melpa.mkDerivation (self: { + helm = melpaBuild rec { pname = "helm"; version = "20150105"; src = fetchFromGitHub { owner = "emacs-helm"; - repo = self.pname; + repo = pname; rev = "e5608ad86e7ca72446a4b1aa0faf604200ffe895"; sha256 = "0n2kr6pyzcsi8pq6faxz2y8kicz1gmvj98fzzlq3a107dqqp25ay"; }; packageRequires = [ async ]; - }); + meta = { licence = gpl3Plus; }; + }; - hi2 = melpa.mkDerivation (self: { + hi2 = melpaBuild rec { pname = "hi2"; version = "1.0"; src = fetchFromGitHub { owner = "nilcons"; - repo = self.pname; - rev = self.version; + repo = pname; + rev = version; sha256 = "1s08sgbh5v59lqskd0s1dscs6dy7z5mkqqkabs3gd35agbfvbmlf"; }; - }); + meta = { licence = gpl3Plus; }; + }; - idris-mode = melpa.mkDerivation (self: { + idris-mode = melpaBuild rec { pname = "idris-mode"; version = "0.9.15"; src = fetchFromGitHub { owner = "idris-hackers"; repo = "idris-mode"; - rev = self.version; + rev = version; sha256 = "00pkgk1zxan89i8alsa2dpa9ls7imqk5zb1kbjwzrlbr0gk4smdb"; }; packageRequires = [ flycheck ]; - }); + meta = { licence = gpl3Plus; }; + }; - lcs = melpa.mkDerivation (self: { + lcs = melpaBuild rec { pname = "lcs"; version = "1.5"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "v${self.version}"; + rev = "v${version}"; sha256 = "08dsv1dzgb9jx076ia7xbpyjpaxn1w87h6rzlb349spaydq7ih24"; }; fileSpecs = [ "lisp/lcs*.el" ]; - }); + meta = { licence = gpl3Plus; }; + }; - lui = melpa.mkDerivation (self: { + lui = melpaBuild rec { pname = "lui"; version = "1.5"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "v${self.version}"; + rev = "v${version}"; sha256 = "08dsv1dzgb9jx076ia7xbpyjpaxn1w87h6rzlb349spaydq7ih24"; }; packageRequires = [ tracking ]; fileSpecs = [ "lisp/lui*.el" ]; - }); + meta = { licence = gpl3Plus; }; + }; - magit = melpa.mkDerivation (self: { + magit = melpaBuild rec { pname = "magit"; version = "20141025"; src = fetchFromGitHub { @@ -455,203 +492,220 @@ rec { sha256 = "0mzyx72pidzvla1x2qszn3c60n2j0n8i5k875c4difvd1n4p0vsk"; }; packageRequires = [ git-commit-mode git-rebase-mode ]; - }); + meta = { licence = gpl3Plus; }; + }; - markdown-mode = melpa.mkDerivation (self: { + markdown-mode = melpaBuild rec { pname = "markdown-mode"; version = "2.0"; src = fetchFromGitHub { owner = "defunkt"; - repo = self.pname; - rev = "v${self.version}"; + repo = pname; + rev = "v${version}"; sha256 = "1l2w0j9xl8pipz61426s79jq2yns42vjvysc6yjc29kbsnhalj29"; }; - }); + meta = { licence = gpl3Plus; }; + }; - org-plus-contrib = melpa.mkDerivation (self: { + org-plus-contrib = melpaBuild rec { pname = "org-plus-contrib"; version = "20141020"; src = fetchurl { - url = "http://orgmode.org/elpa/${self.fname}.tar"; + url = "http://orgmode.org/elpa/${pname}-${version}.tar"; sha256 = "02njxmdbmias2f5psvwqc115dyakcwm2g381gfdv8qz4sqav0r77"; }; buildPhase = '' - cp $src ${self.fname}.tar + cp $src ${pname}-${version}.tar ''; - }); + meta = { licence = gpl3Plus; }; + }; - pkg-info = melpa.mkDerivation (self: { + pkg-info = melpaBuild rec { pname = "pkg-info"; version = "20140610"; src = fetchFromGitHub { owner = "lunaryorn"; - repo = "${self.pname}.el"; + repo = "${pname}.el"; rev = "475cdeb0b8d44f9854e506c429eeb445787014ec"; sha256 = "0x4nz54f2shgcw3gx66d265vxwdpdirn64gzii8dpxhsi7v86n0p"; }; packageRequires = [ epl ]; - }); + meta = { licence = gpl3Plus; }; + }; - popup = melpa.mkDerivation (self: { + popup = melpaBuild rec { pname = "popup"; version = "0.5.0"; src = fetchFromGitHub { owner = "auto-complete"; - repo = "${self.pname}-el"; - rev = "v${self.version}"; + repo = "${pname}-el"; + rev = "v${version}"; sha256 = "0836ayyz1syvd9ry97ya06l8mpr88c6xbgb4d98szj6iwbypcj7b"; }; - }); + meta = { licence = gpl3Plus; }; + }; - projectile = melpa.mkDerivation (self: { + projectile = melpaBuild rec { pname = "projectile"; version = "20141020"; src = fetchFromGitHub { owner = "bbatsov"; - repo = self.pname; + repo = pname; rev = "13580d83374e0c17c55b3a680b816dfae407657e"; sha256 = "10c28h2g53sg68lwamhak0shdhh26h5xaipipz3n4281sr1fwg58"; }; packageRequires = [ dash helm s pkg-info epl ]; - }); + meta = { licence = gpl3Plus; }; + }; - rich-minority = melpa.mkDerivation (self: { + rich-minority = melpaBuild rec { pname = "rich-minority"; version = "0.1.1"; src = fetchFromGitHub { owner = "Bruce-Connor"; - repo = self.pname; - rev = self.version; + repo = pname; + rev = version; sha256 = "0kvhy4mgs9llihwsb1a9n5a85xzjiyiyawxnz0axy2bvwcxnp20k"; }; packageRequires = [ dash ]; - }); + meta = { licence = gpl3Plus; }; + }; - s = melpa.mkDerivation (self: { + s = melpaBuild rec { pname = "s"; version = "20140910"; src = fetchFromGitHub { owner = "magnars"; - repo = "${self.pname}.el"; + repo = "${pname}.el"; rev = "1f85b5112f3f68169ddaa2911fcfa030f979eb4d"; sha256 = "9d871ea84f98c51099528a03eddf47218cf70f1431d4c35c19c977d9e73d421f"; }; - }); + meta = { licence = gpl3Plus; }; + }; - shorten = melpa.mkDerivation (self: { + shorten = melpaBuild rec { pname = "shorten"; version = "1.5"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "v${self.version}"; + rev = "v${version}"; sha256 = "08dsv1dzgb9jx076ia7xbpyjpaxn1w87h6rzlb349spaydq7ih24"; }; fileSpecs = [ "lisp/shorten*.el" ]; - }); + meta = { licence = gpl3Plus; }; + }; - smart-mode-line = melpa.mkDerivation (self: { + smart-mode-line = melpaBuild rec { pname = "smart-mode-line"; version = "2.6"; src = fetchFromGitHub { owner = "Bruce-Connor"; - repo = self.pname; - rev = self.version; + repo = pname; + rev = version; sha256 = "17nav2jbvbd13xzgp29x396mc617n2dh6whjk4wnyvsyv7r0s9f6"; }; packageRequires = [ dash rich-minority ]; - }); + meta = { licence = gpl3Plus; }; + }; - smartparens = melpa.mkDerivation (self: { + smartparens = melpaBuild rec { pname = "smartparens"; version = "1.6.2"; src = fetchFromGitHub { owner = "Fuco1"; - repo = self.pname; - rev = self.version; + repo = pname; + rev = version; sha256 = "16pzd740vd1r3qfmxia2ibiarinm6xpja0mjv3nni5dis5s4r9gc"; }; packageRequires = [ dash ]; - }); + meta = { licence = gpl3Plus; }; + }; - structured-haskell-mode = melpa.mkDerivation (self: { + structured-haskell-mode = melpaBuild rec { pname = "shm"; version = external.structured-haskell-mode.version; src = external.structured-haskell-mode.src; packageRequires = [ haskell-mode ]; fileSpecs = [ "elisp/*.el" ]; + meta = { homepage = "https://github.com/chrisdone/structured-haskell-mode"; description = "Structured editing Emacs mode for Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; + license = bsd3; + platforms = external.structured-haskell-mode.meta.platforms; }; - }); + }; - switch-window = melpa.mkDerivation (self: { + switch-window = melpaBuild rec { pname = "switch-window"; version = "20140919"; src = fetchFromGitHub { owner = "dimitri"; - repo = self.pname; + repo = pname; rev = "3ffbe68e584f811e891f96afa1de15e0d9c1ebb5"; sha256 = "09221128a0f55a575ed9addb3a435cfe01ab6bdd0cca5d589ccd37de61ceccbd"; }; - }); + meta = { licence = gpl3Plus; }; + }; - tracking = melpa.mkDerivation (self: { + tracking = melpaBuild rec { pname = "tracking"; version = "1.5"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "v${self.version}"; + rev = "v${version}"; sha256 = "08dsv1dzgb9jx076ia7xbpyjpaxn1w87h6rzlb349spaydq7ih24"; }; packageRequires = [ shorten ]; fileSpecs = [ "lisp/tracking*.el" ]; - }); + meta = { licence = gpl3Plus; }; + }; - undo-tree = melpa.mkDerivation (self: { + undo-tree = melpaBuild rec { pname = "undo-tree"; version = "0.6.4"; src = fetchgit { - url = "http://www.dr-qubit.org/git/${self.pname}.git"; + url = "http://www.dr-qubit.org/git/${pname}.git"; rev = "a3e81b682053a81e082139300ef0a913a7a610a2"; sha256 = "1qla7njkb7gx5aj87i8x6ni8jfk1k78ivwfiiws3gpbnyiydpx8y"; }; - }); + meta = { licence = gpl3Plus; }; + }; - use-package = melpa.mkDerivation (self: { + use-package = melpaBuild rec { pname = "use-package"; version = "20141013"; src = fetchFromGitHub { owner = "jwiegley"; - repo = self.pname; + repo = pname; rev = "d43af5e0769a92f77e01dea229e376d9006722ef"; sha256 = "1m4v5h52brg2g9rpbqfq9m3m8fv520vg5mjwppnbw6099d17msqd"; }; packageRequires = [ bind-key diminish ]; files = [ "use-package.el" ]; - }); + meta = { licence = gpl3Plus; }; + }; - volatile-highlights = melpa.mkDerivation (self: { + volatile-highlights = melpaBuild rec { pname = "volatile-highlights"; version = "1.11"; src = fetchFromGitHub { owner = "k-talo"; - repo = "${self.pname}.el"; + repo = "${pname}.el"; rev = "fb2abc2d4d4051a9a6b7c8de2fe7564161f01f24"; sha256 = "1v0chqj5jir4685jd8ahw86g9zdmi6xd05wmzhyw20rbk924fcqf"; }; - }); + meta = { licence = gpl3Plus; }; + }; - weechat = melpa.mkDerivation (self: { + weechat = melpaBuild rec { pname = "weechat.el"; version = "20141016"; src = fetchFromGitHub { owner = "the-kenny"; - repo = self.pname; + repo = pname; rev = "4cb2ced1eda5167ce774e04657d2cd077b63c706"; sha256 = "003sihp7irm0qqba778dx0gf8xhkxd1xk7ig5kgkryvl2jyirk28"; }; @@ -659,9 +713,10 @@ rec { rm weechat-sauron.el weechat-secrets.el ''; packageRequires = [ s ]; - }); + meta = { licence = gpl3Plus; }; + }; - wgrep = melpa.mkDerivation (self: { + wgrep = melpaBuild rec { pname = "wgrep"; version = "20141017"; src = fetchFromGitHub { @@ -670,5 +725,6 @@ rec { rev = "7ef26c51feaef8a5ec0929737130ab8ba326983c"; sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4"; }; - }); + meta = { licence = gpl3Plus; }; + }; } From 695136db1c2af6103400b4f76522da36745247d5 Mon Sep 17 00:00:00 2001 From: Joel Taylor Date: Tue, 17 Feb 2015 16:58:42 -0800 Subject: [PATCH 023/197] Temporarily fix build of x509-system on Darwin. Introduces a nasty impurity but what can you do :( --- pkgs/development/haskell-modules/configuration-common.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index eeee4998c31..6d02f4c6cb9 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -144,9 +144,11 @@ self: super: { # Prevents needing to add security_tool as a build tool to all of x509-system's # dependencies. - x509-system = overrideCabal super.x509-system (drv: { + # TODO: use pkgs.darwin.security_tool once we can build it + x509-system = let security_tool = "/usr"; + in overrideCabal super.x509-system (drv: { patchPhase = (drv.patchPhase or "") + pkgs.stdenv.lib.optionalString pkgs.stdenv.isDarwin '' - substituteInPlace System/X509/MacOS.hs --replace security ${pkgs.darwin.security_tool}/bin/security + substituteInPlace System/X509/MacOS.hs --replace security ${security_tool}/bin/security ''; }); From 92aef0621f4e383a290322724c31f302a811b053 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Tue, 17 Feb 2015 17:02:25 -0800 Subject: [PATCH 024/197] update-channel-branches: fix to work with posix /bin/sh Should now work equally well with bash (as on NixOS) and dash (on various other distributions). The only truly required change was on line 10: "function" is a superfluous keyword that's not present in posix sh. Change-Id: If917499b2e24c0d039e8c61208227b90c9fc5c0d --- .../scripts/update-channel-branches.sh | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/maintainers/scripts/update-channel-branches.sh b/maintainers/scripts/update-channel-branches.sh index 5dbbec9393c..d65cf3ec5f6 100755 --- a/maintainers/scripts/update-channel-branches.sh +++ b/maintainers/scripts/update-channel-branches.sh @@ -1,13 +1,14 @@ #!/bin/sh +set -e : ${NIXOS_CHANNELS:=https://nixos.org/channels/} : ${CHANNELS_NAMESPACE:=refs/heads/channels/} # List all channels which are currently in the repository which we would # have to remove if they are not found again. -deadChannels=$(git for-each-ref --format="%(refname)" $CHANNELS_NAMESPACE) +deadChannels=$(git for-each-ref --format="%(refname)" "$CHANNELS_NAMESPACE") -function updateRef() { +updateRef() { local channelName=$1 local newRev=$2 @@ -17,9 +18,9 @@ function updateRef() { # Update the local refs/heads/channels/* branches to be in-sync with the # channel references. local branch=$CHANNELS_NAMESPACE$channelName - oldRev=$(git rev-parse --short $branch 2>/dev/null || true) + oldRev=$(git rev-parse --short "$branch" 2>/dev/null || true) if test "$oldRev" != "$newRev"; then - if git update-ref $branch $newRev 2>/dev/null; then + if git update-ref "$branch" "$newRev" 2>/dev/null; then if test -z "$oldRev"; then echo " * [new branch] $newRev -> ${branch#refs/heads/}" else @@ -35,21 +36,21 @@ function updateRef() { fi # Filter out the current channel from the list of dead channels. - deadChannels=$(grep -v $CHANNELS_NAMESPACE$channelName </dev/null); then # then the version is not annotated in git version. This sed # expression is basically matching that the expressions end with # ". (Name)" to extract the sha1. - sha1=$(echo $currentSystem | sed -n 's,^.*\.\([a-f0-9]*\) *(.*)$,\1,; T skip; p; :skip;') + sha1=$(echo "$currentSystem" | sed -n 's,^.*\.\([a-f0-9]*\) *(.*)$,\1,; T skip; p; :skip;') updateRef current-system "$sha1" fi -echo "Fetching channels from ~/.nix-defexpr:" -for revFile in : $(find -L ~/.nix-defexpr/ -maxdepth 4 -name svn-revision); do +echo "Fetching channels from $HOME/.nix-defexpr:" +for revFile in : $(find -L "$HOME/.nix-defexpr/" -maxdepth 4 -name svn-revision); do test "$revFile" = : && continue; # Deconstruct a path such as, into: @@ -85,7 +86,7 @@ for revFile in : $(find -L ~/.nix-defexpr/ -maxdepth 4 -name svn-revision); do test -z "$user" && user=$USER channelName="$user${user:+/}$repo" - sha1=$(cat $revFile | sed -n 's,^.*\.\([a-f0-9]*\)$,\1,; T skip; p; :skip;') + sha1=$(sed -n 's,^.*\.\([a-f0-9]*\)$,\1,; T skip; p; :skip;' "$revFile") updateRef "$channelName" "$sha1" done From a68484a0ac286e4c94a9cb692fea04c28ce82345 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Tue, 17 Feb 2015 21:39:13 -0500 Subject: [PATCH 025/197] Minor fix for broken ruby evaluation and libiconv --- pkgs/development/interpreters/ruby/patches.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/ruby/patches.nix b/pkgs/development/interpreters/ruby/patches.nix index 5a2c206fad5..0cc477c991e 100644 --- a/pkgs/development/interpreters/ruby/patches.nix +++ b/pkgs/development/interpreters/ruby/patches.nix @@ -84,7 +84,8 @@ in buildFlags = [ "--with-xml2-dir=${libxml2} --with-xml2-include=${libxml2}/include/libxml2" "--with-xslt-dir=${libxslt} --use-system-libraries" - ] ++ libiconvOrEmpty; + libiconv + ]; }; pry = { gemFlags = "--no-ri --no-rdoc"; }; From a78d164b1e6c10f39c87b8907685a711a6de338c Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Tue, 17 Feb 2015 22:30:59 -0500 Subject: [PATCH 026/197] Minor fixes for git on darwin (libiconv and Security dependencies) --- .../version-management/git-and-tools/default.nix | 3 ++- .../version-management/git-and-tools/git/default.nix | 4 ++-- .../version-management/git-and-tools/hub/default.nix | 6 ++++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 523e121b471..a313a566c4e 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -8,7 +8,7 @@ let gitBase = lib.makeOverridable (import ./git) { inherit fetchurl stdenv curl openssl zlib expat perl python gettext gnugrep asciidoc xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt cpio tcl - tk makeWrapper subversionClient gzip; + tk makeWrapper subversionClient gzip libiconv; texinfo = texinfo5; svnSupport = false; # for git-svn support guiSupport = false; # requires tcl/tk @@ -73,6 +73,7 @@ rec { hub = import ./hub { inherit go; inherit stdenv fetchgit; + inherit (darwin) Security; }; gitFastExport = import ./fast-export { diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 809a369d09e..d31edb04bbe 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio, gnugrep, gzip , asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45 -, libxslt, tcl, tk, makeWrapper +, libxslt, tcl, tk, makeWrapper, libiconv , svnSupport, subversionClient, perlLibs, smtpPerlLibs , guiSupport , withManual ? true @@ -31,7 +31,7 @@ stdenv.mkDerivation { ./ssl-cert-file.patch ]; - buildInputs = [curl openssl zlib expat gettext cpio makeWrapper] + buildInputs = [curl openssl zlib expat gettext cpio makeWrapper libiconv] ++ stdenv.lib.optionals withManual [ asciidoc texinfo xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt ] ++ stdenv.lib.optionals guiSupport [tcl tk]; diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix index be53a429e7b..15874922725 100644 --- a/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, go }: +{ stdenv, fetchgit, go, Security }: stdenv.mkDerivation rec { name = "hub-${version}"; @@ -10,11 +10,13 @@ stdenv.mkDerivation rec { sha256 = "1f6r8vlwnmqmr85drfv24vhqx1aacz6s83c2i804v9997n0wrwfm"; }; - buildInputs = [ go ]; + + buildInputs = [ go ] ++ stdenv.lib.optional stdenv.isDarwin Security; phases = [ "unpackPhase" "buildPhase" "installPhase" ]; buildPhase = '' + patchShebangs . sh script/build ''; From 3a423e4405adfc5a2266455fabc6a37cf49ccfcd Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Tue, 17 Feb 2015 22:39:31 -0500 Subject: [PATCH 027/197] It doesn't appear to be necessary to force the libc++abi rpath in libc++, and removing it helps disentangle the upcoming darwin stdenv from its bootstrap tools --- pkgs/development/compilers/llvm/3.5/libc++/default.nix | 2 -- pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh | 6 ++++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/llvm/3.5/libc++/default.nix b/pkgs/development/compilers/llvm/3.5/libc++/default.nix index 460d71922c6..d2796d678d0 100644 --- a/pkgs/development/compilers/llvm/3.5/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.5/libc++/default.nix @@ -34,8 +34,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - inherit libcxxabi; - setupHook = ./setup-hook.sh; meta = { diff --git a/pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh index 8543d09d8f5..8a45be7e85a 100644 --- a/pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh +++ b/pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh @@ -1,2 +1,4 @@ -export NIX_CFLAGS_COMPILE+=" -isystem @out@/include/c++/v1 -stdlib=libc++" -export NIX_CFLAGS_LINK+=" -stdlib=libc++ -Wl,-rpath,@libcxxabi@/lib" +export NIX_CFLAGS_COMPILE+=" -isystem @out@/include/c++/v1" + +export NIX_CXXSTDLIB_COMPILE=" -stdlib=libc++" +export NIX_CXXSTDLIB_LINK=" -stdlib=libc++" From 2efd1a47004eb4ea63cd963151c1d209a0ae96a0 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Tue, 17 Feb 2015 19:57:17 -0800 Subject: [PATCH 028/197] haproxy: update to 1.5.11 Change-Id: I6f5d8d62084da89c22e99df2a99b4608ba95f874 --- pkgs/tools/networking/haproxy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 5a634ffec66..58e238c3c02 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -1,12 +1,12 @@ { stdenv, pkgs, fetchurl }: stdenv.mkDerivation rec { - version = "1.4.25"; + version = "1.5.11"; name = "haproxy-${version}"; src = fetchurl { - url = "http://haproxy.1wt.eu/download/1.4/src/${name}.tar.gz"; - sha256 = "0qnvj6kbnrrc69nsp2dn5iv2z79adzkcgqssnk30iwvvwg0qwh44"; + url = "http://haproxy.1wt.eu/download/1.5/src/${name}.tar.gz"; + sha256 = "1gwkyy06c8bw5vcjv82hai554zrd415jjsb1iafg01c4k1ia8nlb"; }; buildInputs = [ ]; From d2a987d6e36c7bca253bf08dfe22f2beaa3b2ee1 Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Tue, 17 Feb 2015 20:10:26 -0800 Subject: [PATCH 029/197] fix travis evaluation by providing explicit libiconv for the rare cases that need it, like uclibc --- pkgs/os-specific/linux/uclibc/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix index b856a788348..88cf59cf8b7 100644 --- a/pkgs/os-specific/linux/uclibc/default.nix +++ b/pkgs/os-specific/linux/uclibc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, linuxHeaders, libiconv, cross ? null, gccCross ? null, +{stdenv, fetchurl, linuxHeaders, libiconvReal, cross ? null, gccCross ? null, extraConfig ? ""}: assert stdenv.isLinux; @@ -95,7 +95,7 @@ stdenv.mkDerivation { passthru = { # Derivations may check for the existance of this attribute, to know what to link to. - inherit libiconv; + libiconv = libiconvReal; }; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f0c98ce6c2f..c7997f1d263 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6285,11 +6285,16 @@ let libgsf = callPackage ../development/libraries/libgsf { }; + # glibc provides libiconv so systems with glibc don't need to build libiconv + # separately, but we also provide libiconvReal, which will always be a + # standalone libiconv, just in case you want it libiconv = if stdenv.isGlibc then stdenv.cc.libc else callPackage ../development/libraries/libiconv { }; + libiconvReal = callPackage ../development/libraries/libiconv { }; + # On non-GNU systems we need GNU Gettext for libintl. libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux) gettext; @@ -9163,7 +9168,7 @@ let uclibc = callPackage ../os-specific/linux/uclibc { }; uclibcCross = lowPrio (callPackage ../os-specific/linux/uclibc { - inherit fetchurl stdenv libiconv; + inherit fetchurl stdenv libiconvReal; linuxHeaders = linuxHeadersCross; gccCross = gccCrossStageStatic; cross = assert crossSystem != null; crossSystem; From ecf662efc61cfb125e8cbdc983abf9e9cad829e2 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Wed, 18 Feb 2015 00:22:38 -0500 Subject: [PATCH 030/197] Flip cctools and cctools cross --- pkgs/os-specific/darwin/apple-source-releases/default.nix | 4 ++-- pkgs/stdenv/darwin/default.nix | 2 +- pkgs/top-level/all-packages.nix | 7 +++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index afaf602bec5..92ee9e52726 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -54,7 +54,7 @@ let copyfile = applePackage "copyfile" "103.92.1" "15i2hw5aqx0fklvmq6avin5s00adacvzqc740vviwc2y742vrdcd" {}; CoreOSMakefiles = applePackage "CoreOSMakefiles" "76" "0sw3w3sjil0kvxz8y86b81sz82rcd1nijayki1a1bsnsf0hz6qbf" {}; Csu = applePackage "Csu" "79" "1hif4dz23isgx85sgh11yg8amvp2ksvvhz3y5v07zppml7df2lnh" {}; - dtrace = applePackage "dtrace" "118.1" "0pp5x8dgvzmg9vvg32hpy2brm17dpmbwrcr4prsmdmfvd4767wcf" { cctools = pkgs.darwin.cctools_native; }; + dtrace = applePackage "dtrace" "118.1" "0pp5x8dgvzmg9vvg32hpy2brm17dpmbwrcr4prsmdmfvd4767wcf" {}; dyld = applePackage "dyld" "239.4" "07z7lyv6x0f6gllb5hymccl31zisrdhz4gqp722xcs9nhsqaqvn7" {}; eap8021x = applePackage "eap8021x" "180" "1ynkq8zmhgqhpkdg2syj085lzya0fz55d3423hvf9kcgpbjcd9ic" {}; IOKit = applePackage "IOKit" "907.100.13" "0kcbrlyxcyirvg5p95hjd9k8a01k161zg0bsfgfhkb90kh2s8x0m" { inherit IOKitSrcs; }; @@ -70,7 +70,7 @@ let Libnotify = applePackage "Libnotify" "121.20.1" "164rx4za5z74s0mk9x0m1815r1m9kfal8dz3bfaw7figyjd6nqad" {}; libpthread = applePackage "libpthread" "105.1.4" "09vwwahcvmxvx2xl0890gkp91n61dld29j73y2pa597bqkag2qpg" {}; libresolv = applePackage "libresolv" "54" "028mp2smd744ryxwl8cqz4njv8h540sdw3an1yl7yxqcs04r0p4b" {}; - Libsystem = applePackage "Libsystem" "1197.1.1" "1yfj2qdrf9vrzs7p9m4wlb7zzxcrim1gw43x4lvz4qydpp5kg2rh" { cctools = pkgs.darwin.cctools_native; }; + Libsystem = applePackage "Libsystem" "1197.1.1" "1yfj2qdrf9vrzs7p9m4wlb7zzxcrim1gw43x4lvz4qydpp5kg2rh" {}; libunwind = applePackage "libunwind" "35.3" "0miffaa41cv0lzf8az5k1j1ng8jvqvxcr4qrlkf3xyj479arbk1b" {}; mDNSResponder = applePackage "mDNSResponder" "522.92.1" "1cp87qda1s7brriv413i71yggm8yqfwv64vknrnqv24fcb8hzbmy" {}; objc4 = applePackage "objc4" "551.1" "1jrdb6yyb5jwwj27c1r0nr2y2ihqjln8ynj61mpkvp144c1cm5bg" {}; diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 07d9e9269a4..2502882123e 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -126,7 +126,7 @@ rec { inherit stdenv; nativeTools = false; nativeLibc = true; - binutils = pkgs.darwin.cctools_native; + binutils = pkgs.darwin.cctools; cc = pkgs.llvmPackages.clang; coreutils = pkgs.coreutils; shell = "${pkgs.bash}/bin/bash"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d89b99761bf..e3c3e66156f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4656,7 +4656,7 @@ let }); binutilsCross = - if crossSystem != null && crossSystem.libc == "libSystem" then darwin.cctools + if crossSystem != null && crossSystem.libc == "libSystem" then darwin.cctools_cross else lowPrio (forceNativeDrv (import ../development/tools/misc/binutils { inherit stdenv fetchurl zlib bison; noSysDirs = true; @@ -8448,14 +8448,13 @@ let cmdline = callPackage ../os-specific/darwin/command-line-tools {}; apple-source-releases = import ../os-specific/darwin/apple-source-releases { inherit stdenv fetchurl pkgs; }; in apple-source-releases // rec { - - cctools = callPackage (forceNativeDrv (callPackage ../os-specific/darwin/cctools/port.nix {}).cross) { + cctools_cross = callPackage (forceNativeDrv (callPackage ../os-specific/darwin/cctools/port.nix {}).cross) { cross = assert crossSystem != null; crossSystem; inherit maloader; xctoolchain = xcode.toolchain; }; - cctools_native = (callPackage ../os-specific/darwin/cctools/port.nix {}).native; + cctools = (callPackage ../os-specific/darwin/cctools/port.nix {}).native; maloader = callPackage ../os-specific/darwin/maloader { inherit opencflite; From 025f87f79a086d8e00eb1470ffd355012cfe4d0f Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Wed, 18 Feb 2015 00:24:16 -0500 Subject: [PATCH 031/197] Bootstrap tools for the upcoming new darwin stdenv (not working yet in this stdenv, but will soon) --- pkgs/stdenv/darwin/make-bootstrap-tools.nix | 284 +++++++++++++++++++ pkgs/stdenv/darwin/unpack-bootstrap-tools.sh | 54 ++++ 2 files changed, 338 insertions(+) create mode 100644 pkgs/stdenv/darwin/make-bootstrap-tools.nix create mode 100644 pkgs/stdenv/darwin/unpack-bootstrap-tools.sh diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix new file mode 100644 index 00000000000..636410fdd78 --- /dev/null +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -0,0 +1,284 @@ +{system ? builtins.currentSystem}: + +with import ../../top-level/all-packages.nix {inherit system;}; + +rec { + # We want coreutils without ACL support. + coreutils_ = coreutils.override (orig: { + aclSupport = false; + }); + + build = stdenv.mkDerivation { + name = "build"; + + buildInputs = [nukeReferences cpio]; + + buildCommand = '' + mkdir -p $out/bin $out/lib + + # Our (fake) loader + cp -d ${darwin.dyld}/lib/dyld $out/lib/ + + # C standard library stuff + cp -d ${darwin.Libsystem}/lib/*.o $out/lib/ + cp -d ${darwin.Libsystem}/lib/*.dylib $out/lib/ + cp -d ${darwin.Libsystem}/lib/system/*.dylib $out/lib/ + + # Resolv is actually a link to another package, so let's copy it properly + rm $out/lib/libresolv.9.dylib + cp -L ${darwin.Libsystem}/lib/libresolv.9.dylib $out/lib + + cp -rL ${darwin.Libsystem}/include $out + chmod -R u+w $out/include + cp -rL ${icu}/include* $out/include + cp -rL ${libiconv}/include/* $out/include + cp -rL ${gnugrep.pcre}/include/* $out/include + mv $out/include $out/include-Libsystem + + # Copy coreutils, bash, etc. + cp ${coreutils_}/bin/* $out/bin + (cd $out/bin && rm vdir dir sha*sum pinky factor pathchk runcon shuf who whoami shred users) + + cp ${bash}/bin/bash $out/bin + cp ${findutils}/bin/find $out/bin + cp ${findutils}/bin/xargs $out/bin + cp -d ${diffutils}/bin/* $out/bin + cp -d ${gnused}/bin/* $out/bin + cp -d ${gnugrep}/bin/grep $out/bin + cp ${gawk}/bin/gawk $out/bin + cp -d ${gawk}/bin/awk $out/bin + cp ${gnutar}/bin/tar $out/bin + cp ${gzip}/bin/gzip $out/bin + cp ${bzip2}/bin/bzip2 $out/bin + cp -d ${gnumake}/bin/* $out/bin + cp -d ${patch}/bin/* $out/bin + cp -d ${xz}/bin/xz $out/bin + + # This used to be in-nixpkgs, but now is in the bundle + # because I can't be bothered to make it partially static + cp ${curl}/bin/curl $out/bin + cp -d ${curl}/lib/libcurl*.dylib $out/lib + cp -d ${libssh2}/lib/libssh*.dylib $out/lib + cp -d ${openssl}/lib/*.dylib $out/lib + + cp -d ${gnugrep.pcre}/lib/libpcre*.dylib $out/lib + cp -d ${libiconv}/lib/libiconv*.dylib $out/lib + + # Copy what we need of clang + cp -d ${llvmPackages.clang}/bin/clang $out/bin + cp -d ${llvmPackages.clang}/bin/clang++ $out/bin + cp -d ${llvmPackages.clang}/bin/clang-3.5 $out/bin + + cp -rL ${llvmPackages.clang}/lib/clang $out/lib + + cp -d ${libcxx}/lib/libc++*.dylib $out/lib + cp -d ${libcxxabi}/lib/libc++abi*.dylib $out/lib + + mkdir $out/include + cp -rd ${libcxx}/include/c++ $out/include + + cp -d ${icu}/lib/libicu*.dylib $out/lib + cp -d ${zlib}/lib/libz.* $out/lib + cp -d ${gmpxx}/lib/libgmp*.* $out/lib + cp -d ${xz}/lib/liblzma*.* $out/lib + + # Copy binutils. + for i in as ld ar ranlib nm strip otool install_name_tool dsymutil; do + cp ${darwin.cctools}/bin/$i $out/bin + done + + cp -rd ${pkgs.darwin.CF}/Library $out + + chmod -R u+w $out + + nuke-refs $out/bin/* + + rpathify() { + local libs=$(${darwin.cctools}/bin/otool -L "$1" | tail -n +2 | grep -o "$NIX_STORE.*-\S*") || true + for lib in $libs; do + ${darwin.cctools}/bin/install_name_tool -change $lib "@rpath/$(basename $lib)" "$1" + done + } + + fix_dyld() { + # This is clearly a hack. Once we have an install_name_tool-alike that can patch dyld, this will be nicer. + ${perl}/bin/perl -i -0777 -pe 's/\/nix\/store\/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-dyld-239\.4\/lib\/dyld/\/usr\/lib\/dyld\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00/sg' "$1" + } + + # Strip executables even further + for i in $out/bin/*; do + if test -x $i -a ! -L $i; then + chmod +w $i + + fix_dyld $i + strip $i || true + fi + done + + for i in $out/bin/* $out/lib/*.dylib $out/lib/clang/3.5.0/lib/darwin/*.dylib $out/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation; do + if test -x $i -a ! -L $i; then + echo "Adding rpath to $i" + rpathify $i + fi + done + + nuke-refs $out/lib/* + nuke-refs $out/lib/clang/3.5.0/lib/darwin/* + nuke-refs $out/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation + + mkdir $out/.pack + mv $out/* $out/.pack + mv $out/.pack $out/pack + + mkdir $out/on-server + (cd $out/pack && (find | cpio -o -H newc)) | bzip2 > $out/on-server/bootstrap-tools.cpio.bz2 + + mkdir $out/in-nixpkgs + cp ${stdenv.shell} $out/in-nixpkgs/sh + cp ${cpio}/bin/cpio $out/in-nixpkgs + cp ${coreutils_}/bin/mkdir $out/in-nixpkgs + cp ${bzip2}/bin/bzip2 $out/in-nixpkgs + + chmod u+w $out/in-nixpkgs/* + strip $out/in-nixpkgs/* + nuke-refs $out/in-nixpkgs/* + + for i in $out/in-nixpkgs/*; do + fix_dyld $i + done + ''; + + allowedReferences = []; + }; + + host = stdenv.mkDerivation { + name = "host"; + + buildCommand = '' + mkdir -p $out/nix-support + + for i in "${build}/on-server/"*; do + echo "file binary-dist $i" >> $out/nix-support/hydra-build-products + done + + echo "darwin-bootstrap-tools-$(date +%Y.%m.%d)" >> $out/nix-support/hydra-release-name + ''; + + allowedReferences = [ build ]; + }; + + unpack = stdenv.mkDerivation { + name = "unpack"; + + # This is by necessity a near-duplicate of unpack-bootstrap-tools.sh. If we refer to it directly, + # we can't make any changes to it due to our testing stdenv depending on it. Think of this as the + # unpack-bootstrap-tools.sh for the next round of bootstrap tools. + # TODO: think through alternate designs, such as hosting this script as an output of the process. + buildCommand = '' + # Unpack the bootstrap tools tarball. + echo Unpacking the bootstrap tools... + $mkdir $out + $bzip2 -d < $tarball | (cd $out && $cpio -i) + + # Set the ELF interpreter / RPATH in the bootstrap binaries. + echo Patching the tools... + + export PATH=$out/bin + + for i in $out/bin/*; do + if ! test -L $i; then + echo patching $i + install_name_tool -add_rpath $out/lib $i || true + fi + done + + for i in $out/lib/*.dylib $out/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation; do + if ! test -L $i; then + echo patching $i + + id=$(otool -D "$i" | tail -n 1) + install_name_tool -id "$(dirname $i)/$(basename $id)" $i + + libs=$(otool -L "$i" | tail -n +2 | grep -v Libsystem | cat) + if [ -n "$libs" ]; then + install_name_tool -add_rpath $out/lib $i + fi + fi + done + + ln -s bash $out/bin/sh + ln -s bzip2 $out/bin/bunzip2 + + cat >$out/bin/dsymutil << EOF + #!$out/bin/sh + EOF + ''; + + tarball = "${build}/on-server/bootstrap-tools.cpio.bz2"; + + mkdir = "${build}/in-nixpkgs/mkdir"; + bzip2 = "${build}/in-nixpkgs/bzip2"; + cpio = "${build}/in-nixpkgs/cpio"; + + allowedReferences = [ "out" ]; + }; + + test = stdenv.mkDerivation { + name = "test"; + + realBuilder = "${unpack}/bin/bash"; + + buildCommand = '' + export PATH=${unpack}/bin + ls -l + mkdir $out + mkdir $out/bin + sed --version + find --version + diff --version + patch --version + make --version + awk --version + grep --version + clang --version + xz --version + + # The grep will return a nonzero exit code if there is no match, and we want to assert that we have + # an SSL-capable curl + curl --version | grep SSL + + ${build}/in-nixpkgs/sh -c 'echo Hello World' + + export flags="-idirafter ${unpack}/include-Libsystem --sysroot=${unpack} -L${unpack}/lib" + + export CPP="clang -E $flags" + export CC="clang $flags -Wl,-rpath,${unpack}/lib -Wl,-v" + export CXX="clang++ $flags --stdlib=libc++ -lc++abi -isystem${unpack}/include/c++/v1 -Wl,-rpath,${unpack}/lib -Wl,-v" + + echo '#include ' >> foo.c + echo '#include ' >> foo.c + echo '#include ' >> foo.c + echo 'int main() { printf("Hello World\n"); return 0; }' >> foo.c + $CC -o $out/bin/foo foo.c + $out/bin/foo + + echo '#include ' >> bar.c + echo 'int main() { CFShow(CFSTR("Hullo")); return 0; }' >> bar.c + $CC -F${unpack}/Library/Frameworks -framework CoreFoundation -o $out/bin/bar bar.c + $out/bin/bar + + echo '#include ' >> bar.cc + echo 'int main() { std::cout << "Hello World\n"; }' >> bar.cc + $CXX -v -o $out/bin/bar bar.cc + $out/bin/bar + + tar xvf ${hello.src} + cd hello-* + ./configure --prefix=$out + make + make install + + $out/bin/hello + ''; + }; +} diff --git a/pkgs/stdenv/darwin/unpack-bootstrap-tools.sh b/pkgs/stdenv/darwin/unpack-bootstrap-tools.sh new file mode 100644 index 00000000000..8033c7004d9 --- /dev/null +++ b/pkgs/stdenv/darwin/unpack-bootstrap-tools.sh @@ -0,0 +1,54 @@ +set -e + +# Unpack the bootstrap tools tarball. +echo Unpacking the bootstrap tools... +$mkdir $out +$bzip2 -d < $tarball | (cd $out && $cpio -i) + +# Set the ELF interpreter / RPATH in the bootstrap binaries. +echo Patching the tools... + +export PATH=$out/bin + +for i in $out/bin/*; do + if ! test -L $i; then + echo patching $i + install_name_tool -add_rpath $out/lib $i || true + fi +done + +for i in $out/lib/*.dylib $out/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation; do + if ! test -L $i; then + echo patching $i + + id=$(otool -D "$i" | tail -n 1) + install_name_tool -id "$(dirname $i)/$(basename $id)" $i + + libs=$(otool -L "$i" | tail -n +2 | grep -v libSystem | cat) + if [ -n "$libs" ]; then + install_name_tool -add_rpath $out/lib $i + fi + fi +done + +ln -s bash $out/bin/sh +ln -s bzip2 $out/bin/bunzip2 + +# Provide a gunzip script. +cat > $out/bin/gunzip < $out/bin/egrep +echo "exec $out/bin/grep -E \"\$@\"" >> $out/bin/egrep +echo "#! $out/bin/sh" > $out/bin/fgrep +echo "exec $out/bin/grep -F \"\$@\"" >> $out/bin/fgrep + +cat >$out/bin/dsymutil << EOF +#!$out/bin/sh +EOF + +chmod +x $out/bin/egrep $out/bin/fgrep $out/bin/dsymutil From 12c1c8d590648dfab9bb2cf1f0850c13a9bc8db5 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Wed, 18 Feb 2015 00:49:37 -0500 Subject: [PATCH 032/197] wget wants libiconv but doesn't say so --- pkgs/tools/networking/wget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index 587f8bcaeac..5a597afd9d3 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, gettext, libidn , perl, perlPackages, LWP, python3 -, gnutls ? null }: +, libiconv, gnutls ? null }: stdenv.mkDerivation rec { name = "wget-1.16"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ gettext ]; - buildInputs = [ libidn ] + buildInputs = [ libidn libiconv ] ++ stdenv.lib.optionals doCheck [ perl perlPackages.IOSocketSSL LWP python3 ] ++ stdenv.lib.optional (gnutls != null) gnutls ++ stdenv.lib.optional stdenv.isDarwin perl; From 7cc575c870b3fc0a755bffb6c528132d65b68a08 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Wed, 18 Feb 2015 01:14:36 -0500 Subject: [PATCH 033/197] Fish wants libiconv too, even though it won't admit it --- pkgs/shells/fish/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index d165f2f386a..823867abc0f 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, python, which, groff, gettext, man_db, bc }: +{ stdenv, fetchurl, ncurses, python, which, groff, gettext, man_db, bc, libiconv }: stdenv.mkDerivation rec { name = "fish-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "b7e4d3c3d55fc3859edcb20462fcf0d14ab26e920eddcd503072e8105284d924"; }; - buildInputs = [ ncurses ]; + buildInputs = [ ncurses libiconv ]; # Required binaries during execution # Python: Autocompletion generated from manpages and config editing From 3caa6f4d7d431e4c26d84c69b50624533206db21 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Wed, 18 Feb 2015 01:19:59 -0500 Subject: [PATCH 034/197] This doesn't hurt the current darwin stdenv and doesn't affect anything else, but is needed for the upcoming pure darwin stdenv --- pkgs/tools/networking/openssh/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 10990829b0a..68b1aab2d89 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { ${if pam != null then "--with-pam" else "--without-pam"} ${optionalString (etcDir != null) "--sysconfdir=${etcDir}"} ${optionalString withKerberos "--with-kerberos5=${kerberos}"} + ${optionalString stdenv.isDarwin "--disable-libutil"} ''; preConfigure = From 6938b79de8c6325e870a8f7e0845b12b8e6a6d22 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Wed, 18 Feb 2015 07:35:54 +0100 Subject: [PATCH 035/197] Disable simpleparse on python3 and pypy --- pkgs/top-level/python-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 350a8c2551d..b004753d823 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9663,6 +9663,8 @@ let version = "2.1.1"; name = "simpleparse-${version}"; + disabled = isPy3k || isPyPy; + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/S/SimpleParse/SimpleParse-${version}.tar.gz"; sha256 = "1n8msk71lpl3kv086xr2sv68ppgz6228575xfnbszc6p1mwr64rg"; From fbe66014abf80dc7ea86916a6b27abef3c38f5de Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Wed, 18 Feb 2015 06:37:52 +0000 Subject: [PATCH 036/197] haskell-happstack-hamlet: mark as broken No upstream version supports happstack-server >= 7.4 --- .../libraries/haskell/happstack/happstack-hamlet.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix index e81235cf097..3567b418ba3 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix @@ -12,5 +12,7 @@ cabal.mkDerivation (self: { description = "Support for Hamlet HTML templates in Happstack"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; + broken = true; }; }) From 45b9432f828863f9e4b956395223bb4c1abec3aa Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Wed, 18 Feb 2015 06:39:02 +0000 Subject: [PATCH 037/197] haskell-happstack-lite: version bump Fixes build --- .../libraries/haskell/happstack/happstack-lite.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/happstack/happstack-lite.nix b/pkgs/development/libraries/haskell/happstack/happstack-lite.nix index fa904e0434a..d0d4de909ef 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-lite.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-lite.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "happstack-lite"; - version = "7.3.5"; - sha256 = "1gkzkmg1ad5k9hb4gix2afq1k4j996qpp8mm1jzqk03a5njdpb4b"; + version = "7.3.6"; + sha256 = "1mvzpbmjgf5gv9ls5kmg0s6cr765jl701vy2kmbynjkg6jimjmp8"; buildDepends = [ happstackServer mtl text ]; meta = { homepage = "http://www.happstack.com/"; From b3bacd4d0c7f985f9bf67475c40c7d6db6d6bad9 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Wed, 18 Feb 2015 06:41:09 +0000 Subject: [PATCH 038/197] haskell-pool-conduit: mark as broken Fails to build, deprecated. --- pkgs/development/libraries/haskell/pool-conduit/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/haskell/pool-conduit/default.nix b/pkgs/development/libraries/haskell/pool-conduit/default.nix index f8f748056c3..14098c980bb 100644 --- a/pkgs/development/libraries/haskell/pool-conduit/default.nix +++ b/pkgs/development/libraries/haskell/pool-conduit/default.nix @@ -14,5 +14,7 @@ cabal.mkDerivation (self: { description = "Resource pool allocations via ResourceT. (deprecated)"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; + broken = true; }; }) From ffc1a595e439f2b22cd21bc72671d28dc0ab8e1f Mon Sep 17 00:00:00 2001 From: Ryan Scheel Date: Tue, 17 Feb 2015 22:44:58 -0800 Subject: [PATCH 039/197] Update Node stable to v.0.12.0 Patch is from ewemoa on IRC and claims it built successfully. User didn't want to create a Github account. Original patch is at https://pastee.org/zx45s --- pkgs/development/web/nodejs/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index 06aeec77fbd..27bb65ccbc7 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, python, zlib, v8, utillinux, http-parser, c-ares +{ stdenv, fetchurl, openssl, python, zlib, v8, utillinux, http-parser , pkgconfig, runCommand, which, unstableVersion ? false }: @@ -8,7 +8,7 @@ let ln -sv /usr/sbin/dtrace $out/bin ''; - version = if unstableVersion then "0.11.13" else "0.10.33"; + version = if unstableVersion then "0.11.13" else "0.12.0"; # !!! Should we also do shared libuv? deps = { @@ -19,9 +19,7 @@ let # inherit v8 } // (stdenv.lib.optionalAttrs (!stdenv.isDarwin) { inherit http-parser; - }) - # Node 0.11 has patched c-ares, won't compile with system's version - // (if unstableVersion then {} else { cares = c-ares; }); + }); sharedConfigureFlags = name: [ "--shared-${name}" @@ -37,7 +35,7 @@ in stdenv.mkDerivation { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz"; sha256 = if unstableVersion then "1642zj3sajhqflfhb8fsvy84w9mm85wagm8w8300gydd2q6fkmhm" - else "07h8vl750svjg8x5zhxhwjkx03jpy2m6h3fbj7fd1rj4671jdp3m"; + else "0cifd2qhpyrbxx71a4hsagzk24qas8m5zvwcyhx69cz9yhxf404p"; }; configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps); From 233cc55dc44f85fa620a2cd64d64440e3d28994d Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Wed, 18 Feb 2015 06:50:09 +0000 Subject: [PATCH 040/197] haskell-rest-core: version bump --- pkgs/development/libraries/haskell/rest-core/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/rest-core/default.nix b/pkgs/development/libraries/haskell/rest-core/default.nix index ce01091c066..1c4affbafdc 100644 --- a/pkgs/development/libraries/haskell/rest-core/default.nix +++ b/pkgs/development/libraries/haskell/rest-core/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "rest-core"; - version = "0.33.1.2"; - sha256 = "0axl6d28agyzklrnl264413a8hpfi7ih296i453r6fg4c63ma5h4"; + version = "0.34.0.3"; + sha256 = "0jcbnzw0hxq1f7f0frsji3ybdlapmps8dv19ni6rq0bvmiip2i19"; buildDepends = [ aeson aesonUtils either errors fclabels hxt hxtPickleUtils jsonSchema mtl multipart random restStringmap restTypes safe split @@ -18,7 +18,6 @@ cabal.mkDerivation (self: { testDepends = [ HUnit mtl testFramework testFrameworkHunit unorderedContainers ]; - jailbreak = true; meta = { description = "Rest API library"; license = self.stdenv.lib.licenses.bsd3; From c2f216b8e1e425a599d62809b29a243d9c60cabd Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Wed, 18 Feb 2015 06:50:37 +0000 Subject: [PATCH 041/197] haskell-rest-types: version bump --- pkgs/development/libraries/haskell/rest-types/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/rest-types/default.nix b/pkgs/development/libraries/haskell/rest-types/default.nix index 9b9d9f62d26..9a4caac1ad2 100644 --- a/pkgs/development/libraries/haskell/rest-types/default.nix +++ b/pkgs/development/libraries/haskell/rest-types/default.nix @@ -6,13 +6,12 @@ cabal.mkDerivation (self: { pname = "rest-types"; - version = "1.11.1.1"; - sha256 = "0xr9h1bivw3miyg4xill0jwn95lybsbqgrnw2323pwxlbbnaa25a"; + version = "1.12"; + sha256 = "0is0kzpr7w1bfw32ybkqwj8g4fyx5ii983hbrqas9gbrkgc0hxv6"; buildDepends = [ aeson genericAeson hxt jsonSchema mtl regular regularXmlpickler restStringmap text uuid ]; - jailbreak = true; meta = { description = "Silk Rest Framework Types"; license = self.stdenv.lib.licenses.bsd3; From baba36ce27899fd41652d295c7dca6a6b08acabe Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Wed, 18 Feb 2015 06:50:55 +0000 Subject: [PATCH 042/197] haskell-rest-happstack Fixes build --- pkgs/development/libraries/haskell/rest-happstack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/rest-happstack/default.nix b/pkgs/development/libraries/haskell/rest-happstack/default.nix index 523bb685561..0cb090524e8 100644 --- a/pkgs/development/libraries/haskell/rest-happstack/default.nix +++ b/pkgs/development/libraries/haskell/rest-happstack/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "rest-happstack"; - version = "0.2.10.3"; - sha256 = "05sakr88j6rlwnghzd00g3c3895wpjxi36n9pdbpv0fpm0hh86yv"; + version = "0.2.10.6"; + sha256 = "0b21wg4nj24yqh6akyaaw7dxmkdvvb7d9l0d32mz3hx4m2jq9ay5"; buildDepends = [ happstackServer mtl restCore restGen utf8String ]; meta = { description = "Rest driver for Happstack"; From c6ce6460c45a9224096bff0a1aeac42bc86cde39 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Wed, 18 Feb 2015 02:05:43 -0500 Subject: [PATCH 043/197] Rearrange llvm dependencies slightly to avoid unnecessary dependencies on darwin (binutils is only used for gold integration, which doesn't apply on darwin) --- pkgs/development/compilers/llvm/3.5/llvm.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix index 00de67c6052..bacd0b26643 100644 --- a/pkgs/development/compilers/llvm/3.5/llvm.nix +++ b/pkgs/development/compilers/llvm/3.5/llvm.nix @@ -41,9 +41,10 @@ in stdenv.mkDerivation rec { "-DCMAKE_BUILD_TYPE=Release" "-DLLVM_BUILD_TESTS=ON" "-DLLVM_ENABLE_FFI=ON" + ] ++ stdenv.lib.optionals (!isDarwin) [ + "-DBUILD_SHARED_LIBS=ON" "-DLLVM_BINUTILS_INCDIR=${binutils}/include" - ] ++ stdenv.lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON" - ++ stdenv.lib.optionals ( isDarwin) [ + ] ++ stdenv.lib.optionals ( isDarwin) [ "-DCMAKE_CXX_FLAGS=-stdlib=libc++" "-DCAN_TARGET_i386=false" ]; From ac65a757f0555c758e07a493f02514bc5a4bf691 Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Tue, 9 Dec 2014 12:58:34 +0300 Subject: [PATCH 044/197] vsftpd.nix: add 'portPromiscuous' option --- nixos/modules/services/networking/vsftpd.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/modules/services/networking/vsftpd.nix b/nixos/modules/services/networking/vsftpd.nix index 62b6027c012..447149552f4 100644 --- a/nixos/modules/services/networking/vsftpd.nix +++ b/nixos/modules/services/networking/vsftpd.nix @@ -68,6 +68,11 @@ let Only applies if is true. Non anonymous (local) users must use a secure SSL connection for sending/receiving data on data connection. '') + (yesNoOption "portPromiscuous" "port_promiscuous" false '' + Set to YES if you want to disable the PORT security check that ensures that + outgoing data connections can only connect to the client. Only enable if you + know what you are doing! + '') (yesNoOption "ssl_tlsv1" "ssl_tlsv1" true '' '') (yesNoOption "ssl_sslv2" "ssl_sslv2" false '' '') (yesNoOption "ssl_sslv3" "ssl_sslv3" false '' '') From cbab474ceaded3e8a5fdc359a56e14711ddb7740 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 18 Feb 2015 10:39:30 +0100 Subject: [PATCH 045/197] nixUnstable: Update --- pkgs/tools/package-management/nix/unstable.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 09453428a85..8e893edbafa 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -1,20 +1,20 @@ -{ stdenv, fetchurl, perl, curl, bzip2, sqlite, openssl ? null -, pkgconfig, boehmgc, perlPackages +{ lib, stdenv, fetchurl, perl, curl, bzip2, sqlite, openssl ? null +, pkgconfig, boehmgc, perlPackages, libsodium , storeDir ? "/nix/store" , stateDir ? "/nix/var" }: stdenv.mkDerivation rec { - name = "nix-1.9pre4028_0d1dafa"; + name = "nix-1.9pre4045_bd91064"; src = fetchurl { - url = "http://hydra.nixos.org/build/19375273/download/4/${name}.tar.xz"; - sha256 = "592da6102a777c13652f7350f40f5693fa005076e06c7ce6f570a854576d104e"; + url = "http://hydra.nixos.org/build/19776695/download/4/${name}.tar.xz"; + sha256 = "3a9d5750fa7cf4958a275516d5b7f3ab0036529a07a4ee16ade89a714fd55f7a"; }; nativeBuildInputs = [ perl pkgconfig ]; - buildInputs = [ curl openssl sqlite ]; + buildInputs = [ curl openssl sqlite ] ++ lib.optional stdenv.isLinux libsodium; propagatedBuildInputs = [ boehmgc ]; From d6c88eaeb8aa13172e1d503ac62522fed3db9ea2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 18 Feb 2015 10:40:56 +0100 Subject: [PATCH 046/197] Apply upstream fix for Nix on XFS Fixes #6424. --- pkgs/tools/package-management/nix/default.nix | 2 ++ pkgs/tools/package-management/nix/xfs.patch | 13 +++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/tools/package-management/nix/xfs.patch diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index f1dad6379dc..2d105113133 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { sha256 = "a30a5e801bc1cb1019cbc3456d961a307c45c9c588b8692cf1293ea6588ef01c"; }; + patches = [ ./xfs.patch ]; + nativeBuildInputs = [ perl pkgconfig ]; buildInputs = [ curl openssl sqlite ]; diff --git a/pkgs/tools/package-management/nix/xfs.patch b/pkgs/tools/package-management/nix/xfs.patch new file mode 100644 index 00000000000..62ee9189ac1 --- /dev/null +++ b/pkgs/tools/package-management/nix/xfs.patch @@ -0,0 +1,13 @@ +diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc +index 119e71a..422ec97 100644 +--- a/src/libexpr/primops.cc ++++ b/src/libexpr/primops.cc +@@ -796,7 +796,7 @@ static void prim_readDir(EvalState & state, const Pos & pos, Value * * args, Val + for (auto & ent : entries) { + Value * ent_val = state.allocAttr(v, state.symbols.create(ent.name)); + if (ent.type == DT_UNKNOWN) +- ent.type = getFileType(path); ++ ent.type = getFileType(path + "/" + ent.name); + mkStringNoCopy(*ent_val, + ent.type == DT_REG ? "regular" : + ent.type == DT_DIR ? "directory" : From 4ac280ec49c33abccebeeeb625a941172c08679b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 17 Feb 2015 23:18:11 +0100 Subject: [PATCH 047/197] Blacklist the nouveau driver on EC2 --- nixos/modules/virtualisation/amazon-image.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index 32783279bb2..0473c2454e2 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -91,6 +91,10 @@ in boot.initrd.kernelModules = [ "xen-blkfront" ]; boot.kernelModules = [ "xen-netfront" ]; + # Prevent the nouveau kernel module from being loaded, as it + # interferes with the nvidia/nvidia-uvm modules needed for CUDA. + boot.blacklistedKernelModules = [ "nouveau" ]; + # Generate a GRUB menu. Amazon's pv-grub uses this to boot our kernel/initrd. boot.loader.grub.version = if cfg.hvm then 2 else 1; boot.loader.grub.device = if cfg.hvm then "/dev/xvda" else "nodev"; From efbd73dc4c77ca2a1b89148990a296e52512a5f4 Mon Sep 17 00:00:00 2001 From: Sibi Date: Wed, 18 Feb 2015 18:08:13 +0530 Subject: [PATCH 048/197] new package: pybcrypt --- pkgs/top-level/python-packages.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5cb17e42464..806af1fe11a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7808,6 +7808,21 @@ let }; }; + pybcrypt = buildPythonPackage rec { + name = "pybcrypt"; + version = "0.4"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/py-bcrypt/py-bcrypt-${version}.tar.gz"; + md5 = "dd8b367d6b716a2ea2e72392525f4e36"; + }; + + meta = { + description = "bcrypt password hashing and key derivation"; + homepage = https://code.google.com/p/py-bcrypt2; + license = "BSD"; + }; + }; pycapnp = buildPythonPackage rec { name = "pycapnp-0.5.1"; From 75ce44a95c42ee752fafb454e3744c000352caa5 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 18 Feb 2015 15:13:43 +0300 Subject: [PATCH 049/197] r-modules: regenerate --- pkgs/development/r-modules/cran-packages.nix | 1024 ++++++++++-------- 1 file changed, 575 insertions(+), 449 deletions(-) diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix index 2e5724f00ad..fa8d40d71fc 100644 --- a/pkgs/development/r-modules/cran-packages.nix +++ b/pkgs/development/r-modules/cran-packages.nix @@ -1,6 +1,12 @@ +# This file is generated from generate-cran-packages.R. DO NOT EDIT. +# Execute the following command to update the file. +# +# Rscript generate-cran-packages.R > cran-packages.nix + { self, derive }: with self; { A3 = derive { name="A3"; version="0.9.2"; sha256="01s7znhph2mr3snpscci3y7nbcisa6kg6hy7im3742r6ah0z3jv7"; depends=[xtable pbapply]; }; ABCExtremes = derive { name="ABCExtremes"; version="1.0"; sha256="032bc9a6cxy4war95n8v4vaax3q96k2wryjbcipi3z55b2l8hdny"; depends=[SpatialExtremes combinat]; }; +ABCanalysis = derive { name="ABCanalysis"; version="1.0"; sha256="0qmy11lv4x1zgbjifpcy2zhkf3ba5a5b4jbiazcqws35j1p3q835"; depends=[Hmisc plotrix]; }; ABCoptim = derive { name="ABCoptim"; version="0.13.11"; sha256="1j2pbfl5g9x71gq9f7vg6wznsds8sn8dj3q2h5fhjcv58di3gjhl"; depends=[]; }; ABCp2 = derive { name="ABCp2"; version="1.1"; sha256="0s0lbwlc8nycm7b8vx0v01f8dmy91r1zqcj9zgrlj7dnpg4cpkml"; depends=[MASS]; }; ACCLMA = derive { name="ACCLMA"; version="1.0"; sha256="1na27sp18fq12gp6vxgqw1ffsz2yi1d8xvrxbrzx5g1kqxrayy0v"; depends=[]; }; @@ -13,7 +19,7 @@ ADM3 = derive { name="ADM3"; version="1.3"; sha256="1hg9wjdhckilqd13dr4cim4j6jsh AER = derive { name="AER"; version="1.2-2"; sha256="0ny9khzqxzx4npaqmknhpi3aldz11ipg71zw4skxphclamlsgp86"; depends=[car lmtest sandwich survival zoo Formula]; }; AFLPsim = derive { name="AFLPsim"; version="0.3-4"; sha256="0xqp1d3cn8rcrsx0yipqh0k4xynv446acxpcammbflsz01xsgx9v"; depends=[adegenet introgress]; }; AGD = derive { name="AGD"; version="0.32"; sha256="1jjkclqylh43vm1bj1g4cml7a84sxdl94kmhxgmk04rdkmgf8c47"; depends=[gamlss gamlss_dist]; }; -AGSDest = derive { name="AGSDest"; version="2.1"; sha256="1l36x3sjb0732aic2y4yrvx64phii1xjfzr4nc3x9b2crr988n0g"; depends=[ldbounds]; }; +AGSDest = derive { name="AGSDest"; version="2.2"; sha256="00kf786i72bc4a80qswq1iazwqi709pxvzadgfih511plgir6ik2"; depends=[ldbounds]; }; AICcmodavg = derive { name="AICcmodavg"; version="2.0-3"; sha256="1a9jbf3vd77hsf98smjgqchhkc9z8qqp12c1mflln3l0pxx0vk8q"; depends=[lattice MASS Matrix nlme unmarked VGAM xtable]; }; AID = derive { name="AID"; version="1.4"; sha256="1wj2jmqla0b2y9hrvl5i69bncdx1xjdd7if69j6dy1dnxv6clx1z"; depends=[MASS tseries nortest]; }; AIM = derive { name="AIM"; version="1.01"; sha256="11lkfilxk265a7jkc1wq5xlgxa56xhg302f1q9xb7gmjnzdigb21"; depends=[survival survival]; }; @@ -29,11 +35,12 @@ AMORE = derive { name="AMORE"; version="0.2-15"; sha256="00zfqcsah2353mrhqkv8bbh AOfamilies = derive { name="AOfamilies"; version="1.01"; sha256="0v3b83k12lsrdcrkjl2ff38d0g8sbrnm5pmm9xphyrk3lfgap76k"; depends=[lqmm quantreg]; }; APSIMBatch = derive { name="APSIMBatch"; version="0.1.0.2374"; sha256="0j44ijq1v1k60lka9nmw8m1jfjw7pidny9bvswqy5v82gzmwl29d"; depends=[]; }; AR1seg = derive { name="AR1seg"; version="1.0"; sha256="0v9adx5wj9r4jwl3bqqmj0byiqfp585jz013qfqrq601wj8v4zi3"; depends=[Segmentor3IsBack]; }; -ARPobservation = derive { name="ARPobservation"; version="1.0"; sha256="0m9sr0pgwzndia2286fmhlw7xsyn3pvy0044xlp5sw3i3gqhv39f"; depends=[]; }; +ARPobservation = derive { name="ARPobservation"; version="1.1"; sha256="1cdhn11jf1nf03jyvs17ygmjq9pb5rvmyyrq9fp7ifmvcgbkwsms"; depends=[]; }; ARTP = derive { name="ARTP"; version="2.0.4"; sha256="1f6ay9lyaqsc33b0larb8v6imp5adaycya84wif2sg32rv4gx3yl"; depends=[]; }; ARTool = derive { name="ARTool"; version="0.9.3"; sha256="188k3whgm93jm2kpvh711d4l73gickn9iwidz95srwdcdlf9cf1y"; depends=[lme4 car plyr pbkrtest]; }; -ASMap = derive { name="ASMap"; version="0.3-2"; sha256="0rmf12lhzgi301mnf7iy98zq6ggdalwr45lgrw09n9qzb3jf4dp5"; depends=[qtl gtools fields lattice]; }; +ASMap = derive { name="ASMap"; version="0.3-3"; sha256="011r1q6g3rwhxsgvzzb9y08zba0g18m1kgnzij6nm7qblhyvsk92"; depends=[qtl gtools fields lattice]; }; ASPBay = derive { name="ASPBay"; version="1.2"; sha256="0b1qpyvmj7z10ixrmdxp42bj9s72c1l9rihzmv9p58f12a5aznjz"; depends=[hexbin Rcpp Rcpp RcppArmadillo]; }; +ATE = derive { name="ATE"; version="0.2.0"; sha256="1i46ivb7q61kq11z9v1rlnwad914nsdjcz9bagqx17vjk160mc0a"; depends=[]; }; ATmet = derive { name="ATmet"; version="1.2"; sha256="047ibxxf5si45zw22zy8a1kpj36q0pd3bsmxwvn0dhf4h65ah0zz"; depends=[DiceDesign lhs metRology msm sensitivity]; }; AUC = derive { name="AUC"; version="0.3.0"; sha256="0ripcib2qz0m7rgr1kiz68nx8f6p408l1ww7j78ljqik7p3g41g7"; depends=[]; }; AUCRF = derive { name="AUCRF"; version="1.1"; sha256="00d7jcg2dyvf7sc9w7vxxd85m7nsbcmfqsavrv236vxfpfc9yn7i"; depends=[randomForest]; }; @@ -41,7 +48,6 @@ AcceptanceSampling = derive { name="AcceptanceSampling"; version="1.0-3"; sha256 Actigraphy = derive { name="Actigraphy"; version="1.2"; sha256="02xxmzjqym46q0fzddmy29i8la9knrna3b46y8849nmbpqvmp3qn"; depends=[fda lattice SDMTools]; }; ActuDistns = derive { name="ActuDistns"; version="3.0"; sha256="04rff9czcgac80clpv32a1dl0jbyvfsa7wqxyywgk99w672x50i2"; depends=[reliaR actuar hypergeo]; }; AdMit = derive { name="AdMit"; version="2.0.1"; sha256="0bqzq2pf5449qyr8ff5d3sq0lbsph29ppv6zzf1rbjz06sc5d6ff"; depends=[mvtnorm]; }; -AdapEnetClass = derive { name="AdapEnetClass"; version="1.1"; sha256="0xx1528s1kl20ka8asjm91sawfnj0z2sw8gw9z7grc94ssfd80zc"; depends=[imputeYn glmnet lars quadprog]; }; AdaptFit = derive { name="AdaptFit"; version="0.2-2"; sha256="124lj1sq5cbp35z4ybkc7ci3fi6pgf8pc5k9mpqmyb6dj870q836"; depends=[SemiPar MASS nlme cluster]; }; AdaptFitOS = derive { name="AdaptFitOS"; version="0.54"; sha256="0h9jfq9mk5wd6v6an40l3sk2adn6fcaks22bi8d9s7zr2ldpzrjq"; depends=[SemiPar nlme MASS mgcv]; }; AdaptiveSparsity = derive { name="AdaptiveSparsity"; version="1.4"; sha256="1az7isvalf3kmdiycrfl6s9k9xqk22k1mc6rh8v0jmcz402qyq8z"; depends=[Rcpp Rcpp RcppArmadillo]; }; @@ -55,6 +61,7 @@ AmericanCallOpt = derive { name="AmericanCallOpt"; version="0.95"; sha256="1nhy4 AmpliconDuo = derive { name="AmpliconDuo"; version="1.0"; sha256="0l6p5c2802a1f3b77cdrrk3wdf41926mh34630p462fb3wqipps0"; depends=[ggplot2 xtable]; }; AnDE = derive { name="AnDE"; version="1.0"; sha256="1yil8ab50wvlqmdla9kmfba8vfgy5r694r6igb58s6vnmld78yf2"; depends=[discretization functional foreign stringr]; }; AnalyzeFMRI = derive { name="AnalyzeFMRI"; version="1.1-16"; sha256="1mbjb682ns5230jd3vcvd6x4gnn9hpbmjd7r8120y4sp2g733b0f"; depends=[R_matlab fastICA]; }; +AncestryMapper = derive { name="AncestryMapper"; version="1.2"; sha256="0d47vkf59ysa58wnlqkshsvdzhcppb9xc1agwkxv37jv1asllb67"; depends=[]; }; AnglerCreelSurveySimulation = derive { name="AnglerCreelSurveySimulation"; version="0.2.1"; sha256="100mbmdllk6c32j75jviz2k9kmwca3jvrqb95a555alfcpkfim8c"; depends=[]; }; AnnotLists = derive { name="AnnotLists"; version="1.2"; sha256="1g2khb2ggniwg2zcjamsm3bxyrl2zabvk540b5vyy9am9k83m1g9"; depends=[]; }; AntWeb = derive { name="AntWeb"; version="0.7"; sha256="1ykfg3zzjdvjppr2l4f26lx00cn5vaqhhz1j1b5yh113ggyl40qw"; depends=[rjson plyr assertthat httr leafletR]; }; @@ -76,24 +83,23 @@ BACCO = derive { name="BACCO"; version="2.0-9"; sha256="0i1dnk0g3miyv3b60rzgjjm6 BACprior = derive { name="BACprior"; version="2.0"; sha256="1z9dvjq4lr99yp6c99bcv6n5jiiwfddfz4izcpfnnyvagfgizr8p"; depends=[mvtnorm leaps boot]; }; BAEssd = derive { name="BAEssd"; version="1.0.1"; sha256="04wkhcj4wm93hvmfnnzryswaylnxz5qsgnqky9lsx4jqhvg340l6"; depends=[mvtnorm]; }; BAMMtools = derive { name="BAMMtools"; version="2.0.2"; sha256="10z638f79j3jksb69sqrnkzs5nzxi9srsxww4ky3bk21zb66ikhd"; depends=[ape]; }; -BANFF = derive { name="BANFF"; version="0.2"; sha256="151kkw7i1v1jvwvdczqwajmq551vg5jrarwsxz62sazwg70ffmb6"; depends=[foreach doParallel DPpackage igraph mclust pscl tmvtnorm network]; }; +BANFF = derive { name="BANFF"; version="0.3"; sha256="0z7hwplp12m8sypkndjkjkmanbh67h47k8j9wm60qg6nnyqry9np"; depends=[foreach doParallel DPpackage igraph mclust pscl tmvtnorm network coda]; }; BANOVA = derive { name="BANOVA"; version="0.2"; sha256="1zgn9wxh4c89rris58hhj5fh37mmy8wjvligr02id7a1pcw177m3"; depends=[rjags runjags coda]; }; -BAS = derive { name="BAS"; version="1.0"; sha256="1j5crafky3jb25kim3b7gxg9azn3ya357ckq1v7wryzi3zi674sg"; depends=[MASS]; }; BASIX = derive { name="BASIX"; version="1.1"; sha256="18dkvv1iwskfnlpl6xridcgqpalbbpm2616mvc3hfrc0b26v01id"; depends=[]; }; -BAT = derive { name="BAT"; version="1.1"; sha256="0zj2ip3d8l37jv31a9nzgiiiwrmgk69fr1sshfgfkmb2s3fpr6w2"; depends=[vegan spatstat nls2]; }; +BAT = derive { name="BAT"; version="1.2"; sha256="06r2y9l07kj3fm3mm38xjrl7q6yz66vr514xx37957r9s8zf7i92"; depends=[vegan spatstat nls2]; }; BAYSTAR = derive { name="BAYSTAR"; version="0.2-9"; sha256="0crillww1f1jvhjw639sf09lpc3wpzd69milah143gk9zlrkhmz2"; depends=[mvtnorm coda]; }; BB = derive { name="BB"; version="2014.10-1"; sha256="1lig3vxhyxy8cnic5bczms8pajmdvwr2ijad1rkdndpglving7x0"; depends=[quadprog]; }; -BBEST = derive { name="BBEST"; version="0.1-1"; sha256="11kh1kiw4la21is9sbr5r187kgnjy1s8c668xppv9axga57m62sk"; depends=[DEoptim aws ggplot2 reshape2 shiny]; }; +BBEST = derive { name="BBEST"; version="0.1-2"; sha256="1zfnd379xgj29g8cld19w8ali1ny30l1q7ca47ykf07myj62ckv0"; depends=[DEoptim aws ggplot2 reshape2 shiny]; }; BBMM = derive { name="BBMM"; version="3.0"; sha256="1cvv786wf1rr5906qg1di2krrv5jgw3dnyl8z2pvs8jyn0kb3fkj"; depends=[]; }; BBRecapture = derive { name="BBRecapture"; version="0.1"; sha256="05xzp5zjmkh0cyl47qfsz0l8drg8mimssybhycc4q69aif9scqxb"; depends=[HI locfit lme4 secr]; }; -BBmisc = derive { name="BBmisc"; version="1.8"; sha256="1h48p45pcnda095w77yqc7vfbkwzkcsn36ms0mm7lcmyjbl503m9"; depends=[checkmate]; }; +BBmisc = derive { name="BBmisc"; version="1.9"; sha256="01ihbx6cfgqvz87kpy7yb9c7jlizdym3f0n16967x2imq73dazsb"; depends=[checkmate]; }; BCA = derive { name="BCA"; version="0.9-3"; sha256="0ksd6b0ykydgdn33x29bwwqkrp23cvdj3imps0l6qs1p4465j5nf"; depends=[RcmdrMisc Rcmdr car rpart flexclust clv]; }; BCBCSF = derive { name="BCBCSF"; version="1.0-0"; sha256="1ag8wz8a9vh1x4jgppimgchfs53rr6hbg5xzzr6k2h4bfsg7pmn3"; depends=[abind]; }; BCDating = derive { name="BCDating"; version="0.9.7"; sha256="0z3a95sc481p0n33mhg7qlsf1jynbm1vbfds0n03bsjrwvqkzpb2"; depends=[]; }; BCE = derive { name="BCE"; version="2.1"; sha256="0dqp08pbq7r88yhvlwgzzk9dcdln7awlliy5mfq18j5jhiy7axiz"; depends=[FME limSolve Matrix]; }; BCEA = derive { name="BCEA"; version="2.1-0"; sha256="120xmgd7ipnrbiyh8h7z80i0bw9iv9rjf8nnb3f988h9bx8xiwp4"; depends=[]; }; BCEs0 = derive { name="BCEs0"; version="1.1"; sha256="0q63bkmk0kk9p5d3xb0f5srzfrbr743isyw4v2h9ch5yyxizcizb"; depends=[]; }; -BDgraph = derive { name="BDgraph"; version="2.14"; sha256="1j590vm57dwn6776p0hh0x999a0ivf5ydsxyfnflz5hbhaz1zzn0"; depends=[Matrix igraph]; }; +BDgraph = derive { name="BDgraph"; version="2.15"; sha256="1vsdj0lwl13cjhcmfpvzqfqhvcmv6d1rb7vibkxi6qbixdwwxclg"; depends=[Matrix igraph]; }; BEANSP = derive { name="BEANSP"; version="1.0"; sha256="0xcb81pk3iidb3dz9l4hm6cwx8hrbg5qz0sfi59yx2f7nsazr4xk"; depends=[]; }; BEDASSLE = derive { name="BEDASSLE"; version="1.5"; sha256="1bz3lr0waly9vj9adwhmgs3lq7zjdkcbvm3y9rnn72qlrwmv5fbn"; depends=[MASS matrixcalc emdbook]; }; BEQI2 = derive { name="BEQI2"; version="2.0-0"; sha256="19q29kkwww5hziffkm2yx7n4cpfcsyh0z4mljdcnjkwfp732sjig"; depends=[knitr markdown jsonlite xtable plyr reshape2]; }; @@ -107,6 +113,7 @@ BHMSMAfMRI = derive { name="BHMSMAfMRI"; version="1.0"; sha256="0j5ivknsr441clgm BIFIEsurvey = derive { name="BIFIEsurvey"; version="1.1"; sha256="1iwaw2nvs6qgmgqxlc3a7zvda6r8mkyalb6ianc643i3az8cnnxf"; depends=[Rcpp miceadds Rcpp RcppArmadillo]; }; BIOM_utils = derive { name="BIOM.utils"; version="0.9"; sha256="0xckhdvf15a62awfk9rjyqbi6rm7p4awxz7vg2m7bqiqzdll80p7"; depends=[]; }; BIPOD = derive { name="BIPOD"; version="0.2.1"; sha256="04r58gzk3hldbn115j9ik4bclzz5xb2i3x6b90m2w9sq7ymn3zg1"; depends=[Rcpp Rcpp RcppArmadillo]; }; +BLCOP = derive { name="BLCOP"; version="0.3.1"; sha256="1qfkljw5b1k4b5jd08hw6dsmvgr7vg3kjyib5s13q0mkxvclasym"; depends=[MASS quadprog RUnit timeSeries fBasics fMultivar fPortfolio]; }; BLR = derive { name="BLR"; version="1.4"; sha256="0wy3c8nnzkdhwb5s1ygdid47hpdx72ryim36mnicrydy0msjivja"; depends=[SuppDists]; }; BMA = derive { name="BMA"; version="3.18.1"; sha256="0ppcjjcrjrs18lp55hrs0ad7x052v57wd0zdfmvyydlsjbgnsx1p"; depends=[survival leaps robustbase inline]; }; BMN = derive { name="BMN"; version="1.02"; sha256="12gyq01cn6a9ixqgki1ihx5jrp2gw6jdj7q210rb12xlvj3p6x7w"; depends=[]; }; @@ -116,9 +123,10 @@ BNDataGenerator = derive { name="BNDataGenerator"; version="1.0"; sha256="17zi83 BNPTSclust = derive { name="BNPTSclust"; version="1.0"; sha256="04qryrhbhi4qfp9rckw3x0g3292lyfrvphcwgb1p5ig661pxgg7p"; depends=[mvtnorm MASS]; }; BNPdensity = derive { name="BNPdensity"; version="2013.8"; sha256="1qlhav764ji289kcibbmqjj62mmxiw3zsiwjz1gkifzgpmzyar85"; depends=[]; }; BNSP = derive { name="BNSP"; version="1.0.2"; sha256="0hbrx02mybfrzfab5g7kwi6g68jdzj2dc69zxkn3hpyf4rqwbw4x"; depends=[]; }; -BOIN = derive { name="BOIN"; version="1.0"; sha256="14rh2sz4h79vxrskc10idd6mb3dyy8ngdxrac134yxna7507ly0s"; depends=[]; }; +BOIN = derive { name="BOIN"; version="1.1"; sha256="1ffr6w9ml0mkffgg1vds8fmf8ww7rs375pxk2dqv9nlb9061m97r"; depends=[]; }; BRugs = derive { name="BRugs"; version="0.8-3"; sha256="1qjwm6qizg70nvpl5p2yx65ynghazchqw7d2iadhdjz7dd293sqi"; depends=[coda]; }; BSDA = derive { name="BSDA"; version="1.01"; sha256="06mgmwwh56bj27wdya8ln9mr3v5gb6fcca7v9s256k64i19z12yi"; depends=[e1071 lattice]; }; +BSGS = derive { name="BSGS"; version="1.0"; sha256="11r7bx9ax84iv3gam02p1hg174ni3d3gv6yj64n0gp2gaj438hv7"; depends=[MASS pscl plyr]; }; BSGW = derive { name="BSGW"; version="0.9"; sha256="0df5d0d0kfvwavxbxra36jjs9044q1szq1xm37dvh4wfvvv6igmb"; depends=[survival]; }; BSSasymp = derive { name="BSSasymp"; version="1.1-0"; sha256="0z3abgvbpmwgzb6b6r5ys3msy97lfdg81p8d19c83aaa6hrngggn"; depends=[fICA JADE]; }; BSagri = derive { name="BSagri"; version="0.1-8"; sha256="148pr4lkgdi4bwc9lavgj356nh240iazz28xklq14rw4gzhmz2k4"; depends=[gamlss multcomp MCPAN mvtnorm boot mratios]; }; @@ -136,29 +144,29 @@ BayClone2 = derive { name="BayClone2"; version="1.1"; sha256="1wprdj22zh8fwqawcv BayHap = derive { name="BayHap"; version="1.0.1"; sha256="0xqnl2cbf0pyjlpywyy0j4mwknfn8msz4s719dsri3r7hvn9m6kd"; depends=[boa]; }; BayHaz = derive { name="BayHaz"; version="0.1-3"; sha256="08ilghlkgyma5758yw7mdgqycqcillqmx73knzzdlg2kzc77dvg6"; depends=[]; }; BaySIC = derive { name="BaySIC"; version="1.0"; sha256="023ji6q1nvksmhp3ny8ad39xxccc0a1rv9iaiaagwavgzzc0pjd9"; depends=[rjags fields poibin]; }; -BayesBridge = derive { name="BayesBridge"; version="0.5"; sha256="1czyna2mrznlr5swvm9i7x99yfwjvwbzy42avh6xb0342q5glnhw"; depends=[]; }; -BayesCR = derive { name="BayesCR"; version="1.0"; sha256="0cq1ii01j0nprnyvfxml1nrajrbb9yanr4fa5fcwn764cq5s30n9"; depends=[MCMCpack mvtnorm Rlab truncdist truncnorm]; }; +BayesBridge = derive { name="BayesBridge"; version="0.6"; sha256="1j03m465pwq0lhbrfvddjglrzs6px7bc89yvfzj776amm7myqd0l"; depends=[]; }; +BayesCR = derive { name="BayesCR"; version="2.0"; sha256="0cafind5vz81ryw1c7324hyfc6922fsxmjnvddb4mrhis54id2r4"; depends=[mvtnorm Rlab truncdist mnormt rootSolve]; }; BayesComm = derive { name="BayesComm"; version="0.1-0"; sha256="17hnq4z451g2j3p73awllihhwsdy3grh6ki3qy9bkr064wvzbvcj"; depends=[Rcpp RcppArmadillo coda Rcpp RcppArmadillo]; }; BayesDA = derive { name="BayesDA"; version="2012.04-1"; sha256="0fp27cmhw8dsxr4mc1flm6qh907476kph8ch2889g9p31xm1psjc"; depends=[]; }; -BayesFactor = derive { name="BayesFactor"; version="0.9.9"; sha256="1a34caxsmixvriw7hwqsqxbkjg70lv0s81m2i5w5kybfk81xdvnh"; depends=[coda pbapply mvtnorm stringr Rcpp gtools Rcpp]; }; +BayesFactor = derive { name="BayesFactor"; version="0.9.10-2"; sha256="1kb7dbxnjsn7nppwqrn3znb6j7zfldn9xy4f6jfyq9n411zbf8xy"; depends=[coda pbapply mvtnorm stringr Rcpp gtools Rcpp]; }; BayesGESM = derive { name="BayesGESM"; version="1.2"; sha256="1mbi4lb7bjpmkwc3ns3mfvmfqr85pfx85rkcq95pl91saxichs4s"; depends=[truncdist GIGrvg normalp Formula]; }; BayesLCA = derive { name="BayesLCA"; version="1.6"; sha256="1f7xmq3pni68s112k0hvdhag7nqgmm84hhycbm88cyvkdjd0kfba"; depends=[e1071 coda fields nlme MCMCpack]; }; BayesLogit = derive { name="BayesLogit"; version="0.5.1"; sha256="0nr215wzhqlfi32617mmqb6i3w5x1kh5fiy68k0xzdqjsyjr65m0"; depends=[]; }; -BayesMed = derive { name="BayesMed"; version="1.0"; sha256="1ppl5g8c5yy8jzhm34wvvprn9dj697ihcg8jb5111qmjybzzp0dh"; depends=[R2jags QRM polspline MCMCpack]; }; +BayesMed = derive { name="BayesMed"; version="1.0.1"; sha256="1ysc7sh0drqxbisi2dz6gj4jlw6qsd879bbhr5pra7nxgmk4h650"; depends=[R2jags QRM polspline MCMCpack]; }; BayesMixSurv = derive { name="BayesMixSurv"; version="0.9"; sha256="0hqkqpzk21d2zh7pyn042w1s51wyszkmam0rwzgy0i9i51zjxwvz"; depends=[survival]; }; BayesNI = derive { name="BayesNI"; version="0.1"; sha256="0zvr6rkb5zxgl53xby69d0j3yrfnlcmac6kwkxz77q5616w9dwq0"; depends=[]; }; BayesSAE = derive { name="BayesSAE"; version="1.0-1"; sha256="09s7f472by689b2b0gahnkhyjriizpsx6r5qa95nf3f4bfqi2cpf"; depends=[Formula coda lattice]; }; BayesSingleSub = derive { name="BayesSingleSub"; version="0.6.2"; sha256="0hgmyhg4mpxx7k91hbfa9h3533mqyn9rz4kl9kb30cc9g7g0m045"; depends=[coda mvtnorm MCMCpack]; }; BayesTree = derive { name="BayesTree"; version="0.3-1.2"; sha256="1if6x7xxs8pv37c3w4yij17gxnf63k83lawzlmd2644w1i6p7sw1"; depends=[nnet]; }; BayesValidate = derive { name="BayesValidate"; version="0.0"; sha256="1gli65avpkb90asx92l1yjbwaxcsyb920idyjwgd2sl2b3l657ly"; depends=[]; }; -BayesVarSel = derive { name="BayesVarSel"; version="1.5.1"; sha256="0r2al4d74dbra7va88fcazq5h19f0i4wymd39apsz3a3hsb8vdvv"; depends=[MASS]; }; +BayesVarSel = derive { name="BayesVarSel"; version="1.6.1"; sha256="1pmhbyvsq4k2kqnbnxm089qxil0ac61msa204pck6r0b360pmpnh"; depends=[MASS]; }; BayesX = derive { name="BayesX"; version="0.2-9"; sha256="0p170m8zkaspiah1fdyql9lj9yqg6sl525blzq7wwgx5wx4rvncs"; depends=[shapefiles sp maptools colorspace coda]; }; BayesXsrc = derive { name="BayesXsrc"; version="2.1-2"; sha256="114804f6maak5dmwzw4cbigjcdw7c6sgx48af35yrvkspi1gsz3b"; depends=[]; }; BayesianAnimalTracker = derive { name="BayesianAnimalTracker"; version="1.2"; sha256="1pgjijqznfdpvw296h5vksnxgspxs7qhy6s84ww7abnlhg59bz5s"; depends=[TrackReconstruction]; }; Bayesianbetareg = derive { name="Bayesianbetareg"; version="1.2"; sha256="0imsz2761ngbnap0vnxks9527la51m5g8gkkn1vrgwis43i6qcgs"; depends=[mvtnorm betareg]; }; Bayesthresh = derive { name="Bayesthresh"; version="2.0.1"; sha256="0w26h1ragqcg1i4h7c2y6vd8fig2jb2zrnvvchgg5z2hg9qdplsf"; depends=[lme4 MASS VGAM mvtnorm matrixcalc coda]; }; BaylorEdPsych = derive { name="BaylorEdPsych"; version="0.5"; sha256="1kq6nvzdqwawygp7k62lw5hyccsj81jg82hq60yidgxnmmnnf7y2"; depends=[]; }; -BcDiag = derive { name="BcDiag"; version="1.0.7"; sha256="0wnmyn13fqbjqadsnq6f1cr4r8ism96c5v54rf8m3iz40vi58cww"; depends=[]; }; +BcDiag = derive { name="BcDiag"; version="1.0.8"; sha256="1x9rkr96dgxp88z9qaw72ikcdmdlxnj8vjn3bfv0q27sfyxwb3a5"; depends=[]; }; Bchron = derive { name="Bchron"; version="4.1.1"; sha256="0dnfz7xpmbygyarh9ai9x3xfsqiizi0zhnxm8bmkvqyb8h7zpghb"; depends=[inline hdrcde MASS ellipse coda mclust]; }; Bclim = derive { name="Bclim"; version="2.3.1"; sha256="160c9v83bpik73yjj45lr8sdgl8v4ymlkqw424ncc3lficyhvfjg"; depends=[MASS mclust hdrcde statmod]; }; Benchmarking = derive { name="Benchmarking"; version="0.24"; sha256="18gx8cwip1c03p37apyr9z89p117bz439vfgx91gxbbg1scc8bfp"; depends=[lpSolveAPI ucminf]; }; @@ -171,8 +179,9 @@ BiDimRegression = derive { name="BiDimRegression"; version="1.0.6"; sha256="1kgr BiSEp = derive { name="BiSEp"; version="2.0"; sha256="1nm76bcdwwy8c434a94rnhfvnc3va54q0jd8blkbh79qm5nwcpf9"; depends=[mclust]; }; BiasedUrn = derive { name="BiasedUrn"; version="1.06.1"; sha256="1ra9fmymm97a2b8jsrsi98cjnnxc478zq51lx7a5pgafprcwcgkg"; depends=[]; }; BigTSP = derive { name="BigTSP"; version="1.0"; sha256="1jdpa8rcnrhzn0hilb422pdxprdljrzpgr4f26668c1vv0kd6k4v"; depends=[glmnet tree randomForest gbm]; }; -BinNonNor = derive { name="BinNonNor"; version="1.0"; sha256="1xn5ghg2zzcrsxjm5azbm2kr31z7wfl0160dcg2nnjxb68lmfk2b"; depends=[BB corpcor mvtnorm Matrix]; }; +BinNonNor = derive { name="BinNonNor"; version="1.1"; sha256="035xarfsbi7908aipzymxwgyl6x1arrgl17frzc0bzgy36hfkd6m"; depends=[BB corpcor mvtnorm Matrix]; }; BinNor = derive { name="BinNor"; version="2.0"; sha256="0c1qy93ccgzg8g25wm1j4ninsa0ck4y3jjh25za92w070cqhkd8m"; depends=[mvtnorm corpcor psych Matrix]; }; +BinOrdNonNor = derive { name="BinOrdNonNor"; version="1.0"; sha256="1x231xxdiyp6nwj2dx9w1shi5w6mdyzg43g5zc4r2bpvzccgj0l0"; depends=[GenOrd OrdNor BB corpcor Matrix mvtnorm]; }; BioGeoBEARS = derive { name="BioGeoBEARS"; version="0.2.1"; sha256="0wyddc5ma47ljpqipfkwsgddp12m9iy4kqwwgklyhf0rqia56b1h"; depends=[rexpokit cladoRcpp ape phylobase optimx FD xtable plotrix gdata]; }; BioMark = derive { name="BioMark"; version="0.4.2"; sha256="17r4q2migmdk2vqfbr69q07cgdzwpjgs3ijmnm42srs5d3brw8cr"; depends=[pls glmnet MASS st]; }; BioPhysConnectoR = derive { name="BioPhysConnectoR"; version="1.6-10"; sha256="1cc22knlvbvwsrz2a7syk2ampm1ljc44ykv5wf0szhnh75pxg13l"; depends=[snow matrixcalc]; }; @@ -193,8 +202,8 @@ Boom = derive { name="Boom"; version="0.2"; sha256="0myb8pihjz25y9sj8b844jrkkd2x BoomSpikeSlab = derive { name="BoomSpikeSlab"; version="0.5.2"; sha256="0n7kf0nkznsaajx4z4bkzjx99b56mjpd8543jc1dq6ki81yxlr1v"; depends=[Boom BH]; }; BootPR = derive { name="BootPR"; version="0.60"; sha256="03zw7hz4gyhp6iq3sb03pc5k2fhvrpkspzi22zks25s1l7mq51bi"; depends=[]; }; Boruta = derive { name="Boruta"; version="4.0.0"; sha256="1r7bl4ab6swhks9cijhqn9gdhp2vjfhwb65fi5rzz0yvzxx97xi8"; depends=[randomForest rFerns]; }; -BradleyTerry2 = derive { name="BradleyTerry2"; version="1.0-5"; sha256="131z9ccfh55inlczy5wnzni2pch4brs6nzjrg8f5xnvkpyy6jqsp"; depends=[lme4 brglm gtools]; }; -BrailleR = derive { name="BrailleR"; version="0.11"; sha256="0vrgk89in5r13434r2p13shckl2b916dj8xn7kpmyngylp91r3a2"; depends=[nortest xtable moments knitr]; }; +BradleyTerry2 = derive { name="BradleyTerry2"; version="1.0-6"; sha256="1080q7fw4yfl2y0jh3w2xz342i5yhhhavq40i3902bsmjj8g531d"; depends=[lme4 brglm gtools]; }; +BrailleR = derive { name="BrailleR"; version="0.16.1"; sha256="0jr7wb1jibf7bmv7bqxn94dc4ai7kd4hj88dcql8rnilkvmqyqwj"; depends=[nortest xtable moments knitr]; }; Brobdingnag = derive { name="Brobdingnag"; version="1.2-4"; sha256="1saxa492f32f511vw0ys55z3kgyzhswxkylw9k9ccl87zgbszf3a"; depends=[]; }; Brq = derive { name="Brq"; version="1.0"; sha256="0m01qw0mh9za1gx1vkbyvwny4k5fvmvs9dbp0504q8jqfqf4l1vj"; depends=[quantreg truncnorm]; }; BsMD = derive { name="BsMD"; version="2013.0718"; sha256="1yvazqlbmm221r7nkhrhi309gkk6vx7ji5xlvf07klya2zg20gcj"; depends=[]; }; @@ -223,7 +232,7 @@ CDLasso = derive { name="CDLasso"; version="1.1"; sha256="0n699y18ia2yqpk78mszgg CDM = derive { name="CDM"; version="4.1"; sha256="1dh18fak4g6ncbnzqmvrdpbx7qzrccjbvkj1pn46vpm69dip6f28"; depends=[mvtnorm Rcpp psych MASS polycor sfsmisc plyr Rcpp RcppArmadillo]; }; CDNmoney = derive { name="CDNmoney"; version="2012.4-1"; sha256="1bnfsygbzdd70m5s9qq7524b1fybdws46axxjbw9dhwqpr8w85id"; depends=[]; }; CDVine = derive { name="CDVine"; version="1.2"; sha256="1qfjbzdfz2dydkfw3b0jjma4csn62177j5sgzh6rszf0nifsi97g"; depends=[MASS mvtnorm igraph]; }; -CEC = derive { name="CEC"; version="0.9.2"; sha256="1g5w280zsm8bj9iqw07mkqhdv38vx2n745byyvfbzhx27x3brc28"; depends=[]; }; +CEC = derive { name="CEC"; version="0.9.3"; sha256="05cgd281p0hxkni4nqb0d4l71aah3f3s6jxdnzgw8lqxaxz4194i"; depends=[]; }; CEGO = derive { name="CEGO"; version="1.0.1108"; sha256="0klj9g656rnfqhj36r4v8y6mv4cazlzyrvws6yqa0r61abfbxy68"; depends=[MASS DEoptim]; }; CGP = derive { name="CGP"; version="2.0-2"; sha256="1mggv3c8525vbdfdc3yhpp4vm4zzdvbwyxim29zj0lzwjf9fkgqk"; depends=[]; }; CHAT = derive { name="CHAT"; version="1.1"; sha256="1hl4xr4lkvb7r36gcbgax6ipqc3rsvn1r03w7fk9gf9bbyg7bkhg"; depends=[DPpackage]; }; @@ -236,7 +245,7 @@ CINID = derive { name="CINID"; version="1.2"; sha256="0pkgzi2j0045p10kjvnq8f4j1a CINOEDV = derive { name="CINOEDV"; version="2.0"; sha256="0fjpxahc55zd972p3hlw9fk4dq8hpq715xff8p98kfh29dvw9mnz"; depends=[R_matlab igraph ggplot2 reshape2]; }; CITAN = derive { name="CITAN"; version="2014.12-1"; sha256="0hiccsg49zgcdm5iwj2vzyqhwyfw6h5fd2gasy6hlakjp102mvy2"; depends=[agop RSQLite RGtk2 hash stringi DBI]; }; CLAG = derive { name="CLAG"; version="2.18.1"; sha256="0y8m6m01vw3rxwrmxvwhpiy6dd2snr0lhb026l1494y43hhqi3wy"; depends=[]; }; -CLME = derive { name="CLME"; version="2.0-1"; sha256="0vnvxkqp4k54ldg2k03wkshsiykznczrfap009sn3ygy831j1zys"; depends=[MASS lme4 shiny isotone stringr prettyR]; }; +CLME = derive { name="CLME"; version="2.0-2"; sha256="11krgxn3fvbwknmiz2jyidpbb0svf4frvk99spd7i53m615sai91"; depends=[MASS lme4 shiny isotone stringr prettyR]; }; CLSOCP = derive { name="CLSOCP"; version="1.0"; sha256="0rkwq9rl2ph4h5zwb2i3yphjyzxmh6b6k23a8gcczycx6xdq4yhw"; depends=[Matrix]; }; CMC = derive { name="CMC"; version="1.0"; sha256="1r9a5k79fyw01yiwxq02327hpn4l1v2lp0958jj9217wxmhn3pr5"; depends=[]; }; CMF = derive { name="CMF"; version="1.0"; sha256="0hvqcbmg2vd0i1rjb1m1bkrbv2vkj1siank1v8w0n5b6881cyz7q"; depends=[Rcpp Rcpp]; }; @@ -246,11 +255,12 @@ CNVassoc = derive { name="CNVassoc"; version="2.0.1"; sha256="0xf5rrcv7pl158fbz0 CNVassocData = derive { name="CNVassocData"; version="1.0"; sha256="17r3b1w9i9v6llawnjnrjns6jkd82m2cn9c90aif8j0bf4dmgdli"; depends=[]; }; CNprep = derive { name="CNprep"; version="2.0"; sha256="08dpjikx3ldqzw2kwb12q0kbw15qzl09srjdfs0sz9si0x6bfxs6"; depends=[mclust rlecuyer]; }; COBRA = derive { name="COBRA"; version="0.99.4"; sha256="1r1cw12d7c148pcgcg08bfsr1q1s736kfpyyss6b4d7ny7wgmqy4"; depends=[]; }; +COMMUNAL = derive { name="COMMUNAL"; version="1.0"; sha256="0smza4q0gnhskyq3fxcrs2hq3lxkyp5xf3zd6zi92962lg6s3w3n"; depends=[cluster clValid fpc rgl]; }; COMPoissonReg = derive { name="COMPoissonReg"; version="0.3.4"; sha256="1mf2q7phc2bn700yp7i2i6ccj6lrvh8b2dmibqihh76a85j1ycrq"; depends=[]; }; COP = derive { name="COP"; version="1.0-2"; sha256="1gynknplvx97hjhi7adsgq9r9lqismch1q1pqvgmz0x1wkg4jj40"; depends=[dr MASS]; }; COPASutils = derive { name="COPASutils"; version="0.1.6"; sha256="0vi7x14ma3i4gabdb04byr4ba0209lklj3d5ql2f2vaxyb4a1hj9"; depends=[ggplot2 reshape2 dplyr kernlab stringr knitr]; }; CORE = derive { name="CORE"; version="3.0"; sha256="0wq9i7nscnzqiqz6zh6hglm7924261bw169q3x6l9i6jgqhvn32d"; depends=[]; }; -CORElearn = derive { name="CORElearn"; version="0.9.44"; sha256="1hz97hkjcml83sksar863br6gszcv5ffb8yyg641gg1qgfldqc2i"; depends=[cluster rpart]; }; +CORElearn = derive { name="CORElearn"; version="0.9.45"; sha256="0j2lhzikh96ky4n52x0rwhknx5zdk9h78x9ygzfpr6p9x80w850f"; depends=[cluster rpart]; }; CORM = derive { name="CORM"; version="1.0.2"; sha256="0g5plafx2h1ija8jd6rxvy8qsrqprfbwbi1kq1p4jdr9miha20nv"; depends=[cluster]; }; COSINE = derive { name="COSINE"; version="2.1"; sha256="10ypj849pmvhx117ph3k1jqa62nc4sdmv8665yahds7mh0ymhpjj"; depends=[MASS genalg]; }; COUNT = derive { name="COUNT"; version="1.3.2"; sha256="1lb67gwznva5p046f4gjjisip5a12icp7d2g1ipizixw99c5lll8"; depends=[msme sandwich MASS]; }; @@ -262,7 +272,7 @@ CR = derive { name="CR"; version="1.0"; sha256="0smb2i560dwbxg3mp1svfxmaiw193pd3 CRAC = derive { name="CRAC"; version="1.0"; sha256="0vnqmmmwakx5jnzqp20dng35p7rvmz3ypm2m7bs41m8nhh2wq1xa"; depends=[]; }; CRF = derive { name="CRF"; version="0.3-8"; sha256="0w9wfjlx6hvd07k0iszfyip0vn0ca5ax2d5g7hsg6pm2isnzap8a"; depends=[Rglpk Matrix]; }; CRM = derive { name="CRM"; version="1.1.1"; sha256="09h6xvqc2h2gxhdhc7592z93cnw16l549pn9i26ml0f0n20hljmf"; depends=[]; }; -CRTSize = derive { name="CRTSize"; version="0.3"; sha256="0m7dc29p2vdpcgji4k4yrpmhv29b7n9i2n6qz6fm19jb2byqsrr5"; depends=[]; }; +CRTSize = derive { name="CRTSize"; version="0.4"; sha256="02g0799f8i123lihvz0w2qpwbkq22998sni0c392vyzvznfzagwa"; depends=[]; }; CSS = derive { name="CSS"; version="1.0.2"; sha256="0p0c3gfj6p58hd4398kkpjg7rhx6wh5z6qddpqnvbm24acq7nrvh"; depends=[XML stringr]; }; CTT = derive { name="CTT"; version="2.1"; sha256="0v8k54x9pib6hq3nz3m80g1a3p003f7bn8wnj9swwvacc90d6n44"; depends=[]; }; CUMP = derive { name="CUMP"; version="1.0"; sha256="0dbpgm75nbd4h8rf3ca5n4mgdn3qm4yyf2d48vlihakzw6rqbpka"; depends=[]; }; @@ -279,13 +289,13 @@ CausalGAM = derive { name="CausalGAM"; version="0.1-3"; sha256="0g68m2kxixwr7rx6 Causata = derive { name="Causata"; version="4.2-0"; sha256="04lndjy4rdf063z75zv42b000z06ffnr91pv2sql1ks6w60zmh1m"; depends=[XML R_utils rjson RMySQL RCurl stringr yaml boot foreach data_table glmnet ggplot2]; }; CePa = derive { name="CePa"; version="0.5"; sha256="1y2q72j8bqx509i62a2x9j40rj5bkpgx4z6fwj05ibazc1441asd"; depends=[igraph snow]; }; CellularAutomaton = derive { name="CellularAutomaton"; version="1.1-1"; sha256="0kmw2ic161xwalqa63hznic4n4hdz20hsilf2awlcldg7m9si1zd"; depends=[R_oo R_methodsS3]; }; -CensRegMod = derive { name="CensRegMod"; version="0.0"; sha256="0vfkyj2mx5l1pmcah8zilxrjlb6iign1by4ydjq8ddk1zyi242sw"; depends=[]; }; +CensRegMod = derive { name="CensRegMod"; version="1.0"; sha256="0qqwkxn8knhcjb6mph7mp7mma56zxslbvkfgfajq2lq4gbg901y4"; depends=[]; }; CerioliOutlierDetection = derive { name="CerioliOutlierDetection"; version="1.0.8"; sha256="0n67y7ah496wck9hlrphya9k753gk44v7zgfz4s2a5ii49739zqi"; depends=[robustbase]; }; CfEstimateQuantiles = derive { name="CfEstimateQuantiles"; version="1.0"; sha256="1qf85pnl81r0ym1mmsrhbshwi4h1iv19a2wjnghbylpjaslgxp6i"; depends=[]; }; ChainLadder = derive { name="ChainLadder"; version="0.1.9"; sha256="1ysx4g16v75jn2727i56shkfbyyr08vfyngfpapc644xkf69nlq5"; depends=[systemfit Matrix actuar Hmisc statmod reshape2 MASS lattice tweedie]; }; ChargeTransport = derive { name="ChargeTransport"; version="1.0.2"; sha256="0mq06ckp3yyj5g1z2sla79fiqdk2nlbclm618frhqcgmq93h0vha"; depends=[]; }; CheckDigit = derive { name="CheckDigit"; version="0.1-1"; sha256="0091q9f77a0n701n668zaghi6b2k3n2jlb1y91nghijkv32a7d0j"; depends=[]; }; -ChemoSpec = derive { name="ChemoSpec"; version="2.0-2"; sha256="01zng3nhsynj8kbnk7aisj1803q9svd9n6jnnl0vb82lsb29bfw7"; depends=[pls amap chemometrics robustbase RColorBrewer plyr pcaPP mvtnorm mvoutlier rgl R_utils mclust MASS baseline IDPmisc gsubfn lattice seriation]; }; +ChemoSpec = derive { name="ChemoSpec"; version="3.0-1"; sha256="1c8ark711hy4a48pvn8n6c76ibxz8dbpymh3vykpx85a2csjzslv"; depends=[pls amap chemometrics robustbase RColorBrewer plyr pcaPP mvtnorm mvoutlier rgl R_utils mclust MASS baseline IDPmisc gsubfn lattice seriation clusterCrit speaq]; }; ChemometricsWithR = derive { name="ChemometricsWithR"; version="0.1.8"; sha256="084da2hx6agryw7bv6img10pqmsdz2mpihbrj6j081lammrik4fj"; depends=[ChemometricsWithRData MASS pls]; }; ChemometricsWithRData = derive { name="ChemometricsWithRData"; version="0.1.3"; sha256="14l1y4md8hxq8gvip5vgg07vcr0d9yyhm5ckhzk8zwprdabn9a10"; depends=[]; }; ChoiceModelR = derive { name="ChoiceModelR"; version="1.2"; sha256="0dkp3354gvrn44010s8fjbmkpgn1hpl4xbfs5xslql8sk8rw0n2c"; depends=[]; }; @@ -293,9 +303,10 @@ CircE = derive { name="CircE"; version="1.1"; sha256="14bja3zv9wg389m6khmsy3q12h CircNNTSR = derive { name="CircNNTSR"; version="2.1"; sha256="1rl17kw6bl5xf7pgsc4im12i2kqz4a3b11vzzlb6wfl5yck6iff5"; depends=[]; }; CircStats = derive { name="CircStats"; version="0.2-4"; sha256="1f2pf1ppp843raa82s2qxm3xlcv6zpi578zc4pl0d7qyxqnh603s"; depends=[MASS boot]; }; CityPlot = derive { name="CityPlot"; version="2.0"; sha256="0lskgxmagqjglvpq39hgbygkf4qp28i2bj6b4m2av1s3pzb4465g"; depends=[]; }; -Ckmeans_1d_dp = derive { name="Ckmeans.1d.dp"; version="3.02"; sha256="1r7zxvrcn8lg8i74fnjr7mqcnhc0y5lsxy1zch1bhbrnbr19sgq5"; depends=[]; }; +Ckmeans_1d_dp = derive { name="Ckmeans.1d.dp"; version="3.3.1"; sha256="0gzwcg6f3p1vr30lyniqiq4893kjxri4y2vjzh6qrldnay42kqf9"; depends=[]; }; ClickClust = derive { name="ClickClust"; version="1.1.3"; sha256="03xcmz1php6hl5ic0ipda3lsdyk5aql23jbilril2h9kvwifbbsf"; depends=[]; }; ClimClass = derive { name="ClimClass"; version="1.0"; sha256="07jl8vwqyyj4q2hav8qbg69yjs73s3kbms5bd9hqs1y938rrp2l5"; depends=[geosphere ggplot2 reshape2]; }; +ClueR = derive { name="ClueR"; version="1.0"; sha256="1ak8pgbzm5xrk7pjnkbiqdwyvvyvrm6k6h50ycc86w3zy7fnqhds"; depends=[e1071]; }; ClustOfVar = derive { name="ClustOfVar"; version="0.8"; sha256="17y8q2g4yjxs2jl1s8n5svxi021nlm0phs1g5hcnfxzpadq84wbs"; depends=[]; }; ClustVarLV = derive { name="ClustVarLV"; version="1.3.1"; sha256="0ilfpiah8jw11n4bnr7chgycldjkqp3xgq3majisiqfqn2ankxl3"; depends=[Rcpp Rcpp]; }; CoClust = derive { name="CoClust"; version="0.3-0"; sha256="0vcjy8mr8vfs5j1x0xz1zkjn6l08pg6r28ffbdvrqrbalnh87v3s"; depends=[copula gtools]; }; @@ -312,7 +323,7 @@ Comp2ROC = derive { name="Comp2ROC"; version="1.0"; sha256="0vymjbxdlvm5dvss4z4z CompGLM = derive { name="CompGLM"; version="1.0"; sha256="04bjal92r0m7is5ygqpd0mdz3fb3pwcr7rc3mbxg9sg57nff3kf5"; depends=[Rcpp Rcpp]; }; CompLognormal = derive { name="CompLognormal"; version="3.0"; sha256="1dhgr9l713l2n889bpa47lbg2qab0fz0r15qa928c0b9nz688ddm"; depends=[numDeriv]; }; CompQuadForm = derive { name="CompQuadForm"; version="1.4.1"; sha256="1kv4bdkwidkjw0hgn2krv42p9v1a03p47g0p03lja3flhfbmiifj"; depends=[]; }; -CompRandFld = derive { name="CompRandFld"; version="1.0.3-3"; sha256="0znahwahpircjb1xl1q5f1fa3r44mk6f2jjh70bp7zfvlh6c4hr2"; depends=[]; }; +CompRandFld = derive { name="CompRandFld"; version="1.0.3-4"; sha256="1a3j5j50fz3f8vkvdmfccv5hn00spk08xanadqxpdy8pn925gqqb"; depends=[]; }; CompareTests = derive { name="CompareTests"; version="1.0"; sha256="098axl20jid35pqvgiwk6h91waafigwks6n5f4pg7xxx1fifks4f"; depends=[]; }; Compind = derive { name="Compind"; version="1.0"; sha256="13gfsbjaciign8cswsibdj9a4rwj5afwrk4g1x4fyihfhnm4qx7m"; depends=[Benchmarking psych boot Hmisc MASS GPArotation lpSolve nonparaeff]; }; Compounding = derive { name="Compounding"; version="1.0.2"; sha256="1xlb3ylwjv70850agir0mx79kcvs43h0n1sm22zcny3509s2r7lf"; depends=[hypergeo]; }; @@ -333,7 +344,7 @@ CovSel = derive { name="CovSel"; version="1.1"; sha256="13dh97857h3r684yw1bzyr1r CoxBoost = derive { name="CoxBoost"; version="1.4"; sha256="1bxkanc8zr4g3abn4ds5wqibv65flvm4y648fs9s0l4vc9vmyshg"; depends=[survival Matrix prodlim]; }; CoxRidge = derive { name="CoxRidge"; version="0.9.1"; sha256="11vlsrv03j6kcxq9an7g210nq6cc6qd04b7w0pfbdk4bniqc0k60"; depends=[survival]; }; CpGFilter = derive { name="CpGFilter"; version="1.0"; sha256="07426xlmx0ya3pi1y5c24zr58wr024m38y036h9gz26pw7bpawy2"; depends=[]; }; -CpGassoc = derive { name="CpGassoc"; version="2.11"; sha256="01hx9flf4mq1kgg77dah7s33kdkdgnmckppcl1y806xsnxqxmrxq"; depends=[nlme]; }; +CpGassoc = derive { name="CpGassoc"; version="2.50"; sha256="052mzkcp7510dm12winmwpxz6dvy54aziff0mn3nzy0xbk5v1fw4"; depends=[nlme]; }; Cprob = derive { name="Cprob"; version="1.2.4"; sha256="0zird0l0kx2amrp4qjvlagw55pk9jrx0536gq7bvajj8avyvyykr"; depends=[prodlim tpr geepack lgtdl lattice]; }; CreditMetrics = derive { name="CreditMetrics"; version="0.0-2"; sha256="16g3xw8r6axqwqv2f0bbqmwicgyx7nwzff59dz967iqna1wh3spi"; depends=[]; }; Crossover = derive { name="Crossover"; version="0.1-13"; sha256="0s3nlc6yzgnrhdxpjqfpw8qcnjbhs5y0ng3qqpmpm9d9br8kivri"; depends=[rJava CommonJavaJars JavaGD ggplot2 MASS crossdes xtable Matrix multcomp digest Rcpp RcppArmadillo]; }; @@ -365,7 +376,7 @@ DEMEtics = derive { name="DEMEtics"; version="0.8-7"; sha256="1s59qim60d4gp5rxja DESnowball = derive { name="DESnowball"; version="1.0"; sha256="012kdnxmzap6afc3ffkcvk1mazlkp286av6g9fwz2wcbf5mh9n1m"; depends=[clue combinat MASS cluster]; }; DEoptim = derive { name="DEoptim"; version="2.2-3"; sha256="0pcs7kkhad139c3nhmg7bkac1av4siknfg59lpknwwrsxbz208dg"; depends=[]; }; DEoptimR = derive { name="DEoptimR"; version="1.0-2"; sha256="00viy7x3br3094az635lmjydm826d48vv2f14rwmdhqmv03066kq"; depends=[]; }; -DFIT = derive { name="DFIT"; version="1.0-1"; sha256="190k577qvbpbzgyys1r52fq1w642aq5syp2p9d7y6zp4g3xra1sr"; depends=[simex mvtnorm ggplot2]; }; +DFIT = derive { name="DFIT"; version="1.0-2"; sha256="1kn3av6pnkmf9703yp3cn0zbdzjzxrlm6nbbcg7lwv9550jw2c4n"; depends=[simex mvtnorm ggplot2]; }; DIFlasso = derive { name="DIFlasso"; version="1.0-1"; sha256="048d5x9nzksphsdk9lwfagl165bb40r0pvjq2ihvhqvxspgpar4b"; depends=[grplasso penalized miscTools]; }; DIME = derive { name="DIME"; version="1.2"; sha256="11l6mk6i3kqphrnq4iwk4b0ridbbpg2pr4pyqaqbsb06ng899xw0"; depends=[]; }; DIRECT = derive { name="DIRECT"; version="1.0"; sha256="129bx45zmd6h7j6ilbzj2hjg4bcdc08dvm2igggi8ajndl1l5q9j"; depends=[]; }; @@ -374,6 +385,7 @@ DMR = derive { name="DMR"; version="2.0"; sha256="1kal3bvhwqs00b6p6kl0ja35pcz9v9 DMwR = derive { name="DMwR"; version="0.4.1"; sha256="1qrykl9zdvgm4c801iix5rxmhk9vbwnrq9cnc58ms5jf34hnmbcf"; depends=[lattice xts quantmod zoo abind rpart class ROCR]; }; DNAprofiles = derive { name="DNAprofiles"; version="0.2"; sha256="15la7csf45175g4hkfdz41jgbj5njad5d4jwfhpadxkb9v2mgaw4"; depends=[RcppProgress Rcpp bit Rcpp RcppProgress]; }; DNAtools = derive { name="DNAtools"; version="0.1-21"; sha256="1ncx2rmxb0ip804x6xznfv8brjpp518fhnm1653mlrsl3hpzrh88"; depends=[Rsolnp multicool Rcpp Rcpp]; }; +DNMF = derive { name="DNMF"; version="1.0"; sha256="0s484hzzvvkqdh4s5cb6znz26wx07f9k7y940ghx3dkdc7rb0hrx"; depends=[]; }; DOBAD = derive { name="DOBAD"; version="1.0.4"; sha256="1hslwgs4q05xm29my5cq6g3vvjc0arvdmlx734wardj9dy29p1v5"; depends=[numDeriv lattice]; }; DOvalidation = derive { name="DOvalidation"; version="0.1.0"; sha256="0vm4sxbchkj2hk91xnzj6lpj05jg2zcinlbcamy0x1lrbjffn9zk"; depends=[]; }; DPpackage = derive { name="DPpackage"; version="1.1-6"; sha256="01qdl6cp6wkddl9fwwpxwvyhb7lpjxis6wnbm2s288y2n9wi4j24"; depends=[MASS nlme survival]; }; @@ -388,10 +400,11 @@ DTDA = derive { name="DTDA"; version="2.1-1"; sha256="0hi2qjcwd6zrzx87mdn1kns5f2 DTK = derive { name="DTK"; version="3.5"; sha256="0nxcvx25by2nfi47samzpfrd65qpgvcgd5hnq9psx83gv502g55l"; depends=[]; }; DTMCPack = derive { name="DTMCPack"; version="0.1-2"; sha256="0bibas5cf06qq834x9q2l2fyh6q9wrg07k8cn6almcyirzax6811"; depends=[]; }; DTR = derive { name="DTR"; version="1.5"; sha256="1c73ay0j6jkjm4iv32waz3wnn0qy399k1h72l7rwfzpyidnaprvi"; depends=[survival ggplot2 gridExtra aod proto]; }; +DVHmetrics = derive { name="DVHmetrics"; version="0.1"; sha256="0b712bhdc1sjqrfihk97jzma06gz42mq4p0nj1gm71v312bbipvf"; depends=[ggplot2 reshape2 shiny]; }; Daim = derive { name="Daim"; version="1.1.0"; sha256="19s0p3a4db89i169n2jz7lf8r7pdmrksw7m3cp9n275b5h8yjimx"; depends=[rms]; }; DandEFA = derive { name="DandEFA"; version="1.5"; sha256="0d82rjkgqf4w7qg7irlqvzzav1f23i2gmygkbf8jycaa6xhli80d"; depends=[gplots polycor]; }; DatABEL = derive { name="DatABEL"; version="0.9-5"; sha256="1bjjfnwij6xyn2d62rs4n9j05hrv81jvkih2prk59zdyc7hwgmch"; depends=[]; }; -DataCombine = derive { name="DataCombine"; version="0.2.7.1"; sha256="03bshvcq48hqh8f61hm7vzwqr6axqfrg1rqjy3mf4sy2dxkjz3xh"; depends=[data_table dplyr]; }; +DataCombine = derive { name="DataCombine"; version="0.2.9"; sha256="1yvpv28fwkifiiyzj121dhzwzp06fncms5jbwpvc3nkq1bpzm2mk"; depends=[data_table dplyr]; }; Davies = derive { name="Davies"; version="1.1-8"; sha256="1wp7ifbs4vqfrn4vwh09lc53yiagpww91m5mxmcr62mjbw8q7zhr"; depends=[]; }; Deducer = derive { name="Deducer"; version="0.7-7"; sha256="1x97rz92v1hx30fdmgd1lnzydgygjp6zh20v082qymvh997l1zzd"; depends=[ggplot2 JGR car MASS rJava e1071 scales plyr foreign multcomp effects]; }; DeducerExtras = derive { name="DeducerExtras"; version="1.7"; sha256="0sngsq31469a74y7nhskl82fwy2i0ga68m9g6b1xyhxz1a8kgvlg"; depends=[Deducer irr rJava]; }; @@ -405,28 +418,28 @@ Demerelate = derive { name="Demerelate"; version="0.8-1"; sha256="1qngwlzzpd2cmi DendSer = derive { name="DendSer"; version="1.0.1"; sha256="0id6pqx54zjg5bcc7qbxiigx3wyic771xn9n0hbm7yhybz6p3gz9"; depends=[gclus seriation]; }; Density_T_HoldOut = derive { name="Density.T.HoldOut"; version="2.00"; sha256="0kh5nns1kqyiqqfsgvxhx774i2mf4gcim8fp5jjyq577x4679r31"; depends=[histogram]; }; DepthProc = derive { name="DepthProc"; version="1.0.3"; sha256="0xil3pl33224sizn1wy9x3lcngw017qjl22hfqzss9iy73cmxqnc"; depends=[ggplot2 Rcpp rrcov MASS np lattice sm geometry colorspace Rcpp RcppArmadillo]; }; -Deriv = derive { name="Deriv"; version="1.0"; sha256="0s3jy0vjysc1wmmbv1dpc3z9jjcm16pjra1vna8fysnpy82icc7h"; depends=[]; }; +Deriv = derive { name="Deriv"; version="2.0"; sha256="0yshw6fssbnj5mvx2k42iqfz62s49d3056xdwwhamsbmpqdxmzxj"; depends=[]; }; DescTools = derive { name="DescTools"; version="0.99.9"; sha256="19zz8jnhs87klzh6c6kxaq34kacfb80zrm54qywkj9627gv4ngn6"; depends=[boot mvtnorm]; }; DescribeDisplay = derive { name="DescribeDisplay"; version="0.2.4"; sha256="13npxq1314n4n08j6hbmij7qinl1xrxrgc5hxpbbpbd16d75c7iw"; depends=[proto reshape2 ggplot2 plyr scales GGally]; }; -DetMCD = derive { name="DetMCD"; version="0.0.1"; sha256="1bxj7yf98bg185ig2svpkhky6hw14ijb8hwc6g5a3xx6xa9hs57y"; depends=[matrixStats pcaPP robustbase MASS Rcpp RcppEigen]; }; +DetMCD = derive { name="DetMCD"; version="0.0.2"; sha256="0z4zs0k8c8gsd2fry984p06l3p17fdyfky8fv9kvypk7xdg52whc"; depends=[robustbase Rcpp RcppEigen]; }; DetSel = derive { name="DetSel"; version="1.0.2"; sha256="0igkccclmjwzk7sl414zlhiykym0qwaz5p76wf4i7yrpjgk7mhl9"; depends=[ash]; }; Devore7 = derive { name="Devore7"; version="0.7.6"; sha256="1m18p8h9vv4v0aq2fkjyj39vzb8a09azbbczhfiv4y88w540i8nw"; depends=[MASS lattice]; }; DiagTest3Grp = derive { name="DiagTest3Grp"; version="1.6"; sha256="04dxyyqv333rkjf2vlfpal59m7klhw6y7qilym6nw78qb1kqqys7"; depends=[car KernSmooth gplots]; }; -DiagrammeR = derive { name="DiagrammeR"; version="0.1"; sha256="05165cnidwspd3j0i0svlb77i7hbn7mifg5p1653hl5qr3ihl0yd"; depends=[htmlwidgets]; }; +DiagrammeR = derive { name="DiagrammeR"; version="0.4"; sha256="0lzfhg9pxcv3qrm71sgbmra69b1yjjl6xvf82xsnd7d0k9sk3yn3"; depends=[htmlwidgets rstudioapi]; }; DiceDesign = derive { name="DiceDesign"; version="1.6"; sha256="1djq7clga3cvpgfycs3zjj106213yhfj9909sqrni70nj1nwdpj9"; depends=[]; }; DiceEval = derive { name="DiceEval"; version="1.3"; sha256="1vp9zwd09cwl3c8066jr9d3w4yic70fvd40r7hsj2y8d0bhiwl82"; depends=[DiceKriging]; }; DiceKriging = derive { name="DiceKriging"; version="1.5.4"; sha256="09i92jj5qlxr13a3x05aiy3q1z6pxz7ddar6639g4jq87vqq2vd9"; depends=[]; }; DiceOptim = derive { name="DiceOptim"; version="1.4"; sha256="11k6gqw8bcfcnxhm6a039vnkdm7526h3aszjqwfp1s7m157w8kp2"; depends=[DiceKriging rgenoud MASS lhs]; }; DiceView = derive { name="DiceView"; version="1.3-1"; sha256="0c7i1jy13d5bj822q1rp0d7gmmfjd00jaah34pnj8fzwyrq404z9"; depends=[DiceKriging DiceEval rgl]; }; Digiroo2 = derive { name="Digiroo2"; version="0.6"; sha256="1b1ahhqz5largjadlk5n6nw2183c05k28mksb1wm26y0lps0vdgr"; depends=[maptools spatstat spdep]; }; -DirichletReg = derive { name="DirichletReg"; version="0.6-1"; sha256="03ri9w6zvj28b3ckzfbak50lzrcrymvbmr5cckv3adpg7bncp0l9"; depends=[Formula rgl maxLik]; }; -Disake = derive { name="Disake"; version="1.0"; sha256="1i58q6dqk980mk8qj66hbqd64wmkvpa4v0z6c0q3lkirsvdm4cwv"; depends=[]; }; +DirichletReg = derive { name="DirichletReg"; version="0.6-2"; sha256="08qfykyahyq54l9zm7g1yzmk2biz4xqq3qpxw0py4xazq719slk8"; depends=[Formula rgl maxLik]; }; +Disake = derive { name="Disake"; version="1.5"; sha256="1fw45fmnir6h34jw8917mhyz6cgzbq4ywyyf51qxhm68wgzy9h17"; depends=[]; }; DiscML = derive { name="DiscML"; version="1.0.1"; sha256="0qkh0yak1kmzxxx0cqb47zgrj8v2s1d5danpibwwg43j138sb73l"; depends=[ape]; }; DiscreteInverseWeibull = derive { name="DiscreteInverseWeibull"; version="1.0.1"; sha256="0w0s2fixpcmcwids35xx91hll9rf9qbi7155sp90dxd3vr8c939v"; depends=[Rsolnp]; }; DiscreteLaplace = derive { name="DiscreteLaplace"; version="1.0"; sha256="1mwqvlhgswqp697zjl6yjzqbgazycwwz6dfdvx8s72hdmnlqqr9r"; depends=[]; }; DiscreteWeibull = derive { name="DiscreteWeibull"; version="1.0"; sha256="0v8za4arqarf20jrw38dzcjxdwfdpn0ss7p5yxbwhylnj7qz207w"; depends=[Rsolnp]; }; DiscriMiner = derive { name="DiscriMiner"; version="0.1-29"; sha256="1ii8aa4dwfk991qdnpmkva20wvs5fqcna9030c799ybf11qpdass"; depends=[]; }; -Distance = derive { name="Distance"; version="0.9.2"; sha256="0mxwn9mwzfxnqpxvb4h8955c75hvnk09ji330924dfmi3fca8xjf"; depends=[mrds]; }; +Distance = derive { name="Distance"; version="0.9.3"; sha256="054z9pi8m8gjpax3s2hajvaik4yvfpy8qc4gmpl9bqncrk594pbv"; depends=[mrds]; }; DistatisR = derive { name="DistatisR"; version="1.0"; sha256="1il00v26q68h5dd5c9lm2jblgn8hs6n0457r13mlw6r7pcj0158j"; depends=[prettyGraphs car]; }; DistributionUtils = derive { name="DistributionUtils"; version="0.5-1"; sha256="0gw531wfrjx1sxh17qh48dwbxnibgr0viga07vsp8nay7l02jap9"; depends=[RUnit]; }; DivE = derive { name="DivE"; version="1.0"; sha256="1ixkk8kd3ri78ykq178izib0vwppnbiwbpc1139rcl8f5giiwcdh"; depends=[deSolve FME rgeos sp]; }; @@ -451,7 +464,7 @@ EBglmnet = derive { name="EBglmnet"; version="3.6"; sha256="0qjwk5y9bghidha4i937 EDISON = derive { name="EDISON"; version="1.1"; sha256="09xw4p4hwj8djq143wfdcqhr2mhwynj4ixj3ma7crhqidgal169p"; depends=[corpcor MASS]; }; EDR = derive { name="EDR"; version="0.6-5.1"; sha256="10ldygd1ymc4s9gqhhnpipggsiv4rwbgajvdk4mykkg3zmz7cbpm"; depends=[]; }; EFDR = derive { name="EFDR"; version="0.1.0"; sha256="086vk3nff3mcpmh1js2b8wqzpjzdjvlh34fsk3l6sl066gfz49j7"; depends=[Matrix foreach doParallel waveslim gstat tidyr dplyr sp]; }; -EGRET = derive { name="EGRET"; version="2.1.0"; sha256="1gq8hmwdv2cpkgysv4bydszld38h5l7yvlcjrqzpg710xpn73fhi"; depends=[dataRetrieval survival fields lubridate]; }; +EGRET = derive { name="EGRET"; version="2.1.1"; sha256="140hijnwrksi658fn9bfsgrvfkpsix7zhwl4zf4flayrkmbs5i5f"; depends=[dataRetrieval survival fields lubridate]; }; EIAdata = derive { name="EIAdata"; version="0.0.2"; sha256="1zh2nvr11l0ip7q84pzmn36q5d5zrgh0h8zwy7bnsxv5am6z27p2"; depends=[XML plyr xts zoo]; }; EILA = derive { name="EILA"; version="0.1-2"; sha256="0wxl9k4fa0f7jadw3lvn97iwy7n2d02m8wvm9slnhr2n8r8sx3hb"; depends=[class quantreg]; }; EL = derive { name="EL"; version="1.0"; sha256="13r7vjy2608h8jph8kwy69rnkg98b2v69117nrl728r3ayc46a18"; depends=[]; }; @@ -477,6 +490,7 @@ ENmisc = derive { name="ENmisc"; version="1.2-7"; sha256="07rix4nbwx3a4p2fif4wxb EQL = derive { name="EQL"; version="1.0-0"; sha256="0lxfiizkvsfls1km1zr9v980191af6qjrxwcqsa2n6ygzcb17dp5"; depends=[ttutils lattice]; }; ERP = derive { name="ERP"; version="1.0.1"; sha256="0wy1p7pp9dvc3krylskb627rmfqaj11qvia97m88x05ydqx1fwmr"; depends=[fdrtool mnormt]; }; ES = derive { name="ES"; version="1.0"; sha256="1rapwf6kryr6allzbjk6wmxpj9idd3xlnh87rwbh6196xb7rp8lv"; depends=[]; }; +ESEA = derive { name="ESEA"; version="1.0"; sha256="06r5lki32mxkznj6yxvlz0ikqcxm3jbaralv4qp9xrw6dy6yyg27"; depends=[igraph XML parmigene]; }; ESG = derive { name="ESG"; version="0.1"; sha256="1jw6239asv6lwxrz5v0r5pzg6v500bqxg8361sh4jj67rsrc7g9m"; depends=[]; }; ESGtoolkit = derive { name="ESGtoolkit"; version="0.1"; sha256="0r09arhsvamdyahini5yhgc43msdxwvn45l57xbfszahsnr3b3aq"; depends=[CDVine ggplot2 gridExtra reshape2 ycinterextra Rcpp Rcpp]; }; ETAS = derive { name="ETAS"; version="0.0-1"; sha256="1p38ay3vnca8b8wszm66whxap8k58c004l1nlsk7zkynyia0im6c"; depends=[spatstat]; }; @@ -489,7 +503,8 @@ EasyMARK = derive { name="EasyMARK"; version="1.0"; sha256="10slkblbyxq98c3sxgs1 EasyStrata = derive { name="EasyStrata"; version="8.6"; sha256="0agmap9lmqbpfw8ijwxmjkcqjvc1ng0jsadkqpfz71a963nkqdcl"; depends=[Cairo plotrix]; }; EbayesThresh = derive { name="EbayesThresh"; version="1.3.2"; sha256="0n7cr917jrvmgwfqki7shvz9g9zpmbz9z8hm5ax7s8nnfzphrh4g"; depends=[]; }; Ecdat = derive { name="Ecdat"; version="0.2-7"; sha256="1z9mxx3mvn3vi5drxlzss7gs7vpzg7shinl529bx4jpxqpci90jy"; depends=[Ecfun]; }; -Ecfun = derive { name="Ecfun"; version="0.1-3"; sha256="06i5q8pwlw9fgbpvf65mbnynbpyrmb0548y58a6yxfslz480vbis"; depends=[fda gdata RCurl XML tis jpeg MASS TeachingDemos]; }; +Ecfun = derive { name="Ecfun"; version="0.1-4"; sha256="0h3351pcahrn578lz1pcb7h3chmh0vmwbn9iqll98vibck847gai"; depends=[fda gdata RCurl XML tis jpeg MASS TeachingDemos stringi]; }; +EcoGenetics = derive { name="EcoGenetics"; version="1.0"; sha256="1b8w3ksnvny17gxwigvdifpar6c2m2gh9v73g926can8if09dz4n"; depends=[adegenet ggplot2 gstat gstudio hierfstat party raster rgdal rkt sp spdep vegan]; }; EcoHydRology = derive { name="EcoHydRology"; version="0.4.12"; sha256="03dzdw79s0cnnd7mv6wfxw374yf66dlcmj10xh6sh5i352697xp1"; depends=[operators topmodel DEoptim XML]; }; EcoTroph = derive { name="EcoTroph"; version="1.6"; sha256="0zi6g0ra107s47r32mm9h6r1wll3avi0mpjmhcr0nj9y48nv14w3"; depends=[XML]; }; EcoVirtual = derive { name="EcoVirtual"; version="0.1"; sha256="1c815kxljk4qhw0zs28w16ggasfyyyb6aggffx1m1q21s63h6c8h"; depends=[]; }; @@ -526,7 +541,7 @@ Exact = derive { name="Exact"; version="1.4"; sha256="1l4cq6kslnl8x8c53m2w8w1vij ExactCIdiff = derive { name="ExactCIdiff"; version="1.3"; sha256="1vayq8x7gk1fnr1jrlscg6rb58wncriybw4m1z0glfgzr259103y"; depends=[]; }; ExactPath = derive { name="ExactPath"; version="1.0"; sha256="0ngvalmgdswf73q0jr4psg0ihnb7qwkamm6h64l01k5rmgd5nm16"; depends=[ncvreg lars]; }; ExceedanceTools = derive { name="ExceedanceTools"; version="1.2.2"; sha256="084sc6pggfbcyavhfnd5whyigw7dyjhb4cxmxi0kh2jiam5k8v5b"; depends=[splancs SpatialTools]; }; -ExomeDepth = derive { name="ExomeDepth"; version="1.1.1"; sha256="1ifq4nfvaa3yyz4s2140i0xz9mwd8lbwn1hclhx6lz165nixhqsx"; depends=[aod VGAM]; }; +ExomeDepth = derive { name="ExomeDepth"; version="1.1.4"; sha256="0a4y6y1zi1jn1g14f3wsl2pfbmp58afwkvrk7x7s1wp16vwgq0xb"; depends=[aod VGAM]; }; ExpDes = derive { name="ExpDes"; version="1.1.2"; sha256="0qfigbx06b3p04x5v7wban139mp8hg8x77x6nzwa4v6dr226qbkv"; depends=[]; }; ExpDes_pt = derive { name="ExpDes.pt"; version="1.1.2"; sha256="0khw2jhg2vxcivgr20ybvrsqhd8l8bir5xjmr4m44za9nhap43bz"; depends=[]; }; ExtDist = derive { name="ExtDist"; version="0.3.7"; sha256="0vcckw94j02qcy298p26f2v9jrw3a0j62r4xb0cg11cj5aysqw3q"; depends=[numDeriv optimx VGAM SuppDists truncdist]; }; @@ -542,10 +557,11 @@ FAmle = derive { name="FAmle"; version="1.3.2"; sha256="15xp2sdzz4ipp4h89xjws47v FAwR = derive { name="FAwR"; version="1.0.1"; sha256="1j97hdhaamg6xqkaxb04xzsd60hd69n9y84frkqi9swvhr565waj"; depends=[MASS lattice]; }; FBFsearch = derive { name="FBFsearch"; version="1.0"; sha256="1nxfhll9gx9l6hzpcihlz880qxr0fyv5rjghk0xgp8xn4r5wxw11"; depends=[Rcpp RcppArmadillo Rcpp RcppArmadillo]; }; FBN = derive { name="FBN"; version="1.5.1"; sha256="0723krsddfi4cy2i3vd6pi483qjxniychnsi9r8nw7dm052nb4sf"; depends=[]; }; +FCMapper = derive { name="FCMapper"; version="1.0"; sha256="1wp5byx68067fnc0sl5zwvw2wllaqdbcy4g2gbzmlqwli0jz2dsk"; depends=[igraph]; }; FD = derive { name="FD"; version="1.0-12"; sha256="0xdpciq14i8rh7v6mw174hip64r7mrzhx7gwri3vp9y7a1380sbi"; depends=[ade4 ape geometry vegan]; }; FDGcopulas = derive { name="FDGcopulas"; version="1.0"; sha256="1i86ns4hq74y0gnxfschshjlc6if3js0disjb4bwfizaclwbw3as"; depends=[Rcpp numDeriv randtoolbox Rcpp]; }; FDRreg = derive { name="FDRreg"; version="0.1"; sha256="17hppvyncbmyqpi7sin9qsrgffrnx8xjcla2ra6y0sqzam1145y4"; depends=[fda Rcpp mosaic Rcpp RcppArmadillo]; }; -FDboost = derive { name="FDboost"; version="0.0-5"; sha256="1xra0g46kicq74cpjby6y1va2bxvx8b9fiy76mdg1s6n8m6r1pxn"; depends=[mboost Matrix mgcv zoo nnls]; }; +FDboost = derive { name="FDboost"; version="0.0-8"; sha256="1xvyndbfd0df6ld7r6f6ajr7i6aql26n9j5ncn6rw5gm0f64s1lq"; depends=[mboost Matrix mgcv zoo MASS]; }; FFD = derive { name="FFD"; version="1.0-2"; sha256="0s6j4rq7ryypq63cq1cfa7n993bwx9pxp6pscdhyh79rhk28xxda"; depends=[tkrplot R2HTML]; }; FField = derive { name="FField"; version="0.1.0"; sha256="05q16v2vv64qhbnf2l66dwzmvgzyaq8vxwwdabp534bw7z7zpi8q"; depends=[]; }; FGN = derive { name="FGN"; version="2.0-12"; sha256="0jxawb4wm1vcp0131mdnc0r24dw8sd29ih0fc2wh6ahy7mxzajqn"; depends=[akima ltsa]; }; @@ -574,26 +590,28 @@ FTICRMS = derive { name="FTICRMS"; version="0.8"; sha256="0kv02mdmwflhqdrkhzb55s FWDselect = derive { name="FWDselect"; version="1.1"; sha256="1snamrzf0cqcm6sc5vr1b0scgy83jgr5hgsf2cjb3vi3j01hz9wd"; depends=[mgcv]; }; FacPad = derive { name="FacPad"; version="3.0"; sha256="0h7knzin0rfk25li127zwjsyz223w7nx959cs328p6b2azhgn59b"; depends=[Rlab MASS]; }; FactMixtAnalysis = derive { name="FactMixtAnalysis"; version="1.0"; sha256="1l4wfp39b7g38vdk6jpd5zq08sjhsg0s71f662aca2rj6l3a2x3r"; depends=[MASS mvtnorm]; }; -FactoClass = derive { name="FactoClass"; version="1.1.0"; sha256="0y7yd2i79j1m5yl6vnvma47xhr3rl7i37h9sadyrpfm4s486b3kc"; depends=[ade4 xtable]; }; -FactoMineR = derive { name="FactoMineR"; version="1.28"; sha256="05gg4zm0lpvz830xqxrjbi8icpx88bvslibdv744nzqpn4x5ymqh"; depends=[car MASS ellipse lattice cluster scatterplot3d leaps]; }; +FactoClass = derive { name="FactoClass"; version="1.1.1"; sha256="0m5108g2nhdwqqmkn04l1x0kx32ikkhcz6gki0hpj9hlzrkya5w6"; depends=[ade4 xtable]; }; +FactoMineR = derive { name="FactoMineR"; version="1.29"; sha256="08pyp8z9xhy9f1mrcgdm13xqrca63xhpyarkq5fg7hv0ncs68s1h"; depends=[MASS ellipse lattice cluster scatterplot3d leaps flashClust]; }; Fahrmeir = derive { name="Fahrmeir"; version="2012.04-0"; sha256="1axx6r4g6gj1inih41i2az4y0d3jq9x1a6nyj8k7wp51z4z2nbmk"; depends=[]; }; Familias = derive { name="Familias"; version="2.1"; sha256="1ccm2hm8vlm450yqx3r45qklgwa6wb54i39ybfh9g2fl544spzn8"; depends=[paramlink]; }; FastHCS = derive { name="FastHCS"; version="0.0.4"; sha256="11ddp1xy1cmnfbsvabyw0y2wdj4z1brqykji75y7wwchf71m2bps"; depends=[matrixStats rrcov Rcpp RcppEigen]; }; FastImputation = derive { name="FastImputation"; version="1.2"; sha256="04bz623kcanxcl9z8zl6m7m47pk0szcjrjlgs5v1yl3jnq9m2n7g"; depends=[]; }; +FastKNN = derive { name="FastKNN"; version="0.0.1"; sha256="1iz8ybzkvbyqwb00s7cp1zvy9xlmyjid441mf62dq08a0zncnyss"; depends=[pdist assertthat]; }; FastPCS = derive { name="FastPCS"; version="0.1.2"; sha256="1lqb6g65vna2p7kc2y4kc5piy3280nlxl41bdkxkng2icmq14l58"; depends=[matrixStats Rcpp RcppEigen]; }; FastRCS = derive { name="FastRCS"; version="0.0.6"; sha256="0wjsh37jas8hcb9554ijvwj0k8dx96fjf88bzgy7nbim2byiy8p8"; depends=[matrixStats Rcpp RcppEigen]; }; FastRWeb = derive { name="FastRWeb"; version="1.1-0"; sha256="1hiabi7ibp69n5wi5x4kwznxhc2i7dxdrqf1fm6ppv7ix0wkjs07"; depends=[Cairo]; }; FatTailsR = derive { name="FatTailsR"; version="1.0-3"; sha256="0r9n18qlr70p6y4v1xv1lxi1lzm9qp29qy4w51chllqjn15kmv7l"; depends=[minpack_lm]; }; FeaLect = derive { name="FeaLect"; version="1.7"; sha256="1v4psr2j74ciyi7jxphx70hjrd47l5krwvp26ml8qsd51q1i37l8"; depends=[lars rms]; }; FeatureHashing = derive { name="FeatureHashing"; version="0.8"; sha256="05300709d4k5fxyajvdjhwy7br558g81agfrp9pqa2y0v0qx2zkw"; depends=[Rcpp Matrix digest Rcpp digest BH]; }; -FeedbackTS = derive { name="FeedbackTS"; version="1.3"; sha256="0j5dnwq3vby20x5773hi9ay91z8wwq8mk1011x42smw1k00a9q9y"; depends=[maps mapdata proj4 geoR sp]; }; +FedData = derive { name="FedData"; version="1.0"; sha256="1rg35w0450fsy41i3q1j5zdxsik6r47zryba6878pzc429lrx2sn"; depends=[sp raster rgdal igraph Hmisc]; }; +FeedbackTS = derive { name="FeedbackTS"; version="1.3.1"; sha256="1zx64wbl5pzqn69bjhshd3nayxx4wlg7n1zwv7ilh68raxfxnbbx"; depends=[maps mapdata proj4 geoR sp]; }; FieldSim = derive { name="FieldSim"; version="3.1.3"; sha256="0ap1mfsjj3bflpryn0y8h9kg5mzfrnqj6h9f3m5ja32yjv19ql60"; depends=[rgl RColorBrewer]; }; FinAsym = derive { name="FinAsym"; version="1.0"; sha256="0v15ydz4sq9djwcdcfp90mk8l951rry7h91d7asgg53mddbxjj6f"; depends=[]; }; FinCal = derive { name="FinCal"; version="0.6"; sha256="0slw5s7gilmv0j8iwhz27lss2gbrj2l8zqv7bqywr1yf0hw2nxn7"; depends=[ggplot2 reshape2 scales RCurl]; }; FinTS = derive { name="FinTS"; version="0.4-5"; sha256="16m57h6rk4344aalfwaz7hsyis30c1dirsyx8ih661ihgqn1ai1r"; depends=[zoo]; }; FinancialInstrument = derive { name="FinancialInstrument"; version="1.2.0"; sha256="0lx8gqmnapyizlg0qdcjy8xrkpbhj0f7nc95l86a6xy82hz62dzb"; depends=[quantmod zoo xts TTR]; }; FindAllRoots = derive { name="FindAllRoots"; version="1.0"; sha256="0n4wfm21qj5zn06jqnzxa0w9mfn18dqi6hk1jjqa56dxqw1k7vw0"; depends=[]; }; -FindIt = derive { name="FindIt"; version="0.3"; sha256="0bnyfv9xc5c9bzc34qpbnk6s9mvnzkx9zswjr3j210f518y8z45f"; depends=[glmnet lars glmnet lars]; }; +FindIt = derive { name="FindIt"; version="0.4"; sha256="1srqxg9y2yzv7nfspriziyxxp3j6j143g2z9dg6rcf643k8pqqa3"; depends=[glmnet lars Matrix]; }; FindMinIC = derive { name="FindMinIC"; version="1.6"; sha256="0vlr56nw32msvz8bljrw82nzrnazncs6nz7zisidffm2v3najkar"; depends=[nlme sets]; }; FisHiCal = derive { name="FisHiCal"; version="1.1"; sha256="1dds629jlja3vw2l010n1334yh3z10nijqksr0q98ckd2yrwg2rf"; depends=[igraph RcppArmadillo Rcpp RcppArmadillo]; }; FisherEM = derive { name="FisherEM"; version="1.4"; sha256="1lhkyyk82i6alxyiqrvy5fx60f8vab0y62zmw5fjaq6h0vczqn3s"; depends=[MASS elasticnet]; }; @@ -611,9 +629,9 @@ ForwardSearch = derive { name="ForwardSearch"; version="1.0"; sha256="0yd47832pi FourScores = derive { name="FourScores"; version="1.0"; sha256="0d21mrl9bzsvhljv7ymiyck508smp66w9qivrb2rp0p803h9yibm"; depends=[]; }; FrF2 = derive { name="FrF2"; version="1.7-1"; sha256="0i9hfx7n0g866imdsmalqzs8v95vx08cz97hi8311v1wc3pqsn1j"; depends=[DoE_base sfsmisc BsMD scatterplot3d igraph]; }; FrF2_catlg128 = derive { name="FrF2.catlg128"; version="1.2-1"; sha256="0i4m5zb9dazpvmnp8wh3k51bm0vykh4gncnhdg71mfk4hzrfpdac"; depends=[FrF2]; }; -Frames2 = derive { name="Frames2"; version="0.0.3"; sha256="0nsiff1lpxzhiv0ah5d116aldm4qmwqgx9vvk6q03p8lwj4mynsn"; depends=[sampling]; }; +Frames2 = derive { name="Frames2"; version="0.1.0"; sha256="06rmpp2ckdy42zi65f0xg9x8hgfh8hdx9an53nq3xgpz3vhaxavg"; depends=[sampling]; }; FreeSortR = derive { name="FreeSortR"; version="1.1"; sha256="03z5wmr88gr6raa2cg7w4j6y5vgxr3g8b8axzhbd7jipswr5x1jf"; depends=[smacof vegan ellipse]; }; -FunChisq = derive { name="FunChisq"; version="1.0"; sha256="1wrj483w6fjwwqjbymdj229nismmwaxw6v6fpba9mylqbyhs69gc"; depends=[]; }; +FunChisq = derive { name="FunChisq"; version="2.0.0"; sha256="0yvac9nnsqdkyyqkd7yk43n66frx1y5394d4ddaxy7vqw4l4maxd"; depends=[Rcpp BH Rcpp RcppClassic]; }; FunCluster = derive { name="FunCluster"; version="1.09"; sha256="0i73asn1w4s6ydf2ddn5wpr0mwbbxzgmaly1pslarzkx71wk03fz"; depends=[Hmisc cluster]; }; FuncMap = derive { name="FuncMap"; version="1.0-3"; sha256="0bhx7y1n75r3jwf5mkx2i2bqfjgzxgsw58nwhfl48ldibgx7h1qs"; depends=[mvbutils]; }; Funclustering = derive { name="Funclustering"; version="1.0.1"; sha256="0i6g98mfgdyc9hdzvviynrgqhkzicp8y6s0scqy3ifgk9h1k79dw"; depends=[fda Rcpp Rcpp RcppEigen]; }; @@ -661,6 +679,7 @@ GMDH = derive { name="GMDH"; version="1.0"; sha256="194bx1gg0d50fq9002ga8lwx288c GMMBoost = derive { name="GMMBoost"; version="1.1.2"; sha256="01q165vkdiv4qh96lha0g2g94jpnzdclbby6q43ghh9j1yrd4qzj"; depends=[minqa magic]; }; GNE = derive { name="GNE"; version="0.99-0"; sha256="1iwlh1mx8z24hgry78i5sqfrbqqp4946x1jxh6h7z1vxs7qfpq0v"; depends=[alabama nleqslv BB SQUAREM]; }; GOGANPA = derive { name="GOGANPA"; version="1.0"; sha256="1xbir21zvr5hv2y6nndzpsrpmnr7glrc7y6xgcyb856wx46ajan9"; depends=[GANPA WGCNA]; }; +GOplot = derive { name="GOplot"; version="1.0"; sha256="15ix1lcbxf63bmxvjsy7y2nz55wf539xii8rb7lf788jplh47gb6"; depends=[ggplot2 ggdendro gridExtra RColorBrewer]; }; GPArotation = derive { name="GPArotation"; version="2014.11-1"; sha256="15jh5qqqwx47ara6glilzha87rnih0hs5fsz0jjqwv6wr1gw26rm"; depends=[]; }; GPC = derive { name="GPC"; version="0.1"; sha256="1naqy5g6a0z65wssfic5s7cw9v0zjckk526nian3l98ci22sz0j7"; depends=[randtoolbox orthopolynom ks lars]; }; GPCSIV = derive { name="GPCSIV"; version="0.1.0"; sha256="118l792mwd54xsi3g8afg3vc6wds8j6fyaz3mwmq04mlcyblym4l"; depends=[scatterplot3d sqldf]; }; @@ -675,7 +694,7 @@ GRaF = derive { name="GRaF"; version="0.1-12"; sha256="1d7mr2z49v6ch4jbzh0dj2yjy GSA = derive { name="GSA"; version="1.03"; sha256="1h1sbpn1rrdh44w4fx2avc7x24ba40mvpd8b2x5wfrc7a294zf6z"; depends=[]; }; GSAgm = derive { name="GSAgm"; version="1.0"; sha256="18bhk67rpss6gg1ncaj0nrz0wbfxv7kvy1cxria083vi60z0vwbb"; depends=[survival]; }; GSE = derive { name="GSE"; version="3.1"; sha256="08xr7w6dsmgs3l8ayihadcvwy0xdzn78fllxa42sk7nfz6waadr3"; depends=[Rcpp MASS ggplot2 Rcpp RcppArmadillo]; }; -GSIF = derive { name="GSIF"; version="0.4-3"; sha256="18spfkkxxhjx6v0al5zn1nn2zvnaplxxl7wz3fqnjmk7k18izr0n"; depends=[sp RSAGA dismo rgdal raster aqp plotKML gstat boot rpart quantregForest randomForest nlme]; }; +GSIF = derive { name="GSIF"; version="0.4-4"; sha256="1z1wa8vlm12dfbidr09zsw98a47jyji9hm0yiplpz593x5c75dji"; depends=[sp RSAGA dismo rgdal raster aqp plotKML gstat plyr]; }; GSM = derive { name="GSM"; version="1.3.1"; sha256="1ay6znw31qnhz5k6fa0aiccr2xxmnj7v3vzrvlk6y5v5smlvybd0"; depends=[gtools]; }; GUIDE = derive { name="GUIDE"; version="1.0.9"; sha256="1y0y6rwv1khd9bdaz5rl9nmxiangx0jckgihg16wb6hx6kf8kzc1"; depends=[rpanel tkrplot]; }; GUILDS = derive { name="GUILDS"; version="1.2"; sha256="0nirrbq8z7axnrgwbykv5886yf3akf64zynza8l2m96nvzlkzf4y"; depends=[Rcpp pracma subplex Rcpp]; }; @@ -686,8 +705,9 @@ GWAF = derive { name="GWAF"; version="2.1"; sha256="1s56d3b6p5fpaxi32ks2mmhsa5sg GWASExactHW = derive { name="GWASExactHW"; version="1.01"; sha256="19qmk8h7kxmn9kzw0x4xns5p3qqz27xkqq4q6zmh4jzizd0fsl78"; depends=[]; }; GWG = derive { name="GWG"; version="1.0"; sha256="1va0cd229dhhi1lmrkpwapcm96hrdmxilrmba02xnl7ikhisw0my"; depends=[]; }; GWRM = derive { name="GWRM"; version="1.1"; sha256="1l8rw2nksd1vskjb7kjn93vgrs39bcrr8zz1j66rmkcc399pf6nf"; depends=[]; }; -GWmodel = derive { name="GWmodel"; version="1.2-3"; sha256="04sks9rnqxgxyj9q3nyrnknp4cdfck2p52svxfdrgvxqr48kf6ff"; depends=[maptools robustbase]; }; +GWmodel = derive { name="GWmodel"; version="1.2-5"; sha256="14pp1hy4bqr6kg9fy9nchjm6kb3l85f58rl2449b7wv7vsk3yfvk"; depends=[maptools robustbase sp]; }; GWsignif = derive { name="GWsignif"; version="1.0"; sha256="04663qgy3xmijrx8m1s5ql7zj70mgsd58dl08ci742l1fzmfya5f"; depends=[]; }; +GaDiFPT = derive { name="GaDiFPT"; version="1.0"; sha256="15fnj1w30h0zdj032f3js0bbb1qlyk4b54a4aclykwzicqdgalkg"; depends=[]; }; Gammareg = derive { name="Gammareg"; version="1.0"; sha256="1a5wibnbd8jg0v8577n1x9kc358qpd4jz7l8h7r541sdpprm6wb0"; depends=[]; }; GenABEL = derive { name="GenABEL"; version="1.8-0"; sha256="0sd497qvik70iwv7wc8r50rhc5wx153pm8vif738wwqqp43chks3"; depends=[MASS GenABEL_data]; }; GenABEL_data = derive { name="GenABEL.data"; version="1.0.0"; sha256="0p66fb0gynjx3mnfvnlz45cbn6xf49gwx9mfyxf584xfcggxaa1c"; depends=[]; }; @@ -704,19 +724,19 @@ GeneReg = derive { name="GeneReg"; version="1.1.2"; sha256="081qc66mb17dwk886x9l Geneland = derive { name="Geneland"; version="4.0.5"; sha256="1v2m8v4sy95rajjw8m9bg4yal5ay7x1k5kqjxrivm45ad546ykwh"; depends=[RandomFields fields]; }; GeneralizedHyperbolic = derive { name="GeneralizedHyperbolic"; version="0.8-1"; sha256="0rx07z5npawvsah2lhhkryzpj19sg0sl0w410gmff985ksdn285m"; depends=[DistributionUtils RUnit]; }; GeneticSubsetter = derive { name="GeneticSubsetter"; version="0.5"; sha256="1j04qbnx6j39w16ks3v05hr99lsdsy8sp8af2cfg2mqwk4dy3kx2"; depends=[rrBLUP]; }; -GeneticTools = derive { name="GeneticTools"; version="0.3"; sha256="16jqi98nvdmfbmx6z10d2kxfc9mp4zhpg22rschiy6ysp4lczs3c"; depends=[gMWT Rcpp RcppArmadillo plotrix Rcpp RcppArmadillo]; }; +GeneticTools = derive { name="GeneticTools"; version="0.3.1"; sha256="033dwg94ns4mz2ixgn180h6qd783gm492p9qs2nf8498cb4ycg9m"; depends=[gMWT Rcpp plotrix Rcpp RcppArmadillo]; }; GeoDE = derive { name="GeoDE"; version="1.0"; sha256="0wawkzj0344pprm8g884d7by8v74iw96b109rgm7anal48fl30im"; depends=[Matrix MASS]; }; GeoGenetix = derive { name="GeoGenetix"; version="0.0.2"; sha256="0rrc8rdf6whpd830s2g9ybz82jcd0il9kkfrjh3xza3b86fasdvg"; depends=[RandomFields]; }; GeoLight = derive { name="GeoLight"; version="1.03"; sha256="0l2p4rcmk33dj31xy06652mn05d2dhnny3xpzcf12kxyflpipdgr"; depends=[maps changepoint]; }; GeoXp = derive { name="GeoXp"; version="1.6.2"; sha256="18wdmdwb79ipdjdii068dz9f55b5ldxn95g5q6jcxsqwp0wldvw8"; depends=[quantreg rgl spdep KernSmooth rgeos robustbase splancs]; }; GetR = derive { name="GetR"; version="0.1"; sha256="1b2wirhz4nhvmf863czwb8z8b42ilsyjjrg9rc4nd9b7nz50bmjg"; depends=[party]; }; -GetoptLong = derive { name="GetoptLong"; version="0.0.8"; sha256="1lnh65gs1p5k2cj7py0b9aqr56lm8ibgb3yqr0hwmr85ylj47iin"; depends=[rjson GlobalOptions]; }; +GetoptLong = derive { name="GetoptLong"; version="0.0.9"; sha256="0gmhjd19vqd1jc9bj09715j33c5axrza2nw3w5kqgkh42qw4rsmh"; depends=[rjson GlobalOptions]; }; GhcnDaily = derive { name="GhcnDaily"; version="1.5"; sha256="1gln1giid5n5b9mxidh90l8ahvcgx968zak2lxr2f9c32pnrpmnp"; depends=[R_utils R_oo R_methodsS3 abind ncdf]; }; GibbsACOV = derive { name="GibbsACOV"; version="1.1"; sha256="1ikcdsf72sn1zgk527zmxw3zjhx0yvkal6dv001cgkv202842kll"; depends=[MASS]; }; GillespieSSA = derive { name="GillespieSSA"; version="0.5-4"; sha256="0bs16g8vm9yrv74g94lj8fdfmf1rjj0f04lcnaya7gyak3jhk36q"; depends=[]; }; Giza = derive { name="Giza"; version="1.0"; sha256="13nkm8mk1v7s85kmp6psvnr1v97vi0gid8rsqyq3x6046pyl5z6v"; depends=[reshape lattice lattice]; }; GlobalDeviance = derive { name="GlobalDeviance"; version="0.4"; sha256="0s318arq2kmn8fh0rd5hd1h9wmadr9q8yw8ramsjzvdc41bxqq1a"; depends=[snowfall]; }; -GlobalOptions = derive { name="GlobalOptions"; version="0.0.5"; sha256="0rgawyq52ykwlwq8gfmrz8wah8h1z8h3pafn9v8c73xsbr615a7j"; depends=[]; }; +GlobalOptions = derive { name="GlobalOptions"; version="0.0.6"; sha256="0g10zf3hn4ns7faffqzc9xbscz9p84vcqhlg4jp9jl063ma2pvqm"; depends=[]; }; Gmisc = derive { name="Gmisc"; version="1.0"; sha256="0i92f9v9h4d7vxzzgafwhy8bwf52djqb3mxsaqqz2in68fdywdqq"; depends=[htmlTable lattice sp Hmisc forestplot]; }; GoFKernel = derive { name="GoFKernel"; version="2.0-5"; sha256="030gcj608nkalscjqs2ad73pwhk4gp5gl1lvm4mc9b39jhki0r70"; depends=[KernSmooth]; }; GrammR = derive { name="GrammR"; version="1.0.1"; sha256="1dhq4srzxbdbym89dy4gh0c4jjfkljxdnriv4v0yh9g688my1gvn"; depends=[gWidgets RGtk2 gWidgetsRGtk2 MASS cluster rgl GUniFrac ape]; }; @@ -729,17 +749,17 @@ GroupSeq = derive { name="GroupSeq"; version="1.3.2"; sha256="16n06jw7f97jhafgl9 GuardianR = derive { name="GuardianR"; version="0.5"; sha256="0m5arxz4ih84zg8sf2wy2kg38adraa098gb52vwz93dzdm1dhslw"; depends=[RCurl RJSONIO]; }; Guerry = derive { name="Guerry"; version="1.6-1"; sha256="1hpp49w2kd1npsd709cwg125pw6mrqxfv2nn3lcs1mg2r49ki2bl"; depends=[]; }; GxM = derive { name="GxM"; version="1.1"; sha256="02rv8qb46ylk22iqn9cgh63vkyrg9a8nr1d0d3j5hqhi0wyhc41r"; depends=[Rcpp minqa nlme]; }; -HAC = derive { name="HAC"; version="1.0-1"; sha256="11m3f3fmra4ic3kql5n34ssdwgd1db0avgw3rpmwmq99wgpsdvr5"; depends=[copula]; }; +HAC = derive { name="HAC"; version="1.0-2"; sha256="0f4him7qpam4s0xxm49xqx0g3nrj87rszm52l376xi63z7r02wbv"; depends=[copula]; }; HAP_ROR = derive { name="HAP.ROR"; version="1.0"; sha256="1id9amz1cc2l2vnpp0ikbhf8ghbgzqd1b9dfivnyglg7996c3gbg"; depends=[hash ape]; }; HAPim = derive { name="HAPim"; version="1.3"; sha256="03qy0pxazv3gdq3fck7171ixilb9zi1dwnvc4v7d726g0lvn80pg"; depends=[]; }; HBSTM = derive { name="HBSTM"; version="1.0.1"; sha256="0bx7dxcfj46k4kqpqb39w4qkm4hvr1ka8d8rws445vkyl31kr0q6"; depends=[MASS fBasics maps]; }; HDMD = derive { name="HDMD"; version="1.2"; sha256="0na0z08fdf47ghfl2r3fp9qg5pi99kvp7liymwxym2wglkwl4chq"; depends=[psych MASS]; }; -HDPenReg = derive { name="HDPenReg"; version="0.90"; sha256="0hi1pd6lmb5w4px32sgs4zibl8j7zpav15hyayzwm6jh9gngp591"; depends=[Rcpp Rcpp]; }; -HDclassif = derive { name="HDclassif"; version="1.2.2"; sha256="0j32nhl2v0bipflidwfk6q8a0pvn7qjs7ks1al2izsr772dwfcvq"; depends=[MASS]; }; +HDPenReg = derive { name="HDPenReg"; version="0.91"; sha256="0q63pm39ivka64f7rhad6bv0yr1b2b3241ln8gqfnal25qw31w82"; depends=[rtkpp rtkpp]; }; +HDclassif = derive { name="HDclassif"; version="1.2.3"; sha256="1ss30cjq352cr3v5blpdywycfv2ik200mvj54y8qihc811mash6h"; depends=[MASS]; }; HDtweedie = derive { name="HDtweedie"; version="1.1"; sha256="14awd7sws0464f68f5xwnv1xvr0xflvx2z2zzcfj1csvk3af0zzj"; depends=[]; }; HEAT = derive { name="HEAT"; version="1.2"; sha256="1qifqd06ifl0f5l44mkxapnkwhpm0b82yq6dhfw4f8yhb27wd0z2"; depends=[]; }; HGNChelper = derive { name="HGNChelper"; version="0.3.1"; sha256="0vidw7gdvr0i4l175ic5ya8q2x2jj0v2vc7fagzrp2mcy7fn1y6a"; depends=[]; }; -HH = derive { name="HH"; version="3.1-14"; sha256="1fxf0fp0cgpjadfwczs4i62la6fgavz9xviw20g23lq4bdxvjg7f"; depends=[lattice latticeExtra multcomp gridExtra reshape2 leaps vcd colorspace RColorBrewer Rcmdr shiny]; }; +HH = derive { name="HH"; version="3.1-15"; sha256="030yfg1vx4ns0v2623axi1n6jdfi520fsjvln196gjw7dzdsm1gh"; depends=[lattice latticeExtra multcomp gridExtra reshape2 leaps vcd colorspace RColorBrewer Rcmdr shiny]; }; HHG = derive { name="HHG"; version="1.4"; sha256="048jbwhrbgp1pv2j6sw234ykdn7bgpa49slwh3p5547nl2cwjysg"; depends=[]; }; HI = derive { name="HI"; version="0.4"; sha256="0i7y4zcdr6wcjy43lz9h8glzpdv0pz7livr95xb1j4p8zafykday"; depends=[]; }; HIV_LifeTables = derive { name="HIV.LifeTables"; version="0.1"; sha256="0qa5n9w5d5l1kr4827a34581q380xmpyzmmhhl300z1jwr0j94df"; depends=[]; }; @@ -752,16 +772,15 @@ HMMCont = derive { name="HMMCont"; version="1.0"; sha256="1drni4f72x83sprn65wnhw HMMpa = derive { name="HMMpa"; version="1.0"; sha256="14r2axg42by49qm6avgv7g3xnc29bxlrni5fhc5vdz0wygkcrqhn"; depends=[]; }; HMP = derive { name="HMP"; version="1.3.1"; sha256="1r39mq8j071khza37ck7w4kvk1di71hhn5m4wnx9dak7nlcq2nwx"; depends=[MCMCpack dirmult]; }; HMPTrees = derive { name="HMPTrees"; version="1.2"; sha256="0agp8w7rzr1byj01di89r3qy1vb9inb2zgys78mg8jnk7axi925l"; depends=[ape]; }; -HMR = derive { name="HMR"; version="0.3.2"; sha256="02zhp492n6q46qpfsz0q1wsrcpskmzp4422hgspvpqyrk1hgf588"; depends=[]; }; +HMR = derive { name="HMR"; version="0.4.1"; sha256="1acaph5q6vgi4c7liv7xsc3crhp23nib5q44aszxhramky0gvaqr"; depends=[]; }; HPbayes = derive { name="HPbayes"; version="0.1"; sha256="1kpqnv7ymf95sgb0ik7npc4qfkzc1zb483vwnjpba4f42jhf508y"; depends=[MASS mvtnorm corpcor numDeriv boot]; }; HSAUR = derive { name="HSAUR"; version="1.3-6"; sha256="1872diskd9yz76x0z6yjg6dn1dxh479ybnja8vcly9fr8jb0kqqj"; depends=[]; }; HSAUR2 = derive { name="HSAUR2"; version="1.1-13"; sha256="13b14m2cknicahvprkn3kmjk1sir7a10vkaq63niinfirw603fa9"; depends=[]; }; HSAUR3 = derive { name="HSAUR3"; version="1.0-3"; sha256="0v7nvgybfkwzii1019p8yxnbny5y1y1nrqaa81xagi8a1f1klrzl"; depends=[]; }; -HSROC = derive { name="HSROC"; version="2.1.7"; sha256="05gixmzmgdply9zhjpss54b50ch4b8586cik6c49naxcqxr0y5vd"; depends=[lattice coda MASS MCMCpack]; }; +HSROC = derive { name="HSROC"; version="2.1.8"; sha256="056g6iygrddmpmg5nnilqrlw2xavmcc9q07z942vc2nivw06h346"; depends=[lattice coda MASS MCMCpack]; }; HSSVD = derive { name="HSSVD"; version="1.2"; sha256="1k7ga397grl0r4p0ipjgw5xlafb2528rpww67bw7mmy01w87a1cc"; depends=[bcv]; }; HTMLUtils = derive { name="HTMLUtils"; version="0.1.7"; sha256="05y505jazzahnd6jsp3plqz8hd75991hhhcpcdn8093rinb1f8l1"; depends=[R2HTML]; }; HTSCluster = derive { name="HTSCluster"; version="2.0.4"; sha256="1kvq118hqxc81n88g4bq10lh84dydrqqhzig246wf3f97ajvq7y0"; depends=[capushe poisson_glm_mix plotrix]; }; -HTSDiff = derive { name="HTSDiff"; version="1.0.5"; sha256="03g5hwjgg7g79lskwrgd32gy34v0fn8yh95zndid0qm6i7vwip9w"; depends=[plotrix HTSCluster poisson_glm_mix]; }; HUM = derive { name="HUM"; version="1.0"; sha256="1bq74l88jvscmq9ihv5wn06w2wng073ybvqb2bdx2dmiqlpv6jw2"; depends=[gtools Rcpp rgl Rcpp]; }; HW_pval = derive { name="HW.pval"; version="1.0"; sha256="14nmyqw2d9cmn64789yc54fmiqanh6n1dizp7vj94h7b0jwq63yy"; depends=[]; }; HWEBayes = derive { name="HWEBayes"; version="1.4"; sha256="1rbffx6pn031a278ps9aqxcaq8yi73s5kf60za143ysbfxv9dphw"; depends=[MCMCpack mvtnorm]; }; @@ -784,8 +803,8 @@ HiddenMarkov = derive { name="HiddenMarkov"; version="1.8-1"; sha256="13c5g6wryz HierO = derive { name="HierO"; version="0.2"; sha256="1lqj5grjly4kzxl7wb192aagz2kdvpnjdan2kcg5yxwvg1xcvwv1"; depends=[rneos RCurl bitops XML tcltk2]; }; HistData = derive { name="HistData"; version="0.7-5"; sha256="17s64hfs7r77p0wjzpbgz9wp3gjzbly2d0v784f9m2bka8gj6xhr"; depends=[]; }; HistogramTools = derive { name="HistogramTools"; version="0.3.1"; sha256="0cc3saly5q2kn1gr2mam7g901ddcipmlrn1m0amgrnbkakby2320"; depends=[Hmisc ash stringr]; }; -HiveR = derive { name="HiveR"; version="0.2-27"; sha256="1c0isfiq8xw68qi3mk6m5dilsvbib7hy0ill9wga6kf6qndlfc49"; depends=[RColorBrewer plyr tkrgl jpeg png]; }; -Hmisc = derive { name="Hmisc"; version="3.14-6"; sha256="0nr5m7izxm0kq64hjslvxrnpdm8szl7wmvg6ic4xqck86mxba9py"; depends=[lattice survival Formula latticeExtra cluster rpart nnet acepack foreign]; }; +HiveR = derive { name="HiveR"; version="0.2-28"; sha256="1zz1cg7cf4yyv1bymqlyh50nzj5lgdv4clzm0l2vladcxzjvgk8c"; depends=[RColorBrewer plyr jpeg png rgl xtable tkrgl]; }; +Hmisc = derive { name="Hmisc"; version="3.15-0"; sha256="0i2k64yji4c3sicfa89af220hz48hz74dqjfqdjs0417nzs5sn8q"; depends=[lattice survival Formula ggplot2 proto scales latticeExtra cluster rpart nnet acepack foreign]; }; Holidays = derive { name="Holidays"; version="1.0-0"; sha256="1n6rarygdfqi7rjdqxi5j3xn1pzakvyfp5q9h9173vypxbmrk5p7"; depends=[TimeWarp]; }; HomoPolymer = derive { name="HomoPolymer"; version="1.0"; sha256="1bxc33dx9y9rr9aii4vn9d1j9v5pd4c0xayfdldz8d9m2010xr4a"; depends=[RGtk2 MenuCollection deSolve]; }; HotDeckImputation = derive { name="HotDeckImputation"; version="1.0.0"; sha256="0zb02wcpq09lr7lr4wcgrbw9x7jcvhi34g7f4s6h88zz7xg9daw5"; depends=[Rglpk]; }; @@ -796,11 +815,13 @@ HydroMe = derive { name="HydroMe"; version="2.0"; sha256="1a1d3lay94mzwk8n22l650 HyperbolicDist = derive { name="HyperbolicDist"; version="0.6-2"; sha256="1wgqbx9ascyk6gw1dmvfz6hljvbh49gb9shr9qgf22qbq83waiva"; depends=[]; }; IASD = derive { name="IASD"; version="1.0.7"; sha256="0a25sd82fxnmz3f4iaxhc69cdfb7xmh7wi79wv11sbw9cv2pl7kr"; depends=[]; }; IAT = derive { name="IAT"; version="0.2"; sha256="0byivq2298sjvpsz5z1w7r31h6z2jqpip40z8r2alygbgwwa48pd"; depends=[data_table ggplot2]; }; -IBDhaploRtools = derive { name="IBDhaploRtools"; version="1.7"; sha256="1jg2vrs9ly7l8yidw8ppa41v657jhjcj7n27zi1f2vsh3vmjri0m"; depends=[]; }; +IBDLabels = derive { name="IBDLabels"; version="1.1"; sha256="1m9fd058yjxva6hin7i72i2nl285wfm0jkdn5xcng27yqlijyrm9"; depends=[]; }; +IBDhaploRtools = derive { name="IBDhaploRtools"; version="1.8"; sha256="1754239pdil6b383mpzyi8zb9l9hzg15dwgn5246v97g1y3mlp5r"; depends=[]; }; IBDsim = derive { name="IBDsim"; version="0.9-4"; sha256="0cpabz7mnhsrmjrgb23zs5anjrkhwc2005b2inl6p93l47i81fps"; depends=[paramlink]; }; IBHM = derive { name="IBHM"; version="1.1-11"; sha256="1m0zxlybcak2v5c4spgaa39ngb2hryak4xd875jryk1dcnk9c702"; depends=[DEoptim cmaes Rcpp Rcpp]; }; IBrokers = derive { name="IBrokers"; version="0.9-12"; sha256="0mhh4kgwrncrcysvnvah6xc7fhx5ywjzn258cs9xj9kzns0jblk6"; depends=[xts zoo]; }; IC2 = derive { name="IC2"; version="1.0-1"; sha256="03jjb62msxjxdg9l3zd1ns0d2w37hkxy5pnjgaywxw3vfk4zwfj9"; depends=[]; }; +ICAFF = derive { name="ICAFF"; version="1.0.1"; sha256="0zazx4nv81s75appg10aayks04mx6m5n9yf5hqrbxh3yj68vzxfy"; depends=[]; }; ICC = derive { name="ICC"; version="2.2.1"; sha256="1xl8x8ddbrk8ma57mybmmv9m096wlpbas7hsmd2c6qzcrlz6i7wa"; depends=[]; }; ICE = derive { name="ICE"; version="0.69"; sha256="04p8lakaha28mdh965w0ppyxfrz5ssi1n9xifvsbn3ihdra67rip"; depends=[KernSmooth]; }; ICEbox = derive { name="ICEbox"; version="1.0"; sha256="1m3p0b93ksrcsp45m4gszcz01cwbfpj4ldar6l0q3c9lmyqsznx8"; depends=[sfsmisc]; }; @@ -811,7 +832,7 @@ ICSNP = derive { name="ICSNP"; version="1.0-9"; sha256="0kisk7wk0zjsr47hgrmz5c8f ICsurv = derive { name="ICsurv"; version="1.0"; sha256="1mbndpy3x5731c9y955wscy76jrxlgv33bf6ldqp65cwyvdgxl86"; depends=[MASS matrixcalc]; }; IDPSurvival = derive { name="IDPSurvival"; version="1.0"; sha256="1v1w0i74b065b4qc302xbdl5df7qx9z8jmbc9cn46fqm1hh2b6d7"; depends=[Rsolnp gtools survival]; }; IDPmisc = derive { name="IDPmisc"; version="1.1.17"; sha256="0nbwdyg9javjjfvljwbp2jl0c6414c11zb2pirmm5pmimaq9vv0q"; depends=[lattice]; }; -IFP = derive { name="IFP"; version="0.1.1"; sha256="05hyyh7izgifmiqsxbspcsj97jc7vahqzn1975f954iv0ix3rzqm"; depends=[haplo_stats coda]; }; +IFP = derive { name="IFP"; version="0.1.2"; sha256="1sgjyxjfw3i1k02wy2lc7w9gnrs5g4wnp8kd78ks77f9j0sah2j8"; depends=[haplo_stats coda]; }; IM = derive { name="IM"; version="1.0"; sha256="1f1vr5zfqnanc5xmmlfkjkvxwbyyysi3mcvkg95p8r687a7zl0cx"; depends=[png jpeg bmp]; }; IMIS = derive { name="IMIS"; version="0.1"; sha256="09zb48vdj0i3vf8vxrs07xwb9ji27vp2fyvmg6jfq631licsryc2"; depends=[mvtnorm]; }; INLABMA = derive { name="INLABMA"; version="0.1-6"; sha256="0rij3y89yyj25xz8r9n8cnq7rg9b7hf0n9nxxrrnm86w3n4r66in"; depends=[sp Matrix spdep]; }; @@ -822,7 +843,7 @@ IRTShiny = derive { name="IRTShiny"; version="1.0"; sha256="1gjfqjqk7izl23b96g75 ISBF = derive { name="ISBF"; version="0.2.1"; sha256="12mk4d0m5rk4m5bskkkng5j6a9dzh8l1d74wh8lnamq7kf9ai9if"; depends=[]; }; ISDA_R = derive { name="ISDA.R"; version="1.0"; sha256="0w6p2iy6s7fy8pw2cf4b5zhqcgjjwd5bkax1aqflaaj4ppmfx64v"; depends=[scatterplot3d]; }; ISLR = derive { name="ISLR"; version="1.0"; sha256="0gmhvsivhpq3x8a240lgcbv1qzdgf6wxms4svak1501clc87xc6x"; depends=[]; }; -ISOcodes = derive { name="ISOcodes"; version="2014.03.24"; sha256="0a6ap9a5h88c6iqzlqfalcg1fwm9x7rm3c8z9vwxfw6jrjs6v2cp"; depends=[]; }; +ISOcodes = derive { name="ISOcodes"; version="2015.01.24"; sha256="0l0shl04x78x7g58yn0wh4z2gk0cllpcc43p7m22psh8vvyqzxgs"; depends=[]; }; ISOpureR = derive { name="ISOpureR"; version="1.0.8"; sha256="0jjamyj4rf078rfa2qqrn4i55025sc5968lq95yadbw0izxb51i8"; depends=[Rcpp Rcpp RcppEigen]; }; ISOweek = derive { name="ISOweek"; version="0.6-2"; sha256="1f1h8pgjaa14cvaj8ldl87b4vslxwvyfj46m0hkylwp73sv3g2mm"; depends=[stringr]; }; ISwR = derive { name="ISwR"; version="2.0-6"; sha256="1ms4lm1skfqaq4mnm03kvjb7kaxdzv72s6i77zp7z17gzfa40c9h"; depends=[]; }; @@ -866,28 +887,29 @@ JoSAE = derive { name="JoSAE"; version="0.2.2"; sha256="1ag4qg9cfcg8i2xz79bza2ql Johnson = derive { name="Johnson"; version="1.4"; sha256="12ajcfz5mwxvimv8nq683a2x3590gz0gnyviviyzf5x066a4q0lj"; depends=[]; }; JohnsonDistribution = derive { name="JohnsonDistribution"; version="0.24"; sha256="00211pa2wn4bsfj6wfl9q9g123cp8iz3kxc17pw9q65j9an4sr0m"; depends=[]; }; JointRegBC = derive { name="JointRegBC"; version="0.1.1"; sha256="0w7ygs3pvlqkkb2x20kv20kda3gz7cn6zgrkg30nhjxp318d76ab"; depends=[nlme MASS survival]; }; -JudgeIt = derive { name="JudgeIt"; version="1.5.1"; sha256="1jssz1x9gw9hjpqlqbvlxa99icl8gffzl6qya0cnaxr50p82hdag"; depends=[]; }; Julia = derive { name="Julia"; version="1.1"; sha256="0i1n150d89pkds7qyr0xycz6h07zikb2y07d5fcpaqs4446a8prg"; depends=[]; }; KANT = derive { name="KANT"; version="2.0"; sha256="169j72pmdkcj6hv8qgmc02aps0ppvvl1vnr1hzrb1gsf7zj7bs3y"; depends=[]; }; KATforDCEMRI = derive { name="KATforDCEMRI"; version="0.740"; sha256="1k8fihd9m26k14rvc5d5x0d9xc3mh8d49hs64p55np1acqfhg2sy"; depends=[locfit R_matlab matlab]; }; KFAS = derive { name="KFAS"; version="1.0.4-1"; sha256="0s9mrqb1mvs77z57hx734kajbyqddcc9j20wrsmrbf8g97in61s7"; depends=[]; }; -KFKSDS = derive { name="KFKSDS"; version="1.5"; sha256="0wahqli7j851kdqi29b059gb2zm0x00fq08sixvlrcbdf3irlv3m"; depends=[]; }; +KFKSDS = derive { name="KFKSDS"; version="1.6"; sha256="1g11f936p554bfxlm4slxhfxki5vqkks1mrbqw4w83v2rcb50f8d"; depends=[]; }; KMsurv = derive { name="KMsurv"; version="0.1-5"; sha256="0hi5vvk584rl70gbrr75w9hc775xmbxnaig0dd6hlpi4071pnqjm"; depends=[]; }; KODAMA = derive { name="KODAMA"; version="0.0.1"; sha256="199l6y5b98ags5p7jf150v0i0kcdxlsr2q0rgdpz9ra1hw1cjsfb"; depends=[e1071 plsgenomics class]; }; KRLS = derive { name="KRLS"; version="0.3-7"; sha256="0dx4b68xx3saqlkbpvvrhxjscl7jr5phwqvjywxsp4qxlr3ysl79"; depends=[]; }; KappaGUI = derive { name="KappaGUI"; version="1.1"; sha256="1fyx23i6j18q6swazwy2l70lg2933akh4d0k6dzvfjxrai7fvi7y"; depends=[irr]; }; KappaV = derive { name="KappaV"; version="0.3"; sha256="13mmfb8ijpgvzfj20andqb662950lp9g25k5b26r5ba65p7nhva7"; depends=[PresenceAbsence maptools rgeos sp]; }; Kendall = derive { name="Kendall"; version="2.2"; sha256="0z2yr3x2nvdm81w2imb61hxwcbmg14kfb2bxgh3wmkmv3wfjwkwn"; depends=[boot]; }; -KernSmooth = derive { name="KernSmooth"; version="2.23-13"; sha256="1r9zrr3cfiblr2nkyzn05x82kab0fj2qn2nknnsdm80y42lvsprz"; depends=[]; }; +KernSmooth = derive { name="KernSmooth"; version="2.23-14"; sha256="1dl22pncdlrlysmny0q89yg1s6iafdh75dh31l2hjy16gzlrbhk0"; depends=[]; }; KernSmoothIRT = derive { name="KernSmoothIRT"; version="6.1"; sha256="1hq4sykddh9sg24qrnccii89nqxmq7hnldhn8wl6y62aj0h1nrqm"; depends=[Rcpp plotrix rgl Rcpp]; }; +Kernelheaping = derive { name="Kernelheaping"; version="0.2"; sha256="1063ic6bgnppgh0cpbva5rdrd6kp7z5znkcf7xc3987ywnymsb30"; depends=[plyr evmix MASS]; }; Kmisc = derive { name="Kmisc"; version="0.5.0"; sha256="0pbj3gf0bxkzczl6k4vgnxdss2wmsffqvcf73zjwvzvr8ibi5d95"; depends=[Rcpp data_table lattice knitr markdown Rcpp]; }; KoNLP = derive { name="KoNLP"; version="0.76.9"; sha256="1q72irl4izb7f5bb99plpqnmpfdq4x4ymp4wm2bsyfjcxm649ya8"; depends=[rJava stringr hash tau Sejong]; }; Kpart = derive { name="Kpart"; version="1.1"; sha256="1cyml48i1jvwy4xzymijwraqpnssnkrd81q3m7nyjd5m2czjvihv"; depends=[leaps]; }; KrigInv = derive { name="KrigInv"; version="1.3.1"; sha256="0fcfv2vl572l8qp1ilhjai6zrw15bf1z41qm7xlfspfbj611ga7k"; depends=[DiceKriging pbivnorm rgenoud randtoolbox]; }; -LARF = derive { name="LARF"; version="1.2"; sha256="1qhi5zkgk8qlgfvq0jas9dda6nlg94kcay1famm0s488ssg6sr3k"; depends=[]; }; +LARF = derive { name="LARF"; version="1.3"; sha256="0crg89d377wkga0bc42y8bfk6chg06afchhgnab6q4dirwv9360q"; depends=[]; }; LCA = derive { name="LCA"; version="0.1"; sha256="14nhx2fs18558zljnw56mdz3qx30v394llhzswxhznjfiiqc9z5h"; depends=[]; }; LCAextend = derive { name="LCAextend"; version="1.2"; sha256="1y9azq9v42a3z5fq6gj8js89qblb2z93k4mg4jmw0wgkyv6mysfc"; depends=[boot mvtnorm rms kinship2]; }; LCFdata = derive { name="LCFdata"; version="2.0"; sha256="1x3vbr6hdviqvd6dxn1kb449g0q5zkfmjsmr5nxd2g82p69lv3xm"; depends=[]; }; +LDAvis = derive { name="LDAvis"; version="0.2"; sha256="18fbnk5qd7icn3mgwwb3ld3c9n3j1z4ydc2pg2zizkrahhqxdswi"; depends=[proxy RJSONIO]; }; LDOD = derive { name="LDOD"; version="1.0"; sha256="0mf2sy01yv57mqicrz08a17m6crigklx6fmw9zpxv7g85qw1iq4v"; depends=[Rsolnp Rmpfr]; }; LDPD = derive { name="LDPD"; version="1.0.2"; sha256="0bs3s6x6f9rpp53x8ird6qnz9rfayf64askrr04hdjhlgw7cs0n7"; depends=[MASS nleqslv]; }; LDRTools = derive { name="LDRTools"; version="0.1"; sha256="1cr0v6qsdldy89p44lhr6hisqaz99qzab32kd1srdnnwnwl1q2y4"; depends=[]; }; @@ -902,12 +924,12 @@ LIHNPSD = derive { name="LIHNPSD"; version="0.2.1"; sha256="08ils29vvaq6abkgxbh0 LIM = derive { name="LIM"; version="1.4.6"; sha256="03x1gnm06bw1wrzc01110bjzd2mvjdzbc2mbrazh22jrmb32w5d8"; depends=[limSolve diagram]; }; LINselect = derive { name="LINselect"; version="0.0-1"; sha256="1n6nsspdp1ig8v9bclyga072hxqj2hb9n1smrqia8jrma07yaydl"; depends=[]; }; LIStest = derive { name="LIStest"; version="2.1"; sha256="1gk253v3f1jcr4z5ps8nrqf1n7isjhbynxsi9jq729w7h725806a"; depends=[]; }; -LMERConvenienceFunctions = derive { name="LMERConvenienceFunctions"; version="2.5"; sha256="1kq0ww8h43rsygjz5pmb3ym027klgi4sw1csdr9apwgd3ydbnr7n"; depends=[Matrix lme4]; }; +LMERConvenienceFunctions = derive { name="LMERConvenienceFunctions"; version="2.10"; sha256="08jz0i7sv7gn3bqckphbmnx0kc6yjnfvi06iyf7pcdzjaybxhj06"; depends=[Matrix lme4 LCFdata rgl fields mgcv]; }; LMest = derive { name="LMest"; version="2.0"; sha256="0fv38rb9hwlbay632hhb58vga48sq89chm5qn61l6mf3wfkx2rcg"; depends=[MASS MultiLCIRT]; }; LOGICOIL = derive { name="LOGICOIL"; version="0.99.0"; sha256="1wgg7kigzzk5ghjn3hkjf1bb8d6mvjfmkwq64phri5jpxd742ps9"; depends=[nnet]; }; LOST = derive { name="LOST"; version="1.1"; sha256="19ar85dykbz0jlzbhlm3pcpffj4cizc6sj3gn93qdvpxkp64jfq9"; depends=[gdata shapes e1071 MASS miscTools]; }; LPCM = derive { name="LPCM"; version="0.44-8"; sha256="14627wk5azxm3y3a0qfy4qz57nxbdcasnv7djpqhk2gxf5smq19k"; depends=[]; }; -LPS = derive { name="LPS"; version="1.0.4"; sha256="0dy45nn1bmzd17y2dsh4pf4jmh9qvifigvpg2lv2zrmvlx53cli5"; depends=[]; }; +LPS = derive { name="LPS"; version="1.0.10"; sha256="0gf3jmhfki01z8fm5xdx59gxvhgzqd10x2iwa8369iz9dvwbjk8j"; depends=[]; }; LPStimeSeries = derive { name="LPStimeSeries"; version="1.0-4"; sha256="13hbwg05p48i2gg9i379msb78k35m6kqj8l29cmrpqm1gcdyh3sg"; depends=[RColorBrewer]; }; LPmerge = derive { name="LPmerge"; version="1.6"; sha256="0xc06s2p7n151lzrp0dcrrxk8zmd816dc7qbnbcail5c1bhvdqhd"; depends=[Rglpk Matrix]; }; LS2W = derive { name="LS2W"; version="1.3-3"; sha256="0pdsv7ld0j116rh94m5y1i2mwrzc80fqxmc6ykc51i1sj6ws3i5k"; depends=[wavethresh]; }; @@ -920,7 +942,7 @@ LTPDvar = derive { name="LTPDvar"; version="1.1"; sha256="0zb3ffz5vw1zabgzhpcw1m LTR = derive { name="LTR"; version="1.0.0"; sha256="15g5hbrwhab80sarbjgwzvsn6c4fl18h014kz5fpzf0n1rijybik"; depends=[]; }; LVMMCOR = derive { name="LVMMCOR"; version="0.01.1"; sha256="1lq4hqcg0qkywdr4a22m1fr3m97749mm6n2jzdj9i7jrf0agc1fs"; depends=[nlme MASS]; }; LVQTools = derive { name="LVQTools"; version="1.2"; sha256="06mninrrr49xsh00gfsp0vc418r6pdvq3m6sbnj0ywdyki106mni"; depends=[]; }; -LaF = derive { name="LaF"; version="0.6.1"; sha256="1yg498qzxzx4qpp27rwh854x7vkz8iqmny1pvcy2rvnnb8g0wk24"; depends=[Rcpp Rcpp]; }; +LaF = derive { name="LaF"; version="0.6.2"; sha256="180xsqilpkql8my0dimsxj1kpmb3jl19l6bz8li8m63zii4xmwmp"; depends=[Rcpp Rcpp]; }; Lahman = derive { name="Lahman"; version="3.0-1"; sha256="0w7vp3vjxhigyyqmmka4bw5v4pp5z3jzmf0krq8biwzrpx5qp86x"; depends=[]; }; LakeMetabolizer = derive { name="LakeMetabolizer"; version="1.1"; sha256="0l2l9l2c75cmxpqi2w9cgsad2ffnx6b7wvx6xdx6mkb52kkp9sqy"; depends=[rLakeAnalyzer plyr]; }; Lambda4 = derive { name="Lambda4"; version="3.0"; sha256="04ikkflfr0nmy1gr3gfldlh2v8mpl82k1wwnzp57d2kn75m9vbxz"; depends=[]; }; @@ -929,8 +951,9 @@ Laterality = derive { name="Laterality"; version="0.9.2"; sha256="13b1mpjcq7a14d LatticeKrig = derive { name="LatticeKrig"; version="3.4"; sha256="0qa16sxzj40nk4kmzcb7n4xxn7bqlkx7ar66qpqvh2dvcvi1d70d"; depends=[spam fields]; }; LeLogicielR = derive { name="LeLogicielR"; version="1.2"; sha256="0h52pzrksi1mn55mnxbfi61hl7x61cnkhp450slfrk68f6kp30x6"; depends=[xtable RColorBrewer gdata IndependenceTests]; }; LeafAngle = derive { name="LeafAngle"; version="1.2-1"; sha256="0g3i5300f3rvjz7g7z8s5n8xdcsp41gf1vnr4g36m1likddfpxlx"; depends=[]; }; +LeafArea = derive { name="LeafArea"; version="0.0.5"; sha256="1fjb4mcp09xfsgv5ppza4hnhswb5z0qrjmhhpi4sfxlsl3nb4his"; depends=[]; }; LearnBayes = derive { name="LearnBayes"; version="2.15"; sha256="0cz2rgqy1cmdz2h1qbdvfqxmmdzmg2z1scdlxr7k385anha13ja5"; depends=[]; }; -LiblineaR = derive { name="LiblineaR"; version="1.80-10"; sha256="0qhcrdazqn7zf3wq79rg0sr9bp9a7fw6p3gjrhyyn3b2klbrcz7k"; depends=[]; }; +LiblineaR = derive { name="LiblineaR"; version="1.94-2"; sha256="11q3xydd4navpfcy9yx0fld8ixb6nvnkc7qxwrhvackiy810q86i"; depends=[]; }; LifeTables = derive { name="LifeTables"; version="0.2"; sha256="1n4mqypxm0rbi77ykpr6bpzxfxvq8mm9bmfvcqz7k3ajb78cdr0d"; depends=[mclust]; }; LinCal = derive { name="LinCal"; version="1.0"; sha256="1xr9jnna20hh78dh9wjg70jm8fhaxvdwql894kdp0y5h4pchkdph"; depends=[]; }; LinRegInteractive = derive { name="LinRegInteractive"; version="0.3-0"; sha256="0yk5ys8rc8ilxrbdkf1kmqpkny66lcm47fbip90m0n83v21f1jkk"; depends=[rpanel xtable]; }; @@ -940,13 +963,13 @@ Lmoments = derive { name="Lmoments"; version="1.1-6"; sha256="0jffnlamll5mwxrfqr Lock5Data = derive { name="Lock5Data"; version="2.6"; sha256="0ckaac00ck5vyv0gv25l1zhgkm3char6ks1p4fl3vdl5gdyrc1pp"; depends=[]; }; LogConcDEAD = derive { name="LogConcDEAD"; version="1.5-9"; sha256="135vkp70q6gn75ds43aq08y13vrsgsgykssmnhrh6545i86vmhhi"; depends=[MASS mvtnorm]; }; LogicForest = derive { name="LogicForest"; version="2.1.0"; sha256="0zdyyi6wka0568414f1kw91rx04y76n1k11wxd4r8svb5wybjhp5"; depends=[LogicReg CircStats gtools plotrix]; }; -LogicReg = derive { name="LogicReg"; version="1.5.5"; sha256="1lccxiafi2g2jmzaklcgman5zgax2rvfh61qzwz1w0p57460m581"; depends=[survival]; }; +LogicReg = derive { name="LogicReg"; version="1.5.6"; sha256="1izsdv8vcfv7lqq6i5kzawvrdbqizp2pvf5kv198cmav0g0p4ijd"; depends=[survival]; }; LogisticDx = derive { name="LogisticDx"; version="0.1"; sha256="1w530panmbwf4qplzzj02q9g2lfzrkawxy66ibwdd14z9bwjdclj"; depends=[multcomp data_table pROC car gRbase rms statmod speedglm]; }; LogitNet = derive { name="LogitNet"; version="0.1-1"; sha256="08xi5rpbqkc1b3qj24blv3l0r68wcqbsbjcqxiypm75f3c2irc4i"; depends=[]; }; LogrankA = derive { name="LogrankA"; version="1.0"; sha256="005zkpzi8h03qvqlpkygrf9xv4q77klafkfxw47x04jvkhklwigb"; depends=[]; }; LoopAnalyst = derive { name="LoopAnalyst"; version="1.2-3"; sha256="0xbiy1xa2c6acfrzh6p9pa6wrds8ipskxq0f86ia9g5zkp1rjk2j"; depends=[nlme]; }; LowRankQP = derive { name="LowRankQP"; version="1.0.2"; sha256="0is7v4cy4w1g3wn4wa32iqv4awd1nwvfcb71b3yk5wj59lpm8gs3"; depends=[]; }; -Luminescence = derive { name="Luminescence"; version="0.4.0"; sha256="02q36lywk2x67cjn9w214lq8pr50l9cr2q6wfmfgv6wkjnfin2nv"; depends=[XML shape rgl matrixStats raster sp zoo bbmle]; }; +Luminescence = derive { name="Luminescence"; version="0.4.1"; sha256="0zbb81gvan36d1bhx4fmygw8l5iybbywgnxb2a8mhxrfdqjw4kmg"; depends=[XML shape rgl matrixStats raster sp zoo bbmle data_table]; }; M3 = derive { name="M3"; version="0.3"; sha256="1l40alk166lshckqp72k5zmsgm7s5mgyzxlp11l64mgncjwkw2r3"; depends=[ncdf4 rgdal maps mapdata]; }; MADAM = derive { name="MADAM"; version="1.2.2"; sha256="09w5liqa3mpkbyvkwlabcgyg2b4316qpzq7pbpl0wxl74bsh76vq"; depends=[]; }; MAINT_Data = derive { name="MAINT.Data"; version="0.3"; sha256="1qh7kdcnwfibzyhr53inqjz61srbpypcqjri60zdl32jpf109vng"; depends=[MASS miscTools]; }; @@ -979,7 +1002,7 @@ MCAPS = derive { name="MCAPS"; version="0.3-2"; sha256="1jvxl9xi102pcs3swxlx4jk7 MCAvariants = derive { name="MCAvariants"; version="1.0"; sha256="08c5qpklilj41agi5nzm4f5w41pdxk98i1wc1ahhnawc3n2cdbjz"; depends=[]; }; MCDA = derive { name="MCDA"; version="0.0.8"; sha256="0zpjbshvv88dvqf6a6yw9zhzzh2j90b9yx8yg7q52c3l7a9lks6w"; depends=[Rglpk Kendall glpkAPI]; }; MCMC_OTU = derive { name="MCMC.OTU"; version="1.0.8"; sha256="1bdmvwxkm162m3237bgf42dm5kp3q0giwf0avrkla8qd834gqch0"; depends=[MCMCglmm ggplot2]; }; -MCMC_qpcr = derive { name="MCMC.qpcr"; version="1.1.3"; sha256="101pbg08p594ilcrrig9sqkddprpl6cd6g9y9rrk1rq6cy5cmrvr"; depends=[MCMCglmm ggplot2]; }; +MCMC_qpcr = derive { name="MCMC.qpcr"; version="1.1.5"; sha256="19dznc7iyifkc3lap9nlsq7n8c0h4xbqrxqb6nj1aqa0nlfi0aqw"; depends=[MCMCglmm ggplot2 coda]; }; MCMCglmm = derive { name="MCMCglmm"; version="2.21"; sha256="1mjjp65w7pg2kxrx2qf0lh1kdi9d21xxj7s39zhi3q8ixw35h95r"; depends=[Matrix coda ape corpcor tensorA]; }; MCMCpack = derive { name="MCMCpack"; version="1.3-3"; sha256="0s1j3047qp2fkwdix9galm05lp7jk7qxyic6lwpbd70hmj8ggs76"; depends=[coda MASS]; }; MCPAN = derive { name="MCPAN"; version="1.1-15"; sha256="0811wrbp0nf4nj8kvq62ks8yksabib8r1a0gx3nr3v6avfnv08w1"; depends=[mvtnorm multcomp]; }; @@ -1008,7 +1031,7 @@ MILC = derive { name="MILC"; version="1.0"; sha256="14xsiw5al6kixwvf3ph0dlm8s13g MIPHENO = derive { name="MIPHENO"; version="1.2"; sha256="0hcaq66biv4izszdhqkgxgz91mgkjk1yrwq27fx07a2zmzj44sfv"; depends=[doBy gdata]; }; MImix = derive { name="MImix"; version="1.0"; sha256="033gxr0z2xba0pgckiigblb1xa94wrfmpgv3j122cdynjch44j4r"; depends=[]; }; MKLE = derive { name="MKLE"; version="0.05"; sha256="00hcihjn3xfkzy0lvb70hl2acjkwk6s3y7l4gprix24shnblvxzi"; depends=[]; }; -MKmisc = derive { name="MKmisc"; version="0.96"; sha256="1lcnmswvix290s63cqqlq4ls6wyzzb3f5ykcn4sch6nv71bn8x5x"; depends=[RColorBrewer robustbase]; }; +MKmisc = derive { name="MKmisc"; version="0.97"; sha256="0cfkyh291n68382r3kbkdd7c4wbmg2dp811gaav7rvlpmmd0am5w"; depends=[RColorBrewer robustbase]; }; MLCM = derive { name="MLCM"; version="0.4.1"; sha256="1g6lmw75qdiq0fshxr3sqwm1a3y4928chxkggnfwwxp8hqw4r6px"; depends=[]; }; MLDS = derive { name="MLDS"; version="0.4.3"; sha256="1vql92y2dy1ba5l5xdysqzkzvkrr4bhclmjabn49c8qb2xc2rl40"; depends=[MASS]; }; MLEcens = derive { name="MLEcens"; version="0.1-4"; sha256="0zlmrcjraypscgs2v0w4s4hm7qccsmaz4hjsgqpn0058vx622945"; depends=[]; }; @@ -1020,11 +1043,10 @@ MMS = derive { name="MMS"; version="3.00"; sha256="06909912v2hr52s8k0a0830lbmdh0 MNM = derive { name="MNM"; version="1.0-1"; sha256="0fy43jfd7wak2rfdv5hdq7zc0zsxnbz9p69g6sla0zliibafg0q6"; depends=[ICSNP SpatialNP ellipse ICS]; }; MNP = derive { name="MNP"; version="2.6-4"; sha256="068lssg565dw673dm8f5k6dbxl2vblnszg8wibzy3ijf96hp03cw"; depends=[MASS]; }; MOCCA = derive { name="MOCCA"; version="1.2"; sha256="04smpzn9x64w1vpw4szqa7dwnaak1ls6gpg7fgajs68mv5zivffa"; depends=[cclust clv]; }; -MODISTools = derive { name="MODISTools"; version="0.94.5"; sha256="0x0fmr79csrkxqvrz84pqrbzgnqyi7dj5qw6mp5hdwqa99gbgqkb"; depends=[RCurl XML]; }; +MODISTools = derive { name="MODISTools"; version="0.94.6"; sha256="0jzs2dvhq48zjzb2rj6yxws8i2h7w2k00vg7xg5riad4v9j9jk0c"; depends=[RCurl XML]; }; MOJOV = derive { name="MOJOV"; version="1.0.1"; sha256="11mcqxw83z4xx29s34v4rsbb3zvyhlb2lmvf97b77n455gsy5hab"; depends=[aod survey saws lattice]; }; MOrder = derive { name="MOrder"; version="0.1"; sha256="1vhy20xyvfc18f04hvlb1jm2n0caaz8ysy13w2rra5i4kjdvz52i"; depends=[]; }; MPAgenomics = derive { name="MPAgenomics"; version="1.1.2"; sha256="1gwglzkip54si6i23y8s5hhkzrwmhvfyvsian9593ixy4kqlm2bz"; depends=[R_utils changepoint glmnet cghseg HDPenReg spikeslab]; }; -MPCI = derive { name="MPCI"; version="1.0.6"; sha256="1ngxx5363cm2cid3dl9amva016xy914sz49nfdkh88hjsxv3svjc"; depends=[]; }; MPDiR = derive { name="MPDiR"; version="0.1-16"; sha256="10g4dnysjnzf106qibqqcrxz3xw2nfh4ck1n1dlciwahr0f80j13"; depends=[]; }; MPINet = derive { name="MPINet"; version="1.0"; sha256="1zw3piqhhpagg5qahc2xahxxfdwdk8w94aass1virlpl0f52ik8s"; depends=[BiasedUrn mgcv]; }; MPSEM = derive { name="MPSEM"; version="0.2-6"; sha256="1vmdjnhxl8v7xw71kd1m66vhgaa1q0vvifd67v8fmii0i0i5i35y"; depends=[ape MASS]; }; @@ -1037,7 +1059,7 @@ MRMR = derive { name="MRMR"; version="0.1.3"; sha256="1b3a4bkpcncl4sh7d81nk6b2dz MRSP = derive { name="MRSP"; version="0.4.3"; sha256="0zv22xiq3qh9x3r2ckkvq1vv0vkcirh8y87053bqvw1m20j7q1by"; depends=[matrixcalc Formula]; }; MRsurv = derive { name="MRsurv"; version="0.2"; sha256="148myzk6r8whkpv1yv59dmdlr2n8vdwmaww165aw696xfjxwq550"; depends=[survival mvtnorm]; }; MRwarping = derive { name="MRwarping"; version="1.0"; sha256="13bcs7rlm4irx7yzdnib558w9014a4chh9xwc010m6pxvxv36qnv"; depends=[boa SemiPar]; }; -MSBVAR = derive { name="MSBVAR"; version="0.9-1"; sha256="1qd8v3n9nvyp1j1byb8dkmvkbmk5p2kgx7wjmsa9sh4siqbxzn4w"; depends=[KernSmooth xtable coda bit mvtnorm lattice]; }; +MSBVAR = derive { name="MSBVAR"; version="0.9-2"; sha256="1p6n8vbrlqqq1vbqvxnn0ffmnr462gslb1jkaf4vcrndbln5cclq"; depends=[KernSmooth xtable coda bit mvtnorm lattice]; }; MSG = derive { name="MSG"; version="0.2.2"; sha256="18siw81pa02yg0zs40pavwm88yz7kfi60fislmjpwnl2207a6fhf"; depends=[RColorBrewer]; }; MSIseq = derive { name="MSIseq"; version="0.99.1"; sha256="1wg0j0qr2g2lhhw57cvlawd5hik0bmqb66ynxgn62sgx1nkj3g74"; depends=[RWeka rJava R_utils]; }; MSQC = derive { name="MSQC"; version="1.0.1"; sha256="1vs9kygjg9f4sr1m80hdn03gdhbdqfjamqxhbs9zha8smjrsgisw"; depends=[rgl]; }; @@ -1045,41 +1067,44 @@ MST = derive { name="MST"; version="1.0"; sha256="142xhg7fpf27ba9gi3dxbmpcpmz56d MSeasy = derive { name="MSeasy"; version="5.3.3"; sha256="191mvg1imxfjlnd808ypn4lsjx7n6ydf16flax79hv01z7rcjylh"; depends=[amap clValid cluster fpc]; }; MSeasyTkGUI = derive { name="MSeasyTkGUI"; version="5.3.3"; sha256="0ihz8vr2wbgy88bzssilgvlhkbr13jznfjvnqy73wpchqgwy0wy6"; depends=[MSeasy]; }; MSwM = derive { name="MSwM"; version="1.2"; sha256="01l23ia20y3nchykha4vz6sa757zmbvgx2315cacxfcqk9rgs08c"; depends=[nlme]; }; -MTS = derive { name="MTS"; version="0.32"; sha256="0jxa0madik1d317wsl1svb2bndi6mw125brbxpyf019lknh6yajy"; depends=[Rcpp fGarch mvtnorm Rcpp]; }; +MTS = derive { name="MTS"; version="0.33"; sha256="0i7kpgsw56vvgrdgddn83i9lzjlb72z4llffqai29qq0m1i7hm65"; depends=[Rcpp fGarch mvtnorm Rcpp]; }; MTurkR = derive { name="MTurkR"; version="0.6"; sha256="0kmi1x9xsqwi7llgwmkmnkn2hir5r9nryhqh8lrh41fwps4la9x8"; depends=[RCurl digest XML]; }; MUCflights = derive { name="MUCflights"; version="0.0-3"; sha256="03ksvv5nyzlqiml1nz405r3yqb2cl35kpm1h61zcv2nqq8cxqshs"; depends=[XML geosphere sp RSQLite NightDay]; }; MVA = derive { name="MVA"; version="1.0-5"; sha256="18x075hjqhrjwxivvrixgs6yc67il3n5p1m7v2wymcf8h2mkki91"; depends=[HSAUR2]; }; MVB = derive { name="MVB"; version="1.1"; sha256="0an8b594rknlcz6zxjva6br8f34sgwdi2jil3xh1xzb5fa55dw0f"; depends=[Rcpp RcppArmadillo Rcpp RcppArmadillo]; }; -MVN = derive { name="MVN"; version="3.7"; sha256="1rwm3wsgsrc51hil354bcgnpsmk86hbclyb37xr6nxyrkqzx0xi9"; depends=[nortest moments MASS robustbase mvoutlier plyr]; }; +MVN = derive { name="MVN"; version="3.8"; sha256="0n33bp8iqj4dmm4p5vgj32dcaqxqrscv4wy9471hh3wwq938cnag"; depends=[nortest moments MASS robustbase mvoutlier plyr psych]; }; MVR = derive { name="MVR"; version="1.20.0"; sha256="1wwzws9116ck14g6xd1svmwc9wkr8piwb24bddnzri388p8qkgb4"; depends=[statmod]; }; MVar_pt = derive { name="MVar.pt"; version="1.0"; sha256="0wzc2r5psla8khyrkd7p8y23cxyn5bsy8vxglh2p3mpayfzi8k2a"; depends=[]; }; -MXM = derive { name="MXM"; version="0.2.1"; sha256="047whr0fly89i5vlyd4z8lj2nxyfkk9vvniasncnwls8vmmpf1jk"; depends=[]; }; +MXM = derive { name="MXM"; version="0.3"; sha256="14kw4shc0jp6jrs8afimy13jssah0agwa3p5ay2py1zfid43k63y"; depends=[gRbase VGAM MASS pcalg survival]; }; MaXact = derive { name="MaXact"; version="0.2.1"; sha256="1n7af7kg54jbr09qk2a8gb9cjh25cnxzj2snscpn8sr8cmcrij0i"; depends=[mnormt]; }; Maeswrap = derive { name="Maeswrap"; version="1.4.11"; sha256="15i36xj2bdzhly78614077s8k2z75a1gmzl2crsfgvhyyjdax8r7"; depends=[rgl lattice geometry]; }; ManyTests = derive { name="ManyTests"; version="1.1"; sha256="11xk3j2q7w6b6ljmp7b8gni0khpmpvcvzwxypy0w8ihi2gaczsxj"; depends=[]; }; Map2NCBI = derive { name="Map2NCBI"; version="1.0"; sha256="02cgmayrhkyji0cwr6n0f439njq29mzna7sgzkq6ml45njm9m5nh"; depends=[]; }; MapGAM = derive { name="MapGAM"; version="0.7-4"; sha256="1y1f0xmbssc7k6fw1dcs2kg06brza9mj5a2c33b8ln226hvnhk3z"; depends=[sp gam maptools]; }; MareyMap = derive { name="MareyMap"; version="1.2"; sha256="1l7s1ffl9bg1zx5nyb1r3dba188mxiaprdda3gqm2cr1f33jmr51"; depends=[tkrplot]; }; -MarkowitzR = derive { name="MarkowitzR"; version="0.1402"; sha256="1fbn6l8z76ak8z2nyzmizcjm7h54y58773nsy03x1pwykcwpzw9f"; depends=[matrixcalc sandwich gtools]; }; +MarkowitzR = derive { name="MarkowitzR"; version="0.1502"; sha256="0srrmzr4msn04w5f6s6qs51db8jccpfj10sighsv1l7d056n2xjn"; depends=[matrixcalc sandwich gtools]; }; MasterBayes = derive { name="MasterBayes"; version="2.52"; sha256="12ka2l4x6psij7wzbb98lwx5shgwzn5v44qfpiw1i6g236yp0mhm"; depends=[coda genetics gtools kinship2]; }; MatchIt = derive { name="MatchIt"; version="2.4-21"; sha256="02kii2143i8zywxlf049l841b1y4hqjwkr1cnyv6b8b7y7lz2m5v"; depends=[MASS]; }; Matching = derive { name="Matching"; version="4.8-3.4"; sha256="04m647342j4yi74ds7ddwnyrf58qdy7k3mc067k3p779qavq2ka1"; depends=[MASS]; }; MatchingFrontier = derive { name="MatchingFrontier"; version="0.3.17"; sha256="1z4sgvcivlnfhkgqi7jr7b6iwlwskwwnkw9hsaiy4apgki4m0ngn"; depends=[igraph MASS]; }; Matrix = derive { name="Matrix"; version="1.1-5"; sha256="0kqbabpzin7j33cjx6na3qdr5ry5fgsxbi3a7rm93ghqaadaagmj"; depends=[lattice]; }; -MatrixEQTL = derive { name="MatrixEQTL"; version="2.1.0"; sha256="03ccawgrkv0r3y8smpym27p5bsxy8y9rhn7pqs9ybb385951azy9"; depends=[]; }; +MatrixEQTL = derive { name="MatrixEQTL"; version="2.1.1"; sha256="1bvfhzhvm1psgq51kpjcpp7bidaxcrxdigmv6abfi3jk5kyzn5ik"; depends=[]; }; MatrixModels = derive { name="MatrixModels"; version="0.4-0"; sha256="1jcjsyha0xmz264g1haj7x8zpzjmp1m0jl39h5bf8r45hhlaxcsa"; depends=[Matrix]; }; +MaxPro = derive { name="MaxPro"; version="3.1-2"; sha256="1y2g8a8yvzb24dj0z82nzfr6ylplb9sbi2dmj7f3pb4s3yr5zm8y"; depends=[nloptr]; }; +MazamaSpatialUtils = derive { name="MazamaSpatialUtils"; version="0.1.2"; sha256="0s6nwc7y4zhl72ynmrna7g65rhx9y7jrwcdhwlg30nhvr55ibrgx"; depends=[dplyr rgdal rvest sp stringr]; }; McParre = derive { name="McParre"; version="1.0.1"; sha256="16bfca867drbknzc6bylg8paa8p72l23wgjpyvy4pd9z6lpgmhdy"; depends=[MASS]; }; McSpatial = derive { name="McSpatial"; version="2.0"; sha256="18nmdzhszqcb5z9g8r9whxgsa0w3g7fk7852sgbahzyw750k95n4"; depends=[lattice locfit maptools quantreg RANN SparseM]; }; Mcomp = derive { name="Mcomp"; version="2.05"; sha256="0wggj0h0qxjwym1vz1gk9iwnwia4lpjlk6n46l6hinsdax3g221y"; depends=[tseries forecast]; }; MedOr = derive { name="MedOr"; version="0.1"; sha256="1rwc14s16lnzgb78ac2017hv9pss7zw7nw3y7vrvq1qx4fgiw6f8"; depends=[]; }; -MenuCollection = derive { name="MenuCollection"; version="1.1"; sha256="1x44skdzyjv0jg5k4pxk2k0ksh6zgh234sh3gib6a4ldny30prfp"; depends=[RGtk2 RGtk2Extras gplots]; }; +MenuCollection = derive { name="MenuCollection"; version="1.2"; sha256="0v3flicfnln9qld150yk3rfldvsr4dllhq80l02n1lq6px38nf2s"; depends=[RGtk2 RGtk2Extras gplots]; }; MergeGUI = derive { name="MergeGUI"; version="0.2-1"; sha256="1hx03qv5jyjjmqdvylc3kz5dl5qsdqwlirjbrnxrw7grkgkhygap"; depends=[gWidgetsRGtk2 ggplot2 cairoDevice rpart]; }; MetABEL = derive { name="MetABEL"; version="0.2-0"; sha256="0rqjv85mgswrbbp8b8ip6cdmz0cvfy9lm5mcr8a7h38rzgx3g3i3"; depends=[]; }; MetFns = derive { name="MetFns"; version="1.0"; sha256="03kx8cr4c6mgjincf87m305fhryh1c42hdzr1ljl63affnlp7nfp"; depends=[astroFns plotrix]; }; +MetNorm = derive { name="MetNorm"; version="0.1"; sha256="0vfi3k0yp2dz47gwj1n1avs3ji0a2nlrrljz5d0l66zfh4474jb4"; depends=[]; }; MetSizeR = derive { name="MetSizeR"; version="1.1"; sha256="11hdmpvnszr6pn9ihb3zjy9miksz1fs4piry153z4dic8pjydkax"; depends=[mvtnorm MetabolAnalyze cairoDevice gWidgets gWidgetsRGtk2]; }; MetStaT = derive { name="MetStaT"; version="1.0"; sha256="0400gx6i8xlkm51da98ap91c3hgrkgfgxswn0plaxfry3625khkp"; depends=[MASS abind pls]; }; MetaDE = derive { name="MetaDE"; version="1.0.5"; sha256="1ijg64bri5jn2d3d13q1gvvfyqmbh6gn0lk6dkihixf0jwvjdyqi"; depends=[survival combinat]; }; -MetaLandSim = derive { name="MetaLandSim"; version="0.1"; sha256="0g1xcv8g8vws4pppdv9xa8lgf2ip2dq4vr7dpbdn2iqn9w3dmm41"; depends=[spatstat sp e1071 fgui googleVis maptools rgeos spgrass6 raster]; }; +MetaLandSim = derive { name="MetaLandSim"; version="0.2"; sha256="0lb058kcqpylw27hlmkxmpndsiw71g865fgapw6d599brgi91a8i"; depends=[spatstat sp e1071 fgui googleVis maptools rgeos spgrass6 raster]; }; MetaPCA = derive { name="MetaPCA"; version="0.1.4"; sha256="14g4v3hyxnds4l2q36mpz282yqg8ahgdw3b0qmj0xg17krrf5l2s"; depends=[foreach]; }; MetaQC = derive { name="MetaQC"; version="0.1.13"; sha256="11595ggjr46z6xiwmhiyx1sydaq68l18y7mgdwxsg81g03ck9x1r"; depends=[proto foreach iterators]; }; MetaSKAT = derive { name="MetaSKAT"; version="0.40"; sha256="1jxs32hvsw6wzci9f1rc7sw1dfyazdm2d57wcmhkggfg3hkdn1vv"; depends=[SKAT]; }; @@ -1122,7 +1147,7 @@ MuMIn = derive { name="MuMIn"; version="1.12.1"; sha256="1l9grnhsw0bw6hh1s4wk9f5 MultEq = derive { name="MultEq"; version="2.3"; sha256="0fshv7i97q8j7vzkxrv6f20kpqr1kp9v6pbw50g86h37l0jghj7r"; depends=[]; }; MultNonParam = derive { name="MultNonParam"; version="1.0"; sha256="0xff81wjmyw2d38r0v3n7vv0dasg9rlrc0zrdwsmfd83zpvxqj5m"; depends=[]; }; MultiCNVDetect = derive { name="MultiCNVDetect"; version="0.1-1"; sha256="0mfisblw3skm4y8phfg4wa0rdchl01wccarsq79hv63y78pfhh13"; depends=[]; }; -MultiLCIRT = derive { name="MultiLCIRT"; version="2.7"; sha256="0i9ydhqw8a6rvds708vn1ypmfw5nrnpnfzjmg4s01gcm2xswvli0"; depends=[MASS limSolve]; }; +MultiLCIRT = derive { name="MultiLCIRT"; version="2.9"; sha256="0anb041nd56rrryhv5w1pb0axxsfkqas177r6yf5h5gbc4vn3758"; depends=[MASS limSolve]; }; MultiMeta = derive { name="MultiMeta"; version="0.1"; sha256="0gj0wk39fqd21xjcah20jk16jlfrcjarspbjk5xv74c9k4p5gmak"; depends=[gtable mvtnorm expm ggplot2 reshape2]; }; MultiOrd = derive { name="MultiOrd"; version="2.1"; sha256="12y5cg06qyaz72gk3bi5pqkd55n72rz056y9va49znlsqph09x2x"; depends=[mvtnorm corpcor Matrix psych]; }; MultiPhen = derive { name="MultiPhen"; version="2.0.0"; sha256="05w7khzyxswlsz4sxhaakbz828zrdya1y8qcsdfc6w7wgl8qpmj9"; depends=[MASS abind epitools meta HardyWeinberg RColorBrewer gplots]; }; @@ -1132,12 +1157,12 @@ MultinomialCI = derive { name="MultinomialCI"; version="1.0"; sha256="0ryi14d102 Myrrix = derive { name="Myrrix"; version="1.1"; sha256="15w1dic6p983g2gajbm4pws743z68y0k2hxrdwx6ppnzn9rk07rs"; depends=[Myrrixjars rJava]; }; Myrrixjars = derive { name="Myrrixjars"; version="1.0-1"; sha256="0dy82l0903pl4c31hbllscfmxrv3bd5my5b2kv5d3x5zq0x99df0"; depends=[rJava]; }; NADA = derive { name="NADA"; version="1.5-6"; sha256="0y7njsvaypcarzygsqpqla20h5xmidzjmya4rbq39gg6gkc0ky27"; depends=[survival]; }; -NAM = derive { name="NAM"; version="1.0.2"; sha256="1xvs8pjyb5q00ks2nnpdscf4bms4nvy6rf8x2s8325mcrqqi5c76"; depends=[Rcpp Matrix missForest Rcpp]; }; +NAM = derive { name="NAM"; version="1.0.2.2"; sha256="1p2c95fiv1mb5ja3l6d8scnvlbmiwwgbln24z7nqwpmskc5d6dbd"; depends=[Rcpp Matrix missForest Rcpp]; }; NAPPA = derive { name="NAPPA"; version="2.0"; sha256="18yipic8xkf13jaaxnn388m49r5q2g7q7gb0mmw3gh7226lmz987"; depends=[plyr NanoStringNorm]; }; NB = derive { name="NB"; version="0.9"; sha256="1gh42z7lp6g09fsfmikxqzyvqp2874cx3a6vr96w43jfwmgi2diq"; depends=[]; }; NBDdirichlet = derive { name="NBDdirichlet"; version="1.01"; sha256="07j9pcha6clrji8p4iw466hscgs6w43q0f7278xykqcdnk39gkyv"; depends=[]; }; NBPSeq = derive { name="NBPSeq"; version="0.3.0"; sha256="0l4ylxhs2k9ww21jjqs67fygk92avdchhx2y1ixzl7yr2yh1y9by"; depends=[]; }; -NCBI2R = derive { name="NCBI2R"; version="1.4.6"; sha256="1gsvc9v9005hf71nsqgybnfhlmdr3wwzm5ab7h8c8ly5waq2w9i7"; depends=[]; }; +NCBI2R = derive { name="NCBI2R"; version="1.4.7"; sha256="1hjjnkwv5dxisa6amd9bb9l4g4c4525ykg1vnjr31csg5vmzvyfx"; depends=[]; }; NCmisc = derive { name="NCmisc"; version="1.1.3"; sha256="051qbqsvqb5wivba8msdhswfg0cxyxnyp601zgb1zvzcnbrffimg"; depends=[proftools]; }; NEff = derive { name="NEff"; version="1.0"; sha256="0ksnmxjy2ms2z7rq4rddnykydwlb4f9c13nak5f8m65pfjcgv3sk"; depends=[msm bit]; }; NHANES = derive { name="NHANES"; version="1.0"; sha256="18sy2x61bnily3fz0rs61y44kn6y2ikgrzr6nhgm6fkqv02ffdg8"; depends=[]; }; @@ -1146,12 +1171,12 @@ NHMM = derive { name="NHMM"; version="3.5"; sha256="03il5y6vz5zyadydhk3qg6sd6fms NHPoisson = derive { name="NHPoisson"; version="3.0"; sha256="11gdfqfly3cvr6ndxvp06kbdd7aw6k25kz8kyxxybjpzszxbpmq8"; depends=[car]; }; NISTnls = derive { name="NISTnls"; version="0.9-13"; sha256="03a1c8a5dr5l5x4wbclnsh3vmx3dy7migfdzdx7d7p3s7hj3ibif"; depends=[]; }; NISTunits = derive { name="NISTunits"; version="1.0.0"; sha256="156rk3wams52lw3inf55s9v7mi5x29mmb41p8kvryimnzgi904ca"; depends=[]; }; -NLP = derive { name="NLP"; version="0.1-5"; sha256="1l5c21bpbbnpspxi7nmjny1k3i9q5szyxnarndb3yx7aywkvjrkj"; depends=[]; }; +NLP = derive { name="NLP"; version="0.1-6"; sha256="19ynrfzj70swlk6z1r8bh23dzdk2qk8z0bk3xn39vpv0wplyc9i3"; depends=[]; }; NLPutils = derive { name="NLPutils"; version="0.0-1"; sha256="036pafnjcbz7ihdgsjss4jq8fb420j8fmxyymv7kr4pr78wjysbx"; depends=[NLP SnowballC qdap]; }; NLRoot = derive { name="NLRoot"; version="1.0"; sha256="1x8mcdgqqrhyykr12bv4hl4wbh1zw2qgpnd2yrm68kb92iy95rh4"; depends=[]; }; NMF = derive { name="NMF"; version="0.20.5"; sha256="1j91vklzi4qjlix5sn9qh86dwx6vxnla2p4ag81apkr441jkvynr"; depends=[pkgmaker registry rngtools cluster stringr digest gridBase colorspace RColorBrewer foreach doParallel ggplot2 reshape2]; }; NMFN = derive { name="NMFN"; version="2.0"; sha256="0n5fxqwyvy4c1lr0glilcz1nmwqdc9krkqgqh3nlyv23djby9np5"; depends=[]; }; -NMOF = derive { name="NMOF"; version="0.34-0"; sha256="05gg5hf8003yvzgh0rjsgymlsgjz9jray74cffssg4dl9d0f1jkz"; depends=[]; }; +NMOF = derive { name="NMOF"; version="0.34-1"; sha256="0agh22p4rr3dfq1wipm2435hvb932wf9vp0r5992g3wbfnphs29g"; depends=[]; }; NORMT3 = derive { name="NORMT3"; version="1.0-3"; sha256="041s0qwmksy3c7j45n4hhqhq3rv2hncm2fi5srjpwf9fcj5wxypg"; depends=[]; }; NORTARA = derive { name="NORTARA"; version="1.0.0"; sha256="1q4dmn5q939d920spmxxw08afacs3pzhr2gzwyqa5kn8xiz4ffg8"; depends=[corpcor Matrix]; }; NPBayesImpute = derive { name="NPBayesImpute"; version="0.4"; sha256="0r2b878xs2vjvskhz63cyizaa7qfw06sq120m8xnm5ra4r55c0fc"; depends=[Rcpp Rcpp]; }; @@ -1176,7 +1201,7 @@ NetComp = derive { name="NetComp"; version="1.6"; sha256="11rxpdihn575diqfvc7yvx NetData = derive { name="NetData"; version="0.3"; sha256="1jf05zwy0c6gmm7kvxlwvai61bz4wpsw7cl0h4i21ipzn1rqxmqj"; depends=[]; }; NetIndices = derive { name="NetIndices"; version="1.4.4"; sha256="0ydivbri8l8zkxi18ghj9h66915scyhca8i9mcyq4b06mjfigss8"; depends=[MASS]; }; NetSim = derive { name="NetSim"; version="0.9"; sha256="07h4qwz64k8zj8c2mx23cbnhg4rqrb4nfh20xw98kspz7cisdg6d"; depends=[Rcpp Rcpp]; }; -NeuralNetTools = derive { name="NeuralNetTools"; version="1.0.0"; sha256="1bfi811d03xly5pyzhf45c5wlikvcg6df2vvv7qi0yi7i415mmcy"; depends=[ggplot2 neuralnet nnet reshape2 RSNNS scales]; }; +NeuralNetTools = derive { name="NeuralNetTools"; version="1.0.1"; sha256="1gxlv595jxbvpis1vp1bxkspwhqk32f0d0lhkzah8d5ijjzdqihf"; depends=[ggplot2 neuralnet nnet reshape2 RSNNS scales]; }; Newdistns = derive { name="Newdistns"; version="1.0"; sha256="1agg5v05x9qlg1w439aycfjfd5yap6ivn1kqgsc3ck148ar11wb2"; depends=[]; }; NightDay = derive { name="NightDay"; version="1.0.1"; sha256="0vkpr2jwhgghiiiaiglaj1b9pz25fcsl628c9nsp9zyl67982wz1"; depends=[maps]; }; Nippon = derive { name="Nippon"; version="0.5.3"; sha256="02m591aljlaxn95k7sl8gfsviv4ywqv9mrkjf6g19kfrc9pbgjqg"; depends=[maptools]; }; @@ -1193,7 +1218,7 @@ ODMconverter = derive { name="ODMconverter"; version="2.0"; sha256="1691fmkdjhk7 OIdata = derive { name="OIdata"; version="1.0"; sha256="078khxrszwnrww2h0ag153bf59fnyhirxy4m56ssgr2gmfahaymf"; depends=[RCurl maps RCurl maps]; }; OIsurv = derive { name="OIsurv"; version="0.2"; sha256="148mpjj5navc1vrl72y87krn4lf3awnd32z3g4qqaia404w5w7p7"; depends=[survival KMsurv]; }; OLScurve = derive { name="OLScurve"; version="0.2.0"; sha256="1zqapfwgwy9rxnbhmlgplkphw1bdia4cyi9q6iwcppw3rjw75f1n"; depends=[lattice]; }; -ONETr = derive { name="ONETr"; version="1.0.1"; sha256="05azlax5wc0qrr1aqfpdks38185szjlkiv9d3vrkcwmjlw6n109y"; depends=[XML RCurl]; }; +ONETr = derive { name="ONETr"; version="1.0.2"; sha256="1b0djffn4bx6drq5j87s15dwvnjmvraxs52y4dr6micvd9hifa9a"; depends=[XML RCurl]; }; OOmisc = derive { name="OOmisc"; version="1.2"; sha256="09vaxn5czsgn6wpr27lka40kzd76jzqgqxavf26ms3m9kkdf83g4"; depends=[]; }; OPDOE = derive { name="OPDOE"; version="1.0-9"; sha256="0pf8rv5wydc8pl4x57g7bk2swjabaxdgijgsigjy5wihfcb48654"; depends=[gmp mvtnorm orthopolynom nlme crossdes polynom]; }; OPE = derive { name="OPE"; version="0.7"; sha256="0ld3pr94ii1pmfk99qfwgria6ki2iz2hwmn7pj3cjwprv8jkcjji"; depends=[]; }; @@ -1227,15 +1252,15 @@ OrdMonReg = derive { name="OrdMonReg"; version="1.0.3"; sha256="1xca8pvvq79j484l OrdNor = derive { name="OrdNor"; version="1.0"; sha256="1n6c0d4r1w3n016lzk2i5yyvawk9pgmsbzymbbyq7gx8a80iv32h"; depends=[mvtnorm corpcor Matrix GenOrd]; }; OrdinalLogisticBiplot = derive { name="OrdinalLogisticBiplot"; version="0.4"; sha256="1axn03yrw30r2j9ss5ig9sq857y37vhrr4a7px68jc2az8mng41j"; depends=[mirt MASS NominalLogisticBiplot]; }; OrgMassSpecR = derive { name="OrgMassSpecR"; version="0.4-4"; sha256="046lr0piiy5w5lxjvyw7iqqclkghmc6zqymfypkw374gk73yrm76"; depends=[]; }; -OutbreakTools = derive { name="OutbreakTools"; version="0.1-11"; sha256="0m39wppck75mpcgdhwvw0nc0cgidzn80zl58hhs6x3svpnbssn0v"; depends=[ggplot2 network knitr RColorBrewer ape reshape2 sna plyr ggmap scales rjson networkDynamic]; }; +OutbreakTools = derive { name="OutbreakTools"; version="0.1-12"; sha256="0xfvaf8anj57yrw7ycljcnrpg2b2rqi12lclzm6afy15my67drff"; depends=[ggplot2 network knitr RColorBrewer ape reshape2 sna plyr ggmap scales rjson networkDynamic RCurl]; }; OutlierDC = derive { name="OutlierDC"; version="0.3-0"; sha256="1vm3zx4qmj9l0ddfqbksm1qyqzzqrxf93gh4kj52h68zlsfxwv41"; depends=[survival quantreg Formula]; }; OutlierDM = derive { name="OutlierDM"; version="1.1.1"; sha256="0n8iq464ryc3v4wms7cdka39870w5pg29z9v8gmdsp4d9cfsx9v4"; depends=[quantreg MatrixModels outliers pcaPP]; }; OutrankingTools = derive { name="OutrankingTools"; version="1.0"; sha256="0z7pslkkinn7flc4xwjg0bsfswf8ad4jv9rmglaj3fmjcx9b6wgj"; depends=[igraph]; }; -P2C2M = derive { name="P2C2M"; version="0.5"; sha256="0yn66d6bp9mlnbw83y0q4w17cxwinryqbl17hqsa2z446qwzxqlq"; depends=[ape apTreeshape ggplot2 rPython stringr]; }; +P2C2M = derive { name="P2C2M"; version="0.6"; sha256="00m4dmvnvbjbxxqi9ai2zd33cwlsb7ghjbswz256w5iab4c0ls02"; depends=[ape apTreeshape ggplot2 rPython stringr]; }; PAGI = derive { name="PAGI"; version="1.0"; sha256="01j1dz5ihqslpwp9yidmhw86l112l7rfkswmf03vss872mpvyp3f"; depends=[igraph]; }; PAGWAS = derive { name="PAGWAS"; version="1.0"; sha256="1zwq4b0bgsskzvlapffh30ys9y4wlcfwpjqw8m2i9zabib5knx9i"; depends=[lars doMC mnormt]; }; PANDA = derive { name="PANDA"; version="0.9.9"; sha256="1sf3c49v4mb3mz2imqlqdbh1iab7bc2pxpi8bmgj2jld133555ip"; depends=[cluster]; }; -PANICr = derive { name="PANICr"; version="0.0.0.2"; sha256="17r550wyp4nsjk3n1c786z0xfn0h1gpnas22dcq5bl0jn16mh40c"; depends=[MCMCpack]; }; +PANICr = derive { name="PANICr"; version="0.0.0.5"; sha256="049ga5iiymqczvy51y52yk7yvv9xy0ibr64ly8ciqig84d5f4jjr"; depends=[MCMCpack]; }; PAS = derive { name="PAS"; version="1.2"; sha256="0q5g9j8xb9fl7r8f1w5gk5h83ll5w1r6m2gq9ilw8w8s96pm4xd8"; depends=[glmnet]; }; PASWR = derive { name="PASWR"; version="1.1"; sha256="1rxymnqvflypc6m62f5vw65l8x1m2yah7r11hhpmzdq2l2sg8fci"; depends=[e1071 MASS lattice]; }; PASWR2 = derive { name="PASWR2"; version="1.0"; sha256="1bxczrfxj7nlx4r0b23a7sisinb4d5nd3pj68vigbgrhqyggk87x"; depends=[ggplot2 lattice e1071]; }; @@ -1246,15 +1271,16 @@ PBImisc = derive { name="PBImisc"; version="0.999"; sha256="0igwl78wj8w6jzmk5m8y PBSadmb = derive { name="PBSadmb"; version="0.68.104"; sha256="01akimdsp0bkvz3a5d75yyy3ph0mff85n8qsnr59fla5b5cm4qlj"; depends=[PBSmodelling]; }; PBSddesolve = derive { name="PBSddesolve"; version="1.11.29"; sha256="13vprr66hh5d19xambpyw7k7fvqxb8mj5s9ba19ls7xgypw22cmm"; depends=[]; }; PBSmapping = derive { name="PBSmapping"; version="2.68.68"; sha256="1g58jz7mc7fkrv2c739pkg048pcgmklq650800wf6px073db2kc3"; depends=[]; }; -PBSmodelling = derive { name="PBSmodelling"; version="2.66.264"; sha256="08plp74cjzmgv3dkaxgryqq1yqp0z7pdlz9jqgai8w89vwi0il35"; depends=[]; }; +PBSmodelling = derive { name="PBSmodelling"; version="2.67.266"; sha256="0ych9k20x0m71gkdrpwv5jnx6pfsk45wwsaaamy32cmnhd3y14sq"; depends=[XML]; }; PCAmixdata = derive { name="PCAmixdata"; version="2.2"; sha256="0gbmiy2mhz8lgp0pcjby4ny8a28wlx1xrsa2lknzxn4d0m2csxjn"; depends=[]; }; PCDSpline = derive { name="PCDSpline"; version="1.0"; sha256="15kmvcwvwlsr1107n7mfajvf9b1kcslnhsdx0drjjhsvq193qrqa"; depends=[nleqslv matrixcalc]; }; PCGSE = derive { name="PCGSE"; version="0.2"; sha256="19bpnn1b8ihmf52zh9g9pc38130np1ki8l7wf0j5myw2cnw6fna8"; depends=[RMTstat MASS]; }; PCICt = derive { name="PCICt"; version="0.5-4"; sha256="1g17hxs00dlnb6p0av6l7j99qy00555f80nk1i1i1x87fszp3axa"; depends=[]; }; -PCIT = derive { name="PCIT"; version="1.04-5"; sha256="10fnkad09y7vh8j3c5kgkh64lwqn2nsl5818rzl9b8d51f951qjg"; depends=[]; }; +PCIT = derive { name="PCIT"; version="1.5-3"; sha256="0gi28i2qd09pkaja4w7abcl7sz43jnk98897vc2905fnk9nks65j"; depends=[]; }; PCPS = derive { name="PCPS"; version="1.0.2"; sha256="17gjj88zq123nxg4dh2w304sh9c1c4myad2g8x31wn1z7bmawv3y"; depends=[SYNCSA vegan ape picante phylobase plotrix]; }; PCS = derive { name="PCS"; version="1.2"; sha256="0488h6s1yz6fwiqf88z2vgckn6i0kwls8cazmpw3wspnaqvl2n4s"; depends=[statmod]; }; PCovR = derive { name="PCovR"; version="2.5"; sha256="1as3qd2gqznfy95mil8k31nkqrf36sgpja5s9zdwvk0vpaxv1fr7"; depends=[GPArotation ThreeWay MASS Matrix]; }; +PDQutils = derive { name="PDQutils"; version="0.1.0"; sha256="0s6k58l2rrgymg3l4b8s9rvnqlrhcm2pvsrr3gc2x2f846g7pxny"; depends=[orthopolynom moments]; }; PDSCE = derive { name="PDSCE"; version="1.2"; sha256="17lc6d8ly6jbvjijpzg45dvqrzrh5s1sp415nycazgpbg9ypwr2h"; depends=[]; }; PEIP = derive { name="PEIP"; version="1.7"; sha256="1bagi1kr8vd3b3r524vrk747bqmd9insny1nxj8bdvdk0a9yr949"; depends=[bvls Matrix RSEIS pracma]; }; PEMM = derive { name="PEMM"; version="1.0"; sha256="18dd9hsbdrnhrrff7gpdqrw2jv44j8lg0v3lkcdpbd4pppcaq84h"; depends=[]; }; @@ -1263,7 +1289,7 @@ PET = derive { name="PET"; version="0.4.9"; sha256="1ijg6mfh3xrc1gjh6a4nq64psk9y PF = derive { name="PF"; version="9.5"; sha256="1y99brdabj78s5kxyv0136s40kaaj3zya9lk4qd0kqk83z2gdawp"; depends=[xtable RColorBrewer gdata]; }; PGICA = derive { name="PGICA"; version="1.0"; sha256="0qxa5hw2s3mndjvk8lb82pcbyj1kbdclx4j4xa8jq0lcj180abi9"; depends=[fastICA]; }; PGM2 = derive { name="PGM2"; version="1.0"; sha256="18azh6k271p9dvc23q402pv7wrilr1yk02vqqy6qjppnvq6jxahg"; depends=[]; }; -PHENIX = derive { name="PHENIX"; version="1.0"; sha256="1shkf77bq3lvkj6srcil3fqwp78hfkbjnhkz2v8kmfqf92h4z5pb"; depends=[ppcor]; }; +PHENIX = derive { name="PHENIX"; version="1.1"; sha256="0bdb31hqhjz73dz4659i11y9qh0r0j139024285ci7z3xx22cdy5"; depends=[ppcor SuppDists]; }; PHYLOGR = derive { name="PHYLOGR"; version="1.0.8"; sha256="17lmjfbwf8j68zzzhdvppyjacdsmy4zmcfj0pcjsw5j6m361hvh6"; depends=[]; }; PHeval = derive { name="PHeval"; version="0.5.2"; sha256="1q0cyq7b8d42jgiw7ra9vjdjw1zcxpyg6wgb3zgygkmd744ifggp"; depends=[survival]; }; PIGE = derive { name="PIGE"; version="0.9"; sha256="1x8ml25mm69dvlszm9p2ycph92nxcsgd52ydj7ha0dwrrpcv2law"; depends=[snowfall ARTP xtable survival]; }; @@ -1272,7 +1298,7 @@ PIPS = derive { name="PIPS"; version="1.0.1"; sha256="1c5v3s6xys9p1q32k6mpsffhi9 PK = derive { name="PK"; version="1.3-2"; sha256="0162ri9wlm9inryljal48av8yxb326na94kckkigsrklfxb3wkp2"; depends=[]; }; PKI = derive { name="PKI"; version="0.1-1"; sha256="1m4q43yq8ddig15k0j9yg9hq4yz3yplqp68zl3p9g2shkam60p6w"; depends=[base64enc]; }; PKPDmodels = derive { name="PKPDmodels"; version="0.3.2"; sha256="1h893civ77ahbgjnc6kq3l7rszmqmx9dlxwavldigpq3r79vd86k"; depends=[]; }; -PKfit = derive { name="PKfit"; version="1.2.4"; sha256="1vyf7w3d2wylj8hrgz7hpb2syvwsmf8bbdjh4w3kgcjdjivvnvxn"; depends=[optimx deSolve minpack_lm]; }; +PKfit = derive { name="PKfit"; version="1.2.5"; sha256="0kym2dwb4f53xmf8dq94jz0zmpaiv8pl956j1bs3h9nhhzlaj83y"; depends=[deSolve optimx minpack_lm]; }; PKgraph = derive { name="PKgraph"; version="1.7"; sha256="0g36cdv5cblqx69j48irxjc5nlw2cl3p714mlsblnd3362z1brwn"; depends=[RGtk2 gWidgetsRGtk2 cairoDevice lattice rggobi ggplot2 proto RGtk2 gWidgetsRGtk2]; }; PKreport = derive { name="PKreport"; version="1.5"; sha256="16hss9migbxpnw5f9gcw1nlvb81iyji00ylx5wd6kdwhz0ids9wj"; depends=[lattice ggplot2]; }; PLIS = derive { name="PLIS"; version="1.1"; sha256="0b81s7677wglqvv1b5lx8k2iaks09kz0wrl07245a7j2pk9nxv7p"; depends=[]; }; @@ -1303,7 +1329,7 @@ PairedData = derive { name="PairedData"; version="1.0.1"; sha256="025h5wjsh9c78b Paneldata = derive { name="Paneldata"; version="1.0"; sha256="00hk340x5d4mnpl3k0hy1nypgj55as2j7y2pgzfk3fpn3zls5zib"; depends=[]; }; ParDNAcopy = derive { name="ParDNAcopy"; version="2.0"; sha256="017xwznhfibi8kp0ifww02c0qcq0vxs06rjww4kcp2bvdmld8kc4"; depends=[]; }; ParallelForest = derive { name="ParallelForest"; version="1.1.0"; sha256="1xa9lfgrvzv7bvv1aaabcfk4372p8x5gxgj463h5ggf9x177lj5j"; depends=[]; }; -ParamHelpers = derive { name="ParamHelpers"; version="1.4"; sha256="1jbzn3r8i8avwg51nxp6940c4wvqfp8ficqzw2q1xyrm5rkkqgg5"; depends=[BBmisc checkmate]; }; +ParamHelpers = derive { name="ParamHelpers"; version="1.5"; sha256="1ywsc96gc252i6girr2ph674wfrzjfk96l2w8512rqy9bgimr0lr"; depends=[BBmisc checkmate]; }; ParentOffspring = derive { name="ParentOffspring"; version="1.0"; sha256="117g8h0k65f2cjffigl8n4x37y41rr2kz33qn2awyi876nd3mh93"; depends=[]; }; ParetoPosStable = derive { name="ParetoPosStable"; version="1.0.3"; sha256="0f3f4wn33vw1y3cjcvlk44g8z6hjkv4ws535pkcz3lgb95fl4q0n"; depends=[ADGofTest lmom]; }; PatternClass = derive { name="PatternClass"; version="1.5"; sha256="1paw39xm2rqjnc7pnbya7gyl160kzl56nys9g0y1sa6cqycy3y5x"; depends=[SDMTools]; }; @@ -1314,7 +1340,7 @@ PedCNV = derive { name="PedCNV"; version="0.1"; sha256="09qxcjzwdgzdkbj28rzmfv7k PepPrep = derive { name="PepPrep"; version="1.1.0"; sha256="1s2xn05xry50l9kf1mj6yd1dpc7yp6g3d00960hswvhznb0a4l84"; depends=[stringr]; }; Peptides = derive { name="Peptides"; version="1.0.3"; sha256="06q4sdm3yy5rjkfr6yqkmgjsr1bhrbpghyjqkzqh416wc4lnp073"; depends=[]; }; PerFit = derive { name="PerFit"; version="1.2"; sha256="1m0s51k497ks4y5253sw1aq5cdkhfkr70mz31xk01c50v11mb268"; depends=[ltm irtoys]; }; -PerMallows = derive { name="PerMallows"; version="1.7"; sha256="15bn8qpwl5v7kq5jzls6fis6r11pxh2v7dhj4c9qmw2w9c3x1g7s"; depends=[Rcpp Rcpp]; }; +PerMallows = derive { name="PerMallows"; version="1.8"; sha256="1p0rnphhjc0rr1zpbff71mk75lnyph994k4p5whwn2fyfzi1pn0f"; depends=[Rcpp Rcpp]; }; PerfMeas = derive { name="PerfMeas"; version="1.2.1"; sha256="1x7ancmb41zd1js24rx94plgbssyc71z2bvpic6mg34xjkwdjw93"; depends=[]; }; PerformanceAnalytics = derive { name="PerformanceAnalytics"; version="1.4.3541"; sha256="1czchsccsbdfjw743j6rm101q2q01pggyl8zmlva213pwm86zb3v"; depends=[xts zoo]; }; PermAlgo = derive { name="PermAlgo"; version="1.0"; sha256="1dc4b5pn77av80k6pgh9k0ksvv9lnjqiwdb2jv55nm0ndycw0qr4"; depends=[]; }; @@ -1327,6 +1353,8 @@ PivotalR = derive { name="PivotalR"; version="0.1.17.45"; sha256="13rw7y2n2hnyj2 PlayerRatings = derive { name="PlayerRatings"; version="1.0-0"; sha256="0hjb05bdha00ggcpp3n4f86dxjlhzmlpwgsbbx3mhyv3qq1g32ky"; depends=[]; }; PlotRegionHighlighter = derive { name="PlotRegionHighlighter"; version="1.0"; sha256="0n1nkfr3sdaq6f5p9kgx4slrsvhpdbax3rinrkfkb1vnjj4swj77"; depends=[]; }; PoiClaClu = derive { name="PoiClaClu"; version="1.0.2"; sha256="1j593sc344h9iy7if1ppihx2qd73dv32d77d8ckac43i7b2lig24"; depends=[]; }; +PoisBinOrd = derive { name="PoisBinOrd"; version="1.0"; sha256="0jzn0knw61hrazl9xrbqis4j6kj4ipd077vkv6fadpcwxhhi2p2m"; depends=[corpcor GenOrd Matrix mvtnorm]; }; +PoisNonNor = derive { name="PoisNonNor"; version="1.0"; sha256="1i00knyv5m6p9rllkc440cg2agzs36am5b5w9n90506nq36xp8qm"; depends=[BB corpcor MASS Matrix]; }; PoisNor = derive { name="PoisNor"; version="1.0"; sha256="147ma6qg6nwxzp022jm5mpijhg3jz489qclr9g2mli5mhgm31f8j"; depends=[mvtnorm corpcor Matrix]; }; PoissonSeq = derive { name="PoissonSeq"; version="1.1.2"; sha256="1hhx0gv06cp6hm6h36mqy411qn9x15y45crpzbyf8crfs85c6gbg"; depends=[combinat]; }; PolyPatEx = derive { name="PolyPatEx"; version="0.9"; sha256="1y3jsy095kfp9ycjnj467s1y5abba7jkm83x2cajp5g2jdgp7cf6"; depends=[gtools]; }; @@ -1339,9 +1367,9 @@ PopGenome = derive { name="PopGenome"; version="2.1.0"; sha256="150n0fdi047nx4iy PortRisk = derive { name="PortRisk"; version="1.0"; sha256="0vyzvi56lmdlhxpbxcxcfqa8271jv2l45w7x1kzzwl6q0wm4bjln"; depends=[zoo]; }; PottsUtils = derive { name="PottsUtils"; version="0.3-2"; sha256="05ds0a7jq63zxr3jh66a0df0idzhis76qv6inydsjk2majadj3zv"; depends=[miscF]; }; PoweR = derive { name="PoweR"; version="1.0.4"; sha256="00y0dvrsbvz8mr8mdw7fk17s5dfgm0f641qg96039y6g3hk2rn77"; depends=[Rcpp Rcpp RcppArmadillo]; }; -Power2Stage = derive { name="Power2Stage"; version="0.2-2"; sha256="130kfifq7klx5xp6rcmhlwv17assm5n6d78drp9dmsc8pwcxs1ff"; depends=[PowerTOST]; }; -PowerTOST = derive { name="PowerTOST"; version="1.2-05"; sha256="08g4f6wjyb4z332k96i1dkqqnkazc95d3cq984f3ycxadwbqcfyw"; depends=[mvtnorm]; }; -PracTools = derive { name="PracTools"; version="0.0-2"; sha256="1bigir9fv6qrj3r8bfff6zyvxi10c0qh56kvhqsclvwyg3hfk5yz"; depends=[]; }; +Power2Stage = derive { name="Power2Stage"; version="0.3-1"; sha256="0a5llzbhl6s71bh21ka2x50pjissl9gg7f5sskailzcmi60yz2zk"; depends=[PowerTOST]; }; +PowerTOST = derive { name="PowerTOST"; version="1.2-06"; sha256="1amzc0229cwydvnbw59aah52krswdx4k20n6i23vqimmxb26kc64"; depends=[mvtnorm]; }; +PracTools = derive { name="PracTools"; version="0.1"; sha256="0d8m326p41xqr4ndizp5x6qq5h55wgc7yinb6jsxi4xhfd2kiwq5"; depends=[]; }; PredictABEL = derive { name="PredictABEL"; version="1.2-2"; sha256="08c7j2in1wlas6nmy44s08cq86h5fizqbhsnq312dllqdzmb2h9s"; depends=[Hmisc ROCR epitools PBSmodelling]; }; PredictiveRegression = derive { name="PredictiveRegression"; version="0.1-4"; sha256="15vkisj3q4hinc3d537s8inhj3wk62q67qhy050xmp9j563ainmd"; depends=[]; }; PresenceAbsence = derive { name="PresenceAbsence"; version="1.1.9"; sha256="17qn4ggkr5aqml45nkihj1j35y479ywkm1xcfkb2g8ky66jb0c0s"; depends=[]; }; @@ -1378,7 +1406,7 @@ QualInt = derive { name="QualInt"; version="1.0.0"; sha256="1ms96m3nz54848gm9kdc Quandl = derive { name="Quandl"; version="2.4.0"; sha256="0apgwc85ija33dl9qgb8nr2wj5rx0xv6wlmg427nkxnr8pnar8ih"; depends=[xts RCurl RJSONIO zoo]; }; QuantPsyc = derive { name="QuantPsyc"; version="1.5"; sha256="1i9bh88r8zxndzjqsj14qw64gnvm5a9kvhjhzk3qsrvl3qzjgh93"; depends=[boot MASS]; }; QuantifQuantile = derive { name="QuantifQuantile"; version="1.0"; sha256="0r3yz8k68z6c751r0ryxv744spch4aws50313miq498r5mvr4w1y"; depends=[rgl]; }; -QuasiSeq = derive { name="QuasiSeq"; version="1.0-5"; sha256="03zhg6l9q76s8kxib2qrpzhghwpagwyyyrgd4bda58ngiqminlk8"; depends=[Matrix mgcv]; }; +QuasiSeq = derive { name="QuasiSeq"; version="1.0-6"; sha256="0hv6fmw8kqdg82nwdiqb9naryw4x42rv9xw1zmahgqyxr9ffnrgr"; depends=[Matrix mgcv]; }; Quor = derive { name="Quor"; version="0.1"; sha256="1ncl4pj472m881fqndcm6jzn4jkwbnzpc639c9vy5mxa4z569i1g"; depends=[combinat]; }; R_cache = derive { name="R.cache"; version="0.10.0"; sha256="0y8q3w9z9cyzsg60x95kkc81ksc2d5vpdaqg5njq5bgjyw7yjqvs"; depends=[R_methodsS3 R_oo R_utils]; }; R_devices = derive { name="R.devices"; version="2.12.0"; sha256="0as90warygvcsa5cvicjykn7jz2d5cdw68ghqi9cj5lzqq982dkn"; depends=[R_methodsS3 R_oo R_utils base64enc]; }; @@ -1391,7 +1419,7 @@ R_rsp = derive { name="R.rsp"; version="0.19.0"; sha256="0qh9nd6zpiw4c86qlwys8g7 R_utils = derive { name="R.utils"; version="1.34.0"; sha256="1brpj67px14d1y5ax3j49sbf7dnnj1rcbhli5ph44y65snrmdaih"; depends=[R_oo R_methodsS3]; }; R0 = derive { name="R0"; version="1.2-5"; sha256="13f0dvxf1gz9j8ih1n8giyhb4s7nrh1r7ncc5smvh06kjgr5b341"; depends=[MASS]; }; R1magic = derive { name="R1magic"; version="0.2"; sha256="07kqpdpf2grmgkv609l79f3w6ljkldfsyrn9l1yg6birzp3p69v1"; depends=[]; }; -R2BayesX = derive { name="R2BayesX"; version="0.3-1"; sha256="1qsg4lvzxpbn2jli58kncn5kjlv7ccmmkrj1m9jakbbzx51qc1rj"; depends=[BayesXsrc colorspace mgcv]; }; +R2BayesX = derive { name="R2BayesX"; version="1.0-0"; sha256="1p60n14gaqciskzah5haskflpms1g5lh4n57653yysa7fvmfgdhw"; depends=[BayesXsrc colorspace mgcv]; }; R2Cuba = derive { name="R2Cuba"; version="1.0-11"; sha256="1kgcxqn83yskh0dv6vyz66d0z32qy55par36jj987qglpl25zmax"; depends=[]; }; R2G2 = derive { name="R2G2"; version="1.0-2"; sha256="05d5vybvsi4pyr099916nk1l8sqszs9gaj2vhsx1jxxks8981na7"; depends=[]; }; R2GUESS = derive { name="R2GUESS"; version="1.6"; sha256="1lh73zjch2jaspas065mkcsq13v6s323k4wdhvkydmvyhlgvlpcl"; depends=[fields MCMCpack mixOmics mvtnorm snowfall]; }; @@ -1404,7 +1432,7 @@ R2admb = derive { name="R2admb"; version="0.7.10"; sha256="0rjrd1wpr1f4l800mccnw R2jags = derive { name="R2jags"; version="0.05-01"; sha256="0lswadb5n2x7afz5b634cc1xkj60hykhibqq488sgcm80r1xx278"; depends=[rjags abind coda R2WinBUGS]; }; R330 = derive { name="R330"; version="1.0"; sha256="01sprsg7kph62abhymm8zfqr9bd6dhihrfxzgr4pzi5wj3h80bjm"; depends=[s20x leaps rgl lattice]; }; R4CDISC = derive { name="R4CDISC"; version="0.3"; sha256="0443mzkhsbrvsl7vawfpabsdqbqr9yjyyhsw1y07yncy55ylc2v5"; depends=[XML]; }; -R4CouchDB = derive { name="R4CouchDB"; version="0.6"; sha256="0d32p5jl1fw2190dvn46hfw2j7v849ps5a00j18jky2gl4blvghs"; depends=[bitops RCurl RJSONIO]; }; +R4CouchDB = derive { name="R4CouchDB"; version="0.7.1"; sha256="08s999m1kfjzabng41d5fpkag7nrdbricnw7m4jvj1ssqfnil2hj"; depends=[bitops RCurl RJSONIO]; }; R4dfp = derive { name="R4dfp"; version="0.2-4"; sha256="02crzjphlq4hi2crh9lh8l0acmc1rgb3wr1x8sn56cwhq4xzqzcb"; depends=[]; }; R6 = derive { name="R6"; version="2.0.1"; sha256="0ngm3hl0q3aj067q6q0iqh729z8jx3ydvasj1jw9qrr7bzjh1jn5"; depends=[]; }; RAD = derive { name="RAD"; version="0.3"; sha256="0nmgsaykxavq2bskq5x0jvsxzsf4w2gqc0z80a59376li4vs9lpj"; depends=[mvtnorm MASS]; }; @@ -1439,11 +1467,12 @@ RDS = derive { name="RDS"; version="0.7"; sha256="0xlz1pkgznk6x3298f6b40l9h26y0a RDSTK = derive { name="RDSTK"; version="1.1"; sha256="07vfhsyah8vpvgfxfnmp5py1pxf4vvfzy8jk7zp1x2gl6dz2g7hq"; depends=[plyr rjson RCurl]; }; RDataCanvas = derive { name="RDataCanvas"; version="0.1"; sha256="1aw19lmdphxwva5cs3f4fb8hllirzfkk48nqdgrarz32l11y5z5j"; depends=[jsonlite]; }; RDieHarder = derive { name="RDieHarder"; version="0.1.3"; sha256="0wls7b0qfbi6hsq9xdywi4mdhim5b6mrzhvyrm9dxp9z1k7imz6m"; depends=[]; }; +RDota = derive { name="RDota"; version="1.1"; sha256="157psqwg27y7sq75lcp0grn98f6zriljfaysfxsbqmlhlihhl6rb"; depends=[]; }; REBayes = derive { name="REBayes"; version="0.50"; sha256="0p4kv709r0577xq3mdw2vwla1gsjm8b9mnbsbfwm8fx3n3wfrx0p"; depends=[Rmosek Matrix SparseM]; }; RECA = derive { name="RECA"; version="1.1"; sha256="1wgcd53yy4xsi7i674n4255qvvv6988r43q7n7pjqrimp04g1qd0"; depends=[]; }; REDCapR = derive { name="REDCapR"; version="0.7-1"; sha256="1r5vvl52z5gpqhq949fzwmsqvwpr74phcapkckczyznlfql4qdh1"; depends=[httr plyr stringr]; }; REEMtree = derive { name="REEMtree"; version="0.90.3"; sha256="01sp36p12ky8vgsz6aik80w4abs70idr9sn4627lf94r92wwwsbc"; depends=[nlme rpart]; }; -REPPlab = derive { name="REPPlab"; version="0.9"; sha256="0f3p9kjsn0x3sf4qx05rm1llad09w6dimvhdd7q8w3ggwqsh2w20"; depends=[rJava lattice]; }; +REPPlab = derive { name="REPPlab"; version="0.9.1"; sha256="1yrw03p7rk5dbr23z343kxn7vbac8khcz4c718wq9w6sykhgv8d0"; depends=[rJava lattice]; }; REQS = derive { name="REQS"; version="0.8-12"; sha256="049glqhc8h8gf425kmj92jv70917dsigpm37diby0c6hb4jrg8ka"; depends=[gtools]; }; REdaS = derive { name="REdaS"; version="0.9.2"; sha256="0w1b2996b0sdpxklkxylnk18dx8vgssn5avh7pnrvdqa464ci4f8"; depends=[]; }; RFGLS = derive { name="RFGLS"; version="1.1"; sha256="13ggxj74h5b2hfhjyc50ndxznkvlg18j80m78hkzwh25d3948fsk"; depends=[bdsmatrix Matrix]; }; @@ -1453,7 +1482,7 @@ RFinanceYJ = derive { name="RFinanceYJ"; version="0.3.1"; sha256="0qhmzsch7c2p0z RFmarkerDetector = derive { name="RFmarkerDetector"; version="1.0"; sha256="0p8dnqwhsjh1gwxvqpicdbsjs9gczqi5j4av786l9g18f5djsv6m"; depends=[AUCRF randomForest ggplot2 UsingR WilcoxCV ROCR]; }; RForcecom = derive { name="RForcecom"; version="0.7"; sha256="0rjav2rwanzqgi1yasbm9lj18f0mfxwd8w8x41skf656gfcpi0i4"; depends=[XML RCurl plyr]; }; RFreak = derive { name="RFreak"; version="0.3-0"; sha256="1dmllxb6yjkfkn34f07j2g7w5m63b5d10lh9xsmxyfk23b8l3x0x"; depends=[rJava]; }; -RGA = derive { name="RGA"; version="0.1.4"; sha256="0l821rs1sgh4khzlgal1ibx4ymj5hxiz4mg4ki6vg5nxxrld992q"; depends=[httr httpuv RCurl jsonlite shiny]; }; +RGA = derive { name="RGA"; version="0.2"; sha256="0swldzk7q8drjs8ca7ibbkrrgi4mbwf6hvc1jdq4aswqay783vl4"; depends=[httr httpuv RCurl jsonlite shiny]; }; RGCCA = derive { name="RGCCA"; version="2.0"; sha256="0mcp51z5jkn7yxmspp5cvmmvq0cwh7hj66g7wjmxsi74dwxcinvg"; depends=[MASS]; }; RGENERATE = derive { name="RGENERATE"; version="1.3"; sha256="16gkdwbigdsdvnplqhzs11kk4dhb2rlnf7vj6kbzxw9fb1b7818q"; depends=[RMAWGEN]; }; RGENERATEPREC = derive { name="RGENERATEPREC"; version="1.0"; sha256="1f6y3i8r6a9cajbj127s0cd13ihbi8scgrsgizza1fjb7fg2g450"; depends=[copula RGENERATE blockmatrix Matrix stringr RMAWGEN]; }; @@ -1470,11 +1499,11 @@ RHive = derive { name="RHive"; version="2.0-0.2"; sha256="0a1saqqwh6zvz264jkkd6c RI2by2 = derive { name="RI2by2"; version="1.2"; sha256="0387ncq1nhpz8521nwsjybsdpncm56nrwkz68apgihmrbjlmp6m7"; depends=[gtools]; }; RIFS = derive { name="RIFS"; version="0.1-5"; sha256="0705dhirh7bhy2yf3b1mpk3m7lggg4pwy640lvaspwaxkd6zac5w"; depends=[]; }; RIGHT = derive { name="RIGHT"; version="0.1.2"; sha256="047g6gymrfzccnp56pvvk3s2r19p1czm9pjmpdn3fnx13d8lalaz"; depends=[shiny]; }; -RISmed = derive { name="RISmed"; version="2.1.2"; sha256="1hi22sf6g047m2bq9yh6bwvi1x8bjw12vslfp6iyrim0w2pk96m1"; depends=[]; }; +RISmed = derive { name="RISmed"; version="2.1.4"; sha256="1gsy55g3mw5qkam1nswy851dw8gqf4miqzczm75np8chmlczy3b2"; depends=[]; }; RImageJROI = derive { name="RImageJROI"; version="0.1"; sha256="06x8p8wpzmsc6f2330m74x4dmh21dn0gqicand2l198knahp3kf7"; depends=[spatstat]; }; RImpala = derive { name="RImpala"; version="0.1.5"; sha256="0kx2h6gkjxrsp6c33p1j7irs205rn5lpknlmc8as3v1ziigi4d51"; depends=[rJava]; }; -RInSp = derive { name="RInSp"; version="1.0"; sha256="154ibjx5xyibaw8hhdh4hw5rbmwp340bplvz1174n6svg2dpl542"; depends=[]; }; -RInside = derive { name="RInside"; version="0.2.11"; sha256="09j4dpv30pp0q3h129ig15xxlp8yzxnk122iica4nv88niabjcaa"; depends=[Rcpp Rcpp]; }; +RInSp = derive { name="RInSp"; version="1.2"; sha256="0zg46qw44wx17ydcz592gl4k9qq08dycmsshxxqkjf92r3g3l6wm"; depends=[]; }; +RInside = derive { name="RInside"; version="0.2.12"; sha256="09dx9md5i4vdgadmqfzcchs5nhkml4nwr8ckgmmqll0y3xph2f3h"; depends=[Rcpp Rcpp]; }; RItools = derive { name="RItools"; version="0.1-12"; sha256="0zdwj5y355d8jnwmjic3djwn6zy7h1iyl58j9hmnmc3m369cir0s"; depends=[lattice SparseM xtable svd abind]; }; RJDBC = derive { name="RJDBC"; version="0.2-5"; sha256="0cdqil9g4w5mfpwq85pdq4vpd662nmw4hr7qkq6510gk4l375ab2"; depends=[DBI rJava]; }; RJSDMX = derive { name="RJSDMX"; version="1.2"; sha256="0b4w2qva19av76gjwbdccf6gwfc2fia31pvbhgv1a48p272kxzni"; depends=[rJava zoo]; }; @@ -1502,12 +1531,12 @@ RNeXML = derive { name="RNeXML"; version="2.0.1"; sha256="10p9njlrpkwgnyjkcz7w57 RNetCDF = derive { name="RNetCDF"; version="1.6.3-1"; sha256="0c112qwxzml3mbdss69607amxvhpkfgs7ihymxidgkv0s3ra7cp5"; depends=[]; }; RNetLogo = derive { name="RNetLogo"; version="1.0-1"; sha256="051yx7l8qbnvb4gn67m00wnl6v0jrmavmp7n7zygjn7p1xi3w22c"; depends=[rJava igraph]; }; RNiftyReg = derive { name="RNiftyReg"; version="1.1.2"; sha256="1g74qdx71wzyl0k7liwvl33rzhz7srmn15x55md5gyljxb5rqm6c"; depends=[reportr oro_nifti]; }; -ROAuth = derive { name="ROAuth"; version="0.9.5"; sha256="1z0wn1c9hmc3x862l9qchx4kxhywayiryqyif8rbsg44idfgcmyi"; depends=[RCurl digest]; }; +ROAuth = derive { name="ROAuth"; version="0.9.6"; sha256="0vhsp8qybrl94898m2znqs7hmlnlbsh8sm0q093dwdb2lzrqww4m"; depends=[RCurl digest]; }; ROC632 = derive { name="ROC632"; version="0.6"; sha256="0vgv4rclvb79mfj1phs2hmxhwchpc5rj43hvsj6bp7wv8cahfg5g"; depends=[survival penalized survivalROC]; }; ROCR = derive { name="ROCR"; version="1.0-5"; sha256="0xxhr31l1k9gs99yw1plnp4m5c33mp4dy3sdfhf33i57gi3yww0a"; depends=[gplots]; }; ROCt = derive { name="ROCt"; version="0.8"; sha256="1k0571gq7igg56qxwf9ibk28v763ji0w9183gs6qp95lpbyp5zwr"; depends=[date survival relsurv]; }; ROCwoGS = derive { name="ROCwoGS"; version="1.0"; sha256="029nramxwhzqim315g1vkg1zsszzkic28w6ahwg9n7bk9d08adzk"; depends=[]; }; -RODBC = derive { name="RODBC"; version="1.3-10"; sha256="1cswx1r0ycklqj2calhk1anmiaadx0kyazsvbsm3h5sm7wsqfw5b"; depends=[]; }; +RODBC = derive { name="RODBC"; version="1.3-10"; sha256="0rvizr285g0hcsyjbvc2038f0mmw2cg6iwvgb3igkb5z92059iqc"; depends=[]; }; RODBCext = derive { name="RODBCext"; version="0.2.3"; sha256="0j0774gpnd72mw3x9qv7shiwrk0s5rk8hf0wjq4iy42wwbvql7l6"; depends=[RODBC]; }; RODM = derive { name="RODM"; version="1.1"; sha256="0cyi2y3lsw77gqxmawla5jlm4vnhsagh3ykdgb6izxslc4j2fszx"; depends=[RODBC]; }; ROI = derive { name="ROI"; version="0.1-0"; sha256="01za8cxjf721m2lxnw352k8g32pglmllk50l7b8yhjwc49k8rl66"; depends=[registry slam]; }; @@ -1524,15 +1553,16 @@ RPANDA = derive { name="RPANDA"; version="1.0"; sha256="1q8chhmdgn697a4qp4f7prdv RPCLR = derive { name="RPCLR"; version="1.0"; sha256="03kpyszsjb656lfwx2yszv0a9ygxs1x1dla6mpkhcnqw00684fab"; depends=[MASS survival]; }; RPMG = derive { name="RPMG"; version="2.1-5"; sha256="1ck6bz72h1kwi7gg8vd0zw1q61pqv23rish84zri2p18z7nd9kvh"; depends=[]; }; RPMM = derive { name="RPMM"; version="1.20"; sha256="09rwrcd8jz0nii1vx0n3b4daidiq0kp0vf88bvi84y4i06743il7"; depends=[cluster]; }; +RPPairwiseDesign = derive { name="RPPairwiseDesign"; version="1.0"; sha256="0k2vh698rhs5a0b5vhyvrnnwqnagdzs591zx6hn9vbmm8rm4y1dm"; depends=[]; }; RPostgreSQL = derive { name="RPostgreSQL"; version="0.4"; sha256="0gpmbpiaiqvjzyl84l2l8v2jnz3h41v8jl99sp1qvvyrjrickra2"; depends=[DBI]; }; RProtoBuf = derive { name="RProtoBuf"; version="0.4.2"; sha256="0ph6sdw0gys70sjlfimgvjk19rbj4v6p7wk05nar6wh8mabpvb63"; depends=[Rcpp RCurl Rcpp]; }; RPublica = derive { name="RPublica"; version="0.1.2"; sha256="1fawjkwfxx3z370132vsjjs3ls316gzxzlxp8b4vzrshx1p7vp3q"; depends=[jsonlite httr RCurl]; }; -RPushbullet = derive { name="RPushbullet"; version="0.1.1"; sha256="0kaz7jwhg31ycvkxyfb17669jdhsz8y7fsz8brd6kxszkyyl1cvv"; depends=[RJSONIO]; }; +RPushbullet = derive { name="RPushbullet"; version="0.2.0"; sha256="1h9yvw9kw7df0ijwhfc2bi29y61fl9zg3mp4xygx3fyr9mycjm7a"; depends=[RJSONIO]; }; RQDA = derive { name="RQDA"; version="0.2-7"; sha256="05h2f5sk0a14bhzqng5xp87li24b6n11p5lcxf9xpy7sbmh5ig6g"; depends=[RSQLite gWidgetsRGtk2 RGtk2 DBI igraph gWidgets]; }; RQuantLib = derive { name="RQuantLib"; version="0.4.0"; sha256="1p2hd7wa5yi5ian2akb70pjr4glfni4dvwgglyg5pqmmm2j45k2d"; depends=[Rcpp Rcpp]; }; RRF = derive { name="RRF"; version="1.6"; sha256="1gp224mracrz53vnxwfvd7bln18v8x7w130wslhfgcdl0n4f2d28"; depends=[]; }; RRreg = derive { name="RRreg"; version="0.2.0"; sha256="0pni738yc236p8aafzjha5589i8bll3b075k0fync2mkc1v4czln"; depends=[doParallel foreach]; }; -RSA = derive { name="RSA"; version="0.9.3"; sha256="132fqsr6zzv0q5maxgdh8amg6g0if3wdbhml0p0r668yy1wiq5l8"; depends=[lavaan ggplot2 lattice gridExtra plyr RColorBrewer]; }; +RSA = derive { name="RSA"; version="0.9.6"; sha256="1hi3spj0nbl08zszkqp1xxcq2qw3j4zkihrhhn20gacgsqi7k19w"; depends=[lavaan ggplot2 lattice tkrplot plyr RColorBrewer aplpack]; }; RSADBE = derive { name="RSADBE"; version="1.0"; sha256="1nzpm88rrzavk0n8iflsx8r3s1xcry15n80zqdw6jijjycz10w1q"; depends=[]; }; RSAGA = derive { name="RSAGA"; version="0.93-6"; sha256="0wqiww0rx5fz4rbsb1x6pr2q0wz5dacj5fc0asj70igxwmh5x0p8"; depends=[gstat shapefiles plyr]; }; RSAP = derive { name="RSAP"; version="0.9"; sha256="1sxirfabhpmfm0yiiazc9h1db70hqwva2is1dql6sjfanpl8qanl"; depends=[yaml reshape]; }; @@ -1541,7 +1571,7 @@ RSEIS = derive { name="RSEIS"; version="3.3-3"; sha256="13fb4mx3sgnbrcn1kkxy0a49 RSGHB = derive { name="RSGHB"; version="1.0.2"; sha256="0ffdx9lscbgknfqhvjdh3rwnlhiqxbpqa55jkn111a1vfv726v3d"; depends=[]; }; RSKC = derive { name="RSKC"; version="2.4.1"; sha256="1dvzxf001a9dg71l4bh8z3aia7mymqy800268qf7qzy9n6552g59"; depends=[flexclust]; }; RSNNS = derive { name="RSNNS"; version="0.4-6"; sha256="1p4gv2v9vzbgaksiibg66l9l9nabnm5lblc17md2cdcb6rygh3hp"; depends=[Rcpp Rcpp]; }; -RSNPset = derive { name="RSNPset"; version="0.3"; sha256="0dcbgwllkrhxjh4v0bz1zyi7di467vjpqmlrkx7k90pz89kmqy8k"; depends=[fastmatch foreach doRNG Rcpp Rcpp RcppEigen]; }; +RSNPset = derive { name="RSNPset"; version="0.4"; sha256="1asrl75jlkdp829phjfza10fcl9akiqspbxncd8zf2a23f2r54sy"; depends=[fastmatch foreach doRNG Rcpp Rcpp RcppEigen]; }; RSQLServer = derive { name="RSQLServer"; version="0.1.1"; sha256="0xaw8a06xgc78hjg4bndip0jpc7l4glk28pggm2l3j31ybx81kw7"; depends=[DBI rJava RJDBC]; }; RSQLite = derive { name="RSQLite"; version="1.0.0"; sha256="08b1syv8z887gxiw8i09dpqh0zisfb6ihq6qqr01zipvkahzq34f"; depends=[DBI]; }; RSVGTipsDevice = derive { name="RSVGTipsDevice"; version="1.0-4"; sha256="1ybk5q4dhskrh7h1sy86ilchdwi6rivy3vv3lph6pms2virgm854"; depends=[]; }; @@ -1571,8 +1601,8 @@ RVtests = derive { name="RVtests"; version="1.2"; sha256="0k7w6ml981zvr5bix197qw RWBP = derive { name="RWBP"; version="1.0"; sha256="104vr2cdk185hh4zn3vmqvb14p1q8ifk11wdgvk7fli1m1zxxwdd"; depends=[RANN igraph lsa SnowballC]; }; RWeather = derive { name="RWeather"; version="0.4"; sha256="1vm8w07gsxwxvg1gpdzn6mpnh8g9kp0ln9fxjw5rl2f1zz80bxpy"; depends=[XML]; }; RWebLogo = derive { name="RWebLogo"; version="1.0.3"; sha256="1n65mlnr163ywjnyyngnigbj0wpgkr38c3nx8hw5r8mwjnf3d617"; depends=[findpython]; }; -RWeka = derive { name="RWeka"; version="0.4-23"; sha256="1p1kz6if5yhmjvjzvr0ig5i0l6g7bzp6z8q4jssrp2g07g576084"; depends=[RWekajars rJava]; }; -RWekajars = derive { name="RWekajars"; version="3.7.11-1"; sha256="1w8y8xxsmm9b7hnnwknsbivkgbarnfqmv9666b7c5db9yra1hf7f"; depends=[rJava]; }; +RWeka = derive { name="RWeka"; version="0.4-24"; sha256="1nzpwh5i4snlz5hpk27395f6ly2mfzif6fw1cb6yn2sba0nj0ls7"; depends=[RWekajars rJava]; }; +RWekajars = derive { name="RWekajars"; version="3.7.12-1"; sha256="0a3a33l4rglyj95v6m3lqdz0c1fzriprdlp1p8cx2v06n50ymvrz"; depends=[rJava]; }; RWiener = derive { name="RWiener"; version="1.2-0"; sha256="1ssh4xcyr4whgyd91p6bjsm9mq1ajqjqva0yyk13dnf5jfpsr0gs"; depends=[]; }; RXKCD = derive { name="RXKCD"; version="1.7-5"; sha256="0dsds1bv2vfq61gfppar2ai23dryh09ric5i6zaccms6q64z23md"; depends=[RJSONIO png jpeg plyr]; }; RXMCDA = derive { name="RXMCDA"; version="1.5.3"; sha256="1pc52kvihxzq12p95r4srmnawxcsvd4r7252dajby338p56d1lw8"; depends=[XML kappalab]; }; @@ -1584,7 +1614,7 @@ RadioSonde = derive { name="RadioSonde"; version="1.4"; sha256="1v9jdpynmb01m3sy Rambo = derive { name="Rambo"; version="1.1"; sha256="1yc04xsfkc54y19g5iwambgnlc49ixjjvfrafsgis2zh5w6rjwv8"; depends=[sna]; }; Ramd = derive { name="Ramd"; version="0.2"; sha256="0a64rp4dwhfr6vxsmya16x7wy7rxj4n98sdhhyy0ll850rdzlxd8"; depends=[]; }; RandVar = derive { name="RandVar"; version="0.9.2"; sha256="04hw4v2d9aa8z9f8wvwbzhbfy8zjl5q8mpl9b91q86fhh1yq5cz4"; depends=[distr distrEx]; }; -RandomFields = derive { name="RandomFields"; version="3.0.55"; sha256="0gi08sy0m3jyigkfmmnm6jyh7n6l84hrjblbsz5wcab8cjfrdh7l"; depends=[sp]; }; +RandomFields = derive { name="RandomFields"; version="3.0.62"; sha256="1v2dmwl3nq3mw88439z6hjaf3gkz9sf7dqm9iipgk333qw1s6sfk"; depends=[sp]; }; RankAggreg = derive { name="RankAggreg"; version="0.5"; sha256="1c5ckk2pfkdxs3l24wgai2xg817wv218fzp7w1r3rcshxf0dcz2i"; depends=[gtools]; }; RankResponse = derive { name="RankResponse"; version="3.1.1"; sha256="04s588zbxcjgvpmbb2x46bbf5l15xm7pwiaxjgc1kn1pn6g1080c"; depends=[]; }; Rankcluster = derive { name="Rankcluster"; version="0.92.9"; sha256="172jjsyc6a5y32s2fb8z6lgcq6rcwjbk3xnc5vvkhj64amlyxla6"; depends=[Rcpp Rcpp RcppEigen]; }; @@ -1593,12 +1623,13 @@ Rarity = derive { name="Rarity"; version="1.2-1"; sha256="16ds0s396f42qqmn4xrnmf RaschSampler = derive { name="RaschSampler"; version="0.8-7"; sha256="11vkb5gvr1r2a7fpxyygkixc62ms53dpik9jdg7vrb9k43v82ggj"; depends=[]; }; RbioRXN = derive { name="RbioRXN"; version="1.5"; sha256="1w4g8a72a7f5m7g43hcybkahn3p51m6jnkydwgrchp53pby8ljxy"; depends=[plyr RCurl gdata data_table stringr]; }; Rbitcoin = derive { name="Rbitcoin"; version="0.9.2"; sha256="0ndq4kg1jq6h0jxwhpdp8sw1n5shg53lwa1x0bi7rifmy0gnh66f"; depends=[data_table RCurl digest RJSONIO]; }; +Rborist = derive { name="Rborist"; version="0.1-0"; sha256="1irb9scl68m7skqdwny9kvnzg7f1r0q1c0whzqyhhj9l4lw16hmr"; depends=[Rcpp Rcpp RcppArmadillo]; }; Rcapture = derive { name="Rcapture"; version="1.4-2"; sha256="1nsxy5vpfv7fj03i6l5pgzjm0cldwqxxycnvqkfkshbryjcyl0ps"; depends=[]; }; Rcell = derive { name="Rcell"; version="1.2-6"; sha256="0wly2wgm7506a9f26jbq2b0v9wlh2wyp086r2vi6bia9j8sxhi0c"; depends=[proto plyr reshape ggplot2 digest]; }; Rcgmin = derive { name="Rcgmin"; version="2013-2.21"; sha256="02igq7bdlxwa7ysfiyvqfhcvgm866lrp2z3060z5lmnp6afa0958"; depends=[numDeriv]; }; Rchoice = derive { name="Rchoice"; version="0.2"; sha256="06xlz8ii1w42wcvkymxv68dn8pzvnn3xbyarplmdalv4p8c4jchk"; depends=[Formula maxLik msm plm plotrix]; }; Rclusterpp = derive { name="Rclusterpp"; version="0.2.3"; sha256="02s5gmmmd0l98wd1y884pjl3h289dyd9p9s7dh7yl2zaslqs2094"; depends=[Rcpp RcppEigen Rcpp RcppEigen]; }; -Rcmdr = derive { name="Rcmdr"; version="2.1-5"; sha256="1450bhzys80q4ka4sx1mcl0g1a1pdgx8znlkglhkj6i1k7xn0ibm"; depends=[RcmdrMisc car tcltk2 abind]; }; +Rcmdr = derive { name="Rcmdr"; version="2.1-6"; sha256="0mxn0z8nllanhh8q1mnjc0y5kwxzw879k8s6mqz5azm282qk68mj"; depends=[RcmdrMisc car tcltk2 abind]; }; RcmdrMisc = derive { name="RcmdrMisc"; version="1.0-2"; sha256="18by1b1iz7q6lbnhxj5l5w58fqsvki84d830sv7iyzrs2q6n7vhq"; depends=[car sandwich abind Hmisc MASS e1071]; }; RcmdrPlugin_BCA = derive { name="RcmdrPlugin.BCA"; version="0.9-8"; sha256="0xkip7q9i57ghgz0rh0pl8nkl7bflf4w1g4zbyjdlcjypyf7lnr8"; depends=[Rcmdr BCA flexclust car RcmdrMisc nnet foreign rpart rpart_plot]; }; RcmdrPlugin_DoE = derive { name="RcmdrPlugin.DoE"; version="0.12-3"; sha256="1iifn71kjjgcp7dfz2pjq57mgbv4rrznrl3b3k9gdc2dva1z9zvc"; depends=[DoE_base FrF2 DoE_wrapper relimp Rcmdr RcmdrMisc]; }; @@ -1612,9 +1643,10 @@ RcmdrPlugin_IPSUR = derive { name="RcmdrPlugin.IPSUR"; version="0.2-1"; sha256=" RcmdrPlugin_KMggplot2 = derive { name="RcmdrPlugin.KMggplot2"; version="0.2-0"; sha256="1w4n7r3sp6h87wxhrzg500w90p8dzr43j28p8p1r2y0v0i0v6mk5"; depends=[ggplot2 ggthemes gtable plyr Rcmdr RColorBrewer scales survival tcltk2]; }; RcmdrPlugin_MA = derive { name="RcmdrPlugin.MA"; version="0.0-2"; sha256="1zivlc0r2mkxpx23ba76njmb2wnnjijysvza4f24dg4l47d0sr2p"; depends=[Rcmdr MAd metafor]; }; RcmdrPlugin_MPAStats = derive { name="RcmdrPlugin.MPAStats"; version="1.1.5"; sha256="0km6yglhn0128kk1xm2mnrkr2lkv3r9zndhlv7h1dkd16aph3vm3"; depends=[Rcmdr ordinal]; }; +RcmdrPlugin_NMBU = derive { name="RcmdrPlugin.NMBU"; version="1.8.0"; sha256="1646xy5q40r9liaqvlwmh9fscm2ggfdfb713gpxqzrv4kwgaddji"; depends=[mixlm MASS pls xtable Rcmdr]; }; RcmdrPlugin_RMTCJags = derive { name="RcmdrPlugin.RMTCJags"; version="1.0"; sha256="0fwzr27pk7p82wj1xbajva1ips15jdfgwxzf7815bcm7x7w9xr8v"; depends=[Rcmdr runjags rmeta igraph coda rjags]; }; RcmdrPlugin_ROC = derive { name="RcmdrPlugin.ROC"; version="1.0-17"; sha256="0asqvl99x03irnidjs72m6x4x3v8xlaikhfk0zk85v0l21lgy4iv"; depends=[Rcmdr pROC ROCR ResourceSelection]; }; -RcmdrPlugin_SCDA = derive { name="RcmdrPlugin.SCDA"; version="1.0"; sha256="0z43hhp798kga70xmiq4wzp5iad553rndn17g3va3dh6lz1k3y3h"; depends=[SCVA SCRT SCMA Rcmdr]; }; +RcmdrPlugin_SCDA = derive { name="RcmdrPlugin.SCDA"; version="1.1"; sha256="0pd765ndh8d7hy6spds3r4pi09i0ak4b1ygwczp6yr2zcs1aikbc"; depends=[SCVA SCRT SCMA Rcmdr]; }; RcmdrPlugin_SLC = derive { name="RcmdrPlugin.SLC"; version="0.2"; sha256="1nwpzmgfla1y05dxf81w0wmvvmvcq5jn5k8phlq30920ia7ybs8g"; depends=[SLC Rcmdr]; }; RcmdrPlugin_SM = derive { name="RcmdrPlugin.SM"; version="0.3.1"; sha256="10sjh2x02kb6yaxbvd9ihc6777j4iv6wi6k42gyl3k7i2c39fyn3"; depends=[Rcmdr car RColorBrewer colorspace vcd]; }; RcmdrPlugin_StatisticalURV = derive { name="RcmdrPlugin.StatisticalURV"; version="1.0-1"; sha256="04pqqgy12rnhwm8l0752hb9p5h4l11mm7flm6n9kkcvbkvagsbrz"; depends=[agricolae multcomp car Rcmdr]; }; @@ -1634,14 +1666,14 @@ RcmdrPlugin_sampling = derive { name="RcmdrPlugin.sampling"; version="1.1"; sha2 RcmdrPlugin_seeg = derive { name="RcmdrPlugin.seeg"; version="1.0"; sha256="105c2rl3mrcv7r3iqa9d2zs6cys7vfpyydylkg2cggfqkghxgr95"; depends=[Rcmdr seeg spatstat sgeostat]; }; RcmdrPlugin_sos = derive { name="RcmdrPlugin.sos"; version="0.3-0"; sha256="1r9jxzmf5ks62b5jbw0pkf388i1lnld6i27xhfzysjqdxcnzdsdz"; depends=[sos Rcmdr tcltk2]; }; RcmdrPlugin_steepness = derive { name="RcmdrPlugin.steepness"; version="0.3-2"; sha256="1na98sl42896y7yklaj07sn88lj6p6ik7gwy9ffaxzicqaa8plgf"; depends=[Rcmdr steepness]; }; -RcmdrPlugin_survival = derive { name="RcmdrPlugin.survival"; version="1.0-4"; sha256="03rgr9klf2d1ml8i2avf9lncjr3bfcb4v7mcwg800wwdjzkwqkql"; depends=[survival date Rcmdr]; }; -RcmdrPlugin_temis = derive { name="RcmdrPlugin.temis"; version="0.7.2"; sha256="0n5if3cip66pi0mh4xn06yq4w2nzmxgd3g56m4k1384zssrq66gn"; depends=[tm NLP slam zoo lattice Rcmdr tcltk2 ca R2HTML RColorBrewer latticeExtra stringi]; }; +RcmdrPlugin_survival = derive { name="RcmdrPlugin.survival"; version="1.0-5"; sha256="1gcc9l1x0vmzmq7v09mzybig1js5jsgsq84096yk494w3dnzrr0a"; depends=[survival date Rcmdr]; }; +RcmdrPlugin_temis = derive { name="RcmdrPlugin.temis"; version="0.7.3"; sha256="1ssnky8basr135lhnagq7dlwlj1c9qrvm14hbdm0k3g9gnqmxkgh"; depends=[tm NLP slam zoo lattice Rcmdr tcltk2 ca R2HTML RColorBrewer latticeExtra stringi]; }; Rcolombos = derive { name="Rcolombos"; version="1.5.0"; sha256="139ayyc94m6srbcccw1j8p4by5nxy7s52ahvdq2ag183hk91gjq4"; depends=[httr]; }; Rcplex = derive { name="Rcplex"; version="0.3-2"; sha256="1hx9s327af7yawzyq5isvx8n6pvr0481lrfajgh8nihj7g69nmk7"; depends=[slam]; }; -Rcpp = derive { name="Rcpp"; version="0.11.3"; sha256="0k0j99m8qqm65gdng3lxxnpbbzrcyyk6k992iq4lz5pl16qsxgha"; depends=[]; }; +Rcpp = derive { name="Rcpp"; version="0.11.4"; sha256="0ar50r6cbvbd0crc47cm34lnrmzfzzv5fmhd2qa60br55rpxbhf6"; depends=[]; }; Rcpp11 = derive { name="Rcpp11"; version="3.1.2.0"; sha256="1x6n1z7kizagr5ymvbwqb7nyn3lca4d4m0ks33zhcn9gay6g0fac"; depends=[]; }; -RcppAnnoy = derive { name="RcppAnnoy"; version="0.0.4"; sha256="1ybgr065cmi4ayk4j2iskn1a5fxwbz0hhzjkq8znf0y196mwc5xv"; depends=[Rcpp Rcpp BH]; }; -RcppArmadillo = derive { name="RcppArmadillo"; version="0.4.600.0"; sha256="0wiglpl4i4k4acj8w18x7fpmg2wcbm3062ch9hrxmjmi0pkyhzpn"; depends=[Rcpp Rcpp]; }; +RcppAnnoy = derive { name="RcppAnnoy"; version="0.0.5"; sha256="1acgwwcgb7qqvwg3j0qk7jvk3nb76zw0lqn8bswywvgawalw49ah"; depends=[Rcpp Rcpp BH]; }; +RcppArmadillo = derive { name="RcppArmadillo"; version="0.4.600.4.0"; sha256="0qd20bs0h5kvk0433hhslm4qzddchv8vnaynvnzicjjwq3adgi2g"; depends=[Rcpp Rcpp]; }; RcppBDT = derive { name="RcppBDT"; version="0.2.3"; sha256="0gnj4gz754l80df7w3d5qn7a57z9kq494n00wp6f7vr8aqgq8wi1"; depends=[Rcpp Rcpp BH]; }; RcppCNPy = derive { name="RcppCNPy"; version="0.2.4"; sha256="1cawaxghbliy7hgvqz3y69asl43bl9mxf46nwpbxc0vx3cq15fnk"; depends=[Rcpp Rcpp]; }; RcppClassic = derive { name="RcppClassic"; version="0.9.6"; sha256="1xhjama6f1iy7nagnx1y1pkqffrq8iyplllcar24vxr0zirgi1xi"; depends=[Rcpp Rcpp]; }; @@ -1650,14 +1682,15 @@ RcppDE = derive { name="RcppDE"; version="0.1.2"; sha256="0ji5csfygqvrcahgx5gxy7 RcppDL = derive { name="RcppDL"; version="0.0.5"; sha256="1gii00bna6k9byaax7gsx42dv1jjnkrp4clbmdq59ybq3vkvw8z2"; depends=[Rcpp Rcpp]; }; RcppEigen = derive { name="RcppEigen"; version="0.3.2.3.0"; sha256="16n5zkjnf1vipicx7fsr278p99agdbxgg3gjz9xq205frm9cx25a"; depends=[Matrix Rcpp Rcpp]; }; RcppExamples = derive { name="RcppExamples"; version="0.1.6"; sha256="1jnqh9nii5nncsah0lrkls8dqqcka9fnbvfg8ikl4cqjri17rpbv"; depends=[Rcpp Rcpp]; }; -RcppGSL = derive { name="RcppGSL"; version="0.2.3"; sha256="1jnxxzaqa1wabas6zjbd1rv2r7r7lr4pf0ryv6vn6n6d17jrgj21"; depends=[Rcpp Rcpp]; }; -RcppMLPACK = derive { name="RcppMLPACK"; version="1.0.10"; sha256="10g9k83s6a7s5gw03f1zrxnil9kqaswwbh0vkq6h7n7iimdc3j6l"; depends=[Rcpp Rcpp RcppArmadillo BH]; }; +RcppGSL = derive { name="RcppGSL"; version="0.2.4"; sha256="1nw1984siwxvihp68g7khr2c4a4nwyb4ll04r5302kksz4nh7mpi"; depends=[Rcpp Rcpp]; }; +RcppMLPACK = derive { name="RcppMLPACK"; version="1.0.10-2"; sha256="1hdvdk6ni2iganmldarklv635yzgzja36zcpflh5w45c5y3ysqvj"; depends=[Rcpp Rcpp RcppArmadillo BH]; }; RcppOctave = derive { name="RcppOctave"; version="0.14.5"; sha256="0dplc2x9fq2jfzfbcxdd45pmiimapqb3xhyjkzd4k6q8xmqjw95p"; depends=[Rcpp pkgmaker digest stringr Rcpp]; }; RcppParallel = derive { name="RcppParallel"; version="4.3.3"; sha256="1xsp44jfynvz6flfajgbf82aykdhz242brmwxw9w67ngx96x0dxv"; depends=[]; }; RcppProgress = derive { name="RcppProgress"; version="0.2.1"; sha256="1dah99679hs6pcaazxyc52xpx5wawk95r2bpx9fx0i33fqs1s4ng"; depends=[Rcpp Rcpp]; }; RcppRedis = derive { name="RcppRedis"; version="0.1.3"; sha256="0xpldiny2n121dp7vpj9l3bjvjhbfkdim5cassvvj2wms9q4jvh5"; depends=[Rcpp RApiSerialize Rcpp RApiSerialize]; }; RcppRoll = derive { name="RcppRoll"; version="0.1.0"; sha256="0xwm64z7pr2cjmq4kri7zzhy7wvq7aj9lq3xm2g830fn71qvj8x3"; depends=[Rcpp RcppArmadillo Rcpp RcppArmadillo]; }; RcppSMC = derive { name="RcppSMC"; version="0.1.4"; sha256="1gcqffb6rkw029cpzv7bzsxaq0a5b032zjvriw6yjzyrpi944ip7"; depends=[Rcpp Rcpp]; }; +RcppStreams = derive { name="RcppStreams"; version="0.1.0"; sha256="0pb9ri2jajfh7643wx730bkmpvjvvmip682ynm2yn6x6brjll6jf"; depends=[Rcpp Rcpp BH]; }; RcppXts = derive { name="RcppXts"; version="0.0.4"; sha256="143rhz97qh8sbr6p2fqzxz4cgigwprbqrizxpkjxyhq8347g8p4i"; depends=[Rcpp xts Rcpp xts]; }; RcppZiggurat = derive { name="RcppZiggurat"; version="0.1.2"; sha256="05ai6s2j025fvr4znpmsvhxj4x7xyw2wsb9j3c5sv7aw1byfs0bb"; depends=[Rcpp Rcpp RcppGSL]; }; Rcsdp = derive { name="Rcsdp"; version="0.1.53"; sha256="0x91hyx6z9f4zd7djxlq7dnznmr9skyzwbbcbjyid9hxbcfyvhcp"; depends=[]; }; @@ -1674,7 +1707,7 @@ Records = derive { name="Records"; version="1.0"; sha256="08y1g2m6bdrvv4rpkhd5v2 RefFreeEWAS = derive { name="RefFreeEWAS"; version="1.3"; sha256="1cb1q2nki0d18ia4cmi1sp7qih9hv7g1jk1kyp7vya5gp572z3cd"; depends=[isva]; }; RefManageR = derive { name="RefManageR"; version="0.8.45"; sha256="16smvd25gdssiry2i8gs24km83hnsq2v6m225i7qadcmn9pyj4yh"; depends=[XML RCurl RJSONIO plyr bibtex lubridate stringr]; }; RegClust = derive { name="RegClust"; version="1.0"; sha256="1d9w74phw4fgafglc18j7dpmln96fvxnf1kdc9zddgj90p8yfx63"; depends=[]; }; -RegressionFactory = derive { name="RegressionFactory"; version="0.7"; sha256="0wskh0j9sbzqj2yvkzqmcfzw4aymx3q4ydncxjpf4pb054ifdkv9"; depends=[]; }; +RegressionFactory = derive { name="RegressionFactory"; version="0.7.1"; sha256="1zx885x49ncp2cl1v8hxzc3r2njka9cjsadjykbvqp9pdbm4ga5l"; depends=[]; }; RelValAnalysis = derive { name="RelValAnalysis"; version="1.0"; sha256="1jl1gfj44gfkmc1yp6g5wwn4miydwpvxwrg76rnkv9454zrc5pvp"; depends=[zoo]; }; Reliability = derive { name="Reliability"; version="0.0-2"; sha256="12zsicgbjqih3grbs62pw37x8wlkmnyc7g0yz6bqnfb4ym2yb7fg"; depends=[]; }; ReliabilityTheory = derive { name="ReliabilityTheory"; version="0.1.4"; sha256="1faab4z3rp0xqc0s0rrkw4kxgyc332xz3sjaz1wd4p6kiydds2hi"; depends=[igraph sfsmisc combinat FRACTION mcmc PhaseType actuar HI]; }; @@ -1690,7 +1723,7 @@ ResourceSelection = derive { name="ResourceSelection"; version="0.2-4"; sha256=" Rfacebook = derive { name="Rfacebook"; version="0.5"; sha256="0cl4s815i4yxp805j8nhqmva31imbd1xp3yxgi53qwjhagh4i57a"; depends=[httr rjson httpuv]; }; Rfit = derive { name="Rfit"; version="0.21"; sha256="129z5ivwfxbh3rfwk98jnm6ibq5z9z3r9mhy9gv61jfr4ig78dcn"; depends=[quantreg]; }; Rglpk = derive { name="Rglpk"; version="0.6-0"; sha256="0g0s63skabr0yqk5s9p66p77z8v3pr3hbnirbgdddlvkpphi08xx"; depends=[slam]; }; -RgoogleMaps = derive { name="RgoogleMaps"; version="1.2.0.6"; sha256="1kd77617j2dz3dqjskv71vj8xv0yjgcysrpw7a615s0ys2hs91wp"; depends=[png RJSONIO]; }; +RgoogleMaps = derive { name="RgoogleMaps"; version="1.2.0.7"; sha256="04k7h8hgxvgsccdiysbblplwjvn8m7g8h3anzdlxmmjaamd8l9lw"; depends=[png RJSONIO]; }; Rhh = derive { name="Rhh"; version="1.0.2"; sha256="0blxim8yrb0qnbkc1z2q24q6ryakggq2zhaa223swla99ahmsny3"; depends=[]; }; Rhpc = derive { name="Rhpc"; version="0.14-261"; sha256="09rb68dys283gqmgn00v5skz6y5mcychg7hjrmi59pcfl5i7sk71"; depends=[]; }; RhpcBLASctl = derive { name="RhpcBLASctl"; version="0.14-256"; sha256="1s9mwwh269wwdqnb98jxsmpjm2bdf5dj4c3wkj5i81w2p1sm8qx3"; depends=[]; }; @@ -1700,7 +1733,8 @@ Ritc = derive { name="Ritc"; version="1.0.1"; sha256="1h41s4jihzj0yj8xyan0zhhyyi Rivivc = derive { name="Rivivc"; version="0.9"; sha256="0gl3040pp9nqm4g2ympnx80z64zfnn1hfsxka8ynd2cqhjn3b5i1"; depends=[signal]; }; Rjpstatdb = derive { name="Rjpstatdb"; version="0.1"; sha256="0iwgsp3mblp7bsx88wfpqn09y1xrkingfkm3z9jsi2bwrnrjc2iv"; depends=[RCurl XML]; }; Rlab = derive { name="Rlab"; version="2.15.1"; sha256="1pb0pj84i1s4ckdmcglqxa8brhjha4y4rfm9x0na15n7d9lzi9ag"; depends=[]; }; -Rlabkey = derive { name="Rlabkey"; version="2.1.126"; sha256="1bsxy77875mqs1b5kn9djwfhwhn860cmgpgpcfy9xj3mgqghp0s7"; depends=[RCurl rjson]; }; +Rlabkey = derive { name="Rlabkey"; version="2.1.127"; sha256="1bacl4ax9bgn27180hgh6gr4y0bwl3q4y18mc0cyb06yagzci5d9"; depends=[RCurl rjson]; }; +Rlibeemd = derive { name="Rlibeemd"; version="1.3.2"; sha256="0db6x2cry011ymmfy1pxgdyjdn6l93d8wmixp59r51yij2s775xq"; depends=[Rcpp Rcpp]; }; Rmalschains = derive { name="Rmalschains"; version="0.2-2"; sha256="1ki3igj78sk4kk1cvbzrgzjdvw6kbdb7dmqglh6ws2nmr5b6a7fx"; depends=[Rcpp Rcpp]; }; Rmisc = derive { name="Rmisc"; version="1.5"; sha256="1ijjhfy3v91fspid77rrkc5dkcb2lav37wc3f4k5lwrn24wzy5y8"; depends=[lattice plyr]; }; Rmixmod = derive { name="Rmixmod"; version="2.0.2"; sha256="1qv6zymkgsbplrq4aa87lvcsv75dssj8qqq2h9665v31jsgx84lr"; depends=[Rcpp Rcpp]; }; @@ -1730,6 +1764,7 @@ Rpoppler = derive { name="Rpoppler"; version="0.0-1"; sha256="01zsbm538yhwm1cyz5 Rquake = derive { name="Rquake"; version="2.2"; sha256="0gkarqqhmiakc968ffwywkwy7npm1ly5gd6bbhr8fjfwdnhjam5n"; depends=[RPMG RSEIS GEOmap MBA minpack_lm rgl]; }; Rramas = derive { name="Rramas"; version="0.1-4"; sha256="191rm2ylvf3ffc9i4wpjvfbsinmw7s1m0wcq24j4qs4fxg8qqzyq"; depends=[diagram]; }; Rrdrand = derive { name="Rrdrand"; version="0.1-10"; sha256="1j72v44scmghm29jxjdy0651qlkhsnrb3bb5qff82451mbd17bzb"; depends=[]; }; +Rsampletrees = derive { name="Rsampletrees"; version="0.1"; sha256="02wh99nxlhyrivr655825nqcl3w0mvppnmvc9yrkdbkjw0l1zsjd"; depends=[haplo_stats ape]; }; Rserve = derive { name="Rserve"; version="1.7-3"; sha256="09rha4p86vak7ss721mwp5bm5ig09xam8zlqv63n9wf36v3kdmpn"; depends=[]; }; RsimMosaic = derive { name="RsimMosaic"; version="1.0.2"; sha256="0d5z5dffi2prz0r31x08c8gw83448bhkma5mzcmrdlg6kx5y7dp8"; depends=[jpeg fields RANN]; }; Rsolnp = derive { name="Rsolnp"; version="1.15"; sha256="10w9gd1l62r638sh00fbgcpinsyyanfrqjdskrpk7z70fnyvwqm2"; depends=[truncnorm]; }; @@ -1750,6 +1785,7 @@ Rwinsteps = derive { name="Rwinsteps"; version="1.0-1"; sha256="0kzngkan9vydibnr RxCEcolInf = derive { name="RxCEcolInf"; version="0.1-3"; sha256="04d6ffl4qs2vjbk0ibvyq17i2l26qnvxr72s6p3f8q4px33rh4kh"; depends=[MASS MCMCpack mvtnorm lattice]; }; Ryacas = derive { name="Ryacas"; version="0.2-12.1"; sha256="18dpnr6kj0a8f2jcbj9f6ahd0mg7bm1qm8dcs1wh8kmjl3klr1y8"; depends=[XML]; }; Rz = derive { name="Rz"; version="0.9-1"; sha256="1cpsmfxijrfx06ydpjzbaak7gkad4jjk1ph9453l9zly1cwzgspj"; depends=[foreign memisc psych ggplot2 RGtk2 formatR]; }; +SAENET = derive { name="SAENET"; version="1.0"; sha256="0mnzv1a3xmbf4w9mgsi2kf20kyhcsadaih63wb0zvraqv5ijdd31"; depends=[autoencoder neuralnet]; }; SAFD = derive { name="SAFD"; version="0.4"; sha256="1zbja8bgva2j24ks4m14hbf4s0n674lj89nfxkkmwrljzsmjrjhv"; depends=[]; }; SAM = derive { name="SAM"; version="1.0.5"; sha256="1fki43bp6kan6ls2rd6vrp1mcwvz92wzcr7x6sjirbmr03smcypr"; depends=[]; }; SAMURAI = derive { name="SAMURAI"; version="1.2.1"; sha256="02fipbjcsbp2b2957x6183z20icv1yly2pd1747nyww9bmpa7ycm"; depends=[metafor]; }; @@ -1764,12 +1800,12 @@ SBSA = derive { name="SBSA"; version="0.2.3"; sha256="1v23lzzziyjlvgn5p2n1qcq2zv SCBmeanfd = derive { name="SCBmeanfd"; version="1.1"; sha256="0pcyrnzlnlyn4v3lyv7pv01v2lh4vig1x4x8g98lpccpi1bimd4z"; depends=[boot KernSmooth]; }; SCEPtER = derive { name="SCEPtER"; version="0.2-1"; sha256="19sphwcsj2z05dvpmz7vgxykzyghkfn79jwqvk6d66daman679mv"; depends=[MASS]; }; SCEPtERbinary = derive { name="SCEPtERbinary"; version="0.1-1"; sha256="0rab0widfndx94dn1nchhs06q0d57vq2n3xy79p130l9rgp9v489"; depends=[MASS SCEPtER]; }; -SCGLR = derive { name="SCGLR"; version="2.0.1"; sha256="1xanlanxq3qwj7zad6zk1fy4cpbg2ns4dxvnfld209ra3y4jmbkx"; depends=[Matrix Formula expm ggplot2 ROCR]; }; +SCGLR = derive { name="SCGLR"; version="2.0.2"; sha256="1g8vgmlsc88g00rf3pxqszli4r9v3r4md6vq5lxa7j9wn28c7rp1"; depends=[Matrix Formula expm ggplot2 pROC]; }; SCI = derive { name="SCI"; version="1.0-1"; sha256="1m5a15a4n0zjqykq38pyw9133g2ih4ykbgak8c8khq8p0isnl8qb"; depends=[fitdistrplus lmomco]; }; -SCMA = derive { name="SCMA"; version="1.1"; sha256="0bims9l047xvbwp2r5ly5cgpd7fc0p2cik48gg42abwdqvppf542"; depends=[]; }; +SCMA = derive { name="SCMA"; version="1.1.1"; sha256="1jbx4fkixm31zdlfx65xxdzpf77dzpqazy1l6qyjz7q672s2vidd"; depends=[]; }; SCORER2 = derive { name="SCORER2"; version="0.99.0"; sha256="1a28wga69ip9s98ch2dqgl0qkwa3w6frmaqcvhclc360ik813mxq"; depends=[]; }; -SCRT = derive { name="SCRT"; version="1.1"; sha256="0c5pyxsqivhmdd0cbpnvc90pbyw24p3a5zalz85af5b6mkqmjn8y"; depends=[]; }; -SCVA = derive { name="SCVA"; version="1.1"; sha256="0fv0xvla7gmvvp9cg9jpb1p2k3bmib7yzrf3k17xav8zp0smq4y2"; depends=[]; }; +SCRT = derive { name="SCRT"; version="1.1.1"; sha256="02sndf5r1y27pgkw4wd9bhz7jhzk3cv78hp3xl222phjznjf2lzi"; depends=[]; }; +SCVA = derive { name="SCVA"; version="1.1.1"; sha256="1n660pml288ia4x18kjbrcx0n1cnasdxhl6pymh1nzxm4ai2hinc"; depends=[]; }; SCperf = derive { name="SCperf"; version="1.0"; sha256="1v9l7d9lil2gy5bw6i7bzc24808m063xaw2spl005j0a9rh4ag41"; depends=[]; }; SDD = derive { name="SDD"; version="1.1"; sha256="1bl9xlns6np26pgiiza25c54k4989knksdkkk653g8s8gmr4y34x"; depends=[Hmisc sm tseries rpanel rgl]; }; SDMTools = derive { name="SDMTools"; version="1.1-221"; sha256="1kacrpamshv7wz83yn45sfbw4m9c44xrrngzcklnwx8gcxx2knm6"; depends=[R_utils]; }; @@ -1782,6 +1818,7 @@ SEERaBomb = derive { name="SEERaBomb"; version="2014.4.1"; sha256="1vlk6hcn05vdj SEL = derive { name="SEL"; version="1.0-2"; sha256="1nrk0fx6ff330abq8askvp0790xnfv00m3sraqcr32hciw6ks421"; depends=[quadprog lattice]; }; SEMID = derive { name="SEMID"; version="0.1"; sha256="1bxdjdyqlvxz339jdgw90qi6kvfhjdmga38vhfl3ldlxfv2s9gfk"; depends=[igraph]; }; SEMModComp = derive { name="SEMModComp"; version="1.0"; sha256="1za67470f13z8jsy3z588c7iiiz993d3vjqrb8v9fann2r6sf1md"; depends=[mvtnorm]; }; +SETPath = derive { name="SETPath"; version="1.0"; sha256="1dpgmki0dhph13h1fd3mbf308746wccgfz5g5gdm7bwbjnmjzd98"; depends=[]; }; SEchart = derive { name="SEchart"; version="0.1"; sha256="19gqcd6xzwg37nzc67p88ip4i0v2f59ds85xfw9qq8lybvdm76k2"; depends=[JM]; }; SGCS = derive { name="SGCS"; version="2.0"; sha256="1d7abq07f0702k33j334va7kc4swz7rdqqb4sw1wq6a671r7k5v6"; depends=[spatstat]; }; SGL = derive { name="SGL"; version="1.1"; sha256="1wc430jqn3li102zpfmyyavfbab7x7ww9p89clxsndyigrrbjdr7"; depends=[]; }; @@ -1789,20 +1826,20 @@ SGP = derive { name="SGP"; version="1.2-0.0"; sha256="0v4ljhvfrvl6izprcrw8w36474 SGPdata = derive { name="SGPdata"; version="8.0-0.0"; sha256="0g25s2wcj47394fm16maygafnynizma3mgb3r65b5p9c27swk4v8"; depends=[]; }; SHIP = derive { name="SHIP"; version="1.0.2"; sha256="0b83cclibdz1r7sz968nmca4najwgps9wrdlsh4gxrl7fq40k4ln"; depends=[]; }; SII = derive { name="SII"; version="1.0.3"; sha256="1k9mvz6g25qs351c0vx7n5h77kb6k833jrcww14ni59yc9jgvsyg"; depends=[]; }; -SIMMS = derive { name="SIMMS"; version="0.0.1"; sha256="0s53kc95jbav28kj35isc7j09qpjsk49za8p766z9yfaiw0higp7"; depends=[survival MASS]; }; +SIMMS = derive { name="SIMMS"; version="1.0.0"; sha256="1vwd06kaicmy4l1pygd58klbbbi4kp0hics0gyz7gfdc4vwpxf96"; depends=[survival MASS glmnet]; }; SIN = derive { name="SIN"; version="0.6"; sha256="0vq80m3vl8spdnlkwvwy0gk3ziyybqzjp3scnfdcpn942ds7sgg9"; depends=[]; }; SINGLE = derive { name="SINGLE"; version="1.3"; sha256="0wd7jzys51rnwr5rhf2llpygqxydjrv0dill19v8sz9w0madkil4"; depends=[flsa igraph dse Matrix]; }; SIS = derive { name="SIS"; version="0.7-4"; sha256="0a8apfjzfwd5a2cvkviwvqlp26hqr34lba65cq5hxf9n05x2s7rx"; depends=[glmnet ncvreg survival]; }; SKAT = derive { name="SKAT"; version="1.0.1"; sha256="03kc9df36kg9q1qr5l5zvfq3i5h5gz5f2m0mh054m6x76s796k1z"; depends=[]; }; SLC = derive { name="SLC"; version="0.3"; sha256="0l0y1sjj0glsb7vwla99ijclcgaq2y85bgz1wqm348n4shsmm2rs"; depends=[]; }; -SLHD = derive { name="SLHD"; version="1.2-1"; sha256="0n5j20hp7kgi23gjprcwcaji8wdz5wwqqyc7i8dv0058fz2b5gzc"; depends=[]; }; +SLHD = derive { name="SLHD"; version="2.1-1"; sha256="0y3ilxd0phmks8zkmpgw7p5zrkwq4k95h976cwk58pavvhfwj9kb"; depends=[]; }; SMC = derive { name="SMC"; version="1.1"; sha256="1r4ajgi785lmpnlxrba0n6phmk1f0mb6b5yqk6hx8gng2w8ggclz"; depends=[]; }; SMCP = derive { name="SMCP"; version="1.1.3"; sha256="0ksx2ibz849vhrz2px9p7z8hlgvspz7kxhadvhk5mhkfbhrnpdf0"; depends=[]; }; SMCRM = derive { name="SMCRM"; version="0.0-3"; sha256="1x06w00sdijhg5h1s61q4ym5wgk97pw9md6api7if2cxjv7h5zcy"; depends=[]; }; SMFI5 = derive { name="SMFI5"; version="1.0"; sha256="10qp33l0dig00y9gfhpzqig6dbkjw76ch9pfq64dn4xrdkpq1kx5"; depends=[ggplot2 reshape corpcor]; }; SMIR = derive { name="SMIR"; version="0.02"; sha256="02q8m5m8lcfrpi78p3kajkps8wiir3jwyqc54j9vfx8aj6mk1v71"; depends=[]; }; SML = derive { name="SML"; version="0.1"; sha256="0pdj7321wy50v5l23hknlm30kp8cfgn072pbbifyp8qzmk0hyd8h"; depends=[glmnet Matrix lattice]; }; -SMNCensReg = derive { name="SMNCensReg"; version="2.4"; sha256="1q5yjc1njlm3hd33fdjv9d46jawr5l7r1zzj4m22spd2q5cpv04i"; depends=[Matrix PerformanceAnalytics]; }; +SMNCensReg = derive { name="SMNCensReg"; version="3.0"; sha256="06542jacy74mw6ic0i1ml09pn45sll96bya7dqja6bg9yp0m6bvr"; depends=[Matrix PerformanceAnalytics]; }; SMPracticals = derive { name="SMPracticals"; version="1.4-2"; sha256="0apmkmsv2fqmxpgq08n9k9dvcknj74s4cpp0myjcd6kibb7g9slq"; depends=[ellipse MASS nlme survival]; }; SMR = derive { name="SMR"; version="2.0.1"; sha256="0qy56fmismcjklpf29ic2gi1g8ajdjpxsl0akb9cqzyisyf641ia"; depends=[]; }; SMVar = derive { name="SMVar"; version="1.3.3"; sha256="17wr4lixy3p32gr4jq02d7zsr88yrbddjsvynzdsdrwbxf4mwqhp"; depends=[]; }; @@ -1845,33 +1882,36 @@ STEPCAM = derive { name="STEPCAM"; version="1.0"; sha256="0lgikdj0mghz5hjm3rlrnn STPGA = derive { name="STPGA"; version="1.0"; sha256="1kqxzjrxf194n006dr3h5kprb4l7qy8bgm2n6251p0sswpvr70j1"; depends=[]; }; SUE = derive { name="SUE"; version="1.0"; sha256="0akv724s84v2zixvwywj1ydfnfvcjnaabv6gm0601nsrh6ij1mi6"; depends=[]; }; SVMMaj = derive { name="SVMMaj"; version="0.2-2"; sha256="01njc7drq01r3364081dv9gn37vrql52zbrb60gd559f3jshqx3m"; depends=[kernlab MASS]; }; +SVMMatch = derive { name="SVMMatch"; version="1.1"; sha256="1ykwrhlid4hs466xh3kv6y2qdhgk0jiglg0l3zwk5qlni6p26zc9"; depends=[Rcpp Rcpp RcppArmadillo]; }; SWATmodel = derive { name="SWATmodel"; version="0.5.9"; sha256="1i48g9nbjfn30ppwyzyz3k181nscv4wx773l8mzfdwhx0nlv4kyj"; depends=[EcoHydRology]; }; SYNCSA = derive { name="SYNCSA"; version="1.3.2"; sha256="1m057lhfaf0n35rs3sipia04qgkp04hv7wf7rvnr7bhzic9f4vg3"; depends=[vegan mice FD]; }; +Sabermetrics = derive { name="Sabermetrics"; version="1.0"; sha256="1x35h1ffy6jnsak13vb1kcsbmh3hpass19gqic8grk0c3g1dvv6y"; depends=[]; }; Sample_Size = derive { name="Sample.Size"; version="1.0"; sha256="1vfnb2gg3rax4sxd81xqznfvh300nv45nn7zjsyrdjyg1n3ym7nw"; depends=[]; }; SampleSizeMeans = derive { name="SampleSizeMeans"; version="1.1"; sha256="1wbc46n8b8wbcxl21blbzs5728dr8r0l8d3jpzbha8pcav0xrh1m"; depends=[]; }; SampleSizeProportions = derive { name="SampleSizeProportions"; version="1.0"; sha256="0mvkvx3nni0l8ys68sq3h2zlbjvksdcdzxqlf03k0ca5bbcmdf9l"; depends=[]; }; SamplerCompare = derive { name="SamplerCompare"; version="1.2.5"; sha256="1p05fb6g0rwkzz0qp8hx88skxvfq265ndv9g694gc2h8vzwpan1y"; depends=[mvtnorm]; }; SamplingStrata = derive { name="SamplingStrata"; version="1.0-3"; sha256="16nrcv5hbbvn4rgckzagi84i7h49bd878mnpknlzmzr5ykzywsay"; depends=[]; }; SciViews = derive { name="SciViews"; version="0.9-5"; sha256="199waafpn0ndg7szwfhw2jlgcx1f0pv7j0vix2vzz60knwm698xb"; depends=[MASS ellipse]; }; -SciencesPo = derive { name="SciencesPo"; version="0.11.21"; sha256="1mia4gpk6bmdag3iv3227p5f9m6x74s60xsrk4xc9vgnfp5hrbw1"; depends=[ggplot2 foreign data_table dplyr gridExtra xtable]; }; +SciencesPo = derive { name="SciencesPo"; version="1.02.12"; sha256="0v947xjfwyidl2fa6i7drvv9vnskz06kq4rmz46qzns7g0lwfjnq"; depends=[ggplot2 foreign MASS data_table lubridate xtable]; }; ScoreGGUM = derive { name="ScoreGGUM"; version="1.0"; sha256="0f7sjfr3a8b8y1n9lrwyiyyljls3rbz84d9s93psi2fnmjj0kvgw"; depends=[]; }; ScottKnott = derive { name="ScottKnott"; version="1.2-5"; sha256="1ywwhdghcy30mp2nhsk2yhgb37nrdmb9yan5vvzsg66bchc3xgll"; depends=[]; }; ScrabbleScore = derive { name="ScrabbleScore"; version="1.0"; sha256="19vgaxnhvqsbllqxfbnhnar2j4g0fkxi7rfsmkks2bd2py81x04m"; depends=[]; }; ScreenClean = derive { name="ScreenClean"; version="1.0.1"; sha256="0haanr05g4vwp5apncyzv8i3r61g4xf9ihm8ilcabcgpri56gpjk"; depends=[MASS Matrix quadprog]; }; SearchTrees = derive { name="SearchTrees"; version="0.5.2"; sha256="11p81x1klkmxarypxpbisf78dlrmhzzg9y9hxpwz75pks1y56gqg"; depends=[]; }; +SegCorr = derive { name="SegCorr"; version="1.0"; sha256="1fyrnhbifvc2y2n6r0zg5yq0qcjzws62ynwqgc0mbvzax3n82dhm"; depends=[cghseg]; }; Segmentor3IsBack = derive { name="Segmentor3IsBack"; version="1.8"; sha256="00m6fvx6s8mz477c8b4dmgdh52jf6jx1lcqzf84l90b1xw93qnv7"; depends=[]; }; Sejong = derive { name="Sejong"; version="0.01"; sha256="1d9gw42dbs74w7xi8r9bs6dhl23y16yxqzyhqqayvcm98q3l77nf"; depends=[]; }; SeleMix = derive { name="SeleMix"; version="0.9.1"; sha256="04gxgja35qs4k66iil014dzgl5bkx0qhr9w4v7qpmwv2bb07jwz3"; depends=[mvtnorm Ecdat xtable]; }; SelvarMix = derive { name="SelvarMix"; version="1.0"; sha256="0yysmf854xz5l0lf2x0hw0qxbrdhgfrcx5ggw8n4pjfv553p38ni"; depends=[Rcpp glasso Rmixmod Rcpp RcppArmadillo]; }; -SemiCompRisks = derive { name="SemiCompRisks"; version="1.0"; sha256="1q10bqws152vk7fpd9m8w16m0ns2i10q07wnmmbjladvfq4ja9il"; depends=[]; }; +SemiCompRisks = derive { name="SemiCompRisks"; version="2.0"; sha256="0in3pv66nhb0ar4xfxskvf24c7bqkr9ik069a4nynwnc3idpsq32"; depends=[]; }; SemiMarkov = derive { name="SemiMarkov"; version="1.4"; sha256="0z43ynkd6wrxrfdbq01jiwyvw2shc3r3pmircnzkbwm2sffd3515"; depends=[numDeriv MASS Rsolnp]; }; SemiPar = derive { name="SemiPar"; version="1.0-4.1"; sha256="05gnk4s0d6276rmnyyv6gy1wpkji3sw563n8l7hmi9qqa19ij22w"; depends=[MASS cluster nlme]; }; -SemiParBIVProbit = derive { name="SemiParBIVProbit"; version="3.2-13.2"; sha256="0f28xsrjrr6dkciw1q01p2z9nqcyfpfclxx2kaxyi4wvscli04hb"; depends=[mgcv mvtnorm magic CDVine VineCopula VGAM survey trust Matrix sn]; }; -SemiParSampleSel = derive { name="SemiParSampleSel"; version="1.1-1"; sha256="0a3kynh96gp0ngw25v05fmcapx3iiclcjbypq2nn8sybbv9991c4"; depends=[copula mgcv mvtnorm magic trust Matrix]; }; +SemiParBIVProbit = derive { name="SemiParBIVProbit"; version="3.3"; sha256="12zjpyl79kx750xgra06zbw5vnaq8mis39cm8672w3d9giy2fxr5"; depends=[mgcv mvtnorm magic VineCopula VGAM survey trust Matrix sn]; }; +SemiParSampleSel = derive { name="SemiParSampleSel"; version="1.2"; sha256="1k9xmby8hy4k0qn7pjj0rypxj4iqb206ixv92bz7ga0q8zd0nxbr"; depends=[copula mgcv mvtnorm gamlss_dist magic trust VGAM Matrix]; }; SenSrivastava = derive { name="SenSrivastava"; version="2012-04-0"; sha256="0ki0kl18cj8lkad6q48piyvslkirs8y5rnfa8bvgjxsisxg2ahhp"; depends=[]; }; SensitivityCaseControl = derive { name="SensitivityCaseControl"; version="2.1"; sha256="00jqzqx7g0av9lw13is723gph486gb8ga0wgcmmzpmb24s5nya9z"; depends=[]; }; SensoMineR = derive { name="SensoMineR"; version="1.20"; sha256="1qw97cixndg2h29bbpssl0rqag3w8im4nm9964lr7r012y5wdqhx"; depends=[FactoMineR cluster KernSmooth]; }; -SeqFeatR = derive { name="SeqFeatR"; version="0.1.5"; sha256="1cpb64h3pcp18zrly0hxy2wfn68x4pgyj0ywl4z2kadi6y3r0gyh"; depends=[tcltk2 plotrix ape plyr phangorn]; }; +SeqFeatR = derive { name="SeqFeatR"; version="0.1.7"; sha256="195pkpk9sh99v01mk827axsynwaccygx19i1x0h0ma7bsqlmw1qc"; depends=[tcltk2 plotrix ape plyr phangorn calibrate ggplot2]; }; SeqGrapheR = derive { name="SeqGrapheR"; version="0.4.8.3"; sha256="03plwa3sc1pg34p1szbz3d0z8y53w7iqm7qn9q6fj72rsnk5spxc"; depends=[igraph rggobi gWidgets gWidgetsRGtk2 cairoDevice]; }; Sequential = derive { name="Sequential"; version="1.1"; sha256="1fr4n6qbxwj6hs01h07wdj5v4c7af5q8ccnm33yzcrx845qf8fiv"; depends=[]; }; SetMethods = derive { name="SetMethods"; version="1.0"; sha256="0zizvrzyk01w4ncazvifmjm4h5zrpsf6n68n11sc8f5kzny9ia48"; depends=[lattice betareg lattice betareg]; }; @@ -1884,7 +1924,8 @@ SimComp = derive { name="SimComp"; version="2.2"; sha256="07gmlbwvv07kq3z7gq2jxl SimCorMultRes = derive { name="SimCorMultRes"; version="1.3.0"; sha256="0r3d91x9srzsa0g6p3jlzplpsrprbg11kv6fsbbh47pz02fvi8mc"; depends=[evd]; }; SimRAD = derive { name="SimRAD"; version="0.95"; sha256="1l4y39d05h5f2q609i73p07h093r9yca11dqw5iq1d7skwxcvf01"; depends=[]; }; SimSeq = derive { name="SimSeq"; version="1.2.0"; sha256="0jbi19bdsvyrmr2762p8skw419qx438vgnjb93xdy90lrgyx11wh"; depends=[fdrtool]; }; -Simile = derive { name="Simile"; version="1.3"; sha256="0jf0ispjv8izrxggp6y3a3scd8qlbqfgppqz8m1q9n3gy8jhbsli"; depends=[]; }; +SimilarityMeasures = derive { name="SimilarityMeasures"; version="1.4"; sha256="1w4klcln4hy9vcik9csg7b3b8kk4raxgckwfrhqg089d80xbqsxj"; depends=[]; }; +Simile = derive { name="Simile"; version="1.3.2"; sha256="0k3jj5vbv7dlsn7lxf5jh2ckxxw9rh4ycrnx3c3w2c6l6fwjlnkb"; depends=[]; }; SimpleTable = derive { name="SimpleTable"; version="0.1-2"; sha256="1rkybrp7zlb7cj37799npss1ldic0yf519q5l7a6ikal4yl1afyb"; depends=[hdrcde locfit MCMCpack]; }; SimplicialCubature = derive { name="SimplicialCubature"; version="1.0"; sha256="0da2krxsd3p7v2jm4fp2ksh0ak1y0cjxj7inwkdiwmmmgjyq033f"; depends=[]; }; Simpsons = derive { name="Simpsons"; version="0.1.0"; sha256="1pm6wga1yxc35zgz72plzq23d3l4bbzfdvhszdxmkn1pkk64h8ms"; depends=[mclust]; }; @@ -1894,21 +1935,23 @@ SixSigma = derive { name="SixSigma"; version="0.8-1"; sha256="15jdr10a7a6wv50vz9 SkewHyperbolic = derive { name="SkewHyperbolic"; version="0.3-2"; sha256="10vilra5z884xinqkvk7ryi4nsq5zxlyn5qh23lsajba3b3qwhaw"; depends=[DistributionUtils GeneralizedHyperbolic RUnit]; }; Skillings_Mack = derive { name="Skillings.Mack"; version="1.0-2"; sha256="1spf77ix9d264r126hnrjm7z8fw19v1bk5pqhqcf6lm93zlcgh8i"; depends=[MASS matrixcalc gtools]; }; Sleuth2 = derive { name="Sleuth2"; version="1.0-7"; sha256="1zav2g1yqc6bvzap4r5xwy9abkdj8iswivj5y2lylc25nkxwcswg"; depends=[]; }; -Sleuth3 = derive { name="Sleuth3"; version="0.1-6"; sha256="0q8sgh2szqnxc289vgi5v0sljzz8yb803ijx9w5mswdxw87z2dq3"; depends=[]; }; -SmarterPoland = derive { name="SmarterPoland"; version="1.2"; sha256="1ga2m9kbn269dx21k5q1drlw9hph99fsfdx2mfnajwlgpycgf6m9"; depends=[reshape rjson]; }; +Sleuth3 = derive { name="Sleuth3"; version="0.1-8"; sha256="02qbigg75ckyg65620bv88ggs4d9z3vivxd5j76x8hzg5lkk31yj"; depends=[]; }; +SmarterPoland = derive { name="SmarterPoland"; version="1.5"; sha256="0qa31z0wgl8bgc3ihgbfdmp1ang3wyy4qylj81zxh1yn2zxx5fr0"; depends=[rjson ggplot2 httr htmltools]; }; SmithWilsonYieldCurve = derive { name="SmithWilsonYieldCurve"; version="1.0.1"; sha256="0qvhd1dn2wm9gzyp6k7iq057xqpkngkb4cfmvmjqmf0vhysp371w"; depends=[]; }; SmoothHazard = derive { name="SmoothHazard"; version="1.2.3"; sha256="0p6hnq782d5qwmq6ak2rmbzx84lrsy02lr303gg3y0vln5i2myyn"; depends=[lava mvtnorm prodlim]; }; SnowballC = derive { name="SnowballC"; version="0.5.1"; sha256="0kbg33hy6m2hv9jspyx6naqmk2q6h2zmvvczjmkwqvlhzlj0c5s4"; depends=[]; }; SoDA = derive { name="SoDA"; version="1.0-6"; sha256="0sh2dan4ga2k14rirnkvgzsvbksx1k4ika5gkf5cy247rjkqnpj0"; depends=[]; }; SocialMediaMineR = derive { name="SocialMediaMineR"; version="0.1"; sha256="113nyjncl5yi61hz8i7k60b3f0f9a5vyrd3s72nbmc44cnvr8fci"; depends=[RCurl jsonlite httr]; }; SocialNetworks = derive { name="SocialNetworks"; version="1.1"; sha256="0d868xka6d35i17r28cvm0ya971xk6y1kycsfff0279w27cjd9x0"; depends=[Rcpp Rcpp]; }; -SoftClustering = derive { name="SoftClustering"; version="0.14.02"; sha256="15j79h1ccvzfpi55prbv2d7bms1grgry0ka58cr757cvwavrnbb8"; depends=[]; }; +SocialPosition = derive { name="SocialPosition"; version="1.0"; sha256="0aqx6raskybxwavl7366klhagclq0zlklr5sd0l9h6cz530h3azq"; depends=[]; }; +SoftClustering = derive { name="SoftClustering"; version="1.1502"; sha256="1pgg9mjpfw55m3ny726vx5wl8gwsdkrxv8xzgmy3aqdlwzhh4bwz"; depends=[]; }; SoilR = derive { name="SoilR"; version="1.1-23"; sha256="1cryypgnbck5hvkc2izrd8r10q2b97f2p1s46x4dk8p099gck5wg"; depends=[deSolve RUnit]; }; SortableHTMLTables = derive { name="SortableHTMLTables"; version="0.1-3"; sha256="1jgrqsm0cj8qlk0s4qn3b83w96mgpp5gmhgcg9q2glc72v8c4ljh"; depends=[testthat brew]; }; -SoundexBR = derive { name="SoundexBR"; version="1.0"; sha256="13x5adqn6si2qqs99zwkydybikwmpb3wwq5dfbsc8fxbdj0b67mg"; depends=[]; }; +SoundexBR = derive { name="SoundexBR"; version="1.1"; sha256="1rhmwbf7687lgwwx1qldljb9j7qj7hcaypawlchmys61ny9500wl"; depends=[]; }; SparseGrid = derive { name="SparseGrid"; version="0.8.2"; sha256="057xbj2bhjm9i32kn39iscnqqdsvsmq0b8c92l8hnf9avf1sx10x"; depends=[]; }; SparseM = derive { name="SparseM"; version="1.6"; sha256="1296snm3481259xwhj97vffwjb2v8367ivf2g5amd4pzqzwx6p1k"; depends=[]; }; SparseTSCGM = derive { name="SparseTSCGM"; version="2.1.1"; sha256="0xr3l049kssi7k074wggvc96p2zlca076j2hwpwpmna42xl3dmqv"; depends=[glasso longitudinal flare MASS mvtnorm network abind]; }; +SpatPCA = derive { name="SpatPCA"; version="1.0.0.1"; sha256="1j2zhm0xlm5w1p4yhg60qwa0r2hai7nv1n25ski5x2nfnpb5fiij"; depends=[fields Rcpp Rcpp RcppArmadillo]; }; SpatialEpi = derive { name="SpatialEpi"; version="1.2.1"; sha256="02mvahpbrlcnxmf272fk46wykv9s2lcjqd5yhd80dfs78qjwly77"; depends=[sp Rcpp MASS maptools spdep Rcpp RcppArmadillo]; }; SpatialExtremes = derive { name="SpatialExtremes"; version="2.0-0"; sha256="0fjh4cjzljwzxk4bhcrff9wnkskaiawbj7z6swrj1xl35mq4dljx"; depends=[]; }; SpatialNP = derive { name="SpatialNP"; version="1.1-1"; sha256="108gxk0gbbjck9bgxvqb9h216ww21lmh2by0hrhzwx5r63hhcbmd"; depends=[]; }; @@ -1920,22 +1963,24 @@ SpeciesMix = derive { name="SpeciesMix"; version="0.3.1"; sha256="0wl15k00d7n9pm SpecsVerification = derive { name="SpecsVerification"; version="0.3-0"; sha256="19vr4xlx9gx0ph6k2kf59bpbhmzncm1mmzz7ld3pjc7k4jfba3np"; depends=[]; }; SpherWave = derive { name="SpherWave"; version="1.2.2"; sha256="1wd9pql97m1zl0axzpkfq9sxadrm5cfax0gxh0ncqadaq7w7lml4"; depends=[fields]; }; SphericalCubature = derive { name="SphericalCubature"; version="1.0.1"; sha256="0j592zvs07yc6amahlxgdw0k1vqr89gvcq22vcwzkx62igvlf6pv"; depends=[cubature]; }; -SphericalK = derive { name="SphericalK"; version="1.0"; sha256="09jgz7wm0i2gj9flvwv1g8z86n5ch3fmswpypzp76dcia88x5hhc"; depends=[]; }; +SphericalK = derive { name="SphericalK"; version="1.1"; sha256="18h1k0gy65jvzfpsda0ifv3nn3pvzx5ifllxbwh0my6w75c4biqn"; depends=[]; }; SportsAnalytics = derive { name="SportsAnalytics"; version="0.2"; sha256="1vb080ak1mfvr6d0q9i3r8hd547ba80bavjdcri0gclqqcjf1ach"; depends=[]; }; StAMPP = derive { name="StAMPP"; version="1.3"; sha256="1igf6arp7glihkv60zc7c0zwfqaf5kcm2d1xr856fj194zxww9ad"; depends=[pegas doParallel foreach adegenet]; }; StMoSim = derive { name="StMoSim"; version="3.0"; sha256="18mdgpn0x6338zzvc7nwccz6ypqmlpv7pzcy5fwx5y2wfkmdp4rm"; depends=[RcppParallel Rcpp RcppParallel Rcpp]; }; StableEstim = derive { name="StableEstim"; version="2.0"; sha256="080khfix88j4656hmdy9l0xpbk9zzw7z7d7f6yvwsbalk3ag18i5"; depends=[Matrix stabledist testthat numDeriv xtable fBasics MASS]; }; Stack = derive { name="Stack"; version="2.0-1"; sha256="09fgfhw9grxnpl5yg05p9gvlz38iw4prns1jn14nj3qx01k5rnxb"; depends=[plyr stringr ff ffbase bit]; }; +StanHeaders = derive { name="StanHeaders"; version="2.6.0-10"; sha256="0bw11myc16ddi1qhh8dcsf8dqg6dcp1wjbyrp5p98dcc1rym7kmg"; depends=[]; }; StandardizeText = derive { name="StandardizeText"; version="1.0"; sha256="0s267k2b109pcdiyd26gm4ag5afikrnnb55d3cs6g2fvzp744hfp"; depends=[]; }; Stat2Data = derive { name="Stat2Data"; version="1.6"; sha256="0pk68ffc6ffpddfpf9wi8ch39h6k3r80kldld3z5pnql18rc8nvx"; depends=[]; }; StatDA = derive { name="StatDA"; version="1.6.7"; sha256="140hqg56axwg5ckfr4n4rr453ppsgf5bmmd7kg4mai1xnj4wmg8b"; depends=[geoR sgeostat cluster e1071 MASS MBA mgcv rgl robustbase xtable]; }; StatDataML = derive { name="StatDataML"; version="1.0-25"; sha256="05s9kbrjl2wsfccgav34b02m06q62r3iyjd0ndr6xcqlw9x2w2ya"; depends=[XML]; }; -StatMatch = derive { name="StatMatch"; version="1.2.2"; sha256="1ml88ssd2xrnxh6xbg25bbskqv9jrn5vczaq3a3v4bccimv65prh"; depends=[proxy clue survey RANN]; }; +StatMatch = derive { name="StatMatch"; version="1.2.3"; sha256="10y9xaclxrw65v3k9qwdm7lvvf1kxpssc9nx0f15m8xkw5hhm7pa"; depends=[proxy clue survey RANN lpSolve]; }; StatMethRank = derive { name="StatMethRank"; version="1.0"; sha256="0mcvwn1f3hylvyg46vigc5wnvhhig5v01ag3y9rap32v85f308zh"; depends=[MASS rjags pmr]; }; StatRank = derive { name="StatRank"; version="0.0.4"; sha256="0s0jc4hvrry9a884fqfk3gp1w4ww5wif2kh3m0f22nn7qb49if9p"; depends=[truncdist plyr]; }; Statomica = derive { name="Statomica"; version="1.0"; sha256="0x60n1d7wxfd013k6jjzvfi2mqgr52fd8ylk3yhm3907002jnh1g"; depends=[distr fBasics]; }; Stem = derive { name="Stem"; version="1.0"; sha256="1fr02mi5qyxbqavdh2hg8ggw4nfjh3vs7g0vh834h6y0v53l71r5"; depends=[mvtnorm MASS]; }; -StereoMorph = derive { name="StereoMorph"; version="1.2.1"; sha256="1wvkqrfghxcdiicr81hrl320zcpj6q9kqjddsrm24p98vs83hlpi"; depends=[bezier rjson shiny Rcpp jpeg Rcpp]; }; +StereoMorph = derive { name="StereoMorph"; version="1.3"; sha256="07hpz31npl2xihqb7a3cjscp0ch6hia9p42bx8y2spv1rrcn8vvw"; depends=[bezier rjson shiny Rcpp jpeg Rcpp]; }; +StochKit2R = derive { name="StochKit2R"; version="0.3"; sha256="0d74wfn7mgw71zd5cf6m81382ki2ccl64ss6361mm3837v55bh5f"; depends=[Rcpp reshape ggplot2 XML Rcpp BH]; }; Storm = derive { name="Storm"; version="1.2"; sha256="1fg8y9my9yp6px1gh43mr3m2s2z262mzq03pj52mqg3n186vk8z3"; depends=[permute rjson]; }; StrainRanking = derive { name="StrainRanking"; version="1.1"; sha256="0q6k90if74320mrs2ccq2izynylr8zakciwbc2c6ms0v57aalwic"; depends=[]; }; StratSel = derive { name="StratSel"; version="1.1"; sha256="0l08v71qmd170027y5vjnvgfm8kqvgaqrpms9msxhv8g5974kla8"; depends=[MASS memisc Formula mnormt]; }; @@ -1971,21 +2016,23 @@ TEQR = derive { name="TEQR"; version="5.0-0"; sha256="04r26qzps7nnvs4s2xpvjf6q45 TERAplusB = derive { name="TERAplusB"; version="1.0"; sha256="0mshx615awcf2arm39mgw2gzgpyn7a3f767484g7z4nqqlikwpgc"; depends=[]; }; TESS = derive { name="TESS"; version="1.2.1"; sha256="15wrbbhrzj66j0z6xhnbf560qg0dzm1yqfbpmx070n3lsa2rdyij"; depends=[ape coda deSolve]; }; TExPosition = derive { name="TExPosition"; version="2.6.10"; sha256="12rgijlclaipwjjiyng7nwilzixdy6lsvncigcg0vjydhgk97jn1"; depends=[prettyGraphs ExPosition]; }; -TFDEA = derive { name="TFDEA"; version="0.9.5"; sha256="12rr9inzr21vkfcmknxa8zd229vws3nyc4dfz44zsfxzzwi8sqk3"; depends=[lpSolveAPI]; }; +TFDEA = derive { name="TFDEA"; version="0.9.8"; sha256="099gzjpsavrhki8walzjv2x4qy2da0spf2zbac7lcbfcww6sv4bh"; depends=[lpSolveAPI]; }; TFMPvalue = derive { name="TFMPvalue"; version="0.0.5"; sha256="13bfcwfiyl61cv2ma23fcmv2cvbsyzdbg2pl6l6zg39l6scxf9na"; depends=[Rcpp Rcpp]; }; TFX = derive { name="TFX"; version="0.1.0"; sha256="0xrjdbvg0ng4i0s8ql1pfyma10x4n045spilkb05750677r5j44p"; depends=[XML]; }; TH_data = derive { name="TH.data"; version="1.0-6"; sha256="1kx6z8lj1l2vxi7vhx47sly65grjkm3wvrbr3nl52q1vdmy1xsgm"; depends=[]; }; TIMP = derive { name="TIMP"; version="1.12.1"; sha256="06zjpa9j4sr62f2lspa75i7n8xcf4xdgxq2zjbzsx4f0p0nf5ymj"; depends=[fields vcd gplots colorspace gclus nnls deSolve minpack_lm MASS]; }; TInPosition = derive { name="TInPosition"; version="0.13.6"; sha256="1cxxrfpbiyknaivv6gyp79lz0rxwhrndcd054smksxq8zcfz0v7c"; depends=[prettyGraphs TExPosition ExPosition InPosition]; }; +TKF = derive { name="TKF"; version="0.0.3"; sha256="0kdrza02nn4vkfpc5kwpywls24adhj3kywa5w83v4wpx8dmmh10z"; depends=[expm numDeriv]; }; TPmsm = derive { name="TPmsm"; version="1.2.0"; sha256="1670b9g6sqlg5xk76x77cph1wzp44yp957sn8px5k7kkb1hgi0pl"; depends=[KernSmooth]; }; TR8 = derive { name="TR8"; version="0.9.11"; sha256="164fd9g4vn4p51m5ygg65lkjapb9a42wkfcp4ngdqh542x313y2n"; depends=[RCurl XML taxize plyr rappdirs gWidgets gWidgetstcltk]; }; TRAMPR = derive { name="TRAMPR"; version="1.0-7"; sha256="135ylhijhpdxpznfdbdzwfsvy8bhw1yx28c3520a3lyrqvinpawg"; depends=[]; }; +TRD = derive { name="TRD"; version="1.0"; sha256="1xj3ns9phiz4i70ky2p1q1cr3h6iq2i3dywnap6gqaq0fqmiq2fh"; depends=[Rlab]; }; TRSbook = derive { name="TRSbook"; version="1.0.1"; sha256="1w2yl5pchw2vn9l3qnm1ra9mjy946i5xsxh5n5xdvrcj2kak50x5"; depends=[xtable RColorBrewer gdata IndependenceTests]; }; TSA = derive { name="TSA"; version="1.01"; sha256="0cm97hwxm6vfgy9mc3kgwq6dnmn86p8a4avnfjbai048qnwrn6hx"; depends=[leaps locfit mgcv tseries]; }; TSEN = derive { name="TSEN"; version="1.0"; sha256="1pn313g2ylbjc37rqcakd797vffnh7v0rgg1xl5wjyvcgmm5mxix"; depends=[ncdf]; }; TSHRC = derive { name="TSHRC"; version="0.1-3"; sha256="18ygg7bqwg1pdqi52l1lf33gcd277895rlf5853yzh7ln2ivssmi"; depends=[]; }; TSMySQL = derive { name="TSMySQL"; version="2013.9-1"; sha256="1ls3mpp5xq707vgv8l14cfbw1vn4ygy4d9n19nw5mnl3izz4p0pk"; depends=[TSdbi RMySQL DBI tframe TSsql]; }; -TSP = derive { name="TSP"; version="1.0-9"; sha256="122y008gy7b2yscl9n2nwdb81fzjnpimipy3cvbnmk4i6v8nibjx"; depends=[]; }; +TSP = derive { name="TSP"; version="1.0-10"; sha256="1bwafpbg1w8wbn4ww4zq042n5dcs9lmrhbhkpmra0v5jhjgfvi3i"; depends=[]; }; TSPostgreSQL = derive { name="TSPostgreSQL"; version="2013.9-1"; sha256="0ihfz0q1faxb7mk4jm10czfb9fz168x4z8890vql98djsxzjxpz4"; depends=[TSdbi RPostgreSQL DBI tframe tframePlus TSsql]; }; TSSQLite = derive { name="TSSQLite"; version="2013.9-1"; sha256="0yw5whn95dvv3wbwmlhfgkapwp66nk94fjfl1r8irbqvrscmjin0"; depends=[TSdbi RSQLite DBI tframe tframePlus TSsql]; }; TSTutorial = derive { name="TSTutorial"; version="1.2.3"; sha256="0hpk6k3lc72p8pdz5aad04lcjsz9k443h5gs09dc3i10wqw3yhxs"; depends=[MASS]; }; @@ -1997,7 +2044,6 @@ TSdist = derive { name="TSdist"; version="1.2"; sha256="103wv6wy5gjim2cf14d6afin TSfame = derive { name="TSfame"; version="2013.8-2"; sha256="19awl7jrx97y93wsms3h87w8qdgpdrkbbpsjsa2aqsnyq5vgy82l"; depends=[TSdbi DBI tframe tframePlus fame tis]; }; TSgetSymbol = derive { name="TSgetSymbol"; version="2013.9-1"; sha256="1hn78xrfdnwhjrgcnn71ihvdgv4qwdxhpjwcqp0pbkgbxj3q5w3k"; depends=[TSdbi quantmod DBI zoo tframe tframePlus]; }; TShistQuote = derive { name="TShistQuote"; version="2013.9-1"; sha256="06din7frxmbk4qxkpv0z5srh8nh0wkmrfl9lz17y7cwsmldl4hvr"; depends=[TSdbi DBI tframe tframePlus zoo tseries]; }; -TSjson = derive { name="TSjson"; version="2014.4-1"; sha256="1rkxc4dm7hdva0hiqbka8isfszjy26if9hnarsm51cflk8b60zhk"; depends=[TSdbi findpython DBI tframe tframePlus rjson]; }; TSodbc = derive { name="TSodbc"; version="2013.9-1"; sha256="0s0bgid5slvyqlsrc0jvybqd73qjbs7qb0klws4ynk51rw6rilml"; depends=[TSdbi RODBC DBI tframe tframePlus TSsql]; }; TSsql = derive { name="TSsql"; version="2014.4-1"; sha256="10h83z0d9xjc1g0pnjvr4idz5c2vwf36x6qx1lpa48ybap50s215"; depends=[DBI tframe TSdbi]; }; TSxls = derive { name="TSxls"; version="2013.8-2"; sha256="1a0cmw41jf9jqibg25s4s04lawdb86c5r4bkxp8bznzkkhihpxn1"; depends=[TSdbi DBI tframe tframePlus gdata]; }; @@ -2006,7 +2052,7 @@ TTAinterfaceTrendAnalysis = derive { name="TTAinterfaceTrendAnalysis"; version=" TTR = derive { name="TTR"; version="0.22-0"; sha256="0aackwmmakjcynpq4nxi8xw1x3688rkg6kypgd5jiprzzdhsz5rq"; depends=[xts xts]; }; TUWmodel = derive { name="TUWmodel"; version="0.1-4"; sha256="1xxbrcs3dddzcya15pj4k86z05vnv06fnwblfvygx0zkw0m292av"; depends=[]; }; Table1Heatmap = derive { name="Table1Heatmap"; version="1.1"; sha256="1nrabjivfsdhaqmlq365pskkrp99jqsxn8vy03mdnqn5h5zv7wvx"; depends=[colorRamps]; }; -TableMonster = derive { name="TableMonster"; version="1.1"; sha256="1xflw719isy5hxvm0z67bip01cpafylnj76zssb3c174j912f7y3"; depends=[xtable]; }; +TableMonster = derive { name="TableMonster"; version="1.2"; sha256="1cl70d0svzx8nsg6kw5dv50s9d6wxqkyg39d2d4vissbpilq6arn"; depends=[xtable]; }; TableToLongForm = derive { name="TableToLongForm"; version="1.3.1"; sha256="135q0bgsm2yndrg3vpwmihbqlyf3qkm97i0jvcw6bf06p6b2fk41"; depends=[]; }; TaoTeProgramming = derive { name="TaoTeProgramming"; version="1.0"; sha256="1b36s5mpm5vbhzcwmvm8g5pl7vpn6rsl5cnglfy8kgm1q9nnr7ff"; depends=[]; }; TapeR = derive { name="TapeR"; version="0.3.2"; sha256="070zl7hqv5zprhs464gy1kmz0am58l0vig8xvdq6pbz94nrhvpj0"; depends=[nlme pracma]; }; @@ -2023,15 +2069,15 @@ ThreeArmedTrials = derive { name="ThreeArmedTrials"; version="0.1-0"; sha256="1p ThreeWay = derive { name="ThreeWay"; version="1.1.2"; sha256="1vf71im3bs2b2v05j12l8qn181kah0mch4h13n71zqik1ykly6jf"; depends=[]; }; ThresholdROC = derive { name="ThresholdROC"; version="1.0"; sha256="1w7bjw1w09skxyc5w3d72wivljlvnck6vbchihjx7m5k6djn7pxi"; depends=[]; }; TiddlyWikiR = derive { name="TiddlyWikiR"; version="1.0.1"; sha256="0vwwjdmfc8c0y2gfa8gls1mzvp29y39c9sxryrgpk253jj9px1kr"; depends=[]; }; -Tides = derive { name="Tides"; version="1.0"; sha256="10k8cmpfj9jjpzayyklslgazgl96078vfbn71ncgrn9bb98ahyqs"; depends=[]; }; +Tides = derive { name="Tides"; version="1.1"; sha256="0w2xjnw2zv4s49kvzbnfvy30mfkn8hqdz6p155xm1kfqwvyb28qq"; depends=[]; }; TilePlot = derive { name="TilePlot"; version="1.3.1"; sha256="0yfzjyzc743rv5piw9mb7y0rr558hkxszgz49lya2w3i1mqvxbzy"; depends=[]; }; TimeMachine = derive { name="TimeMachine"; version="1.2"; sha256="1dz0j777wmd8mpkm2ryiahpcw6w88w429zjcw6m67pi20r1992cb"; depends=[]; }; TimeProjection = derive { name="TimeProjection"; version="0.2.0"; sha256="04yr4cg2khkw9n3y3qk0ni1327k4pxm09zz2xg8mpjdvgi4p9yi3"; depends=[lubridate timeDate Matrix]; }; TimeWarp = derive { name="TimeWarp"; version="1.0-7"; sha256="1qjr3kfdd1ym0fi4hgjqm32gigchbchxy4xyxmsyl8y7jh2jk9qj"; depends=[]; }; Tinflex = derive { name="Tinflex"; version="1.0"; sha256="0zvh2nfx4kqf90mmrpdm2fzlzn7s7gs09i8zin604hqxjir6p3ny"; depends=[]; }; TopKLists = derive { name="TopKLists"; version="1.0.3"; sha256="0687nxsddmlgyz3kwcfmcv0vj2pw91154rd1p19ivhmbvhvnhwvh"; depends=[Hmisc gplots]; }; -TraMineR = derive { name="TraMineR"; version="1.8-8"; sha256="12zbk7bq4ff4dzq86zbh9pspl1b9a69k0rw9lg8sh3mmc0f09m8j"; depends=[RColorBrewer boot]; }; -TraMineRextras = derive { name="TraMineRextras"; version="0.2.2"; sha256="0sb072ssg5q3kncb3b1a0nrnapjq8rly0ibh3gdrld9fdbdbjx68"; depends=[TraMineR RColorBrewer combinat survival]; }; +TraMineR = derive { name="TraMineR"; version="1.8-9"; sha256="0qawgjifz6w7gb06j9q5kbvhf8pn17922mvmgwzva5mykvqfmdic"; depends=[RColorBrewer boot]; }; +TraMineRextras = derive { name="TraMineRextras"; version="0.2.3"; sha256="0b6xh1xhmigjfj9cbk4gdpi1d131cq9ikwgdblcwwrmnrhcjgld6"; depends=[TraMineR RColorBrewer combinat survival cluster]; }; TrackReconstruction = derive { name="TrackReconstruction"; version="1.1"; sha256="1f2l3nshb6qrhyczw5rxqqzmsjxf0rvv3y78j8d9lv1nnd9kxzq5"; depends=[fields RColorBrewer]; }; TreatmentSelection = derive { name="TreatmentSelection"; version="1.1.2"; sha256="1mvrb72yz51gmwqlfg5gsjbi65lqk5j24agddw1br53ymdvjgzq4"; depends=[ggplot2]; }; TreePar = derive { name="TreePar"; version="3.3"; sha256="1sm518b1b4b1p0n5979qzvi2nacxpp3znbg9n75pf2a8z8wy6p4l"; depends=[ape Matrix subplex TreeSim deSolve]; }; @@ -2054,8 +2100,8 @@ UScensus2000tract = derive { name="UScensus2000tract"; version="0.03"; sha256="1 UScensus2010 = derive { name="UScensus2010"; version="0.11"; sha256="1q06spkh8f4ijvfg557rl3176ki4i8a1y39cyqm3v7mnzwckyj3l"; depends=[maptools sp foreign]; }; UWHAM = derive { name="UWHAM"; version="1.0"; sha256="1qaj8anaxqnx4nc6vvzda9hhhzqk9qp8q7bxm26qgia4hgascnrv"; depends=[trust]; }; Unicode = derive { name="Unicode"; version="0.1-5"; sha256="088f38qy3vympxj6n4vyvvqd4gldcfli9l8rmzgmm1rm3v195mvn"; depends=[]; }; -UsingR = derive { name="UsingR"; version="2.0-2"; sha256="0qn993bb890ihgvq7kddac6xgfgfai30x62ip0048ymnvcmvjfhf"; depends=[MASS HistData Hmisc quantreg]; }; -V8 = derive { name="V8"; version="0.4"; sha256="1cjlpskbpn7qkfqpf5mzx2j5jbvrphwwi1v2gmi0h21s085yw15x"; depends=[Rcpp jsonlite curl Rcpp]; }; +UsingR = derive { name="UsingR"; version="2.0-4"; sha256="0wj6cn9ijc0rkpxsy1fd104m254b997dhmvwzz0knjkh5nybm8zm"; depends=[MASS HistData Hmisc]; }; +V8 = derive { name="V8"; version="0.5"; sha256="0qyrf8p9mvzzccq9gb7f1zh0902p90rqnxj7w8ky5f9fgs7dj0c5"; depends=[Rcpp jsonlite curl Rcpp]; }; VAR_etp = derive { name="VAR.etp"; version="0.7"; sha256="0py5my3ilhcmz44m15hh0d219l9cz7rda4a9gbmf8wh9cgvvj1s3"; depends=[]; }; VBLPCM = derive { name="VBLPCM"; version="2.4.3"; sha256="0aibjkqlc8l3f17m52ifb25s639gkydvgdj2gkijk5mk0g681qdj"; depends=[ergm sna mclust]; }; VBmix = derive { name="VBmix"; version="0.2.17"; sha256="0fhx2vk5ffq147kfgsqjbqwgv64m7z9mbz4gchj90440ih7kyxa5"; depends=[lattice pixmap mnormt]; }; @@ -2068,7 +2114,7 @@ VIM = derive { name="VIM"; version="4.1.0"; sha256="15nmywg8mhknvivg9bfszif2alli VIMGUI = derive { name="VIMGUI"; version="0.9.0"; sha256="195lakyik597sjkq6c5v3881p35111gzmj2r5f5nr53vi6bn4pzm"; depends=[tkrplot VIM survey gWidgetsRGtk2 foreign RGtk2 Cairo Hmisc]; }; VLF = derive { name="VLF"; version="1.0"; sha256="1il8zhm80mc22zj16dpsy4s6s9arj21l9ik0vccyrpnlr8ws3d3l"; depends=[]; }; VLMC = derive { name="VLMC"; version="1.4-0"; sha256="0ifrmwq095xpmn3r303l3b9z31fri224nk3jn7aim6chcjmy1r71"; depends=[MASS]; }; -VNM = derive { name="VNM"; version="2.0"; sha256="0qgr8n7h938dlsirwgcisl79jk8qxbac8nbl0p38kckfgwfsj06c"; depends=[]; }; +VNM = derive { name="VNM"; version="4.0"; sha256="0dc2wvj8f09yrsf5lhg6djhfnkgslngs6a13g54d5q9aa4nnxm8w"; depends=[]; }; VPdtw = derive { name="VPdtw"; version="2.1-10"; sha256="1sipiqbk766czd1jxam3bc2hfq7wsn72x51j5ssn2s2q0gvpl7m1"; depends=[]; }; VSURF = derive { name="VSURF"; version="0.8.2"; sha256="1d9irh8s49i8i9q8psmfl41jnr95wvm3libxin0ir8r297rq82z3"; depends=[randomForest rpart doParallel]; }; VaRES = derive { name="VaRES"; version="1.0"; sha256="0gw05jiqgirhz3c8skbb07y4h44r6vi68gnd5y7ql455v0c2raza"; depends=[]; }; @@ -2076,13 +2122,13 @@ VarEff = derive { name="VarEff"; version="1.0"; sha256="0zp024z5xl43z2z67fq5ryfi VarSwapPrice = derive { name="VarSwapPrice"; version="1.0"; sha256="12q2wp2cqi9q47mzbb7sc250zkjqkhs9z0h93ik0h63dv339abgj"; depends=[]; }; VariABEL = derive { name="VariABEL"; version="0.9-2"; sha256="0vlr6zxl75i49p35jxrc5fwfrb55n91hqdan2ikcix3r2k4qs5k0"; depends=[]; }; VarianceGamma = derive { name="VarianceGamma"; version="0.3-1"; sha256="0h424hdphbgi9i84bgzdwmsq05w61q8300x8f9y4szbxa5k2dnar"; depends=[DistributionUtils GeneralizedHyperbolic RUnit]; }; -VdgRsm = derive { name="VdgRsm"; version="1.3"; sha256="1gaaijap1gc877kpbi2galsg6zj9430w6c4ydbs6aqcx6qy9h5ij"; depends=[permute AlgDesign]; }; +VdgRsm = derive { name="VdgRsm"; version="1.4"; sha256="1qbfx1zql8bjmh5ygjkdrk1hcpvyznwbp0mv750vd1ppaw5ddn9h"; depends=[permute AlgDesign]; }; Vdgraph = derive { name="Vdgraph"; version="2.2-2"; sha256="1q8l711zbrrj4h1wmpv93nbvlg8xi6kjv22zpidkck8ncpyyla80"; depends=[]; }; VecStatGraphs2D = derive { name="VecStatGraphs2D"; version="1.7"; sha256="08f9ixpiq8s5h8h608wrs9l16xk3c1xcrvwgvm5wqm6xfkj9gpfd"; depends=[MASS]; }; VecStatGraphs3D = derive { name="VecStatGraphs3D"; version="1.6"; sha256="1pnpgnxdiis4kzwhh17k61aidyan5fp9rzqhvwf6gljb4csqsk54"; depends=[rgl misc3d MASS]; }; VennDiagram = derive { name="VennDiagram"; version="1.6.9"; sha256="0sxgspqsn15y3pipd9wy4wh2n5rkb9bazqkfwkf88p483azpjxw9"; depends=[]; }; VideoComparison = derive { name="VideoComparison"; version="0.11"; sha256="04jc9br4ddck2sh9bhy02jx34cqxvh904lr46sid6dnmaqfn80l7"; depends=[RJSONIO RCurl zoo pracma Rcpp Rcpp]; }; -VineCopula = derive { name="VineCopula"; version="1.3"; sha256="1vxm7bk7p452p4kbm5q3ricxcd4f74zzlibxx13wj0cbza5p49nl"; depends=[MASS mvtnorm igraph copula]; }; +VineCopula = derive { name="VineCopula"; version="1.4"; sha256="03bjpnpq8zj1h4z35m2xkgrislvp7lmvpxm905xxn1r3r944kflz"; depends=[MASS mvtnorm igraph copula ADGofTest]; }; VizOR = derive { name="VizOR"; version="0.7-9"; sha256="1xw06y86nsrwpri6asrwh8kccjsqzzidgbpld6d6l7vrglp8m6sr"; depends=[lattice rms]; }; Voss = derive { name="Voss"; version="0.1-4"; sha256="056izh1j26vqjhjh01fr7nwiz1l6vwr5z4fll87w99nc5wc4a467"; depends=[fields]; }; VoxR = derive { name="VoxR"; version="0.5.1"; sha256="07lsp6lrkq0gv55m84dl9w7gz5246d9avypqnkz96n3rbbgd0w5z"; depends=[]; }; @@ -2111,8 +2157,8 @@ WilcoxCV = derive { name="WilcoxCV"; version="1.0-2"; sha256="1kbb7ikgnlxybmvqrb WordPools = derive { name="WordPools"; version="1.0-2"; sha256="1izs4cymf2xy1lax85rvsgsgi05ygf0ibi9gzxc96sbgvy4m78kf"; depends=[]; }; WrightMap = derive { name="WrightMap"; version="1.1"; sha256="0dmximp549gr37ps56vz8mnlii7753dc5v0wl3s78cymjmnmyr0z"; depends=[]; }; WriteXLS = derive { name="WriteXLS"; version="3.5.1"; sha256="0grhwwlibdpvzjlm1vc5ykl54jcz0jmg6rkhis00rjn5yqccx0in"; depends=[]; }; -XBRL = derive { name="XBRL"; version="0.99.14"; sha256="1cy0y4wl5kic8c2r1bww1fhplpb183djlb6gsj4ih9gnsykipfb1"; depends=[Rcpp Rcpp]; }; -XLConnect = derive { name="XLConnect"; version="0.2-9"; sha256="1lbbvl4jx42cvc8paswc6p8vf8aqqhf3v52a9fhpv79lcizch558"; depends=[XLConnectJars rJava]; }; +XBRL = derive { name="XBRL"; version="0.99.15"; sha256="0fscvl7i205h0ax8g78v5n75bfqbna6cr7lg8jkicjbf4v791hhz"; depends=[Rcpp Rcpp]; }; +XLConnect = derive { name="XLConnect"; version="0.2-10"; sha256="1dfch76l4pl9zmcp3h4kwycdivzp7nl2li6g8h5kdm9qiy1v0384"; depends=[XLConnectJars rJava]; }; XLConnectJars = derive { name="XLConnectJars"; version="0.2-9"; sha256="0js79297himq628cwx5cc3pcq3iv6p16bn4bpd5diyjaya4x27g3"; depends=[rJava]; }; XML = derive { name="XML"; version="3.98-1.1"; sha256="0n9i6746211wihglbpsgalj2cyvggn4rv6a4fbavqwnjw3h1hwwl"; depends=[]; }; XML2R = derive { name="XML2R"; version="0.0.6"; sha256="0azfh950r2b7ck3n1vzk3mdll7zy844nx3mbk676jxnj8gg7nxk5"; depends=[XML RCurl plyr]; }; @@ -2138,7 +2184,7 @@ aRxiv = derive { name="aRxiv"; version="0.5.8"; sha256="0kwphz9x4ljsznvxxvm03mmb abc = derive { name="abc"; version="2.0"; sha256="0fs6hxyk95c61mn3p642xs3ib9wfjii2v9a74pf488iaywc1kd7d"; depends=[nnet quantreg MASS locfit]; }; abcdeFBA = derive { name="abcdeFBA"; version="0.4"; sha256="1rxjripy8v6bxi25vdfjnbk24zkmf752qbl73cin6nvnqflwxkx4"; depends=[Rglpk rgl corrplot lattice]; }; abctools = derive { name="abctools"; version="1.0"; sha256="0kaw2saghjyysj2bcsij2018ls3lrzh9188m0yqhmv71k5vh68rd"; depends=[abc abind plyr]; }; -abd = derive { name="abd"; version="0.2-6"; sha256="0nlqgjmzpn715kg7pb4zz3rcrf11zd4inj7gam8mr8faf4b5qq2w"; depends=[nlme lattice mosaic]; }; +abd = derive { name="abd"; version="0.2-7"; sha256="0zkqwdcpz1v9k509vvzfbf9732v43q919hwd9yq3q0dg67d32ai7"; depends=[nlme lattice mosaic]; }; abf2 = derive { name="abf2"; version="0.7-0"; sha256="0ybl7w8sjfghy8svbxj01q5ldfi05g1r24q9ah1nfca8xzby410n"; depends=[]; }; abind = derive { name="abind"; version="1.4-0"; sha256="0s7m7wv23z485fc0nb61svcszx0skxl3m8kiilrj506ndazk95hv"; depends=[]; }; abn = derive { name="abn"; version="0.85"; sha256="1ml4l4fiqscc1ikv0wsi73rymb9599mpnhmzlfnvv4zp3fkfm6qm"; depends=[Cairo]; }; @@ -2195,6 +2241,7 @@ aidar = derive { name="aidar"; version="1.0.0"; sha256="01vs14bz4k504q5lx65b60ky akima = derive { name="akima"; version="0.5-11"; sha256="17n7iiwybwanvm5mflb1f2xx1gnw1pcmfsnl1f82afixpalbs0gh"; depends=[]; }; akmeans = derive { name="akmeans"; version="1.1"; sha256="1nqbxbx583n0h2zmpy002rlmr6j86j6bg76xj5c69brrh59dpyw1"; depends=[]; }; alabama = derive { name="alabama"; version="2014.12-1"; sha256="0rp9x5lijisxh57miy2l5jp7jinn200v9y3vfyriknr7903lg0if"; depends=[numDeriv]; }; +ald = derive { name="ald"; version="1.0"; sha256="1vphmqhx6wlzsz3s94jsa4mk6wpacp93wfgpj0vp9ljfb3aplhik"; depends=[]; }; algstat = derive { name="algstat"; version="0.0.2"; sha256="1ssdrrwnxrhx3syndqxqcaldlbnjamk3x2yiq7jgxy0qsiadmqsi"; depends=[mpoly stringr reshape2 Rcpp Rcpp]; }; allan = derive { name="allan"; version="1.01"; sha256="02bv9d5ywbq67achfjifb3i7iiaaxa8r9x3qvpri2jl1cxnlf27m"; depends=[biglm]; }; allanvar = derive { name="allanvar"; version="1.0"; sha256="0wpywdr15gb49m9kxrpjfsxlxrm4hwm46x42k8dgc6sihfsqbm22"; depends=[gplots]; }; @@ -2213,6 +2260,7 @@ aml = derive { name="aml"; version="0.1-1"; sha256="09xxlxp784wlb561apns3j8f2h9p anacor = derive { name="anacor"; version="1.0-5"; sha256="1m2r5x5spb5nahd9cvnsxwqi0ay2kasmha21rbwj3r99jz1vxkql"; depends=[rgl car scatterplot3d colorspace fda]; }; analogue = derive { name="analogue"; version="0.16-0"; sha256="1izbqzmnw4hmirjlvwp15imzaai2kxbv2gzc58y5awwbfdrg314m"; depends=[vegan mgcv MASS brglm princurve lattice]; }; analogueExtra = derive { name="analogueExtra"; version="0.1-0"; sha256="0hyl0vn2i594r5czzha7y9a1n4dpznfpmh2j46mci2r57p2s3qr2"; depends=[vegan3d analogue rgl]; }; +analyz = derive { name="analyz"; version="1.4"; sha256="0qdh1gld2dkl0krbhm2vcqg8dfs03dn51rclgsw02554s06dlgxw"; depends=[]; }; anametrix = derive { name="anametrix"; version="1.6"; sha256="14xrrnvz7jn1jqds48l5pvzlx6hsaxrjc932lqnvv70sfypinjkm"; depends=[RCurl XML pastecs]; }; anapuce = derive { name="anapuce"; version="2.2"; sha256="0qs27as628090k3sq5b14l90g7qdp23d0jz5lb1wxsgi3ji0f7qj"; depends=[]; }; anchors = derive { name="anchors"; version="3.0-8"; sha256="12gd2526y7s2a8i6b9xma2c3sc6zxnwzl6sn8b50hbxizwr8d34j"; depends=[rgenoud MASS]; }; @@ -2267,14 +2315,14 @@ arules = derive { name="arules"; version="1.1-6"; sha256="0xq0j4phwqw9cx2yzxx8xx arulesNBMiner = derive { name="arulesNBMiner"; version="0.1-4"; sha256="05vj7pzzh84xr6d0m16dhzr7bw50hkiyq99vl46zinak648my338"; depends=[arules rJava]; }; arulesSequences = derive { name="arulesSequences"; version="0.2-6"; sha256="1fvph6c8dy3hj0h63h85bzzzka8dx0cc0lcncz9svyahy1j4q3z0"; depends=[arules]; }; arulesViz = derive { name="arulesViz"; version="1.0-0"; sha256="0g4bqfn8jya992r2wbi044v68mj508h52snrdcd5ijhdhw8xq9xc"; depends=[arules scatterplot3d vcd seriation igraph]; }; -asbio = derive { name="asbio"; version="1.1-1"; sha256="13iz795jiplx677y24pwx5ggxbz0b8x7g8khmvvbl05h2rab3pw8"; depends=[scatterplot3d pixmap tkrplot plotrix mvtnorm deSolve lattice multcompView]; }; +asbio = derive { name="asbio"; version="1.1-5"; sha256="1br9rhj6nghwx54i2hpjrsdhwg8v38s66cy8fc4pg97zypdnikpj"; depends=[scatterplot3d pixmap tkrplot plotrix mvtnorm deSolve lattice multcompView]; }; ascii = derive { name="ascii"; version="2.1"; sha256="19dfbp7k4bjxjn8wdzhbmz7g3za6gn8vcnd5qkm4dz7gg1fg7b8p"; depends=[]; }; ascrda = derive { name="ascrda"; version="1.15"; sha256="17anzlhcjmrk13s5gs752rsc735y5wvba6r3w1nbv0cnkpnyk8i7"; depends=[class nnet rda MASS sfsmisc e1071 pamr]; }; asd = derive { name="asd"; version="2.0"; sha256="1nnsbh6g0bhvhp6644zf2l6frr3qnls0s7y7r0g211b5zagq20z3"; depends=[mvtnorm]; }; ash = derive { name="ash"; version="1.0-14"; sha256="15x16ld25i160asqf4z4difa6zn2yfgl04j8y8nqb0djymdx7a1f"; depends=[]; }; aspace = derive { name="aspace"; version="3.2"; sha256="1g51mrzb6amafky2kg2mx63g6n327f505ndhna6s488xlsr1sl49"; depends=[splancs Hmisc shapefiles]; }; aspect = derive { name="aspect"; version="1.0-3"; sha256="12wyyr0ms8g3y96jz1x0y52dlma00j20h7hmm8m6y5p1lgk9kmcd"; depends=[]; }; -assertive = derive { name="assertive"; version="0.1-8"; sha256="0j1phpx2w34rdjaar3fqhp0rsvdlidvw2irfazbh9955mdn2cwq1"; depends=[]; }; +assertive = derive { name="assertive"; version="0.2-1"; sha256="0bzhwdkw3ryaclaw9lni8zw13037gx7kf6wbmjvkwsl9p0lzv7wp"; depends=[]; }; assertthat = derive { name="assertthat"; version="0.1"; sha256="0dwsqajyglfscqilj843qfqn1ndbqpswa7b4l1d633qjk9d68qqk"; depends=[]; }; aster = derive { name="aster"; version="0.8-30"; sha256="0vdlimkkmd9ar5v3xrbi9gshvj980l7641brd7cqs78sqf0v71fn"; depends=[trust]; }; aster2 = derive { name="aster2"; version="0.1"; sha256="1qbh1l2cnhvdfxaw1bv8cpj96nv03g155b1xh1vdigniwc04mssw"; depends=[]; }; @@ -2323,9 +2371,9 @@ bayesGARCH = derive { name="bayesGARCH"; version="2.0.1"; sha256="1gz18wjikkg3yf bayesGDS = derive { name="bayesGDS"; version="0.6.0"; sha256="17ihpsh7lqjninprfwbx3v2415s27qybr5c2z4ls43slv8zrv8mz"; depends=[Matrix]; }; bayesLife = derive { name="bayesLife"; version="2.1-3"; sha256="1ashgfzjjnvj8h4896y4maj3gfx9v4fginjli1wdkcgcgi1d6gkr"; depends=[bayesTFR wpp2012 hett car coda]; }; bayesMCClust = derive { name="bayesMCClust"; version="1.0"; sha256="14cyvcyx3nmkbvsy7n4xjp7zvcgdhy013dv9d72y8j5dvlv82pb4"; depends=[gplots xtable mnormt MASS bayesm boa e1071 gtools]; }; -bayesPop = derive { name="bayesPop"; version="5.2-1"; sha256="15skh0fprvkhgydc320wba9nhb7hzmi7hnwr2iq73vd0by2ibfkb"; depends=[bayesTFR bayesLife abind plyr wpp2012]; }; +bayesPop = derive { name="bayesPop"; version="5.2-2"; sha256="1m1vvbipf903s7a5vm7pad3l8ykj74ilrkpyc4ydqzpyqg4k4npj"; depends=[bayesTFR bayesLife abind plyr wpp2012]; }; bayesQR = derive { name="bayesQR"; version="2.2"; sha256="0w5fg7hdwpgs2dg4vzcdsm60wkxgjxhcssw9jzig5qgdjdkm07nm"; depends=[]; }; -bayesSurv = derive { name="bayesSurv"; version="2.3-1"; sha256="1p3ppvz7qjd0yjnc3k1mrjqa6v00aind613wxg6xhgk5iz0590rg"; depends=[survival coda smoothSurv]; }; +bayesSurv = derive { name="bayesSurv"; version="2.4"; sha256="014jxlx4w6lzzq9axdk8mwwlppmly0yj9i14zhmngdbr7mxh3f87"; depends=[survival coda smoothSurv]; }; bayesTFR = derive { name="bayesTFR"; version="4.1-2"; sha256="17qv25yrprj099vx1jj46ycgxnc4ldx6qcqx42h5gz38qqzz2q4s"; depends=[mvtnorm MASS coda wpp2012]; }; bayesclust = derive { name="bayesclust"; version="3.1"; sha256="0zxjd64nz8c6vg6jwb2xh6kbw41a2pcmlwq5cl6k2kbplqbm2jdf"; depends=[]; }; bayescount = derive { name="bayescount"; version="0.9.9-2"; sha256="1f27dkdgpylk1v0m722r0jxha9sl17zgl1s5apnd8ihgsajm7sdc"; depends=[runjags coda lattice]; }; @@ -2340,14 +2388,13 @@ bbmle = derive { name="bbmle"; version="1.0.17"; sha256="1j3x2glnn0i0fc0mmafwkkq bbo = derive { name="bbo"; version="0.2"; sha256="19xrbla3bb3csg3gjjrpkgyr379zfwyh293bcrcd6j8rnm6g4i01"; depends=[]; }; bc3net = derive { name="bc3net"; version="1.0.2"; sha256="0iakqf4apscxb4mb5klj9qklbi25dmdd77la3ads2y882gm2nj0z"; depends=[c3net infotheo igraph Matrix lattice]; }; bclust = derive { name="bclust"; version="1.4"; sha256="1s04fqff5bw6d5kk0smvach6yq492dv1w0ahh9mrm2jsi2q58h7p"; depends=[]; }; -bcool = derive { name="bcool"; version="1.2"; sha256="0830wx8z0yvw4cfik5jrjcvmhsf7klvqvcqx5l4lr4aq88rakxpq"; depends=[MCMCglmm doMPI foreach seqinr]; }; bcp = derive { name="bcp"; version="3.0.1"; sha256="08sa1az1ljsi00zmj3l7z8p1j5im1w79yjxy8k1p6ba90bck7l4h"; depends=[foreach iterators Rcpp Rcpp]; }; bcpa = derive { name="bcpa"; version="1.1"; sha256="0rwbd39szp0ar9nli2rswhjiwil31zgl7lnwm9phd0qjv8q0ppar"; depends=[Rcpp plyr Rcpp]; }; bcpmeta = derive { name="bcpmeta"; version="1.0"; sha256="02fw1qz9cvr7pvmcng7qg7p04wxxpmvb2s8p78f52w4bf694iqhl"; depends=[mvtnorm]; }; bcrm = derive { name="bcrm"; version="0.4.4"; sha256="0gcigc7505fsk1m70df3n0dz553adkbs8yz2bhskb4qrw4gbmvr7"; depends=[mvtnorm ggplot2]; }; bcv = derive { name="bcv"; version="1.0"; sha256="053if27miv46mbkni6pcpdpz0l336r5l95k7927dqalnri894xwz"; depends=[]; }; bda = derive { name="bda"; version="3.2.0-3"; sha256="1725qdlkcf7hfklnksy7jslh66cfm7gsil1xgm2rw8hr6v2l0pmx"; depends=[]; }; -bde = derive { name="bde"; version="1.0"; sha256="19h3dzfa33r178m2q20p3l0ah1i6nrajv0lan0r036kjza3h978i"; depends=[shiny ggplot2]; }; +bde = derive { name="bde"; version="1.0.1"; sha256="1f25gmjfl58x4pns89abfk85yq5aad3bgq9yqpv505g5gxk62d3v"; depends=[shiny ggplot2]; }; bdoc = derive { name="bdoc"; version="1.2"; sha256="15d7grc0a1hakkxhgbm2gp0awggzlmsp8zf8abj5bgfih63gcmj2"; depends=[]; }; bdpv = derive { name="bdpv"; version="1.1"; sha256="0i6wdf27243ch8pn2chqriwxjg3g72wbvzlx52mz4ahw700xjc7n"; depends=[]; }; bdscale = derive { name="bdscale"; version="1.2"; sha256="0j2h7ainfnh78szp355didbkmcl6d5vz1di8nznjarwxncrbgc6g"; depends=[ggplot2 scales]; }; @@ -2397,7 +2444,7 @@ bigmemory_sri = derive { name="bigmemory.sri"; version="0.1.3"; sha256="0mg14ilw bigpca = derive { name="bigpca"; version="1.0"; sha256="1s4qmg7xl8z0sv1b1vfqw0r5cvlbrxx1n0m03ira8fpykcck2clm"; depends=[reader NCmisc bigmemory biganalytics bigmemory_sri BH irlba]; }; bigrf = derive { name="bigrf"; version="0.1-11"; sha256="0lazi8jk8aapdyyynd5yfcbn4jpjyxh8l64ayd0jj3nisl6hvmdh"; depends=[bigmemory foreach bigmemory BH]; }; bigrquery = derive { name="bigrquery"; version="0.1.0"; sha256="15ibgi6bqvn0ydq8jx1xhwkwpwwyd7w4f2ams2gpafpysc2f2ks6"; depends=[httr jsonlite assertthat R6 dplyr]; }; -bigsplines = derive { name="bigsplines"; version="1.0-4"; sha256="10i8scp048s7mdxccqq2wz7ffqljnpgbhki5hkyjp7i5lbhbmcax"; depends=[]; }; +bigsplines = derive { name="bigsplines"; version="1.0-5"; sha256="0dmm7q7cznhpqy5j955q4mlwrjfiinxlh17g9xlpqjncrzbivxh6"; depends=[]; }; bigtabulate = derive { name="bigtabulate"; version="1.1.2"; sha256="0vp873r3gww6kfkjdm87qgcdi85362kq946lvs45ggvyv7iaw0wa"; depends=[bigmemory BH bigmemory]; }; bild = derive { name="bild"; version="1.1-3"; sha256="02fi3h6mhg2m1ppkcpxpwzjfchkk9h7yv73j0365srr1jxki44pm"; depends=[]; }; bimetallic = derive { name="bimetallic"; version="1.0"; sha256="181qi4dr0zc7x6wziq7jdc1his20jmprfpq3hrfm56fr5n1sj8wl"; depends=[]; }; @@ -2418,17 +2465,17 @@ binseqtest = derive { name="binseqtest"; version="1.0"; sha256="103nbi3zq9m63266 bio_infer = derive { name="bio.infer"; version="1.3-3"; sha256="14pdv6yk0sk6v8g9p6bazbp7mr3wmxgfi6p6dj9n77lhqlvjcgm9"; depends=[]; }; bio3d = derive { name="bio3d"; version="2.1-3"; sha256="1iip34prynbib0aasrcxr1gck2vmal8vxwyrjx7ra9pq9zcnvjyq"; depends=[]; }; bioPN = derive { name="bioPN"; version="1.2.0"; sha256="0mvqgsfc7d4h6npgg728chyp5jcsf49xhnq8cgjxfzmdayr1fwr8"; depends=[]; }; -biogram = derive { name="biogram"; version="1.0"; sha256="0xf9sn66wh4349hhy8jl5zg8b8apjjgcr5kyzmz82765zrdnf346"; depends=[slam bit]; }; +biogram = derive { name="biogram"; version="1.1"; sha256="04nkm972x1nzlacfjfk3i4gsqbfhrfaygmmw13hrp47j8snv8r26"; depends=[slam bit]; }; biom = derive { name="biom"; version="0.3.12"; sha256="18fmzp2zqjk7wm39yjlln7mpw5vw01m5kmivjb26sd6725w7zlaa"; depends=[plyr RJSONIO Matrix]; }; biomod2 = derive { name="biomod2"; version="3.1-64"; sha256="0ymqscsdp5plhnzyl256ws9namqdcdxq3w5g79ymfpymfav10h3a"; depends=[sp raster reshape ggplot2 abind rasterVis pROC nnet gbm mda randomForest rpart MASS]; }; bionetdata = derive { name="bionetdata"; version="1.0.1"; sha256="1l362zxgcvxln47b1vc46ad6ww8ibwhqr2myxnz1dnk2a8nj7r2q"; depends=[]; }; biopara = derive { name="biopara"; version="1.5"; sha256="1fhhs6lkm3iphlkx6wklh9sgr1mkjkka9wv2m8fnk0xw01bdsyl5"; depends=[]; }; bios2mds = derive { name="bios2mds"; version="1.2.2"; sha256="1avzkbk91b7ifjba5zby5r2yw5mibf2wv05a4nj27gwxfwrr21cd"; depends=[amap e1071 scales cluster rgl]; }; -biotools = derive { name="biotools"; version="1.2"; sha256="0wiv10qqah6yp5kwsndv48agnvrfl3j04pj0nsyiwyf9nvajxvic"; depends=[rpanel tkrplot MASS boot]; }; +biotools = derive { name="biotools"; version="2.0"; sha256="02yw5pfj9858j02yi30bvll5pp67dpkzx3y5ka5bwwz7a5g7dvx3"; depends=[rpanel tkrplot MASS boot]; }; bipartite = derive { name="bipartite"; version="2.05"; sha256="05w3ypdxy2lfygdlvg9xv88dpsf21i60rsbvvz058zwpfzr39hfh"; depends=[vegan sna fields igraph MASS permute]; }; biplotbootGUI = derive { name="biplotbootGUI"; version="1.0"; sha256="0pgm31nhh1b78a8ciqjxw7gf3j7hh9wjc3myj29jpl92flbqmsw0"; depends=[rgl tkrplot vegan tcltk2]; }; birdring = derive { name="birdring"; version="1.2"; sha256="1jhhvdipsx3kw8n6gw6amm1vq0m83l48dkark9vvi2hpd730ca1y"; depends=[geosphere ks lazyData raster rgdal rgeos rworldmap rworldxtra sp]; }; -birk = derive { name="birk"; version="1.2"; sha256="0lp3bvp0qlsggmq65208vm1hiprhr1c4pzay6xf4lhwprx47i5kw"; depends=[]; }; +birk = derive { name="birk"; version="1.3.0"; sha256="02h8vh2r1ilmfgx1j3yw9jlzwshqh70nac28qzq1f5mpqll8z1sg"; depends=[]; }; bisectr = derive { name="bisectr"; version="0.1.0"; sha256="1vjsjshvzj66qqzg32rviklqswrb00jyq6vwrywg1hpqhf4kisv7"; depends=[devtools]; }; bisoreg = derive { name="bisoreg"; version="1.1"; sha256="16d6nxbj18y6wv57nxbmwv0gypsgf7hw76hsyv0fhydrkf404igb"; depends=[bootstrap monreg R2WinBUGS coda]; }; bit = derive { name="bit"; version="1.1-12"; sha256="0a6ig6nnjzq80r2ll4hc74za3xwzbzig6wlyb4dby0knzf3iqa6f"; depends=[]; }; @@ -2437,14 +2484,15 @@ bitops = derive { name="bitops"; version="1.0-6"; sha256="176nr5wpnkavn5z0yy9f7d bivarRIpower = derive { name="bivarRIpower"; version="1.2"; sha256="0vgi0476rwali6k8bkp317jawzq5pf04v75xmycpmadb7drnpzy0"; depends=[]; }; biwavelet = derive { name="biwavelet"; version="0.17.5"; sha256="01zhpwq1a3g1pjwbjqh3p1q9jhqqngrxcs9vp4r2zrj3rn9d5x38"; depends=[fields]; }; biwt = derive { name="biwt"; version="1.0"; sha256="1mb3x8ky3x8j4n8d859i7byyjyfzq035i674b2dmdca6mn7paa14"; depends=[rrcov MASS]; }; -bizdays = derive { name="bizdays"; version="0.1.5"; sha256="0y25sm77chk77s4wdb5a4r583ks44mpny9w8c8azbx7nhcvfb4yq"; depends=[]; }; +bizdays = derive { name="bizdays"; version="0.2.1"; sha256="1n8dv2damcfbxs0bq7icbw74invai2799al5vipp1mr09qlwsg02"; depends=[]; }; blender = derive { name="blender"; version="0.1.2"; sha256="1qqkfgf7fzwcz88a43cqr8bw86qda33f18dg3rv1k77gpjqr999c"; depends=[vegan]; }; blighty = derive { name="blighty"; version="3.1-4"; sha256="1fkz3vfcnciy6rfybddcp5j744dcsdpmf7cln2jky0krag8pjzpn"; depends=[]; }; blkergm = derive { name="blkergm"; version="1.1"; sha256="0giknhcl14b4djn5k5v5n33b7bc3f8x6lx2h4jr25kpd89aynhq5"; depends=[network ergm statnet_common ergm]; }; blm = derive { name="blm"; version="2013.2.4.4"; sha256="1w6c30cq38j4i1q4hjg12l70mhy5viw886l1lsnxyvniy113in4i"; depends=[]; }; blme = derive { name="blme"; version="1.0-2"; sha256="11m98j9xr6w0hfcss4bbx2aa34gnc5p9if9r8ilw9ify18by77np"; depends=[lme4]; }; +blmeco = derive { name="blmeco"; version="1.0"; sha256="0shhyvqq88i0nr6wdf78rlqk4c91jv26nrb19jcjcw2wxv1mnazq"; depends=[MASS MuMIn arm lme4]; }; blockTools = derive { name="blockTools"; version="0.6-2"; sha256="0h04179ybklwbs69rg73p5h09fi3vzagh845r00ivw4iv18anq40"; depends=[MASS]; }; -blockcluster = derive { name="blockcluster"; version="3.0.1"; sha256="1lxm20f8dhxfnm13j08sj7h3sfwc8limyqn8n87c3kl87066gdaq"; depends=[Rcpp Rcpp RcppEigen]; }; +blockcluster = derive { name="blockcluster"; version="3.0.2"; sha256="1qd92lj3ckrj7cvl9zs85igb0974wy5s4zwdnvfyvrsi2bqi3qp8"; depends=[Rcpp Rcpp RcppEigen]; }; blockmatrix = derive { name="blockmatrix"; version="1.0"; sha256="14k69ly4i8pb8z59005kaf5rpv611kk1mk96q6piyn1gz1s6sk6r"; depends=[]; }; blockmodeling = derive { name="blockmodeling"; version="0.1.8"; sha256="0x71w1kysj9x6v6vsirq0nndsf6f3wzkf8pbsq3x68sf4cdji1xl"; depends=[]; }; blockrand = derive { name="blockrand"; version="1.3"; sha256="1090vb26w6s7iqjcal0xbb3qb6p6j46a5w25f1wjdppd1spvh7f9"; depends=[]; }; @@ -2457,7 +2505,7 @@ bmk = derive { name="bmk"; version="1.0"; sha256="1wxkrlrhmsxsiraj8nyiax9bqs834l bmmix = derive { name="bmmix"; version="0.1-2"; sha256="00php2pgpnm9n0mnamchi6a3dgaa97kdz2ynivrf38s0vca7fqx8"; depends=[ggplot2 reshape2]; }; bmp = derive { name="bmp"; version="0.2"; sha256="059ps1sy02b22xs138ba99fkxq92vzgfbyf2z5pyxwzszahgy869"; depends=[]; }; bmrm = derive { name="bmrm"; version="3.0"; sha256="0ix5hfsvs2vnca0l1aflynddw6z85cqdyxn0y7xynkkapk182g4p"; depends=[lpSolve LowRankQP]; }; -bnlearn = derive { name="bnlearn"; version="3.7"; sha256="0pn6q77qz0rk1hscrpjyqn0wn540i7d6zvhgnsjj9iijcpk4sh63"; depends=[]; }; +bnlearn = derive { name="bnlearn"; version="3.7.1"; sha256="0wfly2c3il48c31jz3fvmhz285z4kapw6v0k993608gjli0sg86m"; depends=[]; }; bnormnlr = derive { name="bnormnlr"; version="1.0"; sha256="0l2r7vqikak47nr6spdzgjzhvmkr9dc61lfnxybmajvcyy6ymqs9"; depends=[mvtnorm numDeriv]; }; bnpmr = derive { name="bnpmr"; version="1.1"; sha256="0hvwkdbs2p2l0iw0425nca614qy3gsqfq4mifipy98yxxvgh8qgc"; depends=[]; }; boa = derive { name="boa"; version="1.1.7-2"; sha256="1n7i0i8jq2sa1kzhbgyqzl9d53wja7fsxd7rligc8xjm0sdsb386"; depends=[]; }; @@ -2466,7 +2514,7 @@ bold = derive { name="bold"; version="0.2.0"; sha256="06dnhhf2bmiqxizarsqd6l2dcs boolean3 = derive { name="boolean3"; version="3.1.6"; sha256="00s6ljhqy8gpwa3kxfnm500r528iml53q364bjcl4dli2x85wa9p"; depends=[optimx numDeriv lattice rgenoud mvtnorm rlecuyer]; }; boostSeq = derive { name="boostSeq"; version="1.0"; sha256="0sikyzhn1i6f6n7jnk1kb82j0x72rj8g5cimp2qx3fxz33i0asx6"; depends=[genetics lpSolveAPI]; }; boostr = derive { name="boostr"; version="1.0.0"; sha256="123ag8m042i1dhd4i5pqayqxbkfdj4z0kq2fyhxfy92a7550gib2"; depends=[foreach iterators stringr]; }; -boot = derive { name="boot"; version="1.3-14"; sha256="0myi9s0h1dbsh55gf6k03cmx4z2bsv9nxmjklsk4665j4rnmj4wn"; depends=[]; }; +boot = derive { name="boot"; version="1.3-15"; sha256="0d2faa3vs31af9bc4kzfywz60jib8b7j233xb5pzpj3y2j6mdjlr"; depends=[]; }; bootES = derive { name="bootES"; version="1.01"; sha256="00y901d5cjdpzras5w6mv851h5zgp36m5ib6dazs4vqrfpqymva8"; depends=[boot]; }; bootLR = derive { name="bootLR"; version="0.9"; sha256="0p4hq8nfdd8jw8r8dmlb6va4g7jjnkbsah69hissa9lqawbj9pi7"; depends=[boot]; }; bootRes = derive { name="bootRes"; version="1.2.3"; sha256="0bb7w6wyp9wjrrdcyd3wh44f5sgdj07p5sz5anhdnm97rn1ib6dz"; depends=[]; }; @@ -2490,6 +2538,7 @@ breakage = derive { name="breakage"; version="1.1-1"; sha256="0zjazyz92criiimpz4 breakaway = derive { name="breakaway"; version="1.0"; sha256="1agigb3b2ff1p9lx9ndz4hs1sgyv1g2zjb41l5p23370i5gk1nbn"; depends=[]; }; breakpoint = derive { name="breakpoint"; version="1.1"; sha256="07k5d1jn5ahhml2q9ynpmwjm2ckyrr63qj7svh2ziyb41f5v7mfw"; depends=[ggplot2 MASS msm foreach doParallel]; }; brew = derive { name="brew"; version="1.0-6"; sha256="1vghazbcha8gvkwwcdagjvzx6yl8zm7kgr0i9wxr4jng06d1l3fp"; depends=[]; }; +brewdata = derive { name="brewdata"; version="0.4"; sha256="1i8i3yhyph212m6jjsij61hz65a5rplxw8y2xqf6daqiisam5q6i"; depends=[RCurl XML stringdist]; }; brglm = derive { name="brglm"; version="0.5-9"; sha256="14hxjamxyd0npak8wyfmmb17qclj5f86wz2y9qq3gbyi2s1bqw2v"; depends=[profileModel]; }; bride = derive { name="bride"; version="1.3"; sha256="03k9jwklg1l8sqyjfh914570880ii0qb5dd9l0bg0d0qrghbj0rk"; depends=[]; }; brnn = derive { name="brnn"; version="0.5"; sha256="0kf2fdgshk8i3jlxjfgpdfq08kzlz3k9s7rdp4bg4lg3khmah9d1"; depends=[Formula]; }; @@ -2527,7 +2576,7 @@ caper = derive { name="caper"; version="0.5.2"; sha256="1l773sxmh1nyxlrjz8brnwhw capm = derive { name="capm"; version="0.5"; sha256="1pal7v965zyl52fivdqn30w570gvhxjsnafml6jz16x4kszw5jar"; depends=[deSolve FME survey ggplot2 reshape2 shiny rgdal maptools sp]; }; capushe = derive { name="capushe"; version="1.0"; sha256="0dwxaiqnz0qbsk4icjapklaa9bpjfl4gqvk1f92livy97jmf1r44"; depends=[MASS]; }; capwire = derive { name="capwire"; version="1.1.4"; sha256="18a3dnbgr55yjdk6pd7agmb48lsiqjpd7fm64dr1si6rpgpl4i9c"; depends=[]; }; -car = derive { name="car"; version="2.0-22"; sha256="0jffyz0gv0isc9ww3mv1y40b16lkmh2skvljc93aff5q84plam78"; depends=[MASS nnet]; }; +car = derive { name="car"; version="2.0-24"; sha256="1rg2asrwwwinqn0h7xqyx8qv77yq1sa13c8sbmnz8bzm9xx366as"; depends=[MASS mgcv nnet pbkrtest quantreg]; }; carcass = derive { name="carcass"; version="1.3"; sha256="1psxdxdqlc999xylizj5vg1p1pzyrikg9gjqvpv4k0q9b5h0nrpj"; depends=[lme4 survival expm arm MASS]; }; cardidates = derive { name="cardidates"; version="0.4.5"; sha256="1zw8c8jiq8bz748xppwj88z1882qk7k2r0k2gkrsvw7b6c9h35pb"; depends=[boot pastecs]; }; care = derive { name="care"; version="1.1.7"; sha256="0lgas00qp1cvn3cbimxlli99czvkh6b9hxahzif5fgbnfik4d47y"; depends=[corpcor]; }; @@ -2542,8 +2591,8 @@ catIrt = derive { name="catIrt"; version="0.5-0"; sha256="09010z1q96nbnpys6mybsp catR = derive { name="catR"; version="3.4"; sha256="0rgzcnqp18wb8m7f3m8mm7pv04a1irlknkrsrr4hhnzs0phf06yz"; depends=[]; }; catdata = derive { name="catdata"; version="1.2.1"; sha256="0fjylb55iw8w9sd3hbg895pzasliy68wcq95mgrh7af116ss637w"; depends=[MASS]; }; catenary = derive { name="catenary"; version="1.1"; sha256="0khdk61fh8ngr70qf9i2655h5nblj98r8zl724ljv1cjb5x1vphv"; depends=[ggplot2 boot]; }; -cati = derive { name="cati"; version="0.8"; sha256="0kz58dyq5jacf2w2nvhyh3dvk0vgcrm7fjfirywykbrbh5srfw2a"; depends=[nlme ade4 ape e1071 mice rasterVis hypervolume]; }; -catnet = derive { name="catnet"; version="1.14.5"; sha256="1h5azkl5b1a25a9fianab4nc4qwwlrmsvhjpfsn91k5mq8449ah0"; depends=[]; }; +cati = derive { name="cati"; version="0.96"; sha256="07vvhar1skcmx0sqkp4bcrrlmb88llqpgg4vmdi4nqhw48kjyjqn"; depends=[nlme ade4 ape e1071 mice rasterVis hypervolume FD geometry vegan]; }; +catnet = derive { name="catnet"; version="1.14.8"; sha256="03y7ddjyra3cjq7savdgickmw82ncx4k01rn752sks6rpl6bjslc"; depends=[]; }; catspec = derive { name="catspec"; version="0.97"; sha256="1crry0vg2ijahkq9msbkqknljx6vnx2m88bmy34p9vb170g9dbs1"; depends=[]; }; causaleffect = derive { name="causaleffect"; version="1.0"; sha256="1xg0dczqk10nnybm3i9rcnsqr34y86dngb7p6vl1n7bhxrn580jf"; depends=[igraph XML]; }; causalsens = derive { name="causalsens"; version="0.1"; sha256="1v72zjplsa073f92qdza1zvwa1fwxlpmh8f6w5z8qcyiwqcbmifr"; depends=[]; }; @@ -2551,15 +2600,18 @@ cba = derive { name="cba"; version="0.2-14"; sha256="067rm1rfz0rrq8xkzibd81pwvc9 ccChooser = derive { name="ccChooser"; version="0.2.6"; sha256="1vgp4zhg46hcf9ma2cmwgnfrqkmq1arh0ahyzjpfk3817vh7disc"; depends=[cluster]; }; ccaPP = derive { name="ccaPP"; version="0.3.0"; sha256="1wj5yij02372xarhvxsnh43v0l6xb2p8rflmskw6x86vpcdqd6zw"; depends=[Rcpp pcaPP robustbase RcppArmadillo Rcpp RcppArmadillo]; }; cccd = derive { name="cccd"; version="1.04"; sha256="0mhqv9hzvw3w6wp23kvw4py54ij6x9r19b87i97wwgqr5rhhh1f3"; depends=[igraph plotrix proxy]; }; +cccp = derive { name="cccp"; version="0.2-4"; sha256="1hw0xzfdycrnhkym5va430jk1b9ywf7wbm9qyj4a62n210hk4nzc"; depends=[Rcpp Rcpp RcppArmadillo]; }; cccrm = derive { name="cccrm"; version="1.1"; sha256="0q7vxzj3lblz5ddgzm8z99k0b0z194963hx96bbkqm4rv705dgb0"; depends=[nlme gdata]; }; ccda = derive { name="ccda"; version="1.1"; sha256="0ya9x1b41l0pjyyfdswjyip0c2v8z7gncbj7cdz0486ad75229x7"; depends=[MASS]; }; ccgarch = derive { name="ccgarch"; version="0.2.3"; sha256="0angffla3sk9i86v6bbsav95fp3mz5yvq7qfv0fx2v0nd2cx116w"; depends=[]; }; +cchs = derive { name="cchs"; version="0.1.0"; sha256="1x6pzwjdcklkbgr1yalijrcj3g56hj6085fh4pzqbm7xkqcj1mi6"; depends=[survival]; }; cclust = derive { name="cclust"; version="0.6-19"; sha256="11lzzpr65jw7s0419bdy3w7cq97ysvv52ijb1wgqpa48wh1qbqqd"; depends=[]; }; cda = derive { name="cda"; version="1.5.1"; sha256="09a2jb25219hq6if3bx03lsp94rp2ll9g73dhkdi665y7rlhgqwh"; depends=[dielectric Rcpp statmod randtoolbox reshape2 plyr Rcpp RcppArmadillo]; }; cdb = derive { name="cdb"; version="0.0.1"; sha256="1rdb4lacjcw67apdyiv7cl1xvv9d1mrzck1qk605n6794k7wf2ys"; depends=[bitops]; }; cdcsis = derive { name="cdcsis"; version="1.0"; sha256="1fxdsaqpjhpffn2fxddfcrx8wxwyvfws6rxkpp57g25980xiyzkd"; depends=[ks]; }; -cec2005benchmark = derive { name="cec2005benchmark"; version="1.0.3"; sha256="1fc833ji557y2vb6snlxh90gz1n7fxjfkwjmdcmasj1sfzaalsjy"; depends=[]; }; -cec2013 = derive { name="cec2013"; version="0.1-4"; sha256="199r6b1gkay9a7v1x7v2w8xmxmafvizdyb1dkiq3qylsqvhq994d"; depends=[]; }; +cds = derive { name="cds"; version="1.0"; sha256="0gzvsw4s5pjrdbck4j985sl59pslcmliny9664srrv4iqc6i8z6i"; depends=[MASS limSolve clue colorspace copula]; }; +cec2005benchmark = derive { name="cec2005benchmark"; version="1.0.4"; sha256="0bwv63l31hiy63372nvnyfkpqp61cqjag0gczd2v2iwsy3hyivpd"; depends=[]; }; +cec2013 = derive { name="cec2013"; version="0.1-5"; sha256="07i2vp1x3qaw5di5vr5z70d47hh9174pjckjlhgv0f2w97slwc1i"; depends=[]; }; celestial = derive { name="celestial"; version="1.2"; sha256="1bwxr37vkgxavl230jmvk1yp3acnkcpc8im10fsxh1nfxys254ap"; depends=[]; }; cellVolumeDist = derive { name="cellVolumeDist"; version="1.3"; sha256="00hq3nbfbnmg2lhrqd0glkh5ld50fv54ll3q6v875d1lgs44sln1"; depends=[minpack_lm gplots]; }; cem = derive { name="cem"; version="1.1.10"; sha256="0lykr7sksii30nk4z8pvn4bdmvhm5952grrsvb63qblazg3b84qc"; depends=[nlme lattice randomForest combinat]; }; @@ -2600,7 +2652,7 @@ chromer = derive { name="chromer"; version="0.1"; sha256="0fzl2ahvzyylrh4247w9yj chromoR = derive { name="chromoR"; version="1.0"; sha256="1x11byr6i89sdk405h6jd2rbvgwrcvqvb112bndv2rh9jnrvcw4z"; depends=[haarfisz gdata]; }; chron = derive { name="chron"; version="2.3-45"; sha256="0jkanbisi1bxh35rg0i6sl82f8r9v8va8mf8hknfvwv7p7n3ddpx"; depends=[]; }; cin = derive { name="cin"; version="0.1"; sha256="1pwvy5nh5nrnysfqrzllb9fcrpddqg02c7iw3w9fij2h8s2v6kq5"; depends=[]; }; -circlize = derive { name="circlize"; version="0.2.1"; sha256="04wrk515gx2ccmniimddpqbjc6y8x3b12w0n93j7lizmck4zsrzj"; depends=[GlobalOptions]; }; +circlize = derive { name="circlize"; version="0.2.2"; sha256="001zic779ydc1535fx00lmgk92hv2yn4kq5cangwhrwxj6ycfimy"; depends=[GlobalOptions]; }; circular = derive { name="circular"; version="0.4-7"; sha256="1kgis2515c931ir76kpxnjx0cscw4n09a5qz1rbrhf34gv81pzqw"; depends=[boot]; }; cit = derive { name="cit"; version="1.3"; sha256="05gr9pb01l4rs79rpgcj8mds61n3kv50fgcw2bcibzs1d1za33ig"; depends=[]; }; citbcmst = derive { name="citbcmst"; version="1.0.4"; sha256="1zkd117h9nahwbg5z6byw2grg5n3l0kyvv2ifrkww7ar30a2yikl"; depends=[]; }; @@ -2608,7 +2660,7 @@ citccmst = derive { name="citccmst"; version="1.0.2"; sha256="1b7awn1hjckxisfdi4 cjoint = derive { name="cjoint"; version="1.0.3"; sha256="0f9yh4rbgqlx12vx336isfxc3lnrl5sgbapld0qfkv93p26in9h6"; depends=[sandwich lmtest ggplot2]; }; clValid = derive { name="clValid"; version="0.6-6"; sha256="1l9q7684vv75jnbymaa10md13qri2wjjg7chr1z1m0rai8iq3xxw"; depends=[cluster class]; }; cladoRcpp = derive { name="cladoRcpp"; version="0.14.4"; sha256="0d4vl7xrrwbhhx56ymw52rb5svw9nskxdya4dl04lw1qxc45p4jy"; depends=[Rcpp Rcpp RcppArmadillo]; }; -class = derive { name="class"; version="7.3-11"; sha256="1j6wqirih9x6q50vq21543np4i99ia6ih2ffriiw1gms8xmdfrsk"; depends=[MASS]; }; +class = derive { name="class"; version="7.3-12"; sha256="14baglhxk8xv3857s9b0immizh7sakk3spa5s4v28ysh7i94wx6i"; depends=[MASS]; }; classGraph = derive { name="classGraph"; version="0.7-4"; sha256="08cid5bdbciyijlzkx3684gx0cyzcj8myawf4dhcrz00jqrg8v60"; depends=[]; }; classInt = derive { name="classInt"; version="0.1-22"; sha256="0r9940bv6n43i6vlcgc19bvmcv3zlw0bi9zfs3scvah68rdb7v7l"; depends=[e1071 class]; }; classifly = derive { name="classifly"; version="0.4"; sha256="0mw1vcas0gr1r4yvh0j02zhk7kp5342r0bhhg776hqgqdczgh5zj"; depends=[class plyr]; }; @@ -2617,7 +2669,7 @@ classyfire = derive { name="classyfire"; version="0.1-2"; sha256="0rar3mi2m1wf14 clere = derive { name="clere"; version="1.1"; sha256="1jna5dqy47mldd557qxl7vr59v5lalhligvm3c4k6b2dfararhfr"; depends=[Rcpp Rcpp RcppEigen]; }; clhs = derive { name="clhs"; version="0.5-4"; sha256="0535mpl1dbm9ij1dvj8dsmv4fickdg47by1mvf71lgfk5mjxy5nc"; depends=[ggplot2 sp raster reshape2 plyr scales]; }; clickstream = derive { name="clickstream"; version="1.1.3"; sha256="0vhwhklyxpirza6j7cq8rcv7mli2w1pkvld70ih8i1xb1dx3y19x"; depends=[igraph plyr reshape2 Rsolnp]; }; -climdex_pcic = derive { name="climdex.pcic"; version="1.1-4"; sha256="1jn4hzngmwag9jxhz6w45xzfn0cwiyiik6ylyns2zmil7avjplmr"; depends=[PCICt caTools Rcpp]; }; +climdex_pcic = derive { name="climdex.pcic"; version="1.1-5"; sha256="0r6y3ylxdfkbhrx4vbzs1f7y86gdfny3dxzskc48l3qv75q5276m"; depends=[PCICt caTools Rcpp]; }; clime = derive { name="clime"; version="0.4.1"; sha256="0qs9i7cprxddg1cmxhnmcfhl7v7g1r519ff2zfipxbs59m5xk9sf"; depends=[lpSolve]; }; clinUtiDNA = derive { name="clinUtiDNA"; version="1.0"; sha256="0x3hb09073gkh60fc8ia0sfk948sm6z6j8sqkz275k4m8ryrabas"; depends=[]; }; clinfun = derive { name="clinfun"; version="1.0.6"; sha256="00prrdm6qm5p2sjjlhi99msvqpxcm492z378wgl65iwf0jywdnpw"; depends=[mvtnorm]; }; @@ -2625,10 +2677,10 @@ clinsig = derive { name="clinsig"; version="1.0-5"; sha256="1jb2qk6hfvms85whymrf clogitL1 = derive { name="clogitL1"; version="1.4"; sha256="0m9yrg9mzzfv5qkdf6w55xyrjdghyrf27kk7b4x2gyvwvi5b7dkm"; depends=[Rcpp Rcpp]; }; cloudUtil = derive { name="cloudUtil"; version="0.1.10"; sha256="1j86vpd4ngrdpfjk44wb1mp0l88dxia64pjd2idfcd276giplh6s"; depends=[]; }; clpAPI = derive { name="clpAPI"; version="1.2.6"; sha256="1kgzmzf87b0j43ch21anmm2d73bj2d16slmyavpbkdwg72dg1sjb"; depends=[]; }; -clue = derive { name="clue"; version="0.3-48"; sha256="1lwfm5sk9d35khcrvjs91bixfnjc3zwyfzq5ma9ljsc6hs80y8ar"; depends=[cluster]; }; +clue = derive { name="clue"; version="0.3-49"; sha256="1gz9imirwlvmvzn9j0rmdrrax2girf78xfrxw6mrhal66g48bsrj"; depends=[cluster]; }; clues = derive { name="clues"; version="0.5-4"; sha256="0pgd3vjfplvsfn3nw6sqlkfsv6lbpjlcai7z9qp31qcih3g71vgr"; depends=[]; }; clustMD = derive { name="clustMD"; version="1.0"; sha256="1i3c790k300a7y5xhqanp8f1bid2q3a0ajwgf5qsr6dv3ld4h7vj"; depends=[tmvtnorm mvtnorm truncnorm MASS mclust msm]; }; -cluster = derive { name="cluster"; version="1.15.3"; sha256="014aycvxnw86rvzg8z6n9q2g7h5bzz6slz6l7vcaiiqpk9jxijj1"; depends=[]; }; +cluster = derive { name="cluster"; version="2.0.1"; sha256="09l2vydyabk7x19bblxbjm68vnmifz46m5k3csb1snpbhq6qx52c"; depends=[]; }; cluster_datasets = derive { name="cluster.datasets"; version="1.0-1"; sha256="0i68s9305q08fhynpq24qnlw03gg4hbk4184z3q3ycbi8njpr4il"; depends=[]; }; clusterCrit = derive { name="clusterCrit"; version="1.2.4"; sha256="150iq5gp5czb8m7niyi294jjy3dbfpwccgak7scahd5kz2vs07c7"; depends=[]; }; clusterGeneration = derive { name="clusterGeneration"; version="1.3.1"; sha256="0lvkqqcshnaqk40s5y736r53y9yss3hlvgs6gs7p8ksk14vj7i2q"; depends=[MASS]; }; @@ -2649,7 +2701,7 @@ cmm = derive { name="cmm"; version="0.8"; sha256="1661v2lzxgf4s37wdsrnbsvqwppcr7 cmprsk = derive { name="cmprsk"; version="2.2-7"; sha256="1imr3wpnj4g57n2x4ryahl4lk8lvq9y2r7319zv3k82mznha8bcm"; depends=[survival]; }; cmprskQR = derive { name="cmprskQR"; version="0.9.0"; sha256="1vnrfhlmmyamkpd8lsfznfpcq0mspkiwn3j23yj4sarfx5n32s9a"; depends=[survival quantreg]; }; cmrutils = derive { name="cmrutils"; version="1.2-2"; sha256="0gc4sx8g9364sybmrqdjdvddqjd9ps6v205kaw0nqdx30xn96hmm"; depends=[chron]; }; -cmvnorm = derive { name="cmvnorm"; version="1.0"; sha256="18aqjxr2rm4v813w25bp0jjm3110b22r8yskmnpspcw44666829v"; depends=[emulator elliptic]; }; +cmvnorm = derive { name="cmvnorm"; version="1.0-1"; sha256="00cm7zfxbc5md3p6sakan64a6rzz7nbq0bqq9ys2iyxpilxalj3m"; depends=[emulator elliptic]; }; cna = derive { name="cna"; version="1.0-2"; sha256="06q335jr4kdydk79s8f1fg67wflhcb5ngl6gk1fqb096zkmhszxf"; depends=[]; }; cncaGUI = derive { name="cncaGUI"; version="0.0-2"; sha256="0iwsaqqnh142syag91rzwwsc9n2qiw4xh5x1gjsgc74ywdm4g5fz"; depends=[rgl tcltk2 tkrplot]; }; coalescentMCMC = derive { name="coalescentMCMC"; version="0.4"; sha256="115kvrk46hzhr83vkk57jn90dw2fvj1pl56w6mlja16i93yaz10h"; depends=[ape coda Matrix phangorn]; }; @@ -2683,7 +2735,8 @@ commentr = derive { name="commentr"; version="0.1"; sha256="0kyi7xd2f2b1avk78bmk compHclust = derive { name="compHclust"; version="1.0-2"; sha256="1h39krvz516xwsvn5987i1zbzan8vx2411qz6dad112hpss0vyk9"; depends=[]; }; compactr = derive { name="compactr"; version="0.1"; sha256="0f2yds6inmx0lixj08ibqyd2i61l2cbg1ckgpb8dl2q7kcyyd6mx"; depends=[]; }; compare = derive { name="compare"; version="0.2-5"; sha256="073apjmw5hwslhnjwhff0m8lwszv29n6vbqy0wxl39pyzg7q2x41"; depends=[]; }; -compareGroups = derive { name="compareGroups"; version="2.0.5"; sha256="1r07g5l0x8bkgm13qzw992aw0wn2q2wcadidr9444nqhk2l8809b"; depends=[Hmisc xtable gdata SNPassoc survival epitools HardyWeinberg]; }; +compareC = derive { name="compareC"; version="1.3.1"; sha256="0dachfr23lps2jj1y5gc958k54vskmww84gdgk4amihsdgjsnphg"; depends=[]; }; +compareGroups = derive { name="compareGroups"; version="3.0"; sha256="0dgh72virrx9bwls5z9wbdh8rk0q1i08pmyh7wma532mx0yv8mzq"; depends=[Hmisc gdata xtable SNPassoc survival epitools HardyWeinberg]; }; compareODM = derive { name="compareODM"; version="1.2"; sha256="019hq8j56asjvh4x1p65785mf38xr05j3by0749gl9k9yl8645da"; depends=[XML]; }; comparison = derive { name="comparison"; version="1.0-4"; sha256="0pc462rhk8gr8zrf08ksi315kmhydlp027q5gd40ap5mmhk7rd82"; depends=[isotone]; }; compeir = derive { name="compeir"; version="1.0"; sha256="1bb5459wcqpjic2b9kjn0l0qdn7sqmmx34hdb2aqg80q22mhx5dv"; depends=[lattice etm]; }; @@ -2697,6 +2750,7 @@ concor = derive { name="concor"; version="1.0-0.1"; sha256="0hjyvi6p16cyrmq0bq7f concreg = derive { name="concreg"; version="0.5"; sha256="0psvnirl5rqicyzxs9sivh23bzzwdgviqczdl2in2gnrvdiw7m6f"; depends=[survival]; }; cond = derive { name="cond"; version="1.2-3"; sha256="0y7m7valk7zn40y62348czmdvfkx59il9sl6wy565lzqfiimd9ps"; depends=[statmod survival]; }; condGEE = derive { name="condGEE"; version="0.1-4"; sha256="0mqj2pc91n8h3arpd4b9f7ndbcnai21c67is22qg22wj7vhhs87h"; depends=[numDeriv rootSolve]; }; +condMVNorm = derive { name="condMVNorm"; version="2015.2-1"; sha256="04563jljnjhbiaiq33gn5dxjfvv05xp3lhl3w942v0smy0cdhrh4"; depends=[mvtnorm]; }; condmixt = derive { name="condmixt"; version="1.0"; sha256="05q1fj7akf6lsq9rbcqqkzlx82jvk6mlvmwx6jzk8j228fwqmg90"; depends=[evd]; }; coneproj = derive { name="coneproj"; version="1.5"; sha256="1xk6v5hp5v5hcxnl8fhb9ccv343yjpswrgm65p4046sw0b764pny"; depends=[Rcpp RcppArmadillo Rcpp]; }; conf_design = derive { name="conf.design"; version="2.0.0"; sha256="06vdxljkjq1x56xkg041l271an1xv9wq79swxvzzk64dqqnmay51"; depends=[]; }; @@ -2712,8 +2766,9 @@ contrast = derive { name="contrast"; version="0.19"; sha256="1kc3scz3msa52lplc79 convevol = derive { name="convevol"; version="1.0"; sha256="05nhpndixvrmiq5paswj7qwsq3k3al34q3j751bic4kb8zhby3fk"; depends=[ape geiger MASS phytools cluster]; }; cooccur = derive { name="cooccur"; version="1.2"; sha256="0v26aa6j77dmm7pdij4qaz03mxn69aa71rw6n5yl3b9qb0w4k81z"; depends=[reshape2 gmp ggplot2]; }; cooptrees = derive { name="cooptrees"; version="1.0"; sha256="0izvwna1jsqik3v5fz1r4c86irvma42clw0p4rdvwswv5pk698i1"; depends=[igraph optrees gtools]; }; -copBasic = derive { name="copBasic"; version="1.7.0"; sha256="1lqlxka3x5q17g9i9fzm9m2zssd5cm3dy56s7wm8rxgj30bxddm4"; depends=[lmomco]; }; +copBasic = derive { name="copBasic"; version="1.7.1"; sha256="0qhrazzsrc429z9fsbqklvwdfgn65adck51vp74jijjd0p6pki4s"; depends=[lmomco]; }; copCAR = derive { name="copCAR"; version="1.0"; sha256="0rq432w959p7drx73vsrdh5dhi2wy7dsjhhb4nh9wm36kkzki5ca"; depends=[numDeriv Rcpp spam Rcpp RcppArmadillo]; }; +cope = derive { name="cope"; version="0.1"; sha256="1g00dzy99m4212wrkhmqf8ibmilhp75hd2yv7yfzi28nr5jgir3m"; depends=[maps fields MASS mvtnorm]; }; copula = derive { name="copula"; version="0.999-12"; sha256="131wr6a7qxsdsl9f5amjkzj2wwgdwlg85a1pmd0bflzfi86dvrdf"; depends=[Matrix lattice gsl ADGofTest stabledist mvtnorm pspline]; }; copulaedas = derive { name="copulaedas"; version="1.4.1"; sha256="1xs02s91la4i1x1zs8k5gfvd9jhs2zqhv58431p1j3spfapzf2rc"; depends=[copula vines mvtnorm truncnorm]; }; corHMM = derive { name="corHMM"; version="1.15"; sha256="1f1qq8fnnx68mpfj863pml4xynxsl21f9r1qqv7yfrx14daki4a0"; depends=[ape nloptr expm numDeriv corpcor phangorn rgenoud]; }; @@ -2724,7 +2779,7 @@ coreTDT = derive { name="coreTDT"; version="1.0"; sha256="14rnh61gk3m6g8rq77hm9y corpcor = derive { name="corpcor"; version="1.6.7"; sha256="1vfzi17vkvzbqgzhmpdhybb6lli0z9vm9p31cwb8bn8ddlkn5ll4"; depends=[]; }; corpora = derive { name="corpora"; version="0.4-3"; sha256="0zh8mabfy9yqgx7asi4yqv4c0kj59yvyxxaxjgdjy5kkr17zd4g4"; depends=[]; }; correlate = derive { name="correlate"; version="1.0"; sha256="0hv0i928f49p8n78hd3bcx923l2x0zcs4kwj71ph8gm7s8540fhc"; depends=[]; }; -corrgram = derive { name="corrgram"; version="1.6"; sha256="1y0963hqh909pqfjkjp2wwq1npmy7qp37gyfyy5vcspl2fic4afb"; depends=[seriation]; }; +corrgram = derive { name="corrgram"; version="1.7"; sha256="1zs0i4dhl1c5ms70cmy8cc9qi9y3ssd62brd7jrpagz56sdwwx0k"; depends=[seriation]; }; corrplot = derive { name="corrplot"; version="0.73"; sha256="0xnlkb8lhdjcc10drym9ymqzvfwa3kvf955y0k66z5jvabzyjkck"; depends=[]; }; corrsieve = derive { name="corrsieve"; version="1.6-8"; sha256="0ak3j9khcwv5rxbicck2sr260wpmd3xj254y7pdavx2fk0b72yxs"; depends=[]; }; cosinor = derive { name="cosinor"; version="1.1"; sha256="02nnqg51vq48lzk667cyarnmhcf5mifnsdij7dlgqvz2k4fdq4pl"; depends=[ggplot2 shiny]; }; @@ -2741,7 +2796,7 @@ covTest = derive { name="covTest"; version="1.02"; sha256="0p4di8bdjghsq5jd678dp covreg = derive { name="covreg"; version="1.0"; sha256="0v19yhknklmgl58zhvg4szznb374cdh65i7s8pcj2nwrarycwzaq"; depends=[]; }; coxinterval = derive { name="coxinterval"; version="1.0"; sha256="0x6xnc5wf5sivwn0hd99lmb52wj5swj01r9wrky9f61nji3fjv4v"; depends=[Matrix survival timereg]; }; coxme = derive { name="coxme"; version="2.2-3"; sha256="1s9h03crzmvi0szg5rhq0m48q9i7hdppn1k528nfca5ikw2l37h9"; depends=[survival bdsmatrix nlme Matrix bdsmatrix]; }; -coxphf = derive { name="coxphf"; version="1.10"; sha256="15bpy6vcn65pnknqbiqhpbpddhzyslgsc06g8rnamg60akg4p3v8"; depends=[survival]; }; +coxphf = derive { name="coxphf"; version="1.11"; sha256="0494szmhc7qp1qynrqf3kmna26h4ams40qr6w7qj4al54mkp0346"; depends=[survival]; }; coxphw = derive { name="coxphw"; version="3.0.0"; sha256="11pyd09dwkbixjz1riv8rz3jrp1ix6cbn1fw9nm8vnrc19x5lkz5"; depends=[survival]; }; coxrobust = derive { name="coxrobust"; version="1.0"; sha256="08hp0fz5gfxgs3ipglj6qfr6v63kzxkrzg650bmzabq8dvrxd97q"; depends=[survival]; }; cpa = derive { name="cpa"; version="1.0"; sha256="14kcxayw4cdbjfa6bvfzqp8flwc0sr3hmh2dnr1dfax0hnccd71m"; depends=[]; }; @@ -2787,7 +2842,7 @@ cudaBayesregData = derive { name="cudaBayesregData"; version="0.3-11"; sha256="1 cudia = derive { name="cudia"; version="0.1"; sha256="1ms3bc8sp6l3bm75j418mmb707sy3gyvxznhfias3nd4sw7i074x"; depends=[MCMCpack mvtnorm]; }; cumSeg = derive { name="cumSeg"; version="1.1"; sha256="01hn3j1i7bi2r9vsqwbgy1f1alcisxyf4316xx57bg82lb34d0s5"; depends=[lars]; }; cumplyr = derive { name="cumplyr"; version="0.1-1"; sha256="07sz1wryl3kxbk67qyvnkrkdrp4virlsaia0y6rf9bqdw7rc6vi2"; depends=[]; }; -curl = derive { name="curl"; version="0.4"; sha256="0w9i527ww9603w25pqw7mawlsjxdpgqd8az6yppdxpvycci41j0f"; depends=[]; }; +curl = derive { name="curl"; version="0.5"; sha256="1fws0402amazfa9wihgydrwrl19rmhi67shc3r1g8hvzfvax5ham"; depends=[]; }; currentSurvival = derive { name="currentSurvival"; version="1.0"; sha256="0bqpfwf4v4pb024a98qwg81m6zd7ljg1ps42ifhxpqx7b9gdyi6c"; depends=[survival cmprsk]; }; curvHDR = derive { name="curvHDR"; version="1.0-3"; sha256="0rq72prxv2r5nicss9mh4wpkfjvlbb885w85ag4qrqijzq6y8q04"; depends=[feature geometry hdrcde ks misc3d ptinpoly rgl]; }; curvetest = derive { name="curvetest"; version="2.2"; sha256="1lz6rx9fmgyrlci1dyanscp2a18ki9lhrwnrzhp062flysffimg6"; depends=[locfit R_oo R_methodsS3]; }; @@ -2804,7 +2859,7 @@ cxxfunplus = derive { name="cxxfunplus"; version="1.0"; sha256="0kyy5shgkn7wikjd cycloids = derive { name="cycloids"; version="1.0"; sha256="00pdxny11mhfi8hf76bfyhd1d53557wcbl2bqwjzlpw5x3vdnsan"; depends=[]; }; cyphid = derive { name="cyphid"; version="1.1"; sha256="0ya9w8aw27n0mvvjvni4hxsr4xc8dd08pjxx7zkfl1ynfn5b08am"; depends=[fda]; }; cytoDiv = derive { name="cytoDiv"; version="0.5-3"; sha256="00c0gqgypywgbhavb15bvj6ijrk4b5zk86w85n9kwr4069b7jvwc"; depends=[GenKern plotrix]; }; -d3Network = derive { name="d3Network"; version="0.5.1"; sha256="1nc5gca9jsny5jj8m37081l3rwvmp1cxqpqaimzyr475j6cac40r"; depends=[plyr rjson whisker]; }; +d3Network = derive { name="d3Network"; version="0.5.2.1"; sha256="1gh979z9wksyxxxdzlfzibn0ysvf6h1ij7vwpd55fvbwr308syaw"; depends=[plyr rjson whisker]; }; dae = derive { name="dae"; version="2.4-0"; sha256="1gf3x751if3g2p7yy8jsvpn612w36mjhkz8qkh0y0kajm0nipzkb"; depends=[ggplot2]; }; daewr = derive { name="daewr"; version="1.1-4"; sha256="0pmz4721999vf023hpvsf17k5fgqpwnisnwssmav46glhmzl2cyj"; depends=[lattice FrF2 BsMD]; }; dafs = derive { name="dafs"; version="1.0-37"; sha256="1vdi57qaqdn39yf1ih2gzry02l289q4bffpksglsl4shs6bg2206"; depends=[s20x]; }; @@ -2816,7 +2871,7 @@ darts = derive { name="darts"; version="1.0"; sha256="07i5349s335jaags352mdx8chf dashboard = derive { name="dashboard"; version="0.1.0"; sha256="1znqwvz49r47lp6q48qaas0s63wclgybav82a247qvcavzns3kip"; depends=[Rook]; }; data_table = derive { name="data.table"; version="1.9.4"; sha256="0gsnjjly3mxwfs6q0kjr42vr234mprp8kcyzcsa4dqf2ya2gs1s6"; depends=[chron reshape2]; }; dataQualityR = derive { name="dataQualityR"; version="1.0"; sha256="0f2410sd6kldv7zkqsmbz1js0p5iq7zwlnfwmmnlbrd303p35p3j"; depends=[]; }; -dataRetrieval = derive { name="dataRetrieval"; version="2.1.0"; sha256="1ncackbcf3vqnaf01g5xcbdyjghkfn0gilmrdp2gzfgkd3jp4lx2"; depends=[XML RCurl reshape2 lubridate plyr]; }; +dataRetrieval = derive { name="dataRetrieval"; version="2.1.1"; sha256="0d2m8yv471kcxr855r6s9p2dadmlc8ks16iafsvhcf8a9id7p91x"; depends=[XML RCurl reshape2 lubridate plyr]; }; datacheck = derive { name="datacheck"; version="1.0.4"; sha256="1ns5cmsvmqswzpa33mqcmj92b4j3l32v29ki3crg0kayrpdmyrbw"; depends=[Hmisc shiny stringr]; }; dataframes2xls = derive { name="dataframes2xls"; version="0.4.6"; sha256="18m4cbr3pxdn5ynxwd8klwwli3cyfjcn83pl17sn1rbavqlnkq5c"; depends=[]; }; datalist = derive { name="datalist"; version="0.2"; sha256="0q82wira0sfi63cn66f5cfyd15f19ig7pbmpk56j38a3115l2fmn"; depends=[assertthat]; }; @@ -2850,7 +2905,8 @@ deal = derive { name="deal"; version="1.2-37"; sha256="1nn2blmxz3j5yzpwfviarnmab deamer = derive { name="deamer"; version="1.0"; sha256="1xbxr78n6s1yhf192ab4syi1naqlwl9z4cxzchrkw80q7bxqfiz8"; depends=[]; }; debug = derive { name="debug"; version="1.3.1"; sha256="0mpwi6sippxyr1l8xf48xqv6qw6pmfkxs13k1gjyd7bkzlbchgqd"; depends=[mvbutils]; }; decctools = derive { name="decctools"; version="0.2.0"; sha256="0k5w49s9s51m7w1h5adk26nw1ypwv5g1mlal78qmx5a4jzaf5bw9"; depends=[XLConnect stringr XML reshape2 RCurl lubridate plyr]; }; -decompr = derive { name="decompr"; version="1.3.2"; sha256="1d8i2qjxwspqqwlmiykpq8nk13kmxbfdhaxg3jmp70876hsxjp73"; depends=[]; }; +decode = derive { name="decode"; version="1.0"; sha256="03r0b3igk687n8xh2p7c7ii87bj8ihny2h0qcrciql9cjwvxkala"; depends=[]; }; +decompr = derive { name="decompr"; version="2.1.0"; sha256="0b24wb2n2g1qf5v60hrazfzy211y1f2v9mkx013msb0a89a7bi45"; depends=[]; }; decon = derive { name="decon"; version="1.2-4"; sha256="1v4l0xq29rm8mks354g40g9jxn0didzlxg3g7z08m0gvj29zdj7s"; depends=[]; }; deducorrect = derive { name="deducorrect"; version="1.3-5"; sha256="06lcqnay36fgkzvgbiq7b67r9lfgll3lxfr1pmx14vmivshb6mmm"; depends=[editrules]; }; deepnet = derive { name="deepnet"; version="0.2"; sha256="09crwiq12wzwvdp3yxhc40vdh7hsnm4smqamnk4i6hli11ca90h4"; depends=[]; }; @@ -2858,11 +2914,11 @@ degenes = derive { name="degenes"; version="1.1"; sha256="1xxn5j06qizywimrp1pl8z degreenet = derive { name="degreenet"; version="1.2"; sha256="07b6phgyydfp8jwjvrqcvcx3b2qhbkr44xkcn20ya1igsbyh6kzz"; depends=[]; }; deldir = derive { name="deldir"; version="0.1-7"; sha256="0di37vy2na4wm5281831f5rj855lq9pjf2k61lfl1vslr5fjx96i"; depends=[]; }; deltaPlotR = derive { name="deltaPlotR"; version="1.5"; sha256="0hbaibl4b50pg9ypyhz4700w6kir4jiyyl0230a8hjmb92aqn303"; depends=[MASS]; }; -demi = derive { name="demi"; version="1.1.1"; sha256="19zszmjcczmz9qjp1dhvf92w134266w4qwskdpz36q72m5455zdb"; depends=[plyr R_utils]; }; +demi = derive { name="demi"; version="1.1.2"; sha256="04dq4db9ibvv91nm0gz8dfbgv1gpmalf9hv6i78dwhh1xzjg1mig"; depends=[R_utils plyr devtools]; }; deming = derive { name="deming"; version="1.0-1"; sha256="00v59qb6qwbwsvcwi59d0c0g3czfz1190ccj4dx6yarizr4g6cy8"; depends=[boot]; }; demoKde = derive { name="demoKde"; version="0.9-3"; sha256="1nkvsjms1gfvjz5l7zza0cgx4yqmn2kgnax44pysn0zqmhfny8bw"; depends=[]; }; demography = derive { name="demography"; version="1.18"; sha256="17r7sz5ikngc4qg495wmn99xawmllpx7rw2gpv8q8bypbc47wlfv"; depends=[forecast rainbow ftsa cobs mgcv strucchange RCurl]; }; -dendextend = derive { name="dendextend"; version="0.17.5"; sha256="0mjmxmkla4vhni0bgm6z9375pjcghccd10595bq1z84g1fxzqrjc"; depends=[magrittr whisker]; }; +dendextend = derive { name="dendextend"; version="0.18.3"; sha256="1s6bdkibb066yima31sn8ddp8qrwyx2zc84wf2kixs37ynhw1xi1"; depends=[magrittr whisker]; }; dendextendRcpp = derive { name="dendextendRcpp"; version="0.5.1"; sha256="062f7yjsg196v8c09h6gvbhi0fzgwg40a8xhi751avkjc68z30cq"; depends=[Rcpp dendextend Rcpp]; }; dendroextras = derive { name="dendroextras"; version="0.2.1"; sha256="0k1w374r4fvfcbzhrgcvklccjggyz755z7wc2vqfi3c5hvdb9ns4"; depends=[]; }; dendsort = derive { name="dendsort"; version="0.3.2"; sha256="0qj65jraj6ksmsfsrc4f3y8m7x5lqg9bqc9yb5s3bav2r8qjyhv6"; depends=[]; }; @@ -2882,12 +2938,13 @@ desirability = derive { name="desirability"; version="1.6"; sha256="17g998fmps4y desire = derive { name="desire"; version="1.0.7"; sha256="0jmj644nj6ck0gsk7c30af9wbg3asf0pqv1fny98irndqv508kf6"; depends=[loglognorm]; }; detect = derive { name="detect"; version="0.3-2"; sha256="1mjc8h3xb2zbj4dxala8yqbdl94knf9q0qvkc37ag1b2w4y2d2b0"; depends=[Formula]; }; detrendeR = derive { name="detrendeR"; version="1.0.4"; sha256="1z10gf6mgqybb9ml6z3drq65n7g28h2pqpilc2h84l6y76sy909c"; depends=[dplR]; }; +devEMF = derive { name="devEMF"; version="2.0"; sha256="19wraakvf7xsf1i108dz3ipl1hdixgwa6h0bizxfyajw5yqmw8mw"; depends=[]; }; devtools = derive { name="devtools"; version="1.7.0"; sha256="0d1hic61niw4fkjw9jnzslc25jcvprjn8mn6wapfpxpkm63499ff"; depends=[httr RCurl memoise whisker evaluate digest rstudioapi jsonlite roxygen2]; }; df2json = derive { name="df2json"; version="0.0.2"; sha256="10m7xn7rm4aql1bzpckjcx5kvdw44m1pxgzqkgkd40lzqb1cwk18"; depends=[rjson]; }; -dfcomb = derive { name="dfcomb"; version="1.0-1"; sha256="159lgcsanhxiip18f9cgsska1nij7yg9rrxfnyhyk3l7d8vf1liq"; depends=[BH RcppProgress Rcpp]; }; +dfcomb = derive { name="dfcomb"; version="2.0-2"; sha256="0a3larpfm9v195kmiv17njv8l4qnmlxav9rcg9pxvlhbni5pv3dw"; depends=[RcppArmadillo BH RcppProgress Rcpp]; }; dfcrm = derive { name="dfcrm"; version="0.2-2"; sha256="1kwgxfqnz2bcicyb27lp6bnvrj30lqjpn5fg7kaqshgkj53g0s4f"; depends=[]; }; dfexplore = derive { name="dfexplore"; version="0.2.1"; sha256="04nbhn59l1kas26nwj4qflkjvvr33sj1mm7zg7fhvya85gvlhrbf"; depends=[ggplot2]; }; -dfmta = derive { name="dfmta"; version="1.1-0"; sha256="0sxxiqj7in4g1hah0kmslh3bcj3grrb7slq7lh9xbgf0cfw5j7sr"; depends=[RcppArmadillo BH RcppProgress Rcpp]; }; +dfmta = derive { name="dfmta"; version="1.1-2"; sha256="147d3qakv2mpcr1rl4pshmw6kg1xah46j45crz1fr2iigy9ail14"; depends=[RcppArmadillo BH RcppProgress Rcpp]; }; dfoptim = derive { name="dfoptim"; version="2011.8-1"; sha256="19j0h5xdrbmykz2nrjrwqwaw7466zvqaiwafrm1jc12mk5azfcqx"; depends=[]; }; dglars = derive { name="dglars"; version="1.0.5"; sha256="02g8x4p98jv3cfwfxvh68aivb72651w4977g4xqksq0p4nqcs636"; depends=[]; }; dglm = derive { name="dglm"; version="1.8.1"; sha256="12q49nf30ji4c7vysf2s48bif7crwlmqn8cx0wy23xlhj5x2p4b3"; depends=[statmod]; }; @@ -2904,7 +2961,7 @@ difR = derive { name="difR"; version="4.5"; sha256="0qlaqpywyjggw74h5y5r2aivcykn diffEq = derive { name="diffEq"; version="1.0-1"; sha256="1xmb19hs0x913g45szmm26xx5xp85v182wqf0lnl4raxaf47yhkm"; depends=[deSolve rootSolve bvpSolve ReacTran deTestSet shape]; }; diffIRT = derive { name="diffIRT"; version="1.4"; sha256="13axwzsrlr1akj4viwsyaplh11krixg3l07qi58c81jrcrmqpgv1"; depends=[statmod]; }; diffdepprop = derive { name="diffdepprop"; version="0.1-9"; sha256="0mgrm1isr26v2mcm6fkzc7443ji00vpnqmw4zngx81n7442b3cl2"; depends=[gee rootSolve PropCIs]; }; -diffeR = derive { name="diffeR"; version="0.0-1"; sha256="06gfff2108g81h5x3g0mzda64hvpzz92y5vh3qgxfr8dbldcvmvn"; depends=[rgdal raster ggplot2]; }; +diffeR = derive { name="diffeR"; version="0.0-2"; sha256="1dkmwr6klqx950g9214n2rbd0p3k668w5217b0nvz6vfp3gczkjz"; depends=[rgdal raster ggplot2]; }; diffractometry = derive { name="diffractometry"; version="0.1-8"; sha256="1m6cyf1kxm9xf1z4mn4iz0ggiy9wcyi8ysbgcsk7l78y7nqh1h99"; depends=[]; }; diffusionMap = derive { name="diffusionMap"; version="1.1-0"; sha256="1l985q2hfc8ss5afajik4p25dx628yikvhdimz5s0pql800q2yv3"; depends=[scatterplot3d igraph Matrix]; }; digest = derive { name="digest"; version="0.6.8"; sha256="0m9grqv67hhf51lz10whymhw0g0d98466ka694kya5x95hn44qih"; depends=[]; }; @@ -2918,7 +2975,7 @@ dirmult = derive { name="dirmult"; version="0.1.3-4"; sha256="1r9bhw1z0c1cgfv7jc disclap = derive { name="disclap"; version="1.5"; sha256="0piv9gxhxcd4pbh5qjn9c3199f32y3qiw5vy8cr77ki70dnmr66n"; depends=[]; }; disclapmix = derive { name="disclapmix"; version="1.6"; sha256="0g1yg4n4pfy0295faw2scfh45m978ymmlx9bl3h8849kfaizkysi"; depends=[Rcpp disclap cluster Rcpp]; }; discreteMTP = derive { name="discreteMTP"; version="0.1-2"; sha256="13qsf1kc3rph0kkdkz31qj072www5dwjyk73lfpy141rzhcn1v1x"; depends=[]; }; -discreteRV = derive { name="discreteRV"; version="1.1.3"; sha256="1xsy596w080p3gzxrhvyzs1amic5xmqygzialyhz8mywywir4s57"; depends=[plyr]; }; +discreteRV = derive { name="discreteRV"; version="1.1.4"; sha256="1bxr8rjqjx58bkkp96zk3hdssp43kcdzfjif95kda25by7926s3z"; depends=[plyr MASS]; }; discretization = derive { name="discretization"; version="1.0-1"; sha256="00vq2qsssnvgpx7ihbi9wcafpb29rgv01r06fwqf9nmv5hpwqbmp"; depends=[]; }; discrimARTs = derive { name="discrimARTs"; version="0.2"; sha256="088v4awic4bhzqcr7nvk2nldf8cm1jqshg2pzjd2l2p1cgwmlxib"; depends=[RUnit]; }; diseasemapping = derive { name="diseasemapping"; version="1.1.5"; sha256="1v1pbsi15dizclmpqqjiwkwfv55ai4hky71rza4nfmyffjznwdz8"; depends=[sp]; }; @@ -2933,7 +2990,7 @@ distfree_cr = derive { name="distfree.cr"; version="1.0"; sha256="13y714l6b3kkpp distillery = derive { name="distillery"; version="1.0-1"; sha256="0hfj4qbfb5219dm7yrgf2h4jrh2qsjhwrbv8gbrxcr0xf6gqbxmv"; depends=[]; }; distory = derive { name="distory"; version="1.4.2"; sha256="12j19cb1b4prm8m43gya15kia1ii1k0yy7hkngpn2vsyk7n2z65m"; depends=[ape]; }; distr = derive { name="distr"; version="2.5.3"; sha256="13ssdidbh4x534f0vvhfpi5cdrhlpmrz8s0y33q7ccf3dfmdsyan"; depends=[startupmsg sfsmisc SweaveListingUtils]; }; -distrDoc = derive { name="distrDoc"; version="2.5"; sha256="104y8q7p53pzwr5pgspa0zczmnhylac2k9aj9flqd75ka6icfqh8"; depends=[distr distrEx distrSim distrTEst distrTeach RandVar distrMod MASS SweaveListingUtils startupmsg]; }; +distrDoc = derive { name="distrDoc"; version="2.5.1"; sha256="02wcqy9z36lxkpxy42vj1yv7x2v3i57rngpw58s7immzp5j3dlam"; depends=[distr distrEx distrSim distrTEst distrTeach RandVar distrMod MASS SweaveListingUtils startupmsg]; }; distrEllipse = derive { name="distrEllipse"; version="2.5"; sha256="1slzzmcf09mqqba287rpgpwbsq6j5lprjgxda5lrc21znvrgfxn3"; depends=[mvtnorm setRNG distr distrEx distrSim]; }; distrEx = derive { name="distrEx"; version="2.5"; sha256="0mbccd53r9wl875i702j14wlrv7pjgrwzlnyc511cqa5pg3mn81i"; depends=[distr]; }; distrMod = derive { name="distrMod"; version="2.5.3"; sha256="1xa6a8fxhb87z4bimvnrylm63q9m90kmm49w2dik79a9d5x5q29b"; depends=[distr distrEx RandVar MASS sfsmisc startupmsg]; }; @@ -2946,6 +3003,7 @@ divagis = derive { name="divagis"; version="1.0.0"; sha256="1kcz7i3h9xxpqhlq0rl0 diveMove = derive { name="diveMove"; version="1.3.9"; sha256="0782b8fvh676g6fy05g1da52q398rxmgz46vk6yxwrmnvg78wcq5"; depends=[caTools KernSmooth quantreg geosphere]; }; diveRsity = derive { name="diveRsity"; version="1.9.73"; sha256="07lln4fkphwk8kgvw4hsi7rghpwza8967z2gkb2265l28irv7ffm"; depends=[ggplot2 shiny qgraph Rcpp Rcpp]; }; diversitree = derive { name="diversitree"; version="0.9-7"; sha256="0hr3hzrrbmfqbzcwn18lnqmychs9f21j1x214zry0jmw9pnai0s0"; depends=[deSolve ape subplex Rcpp Rcpp]; }; +divo = derive { name="divo"; version="0.1.1"; sha256="10kymbvp46rzdd6a6p2fri9424sdxj2bhhv0fld7ikk71xgpfdrp"; depends=[RcppCNPy cluster]; }; dixon = derive { name="dixon"; version="0.0-5"; sha256="0x7x0l7p8kmkfqqqah8hck2r96b3w8padd41skd3q35vq8kmnsqc"; depends=[splancs spatstat]; }; dkDNA = derive { name="dkDNA"; version="0.1.0"; sha256="1waqj8l48yqlzi3rb3ilxyx79n5d4w0sp02flvynwaxck6jvh8gc"; depends=[]; }; dlm = derive { name="dlm"; version="1.1-4"; sha256="0hyphl90bqc16j7in750pmiyq28hmc46kxgv7gj17c8xl9c9xqxm"; depends=[]; }; @@ -2977,12 +3035,13 @@ dplR = derive { name="dplR"; version="1.6.2"; sha256="1w8p4pfzpvarwx9an3zm158pyb dplyr = derive { name="dplyr"; version="0.4.1"; sha256="0kcwg922gzvwz1vfazwknb2sn2z9wfg9xhndi4280lg8cjdllcmw"; depends=[assertthat R6 Rcpp magrittr lazyeval DBI Rcpp BH]; }; dpmixsim = derive { name="dpmixsim"; version="0.0-8"; sha256="0paa2hmpd6bqf0m7p9j7l2h3j18lm64ya6ya8zvp55wm8pf7xgqg"; depends=[oro_nifti cluster]; }; dr = derive { name="dr"; version="3.0.9"; sha256="0gmxa5mbmkz54l75ss6kj5ka5kingf02pqj0xsfjxfv0311hwm52"; depends=[MASS]; }; +drat = derive { name="drat"; version="0.0.1"; sha256="1vj67q8l6mjkzrdyi325jjdpr0gr1i6sns8sdk4g964kx372f7ih"; depends=[]; }; drawExpression = derive { name="drawExpression"; version="1.0"; sha256="0c2daicqrjlqf7s788cknzvw9c6rm500lgmwfr7z03bq7bd2ah90"; depends=[]; }; drc = derive { name="drc"; version="2.3-96"; sha256="0yrxa7rnsi7w4zdxd713m0l8bfsqnhcypzr091yazlahk33mybxf"; depends=[car gtools MASS magic plotrix lattice nlme]; }; drfit = derive { name="drfit"; version="0.6.3"; sha256="0vx5niw6mfg85937sbjmc0z0gdgf9aj43rmkn1gljky7pq4j3hfn"; depends=[MASS RODBC drc]; }; drgee = derive { name="drgee"; version="1.0.1"; sha256="0vrmi3q6dhmk9z5168pdfhi18nkm4pgj4zx8d24r4k1jcqvgckl0"; depends=[nleqslv]; }; drm = derive { name="drm"; version="0.5-8"; sha256="1p6ixd7hnv41gfmvan3rv9xzz1279hmrnvfrl6pxwzs9zcnbb53a"; depends=[]; }; -drmdel = derive { name="drmdel"; version="1.3"; sha256="0yflpja6r8cm4yv07ac1wic8w2iv0pwqpgh3ls2pjwv3vqzg7jrm"; depends=[]; }; +drmdel = derive { name="drmdel"; version="1.3.1"; sha256="1bpm9jj9dxk2daxp1yb7pn9jd750p27qa84vdfxpacm5r0mggnys"; depends=[]; }; dropR = derive { name="dropR"; version="0.1"; sha256="0sw5lqlfdn64dbykxdhk1pz18f83if871vkapa2nxgcfiy79b0vs"; depends=[plyr shiny]; }; drsmooth = derive { name="drsmooth"; version="1.0"; sha256="1cxhj28dkll704kif040vqnp9grb61v891rswvyx7aa9216156px"; depends=[car clinfun mgcv multcomp pgirmess DTK segmented mvtnorm]; }; ds = derive { name="ds"; version="3.0"; sha256="10xp575l0wh85wg32k3as02kgqm9ax9nx9i5kd5bkimfwg4qv745"; depends=[]; }; @@ -3001,7 +3060,7 @@ dunn_test = derive { name="dunn.test"; version="1.2.2"; sha256="0n7z2nimkpbh7d74 dupiR = derive { name="dupiR"; version="1.2"; sha256="0p649yw7iz6hnp7rqa2gk3dqkjbqx1f6fzpf1xh9088nbf3bhhz3"; depends=[plotrix]; }; dvfBm = derive { name="dvfBm"; version="1.0"; sha256="0gx11dxkbnh759ysd1lxdarlddgr3l5gwd5b0klwvwsgck6jv529"; depends=[wmtsa]; }; dvn = derive { name="dvn"; version="0.3.3"; sha256="14ncna67qgknh20xdvxqddjhagj61niwpvz4ava9k0z68rgzmk5h"; depends=[RCurl XML]; }; -dygraphs = derive { name="dygraphs"; version="0.3.3"; sha256="1fp3c968mri1iyxkj106prj75vmlkny7r51cj2q8wdv83jxrd63f"; depends=[magrittr htmlwidgets zoo xts]; }; +dygraphs = derive { name="dygraphs"; version="0.4.1"; sha256="0d3idvmv79qmgsh55lgznxxcdw1bqgwzj481nvcsspssymysfgqq"; depends=[magrittr htmlwidgets zoo xts]; }; dyn = derive { name="dyn"; version="0.2-9"; sha256="16zd32567aj0gqv9chbcdgi6sj78pnnfy5k8si15v5pnfvkkwslp"; depends=[zoo]; }; dynBiplotGUI = derive { name="dynBiplotGUI"; version="1.1.2"; sha256="1lcd164lxrrmzxr3rp3xwvwsnpa7am6c916vrbwy74ccg2bpbv7m"; depends=[tcltk2 tkrplot]; }; dynCorr = derive { name="dynCorr"; version="0.1-2"; sha256="0qzhhfhkwpq6mwg7y6sxpqvcj8klvivnfv69g7x3ycha1kw2xk3w"; depends=[lpridge]; }; @@ -3043,14 +3102,14 @@ edgeRun = derive { name="edgeRun"; version="1.0.9"; sha256="0d5nc8fwlm61dbi00dws editrules = derive { name="editrules"; version="2.7.2"; sha256="19g07caacwphvrqn900chrz3k6x4z8gmvlcvna5x2mqidcjkf25i"; depends=[igraph lpSolveAPI]; }; edrGraphicalTools = derive { name="edrGraphicalTools"; version="2.1"; sha256="09y63xj3gqrz66mym20g4pmfwrb0wnc2n67692hnqq8dz31q7p3i"; depends=[rgl mvtnorm MASS lasso2]; }; eegAnalysis = derive { name="eegAnalysis"; version="0.0"; sha256="1lrwjbhm5fnf5fhyyga2b21j2snnmj3zfvfxfkvgsbdnzr3qxaxb"; depends=[e1071 wmtsa fields splus2R]; }; -eegkit = derive { name="eegkit"; version="1.0-1"; sha256="171jfd4lq8xqqd1iajf9ljr3y77faidb0wpv6jasvwf4cb7lyasn"; depends=[bigsplines eegkitdata ica rgl]; }; +eegkit = derive { name="eegkit"; version="1.0-2"; sha256="10dksmc5lrl0ypifvmmv96xnndl2zx191sl79qif0gfs3wq3w4s0"; depends=[bigsplines eegkitdata ica rgl]; }; eegkitdata = derive { name="eegkitdata"; version="1.0"; sha256="1krsadhamv1m8im8sa1yfl7injvrc4vv3p88ps1mpn8hibk5g51m"; depends=[]; }; eeptools = derive { name="eeptools"; version="0.3.1"; sha256="0m6i0hiw565wgziknlf19rh2fq8zvzq2v5a0ppnwcv8vhbhyph3g"; depends=[ggplot2 MASS stringr maptools arm data_table memisc]; }; effects = derive { name="effects"; version="3.0-3"; sha256="10v99rv18jl10q0zhd4rvkx7dgab3b8w46jv1npqk9lx172iaf1y"; depends=[pbkrtest lme4 nnet lattice colorspace]; }; effsize = derive { name="effsize"; version="0.5.2"; sha256="0xhrq1a7vjcbipvmslmkw4widnp0scfcir80sr5npcx5pvxagsq3"; depends=[]; }; ega = derive { name="ega"; version="1.0.0"; sha256="1825lwr9bii16nbaj1ryh82gwg2p1r5dhn41cp3l728cfpz5gvlz"; depends=[ggplot2]; }; -egcm = derive { name="egcm"; version="1.0.2"; sha256="17fzxl34vc38308wbvjp5xdv1q48k4lf6gsw7ax27zc4chqlmqfz"; depends=[ggplot2 tseries zoo MASS]; }; -eggCounts = derive { name="eggCounts"; version="0.3"; sha256="0rsw0610jppnxvw22dj33sn1xq5wf44nsgszwi0jxcd45n1n2k8x"; depends=[coda actuar boot]; }; +egcm = derive { name="egcm"; version="1.0.6"; sha256="1j499f94ibr9rx544mwbpwjrwhzbdlvv1p156kj8pfnd7qin26xl"; depends=[zoo xts TTR ggplot2 tseries MASS urca fArma]; }; +eggCounts = derive { name="eggCounts"; version="0.4-1"; sha256="16prkcmpfjl1lab8m9hm0sfbdlh94ds3wi6ra9n2wnrpdn32fl20"; depends=[actuar boot coda]; }; egonet = derive { name="egonet"; version="1.2"; sha256="1f0fbqyk2ilmhirxvf1iwgfappi5r7807ag77r89lbaf5jq8akl0"; depends=[sna]; }; eha = derive { name="eha"; version="2.4-2"; sha256="0n3j9zl4xs5pc87j01symnj4yz523fng1gysrj8pz4wra4zlg83m"; depends=[survival]; }; eiPack = derive { name="eiPack"; version="0.1-7"; sha256="1cxk31bj012ijm85sf6l4rjrwayw94j2d6aav8p9g1f0raha2s6y"; depends=[MASS coda msm]; }; @@ -3059,6 +3118,7 @@ eigenmodel = derive { name="eigenmodel"; version="1.01"; sha256="0p9n28x5gg46nsz eigenprcomp = derive { name="eigenprcomp"; version="1.0"; sha256="156qyv7sl8nng55n3ay6dnpayyfrqv27ndz40xf4w92is9zmymy0"; depends=[]; }; eive = derive { name="eive"; version="2.1"; sha256="1vazl5dnrvljd07csy9rjs4302w09h94i411gffg9fvxn70km7qg"; depends=[Rcpp Rcpp]; }; eiwild = derive { name="eiwild"; version="0.6.7"; sha256="1fp4kvlmcjjnzn2a5cmlzaf6y5q6cdbbi2nmvjyqc4y1bmwh3srf"; depends=[gtools coda lattice]; }; +elastic = derive { name="elastic"; version="0.3.0"; sha256="1lr2g7badfmmxdpv9z3gzjnd99di2nn0c2mhmrvjdclwzv4pk83c"; depends=[httr jsonlite]; }; elasticnet = derive { name="elasticnet"; version="1.1"; sha256="1x8rwqb275lz86vi044m1fy8xanmvs7f7irr1vczps1w45nsmqr2"; depends=[lars]; }; elec = derive { name="elec"; version="0.1.2"; sha256="0f7ahrjb52w8a8l5v00xla6z9afpz2zrckl9v04xalp34snhdwan"; depends=[]; }; elec_strat = derive { name="elec.strat"; version="0.1.1"; sha256="09196k5c3jsikh98d33bn70izwcbx0wb5ki9fv1ij0dw9mnv4c3p"; depends=[elec]; }; @@ -3077,6 +3137,7 @@ emme2 = derive { name="emme2"; version="0.9"; sha256="035s4h95ychqb14wib0dqbg4sj emoa = derive { name="emoa"; version="0.5-0"; sha256="1wcnsnkdmpcn21dyql5dmj728n794bmfr6g9hgh9apzbhn4cri8p"; depends=[]; }; empiricalFDR_DESeq2 = derive { name="empiricalFDR.DESeq2"; version="1.0"; sha256="0vv104jgdwp5bg72v29614j831ndbw3sv105hkj9z3hi4ax16b5f"; depends=[]; }; emplik = derive { name="emplik"; version="0.9-9-6"; sha256="0qrrsws9hnb9f2zv50q4v9zx467n6hm83g841h3ba511iwjpp32r"; depends=[quantreg]; }; +emplik2 = derive { name="emplik2"; version="1.20"; sha256="0qdsfmnvds01qa4f112knv905k0fzccrqj9fwaqrqcy48cigm8pd"; depends=[]; }; emulator = derive { name="emulator"; version="1.2-15"; sha256="1rp7q7zs8b49jzdkbzm4s1g8554h41hcabf4d78k9jhhys2z28g2"; depends=[mvtnorm]; }; enRich = derive { name="enRich"; version="2.0"; sha256="13ahwdifm33h4h5mvmc49v39fbhiy291rbdwm4c8kxjrqjq9ip66"; depends=[]; }; enaR = derive { name="enaR"; version="2.8.1"; sha256="1p2vhqd1zxwar5fb16ibvwrzrxl7c574ls6747bkdjzlx7vznrn1"; depends=[MASS stringr sna network gdata]; }; @@ -3087,7 +3148,7 @@ english = derive { name="english"; version="1.0-1"; sha256="1413axjp2icj9wwnkz3v enigma = derive { name="enigma"; version="0.1.1"; sha256="1309w9nwh7kd1iivj5kq6sgi10k9ac69n3yl6a52ajqnm9rsg3lm"; depends=[httr jsonlite plyr]; }; enpls = derive { name="enpls"; version="1.0"; sha256="1grnabrb0kzjvjvwp9rx1xqfljla0jd5xrkcbwfzmy2ymmbvh6ma"; depends=[pls foreach doParallel]; }; enrichvs = derive { name="enrichvs"; version="0.0.5"; sha256="0x91s03hz1yprddm6mqi75bm45ki3yapfrxmap7d4qc0hi06h22k"; depends=[]; }; -ensembleBMA = derive { name="ensembleBMA"; version="5.0.8"; sha256="1wv1g1iwpmxhcgxgx78jc4w5kcbbzjxljj7pbfykgq7hjpkb109f"; depends=[chron]; }; +ensembleBMA = derive { name="ensembleBMA"; version="5.1"; sha256="12xssw8vwbiv296khig0dhbz30swglqi1m9m3j97gzpc4fi8s4lv"; depends=[chron]; }; ensembleMOS = derive { name="ensembleMOS"; version="0.7"; sha256="0g5qzdic5jvgn6wv7zh0jnz8malfgfxn26l7lg30y96vcmi4hk54"; depends=[ensembleBMA chron]; }; ensurer = derive { name="ensurer"; version="1.0"; sha256="07bjiq9sk5njksb1dyi5kqx3k4a454x8jy0q5v6n1m5lpyqf0py7"; depends=[]; }; entropart = derive { name="entropart"; version="1.2.1"; sha256="14cn0zkfk6w8qrbzis9nxhs0vmhpxn4ksa95j5zxr7lxn77piznz"; depends=[ade4]; }; @@ -3118,6 +3179,7 @@ ergm_userterms = derive { name="ergm.userterms"; version="3.1.1"; sha256="0pvklv ergmharris = derive { name="ergmharris"; version="1.0"; sha256="1bfijhsljlykb94wi25lbpv35zkmgqpmgzmxcq98gjvzbn5j9pdq"; depends=[]; }; erpR = derive { name="erpR"; version="0.2.0"; sha256="1y6abc5fkcyyjh36maj1zbxppqzwd5wkvzvqahyvzsz5fqpjkcdx"; depends=[rpanel]; }; esotericR = derive { name="esotericR"; version="1.0"; sha256="0kl9c2z2mpg3mk8jnl0ssgcf6y0i9jpczms746j8f07ydrcxpf41"; depends=[]; }; +estimability = derive { name="estimability"; version="1.1"; sha256="1inw2ir83bzz40gynwfcjzx7f6v99pqlphq7p3rmql01ikd2b6r9"; depends=[]; }; estout = derive { name="estout"; version="1.2"; sha256="0whrwlh4kzyip45s4zifj64mgsbnrllpvphs6i5csb7hi3mdb3i5"; depends=[]; }; etable = derive { name="etable"; version="1.2.0"; sha256="17xahaf2fz1qgqjaw8qbnss95il6g47m3w00yqc5nkvv37gs0q7c"; depends=[xtable Hmisc]; }; etasFLP = derive { name="etasFLP"; version="1.2.0"; sha256="0h81fm71q8qb2h0gz669cvqpzcd8jwq5yk2b8vwsiv4jlgfiq85g"; depends=[mapdata rgl fields maps]; }; @@ -3130,7 +3192,7 @@ eventInterval = derive { name="eventInterval"; version="1.2"; sha256="15g934n7fl events = derive { name="events"; version="0.5"; sha256="1zka4ygymifs8snd7cabl11b5lg3f8g8370dkm9ybl40bn8vvqq2"; depends=[]; }; eventstudies = derive { name="eventstudies"; version="1.1"; sha256="13l2yhmlpiid9r3njnmvja231l00ym7gvwfbv0m9fk2k5j6gm5id"; depends=[zoo xts boot]; }; evir = derive { name="evir"; version="1.7-3"; sha256="1kn139vvzdrx5r9jayjb4b0803b0bbppxk68z00gdb50mxgvi593"; depends=[]; }; -evmix = derive { name="evmix"; version="2.3"; sha256="1lp0k0ccpjaxy0l1chhr37jr2120g4x1xncvqq0dd162ppw8wqg8"; depends=[MASS gsl]; }; +evmix = derive { name="evmix"; version="2.4"; sha256="0a2mdvv5ckg58f7lc5x63c33pmcaf7drhv3z9xzi0ramgrmx8ahm"; depends=[MASS gsl SparseM]; }; evobiR = derive { name="evobiR"; version="1.0"; sha256="12j01qzc4yrjpxbj39bl29f5ypxwk33c6qf0mjjbgpwn5g6fgsi4"; depends=[seqinr ape stringr geiger taxize]; }; evolvability = derive { name="evolvability"; version="1.0"; sha256="17vkmb5208q4lx6jslx96nbhsl9m2c4ra6264bparbgrg34byg9x"; depends=[coda]; }; evora = derive { name="evora"; version="1.0"; sha256="0blq28ldynbq3v6rh0yk89wy1sjp4621h6iwnyyiipqwzihwrhz2"; depends=[Hmisc]; }; @@ -3143,7 +3205,7 @@ exactRankTests = derive { name="exactRankTests"; version="0.8-27"; sha256="0ygy3 exactci = derive { name="exactci"; version="1.3-0"; sha256="03mhgpyrgm3cb0hw908wxhi6pxrvcsw4r1lmbx95xn44j1p9zpzk"; depends=[ssanv]; }; exactmeta = derive { name="exactmeta"; version="1.0-2"; sha256="1v807ns799qajffky4k18iah0s3qh2ava6sz5i85hwx9dhkz19h4"; depends=[]; }; exams = derive { name="exams"; version="2.0-2"; sha256="1cv01wa3zs31zdc1qk6rsnimbs6m31r0j56syg6yjicfxiwxxm0v"; depends=[]; }; -excursions = derive { name="excursions"; version="1.1-20140610"; sha256="0x7rk00abf7fw9h2qqp6s2snkm1snkl35mgmxvgwv0a0jm3q56ls"; depends=[Matrix]; }; +excursions = derive { name="excursions"; version="2.0.16"; sha256="10z0mix7fx4pb9jpix5d00ch4i6jlvj2337s6ja916q6cczj21qr"; depends=[Matrix sp spam]; }; expands = derive { name="expands"; version="1.5"; sha256="14m5fzh302v0nchf875i4nwrr25wk7hych405psgfidq058pr985"; depends=[rJava flexmix matlab mclust moments ape permute]; }; expectreg = derive { name="expectreg"; version="0.39"; sha256="1mxhv6phc3lgp0zz20wszx4nr3by9p6492wcb0x8wn8p8p1sy1b3"; depends=[mboost BayesX quadprog]; }; experiment = derive { name="experiment"; version="1.1-1"; sha256="07yaf5k5fpymz2yvr52zbbi60g0v84qryvqqjq3sjq2mb1fjfz1p"; depends=[boot MASS]; }; @@ -3155,7 +3217,7 @@ expp = derive { name="expp"; version="1.1"; sha256="13zbhkkcshqrpln5gsa051d390q9 expsmooth = derive { name="expsmooth"; version="2.02"; sha256="1l9k4llzkqwzmrr1l68qr58ngzs3ql67hxrr5fcrcwwnaa1zinyj"; depends=[tseries forecast]; }; exptest = derive { name="exptest"; version="1.2"; sha256="0wgjg62rjhnr206hkg5h2923q8dq151wyv54pi369hzy3lp8qrvq"; depends=[]; }; exsic = derive { name="exsic"; version="1.1.1"; sha256="1k6nqs9i4iivxnk4nkimp6zvdly274wibkmx9n0wz01gnzxqil0p"; depends=[stringr markdown]; }; -extRemes = derive { name="extRemes"; version="2.0-4"; sha256="016jvifkwh0n1zfak1y963d1ixklc8f6glak627fmjldik67w4iv"; depends=[Lmoments distillery car]; }; +extRemes = derive { name="extRemes"; version="2.0-5"; sha256="1r1q26gb06db0nsd9m5r54sjhsdwbi3179ai4b71l849viragq4z"; depends=[Lmoments distillery car]; }; extWeibQuant = derive { name="extWeibQuant"; version="1.1"; sha256="08dzw5xfgqx0c7ac632c5mg5jmjjw7wwpcr4c9lvz5rv72ykh2rh"; depends=[]; }; extfunnel = derive { name="extfunnel"; version="1.3"; sha256="162w5b2wjs3yqy8jisamsapav6swa8sskf1b6x5hglnrv3i4qyyy"; depends=[rmeta]; }; extlasso = derive { name="extlasso"; version="0.2"; sha256="05774y0i01lrbyws6zx5ymhcglllv1wc7gzrnyx8i5d1lxdinsyd"; depends=[]; }; @@ -3200,7 +3262,7 @@ falsy = derive { name="falsy"; version="1.0"; sha256="16j6j7kf5xlqg6m2sfdfgpcjf9 fame = derive { name="fame"; version="2.18"; sha256="132wb59d15bs94fga5hwxxr9pklyp2rjn448nl8lx5spjrvycwf4"; depends=[tis]; }; fanc = derive { name="fanc"; version="1.13"; sha256="08qw4vhms8q2jyqqp2vlq8xdg7y7m0mcwb1pibm7wn938rgablq3"; depends=[Matrix]; }; fanovaGraph = derive { name="fanovaGraph"; version="1.4.7"; sha256="19bzl6yrmi5lgyx6nq3f7i0rdaz2ig580h8116axrsxpx8c4d52x"; depends=[sensitivity igraph DiceKriging]; }; -fanplot = derive { name="fanplot"; version="3.3"; sha256="0bv7x3xrsg0pmp9gmck30jypv8cwc03bv753m49dfpgs2p9srcmc"; depends=[]; }; +fanplot = derive { name="fanplot"; version="3.4.0"; sha256="1arb10jxksicrdpgj8fq8r0sdnzvvdjjbw357aplqh422x54w4mp"; depends=[]; }; faoutlier = derive { name="faoutlier"; version="0.4"; sha256="113qpwil669jr89kpqs6c6xzh0z3vp2hzfy98mh1dr2dvaznd06f"; depends=[sem lattice lavaan MASS]; }; far = derive { name="far"; version="0.6-4"; sha256="166lhswdd1shx591wvx8a3lwzjini60mc37rbb3qvm6fxrb6fl55"; depends=[nlme]; }; faraway = derive { name="faraway"; version="1.0.6"; sha256="10vj38chfnlz595pdi16v8gcwsbmn8a7p4gb0mm98dncyin5p2a3"; depends=[]; }; @@ -3213,21 +3275,22 @@ fastM = derive { name="fastM"; version="0.0-2"; sha256="0q5dz47sqj6d4r3k6l6q34l5 fastR = derive { name="fastR"; version="0.8-1"; sha256="08p03i72zn0cbwjsxpnsknk0148dx3pfwkw740x7f52c3jgbb1gi"; depends=[mosaic lattice mosaicData]; }; fastSOM = derive { name="fastSOM"; version="0.9"; sha256="03501d5289lrlr4qcgxciz160hqc6nhqb9ab266fr132fkbiv4id"; depends=[]; }; fastclime = derive { name="fastclime"; version="1.2.4"; sha256="0z91khjzffwy4mbqgkfw4l9mw32sg4p5pvcg4v24z1q44pgnwn4y"; depends=[lattice igraph MASS Matrix]; }; -fastcluster = derive { name="fastcluster"; version="1.1.15"; sha256="1xw1jswx9sm080346hwqdvkib4jqg022vxaq907jzg71kxcfd0c0"; depends=[]; }; +fastcluster = derive { name="fastcluster"; version="1.1.16"; sha256="0x2prrsnqi5iqx23ki6y2agndjq8058ph6s703i4avrqi1q1w1q8"; depends=[]; }; fastcox = derive { name="fastcox"; version="1.1.1"; sha256="1a5i0ragl0r6p29iamkn04igakiwyysykfbs2p6ybgy8pfdq69sv"; depends=[Matrix]; }; fastmatch = derive { name="fastmatch"; version="1.0-4"; sha256="16gfizfb1p7rjybrfm57nb6hdm30iirbppva8p8xf8pndz35fjbs"; depends=[]; }; fat2Lpoly = derive { name="fat2Lpoly"; version="1.1.1"; sha256="0xgxlx9m6lgcn784892g2xvnabyq8k45wi3xrszrbdxxa7zqd1i4"; depends=[kinship2 multgee]; }; fbRanks = derive { name="fbRanks"; version="2.0"; sha256="17kbmdpgqkj2n951c6mdsrgfga6kiij1gqiw1wpi0q3fq4dlfrzx"; depends=[igraph stringr]; }; fbati = derive { name="fbati"; version="1.0-1"; sha256="1ia67dg9b61kc14mjg7065v0c6n6agdp8cjdviasyzga00wzsyxj"; depends=[pbatR fgui rootSolve]; }; fcd = derive { name="fcd"; version="0.1"; sha256="091wbf5iskcgyr7jv58wrf590qijb0qcpninmvm3xrwxi34r37xr"; depends=[glmnet MASS combinat]; }; -fclust = derive { name="fclust"; version="1.0.1"; sha256="1xl8mw4wfwp9n9fmfmzxz8k8qyrk62qr77j085b3kgp7a85dp8ma"; depends=[]; }; +fclust = derive { name="fclust"; version="1.1"; sha256="1nimfgirpcff5dqqx2jqn25ma9j0agffimymrv9x5ivfdncdflbg"; depends=[]; }; fcros = derive { name="fcros"; version="1.3"; sha256="1ylkma69gfc5ij3vvf1axyasya31qm5bwj2bjlvj12byf52wsiy8"; depends=[]; }; fda = derive { name="fda"; version="2.4.4"; sha256="05rvrp29ip1wrk2wly06wdry2a2riynkx677nx5lg240lz12d6yw"; depends=[Matrix]; }; fda_usc = derive { name="fda.usc"; version="1.2.1"; sha256="1w0dw06vgviia4yy2v5mrq0jvnfvdp7y8f2x246v3xliqgjmg7as"; depends=[fda MASS mgcv rpart]; }; fdaMixed = derive { name="fdaMixed"; version="0.4"; sha256="15m13v71kqxd9gqiymgfkq0dvcpzp05576m8zkg08m0k067ga9bd"; depends=[Formula Rcpp Rcpp RcppArmadillo]; }; fdakma = derive { name="fdakma"; version="1.1.1"; sha256="0y70ckgxkns6p45gv9w02krrr96vzs8f838s5vk02c2m6ynp4prs"; depends=[]; }; fdasrvf = derive { name="fdasrvf"; version="1.4.2"; sha256="12x04fi0sxs9yh1mf9iykk69zlz6m31j7s01in28p5hgk6wqf8fi"; depends=[foreach mvtnorm matrixcalc numDeriv]; }; -fdatest = derive { name="fdatest"; version="2.0"; sha256="1flnfcsmak8zbq79sv8ims2ywx62983226ly3lp2j7mwj6dxflhw"; depends=[fda]; }; +fdatest = derive { name="fdatest"; version="2.1"; sha256="0zdnmssir5jz2kbfz4f4xshjfv4pivqx7cbh2arlx6ypkjrjws8n"; depends=[fda]; }; +fdrDiscreteNull = derive { name="fdrDiscreteNull"; version="1.0"; sha256="1388a9hjbgblmhx5f3ddk16kigzsik9bvw179d1szk33kadfq2vp"; depends=[MCMCpack]; }; fdrci = derive { name="fdrci"; version="2.0"; sha256="0smyl9phl02wghimawvff3h267w3h213jbqpka155i6cfzig9qjy"; depends=[]; }; fdrtool = derive { name="fdrtool"; version="1.2.13"; sha256="0308w4cycapddmv7cg6i65j6wbdckdgnl4n63v06bi4j9dcznksj"; depends=[]; }; fds = derive { name="fds"; version="1.7"; sha256="164f2cbywph7kyn712lfq4d86v22j4y3fg5i9zyz956hipqv0qvw"; depends=[rainbow RCurl]; }; @@ -3261,16 +3324,18 @@ fit_models = derive { name="fit.models"; version="0.5-10"; sha256="06pj26dbnq6mf fit4NM = derive { name="fit4NM"; version="3.3.3"; sha256="0k2194521yby6xxi77bpjp6ywz8kpnzws217m7n0hw6xwz5mqj1g"; depends=[gWidgets tkrplot RGtk2 gWidgetsRGtk2 cairoDevice]; }; fitDRC = derive { name="fitDRC"; version="1.1"; sha256="1f6avw8ia9ks17zdagpmh6yvcmi53h5cvm0wwv9hsb92x5zfhxn9"; depends=[]; }; fitTetra = derive { name="fitTetra"; version="1.0"; sha256="0ia6wk4gicpmn6kclsd28p7v1npwfv2blagiz0cxzwfw3njv103g"; depends=[]; }; +fitbitScraper = derive { name="fitbitScraper"; version="0.1.1"; sha256="1qmrf4lvvqhjsvnslhycy4wg7irsv7l8hr8g94l9p867cz42h58r"; depends=[httr stringr RJSONIO]; }; fitdistrplus = derive { name="fitdistrplus"; version="1.0-3"; sha256="11v2qiiyfqrlkmc8y48nfzm6s98xabq3ipgkrzb3n8ylwqakdwdq"; depends=[survival]; }; flam = derive { name="flam"; version="1.0"; sha256="0jyx0wff5zdpnhgxz74k6fxgwdnl7khanahv63af22y0mqpd066f"; depends=[MASS]; }; flare = derive { name="flare"; version="1.5.0"; sha256="03bq40lwwq49vvbarf37y7c3smm29mxqfxsc66gkg8l5pak4l38i"; depends=[lattice MASS Matrix igraph]; }; flashClust = derive { name="flashClust"; version="1.01-2"; sha256="0l4lpz451ll7f7lfxmb7ds24ppzhfg1c3ypvydglcc35p2dq99s8"; depends=[]; }; -flexCWM = derive { name="flexCWM"; version="1.3"; sha256="1hrp7lqh5gmn0mlda9mix0b1dkylrydkmhm6ipajy3kgqkxih6pi"; depends=[numDeriv mnormt mclust ellipse mixture Flury adehabitat MASS statmod]; }; +flexCWM = derive { name="flexCWM"; version="1.4"; sha256="0v8vrf3wy4dsqzrmxdsrp1vin4188frkyp71xxsv7nbg7xgf2i83"; depends=[numDeriv mnormt mclust ellipse mixture Flury adehabitat MASS statmod]; }; flexclust = derive { name="flexclust"; version="1.3-4"; sha256="1x9gyg69kb3wn02w885kl6hcwpf2ki66gzfayvc83jisrwxvdfvv"; depends=[lattice modeltools]; }; flexmix = derive { name="flexmix"; version="2.3-13"; sha256="1i205yw3kkxs27gqcs6zx0c2mh16p332a2p06wq6fdzb20bazg3z"; depends=[lattice modeltools nnet]; }; flexsurv = derive { name="flexsurv"; version="0.5"; sha256="0a0mhnz9xayb0pjx4glq09yiz8jplynkq8aniw9saxdik8zd1srg"; depends=[survival muhaz mvtnorm deSolve]; }; flip = derive { name="flip"; version="2.4.3"; sha256="04zf2gnk5w57gxnlnh26pn1ir1wfrzxhfhchr33ghk7prhc7k4b8"; depends=[e1071 someMTP cherry Rcpp Rcpp RcppArmadillo]; }; flora = derive { name="flora"; version="0.2.3"; sha256="03n2as362fcz7jbkprwqr2rs86njbkywczsf8cjfa2akwh93gj7s"; depends=[shiny]; }; +flower = derive { name="flower"; version="1.0"; sha256="1h2fvpjrvpbyrqb8hd51sslr1ibpwa7h9fiqy9anvf2yim5j11yq"; depends=[]; }; flowfield = derive { name="flowfield"; version="1.0"; sha256="1cx3i0w3xq781mmms4x20fshlf1i9bwxw9bxx562crix3fq3m50j"; depends=[]; }; flsa = derive { name="flsa"; version="1.05"; sha256="07z2b1pnpnimgbzkjgjl2b074pl9mml7nac2p8qvdgv7aj070cmh"; depends=[]; }; flux = derive { name="flux"; version="0.3-0"; sha256="0pc9cab2pwrfl0fnz29wp7a398r49hvbi50jp8i2fk2rfvck21a7"; depends=[caTools]; }; @@ -3313,6 +3378,7 @@ freqparcoord = derive { name="freqparcoord"; version="1.0.0"; sha256="0hn5y10yp3 freqweights = derive { name="freqweights"; version="1.0.1"; sha256="13wy8nzs888yn7ld96qq3p7k3xjn6s38qdlfb3nqmh52daqcnn7m"; depends=[plyr dplyr data_table biglm fastcluster FactoMineR]; }; frm = derive { name="frm"; version="1.2"; sha256="128ya5gx27hywkhf9mivscxsk8rgf07c0y65fh15hp1c8m6dx0nz"; depends=[]; }; frmhet = derive { name="frmhet"; version="1.0"; sha256="065lmmphz140r5gzspqkn6ch1mrlcwqb7rq7xb6sh0r9cizmqia3"; depends=[]; }; +frmpd = derive { name="frmpd"; version="1.0.1"; sha256="104frdraawj8g76589kz4csbgzkvs4rgdhgwmb77srhqp5nc8v96"; depends=[]; }; frmqa = derive { name="frmqa"; version="0.1-5"; sha256="0vd5jnjzhkc0vd4cqn4cs6a3limd4fxwyb5i7845rwmkzk1944aj"; depends=[partitions Rmpfr]; }; frontier = derive { name="frontier"; version="1.1-0"; sha256="0k2ap22qddzki63biikr1jzi5vmqz4j06d7qrf1y8axdq1q1cr44"; depends=[micEcon lmtest moments Formula miscTools]; }; frontiles = derive { name="frontiles"; version="1.2"; sha256="08qq25wbylvhvmq34wggyj0hwdlxfs9rfs8gjqsrg50xccchniqi"; depends=[classInt colorspace rgl sp]; }; @@ -3331,6 +3397,7 @@ funFEM = derive { name="funFEM"; version="1.0"; sha256="1jvax3ch21391f34gdd4yp8c funHDDC = derive { name="funHDDC"; version="1.0"; sha256="038m64yv27wz7ki2gcn94q011p8mv0ggmli5n27y0f5bnkfh6d6w"; depends=[fda]; }; functional = derive { name="functional"; version="0.6"; sha256="120qq9apg6bf39n9vnp68db5rdhwvnj2vi12a8j8243vq8kqxdqr"; depends=[]; }; funreg = derive { name="funreg"; version="1.1"; sha256="1sxr4mylcpbya197d55yi6d7g5pfspaf59xxbwjgmwgjw06rl76r"; depends=[MASS mgcv mvtnorm]; }; +funtimes = derive { name="funtimes"; version="1.0"; sha256="0jdl09x0fvfz08xyg1yfyhn0lgg8ycqbli4ag9js0yva8pwab7lh"; depends=[Jmisc]; }; futile_any = derive { name="futile.any"; version="1.3.0"; sha256="1c7pj64kz09qzwrxvkp1w1w8mvxwq36zkj6w4b7yyi8v7x3daq2a"; depends=[lambda_r]; }; futile_logger = derive { name="futile.logger"; version="1.3.7"; sha256="0mcca1d70a173f2c54g05fp6174z3265bc4z73k8hs16sfb3s7zf"; depends=[lambda_r futile_options]; }; futile_matrix = derive { name="futile.matrix"; version="1.2.2"; sha256="1cb975n93ck5fma0gvvbzainp7hv3nr8fc6b3qi8gnxy0d2i029m"; depends=[lambda_r lambda_tools futile_logger RMTstat]; }; @@ -3360,7 +3427,7 @@ gRim = derive { name="gRim"; version="0.1-17"; sha256="0vn031r318kp78cx00n43fc42 gSeg = derive { name="gSeg"; version="0.1"; sha256="0qnv3c0rla0g2fb4s4x1i0zdp3dlvi98qf80wlr54gnn7s9vpjf1"; depends=[]; }; gWidgets = derive { name="gWidgets"; version="0.0-54"; sha256="13lbbbnmkvb559klgsnz0q27qlyv102xakb6yccxsxjw249hm8c2"; depends=[]; }; gWidgets2 = derive { name="gWidgets2"; version="1.0-5"; sha256="1y6vm6ds77yr1qiqlcaixbsarbwx5w53ba343svla7wva80ajbpl"; depends=[digest]; }; -gWidgets2RGtk2 = derive { name="gWidgets2RGtk2"; version="1.0-2"; sha256="1pzcpjz5cdizvj0ih2r4i3ll6flm45q8ym6sz0wqbg4j3ir0l5kh"; depends=[memoise RGtk2 gWidgets2]; }; +gWidgets2RGtk2 = derive { name="gWidgets2RGtk2"; version="1.0-3"; sha256="041d510rxghcj5h6zw5258f4jnj1j9ycq2kdh0kl81fjr8n992jv"; depends=[memoise RGtk2 gWidgets2]; }; gWidgets2tcltk = derive { name="gWidgets2tcltk"; version="1.0-4"; sha256="1c9vfnr6j4lvshvdzp88a45pjrdl0dfhr1rxlpz95d3cks9rfq1f"; depends=[digest memoise gWidgets2]; }; gWidgetsRGtk2 = derive { name="gWidgetsRGtk2"; version="0.0-83"; sha256="1kn2095jx1amyzbkvgf7m466zqfv548n232xc555bpsrw9ma5qhk"; depends=[RGtk2 gWidgets cairoDevice]; }; gWidgetstcltk = derive { name="gWidgetstcltk"; version="0.0-55"; sha256="06991rqh4927bal7j718bn2ziy6rws8yq682lmp5vbqhdd36afv2"; depends=[gWidgets digest]; }; @@ -3374,22 +3441,23 @@ gamboostMSM = derive { name="gamboostMSM"; version="1.1.87"; sha256="0if0x92lch5 gamclass = derive { name="gamclass"; version="0.55"; sha256="0nhy1qdc221hsnby8j0m2a4x4a8qwfixbaq4gd22rn1xpbsdnfw3"; depends=[car mgcv DAAG MASS rpart randomForest lattice latticeExtra ape KernSmooth]; }; games = derive { name="games"; version="1.1-1"; sha256="05x27vivz2acp7darja0x21l29ddlav6ch6l89a9s60v52zqflik"; depends=[maxLik Formula MASS stringr]; }; gamlr = derive { name="gamlr"; version="1.12-1"; sha256="17vfb3kac5y3xfw8s1m8czm5bq5z6x6lc43f2szj5lv84mf2r6y7"; depends=[Matrix]; }; -gamlss = derive { name="gamlss"; version="4.3-1"; sha256="1yhg76shxaz78pmyadhh0kf710gaf9mz58hi832mpzd0hd2635y7"; depends=[gamlss_data gamlss_dist nlme MASS survival]; }; -gamlss_add = derive { name="gamlss.add"; version="4.3-0"; sha256="0kafvrh5b60pd7vs7swd6xq9c2py6ixjrdnhq2y4w112fp86jnbp"; depends=[gamlss mgcv nnet rpart]; }; -gamlss_cens = derive { name="gamlss.cens"; version="4.2.7"; sha256="1dy8myravipsa3cmkdwy3m46s419fhck0f0yz1kf6qlvxxr7a4m4"; depends=[gamlss gamlss_dist survival]; }; +gamlss = derive { name="gamlss"; version="4.3-4"; sha256="0qbxcfvhy8blswzv8194x9f08p25vhknnm3h4hhz9lp5gh536fbk"; depends=[gamlss_data gamlss_dist nlme MASS survival]; }; +gamlss_add = derive { name="gamlss.add"; version="4.3-3"; sha256="0cs4mcpm0ckaim3g8q7m4yb6y3izqgvndzgkqgrwr75cxz0wd4vh"; depends=[gamlss_dist gamlss mgcv nnet rpart]; }; +gamlss_cens = derive { name="gamlss.cens"; version="4.3.1"; sha256="1y3a4b6n86h0r287065kr574ix0qpc2nnjpp8fp49nbpxwxlz962"; depends=[gamlss_dist gamlss survival]; }; gamlss_data = derive { name="gamlss.data"; version="4.2-7"; sha256="0g3fmqrwxmj14r0p0ai1adq6cs3bd3ys47gjcja035xjiajg6cs2"; depends=[]; }; -gamlss_demo = derive { name="gamlss.demo"; version="4.2-7"; sha256="1mlfkm290dk8fvfahmrr7adhw0bj4923zjs2xn0fvbj739rgv6b7"; depends=[rpanel gamlss gamlss_tr gamlss_util]; }; -gamlss_dist = derive { name="gamlss.dist"; version="4.3-1"; sha256="0598sg1dq5xx6a2pdlp87xmkfjfnk6prahnqlpn8yp3jmjm9ws47"; depends=[MASS]; }; -gamlss_mx = derive { name="gamlss.mx"; version="4.2-7"; sha256="0k1isn2mavmwm15jk4gp9r3ks6z9pwd7k3xdsc29b9p8v8iapj4q"; depends=[gamlss nnet MASS]; }; +gamlss_demo = derive { name="gamlss.demo"; version="4.3-1"; sha256="04xl2ddf8wg2j8m05y8j5avcgfrr55a7g6m9wzxx4k599m0c7c8i"; depends=[rpanel gamlss_dist gamlss_tr]; }; +gamlss_dist = derive { name="gamlss.dist"; version="4.3-4"; sha256="0aymwh1lrjalravqf6nfz716v4r805aw82dsi0sn2nlb00fi8w2x"; depends=[MASS]; }; +gamlss_mx = derive { name="gamlss.mx"; version="4.3-1"; sha256="1sjm8a44nh88mvscpspyqsp2agjhwibi4kbyizyi78dmzf2sakiq"; depends=[gamlss_dist gamlss nnet]; }; gamlss_nl = derive { name="gamlss.nl"; version="4.1-0"; sha256="083l5lsb0csxcp4vffvdv2nr7jk3s2gkcavx66m8inzw16j7xilz"; depends=[gamlss survival]; }; -gamlss_spatial = derive { name="gamlss.spatial"; version="0.1"; sha256="0lsq3lfv9gxjvnbnib551sfvcn6g9amwg51q5ipwwzh12hdl0m98"; depends=[gamlss spam mgcv]; }; -gamlss_tr = derive { name="gamlss.tr"; version="4.2-7"; sha256="0f0vmspknkg8039dnrxkjqwjqbl34vjb5sgkcdvy5g8x8dlb5h3w"; depends=[gamlss]; }; -gamlss_util = derive { name="gamlss.util"; version="4.2-7"; sha256="1c8xc0qf387cd9d6k9fzlwvj9735y7v6njsb5fls2fimpnd5vsik"; depends=[gamlss colorspace Matrix MASS rgenoud zoo gamlss_add spam]; }; +gamlss_spatial = derive { name="gamlss.spatial"; version="0.2"; sha256="0sjb47gnzrab4y23c0z7cxqq5k46k2rb31lmqws2c9zgf4n7aqbi"; depends=[gamlss_dist gamlss spam mgcv]; }; +gamlss_tr = derive { name="gamlss.tr"; version="4.3-1"; sha256="1fdy61i2dmz2qafk92kl9acjbxx5gm8s9kkc8k9nnx6230qg8iq6"; depends=[gamlss_dist gamlss]; }; +gamlss_util = derive { name="gamlss.util"; version="4.3-2"; sha256="13facgyd14jl4j09d446jjzs91zwmv85g22gkyyi1hl4i5v5nfc4"; depends=[gamlss_dist gamlss zoo]; }; gamm4 = derive { name="gamm4"; version="0.2-3"; sha256="19vy5wik9nh77cm25gp3j3j8w8vinwzx5pv90nzdzvx84yvvf0y3"; depends=[Matrix lme4 mgcv]; }; gammSlice = derive { name="gammSlice"; version="1.3"; sha256="1vw8d0v0awyflh4gmbcf1g9nfx52cys8gpqvag5djri59p0y945a"; depends=[KernSmooth lattice mgcv]; }; gaoptim = derive { name="gaoptim"; version="1.1"; sha256="04igpn73k6f6652y496igwypfxmz4igg4jgxx6swqyi37182rqhm"; depends=[]; }; gap = derive { name="gap"; version="1.1-12"; sha256="1760jwfrlfmb8crk8kba0swpazcznlv80c6j8fiyd9zxjhnq7zf5"; depends=[]; }; gapmap = derive { name="gapmap"; version="0.0.2"; sha256="0xykpy3cmbiwwa3s8f4777585r7l441qb9ks6ajym01scqcj3nwl"; depends=[ggplot2 reshape2]; }; +gaselect = derive { name="gaselect"; version="1.0.5"; sha256="0xzx00n46x6x7w1xbx8nvabkkrna45pv1i70787m8h05q1yrjjij"; depends=[Rcpp Rcpp RcppArmadillo]; }; gaussDiff = derive { name="gaussDiff"; version="1.1"; sha256="0fqjdxp2ibbami75ba16d02dz4rz5sk8mni45di9anydx44g9d45"; depends=[]; }; gaussquad = derive { name="gaussquad"; version="1.0-2"; sha256="0bcvkssmwwngcd4cnv924n9h3c8z1w3x9c9bkwn5jbz9zyv1lfms"; depends=[polynom orthopolynom]; }; gb = derive { name="gb"; version="1.1.8-8"; sha256="18n9wqz82mjxjgzk8vc68kyz3b6lk21d2f16551d6fikjla03adf"; depends=[boot]; }; @@ -3406,12 +3474,13 @@ gdalUtils = derive { name="gdalUtils"; version="0.3.1"; sha256="1a6sg3x5yfffa9xr gdata = derive { name="gdata"; version="2.13.3"; sha256="05k5l4gz0381z89sp64xhngcsykazzznwmankwsnimx5alwrfk2m"; depends=[gtools]; }; gdimap = derive { name="gdimap"; version="0.1-9"; sha256="0ksbpcy739bvsiwis0pzd03zb4cvbd8d5wdf8whfn9k6mkj4x9rs"; depends=[rgl oro_nifti movMF gridExtra colorspace geometry gsl abind]; }; gdistance = derive { name="gdistance"; version="1.1-6"; sha256="1cla8gc6ffx0cd25w8v8wi3w306wld4kj6bcar0q6d7hd018kpir"; depends=[raster igraph Matrix sp]; }; -gee = derive { name="gee"; version="4.13-18"; sha256="0zfxmjajbgr7999gbnqppq43zzk901kqra7b1d5fa2qn8js6h1ng"; depends=[]; }; +gee = derive { name="gee"; version="4.13-18"; sha256="1s2cjgg4ypw72g710m93g6az763xz6sxw91nd6cwm5jjvr9vb91f"; depends=[]; }; geeM = derive { name="geeM"; version="0.7.2"; sha256="0qxamrkmiy70g9kkncrwgh3gx8dq5ixfwbcl8k4dgf5i5051giw9"; depends=[Matrix]; }; geepack = derive { name="geepack"; version="1.2-0"; sha256="1pxh9nsyj9a40znm4zza4nbi3dkhb96s3azi43p9ivvfj3l21m74"; depends=[]; }; geesmv = derive { name="geesmv"; version="1.0"; sha256="1xxsiz6rwqxx113vmlddx89g190nmv1yaimmibz8ai0sam5hqnp9"; depends=[nlme gee matrixcalc MASS]; }; -geigen = derive { name="geigen"; version="1.4"; sha256="0k7h3farw9a3sxh0q4gilwqlgz1gqr4al6jbr70j2y5p6sbkvabd"; depends=[]; }; +geigen = derive { name="geigen"; version="1.5"; sha256="06k4fc7j8asqv1winmz28hb3r8fvlgikrvi064ysvj2fqwh7jnq1"; depends=[]; }; geiger = derive { name="geiger"; version="2.0.3"; sha256="1wqihvscmq44i34205fzv79wk7j2a72qd8y6ycgrv74plql0316c"; depends=[ape MASS mvtnorm subplex deSolve digest Rcpp coda Rcpp]; }; +gelnet = derive { name="gelnet"; version="1.0"; sha256="06cyd5g5yxmyqiqjvp02f2k2ha50sk8qjqmmwcfxhaxysk9vbaag"; depends=[]; }; gems = derive { name="gems"; version="0.9.5"; sha256="15n3xfhifcxmhsmc2p4ijgfd9l1pmzqj0zmh0xxi8y10ax68f524"; depends=[MASS msm mstate plyr data_table]; }; gemtc = derive { name="gemtc"; version="0.6-1"; sha256="1da5z1gvad5rgc5cm3w69x58qjqfg7x65z71h91g89f5nvwxkl2c"; depends=[coda igraph meta XML]; }; gemtc_jar = derive { name="gemtc.jar"; version="0.14.3"; sha256="18hbiygpsv67flc4v6z6mir0rfq41v1vsh11dg9phmdr8bx4kcl1"; depends=[rJava]; }; @@ -3422,6 +3491,7 @@ genalg = derive { name="genalg"; version="0.1.1.1"; sha256="0f6j3zj9frnjhs4rrcn0 genasis = derive { name="genasis"; version="1.0"; sha256="1r0733cc2hss3f8dp19s1ji55yp72mds7p3x1zvvpiks2r7w712p"; depends=[Kendall fitdistrplus]; }; gendata = derive { name="gendata"; version="1.0"; sha256="1hyyf9kpf8f0xxwwvirxlz6nw6wf2wqq5vvjnyikq5dwa7a3ngmw"; depends=[]; }; gender = derive { name="gender"; version="0.4.3"; sha256="0dhwhv2b86arpmyr89g69h8ikw0f2x27ig420jngfb9gxljj9phc"; depends=[devtools dplyr httr jsonlite]; }; +genderizeR = derive { name="genderizeR"; version="1.0.0"; sha256="1a4zjbg8v7ig6hglbkvxbsp4q9hyy3zr751vmcsv529ikgiikkji"; depends=[jsonlite stringr tm data_table magrittr RCurl]; }; geneListPie = derive { name="geneListPie"; version="1.0"; sha256="0z2gawfzhm05dafj4zlj6ifmf0dy7p1hrpa59lzxrnrc0wr6laji"; depends=[]; }; geneSignatureFinder = derive { name="geneSignatureFinder"; version="2014.02.17"; sha256="1s9jj87wnzzgm9hnws09yhrxdlb6jw56i3ddwznvmh8vpzrspv4h"; depends=[survival cluster class]; }; genepi = derive { name="genepi"; version="1.0.1"; sha256="1whhdlq9p8gmygv7464hvfz6dhm65gqq1dqls6hgpmw822zxgbd5"; depends=[]; }; @@ -3432,21 +3502,21 @@ genpathmox = derive { name="genpathmox"; version="0.2"; sha256="1m08j10mrvkrnlgx genridge = derive { name="genridge"; version="0.6-5"; sha256="0ms8n1yrga5qqg9ni41ifyw6320aajyrwvjh6d27q1k96j2dicp4"; depends=[car]; }; gensemble = derive { name="gensemble"; version="1.0"; sha256="0yyi7djzqx4yhxp6yy1rjgvzidjlna79ds89bgj6m6zj3aav6yw2"; depends=[]; }; geoBayes = derive { name="geoBayes"; version="0.1.3"; sha256="0i5yxdgcbikq9b69f9z7080mcrff7phzij25q9jsd63rlld1nz77"; depends=[coda sp]; }; -geoCount = derive { name="geoCount"; version="1.131209"; sha256="0v9nsqhwf58czq4vh9f2yim2r7w9sfx9g9hp4jdbfy4q7jc5m02a"; depends=[Rcpp RcppArmadillo Rcpp RcppArmadillo]; }; +geoCount = derive { name="geoCount"; version="1.150120"; sha256="1kcjqls91r6p8ykn901c5p3v2lzbyainahhjpnr5c3a57v8s73ms"; depends=[Rcpp Rcpp RcppArmadillo]; }; geoR = derive { name="geoR"; version="1.7-4.1"; sha256="19mafynvnpabwm5i6m4ax6d9rrh3fgyg9sslb552v6ry9nfq31h0"; depends=[sp MASS splancs RandomFields]; }; geoRglm = derive { name="geoRglm"; version="0.9-4"; sha256="1wzq8p4xi40j4cagg7ji8qz9kynrwlyrlcvv0358pbl19nvg7hxb"; depends=[geoR]; }; geocodeHERE = derive { name="geocodeHERE"; version="0.1.1"; sha256="1j7xw3ca9clyxcq0banj8cw03f7ryj6pidn5hrff2xvfz215qz7h"; depends=[httr]; }; geomapdata = derive { name="geomapdata"; version="1.0-4"; sha256="1g89msnav87kim32xxbayqcx1v4439x4fsmc8xhlvq4jwlhd5xxw"; depends=[]; }; geometry = derive { name="geometry"; version="0.3-5"; sha256="1x1dhdbqnq1wi1r4njj3l1g8yag2dig19rna3a5pwf1j1gxbl0i8"; depends=[magic]; }; -geomorph = derive { name="geomorph"; version="2.1.2"; sha256="1pv7fjsfhnj85y3bmvbr9yirnr0a7sgyc3kljbi60z1ypr5294np"; depends=[rgl jpeg vegan ape geiger phytools]; }; +geomorph = derive { name="geomorph"; version="2.1.3"; sha256="1jym15xlpbgc6lfd8dzl6ixc9mn79m1a9a8jiw1yjw9kgkvp8w6p"; depends=[rgl jpeg ape geiger phytools]; }; geonames = derive { name="geonames"; version="0.998"; sha256="1p0x260i383ddr2fwv54pxpqz9vy6vdr0lrn1xj7178vxic1dwyy"; depends=[rjson]; }; geophys = derive { name="geophys"; version="1.3-6"; sha256="1yfhilgc2nv5jfp0n7iah0wl041an2850c2qnzrvx0vv9fywgw9g"; depends=[RPMG RSEIS RFOC GEOmap cluster]; }; georob = derive { name="georob"; version="0.1-5"; sha256="0awcqcpv82pn2z7lgir73pg2b0whvrrfy55gi0jrjn7lzyakhqaq"; depends=[sp constrainedKriging lmtest nlme nleqslv quantreg RandomFields robustbase snowfall]; }; geoscale = derive { name="geoscale"; version="1.1"; sha256="1xmn8y33jz1f16sjbzrld20gy7w54awrr79lhs9s4r8k1gmn0zqg"; depends=[]; }; geospacom = derive { name="geospacom"; version="0.5-7"; sha256="00yi2wwnjh2z8xhzfbp1jhh5fhq2z885s0gv937xsin4a63m76fd"; depends=[rgeos classInt sp maptools geosphere]; }; geosphere = derive { name="geosphere"; version="1.3-11"; sha256="0gsbzbx7x4ly7dfh8ld3fa795ysf4sl8a1jg3jc12nrrx85cwl74"; depends=[sp]; }; -geospt = derive { name="geospt"; version="1.0-0"; sha256="11gs2g7gxrzzridlhgbvpgjv55zfxy7y3d24dr3zf9ssa2z8v4v2"; depends=[gstat genalg MASS sp nloptr fields gsl plyr TeachingDemos sgeostat]; }; -geostatsp = derive { name="geostatsp"; version="1.1.8"; sha256="1j8g7qw9mlc268wfjkfjrg54j857zy32f7vbigs8s156bix7k0df"; depends=[Matrix raster sp abind numDeriv pracma]; }; +geospt = derive { name="geospt"; version="1.0-1"; sha256="1nv5wn8s4vlbyyzi8is7zsa1vrijp1va0vhi8l2yny8fh22qhjij"; depends=[gstat genalg MASS sp minqa limSolve fields gsl plyr TeachingDemos sgeostat]; }; +geostatsp = derive { name="geostatsp"; version="1.1.9"; sha256="1m6cihsm6k9l3kdp8chvsz5cqllbmk0mx08n8wp6zkaa02kl9izn"; depends=[Matrix raster sp abind numDeriv pracma]; }; geotools = derive { name="geotools"; version="0.1"; sha256="0d0vf9dvrrv68ivssp58qzaj8vra26ms33my097jmzmgagwy1spd"; depends=[]; }; geotopbricks = derive { name="geotopbricks"; version="1.3.5.4"; sha256="065h5dd7qxjydblgkgj2amz8krscgf7ds61b923w3b4biin4s4q4"; depends=[raster stringr zoo]; }; geozoo = derive { name="geozoo"; version="0.4.3"; sha256="0nmmmyk0ih5aqpsn7ip4dhgfm7jhcnca8pigyr9794b110icq1rv"; depends=[bitops]; }; @@ -3459,7 +3529,7 @@ ggROC = derive { name="ggROC"; version="1.0"; sha256="0p9gdy7ia59d5m84z9flz5b03r ggRandomForests = derive { name="ggRandomForests"; version="1.1.3"; sha256="0yz25imvlpblrw2v9b5s39na9diljh2g93mmcv9gljad40iy34va"; depends=[randomForestSRC ggplot2 survival dplyr reshape2]; }; ggdendro = derive { name="ggdendro"; version="0.1-15"; sha256="1xa1pswkf7xnrxs1zqw71ws0r6r0nmc2gnc76bd372czfdn4npci"; depends=[MASS ggplot2]; }; gglasso = derive { name="gglasso"; version="1.3"; sha256="0qqp5zak4xsakhydn9cfhpb19n6yidgqj183il1v7yi90qjfyn66"; depends=[]; }; -ggm = derive { name="ggm"; version="2.2"; sha256="12j904rmmhjmqzl9j12cxcjpxaqql8ncv39wgclwhifnwhzbw7zm"; depends=[igraph]; }; +ggm = derive { name="ggm"; version="2.3"; sha256="1n4y459x2i0jil8chjjqqjs28a8pzfxrws2fcjkg3il7zy0zwbw3"; depends=[igraph]; }; ggmap = derive { name="ggmap"; version="2.3"; sha256="0sl3jkifba3q0khl5sg2nf08kgn1pirw5a1xag07za51sqda5b5q"; depends=[ggplot2 proto scales RgoogleMaps png plyr reshape2 rjson mapproj]; }; ggmcmc = derive { name="ggmcmc"; version="0.6"; sha256="12z0six1swpmisbm8x9a9dk19cd0f9yvzm92gc9qs484ihpcscvq"; depends=[dplyr tidyr ggplot2]; }; ggparallel = derive { name="ggparallel"; version="0.1.1"; sha256="1z8w4bm4ahmmwbr87qlqhm8jlrqf7dhdvm1cf0xrwjlkmy6dqjvg"; depends=[ggplot2 reshape2 plyr]; }; @@ -3478,6 +3548,7 @@ gitter = derive { name="gitter"; version="1.0.4"; sha256="1pvl8k8mb15mcfz1074y24 glarma = derive { name="glarma"; version="1.3-0"; sha256="0fp354zxkddc4giynhwjlf9mg4sklcmqi0gdn8nxm1pkdpb86rba"; depends=[MASS]; }; glasso = derive { name="glasso"; version="1.8"; sha256="0gcapw7kyxb19wvdyxq1vsmc5j7yyd0rvqxs2i71k31q352sg6zw"; depends=[]; }; glassomix = derive { name="glassomix"; version="1.2"; sha256="13a2ly0by58z8djq8nbakpyacgb6nkdsqxjq44yw4v2fy3s22z3n"; depends=[mvtnorm glasso huge]; }; +glba = derive { name="glba"; version="0.2"; sha256="0ckcz6v6mfbv34s8sp086czhb5l58sky79k84332rrz6wj47p3md"; depends=[]; }; glcm = derive { name="glcm"; version="1.2"; sha256="00bkhd4arvg7ahdr5kfvran46b2sywv9i0rlwalx9pmyvjwnzm5b"; depends=[Rcpp Rcpp RcppArmadillo]; }; gld = derive { name="gld"; version="2.2.1"; sha256="1x9xlqj87xmk90hn20k1yvnvyndxdbi67yrxrfdhr3lhxabq5msw"; depends=[]; }; gldist = derive { name="gldist"; version="2160.2"; sha256="1dcf3pb4xqvhqj4m3xc3ihzjbzxjspjrnc8819hmlnmdd0csghmx"; depends=[]; }; @@ -3487,6 +3558,7 @@ glm2 = derive { name="glm2"; version="1.1.2"; sha256="1x9pq2ddsz9al8w044qch34s3f glmc = derive { name="glmc"; version="0.2-4"; sha256="03m1ym9w0b0gqib13pnh1yrjijlcwsn5lijg0nsr4hd6gxw29cla"; depends=[emplik]; }; glmdm = derive { name="glmdm"; version="2.60"; sha256="09vljki24fccqkvxkmg2i6a8pxqhfwm155b41m2q51lqaq29bfw7"; depends=[]; }; glmlep = derive { name="glmlep"; version="0.1"; sha256="0jnm3cf2r9fyncxzpk87g4pnxbryqcxxrc5y2a80pv48al3sxlzk"; depends=[]; }; +glmm = derive { name="glmm"; version="1.0.1"; sha256="1xsfxrc2lc3p0c2lwrrrw5y3yfxmmfjyqi3zwsad5l6bg08d6b6i"; depends=[trust mvtnorm Matrix]; }; glmmBUGS = derive { name="glmmBUGS"; version="2.3"; sha256="1j96c1c2lqplhjvyigpj494yxj85bpmc7cnd1hl1rc8b552jr192"; depends=[MASS abind]; }; glmmGS = derive { name="glmmGS"; version="0.5-1"; sha256="1aqyxw3nrjri8k8wlwvddy25dj7mjqndssd5p5arax8vaqgrdnjz"; depends=[]; }; glmmLasso = derive { name="glmmLasso"; version="1.3.3"; sha256="122dl5l4ngl9xvyz1kr58hryyxmld0zpwp5437ckwbnkf9bv1ldk"; depends=[minqa]; }; @@ -3496,7 +3568,7 @@ glmnetcr = derive { name="glmnetcr"; version="1.0.2"; sha256="1pyg23hdqksiaqdcrs glmpath = derive { name="glmpath"; version="0.97"; sha256="054v188ffjl6x11cld5s9py22kxcs0iq58x4yhxb0ny7mbma5hkn"; depends=[survival]; }; glmpathcr = derive { name="glmpathcr"; version="1.0.3"; sha256="0qa63c7kwpxf6smczgzf4fmvczw1ynqq5vgcw3bxdbs37q4ypj8n"; depends=[glmpath mvtnorm]; }; glmulti = derive { name="glmulti"; version="1.0.7"; sha256="154s72sjp6pz7ki7s4mgn5v62j7h0lfz9mngf40wvmy31da2s8ix"; depends=[rJava]; }; -glmvsd = derive { name="glmvsd"; version="1.1"; sha256="0qljc8drvc8xdcrs1vchby1zng1v228zp5v01pznfq1rb1knd15c"; depends=[glmnet ncvreg MASS]; }; +glmvsd = derive { name="glmvsd"; version="1.2"; sha256="0p99sanr95vcjfyjx7khwd1l59d319j1i49iv3isgsh3fwikhpgf"; depends=[glmnet ncvreg MASS]; }; glmx = derive { name="glmx"; version="0.1-0"; sha256="0i0p1xk5yk1l274gfr4ijmqnnbq7yyzmi577pb7igwvi3hjn7g7k"; depends=[MASS Formula lmtest sandwich]; }; globalGSA = derive { name="globalGSA"; version="1.0"; sha256="1f3xv03m6g2p725ff0xjhvn2xcfm7r7flyrba080i4ldy6fd8jg8"; depends=[]; }; globalOptTests = derive { name="globalOptTests"; version="1.1"; sha256="0yf4p82dpjh36ddpfrby7m3fnj2blf5s76lncflch917sq251h4f"; depends=[]; }; @@ -3506,7 +3578,7 @@ glpkAPI = derive { name="glpkAPI"; version="1.3.0"; sha256="0173wljx13jali2jxz4k glrt = derive { name="glrt"; version="2.0"; sha256="0p2b0digndvnn396ynv56cdg436n3ll7pxkb81rs3dhwbyqyc948"; depends=[survival]; }; gmailr = derive { name="gmailr"; version="0.6.0"; sha256="1l0lnlq5vrxrab8d9b5hwm8krg8zgx8f8m0kfnryyyrqkjrksky5"; depends=[httr base64enc magrittr jsonlite mime]; }; gmatrix = derive { name="gmatrix"; version="0.2"; sha256="1w83m6q8xflifqqgkkg2my4fkjfjyv0qq4ly8yqk12k77lb03hxq"; depends=[]; }; -gmm = derive { name="gmm"; version="1.5-0"; sha256="071i2bk73z606yb6a3vrv4cfyvgfwkrirm09i7bg2l3y2is1dfgj"; depends=[sandwich]; }; +gmm = derive { name="gmm"; version="1.5-1"; sha256="14rm73h0kg7kb3dsd08mxbcp41y6a730nmpfnpndh4lsgkk6d5jb"; depends=[sandwich]; }; gmodels = derive { name="gmodels"; version="2.15.4.1"; sha256="1yizjw181bg0ml6j96calflz3k3wpvpxh61hfd3pdba013ixjib5"; depends=[MASS gdata]; }; gmp = derive { name="gmp"; version="0.5-12"; sha256="10fpvcli526a8j6jaryn0mwk78c24xy7whdpcvqzzvb41l6nnkma"; depends=[]; }; gmt = derive { name="gmt"; version="1.2-0"; sha256="09az2iwwhyrls4mr619vwzhzmaks6klm67lnir48bh40hynsvibp"; depends=[]; }; @@ -3519,7 +3591,7 @@ goft = derive { name="goft"; version="1.0"; sha256="061x6mnzidmnza9q7z2ikik9zrn4 goftest = derive { name="goftest"; version="1.0-2"; sha256="11xw0cfj71z5smywsds9ijbhf3glxkqnhxmwwdqkv4gjrrr2y1bv"; depends=[]; }; gogarch = derive { name="gogarch"; version="0.7-2"; sha256="03gpl73zc6kx4gni59xbg7b38dkpd7p4c7kvlqm46f58j257viik"; depends=[fGarch fastICA]; }; gooJSON = derive { name="gooJSON"; version="1.0.01"; sha256="02sldh5lsrjprc9mbf99jyid7ij62db5f1h60z719gxl4pk6fjms"; depends=[rjson]; }; -googleVis = derive { name="googleVis"; version="0.5.7"; sha256="1z26b3zzrnlvy27sxj28nsrvdkjbsqcdmkj15wq5gks53rhsb0ia"; depends=[RJSONIO]; }; +googleVis = derive { name="googleVis"; version="0.5.8"; sha256="185pp2sgdw81p9vjkxzx4nrv9fp9jw24mqng7k98ql98p3kw9y21"; depends=[RJSONIO]; }; goric = derive { name="goric"; version="0.0-8"; sha256="0ayac0yfkxrl13ckc2pwfqnmsrhmbg5bi6iwzx0fmh81vrlp0zrm"; depends=[nlme quadprog mvtnorm MASS Matrix]; }; govStatJPN = derive { name="govStatJPN"; version="0.1"; sha256="03sywa7rl5rblvv370mfszz5ngp850qf32yydy1fdx10lv5amrfl"; depends=[]; }; gpairs = derive { name="gpairs"; version="1.2"; sha256="09mkdbs9hklxnmqcsnf65s3dfsfcr7kppp6zxj08v5hxym1gpz3l"; depends=[barcode lattice vcd MASS colorspace]; }; @@ -3533,17 +3605,18 @@ gptk = derive { name="gptk"; version="1.08"; sha256="0fk6c8f8fni4y2n2cbfwywlfyz7 gputools = derive { name="gputools"; version="0.28"; sha256="0ria03ggcfqgn93gjv2anhvkd3k73c6vfwgka16kf66g1nfzxs4l"; depends=[]; }; grImport = derive { name="grImport"; version="0.9-0"; sha256="1d8fd7502qj7cirjqdkr1qj51rylw2fz5hs06avfvc2dxs2xwfw1"; depends=[XML]; }; grade = derive { name="grade"; version="0.2-1"; sha256="085hfvqn880yk19axdjv3z9jr33kls212vs172a8mzhnkallph1r"; depends=[]; }; -gramEvol = derive { name="gramEvol"; version="1.2-1"; sha256="12lixsczgy5ypriv6vwfv8ymfa72pxqhh58dc7n41wcl0zhgfzb4"; depends=[]; }; +gramEvol = derive { name="gramEvol"; version="2.0-2"; sha256="1xrn5gkr9rxw53i5l2sqcgai9q0w4kyrychf0nq17cvcynw1y1lx"; depends=[]; }; granova = derive { name="granova"; version="2.1"; sha256="161fznqlnwmw53abmg2n62lhxxda7400ljnadvcdvsm8f6kcjf80"; depends=[car]; }; granovaGG = derive { name="granovaGG"; version="1.3"; sha256="1bsxad2h7rmbkmmg5zx6wbpws62dmp7n905gnp17n8cl8c6w2jp9"; depends=[ggplot2 RColorBrewer plyr gridExtra reshape2]; }; graphicsQC = derive { name="graphicsQC"; version="1.0-6"; sha256="07kzz0r8rh4m7qqxnlab0d4prr56jz5kspx782byspkcm5l4xrsl"; depends=[XML]; }; +graphscan = derive { name="graphscan"; version="1.0"; sha256="15kdpp2k2gpfr8qq6wr08gva5hlxqha2h48zi1j3p6r766j07082"; depends=[ape sp snowfall rgl]; }; greport = derive { name="greport"; version="0.5-2"; sha256="0lmska9m29hsz9f4myix6my6mg53awr5abigg642i3i2axv7cjd7"; depends=[Hmisc data_table rms lattice latticeExtra Formula survival]; }; gridBase = derive { name="gridBase"; version="0.4-7"; sha256="09jzw4rzwf2y5lcz7b16mb68pn0fqigv34ff7lr6w3yi9k91i1xy"; depends=[]; }; gridDebug = derive { name="gridDebug"; version="0.4-0"; sha256="1nbcdjip6ghnlv0j7cf45bpqdpirwn636pg324f0hgiqj4rifn09"; depends=[gridGraphviz gridSVG]; }; gridExtra = derive { name="gridExtra"; version="0.9.1"; sha256="15pj5w5wlrf8gw4z01i9j88gk6bm4kni64fpip9icmxkn887y3hx"; depends=[]; }; -gridGraphics = derive { name="gridGraphics"; version="0.1-2"; sha256="1ddgfjxvqd7kv4xax71v1srvq8887nvxsc5rn0px57w5fkdl69sh"; depends=[]; }; +gridGraphics = derive { name="gridGraphics"; version="0.1-3"; sha256="09ml9vy4lz0q235xy2m5l8qd3rb3r73gf3bwz35dgn7qcxps8jjp"; depends=[]; }; gridGraphviz = derive { name="gridGraphviz"; version="0.1"; sha256="14zcr0w2c9cgdw6ij93w52k3bkmgdmx809snh9jjf2amy08p2gbg"; depends=[]; }; -gridSVG = derive { name="gridSVG"; version="1.4-2"; sha256="1h96jv7c60r1f4syappv6dn5f929rr8x3bm6blaxy4jy8bx52xmh"; depends=[RJSONIO XML]; }; +gridSVG = derive { name="gridSVG"; version="1.4-3"; sha256="1jgrhckjbvccp5zqbkkiw9glhdljwxlc8kkr1fgkbrwmsi053iwk"; depends=[RJSONIO XML]; }; grnn = derive { name="grnn"; version="0.1.0"; sha256="1dxcmar42g9hz4zlyszlmmnnsnja0gxfggav5jxv0gkp32rkd0wh"; depends=[]; }; groc = derive { name="groc"; version="1.0.4"; sha256="1v32gwr8ghv47dmzp1x02n3aaqv3cfywh7xzx2486v4p960s42gc"; depends=[rrcov pls mgcv robust robustbase MASS]; }; grofit = derive { name="grofit"; version="1.1.1-1"; sha256="1rnym5fxbg3bin2idmymrwvf1fcd646bipbgjd6wby8my69zy4c5"; depends=[]; }; @@ -3552,7 +3625,7 @@ growcurves = derive { name="growcurves"; version="0.2.3.9"; sha256="1f8hh8ppp6bg growfunctions = derive { name="growfunctions"; version="0.11"; sha256="087qpykjj46a5zp48dx59k51mdyqckc39zgmrnhc5rhgm5df8sv3"; depends=[Rcpp Matrix spam mvtnorm ggplot2 reshape2 scales Rcpp RcppArmadillo]; }; growthmodels = derive { name="growthmodels"; version="1.2.0"; sha256="1wy5z77819s3daa0mifafcjfkggsq0ac522yagj86ml3vf7yqppj"; depends=[]; }; growthrate = derive { name="growthrate"; version="1.3"; sha256="1ak3yqlm7dnkdjlmikwa57qnf7yd9n1ixz36gv3shr252750x9cd"; depends=[Matrix clime mvtnorm]; }; -grplasso = derive { name="grplasso"; version="0.4-4"; sha256="1l27fbdf08xj6flvbyvq9pc9v0hv9xpwpxxgcalv1l7rnvbq42jm"; depends=[]; }; +grplasso = derive { name="grplasso"; version="0.4-5"; sha256="15bqckq9qjdlllhfpb21vzgi9msbl544alkrz01w1vvb3hk1847y"; depends=[]; }; grppenalty = derive { name="grppenalty"; version="2.1-0"; sha256="12hbghmg96dwlscjy6nspgkmqqj4vwq2qcwcz1gp50a08qbmdcrk"; depends=[]; }; grpreg = derive { name="grpreg"; version="2.8-0"; sha256="1mfd3hzzv720zhl8s6ghw0vfpqkz8q050dwnvmmb0smhdvahd2zj"; depends=[Matrix]; }; grt = derive { name="grt"; version="0.2"; sha256="0cqjk7yqk2ryx1pgvjd3x8l25hqv92p8rvdr7xw4jkzillllwmhz"; depends=[MASS rgl misc3d]; }; @@ -3581,14 +3654,13 @@ gvcm_cat = derive { name="gvcm.cat"; version="1.7"; sha256="0wgras21wzx1magcayz9 gvlma = derive { name="gvlma"; version="1.0.0.2"; sha256="0gj52hg665nmlwgbjh9yvz7a3sbzlbj41ksxchnnlxaxipdf6sl8"; depends=[]; }; gwerAM = derive { name="gwerAM"; version="1.0"; sha256="1c3rzd1jf52a4dn63hh43m9s9xnjvqn67amlm9z1ndrnn6fwfg1b"; depends=[MASS Matrix]; }; gwrr = derive { name="gwrr"; version="0.2-1"; sha256="1fjk217pimnmxsimqp9sn02nr1mwy3hw3vsr95skbfsd6vdda14d"; depends=[fields lars]; }; -h2o = derive { name="h2o"; version="2.8.1.1"; sha256="12v5xjh7j7ns5wqj8aa6phx6cbh8d03r9h933g8ynss18pkd901w"; depends=[RCurl rjson statmod survival]; }; +h2o = derive { name="h2o"; version="2.8.4.4"; sha256="03mj2p5wsgdn0jnv1fsrj7012v2am0mvyayj24zp7q56sfsgxigf"; depends=[statmod survival RCurl rjson]; }; hSDM = derive { name="hSDM"; version="1.4"; sha256="1jq6hdnyv446ng62srip0b48kccf0qw3xqym3fprg74mjdy3inqr"; depends=[coda]; }; haarfisz = derive { name="haarfisz"; version="4.5"; sha256="1qmh4glwzqwqx3pvxc71rlcimp1l0plgdf380v9hk0b4gj7g3pkf"; depends=[wavethresh]; }; hamlet = derive { name="hamlet"; version="0.7"; sha256="0f3gl5xvgdksaxk76dyv46hahc41f2j3pf9wp0rc0q7wpp5nfsjl"; depends=[]; }; hapassoc = derive { name="hapassoc"; version="1.2-7"; sha256="1cyx68fzazyyihhp2r237c6igspnfklswnja2k4z3my528ggbq7k"; depends=[]; }; haplo_ccs = derive { name="haplo.ccs"; version="1.3.1"; sha256="0cs90zxxbvglz1af0lh37dw1gxa04k0kawzxamz2was3dbh19lbz"; depends=[haplo_stats survival]; }; haplo_stats = derive { name="haplo.stats"; version="1.6.11"; sha256="0j3zh4n2rly8dij8srm8ck6fl63haw6d27m3nfnrxywr87pljg14"; depends=[]; }; -hapsim = derive { name="hapsim"; version="0.3"; sha256="18r0cq15psjwxprml84ihj5gw4pk6agd7x0qicj899awa21f2qb3"; depends=[MASS]; }; harvestr = derive { name="harvestr"; version="0.6.0"; sha256="1jg4d98bwx2cm3hliayqrazq43sa9kd9ynpaid6x4ld3mz5y8mlq"; depends=[plyr digest]; }; hash = derive { name="hash"; version="2.2.6"; sha256="0mkx59bmni3b283znvbndnkbar85fzavzdfgmwrhskidsqcz34yz"; depends=[]; }; hashFunction = derive { name="hashFunction"; version="1.0"; sha256="1v57xj8xwv6xhxvgp0zxgvs5vcjw8z5k2ciwbn0jxf4ilyd66cgj"; depends=[]; }; @@ -3596,6 +3668,7 @@ hasseDiagram = derive { name="hasseDiagram"; version="0.1.1"; sha256="1szj5pi9i5 hawkes = derive { name="hawkes"; version="0.0-4"; sha256="1ghwq3icxwmrai3xn9r8cnvlh3z3j18lznhw1bm31h9mkkp2dk0a"; depends=[Rcpp Rcpp RcppArmadillo]; }; hazus = derive { name="hazus"; version="0.1"; sha256="1c0ahjdy9di1683nk5k4rmr6rhb66523ny039nyv842rgqdy625j"; depends=[reshape2]; }; hbim = derive { name="hbim"; version="1.0.3"; sha256="1480nydsi2xj7zbfk4zw24mhsjadf83d827kpqzbmn0yh6srp3ps"; depends=[mvtnorm]; }; +hbm = derive { name="hbm"; version="1.0"; sha256="0qz28azm91a6pbss1mfc47a21d3q9rs3mmw0kgwc7i2a2m43mysm"; depends=[Matrix foreach doParallel]; }; hbmem = derive { name="hbmem"; version="0.3"; sha256="0ylxp77ack874sadwfnry84a6bg8gdl9xbw821lp5q05nnyg0dcj"; depends=[]; }; hbsae = derive { name="hbsae"; version="1.0"; sha256="1iwmpi0pn5fxyxkwqkbmy6w1f1wcx0p809jnviim0ypwib32mhh7"; depends=[Matrix arm]; }; hcc = derive { name="hcc"; version="0.54"; sha256="14b3pamkywb0wsjpbm0wpflcds0b5mfymvgk92rmf6ngz1bkpdbq"; depends=[]; }; @@ -3617,7 +3690,7 @@ helloJavaWorld = derive { name="helloJavaWorld"; version="0.0-9"; sha256="1a8yxj helsinki = derive { name="helsinki"; version="0.9.24"; sha256="1ljqgwcmvcmir8fq3izym4k8ljakwqpgq94wfhrdxp0q393zb8rq"; depends=[maptools RCurl rjson sp]; }; heplots = derive { name="heplots"; version="1.0-12"; sha256="064kanmqm4b0sbyw60wfb19adclpdagm23l6p86vi0hyx0dr0ykz"; depends=[car MASS]; }; hergm = derive { name="hergm"; version="2.1-1"; sha256="0d2y4zkd5xv1r4ynkwwaj4kj54m5avlrnk60m3xsfbwcbbblf2fx"; depends=[ergm latentnet network sna]; }; -heritability = derive { name="heritability"; version="1.0"; sha256="08hlj6blqp70812llaxx5m18qn1v65csfz6d0lhhab2pir7arlg8"; depends=[]; }; +heritability = derive { name="heritability"; version="1.1"; sha256="05vcprf3rk65197njnhw7n5l19hvy7hfp4fdigkwzvch4rnicidf"; depends=[MASS]; }; hermite = derive { name="hermite"; version="1.0.1"; sha256="0y49dj905y9x4pjrx6iki3mk5kkppbd1c6dk0yvvh7sisapnphjx"; depends=[]; }; het_test = derive { name="het.test"; version="0.1"; sha256="08kxp81dx32anh0k5b65x7w7madwnn9hiabdrk6ck6b6mx37x26v"; depends=[vars]; }; hett = derive { name="hett"; version="0.3-1"; sha256="1y0hr9g2pjwzc5azh095h33qidxhhmlvd1csamjnhwdphj5drzz0"; depends=[MASS lattice]; }; @@ -3628,7 +3701,7 @@ hgam = derive { name="hgam"; version="0.1-2"; sha256="1flcc67n8kbh9m5phdfl587xg1 hglasso = derive { name="hglasso"; version="1.2"; sha256="1qq41ma33wz7qjs5zx72yvngpsiq62z9sd6d5hvvl83brq0fcr4b"; depends=[glasso mvtnorm igraph fields]; }; hglm = derive { name="hglm"; version="2.0-11"; sha256="0yqnky2p5avxn7nv8wnk57xkd0dpk89jas6d577q50ms4dpwdl6z"; depends=[Matrix MASS hglm_data]; }; hglm_data = derive { name="hglm.data"; version="1.0-0"; sha256="1hrq1jac658z5xjsg03nfkb4kwm9z44bhciv5chk74ww8gjr9j9q"; depends=[Matrix MASS]; }; -hht = derive { name="hht"; version="2.1.1"; sha256="1pfjqydgbcr75j3l18jf466zj4hxghqfm33m5v7f7kw97rr5vyzm"; depends=[EMD fields spatstat]; }; +hht = derive { name="hht"; version="2.1.2"; sha256="10lpndwpddcqxyrk9pq9dwaqpj4apxdic971nd68cn3pql6fssdn"; depends=[EMD fields spatstat]; }; hiPOD = derive { name="hiPOD"; version="1.0"; sha256="1i15ickz2s0kffh99qq30pl5hsl0lbj0kp55jnbv4x72hndzhmla"; depends=[rgl]; }; hiddenf = derive { name="hiddenf"; version="1.1"; sha256="04pl3glvg3m1xzvxnc5lwjz839zrpc8zhnsxcswvvaqpgzip5f1p"; depends=[]; }; hier_part = derive { name="hier.part"; version="1.0-4"; sha256="03acdgzkhbk4p0wxw2g1hzklmq9hzmdkkvfj742vzfswdd803yg9"; depends=[gtools]; }; @@ -3660,14 +3733,14 @@ homtest = derive { name="homtest"; version="1.0-5"; sha256="1lnqlg3dwq174ic6dbjl hot_deck = derive { name="hot.deck"; version="1.0"; sha256="11dxj676y55p4n0c27l7f3ns8kk308f6b6lhwfpjqfz0wgysnfq9"; depends=[mice]; }; hotspots = derive { name="hotspots"; version="1.0.2"; sha256="1cwcwin86y7afjhs8jwlz1m63hh70dcjag0msds4ngksvjh9gj2q"; depends=[lattice ineq]; }; howmany = derive { name="howmany"; version="0.3-1"; sha256="045ck8qahfg2swbgyf7dpl32ryq1m4sbalhr7m5qdgpm62vz8h7f"; depends=[]; }; -hpcwld = derive { name="hpcwld"; version="0.4"; sha256="1vh5jvq9nbghsl59fi6v3nmsh0jmxq7pzbs3fgasz8c3jmjw50kp"; depends=[]; }; +hpcwld = derive { name="hpcwld"; version="0.5"; sha256="17k4mw41gygwgvh7h78m0jgzh1bivrvrsr8lgxxw3sbkw88lwb40"; depends=[multicool partitions]; }; hpoPlot = derive { name="hpoPlot"; version="2.0"; sha256="080jzi1zw510clbbkmf2wkwbfgna06kfz91i7d90b9pqi7krj28j"; depends=[functional magrittr]; }; hqmisc = derive { name="hqmisc"; version="0.1-1"; sha256="0jcy2hb3dmzf9j4n92aq7247mx9w7n30wpsx0dkchqnjwlqwwncw"; depends=[]; }; hrr = derive { name="hrr"; version="1.1.1"; sha256="17jzsgh2784y7jdwpa50v7qz99dw6k2n25sisnam6h1a39b96byn"; depends=[]; }; hsicCCA = derive { name="hsicCCA"; version="1.0"; sha256="1d4lkjrihwhl3jrsj7250ccd90nfwpllyavc3mp15fhcy2jnjci8"; depends=[]; }; hsmm = derive { name="hsmm"; version="0.4"; sha256="1fh8c5kfv4brygdq6bfkrhrhkm99mxl4ljb1mhp9nf2bjlla11mc"; depends=[mvtnorm]; }; hsphase = derive { name="hsphase"; version="2.0.1"; sha256="1z7yxbknldxn780dxw9xz984b3i8pj5hmdnbynvxc5k0ss8g7isy"; depends=[snowfall Rcpp RcppArmadillo Rcpp]; }; -htmlTable = derive { name="htmlTable"; version="1.0"; sha256="08qj94n6inib27mr47bwln2daizhdp5zghsndp3x3ykkvi1972ys"; depends=[stringr magrittr Hmisc]; }; +htmlTable = derive { name="htmlTable"; version="1.1"; sha256="18nw20y3v5rqq3kfybm2clr8vmr43i5girfjzcrngbmy3qxiq64j"; depends=[stringr knitr magrittr Hmisc]; }; htmltab = derive { name="htmltab"; version="0.5.0"; sha256="1c5bcx00wgh2xvghg91jyv7086y5ya0bil4igfsqjqsn0lfcjxpg"; depends=[XML]; }; htmltools = derive { name="htmltools"; version="0.2.6"; sha256="1gp6f6388xy3cvnb08q08vraidjp740gfxlafdd19m2s04v5hncz"; depends=[digest]; }; htmlwidgets = derive { name="htmlwidgets"; version="0.3.2"; sha256="1r0n3c2xvj9k7x892nbqyclpc66lq5wyxc2y0nybs5wcz3jx9s2p"; depends=[htmltools RJSONIO yaml]; }; @@ -3696,7 +3769,7 @@ hypergeo = derive { name="hypergeo"; version="1.2-9"; sha256="0ydwza0h8ykzbrsvvp hypervolume = derive { name="hypervolume"; version="1.1.2"; sha256="1d4c5lfvr32w5mdrll6kg7frykhc8wfg3i5v3a93s0df02yprc4s"; depends=[Rcpp rgl MASS geometry pdist Rcpp]; }; hypothesestest = derive { name="hypothesestest"; version="1.0"; sha256="0g8sm386m1zm9i3900r62x83wb600cy8hqk7dlvbx6wcgrxg82sm"; depends=[]; }; hypred = derive { name="hypred"; version="0.5"; sha256="07jxpzh53qmv1vs2yhgnvxwcwkwpp6a12861i4a5n6pvwivw220d"; depends=[]; }; -hysteresis = derive { name="hysteresis"; version="2.0"; sha256="1g9d91djwi9k2q10zqak8fpmywnwmha1pm18g2hmwzrqrwnr6dh9"; depends=[car msm nlrwr]; }; +hysteresis = derive { name="hysteresis"; version="2.5"; sha256="1b1dd2367pjbg4jnn65l2jcj38ljz7adpdg8f5b9rj1rw7qgikfl"; depends=[car msm MASS]; }; hzar = derive { name="hzar"; version="0.2-5"; sha256="000l4ki3hvznnhkxc5j422h5ifnsfqalv666j48yby1hsf1lc3kg"; depends=[MCMCpack foreach coda]; }; iBATCGH = derive { name="iBATCGH"; version="1.1"; sha256="0nl5l17pm92ns40qzkmayc48a6i4j8w0562sp5jxyi95y4vb4aiy"; depends=[Rcpp msm Rcpp RcppArmadillo]; }; iBUGS = derive { name="iBUGS"; version="0.1.4"; sha256="0vsxy8pnbix0rg7ksgywx7kypqb5ngkxhldh3cisjkvdv638ybps"; depends=[R2WinBUGS gWidgetsRGtk2]; }; @@ -3724,7 +3797,7 @@ icaOcularCorrection = derive { name="icaOcularCorrection"; version="3.0.0"; sha2 icamix = derive { name="icamix"; version="1.0.1"; sha256="06jaznzgixglbrrmvmp3cnghdldv30h5nfjghvdymia27m7ssdrr"; depends=[Rcpp Rcpp RcppArmadillo]; }; icapca = derive { name="icapca"; version="1.1"; sha256="131gdrk8vsbac0krmsryvsp21bn9hzxqxq847zn16cxjf6y5i3xb"; depends=[]; }; iccbeta = derive { name="iccbeta"; version="1.0"; sha256="0zsf2b5nrv39pssi5walf82892fr8p1f802c96hjjknh78q7gh0h"; depends=[lme4 Rcpp Rcpp RcppArmadillo]; }; -icd9 = derive { name="icd9"; version="0.5"; sha256="128gv2yxylncmbr6b1qz82ys7aanqxf35psrmrh2i4l84w3w5l8g"; depends=[memoise]; }; +icd9 = derive { name="icd9"; version="1.0"; sha256="1imayxcg58dg56wakwn7qcqm5r9xw0idzvh942rl0ir9xgz7dp7m"; depends=[Rcpp checkmate Rcpp]; }; icensmis = derive { name="icensmis"; version="1.2.1"; sha256="1h4l9irip4hv34hr92j8756qgmy455mfdblr7ypgsgvr27cgax8h"; depends=[Rcpp Rcpp]; }; idbg = derive { name="idbg"; version="1.0"; sha256="1rxmj04hswxybrg7dfib3mjy8v8mdiv13zwbscp2q55z55hhf1m5"; depends=[]; }; identity = derive { name="identity"; version="0.2-1"; sha256="1j5wb5cj5j49in2g6r1shdm4ri4cfzj22hpqazvcmq4dm291sdi9"; depends=[]; }; @@ -3758,6 +3831,7 @@ influence_SEM = derive { name="influence.SEM"; version="1.4"; sha256="1grsnp8xwm infoDecompuTE = derive { name="infoDecompuTE"; version="0.5.1"; sha256="1aigd1fvpdqjplq1s1js0sy8px68q73lbp5q591rn52c77smdhaj"; depends=[MASS]; }; informR = derive { name="informR"; version="1.0.04"; sha256="0s40hlilk8fjld2m43f2m50a3764qgnv07y5jwv60a8d0nf4gpa2"; depends=[abind relevent]; }; infotheo = derive { name="infotheo"; version="1.2.0"; sha256="18xacczfq3z3xpy434js4nf3l19lczngzd0lq26wh22pvg1yniwv"; depends=[]; }; +infra = derive { name="infra"; version="0.1.2"; sha256="0jycnnmrrjq37lv67xbvh6p63d6l4vbgf3i1z9y7r75d6asspzn1"; depends=[]; }; infutil = derive { name="infutil"; version="1.0"; sha256="02d0hfbkdqjj0lm1fzwwxy60831kbcjn2m4rfblpib0krkbpz72n"; depends=[ltm]; }; inline = derive { name="inline"; version="0.3.13"; sha256="1dijlcnm7wfd6jgy6wsj6imwg43f91cl7iiz5j2jhhavw2pczr62"; depends=[]; }; inlinedocs = derive { name="inlinedocs"; version="2013.9.3"; sha256="13vk6v9723wlfv1z5fxmvxfqhaj68h0x3s2qq9j6ickr4wakb4ar"; depends=[]; }; @@ -3822,6 +3896,7 @@ ivfixed = derive { name="ivfixed"; version="1.0"; sha256="0a26zrkvz0ffq4zxdx5vhr ivivc = derive { name="ivivc"; version="0.2.2"; sha256="1qychbszcg9lmbmrnpv65xcv1i5k2xarsa374fs6gw7zlp5nrvap"; depends=[reshape optimx sciplot png deSolve minpack_lm]; }; ivlewbel = derive { name="ivlewbel"; version="1.1"; sha256="0ykcfikm2i28s3fm6zzx8cjvpwhksg8an0rfr0b35gf7p69brgag"; depends=[gmm plyr lmtest]; }; ivpack = derive { name="ivpack"; version="1.2"; sha256="0cr5acjrn41d3q0b77hlg2jmsbf1msvys9gcavm1blsryg2bc03c"; depends=[AER sandwich lmtest]; }; +ivpanel = derive { name="ivpanel"; version="1.0"; sha256="0irjmkw3nnd8ssidvj23lr0hihlhd9acsbaznh88lknx53ijc2qv"; depends=[Formula]; }; ivprobit = derive { name="ivprobit"; version="1.0"; sha256="1kijq7k6iv2ybaxb08kqzm2s2k6wp2z50r01kxcq023pmyfjczwy"; depends=[]; }; jSonarR = derive { name="jSonarR"; version="1.1.1"; sha256="054q3ly471xa64yyz2as6vkr440ip1y8n5wl6s3zbhqy3bqkdqif"; depends=[RCurl jsonlite]; }; jaatha = derive { name="jaatha"; version="2.7.0"; sha256="1ibk84x38j03hbdrf9pi0bi025fxlk2ysqxmfrqiqr4zq2rzhbvp"; depends=[phyclust Rcpp reshape2 Rcpp]; }; @@ -3835,17 +3910,18 @@ jointDiag = derive { name="jointDiag"; version="0.2"; sha256="0y1gzrc79vahfhn4jr jointPm = derive { name="jointPm"; version="2.3.1"; sha256="1c2cn9sqwfyv9ksd63w8rrz0kh18jm2wv2sfdkgncjb7vfs4hbv9"; depends=[]; }; jomo = derive { name="jomo"; version="0.1-2"; sha256="1d5bqcxbl5zpy3lqmf8k2khbwislf7smw9fknlgb99sf5p3w9ca0"; depends=[]; }; jpeg = derive { name="jpeg"; version="0.1-8"; sha256="05hawv5qcb82ljc1l2nchx1wah8mq2k2kfkhpzyww554ngzbwcnh"; depends=[]; }; +js = derive { name="js"; version="0.1"; sha256="0jmfb4dmm0g1g14a9mwiqz3mcb8h46lbp781bjr0knfpzh5b20nc"; depends=[V8]; }; jsonlite = derive { name="jsonlite"; version="0.9.14"; sha256="1dshp8c0a6mfn401s20jlab86jd86bb0fcfswcyjdm39y8sd81fz"; depends=[]; }; jtrans = derive { name="jtrans"; version="0.1"; sha256="1wcrjyifsnpk9jfmwc1cx30qp5vavwl87i0avbbls8cmji7z0nay"; depends=[]; }; jvmr = derive { name="jvmr"; version="2.11.2.1"; sha256="0h76b1596zil2m6fbhp38gchxwif942sldbfc6sgbn3ig9mz8zw5"; depends=[rJava]; }; jwutil = derive { name="jwutil"; version="1.0.2"; sha256="01c2mjg719bqjzca1a0ac6q0af2jc95jb292smvrq4bx1bd5nwpi"; depends=[]; }; -kSamples = derive { name="kSamples"; version="1.0"; sha256="0a4kl6508isjsbv8g7b8g9c2kmai90lwdjn0576i7l4hnqvi532b"; depends=[SuppDists]; }; +kSamples = derive { name="kSamples"; version="1.0.1"; sha256="11qylllwpm3rhrzmdlkbdqixpmx4qlvgmfwp9s4jfy5h3q68mfw7"; depends=[SuppDists]; }; kappaSize = derive { name="kappaSize"; version="1.1"; sha256="0jrjal8cvy2yg0qiyilmv3jl3ib5k9jg8gp2533kdsx4m0sack04"; depends=[]; }; kappalab = derive { name="kappalab"; version="0.4-6"; sha256="0dmzy0d7azzfpnzbf8b7a6zgmmfwzfiybz8610asajyfsj36gszl"; depends=[lpSolve quadprog kernlab]; }; kaps = derive { name="kaps"; version="1.0.2"; sha256="0jg4smbq51v88i3815icb284j97iam09pc52rv3izxa57nv9a0gz"; depends=[survival Formula coin]; }; kcirt = derive { name="kcirt"; version="0.6.0"; sha256="1gm3c89i5dq7lj8khc12v30j1c0l1gwb4kv24cyy1yw6wg40sjig"; depends=[mvtnorm snowfall corpcor]; }; kdetrees = derive { name="kdetrees"; version="0.1.5"; sha256="1plf2yp2vl3r5znp5j92l6hx1kgj0pzs7ffqgvz2nap5nf1c6rdg"; depends=[ape distory ggplot2]; }; -kedd = derive { name="kedd"; version="1.0.1"; sha256="1hk4a6n4ywd61g24843zb1z0wbz10lz82as9cpig6m1hglbhs8ll"; depends=[]; }; +kedd = derive { name="kedd"; version="1.0.2"; sha256="11mfgjr1pl56y4rcychs8xjgazy3vhg1xasr37fd0g32g7w3lxqg"; depends=[]; }; kelvin = derive { name="kelvin"; version="1.2-2"; sha256="0fl2yxc0dpmkhq3f7711gd08i7jlzlfncin1d6q251dfnmwd7rzf"; depends=[Bessel]; }; kequate = derive { name="kequate"; version="1.4.0"; sha256="0vr45y4f6x3080pf3k53nifavf8mfhikz54nis66c53fs9rp0jwf"; depends=[ltm equateIRT]; }; kerdiest = derive { name="kerdiest"; version="1.2"; sha256="16xj2br520ls8vw5qksxq9hqlpxlwmxccfk5balwgk5n2yhjs6r3"; depends=[date chron evir]; }; @@ -3856,10 +3932,11 @@ kin_cohort = derive { name="kin.cohort"; version="0.6"; sha256="13gnjk58m5kya9wj kinfit = derive { name="kinfit"; version="1.1.13"; sha256="1av33f4wns6qp79wyww70f7fsfybcqm83nby1ia65sjp2dz04dk1"; depends=[]; }; kinship2 = derive { name="kinship2"; version="1.6.0"; sha256="06f544yk61i1xq0rm0r5gpzwfl6rvzyg7gz8z86bjyxg0z44h3vy"; depends=[Matrix quadprog]; }; kintone = derive { name="kintone"; version="0.1.1"; sha256="13c82vkapks9j2crrb4awnhl60ld8b1r7xmy9yv4zzch868kcl5g"; depends=[RCurl rjson]; }; +kissmig = derive { name="kissmig"; version="1.0-3"; sha256="1pi1x3gdbqrhr1km1hqj15k8wyrgs697fnxgjgxga1irbn8bi482"; depends=[raster]; }; kitagawa = derive { name="kitagawa"; version="2.1-0"; sha256="1ddyd0rwwmdpbq823qass5dlp2lvi9d64wpl61ik6fghms2p9ryr"; depends=[kelvin]; }; kknn = derive { name="kknn"; version="1.2-5"; sha256="0c1qnn1lnypjybk2p0dpfrg6hzxflzbwmjb5biq45r57bzji7im7"; depends=[igraph Matrix]; }; klaR = derive { name="klaR"; version="0.6-12"; sha256="10nkqb1zradbvifgv1fm373mhyydgdjjgmnw2442a2lark59z3vs"; depends=[MASS combinat]; }; -klausuR = derive { name="klausuR"; version="0.12-5"; sha256="1agd432ihljww3bhm73lqdvgkd8w99jqr7fp5xwwav7mawwsirfj"; depends=[xtable psychometric]; }; +klausuR = derive { name="klausuR"; version="0.12-10"; sha256="12fjs4dnwaki8sz718xgsg8qrqhsgf87cs0bylf0p3f5k8hrmk4b"; depends=[xtable psychometric polycor]; }; klin = derive { name="klin"; version="2007-02-05"; sha256="0j0hr4bppzk754a66q5z42h7jzfavqpxgl7y266804aginfqm1ax"; depends=[Matrix]; }; km_ci = derive { name="km.ci"; version="0.5-2"; sha256="1l6kw8jppaa1802yc5pbfwwgac56nhwc9p076ivylhms4w7cdf8v"; depends=[survival]; }; kmc = derive { name="kmc"; version="0.1-2"; sha256="16lv8wk24cp91qg5202zhfmdhg83qw8bwiycknaml5ki820ffdlx"; depends=[rootSolve emplik Rcpp Rcpp]; }; @@ -3873,17 +3950,18 @@ knitr = derive { name="knitr"; version="1.9"; sha256="17kwz14n16c3zjrpvm3c6rfn50 knitrBootstrap = derive { name="knitrBootstrap"; version="0.9.0"; sha256="1cw5dvhjiypk6847qypxphfl9an54qjvd6qv029znhwijsg56mmg"; depends=[knitr markdown]; }; knnGarden = derive { name="knnGarden"; version="1.0.1"; sha256="1gmhgr42l6pvc6pzlq5khrlh080795b0v1l5xf956g2ckgk5r8m1"; depends=[cluster]; }; knnIndep = derive { name="knnIndep"; version="2.0"; sha256="1fwkldgs2994svf3sj90pwsfx6r22cwwa22b30hdmd24l8v9kzn7"; depends=[]; }; -knockoff = derive { name="knockoff"; version="0.1.1"; sha256="0jn8k807frwd8n9clf9xccxwg1rp7qjf3xsl56mphb4h8g7i59nb"; depends=[glmnet RJSONIO]; }; +knncat = derive { name="knncat"; version="1.2.2"; sha256="1d392910y3yy46j8my1a7m0xkij2rc6vwq5fg22qk00vqli8drz2"; depends=[]; }; +knockoff = derive { name="knockoff"; version="0.2"; sha256="06aq5xp86bnrnwx5hznsr3rxnd19hxc3b53a8iwr00d1hx6mi6ap"; depends=[glmnet RJSONIO]; }; koRpus = derive { name="koRpus"; version="0.05-5"; sha256="03rw0yb67y652j8hcr5m4c0py0rr3gp87y0hdxpypd81rkikwhfm"; depends=[]; }; kobe = derive { name="kobe"; version="1.3.2"; sha256="1z64jwrq6ddpm22cvk2swmxl1j7qyz0ddk3880c7zfq6gk7f9bxl"; depends=[plyr reshape ggplot2 MASS emdbook coda]; }; -kofnGA = derive { name="kofnGA"; version="1.0"; sha256="1h50dkysydk2nk90xi0lw6qyc15131xh2m4vh0gkfch8sd2gwqiw"; depends=[]; }; +kofnGA = derive { name="kofnGA"; version="1.1"; sha256="1ykk3rmyrv8c556rl3wp0i1d522dghaq4qk5acg06hhk9j9962fg"; depends=[]; }; kohonen = derive { name="kohonen"; version="2.0.15"; sha256="1mamn6lwnd54jw7bbxgrxj511abn9wg5rxrm9fac7jndf00kjaim"; depends=[class MASS]; }; kolmim = derive { name="kolmim"; version="0.2"; sha256="1cq1miny83shxas4zijcbzcnxv29vjyxj3pip8brf52sjvrj4max"; depends=[]; }; kpodclustr = derive { name="kpodclustr"; version="1.0"; sha256="1fywgdj4q3kg8y9lwnj6vxg9cwgs5ccwj6m3knfgg92f8ghnsbsw"; depends=[clues]; }; kriging = derive { name="kriging"; version="1.1"; sha256="04bxr34grf2nlrwvgrlh84pz7yi0r8y7dc2wk0v5h5z6yf5a085w"; depends=[]; }; krm = derive { name="krm"; version="2014.12-1"; sha256="0lf506q6975vihkd75wwndqaa86ci4d4k4ijjzpvv31xw2kkbwb6"; depends=[kyotil]; }; ks = derive { name="ks"; version="1.9.3"; sha256="077sx9kms8nkgg6c4bg24n0j6a7bf253bp26hybyilbagp7k6pin"; depends=[KernSmooth misc3d mvtnorm rgl multicool]; }; -kselection = derive { name="kselection"; version="0.1.1"; sha256="18l8a00v8ldpzvbzi5ph7hmgrlsydkynfzqn3vs1i84zvwrh1fz5"; depends=[]; }; +kselection = derive { name="kselection"; version="0.2.0"; sha256="1arg96r2pldvb89rfqnfpjxwksyac2mhmbimbkwzm7wrnbnrcn5d"; depends=[]; }; kst = derive { name="kst"; version="0.2-1"; sha256="1wy9cvvln994qgr0p7qa9qs1jd7gjv6ch65gg6i42cf9681m9h65"; depends=[proxy relations sets]; }; ktsolve = derive { name="ktsolve"; version="1.1"; sha256="0b5myr093v3qaj9gzbw1w728i5ij418whxxpicj51w657dcy647k"; depends=[]; }; ktspair = derive { name="ktspair"; version="1.0"; sha256="1v63982jidxlcf2syahcb29myv34kc790l7lwyfxx9l50ssb812n"; depends=[]; }; @@ -3919,15 +3997,16 @@ latentnet = derive { name="latentnet"; version="2.6.0"; sha256="0aw184r1w28d4lmz lattice = derive { name="lattice"; version="0.20-29"; sha256="0ip6qw1kry68dqj97bh8ddpq6gfsxf3n3axc6pn3zv2n1mfv6s9s"; depends=[]; }; latticeDensity = derive { name="latticeDensity"; version="1.0.7"; sha256="1y33p8hfmpzn8zl4a6zxg1q3zx912nhqlilca6kl5q156zi0sv3d"; depends=[splancs spdep spatstat spam]; }; latticeExtra = derive { name="latticeExtra"; version="0.6-26"; sha256="16x00sg76mga8p5q5ybaxs34q0ibml8wq91822faj5fmg7r1050d"; depends=[RColorBrewer lattice]; }; -lava = derive { name="lava"; version="1.3"; sha256="1m8bnq1br6xj6ai05slgbr84g0l58hq6z8lmnk0gw0gbkqsxd2wa"; depends=[numDeriv]; }; +lava = derive { name="lava"; version="1.4.0"; sha256="0zf62xk2j1gbwxqglq6lsxs3f7fb0hynnlfh1w870xz8imgf20yp"; depends=[numDeriv]; }; lava_tobit = derive { name="lava.tobit"; version="0.4-7"; sha256="1da98d5pndlbbw37k64fmr2mi1hvkhjxsmm3y9p4b772pz9i1pvj"; depends=[lava mvtnorm survival]; }; lavaan = derive { name="lavaan"; version="0.5-17"; sha256="0rb9bra1nzsbrvvjwcj5vh7l689wdvaq1r86r85919b6n3x38v4b"; depends=[MASS mnormt pbivnorm quadprog]; }; lavaan_survey = derive { name="lavaan.survey"; version="1.1"; sha256="1vscv165kilkc00pgs2s9qn404l3rv45zc9kzmrghxz42jsy04zc"; depends=[lavaan survey MASS Matrix]; }; -lawstat = derive { name="lawstat"; version="2.4.1"; sha256="142plbzpvi5xy7j5m5wizhz3w1n9im9hs8byhs6kfjpdw710qn7h"; depends=[mvtnorm VGAM]; }; +lawstat = derive { name="lawstat"; version="2.5"; sha256="01y00jfapmh3bmrmz740flkahw0b8im8sp5ac8hsp4pf9k09cvws"; depends=[mvtnorm VGAM Kendall Hmisc]; }; lazy = derive { name="lazy"; version="1.2-15"; sha256="1pdqgvn0qpfg5hcg5159ccf5qj2nd1ibai9p85rwjpddfynk6jks"; depends=[]; }; lazyData = derive { name="lazyData"; version="1.0.3"; sha256="1i4jry54id8hhfla77pwk3rj2cci6na36hxj7k35k8lx666fdam2"; depends=[]; }; lazyWeave = derive { name="lazyWeave"; version="2.2.5"; sha256="18j31lbbplxvrz4wnq7hfw9qcx1s0y4c34lbxwly2wyrvzjhxybl"; depends=[Hmisc survival]; }; lazyeval = derive { name="lazyeval"; version="0.1.10"; sha256="02qfpn2fmy78vx4jxr7g7rhqzcm1kcivfwai7lbh0vvpawia0qwh"; depends=[]; }; +lba = derive { name="lba"; version="1.0"; sha256="108kfffwpvl6rjcmmxswprxxqcv1sj7w9mmca4pwaiprad7p7x59"; depends=[MASS alabama plotrix ca]; }; lbfgs = derive { name="lbfgs"; version="1.2.1"; sha256="0p99g4f3f63vhsw0s1m0y241is9lfqma86p26pvja1szlapz3jf5"; depends=[Rcpp Rcpp]; }; lbiassurv = derive { name="lbiassurv"; version="1.1"; sha256="1i6l3y4rasqpqka7j39qjx22wjbilgc9pkp05an52aysfvfxy193"; depends=[actuar]; }; lcd = derive { name="lcd"; version="0.7-3"; sha256="1jnnw15d4s8yb5z5jnzvmlrxv5x6n3h7wcdiz2nw4vfiqncnpwx4"; depends=[igraph MASS ggm]; }; @@ -3947,13 +4026,13 @@ lefse = derive { name="lefse"; version="0.1"; sha256="1zdmjxr5xa5p3miw79mhsswsh2 leiv = derive { name="leiv"; version="2.0-7"; sha256="15ay50886xx9k298npyksfpva8pck7fhqa40h9n3d7fzvqm5h1jp"; depends=[]; }; lessR = derive { name="lessR"; version="3.1.1"; sha256="0cx5bvwfkrfy5im7x718ixf45aw22561b9w0vv0qp97y7xyjqja5"; depends=[car leaps MBESS foreign gdata triangle]; }; lestat = derive { name="lestat"; version="1.8"; sha256="12w3s5yr9lsnjkr3nsay5sm4p241y4xz0s3ir56kxjqw23g6m80v"; depends=[MASS]; }; -letsR = derive { name="letsR"; version="1.0"; sha256="1far1vil7g4ymvmhzb0dgfng5d1nkcb4rr1sp7yi72lz60h3g9hk"; depends=[maps raster XML geosphere maptools sp]; }; -lfe = derive { name="lfe"; version="1.8-1441"; sha256="0ahcrb1wx2zcigvcijsnj3x9wb8mba1gciyalikkiyrh3bljp8lz"; depends=[Matrix Formula xtable]; }; +letsR = derive { name="letsR"; version="2.0"; sha256="0z695c2mcswhw064cfq9nj7ai2mfxd9hjy764wgjdnwp4x1bnjh8"; depends=[raster maps XML geosphere fields maptools sp rgdal]; }; +lfe = derive { name="lfe"; version="2.0-1570"; sha256="0j3xbch6xk8zm4wbhs9lr60893r0dsqfvlvd8l13bqa3sq9xfhp6"; depends=[Matrix Formula xtable]; }; lfl = derive { name="lfl"; version="1.0"; sha256="10ypsnzjzygihz019clwnf3gv5b64d873231pjkp772k1n3wgv9a"; depends=[Rcpp foreach forecast plyr tseries e1071 zoo Rcpp]; }; lfstat = derive { name="lfstat"; version="0.6.1"; sha256="0i3zrinvjxlg9w5zqrv8wzy15vxvi2gw3jrlfs4rddkxnp98ya9d"; depends=[lattice lmom lmomRFA latticeExtra]; }; lga = derive { name="lga"; version="1.1-1"; sha256="1nkvar9lmdvsc3c21xmrnpn0haqk03jwvc9zfxvk5nwi4m9457lg"; depends=[boot lattice]; }; lgarch = derive { name="lgarch"; version="0.5"; sha256="01y5p3w4i1yfxb647pkdazqn9yac1p6jp7rk92ddxnvvjb6fdp59"; depends=[zoo]; }; -lgcp = derive { name="lgcp"; version="1.3-6"; sha256="04khs0knax3g20hgi5ykny1ck4jxz1aivaa19bb24fljvhn88prv"; depends=[spatstat sp raster RandomFields iterators ncdf rpanel fields maptools Matrix rgeos]; }; +lgcp = derive { name="lgcp"; version="1.3-8"; sha256="1ijv7k8y489zjsrms2laqr60r1ggx5v8d5kb16c6h6nkh8zrnw40"; depends=[spatstat sp raster RandomFields iterators ncdf rpanel fields maptools Matrix rgeos]; }; lgtdl = derive { name="lgtdl"; version="1.1.3"; sha256="00lffc60aq1qjyy66nygaypdky9rypy607mr8brwimjn8k1f0gx4"; depends=[]; }; lhs = derive { name="lhs"; version="0.10"; sha256="1hc23g04b6nsg8xffkscwsq2mr725r6s296iqll887b3mnm3xaqz"; depends=[]; }; libamtrack = derive { name="libamtrack"; version="0.5.5"; sha256="0v2h4ficf87ai3h2liw8j7428k0bzzb59zini2vskwhcqb7ky7yw"; depends=[]; }; @@ -3964,6 +4043,7 @@ likert = derive { name="likert"; version="1.2"; sha256="1x1mlaqzwr15xzcfq9934jxb limSolve = derive { name="limSolve"; version="1.5.5.1"; sha256="0anrbhw07mird9fj96x1p0gynjnjcj07gpwlq0ffjlqq2qmkzgqs"; depends=[quadprog lpSolve MASS]; }; limitplot = derive { name="limitplot"; version="1.2"; sha256="0wj1xalm80fa5pvjwh2zf5hpvxa3r1hnkh2z9z285wkbrcl0qfl2"; depends=[]; }; linLIR = derive { name="linLIR"; version="1.1"; sha256="1v5bwki5j567x2kndfd5nli5i093a33in31025h9hsvkbal1dxgp"; depends=[]; }; +linbin = derive { name="linbin"; version="0.1.0"; sha256="0812m19kfscb0d23rv0llziapd269r7zlm2yq8h3yp8c8jl8gdb1"; depends=[]; }; lineup = derive { name="lineup"; version="0.34-1"; sha256="0p6gxbv8xdrhgk8zdlnqrybald9vqz717czb49b123h84rjr2f19"; depends=[qtl class]; }; linkR = derive { name="linkR"; version="1.0.0"; sha256="1l936i74h1s42w1d7nn220rjygc6n0jkjidvix1df2wlacnswzpg"; depends=[svgViewR]; }; linkcomm = derive { name="linkcomm"; version="1.0-11"; sha256="1w5sfmzvrk30fr161pk0cy5nj8kasqm6hqgyafq6r280b5s272cb"; depends=[igraph RColorBrewer dynamicTreeCut]; }; @@ -3975,14 +4055,14 @@ liso = derive { name="liso"; version="0.2"; sha256="072l7ac1fbkh8baiiwx2psiv1sd7 lisp = derive { name="lisp"; version="0.1"; sha256="025sq46277q9i21189cbmx5dnrh5wfshc5k6la1wjilhr1iqf6nj"; depends=[]; }; lisrelToR = derive { name="lisrelToR"; version="0.1.4"; sha256="0zicq0z3hhixan1p1apybnf3v5s6v6ysll4pcz8ivygwr2swv3p5"; depends=[]; }; list = derive { name="list"; version="7.1"; sha256="1avbps4di6rhy6rvfyky336zqab65ibfjw2hwp1r713psbmf9z16"; depends=[sandwich VGAM magic gamlss_dist MASS quadprog arm corpcor mvtnorm coda]; }; -llama = derive { name="llama"; version="0.7.2"; sha256="115j944891mf6sba2bk1lhb8ksdw2halncjvf1j9wsjb6d41liha"; depends=[mlr plyr rJava parallelMap]; }; +llama = derive { name="llama"; version="0.8.1"; sha256="0pv411kj4n3pi2yg35jzjd4zfxkqksbp049v6d9xd2q14i9kphv2"; depends=[mlr rJava parallelMap ggplot2 checkmate]; }; lle = derive { name="lle"; version="1.1"; sha256="09wq7mzw48czp5k0b4ij399cflc1jz876fqv0mfvlrydc9igmjhk"; depends=[scatterplot3d MASS snowfall]; }; lllcrc = derive { name="lllcrc"; version="1.2"; sha256="06n1fcd3g3z5rl2cyx8jhyscq9fb52mmh0cxg81cnbmai3sliccb"; depends=[data_table combinat VGAM plyr]; }; lm_beta = derive { name="lm.beta"; version="1.5-1"; sha256="0p224y9pm72brbcq8y1agkcwc82j7clsnszqzl1qsc0gw0bx9id3"; depends=[]; }; lm_br = derive { name="lm.br"; version="2.6"; sha256="1f7cxd6ksspgpz2lnppyb466lgis5isk0bj8z4bjiwk4abg4lg3i"; depends=[Rcpp Rcpp]; }; lmSupport = derive { name="lmSupport"; version="2.9.1"; sha256="11c86ji7srv80zlrp6c8ark312xzvajig8flc5qm77dgacik8daq"; depends=[car psych gvlma AICcmodavg lme4 pbkrtest]; }; lme4 = derive { name="lme4"; version="1.1-7"; sha256="0v9vl9rspakyw2dmcl5lbhv1nlg10yhgdvi3gpfnizln7xw9ksyp"; depends=[Matrix Rcpp MASS nlme lattice minqa nloptr Rcpp RcppEigen]; }; -lmeNB = derive { name="lmeNB"; version="1.2"; sha256="0xgw1kmq3krz8z0ickjg6qkj3bq2bkbwcd79c5fkl6fa3hp035mh"; depends=[numDeriv statmod lmeNBBayes]; }; +lmeNB = derive { name="lmeNB"; version="1.3"; sha256="03khn9wgjbz34sx0p5b9wd3mhbknw8qyvyd5pvllmjipnir63d3q"; depends=[numDeriv statmod lmeNBBayes]; }; lmeNBBayes = derive { name="lmeNBBayes"; version="1.3"; sha256="0zvbliryh821hxxzr2d5irbjp50vkhdmrkzgphv9jnzqh7rr3hvm"; depends=[]; }; lmeSplines = derive { name="lmeSplines"; version="1.1-10"; sha256="0fy6hspk7rqqkzv0czvvs8r4ishvs7zsf4ykvia65nj26w7yhyia"; depends=[nlme]; }; lmeVarComp = derive { name="lmeVarComp"; version="1.0"; sha256="17zrl33h4lcd8lpdv3d12h5afj8nxr2lyw6699zq4fds2chbq66l"; depends=[]; }; @@ -3990,15 +4070,15 @@ lmec = derive { name="lmec"; version="1.0"; sha256="09shj01h2dl5lh7ch0wayr7qyhlm lmenssp = derive { name="lmenssp"; version="1.0"; sha256="0a1q9ax0pnz9gcv4nzgay9lznaz9gp27jj6vp6la7vfhrfg5qcg6"; depends=[MASS nlme]; }; lmerTest = derive { name="lmerTest"; version="2.0-20"; sha256="1x3h78lnj7j002lzx0yxg36vl98z5xmk913k3h2wssxfva9ljp0w"; depends=[Matrix lme4 plyr numDeriv MASS Hmisc gplots]; }; lmf = derive { name="lmf"; version="1.2"; sha256="1xqlqmjl7wf5b2s2a1k1ara21v74b3wvwl4mhbj9dkdb0jcrgfva"; depends=[]; }; -lmm = derive { name="lmm"; version="0.9"; sha256="0gs68iwk9gajb5af5ibgg9k5280ixqki8vxyp3cq5lrk96gcmqpr"; depends=[]; }; +lmm = derive { name="lmm"; version="1.0"; sha256="0x5ikb1db99dsn476mf4253dlznlxa1cwnykg1nwnm2vy5qym2fq"; depends=[]; }; lmmfit = derive { name="lmmfit"; version="1.0"; sha256="06mzmx7md7qw5mfhgdljc7i40sx9yrx7j57xbbp3fhl2zs1dpb4g"; depends=[nlme MASS]; }; lmmlasso = derive { name="lmmlasso"; version="0.1-2"; sha256="1mvd38k9npyc05a2x7z0908qz9x4srqgzq9yjyyggplqfrl4dgsz"; depends=[emulator miscTools penalized]; }; lmmot = derive { name="lmmot"; version="0.1.2"; sha256="1c7cn1g1fl8nwjzm78a8qgw9da170f1q0z5vxl446f167ix5ppkp"; depends=[maxLik MASS]; }; lmms = derive { name="lmms"; version="1.2"; sha256="12wli7iwnihq42pa1jy1ml4y3l93grwrv9n7vpgp5wp1hj4d1s8c"; depends=[nlme lmeSplines reshape gdata gplots ggplot2]; }; lmodel2 = derive { name="lmodel2"; version="1.7-2"; sha256="0dyzxflr82k7ns824zlycj502jx3qmgrck125im2k2da34ir3m3q"; depends=[]; }; -lmom = derive { name="lmom"; version="2.4"; sha256="04mfp7fcw1696qn34pxdffspwy0xalig3p7mqcj49v6kdxclpx1p"; depends=[]; }; -lmomRFA = derive { name="lmomRFA"; version="3.0"; sha256="188i2fk2csqwdmw3x1wwigaajbvwfd9dwd8q3pmx7ha4smp49amk"; depends=[lmom]; }; -lmomco = derive { name="lmomco"; version="2.1.1"; sha256="0q58g13j7h8pag3yj96qpnsa2m77hrrjkc24f6x847vlsn39md80"; depends=[]; }; +lmom = derive { name="lmom"; version="2.5"; sha256="0s2x8k6p71hxdqggy8ajk7p9p040b9xr3lm49g31z3kcsmzvk23q"; depends=[]; }; +lmomRFA = derive { name="lmomRFA"; version="3.0-1"; sha256="0lf8n6bhdv3px6p60smghvmwsbgawvjrmgy2dfhs517n67pxg30i"; depends=[lmom]; }; +lmomco = derive { name="lmomco"; version="2.1.3"; sha256="1baxs9c385rgcw73hr1616gknb7fs5v81bv5jv5g1fwzr1qxxm7k"; depends=[]; }; lmtest = derive { name="lmtest"; version="0.9-33"; sha256="1ycmxjrxf41mnbgakdmn4y2kmgp4rkj7v3nqwqnlc6gdfdmac73s"; depends=[zoo]; }; loa = derive { name="loa"; version="0.2.22"; sha256="13j4d4d35nd2ssmkghpd6azysmy7g8mc9y3glkzjnddp1xxz8icn"; depends=[lattice MASS png RgoogleMaps RColorBrewer]; }; localdepth = derive { name="localdepth"; version="0.5-7"; sha256="0h0y74xnhdqa7y51ljmpz7ayznppvy2ll06wfds6200lb9cxgr7k"; depends=[circular]; }; @@ -4043,10 +4123,11 @@ lqa = derive { name="lqa"; version="1.0-3"; sha256="141r2cd9kybi6n9jbdsvhza8jdxx lqmm = derive { name="lqmm"; version="1.5.1"; sha256="1myv2v2059vlni1npxyv6ii846aiqz1mvyz9r9n5vpzgz92abizi"; depends=[SparseGrid nlme]; }; lrmest = derive { name="lrmest"; version="1.0"; sha256="1gdj8pmmzvs1li05pwhad63blhibq45xd1acajxsx06k7k21ajs7"; depends=[MASS]; }; lsa = derive { name="lsa"; version="0.73"; sha256="041wa1i85i90qvm5sxvd9nidis8s069cvf9nw1r68ajkvds65y91"; depends=[SnowballC]; }; +lsbclust = derive { name="lsbclust"; version="1.0.1"; sha256="13vp6jz4py8ljp6sa1swpcw2j7lg7qfj3xk1qbi0kbw0krswg959"; depends=[ggplot2 plyr clue gridExtra reshape2 Rcpp Rcpp]; }; lsdv = derive { name="lsdv"; version="1.1"; sha256="0rl1xszr9r8v71j98gjpav30n2ncsci19hjlc9flzs1s20sb1xpr"; depends=[]; }; lsgl = derive { name="lsgl"; version="1.0.123.1"; sha256="10q3f56yjgs3kvyk7b7d1xi06sa16pv9y3c6lsp1461whqvinpj4"; depends=[sglOptim Matrix sglOptim Rcpp RcppProgress RcppArmadillo BH]; }; lshorth = derive { name="lshorth"; version="0.1-6"; sha256="0nbjakx0zx4fg09fv26pr9dlrbvb7ybi6swg84m2kwjky8399vvx"; depends=[]; }; -lsmeans = derive { name="lsmeans"; version="2.14"; sha256="1js8k0cawc297yyqv6415agjy84x5znf4cd7qwqf36iyg0pzzxq1"; depends=[multcomp plyr Matrix mvtnorm]; }; +lsmeans = derive { name="lsmeans"; version="2.15"; sha256="14fl0nfqypbnqqdl7q0gvjn9880j6wkdk48jbf0xq953l11qw4sh"; depends=[estimability multcomp plyr Matrix mvtnorm]; }; lspls = derive { name="lspls"; version="0.2-1"; sha256="1g27fqhnx9db0zrxbhqr76agvxy8a5fx1bfy58j2ni76pki1y4rl"; depends=[pls]; }; lsr = derive { name="lsr"; version="0.3.2"; sha256="1ahcj3ja5hj7pc7hvzlvhmh62mql3a0awli8szsyld0fpn50wprz"; depends=[]; }; lss = derive { name="lss"; version="0.52"; sha256="1fvs8p9rhx81xfn450smnd0i1ym06ar6nwwcpl74a66pfi9a5sbp"; depends=[quantreg]; }; @@ -4055,10 +4136,10 @@ ltm = derive { name="ltm"; version="1.0-0"; sha256="1igkgb0jy3mzlnp9s6avhcpplwij ltmle = derive { name="ltmle"; version="0.9.3-1"; sha256="0nvcxl55nmcabsz79vkjxmnifzm2vxg0lgwcjqiwsj242vhnfjhh"; depends=[]; }; ltsa = derive { name="ltsa"; version="1.4.4"; sha256="06db0d4j0kqp4q6rpa3sawcsm5rfgdhzl8fl7cxivjbbyrfnszqp"; depends=[]; }; ltsbase = derive { name="ltsbase"; version="1.0.1"; sha256="16p5ln9ak3h7h0icv5jfi0a3fbw5wdqs3si69sjbn8f5qs2hz7yp"; depends=[MASS robustbase]; }; -ltsk = derive { name="ltsk"; version="1.0.1"; sha256="1ym9h6af1aq46b6yxhdwnp6kqgx3zw08sal67y8rqd9z68432lx4"; depends=[fields]; }; +ltsk = derive { name="ltsk"; version="1.0.3"; sha256="17l4mwggd4s39l6x1b6gvwgd6gjl0h37wfis1i6l9k6hiaqhb6vr"; depends=[fields]; }; lubridate = derive { name="lubridate"; version="1.3.3"; sha256="1f07z3f90vbghsarwjzn2nj6qz8qyfkqalszx8cb5kliijdkwy8z"; depends=[plyr stringr memoise]; }; luca = derive { name="luca"; version="1.0-5"; sha256="1jiqwibkrgga4ahz0qgpfkvrsxjqc55i2nwnm60xddb8hpb6a6qx"; depends=[survival genetics]; }; -lucid = derive { name="lucid"; version="1.0"; sha256="15fpwskyf5qhzdsm44ik3fz3wkxdc3frnnyqgksbc06w3jpm3jrb"; depends=[nlme]; }; +lucid = derive { name="lucid"; version="1.1"; sha256="1dywjl9zhmaqbhmsazdffhnnjbdcsgrzw54c0im23jz22jq8jw52"; depends=[nlme]; }; lunar = derive { name="lunar"; version="0.1-04"; sha256="0nkzy6sf40hxkvsnkzmqxk4sfb3nk7ay4rjdnwf2zym30qax74kk"; depends=[]; }; lvm4net = derive { name="lvm4net"; version="0.1"; sha256="0b140jybn6jpr1qh3s84vg0ba34356vc8pa4v2zfp9ggipfl073b"; depends=[ergm ellipse igraph]; }; lxb = derive { name="lxb"; version="1.3"; sha256="0mvjk0s9bzvznjy0cxjsqv28f6jjzvr713b2346ym4cm0y4l3mir"; depends=[]; }; @@ -4073,7 +4154,7 @@ mRm = derive { name="mRm"; version="1.1.5"; sha256="0sbpk7z4ij917nw8wyvnm87iav95 maRketSim = derive { name="maRketSim"; version="0.9.2"; sha256="1cq17zjwyf4i5lcqgxqkw805s4mr6qp89blgpmpxy8gdrbfj93m4"; depends=[]; }; maSAE = derive { name="maSAE"; version="0.1-2"; sha256="18a1zbfmjhrmi3fgqd7vaicpsca59kp8r1003pwl7l4032p32fxk"; depends=[]; }; maboost = derive { name="maboost"; version="1.0-0"; sha256="18d36cgvn8p75nidfr6al458jbzwc1i7x77y1ks50y9phrz3wf65"; depends=[rpart C50]; }; -mada = derive { name="mada"; version="0.5.6"; sha256="10vw138ykfz0s8c2q39fd4vipran85w04jmr1fni4z8x0i67iak2"; depends=[mvtnorm ellipse mvmeta]; }; +mada = derive { name="mada"; version="0.5.7"; sha256="0a2m1rb4d143v9732392xzvbg6x1k3l0g3zscgbx64m21kxshmgb"; depends=[mvtnorm ellipse mvmeta]; }; mads = derive { name="mads"; version="0.1.1"; sha256="070948j1r1dpymg2smgciz87nzpkv5fwvfsfppf0jrgfncivav1l"; depends=[mrds]; }; madsim = derive { name="madsim"; version="1.1"; sha256="1d9mv769zia43krdfl43hp22cp5mdi3ycwj3kxyfcjrg23bjnyc0"; depends=[]; }; magic = derive { name="magic"; version="1.5-6"; sha256="1399w1zhz79nj8cdhslybncd9h6rylfhb548nv22ip0dxxdkyv0v"; depends=[abind]; }; @@ -4092,7 +4173,7 @@ mapmisc = derive { name="mapmisc"; version="1.1.1"; sha256="0q30y243dava7zq2gz2d mapplots = derive { name="mapplots"; version="1.5"; sha256="09sk78a0p8hlwhk3w2dwvpb0a6p7fqdxyskvz32p1lcav7y3jfrb"; depends=[]; }; mapproj = derive { name="mapproj"; version="1.2-2"; sha256="1fdb72hvcp6jm7rhvs8zdkya6ifs92lfqnmq5vj5amwckkxfidc6"; depends=[maps]; }; maps = derive { name="maps"; version="2.3-9"; sha256="1gzy81sl4vpr4hsnh4jsp5rd26jdkzsw99qxwfmbadjyf55q06wv"; depends=[]; }; -maptools = derive { name="maptools"; version="0.8-30"; sha256="0vbpgxdz6xl8a2bkhcw6rfs15nvmppka0ad7i2v2pi18350riwpq"; depends=[sp foreign lattice]; }; +maptools = derive { name="maptools"; version="0.8-34"; sha256="1ii4vgapdbf0i9f71agfmv85lmw1da686igw1252kgfrbf2mjdfw"; depends=[sp foreign lattice]; }; maptpx = derive { name="maptpx"; version="1.9-1"; sha256="1yrlgz5bkjjs3m59dqp60n95lax0fp7xw00v59kymmw5hr3sis6f"; depends=[slam]; }; maptree = derive { name="maptree"; version="1.4-7"; sha256="1k7v84wvy6wz6g0dyiwvd3lvf78rlfidk60ll4fz7chvr2nrqdp4"; depends=[cluster rpart]; }; mar1s = derive { name="mar1s"; version="2.1"; sha256="0psjva7nsgar5sj03adjx44pw0sdqnsd96m4g6k8d76pv30m1g7l"; depends=[cmrutils fda zoo]; }; @@ -4101,7 +4182,7 @@ marg = derive { name="marg"; version="1.2-2"; sha256="0j08zzcrj8nqsargi6xi50gy9p markdown = derive { name="markdown"; version="0.7.4"; sha256="09bqwv75mvfnjwbsz4v0zr9mmjdccwwgayiv7f6db48lngijng4f"; depends=[mime]; }; marked = derive { name="marked"; version="1.1.6"; sha256="0f9sa4mdkiq1fn99sczb0glf5xfm17a3x8dq9ycf0l39fyg582d0"; depends=[lme4 R2admb truncnorm coda optimx ggplot2 Matrix numDeriv Rcpp plyr Rcpp]; }; markovchain = derive { name="markovchain"; version="0.1.0"; sha256="1x299ila4s5bg9a2a87j4d8bpfajgxad5x9l3hjlghciki69080x"; depends=[igraph Matrix matlab expm]; }; -marmap = derive { name="marmap"; version="0.9.1"; sha256="1yldq55rgbx4immjg1j5d6110fr2rwpl2v4m6fwdqlhim1hqh82k"; depends=[DBI RSQLite gdistance geosphere sp raster ncdf plotrix shape reshape2 adehabitatMA]; }; +marmap = derive { name="marmap"; version="0.9.2"; sha256="1csi6v6z2p3nmyqwy8bmbj036693rzmxrc317g0a45gsqxggp3n4"; depends=[DBI RSQLite gdistance geosphere sp raster ncdf plotrix shape reshape2 adehabitatMA ggplot2]; }; marqLevAlg = derive { name="marqLevAlg"; version="1.1"; sha256="1wmqi68g0flrlmj87vwgvyxap0miss0n42qiiw7ypyj4jw9kwm8j"; depends=[]; }; matR = derive { name="matR"; version="0.9"; sha256="0lih3g2z6rxykprl3s529xcf466bpzpsv4l20dkgx1fgfslfcl2p"; depends=[MGRASTer BIOM_utils]; }; matchingMarkets = derive { name="matchingMarkets"; version="0.1-2"; sha256="02hx8q13n0l2880480vfkizlz6i1l78q95kn08c4mnnqd0jglifv"; depends=[Rcpp lpSolve partitions Rcpp RcppArmadillo]; }; @@ -4109,18 +4190,18 @@ mathgraph = derive { name="mathgraph"; version="0.9-11"; sha256="0xikgzn24p0qqlr matie = derive { name="matie"; version="1.2"; sha256="1ymx49cyvz63imqw5n48grilphiqvvdirwsrv82p7jgxdyav2xv0"; depends=[dfoptim mvtnorm seriation igraph gplots cba]; }; matlab = derive { name="matlab"; version="1.0.2"; sha256="0m21k2vzbc5d3c93p2hk4208xyd2av2slg55q5j1ibjidiryqgd2"; depends=[]; }; matpow = derive { name="matpow"; version="0.1.1"; sha256="1a6q21ba16qfdpykmjwgmrb1kkvvyx48qg8cbgpdmch0vhibcgcp"; depends=[]; }; -matrixStats = derive { name="matrixStats"; version="0.13.0"; sha256="074cjqc11sz38xdwi5rpf96b5ldqmck9xz9hddwkli8j54sajqv3"; depends=[R_methodsS3]; }; +matrixStats = derive { name="matrixStats"; version="0.14.0"; sha256="1glm3h6d4c6bl3svnfk6fyj59linfc7s6fyrs0nlcwizs4371nis"; depends=[]; }; matrixcalc = derive { name="matrixcalc"; version="1.0-3"; sha256="1c4w9dhi5w98qj1wwh9bbpnfk39rhiwjbanalr8bi5nmxkpcmrhp"; depends=[]; }; matrixpls = derive { name="matrixpls"; version="0.5.0"; sha256="0r1qpfbvaq24d30ck5c5zwsss4rqhl12g3hhmij3cn55hmv26azq"; depends=[assertive matrixcalc lavaan psych MASS]; }; maxLik = derive { name="maxLik"; version="1.2-4"; sha256="1b2qr16s2w76nxqdlq3hflpg0sjnn8mlzas7082y8xpxw3cknpdz"; depends=[miscTools sandwich]; }; maxent = derive { name="maxent"; version="1.3.3.1"; sha256="1skc7d0p6kg0gi1bpgaqn2dmxjzbvcphx5x3idpscxfbplm5v96p"; depends=[SparseM tm Rcpp Rcpp]; }; maxlike = derive { name="maxlike"; version="0.1-5"; sha256="0h544wr7qsyb70vmbk648hfyb6arrsb41gw39svcin412rhw9k9j"; depends=[raster]; }; maxstat = derive { name="maxstat"; version="0.7-21"; sha256="0c83ykazj7np35sln8i87z29hg6dx1vsayfirc2pj533dzhhh9a8"; depends=[exactRankTests mvtnorm]; }; -mbbefd = derive { name="mbbefd"; version="0.5.0.1"; sha256="08sq482cqa3jgbannvg16fqwadivg7lxigyfvwhagibv3764j8z4"; depends=[]; }; +mbbefd = derive { name="mbbefd"; version="0.6"; sha256="0lmidvganblkd1lxq4fy1rapzzdn89w3277nblw6nxjp33yx4nzm"; depends=[Rcpp Rcpp]; }; mbest = derive { name="mbest"; version="0.1"; sha256="0dz54rgbl40cbrv6670qd441ymz43lj16dvd9fnq3znfafc1790n"; depends=[lme4]; }; mblm = derive { name="mblm"; version="0.12"; sha256="17h65bapvz89g5in3gkxq541bxgpj9pciz6i5hzhqn0bdbsb3k6r"; depends=[]; }; mbmdr = derive { name="mbmdr"; version="2.6"; sha256="0ss5w66hcgd8v8j9bbbp12a720sblhr2hy9kidqfr8hgjaqlch86"; depends=[logistf]; }; -mboost = derive { name="mboost"; version="2.4-1"; sha256="14lfsmhi9vg87ah19vi5xdf7nyrlvm6ha0nyr0alwz49pjkhygjw"; depends=[stabs Matrix survival lattice nnls quadprog]; }; +mboost = derive { name="mboost"; version="2.4-2"; sha256="104qs8hbsm4ps5ybzxrdz6lz0lqn925xy4k3m4rmbk4r62wj9v61"; depends=[stabs Matrix survival lattice nnls quadprog]; }; mc2d = derive { name="mc2d"; version="0.1-15"; sha256="1kp2l1gvw3caplq9916s1dmpmfp6fb2xscys9gj6dykl6gi4h4hb"; depends=[mvtnorm]; }; mcGlobaloptim = derive { name="mcGlobaloptim"; version="0.1"; sha256="1p8841y9a4yq51prv6iirgw9ln8jznx8nk547sc5xlznksjy1g9n"; depends=[randtoolbox snow]; }; mcIRT = derive { name="mcIRT"; version="0.41"; sha256="0pbwydl4zjzwdlpzwpqm4xhq716zgq9s7bvcbrqp6q0jkba9zjnw"; depends=[Rcpp Rcpp RcppArmadillo]; }; @@ -4149,7 +4230,7 @@ measuRing = derive { name="measuRing"; version="0.1"; sha256="1nlsxrld6dsqv4cyss meboot = derive { name="meboot"; version="1.4-5"; sha256="1h33f3dpx906q5nmd57hhkq07mbs2kg8mv6mi4imaa2zpr5vc4py"; depends=[dynlm nlme]; }; medSTC = derive { name="medSTC"; version="1.0.0"; sha256="1f7w6jbxairqvghr5b7vgdllg3ian16a1fgi7vqlq0mhy2j6phan"; depends=[]; }; mederrRank = derive { name="mederrRank"; version="0.0.7"; sha256="08jbqmb418qb7v2x6lm4wig1pfzzfx6fhb49mbfhlkbmssbqsjfq"; depends=[BB numDeriv]; }; -medflex = derive { name="medflex"; version="0.4.0"; sha256="0qmq01761955zb3fs649mfclg8j82lg07a7rkvfwillkg3ls5k56"; depends=[multcomp boot]; }; +medflex = derive { name="medflex"; version="0.5-0"; sha256="06zp0la99ly2vpm97l3qm289inyd0bxgkjd4cv15mvc47w9c9x9x"; depends=[multcomp boot Matrix sandwich]; }; mediation = derive { name="mediation"; version="4.4.3"; sha256="1m3q7zw1wsl6nnfjigbp3yg8mjnqxzawbgdrj7diclz8s6f07b4x"; depends=[MASS Matrix mvtnorm sandwich lpSolve Hmisc]; }; medicalrisk = derive { name="medicalrisk"; version="1.1"; sha256="1fb8zp426zcqsnb35sgywnz44lpssa1acfa2aha9bnvyazif3s90"; depends=[plyr reshape2 hash]; }; mefa = derive { name="mefa"; version="3.2-5"; sha256="037vpnwclyj6xgycznh6g6qlirlgy3sjnkjqb1046q80b5ywv2ni"; depends=[]; }; @@ -4163,11 +4244,11 @@ memoise = derive { name="memoise"; version="0.2.1"; sha256="19wm4b3kq6xva43kga3x memuse = derive { name="memuse"; version="1.1"; sha256="1i6l3d885b4v01hlkl50m401bwi7akydhh52gf4kya5khanb8n2b"; depends=[]; }; merror = derive { name="merror"; version="2.0.1"; sha256="09v62f7ycywasid3b7x52dhidplwdbx9fd0855b40jklfy469bkn"; depends=[]; }; metRology = derive { name="metRology"; version="0.9-17"; sha256="1g4gv3mpii71i6imfwqg9d5iwfx03bq4lizzhx7dy39b2mj7jd4q"; depends=[MASS numDeriv]; }; -meta = derive { name="meta"; version="4.0-3"; sha256="0c5by24381vsfqin8y5swakyp162izxa2i3j1bxwqf34m8crwpl6"; depends=[]; }; +meta = derive { name="meta"; version="4.1-0"; sha256="0zf2917ljzpbc8izprzx7a78wc37q2k23lzdk8rmm5chml16mb3f"; depends=[]; }; metaLik = derive { name="metaLik"; version="0.41.0"; sha256="08wiriq6cm02d0b0q34056y5249daidpjzkwzgjq6dh55v5fp2s4"; depends=[]; }; -metaMA = derive { name="metaMA"; version="2.1"; sha256="1hwhj3m4n48qb9vqix2qazsy1xnmwk8x37zm826xx9j0n5j2ilac"; depends=[SMVar]; }; +metaMA = derive { name="metaMA"; version="3.1.2"; sha256="1mjyz06q1kc8lhfixpym4ndpnisi1r849fj3da6riwfd6ab1v181"; depends=[SMVar]; }; metaMix = derive { name="metaMix"; version="0.1"; sha256="15vw8cwsy56fhq0q9w99799bnkj2ji2ns0ljfkg1p7wwhfrj689f"; depends=[data_table Matrix gtools Rmpi ggplot2]; }; -metaRNASeq = derive { name="metaRNASeq"; version="0.4"; sha256="14xqgxvlip6il1gx9xvv37683qm7zmyswklbcgqw9rgqifi0plal"; depends=[]; }; +metaRNASeq = derive { name="metaRNASeq"; version="1.0.2"; sha256="1xz7df7ypq4326yg429pgxd6aldp14c3h3qi20j5nqr5xgsdgzqa"; depends=[]; }; metabolomics = derive { name="metabolomics"; version="0.1.4"; sha256="0m5d2784mkpkkg396y3vpvf38vmba5kvxarilq3zf818vjs4pnax"; depends=[crmn gplots]; }; metacom = derive { name="metacom"; version="1.4.2"; sha256="1vb8qyilwvqb6b5sxqlmbw25r12q8f5h0mqbh3mbcmr0zarb35ql"; depends=[devtools vegan lattice]; }; metacor = derive { name="metacor"; version="1.0-2"; sha256="04k3ph0yg3jp8x4g6l1h4m0qwl51mx0626xmm0fzr1pv4b4a1ypw"; depends=[rmeta gsl]; }; @@ -4181,10 +4262,10 @@ metasens = derive { name="metasens"; version="0.2-0"; sha256="13mncikxzg8cnpbw78 metatest = derive { name="metatest"; version="1.0-4"; sha256="0bz6gg2n4ffkr144jxk27y24xpqhp8awr09wkaijmv8902qx6qah"; depends=[]; }; meteoForecast = derive { name="meteoForecast"; version="0.43"; sha256="1fpbxkdkgi50xbx3n26apdm6i29a2302vabfz0z3czafd76wkwg7"; depends=[raster sp zoo ncdf rjson]; }; meteogRam = derive { name="meteogRam"; version="1.0"; sha256="167gyxjnl4dyfqs3znv8sdpkvpqdxzdqi1g730s30gycrm9snap9"; depends=[ggplot2 RadioSonde]; }; -mets = derive { name="mets"; version="1.0"; sha256="1jmvcnhxxqhfim8dxm2jglr616lj9dqzp9931m318m167gk4785z"; depends=[timereg lava numDeriv Rcpp survival Rcpp RcppArmadillo]; }; +mets = derive { name="mets"; version="1.1.0"; sha256="0nfyfmhcd4sy2j1nymgw4yz0b5a36s2dqx42kzwbzgvp1m11z225"; depends=[timereg lava numDeriv Rcpp survival Rcpp RcppArmadillo]; }; mewAvg = derive { name="mewAvg"; version="0.3.0"; sha256="16gc78ccjffp9qgc7rs622jql54ij83ygvph3hz19wpk22m96glm"; depends=[]; }; mfblock = derive { name="mfblock"; version="1.0"; sha256="06raii52gb7fzh23ahvkrcwvbx3mg02ww3qa340igkqys6jf3yih"; depends=[skewt boot nloptr]; }; -mfp = derive { name="mfp"; version="1.5.0"; sha256="1hqsw7dn7vwgg5qhjmx50xdm0k3g95n0r6r8wbqrp3nx8rzxgsnr"; depends=[survival]; }; +mfp = derive { name="mfp"; version="1.5.1"; sha256="0flqrvicgks7nxxijhndshpf541drlgqjidm3nql1bg5hnpc5fcq"; depends=[survival]; }; mfx = derive { name="mfx"; version="1.1"; sha256="1zhpk38k7vdq0pyqi1s858ns19qycs3nznpa00yv8sz9n798wnn5"; depends=[sandwich lmtest MASS betareg]; }; mgcv = derive { name="mgcv"; version="1.8-4"; sha256="18hd5b4p2k941f4lg18a73671hqdf2gh4z4vw08lkab10zpl59sa"; depends=[nlme Matrix]; }; mgpd = derive { name="mgpd"; version="1.99"; sha256="0cxpgza9i0hjm5w1i5crzlgh740v143120zwjn95cav8pk8n2wyb"; depends=[evd numDeriv corpcor fields]; }; @@ -4203,8 +4284,8 @@ micEconSNQP = derive { name="micEconSNQP"; version="0.6-6"; sha256="1n3pxapc90iz mice = derive { name="mice"; version="2.22"; sha256="1b7ivpa21ipzbmmwjn1ch968zpw6wydg30f7jdk95m40lrk2xs68"; depends=[Rcpp lattice MASS nnet randomForest rpart Rcpp]; }; miceadds = derive { name="miceadds"; version="1.0"; sha256="15kz3n7gx40il4sagnp5qc7c31dk1phdb932289lc0xknrb8k00a"; depends=[MASS mice mvtnorm pan sirt lme4 MBESS pls mitools bayesm Rcpp inline car foreign Rcpp RcppArmadillo]; }; microbenchmark = derive { name="microbenchmark"; version="1.4-2"; sha256="05yxvdnkxr2ll94h6f2m5sn3gg7vrlm9nbdxgmj2g8cp8gfxpfkg"; depends=[ggplot2]; }; -micromap = derive { name="micromap"; version="1.9"; sha256="0scb79rrj11vy7qgq27hy8222ar22yagk31bq8b5z268zwfbw4fs"; depends=[ggplot2 maptools RColorBrewer rgdal]; }; -micromapST = derive { name="micromapST"; version="1.0.3"; sha256="182zhpsps8cx3wflc5j62njzsv108d5a30v9sb1wpxpcrnsyr343"; depends=[RColorBrewer]; }; +micromap = derive { name="micromap"; version="1.9.2"; sha256="1x4v0ibbpfz471dp46agib27i4svs8wyy93ldriryvhpa2w5948y"; depends=[maptools RColorBrewer rgdal sp ggplot2]; }; +micromapST = derive { name="micromapST"; version="1.0.5"; sha256="1n9mzyl5dj21165j0j99brkqq7c54j3cg6r21ifdzffj2dx29wh0"; depends=[RColorBrewer]; }; micropan = derive { name="micropan"; version="1.0"; sha256="0qnxm6z2pk1wibchj6rhn3hld77dzl5qgvzl4v9n16ywlgdv09ai"; depends=[igraph]; }; midasr = derive { name="midasr"; version="0.3"; sha256="1gdfrf8p4wxz03bzdqrvj4ss14zy7dh5ac04ncvg4db2wcdxq6z5"; depends=[sandwich optimx MASS numDeriv Matrix]; }; migest = derive { name="migest"; version="1.6"; sha256="1mjjcba74nk10kdbsaphih3zdyaqmf02hrv13s34klwdwkp3nv0m"; depends=[]; }; @@ -4216,16 +4297,17 @@ minerva = derive { name="minerva"; version="1.4.1"; sha256="0dg5xnl9srdvid49na84 miniCRAN = derive { name="miniCRAN"; version="0.1-1"; sha256="0azyv5wcl4dk1z4j6pq26y7h7f9lvq6m198dj4aa142k9smxfrnw"; depends=[XML httr igraph]; }; miniGUI = derive { name="miniGUI"; version="0.8.0"; sha256="1iq52x7wbcin7ya207jj3k9vym7mavm5z61vggyabdmr768pci39"; depends=[]; }; minimax = derive { name="minimax"; version="1.0"; sha256="1g0d9q5h1avbb0yg7ajw5330820i3n5cgkpsif754l4j3ikya8p3"; depends=[]; }; +minimist = derive { name="minimist"; version="0.1"; sha256="007y829d766b1v6wkrhk7pkg99r38bvmhc8bwvs8rs13dr7444ln"; depends=[V8]; }; minpack_lm = derive { name="minpack.lm"; version="1.1-8"; sha256="0nvsxqwg3k9k3dqjzkz1vq2z0xla317011zm9ms8y1qvf75raz83"; depends=[]; }; minqa = derive { name="minqa"; version="1.2.4"; sha256="036drja6xz7awja9iwb76x91415p26fb0jmg7y7v0p65m6j978fg"; depends=[Rcpp Rcpp]; }; minque = derive { name="minque"; version="1.1"; sha256="1hx4j38213hs8lssf9kj5s423imk7dzv60mdbzrpbp7la7jk2n57"; depends=[klaR Matrix]; }; minxent = derive { name="minxent"; version="0.01"; sha256="1a0kak4ff1mnpvc9arr3sihp4adialnxxyaacdgmwpw61wgcir7h"; depends=[]; }; -mipfp = derive { name="mipfp"; version="1.0"; sha256="16gy2krldhg08xqblk3wc2qxia7zy0q8s1mn2yifz53xm0xlghlr"; depends=[]; }; -mirt = derive { name="mirt"; version="1.7"; sha256="0bh173gk667848x4pj95g19g90gyviii1y4hwyhxfyd90jsqikzz"; depends=[lattice GPArotation Rcpp sfsmisc numDeriv Rcpp]; }; -mirtCAT = derive { name="mirtCAT"; version="0.3"; sha256="1z83d0f35az5gh3vx8cdr1v4qcmnvqxkxs5jplcx26vh318byaaw"; depends=[mirt shiny lattice]; }; +mipfp = derive { name="mipfp"; version="1.5"; sha256="1hjayf9m0qp5m67ndq6w03c6zgrh74jfhd7yzh1xhsnbsxi5iqi3"; depends=[cmm]; }; +mirt = derive { name="mirt"; version="1.8"; sha256="1lmq5nbh46ik97f6cf37iixzwws15rnpacaig7rv7bax23d6gcwc"; depends=[lattice GPArotation Rcpp sfsmisc numDeriv Rcpp]; }; +mirtCAT = derive { name="mirtCAT"; version="0.4.2"; sha256="133q6kdj8hkgfrby6sb9kdpmlk097zzwapb0nh2lnswyxfpl7s6w"; depends=[mirt shiny lattice Rcpp Rcpp RcppArmadillo]; }; misc3d = derive { name="misc3d"; version="0.8-4"; sha256="0qjzpw3h09qi2gfz52b7nhzd95p7yyxsd03fldc9wzzn6wi3vpkm"; depends=[]; }; miscF = derive { name="miscF"; version="0.1-2"; sha256="195rb9acdirfhap0z35yvcci5xn4j84mlbafki4l1vfgqgnh0ajj"; depends=[MCMCpack mvtnorm Rcpp RcppArmadillo Rcpp RcppArmadillo]; }; -miscFuncs = derive { name="miscFuncs"; version="1.2-6"; sha256="1302k6pvf74a0b9bkdjdr2j1xl98842rbq7137h8hwldl50g48i7"; depends=[roxygen2 mvtnorm]; }; +miscFuncs = derive { name="miscFuncs"; version="1.2-7"; sha256="1cnhd23fi6akr3fsr2b85s5cn36ksy4h3c4iyyjqcpc49wa819d0"; depends=[roxygen2 mvtnorm]; }; miscTools = derive { name="miscTools"; version="0.6-16"; sha256="19mslb64lm8srrmml1v40rfkxhqw02bplw0yjv7qnkqj44hcqfw1"; depends=[]; }; miscset = derive { name="miscset"; version="0.4"; sha256="04cl8a2chcynfn5rljqw2ll4ry0wqaslqgjh9ny8ax3hcvyvmmwl"; depends=[data_table gridExtra Rcpp xtable Rcpp]; }; missForest = derive { name="missForest"; version="1.4"; sha256="0y02dhrbcx10hfkakg5ysr3kpyrsh2d9i5b0qzhj9x5x0d5q11gp"; depends=[randomForest foreach itertools]; }; @@ -4233,8 +4315,8 @@ missMDA = derive { name="missMDA"; version="1.7.3"; sha256="1wg4rgziw2f8asdxi2a5 mistat = derive { name="mistat"; version="1.0-2"; sha256="1n5wdn5pl6mflzxpdwjj0x44c8a3cxxpwhmyw1jkx5r8yk95mh3p"; depends=[]; }; mistral = derive { name="mistral"; version="1.1-1"; sha256="19zkc5ddjzw17y70x3l6maljsfvg0295xyzx7kavmjrws74jx4rc"; depends=[DiceKriging e1071 kernlab Matrix mvtnorm rgenoud]; }; mitools = derive { name="mitools"; version="2.3"; sha256="0w76zcl8mfgd7d4njhh0k473hagf9ndcadnnjd35c94ym98jja33"; depends=[]; }; -mix = derive { name="mix"; version="1.0-8"; sha256="0zdbxrslj39cl272ggzvlc41gysj1inbcbmsa4ch7ss5xvk5vfbf"; depends=[]; }; -mixAK = derive { name="mixAK"; version="3.8"; sha256="1mkfa9zy61j4hn131x9kfsvydk7p0kp79zg1x9aidpaz5agdc92k"; depends=[colorspace lme4 fastGHQuad mnormt coda]; }; +mix = derive { name="mix"; version="1.0-8"; sha256="0wlp6wkn8dwwnjfq3qzk0hjb3xsjh5ld5zxbd6nf12awpkwa1j9y"; depends=[]; }; +mixAK = derive { name="mixAK"; version="3.10"; sha256="1mma3515p1r5nhbmdyxzvv73ni5iw4arnzq94nw9gib1dgjpm7c5"; depends=[colorspace lme4 fastGHQuad mnormt coda]; }; mixOmics = derive { name="mixOmics"; version="5.0-3"; sha256="1b8ms3jz4acvbfm2b1iw30h2d80lpqgabwr5j9k2gy3nvqm72nxq"; depends=[MASS lattice RGCCA igraph rgl pheatmap]; }; mixPHM = derive { name="mixPHM"; version="0.7-1"; sha256="0v75xv06m40jqq0c4y1gvdrmyddxs814djbpyq61fv8cn22fn7wx"; depends=[survival lattice]; }; mixRasch = derive { name="mixRasch"; version="1.1"; sha256="1r067pv7b54y1bz8p496wxv4by96dxfi2n1c99gziqf5ramx3qzp"; depends=[]; }; @@ -4242,6 +4324,7 @@ mixcat = derive { name="mixcat"; version="1.0-3"; sha256="0xszngygd3yj61pvv6jrrb mixdist = derive { name="mixdist"; version="0.5-4"; sha256="100i9mb930mzvdha31m1srylmpa64wxyjv6pkw1g5lhm1hsclwm3"; depends=[]; }; mixer = derive { name="mixer"; version="1.8"; sha256="1r831jha7qrxibw5m3nc3l6r887ihzxzsj65yjnbl5cf5b8y19bb"; depends=[]; }; mixexp = derive { name="mixexp"; version="1.1.9"; sha256="1qr6gad3fjwxjngjb7iqhspkkwzj1c77v140ap2vdrcygsd6ncd1"; depends=[gdata lattice daewr]; }; +mixlm = derive { name="mixlm"; version="1.0.8.1"; sha256="0ygfi6sw3yl4fpx27kvb8hqspj4ndylm9135avvcjqj9b5jlvb68"; depends=[multcomp pls pracma leaps lme4 car]; }; mixlow = derive { name="mixlow"; version="1.0.1"; sha256="12vnp3gl3ykxzgvc4bwhi4flmc1sl2y77yi0zi4by17q93a49akm"; depends=[nlme]; }; mixor = derive { name="mixor"; version="1.0.2"; sha256="1xkwgk4dvjbpqvvbrb8yb88iz4nkv7sykxaygjq7zfcdrdivxz6n"; depends=[]; }; mixreg = derive { name="mixreg"; version="0.0-5"; sha256="0wsb1z98ymhshw9nhsvlszsanflxv3alwpdsw8lr3v62bkwka8zr"; depends=[]; }; @@ -4256,6 +4339,7 @@ mkssd = derive { name="mkssd"; version="1.1"; sha256="1qqzy6fn6sc3lxahc19hzzf1hz mlDNA = derive { name="mlDNA"; version="1.1"; sha256="0d9lydiwar98hin26slnym4svn0g1xmyn212vvzsx9lzlvs5a9k4"; depends=[snowfall igraph rsgcc e1071 randomForest pROC ROCR]; }; mlPhaser = derive { name="mlPhaser"; version="0.01"; sha256="1s2mqlnbcjdkx0ghvr2sw9rzggqa4jy2vzi9vbyqkh6795lgck6n"; depends=[]; }; mlbench = derive { name="mlbench"; version="2.1-1"; sha256="1rp035qxfgh5ail92zjh9jh57dj0b8babw3wsg29v8ricpal30bl"; depends=[]; }; +mldr = derive { name="mldr"; version="0.1.70"; sha256="08yiglqzlqxlfrxd7l12x59h7a38skrkkf8w7jh620ab7a7w1gyg"; depends=[shiny XML circlize]; }; mlearning = derive { name="mlearning"; version="1.0-0"; sha256="0r8xfaxw83s2r27b8x5qd0k4r5ayxpkafzn9b1a0jvsr87i6520r"; depends=[class nnet MASS e1071 randomForest ipred]; }; mlegp = derive { name="mlegp"; version="3.1.4"; sha256="1932544irhzhf6a8rjyh66j57h9awlhwd6xam603bamfg106cmg2"; depends=[]; }; mleur = derive { name="mleur"; version="1.0-6"; sha256="0mddphq3b6y2jaafaa9y41842kcaqdl3dh7j4pva55q2vcjcclj7"; depends=[urca stabledist fGarch lattice]; }; @@ -4265,8 +4349,8 @@ mlmRev = derive { name="mlmRev"; version="1.0-6"; sha256="0mvmahnbbp478xwldj4wls mlmmm = derive { name="mlmmm"; version="0.3-1.2"; sha256="1m5ziiqs3ll1xjm1yf7x4sdc910jypn3kjnbadf95xxkvqmfrsqq"; depends=[]; }; mlogit = derive { name="mlogit"; version="0.2-4"; sha256="15ndly7i56k8blgvpn15ixxnqx9yvbci7n3mb3hm9mnrxwh5v7sx"; depends=[Formula maxLik statmod zoo MASS lmtest]; }; mlogitBMA = derive { name="mlogitBMA"; version="0.1-6"; sha256="1wl8ljh6rr1wx7dxmd1rq5wjbpz3426z8dpg7pkf1x9wr94a2q25"; depends=[BMA abind maxLik]; }; -mlr = derive { name="mlr"; version="2.2"; sha256="1l1ng2k3iyz3x1237kshcana6f8dds79dzs703c95wrzvfsrim89"; depends=[ParamHelpers BBmisc checkmate codetools ggplot2 parallelMap plyr survival]; }; -mlxR = derive { name="mlxR"; version="2.1.0"; sha256="0b9ws7p4ibbawyaa1fjl6lgs2lywnvg43ba4vzbicm2aqi8qhdyh"; depends=[ggplot2 XML Rcpp]; }; +mlr = derive { name="mlr"; version="2.3"; sha256="0cvg2bxxw3c69lj5wy4ds54wn5h299c5mjcsbax1p0k408z5aa6z"; depends=[ParamHelpers BBmisc ggplot2 checkmate parallelMap plyr reshape2 survival]; }; +mlxR = derive { name="mlxR"; version="2.1.1"; sha256="13ddm4hhnjx7r058qlvvxn9npqa0vq6y5l1g0zrlhckjp7bpp90a"; depends=[ggplot2 XML Rcpp]; }; mmand = derive { name="mmand"; version="1.1.0"; sha256="0awi9wxxalz81d6766djbjsk980n65dhz02fcqb69ifc7x80lc33"; depends=[reportr Rcpp Rcpp RcppArmadillo]; }; mmap = derive { name="mmap"; version="0.6-12"; sha256="12ql03wzwj23h8lwd07rln6id44mfrgf9wcxn58y09wn3ky1rm6a"; depends=[]; }; mmcm = derive { name="mmcm"; version="1.2-5"; sha256="193mlvl8fp5y2150m0xw5bhr7nkr4fgmwjbv1dg314a7ara42v4y"; depends=[mvtnorm]; }; @@ -4296,7 +4380,7 @@ monitoR = derive { name="monitoR"; version="1.0.2"; sha256="1nrw8xrp99p62w4bpsbc monmlp = derive { name="monmlp"; version="1.1.2"; sha256="14x6xz07hg2c5n36rc314z66jqvgmicjxi2vsqyy91vwjxs9akrm"; depends=[]; }; monomvn = derive { name="monomvn"; version="1.9-5"; sha256="1fh0c1234hb5f3rwy85i4rlzc3n1851q5mivckcjs2vdm9rz25mg"; depends=[pls lars MASS]; }; monreg = derive { name="monreg"; version="0.1.2"; sha256="0qah7yw1xwk3pig413r7l8hhh645d45706mndv614fir738bv9pk"; depends=[]; }; -moonBook = derive { name="moonBook"; version="0.1.1"; sha256="04fcnbypwb5md1r6szc8nbd97maxps7dhxzb87marqw5s3gb61qr"; depends=[nortest survival]; }; +moonBook = derive { name="moonBook"; version="0.1.3"; sha256="1wy8qwzymh482gfb4v9v74k666mq8dz2yird7gz43l3hps22kfgb"; depends=[nortest survival]; }; moonsun = derive { name="moonsun"; version="0.1.3"; sha256="1y8mwxmcy4iz444c2fayyi4i0jk1k561dp6cbjg2b3lmdml0whmi"; depends=[]; }; mopsocd = derive { name="mopsocd"; version="0.5.1"; sha256="10hssnm1afqmxa9kw6ifqnz3p3yyjrmxgi98zlj31a5g4nis8wb1"; depends=[]; }; morgenstemning = derive { name="morgenstemning"; version="1.0"; sha256="17y90cf8ajmkfwla0hm4jgkbkd1mxnym63ph2468sfxkhn0r3v88"; depends=[]; }; @@ -4304,6 +4388,8 @@ morse = derive { name="morse"; version="1.0.2"; sha256="044aljv48mfq6yj9i77yqf03 mosaic = derive { name="mosaic"; version="0.9.2-2"; sha256="1fx3nbndvvif1pwl013clh91s229yg7fnr0kp842jyx03hkcinba"; depends=[car dplyr lattice ggplot2 mosaicData MASS reshape2 plyr latticeExtra gridExtra ggdendro]; }; mosaicData = derive { name="mosaicData"; version="0.9.1"; sha256="0gxnw3x806pm97x1043qq3qf1cwn1z1771cayp3xlh5khn5bijk7"; depends=[]; }; moult = derive { name="moult"; version="1.4"; sha256="0nglf7wijp2v66fpyh88glbn1glp8vvkbvpc1g6136bg6ahbbkkl"; depends=[Formula Matrix]; }; +mountainplot = derive { name="mountainplot"; version="1.0"; sha256="1hjmzig0s4vjlkpqhvf4v6z2gd8ljy14z5n1m9y21is9yp2cy6xf"; depends=[lattice]; }; +mousetrack = derive { name="mousetrack"; version="1.0.0"; sha256="0lf0xh0c3xl27nh5w8wwyrm2jfzfajm2f73xjdgf746dp365qc8n"; depends=[pracma]; }; movMF = derive { name="movMF"; version="0.2-0"; sha256="1p9ay7w93gyx4janw23iwg2j0wkvnvzalaa20n1rlahhmh327g7i"; depends=[skmeans clue slam]; }; move = derive { name="move"; version="1.2.475"; sha256="0d542554bamgnc5qd7z497ssk885mz4m1wbaiqpi5cyxd24kwgii"; depends=[geosphere sp raster rgdal]; }; mp = derive { name="mp"; version="0.2.0"; sha256="1vpjrx04yn1rdmrhj42rhc757cj02sghrv0i5jfm4k2y28ab7qh1"; depends=[svd Rcpp Rcpp RcppArmadillo]; }; @@ -4317,16 +4403,16 @@ mpmcorrelogram = derive { name="mpmcorrelogram"; version="0.1-3"; sha256="0qgzsh mpmi = derive { name="mpmi"; version="0.41"; sha256="1iwdhvdglsamzq18f0r5mh0anrd4ffrddafdlbw16kr8jy0c8fdn"; depends=[KernSmooth]; }; mpoly = derive { name="mpoly"; version="0.0.5"; sha256="1zhmd3lsa0n56yr3bdhg3r668zrmf35phm8g69c18a3rr5qmcdqg"; depends=[stringr rSymPy rJython rJava rjson partitions plyr]; }; mppa = derive { name="mppa"; version="1.0"; sha256="06v6vq2nfh4b407x2gyvcp5wbdrcnk3m8y58akapi66lj8xplcx4"; depends=[]; }; -mpt = derive { name="mpt"; version="0.5-0"; sha256="0bsfk8rxl3bnsydzs32061ayfgxkyxhnjk8pirgzrrsm2vk6j3j9"; depends=[]; }; +mpt = derive { name="mpt"; version="0.5-1"; sha256="1b6n7kivkj4ndcc27jmznx9dh40kvjjk7hfxh21kmnknl5ap4ffb"; depends=[]; }; mra = derive { name="mra"; version="2.13"; sha256="1x282nzdz5bd3yji26mnzlvrkxszx15cra079k07rgdxqnixg2c8"; depends=[]; }; mratios = derive { name="mratios"; version="1.3.17"; sha256="0a2pn4234ri5likaqbxgkw8xqmwchr6fak3nninral0yzd4rcal5"; depends=[mvtnorm]; }; -mrds = derive { name="mrds"; version="2.1.10"; sha256="0gbivbawvzpg9s9yrfnil44h8ng9k8gf8swfgmlzibi9ixrv90lb"; depends=[optimx mgcv Rsolnp]; }; +mrds = derive { name="mrds"; version="2.1.12"; sha256="1v7lv3ssg9m8bx2gskzf31lkg3sxsdkvknrdx9aawdh3mzxwcys7"; depends=[optimx mgcv Rsolnp]; }; mreg = derive { name="mreg"; version="1.1"; sha256="06la0yy2yys161jhlzlcm5lcv0664wm6sa8gjdnpd1s1nx52jkqf"; depends=[]; }; mritc = derive { name="mritc"; version="0.5-0"; sha256="1344x7gc7wvmcqp0sydppavavvps5v7bs0dza2fr8rz3sn4as8sa"; depends=[lattice misc3d oro_nifti]; }; msBP = derive { name="msBP"; version="1.0-2.1"; sha256="1yprhglqykh6v2jicab25a0ny1r49kaj3i04fspi3was2md2qbzd"; depends=[DPpackage]; }; msSurv = derive { name="msSurv"; version="1.1-2"; sha256="1nyadgzwdyf48qhqdx8sszvgkhxafacnccacg39ghm6gqv8b5j60"; depends=[class lattice]; }; msap = derive { name="msap"; version="1.1.8"; sha256="0z5lm782jjb9w1h5vgz8bmxjdcrq9zb3xp1w5cb479jjc7krlgg3"; depends=[ade4 ape]; }; -msarc = derive { name="msarc"; version="1.4.3"; sha256="0yzzmaw1cvwclggyvg05vqqp3jxpkwbyz4hgaa2dlmad516fw5rb"; depends=[gplots XLConnect wordcloud RColorBrewer]; }; +msarc = derive { name="msarc"; version="1.4.5"; sha256="1jv364502m6q2w039dmdhwsx5id39jc4xcabyrbwbrgy65kwfspg"; depends=[gplots XLConnect wordcloud RColorBrewer]; }; msda = derive { name="msda"; version="1.0.1"; sha256="0bd9am0dyrs9x8xj6rccgqcx15ddag1fakjzpyw43n3zi0h24fa6"; depends=[Matrix MASS]; }; mseapca = derive { name="mseapca"; version="1.0"; sha256="115njdk8cv55zxd38hq9qaca686ykckni0f3xl8w3bn32gb5g9a7"; depends=[XML]; }; msgl = derive { name="msgl"; version="2.0.125.1"; sha256="1k2n8yn9j5sknw95saq2zgl3jfanyp3c2xyj49wqgawhwsw81jdh"; depends=[Matrix sglOptim Rcpp RcppProgress RcppArmadillo BH sglOptim]; }; @@ -4345,12 +4431,13 @@ muhaz = derive { name="muhaz"; version="1.2.6"; sha256="1b7gzygbb5qss0sf9kdwp7rn multcomp = derive { name="multcomp"; version="1.3-8"; sha256="0bywqyv9fvl08bggz36x24p9qqbwzvqmcik901x5yi99062xg7dl"; depends=[mvtnorm survival TH_data sandwich]; }; multcompView = derive { name="multcompView"; version="0.1-5"; sha256="0vfgvqxqgxyifkqs3r5xxj7rfn8lfmby6wyyiqa5jv01073xchib"; depends=[]; }; multgee = derive { name="multgee"; version="1.5.0"; sha256="1wa4pfvn4q77j4h6drvzysr3syni92z2yp2nppvzfpd29aib1fyd"; depends=[gnm VGAM]; }; +multiAssetOptions = derive { name="multiAssetOptions"; version="0.1-1"; sha256="1kb4qxyl9shvrpqfxq26lhh3sssmyjcnhhcl6gcbb0s86snh9ms9"; depends=[Matrix]; }; multiDimBio = derive { name="multiDimBio"; version="0.3.3"; sha256="1aj6yam31mr0abjb6m5m85r1w71snha4s7h4ikyw66sc73xkmb9m"; depends=[ggplot2 lme4 misc3d MASS RColorBrewer]; }; multiPIM = derive { name="multiPIM"; version="1.4-1"; sha256="0r69gkl8k6dd2rafrwvrdkpz4jlffz1g6czspsi908jf9dyw8y72"; depends=[lars penalized polspline rpart]; }; multiband = derive { name="multiband"; version="0.1.0"; sha256="1f4gmy0yf9zid7kl05zncvvig6hs4nl1h9wkrkc24rxx9risw9k9"; depends=[]; }; multibiplotGUI = derive { name="multibiplotGUI"; version="0.0-1"; sha256="14zgn86zwwdchhr5dzqxxxsf0dy6kny4ixvd77y08454lni0a69r"; depends=[rgl tkrplot RODBC]; }; multic = derive { name="multic"; version="0.3.8.1"; sha256="06lc9kn0z3s7x00hz8vj903q0c6cncnj4v3ygvd2yvkgcbhfvjd0"; depends=[]; }; -multicon = derive { name="multicon"; version="1.5"; sha256="0ds0nkjb4zd8j7bj59vvpy7m4srmvmh3gya9n9d09lxwh6ipih7q"; depends=[psych abind foreach mvtnorm sciplot]; }; +multicon = derive { name="multicon"; version="1.6"; sha256="16glkgnm4vlpxkhf1xw1gl1q10yavx9479i21v29lldag35z8pqx"; depends=[psych abind foreach mvtnorm sciplot]; }; multicool = derive { name="multicool"; version="0.1-2"; sha256="1rs7q93lcr1crrx433zgil2db1rb3n4qw62r52nvpllqfwfx98dc"; depends=[]; }; multigroup = derive { name="multigroup"; version="0.4.3"; sha256="153pg27dz61igagn1yq4xl7m7vjb5vfc9ps1xhgzvmbvmnbcr004"; depends=[MASS]; }; multilevel = derive { name="multilevel"; version="2.5"; sha256="0pzv5xc8p6cpzzv9iq3a3ib1dcan445mm12whf3d6qkz2k4778g6"; depends=[nlme MASS]; }; @@ -4360,15 +4447,16 @@ multinomRob = derive { name="multinomRob"; version="1.8-6.1"; sha256="1fdjfk77a7 multipleNCC = derive { name="multipleNCC"; version="1.0"; sha256="13z6yq77h1r6kp8wgza58c6yp9a1gqm0w36x534mxbhcmingdw9f"; depends=[survival gam]; }; multiplex = derive { name="multiplex"; version="1.2"; sha256="06wrzglgrvahavlcknf80cp0j4k840dhmclw9g6wqv51pq9brj2f"; depends=[]; }; multipol = derive { name="multipol"; version="1.0-6"; sha256="1yjz0p4mcgzs98s61i8315wyhh986jxp8b0lq66375ckpr2ddcss"; depends=[abind]; }; -multisensi = derive { name="multisensi"; version="1.0-7"; sha256="1sq0jxkp33wsv6id27nka0764mr1jskqzsr2nhmqc4c8l312bkp6"; depends=[]; }; +multirich = derive { name="multirich"; version="2.0.2"; sha256="1lqc4np45p9ar9l8l1m5bdh98fsmhvzj8s0b2mcp9cqrvnhp1irc"; depends=[]; }; +multisensi = derive { name="multisensi"; version="1.0-8"; sha256="168g6hym5chz69wa3vfprg1m1c935wh7bi3gfz5calxiqf89mncz"; depends=[]; }; multispatialCCM = derive { name="multispatialCCM"; version="1.0"; sha256="1fzd91w10iln8qb81z240lq3fi4gq22l4rh9npkav6fiq6g6rlp8"; depends=[]; }; multitable = derive { name="multitable"; version="1.6"; sha256="067bgl793wwvb1rhan70ih0ga3dxja2c6zx7fwzml5rqi6p728pr"; depends=[]; }; -multitaper = derive { name="multitaper"; version="1.0-9"; sha256="1brx35jbhvcx0384wgnd958qa8yc64aaabb2i3y4d7qcfdj787g7"; depends=[]; }; +multitaper = derive { name="multitaper"; version="1.0-10"; sha256="07basffympz859srjbgk524h081mibz6czrpiv06g44idwyi1bz3"; depends=[]; }; multivator = derive { name="multivator"; version="1.1-4"; sha256="125ifkpm1pny4rjpzirnwpmpjfg0y8w0rygj0way0p1qwm0l207n"; depends=[emulator mvtnorm]; }; multiwayvcov = derive { name="multiwayvcov"; version="1.2.1"; sha256="15gxcrg2i1aqbxkif5dmdz81yzqj7a4hq0dcd0narzsvm5b4w9py"; depends=[sandwich boot]; }; multxpert = derive { name="multxpert"; version="0.1"; sha256="03mvf4m0kabm22vy4zkj1cfh884larpj8cbgg3p9l3pag20snf1l"; depends=[mvtnorm]; }; muma = derive { name="muma"; version="1.4"; sha256="0midx3wzyvcz8rk9kvsfll3xg41pkz40si4jw2ps54ykkf9rkm99"; depends=[car pdist pls gplots mvtnorm robustbase gtools bitops caTools pcaPP rrcov]; }; -munfold = derive { name="munfold"; version="0.3-1"; sha256="0rjicbyhxp0xr375ryg7kb2a4rvh3giw62ypws63nc3l8iwsig2m"; depends=[memisc MASS]; }; +munfold = derive { name="munfold"; version="0.3-3"; sha256="1szm3c1xi1s7r1w6h7xb4x538sbczrblb70a3ysxf4q8c1ihmly9"; depends=[memisc MASS]; }; munsell = derive { name="munsell"; version="0.4.2"; sha256="1bi5yi0i80778bbzx2rm4f0glpc34kvh24pwwfhm4v32izsqgrw4"; depends=[colorspace]; }; muscle = derive { name="muscle"; version="3.8.31-4"; sha256="0pijc8x6pwsb6z4061v1r7iwq5lsnia5qn1bikwpxy8ir19nic72"; depends=[]; }; musicNMR = derive { name="musicNMR"; version="0.0.2"; sha256="09xxc78ajk428yc3617jfxqp5fy89nfc24f1rig6cw28fflwqj0k"; depends=[seewave]; }; @@ -4376,7 +4464,7 @@ mutoss = derive { name="mutoss"; version="0.1-8"; sha256="13x49dk1xyn697yindg6m0 mutossGUI = derive { name="mutossGUI"; version="0.1-9"; sha256="1xdby6n0w1155kx6mhinvgqm0ssgyy4443pkq3k88a5s4bfxw5bw"; depends=[mutoss multcomp plotrix rJava JavaGD CommonJavaJars JGR]; }; mvMORPH = derive { name="mvMORPH"; version="1.0.2"; sha256="1zzh2vmm3l6zvzg8b39ivkx2jmbw2g6n00jj4icp46w8jb26rlwa"; depends=[phytools ape corpcor subplex]; }; mvProbit = derive { name="mvProbit"; version="0.1-0"; sha256="0fnrlralydlsf9iphq385f8hpqigfmi8rafvgp443gygvpq5b6g0"; depends=[mvtnorm maxLik abind bayesm miscTools]; }; -mvSLOUCH = derive { name="mvSLOUCH"; version="1.1.4"; sha256="00grmwqn8z5h5b4cbk0ip45a2474zjkqvssf53q40vwz7s2ilxnb"; depends=[ouch ape numDeriv mvtnorm corpcor]; }; +mvSLOUCH = derive { name="mvSLOUCH"; version="1.1.5"; sha256="1cq1j4f1k0xhq2ncmji1a4p4m6h7k2afsr39abib4g3md902v0hp"; depends=[ouch ape numDeriv mvtnorm corpcor]; }; mvShapiroTest = derive { name="mvShapiroTest"; version="1.0"; sha256="0zcv5l28gwipkmymk12l4wcj9v047pr8k8q5avljdrs2a37f74v1"; depends=[]; }; mvabund = derive { name="mvabund"; version="3.9.3"; sha256="1vr4rw8ivkhmzrpvz2k8v594cavrw88i7nqr9g1mar76d9mpchkx"; depends=[Rcpp MASS tweedie statmod Rcpp]; }; mvbutils = derive { name="mvbutils"; version="2.7.4.1"; sha256="1vs97yia78xh35sdfv5pj3ddqmy83qgamvyyh9gjg0vdznqhffzg"; depends=[]; }; @@ -4391,7 +4479,8 @@ mvnfast = derive { name="mvnfast"; version="0.1.3"; sha256="1ghm6zdrh2ax8r4jin8g mvngGrAd = derive { name="mvngGrAd"; version="0.1.4"; sha256="0vipdmbakr1r25jx87cz1xlvrajfzvm9aq1gzg3npz5140pgc3m2"; depends=[]; }; mvnmle = derive { name="mvnmle"; version="0.1-11"; sha256="02mpmrr22cqb3v8x7kydgg715yl3lrdgzgdqpchmp0xrl2db8gq4"; depends=[]; }; mvnormtest = derive { name="mvnormtest"; version="0.1-9"; sha256="1iaxjwp7bgxhaa4xqvgqb61316mq2fb0452d0pabhmbxkvmvdnj6"; depends=[]; }; -mvoutlier = derive { name="mvoutlier"; version="2.0.5"; sha256="1n12wy2i9jkb6brrqc0ibw3wiyd25dm5jhyapf05cj8wi06jfrsf"; depends=[sgeostat robCompositions robustbase]; }; +mvnpermute = derive { name="mvnpermute"; version="1.0.0"; sha256="0mbyj5i5vysrnl3pgypl0cjf3sylsvzfl1pcxkn0q16560vqh2ba"; depends=[]; }; +mvoutlier = derive { name="mvoutlier"; version="2.0.6"; sha256="00kim5i8xdbaqc0l16w1pif5yfqf741x686lq6drb243jl89rfjv"; depends=[sgeostat robCompositions robustbase]; }; mvprpb = derive { name="mvprpb"; version="1.0.4"; sha256="1kcjynz9s7vrvcgjb9sbqv7g50yiymbpkpg6ci34wznd33f7nrxm"; depends=[]; }; mvrtn = derive { name="mvrtn"; version="1.0"; sha256="0k0k76wk5zq0cjydncsrb60rdhmb58mlf7zhclhaqmli1cy697k8"; depends=[]; }; mvsf = derive { name="mvsf"; version="1.0"; sha256="1krvsxvj38c5ndvnsd1m18fkqld748kn5j2jbgdr3ca9m3i5nlwf"; depends=[nortest mvnormtest]; }; @@ -4408,6 +4497,7 @@ myepisodes = derive { name="myepisodes"; version="1.1.1"; sha256="0xk9bwgpl630nh mztwinreg = derive { name="mztwinreg"; version="1.0-1"; sha256="1rg6ikaqdrc7q44s3r3km8h45prnvcpzpxd7nxbmh209iz9j19ai"; depends=[rms mclogit]; }; nCDunnett = derive { name="nCDunnett"; version="1.0.0"; sha256="0n5zzsdrhra5xql110wrxbfdjm3fwa6qhvnpj89w9ph9nr4ad8gf"; depends=[]; }; nCal = derive { name="nCal"; version="14.11-8"; sha256="0cgn56alv4qrb0dv7g3v3nx0y4bqgxyxrkbml7rqfz95s3rvm2dh"; depends=[drc gdata gWidgets kyotil]; }; +nFCA = derive { name="nFCA"; version="0.3"; sha256="1jyyzagmppm3i7vh3ia4ic0zql1w04f66z81v0zpdihd4cbl5ra7"; depends=[]; }; nFactors = derive { name="nFactors"; version="2.3.3"; sha256="016d76yfxz7gx7zz5dgwjmj2c5m6kxdmqj0lln5w6d70r9g1kxg7"; depends=[MASS psych boot lattice]; }; nLTT = derive { name="nLTT"; version="1.0"; sha256="0yvsjfrsx48p2gyisdyvisplz61d7kkaw1bkdkj3q11g3xq84hx9"; depends=[ape coda deSolve]; }; nabor = derive { name="nabor"; version="0.4.4"; sha256="0465wkyggz4665b2ph1qpyxsmak0arfzpxaci1r0lrf5ddyp0n6y"; depends=[Rcpp Rcpp RcppEigen BH]; }; @@ -4415,14 +4505,14 @@ nadiv = derive { name="nadiv"; version="2.13.2"; sha256="1r63z08k46b6hryxracicsw namespace = derive { name="namespace"; version="0.9.1"; sha256="1bsx5q19l7m3q2qys87izvq06zgb22b7hqblx0spkvzgiiwlq236"; depends=[]; }; nanop = derive { name="nanop"; version="2.0-4"; sha256="0795kksw6yry9il8xj21iq13xw6jipqcv5vjs3k7s19dbah2k8pi"; depends=[distrEx rgl]; }; nasaweather = derive { name="nasaweather"; version="0.1"; sha256="05pqrsf2vmkzc7l4jvvqbi8wf9f46854y73q2gilag62s85vm9xb"; depends=[]; }; -nat = derive { name="nat"; version="1.5.12"; sha256="1pf6d6y6zakixlhvmpv1di27waz5gnhk8gmnk4n76xgfs3zk85lb"; depends=[rgl RANN igraph filehash digest nat_utils plyr]; }; +nat = derive { name="nat"; version="1.6.4"; sha256="1a4wr1378y8crmpk150gmzjc12wn4q9l6nbghddizyw9827b5my1"; depends=[rgl nabor igraph filehash digest nat_utils plyr yaml]; }; nat_nblast = derive { name="nat.nblast"; version="1.5"; sha256="1slpk126fwgn90j3aazlf3pw2ij050dghc1yqadv6mjcj82qpm5i"; depends=[rgl nat nabor dendroextras plyr spam]; }; nat_templatebrains = derive { name="nat.templatebrains"; version="0.4.1"; sha256="06vqnrwcara4ljkf5wbwqbsfx1ypd8xsv8pbrs5x6hyj5jxnnvaz"; depends=[rgl nat]; }; nat_utils = derive { name="nat.utils"; version="0.4.2"; sha256="0k5bdqwrbq82bb9ld90ia7b4vjaczba20h231a129rkszsy6sz9v"; depends=[]; }; naturalsort = derive { name="naturalsort"; version="0.1.2"; sha256="0m8a8z0n5zmmgpmpn5w87j2jfsz1igz3x133z3q25h8jlyaxy750"; depends=[]; }; nbpMatching = derive { name="nbpMatching"; version="1.4.4"; sha256="0dnj97aj2x81yppw3rayxxaf2bb68l5x5f2852l5xmvpxb73w478"; depends=[Hmisc MASS]; }; ncbit = derive { name="ncbit"; version="2013.03.29"; sha256="0f07h8v68119rjvgm84b75j0j7dvcrl6dq62vp41adlm2hgjg024"; depends=[]; }; -ncdf = derive { name="ncdf"; version="1.6.8"; sha256="0600qh0diw1j47w8b7gpk1wkpvinpvf3g9v3hlp3f8hcwpdn3s0y"; depends=[]; }; +ncdf = derive { name="ncdf"; version="1.6.8"; sha256="1vrbrrqij7p712wfrki09749yryzr9lg4p95yqvb0zzggqpw2snm"; depends=[]; }; ncdf_tools = derive { name="ncdf.tools"; version="0.7.1.291"; sha256="149d89kim67q77w17afc5x7hkvmk05gfkaw6cpl583j2zxingify"; depends=[RNetCDF chron abind plotrix raster RColorBrewer JBTools]; }; ncdf4 = derive { name="ncdf4"; version="1.13"; sha256="07s1lh5cg4fck7sapfka2skky70max1rfhimblnqf41phndxjcsv"; depends=[]; }; ncdf4_helpers = derive { name="ncdf4.helpers"; version="0.3-3"; sha256="051akd7r6zx805a0xwcs95q5sd8alag0f1gzqjk3n188q8r3ji5j"; depends=[ncdf4 PCICt abind]; }; @@ -4436,9 +4526,12 @@ needy = derive { name="needy"; version="0.2"; sha256="1ixgpnwrg6ph1n5vy91qhl1mqi negenes = derive { name="negenes"; version="1.0-1"; sha256="0g8m3idjm24cf9b1wngw2pv1axgnv9mk5wqs78zgwvn0m67ypsiz"; depends=[]; }; neldermead = derive { name="neldermead"; version="1.0-10"; sha256="1snavf90yb12sydic7br749njbnfr0k7kk20fy677mg648sf73di"; depends=[optimbase optimsimplex]; }; nephro = derive { name="nephro"; version="1.0"; sha256="0dv6gj1q6qrg9y6cpf230q1mksqk3nvzj3afavhrwz1fcz2w22f4"; depends=[]; }; +nestedRanksTest = derive { name="nestedRanksTest"; version="0.1"; sha256="12pqxldyzy2i2gc575rx67zdfb8c9j0fv400nw509cwx5w6ya35x"; depends=[]; }; netClass = derive { name="netClass"; version="1.2.1"; sha256="04yrj71l5p83rpwd0iaxdkhm49z9qp3h6b7rp9cgav244q060m9y"; depends=[kernlab Matrix ROCR igraph samr]; }; +netassoc = derive { name="netassoc"; version="0.4.1"; sha256="1rwswa70n6j3s779cq3ddg8kgj17bx5iqya1rrspqd7rjj95k1bk"; depends=[igraph]; }; +netgen = derive { name="netgen"; version="1.0"; sha256="01j5s80k658wcp8ml2kyf10dvajp4crrxcad65rs03grak1q5mkv"; depends=[BBmisc mvtnorm lhs ggplot2 lpSolve checkmate]; }; netgsa = derive { name="netgsa"; version="1.0"; sha256="1f70wpwj0gdc4k9cm7glz5jfd1xdij9bxkaqd8lpjxmarap00w6x"; depends=[cvTools corpcor glasso glmnet igraph]; }; -netmeta = derive { name="netmeta"; version="0.6-0"; sha256="0cwlwd4bms0kf6nicx7crjjighzrzjgfgmx5yl5v7am4v7kwhz2g"; depends=[meta magic]; }; +netmeta = derive { name="netmeta"; version="0.7-0"; sha256="0nsy817bj3fh4sz632pljyjn7jphg9w389hhdcyjvkb7i43c9v5c"; depends=[meta magic]; }; nets = derive { name="nets"; version="0.1"; sha256="0zshiavdi1z8mq6q93vsyb5wx5nq37qln9gcyvamvi2pgy5xg4k2"; depends=[igraph]; }; nettools = derive { name="nettools"; version="1.0.1"; sha256="13fw316r31g9cjlbyy9qfccsyagxb6pyvn5k32f166b7vj92mk1q"; depends=[rootSolve dtw WGCNA Matrix minerva combinat igraph]; }; netweavers = derive { name="netweavers"; version="1.1"; sha256="0p8hb3m0lbkf0pw9vdhv94spdba432klpqgn07jvxfhfhmr8cyz0"; depends=[igraph]; }; @@ -4469,16 +4562,15 @@ nlmeU = derive { name="nlmeU"; version="0.70-3"; sha256="05kxymgybziiijpb17bhcd9 nlmrt = derive { name="nlmrt"; version="2013-9.25"; sha256="0z2ih61rpqzk64qagiwbx396vwb28jhqk8b4kxchca0il3fzqqav"; depends=[]; }; nloptr = derive { name="nloptr"; version="1.0.4"; sha256="1cypz91z28vhvwq2rzqjrbdc6a2lvfr2g16vid2sax618q6ai089"; depends=[]; }; nlreg = derive { name="nlreg"; version="1.2-2"; sha256="1pi7057ldiqb12kw334iavb4i92ziy1kv4amcc4d1nfsjam03jxv"; depends=[statmod survival]; }; -nlrwr = derive { name="nlrwr"; version="1.1-0"; sha256="0yrngp1gx7l9rwva9rqjlklkfiwklz20zj6sbgckrm68qw4rcvab"; depends=[alr3 car drc HydroMe lattice lmtest MASS NISTnls nlme nls2 nlstools NRAIA sandwich]; }; nls2 = derive { name="nls2"; version="0.2"; sha256="0k46i865p6jk0jchy03jiq131pc20h9crn3hygzy305rdnqvaccq"; depends=[proto]; }; nlsMicrobio = derive { name="nlsMicrobio"; version="0.0-1"; sha256="0676n78265z00dacmq593c9l2239ii574djm9s7i7w8jk1kdhzx2"; depends=[nlstools]; }; -nlsem = derive { name="nlsem"; version="0.1"; sha256="1nw8df9asb1f0713s3ll7ldw28jw8h6gvyy6d8bjlvz2qhjnlh8d"; depends=[gaussquad mvtnorm nlme]; }; +nlsem = derive { name="nlsem"; version="0.2"; sha256="0hq4ffkbrp6v6y5hr26hm2g110vjx3xy01y5kznigza0v9wcpzqq"; depends=[gaussquad mvtnorm nlme]; }; nlsmsn = derive { name="nlsmsn"; version="0.0-4"; sha256="1gvpy8rq020l64bdw6n7kv354l7gwa2rgxarm6k0mqq7z21fxf58"; depends=[]; }; nlstools = derive { name="nlstools"; version="1.0-0"; sha256="04y3yzpipr82fgafppp09fbi6invmwyalljirmmh01qnrzfimwna"; depends=[]; }; nlt = derive { name="nlt"; version="2.1-3"; sha256="1j0xrrbr1hvfda8rvnc17lj96m6cz24faxvwn68ilf7j1ab2lkgn"; depends=[EbayesThresh adlift]; }; nlts = derive { name="nlts"; version="0.2-0"; sha256="14kvzc1p4anj9f7pg005pcbmc4k0917r49pvqys9a0a51ira67vb"; depends=[locfit acepack]; }; nmcdr = derive { name="nmcdr"; version="0.3.0"; sha256="1557pdv7mqdjwpm6d9zw3zfbm1s8ai3rasd66nigscmlq102w745"; depends=[CDFt]; }; -nnet = derive { name="nnet"; version="7.3-8"; sha256="0nhbprhwkpnhzw6jls8y76xskfh9gq491kg8q8wnamjv3gnngfa5"; depends=[]; }; +nnet = derive { name="nnet"; version="7.3-9"; sha256="1z1lhi35w5l7l645d764w9h4aiv6hapjv8fwb9b51b36vyg1r0zg"; depends=[]; }; nnls = derive { name="nnls"; version="1.4"; sha256="07vcrrxvswrvfiha6f3ikn640yg0m2b4yd9lkmim1g0jmsmpfp8f"; depends=[]; }; nodeHarvest = derive { name="nodeHarvest"; version="0.6"; sha256="16151rwmqkf5vlyrlxlirz8s0nimxppx1f7f4pwfxi9vipwph125"; depends=[quadprog randomForest]; }; nodiv = derive { name="nodiv"; version="1.0.1"; sha256="07qx08s7nn7priwm5x5k3ycacfa4ibd20c759x9qhzqaigjmrh42"; depends=[picante raster ape sp vegan]; }; @@ -4523,7 +4615,7 @@ nsprcomp = derive { name="nsprcomp"; version="0.5"; sha256="1rrjiwkpiaqlp27s5xfd nullabor = derive { name="nullabor"; version="0.3.1"; sha256="0anwla6x9y2i7yd6r0yi1xhy0zfqwfpp5h1f18gji11nmiva9d81"; depends=[ggplot2 MASS plyr dplyr moments fpc]; }; numDeriv = derive { name="numDeriv"; version="2012.9-1"; sha256="09s00a1wddpq5556mz87vdmx045rhjrx1w8f2a37m8hljghy86k9"; depends=[]; }; numOSL = derive { name="numOSL"; version="1.7"; sha256="1hgyjjxpirgf2vmn273s861mnpyq2363kaafnkzgbcg0s08xxj1r"; depends=[]; }; -numbers = derive { name="numbers"; version="0.4-5"; sha256="0z69samkj7fvbk0wj2nbnkcw17y1sdha7hghkc7yhgkwx2z1pana"; depends=[gmp]; }; +numbers = derive { name="numbers"; version="0.5-2"; sha256="0papfbpar9imkh0ahr809zaxgsi3ch7flypxyap4r2x1clgrx0p1"; depends=[gmp]; }; nutshell = derive { name="nutshell"; version="2.0"; sha256="1v11g5wqyxnj29b7akl0cwa34hcqs79ijbiv735pg3df4ggyrzvm"; depends=[nutshell_bbdb nutshell_audioscrobbler]; }; nutshell_audioscrobbler = derive { name="nutshell.audioscrobbler"; version="1.0"; sha256="10fvc5d22gnfb0bkgbww48f0vvcaja96g5gfv85kap939j11172j"; depends=[]; }; nutshell_bbdb = derive { name="nutshell.bbdb"; version="1.0"; sha256="19c4047rjahyh6wa6kcf82pj09smskskvhka9lnpchj13br8rizw"; depends=[]; }; @@ -4555,16 +4647,14 @@ onls = derive { name="onls"; version="0.1-0"; sha256="1kfgikswddly9lar6wa1hhz89r opefimor = derive { name="opefimor"; version="1.1"; sha256="0xv57l38wx3w67h312g5xcpi9m7ggd6crqvqjh5gddq0g1g93bjq"; depends=[]; }; openNLP = derive { name="openNLP"; version="0.2-3"; sha256="1hbw9gfc95b379if23wc0jv6lgf6ilb10gpwfs8nm3jc3by2zsx4"; depends=[NLP openNLPdata rJava]; }; openNLPdata = derive { name="openNLPdata"; version="1.5.3-1"; sha256="1a048irgv56yi2lvhpqh8vh4dl7g7zfg934qypjxg8mcdcqi820y"; depends=[rJava]; }; -openair = derive { name="openair"; version="1.1-0"; sha256="129m41ivg74ss3cakpzyarcx0dcqysgf7d6ryz82mb061wgn3lik"; depends=[maps plyr reshape2 mgcv lattice latticeExtra cluster RColorBrewer mapdata mapproj hexbin RgoogleMaps Rcpp Rcpp]; }; -opencpu = derive { name="opencpu"; version="1.4.5"; sha256="1nbrj0jqg1hjpgj7vwj5d1yqzc6h6498saib8gcmps558gj94fj8"; depends=[evaluate httpuv knitr jsonlite devtools httr brew pander openssl]; }; +openair = derive { name="openair"; version="1.1-5"; sha256="1i0vif16n4y3m64q3ryrkh725b5j6b7b1g58hwz5hxzj4m2fls7l"; depends=[lazyeval dplyr maps plyr reshape2 mgcv lattice latticeExtra cluster RColorBrewer mapproj hexbin mapdata RgoogleMaps Rcpp Rcpp]; }; +opencpu = derive { name="opencpu"; version="1.4.6"; sha256="19anprhkwqw2kii417qy3laalrlj207zfvklc05m0vz9sra7sxj0"; depends=[evaluate httpuv knitr jsonlite devtools httr brew openssl]; }; openintro = derive { name="openintro"; version="1.4"; sha256="1k6pzlsrqikbri795vic9h191nf2j7v7hjybjfkrx6847c1r4iam"; depends=[]; }; openssl = derive { name="openssl"; version="0.3"; sha256="0h71jc1w99qg4y01q6j3yhmjhwf06r9pv150id2ls5f1z3hr0l6p"; depends=[]; }; opentraj = derive { name="opentraj"; version="1.0"; sha256="13nqal96199l8vkgmkvl542ksnappkscb6rbdmdapxyi977qrgxk"; depends=[plyr maptools openair raster rgdal reshape doParallel foreach sp]; }; openxlsx = derive { name="openxlsx"; version="2.2.1"; sha256="0wcvyl5gzkh28v2y40ckzp4prp9ygby01pm66rp902xhjqz0vnw1"; depends=[Rcpp Rcpp]; }; operator_tools = derive { name="operator.tools"; version="1.3.0"; sha256="0y5f0ifj4gaq03gm44vdvslcs7lglk1p8kq47mdc0gc1yfa6l00c"; depends=[]; }; operators = derive { name="operators"; version="0.1-7"; sha256="1qik9ihv5blz77bzsnrslf665ndpa8vp3xldqsgvs4gr5bg5algw"; depends=[]; }; -opm = derive { name="opm"; version="1.1.0"; sha256="14sj0frjfd4a7j30zyk1fbhkpry45bjcn2k0l9jf7xc8415rbc3v"; depends=[lattice boot hwriter plotrix Ckmeans_1d_dp pkgutils yaml mgcv grofit rjson nlme DBI]; }; -opmdata = derive { name="opmdata"; version="0.7.0"; sha256="043zzp2p4cvda5rshi9s990lm5qyi6ydkmy84xanwaqvysi1cpyy"; depends=[opm]; }; ops = derive { name="ops"; version="1.0"; sha256="0cvwyn5sz5lx8sin8w4k8ymslfl4nfaa012a9vcl2hvp4850rk25"; depends=[]; }; optAUC = derive { name="optAUC"; version="1.0"; sha256="0j1llzqa3n7kqw3i5bb7284z0hi6s5jbjfl9zap0l7xf6hg4x1dn"; depends=[MASS]; }; optBiomarker = derive { name="optBiomarker"; version="1.0-27"; sha256="1kkj602d4klwyd8kylawgfysg8dlp2g6j7afkppzv5x8mbhs5ji4"; depends=[rpanel rgl MASS randomForest e1071 ipred msm Matrix]; }; @@ -4589,7 +4679,7 @@ ordPens = derive { name="ordPens"; version="0.2-1"; sha256="1kcxjfr2ncnqg293ph50 orddom = derive { name="orddom"; version="3.1"; sha256="165axs15fvwhrp89xd87l81q3h2qjll1vrwcsap645cwvb85nwsh"; depends=[psych]; }; orderbook = derive { name="orderbook"; version="1.03"; sha256="0dlvjrzdhhh8js4g1lvxs46q7fdxfxavxnb4nj6xlwca75i51675"; depends=[lattice hash]; }; orderedLasso = derive { name="orderedLasso"; version="1.7"; sha256="0vrh89nrmpi8xscvambcb1y70gqqi5819a2gxh02h4pnyjn8axql"; depends=[Matrix Iso quadprog ggplot2 reshape2]; }; -ordinal = derive { name="ordinal"; version="2014.12-22"; sha256="1ymdvh9g8jm0qsqqbr7wcay2h1lgbfg6p8k8cx06dfcb5zpvswbi"; depends=[ucminf MASS Matrix]; }; +ordinal = derive { name="ordinal"; version="2015.1-21"; sha256="1vhkxdsapmah09vzy6xd00kb1ck02vbiyamv5ccflxdbdmch1q1y"; depends=[ucminf MASS Matrix]; }; ordinalgmifs = derive { name="ordinalgmifs"; version="1.0.2"; sha256="1rbn2mb516hdr0chny1849m1aq0vb0vmr636b4fp914l5zh75vgi"; depends=[]; }; ore = derive { name="ore"; version="1.0.6"; sha256="14ks8ypjlmdiysaayyz1syb8vrcfp2v79wfx191fz05ckgww4dyy"; depends=[]; }; orgR = derive { name="orgR"; version="0.9.0"; sha256="1q4qbwnbhmja8rqiph7g7m4wxhzhk9mh91x1jgbnky8bs4ljdgrx"; depends=[ggthemes ggplot2 lubridate data_table stringr]; }; @@ -4622,28 +4712,31 @@ packClassic = derive { name="packClassic"; version="0.5.2"; sha256="04a1sg9vx3r0 packHV = derive { name="packHV"; version="1.8"; sha256="0dr2picjd7mm633vw29524f3n4jpyillpzi9cg7yc2cymxnrgvyg"; depends=[survival WriteXLS]; }; packS4 = derive { name="packS4"; version="0.9.1"; sha256="01kkw5g3xcn9hhfglmfvwsryid0w4vw9azh6as8l8d5i1xjyp9k7"; depends=[]; }; packdep = derive { name="packdep"; version="0.3.1"; sha256="1827h9xcvgdad9nwz9k3hi79jc33yr7dnxy4xn2frp3fdh4q81ll"; depends=[igraph]; }; -packrat = derive { name="packrat"; version="0.4.2-1"; sha256="0p0syic6n7iq652r7jhrp11f584h1hrvqw6nnc8xkxlfg1rabs7n"; depends=[]; }; +packrat = derive { name="packrat"; version="0.4.3"; sha256="0sfv7vl9afvv2rpqk39hbrvhq6z54ilqjrff4j3parsfqvg7gaqf"; depends=[]; }; +pacman = derive { name="pacman"; version="0.2.0"; sha256="04kqa34qz1bvx3rbq50f0djmmxgm40cip28fb7mj4icm1l9z2x8m"; depends=[devtools]; }; paf = derive { name="paf"; version="1.0"; sha256="0wrqn67jfrjjxwcrkka6dljgi3mdk00vfjkzzcv2v7c97gx1zvwn"; depends=[survival]; }; pairedCI = derive { name="pairedCI"; version="0.5-4"; sha256="03wf526n3bbr2ai44zwrdhbfx99pxq1nbng9wsbndrdg2ji4dar2"; depends=[]; }; pairheatmap = derive { name="pairheatmap"; version="1.0.1"; sha256="1awmqr5n9gbqxadkblpxwcjl9hm73019bwwfwy1f006jpn050d6l"; depends=[]; }; pairwise = derive { name="pairwise"; version="0.2.5"; sha256="0r08v95f6f2safi6c0x84v5gib5qnkv46dmi97rdb9l2xzly249b"; depends=[]; }; pairwiseCI = derive { name="pairwiseCI"; version="0.1-22"; sha256="1lgir9gcikx8c9pd2wdsqnik9rwr4qkymcf4ndp8s491vj6cm6sa"; depends=[MCPAN coin boot mratios binMto MASS]; }; -palaeoSig = derive { name="palaeoSig"; version="1.1-2"; sha256="0f5y69zzb32zi3kdy8jpcvz3i38nmmi0d9ajs44jrq4rkhhhwq3v"; depends=[rioja vegan TeachingDemos gstat fields mapproj]; }; +palaeoSig = derive { name="palaeoSig"; version="1.1-3"; sha256="1zm8xr7fpnnh6l4421vjavi6bg44iars3mna4r5fw3spmbswyv7b"; depends=[vegan TeachingDemos rioja mgcv MASS]; }; paleoMAS = derive { name="paleoMAS"; version="2.0-1"; sha256="1hhb5wbj4m3ch8wnvd1zkl5bk6wa9nl6jl1dhm4z6yqkh29yn9z6"; depends=[MASS vegan lattice]; }; paleoTS = derive { name="paleoTS"; version="0.4-4"; sha256="19acfq5z42blk6ya7sj3sprddlgvhrzb9zqpvpy4q8siqkxxrjah"; depends=[mvtnorm]; }; paleobioDB = derive { name="paleobioDB"; version="0.3"; sha256="1vcfssi6w0m2wd2smyjxp1zf0y48y95386kkb8qdndqw99g089w8"; depends=[raster maps rjson gtools RCurl plyr scales]; }; paleofire = derive { name="paleofire"; version="1.1.5"; sha256="18ymcybsq4hqxyrqslaqda8n2pyf4yl45mgs3yzl1gbw77zas1bl"; depends=[GCD locfit raster ggplot2 plyr rgdal lattice]; }; paleotree = derive { name="paleotree"; version="2.3"; sha256="0zfav7s7x6g7rndbl6jg186fyxsq200b6z0l1zdvcm9528svv9wp"; depends=[ape phangorn]; }; palinsol = derive { name="palinsol"; version="0.92"; sha256="1jxy3qx8w1r8jwgdavf37gqjjqpizdqk218xcc7b77xi8w52vxpg"; depends=[gsl]; }; +pamctdp = derive { name="pamctdp"; version="0.3.1"; sha256="1fnadgfd2ikis49j9zl2ijj8gim8lpbygwxjj6ri9jyrc1qmj9jb"; depends=[ade4 xtable FactoClass]; }; pamm = derive { name="pamm"; version="0.7"; sha256="02py4zcymmwnlpsvha5cgc4ik8fp0gbsg86s5q7z5fl3ma3g669j"; depends=[lme4 mvtnorm gmodels]; }; +pampe = derive { name="pampe"; version="1.0"; sha256="0dfwhcnsxw71sn14m44fx1fxbx924rjpi2vvz292jzr404krcvny"; depends=[leaps]; }; pamr = derive { name="pamr"; version="1.55"; sha256="1hy3khb0gikdr3vpjz0s245m5zang1vq8k93g7n9fq3sjfa034gd"; depends=[cluster survival]; }; -pan = derive { name="pan"; version="0.9"; sha256="1payx5bzs0hp3f176ia56y4a9pym8p4h7ap5wag2symlvprzppah"; depends=[]; }; +pan = derive { name="pan"; version="1.3"; sha256="08g0arwwkj9smkzyh6aicfrqvknag3n2xl55f7q7ghj09fhwg1br"; depends=[]; }; pander = derive { name="pander"; version="0.5.1"; sha256="0m95vnrzw9v4cq52kn3a605gbk1qd24ivh7aywhk1lh0imlk7i85"; depends=[digest Rcpp Rcpp]; }; panelAR = derive { name="panelAR"; version="0.1"; sha256="1ka2rbl9gs65xh2y2m4aqwh5qj4szibjy101hqfmza9wmdh25gpq"; depends=[car]; }; panelaggregation = derive { name="panelaggregation"; version="0.1"; sha256="19426hab4rvgn8k2c7x327k4ymihas59jbys0nmrfgg074x0xdnm"; depends=[data_table]; }; papeR = derive { name="papeR"; version="0.5-0"; sha256="1j366644scrsq2sjl9vip0ids97y9m6c8fyx16qlismrfcfbapyz"; depends=[car gmodels]; }; parallelMCMCcombine = derive { name="parallelMCMCcombine"; version="1.0"; sha256="05krkd643awqhfrylq9lxr2cmgvnm1msn2x8p1l1483n2gzyklz7"; depends=[mvtnorm]; }; -parallelMap = derive { name="parallelMap"; version="1.1"; sha256="1h3im52ia29m1qv4dcvw1zxciv3v9b9fq2difg6cs9apdn0fvlz8"; depends=[BBmisc checkmate fail]; }; +parallelMap = derive { name="parallelMap"; version="1.2"; sha256="1rd4q644xml29nj4mybgh8cr0h4wsadsf2wlyzppx5hg5yi27ff2"; depends=[BBmisc checkmate]; }; parallelize_dynamic = derive { name="parallelize.dynamic"; version="0.9-1"; sha256="03zypcvk1iwkgy6dmd5bxg3h2bqvjikxrbzw676804zi6y49mhln"; depends=[]; }; paramlink = derive { name="paramlink"; version="0.9-6"; sha256="0pazllkjbqzvl9vmpvr67lkcsd960mipcd1p1nf00y8hknrwh7qp"; depends=[kinship2 maxLik]; }; paran = derive { name="paran"; version="1.5.1"; sha256="0nvgk01z2vypk5bawkd6pp0pnbgb54ljy0p8sc47c8ibk242ljqk"; depends=[MASS]; }; @@ -4654,6 +4747,7 @@ parfossil = derive { name="parfossil"; version="0.2.0"; sha256="12gsc5n4ycvhzxvq parma = derive { name="parma"; version="1.5-1"; sha256="0qrq3bx0amri9b3s6bym4znnk140jjd2abnvqyihaj4bf2glbl0g"; depends=[nloptr slam Rglpk quadprog FRAPO corpcor]; }; parmigene = derive { name="parmigene"; version="1.0.2"; sha256="1fsm6pkr17jcbzkj1hbn91jf890fviqk1lq6ls8pihsdgah1zb4d"; depends=[]; }; parsedate = derive { name="parsedate"; version="1.1.1"; sha256="0mr97rw4fzg2v9dh5d4x0b76d5s56gi6zilq69yjhbx78w46apzc"; depends=[]; }; +partialAR = derive { name="partialAR"; version="1.0.5"; sha256="1d8nbv3rkf0p4vg8mlb1l5cqzgsqqhigwiq2bnd4npak6fq6syvg"; depends=[Rcpp zoo ggplot2 MASS tseries data_table FKF urca plot3D Rcpp]; }; partialOR = derive { name="partialOR"; version="0.9"; sha256="02vbvln8lswysaafpxq5rxb6crp7yhlc13i42kybv8fr10jaagjj"; depends=[nnet]; }; partitionMap = derive { name="partitionMap"; version="0.5"; sha256="0pi066xaaq0iqr0d7cncdzjd7bacmgrivc4qvhqx0y7q1vifrdjm"; depends=[randomForest]; }; partitionMetric = derive { name="partitionMetric"; version="1.1"; sha256="1wry9d3s814yp79ayab7rzf8z5l2mwpgnrc5j7d2sac24vp4pd48"; depends=[]; }; @@ -4684,7 +4778,7 @@ pbdMPI = derive { name="pbdMPI"; version="0.2-5"; sha256="0g21zyl8dck5mxjsg4iif6 pbdNCDF4 = derive { name="pbdNCDF4"; version="0.1-4"; sha256="0fd29mnbns30ck09kkh53dgj24ddrqzks4xrrk2hh1wiy7ap1h95"; depends=[]; }; pbdPROF = derive { name="pbdPROF"; version="0.2-3"; sha256="0vk29vgsv7fhw240sagz0szg0wb649sqc05j1aj027zvz931vfl8"; depends=[ggplot2 gridExtra reshape2]; }; pbdSLAP = derive { name="pbdSLAP"; version="0.2-0"; sha256="06q9k8y7k604wa2zfspjg2v3fybn5my1vyr7zsg6j66n9g4z6039"; depends=[rlecuyer pbdMPI]; }; -pbivnorm = derive { name="pbivnorm"; version="0.5-1"; sha256="18ry0qz0ryazplv5iwdvbfngn0zv7frqp16nc2x70s0wf3izxkwr"; depends=[]; }; +pbivnorm = derive { name="pbivnorm"; version="0.6.0"; sha256="05jzrjqxzbcf6z245hlk7sjxiszv9paadaaimvcx5y5qgi87vhq7"; depends=[]; }; pbkrtest = derive { name="pbkrtest"; version="0.4-2"; sha256="1yppp24a8rl36x6sn1jjhhgs41irbf0z5nrv454g9qwhbvfgiay5"; depends=[lme4 Matrix MASS]; }; pbo = derive { name="pbo"; version="1.3.4"; sha256="0v522z36q48k4mx5gym564kgvhmf08fsadp8qs6amzbgkdx40yc4"; depends=[lattice]; }; pbs = derive { name="pbs"; version="1.1"; sha256="0cpgs6k5h8y2cia01zs1p4ri8r7ljg2z4x8xcbx73s680dvnxa2w"; depends=[]; }; @@ -4723,7 +4817,7 @@ pendensity = derive { name="pendensity"; version="0.2.7"; sha256="1f7v0dqcip6mvz pensim = derive { name="pensim"; version="1.2.9"; sha256="10nrnxwfs41bhybs7j6xgnx0pq3c802n9k8irngmh8iy4w3wbhrq"; depends=[penalized MASS]; }; peperr = derive { name="peperr"; version="1.1-7"; sha256="01a6sxcmb8v2iz2xdwhdnr92k3w2vn3hr0hg9b6mkpzjf4n45q3k"; depends=[snowfall survival]; }; peplib = derive { name="peplib"; version="1.5.1"; sha256="1bdgmwbk76ryl5gxcgf3slds92yilg9p1x1lx0hnzzwcgx99wif3"; depends=[]; }; -peptider = derive { name="peptider"; version="0.1.6"; sha256="089m3pwjkxy0lb2lgmkj4naxawn8jy0iqdxh74a2r56r2yl22n88"; depends=[discreteRV plyr dplyr]; }; +peptider = derive { name="peptider"; version="0.1.7"; sha256="1jmbklrs32gyb8ph6lkfqkjc97xzhah8g0zkb52s22bvx22iqvhf"; depends=[discreteRV plyr dplyr]; }; pequod = derive { name="pequod"; version="0.0-3"; sha256="14nag0bd2icg294y7n47c6xlw54rrdia887d2ni6achjqgwvffzh"; depends=[ggplot2 car]; }; perARMA = derive { name="perARMA"; version="1.5"; sha256="1d9vrxv8r6qgxhaz3pv8n34c526gi5cd8w7wxy9qc914y8kplmzr"; depends=[corpcor gnm matlab Matrix signal]; }; performanceEstimation = derive { name="performanceEstimation"; version="1.0.0"; sha256="176crk5vf9fw52qwsbwcwyp0l9v0kg27jwz2krx295d8kq22ygrj"; depends=[ggplot2 foreach doParallel]; }; @@ -4735,14 +4829,14 @@ perry = derive { name="perry"; version="0.2.0"; sha256="1lfmcq2xsxmfs7cxvhgxcsgg persiandictionary = derive { name="persiandictionary"; version="1.0"; sha256="0rgi36ngpiax3p5zk4cdgf3463vgx7zg5wxscs2j7834yh37jwax"; depends=[]; }; perturb = derive { name="perturb"; version="2.05"; sha256="18ydmmp8aq4rf9834dmsr4fr9r07zyn97v8a1jqz3g9njza983la"; depends=[]; }; pesticides = derive { name="pesticides"; version="0.1"; sha256="1w180hqqav0mh9sr9djj94sf55fzh4r373a7h08a2nz9nyjpq09w"; depends=[]; }; -pez = derive { name="pez"; version="0.9-0"; sha256="088rvlgc9d7i4g5n39iymaaqzjbcrk5vh526xl6sa31yd2cr8240"; depends=[ape caper picante quantreg mvtnorm vegan PVR ade4 apTreeshape FD]; }; +pez = derive { name="pez"; version="1.0-0"; sha256="0d1npc2w6gzi4ki7gwqa0f4sklz0sml8q0cmgb77hpvgrny47mk3"; depends=[ape caper picante quantreg mvtnorm vegan ade4 apTreeshape FD plotrix Matrix]; }; pgam = derive { name="pgam"; version="0.4.12"; sha256="0vhac2mysd053bswy3xwpiz0q0qh260hziw6bygpf83vkj94qf2v"; depends=[]; }; pgirmess = derive { name="pgirmess"; version="1.5.9"; sha256="1n58r5ghd2ppnid6787gd1n18f23pf0fk7yr3vagcqpzv4pk0wic"; depends=[boot nlme rgdal sp spdep splancs]; }; pglm = derive { name="pglm"; version="0.1-2"; sha256="1arn2gf0bkg0s59a96hyhrm7adw66d33qs2al2s0ghln6fyk8674"; depends=[maxLik plm statmod]; }; pgmm = derive { name="pgmm"; version="1.1"; sha256="0ajdcnxxy18ifidid4xnq9a03bsrvcbh3dh2vhviggkhq8gji1dn"; depends=[]; }; pgs = derive { name="pgs"; version="0.4-0"; sha256="1zf5sjn662sds3h06zk5p4g71qnpwp5yhw1dkjzs1rs48pxmagrx"; depends=[gsl R2Cuba]; }; phalen = derive { name="phalen"; version="1.0"; sha256="0awj9a48dy0azkhqkkzf82q75hrsb2yw6dgbsvlsb0a71g4wyhlr"; depends=[sqldf]; }; -phangorn = derive { name="phangorn"; version="1.99-11"; sha256="16ymrm0iifzimg7y7f7wkj2syj4mbhwxm0sx6kyw8jglx82qw7fs"; depends=[ape quadprog igraph Matrix fastmatch rgl]; }; +phangorn = derive { name="phangorn"; version="1.99-12"; sha256="0yp2ih3f15xx1vd4vk1hdg3gl7l1a9y2j88cd6b6z2x1d6waj1yv"; depends=[ape quadprog igraph Matrix fastmatch nnls]; }; phaseR = derive { name="phaseR"; version="1.3"; sha256="1hwclb7lys00vc260y3z9428b5dgm7zq474i8yg0w07rxqriaq2h"; depends=[deSolve]; }; phcfM = derive { name="phcfM"; version="1.2"; sha256="0i1vr8rmq5zs34syz2vvy8c9603ifzr9s5v2izh1fh8xhzg7655x"; depends=[coda]; }; pheatmap = derive { name="pheatmap"; version="0.7.7"; sha256="0zj6n6cjkim20apihl943rhzxlmkmpqwh00l6h2c8z04m3pv186v"; depends=[RColorBrewer]; }; @@ -4751,8 +4845,8 @@ phenex = derive { name="phenex"; version="1.0-7"; sha256="0q563cv9lskikf3ls0idp5 phenmod = derive { name="phenmod"; version="1.2-3"; sha256="0dxwx8c7zka29fq7svrvn8bghj8jh8grbrgsw4pvavx2439cldak"; depends=[gstat RColorBrewer lattice pheno]; }; pheno = derive { name="pheno"; version="1.6"; sha256="0xdya1g1ap7h12c6zn3apbkxr725rjhcp4gbdchkvcnwz4y9vw8c"; depends=[nlme SparseM quantreg]; }; pheno2geno = derive { name="pheno2geno"; version="1.2.1"; sha256="0rh4fzka453i5djsyv4c0z3x6d5r7fvyvxi6x1a1806nzy7w43hj"; depends=[qtl VGAM mixtools]; }; -phenology = derive { name="phenology"; version="4.0"; sha256="04zpqvbq5qb3kr1crgj2lbnzj9hcipak2rp4qvskisg750rr8h3p"; depends=[fields zoo coda shiny]; }; -phia = derive { name="phia"; version="0.1-5"; sha256="0vkl4ccsdx72dwis2959f6w9zg584wfkn58fh2slybdyg9p8886a"; depends=[car]; }; +phenology = derive { name="phenology"; version="4.0.4"; sha256="1h40dr3347nisf61nnrfi23a6951zxnf5ibmnb5k80fwkhmw81f0"; depends=[fields zoo coda shiny]; }; +phia = derive { name="phia"; version="0.2-0"; sha256="1v2znss1snqrn3bpd0513jmw0x39p9vpwdc60klx725yrr2cfznw"; depends=[car Matrix]; }; phmm = derive { name="phmm"; version="0.7-5"; sha256="0dil0ha199yh85j1skwfdl0v02vxdmb0xcc1jdbayjr5jrn9m1zk"; depends=[survival lattice Matrix]; }; phom = derive { name="phom"; version="1.0.3"; sha256="0x05p6fn4kycilal65k7dy6h3w5i3ca9w93ryp4gqd4lp50l1749"; depends=[Rcpp Rcpp]; }; phonR = derive { name="phonR"; version="0.4-2"; sha256="15hi15minbd756vplmcyf0987ppanr44kds13nny0v1h5yyv8kyx"; depends=[]; }; @@ -4770,17 +4864,17 @@ phylosim = derive { name="phylosim"; version="2.1.1"; sha256="0rrz5c7zl2hjalwm6m phylotools = derive { name="phylotools"; version="0.1.2"; sha256="19w7xzk6sk1g9br7vwv338nvszzh0lk5rdzf0khiywka31bbsjyb"; depends=[seqRFLP ape picante spaa fields]; }; phyreg = derive { name="phyreg"; version="0.7"; sha256="0saynhq4yvd4x2xaljcsfmqk7da2jq3jqk26fm9qivg900z4kf35"; depends=[]; }; physiology = derive { name="physiology"; version="0.2.2"; sha256="0z394smbnmlrnp9ms5vjczc3avrcn5nxm8np5y58k86x470w6npz"; depends=[]; }; -phytools = derive { name="phytools"; version="0.4-31"; sha256="1dmwjkd2c16amz7v4nwyd0006kydy3snrb1wkjd69n6qnfwmr7ba"; depends=[ape maps animation clusterGeneration mnormt msm numDeriv phangorn plotrix scatterplot3d]; }; +phytools = derive { name="phytools"; version="0.4-45"; sha256="0qhndyik687v2hrd32xr0zglpyxikv1zhp2dkz611kpjbxz0gq44"; depends=[ape maps animation clusterGeneration mnormt msm numDeriv phangorn plotrix scatterplot3d]; }; +phytotools = derive { name="phytotools"; version="1.0"; sha256="049znviv2vvzv23biy1l28axm7bc7biwmq4bnn0cnjqgkk48ysz3"; depends=[insol FME]; }; pi0 = derive { name="pi0"; version="1.3-250"; sha256="1561zvf1hcd05iqy245c0z23mi8ypk6q3lkfldcr55cs67w4lmz6"; depends=[LowRankQP Matrix numDeriv limSolve rgl scatterplot3d Iso quadprog kernlab]; }; picante = derive { name="picante"; version="1.6-2"; sha256="1zxpd8kh3ay6f3gdqkij1a6vnkr98dc1jib2r6br2kjyzshabcsd"; depends=[ape vegan nlme]; }; picasso = derive { name="picasso"; version="0.3.0"; sha256="0z314akr1x2a28hh5hbb7mzkyaxsj4dfkdmx10l6gqllgk9j5qca"; depends=[lattice igraph MASS Matrix]; }; pingr = derive { name="pingr"; version="1.1.0"; sha256="0j03qcsyckv3zh2v4m8wz8kyfl0k8qi71rm20rc0spy1s9ng7fcb"; depends=[]; }; -pipeR = derive { name="pipeR"; version="0.5"; sha256="1x761ycmnldzsvahfaz1k8qz0qnrqp54qxqaskc8zp841cbhp8bh"; depends=[]; }; +pipeR = derive { name="pipeR"; version="0.6"; sha256="15hq6i1cv072jpw71slij534s85xljkjk2ygxpkgq3cyngbq3jxb"; depends=[]; }; pitchRx = derive { name="pitchRx"; version="1.6"; sha256="16x152xz7vs4bwi4xh05sbj38xgqzk8g95vfm0vm5mf94qnnaa6c"; depends=[ggplot2 XML2R plyr MASS hexbin mgcv]; }; pixmap = derive { name="pixmap"; version="0.4-11"; sha256="04klxp6jndw1bp6z40v20fbmdmdpfca2g0czmmmgbkark9s1183g"; depends=[]; }; pkgKitten = derive { name="pkgKitten"; version="0.1.2"; sha256="0nk51c3cx9hy8dwdi7llf9k6kq8495dvy8bxjlajwiwd39jipvgs"; depends=[]; }; pkgmaker = derive { name="pkgmaker"; version="0.22"; sha256="0vrqnd3kg6liqvpbd969jjsdx0f0rvmmxgdbwwrp6xfmdg0pib8r"; depends=[registry codetools digest stringr xtable]; }; -pkgutils = derive { name="pkgutils"; version="0.6.0"; sha256="0pi1xaamirsv1bwlwcvyd1hvdgbjbdmw3vg3krawsb34mynbrcff"; depends=[]; }; pks = derive { name="pks"; version="0.3-0"; sha256="0lvj5kfjf8wikszz1dipwr1fw9xbhy3nx0ksqz4ln240k7fn5kcj"; depends=[sets]; }; plRasch = derive { name="plRasch"; version="1.0"; sha256="1rnpvxw6pzl5f6zp4xl2wfndgvqz5l3kiv9sh4cpvhga0gl8zjaw"; depends=[survival]; }; plan = derive { name="plan"; version="0.4-2"; sha256="0vwiv8gcjdbnsxd8zqf0j1yh6gvbzm0b5kr7m47ha9z64d7wxch6"; depends=[]; }; @@ -4796,10 +4890,10 @@ pln = derive { name="pln"; version="0.2-1"; sha256="09zg7zwmmqpjr1j59lqsjf4blrky plot2groups = derive { name="plot2groups"; version="0.10"; sha256="00mp82vvx6inlc2zj2cqqnzyglrm9x9im2vrqqk8j2jn0hbgfymy"; depends=[ggplot2]; }; plot3D = derive { name="plot3D"; version="1.0-2"; sha256="0qsrd1na4xw2bm1rzwj3asgkh7xqpyja0dxdmz41f3x58ip9wnz1"; depends=[misc3d]; }; plot3Drgl = derive { name="plot3Drgl"; version="1.0"; sha256="109vsivif4hmw2hk3hi4y703d3snzxbr9pzhn1846imdclkl12yg"; depends=[rgl plot3D]; }; -plotGoogleMaps = derive { name="plotGoogleMaps"; version="2.1"; sha256="1hymq35va75grxsjhd8sk7x4xfqsyfk5r5i1l3drwrajl1sx8b1a"; depends=[sp spacetime rgdal maptools lattice raster]; }; -plotKML = derive { name="plotKML"; version="0.4-8"; sha256="0vi7rh13w9p6xhf350f76dj0f6hkg42q4jvbc6ymj47ldz2r0gmh"; depends=[XML sp raster rgdal spacetime colorspace plotrix dismo aqp pixmap plyr stringr colorRamps scales gstat zoo RColorBrewer RSAGA classInt]; }; +plotGoogleMaps = derive { name="plotGoogleMaps"; version="2.2"; sha256="0qv57k46ncg0wrgma0sbr3xf0j9j8cii3ppk3gs65ardghs3bf6b"; depends=[sp spacetime rgdal maptools lattice raster]; }; +plotKML = derive { name="plotKML"; version="0.5-0"; sha256="0sx48z27a34bc8gw7m66w52q36llbm2wm15l6kvd6zzlyzvj8cda"; depends=[XML sp raster rgdal spacetime colorspace plotrix dismo aqp pixmap plyr stringr colorRamps scales gstat zoo RColorBrewer RSAGA classInt]; }; plotMCMC = derive { name="plotMCMC"; version="2.0-0"; sha256="0i4kcx6cpqjd6i16w3i8s34siw44qigca2jbk98b9ligbi65qnqb"; depends=[coda gplots lattice]; }; -plotROC = derive { name="plotROC"; version="1.2"; sha256="0x9wpj65cr6k97irwpx0b5zhljgzdii048nmz4xansazvmh04mgj"; depends=[ggplot2 gridSVG shiny]; }; +plotROC = derive { name="plotROC"; version="1.3"; sha256="1scb2mkz1b74kmai6fhliva9ghhrl1036kk6v3ll5xk16ffjpgg3"; depends=[ggplot2 gridSVG shiny]; }; plotSEMM = derive { name="plotSEMM"; version="2.0"; sha256="0n30m1nz9fnilbgxg5jcmx2bsscdvz5mkjkyrgx7yr3alazkaimd"; depends=[plyr shiny MplusAutomation Rcpp plotrix Rcpp]; }; plotmo = derive { name="plotmo"; version="2.2.1"; sha256="1kgsw7xfqmzsyybhj21a42ynci1y7gm8gas1jqsbgh0vydfbzzh5"; depends=[]; }; plotpc = derive { name="plotpc"; version="1.0.3"; sha256="0dw9k702a67c2k77dl4k2747lhsr84x41qrgj5mp9jnyfq6naciq"; depends=[]; }; @@ -4832,6 +4926,7 @@ pocrm = derive { name="pocrm"; version="0.8"; sha256="04i9slfb9hmhhhq6m2iz7p3cm3 poibin = derive { name="poibin"; version="1.2"; sha256="12dm1kdalbqy8k7dfldf89v6zw6nd0f73gcdx32xbmry2l2976sa"; depends=[]; }; poilog = derive { name="poilog"; version="0.4"; sha256="0bg03rd5rn4rbdpiv87i8lamhs5m7n7cj8qf48wpnirg6jpdxggs"; depends=[]; }; pointdensityP = derive { name="pointdensityP"; version="0.1"; sha256="1wa10sp0pxcjyicifz638f89b7ynsy7718qbh2p2gn66lbvjpkhr"; depends=[]; }; +poisDoubleSamp = derive { name="poisDoubleSamp"; version="1.1"; sha256="13wyj9jf161218y4zjv2haavlmanihp9l59cvh7x8pfr9dh2dwr8"; depends=[Rcpp Rcpp]; }; poisson_glm_mix = derive { name="poisson.glm.mix"; version="1.2"; sha256="0328m279jfa1fasi9ha304k4wcybzr7hldww7wn0cl7anfxykbv8"; depends=[]; }; poistweedie = derive { name="poistweedie"; version="1.0"; sha256="18992fafypds3qsb52c09fasm3hzlyh5zya6cw32wnhipmda643m"; depends=[]; }; polidata = derive { name="polidata"; version="0.1.0"; sha256="07641v0dnn161kyxx7viplkf8c3r51hd4hd5pzmcph4y4387r01i"; depends=[jsonlite RCurl]; }; @@ -4858,11 +4953,11 @@ popbio = derive { name="popbio"; version="2.4"; sha256="12hvxkgbr6snypplxv404sj0 popdemo = derive { name="popdemo"; version="0.1-4"; sha256="0syhmm8fnxbsdzj75y7dpahmpf453a6gwp3yljkvmfl0bfv1g1ng"; depends=[expm]; }; popgen = derive { name="popgen"; version="1.0-3"; sha256="00rgfwmmiharfxqlpy21n3jbxwr5whzdg8psqylkjf83ls2myqzm"; depends=[cluster]; }; popgraph = derive { name="popgraph"; version="1.4"; sha256="1z6w6vj3vl2w10hvzwmkw4d475bqcd6ys92xnn445ag6vpq0cvxq"; depends=[ggplot2 igraph MASS sp Matrix sampling]; }; -poplite = derive { name="poplite"; version="0.99.5"; sha256="0xcq5m2yhslaip3aa2s23dwp8bgi9qcdfbqd0af5bsn7kqrgwh94"; depends=[dplyr DBI igraph lazyeval RSQLite]; }; -poppr = derive { name="poppr"; version="1.1.2"; sha256="0qzqyrx8jqz9xhwq6v2ic2jm82g3csg6cs31g7hailx559axxi8i"; depends=[adegenet vegan ggplot2 phangorn ape igraph ade4 pegas reshape2]; }; +poplite = derive { name="poplite"; version="0.99.16"; sha256="0yp1hfda2k6c5x0gbcfxj9h6igzx3ra05xs7g88wjz76yxp3wb6w"; depends=[dplyr DBI igraph lazyeval RSQLite]; }; +poppr = derive { name="poppr"; version="1.1.4"; sha256="13zxcclr8ar3ibjd34n23g0q0rw28gdl2q5477cmpcnypwzxsa71"; depends=[adegenet vegan ggplot2 phangorn ape igraph ade4 pegas reshape2]; }; popsom = derive { name="popsom"; version="2.3"; sha256="0hdg1nx8mlpqw9aj2q08sb20frsc5jnbvqpfalf5kyvlygnhxdlc"; depends=[som fields]; }; portes = derive { name="portes"; version="2.1-3"; sha256="0nqh6aync5igmvg7nr5inkv2cwgzd0zi6ky0vvrc3abchqsjm2ck"; depends=[]; }; -portfolio = derive { name="portfolio"; version="0.4-6"; sha256="0kaaincyzc2f4dm7n08y3vs1yd1r7pd997gf2wvfjydw7wkc5pin"; depends=[lattice nlme]; }; +portfolio = derive { name="portfolio"; version="0.4-7"; sha256="0gs1a4qh68xsvl7yi6mz67lamwlqyqjbljpyax795piv46kkm06p"; depends=[lattice nlme]; }; portfolioSim = derive { name="portfolioSim"; version="0.2-7"; sha256="1vf46882ys06ia6gfiibxx1b1g81xrg0zzman9hvsj4iky3pwbar"; depends=[lattice portfolio]; }; potts = derive { name="potts"; version="0.5-2"; sha256="1q4kvknxkrd8qbv8l3vmwrppgzq5bsysnqgm029lx7iys73x4fck"; depends=[]; }; poweRlaw = derive { name="poweRlaw"; version="0.20.5"; sha256="03s4kn01q4v2wx2y5pglqycjr37076g9alp9kz915h0ckfv1i42f"; depends=[VGAM]; }; @@ -4874,12 +4969,14 @@ powerSurvEpi = derive { name="powerSurvEpi"; version="0.0.6"; sha256="1jsbrj35m2 powerpkg = derive { name="powerpkg"; version="1.5"; sha256="0mbk2fda2fvyp1h5lk5b1fg398xybbjv0z6kdx7w7xj345misf7l"; depends=[]; }; powerr = derive { name="powerr"; version="0.1-3"; sha256="0scarwipq8095hvj7ij849l10q2g7g5z66ws7r72apdvxs5nvxnj"; depends=[Matrix Rcpp Rcpp RcppEigen]; }; ppcor = derive { name="ppcor"; version="1.0"; sha256="18l5adjysack86ws61xh89z5xfr83v932a0pn6ad8i8py3nd85fj"; depends=[]; }; +ppiPre = derive { name="ppiPre"; version="1.6"; sha256="0ck1xxaip614sxi8liqfhznzpq2i6f491v9kijawak5xm39bn9vv"; depends=[igraph e1071]; }; ppls = derive { name="ppls"; version="1.6-1"; sha256="1r3h4pf79bkzpqdvyg33nwjabsqfv7r8a4ziq2zwx5vvm7mdy7pd"; depends=[MASS]; }; +ppmlasso = derive { name="ppmlasso"; version="1.1"; sha256="1w13p1wjl1csds1xfc79m44rlym9id9gwnp3q0bzw05f35zbfryg"; depends=[spatstat]; }; pps = derive { name="pps"; version="0.94"; sha256="0sirxpagqc2ghc01zc6q4dk691six9wkgknfbwaqxbxvda3hcmyq"; depends=[]; }; pqantimalarials = derive { name="pqantimalarials"; version="0.2"; sha256="0azxkf1rvk9cyzr4gbp4y2vcxrxw3d4f002d5gjkvv1f4kx8faw1"; depends=[reshape2 RColorBrewer plyr shiny]; }; prLogistic = derive { name="prLogistic"; version="1.2"; sha256="1abwz7nqkz2qbyqyr603kl9a3rkad3f4vxhck6a9kl80xrmfrj9s"; depends=[boot lme4 Hmisc]; }; prabclus = derive { name="prabclus"; version="2.2-6"; sha256="0qjsxrx6yv338bxm4ki0w9h8hind1l98abdrz828588bwj02jya1"; depends=[MASS mclust]; }; -pracma = derive { name="pracma"; version="1.7.9"; sha256="1yxahsr7sln6c6d777vs5iwa5wyp2zfyd5iq2hnqf2z05whc72ks"; depends=[]; }; +pracma = derive { name="pracma"; version="1.8.3"; sha256="06711w5451gb22667i5dx27ysi4pfagkxdfzg270lxwbymcii6pp"; depends=[]; }; pragma = derive { name="pragma"; version="0.1.3"; sha256="1n30a346pph4d8cj4p4qx2l6fnwhkxa8yxdisx47pix376ljpjfx"; depends=[]; }; praktikum = derive { name="praktikum"; version="0.1"; sha256="0kkydgglvqw371fxh46fi86fmdndhwq1n8qj0ynbh2gz1cn86aw1"; depends=[]; }; prc = derive { name="prc"; version="2014.11-4"; sha256="0r4c0s80fdzc9ifbfy8aaqi7164blqgiv3vbzp9x70c4dfl3lwxx"; depends=[kyotil nlme]; }; @@ -4887,6 +4984,7 @@ predfinitepop = derive { name="predfinitepop"; version="1.0"; sha256="1x5ri1kvd1 predictmeans = derive { name="predictmeans"; version="0.99"; sha256="1qfqh21d3m0k2491hv5rl5k4v49j5089xsdk3bxicp30l512rax0"; depends=[lme4 nlme ggplot2 lattice pbkrtest plyr]; }; predmixcor = derive { name="predmixcor"; version="1.1-1"; sha256="0v99as0dzn0lqnbbzycq9j885rgsa1cy4qgbya37bbjd01b3pykd"; depends=[]; }; prefmod = derive { name="prefmod"; version="0.8-32"; sha256="0v5r195gzbfi6jbqz8r1x2fzj3anqxf4hxaxb9krm9rkwgphrwpi"; depends=[gnm colorspace]; }; +presens = derive { name="presens"; version="1.0.0"; sha256="0hwciahpfp7h7dchn6k64cwjwxzm6cx28b66kv6flz4yzwvqd3pb"; depends=[birk marelac]; }; preseqR = derive { name="preseqR"; version="1.0.1"; sha256="0plwhgs6fgvra2w5xcjrr260fra0nl2cpsn5r1z701q7b8nbm257"; depends=[]; }; prettyGraphs = derive { name="prettyGraphs"; version="2.1.5"; sha256="19jag5cymancxy5lvkj5mkhdbxr37pciqj4vdvmxr82mvw3d75m4"; depends=[]; }; prettyR = derive { name="prettyR"; version="2.1"; sha256="0q6w51758yaxa3l276vqvkvry6v4xz33lx8791b5hyrq837ypx8z"; depends=[]; }; @@ -4899,6 +4997,7 @@ primerTree = derive { name="primerTree"; version="1.0.1"; sha256="068j5a2rh8f1h1 princurve = derive { name="princurve"; version="1.1-12"; sha256="19fprwpfhgv6n6ann978ilwhh58qi443q25z01qzxml4b5jzsd7w"; depends=[]; }; prinsimp = derive { name="prinsimp"; version="0.8-8"; sha256="074a27ml0x0m23hlznv6qz6wvfqkv08qxh3v1sbkl9nxrc7ak4vn"; depends=[]; }; prob = derive { name="prob"; version="0.9-5"; sha256="05skjqimzhnk99z864466dc8qx58pavrky320il91yqyr8b98j8b"; depends=[combinat fAsianOptions hypergeo VGAM]; }; +probFDA = derive { name="probFDA"; version="1.0"; sha256="0aqg3f9n1c30wiqml556xmdcv9yr8rijqvymqk89jdzfc0ri25gh"; depends=[MASS]; }; probsvm = derive { name="probsvm"; version="1.00"; sha256="1k0zysym7ncmjy9h7whwi49qsfkpxfk7chfdjrydl6hn6pscis37"; depends=[kernlab]; }; prodlim = derive { name="prodlim"; version="1.5.1"; sha256="0qjyx4i66cahiqjqff63ljwxdig4lvfs2asxnhkgylwn2kb3lygv"; depends=[survival KernSmooth lava]; }; profdpm = derive { name="profdpm"; version="3.3"; sha256="07lhjavrx4fa5950w928mfpddmmnmvdapl5n6mv49m8h3bxs4nmy"; depends=[]; }; @@ -4917,12 +5016,13 @@ proteomics = derive { name="proteomics"; version="0.2"; sha256="01cd4sb79gcx8gbz protiq = derive { name="protiq"; version="1.2"; sha256="1d5wr9w540a79i57nr0arn5xg7s6jhhy5nrgsk8r3ljidld2s2sa"; depends=[mvtnorm]; }; proto = derive { name="proto"; version="0.3-10"; sha256="03mvzi529y6kjcp9bkpk7zlgpcakb3iz73hca6rpjy14pyzl3nfh"; depends=[]; }; protoclass = derive { name="protoclass"; version="1.0"; sha256="17d2m6r1shgb47v8mwdg1a7f5h29m5l7f5m0nsmv0xc90s9cpvk8"; depends=[class]; }; +protoclust = derive { name="protoclust"; version="1.4"; sha256="00rqwh2zhdaf1m3gb1skczpck9svfgjyayx6f71i9fbqilmhqaz1"; depends=[]; }; protr = derive { name="protr"; version="0.5-1"; sha256="1ji0vpy9rrrvbsfwi4823ywi5zbwl57zw1glxllxgwyv9l6v4bpb"; depends=[]; }; -proxy = derive { name="proxy"; version="0.4-13"; sha256="1lqkv2m9xryi6504mxxgw1xmvvz5qbh887ak38aqkf8cyzc10mi1"; depends=[]; }; +proxy = derive { name="proxy"; version="0.4-14"; sha256="1ijip1jmpm7dg11yv2rjcpkpg4p30m9acddbn49fbss9kcpl5b5i"; depends=[]; }; pryr = derive { name="pryr"; version="0.1"; sha256="1vp63v1l4myahmmbphc043x1kpmvvdhs6dr640dxi0napvkdqlq6"; depends=[stringr codetools Rcpp Rcpp]; }; psData = derive { name="psData"; version="0.1.2"; sha256="0w8kzivqrh1b6gq803rfd10drxdwgy0cxb5sff273m6jxzak52f2"; depends=[countrycode DataCombine foreign xlsx]; }; -psbcGroup = derive { name="psbcGroup"; version="1.0"; sha256="1l28sy0jys1g3nyfls9nl9vx9b6qh405a2nhx0qgxwb24l67x56n"; depends=[bayesm LearnBayes SuppDists mvtnorm]; }; -pscl = derive { name="pscl"; version="1.4.6"; sha256="13bdmnm4g36x32r0vzzcvlgks9yx44lphvm9k80m24l45mlh7sby"; depends=[MASS lattice]; }; +psbcGroup = derive { name="psbcGroup"; version="1.1"; sha256="17kpxddvy9m87i9r1hazc8g6mm35p1452ngz80byhgw9p0jkvn5p"; depends=[LearnBayes SuppDists mvtnorm]; }; +pscl = derive { name="pscl"; version="1.4.8"; sha256="1isgj3gsazpl2l69162n0xrgbsrsybwg18rz58amdq0h023c5dbz"; depends=[MASS lattice]; }; psd = derive { name="psd"; version="0.4-1"; sha256="1knfpgvmhrispfvlv94rnpbrjkyggqrmng65bjdjjigq83hhzywm"; depends=[fftw RColorBrewer signal zoo]; }; pse = derive { name="pse"; version="0.4.0"; sha256="1ln6b5ch99fmmcsfn8m8fl4ir7cadwq5ckggwizw9cbllw3drv0b"; depends=[Hmisc boot]; }; pseudo = derive { name="pseudo"; version="1.1"; sha256="0dcx6b892cic47rwzazsbnsicpgyrbdcndr3q5s6z0j1b41lzknd"; depends=[KMsurv geepack]; }; @@ -4942,7 +5042,7 @@ psytabs = derive { name="psytabs"; version="0.5"; sha256="0jcsv771ndf0fv76982rbv pt = derive { name="pt"; version="1.0"; sha256="0hjijfmc9dip3ys8xg44w0fwvyzyjyjl9hpwm7j2nzg3plv6i1fz"; depends=[]; }; ptinpoly = derive { name="ptinpoly"; version="2.4"; sha256="1jbj8z7lqg7w1mqdh230qjaydx2yb6ffgkc39k7dx8xl30g00i5b"; depends=[misc3d]; }; ptw = derive { name="ptw"; version="1.0-7"; sha256="195pa6hj3y9spyc7yxfgr8alkp48a7ccnyp64r6fyjwj6ds08b64"; depends=[]; }; -pubmed_mineR = derive { name="pubmed.mineR"; version="1.0.3"; sha256="08bhhylyh6smxq6zyn6fz4jb1r96vk9ag9jgvyndqyzx8rvyk24m"; depends=[RCurl XML NCBI2R boot R2HTML]; }; +pubmed_mineR = derive { name="pubmed.mineR"; version="1.0.3.1"; sha256="1q1y3sshv5c56qgbbrrlnb1nhg052n8g2vrx32vhg304rqircxkm"; depends=[RCurl XML boot R2HTML]; }; pumilioR = derive { name="pumilioR"; version="1.3"; sha256="1zmcdp978p73bh9fdshxlrzgfg18j007xgxgr439rq90bwiwva6j"; depends=[XML RCurl]; }; pushoverr = derive { name="pushoverr"; version="0.1.4"; sha256="1qa7cajgri3dwlvbpwn244m92n3q3apl4m5420mzsa9ngnmm8hj1"; depends=[httr]; }; pvar = derive { name="pvar"; version="2.2"; sha256="1f58czx14shd02ijyxhn46yrvfh44wrpifja8cjv522gbkrcr7yf"; depends=[Rcpp Rcpp]; }; @@ -4980,7 +5080,8 @@ qp = derive { name="qp"; version="0.3-2"; sha256="1964bj2ggmpaqz0rnmc2zx5hyrzawl qpcR = derive { name="qpcR"; version="1.4-0"; sha256="029qhncfiicb3picay5yd42g6qi0x981r6mgd67vdx71cac9fp59"; depends=[MASS minpack_lm rgl robustbase Matrix]; }; qqman = derive { name="qqman"; version="0.1.2"; sha256="024ln79hig5ggcyc3466r6y6zx2hwy2698x65cha5zpm51kq1abs"; depends=[]; }; qqtest = derive { name="qqtest"; version="1.0"; sha256="12hw4d2gddb4fgdi986pyqgvlpxgk5lngfp989hq2a830kyxz1ds"; depends=[MASS]; }; -qrLMM = derive { name="qrLMM"; version="1.0-9"; sha256="0dfxgasmz6c7z8px070d2r9j5rwjg1sxdymdj13g9d33xrlwic5j"; depends=[nlme matrixcalc mvtnorm ghyp quantreg psych]; }; +qrLMM = derive { name="qrLMM"; version="1.1"; sha256="1yg9ph6jy0sn4d82vn4v7yy3mqczbnzsq8qqp9dw38vh2456rmf2"; depends=[nlme matrixcalc mvtnorm ghyp quantreg psych]; }; +qrNLMM = derive { name="qrNLMM"; version="1.0"; sha256="0vlinc3bggapff29dyz14vn122gy6aq3rp38v2bpnxfkbpj10lvy"; depends=[matrixcalc mvtnorm ghyp quantreg psych ald]; }; qrfactor = derive { name="qrfactor"; version="1.4"; sha256="0f02lh8zrc36slwqy11x03yzfdy94p1lk5jar9h5cwa1dvi5k8gm"; depends=[mvoutlier mgraph pvclust cluster maptools]; }; qrnn = derive { name="qrnn"; version="1.1.2"; sha256="01wsz9qcdiayi7gsyy2y09jyyapanyhlc4pdyman2f7z5nl9yv9i"; depends=[]; }; qtbase = derive { name="qtbase"; version="1.0.4"; sha256="02yilvywkcqn3y9ayix18cgkwhi0gh69fl3fcw28fs2zxf1hqy75"; depends=[]; }; @@ -5000,6 +5101,7 @@ qualCI = derive { name="qualCI"; version="0.1"; sha256="09mzsy5ryyrn1gz9ahrh95cp qualV = derive { name="qualV"; version="0.3"; sha256="0cr3jlp0y83nk6i965bd6v86sl8pjx47z1y20lcygrf5cb6m4ifw"; depends=[KernSmooth]; }; qualityTools = derive { name="qualityTools"; version="1.54"; sha256="0ylp5a49b4q4max4yz30ia7r12s4jrvqn9zx5a21qcnpinf8b932"; depends=[]; }; quantchem = derive { name="quantchem"; version="0.13"; sha256="1ga5xa7lsk04flfp1syjzpnvj3i2ypzh1m49vq1xkdwpm6axdy8n"; depends=[MASS outliers]; }; +quantification = derive { name="quantification"; version="0.1.0"; sha256="0987389rr21fl3khgd3a1yq5821hljwm0xlyxgjy1km5hj81diap"; depends=[car]; }; quantmod = derive { name="quantmod"; version="0.4-3"; sha256="1x9h7ydifvs8mpcd4r83qz17pixxw1466262hh2j0xi259i1ds0k"; depends=[xts zoo TTR]; }; quantreg = derive { name="quantreg"; version="5.11"; sha256="0pyc1zknkjyvaix76bn84l90zavajsc7jx17x0zanllnh34siizp"; depends=[SparseM]; }; quantregForest = derive { name="quantregForest"; version="0.2-3"; sha256="06c73f66nnw3vd2dv8h5skzyxbr89i3pyprbb0if721h5d7pm0s7"; depends=[randomForest]; }; @@ -5009,7 +5111,7 @@ questionr = derive { name="questionr"; version="0.4.2"; sha256="04s9g1njfmsnay3s queueing = derive { name="queueing"; version="0.2.3"; sha256="1gcnd96vqygbhpa1mfls8adjdhkqy8c8427jf2qqq49s3vgzc08y"; depends=[]; }; quint = derive { name="quint"; version="1.0"; sha256="19dxrssy4dw7v3s4hhhy6yilbc7zb6pvcnh3mm1z6vv5a1wfr245"; depends=[partykit Formula rpart]; }; quipu = derive { name="quipu"; version="1.9.0"; sha256="1py1qpbwp2smr5di8b3zmzxxhchfmr5qfhqkdiqig28mcnqcmp5n"; depends=[agricolae stringr pixmap shiny xtable]; }; -qvcalc = derive { name="qvcalc"; version="0.8-8"; sha256="0xmbn6p7ryr43yf978pqpdnlxdq84v965hxbff8dviqhxwgqv4aq"; depends=[]; }; +qvcalc = derive { name="qvcalc"; version="0.8-9"; sha256="1ysbsm65n05vypvvpsbdfbrb60gij50vsmybzi4405g5z2ds1j72"; depends=[]; }; r2d2 = derive { name="r2d2"; version="1.0-0"; sha256="1zl0b36kx49ymfks8rm33hh0z460y3cz6189zqaf0kblg3a32nsi"; depends=[KernSmooth MASS sp]; }; r2dRue = derive { name="r2dRue"; version="1.0.4"; sha256="1apdq7zj5fhs349wm9g6y06nn33x24pg3gdp4z1frd18qlacf8z5"; depends=[rgdal sp matrixStats]; }; r2lh = derive { name="r2lh"; version="0.7"; sha256="1kkyjv9x2klrjnaaw4a16sxdfqmpp9s5mlclzlczlqjypbf2aa6d"; depends=[]; }; @@ -5038,8 +5140,10 @@ rJPSGCS = derive { name="rJPSGCS"; version="0.2-7"; sha256="1j8lc56q20b0qkl20r8m rJava = derive { name="rJava"; version="0.9-6"; sha256="008g6s6rcb5lnz5y2a2rs4iq85a4nl522g714s1w1r153qcc0jz0"; depends=[]; }; rJavax = derive { name="rJavax"; version="0.3"; sha256="0sv2fjinp4wmdfvcpgm4hv8v3fkiiv84ywqyr4hz86j50ncd79km"; depends=[rJava]; }; rJython = derive { name="rJython"; version="0.0-4"; sha256="13fpcw37cca738v9idqgi3gv9avfkfwfacxj54p2c4wyg46ghnah"; depends=[rJava rjson]; }; +rLTP = derive { name="rLTP"; version="0.1"; sha256="0dv8jj8rgcx4cbbs10sqdblcznxgm9ld5md922ghnka4ymar244m"; depends=[RCurl]; }; rLakeAnalyzer = derive { name="rLakeAnalyzer"; version="1.4"; sha256="1qs8f4sv044bxrf45wzfj444plkcq3i61353881x8shn13h3awas"; depends=[plyr]; }; rLindo = derive { name="rLindo"; version="8.0.1"; sha256="05qyc4wvpjgw8jxmwn2nwybi695fjn0cdilkprwmjg07c82f0q5n"; depends=[]; }; +rNMF = derive { name="rNMF"; version="0.5.0"; sha256="1nz6h0j5ywdh48m0swmhp34hbkycd7n13rclrxaw85qi9wc42597"; depends=[nnls knitr]; }; rNOMADS = derive { name="rNOMADS"; version="2.1.2"; sha256="1ww9jyzpk5r1glq407xz0ab80n0lj9gp4v4zfm2myfch3bjkcn9h"; depends=[rvest scrapeR stringr fields GEOmap MBA RCurl XML]; }; rPlant = derive { name="rPlant"; version="2.7"; sha256="0gqxb49d6qzkd533s9qp75byvz66v1csdlnmh3m2zg96aw32178r"; depends=[rjson RCurl seqinr knitcitations]; }; rPref = derive { name="rPref"; version="0.4"; sha256="0w1cfcqngyympp8xh72rc2w7njjf0y4bilvmfiamp90ykv1yd0vn"; depends=[Rcpp RcppParallel dplyr igraph Rcpp RcppParallel]; }; @@ -5059,7 +5163,7 @@ rags2ridges = derive { name="rags2ridges"; version="1.4"; sha256="1vwd39vp8xdrcz rainbow = derive { name="rainbow"; version="3.2"; sha256="043qbbyb1i7b8n3vspr6rdwlpqg3wdn31rsq3hmlahvwrfqma70n"; depends=[MASS pcaPP hdrcde cluster colorspace ks]; }; raincpc = derive { name="raincpc"; version="0.4"; sha256="0yzpyidvf24frf82pj7rarjh0ncm5dhm0mmpsf2ycqlvp0qld10i"; depends=[SDMTools]; }; rainfreq = derive { name="rainfreq"; version="0.3"; sha256="0985ck2bglg22gfj7m0hc7kpk0apljsbssf1ci99mgk47yi8fk9v"; depends=[RCurl SDMTools]; }; -ramps = derive { name="ramps"; version="0.6-12"; sha256="128lqfkgmcbcfvs210j14h54spqjcr4jdhk2rqgrwcjp5wjv209w"; depends=[coda maps Matrix nlme fields]; }; +ramps = derive { name="ramps"; version="0.6-13"; sha256="1y7jaajzbf6d9xwr0rg0qr43l8kncgwbpfy5rpka90g3244v8nwz"; depends=[coda maps Matrix nlme fields]; }; randaes = derive { name="randaes"; version="0.3"; sha256="14803argy0xdd8mpn4v67gbp90qi2is4x6na9zw7i9pm504xji1x"; depends=[]; }; random = derive { name="random"; version="0.2.3"; sha256="1ljz54i73bzxh69v7xjklajcl526pdapr0jgdwd6prfilafhf618"; depends=[curl]; }; random_polychor_pa = derive { name="random.polychor.pa"; version="1.1.4-1"; sha256="1051v7krrawdqnhz9q01rsknp2i7iv82d370q7m9i9d9i8wfnpk5"; depends=[psych nFactors boot MASS mvtnorm sfsmisc]; }; @@ -5067,10 +5171,11 @@ randomForest = derive { name="randomForest"; version="4.6-10"; sha256="0glj08w6s randomForestSRC = derive { name="randomForestSRC"; version="1.6.0"; sha256="1fd2hlihqkrx5cg91cfiibxw7h3gca5asf8a9nnm7ldafsamczy5"; depends=[]; }; randomGLM = derive { name="randomGLM"; version="1.02-1"; sha256="031338zxy6vqak8ibl2as0l37pa6qndln0g3i9gi4s6cvbdw3xrv"; depends=[MASS foreach doParallel]; }; randomLCA = derive { name="randomLCA"; version="1.0-2"; sha256="14v6jmsbyzmavxjdwh9nb0lljhc7kdly4p1v2a9jypjil6kk5ibc"; depends=[lattice boot fastGHQuad]; }; -randomNames = derive { name="randomNames"; version="0.0-6"; sha256="18fyxpqj6xv933nyv4s59wv7pgl4wra123qmf0fa68gk1zj9l153"; depends=[data_table]; }; -randomUniformForest = derive { name="randomUniformForest"; version="1.1.2"; sha256="16nrw4vican3clnbs4zn4n1zmnfx8mnx3lp70knj0fc1w0rfq2yw"; depends=[Rcpp doParallel iterators foreach ggplot2 pROC gtools cluster MASS Rcpp]; }; +randomNames = derive { name="randomNames"; version="0.0-8"; sha256="10fhqxnnw6gk5g8jnb83hh2nvvj65g8mwy7rfln8yzq93gjxnykm"; depends=[data_table]; }; +randomUniformForest = derive { name="randomUniformForest"; version="1.1.5"; sha256="1amr3m7h5xcb8gahrr58233chsnx1naf9x5vpjy9p5ivh71xcxf7"; depends=[Rcpp doParallel iterators foreach ggplot2 pROC gtools cluster MASS Rcpp]; }; randomizationInference = derive { name="randomizationInference"; version="1.0.3"; sha256="0x36r9bjmpx90fz47cha4hbas4b31mpnbd8ziw2wld4580jkd6mk"; depends=[permute matrixStats]; }; randomizeBE = derive { name="randomizeBE"; version="0.3-1"; sha256="06hj614wp9lb348qwyqgw5zk2vn0m81bkwz4jprgjd72kpy8kv1h"; depends=[]; }; +randomizr = derive { name="randomizr"; version="0.2.0"; sha256="040278biy0a3drcl5z79cd74psix1dnfg0a5gzv101jyhbnjp4ml"; depends=[]; }; randtests = derive { name="randtests"; version="1.0"; sha256="03z3kxl4x0l91dsv65ld9kgc58z82ld1f4lk18i18dpvwcgkqk82"; depends=[]; }; randtoolbox = derive { name="randtoolbox"; version="1.16"; sha256="03z4g2mmdywsgl95xbj80awirkgrghdk2kwhsh58p00aq4bpl5ff"; depends=[rngWELL]; }; rangeMapper = derive { name="rangeMapper"; version="0.2-8"; sha256="0bxb37gy98smypjj27r3dbd0vfyvaqw2p25qv07j3isykcn2pxpn"; depends=[RSQLite rgdal sp rgeos raster maptools lattice RColorBrewer classInt]; }; @@ -5081,7 +5186,7 @@ rapportools = derive { name="rapportools"; version="1.0"; sha256="1sgv4sc737i12a rareGE = derive { name="rareGE"; version="0.1"; sha256="0v3a2wns77q923ilddicqzg0108f8kmfdnsff1n65icin7cfzsny"; depends=[MASS nlme survey]; }; rareNMtests = derive { name="rareNMtests"; version="1.1"; sha256="13r2hipqsf8z9k48ha5bh53n3plw1whb7crpy8zqqkcac8444b2z"; depends=[vegan]; }; rasclass = derive { name="rasclass"; version="0.2.1"; sha256="04g2sirxrf16xjmyn4zcci757k7sgvsjbg0qjfr5phbr1rssy9qf"; depends=[car nnet RSNNS e1071 randomForest]; }; -raster = derive { name="raster"; version="2.3-12"; sha256="13h3glha5q1j3kvms0l8lbkm1vy49w675s83fxh0fyfh4rh0lrb7"; depends=[sp]; }; +raster = derive { name="raster"; version="2.3-24"; sha256="0397brw7fmfzc55p3v8isc22hksh2bzq64a2iwac52hf0bvl0fzn"; depends=[sp]; }; rasterVis = derive { name="rasterVis"; version="0.32"; sha256="040cg1v30ixkjkibqjpvz94wz486ffsrsnpfgzlp302xvvsmb3dk"; depends=[raster lattice latticeExtra hexbin sp zoo RColorBrewer]; }; rateratio_test = derive { name="rateratio.test"; version="1.0-2"; sha256="1a2v12z2dr893ha80fhada1820z5ih53w4pnsss9r9xw3hi0m6k5"; depends=[]; }; raters = derive { name="raters"; version="2.0.1"; sha256="16jnx6vv39k4niqkdlj4yhqx8qbrdi99bwzxjahsxr12ab5npbp1"; depends=[]; }; @@ -5103,7 +5208,7 @@ rcbalance = derive { name="rcbalance"; version="1.2"; sha256="0880bvzbnq9gak2n70 rcdd = derive { name="rcdd"; version="1.1-8"; sha256="09bb92rp44palx9dvc9pb0gdmb1g22289xjk8p9s918lalc6i9aw"; depends=[]; }; rcdk = derive { name="rcdk"; version="3.3.2"; sha256="02rlg3w8dbmag8b4z4wayh7xn61xc9g3647kxg91r0mvfhmrxl2h"; depends=[fingerprint rJava rcdklibs png iterators]; }; rcdklibs = derive { name="rcdklibs"; version="1.5.8.4"; sha256="0mzkr23f4d639vhxfdbg44hzxapmpqkhc084ikcj93gjwvdz903k"; depends=[rJava]; }; -rcicr = derive { name="rcicr"; version="0.2.6"; sha256="1dgk86cagga9ax0cabp6396iy03hysmjli20z5rq4f0r8kg172qk"; depends=[matlab aspace jpeg]; }; +rcicr = derive { name="rcicr"; version="0.3.0"; sha256="0fvv6diqg6sw3ar3gzvhl3mbm6zvx0k12lzsa92mccg0giqa9n0w"; depends=[matlab aspace jpeg]; }; rclinicaltrials = derive { name="rclinicaltrials"; version="1.4"; sha256="1jh4jn52hcwbycvwvfn7wb1h0r7makkli3hvxg17dbalrxky9xgq"; depends=[httr XML plyr]; }; rcppbugs = derive { name="rcppbugs"; version="0.1.4.1"; sha256="0wb5mzw1sdrr7lc6izilv60k5v0wcvy8q31a863b63a9jvh16g8d"; depends=[Rcpp Rcpp RcppArmadillo BH]; }; rcrossref = derive { name="rcrossref"; version="0.2.1"; sha256="19l3z2rfs1wj9z5myrskzbgsdpqya231wkiagvr6fynjdf2wcl9q"; depends=[jsonlite XML httr plyr bibtex dplyr]; }; @@ -5120,9 +5225,11 @@ readMzXmlData = derive { name="readMzXmlData"; version="2.8"; sha256="0x5h3dh6fk readODS = derive { name="readODS"; version="1.4"; sha256="00xcas8y0cq3scgi9vlfkrjalphmd7bsynlzpy7izxa5w9b7x79f"; depends=[XML]; }; readbitmap = derive { name="readbitmap"; version="0.1-4"; sha256="08fqqsdb2wsx415mnac9mzl5sr5and0zx72ablnlidqfxv8xsi9d"; depends=[bmp jpeg png]; }; reader = derive { name="reader"; version="1.0.4"; sha256="0hfv6x80c3jlhy5pspibbpfqqik0rly399qh4b1wn5da0vrbmvs3"; depends=[NCmisc]; }; +readstata13 = derive { name="readstata13"; version="0.5-3"; sha256="0mfl8w3rgpix02zjxik09l2fg33v066bm1i6l9dirjk65741fa48"; depends=[Rcpp Rcpp]; }; reams = derive { name="reams"; version="0.1"; sha256="07hqi0y59kv5lg0nl75xy8n48zw03y5m71zx58aiig94bf3yl95c"; depends=[leaps mgcv]; }; rebird = derive { name="rebird"; version="0.1.1"; sha256="0s8wmp2sghs56ppca57fjfab7wngszmy1g8rd3hiwx6br0sjidcg"; depends=[RJSONIO httr RCurl plyr]; }; -rebmix = derive { name="rebmix"; version="2.6.2"; sha256="1cib2xwxv2pzhhc1fw7dfnjmk7s8fvxpn7025fvisg0gx5533978"; depends=[]; }; +rebmix = derive { name="rebmix"; version="2.7.0"; sha256="180kvij3aaxvqcbidfjir9jvlhjib20nam5pvin9qn2prhdscjmk"; depends=[]; }; +rebus = derive { name="rebus"; version="0.0-5"; sha256="06rl6knnk93k537hhjx4r55hq6hssij7xc426ilki329vwfi5kyf"; depends=[]; }; recalls = derive { name="recalls"; version="0.1.0"; sha256="121r2lf32x4yq8zxx6pbnphs7ygn382ns85qxws6jnqzy52q41vh"; depends=[RCurl RJSONIO]; }; reccsim = derive { name="reccsim"; version="0.9-1"; sha256="17nsp91xq20vfwjfwav80qjs2wc7gwpmrdnwv7lc61baq0kkcs7k"; depends=[]; }; recluster = derive { name="recluster"; version="2.7"; sha256="0kgq3bm5zh4iskm4ydpnsxmy9vcgxjk9iz7d1f1didlvxg3piys7"; depends=[vegan ape picante phangorn phytools cluster]; }; @@ -5130,7 +5237,7 @@ recommenderlab = derive { name="recommenderlab"; version="0.1-5"; sha256="1hpgd2 recommenderlabBX = derive { name="recommenderlabBX"; version="0.1-0"; sha256="0dl79cxarsfp8l4nxnns05jwnjygigjhwpjrr4lzx4nvsfxmgsr2"; depends=[recommenderlab]; }; recommenderlabJester = derive { name="recommenderlabJester"; version="0.1-0"; sha256="1m5jg8gs16cwwwcnjzqkyzwyip8fshrwhmqz8g7nlf6g3p9347rl"; depends=[recommenderlab]; }; reconstructr = derive { name="reconstructr"; version="0.5"; sha256="0lffi30grk88na2jmkbhs62xf3d8mzrmjsiajrpp7dsaxa650bf0"; depends=[Rcpp Rcpp]; }; -recosystem = derive { name="recosystem"; version="0.2.4"; sha256="19d8c98wkzaxmzkg5z3ry6klcqgbcmb8ycwh52l9mvvy2k1ybkw6"; depends=[Rcpp Rcpp]; }; +recosystem = derive { name="recosystem"; version="0.2.5"; sha256="0i5rgkmjaz50qlyi85hmr61r0iir53prrphzvnjq5bjchb1k3m09"; depends=[Rcpp Rcpp]; }; redcapAPI = derive { name="redcapAPI"; version="1.2"; sha256="10d4pjcap1pcabzb2jjp0c9n0k8zpcz8cb0fmsqwfisjsyda7slk"; depends=[chron DBI Hmisc httr stringr]; }; ref = derive { name="ref"; version="0.99"; sha256="0f0yz08pqpg57mcm7rh4g0rbvlcvs5fbpjkfrq7fmj850z1ixvw0"; depends=[]; }; refGenome = derive { name="refGenome"; version="1.3.0"; sha256="121aw4w84hlhxgwlf1gh0w3ydvd8zsijrh0q7fzcwi1vdgnjb7lv"; depends=[doBy RSQLite DBI]; }; @@ -5150,21 +5257,22 @@ rehh = derive { name="rehh"; version="1.11"; sha256="1fvcwi9ijj886aswphblkxzgivm relSim = derive { name="relSim"; version="0.1-47"; sha256="13asl14f3547nl50jwrk72pbm2vx140k27gz3b38j28cpmvi03mz"; depends=[DNAtools]; }; rela = derive { name="rela"; version="4.1"; sha256="00ksm7zh1mpd2d5c5d823id3sxj0h3x0ccg6a40fadibvr1ay3ny"; depends=[]; }; relaimpo = derive { name="relaimpo"; version="2.2-2"; sha256="1rxjg2yw2gyshaij98w83cshxwscnq3ql7bg13n7v4nbjsi1l6zh"; depends=[MASS boot survey mitools corpcor]; }; -relations = derive { name="relations"; version="0.6-3"; sha256="1hw6g297h2az5f97q2rr3f6mb9d681wrgl9p8f2q1z3ww39b5vgw"; depends=[cluster slam sets]; }; +relations = derive { name="relations"; version="0.6-4"; sha256="02pzyygz4jnv91v90xkldplcwsbd4z5rbmyldlgjdlbpacs3chna"; depends=[cluster slam sets]; }; relax = derive { name="relax"; version="1.3.15"; sha256="0cgvxw3pmy9kx8p81bb5n5nnbn6l9hm07k6hdy7p2j2gl15xxnpq"; depends=[]; }; relaxnet = derive { name="relaxnet"; version="0.3-2"; sha256="1l83rk7r4vkcxbfljmibzm8lzpx0vf406hv4h5cy9x0k3rz2bfh0"; depends=[glmnet]; }; relaxo = derive { name="relaxo"; version="0.1-2"; sha256="1rzmq7q3j271s6qwwrmwidv0vxcjpgjhyiqgr6fkczkai2lbnd8x"; depends=[lars]; }; -reldist = derive { name="reldist"; version="1.6-3"; sha256="1qr2sbr0h7by6zllz23p3k136wk1i1lzn066hllw4cqhxfviaynm"; depends=[mgcv]; }; +reldist = derive { name="reldist"; version="1.6-4"; sha256="0v86wws29zy67jidrvfxkfwhpxppqrpq5h3b22cjif5qjqz3kk8f"; depends=[mgcv]; }; relevent = derive { name="relevent"; version="1.0-3"; sha256="054x4kmc0h0s6a4svjqawy52sllzmaca46q6abnr5qhdzzmfh21n"; depends=[trust sna]; }; reliaR = derive { name="reliaR"; version="0.01"; sha256="000nafjp386nzd0n57hshmjzippiha6s6c4nfrcwl059dzmi088i"; depends=[]; }; -relimp = derive { name="relimp"; version="1.0-3"; sha256="1isn2ns3qiz985wrg7992dmmqxwdq75a9yhfqnb64xhnzzpcpszq"; depends=[]; }; +relimp = derive { name="relimp"; version="1.0-4"; sha256="1i9j218b6lh6ag4a8x4vwhmqqclbzx46mpwd36s8hdqayzs6lmad"; depends=[]; }; relsurv = derive { name="relsurv"; version="2.0-4"; sha256="1da3sj7hks5azm18m23fh8r2g02p0nivgilayndxwwvd1i70ycrx"; depends=[survival date MASS]; }; +remMap = derive { name="remMap"; version="0.2-0"; sha256="1k2niiaq2lr4inrx443clff9cqqvyiiwd45k7yqjd8ixnbaa3mrk"; depends=[]; }; remix = derive { name="remix"; version="2.1"; sha256="0s1gaf7vj08xd4m7lc9qpwvk0mpamabbxk71970mfazx6hk24dr0"; depends=[plyr survival Hmisc ascii]; }; remote = derive { name="remote"; version="0.3.0"; sha256="1f41j26grkv4830bvi6z16b63yksplrq3yg1amd4l634lwhp6x55"; depends=[Rcpp raster foreach Rcpp]; }; -rentrez = derive { name="rentrez"; version="0.3.1"; sha256="1awamp0730wzpxzbdr9rhy4xb06b25xrmk2pj3h6kj75k4k7h5vs"; depends=[XML httr]; }; +rentrez = derive { name="rentrez"; version="0.4"; sha256="14v53b6z86isylc3fv5b23sl1lhn4rrmd8l4nfpjin1szzdzdx58"; depends=[XML httr jsonlite]; }; repfdr = derive { name="repfdr"; version="1.1"; sha256="1k85y27k42kw5zmbrnnqb62x3djjzdm4zrvm2g4dl8ykdlnaikv9"; depends=[]; }; -replicationInterval = derive { name="replicationInterval"; version="0.2"; sha256="1hs5alhpdnhwn86wrlqhbf1cpy96hh6rffkmcpbxxpcv3fhzgz7b"; depends=[MBESS]; }; -repmis = derive { name="repmis"; version="0.3.3"; sha256="1jyrablh5wkj43dgkq61f5jz2vh4riwdcbd33j1kjamyca92kvyh"; depends=[digest httr plyr R_cache xlsx]; }; +replicationInterval = derive { name="replicationInterval"; version="0.3"; sha256="1zqs114514xj59dlkhw5kmq73grghmb3i5rnnq05qzgf5wjn581i"; depends=[MBESS]; }; +repmis = derive { name="repmis"; version="0.4"; sha256="0m54pif9sj1lf23wbykxlsab3q1b90bwz8cwkh2ibic6gyh5h4dg"; depends=[data_table digest httr plyr R_cache xlsx]; }; repolr = derive { name="repolr"; version="2.0"; sha256="10wg07sfxcxzswf3zh5sx2cm9dxjx11zymy82a4q9awnacb5gp9b"; depends=[gee]; }; reportRx = derive { name="reportRx"; version="1.0"; sha256="0npiflql0lq8sqp6xgydxbw7xdr0zdxj1s2h4bnpmn4clc05r7m4"; depends=[reshape survival xtable aod cmprsk geoR stringr]; }; reportr = derive { name="reportr"; version="1.1.2"; sha256="0lxnmay9vgg7dsa3scszx3v4lb6m3bv6kjl0dk7hrl7bd67azdrk"; depends=[]; }; @@ -5172,6 +5280,7 @@ reports = derive { name="reports"; version="0.1.4"; sha256="0r74fjmdqax2x5fhbkdx reporttools = derive { name="reporttools"; version="1.1.1"; sha256="0cnxzq679f860z063j3pbm2c5qcaz45g73khj9rdp3if0cci8ikj"; depends=[xtable]; }; repra = derive { name="repra"; version="0.4.2"; sha256="1djcs83z8ckpmsbyzscnysmy45z28kswzm852176b9pip21mb1w8"; depends=[data_table dplyr Rcpp reshape2 ggplot2 assertthat Rcpp]; }; represent = derive { name="represent"; version="1.0"; sha256="0jvb40i6r1bh9ysfqwsj7s1g933d7z5fq9d618yjrqr6hbbqsvac"; depends=[]; }; +reproducer = derive { name="reproducer"; version="0.1.2"; sha256="067yj1dhhikjrnkklsfp6p03gp4lqxwfdwhl6z8djj4rkzi48xm5"; depends=[openxlsx ggplot2 gridExtra]; }; resample = derive { name="resample"; version="0.2"; sha256="1p6hyd0wi037bsz0xd9gkw28sp4nkj1zmqs9h0lzkxbspn6h0q7j"; depends=[]; }; resemble = derive { name="resemble"; version="1.1.1"; sha256="0mz5mxm6p1drfx2s9dx35m2bnvirr8lkjjh5b4vdk9p2cdv1qkkv"; depends=[RcppArmadillo foreach iterators pls Rcpp Rcpp RcppArmadillo]; }; reshape = derive { name="reshape"; version="0.8.5"; sha256="08jm9fb02g1fp9vmiqmc0yki6n3rnnp2ph1rk8n9lb5c1s390f4k"; depends=[plyr]; }; @@ -5180,7 +5289,7 @@ reshapeGUI = derive { name="reshapeGUI"; version="0.1.0"; sha256="0kb57isws8gw0n restlos = derive { name="restlos"; version="0.1-3"; sha256="03bsakp9kd8i468wz7xhdjqb6ck6p9wci3gk2b2bykv73c0g6n95"; depends=[som rgl geometry igraph]; }; restorepoint = derive { name="restorepoint"; version="0.1.5"; sha256="0xmpxprirnd1yavwk3vkc0cp715d187mn0amppya7kd47iw10wsy"; depends=[]; }; retimes = derive { name="retimes"; version="0.1-2"; sha256="019sllyfahlqnqry2gqw4w5cy4cavrqnwpwrbb25cgjpdb19raja"; depends=[]; }; -retistruct = derive { name="retistruct"; version="0.5.9"; sha256="0m8dk9fcvj6idd17gswv65shz3sjm4xw4n023gb97ccgvvf1la65"; depends=[foreign RImageJROI png ttutils sp geometry RTriangle rgl R_matlab]; }; +retistruct = derive { name="retistruct"; version="0.5.10"; sha256="1wg2a906y09hcqba42hh9r2x59w35dms2aa5mw44avigc1nwm0s2"; depends=[foreign RImageJROI png ttutils sp geometry RTriangle rgl R_matlab]; }; reutils = derive { name="reutils"; version="0.1.2"; sha256="0f2c6zxk6x2plq649b1ml6b112j6y8ys074pn30yw35ncg3h86fa"; depends=[assertthat RCurl XML]; }; revealedPrefs = derive { name="revealedPrefs"; version="0.2"; sha256="1f871y4wkjznzgwxfbnmrfiafq43cyf0i5hjy68ybxc7bbvfryxc"; depends=[Rcpp Rcpp RcppArmadillo]; }; reweight = derive { name="reweight"; version="1.2.1"; sha256="0fv7q1zb3f4vplg3b5ykb1ydwbzmiajgd1ihrxl732ll8rkkfa4v"; depends=[]; }; @@ -5191,7 +5300,7 @@ rfUtilities = derive { name="rfUtilities"; version="1.0"; sha256="020wwrbpfzi7pl rfigshare = derive { name="rfigshare"; version="0.3.6"; sha256="1n6i5ppn3v93126gvva8sn85v1h4f7hgc43pxja9bwr1ypmzgr45"; depends=[RJSONIO httr httpuv plyr yaml ggplot2 XML]; }; rfishbase = derive { name="rfishbase"; version="0.2-2"; sha256="09pa5zpw9rclf5pqj1wjjhdcblca9sm9xcs9ka3xfa7azj7n9ljd"; depends=[XML RCurl]; }; rfisheries = derive { name="rfisheries"; version="0.1"; sha256="1g0h3icj7cikfkh76yff84hil23rfshlnnqmgvnfbhykyr2zmk61"; depends=[httr data_table assertthat ggplot2 rjson]; }; -rfoaas = derive { name="rfoaas"; version="0.1.1"; sha256="17rp14s6gclk48cv47i3k4xgl5wjydx9z9apw1xmmsw5hvyzsz0p"; depends=[httr]; }; +rfoaas = derive { name="rfoaas"; version="0.1.3"; sha256="0wdb645fx2wsy4vwz43d8ynwx3divpjwbkql52zkikyr8zv21gz5"; depends=[httr]; }; rfordummies = derive { name="rfordummies"; version="0.0-2"; sha256="01wbhn8wpwkwvkafx4m8l5zj2xjbvwjlzbnwkd4i7g2nrvw29wsx"; depends=[]; }; rforensicbatwing = derive { name="rforensicbatwing"; version="1.3"; sha256="0ff4v7px4wm5rd4f4z8s4arh48hgayqjfpnni2997c92wlsq3d12"; depends=[Rcpp Rcpp]; }; rgabriel = derive { name="rgabriel"; version="0.7"; sha256="1c6awfppm1gqg7rm3551k6wyhqvjpyidqikjisg2p2kkhmyfkyzx"; depends=[]; }; @@ -5204,6 +5313,7 @@ rgenoud = derive { name="rgenoud"; version="5.7-12"; sha256="17gzkn4laylnksy8h2w rgeos = derive { name="rgeos"; version="0.3-8"; sha256="0snbfxzh700fn415li0wia94zgb0x73vwdrbrpimvz9k3y43yvp8"; depends=[sp sp]; }; rggobi = derive { name="rggobi"; version="2.1.20"; sha256="1a7l68h3m9cq14k7y96ijgh0iz3d6j4j2anxg50pykz20lnykr9g"; depends=[RGtk2]; }; rgl = derive { name="rgl"; version="0.95.1201"; sha256="0vd2zww17p2lcdipv7ijclbisy6ms6d1a4qnwpj1y1kbkhcplw1j"; depends=[]; }; +rglobi = derive { name="rglobi"; version="0.2.4"; sha256="1rz2dn0llx8jjd1ah9ajw9hv63rjbvkhihp81af48s4kr2g8bmim"; depends=[rjson RCurl]; }; rgp = derive { name="rgp"; version="0.4-1"; sha256="1p5qa46v0sli7ccyp39iysn04yvq80dy2w1hk4c80pfwrxc6n03g"; depends=[emoa]; }; rgpui = derive { name="rgpui"; version="0.1-2"; sha256="0sh5wj4f2wj6g3r7xaq95q89n0qjavchi5kfi6sj1j34ykybbs3g"; depends=[rgp shiny emoa]; }; rgr = derive { name="rgr"; version="1.1.10"; sha256="1gmr4px70dwz45zb4w1vqddqpw1idln2rids9cdh2fxppdf9m9x8"; depends=[MASS fastICA]; }; @@ -5234,10 +5344,11 @@ rjstat = derive { name="rjstat"; version="0.2"; sha256="1ylwp6d3cc8xb8129yr49grx rkt = derive { name="rkt"; version="1.3"; sha256="0d82id22xac84l5iqls0mlg1g9yn4hhkmf4ln7xlp0zinmmhym9m"; depends=[]; }; rkvo = derive { name="rkvo"; version="0.1"; sha256="0ci8jqf9nc8hb063nckxdnp0nlyr4ghby356lxm00anw44jlmw8v"; depends=[Rcpp Rcpp]; }; rlecuyer = derive { name="rlecuyer"; version="0.3-3"; sha256="1n0vny3k5s5152y0ggz9vfn4bqay9ncbdzkw9g4703pszrbwq7xh"; depends=[]; }; -rlist = derive { name="rlist"; version="0.3-2"; sha256="11br13s7frwz9ix7lgb4qpgcnvbqrzx0l0mx5kdg4pbvlbhjd4ij"; depends=[stringdist data_table yaml jsonlite]; }; +rlist = derive { name="rlist"; version="0.4"; sha256="00h00jka64m7skrjp1454805fhr3q1k9sqih4pnvbb0maxlzgn7g"; depends=[yaml jsonlite]; }; +rlm = derive { name="rlm"; version="1.0"; sha256="0dcbrdk4yjcv96rjnqc8sq821kwk7bsg66pn2hsblcpb14l23hhf"; depends=[]; }; rlme = derive { name="rlme"; version="0.4"; sha256="02683sklihj3726a90jryybf855rvbz9v3dm9z9yhb32q9bfmy34"; depends=[MASS quantreg nlme mgcv stringr magic robustbase Rcpp Rcpp]; }; rmaf = derive { name="rmaf"; version="2.0"; sha256="00qhdfzbjvmz83nicl73yhx7w8sv6j7x928j4vd6ll79098x4y84"; depends=[]; }; -rmarkdown = derive { name="rmarkdown"; version="0.4.2"; sha256="1spmzlc3q997xyyikzl9kr853q2nrr6vzrxh9bjmswv7qzbc3izz"; depends=[knitr yaml htmltools caTools]; }; +rmarkdown = derive { name="rmarkdown"; version="0.5.1"; sha256="08v16n4a9rdr0fh54hlmfxifbpl40nfr24g3wrjxxacml16smcsd"; depends=[knitr yaml htmltools caTools]; }; rmatio = derive { name="rmatio"; version="0.11.0"; sha256="0cmlh16nf3r94gpczq0j46g4dgjy9q1c647rqd9i14hvfrpxzcfa"; depends=[Matrix lattice]; }; rmeta = derive { name="rmeta"; version="2.16"; sha256="1s3n185kk0ddv8v6c7mbc7cpj6yg532r7is6pjf9vda7317rxywy"; depends=[]; }; rmetasim = derive { name="rmetasim"; version="2.0.4"; sha256="1a3bhiybzdvgqnnyh3d31d6vdsp4mi33sv8ks9b9xd9r369npk86"; depends=[ape ade4 gtools]; }; @@ -5246,11 +5357,11 @@ rminer = derive { name="rminer"; version="1.4"; sha256="07s971fpl16l4ryrbb24zwy1 rmngb = derive { name="rmngb"; version="0.6-1"; sha256="1wyq8jvzqpy1s6w0j77ngh5x2q7mpj0ib01m8mla20w6yr6xbqjk"; depends=[Hmisc]; }; rmongodb = derive { name="rmongodb"; version="1.8.0"; sha256="035a76ak6wi21hdvgzzbggz0qnb53rrr2wfx97ngc8ijwhw8hjh7"; depends=[jsonlite plyr]; }; rmp = derive { name="rmp"; version="1.0"; sha256="1g0785fwjbwbj82sir3n7sg3idsjzdhrpxc7z88339cv9g4rl7ry"; depends=[]; }; -rms = derive { name="rms"; version="4.2-1"; sha256="078i2x88r8p81mz83l0nwkhh7v0zv6229rff6lgkdv4x6qbn11x0"; depends=[Hmisc survival lattice SparseM quantreg nlme rpart polspline multcomp]; }; +rms = derive { name="rms"; version="4.3-0"; sha256="135mrl7jv310l8w1nxaa5rsvib7j27sbdxz0bi1xxi5zywb8cmf4"; depends=[Hmisc survival lattice ggplot2 gridExtra SparseM quantreg nlme rpart polspline multcomp]; }; rms_gof = derive { name="rms.gof"; version="1.0"; sha256="1n0h3nrp11f2x70mfjxpk2f3g4vwjaf4476pjjwy49smxxlxwz82"; depends=[]; }; rnaseqWrapper = derive { name="rnaseqWrapper"; version="1.0-1"; sha256="1fa3hmwrpccf09dlpginl31lcxpj5ypxspa0mlraynlfl5jrivch"; depends=[ecodist gplots gtools]; }; rnbn = derive { name="rnbn"; version="1.0.3"; sha256="05amrx12b7p4pca1wbysn1n2rxbg5r54mpmga4i3xlpijx9baj80"; depends=[httr]; }; -rncl = derive { name="rncl"; version="0.2.0"; sha256="0z4sv5gmvklds8ml9gay4kqpg8c2a2rwlqvb9fzn0xb5vby6q31d"; depends=[Rcpp ape Rcpp]; }; +rncl = derive { name="rncl"; version="0.2.2"; sha256="1l9g7mylj4ip15x4985i27n42fhi9vyi1ii23dc9k27s84b274y7"; depends=[Rcpp ape Rcpp]; }; rneos = derive { name="rneos"; version="0.2-8"; sha256="0cg88l1irqkx7d72sa5bfqcn5fb5rapvimi1gw15klci39w0s43q"; depends=[RCurl XML]; }; rngSetSeed = derive { name="rngSetSeed"; version="0.3-2"; sha256="00mqjjkhbnvxqkf1kz16gipsf98q62vmhx9v8140qs7c4ljbhc3a"; depends=[]; }; rngWELL = derive { name="rngWELL"; version="0.10-3"; sha256="1wijscc0s6h1ipc1r8h179y94s1bzf409xlpiyr1njaxvvvpwvw1"; depends=[]; }; @@ -5271,11 +5382,11 @@ robustbase = derive { name="robustbase"; version="0.92-3"; sha256="0b7rld5pa9nrn robustfa = derive { name="robustfa"; version="1.0-5"; sha256="04nk5ipml54snsmiqf5sbhx490i46gnhs7yibf4wscrsj1bh2mqy"; depends=[rrcov]; }; robustgam = derive { name="robustgam"; version="0.1.7"; sha256="0s1z7jylj757g91najbyi1aiqnssd207jfm9yhias746540qp3kw"; depends=[Rcpp RcppArmadillo mgcv robustbase Rcpp RcppArmadillo]; }; robustlmm = derive { name="robustlmm"; version="1.6"; sha256="18lhbnmcd6nc0qr23a19mhw9k9r30li6z92g600dil6ll8s5m54z"; depends=[lme4 Matrix ggplot2 lattice nlme robustbase xtable]; }; -robustloggamma = derive { name="robustloggamma"; version="0.4-28"; sha256="0wwa7i2qw0fd5fiy45h7qiw7526zyyxx379ll4ha2n593dwhybx3"; depends=[robustbase]; }; +robustloggamma = derive { name="robustloggamma"; version="0.4-31"; sha256="19ycdvpzns46gjnkddwznnszs0941blpss7l0cqligv91cz7bkjc"; depends=[robustbase]; }; robustreg = derive { name="robustreg"; version="0.1-7"; sha256="1nrz10065mwccil78c74vmkhinskpnk1vyp1ikrdw23vyk2l00nc"; depends=[Rcpp Matrix Rcpp RcppArmadillo]; }; robustvarComp = derive { name="robustvarComp"; version="0.1-2"; sha256="187mcpih509hx15wjjr7z2h6h76mz2v0d8xgsxjd8wz7l3dnlp2f"; depends=[robustbase GSE numDeriv robust plyr]; }; rocc = derive { name="rocc"; version="1.2"; sha256="00yxbbphhwkg4sj2h7pd9vw86yavl711nk8yylwmjd3qv39qjml0"; depends=[ROCR]; }; -rockchalk = derive { name="rockchalk"; version="1.8.86"; sha256="0rdp9dmgz2wjac1ahvivpb8fzjamr8v1vszgsjpfiyc9l90zv4bk"; depends=[lme4 car MASS]; }; +rockchalk = derive { name="rockchalk"; version="1.8.92"; sha256="1mi1w8323m4q0s17cnafnlswgnlxqb5c9nq3rv8fq77k7klmq5rz"; depends=[lme4 car MASS tables]; }; rococo = derive { name="rococo"; version="1.1.2"; sha256="08204y3g3xd2srpcpnbkq1laqfr3wrhy73whlxf83gffw8j0iyv8"; depends=[Rcpp Rcpp]; }; rodd = derive { name="rodd"; version="0.1-1"; sha256="0x7w7v04nqb1gl4h32a674gwc68h6p9pff2piisyd74cgx90sm1b"; depends=[numDeriv quadprog Matrix rootSolve matrixcalc]; }; rootSolve = derive { name="rootSolve"; version="1.6.5.1"; sha256="02ydj4ydgljs80nrrrxb4dhfa7m12rw65xy79d7g71w97326w8p2"; depends=[]; }; @@ -5283,20 +5394,21 @@ ropensecretsapi = derive { name="ropensecretsapi"; version="1.0.1"; sha256="0d4y ror = derive { name="ror"; version="1.2"; sha256="0n8mk35rm3rp0c7a3i961kij21a177znh9hkq4snqqlw9vf50hdg"; depends=[rJava ROI ROI_plugin_glpk igraph]; }; rorutadis = derive { name="rorutadis"; version="0.1.3"; sha256="0ik0dpmsyb4g9wl1fb7mm0dry9s26nfvv1v91cslss82phhf16wd"; depends=[Rglpk ggplot2 gridExtra]; }; rotations = derive { name="rotations"; version="1.3"; sha256="01qqiqlp370llk8w9g0nip08cd54rj9dsvf0qxznalyb7vpnvgxf"; depends=[ggplot2 Rcpp rgl sphereplot Rcpp RcppArmadillo]; }; +roughrf = derive { name="roughrf"; version="1.0"; sha256="0nwdynqfb9yzjvi1lykgdkch3b4g09aj8vbd6sf5pyx473s066y4"; depends=[randomForest mice nnet]; }; rowr = derive { name="rowr"; version="1.1.1"; sha256="1bpx9vd6i2ljwww3gp4c1fxbv9lsdxh3jdwkmrqqj2s18bkf0a7a"; depends=[]; }; roxygen2 = derive { name="roxygen2"; version="4.1.0"; sha256="0jpaqrnkb6qfs6jly637j8sbng6r1gzw15phwkifsh0fgqbi61ap"; depends=[stringr brew digest Rcpp Rcpp]; }; -royston = derive { name="royston"; version="1.1"; sha256="19sfjb8z1h0k28rh65xiaf5w5dsmlvxcxmlnnahh1rc2xxhpcfhg"; depends=[nortest moments]; }; +royston = derive { name="royston"; version="1.2"; sha256="1rywc89qzx0hldbq10201bjdhz60pq2gmgd9b9j52mza3w4canjz"; depends=[nortest moments]; }; rpanel = derive { name="rpanel"; version="1.1-3"; sha256="1wm0dcbyvxz4ily8skz2yda44n74x2nmc4pg11ja0yvk038gjfns"; depends=[]; }; -rpart = derive { name="rpart"; version="4.1-8"; sha256="1vhmwvb7hsh75lvmsjmkab2zl136irca1dhr6p57s1yhmpw4cys0"; depends=[]; }; -rpart_plot = derive { name="rpart.plot"; version="1.5.1"; sha256="1qzps1h53i81dwsj384npya23wmns95iwdhanlvqd8rkcsswkddn"; depends=[rpart]; }; +rpart = derive { name="rpart"; version="4.1-9"; sha256="11v8hrk8pz66naadsa1sk7bwij30rzm3m315y3q9i6gl4rlr8qca"; depends=[]; }; +rpart_plot = derive { name="rpart.plot"; version="1.5.2"; sha256="0aw0bhd0bliih7fsvnfkdkxq65v3v3fl88irp8vxrdblqgjyc09x"; depends=[rpart]; }; rpart_utils = derive { name="rpart.utils"; version="0.5"; sha256="00ahvmly6cdf7qhhcic0dbjlljqq8kbhx15rc7vrkd3hzd55c0im"; depends=[rpart]; }; rpartScore = derive { name="rpartScore"; version="1.0-1"; sha256="15zamlzbf6avir8zfw88531zg5c0a6sc5r9v5cy9h08ypf34xf4y"; depends=[rpart]; }; rpartitions = derive { name="rpartitions"; version="0.1"; sha256="1gklsi4pqhk16xp9s49n1lr9ldm1vx61pvphjqsqkzrlxwcpx3j8"; depends=[hash]; }; rpf = derive { name="rpf"; version="0.44"; sha256="1q68lb7cw4p31mrjwxyn2bkpclmgfcnln8z0brs9pkkh70j0vii8"; depends=[mvtnorm RcppEigen]; }; rpg = derive { name="rpg"; version="1.2"; sha256="13vvym3xf70fmm57nl56dc5wvvv9va9id2agxlzxd9yrhlxbcnhm"; depends=[Rcpp uuid RApiSerialize Rcpp RApiSerialize]; }; rphast = derive { name="rphast"; version="1.6"; sha256="0ni8969bj3pv0wl8l0v352pqw2d5mlshsdw1rb6wlxk7qzfi5cl2"; depends=[]; }; -rplexos = derive { name="rplexos"; version="0.11"; sha256="07yxb274jszac5qxn1dhqrrqprrfw3w415bb0pwsgphdandf25x7"; depends=[dplyr RSQLite Rcpp DBI data_table lubridate reshape2 stringi assertthat Rcpp]; }; -rplos = derive { name="rplos"; version="0.4.1"; sha256="1v757v0b09mggdrgfzqmhvmf7yhqm3k42ml8sg8v4j74lscy653l"; depends=[ggplot2 RCurl RJSONIO XML plyr stringr googleVis httr lubridate reshape2 data_table whisker solr assertthat]; }; +rplexos = derive { name="rplexos"; version="0.12.1"; sha256="13n5xysa1pi5pcbq80w268ybqc414i56d4hpln0yl6zva6dgpsqd"; depends=[dplyr RSQLite Rcpp DBI data_table lubridate reshape2 stringi assertthat Rcpp]; }; +rplos = derive { name="rplos"; version="0.4.6"; sha256="01vfb07fc5z0pm6d5wvcpfwjx5fha9par3fpra9v6snaqm74l3w5"; depends=[ggplot2 httr jsonlite XML dplyr plyr lubridate reshape2 whisker solr]; }; rplotengine = derive { name="rplotengine"; version="1.0-5"; sha256="1wwpfnr5vi8z26alm8y5gply0y4iniagimldzy2z696djzz8p8p8"; depends=[xtable]; }; rportfolios = derive { name="rportfolios"; version="1.0"; sha256="1zcv5ddmk15l0p03nlffimlhhpcc7l1c05xl2d1xlfk58rkvqns6"; depends=[]; }; rprintf = derive { name="rprintf"; version="0.1-2"; sha256="1jsn6i3ikcdbrg8g89hmb1ky3a84fykx5gpnbswplhidh2qhb9jz"; depends=[stringr]; }; @@ -5304,6 +5416,7 @@ rpsychi = derive { name="rpsychi"; version="0.8"; sha256="1h40kbqvvwwjkz5hrclj6j rpubchem = derive { name="rpubchem"; version="1.5.0.2"; sha256="0lvi7m8jb2izsfia3c0qigsd1k1x9r02gymlwfg29pb8k10lwcjf"; depends=[XML car RCurl RJSONIO]; }; rpud = derive { name="rpud"; version="0.0.2"; sha256="03xddc6kh39wlcv8dvpnv4h0f5qx5cv327xip26zk7gg7pgrn05x"; depends=[]; }; rqPen = derive { name="rqPen"; version="1.0"; sha256="1vd2kjbqb5jqvbciagw03fp28ljswifznkdqj34q753kzvryblri"; depends=[quantreg]; }; +rr = derive { name="rr"; version="1.0"; sha256="18h35whflnqzr7fkaqlwq73w9s1vbpk8nm5i5ww4wgz20wxm8l87"; depends=[MASS arm coda]; }; rrBLUP = derive { name="rrBLUP"; version="4.3"; sha256="0wydh4sx7b6rcrgb3qvqh0z46pixx63711q2nf8s3c32090a5g81"; depends=[]; }; rrBlupMethod6 = derive { name="rrBlupMethod6"; version="1.3"; sha256="1qwv954mhry46ff2ax48xcmnasygi5alv8d413g3qbk2da6i0d8l"; depends=[]; }; rrcov = derive { name="rrcov"; version="1.3-8"; sha256="0f71khnsvd95yh6y1hnl62vqjp1z3wg74g8jvg2q28v1ysk68p1b"; depends=[robustbase mvtnorm lattice cluster pcaPP]; }; @@ -5314,9 +5427,10 @@ rriskDistributions = derive { name="rriskDistributions"; version="2.0"; sha256=" rrlda = derive { name="rrlda"; version="1.1"; sha256="06n9jah190cz25n93jlb5zb0xrx91bjvxgswwdx9hdf0fmwrpkvz"; depends=[pcaPP mvoutlier glasso matrixcalc]; }; rrules = derive { name="rrules"; version="0.1-0"; sha256="0f9msp289akzricjrm8dvfbh2dihfbszr7ms4fld1cr30zssajin"; depends=[]; }; rsae = derive { name="rsae"; version="0.1-5"; sha256="1f3ry3jwa6vg2vq2npx2pzzvfwadz8m48hjrqjk860nfjrymwgx5"; depends=[]; }; +rsatscan = derive { name="rsatscan"; version="0.3.9122"; sha256="100098c5v8s3xcwvgx63fqi1ngyq5hc7l4wwklhw5zm7h30fcr7z"; depends=[foreign]; }; rscproxy = derive { name="rscproxy"; version="2.0-5"; sha256="1bjdv7drlnffcnyc0j8r22j7v60k1xj58bw8nk9l8wvnmngrjz86"; depends=[]; }; rsdepth = derive { name="rsdepth"; version="0.1-5"; sha256="064jbb6gnx0sm41w3sbi6mvsbzsfkjqfici6frk8sfm9ybvm591j"; depends=[]; }; -rsdmx = derive { name="rsdmx"; version="0.4-4"; sha256="1y72j4h2rx2mwzwmwsrv317cdiqpfn4qwsind3lsgd73w20wyi0d"; depends=[XML RCurl plyr]; }; +rsdmx = derive { name="rsdmx"; version="0.4-5"; sha256="12rk0bcfsnkd2447jyc40857ksm7gbg4nn3slls9wsd641am6kxi"; depends=[XML RCurl plyr]; }; rseedcalc = derive { name="rseedcalc"; version="1.2"; sha256="1di9bzwxyxm9gs14ks9z6sixi656hz9xwmq3aaqh53cjjr1ka0rc"; depends=[]; }; rsem = derive { name="rsem"; version="0.4.5"; sha256="02vccj03bxisi2jwl31rwi4gw9i26g70aagdgg5gk8z0bys78v4d"; depends=[MASS lavaan]; }; rsgcc = derive { name="rsgcc"; version="1.0.6"; sha256="12f8xsg6abmhdgkrrc8sfzmv4i1pycq1g0jfad664d17yciw7rhh"; depends=[biwt cairoDevice fBasics gplots gWidgets gWidgetsRGtk2 minerva parmigene stringr snowfall]; }; @@ -5337,7 +5451,7 @@ rtape = derive { name="rtape"; version="2.2"; sha256="0q7rs7pc1k1kayr734lvh367j5 rtdists = derive { name="rtdists"; version="0.2-6"; sha256="1f2yv4qq27i1fc0ys3kk31lsnbdzrmrk44widnxd19hxn4r05cs6"; depends=[evd msm gsl]; }; rtematres = derive { name="rtematres"; version="0.2"; sha256="1d0vrprvnlk4hl2dbc6px9xn9kx9d1qvlqxd798hzda6qg5wwvf2"; depends=[XML RCurl plyr gdata]; }; rtf = derive { name="rtf"; version="0.4-11"; sha256="04z0s5l9qjlbqahmqdaqv7mkqavsz4yz25swahh99xfwp9plknfl"; depends=[R_oo R_methodsS3]; }; -rtfbs = derive { name="rtfbs"; version="0.3.3"; sha256="0cias6w0cypzh26y3zgkwanccxi77d12i8a21f8mbrldskiakfp2"; depends=[rphast]; }; +rtfbs = derive { name="rtfbs"; version="0.3.4"; sha256="1z5rhxgi44xdv07g3l18ricxdmp1p59jl8fxawrh5jr83qpcxsks"; depends=[rphast]; }; rtiff = derive { name="rtiff"; version="1.4.4"; sha256="13cz35dfz735yk2lci8cmjmsg4ddm31lv98lpx8ymy3bwmzdmc3c"; depends=[pixmap]; }; rtkpp = derive { name="rtkpp"; version="0.8.4"; sha256="0v1n16hi1zvbdn6p737ryw8baflyw7aqjpnnzqr7rgwc518zhd1f"; depends=[Rcpp Rcpp]; }; rtop = derive { name="rtop"; version="0.3-45"; sha256="0dh7jlnakk1hd27swspa0fj6pq6yddxhz32w3d7xq8jgr7xm8d70"; depends=[sp gstat]; }; @@ -5350,8 +5464,8 @@ ruv = derive { name="ruv"; version="0.9.4"; sha256="07bvyqrkm10vh63l8dm93spd7l0v rv = derive { name="rv"; version="2.3.1"; sha256="0bjqwk7djl625fws3jlzr1naanwmrfb37hzkyy5szai52nqr2xij"; depends=[]; }; rvHPDT = derive { name="rvHPDT"; version="3.0"; sha256="05nrfnyvb8ar7k2bmn227rn20w1yzkp1smwi4sysc00hyjrlyg8s"; depends=[gtools]; }; rvTDT = derive { name="rvTDT"; version="1.0"; sha256="09c2fbqnlwkhaxfmgpsdprl0bb447ajk9xl7qdlda201fvxkdc8v"; depends=[CompQuadForm]; }; -rvalues = derive { name="rvalues"; version="0.2"; sha256="1zc4irq0s9mm7yz8pc3n9il0z508wwf2a2j741wyyw90f35fasi0"; depends=[]; }; -rvertnet = derive { name="rvertnet"; version="0.0-5"; sha256="1rj6csx2qb094wgkablrpzlbqb0hpzg5d29xrar2cy39gjmz40cj"; depends=[RCurl plyr RJSONIO httr ggplot2 maps]; }; +rvalues = derive { name="rvalues"; version="0.3"; sha256="0fkf0gngrx1rfa67blzf3xxjwhlp2m2jplxw3z3j9vgl6ray0nqs"; depends=[]; }; +rvertnet = derive { name="rvertnet"; version="0.2.2"; sha256="14afdf0mflpa2arxdy44y8mak9j3cg2cgk97idd7k4pi8vf6q0jg"; depends=[plyr jsonlite httr data_table ggplot2 maps]; }; rvest = derive { name="rvest"; version="0.2.0"; sha256="1bg9l0wzh9xs7rpacl8s6q33hkjvv85vsl8079qsri0lr856wni7"; depends=[httr XML selectr magrittr]; }; rvgtest = derive { name="rvgtest"; version="0.7.4"; sha256="1lhha5nh8fk42pckg4ziha8sa6g20m0l4p078pjj51kz0k8929ng"; depends=[]; }; rworldmap = derive { name="rworldmap"; version="1.3-1"; sha256="0wrg6ap39bq88sv5axxd90yyqafn77amk5429pxd9v5a2hdm3g8w"; depends=[sp maptools fields]; }; @@ -5360,7 +5474,7 @@ rwt = derive { name="rwt"; version="1.0.0"; sha256="112wp682z4gkxsd3bqnlkdrh42bf ryouready = derive { name="ryouready"; version="0.3"; sha256="0nms3zfkis2fsxkyj3dr95vz3kk6pkm7l5ga7iz8pxy1ywrawj2i"; depends=[stringr car]; }; rysgran = derive { name="rysgran"; version="2.1.0"; sha256="1l2mx297iyipap8cw2wcw5gm7jq4076bf4gvgvij4q35vp62m85z"; depends=[soiltexture lattice]; }; rzmq = derive { name="rzmq"; version="0.7.7"; sha256="0gf8gpwidfn4756jqbpdbqsl8l4ahi3jgavrrvbbdi841rxggfmx"; depends=[]; }; -s20x = derive { name="s20x"; version="3.1-11"; sha256="1zk9a7jdinggznq5h17vvx155a29d4py64dr7h1bh8dq22nlzd0g"; depends=[]; }; +s20x = derive { name="s20x"; version="3.1-12"; sha256="0kr3x5p7wspr9kgfq1361v78y6qnzkfbsdxqwl4zlzb2zpq6d5s4"; depends=[]; }; s2dverification = derive { name="s2dverification"; version="2.1.1"; sha256="1m3m5sbq96fhnl4slxgb2j0009kqfdivdn3nbb203pc0knjpflnq"; depends=[GEOmap geomapdata maps mapproj]; }; s4vd = derive { name="s4vd"; version="1.0"; sha256="07pnkhyqf9iymj913813d93dmb3iqbdlcl0gsgacihyyinb4id5s"; depends=[biclust]; }; sBF = derive { name="sBF"; version="1.1.1"; sha256="0dankakl4rwl9apl46hk57ps4mvn2l1crw4gdqds26fc8w6f6rab"; depends=[]; }; @@ -5371,7 +5485,8 @@ sac = derive { name="sac"; version="1.0.1"; sha256="1rl5ayhg5y84fw9w3zf43dijjlw9 saccades = derive { name="saccades"; version="0.1"; sha256="0bmwqfhdqf4j0xpyfzzgl6h35r3wgjmkrmnwn9l17648f236d7c8"; depends=[zoom]; }; sads = derive { name="sads"; version="0.1.10"; sha256="02662vbbk3jikp506ljil9zqchs6bq3lsw4fwbbi2wgg7xvb260g"; depends=[MASS bbmle poilog VGAM untb]; }; sae = derive { name="sae"; version="1.0-2"; sha256="0a9g07m1a8v4iw9pnzlws356kv4f77qkz5yc454i7130zfp2kxxi"; depends=[nlme MASS]; }; -saeSim = derive { name="saeSim"; version="0.6.0"; sha256="10gvbzscnhc42a8z2jq8951i74v8pq7xsh3v3zsk2k4g8sx9hdy2"; depends=[dplyr ggplot2 MASS spdep]; }; +sae2 = derive { name="sae2"; version="0.1-1"; sha256="0fbbh2s0gjhyhypaccnd37b5g2rhyzq7mrm6s0z36ldg1pzi4dd9"; depends=[MASS]; }; +saeSim = derive { name="saeSim"; version="0.7.0"; sha256="03zfw18fvx8blh9iijh3rnglg8zbsvd9dq3kqv6ajz3hwr90z29g"; depends=[dplyr functional ggplot2 MASS spdep parallelMap]; }; saemix = derive { name="saemix"; version="1.2"; sha256="1whwn54iiapdfig6qpzji3z3skir6jrs34dq78zlynibgrg95hx6"; depends=[]; }; saery = derive { name="saery"; version="1.0"; sha256="09x1v627llqbpiwkh1wr0z7gsndfdrjzag2hprhq1adbzh05k47z"; depends=[]; }; safeBinaryRegression = derive { name="safeBinaryRegression"; version="0.1-3"; sha256="1g68r6pp5l41rbgyfqgcha1gpsisnl0ybdmdqr4ylr43f61dpgvd"; depends=[lpSolveAPI]; }; @@ -5388,7 +5503,7 @@ sand = derive { name="sand"; version="1.0.2"; sha256="1y371ds86gcq2id996vp56h5da sandwich = derive { name="sandwich"; version="2.3-2"; sha256="10ag2iwwxcwgbmbibfkpxxc8iih7bmya57zl4g983fb7zyd36mhz"; depends=[zoo]; }; sanitizers = derive { name="sanitizers"; version="0.1.0"; sha256="1c1831fnv1nzpq8nw9krgf9fm8v54w0gvcn4443b6jghnnbhn2n6"; depends=[]; }; sanon = derive { name="sanon"; version="1.4"; sha256="0zg0paiz3rb0fk2mgi8rlzqy9vq3afy5vx6s15k1xqz8rjgsbd1x"; depends=[]; }; -sapa = derive { name="sapa"; version="2.0-0"; sha256="04zf1xs4w7s28mvc272la8z3r1slnf50pw0k8zj335j3i56x6b9y"; depends=[ifultools splus2R]; }; +sapa = derive { name="sapa"; version="2.0-1"; sha256="11xgd2ijfz5yn0zyl5gfy97h2cxi1vyxkrijy2s9b78wm7fzpnkv"; depends=[ifultools splus2R]; }; saps = derive { name="saps"; version="1.0.0"; sha256="02si76ckinkm4ajclq4isy6gi0cf1mwfrq3w17i5gflbfqmf2qvj"; depends=[survival reshape2]; }; sas7bdat = derive { name="sas7bdat"; version="0.5"; sha256="0qxlapb6wdhzpwlmzlhscy3av7va3h6gkzsppn4sx5q960310an3"; depends=[]; }; saves = derive { name="saves"; version="0.5"; sha256="1b4mfi2851bwcp0frx079h5yl6y1bhc2s8ziigmr8kwy1y1cxw10"; depends=[]; }; @@ -5432,11 +5547,11 @@ sdnet = derive { name="sdnet"; version="2.03.3"; sha256="1884pil3brm7llczacxda6g sdprisk = derive { name="sdprisk"; version="1.0-3"; sha256="0v490zz2c1qa0w9nfd0xs5xbbvd9g8vp39fp8x7k7cy598vby4yx"; depends=[numDeriv PolynomF rootSolve]; }; sdtoolkit = derive { name="sdtoolkit"; version="2.33-1"; sha256="0pirgzcn8b87hjb35bmg082qp14idc5pfvm6dikpgkswag23hwh8"; depends=[]; }; sdwd = derive { name="sdwd"; version="1.0.1"; sha256="1df8xx538ba3axi0jbkvyrdl7qnmkvh1x15kh57jmw3qbpf5gh56"; depends=[Matrix]; }; -seacarb = derive { name="seacarb"; version="3.0.5"; sha256="1k605jcr6l46lvvxyfb7m8l48rkj8ffv3fggf38nngnk9p0dxsy5"; depends=[oce]; }; +seacarb = derive { name="seacarb"; version="3.0.6"; sha256="0xhyy8nd20f29j9y3x250fq8qp57gdv61gg4ck24v4jbl8qvwhla"; depends=[oce]; }; sealasso = derive { name="sealasso"; version="0.1-2"; sha256="0cjy3fj170p5wa41c2hwscmhqxwkjq22vhg9kbajnq7df2s20jcp"; depends=[lars]; }; seas = derive { name="seas"; version="0.4-3"; sha256="1n0acg6fvaym4nx1ihw0vmb79csds0k4x9427qmcyxbl9hxxmllp"; depends=[]; }; season = derive { name="season"; version="0.3-5"; sha256="08f382kq51r5g9p5hsnjf17dwivhx1vfgmmwp1vzmbqx1drlqkzx"; depends=[ggplot2 MASS mgcv survival coda]; }; -seasonal = derive { name="seasonal"; version="0.70.1"; sha256="0vjyr864v5v1hxy00djzmbq38ajmywacp9k0zfv1q9nf64kg62l5"; depends=[]; }; +seasonal = derive { name="seasonal"; version="0.80.0"; sha256="06rwbvzgxrhqldni59qq0xzky4qzlkrx088i9qgs99id8ypbvvc5"; depends=[]; }; seawaveQ = derive { name="seawaveQ"; version="1.0.0"; sha256="19vm1f0qkmkkbnfy1hkqnfz6x2a7g9902ka76bhpcscynl69iy56"; depends=[survival NADA lubridate]; }; secr = derive { name="secr"; version="2.9.3"; sha256="1jy9phy6h9rf3l08gd5bxnjj37gdbnwbwy9flcyakcjlycj5smvb"; depends=[abind MASS nlme sp mgcv raster]; }; secrdesign = derive { name="secrdesign"; version="2.2.2"; sha256="028d6kaf09fh2kkdawgjln2qlh3xd89p3pbqmqwwsdp6p43x0wxy"; depends=[secr abind]; }; @@ -5461,9 +5576,10 @@ semTools = derive { name="semTools"; version="0.4-6"; sha256="1rxs6kwfc4bp273i9p semdiag = derive { name="semdiag"; version="0.1.2"; sha256="0kjcflw7dn907zx6790w7hnf5db6bf549whfsc0c2r173kf13irp"; depends=[sem]; }; semiArtificial = derive { name="semiArtificial"; version="1.2.0"; sha256="11pwdqpsf5d5g74s2b8ixmrh2khkha3d4akzlkn652s98qr55dpc"; depends=[CORElearn MASS nnet cluster mclust fpc timeSeries timeDate]; }; semisupKernelPCA = derive { name="semisupKernelPCA"; version="0.1.5"; sha256="1v8wdq63b1gqicj8c9a24k0w7cc0bkg0mnc9z5mklsfcl7g0g6k9"; depends=[datautils irlba]; }; +semsfa = derive { name="semsfa"; version="1.0"; sha256="1x227rigjk9glq5x9lp6xxcf3y9i73rv3mrj7lkr2ycnsx8zz57h"; depends=[mgcv np moments doParallel foreach iterators]; }; sendmailR = derive { name="sendmailR"; version="1.2-1"; sha256="0z7ipywnzgkhfvl4zb2fjwl1xq7b5wib296vn9c9qgbndj6b1zh4"; depends=[base64enc]; }; sendplot = derive { name="sendplot"; version="4.0.0"; sha256="0ia2xck94nwirwxi38nv0viz5wb8291yiak6f0wgwh84irsrfp1h"; depends=[rtiff]; }; -sensR = derive { name="sensR"; version="1.4-4"; sha256="1c9dg9q4g7cpm1a8qk984vrkfv5f34nh7gi88w8ppkzmmm6c5q25"; depends=[multcomp MASS numDeriv]; }; +sensR = derive { name="sensR"; version="1.4-5"; sha256="1vp06ghmk852wkc4vmp4k68z6v623hsay69c8nm3m8xvf2vrqfgb"; depends=[multcomp MASS numDeriv]; }; sensitivity = derive { name="sensitivity"; version="1.10.1"; sha256="1pszyf8lkp2jv773kfs1jmidq8dykiwhp592dnm4zhiy18sl7jl2"; depends=[boot]; }; sensitivityPStrat = derive { name="sensitivityPStrat"; version="1.0-6"; sha256="0rfzvkpz7dll3173gll6np65dyb40zms63fkvaiwn0lk4aryinlh"; depends=[survival]; }; sensitivitymv = derive { name="sensitivitymv"; version="1.2"; sha256="0h8lbl5yhxgzdrajjydb2ap9q3dnm1abxdk8gdhp84m1bv8pznkj"; depends=[]; }; @@ -5479,7 +5595,7 @@ seqinr = derive { name="seqinr"; version="3.1-3"; sha256="0bbjfwbqg74wsamb3iz01g seqminer = derive { name="seqminer"; version="3.4"; sha256="1fl7mmqs3y0vpfhqss7syafwli67jwha703fyailxixq7djvwf9f"; depends=[stringr]; }; seqmon = derive { name="seqmon"; version="0.2"; sha256="075hc6vgl1w3nisrihf5w6mkkg9q601jsqxm9hk9yagyvvd7d78w"; depends=[]; }; sequences = derive { name="sequences"; version="0.5.9"; sha256="17571m525b6a3k4f0m936wfq401181gx1fpb7x4v0fhaldzdmk3a"; depends=[Rcpp Rcpp]; }; -sequenza = derive { name="sequenza"; version="2.1.0"; sha256="0qnznw6gn5yfd64mib8h9y29vak40d3znzkqvhlpnn0da6aak1zv"; depends=[squash]; }; +sequenza = derive { name="sequenza"; version="2.1.1"; sha256="0vrdmfy8qyzjflyl5skcy9mazl56py5gzb1kn1xh2hiv3mshdrfx"; depends=[squash]; }; seriation = derive { name="seriation"; version="1.0-14"; sha256="0a7m1x6dhk00wh6djiz75x462y06fammr7fd2z8ks32migsbbvpp"; depends=[TSP cluster gclus colorspace MASS]; }; servr = derive { name="servr"; version="0.1"; sha256="035pf1xg0jgjrba39wxwlrh7n43kp29ymagfv7yskxj31dh3b34i"; depends=[httpuv]; }; sesem = derive { name="sesem"; version="1.0.1"; sha256="0s4xkv6bc5nxhj09mk9agnj11b9h7swccs9jrn4lg3fy12vqhf5a"; depends=[lavaan mgcv gplots]; }; @@ -5492,22 +5608,26 @@ severity = derive { name="severity"; version="2.0"; sha256="1mp19y2pn7nl9m8xfljc sfa = derive { name="sfa"; version="1.0-1"; sha256="1acqxgydf8j5csdkx0yf169x3yaa31r0ccdrqarh6vj1hacm89ad"; depends=[]; }; sfsmisc = derive { name="sfsmisc"; version="1.0-27"; sha256="16hkm0ylwipc1zqsi8fiwyqvl9hpjgl7kyvgamibxlbp1y669qgm"; depends=[]; }; sft = derive { name="sft"; version="2.0-7"; sha256="1fq1b32f08i4k9bv4hh7rhk1jj7kgans6dwh1bmawaqkchyab3jr"; depends=[fda]; }; +sgPLS = derive { name="sgPLS"; version="1.0"; sha256="0n2apx74pcfqw1wakck1pnnahf3lxs5qzzki1j5w2vlp38f312k9"; depends=[mixOmics]; }; sgeostat = derive { name="sgeostat"; version="1.0-25"; sha256="04zl932s6zb26r42h2l8qf3d43bmrq67281mrkh4spn4vcddv5da"; depends=[]; }; sglOptim = derive { name="sglOptim"; version="1.0.122.1"; sha256="0ld53rdxai85r9hwz9jrsxr08lxin0ksxa6823r7cr96w18c1ssm"; depends=[Matrix Rcpp RcppProgress RcppArmadillo BH]; }; sglasso = derive { name="sglasso"; version="1.1-0"; sha256="1iyj8clk2ibj94nxh1xi1wr50y2l53fxcivc2jdnilcqmscwbf1x"; depends=[Matrix]; }; sglr = derive { name="sglr"; version="0.7"; sha256="11gjbvq51xq7xbmpziyzwqfzf4avyxj2wpiz0kp4vfdj3v7p4fp9"; depends=[ggplot2 shiny]; }; -sgof = derive { name="sgof"; version="2.1.1"; sha256="02gbqyzjrma48aw3p038hlc2a7gdmgb6ac81473w1rg495n9sx7p"; depends=[]; }; +sgof = derive { name="sgof"; version="2.2"; sha256="087f4nbx9ppzi5za3f4w4msq2gd3r08v16fihppa30nqydg3ssbj"; depends=[poibin]; }; sgr = derive { name="sgr"; version="1.3"; sha256="0zxmrbv3fyb686hcgfy2w1w2jffxf41ab8yc90dsgf931s9c55wn"; depends=[MASS]; }; +sgt = derive { name="sgt"; version="1.0"; sha256="1dg5ki1qgghzwl49vsjpvl47s8kh46iag5krknczfcahk4fq0knp"; depends=[maxLik]; }; shape = derive { name="shape"; version="1.4.2"; sha256="0yk3cmsa57svcvbnm21pyr0s0qbhnllka8nmsg4yb41frjlqph66"; depends=[]; }; shapefiles = derive { name="shapefiles"; version="0.7"; sha256="08ghndihs45kylbzd9wnxffn8ixvxjhjnjldjyd526ai2sj8xcgf"; depends=[foreign]; }; shapes = derive { name="shapes"; version="1.1-10"; sha256="038xps6f8b6w9qa9csqk33ggmb311h5zxwsxr027bd95a3vmyijx"; depends=[scatterplot3d rgl MASS]; }; sharpshootR = derive { name="sharpshootR"; version="0.6-3"; sha256="1dpcyd1wi022zcs9s48xg3wzy17dqcd0622ak0phvbwxgpwmz9j2"; depends=[aqp ape igraph cluster lattice latticeExtra vegan sp reshape2 Hmisc scales circular RColorBrewer plyr]; }; sharx = derive { name="sharx"; version="1.0-4"; sha256="1flcflx6w93s8bk4lcwcscwx8vacdl8900ikwkz358jbgywskd5n"; depends=[Formula dcmle dclone]; }; -shiny = derive { name="shiny"; version="0.11"; sha256="0mki9dxlz9v6kpd4kahl4v2rvrf7mkk4rr5hy500jk3caiwqfx5k"; depends=[httpuv mime RJSONIO xtable digest htmltools R6]; }; +shiny = derive { name="shiny"; version="0.11.1"; sha256="1aplb2wvgsbg6hhjsyjjhd8qbj11yrzm10rr812lzpiavd9wjn3w"; depends=[httpuv mime RJSONIO xtable digest htmltools R6]; }; shinyAce = derive { name="shinyAce"; version="0.1.0"; sha256="1031hzh647ys0d5hkw7cqxj0wgry3rxgq95fgs7slbm0rgx9g6f7"; depends=[shiny]; }; shinyBS = derive { name="shinyBS"; version="0.20"; sha256="1l95g2rzv53vwx5zcaqiqz8jirncwh1yb14y62x9phg4n5jfk9f8"; depends=[shiny]; }; -shinyFiles = derive { name="shinyFiles"; version="0.4.0"; sha256="147g9ah7p97wkn3zpfhn5fljpwy2v936r4jqbdm7fbh7zi3rb3k2"; depends=[shiny htmltools]; }; +shinyFiles = derive { name="shinyFiles"; version="0.5.0"; sha256="0ax8blsflzwzzp7ky7zs48dsf8a9dzm18hcmif9hjlq8dy5bh7sp"; depends=[shiny htmltools]; }; shinyRGL = derive { name="shinyRGL"; version="0.1.0"; sha256="07llg1yg5vmsp89jk60ly695zvxky6n06ar77mjxzlyc294akwmy"; depends=[rgl shiny]; }; +shinyTree = derive { name="shinyTree"; version="0.2.2"; sha256="08n2s6pppbxn23ijp6vms609p4qwlmfh9g0k5hdfqsqxjrz1nndi"; depends=[shiny]; }; +shinybootstrap2 = derive { name="shinybootstrap2"; version="0.2.1"; sha256="17634l3swlvgj1sv56nvrpgd6rqv7y7qjq0gygljbrgpwmfj198c"; depends=[htmltools jsonlite shiny]; }; shinythemes = derive { name="shinythemes"; version="1.0"; sha256="19qhbiyn8chchwj9w9vyi6q86l84amf2n0g5y310apw1hzsjnnr7"; depends=[shiny]; }; shopifyr = derive { name="shopifyr"; version="0.28"; sha256="1ypqgiqimdwj9fjy9ykk42rnkipb4cvdxy5m9z9jklvk5a7cgrml"; depends=[RCurl R6 RJSONIO]; }; shotGroups = derive { name="shotGroups"; version="0.6"; sha256="0khcgzli6114yqrglmsvhr8rwkkkwdkd06b50isbc24vpv6xbfx9"; depends=[boot coin CompQuadForm energy KernSmooth mvoutlier robustbase]; }; @@ -5520,15 +5640,15 @@ siar = derive { name="siar"; version="4.2"; sha256="1c4z72jr81dzkp9xqyrrkwjsalvv sideChannelAttack = derive { name="sideChannelAttack"; version="1.0-6"; sha256="1xcsy1h8gc8a4f9nzs7zv8x6v55g1pg8vy1kg64iqxm0gnz2f20l"; depends=[MASS corpcor mmap ade4 infotheo]; }; sidier = derive { name="sidier"; version="3.0"; sha256="0jkb2iqlafxzar359fqh09kzfz7iy4kkmg8sp9f6ihyvy35dvh93"; depends=[ape network igraph gridBase ggmap ggplot2]; }; sievetest = derive { name="sievetest"; version="1.2.2"; sha256="0mbgkf014m6bc7qg60vf065i6mvl5n4a0bvg8vb7dw531vsw2771"; depends=[]; }; -sig = derive { name="sig"; version="0.0-4"; sha256="0q5bwaj15jlmcg4qqcdkkwbnqphwgwzcnfzga12xzr912rwjybjr"; depends=[]; }; +sig = derive { name="sig"; version="0.0-5"; sha256="084wwpj5mnmq4k98ijbv23z80sj4axadc7c6hn3917dazsaa6ngn"; depends=[]; }; sigclust = derive { name="sigclust"; version="1.1.0"; sha256="0151v7lr4n4yyn93j0s06gzc9jh9xhdgvfw6kvpfy24jl6wdii7g"; depends=[]; }; sigloc = derive { name="sigloc"; version="0.0.4"; sha256="13v2dlgsbcsqqm8yxls62i7r3sk8m3c78jv8f9lgdihq5pjnd9zp"; depends=[nleqslv ellipse]; }; signal = derive { name="signal"; version="0.7-4"; sha256="0sz8im7i46qy5wjpm34a2nqvrc1vipmqlw8ns3i2s1vhcvp7fjs1"; depends=[MASS]; }; signal_hsmm = derive { name="signal.hsmm"; version="1.1"; sha256="0ifx7ahl5nj90id0pk4gpz0hdq72rsf53n05s17g6j275dzkmd0n"; depends=[seqinr shiny]; }; simFrame = derive { name="simFrame"; version="0.5.3"; sha256="154d4k6x074ib813dp42l5l8v81x9bq2c8q0p5mwm63pj0rgf5f3"; depends=[Rcpp lattice Rcpp]; }; -simMSM = derive { name="simMSM"; version="1.1.2"; sha256="08l2mwwa8sd5dsg846kpbhffipwr60kamr8c02j76r9ka4pkn4p8"; depends=[]; }; -simPH = derive { name="simPH"; version="1.2.4"; sha256="07cwa18hpyqax73yhxml7qhxhmgiqjdv246v7m7s91k26vb6kpd4"; depends=[car DataCombine data_table dplyr ggplot2 gridExtra lazyeval MASS mgcv reshape2 stringr survival quadprog]; }; -simPop = derive { name="simPop"; version="0.2.6"; sha256="1cpi4bva7qpqlsl6xx6174hz3x5vk22i0y9am0ib0jdxampfz1v8"; depends=[lattice vcd data_table laeken MASS Rcpp e1071 nnet doParallel foreach colorspace Rcpp]; }; +simMSM = derive { name="simMSM"; version="1.1.4"; sha256="0dxl0cinc8zz77jjk7qbj81x6c9b1mw07x9rr5qdqbj9vnaj0gzy"; depends=[survival mvna]; }; +simPH = derive { name="simPH"; version="1.3"; sha256="1hazh1flag3n7mrab9agc6nmiii0amdcxlbgzadiwpgyrdbdhkjn"; depends=[data_table dplyr ggplot2 gridExtra lazyeval MASS mgcv reshape2 stringr survival quadprog]; }; +simPop = derive { name="simPop"; version="0.2.9"; sha256="1vi2jab57aqf1jyf87vrybz5qbhv7wdjhsm963z3cpyva2bj0i60"; depends=[lattice vcd data_table laeken MASS Rcpp e1071 nnet doParallel foreach colorspace Rcpp]; }; simSummary = derive { name="simSummary"; version="0.1.0"; sha256="1ay2aq6ajf1rf6d0ag3qghxpwj0f8b3fhpr2k0imzmpbyag1i3gj"; depends=[abind svUnit gdata]; }; simTool = derive { name="simTool"; version="1.0.3"; sha256="1x018p5mssrhz2ghs3ly9wss12503h93gl7zk0mqh1bcrzximh0k"; depends=[plyr reshape]; }; simba = derive { name="simba"; version="0.3-5"; sha256="14kqxqavacckl5s1518iiwzrmlgbxz1lxy33y8c9qq7xaln41g9h"; depends=[vegan]; }; @@ -5541,7 +5661,7 @@ simone = derive { name="simone"; version="1.0-2"; sha256="071krim64s7fjwvwq7bjr0 simpleboot = derive { name="simpleboot"; version="1.1-3"; sha256="1qprjisfflhzg8ll12p3q1zcfdiyc45glic2j9cw9nhx5rb065fk"; depends=[boot]; }; simplexreg = derive { name="simplexreg"; version="1.0"; sha256="144kljh968i7n2d21r4204i4h952mfrkfc8b5r6x760msgjphxvh"; depends=[Formula plotrix]; }; simrel = derive { name="simrel"; version="1.0-1"; sha256="0905rjqh8c08vyg090h0i7sx89vdryignslldzfz2r5yrszl4ga8"; depends=[FrF2 sfsmisc]; }; -simsalapar = derive { name="simsalapar"; version="1.0-4"; sha256="035mimkia6q1yiz413pwbgfwk6cyad24kpvhmd6gp61njawwha19"; depends=[sfsmisc gridBase colorspace]; }; +simsalapar = derive { name="simsalapar"; version="1.0-5"; sha256="1z3dwylfrl08pq2k5ppfma3ijh356qc7wwdvgyp3wmw1bcq1amyf"; depends=[sfsmisc gridBase colorspace]; }; simsem = derive { name="simsem"; version="0.5-8"; sha256="1kir1c0g5xb4gzmpvx13qp071b3d5v0br3093q394wzp22d816xk"; depends=[lavaan]; }; siplab = derive { name="siplab"; version="1.1"; sha256="1b5drhla4p7n1y1cp7kqwqzw0b286kgij9j6wsks5vjgy5qfal1x"; depends=[spatstat]; }; sirad = derive { name="sirad"; version="2.0-7"; sha256="009icj1jil757vvsf88sgmdz40swrx1qvrhnx7wwj7p3dlh78pvw"; depends=[zoo ncdf RNetCDF raster]; }; @@ -5550,7 +5670,7 @@ sisVIVE = derive { name="sisVIVE"; version="1.0"; sha256="1y6zq8dp5k9mx83x6fryjh sisus = derive { name="sisus"; version="3.9-13"; sha256="0lz9ww07dvdx6l3k5san8gwq09hycc3mqwpgzmr2ya9z8y27zadr"; depends=[MASS RColorBrewer coda gdata gtools moments polyapost rcdd]; }; sitar = derive { name="sitar"; version="1.0.1"; sha256="1ji8742f518fzg8xz0dy5irwdz7a0nymajh69zd2l53yvcsnlwdp"; depends=[nlme]; }; sitools = derive { name="sitools"; version="1.4"; sha256="0c0qnvsv06g6v7hxad96fkp9j641v8472mbphvaxa60k3xc7ackb"; depends=[]; }; -sjPlot = derive { name="sjPlot"; version="1.6.5"; sha256="04hacshyfb1irm9zz70lng9h5g3yvzk1y0grmf0518196arrmrqc"; depends=[ggplot2 MASS car foreign plyr psych reshape2 scales]; }; +sjPlot = derive { name="sjPlot"; version="1.6.9"; sha256="1nf2ndwd6y5szvvycz2sdr572d3c4zc79frvhxh3iajb071awral"; depends=[ggplot2 MASS car foreign plyr psych reshape2 scales]; }; sjdbc = derive { name="sjdbc"; version="1.5.0-71"; sha256="0i9wdfadfcabayq78ilcn6x6y5csazbsgd60vssa2hdff0ncgvk1"; depends=[rJava]; }; skatMeta = derive { name="skatMeta"; version="1.4.3"; sha256="0bknv066ya4yl4hl4y02d9lglq2wkl9c2j1shzg3d64dg4sjvbak"; depends=[Matrix coxme survival CompQuadForm]; }; skda = derive { name="skda"; version="0.1"; sha256="0a6mksr1d0j3pd0kz4jb6yh466gvl4fkrvgvnlmvivpv6b2gqs3q"; depends=[]; }; @@ -5565,11 +5685,12 @@ slp = derive { name="slp"; version="1.0-3"; sha256="09jyrp6y3rigy043d8s5i7nh89pg sm = derive { name="sm"; version="2.2-5.4"; sha256="0hnq5s2fv94gaj0nyqc1vjdjd64vsp9z23nqa8hxvjcaf996rwj9"; depends=[]; }; smaa = derive { name="smaa"; version="0.2-3"; sha256="1vabxxyz2k10sbvrzdf51jlh59zlkjdq82vblk5s37ddmzgwnif9"; depends=[]; }; smac = derive { name="smac"; version="1.0"; sha256="1inn7i5k0q5vln24kazh3gl3szf6lxwnjr2rw70jcyn9dr9iy952"; depends=[]; }; -smacof = derive { name="smacof"; version="1.5-0"; sha256="06csyz9fvdicxm11wh9mp6i4mvlgxyiclhlyg45grag0kqjgg6ha"; depends=[rgl polynom scatterplot3d Hmisc colorspace nnls]; }; +smacof = derive { name="smacof"; version="1.6-2"; sha256="10yg4dxyv08wq1a74jac6jnmzhbjm6qip3vg5ca06w5pqk6lbdgn"; depends=[rgl polynom scatterplot3d Hmisc colorspace nnls]; }; smacpod = derive { name="smacpod"; version="1.1.1"; sha256="1pmgxvww24mcgrvv87axqvw457r5wl57scqy93inmzia2mgyva1p"; depends=[spatstat]; }; smam = derive { name="smam"; version="0.2-2"; sha256="1p6bzk4b9kpmfs4nxmcgc46hgdpldqg0pzpc0zhvs187z2nrfw75"; depends=[Matrix]; }; smart = derive { name="smart"; version="1.0.1"; sha256="0ki3qn71zrw0nyv395qijcwahnxyv1p21j8x6cxr9spah2wzz8lb"; depends=[Matrix gplots gtools PMA elasticnet pcaPP igraph]; }; smatr = derive { name="smatr"; version="3.4-3"; sha256="0iiazln4albj7k5w67slvyn98cqg4f6k409mml0n1pvlkki0h7gy"; depends=[plyr]; }; +smbinning = derive { name="smbinning"; version="0.1"; sha256="1r3l8z875k5sjnbjg0dpkv3x122hn8g601025lfdpl2ndkbz4qms"; depends=[sqldf partykit Formula gsubfn]; }; smcUtils = derive { name="smcUtils"; version="0.2.2"; sha256="0d1kmg386j0zrpp8vgxjwvpf1i25l86xrh82767xkp0n9qj8srwq"; depends=[]; }; smco = derive { name="smco"; version="0.1"; sha256="1sj3y1x6pc32cwzyhn9gaxs964xh5xl4vw08hsa8kfcxhh2r0s99"; depends=[]; }; smcure = derive { name="smcure"; version="2.0"; sha256="1j7fxnb0sx57a0l929c3haz4f1y829ymlq0cvdh0cia4qp6ydv60"; depends=[survival]; }; @@ -5580,7 +5701,7 @@ smfsb = derive { name="smfsb"; version="1.1"; sha256="0khd23b6k9zgxz2x6g6c6k2g32 smirnov = derive { name="smirnov"; version="1.0-1"; sha256="09mpb45wj8rfi6n6822h4c335xp2pl0xsyxgin1bkfw97yjcvrgk"; depends=[]; }; smnet = derive { name="smnet"; version="1.0"; sha256="185ihq44fp00qp03lp9hz821a1ddm1bd09k3j0ii715grc91nc49"; depends=[SSN spam dfoptim RSQLite igraph DBI]; }; smoothHR = derive { name="smoothHR"; version="1.0.1"; sha256="02kjqkgnhjwhq1vmva9nmy36a7bc6zjj6g81dw9m4zd3y9nbb005"; depends=[survival]; }; -smoothSurv = derive { name="smoothSurv"; version="1.3-2"; sha256="11aq3yb7q4pilp00l7q8r3ywbmwnka63kkjpvakp27mvaqyr02qr"; depends=[survival]; }; +smoothSurv = derive { name="smoothSurv"; version="1.5"; sha256="145j415jr482s860c685sr815bwx7g63pkfhra1m6r2wawqb2gl5"; depends=[survival]; }; smoother = derive { name="smoother"; version="1.0.0.0"; sha256="0i4g19xh20v4ig9fcy1gvbawi0a92jkg2qwdcxvgcflvppnvbv22"; depends=[]; }; smoothie = derive { name="smoothie"; version="1.0-1"; sha256="12p4ig8fbmlsby5jjd3d27njv8j7aiwx0m2n1nmgvjj0n330s1kj"; depends=[]; }; smoothmest = derive { name="smoothmest"; version="0.1-2"; sha256="14cri1b6ha8w4h8m26b3d7qip211wfv1sywgdxw3a6vqgc65hmk5"; depends=[MASS]; }; @@ -5590,18 +5711,18 @@ smss = derive { name="smss"; version="1.0-1"; sha256="17a0x92hxzn212yiz87n7ssyi3 sn = derive { name="sn"; version="1.1-2"; sha256="0ik528c0nxcr7hc3x6xx4zpyjhpaaa55jrvz1141f9bggv6bwclh"; depends=[mnormt numDeriv]; }; sna = derive { name="sna"; version="2.3-2"; sha256="1dmdv1bi22gg4qdrjkdzdc51qsbb2bg4hn47b50lxnrywdj1b5jy"; depends=[]; }; snapshot = derive { name="snapshot"; version="0.1.2"; sha256="0cif1ybxxjpyp3spnh98qpyw1i5sgi1jlafcbcldbqhsdzfz4q10"; depends=[]; }; -snht = derive { name="snht"; version="1.0"; sha256="12aw4d6n97g05qwwj8bk2pfg2b4b3k1hm9ihl17av3aicgvzmw3p"; depends=[MASS zoo plyr reshape]; }; +snht = derive { name="snht"; version="1.0.1"; sha256="0fv2p12c72acimkasnb8d7yq7l4j5y7c9v64q54k8fy85rkjw9wl"; depends=[mgcv zoo plyr reshape]; }; snipEM = derive { name="snipEM"; version="1.0"; sha256="0f98c3ycl0g0l3sgjgk7xrjp6ss7n8zzlyzvpcb6agc60cnw3w03"; depends=[Rcpp mvtnorm MASS GSE Rcpp RcppArmadillo]; }; snow = derive { name="snow"; version="0.3-13"; sha256="1habq43ncac9609xky3nqfkbq52cz36dg8jbdihag269z1kazdnf"; depends=[]; }; snowFT = derive { name="snowFT"; version="1.3-0"; sha256="10hhhzzzyz1ph7c8k08s79h4pdwq4jk8bh47y37ww0yjq0fd6gik"; depends=[snow]; }; snowfall = derive { name="snowfall"; version="1.84-6"; sha256="1n9v9m4c02pspgkxfmq7zdk41s2vjcsk06b0kz9km4xy1x7k0hsg"; depends=[snow]; }; snp_plotter = derive { name="snp.plotter"; version="0.5.1"; sha256="16apsqvkah5l0d5qcwp3lq2jspkb6n62wzr0wskmj84jblx483vv"; depends=[genetics]; }; -snpEnrichment = derive { name="snpEnrichment"; version="1.6.0"; sha256="1wzzlvjrvp8bwjxa0rh7427j9d9fkvxx2q4rs9hq1sf51vj5986b"; depends=[]; }; +snpEnrichment = derive { name="snpEnrichment"; version="1.6.3"; sha256="0hg1cgyr4nlrqfv60aky8ljwh46ldslca3jmb6v6criyz6knqdv3"; depends=[]; }; snpRF = derive { name="snpRF"; version="0.4"; sha256="1amxc4jprrc6n5w5h9jm2as025gqdqkla2asz7x97sjdnnj9kzzn"; depends=[]; }; snpStatsWriter = derive { name="snpStatsWriter"; version="1.5-6"; sha256="04qhng888yih8gc7yd6rrxvvqf98x3c2xxz22gkwqx59waqd4jlq"; depends=[colorspace]; }; snpar = derive { name="snpar"; version="1.0"; sha256="0c9myg748jm7khqs8yhg2glxgar1wcf6gyg0xwbmw0qc41myzfnq"; depends=[]; }; snplist = derive { name="snplist"; version="0.13"; sha256="1v9n3gdvygx4s6hlm0ijyw04szxwn9c1dqnhaqn61a8yfkmmnxn8"; depends=[RSQLite Rcpp R_utils DBI Rcpp]; }; -sns = derive { name="sns"; version="0.9.1"; sha256="1knah4y3amv9j03djdm0kcwd50z8hdrpiknx1i35m3bdix85knsn"; depends=[mvtnorm]; }; +sns = derive { name="sns"; version="1.0.0"; sha256="0qr5gj095xg48mqj7maz1m1zizx1jdjca8qygygqvak1b7nl4ccs"; depends=[mvtnorm coda]; }; soc_ca = derive { name="soc.ca"; version="0.7.1"; sha256="0lg1bpbd0crywa29xc79cn3kr614wq4hr09xpwk17nv7q8qw8cnh"; depends=[ggplot2 gridExtra ellipse scales]; }; softImpute = derive { name="softImpute"; version="1.0"; sha256="0pkpr8pxvrrw4p95907bnhl3k54dxz5r2fk8zi56kilrarhzchqr"; depends=[Matrix]; }; softclassval = derive { name="softclassval"; version="1.0-20130317"; sha256="1ifqm4a3xxi9wd4l1q4l5h4q5f8hp0k28mqpszzj8k1czbph88ql"; depends=[arrayhelpers]; }; @@ -5622,7 +5743,7 @@ somplot = derive { name="somplot"; version="1.6.4"; sha256="06c8p2lqz3yxmxdl7ji8 sonicLength = derive { name="sonicLength"; version="1.4.4"; sha256="1v46xzx3jxxxs2biyrq6xbv2lhpz1i95la93hj6dl4jfyikmx0im"; depends=[]; }; soobench = derive { name="soobench"; version="1.0-73"; sha256="1y2r061pd4kr0kdgp8db3qy2aj07jdiyvy2py4fmwg6b8pcf9y0l"; depends=[]; }; sortinghat = derive { name="sortinghat"; version="0.1"; sha256="1wrxwhdp3gj1ra0rgldnmc0w019bnjb6z9j20c5p1ab09x4dmlny"; depends=[MASS bdsmatrix mvtnorm]; }; -sorvi = derive { name="sorvi"; version="0.6.23"; sha256="070g6kxnacqwzl4djhbb5zjvp71997xl2l53cfni05yf7mkm17as"; depends=[reshape pxR ggplot2 plyr RColorBrewer XML]; }; +sorvi = derive { name="sorvi"; version="0.7.20"; sha256="1cd0lg74lfdbkp314i40asc3vshs1acb20wz1cxzg62vyz6ia055"; depends=[reshape ggplot2 plyr RColorBrewer XML]; }; sos = derive { name="sos"; version="1.3-8"; sha256="0vcgq8hpgdnlmkxc7qh1jqigr0gvm9x3w4ijbhma7x4i5fx3c2il"; depends=[brew]; }; sos4R = derive { name="sos4R"; version="0.2-11"; sha256="0r4lficx8wr0bsd510z4cp6la32xf928rsiznbywpxghnypsrcgg"; depends=[XML RCurl sp]; }; sotkanet = derive { name="sotkanet"; version="0.9.03"; sha256="1h8jmwv99hcrl5hkd99ypphvl8hx6k765vb8aphzp8a0vh42pkl1"; depends=[ggplot2 rjson]; }; @@ -5630,7 +5751,7 @@ soundecology = derive { name="soundecology"; version="1.2"; sha256="0vxnkqn9ibz1 source_gist = derive { name="source.gist"; version="1.0.0"; sha256="03bv0l4ccz9p41cjw18wlz081vbjxzfgq3imlhq3pgy9jdwcd8fp"; depends=[RCurl rjson]; }; sp = derive { name="sp"; version="1.0-17"; sha256="02j0q2b0i7j4p7i5l19n4dq92iv7dspwwg3jx2qkv3481p5dq25q"; depends=[lattice]; }; sp23design = derive { name="sp23design"; version="0.9"; sha256="1ihvcld19cxflq2h93m9k9yaidhwixvbn46fqqc1p3wxzplmh8bs"; depends=[mvtnorm survival]; }; -spBayes = derive { name="spBayes"; version="0.3-8"; sha256="0pmriffqnblqyd1332a2pqrjr7y3wllb17swb403h7c9dph6mzzv"; depends=[coda magic abind Formula]; }; +spBayes = derive { name="spBayes"; version="0.3-9"; sha256="1zdyz5jqbixwj59q9f1x8f3knz0jwdfl0abj0w6cxrllkb38yg10"; depends=[coda magic abind Formula]; }; spBayesSurv = derive { name="spBayesSurv"; version="1.0.2"; sha256="0pxndjksrd22p60pvc4czxwqhrpx5ik0yr23nz7kmg6wnp36hc6w"; depends=[Rcpp survival coda Rcpp RcppArmadillo]; }; spMC = derive { name="spMC"; version="0.3.6"; sha256="0h71m55jmv80kx5ccsrpsakrh4qw5f3kx2qizwi10jlybwggqv0m"; depends=[]; }; spThin = derive { name="spThin"; version="0.1.0"; sha256="06qbk0qiaw7ly1ywbr4cnkmqfasymr7gbhvq8jjbljm0l69fgjpp"; depends=[spam fields knitr]; }; @@ -5641,7 +5762,7 @@ spaa = derive { name="spaa"; version="0.2.1"; sha256="0qlfbfvv97avbnixm5dz9il3dm space = derive { name="space"; version="0.1-1"; sha256="1qigfz62xz47hqi43aii3yr4h7ddvaf11a5nil7rqprgkd0k6mv3"; depends=[]; }; spaceExt = derive { name="spaceExt"; version="1.0"; sha256="0lp8qmb7vcgxqqpsi89zjy7kxpibg3x2mq205pjmsrbbh7saqzr4"; depends=[limSolve glasso]; }; spacejam = derive { name="spacejam"; version="1.1"; sha256="1mdxmfa1aifh3h279cklm4inin0cx3h0z2lm738bai34j6hpvar7"; depends=[igraph Matrix]; }; -spacetime = derive { name="spacetime"; version="1.1-2"; sha256="1mmb3q4gmn0bs56242y01d3zbddg85g610ws6pc6s2k7i08xkxvb"; depends=[sp zoo xts intervals lattice]; }; +spacetime = derive { name="spacetime"; version="1.1-3"; sha256="04myzza2av2sr6g75dlklr3nv36hr3frvafphzn278vbhma777d9"; depends=[sp zoo xts intervals lattice]; }; spacodiR = derive { name="spacodiR"; version="0.13.0115"; sha256="0c0grrvillpwjzv6fixviizq9l33y7486ypxniwg7i5j6k36nkpl"; depends=[picante colorspace Rcpp Rcpp]; }; spacom = derive { name="spacom"; version="1.0-4"; sha256="1jfsbgy7b0mwl4n2pgrkkghx9p8b0wipvg4c5jar6v8ydby6qg94"; depends=[spdep foreach iterators lme4 nlme Matrix]; }; spam = derive { name="spam"; version="1.0-1"; sha256="033s5ka05kg97fmc3l1li3z6x5225rwhrdxh57wwn4axrjwy1nyy"; depends=[]; }; @@ -5653,22 +5774,23 @@ spark = derive { name="spark"; version="1.0.0"; sha256="0ryc7kq3hx8nd5m999p1y7lx sparkTable = derive { name="sparkTable"; version="0.12.0"; sha256="1q0wz090db9ff46k9w6wk1qk20yr527ilg2ply4qcw3zjydk8cc5"; depends=[Cairo gridExtra ggplot2 shiny Rglpk xtable StatMatch boot pixmap RGraphics]; }; sparktex = derive { name="sparktex"; version="0.1"; sha256="0r6jnn9fj166pdhnjbsaqmfmnkq0qr1cjprihlnln9jad05mrkjx"; depends=[]; }; sparr = derive { name="sparr"; version="0.3-6"; sha256="1imgph2bf575rm06l4vsz0nhizkrwa3p5j6b6gdn30l0hlhxjp0j"; depends=[spatstat rgl MASS]; }; -sparseBC = derive { name="sparseBC"; version="1.0"; sha256="16x581pm9fkbb4kp8lvz95mnckgrjbiwj9zin8hzyxdl1nrg4c3m"; depends=[glasso]; }; -sparseHessianFD = derive { name="sparseHessianFD"; version="0.1.1"; sha256="15x9v7b40mxl1z9ncazxzfzz7igvzmck22wlgj2y7c2ja8jxi6n2"; depends=[Rcpp RcppEigen Matrix Rcpp RcppEigen]; }; +sparseBC = derive { name="sparseBC"; version="1.1"; sha256="1w60n2875n809lbrn0hd4kdmsyfd64aikgzxchza8b59x77l0psy"; depends=[glasso fields]; }; +sparseHessianFD = derive { name="sparseHessianFD"; version="0.2.0"; sha256="1sj9d2d8bfjd00jr682gj21d4y0hjm91l3hj7356fpq461nb9pl8"; depends=[Rcpp Matrix Rcpp RcppEigen]; }; sparseLDA = derive { name="sparseLDA"; version="0.1-6"; sha256="0k9v2pjx4q4nhvpjhv496v4gfr5h19w0h2h7za7j6zqfn6aygvz6"; depends=[lars elasticnet MASS mda]; }; sparseLTSEigen = derive { name="sparseLTSEigen"; version="0.2.0"; sha256="11llmrkq0pnrdphgjvhmg269bq3xbbn4s7kd7xhvk62sigvspkcj"; depends=[robustHD Rcpp RcppEigen Rcpp RcppEigen]; }; -sparseMVN = derive { name="sparseMVN"; version="0.1.0"; sha256="1xcq1w80ypqdz4zxwhnnzc50lhja6qxfxxnrg5xkgzpmy1zvjbzq"; depends=[Matrix]; }; +sparseMVN = derive { name="sparseMVN"; version="0.2.0"; sha256="12g387bvpy4249kwq946v006ab095zsmgfsrkc1yqncxhmjwrgqn"; depends=[Matrix]; }; sparseSEM = derive { name="sparseSEM"; version="2.5"; sha256="0ig8apsi94kvbcq3i8nzmywbdizlss7c6r9bppcyl9lxgikc3cds"; depends=[]; }; sparsediscrim = derive { name="sparsediscrim"; version="0.2"; sha256="0m8ccmqpg1np738njavf736qh917hd3blywyzc3vwa1xl59wqccl"; depends=[corpcor bdsmatrix mvtnorm]; }; sparsenet = derive { name="sparsenet"; version="1.2"; sha256="106a2q4syrcnmicrx92gnbsf2i5ml7pidwghrpl6926glj59j248"; depends=[glmnet shape]; }; spartan = derive { name="spartan"; version="2.1"; sha256="1zkb08ppsmbkvgw16y46nlhcsb2s7dh3rcm7f57ydchpda2gxixh"; depends=[]; }; spatcounts = derive { name="spatcounts"; version="1.1"; sha256="0rp8054aiwc62r1m3l4v5dh3cavbs5h2yb01453bw9rwis1pj2qm"; depends=[]; }; -spate = derive { name="spate"; version="1.3"; sha256="17aiqi5cd17y9kaqx9yssk772ghcldk9i4s8nyafq8zp8d4r85i1"; depends=[mvtnorm truncnorm]; }; +spate = derive { name="spate"; version="1.4"; sha256="1cr63qm3hgz6viw6ynzjv7q5ckfsan7zhbp224gz4cgx5yjg0pn3"; depends=[mvtnorm truncnorm]; }; spatgraphs = derive { name="spatgraphs"; version="2.62"; sha256="1h7sv6qc5zhaiaqlrzagrlc2mxlasdzilmi5q9nrd1vsdzsqxvb4"; depends=[]; }; -spatial = derive { name="spatial"; version="7.3-8"; sha256="1vc6pc5i7nbazbh5y3hhr9kgaq0gd9xi89xc8ah4n0lrivjbxfa8"; depends=[]; }; +spatial = derive { name="spatial"; version="7.3-9"; sha256="12qhfqmznij1jddjklhlqzywcfw2hww8sff7b2m6mjxlky08p5jg"; depends=[]; }; spatial_gev_bma = derive { name="spatial.gev.bma"; version="1.0"; sha256="1rjn0gsbgiv69brhnm0zj25ya3nyfh4yf6jizng85mvss3viv3hj"; depends=[SpatialExtremes msm coda]; }; spatial_tools = derive { name="spatial.tools"; version="1.4.8"; sha256="0qnsjfx974na87p3n7sp711sc13v6dmpvb2kjpvscixs8rsy03y1"; depends=[iterators foreach rgdal raster mmap abind doParallel]; }; spatialCovariance = derive { name="spatialCovariance"; version="0.6-8"; sha256="06z6jz9sadqc382w07ysnnlhqc96hxaasz9wncbhipd4cd1y4daa"; depends=[]; }; +spatialEco = derive { name="spatialEco"; version="0.1-0"; sha256="1ks44g6np9q1yf4mr0wgijjvf8lvjpgkyfwjcj2d9938fng6p74x"; depends=[RANN rms sp raster spatstat cluster spdep SDMTools RCurl rgeos]; }; spatialTailDep = derive { name="spatialTailDep"; version="1.0.2"; sha256="107yldc43pgbadxdisnc7vq8vyvcps1b1isyvxd0kyf59xldiq47"; depends=[cubature mvtnorm SpatialExtremes]; }; spatialkernel = derive { name="spatialkernel"; version="0.4-19"; sha256="0gbl6lrbaxzv2f975k0vd6ghrljgf1kjazld3hm7781kv1f87lji"; depends=[]; }; spatialnbda = derive { name="spatialnbda"; version="1.0"; sha256="14mx5jybymasyia752f3vnr5vmswcavbz8bpqr69vlxphw27qkwk"; depends=[SocialNetworks mvtnorm]; }; @@ -5713,7 +5835,7 @@ splus2R = derive { name="splus2R"; version="1.2-0"; sha256="0kmyr1azyh0m518kzwvv splusTimeDate = derive { name="splusTimeDate"; version="2.5.0-135"; sha256="0hghggdcr70vfjx4npj37nmd96qvgrp1gpwa9bznvjkvyfawwy6i"; depends=[]; }; splusTimeSeries = derive { name="splusTimeSeries"; version="1.5.0-73"; sha256="1csk0ffgg1bi2k1m2bbxl6aqqqxf6i8sc8d4azip8ck7rn8vya46"; depends=[splusTimeDate]; }; spnet = derive { name="spnet"; version="0.9.0.6"; sha256="1kbf53ww2wdr2nsml9zhzd80dhi48izw1nwjszv9jqidd6nk7v29"; depends=[sp shape]; }; -spocc = derive { name="spocc"; version="0.2.2"; sha256="0hy72nh29hkzgqhsbadx4708y4sswacn9z75kcrqd1krc5fqa926"; depends=[ggplot2 rgbif rinat rbison ecoengine rebird AntWeb plyr ggmap maptools rworldmap sp rgeos lubridate RColorBrewer httr XML rgdal RJSONIO leafletR data_table assertthat whisker]; }; +spocc = derive { name="spocc"; version="0.2.4"; sha256="0hhjdx3vgzfwf368pvmapgb5hll659mwkyzvgagvzz90sm44134a"; depends=[ggplot2 rgbif rinat rbison ecoengine rebird AntWeb ggmap maptools rworldmap sp rgeos lubridate RColorBrewer httr rgdal leafletR whisker gistr]; }; sporm = derive { name="sporm"; version="1.1"; sha256="07sxz62h4jb7xlqg08sj4wpx121n9jfk65196mnxdvb36lqmb4hp"; depends=[]; }; sprint = derive { name="sprint"; version="1.0.7"; sha256="1yzx1qjpxx9yc0hbm1mmha5b7aq13iflq66af597b7yj6abm7zjp"; depends=[rlecuyer ff randomForest boot e1071]; }; sprinter = derive { name="sprinter"; version="1.1.0"; sha256="12v4l4fxijh2d46yzs0w4235a8raip5rfbxskl0dw7701ryh7n8g"; depends=[CoxBoost survival GAMBoost randomForestSRC LogicReg]; }; @@ -5747,12 +5869,13 @@ stab = derive { name="stab"; version="0.1.9"; sha256="1awf8bj3c4wvs818g4wfmw23vd stabledist = derive { name="stabledist"; version="0.6-6"; sha256="0s59jp3y5ks4rfj7x76vb9g3slbbn98lvki54lv96yxdfr8i7ry5"; depends=[]; }; stabs = derive { name="stabs"; version="0.5-1"; sha256="0mlwbf8wf38mr39si31i4iz00hpsmchbhgagwgsf3x9422zpq92p"; depends=[]; }; stacomirtools = derive { name="stacomirtools"; version="0.3"; sha256="1lbbnvmilf3j3hyhvpkyjd4b4sf3zwygilb8x0kjn2jfhkxnx4c1"; depends=[RODBC xtable]; }; +stagePop = derive { name="stagePop"; version="1.0-1"; sha256="0yb1dbgmns6km0p35wny6f4v7xl4225v8lww0wmzrvdw7l2m8m8d"; depends=[deSolve PBSddesolve]; }; stam = derive { name="stam"; version="0.0-1"; sha256="1x1j45fir64kffny0nssb2hwn4rcp8gd2cjv6fw4yy0l4d0xi5iv"; depends=[np sp]; }; stargazer = derive { name="stargazer"; version="5.1"; sha256="0ar0qm289ncsns2pqkabpyjc90ws0il1q7fp5206wqghgsvqjcc0"; depends=[]; }; startupmsg = derive { name="startupmsg"; version="0.9"; sha256="1l75w4v1cf4kkb05akhgzk5n77zsj6h20ds8y0aa6kd2208zxd9f"; depends=[]; }; stashR = derive { name="stashR"; version="0.3-5"; sha256="1lnpi1vb043aj4b9vmmy56anj4344709986b27hqaqk5ajzq9c3w"; depends=[filehash digest]; }; statar = derive { name="statar"; version="0.1.3"; sha256="1lkbp6ki4w0gm3l683xar44vrkw69883qvr73mc179bdh31znqli"; depends=[data_table dplyr ggplot2 Hmisc lazyeval lfe lubridate matrixStats stargazer stringr tidyr]; }; -statcheck = derive { name="statcheck"; version="1.0.0"; sha256="05hvwyy5fdy11v6dim0sm4n7qffhhkgpwg0120jhykjssyivimpx"; depends=[plyr]; }; +statcheck = derive { name="statcheck"; version="1.0.1"; sha256="01b40bjagkj6hfyq9ppdlaafwgykv8p9s8sm0abd3if82ivdpixj"; depends=[plyr]; }; statebins = derive { name="statebins"; version="1.0"; sha256="1mqky4nb31xjhn922csvv8ps2fwgcgazxs56rcn3ka32c59a4mmg"; depends=[ggplot2 scales gridExtra RColorBrewer]; }; statfi = derive { name="statfi"; version="0.9.8"; sha256="0kg9bj2mmd95ysg604rcg4szqx3whbqm14fwivnd110jgfy20gk2"; depends=[pxR]; }; statmod = derive { name="statmod"; version="1.4.20"; sha256="11986yjry1lg28s09q6vv2671x51nnfin6j0mpscq2ygyi615jwz"; depends=[]; }; @@ -5761,6 +5884,7 @@ statnet_common = derive { name="statnet.common"; version="3.2.2"; sha256="1xdkc1 steepness = derive { name="steepness"; version="0.2-2"; sha256="0bw7wm7n2xspkmj90qsjfssnig683s3qwg1ndkq2aw3f6clh4ilm"; depends=[]; }; stellaR = derive { name="stellaR"; version="0.3-3"; sha256="098sz6b8pl3fyca3g6myp97nna368xhxf8krmibadnnsr49q5zs9"; depends=[]; }; stepPlr = derive { name="stepPlr"; version="0.92"; sha256="16j32sk7ri4jdgss7vw5zz7s42rxk7rs376iyxzzpy1zcc9b64rv"; depends=[]; }; +stepR = derive { name="stepR"; version="1.0"; sha256="0sif4hrnxkpwimrlf6m3qdgk79vzca44apz0xqc0h647841n63ax"; depends=[]; }; stepp = derive { name="stepp"; version="3.0-11"; sha256="0jrwfvcgh3sjm3zag93kjyny2qqsyiw988vnx6jw7s31bv9g0d6s"; depends=[car survival]; }; stepwise = derive { name="stepwise"; version="0.3"; sha256="1lbx1bxwkf9dw6q46w40pp7h5nkxgghmx8rkpaymm6iybc7gyir2"; depends=[]; }; stilt = derive { name="stilt"; version="1.0.1"; sha256="1vrbbic0vqzgy574kzcr38iqyhax4wa6zl6w74n65z15map2fyma"; depends=[fields]; }; @@ -5769,7 +5893,7 @@ stinepack = derive { name="stinepack"; version="1.3"; sha256="0kjpcjqkwndqs7cyc6 stm = derive { name="stm"; version="1.0.8"; sha256="0dnzkqh3hnnjm0wmzpn48bwylmh49a8ib263bzvjaqpi70mck49p"; depends=[matrixStats slam lda stringr Matrix glmnet]; }; stocc = derive { name="stocc"; version="1.23"; sha256="183rv1l1hpa691f3xf455bv8dzdw6ac79zg3v99zksli6i7c8jdz"; depends=[truncnorm coda Matrix fields]; }; stochprofML = derive { name="stochprofML"; version="1.2"; sha256="0gqfm2l2hq1dy3cvg9v2ksphydqdmaj8lppl5s5as2khnh6bd1l1"; depends=[MASS numDeriv]; }; -stochvol = derive { name="stochvol"; version="0.9-1"; sha256="09v3b49p671i7y1xprija5m3pbcvry1axjxhgzyvb1bsivdlr4p3"; depends=[coda Rcpp Rcpp]; }; +stochvol = derive { name="stochvol"; version="1.0.0"; sha256="1c083gmfq9ldd41235shcb5i3ggd92fxvimhaavljnr1wsls5f2b"; depends=[coda Rcpp Rcpp]; }; stockPortfolio = derive { name="stockPortfolio"; version="1.2"; sha256="0k5ss6lf9yhcvc4hwqmcfpdn6qkbq5kaw0arldkl46391kac3bd1"; depends=[]; }; stoichcalc = derive { name="stoichcalc"; version="1.1-3"; sha256="0z9fnapibfp070jxg27k74fdxpgszl07xiqfj448dkydpg8ydkrb"; depends=[]; }; stosim = derive { name="stosim"; version="0.0.12"; sha256="0c4sj5iirm542hx782izfdmy2m3kl5q28l10xjj0ib4xn5y6yx3c"; depends=[tcltk2 Rcpp Rcpp]; }; @@ -5790,11 +5914,11 @@ stringi = derive { name="stringi"; version="0.4-1"; sha256="01ig59cmvrk9vfh4l84i stringr = derive { name="stringr"; version="0.6.2"; sha256="0dv7dd0xsivlccnf9pr5kb7zirgqn9mc6lgw5hnmkbb0s1qrrz63"; depends=[]; }; strucchange = derive { name="strucchange"; version="1.5-0"; sha256="17ikp36ahnsx1q3avqkz5r2n2yagzq7j6m515vdm8rxgv0538is3"; depends=[zoo sandwich]; }; structSSI = derive { name="structSSI"; version="1.1"; sha256="0rmf3q65adrqh9nrc4apqm4ca7frpwqr6xh80b4mxiz0z4wfcv9q"; depends=[igraph rjson ggplot2 reshape2]; }; -strum = derive { name="strum"; version="0.5"; sha256="1mcfswy052nppaddy7y96fr2dx1z62qhr9d7drbrd1mlayyhdsd8"; depends=[pedigree Matrix MASS Rcpp Rcpp RcppArmadillo]; }; +strum = derive { name="strum"; version="0.5.1"; sha256="1maws316zqhgvv2iq1iqhybxqx3rws9rnn7zxf07ksdxmqqqkcbj"; depends=[pedigree Matrix MASS Rcpp Rcpp RcppArmadillo]; }; strvalidator = derive { name="strvalidator"; version="1.4.0"; sha256="1zgfy5w4qwcm3jdqigahxi7xn8328jr568ssbj99ibzdj0m0hmfw"; depends=[gridExtra ggplot2 gWidgets gtable plyr scales gWidgetsRGtk2 RGtk2 data_table]; }; -stsm = derive { name="stsm"; version="1.4"; sha256="0j6kvsij6rsvkjc4q1m9vi9afvsib8x6zwjka1xwbp8g6fzamjq4"; depends=[KFKSDS stsm_class]; }; +stsm = derive { name="stsm"; version="1.7"; sha256="080xakf7rf53vzv64g338hz87sk4cqfwd6ly4f122sxvn4xypq3n"; depends=[KFKSDS]; }; stsm_class = derive { name="stsm.class"; version="1.3"; sha256="19jrja5ff31gh5k2zqhqsyd7w2ivr4s6bkliash6x8fmd22h5zs8"; depends=[]; }; -stylo = derive { name="stylo"; version="0.5.8-2"; sha256="1vslcn0gnzvsznashivpfsh45z1kjzpx55lq58s2ryaz8hdigy41"; depends=[tcltk2 ape pamr e1071 class lattice tsne]; }; +stylo = derive { name="stylo"; version="0.5.9"; sha256="061nfjh932qjlzvnarpwvzar0qv7ij8l6m3iax1jilygzhfqfyin"; depends=[tcltk2 ape pamr e1071 class lattice tsne]; }; suRtex = derive { name="suRtex"; version="0.9"; sha256="0xcy3x1079v10bn3n3y6lxignb9n3h57w4hhrvzi5y14x05jjyda"; depends=[]; }; subgroup = derive { name="subgroup"; version="1.1"; sha256="1n3qw7vih1rngmp4fwjbs050ngby840frj28i8x7d7aa52ha2syf"; depends=[]; }; subplex = derive { name="subplex"; version="1.1-4"; sha256="0c6y5ibyxh0mpn77f7kwrmkpb3mah10hbqhwqmz4i1lfv58mb4zk"; depends=[]; }; @@ -5820,6 +5944,7 @@ survC1 = derive { name="survC1"; version="1.0-2"; sha256="1bidjhq3k5ab7gqj1b2afn survIDINRI = derive { name="survIDINRI"; version="1.1-1"; sha256="03lsypx189zm28gv764gdq24a18jj3kpdk91ssa501qxj5jv7v29"; depends=[survival survC1]; }; survMisc = derive { name="survMisc"; version="0.4.4"; sha256="0ir84sb2gj1aqglifrxx66sjirxgz3bkgyh1l2vcmyndnad871jr"; depends=[survival ggplot2 KMsurv combinat Hmisc zoo data_table km_ci gridExtra rpart gam]; }; survPresmooth = derive { name="survPresmooth"; version="1.1-8"; sha256="1qva7yx4vv99mgh3wqxdnbasa1gy0ixxyxpqrfbn6827whjzf91m"; depends=[]; }; +survRM2 = derive { name="survRM2"; version="1.0"; sha256="19lfs66x2zh7cd4s04ry3sd75q4fm8a3xmpl1b0jzvldhnq2yrgz"; depends=[survival]; }; survSNP = derive { name="survSNP"; version="0.23.2"; sha256="0vpk5qdvsagv5pnap7ja7smqvibvfp5v7smhikbbwl0h6l83jjw4"; depends=[survival Rcpp lattice foreach xtable Rcpp]; }; surveillance = derive { name="surveillance"; version="1.8-3"; sha256="10d170l0ah92awpa9cafxshpvmj3d206fqn5sm7bd73q87mvbgdp"; depends=[sp xtable polyCub Rcpp MASS Matrix spatstat Rcpp]; }; survexp_fr = derive { name="survexp.fr"; version="1.0"; sha256="12rjpnih0xld4dg5gl7gwxdxmrdmyzsymm7j05v98ynldd1jkjl8"; depends=[survival]; }; @@ -5835,7 +5960,7 @@ svDialogstcltk = derive { name="svDialogstcltk"; version="0.9-4"; sha256="16166f svGUI = derive { name="svGUI"; version="0.9-55"; sha256="1fkkc12mhcbn3s2wzk0xdsp8jl2xmn48ys2an8jhxbww3gplk1rq"; depends=[]; }; svHttp = derive { name="svHttp"; version="0.9-55"; sha256="0qxsh6ifk3fszgzz497qwia4pxzplwraf2qnn5cqlv5l79nja5yq"; depends=[svMisc]; }; svIDE = derive { name="svIDE"; version="0.9-52"; sha256="19wsmi1i7nlnqdah1h2pxzsy8m50bnb282fdbj4219p86bb92a86"; depends=[svMisc XML]; }; -svKomodo = derive { name="svKomodo"; version="0.9-62"; sha256="1af22nfbhmx5b3n45k5xfwq667w4cd7m0g5hx5dvv2vfikr613nx"; depends=[svMisc]; }; +svKomodo = derive { name="svKomodo"; version="0.9-63"; sha256="0x2774lhckhg8kw6plsn6dpks3b3fisb0psa03p7di7jx8vrkg5n"; depends=[svMisc]; }; svMisc = derive { name="svMisc"; version="0.9-70"; sha256="1xprymz5hblbc929kmbaz0lj633xvgz6mm4snhhjib47cz5anl1w"; depends=[]; }; svSocket = derive { name="svSocket"; version="0.9-57"; sha256="0id93b500iybza6sbn60ybm91mkh5cjpvhypqs4f3dv13m6blb9j"; depends=[svMisc]; }; svSweave = derive { name="svSweave"; version="0.9-8"; sha256="0zkng8lwdpjdbic9f6jnk2ndxbch2kjyz71ds1bksvd3kmk03lks"; depends=[knitr]; }; @@ -5856,7 +5981,7 @@ swirl = derive { name="swirl"; version="2.2.21"; sha256="0lpin7frm1a6y9lz0nyykhv switchnpreg = derive { name="switchnpreg"; version="0.8-0"; sha256="1vaanz01vd62ds2g2xv4kjlnvp13h59n8yqikwx07293ixd4qhpw"; depends=[MASS fda expm HiddenMarkov]; }; sybil = derive { name="sybil"; version="1.2.6"; sha256="1d7q0dvpqxay86dy4zbllv78dsh0amr8n7wl0vkrb8jbakq4afip"; depends=[Matrix lattice]; }; sybilDynFBA = derive { name="sybilDynFBA"; version="0.0.2"; sha256="1sqk6dwwfrwvgkwk6mra0i1dszhhvcwm58ax6m89sxk8n0nbmr4b"; depends=[sybil]; }; -sybilEFBA = derive { name="sybilEFBA"; version="1.0.1"; sha256="1advbbsyig49av7sbpbvs47xzg6f8czjb1938ynd0n2yq1bgq5xm"; depends=[sybil Matrix]; }; +sybilEFBA = derive { name="sybilEFBA"; version="1.0.2"; sha256="07c32xwql7sr217j8ixqd2pj43hhyr99vjdh7c106lsmqd1pifa4"; depends=[sybil Matrix]; }; sybilSBML = derive { name="sybilSBML"; version="2.0.8"; sha256="1sxp0naws7d1ak0xna1sy87zzjrravwax0qvcd6vy4p0f39z06ci"; depends=[Matrix sybil]; }; sybilccFBA = derive { name="sybilccFBA"; version="1.0.0"; sha256="1fmhgyqzipddcqx2srms9bgigjmijasxhsmivv6c45ln23qjvgf5"; depends=[sybil Matrix]; }; sybilcycleFreeFlux = derive { name="sybilcycleFreeFlux"; version="1.0.1"; sha256="0ffmgnr239xz8864vmrqlhwwc97fqzzib6kwrsm7bszdnw1kkv3r"; depends=[sybil Matrix MASS]; }; @@ -5882,18 +6007,18 @@ tabplot = derive { name="tabplot"; version="1.1"; sha256="0vyc6b6h540sqwhrza2ijg tabplotd3 = derive { name="tabplotd3"; version="0.3.3"; sha256="0mbj45vb17wlnndpkhvq7xaawsb814x7zxa4rqbfgidvbm1p3abv"; depends=[tabplot httpuv Rook brew RJSONIO]; }; tabuSearch = derive { name="tabuSearch"; version="1.1"; sha256="0bri03jksm314xy537dldbdvgyq6sywfmpmj2g2acdcli31kkpq0"; depends=[]; }; tagcloud = derive { name="tagcloud"; version="0.5"; sha256="0d6h54p20pjnh1y7bw381nqbml1hv5x71gm33mgrzcib7mqa0c0b"; depends=[Rcpp RColorBrewer Rcpp]; }; -tau = derive { name="tau"; version="0.0-18"; sha256="10akzwf0fi05vplgy4njzrb4jdqa079zhycri4014w8sihb5msan"; depends=[]; }; +tau = derive { name="tau"; version="0.0-18"; sha256="04rj3jrcz4h60dqm1xmnmpr52csz1s7rf2wv6ivybgyvbq0w2ijf"; depends=[]; }; tawny = derive { name="tawny"; version="2.1.2"; sha256="0ihg3qlng8swak1dfpbnlx5xc45d1i9rgqawmqa97v5m91smfa71"; depends=[lambda_r lambda_tools futile_logger futile_matrix tawny_types zoo xts PerformanceAnalytics quantmod]; }; tawny_types = derive { name="tawny.types"; version="1.1.3"; sha256="1v0k6nn45rdczjn5ymsp2fqq0ijnlniyf3bc08ibd8yd1jcdyjnj"; depends=[lambda_r lambda_tools futile_logger futile_options zoo xts quantmod]; }; taxize = derive { name="taxize"; version="0.5.2"; sha256="1141ypz76nda9ij0fr63kgjagj9al63gnqwxa7ld7v9xzig8zgyp"; depends=[XML RCurl stringr plyr httr jsonlite foreach ape Taxonstand reshape2 data_table vegan bold]; }; -tbart = derive { name="tbart"; version="0.9.1"; sha256="1xpv9vfak57836c50n7rg9hrxd6iz6378jpddsd4zm7pvnzzhhim"; depends=[Rcpp sp Rcpp]; }; +tbart = derive { name="tbart"; version="1.0"; sha256="0m8l9ic7na70il6r9ha0pyrjwznbgjq7gk5xwa5k9px4ysws29k5"; depends=[Rcpp sp Rcpp]; }; tbdiag = derive { name="tbdiag"; version="0.1"; sha256="1wr2whgdk84426hb2pf8iiyradh9c61gyazvcrnbkgx2injkz65q"; depends=[]; }; tcR = derive { name="tcR"; version="1.1"; sha256="0z5v42yalza10bizl6kw54saiawj9y33g0jwzsqzzaxfdvsxd2gz"; depends=[ggplot2 dplyr gridExtra reshape2 Rcpp data_table gtable roxygen2 stringdist Rcpp]; }; tcltk2 = derive { name="tcltk2"; version="1.2-11"; sha256="1ibxld379600xx7kiqq3fck083s8psry12859980218rnzikl65d"; depends=[]; }; tclust = derive { name="tclust"; version="1.2-3"; sha256="0a1b7yp4l9wf6ic5czizyl2cnxrc1virj0icr8i6m1vv23jd8jfp"; depends=[mvtnorm sn mclust cluster]; }; tdm = derive { name="tdm"; version="3.0.3"; sha256="01xy090h9idw05jssfgdarbqp5d1vsiir5x7fr1ylaz0k8ai23d4"; depends=[rjags coda png deSolve]; }; tdthap = derive { name="tdthap"; version="1.1-7"; sha256="0lqcw4bzjd995pwn2yrmzay82gnkxnmxxsqplpbn5gg8p6sf5qqk"; depends=[]; }; -teigen = derive { name="teigen"; version="2.0.7"; sha256="0pyxpmmd4s6azq8lzn0lrg7jkr7g638xkhljx1w5bval6cq2bcwk"; depends=[]; }; +teigen = derive { name="teigen"; version="2.0.8"; sha256="0gh5p2rwv1krrbq92wpgl1ya74vrdxhsagd7r7wvyxvxdv3j94v5"; depends=[]; }; tempdisagg = derive { name="tempdisagg"; version="0.24.0"; sha256="02ld14mppyyqvgz537sypr3mqc758cchfcmpj46b7wswwa2y7fyz"; depends=[]; }; tensor = derive { name="tensor"; version="1.5"; sha256="19mfsgr6vz4lgwidm80i4yw0y1dr3n8i6qz7g4n2xa0k74zc5pp1"; depends=[]; }; tensorA = derive { name="tensorA"; version="0.36"; sha256="1xpczn94a6vfkfibfvr71a7wccksg16pc22h0inpafna4qpygcwp"; depends=[]; }; @@ -5906,10 +6031,10 @@ testthat = derive { name="testthat"; version="0.9.1"; sha256="0hbkyfx54fz4lwyz3a testthatsomemore = derive { name="testthatsomemore"; version="0.1"; sha256="0j9sszm4l0mn7nqz47li6fq5ycb3yawc2yrad9ngb75cvp47ikkk"; depends=[testthat]; }; texmex = derive { name="texmex"; version="2.1"; sha256="17x4xw2h4g9a10zk4mvi3jz3gf4rf81b29hg2g3gq6a6nrxsj8sy"; depends=[mvtnorm]; }; texreg = derive { name="texreg"; version="1.34"; sha256="03w8fk5lkpgag22a63jnhf0cn3l5ryjh4pkfhxgqzrijvrr1v2cb"; depends=[]; }; -textcat = derive { name="textcat"; version="1.0-2"; sha256="0m8jbw8k8h6m9q9x25gvx0glzwhhpy73pjv4zivivna5zxapgi23"; depends=[tau slam]; }; +textcat = derive { name="textcat"; version="1.0-2"; sha256="0sjhahmqva9pwp75zwxxf8g1cw38awid3w6rx9xfx73cpj2blcz3"; depends=[tau slam]; }; textir = derive { name="textir"; version="2.0-2"; sha256="19n14nqx7gcp5ypfqwmk80lxxwqc0dklm09z3f9czg68j6qv181i"; depends=[distrom gamlr Matrix]; }; textometry = derive { name="textometry"; version="0.1.4"; sha256="17k3v9r5d5yqgp25bz69pj6sw2j55dxdchq63wljxqkhcwxyy9lh"; depends=[]; }; -textreg = derive { name="textreg"; version="0.1"; sha256="13pp9fqzka0vlqxy0brk1a637sy7yxlfhq6idrir3psskgxyqkmn"; depends=[tm NLP Rcpp Rcpp]; }; +textreg = derive { name="textreg"; version="0.1.2"; sha256="0qya0czbi78a29jp9pd3lbqh574d9k0i340hrgc6jmdhwzhimhk7"; depends=[tm NLP Rcpp Rcpp]; }; tfer = derive { name="tfer"; version="1.1"; sha256="19d31hkxs6dc4hvj5495a3kmydm29mhp9b2wp65mmig5c82cl9ck"; depends=[]; }; tfplot = derive { name="tfplot"; version="2014.2-2"; sha256="1jrkzccvqmwghp6nhxay0m1qx8r5wa96zb9r8v6qihryi9m3amhs"; depends=[tframe]; }; tframe = derive { name="tframe"; version="2015.1-1"; sha256="10igwmrfslyz3z3cbyldik8fcxq43pwh60yggka6mkl0nzkxagbd"; depends=[]; }; @@ -5929,12 +6054,12 @@ tigerstats = derive { name="tigerstats"; version="0.2"; sha256="1wj4z1jj7jg3885n tightClust = derive { name="tightClust"; version="1.0"; sha256="0psyzk6d33qkql8v6hzkp8mfwb678r95vfycz2gh6fky7m5k3yyz"; depends=[]; }; tikzDevice = derive { name="tikzDevice"; version="0.8.1"; sha256="0262szfzv4yrfal19giinrphra1kfcm2arfckql4rf2zsq13rw35"; depends=[filehash]; }; tileHMM = derive { name="tileHMM"; version="1.0-6"; sha256="18vqj7fdh4knnjk9s7yk2bgn3qwqz92fmm5fdny21gi0wl4qgdsd"; depends=[]; }; -timeDate = derive { name="timeDate"; version="3011.99"; sha256="1fav8pi305vpbr7gkvpj5y9pgmck8359ba6gviki6h5xxs8zxi0s"; depends=[]; }; +timeDate = derive { name="timeDate"; version="3012.100"; sha256="0cn4h23y2y2bbg62qgm79xx4cvfla5xbpmi9hbdvkvpmm5yfyqk2"; depends=[]; }; timeROC = derive { name="timeROC"; version="0.2"; sha256="1ikd2wr5cja784hihqdyk7mwky18czz58sl0xrvmzhc67153a4jz"; depends=[pec mvtnorm timereg]; }; -timeSeries = derive { name="timeSeries"; version="3011.98"; sha256="1smcm4k1a6br696p39s9w9ivzip33mspsixf6c72i01zgbrj6qnc"; depends=[timeDate]; }; +timeSeries = derive { name="timeSeries"; version="3012.99"; sha256="06lz9xljzadfs94xwn8578h8mw56wp923k0xfppzq69hcpcrhsvf"; depends=[timeDate]; }; timeit = derive { name="timeit"; version="0.2.1"; sha256="0fsa67jyk4yizyd079265jg6fvjsifkb60y3fkkxsqm7ffqi6568"; depends=[microbenchmark]; }; timeline = derive { name="timeline"; version="0.9"; sha256="0zkanz3ac6cgsfl80sydgwnjrj9rm7pcfph7wzl3xkh4k0inyjq3"; depends=[ggplot2]; }; -timeordered = derive { name="timeordered"; version="0.9.7"; sha256="0mb2sa74var1k65a90vkqhk4b4hykb8ngs7cz9j7cgn2x91x4qzq"; depends=[igraph plyr]; }; +timeordered = derive { name="timeordered"; version="0.9.8"; sha256="1j0x2v22ybyl3l9r3aaz5a3bxh0zq81rbga9gh63zads2xy5axmf"; depends=[igraph plyr]; }; timereg = derive { name="timereg"; version="1.8.6"; sha256="02whk0wqd1n2dzsfqvhs4plgkvrj04r1i83lvsa2j2qwjvbf831p"; depends=[survival lava]; }; timesboot = derive { name="timesboot"; version="1.0"; sha256="1ixmcigi1bf42np93md8d3w464papg9hp85v0c3hg3vl4nsm2bji"; depends=[boot]; }; timeseriesdb = derive { name="timeseriesdb"; version="0.1"; sha256="1zwvjnx4b020avyxjx2nwg9n8p8bdrn038mfcl53y9cnxj3w5wsq"; depends=[DBI]; }; @@ -5959,8 +6084,9 @@ tm_plugin_lexisnexis = derive { name="tm.plugin.lexisnexis"; version="1.1"; sha2 tm_plugin_mail = derive { name="tm.plugin.mail"; version="0.1"; sha256="0ca2w2p5zv3qr4zi0cj3lfz36g6xkgkbck8pdxq5k65kqi5ndzyp"; depends=[NLP tm]; }; tm_plugin_webmining = derive { name="tm.plugin.webmining"; version="1.2.2"; sha256="08nm2iwx897d5v144lh2gj5c3yprnky48s882p278b8blmdwnfn0"; depends=[NLP tm boilerpipeR RCurl XML RJSONIO]; }; tmap = derive { name="tmap"; version="0.6"; sha256="10aw79k3vdi3f20i4clsbvdlfylg34z02ah36wz5yj7y68fm5ijh"; depends=[rgeos gridBase sp rgdal classInt RColorBrewer igraph fields vegan]; }; +tmg = derive { name="tmg"; version="0.3"; sha256="0yqavibinzsdh85izzsx8b3bb9l36vzkp5a3bdwdbh410s62j68a"; depends=[Rcpp Rcpp RcppEigen]; }; tmle = derive { name="tmle"; version="1.2.0-4"; sha256="11hjp2vak1zv73326yzzv99wg8a2xyvfgvbyvx3jfxkgk33mybbm"; depends=[SuperLearner]; }; -tmle_npvi = derive { name="tmle.npvi"; version="0.8.1"; sha256="1vxkhf17x3zsf4fvx458qyqn0xi460db6kw6zmaw6jhagjk5yaj0"; depends=[R_utils MASS sgeostat]; }; +tmle_npvi = derive { name="tmle.npvi"; version="0.9.3"; sha256="0njrjwjjn853iahccg37dns7pm14qr05xbkqnd1rhzg4lcl34fyb"; depends=[R_utils R_methodsS3 R_oo MASS Matrix sgeostat geometry]; }; tmvtnorm = derive { name="tmvtnorm"; version="1.4-9"; sha256="1dacdhqv6bb29a81bmxp8hxy4hragpg8mb5kql4cp59q08zmizyi"; depends=[mvtnorm Matrix gmm]; }; tnet = derive { name="tnet"; version="3.0.11"; sha256="00hifb145w0a9f5qi3gx16lm1qg621jp523vswb8h86jqmxcczbc"; depends=[igraph survival]; }; toaster = derive { name="toaster"; version="0.2.5"; sha256="0yybv6lq22mzawyvywh1dpg5p5mx5qqqssdhgd3ff78cqp7j298r"; depends=[RODBC plyr reshape2 ggplot2 scales RColorBrewer wordcloud ggmap]; }; @@ -5976,7 +6102,6 @@ toxtestD = derive { name="toxtestD"; version="2.0"; sha256="0b7hmpfhwg626r8il12s tpe = derive { name="tpe"; version="1.0.1"; sha256="0zsa8vb4qmln3sb4lplv43lh50yys9vfd3rxfp6qxqqjxivd0xsh"; depends=[]; }; tpr = derive { name="tpr"; version="0.3-1"; sha256="0nxl0m39zaii6rwm35hxcdk6iy2f729jjmhc2cpr8h0mgvgqf19d"; depends=[lgtdl]; }; track = derive { name="track"; version="1.0-15"; sha256="05v6p2mfms59p3cs4vwpzvi9gaadrin50fc39l5kjqwqa9vhmkz7"; depends=[]; }; -trackObjs = derive { name="trackObjs"; version="1.0-18"; sha256="0wwm9yx5wnmgvyd7zczkv8mdzixazb3kps112w19rdbnkiq1db3d"; depends=[]; }; tractor_base = derive { name="tractor.base"; version="2.5.0"; sha256="17s4iyp67w7m8gslm87p3ic5r9iq7x1ifpxqrmnin3y5a3d04f5v"; depends=[reportr]; }; traitr = derive { name="traitr"; version="0.14"; sha256="1pkc8wcq55229wkwb54hg9ndbhlxziv51n8880z6yq73zac1hbmf"; depends=[digest proto gWidgets]; }; traj = derive { name="traj"; version="1.2"; sha256="0mq6xdbxjqjivxyy7cwaghwmnmb5pccrah44nmalssc6qfrgys4n"; depends=[cluster psych pastecs NbClust GPArotation]; }; @@ -5986,10 +6111,11 @@ translateR = derive { name="translateR"; version="1.0"; sha256="11kh9hjpsj5rfmzy transport = derive { name="transport"; version="0.6-3"; sha256="1sldlccsprzan1liyslzp9wzz3d36khyr6zri773npvnss9pa67w"; depends=[]; }; trapezoid = derive { name="trapezoid"; version="2.0-0"; sha256="0f6rwmnn61bj97xxdgbydi94jizv1dbq0qycl60jb4dsxvif8l3n"; depends=[]; }; treatSens = derive { name="treatSens"; version="1.0"; sha256="0g3v9b1kdndqls9h1ijp5v17ybb1710bdclid745y6lfkia1b71w"; depends=[]; }; -tree = derive { name="tree"; version="1.0-35"; sha256="1k8c2kjk53gix68frprlyx5ww7cm373vz1xg2r2jxbzxg1y4v691"; depends=[]; }; +tree = derive { name="tree"; version="1.0-35"; sha256="1cxn73rlr8s3qbq3icdh1v3jbbz913ns6xk6yzgk30ncifw4iq6g"; depends=[]; }; treebase = derive { name="treebase"; version="0.0-7.1"; sha256="0kj1cyk14j4qzm31f47a8g7qh4842rqkzr0fqh9i5c8kzrqxbc0g"; depends=[ape XML RCurl reshape2 data_table]; }; -treeclim = derive { name="treeclim"; version="1.0.10"; sha256="0sn64a4jvb4xls34w9n3r8daydnn0kk6c0v3zb9kn9mfpc7sqkbd"; depends=[Rcpp abind plyr ggplot2 lmtest lmodel2 np boot Rcpp RcppArmadillo]; }; +treeclim = derive { name="treeclim"; version="1.0.11"; sha256="09i7zxwdrbfgridxsm20r554nyvwp40ngc47isy16a7f1q3rwjah"; depends=[Rcpp abind plyr ggplot2 lmtest lmodel2 np boot Rcpp RcppArmadillo]; }; treecm = derive { name="treecm"; version="1.2.1"; sha256="02al6iz25pay7y1qmbpy04nw8dj9c5r7km6q5k3v3jdkfal6cm6k"; depends=[plyr]; }; +treelet = derive { name="treelet"; version="1.1"; sha256="0k3qhxjg7ws6jfhcvvv9jmy26v2wzi4ghnxnwpjm8nh7b90lbysd"; depends=[]; }; treemap = derive { name="treemap"; version="2.2"; sha256="0h4wkjw12n9awqsvrs72nmsxq3d5as3zjy8kyhw7715h1cvry769"; depends=[colorspace data_table ggplot2 gridBase igraph RColorBrewer shiny]; }; treethresh = derive { name="treethresh"; version="0.1-8"; sha256="1xkbqlr9gkpw6axzl7v5aipackhvy873yrpwn2b9zqr35pj06pr6"; depends=[EbayesThresh wavethresh]; }; triangle = derive { name="triangle"; version="0.8"; sha256="0jdphz1rf4cx4y28syfffaz7fbl41g3rw3mrv9dywycdznhxdnrp"; depends=[]; }; @@ -5998,7 +6124,7 @@ trimTrees = derive { name="trimTrees"; version="1.2"; sha256="0v75xf5186dy76332x trimcluster = derive { name="trimcluster"; version="0.1-2"; sha256="0lsgbg93hm0w1rdb813ry0ks2l0jfpyqzqkf3h3bj6fch0avcbv2"; depends=[]; }; trioGxE = derive { name="trioGxE"; version="0.1-1"; sha256="1ra86l3i7fhb6nsy8izixyvm6z23shv7fcjmnnpil54995j15ax4"; depends=[msm mgcv gtools]; }; trip = derive { name="trip"; version="1.1-19"; sha256="1353lzfgvq8236ijxy8521r7hhmgyfrvc17ga8p8c0851nx53xn3"; depends=[sp maptools MASS spatstat]; }; -tripEstimation = derive { name="tripEstimation"; version="0.0-41"; sha256="11cn9lz4vdcx8wb46cm5sj0rfjl9cs50z7zxfxrn79nz0pga4gwn"; depends=[lattice mgcv rgdal sp zoo]; }; +tripEstimation = derive { name="tripEstimation"; version="0.0-42"; sha256="17spnvrrqv89vldd496wc1psmaby0mhw9nh0qnfm7yc2jcqaf5nb"; depends=[lattice mgcv rgdal sp zoo]; }; tripack = derive { name="tripack"; version="1.3-6"; sha256="1dknz1arzfyknip04a9fxdhqmrkb0r0lr8hgria9s0d57hr1ay12"; depends=[]; }; trotter = derive { name="trotter"; version="0.6"; sha256="0i8r2f2klkkfnjm7jhvga3gx6m7r97pd73d88004jzlm9ficspgy"; depends=[]; }; trueskill = derive { name="trueskill"; version="0.1"; sha256="0mqvm64fcsxjlh789lqdk6l28q31yhh6jjirwjlgbpxxb90c5107"; depends=[]; }; @@ -6008,25 +6134,26 @@ truncgof = derive { name="truncgof"; version="0.6-0"; sha256="0b499i9zjwvva5jfl9 truncnorm = derive { name="truncnorm"; version="1.0-7"; sha256="1qac05z50618y4bw1d7yznsli1bv82s0g8h37iacrjrdkv87bmy7"; depends=[]; }; truncreg = derive { name="truncreg"; version="0.2-1"; sha256="0qvdfj93phk1s2p4n0rmpf8x9gj5n1j75h4z424mrg10r24699rd"; depends=[maxLik]; }; trust = derive { name="trust"; version="0.1-6"; sha256="1jghgwnazhqgyn2k0b3x4n8swncyy6dzlkv86chv98zw4s3bnlak"; depends=[]; }; -trustOptim = derive { name="trustOptim"; version="0.8.4.1"; sha256="1m4jp0nqrazpkpw0s8rnd5f4hhvckwy6kb6qh7zw9nmgq4nlb93k"; depends=[Matrix Rcpp Rcpp RcppEigen]; }; +trustOptim = derive { name="trustOptim"; version="0.8.5"; sha256="1y9krw2z5skkwgfdjagl8l04l9sbiqbk1fbxp30wrf4qj3pba5w6"; depends=[Rcpp Matrix Rcpp RcppEigen]; }; tsDyn = derive { name="tsDyn"; version="0.9-41"; sha256="1ssb0z35xmnwyrsvmk2jsxfd5h0xhnx8kp8qyxc43j4v2nz5l4kq"; depends=[mnormt mgcv nnet tseriesChaos tseries vars urca forecast MASS Matrix foreach]; }; tsModel = derive { name="tsModel"; version="0.6"; sha256="0mkmhzj4g38ngzfcfx0zsiqpxs2qpw82kgmm1b8gl671s4rz00zs"; depends=[]; }; tsbridge = derive { name="tsbridge"; version="1.1"; sha256="0mry3ia54cdfydpzm8asrq1ldj70gnpb5dqzj51w0jiyps2zlw6f"; depends=[mvtnorm tsbugs]; }; tsbugs = derive { name="tsbugs"; version="1.2"; sha256="130v4x6cfy7ddvhijsnvipm4ycrispkj1j0z5f326yb4v5lrk91x"; depends=[]; }; tsc = derive { name="tsc"; version="1.0-3"; sha256="1acsdkxizlkix1sskwqv2a80rshw6f14zvcsjhrmmdfd4bmwh36y"; depends=[]; }; -tseries = derive { name="tseries"; version="0.10-32"; sha256="0jz8a3z3hx2ps7krmpg6m10jvz5ddgmcrmnd38jpxb6ndnhh3pzw"; depends=[quadprog zoo]; }; +tscount = derive { name="tscount"; version="1.0.0"; sha256="0n01biifzjfvnj3zhrn87qigf4l1kij2zfqf6876qz8rps1jz626"; depends=[ltsa]; }; +tseries = derive { name="tseries"; version="0.10-33"; sha256="1ckncvzm5ili9ggzx09nx9hq1n2yz0kl3vxk1hmnxlklqm12fym3"; depends=[quadprog zoo]; }; tseriesChaos = derive { name="tseriesChaos"; version="0.1-13"; sha256="0f2hycxyvcaj3s1lmva1qy46xr6qi43k8fvnm4md5qj8jp2zkazg"; depends=[deSolve]; }; tsfa = derive { name="tsfa"; version="2014.2-2"; sha256="07g9qfdrhccl5dlsbpxn1ihavxljd9nq21hzbyn225cfi4bkx42h"; depends=[GPArotation dse EvalEst setRNG tframe tfplot]; }; tsintermittent = derive { name="tsintermittent"; version="1.5"; sha256="1qziwdpxfc2v010bk2cnhkrajza0z7lrrsjg06m49msyk5bk62z1"; depends=[MAPA]; }; tslars = derive { name="tslars"; version="1.0"; sha256="0ylpn4jxmrck7hna3j420kw2yhsrklrq2664w85z30xij3zrrrci"; depends=[]; }; tsne = derive { name="tsne"; version="0.1-2"; sha256="12q5s79r2949zhm61byd4dbgw6sz3bmxzcwr8b0wlp8g1xg4bhy6"; depends=[]; }; -tsoutliers = derive { name="tsoutliers"; version="0.4"; sha256="08b8ssd8ha2n96la1kc64w2r1616c2d417vr6292g8m60fvlcq48"; depends=[forecast polynom stsm stsm_class KFKSDS]; }; +tsoutliers = derive { name="tsoutliers"; version="0.6"; sha256="1cyh56i7dsnclphi81fab6k8vkdqv8ing2zmpfsjq4gvq76p7piw"; depends=[forecast polynom stsm KFKSDS]; }; tspmeta = derive { name="tspmeta"; version="1.1"; sha256="11kr5avf67v2cxy3k1yrpv9lcbmiprd0w43w7zvizhsij58h13vm"; depends=[ggplot2 TSP MASS BBmisc fpc vegan stringr splancs]; }; ttScreening = derive { name="ttScreening"; version="1.5"; sha256="0qn8lkvgvqpmm368fwpqkm09yaj9mw42mjlikyiwpv2wrgbpmg9n"; depends=[matrixStats corpcor MASS]; }; tth = derive { name="tth"; version="4.3-2"; sha256="1gs8xjljklvs0pavvn9f59y09hw7x2da58a46b5x01g08i0j8h1d"; depends=[]; }; ttutils = derive { name="ttutils"; version="1.0-1"; sha256="18mk30070mcplybg320vjbk9v5flxnbqi5gx0yyr1z6ymjmnrxbc"; depends=[]; }; ttwa = derive { name="ttwa"; version="0.8.5.1"; sha256="1lhypcwssq0dspizvln3w4dg16ad6mz8cj4w34c5vsrayqid7fyn"; depends=[data_table]; }; -tufterhandout = derive { name="tufterhandout"; version="1.2"; sha256="0g0av6qfm8bpvlhxb3cckzmn997af2h9j367j4afrip7sdzc9bn6"; depends=[rmarkdown knitr]; }; +tufterhandout = derive { name="tufterhandout"; version="1.2.1"; sha256="04fvvbx69a28nk7i4wz5ynamz1yvsa2ibz542r1xaq1ikk0ywqbw"; depends=[rmarkdown knitr]; }; tumblR = derive { name="tumblR"; version="1.0"; sha256="01y4vx72p8fvc4nx0y8j8i7gnb573zhvnb4ffl3kx6znzx6hz9ll"; depends=[httr RCurl ROAuth stringr RJSONIO]; }; tuneR = derive { name="tuneR"; version="1.2.1"; sha256="1f6mdkfwfy6r62sbwq37sylvcji6f3mj9w13sgicxjn6swbszf57"; depends=[signal]; }; tuple = derive { name="tuple"; version="0.4-02"; sha256="0fm8fsdfiwknjpc20ivi5m5b19r9scdxhzij70l8qi3ixw1f0rnk"; depends=[]; }; @@ -6035,10 +6162,10 @@ turfR = derive { name="turfR"; version="0.8-7"; sha256="007jmkppfv1x4zzvvd65fhg5 turner = derive { name="turner"; version="0.1.7"; sha256="1xckb750hbfmzhvabj0lzrsscib7g187b44ag831z58zvawwh772"; depends=[tester]; }; tvd = derive { name="tvd"; version="0.1.0"; sha256="07al7gpm81a16q5nppsyc5rhv6zzkcvw72isx955b1q189v073aw"; depends=[Rcpp Rcpp]; }; tvm = derive { name="tvm"; version="0.2"; sha256="1fwa37xnp3idal8v1xxlc9gr25595f644i7a3h8xpd0k086sp1dg"; depends=[ggplot2 reshape2]; }; -twang = derive { name="twang"; version="1.4-0"; sha256="0r9n0s421dhvsr3ppzhdxsq4viz18mbi9mglhyyl5r6slzyb4m0x"; depends=[gbm survey xtable latticeExtra]; }; +twang = derive { name="twang"; version="1.4-9.3"; sha256="06lgawzq3b2jg84rvg24582ndlk8qji4gcbvxz5acf302cvdnmji"; depends=[gbm survey xtable lattice latticeExtra]; }; tweedie = derive { name="tweedie"; version="2.2.1"; sha256="1fsi0qf901bvvwa8bb6qvp90fkx1svzswljlvw4zirdavy65w0iq"; depends=[]; }; twiddler = derive { name="twiddler"; version="0.5-0"; sha256="0r16nfk2afcw7w0j0n3g0sjs07dnafrp88abwcqg3jyvldp3kxnx"; depends=[]; }; -twitteR = derive { name="twitteR"; version="1.1.7"; sha256="0zkz44brvkrsp1g7i90j2lvnj462vav706vqyxv0jfkp52f0s1z4"; depends=[ROAuth RCurl rjson]; }; +twitteR = derive { name="twitteR"; version="1.1.8"; sha256="1gzahkipzpgfc160sgxzzga7byncih4j30r303m788c9lxk5dbxv"; depends=[bit64 rjson DBI httr]; }; twoStageGwasPower = derive { name="twoStageGwasPower"; version="0.99.0"; sha256="1xvy6v444v47i29aw54y29xiizkmryv8p3mjha93xr3xq9bx2mq7"; depends=[]; }; twostageTE = derive { name="twostageTE"; version="1.2"; sha256="05k9lvkailv06cah71p71hnx8in045nxz6waplsccznplhgqg5ar"; depends=[isotone]; }; txtplot = derive { name="txtplot"; version="1.0-3"; sha256="1949ab1bzvysdb79g8x1gaknj0ih3d6g63pv9512h5m5l3a6c31h"; depends=[]; }; @@ -6051,8 +6178,8 @@ unbalhaar = derive { name="unbalhaar"; version="2.0"; sha256="0v6bkin1cakwl9lmv4 uniCox = derive { name="uniCox"; version="1.0"; sha256="1glgk6k8gwxk3haqaswd2gmr7a2hgwjkwk2i1qc5ya7gg8svyavv"; depends=[survival]; }; uniReg = derive { name="uniReg"; version="1.0"; sha256="1xl19dqnxxibgiiny9ysll2z8j1i70qrszf4xbacq1a6z31vm840"; depends=[DoseFinding MASS mvtnorm quadprog SEL]; }; uniftest = derive { name="uniftest"; version="1.0"; sha256="12d246f8984p4hc69p5nr5yzxs1v247yjgpxx1f0mbhkyvwp6r67"; depends=[]; }; -unittest = derive { name="unittest"; version="1.1-1"; sha256="030li1c9qcl321arbzv52m6j9ss05z7sljsb2mmggxyb0r0m0y3b"; depends=[]; }; -unmarked = derive { name="unmarked"; version="0.10-4"; sha256="1mb9c6h51y476y50q4bh9v6wx6d91b2npf18a66gjs406nra3yck"; depends=[reshape lattice Rcpp plyr Rcpp RcppArmadillo]; }; +unittest = derive { name="unittest"; version="1.2-0"; sha256="1g3f36kikxrzsiyhwpl73q2si5k28drcwvvrqzsqmfyhbjb14555"; depends=[]; }; +unmarked = derive { name="unmarked"; version="0.10-6"; sha256="07mw9rg4i81fqdkgkpcb7kd7235hn4nyxpbf5b8vxzsly81ffpz7"; depends=[reshape lattice Rcpp plyr Rcpp RcppArmadillo]; }; untb = derive { name="untb"; version="1.7-2"; sha256="1ha0xj94sz1r325qb4sb5hla9hw1gbqr76703vk792x9696skhji"; depends=[Brobdingnag partitions polynom]; }; upclass = derive { name="upclass"; version="2.0"; sha256="0jkxn6jgglw6pzzbcvi1pnq4hwfach3xbi13zwml4i83s3n5b0vg"; depends=[mclust]; }; uplift = derive { name="uplift"; version="0.3.5"; sha256="11xikfmg6dg8mhwqq6wq9j9aw4ljh84vywpm9v0fk8r5a1wyy2f6"; depends=[RItools MASS coin tables penalized]; }; @@ -6067,20 +6194,20 @@ ustyc = derive { name="ustyc"; version="1.0.0"; sha256="1267bng2dz3229cbbq47w22i utility = derive { name="utility"; version="1.3"; sha256="0ng7jc45k9rgj9055ndmgl308zjvxd2cjsk2pn57x44rl1lldcj5"; depends=[]; }; uuid = derive { name="uuid"; version="0.1-1"; sha256="1b35h2n86233zb6dwkgxxlvnlld8kmv0j6j3m31xjbpmc3ppr7w3"; depends=[]; }; vacem = derive { name="vacem"; version="0.1-1"; sha256="0lh32hj4g1hsa45v6pmfyj1hw0klk8gr1k451lvs4hzpkkcwkqbn"; depends=[foreach]; }; -varComp = derive { name="varComp"; version="0.1-317"; sha256="16nmhipi0nlh0igc3g9jbv1pqvigmgxy8f395xx6hbzyg87x2ha9"; depends=[quadprog Matrix MASS CompQuadForm RLRsim SPA3G mvtnorm nlme]; }; +varComp = derive { name="varComp"; version="0.1-360"; sha256="18xazjx102j6v1jgswxjdqjb0hq6hd646yhwb7bcplqyls9hzha0"; depends=[quadprog Matrix MASS CompQuadForm RLRsim SPA3G mvtnorm nlme]; }; varSelRF = derive { name="varSelRF"; version="0.7-5"; sha256="1800d9vvkqpxjvmiqdr610hw7ji79j0wsbl823s097dndmv51axk"; depends=[randomForest]; }; varSelectIP = derive { name="varSelectIP"; version="0.2-1"; sha256="180lzsg48hnlcmhpk0a5yzmy2syw8yr7f5npnyspx3897hjag1vp"; depends=[MASS mvtnorm]; }; varbvs = derive { name="varbvs"; version="1.0"; sha256="0ywgb6ibijffjjzqqb5lvh1lk5qznwwiq7kbsyzkwcxbp8xkabjw"; depends=[]; }; vardiag = derive { name="vardiag"; version="0.2-0"; sha256="0avj900zx4nr67dk08n0n6arxx2cb2ymm0kd5xxnzsmyrmwm40mm"; depends=[]; }; -vardpoor = derive { name="vardpoor"; version="0.2.4"; sha256="1wjwg86kv4q00mhngjybsvi9zzxpdxv2vycdilkjyckmqy5miwrx"; depends=[data_table laeken stringr reshape2 foreach plyr gdata MASS]; }; +vardpoor = derive { name="vardpoor"; version="0.2.6"; sha256="1csnvdpcllq1lrzq3xqhgbnrf3gdah011rknhbl5z67zwa8gs4w1"; depends=[data_table laeken stringr reshape2 foreach plyr gdata MASS]; }; vars = derive { name="vars"; version="1.5-2"; sha256="1q45z5b07ww4nafrvjl48z0w1zpck3cd8fssgwgh4pw84id3dyjh"; depends=[MASS strucchange urca lmtest sandwich]; }; vartors = derive { name="vartors"; version="0.2.6"; sha256="04dynqs903clllk9nyynh3dr7msxn5rr5jmw6ql86ppd5w3da0rl"; depends=[]; }; vbdm = derive { name="vbdm"; version="0.0.4"; sha256="1rbff0whhbfcf6q5wpr3ws1n4n2kcr79yifcni12vxg69a3v6dd3"; depends=[]; }; vbsr = derive { name="vbsr"; version="0.0.5"; sha256="1avskbxxyinjjdga4rnghcfvd4sypv4m39ysfaij5avvmi89bx3b"; depends=[]; }; vcd = derive { name="vcd"; version="1.3-2"; sha256="1ww69sgg178aqcs90mm599nlr6hnxn54d2wzyhddgx1z3qxhzwjd"; depends=[MASS colorspace]; }; vcdExtra = derive { name="vcdExtra"; version="0.6-5"; sha256="0z2xyvmxka1awx0bnqvp6d16zj8gb6jhj0q4xil7r8ya4hqqmmac"; depends=[vcd gnm MASS]; }; -vcrpart = derive { name="vcrpart"; version="0.3-1"; sha256="1msnwiz8xdlzaks5xwn6wricqayfmqfqprnys3x4f2z95anai214"; depends=[partykit nlme rpart numDeriv ucminf zoo sandwich strucchange]; }; -vdg = derive { name="vdg"; version="1.0"; sha256="1agikw9w9rnn3b2q8lp9y3bxjrf8vx24j624wf19bvx5s3ghqc36"; depends=[ggplot2 quantreg proxy]; }; +vcrpart = derive { name="vcrpart"; version="0.3-2"; sha256="1mvhashafvc7ssg60np1g6i9bjvc00dniwilw6x54gnlpczq1qrp"; depends=[partykit nlme rpart numDeriv ucminf zoo sandwich strucchange]; }; +vdg = derive { name="vdg"; version="1.0.1"; sha256="1z9kgg9bsa80px94cwkna9hsjfa69kvhssmqlcidzb4h5hg7a3fd"; depends=[ggplot2 quantreg proxy]; }; vdmR = derive { name="vdmR"; version="0.1.0"; sha256="0rv9c6bn711dn1fhgmr4ig0lr9s6yjk7r5ccvyiadgn6g5mr2bds"; depends=[ggplot2 plyr maptools gridSVG rjson GGally Rook dplyr]; }; vec2dtransf = derive { name="vec2dtransf"; version="1.1"; sha256="029xynay9f9rn0syphh2rhd3szv50ib4r0h0xfhhvbbb37h5dc9s"; depends=[sp]; }; vecsets = derive { name="vecsets"; version="1.1"; sha256="0k27g3frc9y9z2qlm19kfpls6wl0422dilhdlk6096f1fp3mc6ij"; depends=[]; }; @@ -6098,13 +6225,12 @@ violinmplot = derive { name="violinmplot"; version="0.2.1"; sha256="1j3hb03y988x vioplot = derive { name="vioplot"; version="0.2"; sha256="16wkb26kv6qr34hv5zgqmgq6zzgysg9i78pvy2c097lr60v087v0"; depends=[sm]; }; viopoints = derive { name="viopoints"; version="0.2-1"; sha256="0cpbkkzm1rxch8gnvlmmzy8g521f5ang3nhlcnin419gha0w6avf"; depends=[]; }; virtualspecies = derive { name="virtualspecies"; version="1.0"; sha256="1qg5106ja17nsqzjnyswjf438f55195l197pizkybb2ilg4fw0x1"; depends=[raster ade4 dismo rworldmap]; }; -visova = derive { name="visova"; version="1.1"; sha256="1ag1vs5alh62yj5722qb74rmvvxv7906h7nb5m31bac2p4ldbfar"; depends=[RJSONIO]; }; visreg = derive { name="visreg"; version="2.1-0"; sha256="1l8az4ykfr3rfgxx7wj9qvma77lcgr3pa60cxzqabm9cg6622fsf"; depends=[lattice]; }; -visualFields = derive { name="visualFields"; version="0.4"; sha256="07pkaccnk8c9zzizpcdw82vcbqdng2bi9aczpa68i7fz24bvcfan"; depends=[gridBase flip matrixStats Hmisc]; }; +visualFields = derive { name="visualFields"; version="0.4.2"; sha256="14plg94g4znl8n6798na2rivjjamjgayqkk1qwn1nx5df040l4q5"; depends=[gridBase flip matrixStats Hmisc]; }; visualize = derive { name="visualize"; version="4.2"; sha256="1jgk7j0f3p72wbqnmplrgpy7hlh7k2cmvx83gr2zfnbhygdi22mk"; depends=[]; }; vitality = derive { name="vitality"; version="1.1"; sha256="048i6ralh3gbh3hqkdxj3sdkxp1nrjbp3jpwrva4sa8d69vwxla5"; depends=[IMIS]; }; vowels = derive { name="vowels"; version="1.2-1"; sha256="0177xysb5y8jzpxn9wdygq2f74gys67g29cd12zw77vlq3c3kkbr"; depends=[]; }; -vows = derive { name="vows"; version="0.3.1"; sha256="10r45gbsvmz4xqmync7lsh3db8wvpv2gfzg6sfq799ynrddbklvp"; depends=[fda gamm4 rpanel mgcv RLRsim shape stringr]; }; +vows = derive { name="vows"; version="0.4"; sha256="0cc0znrnzhfgp47dsyncjh7b072mbwk568n2pshxwdfxzh3kj65q"; depends=[fda gamm4 rpanel mgcv RLRsim oro_nifti shape stringr]; }; vrmlgen = derive { name="vrmlgen"; version="1.4.9"; sha256="0lifhhf41yml4k83wpkssl14jgn8jaw1lcknwbci1sd8s1c4478l"; depends=[]; }; vrtest = derive { name="vrtest"; version="0.97"; sha256="00hdgb0r18nwv3qay97b09kqqw9xqsbya06rrjyddqh9r6ggx1y0"; depends=[]; }; vscc = derive { name="vscc"; version="0.2"; sha256="1p14v8vd8kckd44g4dvzh51gdkd8jvsc4bkd2i4csx8vjiwrni5w"; depends=[teigen mclust]; }; @@ -6122,17 +6248,17 @@ wavelets = derive { name="wavelets"; version="0.3-0"; sha256="141s7z7wxl5plxp7xp wavemulcor = derive { name="wavemulcor"; version="1.2"; sha256="1039y5rakjkx2mvfmykg2z4jpkpbcj7rclyg7ab19wnxmdm8ls81"; depends=[waveslim]; }; waveslim = derive { name="waveslim"; version="1.7.5"; sha256="0lqslkihgrd7rbihqhhk57m9vkbnfsznkvk8430cvbcsn7vridii"; depends=[]; }; wavethresh = derive { name="wavethresh"; version="4.6.6"; sha256="1ykhfw1bdibvq2b3rrgqszvwqmzkd3fgxqg7p36ms1cxph68g2r9"; depends=[MASS]; }; -wbs = derive { name="wbs"; version="1.2"; sha256="1mnbx0ik4bakf818nbpgi4zgb8y4ljvz5yq602h3crsc4b32kq1k"; depends=[]; }; +wbs = derive { name="wbs"; version="1.3"; sha256="1fdf3dj23n63nfnzafq88sxqvi15cbrzsvc8wrljw1raq5z012yv"; depends=[]; }; weatherData = derive { name="weatherData"; version="0.4.1"; sha256="19ynb9w52ay15awaf4bqm9lj2w6pk70lyaipn46jrspwxqsvfhlc"; depends=[plyr]; }; -webutils = derive { name="webutils"; version="0.2"; sha256="19b39jmhblvljkazzf6a55pxd74hx65cvh4s1vgx7m475rqrg6ih"; depends=[jsonlite]; }; +webutils = derive { name="webutils"; version="0.3"; sha256="1wzpwigc5mmdnz453qr4s1viaslgdrcg238n25qcg4xjakmnxrss"; depends=[jsonlite]; }; webvis = derive { name="webvis"; version="0.0.2"; sha256="1cdn9jrpg2sbx4dsj0xf7m0daqr7fqiw3xy1lg0i0qn9cpvi348f"; depends=[]; }; weightedKmeans = derive { name="weightedKmeans"; version="1.2.0"; sha256="140cvl1jwwqyvcsf7pbsxh9k4bynd7c1q159pp7ia1f1sgimxafb"; depends=[lattice latticeExtra clv]; }; weightedScores = derive { name="weightedScores"; version="0.9.1"; sha256="0wd2ymxy8yh3l4xd3xgifbihi89h53wy6n84x7x26px12c70q8fa"; depends=[mvtnorm rootSolve]; }; weights = derive { name="weights"; version="0.80"; sha256="147fgs99sg1agq081ikj2fhb4b2vzsppdg1h1w036bb92vsjb0g5"; depends=[Hmisc gdata]; }; weirs = derive { name="weirs"; version="0.23"; sha256="1kp49r5ba7ii1mr1nszbssx3fn0c2hcfpawm3a1kbh4rmhvy3frs"; depends=[]; }; -wesanderson = derive { name="wesanderson"; version="0.3"; sha256="169phanzwz3mgzqncwxc5kdshhmj922nzlbq8gz6grvh51bc7aaa"; depends=[]; }; +wesanderson = derive { name="wesanderson"; version="0.3.2"; sha256="17acf9ydi2sw7q887ni9ly12mdmip66ix6gdkh68rncj8sx3csrd"; depends=[]; }; wfe = derive { name="wfe"; version="1.3"; sha256="16b39i60x10kw6yz44ff19h638s9lsgnz8azc76zl9b8s64jliya"; depends=[arm Matrix MASS]; }; -wgaim = derive { name="wgaim"; version="1.4-3"; sha256="132i8dw2x46hihvv49ppx9ddll1clz7235y6b5cq1rzs19y7bwqd"; depends=[qtl lattice]; }; +wgaim = derive { name="wgaim"; version="1.4-6"; sha256="1m3i8v12y9n19gnsnqwmbair684skdpnlvvb3ax6jh6dcbb645my"; depends=[qtl lattice]; }; wgsea = derive { name="wgsea"; version="1.8"; sha256="1114wik011sm2n12bwm2bhqvdxagbhbscif45k4pgxdkahy2abpi"; depends=[]; }; whisker = derive { name="whisker"; version="0.3-2"; sha256="0z4cn115gxcl086d6bnqr8afi67b6a7xqg6ivmk3l4ng1x8kcj28"; depends=[]; }; widals = derive { name="widals"; version="0.5.4"; sha256="1bl59s1r4gkvq4nkf94fk7m0zvhbrszkgmig66lfxhyvk9r84fvb"; depends=[snowfall]; }; @@ -6148,11 +6274,11 @@ wnominate = derive { name="wnominate"; version="0.99"; sha256="19pis0p4kkwyddn8f wombsoft = derive { name="wombsoft"; version="2.0"; sha256="11ri29vj1yg2lpr6vf1i45w20hqh8dswj04ylbq0vy27cwmxqljd"; depends=[]; }; wordcloud = derive { name="wordcloud"; version="2.5"; sha256="1ajqdkm8h1wid3d41zd8v7xzf2swid998w31zrghd45a5lcp7qcm"; depends=[RColorBrewer slam Rcpp Rcpp]; }; wordmatch = derive { name="wordmatch"; version="1.0"; sha256="0zscp361qf79y1zsliga18hc7wj36cnydshrqb9pv67b65njrznz"; depends=[plyr reshape2]; }; -wordnet = derive { name="wordnet"; version="0.1-10"; sha256="0s68hkyk28ry0g96d4gxy7r9nywypx7ymqpzadlb79dls32i20lz"; depends=[rJava]; }; +wordnet = derive { name="wordnet"; version="0.1-10"; sha256="1k0ncxqsvv5vd5xm6nxs66hvqic9zbxf63sshszgpva2cqlyj4q8"; depends=[rJava]; }; wpp2008 = derive { name="wpp2008"; version="1.0-1"; sha256="0gd3vjw1fpzhp3qlf1jpc24f76i0pxsjs5pb1v3k2si6df7q4msd"; depends=[]; }; wpp2010 = derive { name="wpp2010"; version="1.2-0"; sha256="1h87r1cn4lnx80dprvawsyzfkriscqjgr27gvv7n19wvsx8qd57k"; depends=[]; }; wpp2012 = derive { name="wpp2012"; version="2.2-1"; sha256="00283s4r36zzwn67fydrl7ldg6jhn14qkf47h0ifmsky95bd1n5k"; depends=[]; }; -wppExplorer = derive { name="wppExplorer"; version="1.4-0"; sha256="1dyg9482h9854nx526151rclh3m45g78x36ll8xw78ywnj9xrjzj"; depends=[shiny plyr reshape2 googleVis wpp2012 Hmisc ggplot2]; }; +wppExplorer = derive { name="wppExplorer"; version="1.5-0"; sha256="046dqbgaawy04cbk8ya5i0gwmr7d51k3017jjk66fy1x4176159m"; depends=[shiny plyr reshape2 googleVis wpp2012 Hmisc ggplot2]; }; wq = derive { name="wq"; version="0.4-1"; sha256="0a46islpzpbkx6c7mbn6q787mh9mb6sy4k46lz8s63fh2h7p0szk"; depends=[zoo]; }; wrassp = derive { name="wrassp"; version="0.1.3"; sha256="1xza4w5dgc6gda9ybmq386jnb1gkahdi6sds5dqay7pm5mjql6fl"; depends=[]; }; write_snns = derive { name="write.snns"; version="0.0-4.2"; sha256="0sxg7z8rnh4lssbivkrfxldv4ivy37wkndzzndpbvq2gbvbjnp4l"; depends=[]; }; @@ -6161,11 +6287,11 @@ wrspathrowData = derive { name="wrspathrowData"; version="1.0"; sha256="0a1aggcl wskm = derive { name="wskm"; version="1.4.19"; sha256="16smir0b4pxkaxgr2vclq8kprpwn0y3fb43ba79q94d6m5hm844y"; depends=[lattice latticeExtra clv]; }; wsrf = derive { name="wsrf"; version="1.4.0"; sha256="1b9ifswv0civaavmpzi2r3fdbccxg4akzvklqri0hj49kr4cw5pa"; depends=[Rcpp Rcpp]; }; wtcrsk = derive { name="wtcrsk"; version="1.3"; sha256="1viddyms2d9q2hb9z788fcs8vp7gp6vzlsszcnyxgganfjsd85zy"; depends=[]; }; -wux = derive { name="wux"; version="1.2-2"; sha256="1x3d4ndaz6qpbd99vf1a9k68zj3jdk43gwix7022ds9ilq2wk4pj"; depends=[sp ncdf reshape abind fields rgdal rgeos class stringr Hmisc gdata corpcor]; }; +wux = derive { name="wux"; version="1.2-3"; sha256="1hpgjs7jl4zckm87hrsnmqyvxg93aqsnrf79wisvs2wajgh73zmi"; depends=[sp ncdf reshape abind fields rgdal rgeos class stringr Hmisc gdata corpcor]; }; x_ent = derive { name="x.ent"; version="1.0.6"; sha256="0yjg7gi8yhn7vw90i802dcrp6mln84rjlpcgnjvwq21s8nffs2z6"; depends=[opencpu rJava stringr xtable jsonlite venneuler ggplot2]; }; x12 = derive { name="x12"; version="1.6.0"; sha256="0bl50nva4ai8p24f9hr622m0fc5nmbjakn3rsvl79g050gjsd4i3"; depends=[stringr]; }; x12GUI = derive { name="x12GUI"; version="0.13.0"; sha256="1mga7g9gwb3nv2qs27lz4n9rp6j3svads28hql88sxaif6is3nk1"; depends=[x12 Hmisc RGtk2 cairoDevice lattice stringr]; }; -xergm = derive { name="xergm"; version="1.3"; sha256="1bkvxi3f7hmzx9mlbp30sk1ixhyxwai9rgahs25hrzy4dsnyxyk0"; depends=[ergm statnet statnet_common network sna texreg Matrix boot coda ROCR igraph vegan lme4]; }; +xergm = derive { name="xergm"; version="1.4.1"; sha256="1lcqa2vxdg4ljk2p0m8cqw68bqxycxql57nr3n4ggic2ys0sbrxa"; depends=[statnet statnet_common network sna ergm texreg Matrix boot coda ROCR igraph vegan lme4 Rcpp speedglm Rcpp]; }; xgboost = derive { name="xgboost"; version="0.3-2"; sha256="1sp0rl4ixdcqljcf12cc517vnwj851g88xla641nfl0qbcj8b7n7"; depends=[Matrix]; }; xgobi = derive { name="xgobi"; version="1.2-15"; sha256="03ym5mm16rb1bdwrymr393r3xgprp0ign45ryym3g0x2zi8dy557"; depends=[]; }; xhmmScripts = derive { name="xhmmScripts"; version="1.1"; sha256="1qryyb34jx9c64l8bnwp40b08y81agdj5w0icj8dk052x50ip1hl"; depends=[gplots plotrix]; }; @@ -6192,10 +6318,10 @@ zic = derive { name="zic"; version="0.8.1"; sha256="05mn894qdx6k7158dbsjy2b49n0g zipcode = derive { name="zipcode"; version="1.0"; sha256="1lvlf1h5fv412idpdssjfh4fki933dm5nhr41ppl1mf45b9j7azn"; depends=[]; }; zipfR = derive { name="zipfR"; version="0.6-6"; sha256="1y3nqfjg5m89mdvcmqwjmwlc8p3hpcqnwv4ji1a7ggg4n63lwl3j"; depends=[]; }; zoeppritz = derive { name="zoeppritz"; version="1.0-4"; sha256="0mjg55jc5b8h2jj6cy8b34a4q7jhhx73xns0v2dpfkq4kmilsv5p"; depends=[]; }; -zoib = derive { name="zoib"; version="1.0"; sha256="0mxd9j5sbwyv3bhhrly2ikbfqgk3cgkl6jzai9q6lq3lbg55mh9a"; depends=[rjags coda matrixcalc Formula]; }; +zoib = derive { name="zoib"; version="1.1"; sha256="1w63wqzmf7977hk0nalgayar75ijaqjl3rgfmn90sa4fs1nqnxg7"; depends=[rjags coda matrixcalc Formula]; }; zoo = derive { name="zoo"; version="1.7-11"; sha256="0fp726rp9mqsfmm391bmckk76lqsvzwd39ffvb355wf2spl8nzvf"; depends=[lattice]; }; zooimage = derive { name="zooimage"; version="3.0-5"; sha256="1r3slmyw0dyqfa40dr5xga814z09ibhmmby8p1cii5lh61xm4c39"; depends=[svMisc svDialogs mlearning filehash jpeg png]; }; zoom = derive { name="zoom"; version="2.0.4"; sha256="03f5rxfr6ncf1j6vpn7pip21q7ylj4bx0a5xphqb6x6i33lxf1g5"; depends=[]; }; -ztable = derive { name="ztable"; version="0.1.3"; sha256="18ndpv45hgxhhp65hraz8a5c52ywpkh535zdcjzjy15im387fq4g"; depends=[]; }; +ztable = derive { name="ztable"; version="0.1.5"; sha256="1jfqnqy9544gfvz3bsb48v4177nwp4b4n9l2743asq8sbq305b5r"; depends=[]; }; zyp = derive { name="zyp"; version="0.10-1"; sha256="0f1fqqxysf3psnvn08s5qly2c958h1hhznjjj8mvpjr5g6hqlr1k"; depends=[Kendall]; }; } From 6c2a6071127dcad72d3a0a6c0b83acebacf25362 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 18 Feb 2015 15:20:14 +0300 Subject: [PATCH 050/197] R: update archive url --- pkgs/development/r-modules/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index e60181100be..0bb02d0f989 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -23,7 +23,7 @@ let src = fetchurl { urls = [ "mirror://cran/src/contrib/${name}_${version}.tar.gz" - "mirror://cran/src/contrib/Archive/${name}/${name}_${version}.tar.gz" + "mirror://cran/src/contrib/00Archive/${name}/${name}_${version}.tar.gz" ]; inherit sha256; }; From 621d1ab4444c4bf8830c9fd0810407fda186db36 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 18 Feb 2015 15:39:54 +0300 Subject: [PATCH 051/197] R: update mirrors --- pkgs/build-support/fetchurl/mirrors.nix | 29 +++++++++++++++++-------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 8a90353982f..7f61ddc77db 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -296,19 +296,20 @@ rec { cran = [ http://cran.r-project.org/ http://cran.rstudio.com/ + http://cran.usthb.dz/ http://mirror.fcaglp.unlp.edu.ar/CRAN/ - http://r.mirror.mendoza-conicet.gob.ar/ http://cran.csiro.au/ http://cran.ms.unimelb.edu.au/ http://cran.at.r-project.org/ http://www.freestatistics.org/cran/ + http://nbcgib.uesc.br/mirrors/cran/ http://cran-r.c3sl.ufpr.br/ http://cran.fiocruz.br/ http://www.vps.fmvz.usp.br/CRAN/ http://brieger.esalq.usp.br/CRAN/ http://cran.stat.sfu.ca/ http://mirror.its.dal.ca/cran/ - http://probability.ca/cran/ + http://cran.utstat.utoronto.ca/ http://cran.skazkaforyou.com/ http://cran.parentingamerica.com/ http://dirichlet.mat.puc.cl/ @@ -318,30 +319,38 @@ rec { http://mirrors.xmu.edu.cn/CRAN/ http://www.laqee.unal.edu.co/CRAN/ http://www.icesi.edu.co/CRAN/ + http://mirrors.nic.cz/R/ http://mirrors.dotsrc.org/cran/ http://cran.espol.edu.ec/ + http://cran.salud.gob.sv/ + http://ftp.eenet.ee/pub/cran/ http://cran.univ-lyon1.fr/ http://mirror.ibcp.fr/pub/CRAN/ http://ftp.igh.cnrs.fr/pub/CRAN/ http://cran.irsn.fr/ http://cran.univ-paris1.fr/ + http://cran.cardse.net/ http://mirrors.softliste.de/cran/ - http://cran.r-mirror.de/ http://ftp5.gwdg.de/pub/misc/cran/ - http://cran.cc.uoc.gr/ + http://cran.sciserv.eu/ + http://cran.uni-muenster.de/ + http://cran.cc.uoc.gr/mirrors/CRAN/ http://cran.rapporter.net/ + http://cran.hafro.is/ http://ftp.iitm.ac.in/cran/ http://cran.repo.bppt.go.id/ + http://cran.unej.ac.id/ http://cran.um.ac.ir/ http://ftp.heanet.ie/mirrors/cran.r-project.org/ http://cran.mirror.garr.it/mirrors/CRAN/ http://cran.stat.unipd.it/ http://dssm.unipa.it/CRAN/ - http://essrc.hyogo-u.ac.jp/cran/ - http://cran.md.tsukuba.ac.jp/ http://cran.ism.ac.jp/ + http://cran.md.tsukuba.ac.jp/ http://cran.nexr.com/ - http://biostat.cau.ac.kr/CRAN/ + http://healthstat.snu.ac.kr/CRAN/ + http://cran.biodisk.org/ + http://rmirror.lau.edu.lb/ http://cran.itam.mx/ http://www.est.colpos.mx/R-mirror/ http://cran.xl-mirror.nl/ @@ -356,15 +365,18 @@ rec { http://cran.fyxm.net/ http://r.adu.org.za/ http://cran.mirror.ac.za/ + http://ftp.cixug.es/CRAN/ http://cran.es.r-project.org/ http://ftp.sunet.se/pub/lang/CRAN/ http://stat.ethz.ch/CRAN/ - http://cran.cs.pu.edu.tw/ + http://ftp.yzu.edu.tw/CRAN/ http://cran.csie.ntu.edu.tw/ http://mirrors.psu.ac.th/pub/cran/ http://cran.pau.edu.tr/ http://www.stats.bris.ac.uk/R/ + http://mirrors.ebi.ac.uk/CRAN/ http://cran.ma.imperial.ac.uk/ + http://mirror.mdx.ac.uk/R/ http://star-www.st-andrews.ac.uk/cran/ http://cran.cnr.berkeley.edu/ http://cran.stat.ucla.edu/ @@ -384,7 +396,6 @@ rec { http://cran.cs.wwu.edu/ http://camoruco.ing.uc.edu.ve/cran/ http://cran.vinastat.com/ - http://lib.stat.cmu.edu/ ]; # Hackage mirrors From 57a0c44c2c3fecf8e1378fedef687eb730e17569 Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Wed, 18 Feb 2015 18:36:48 +0300 Subject: [PATCH 052/197] vimPlugins: update --- pkgs/misc/vim-plugins/default.nix | 261 +++++++++++++++--------------- 1 file changed, 131 insertions(+), 130 deletions(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index e434e9855c2..48192d28eea 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -655,11 +655,11 @@ rec { }; "Gist" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Gist"; + name = "Gist-2015-02-10"; src = fetchgit { url = "git://github.com/mattn/gist-vim"; - rev = "8a567b823163d349406dffaff4519e0bac10eade"; - sha256 = "3f1b701529808bfbd000d377d49448d0ddd7e4e0cbf54fdc83fc5b676f567c88"; + rev = "4d64b05bcbfdc8c22f37ff29776626be48251af7"; + sha256 = "16101ab3802bbeba7e83706446474b61fbb6312270161cdb669780b54c3c04cf"; }; dependencies = []; @@ -675,111 +675,111 @@ rec { }; "Hoogle" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Hoogle"; + name = "Hoogle-2013-11-26"; src = fetchgit { url = "git://github.com/Twinside/vim-hoogle"; rev = "81f28318b0d4174984c33df99db7752891c5c4e9"; - sha256 = "0f96f3badb6218cac87d0f7027ff032ecc74f08ad3ada542898278ce11cbd5a0"; + sha256 = "e5a95db90efdb93cd06c0c6946c24ae3e401800dd0da344cc83171ff1bc696f2"; }; dependencies = []; }; "Solarized" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Solarized"; + name = "Solarized-2011-05-09"; src = fetchgit { url = "git://github.com/altercation/vim-colors-solarized"; rev = "528a59f26d12278698bb946f8fb82a63711eec21"; - sha256 = "a1b2ef696eee94dafa76431c31ee260acdd13a7cf87939f27eca431d5aa5a315"; + sha256 = "1de517cfc66707e44c2d4d72080ee949cfb963a087e9e52c62cc4394f13ed597"; }; dependencies = []; }; "Supertab" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Supertab"; + name = "Supertab-2015-02-15"; src = fetchgit { url = "git://github.com/ervandew/supertab"; - rev = "454c06e25680799b6f408622d6bfbaf920ace825"; - sha256 = "7ec13edc3338281ea1eb2fbae9a79b947fb3b490b684f8b4cc0ff9252845aa01"; + rev = "c8bfeceb1fc92ad58f2ae6967cbfcd6fbcb0d6e7"; + sha256 = "9f610d2acd57537f6fa2bfafb9300fe7d42afedf30bc4bb3fb02974743f9ab27"; }; dependencies = []; }; "Syntastic" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Syntastic"; + name = "Syntastic-2015-02-17"; src = fetchgit { url = "git://github.com/scrooloose/syntastic"; - rev = "7d9aec0bee91be677c38b94ff222d02aa732fe52"; - sha256 = "9175783f6ea7ca148c156d9152ab59741da8e9ddede56c1ef9058a1856815723"; + rev = "47821840200cd8e14e99001caac602a37cdf8d5c"; + sha256 = "becf0b07d25d9514ac7c5328d4e3deeab5731792887c8334571b72c3871a50ee"; }; dependencies = []; }; "Tabular" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Tabular"; + name = "Tabular-2013-05-16"; src = fetchgit { url = "git://github.com/godlygeek/tabular"; rev = "60f25648814f0695eeb6c1040d97adca93c4e0bb"; - sha256 = "28c860ad621587f2c3213fae47d1a3997746527c17d51e9ab94c209eb7bfeb0f"; + sha256 = "dbfbeaf833ecc87c7f505fe25c79110f10535d81065fd4a30853565d288448d6"; }; dependencies = []; }; "Tagbar" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Tagbar"; + name = "Tagbar-2015-02-16"; src = fetchgit { url = "git://github.com/majutsushi/tagbar"; - rev = "00dfa82b00e734b453153564efeec933c48087f0"; - sha256 = "29305a2eb45ca104046b97557e9dbd599611564c533e5493de2fe467913af635"; + rev = "a284cd009104b5c9b64a378cd98fdf4993c1689e"; + sha256 = "c6458537ea211a77a8fb6f85b4d7eac1fec6714fd60398ebae00647599397922"; }; dependencies = []; }; "The_NERD_Commenter" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "The_NERD_Commenter"; + name = "The_NERD_Commenter-2014-07-08"; src = fetchgit { url = "git://github.com/scrooloose/nerdcommenter"; rev = "6549cfde45339bd4f711504196ff3e8b766ef5e6"; - sha256 = "ef270ae5617237d68b3d618068e758af8ffd8d3ba27a3799149f7a106cfd178e"; + sha256 = "7624da2591153946e0e9d0637c31b551bc1f87cea8441d725bdd01b0cd972588"; }; dependencies = []; }; "The_NERD_tree" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "The_NERD_tree"; + name = "The_NERD_tree-2014-11-20"; src = fetchgit { url = "git://github.com/scrooloose/nerdtree"; rev = "3b98a7fcae8f9fff356907171f0406ff8cd28921"; - sha256 = "deec2ce33249829ae3925478d7d1925ea99e20c37dcc86db7c3bfac4fdc706e0"; + sha256 = "75aa60c361c66c0bae986fc6a7111ccf529ab74409a9e11355e4c2fa065e1afc"; }; dependencies = []; }; "UltiSnips" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "UltiSnips"; + name = "UltiSnips-2015-02-14"; src = fetchgit { url = "git://github.com/sirver/ultisnips"; - rev = "d693259abb2e28f70abf760d395fcf526d5272ee"; - sha256 = "541e47c9ae5b1e18072f5abfc64eadca8ddfe0271b251f1ddadd15ab98d82600"; + rev = "56ac14840f47521be9b61fb5ae72930f35d5d8a9"; + sha256 = "a0766d809a0a858e3393429d67e68e7a85d67519e143a64e8ddd3f7fa2418ca6"; }; dependencies = []; }; "VimOutliner" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "VimOutliner"; + name = "VimOutliner-2015-01-09"; src = fetchgit { url = "git://github.com/vimoutliner/vimoutliner"; rev = "7c995f973c54b0d026137615af28059890edb197"; - sha256 = "9d1526ec99904fd2ccfdb4dd6763b4cd04048cb74bb7a0a4c9b4a7b1f5d75cb5"; + sha256 = "c48acd2d4939ece0de7a2bae42f04e2f247a087947b66da86b4fb96fb32330d9"; }; dependencies = []; }; "WebAPI" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "WebAPI"; + name = "WebAPI-2014-10-27"; src = fetchgit { url = "git://github.com/mattn/webapi-vim"; rev = "a7789abffe936db56e3152e23733847f94755753"; - sha256 = "455b84d9fd13200ff5ced5d796075f434a7fb9c00f506769174579266ae2be80"; + sha256 = "a5e9560b71b9e3c242c8623972f11a9298708e99f90b4f919610b0959417a767"; }; dependencies = []; @@ -800,63 +800,63 @@ rec { }; "commentary" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "commentary"; + name = "commentary-2014-11-10"; src = fetchgit { url = "git://github.com/tpope/vim-commentary"; rev = "9c685131a5facfa0d643feca3a61b41c007d8170"; - sha256 = "2a9f394d0669429469c2f1ddaf9a722c2773f35da08ea9496d3b4b4e85b6038d"; + sha256 = "7f92a27f16f8a3a9285b14ca9dd9c7deb6cc7391075024446e5be395cca18c1e"; }; dependencies = []; }; "ctrlp" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp"; + name = "ctrlp-2013-07-29"; src = fetchgit { url = "git://github.com/kien/ctrlp.vim"; rev = "b5d3fe66a58a13d2ff8b6391f4387608496a030f"; - sha256 = "41f7884973770552395b96f8693da70999dc815462d4018c560d3ff6be462e76"; + sha256 = "3736b2f152df20be0a0d5ed6a39929b2df1ed9bbe98f68d80db657c00f0dcb30"; }; dependencies = []; }; "extradite" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "extradite"; + name = "extradite-2015-01-26"; src = fetchgit { url = "git://github.com/int3/vim-extradite"; rev = "a1dc4b63befd5032e65a0c94e7257d4636aa6a3f"; - sha256 = "94e05bbe36c9d4cee9832530531eedff0da509d5a0a52beee4e524fd4ad96714"; + sha256 = "0f03c331bfa61292087ec403e5a9083f3dc03988b6d5cb6704934d2e6c646fdb"; }; dependencies = []; }; "fugitive" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fugitive"; + name = "fugitive-2015-02-08"; src = fetchgit { url = "git://github.com/tpope/vim-fugitive"; - rev = "933f6a1e1df549564062f936bd1c836d28cf1676"; - sha256 = "f8b43c6f0513a814d6ddc735c2f668b0b1f187bbb0a312a82276c4501ef2a908"; + rev = "eb8eb1850a47671a8a3639feab8b2a50577e4913"; + sha256 = "d589245c1a9490a7c370ea80492a606fa207fac268a3c1bd5151fc3f326d3514"; }; dependencies = []; }; "ghcmod" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ghcmod"; + name = "ghcmod-2014-10-19"; src = fetchgit { url = "git://github.com/eagletmt/ghcmod-vim"; rev = "d5c6c7f3c85608b5b76dc3e7e001f60b86c32cb9"; - sha256 = "ab56d470ea18da3fae021e22bba14460505e61a94f8bf707778dff5eec51cd6d"; + sha256 = "b5a50bc1bcc0777def41cf7f18557f6674f709cbf22577ebe845ec1bb8e39e9d"; }; dependencies = []; }; "github:MarcWeber/vim-addon-vim2nix" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "github-MarcWeber-vim-addon-vim2nix"; + name = "github-MarcWeber-vim-addon-vim2nix-2015-02-08"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-vim2nix"; - rev = "5507ee4db7599873d72fab035c752dea245e2cd4"; - sha256 = "1rqvgg3wq1grkh4nfj2wqmjg7a9r4hd82m89s9520kyzvldp8sgx"; - }; - dependencies = ["vim-addon-manager"]; + rev = "5507ee4db7599873d72fab035c752dea245e2cd4"; + sha256 = "02094bd066f930469a2acebe93f960a4b57ee1e302fe2e80a87ef9e607791295"; + }; + dependencies = ["vim-addon-manager"]; }; "matchit.zip" = buildVimPluginFrom2Nix { # created by nix#NixDerivation @@ -881,400 +881,401 @@ rec { ''; }; "pathogen" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "pathogen"; + name = "pathogen-2014-11-06"; src = fetchgit { url = "git://github.com/tpope/vim-pathogen"; rev = "b9fb0dfd811004010f5f6903edef42d6004ebea2"; - sha256 = "62ec7e9721651aa86aa716d47c2057771f7d093f414c3b98f50a759d210db4c7"; + sha256 = "9ccb1d234d9eb8bccc3a50ff6fadcc925644a0e17cd4444623d22843c5d82e80"; }; dependencies = []; }; "quickfixstatus" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "quickfixstatus"; + name = "quickfixstatus-2011-09-02"; src = fetchgit { url = "git://github.com/dannyob/quickfixstatus"; rev = "fd3875b914fc51bbefefa8c4995588c088163053"; - sha256 = "7b6831d5da1c23d95f3158c67e4376d32c2f62ab2e30d02d3f3e14dcfd867d9b"; + sha256 = "a7f15f5404bf0719c5c1eab9c117c3ca4302b0232f959b509c364f3869a2c9fd"; }; dependencies = []; }; "rainbow_parentheses" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "rainbow_parentheses"; + name = "rainbow_parentheses-2013-03-04"; src = fetchgit { url = "git://github.com/kien/rainbow_parentheses.vim"; rev = "eb8baa5428bde10ecc1cb14eed1d6e16f5f24695"; - sha256 = "47975a426d06f41811882691d8a51f32bc72f590477ed52b298660486b2488e3"; + sha256 = "6f467a4de21e26e7d50a74d9fd1503ea67d94bdd93fde19ed5da42552487957b"; }; dependencies = []; }; "rust" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "rust"; + name = "rust-2015-01-29"; src = fetchgit { url = "git://github.com/wting/rust.vim"; rev = "2450ecf3091cc7c2711ca9f00eae8e3bedd04376"; - sha256 = "9d2e8b2c06d6100f9a1e76644313d457a2ff955241d8f712de6fddd0b7f5c4ee"; + sha256 = "f7335d4265db4d0e030b6d1f23818710e8b80be4aeb42ebb60396d5327c6f669"; }; dependencies = []; }; "sensible" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "sensible"; + name = "sensible-2014-11-24"; src = fetchgit { url = "git://github.com/tpope/vim-sensible"; rev = "b30dcf387af977acfa21732592bfca05598b2188"; - sha256 = "6a9fc68c3eb0ee500ac59bdbc2c48d98e88a2936ee544f7203fa1a0296002b5f"; + sha256 = "8b2b22cd0dc766d4ecc3fc9f9ad21412b033ff02b6a3047a768da82773bb6bfe"; }; dependencies = []; + }; "snipmate" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "snipmate"; + name = "snipmate-2015-02-04"; src = fetchgit { url = "git://github.com/garbas/vim-snipmate"; rev = "22e3bb0133ed6e2acbc630a49f0a780487f56fd5"; - sha256 = "ec4a34d60a3930154342d37116baca5ca135881582261fa2a5136b298650ebe0"; + sha256 = "7b4a730b557d4f0d117e8ad7529ff38f81d29986db6d4418c0ea39ff3c827e65"; }; dependencies = ["vim-addon-mw-utils" "tlib"]; }; "sourcemap" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "sourcemap"; + name = "sourcemap-2012-09-19"; src = fetchgit { url = "git://github.com/chikatoike/sourcemap.vim"; rev = "0dd82d40faea2fdb0771067f46c01deb41610ba1"; - sha256 = "a08c77aea39be4a0a980d62673d1d17fecc518a8aeb9101210e453aaacb78fbd"; + sha256 = "95665edd31b4840728f6e1492ccf143d52079b2c1ce11407cf9936b03c9df23c"; }; dependencies = []; }; "surround" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "surround"; + name = "surround-2015-02-08"; src = fetchgit { url = "git://github.com/tpope/vim-surround"; - rev = "6afb2d90e3b3a637da093e1022ffaa232a2aeafd"; - sha256 = "775e8d58469840f1cf5d69d3c92914fcca9ace6e351708e491fcc82fd2fa1269"; + rev = "fd75eb2cb2ffe85a457445cb152d5a6c7acda140"; + sha256 = "3322993b1c0aec299525d5d8120433b72a03e70cee573289639ed5675e33974e"; }; dependencies = []; }; "table-mode" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "table-mode"; + name = "table-mode-2015-01-11"; src = fetchgit { url = "git://github.com/dhruvasagar/vim-table-mode"; rev = "3096a26db437bfb6e66798bfbf45e7549ba767d9"; - sha256 = "78e63f47cdae63507fc567e3c60c214a794be8d072a6b83a980c7bb58396829c"; + sha256 = "610bbcad80fc153e2d68745ad767205d906c08055e884b93b98a0e2aa947d4dd"; }; dependencies = []; }; "tlib" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tlib"; + name = "tlib-2015-01-15"; src = fetchgit { url = "git://github.com/tomtom/tlib_vim"; rev = "9e629767e5a91ede057d07f8754326e68c92a692"; - sha256 = "8b435939fb1a439cc89734d3d7a38294217716c5b46b1402486e947e6ae97bb6"; + sha256 = "2c3c039175494fb3b2f5002194f3ee9f50dafc65c80bc5f3a07d9911aea52208"; }; dependencies = []; }; "undotree" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "undotree"; + name = "undotree-2015-01-29"; src = fetchgit { url = "git://github.com/mbbill/undotree"; rev = "42000e2a7140843030f517de9d4923dd5fa40458"; - sha256 = "9a9a89ccfa69f41ba24ec8f2be366f469e0497cef735ad01ec0f22fef5fcc293"; + sha256 = "8a340bce79409b1f6c88c8c9310fd9d9eb97bba23c5208f66715e5a008cb0cba"; }; dependencies = []; }; "vim-addon-actions" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-actions"; + name = "vim-addon-actions-2014-09-22"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-actions"; rev = "a5d20500fb8812958540cf17862bd73e7af64936"; - sha256 = "d2c3eb7a1f29e7233c6fcf3b02d07efebe8252d404ee593419ad399a5fdf6383"; + sha256 = "4a6d9e25b69cf458980e0b2acabc5b87e1e0d763f357fbeaee1e859b2f3d9069"; }; dependencies = ["vim-addon-mw-utils" "tlib"]; }; "vim-addon-async" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-async"; + name = "vim-addon-async-2013-10-18"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-async"; rev = "dadc96e188f1cdacbac62129eb29a1eacfed792c"; - sha256 = "27f941e21a8ca5940bd20914e2a9e3809e554f3ef2c27b3bafb9a153107a5d07"; + sha256 = "ff9c7ce533dd2d0c2cabcd507f22c27b8507b03f58dfe30158304dca77133730"; }; dependencies = ["vim-addon-signs"]; }; "vim-addon-background-cmd" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-background-cmd"; + name = "vim-addon-background-cmd-2015-01-05"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-background-cmd"; rev = "e99076519139b959edce0581b0f31207a5ec7c64"; - sha256 = "524795221ae727635fe52ead47dff452d2dd48900917da609426ea399a2eceeb"; + sha256 = "54872b6f636994a3057c0fcda3e6e540684205cf2d08a41778bcfbdd6d0a57a2"; }; dependencies = ["vim-addon-mw-utils"]; }; "vim-addon-commenting" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-commenting"; + name = "vim-addon-commenting-2013-06-10"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-commenting"; rev = "b7cf748ac1c9bf555cbd347589e3b7196030d20b"; - sha256 = "4ad7d5f6669f0a1b4a24c9ce3649c030d7d3fc8588de4d4d6c3269140fbe9b3e"; + sha256 = "f0ce6072dd607c7fe3a337903d49d19bf90bc59d302977cc30dd26696cd723a9"; }; dependencies = []; }; "vim-addon-completion" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-completion"; + name = "vim-addon-completion-2015-02-10"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-completion"; - rev = "80f717d68df5b0d7b32228229ddfd29c3e86e435"; - sha256 = "c8c0af8760f2622c4caef371482916861f68a850eb6a7cd746fe8c9ab405c859"; + rev = "021c449a5ce1ce4ac0af5955e05b0279c1cc0e75"; + sha256 = "177738cbe3ab6083517e211c8aa8e6235beafb518a7e8b87922a675dbbed5b5b"; }; dependencies = ["tlib"]; }; "vim-addon-errorformats" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-errorformats"; + name = "vim-addon-errorformats-2014-11-05"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-errorformats"; rev = "dcbb203ad5f56e47e75fdee35bc92e2ba69e1d28"; - sha256 = "a1260206545d5ae17f2e6b3319f5cf1808b74e792979b1c6667d75974cc53f95"; + sha256 = "59a7abe3d6be8e579737c7c614a5cb148df14cc1dcea3d711acb115190cb31b3"; }; dependencies = []; }; "vim-addon-goto-thing-at-cursor" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-goto-thing-at-cursor"; + name = "vim-addon-goto-thing-at-cursor-2012-01-11"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-goto-thing-at-cursor"; rev = "f052e094bdb351829bf72ae3435af9042e09a6e4"; - sha256 = "34658ac99d9a630db9c544b3dfcd2c3df69afa5209e27558cc022b7afc2078ea"; + sha256 = "a91752a43042086448246777cd9dc2fa7f5f8f54ef052148acfa51c05f58281e"; }; dependencies = ["tlib"]; }; "vim-addon-local-vimrc" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-local-vimrc"; + name = "vim-addon-local-vimrc-2014-02-14"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-local-vimrc"; rev = "7689b55ee86dd6046923fd28ceab49da3881abfe"; - sha256 = "f11d13676e2fdfcc9cabc991577f0b2e85909665b6f245aa02f21ff78d6a8556"; + sha256 = "b496281c8b0dd4c7aada20789a6a3a6b6d1d2741d19b0a690d09bf121d0f40d8"; }; dependencies = []; }; "vim-addon-manager" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-manager"; + name = "vim-addon-manager-2014-12-03"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-manager"; rev = "fda9d2f4522024aa8bd8b8305e6a71c4a4a28c07"; - sha256 = "1gp7w6wnp1cnvq7lhb6kkqrp315mxzwsc4sy1bxz1ih1rjdxmdd3"; + sha256 = "6cff7636e5939931a1f152fe635319028fb92d88483789d737e89ef2d73ea16f"; }; dependencies = []; }; "vim-addon-mru" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-mru"; + name = "vim-addon-mru-2013-08-08"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-mru"; rev = "e41e39bd9d1bf78ccfd8d5e1bc05ae5e1026c2bb"; - sha256 = "15b70f796f28cbd999060fea7f47408fa8a6cb176cd4915b9cc3dc6c53eed960"; + sha256 = "b00f609e5e043171b2be729bbc7b5094678fdfe7de97a1b34bf9855bec7d75f8"; }; dependencies = ["vim-addon-other" "vim-addon-mw-utils"]; }; "vim-addon-mw-utils" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-mw-utils"; + name = "vim-addon-mw-utils-2012-11-05"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-mw-utils"; rev = "0c5612fa31ee434ba055e21c76f456244b3b5109"; - sha256 = "4e1b6d1b59050f1063e58ef4bee9e9603616ad184cd9ef7466d0ec3d8e22b91c"; + sha256 = "7ba038830b6f6c60a93d3dc8e60755a3728ddc8414e9d8c0089d5b530eb848e7"; }; dependencies = []; }; "vim-addon-nix" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-nix"; + name = "vim-addon-nix-2014-11-05"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-nix"; rev = "7b0a376bb1797fef8da2dc14e768f318bcb671e8"; - sha256 = "c2b0f6f50083063b5e801b872f38d4f00307fe5d7a4f3977a108e5cd10c1c410"; + sha256 = "db4c397ae56f81f600e67549c76a879901d6084246b34751526a9e39f3f720c1"; }; dependencies = ["vim-addon-completion" "vim-addon-goto-thing-at-cursor" "vim-addon-errorformats" "vim-addon-actions" "vim-addon-mw-utils" "tlib"]; }; "vim-addon-other" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-other"; + name = "vim-addon-other-2014-07-15"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-other"; rev = "f78720c9cb5bf871cabb13c7cbf94378dbf0163b"; - sha256 = "43f027e4b7576031072515c23c2b09f7f2c8bba7ee43a1e2041a4371bd954d1b"; + sha256 = "ec0b80acd31bac66bb1fc72bfc960f2a89b156d6ecd0a620c143bde8fbfe1e21"; }; dependencies = ["vim-addon-actions" "vim-addon-mw-utils"]; }; "vim-addon-php-manual" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-php-manual"; + name = "vim-addon-php-manual-2015-01-01"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-php-manual"; rev = "5f9810dd1f6e9f36a45f637ae6260ccff09256ff"; - sha256 = "3942eb6a7191c308beab240e91c99ee4e2c52e2d672503d46f98312e823b86cd"; + sha256 = "d127d274bd37c1ad4deae4e988403f987cb11c0a8d7f7d729bf1fcf282a33add"; }; dependencies = []; }; "vim-addon-signs" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-signs"; + name = "vim-addon-signs-2013-04-19"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-signs"; rev = "17a49f293d18174ff09d1bfff5ba86e8eee8e8ae"; - sha256 = "a9c03a32e758d51106741605188cb7f00db314c73a26cae75c0c9843509a8fb8"; + sha256 = "27035d6d8eace02be4a5585100372a709d7a582ea66b56a1c282ee5041e1fc70"; }; dependencies = []; }; "vim-addon-sql" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-sql"; + name = "vim-addon-sql-2014-01-18"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-sql"; rev = "05b8a0c211f1ae4c515c64e91dec555cdf20d90b"; - sha256 = "a1334ae694e0a03229bacc8ba7e08e7223df240244c7378e3f1bd91d74e957c2"; + sha256 = "0d5cb4e6fa829a39cf8ba537a463aece768619ce8bcbb8693a4c348fa64541ca"; }; dependencies = ["vim-addon-completion" "vim-addon-background-cmd" "tlib"]; }; "vim-addon-syntax-checker" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-syntax-checker"; + name = "vim-addon-syntax-checker-2013-07-12"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-syntax-checker"; rev = "8eb7217e636ca717d4de5cd03cc0180c5b66ae77"; - sha256 = "aef048e664653b5007df71ac24ed34ec55d8938c763d3f80885a122e445a9b3d"; + sha256 = "530f1d69e8ebae201c07b38e50ebfadbae60649d4a73977c124cd3f1378d659f"; }; dependencies = ["vim-addon-mw-utils" "tlib"]; }; "vim-addon-toggle-buffer" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-toggle-buffer"; + name = "vim-addon-toggle-buffer-2012-01-13"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-toggle-buffer"; rev = "a1b38b9c5709cba666ed2d84ef06548f675c6b0b"; - sha256 = "672166ecfe0599177afb56b444366f587f77e9659c256ac4e41ee45cb2df6055"; + sha256 = "c258c941e75f09474d27ebeb859438565e3e237873fa71d1abfc75f8dfaee963"; }; dependencies = ["vim-addon-mw-utils" "tlib"]; }; "vim-addon-xdebug" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-xdebug"; + name = "vim-addon-xdebug-2014-08-29"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-xdebug"; rev = "45f26407305b4ce6f8f5f37d2b5e6e4354104172"; - sha256 = "0a7bf2caf36772c94bd25bfbf46bf628623809c9cfab447ff788eb74149464ef"; + sha256 = "ebf61896e9b32eeeb0553124cc0011aee7d779307a32771c3ecb7181951d479a"; }; dependencies = ["WebAPI" "vim-addon-mw-utils" "vim-addon-signs" "vim-addon-async"]; }; "vim-airline" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline"; + name = "vim-airline-2015-02-13"; src = fetchgit { url = "git://github.com/bling/vim-airline"; - rev = "446397e006d8cba9e1ac38d8c656ba39218c139b"; - sha256 = "c1f3ae483616318574e892b1cbaac2e08b0b90fd7348d7de745984c764b21119"; + rev = "ca925efdbfe88b03597efc7caee4ee8762a2cfe0"; + sha256 = "47def66ab083fb847c8ee40e0a23bf6d69cdcc7919c869089542381c8319c972"; }; dependencies = []; }; "vim-coffee-script" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-coffee-script"; + name = "vim-coffee-script-2014-10-10"; src = fetchgit { url = "git://github.com/kchmck/vim-coffee-script"; rev = "827e4a38b07479433b619091469a7495a392df8a"; - sha256 = "89ee4c7cce9f3310be502df6b2dd2e70a715c0b06882afc9c8169fbf58b207d0"; + sha256 = "ca93ff77aab2c5f0b855afa60b26fce355f74684e8de27e76d2d22eda3e75904"; }; dependencies = []; }; "vim-easy-align" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-easy-align"; + name = "vim-easy-align-2014-12-14"; src = fetchgit { url = "git://github.com/junegunn/vim-easy-align"; rev = "c62d124be614de65922b15d468c4049d1eee9353"; - sha256 = "868bd5a0405a7611e020fe7692a078ca72562674b6d9a404d2d83f665af96aee"; + sha256 = "733dbf6c4d1a29957451d64c7cf431f877e5abefcee19017742b4d5e8d60165b"; }; dependencies = []; }; "vim-gitgutter" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-gitgutter"; + name = "vim-gitgutter-2015-02-11"; src = fetchgit { url = "git://github.com/airblade/vim-gitgutter"; - rev = "e5efbaffc066ababc9ae0d689c7050fa5d6591bd"; - sha256 = "78e7db87f4f677ede5aad758131d060f4fb6017cf716aa6adc0736e92934d42d"; + rev = "061258e04476c0f9f653a969e640bf03b3659594"; + sha256 = "535643c8e958d7c020ef0c39aadb5c6a7f3bad8895213bc0f6774c12e2627ac3"; }; dependencies = []; }; "vim-iced-coffee-script" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-iced-coffee-script"; + name = "vim-iced-coffee-script-2013-12-27"; src = fetchgit { url = "git://github.com/noc7c9/vim-iced-coffee-script"; rev = "e42e0775fa4b1f8840c55cd36ac3d1cedbc1dea2"; - sha256 = "c7859591975a51a1736f99a433d7ca3e7638b417340a0472a63995e16d8ece93"; + sha256 = "631786c89ebcd630788f2c7201b3f2503e0106eef4e3d9d808e91946f7778c08"; }; dependencies = []; }; "vim-latex-live-preview" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-latex-live-preview"; + name = "vim-latex-live-preview-2013-11-25"; src = fetchgit { url = "git://github.com/xuhdev/vim-latex-live-preview"; rev = "18625ceca4de5984f3df50cdd0202fc13eb9e37c"; - sha256 = "261852d3830189a50176f997a4c6b4ec7e25893c5b7842a3eb57eb7771158722"; + sha256 = "c129e9360f0c3c616a26ea74cfde03c70cfae16f9e1eeb89cfbcfc16beb3b5b9"; }; dependencies = []; }; "vim-signature" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-signature"; + name = "vim-signature-2015-01-12"; src = fetchgit { url = "git://github.com/kshenoy/vim-signature"; rev = "b4ac4f38528313456f98b1a50722cfc9a06bfc45"; - sha256 = "c065eb81669fd76a8bf6d19e220c85ad07ede73e6a9b3dd12634611146303675"; + sha256 = "606e2b1dc19c0e9c7301e0c9a6ff07cd7cefe057f3a5ac17536735dcb1a03e06"; }; dependencies = []; }; "vim-snippets" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-snippets"; + name = "vim-snippets-2015-02-17"; src = fetchgit { url = "git://github.com/honza/vim-snippets"; - rev = "27906a3754f0ac292d0915a4075bff22db53fa3e"; - sha256 = "fce0a62e78f031a00da0c7863d51d9f19f826bdc01c56cf5fc959132db29b6a6"; + rev = "93b4de1299916de0d93d70629f86ff0fa9735061"; + sha256 = "82a909f180ea11959d20f838a2716ff188bdec9f5ea2406ccd4fa27388462cf6"; }; dependencies = []; }; "vim2hs" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim2hs"; + name = "vim2hs-2014-04-16"; src = fetchgit { url = "git://github.com/dag/vim2hs"; rev = "f2afd55704bfe0a2d66e6b270d247e9b8a7b1664"; - sha256 = "485fc58595bb4e50f2239bec5a4cbb0d8f5662aa3f744e42c110cd1d66b7e5b0"; + sha256 = "1c8120a530a29047a8034dc7b381a53f41b0d827d90ea496736b97b65a6b01f5"; }; dependencies = []; }; "vundle" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vundle"; + name = "vundle-2014-07-18"; src = fetchgit { url = "git://github.com/gmarik/vundle"; rev = "0b28e334e65b6628b0a61c412fcb45204a2f2bab"; - sha256 = "9681d471d1391626cb9ad22b2b469003d9980cd23c5c3a8d34666376447e6204"; + sha256 = "95b9b4b8bb76fa60f2a26ef48c3801385051bcb5b2f591d548dc45284b3ab79e"; }; dependencies = []; From aa2fd491ad84c4ba2137d7eaf463c76fadd95bcc Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 18 Feb 2015 05:02:46 +0300 Subject: [PATCH 053/197] rpcbind: update --- pkgs/servers/rpcbind/default.nix | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/servers/rpcbind/default.nix index 31be5eef7c8..854a2ab94b7 100644 --- a/pkgs/servers/rpcbind/default.nix +++ b/pkgs/servers/rpcbind/default.nix @@ -1,24 +1,29 @@ -{ fetchurl, stdenv, libtirpc }: +{ fetchurl, stdenv, pkgconfig, libtirpc +, useSystemd ? true, systemd }: -stdenv.mkDerivation rec { - name = "rpcbind-0.2.0"; +let version = "0.2.2"; +in stdenv.mkDerivation rec { + name = "rpcbind-${version}"; src = fetchurl { - url = "mirror://sourceforge/rpcbind/rpcbind-0.2.0.tar.bz2"; - sha256 = "c92f263e0353887f16379d7708ef1fb4c7eedcf20448bc1e4838f59497a00de3"; + url = "mirror://sourceforge/rpcbind/${version}/${name}.tar.bz2"; + sha256 = "0acgl1c07ymnks692b90aq5ldj4h0km7n03kz26wxq6vjv3winqk"; }; patches = [ ./sunrpc.patch ]; - preConfigure = '' - export CPPFLAGS=-I${libtirpc}/include/tirpc - ''; + buildInputs = [ libtirpc ] + ++ stdenv.lib.optional useSystemd systemd; - buildInputs = [ libtirpc ]; + configureFlags = stdenv.lib.optional (!useSystemd) "--with-systemdsystemunitdir=no"; - meta = { + nativeBuildInputs = [ pkgconfig ]; + + meta = with stdenv.lib; { description = "ONC RPC portmapper"; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ abbradar ]; longDescription = '' Universal addresses to RPC program number mapper. ''; From 7791a5362d39fc48eee46fa383ad38927e6f6e43 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 18 Feb 2015 05:05:04 +0300 Subject: [PATCH 054/197] libtirpc: adopt --- pkgs/development/libraries/ti-rpc/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix index 5631ca7e6ca..8c9b6f0e1b3 100644 --- a/pkgs/development/libraries/ti-rpc/default.nix +++ b/pkgs/development/libraries/ti-rpc/default.nix @@ -21,10 +21,11 @@ stdenv.mkDerivation rec { doCheck = true; - meta = { + meta = with stdenv.lib; { homepage = "http://sourceforge.net/projects/libtirpc/"; description = "The transport-independent Sun RPC implementation (TI-RPC)"; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; + maintainers = with maintainers; [ abbradar ]; longDescription = '' Currently, NFS commands use the SunRPC routines provided by the glibc. These routines do not support IPv6 addresses. Ulrich From aa878ffe944c4c85482ac07a8ffefd251a0ada96 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 18 Feb 2015 05:05:18 +0300 Subject: [PATCH 055/197] bundler: fix hash --- pkgs/development/interpreters/ruby/bundler-head.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/ruby/bundler-head.nix b/pkgs/development/interpreters/ruby/bundler-head.nix index 2e8cfc8cbf1..43a5961aa35 100644 --- a/pkgs/development/interpreters/ruby/bundler-head.nix +++ b/pkgs/development/interpreters/ruby/bundler-head.nix @@ -5,7 +5,7 @@ buildRubyGem { src = fetchgit { url = "https://github.com/bundler/bundler.git"; rev = "a2343c9eabf5403d8ffcbca4dea33d18a60fc157"; - sha256 = "1l4r55n1wzr817l225l6pm97li1mxg9icd8s51cpfihh91nkdz68"; + sha256 = "1fywz0m3bb0fmcikhqbw9iaw67k29srwi8dllq6ni1cbm1xfyj46"; leaveDotGit = true; }; dontPatchShebangs = true; From c5a71157215fb009b7230311f8d0e8301c49efc9 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Wed, 18 Feb 2015 17:23:47 +0100 Subject: [PATCH 056/197] grsecurity: Update stable and test patches stable: 3.0-3.14.32-201502062101 -> 3.0-3.14.33-201502180832 test: 3.0-3.18.6-201502062100 -> 3.0-3.18.7-201502180834 --- pkgs/os-specific/linux/kernel/patches.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 14c25374b3f..dfa65a78e7c 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -65,17 +65,17 @@ rec { }; grsecurity_stable = grsecPatch - { kversion = "3.14.32"; - revision = "201502062101"; + { kversion = "3.14.33"; + revision = "201502180832"; branch = "stable"; - sha256 = "1qni3x6kwrhgqbhwm02m9wnmz7y2ydwwxw9ckk06xyq3j9qgv3aj"; + sha256 = "1hg8zs6p5fy312ksz3ygffa8vd5pl2l2xbdyxdgcdiakzpqjgfgc"; }; grsecurity_unstable = grsecPatch - { kversion = "3.18.6"; - revision = "201502062100"; + { kversion = "3.18.7"; + revision = "201502180834"; branch = "test"; - sha256 = "11cy7qqkahd323hmi67r4psgryapk1qwamm9m15rhbfqgq428306"; + sha256 = "03gl2l4wjdba03nnr0195yx76h6i3kn40ls22g5hbfg6p3y1risa"; }; grsec_fix_path = From c6e0178d40a76b606ae83884e7e3e844de43e22b Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 18 Feb 2015 19:25:13 +0300 Subject: [PATCH 057/197] gitlab: fix checksum --- pkgs/applications/version-management/gitlab/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 34a7c601cac..4f75bb94a29 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -7,7 +7,7 @@ let url = "https://github.com/gitlabhq/gitlabhq.git"; rev = "477743a154e85c411e8a533980abce460b5669fc"; fetchSubmodules = false; - sha256 = "0jl1w9d46v8hc27h9s380ha07m3fd2zpflj4q9vywwcf570ahj7x"; + sha256 = "1gk77j886w6zvw5cawpgja6f87qirmjx7y4g5i3psxm4j67llxdp"; }; env = bundlerEnv { From 61f074028bbcc805643ae5d73ce14433f3aa0c5e Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 18 Feb 2015 18:01:55 +0100 Subject: [PATCH 058/197] qprint: add version 1.1 --- pkgs/tools/text/qprint/default.nix | 28 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/text/qprint/default.nix diff --git a/pkgs/tools/text/qprint/default.nix b/pkgs/tools/text/qprint/default.nix new file mode 100644 index 00000000000..3bb147f7dd2 --- /dev/null +++ b/pkgs/tools/text/qprint/default.nix @@ -0,0 +1,28 @@ +{ fetchurl, stdenv }: + +stdenv.mkDerivation rec { + name = "qprint-1.1"; + + src = fetchurl { + url = "http://www.fourmilab.ch/webtools/qprint/${name}.tar.gz"; + sha256 = "1701cnb1nl84rmcpxzq11w4cyj4385jh3gx4aqxznwf8a4fwmagz"; + }; + + doCheck = true; + + checkTarget = "wringer"; + + preInstall = '' + mkdir -p $out/bin + mkdir -p $out/share/man/man1 + ''; + + meta = { + homepage = "http://www.fourmilab.ch/webtools/qprint/"; + license = stdenv.lib.licenses.publicDomain; + description = "encode and decode Quoted-Printable files"; + maintainers = [ stdenv.lib.maintainers.tv ]; + platforms = stdenv.lib.platforms.all; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e5e94cedc05..b7c6d211508 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2376,6 +2376,8 @@ let qpdf = callPackage ../development/libraries/qpdf { }; + qprint = callPackage ../tools/text/qprint { }; + qscintilla = callPackage ../development/libraries/qscintilla { qt = qt4; }; From 7e4e671c54038eca7e86b09ef94f10651aad85ce Mon Sep 17 00:00:00 2001 From: Marcell Vazquez-Chanlatte Date: Wed, 18 Feb 2015 11:27:47 -0600 Subject: [PATCH 059/197] Add uncertainties python package --- pkgs/top-level/python-packages.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b49048d226f..10e56be1f28 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13143,6 +13143,24 @@ let }; }; + uncertainties = buildPythonPackage rec { + name = "uncertainties-2.4.6.1"; + + src = pkgs.fetchurl { + url = "https://github.com/lebigot/uncertainties/archive/2.4.6.1.tar.gz"; + sha256 = "993ad1a380185ff9548510401ed89fe96cf1f18ca48b44657356c8dcd3ad5032"; + }; + + buildInputs = with self; [ nose numpy ]; + + meta = { + homepage = "http://pythonhosted.org/uncertainties/"; + description = "Transparent calculations with uncertainties on the quantities involved (aka error propagation)"; + license = licenses.bsd3; + }; + }; + + # python2.7 specific packages } // optionalAttrs isPy27 ( with self; From 1b0409896e523a68b84d3c017fb08c86032b5059 Mon Sep 17 00:00:00 2001 From: Joel Taylor Date: Wed, 18 Feb 2015 11:38:33 -0800 Subject: [PATCH 060/197] add fetch-bower to node-packages --- pkgs/top-level/node-packages-generated.nix | 5279 ++++++++++++-------- pkgs/top-level/node-packages.json | 1 + 2 files changed, 3132 insertions(+), 2148 deletions(-) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 8709dd62b6e..4b96ca505ca 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -175,7 +175,7 @@ sha1 = "d71c96f7d41d0feda2c38cd14e8a27c04158df4a"; }; deps = { - "mime-types-2.0.7" = self.by-version."mime-types"."2.0.7"; + "mime-types-2.0.9" = self.by-version."mime-types"."2.0.9"; "negotiator-0.4.9" = self.by-version."negotiator"."0.4.9"; }; peerDependencies = []; @@ -186,22 +186,24 @@ self.by-version."accepts"."1.1.4"; by-spec."accepts"."~1.1.4" = self.by-version."accepts"."1.1.4"; - by-spec."accepts"."~1.2.2" = - self.by-version."accepts"."1.2.2"; - by-version."accepts"."1.2.2" = self.buildNodePackage { - name = "accepts-1.2.2"; + by-spec."accepts"."~1.2.3" = + self.by-version."accepts"."1.2.4"; + by-version."accepts"."1.2.4" = self.buildNodePackage { + name = "accepts-1.2.4"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/accepts/-/accepts-1.2.2.tgz"; - name = "accepts-1.2.2.tgz"; - sha1 = "9bc29b9b39f33a351e76a76058184ebc8ed7783f"; + url = "http://registry.npmjs.org/accepts/-/accepts-1.2.4.tgz"; + name = "accepts-1.2.4.tgz"; + sha1 = "f4e6c66f4faf69c76bd7a63a1ffc5bd2dacfb2ac"; }; deps = { - "mime-types-2.0.7" = self.by-version."mime-types"."2.0.7"; - "negotiator-0.5.0" = self.by-version."negotiator"."0.5.0"; + "mime-types-2.0.9" = self.by-version."mime-types"."2.0.9"; + "negotiator-0.5.1" = self.by-version."negotiator"."0.5.1"; }; peerDependencies = []; }; + by-spec."accepts"."~1.2.4" = + self.by-version."accepts"."1.2.4"; by-spec."acorn"."^0.11.0" = self.by-version."acorn"."0.11.0"; by-version."acorn"."0.11.0" = self.buildNodePackage { @@ -216,20 +218,6 @@ }; peerDependencies = []; }; - by-spec."acorn"."^0.8.0" = - self.by-version."acorn"."0.8.0"; - by-version."acorn"."0.8.0" = self.buildNodePackage { - name = "acorn-0.8.0"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/acorn/-/acorn-0.8.0.tgz"; - name = "acorn-0.8.0.tgz"; - sha1 = "e07ae6721110b22878242950ae2e96658b0aac7e"; - }; - deps = { - }; - peerDependencies = []; - }; by-spec."acorn"."~0.9.0" = self.by-version."acorn"."0.9.0"; by-version."acorn"."0.9.0" = self.buildNodePackage { @@ -335,7 +323,19 @@ peerDependencies = []; }; by-spec."adm-zip"."~0.4.3" = - self.by-version."adm-zip"."0.4.4"; + self.by-version."adm-zip"."0.4.7"; + by-version."adm-zip"."0.4.7" = self.buildNodePackage { + name = "adm-zip-0.4.7"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz"; + name = "adm-zip-0.4.7.tgz"; + sha1 = "8606c2cbf1c426ce8c8ec00174447fd49b6eafc1"; + }; + deps = { + }; + peerDependencies = []; + }; by-spec."after"."0.8.1" = self.by-version."after"."0.8.1"; by-version."after"."0.8.1" = self.buildNodePackage { @@ -375,7 +375,7 @@ sha1 = "276dc149bb5ce19d13632d7cab7afd4e759e37cc"; }; deps = { - "asyncblock-2.1.23" = self.by-version."asyncblock"."2.1.23"; + "asyncblock-2.1.24" = self.by-version."asyncblock"."2.1.24"; "mdns-js-0.2.5" = self.by-version."mdns-js"."0.2.5"; "plist-with-patches-0.5.1" = self.by-version."plist-with-patches"."0.5.1"; }; @@ -445,14 +445,14 @@ by-spec."amdefine".">=0.0.4" = self.by-version."amdefine"."0.1.0"; by-spec."amqp".">=0.1.3" = - self.by-version."amqp"."0.2.0"; - by-version."amqp"."0.2.0" = self.buildNodePackage { - name = "amqp-0.2.0"; + self.by-version."amqp"."0.2.3"; + by-version."amqp"."0.2.3" = self.buildNodePackage { + name = "amqp-0.2.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/amqp/-/amqp-0.2.0.tgz"; - name = "amqp-0.2.0.tgz"; - sha1 = "caed3d5a1ef5f419663f80dcf6e95312e5fca2ca"; + url = "http://registry.npmjs.org/amqp/-/amqp-0.2.3.tgz"; + name = "amqp-0.2.3.tgz"; + sha1 = "25afbd851ad784f8e606f22bfe34c5f83e4fe75c"; }; deps = { "lodash-1.3.1" = self.by-version."lodash"."1.3.1"; @@ -550,20 +550,6 @@ }; peerDependencies = []; }; - by-spec."ansi-styles"."~1.0.0" = - self.by-version."ansi-styles"."1.0.0"; - by-version."ansi-styles"."1.0.0" = self.buildNodePackage { - name = "ansi-styles-1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz"; - name = "ansi-styles-1.0.0.tgz"; - sha1 = "cb102df1c56f5123eab8b67cd7b98027a0279178"; - }; - deps = { - }; - peerDependencies = []; - }; by-spec."ansicolors"."~0.3.2" = self.by-version."ansicolors"."0.3.2"; by-version."ansicolors"."0.3.2" = self.buildNodePackage { @@ -592,7 +578,7 @@ }; peerDependencies = []; }; - by-spec."anymatch"."~1.1.0" = + by-spec."anymatch"."^1.1.0" = self.by-version."anymatch"."1.1.0"; by-version."anymatch"."1.1.0" = self.buildNodePackage { name = "anymatch-1.1.0"; @@ -849,6 +835,20 @@ }; peerDependencies = []; }; + by-spec."asap"."^2.0.0" = + self.by-version."asap"."2.0.1"; + by-version."asap"."2.0.1" = self.buildNodePackage { + name = "asap-2.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/asap/-/asap-2.0.1.tgz"; + name = "asap-2.0.1.tgz"; + sha1 = "1345eaff39393ba58863177440a424ce59029244"; + }; + deps = { + }; + peerDependencies = []; + }; by-spec."asap"."~1.0.0" = self.by-version."asap"."1.0.0"; by-spec."ascii-json"."~0.2" = @@ -910,24 +910,24 @@ peerDependencies = []; }; by-spec."asn1.js".">=1.0.0-0 >=1.0.0-0 <2.0.0-0" = - self.by-version."asn1.js"."1.0.2"; - by-version."asn1.js"."1.0.2" = self.buildNodePackage { - name = "asn1.js-1.0.2"; + self.by-version."asn1.js"."1.0.3"; + by-version."asn1.js"."1.0.3" = self.buildNodePackage { + name = "asn1.js-1.0.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/asn1.js/-/asn1.js-1.0.2.tgz"; - name = "asn1.js-1.0.2.tgz"; - sha1 = "967f8108b236b2bb056aaf8022316e88d3efe895"; + url = "http://registry.npmjs.org/asn1.js/-/asn1.js-1.0.3.tgz"; + name = "asn1.js-1.0.3.tgz"; + sha1 = "281ba3ec1f2448fe765f92a4eecf883fe1364b54"; }; deps = { "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; "minimalistic-assert-1.0.0" = self.by-version."minimalistic-assert"."1.0.0"; - "bn.js-1.0.0" = self.by-version."bn.js"."1.0.0"; + "bn.js-1.3.0" = self.by-version."bn.js"."1.3.0"; }; peerDependencies = []; }; by-spec."asn1.js"."^1.0.0" = - self.by-version."asn1.js"."1.0.2"; + self.by-version."asn1.js"."1.0.3"; by-spec."asn1.js-rfc3280"."^1.0.0" = self.by-version."asn1.js-rfc3280"."1.0.0"; by-version."asn1.js-rfc3280"."1.0.0" = self.buildNodePackage { @@ -941,7 +941,7 @@ deps = { }; peerDependencies = [ - self.by-version."asn1.js"."1.0.2"]; + self.by-version."asn1.js"."1.0.3"]; }; by-spec."assert"."*" = self.by-version."assert"."1.3.0"; @@ -1079,14 +1079,14 @@ peerDependencies = []; }; by-spec."ast-types"."~0.6.1" = - self.by-version."ast-types"."0.6.10"; - by-version."ast-types"."0.6.10" = self.buildNodePackage { - name = "ast-types-0.6.10"; + self.by-version."ast-types"."0.6.12"; + by-version."ast-types"."0.6.12" = self.buildNodePackage { + name = "ast-types-0.6.12"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/ast-types/-/ast-types-0.6.10.tgz"; - name = "ast-types-0.6.10.tgz"; - sha1 = "381c6b083112bdf6561f14ce1aee5dce4a0089a7"; + url = "http://registry.npmjs.org/ast-types/-/ast-types-0.6.12.tgz"; + name = "ast-types-0.6.12.tgz"; + sha1 = "ea7e5b0750b6ebd9d3f492011c0f7e0c55e035b0"; }; deps = { }; @@ -1236,7 +1236,7 @@ self.by-version."async"."0.9.0"; by-spec."async"."~0.9.0" = self.by-version."async"."0.9.0"; - by-spec."async-each"."~0.1.5" = + by-spec."async-each"."^0.1.5" = self.by-version."async-each"."0.1.6"; by-version."async-each"."0.1.6" = self.buildNodePackage { name = "async-each-0.1.6"; @@ -1266,30 +1266,30 @@ peerDependencies = []; }; by-spec."asyncblock"."^2.1.23" = - self.by-version."asyncblock"."2.1.23"; - by-version."asyncblock"."2.1.23" = self.buildNodePackage { - name = "asyncblock-2.1.23"; + self.by-version."asyncblock"."2.1.24"; + by-version."asyncblock"."2.1.24" = self.buildNodePackage { + name = "asyncblock-2.1.24"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/asyncblock/-/asyncblock-2.1.23.tgz"; - name = "asyncblock-2.1.23.tgz"; - sha1 = "b51489b4e95cd152a148cff85015ff09691d1df9"; + url = "http://registry.npmjs.org/asyncblock/-/asyncblock-2.1.24.tgz"; + name = "asyncblock-2.1.24.tgz"; + sha1 = "8f5c5f95cf5d1b50fead4595ae596f40f2c8d255"; }; deps = { - "fibers-1.0.2" = self.by-version."fibers"."1.0.2"; + "fibers-1.0.5" = self.by-version."fibers"."1.0.5"; "esprima-1.2.2" = self.by-version."esprima"."1.2.2"; }; peerDependencies = []; }; by-spec."aws-sdk"."*" = - self.by-version."aws-sdk"."2.1.7"; - by-version."aws-sdk"."2.1.7" = self.buildNodePackage { - name = "aws-sdk-2.1.7"; + self.by-version."aws-sdk"."2.1.12"; + by-version."aws-sdk"."2.1.12" = self.buildNodePackage { + name = "aws-sdk-2.1.12"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1.7.tgz"; - name = "aws-sdk-2.1.7.tgz"; - sha1 = "624d1ab9dbdf4782b9c3e07f906bf86a00f0bcb5"; + url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1.12.tgz"; + name = "aws-sdk-2.1.12.tgz"; + sha1 = "639419d26dc653020cc5ebd760ef09e193206843"; }; deps = { "xml2js-0.2.6" = self.by-version."xml2js"."0.2.6"; @@ -1297,7 +1297,7 @@ }; peerDependencies = []; }; - "aws-sdk" = self.by-version."aws-sdk"."2.1.7"; + "aws-sdk" = self.by-version."aws-sdk"."2.1.12"; by-spec."aws-sdk"."2.0.5" = self.by-version."aws-sdk"."2.0.5"; by-version."aws-sdk"."2.0.5" = self.buildNodePackage { @@ -1518,33 +1518,21 @@ by-spec."base64-js"."~0.0.4" = self.by-version."base64-js"."0.0.8"; by-spec."base64-url"."1" = - self.by-version."base64-url"."1.2.0"; - by-version."base64-url"."1.2.0" = self.buildNodePackage { - name = "base64-url-1.2.0"; + self.by-version."base64-url"."1.2.1"; + by-version."base64-url"."1.2.1" = self.buildNodePackage { + name = "base64-url-1.2.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/base64-url/-/base64-url-1.2.0.tgz"; - name = "base64-url-1.2.0.tgz"; - sha1 = "5b10db3a40720a0d46d33d1954bc95c2c8b97917"; - }; - deps = { - }; - peerDependencies = []; - }; - by-spec."base64-url"."1.1.0" = - self.by-version."base64-url"."1.1.0"; - by-version."base64-url"."1.1.0" = self.buildNodePackage { - name = "base64-url-1.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/base64-url/-/base64-url-1.1.0.tgz"; - name = "base64-url-1.1.0.tgz"; - sha1 = "fff58640464480a208a532f2e1919d296e3fbf10"; + url = "http://registry.npmjs.org/base64-url/-/base64-url-1.2.1.tgz"; + name = "base64-url-1.2.1.tgz"; + sha1 = "199fd661702a0e7b7dcae6e0698bb089c52f6d78"; }; deps = { }; peerDependencies = []; }; + by-spec."base64-url"."1.2.1" = + self.by-version."base64-url"."1.2.1"; by-spec."base64id"."0.1.0" = self.by-version."base64id"."0.1.0"; by-version."base64id"."0.1.0" = self.buildNodePackage { @@ -1692,7 +1680,7 @@ peerDependencies = []; }; "bcrypt" = self.by-version."bcrypt"."0.8.1"; - by-spec."bcrypt".">= 0.5" = + by-spec."bcrypt".">=0.5.0" = self.by-version."bcrypt"."0.8.1"; by-spec."beeper"."^1.0.0" = self.by-version."beeper"."1.0.0"; @@ -1781,6 +1769,20 @@ }; peerDependencies = []; }; + by-spec."binary-extensions"."^1.0.0" = + self.by-version."binary-extensions"."1.3.0"; + by-version."binary-extensions"."1.3.0" = self.buildNodePackage { + name = "binary-extensions-1.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/binary-extensions/-/binary-extensions-1.3.0.tgz"; + name = "binary-extensions-1.3.0.tgz"; + sha1 = "8c0fd7fa1bd27cfe1e6f2a1d38721647c80b2029"; + }; + deps = { + }; + peerDependencies = []; + }; by-spec."binaryheap".">= 0.0.3" = self.by-version."binaryheap"."0.0.3"; by-version."binaryheap"."0.0.3" = self.buildNodePackage { @@ -1865,6 +1867,8 @@ }; peerDependencies = []; }; + by-spec."bindings"."1.2.x" = + self.by-version."bindings"."1.2.1"; by-spec."bindings".">=1.2.1" = self.by-version."bindings"."1.2.1"; by-spec."bindings"."^1.2.1" = @@ -1874,28 +1878,28 @@ by-spec."bindings"."~1.2.1" = self.by-version."bindings"."1.2.1"; by-spec."bip-pod".">=0.0.1" = - self.by-version."bip-pod"."0.3.2"; - by-version."bip-pod"."0.3.2" = self.buildNodePackage { - name = "bip-pod-0.3.2"; + self.by-version."bip-pod"."0.3.8"; + by-version."bip-pod"."0.3.8" = self.buildNodePackage { + name = "bip-pod-0.3.8"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/bip-pod/-/bip-pod-0.3.2.tgz"; - name = "bip-pod-0.3.2.tgz"; - sha1 = "f8d86caebc88c62c731e708b9d275314ec87fc40"; + url = "http://registry.npmjs.org/bip-pod/-/bip-pod-0.3.8.tgz"; + name = "bip-pod-0.3.8.tgz"; + sha1 = "0c1d60c473fa6a9ae7c8ba5b56150aecb3af6b7b"; }; deps = { "JSONPath-0.10.0" = self.by-version."JSONPath"."0.10.0"; "cron-1.0.6" = self.by-version."cron"."1.0.6"; "dns-0.2.2" = self.by-version."dns"."0.2.2"; "extend-2.0.0" = self.by-version."extend"."2.0.0"; - "ipaddr.js-0.1.6" = self.by-version."ipaddr.js"."0.1.6"; - "mime-1.2.11" = self.by-version."mime"."1.2.11"; + "ipaddr.js-0.1.8" = self.by-version."ipaddr.js"."0.1.8"; + "mime-1.3.4" = self.by-version."mime"."1.3.4"; "moment-2.9.0" = self.by-version."moment"."2.9.0"; "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; "passport-0.2.1" = self.by-version."passport"."0.2.1"; "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3"; - "request-2.51.0" = self.by-version."request"."2.51.0"; - "tldtools-0.0.19" = self.by-version."tldtools"."0.0.19"; + "request-2.53.0" = self.by-version."request"."2.53.0"; + "tldtools-0.0.23" = self.by-version."tldtools"."0.0.23"; "underscore-1.7.0" = self.by-version."underscore"."1.7.0"; "validator-1.5.1" = self.by-version."validator"."1.5.1"; }; @@ -1912,7 +1916,7 @@ sha1 = "b0f75ec915bd890d56b47864de3e883787f55a9d"; }; deps = { - "request-2.51.0" = self.by-version."request"."2.51.0"; + "request-2.53.0" = self.by-version."request"."2.53.0"; }; peerDependencies = []; }; @@ -1946,7 +1950,7 @@ sha1 = "4acd59449ae8c4e5449f6eef66cc442fc5f4821e"; }; deps = { - "chain-node-3.0.1" = self.by-version."chain-node"."3.0.1"; + "chain-node-3.1.0" = self.by-version."chain-node"."3.1.0"; }; peerDependencies = []; }; @@ -2063,7 +2067,7 @@ }; deps = { "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3"; - "embedly-1.0.2" = self.by-version."embedly"."1.0.2"; + "embedly-1.0.4" = self.by-version."embedly"."1.0.4"; }; peerDependencies = []; }; @@ -2126,14 +2130,14 @@ }; "bip-pod-flickr" = self.by-version."bip-pod-flickr"."0.3.1"; by-spec."bip-pod-flow".">=0.0.1" = - self.by-version."bip-pod-flow"."0.3.0"; - by-version."bip-pod-flow"."0.3.0" = self.buildNodePackage { - name = "bip-pod-flow-0.3.0"; + self.by-version."bip-pod-flow"."0.3.1"; + by-version."bip-pod-flow"."0.3.1" = self.buildNodePackage { + name = "bip-pod-flow-0.3.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/bip-pod-flow/-/bip-pod-flow-0.3.0.tgz"; - name = "bip-pod-flow-0.3.0.tgz"; - sha1 = "7660d5a584b752545306483964ce402a434e86b3"; + url = "http://registry.npmjs.org/bip-pod-flow/-/bip-pod-flow-0.3.1.tgz"; + name = "bip-pod-flow-0.3.1.tgz"; + sha1 = "69cae3cf582dc02434c416f10a88febc9955cfb5"; }; deps = { "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3"; @@ -2161,23 +2165,23 @@ }; "bip-pod-github" = self.by-version."bip-pod-github"."0.3.1"; by-spec."bip-pod-gmail"."*" = - self.by-version."bip-pod-gmail"."0.3.0"; - by-version."bip-pod-gmail"."0.3.0" = self.buildNodePackage { - name = "bip-pod-gmail-0.3.0"; + self.by-version."bip-pod-gmail"."0.3.1"; + by-version."bip-pod-gmail"."0.3.1" = self.buildNodePackage { + name = "bip-pod-gmail-0.3.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/bip-pod-gmail/-/bip-pod-gmail-0.3.0.tgz"; - name = "bip-pod-gmail-0.3.0.tgz"; - sha1 = "08f3113886a7d20a568950561323da239e7e521c"; + url = "http://registry.npmjs.org/bip-pod-gmail/-/bip-pod-gmail-0.3.1.tgz"; + name = "bip-pod-gmail-0.3.1.tgz"; + sha1 = "01e615d9dfa96bb1bc6ebf99f00fdf43bf34bc5f"; }; deps = { - "googleapis-1.1.1" = self.by-version."googleapis"."1.1.1"; + "googleapis-1.1.3" = self.by-version."googleapis"."1.1.3"; "passport-google-oauth-0.1.5" = self.by-version."passport-google-oauth"."0.1.5"; "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3"; }; peerDependencies = []; }; - "bip-pod-gmail" = self.by-version."bip-pod-gmail"."0.3.0"; + "bip-pod-gmail" = self.by-version."bip-pod-gmail"."0.3.1"; by-spec."bip-pod-google"."*" = self.by-version."bip-pod-google"."0.3.0"; by-version."bip-pod-google"."0.3.0" = self.buildNodePackage { @@ -2207,7 +2211,7 @@ sha1 = "d34617def8d9216f0a08e2c0a36bfc0e9d491021"; }; deps = { - "googleapis-1.1.1" = self.by-version."googleapis"."1.1.1"; + "googleapis-1.1.3" = self.by-version."googleapis"."1.1.3"; "passport-google-oauth-0.1.5" = self.by-version."passport-google-oauth"."0.1.5"; "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3"; }; @@ -2215,14 +2219,14 @@ }; "bip-pod-google-drive" = self.by-version."bip-pod-google-drive"."0.3.0"; by-spec."bip-pod-html".">=0.0.1" = - self.by-version."bip-pod-html"."0.3.0"; - by-version."bip-pod-html"."0.3.0" = self.buildNodePackage { - name = "bip-pod-html-0.3.0"; + self.by-version."bip-pod-html"."0.3.1"; + by-version."bip-pod-html"."0.3.1" = self.buildNodePackage { + name = "bip-pod-html-0.3.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/bip-pod-html/-/bip-pod-html-0.3.0.tgz"; - name = "bip-pod-html-0.3.0.tgz"; - sha1 = "a1c6b2698270cd36f9441c7e52cb8916a505fbbb"; + url = "http://registry.npmjs.org/bip-pod-html/-/bip-pod-html-0.3.1.tgz"; + name = "bip-pod-html-0.3.1.tgz"; + sha1 = "a784af5cb9d9be8b18c714351e2f21782ec9c588"; }; deps = { "favitest-1.0.7" = self.by-version."favitest"."1.0.7"; @@ -2241,7 +2245,7 @@ sha1 = "311f42fdfca0e013390650ac2149740cb7a34afe"; }; deps = { - "request-2.51.0" = self.by-version."request"."2.51.0"; + "request-2.53.0" = self.by-version."request"."2.53.0"; }; peerDependencies = []; }; @@ -2258,7 +2262,7 @@ deps = { "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3"; "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3"; - "request-2.51.0" = self.by-version."request"."2.51.0"; + "request-2.53.0" = self.by-version."request"."2.53.0"; "passport-imgur-0.0.2" = self.by-version."passport-imgur"."0.0.2"; }; peerDependencies = []; @@ -2277,7 +2281,7 @@ deps = { "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3"; "passport-instagram-0.1.2" = self.by-version."passport-instagram"."0.1.2"; - "request-2.51.0" = self.by-version."request"."2.51.0"; + "request-2.53.0" = self.by-version."request"."2.53.0"; }; peerDependencies = []; }; @@ -2314,14 +2318,14 @@ }; "bip-pod-keenio" = self.by-version."bip-pod-keenio"."0.3.0"; by-spec."bip-pod-mailchimp"."*" = - self.by-version."bip-pod-mailchimp"."0.3.0"; - by-version."bip-pod-mailchimp"."0.3.0" = self.buildNodePackage { - name = "bip-pod-mailchimp-0.3.0"; + self.by-version."bip-pod-mailchimp"."0.3.1"; + by-version."bip-pod-mailchimp"."0.3.1" = self.buildNodePackage { + name = "bip-pod-mailchimp-0.3.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/bip-pod-mailchimp/-/bip-pod-mailchimp-0.3.0.tgz"; - name = "bip-pod-mailchimp-0.3.0.tgz"; - sha1 = "dbcc920e9297e68a97085675e430e396c2b2df34"; + url = "http://registry.npmjs.org/bip-pod-mailchimp/-/bip-pod-mailchimp-0.3.1.tgz"; + name = "bip-pod-mailchimp-0.3.1.tgz"; + sha1 = "a0fa3f9920dab70a76c98df0edc10a1c3d5f8485"; }; deps = { "passport-mailchimp-0.0.1" = self.by-version."passport-mailchimp"."0.0.1"; @@ -2329,7 +2333,7 @@ }; peerDependencies = []; }; - "bip-pod-mailchimp" = self.by-version."bip-pod-mailchimp"."0.3.0"; + "bip-pod-mailchimp" = self.by-version."bip-pod-mailchimp"."0.3.1"; by-spec."bip-pod-mailgun"."*" = self.by-version."bip-pod-mailgun"."0.3.0"; by-version."bip-pod-mailgun"."0.3.0" = self.buildNodePackage { @@ -2374,28 +2378,28 @@ deps = { "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3"; "passport-mixcloud-0.0.2" = self.by-version."passport-mixcloud"."0.0.2"; - "request-2.51.0" = self.by-version."request"."2.51.0"; + "request-2.53.0" = self.by-version."request"."2.53.0"; }; peerDependencies = []; }; "bip-pod-mixcloud" = self.by-version."bip-pod-mixcloud"."0.3.0"; by-spec."bip-pod-mongodb"."*" = - self.by-version."bip-pod-mongodb"."0.3.0"; - by-version."bip-pod-mongodb"."0.3.0" = self.buildNodePackage { - name = "bip-pod-mongodb-0.3.0"; + self.by-version."bip-pod-mongodb"."0.3.1"; + by-version."bip-pod-mongodb"."0.3.1" = self.buildNodePackage { + name = "bip-pod-mongodb-0.3.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/bip-pod-mongodb/-/bip-pod-mongodb-0.3.0.tgz"; - name = "bip-pod-mongodb-0.3.0.tgz"; - sha1 = "333cdd30bb30c369b151a27fc4b1bc2aaf6f802d"; + url = "http://registry.npmjs.org/bip-pod-mongodb/-/bip-pod-mongodb-0.3.1.tgz"; + name = "bip-pod-mongodb-0.3.1.tgz"; + sha1 = "3eb25f1255f5cef8fa5e7f14378f1e6c7a93908a"; }; deps = { - "mongodb-2.0.14" = self.by-version."mongodb"."2.0.14"; + "mongodb-2.0.16" = self.by-version."mongodb"."2.0.16"; "assert-1.3.0" = self.by-version."assert"."1.3.0"; }; peerDependencies = []; }; - "bip-pod-mongodb" = self.by-version."bip-pod-mongodb"."0.3.0"; + "bip-pod-mongodb" = self.by-version."bip-pod-mongodb"."0.3.1"; by-spec."bip-pod-numerous"."*" = self.by-version."bip-pod-numerous"."0.3.0"; by-version."bip-pod-numerous"."0.3.0" = self.buildNodePackage { @@ -2438,7 +2442,7 @@ sha1 = "c23247a9532d9913938d547e6278c7466634a0d8"; }; deps = { - "pusher-1.0.2" = self.by-version."pusher"."1.0.2"; + "pusher-1.0.4" = self.by-version."pusher"."1.0.4"; }; peerDependencies = []; }; @@ -2456,7 +2460,7 @@ deps = { "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3"; "passport-soundcloud-0.1.2" = self.by-version."passport-soundcloud"."0.1.2"; - "request-2.51.0" = self.by-version."request"."2.51.0"; + "request-2.53.0" = self.by-version."request"."2.53.0"; }; peerDependencies = []; }; @@ -2477,17 +2481,17 @@ }; "bip-pod-statuscake" = self.by-version."bip-pod-statuscake"."0.3.0"; by-spec."bip-pod-syndication".">=0.0.1" = - self.by-version."bip-pod-syndication"."0.3.4"; - by-version."bip-pod-syndication"."0.3.4" = self.buildNodePackage { - name = "bip-pod-syndication-0.3.4"; + self.by-version."bip-pod-syndication"."0.3.5"; + by-version."bip-pod-syndication"."0.3.5" = self.buildNodePackage { + name = "bip-pod-syndication-0.3.5"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/bip-pod-syndication/-/bip-pod-syndication-0.3.4.tgz"; - name = "bip-pod-syndication-0.3.4.tgz"; - sha1 = "d38f2acafda836fa87b8cd3e253049d67cab10a6"; + url = "http://registry.npmjs.org/bip-pod-syndication/-/bip-pod-syndication-0.3.5.tgz"; + name = "bip-pod-syndication-0.3.5.tgz"; + sha1 = "21874326672a82a56bc40702efabfb3cbfa66d49"; }; deps = { - "ejs-2.2.3" = self.by-version."ejs"."2.2.3"; + "ejs-2.2.4" = self.by-version."ejs"."2.2.4"; "favitest-1.0.7" = self.by-version."favitest"."1.0.7"; "feedparser-0.19.2" = self.by-version."feedparser"."0.19.2"; "htmlparser2-3.8.2" = self.by-version."htmlparser2"."3.8.2"; @@ -2495,7 +2499,7 @@ "moment-2.9.0" = self.by-version."moment"."2.9.0"; "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3"; "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3"; - "request-2.51.0" = self.by-version."request"."2.51.0"; + "request-2.53.0" = self.by-version."request"."2.53.0"; "rss-1.1.1" = self.by-version."rss"."1.1.1"; "send-0.9.3" = self.by-version."send"."0.9.3"; "validator-1.5.1" = self.by-version."validator"."1.5.1"; @@ -2514,21 +2518,21 @@ }; deps = { "html-md-3.0.2" = self.by-version."html-md"."3.0.2"; - "marked-0.3.2" = self.by-version."marked"."0.3.2"; + "marked-0.3.3" = self.by-version."marked"."0.3.3"; "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3"; "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3"; }; peerDependencies = []; }; by-spec."bip-pod-time".">=0.0.1" = - self.by-version."bip-pod-time"."0.3.0"; - by-version."bip-pod-time"."0.3.0" = self.buildNodePackage { - name = "bip-pod-time-0.3.0"; + self.by-version."bip-pod-time"."0.3.1"; + by-version."bip-pod-time"."0.3.1" = self.buildNodePackage { + name = "bip-pod-time-0.3.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/bip-pod-time/-/bip-pod-time-0.3.0.tgz"; - name = "bip-pod-time-0.3.0.tgz"; - sha1 = "c7e3628b35c2d8a054e7a73db78e162c9247275f"; + url = "http://registry.npmjs.org/bip-pod-time/-/bip-pod-time-0.3.1.tgz"; + name = "bip-pod-time-0.3.1.tgz"; + sha1 = "97dae8e0b997ba22f43a8d8c7ff13f965883a735"; }; deps = { "moment-2.5.1" = self.by-version."moment"."2.5.1"; @@ -2588,14 +2592,14 @@ }; "bip-pod-twilio" = self.by-version."bip-pod-twilio"."0.3.1"; by-spec."bip-pod-twitter"."*" = - self.by-version."bip-pod-twitter"."0.3.0"; - by-version."bip-pod-twitter"."0.3.0" = self.buildNodePackage { - name = "bip-pod-twitter-0.3.0"; + self.by-version."bip-pod-twitter"."0.3.3"; + by-version."bip-pod-twitter"."0.3.3" = self.buildNodePackage { + name = "bip-pod-twitter-0.3.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/bip-pod-twitter/-/bip-pod-twitter-0.3.0.tgz"; - name = "bip-pod-twitter-0.3.0.tgz"; - sha1 = "9304bbb8493a604fd0fe28bcd5f61f725fb0ec70"; + url = "http://registry.npmjs.org/bip-pod-twitter/-/bip-pod-twitter-0.3.3.tgz"; + name = "bip-pod-twitter-0.3.3.tgz"; + sha1 = "3ecdaf0e54d1ec23fd0d9b478db5a215997b330b"; }; deps = { "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3"; @@ -2605,7 +2609,7 @@ }; peerDependencies = []; }; - "bip-pod-twitter" = self.by-version."bip-pod-twitter"."0.3.0"; + "bip-pod-twitter" = self.by-version."bip-pod-twitter"."0.3.3"; by-spec."bip-pod-witai"."*" = self.by-version."bip-pod-witai"."0.3.0"; by-version."bip-pod-witai"."0.3.0" = self.buildNodePackage { @@ -2658,44 +2662,45 @@ }; "bip-pod-zoho" = self.by-version."bip-pod-zoho"."0.3.1"; by-spec."bipio"."*" = - self.by-version."bipio"."0.3.3"; - by-version."bipio"."0.3.3" = self.buildNodePackage { - name = "bipio-0.3.3"; + self.by-version."bipio"."0.3.18"; + by-version."bipio"."0.3.18" = self.buildNodePackage { + name = "bipio-0.3.18"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/bipio/-/bipio-0.3.3.tgz"; - name = "bipio-0.3.3.tgz"; - sha1 = "5dd85ded95c8662bad90d4029c040bf57d89ec17"; + url = "http://registry.npmjs.org/bipio/-/bipio-0.3.18.tgz"; + name = "bipio-0.3.18.tgz"; + sha1 = "6d695785dac53ceb138f4e4a99499c0d846cd77d"; }; deps = { "JSONPath-0.10.0" = self.by-version."JSONPath"."0.10.0"; - "amqp-0.2.0" = self.by-version."amqp"."0.2.0"; + "amqp-0.2.3" = self.by-version."amqp"."0.2.3"; "async-0.1.18" = self.by-version."async"."0.1.18"; "base-converter-1.1.2" = self.by-version."base-converter"."1.1.2"; "bcrypt-0.8.1" = self.by-version."bcrypt"."0.8.1"; - "bip-pod-0.3.2" = self.by-version."bip-pod"."0.3.2"; + "bip-pod-0.3.8" = self.by-version."bip-pod"."0.3.8"; "bip-pod-crypto-0.3.0" = self.by-version."bip-pod-crypto"."0.3.0"; "bip-pod-email-0.3.3" = self.by-version."bip-pod-email"."0.3.3"; - "bip-pod-flow-0.3.0" = self.by-version."bip-pod-flow"."0.3.0"; - "bip-pod-html-0.3.0" = self.by-version."bip-pod-html"."0.3.0"; + "bip-pod-flow-0.3.1" = self.by-version."bip-pod-flow"."0.3.1"; + "bip-pod-html-0.3.1" = self.by-version."bip-pod-html"."0.3.1"; "bip-pod-http-0.3.0" = self.by-version."bip-pod-http"."0.3.0"; "bip-pod-math-0.3.2" = self.by-version."bip-pod-math"."0.3.2"; - "bip-pod-syndication-0.3.4" = self.by-version."bip-pod-syndication"."0.3.4"; + "bip-pod-syndication-0.3.5" = self.by-version."bip-pod-syndication"."0.3.5"; "bip-pod-templater-0.3.0" = self.by-version."bip-pod-templater"."0.3.0"; - "bip-pod-time-0.3.0" = self.by-version."bip-pod-time"."0.3.0"; - "body-parser-1.10.2" = self.by-version."body-parser"."1.10.2"; - "clone-0.2.0" = self.by-version."clone"."0.2.0"; + "bip-pod-time-0.3.1" = self.by-version."bip-pod-time"."0.3.1"; + "body-parser-1.12.0" = self.by-version."body-parser"."1.12.0"; + "clone-1.0.0" = self.by-version."clone"."1.0.0"; "commander-2.6.0" = self.by-version."commander"."2.6.0"; "config-0.4.36" = self.by-version."config"."0.4.36"; - "connect-2.28.2" = self.by-version."connect"."2.28.2"; + "connect-2.29.0" = self.by-version."connect"."2.29.0"; "connect-mongo-0.7.0" = self.by-version."connect-mongo"."0.7.0"; - "cookie-parser-1.3.3" = self.by-version."cookie-parser"."1.3.3"; + "cookie-parser-1.3.4" = self.by-version."cookie-parser"."1.3.4"; "cron-1.0.6" = self.by-version."cron"."1.0.6"; "dateformat-1.0.7-1.2.3" = self.by-version."dateformat"."1.0.7-1.2.3"; "datejs-1.0.0-rc3" = self.by-version."datejs"."1.0.0-rc3"; - "errorhandler-1.3.2" = self.by-version."errorhandler"."1.3.2"; + "errorhandler-1.3.4" = self.by-version."errorhandler"."1.3.4"; + "execSync-1.0.2" = self.by-version."execSync"."1.0.2"; "express-5.0.0-alpha.1" = self.by-version."express"."5.0.0-alpha.1"; - "express-session-1.10.1" = self.by-version."express-session"."1.10.1"; + "express-session-1.10.3" = self.by-version."express-session"."1.10.3"; "extend-2.0.0" = self.by-version."extend"."2.0.0"; "favitest-1.0.7" = self.by-version."favitest"."1.0.7"; "heapdump-0.2.10" = self.by-version."heapdump"."0.2.10"; @@ -2703,14 +2708,14 @@ "htmlparser2-3.8.2" = self.by-version."htmlparser2"."3.8.2"; "imagemagick-0.1.3" = self.by-version."imagemagick"."0.1.3"; "inquirer-0.8.0" = self.by-version."inquirer"."0.8.0"; - "ipaddr.js-0.1.6" = self.by-version."ipaddr.js"."0.1.6"; + "ipaddr.js-0.1.8" = self.by-version."ipaddr.js"."0.1.8"; "json-middleware-1.0.2" = self.by-version."json-middleware"."1.0.2"; "jsonwebtoken-1.3.0" = self.by-version."jsonwebtoken"."1.3.0"; "ldapjs-0.7.1" = self.by-version."ldapjs"."0.7.1"; - "marked-0.3.2" = self.by-version."marked"."0.3.2"; + "marked-0.3.3" = self.by-version."marked"."0.3.3"; "memwatch-0.2.2" = self.by-version."memwatch"."0.2.2"; "method-override-1.0.2" = self.by-version."method-override"."1.0.2"; - "mime-1.2.11" = self.by-version."mime"."1.2.11"; + "mime-1.3.4" = self.by-version."mime"."1.3.4"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "moment-2.9.0" = self.by-version."moment"."2.9.0"; "mongoose-3.9.7" = self.by-version."mongoose"."3.9.7"; @@ -2720,14 +2725,15 @@ "passport-0.2.1" = self.by-version."passport"."0.2.1"; "posix-getopt-1.1.0" = self.by-version."posix-getopt"."1.1.0"; "q-1.1.2" = self.by-version."q"."1.1.2"; - "request-2.51.0" = self.by-version."request"."2.51.0"; + "request-2.53.0" = self.by-version."request"."2.53.0"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; + "sleep-1.2.0" = self.by-version."sleep"."1.2.0"; "sprintf-0.1.5" = self.by-version."sprintf"."0.1.5"; "ssl-root-cas-1.1.9-beta" = self.by-version."ssl-root-cas"."1.1.9-beta"; "sugar-1.4.1" = self.by-version."sugar"."1.4.1"; "temp-0.8.1" = self.by-version."temp"."0.8.1"; - "time-0.11.0" = self.by-version."time"."0.11.0"; - "tldtools-0.0.21" = self.by-version."tldtools"."0.0.21"; + "time-0.11.1" = self.by-version."time"."0.11.1"; + "tldtools-0.0.23" = self.by-version."tldtools"."0.0.23"; "underscore-1.7.0" = self.by-version."underscore"."1.7.0"; "validator-1.5.1" = self.by-version."validator"."1.5.1"; "webkit-devtools-agent-0.2.5" = self.by-version."webkit-devtools-agent"."0.2.5"; @@ -2735,7 +2741,7 @@ }; peerDependencies = []; }; - "bipio" = self.by-version."bipio"."0.3.3"; + "bipio" = self.by-version."bipio"."0.3.18"; by-spec."bitcoinjs-lib"."1.2.0" = self.by-version."bitcoinjs-lib"."1.2.0"; by-version."bitcoinjs-lib"."1.2.0" = self.buildNodePackage { @@ -2749,7 +2755,7 @@ deps = { "bigi-1.4.0" = self.by-version."bigi"."1.4.0"; "bs58check-1.0.3" = self.by-version."bs58check"."1.0.3"; - "crypto-browserify-3.9.9" = self.by-version."crypto-browserify"."3.9.9"; + "crypto-browserify-3.9.12" = self.by-version."crypto-browserify"."3.9.12"; "ecurve-1.0.0" = self.by-version."ecurve"."1.0.0"; }; peerDependencies = []; @@ -2847,7 +2853,7 @@ }; deps = { "bencode-0.6.0" = self.by-version."bencode"."0.6.0"; - "bn.js-1.0.0" = self.by-version."bn.js"."1.0.0"; + "bn.js-1.3.0" = self.by-version."bn.js"."1.3.0"; "buffer-equal-0.0.1" = self.by-version."buffer-equal"."0.0.1"; "compact2string-1.4.0" = self.by-version."compact2string"."1.4.0"; "debug-2.1.1" = self.by-version."debug"."2.1.1"; @@ -2913,15 +2919,15 @@ }; by-spec."block-stream"."0.0.7" = self.by-version."block-stream"."0.0.7"; - by-spec."bluebird".">= 1.2.1" = - self.by-version."bluebird"."2.9.1"; - by-version."bluebird"."2.9.1" = self.buildNodePackage { - name = "bluebird-2.9.1"; + by-spec."bluebird".">= 2.3.2" = + self.by-version."bluebird"."2.9.9"; + by-version."bluebird"."2.9.9" = self.buildNodePackage { + name = "bluebird-2.9.9"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/bluebird/-/bluebird-2.9.1.tgz"; - name = "bluebird-2.9.1.tgz"; - sha1 = "5a10857dd34a025ebd2013b303027b027f20557f"; + url = "http://registry.npmjs.org/bluebird/-/bluebird-2.9.9.tgz"; + name = "bluebird-2.9.9.tgz"; + sha1 = "61a26904d43d7f6b19dff7ed917dbc92452ad6d3"; }; deps = { }; @@ -2942,14 +2948,14 @@ peerDependencies = []; }; by-spec."bn.js"."^1.0.0" = - self.by-version."bn.js"."1.0.0"; - by-version."bn.js"."1.0.0" = self.buildNodePackage { - name = "bn.js-1.0.0"; + self.by-version."bn.js"."1.3.0"; + by-version."bn.js"."1.3.0" = self.buildNodePackage { + name = "bn.js-1.3.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/bn.js/-/bn.js-1.0.0.tgz"; - name = "bn.js-1.0.0.tgz"; - sha1 = "01e39f8c13f981c468b673caf0632f726d54713f"; + url = "http://registry.npmjs.org/bn.js/-/bn.js-1.3.0.tgz"; + name = "bn.js-1.3.0.tgz"; + sha1 = "0db4cbf96f8f23b742f5bcb9d1aa7a9994a05e83"; }; deps = { }; @@ -3005,6 +3011,29 @@ peerDependencies = []; }; by-spec."body-parser"."^1.0.2" = + self.by-version."body-parser"."1.12.0"; + by-version."body-parser"."1.12.0" = self.buildNodePackage { + name = "body-parser-1.12.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/body-parser/-/body-parser-1.12.0.tgz"; + name = "body-parser-1.12.0.tgz"; + sha1 = "9750fc3cc1080b34a13d18c79840cd559979fce5"; + }; + deps = { + "bytes-1.0.0" = self.by-version."bytes"."1.0.0"; + "content-type-1.0.1" = self.by-version."content-type"."1.0.1"; + "debug-2.1.1" = self.by-version."debug"."2.1.1"; + "depd-1.0.0" = self.by-version."depd"."1.0.0"; + "iconv-lite-0.4.7" = self.by-version."iconv-lite"."0.4.7"; + "on-finished-2.2.0" = self.by-version."on-finished"."2.2.0"; + "qs-2.3.3" = self.by-version."qs"."2.3.3"; + "raw-body-1.3.3" = self.by-version."raw-body"."1.3.3"; + "type-is-1.6.0" = self.by-version."type-is"."1.6.0"; + }; + peerDependencies = []; + }; + by-spec."body-parser"."~1.10.2" = self.by-version."body-parser"."1.10.2"; by-version."body-parser"."1.10.2" = self.buildNodePackage { name = "body-parser-1.10.2"; @@ -3022,12 +3051,12 @@ "on-finished-2.2.0" = self.by-version."on-finished"."2.2.0"; "qs-2.3.3" = self.by-version."qs"."2.3.3"; "raw-body-1.3.2" = self.by-version."raw-body"."1.3.2"; - "type-is-1.5.5" = self.by-version."type-is"."1.5.5"; + "type-is-1.5.7" = self.by-version."type-is"."1.5.7"; }; peerDependencies = []; }; - by-spec."body-parser"."~1.10.2" = - self.by-version."body-parser"."1.10.2"; + by-spec."body-parser"."~1.12.0" = + self.by-version."body-parser"."1.12.0"; by-spec."body-parser"."~1.8.4" = self.by-version."body-parser"."1.8.4"; by-version."body-parser"."1.8.4" = self.buildNodePackage { @@ -3046,7 +3075,7 @@ "on-finished-2.1.0" = self.by-version."on-finished"."2.1.0"; "qs-2.2.4" = self.by-version."qs"."2.2.4"; "raw-body-1.3.0" = self.by-version."raw-body"."1.3.0"; - "type-is-1.5.5" = self.by-version."type-is"."1.5.5"; + "type-is-1.5.7" = self.by-version."type-is"."1.5.7"; }; peerDependencies = []; }; @@ -3068,7 +3097,7 @@ "on-finished-2.1.1" = self.by-version."on-finished"."2.1.1"; "qs-2.3.3" = self.by-version."qs"."2.3.3"; "raw-body-1.3.1" = self.by-version."raw-body"."1.3.1"; - "type-is-1.5.5" = self.by-version."type-is"."1.5.5"; + "type-is-1.5.7" = self.by-version."type-is"."1.5.7"; }; peerDependencies = []; }; @@ -3102,6 +3131,21 @@ }; peerDependencies = []; }; + by-spec."boom"."2.x.x" = + self.by-version."boom"."2.6.1"; + by-version."boom"."2.6.1" = self.buildNodePackage { + name = "boom-2.6.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/boom/-/boom-2.6.1.tgz"; + name = "boom-2.6.1.tgz"; + sha1 = "4dc8ef9b6dfad9c43bbbfbe71fa4c21419f22753"; + }; + deps = { + "hoek-2.11.0" = self.by-version."hoek"."2.11.0"; + }; + peerDependencies = []; + }; by-spec."bower"."*" = self.by-version."bower"."1.3.12"; by-version."bower"."1.3.12" = self.buildNodePackage { @@ -3471,22 +3515,22 @@ by-spec."browser-request"."~0.3.1" = self.by-version."browser-request"."0.3.3"; by-spec."browser-resolve"."^1.3.0" = - self.by-version."browser-resolve"."1.6.0"; - by-version."browser-resolve"."1.6.0" = self.buildNodePackage { - name = "browser-resolve-1.6.0"; + self.by-version."browser-resolve"."1.7.0"; + by-version."browser-resolve"."1.7.0" = self.buildNodePackage { + name = "browser-resolve-1.7.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/browser-resolve/-/browser-resolve-1.6.0.tgz"; - name = "browser-resolve-1.6.0.tgz"; - sha1 = "3b364916bf1ea32960449e0725a4a5732b2adbd0"; + url = "http://registry.npmjs.org/browser-resolve/-/browser-resolve-1.7.0.tgz"; + name = "browser-resolve-1.7.0.tgz"; + sha1 = "b0efbb9b7da0b325328d3db9ceb7ee346939913e"; }; deps = { - "resolve-1.0.0" = self.by-version."resolve"."1.0.0"; + "resolve-1.1.0" = self.by-version."resolve"."1.1.0"; }; peerDependencies = []; }; - by-spec."browser-resolve"."^1.3.1" = - self.by-version."browser-resolve"."1.6.0"; + by-spec."browser-resolve"."^1.7.0" = + self.by-version."browser-resolve"."1.7.0"; by-spec."browser-resolve"."~1.2.1" = self.by-version."browser-resolve"."1.2.4"; by-version."browser-resolve"."1.2.4" = self.buildNodePackage { @@ -3516,50 +3560,50 @@ }; deps = { "hat-0.0.3" = self.by-version."hat"."0.0.3"; - "connect-2.28.2" = self.by-version."connect"."2.28.2"; - "request-2.51.0" = self.by-version."request"."2.51.0"; + "connect-2.29.0" = self.by-version."connect"."2.29.0"; + "request-2.53.0" = self.by-version."request"."2.53.0"; "ascii-json-0.2.0" = self.by-version."ascii-json"."0.2.0"; }; peerDependencies = []; }; "browserchannel" = self.by-version."browserchannel"."2.0.0"; by-spec."browserify"."*" = - self.by-version."browserify"."8.1.1"; - by-version."browserify"."8.1.1" = self.buildNodePackage { - name = "browserify-8.1.1"; + self.by-version."browserify"."8.1.3"; + by-version."browserify"."8.1.3" = self.buildNodePackage { + name = "browserify-8.1.3"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/browserify/-/browserify-8.1.1.tgz"; - name = "browserify-8.1.1.tgz"; - sha1 = "3b1f8e1d47a0037908d4feaac7e7d76c55ba4678"; + url = "http://registry.npmjs.org/browserify/-/browserify-8.1.3.tgz"; + name = "browserify-8.1.3.tgz"; + sha1 = "f33a549a3a6c368219b075fdcfe6df195e049a9a"; }; deps = { "JSONStream-0.8.4" = self.by-version."JSONStream"."0.8.4"; "assert-1.3.0" = self.by-version."assert"."1.3.0"; "browser-pack-3.2.0" = self.by-version."browser-pack"."3.2.0"; - "browser-resolve-1.6.0" = self.by-version."browser-resolve"."1.6.0"; + "browser-resolve-1.7.0" = self.by-version."browser-resolve"."1.7.0"; "browserify-zlib-0.1.4" = self.by-version."browserify-zlib"."0.1.4"; - "buffer-3.0.1" = self.by-version."buffer"."3.0.1"; + "buffer-3.0.2" = self.by-version."buffer"."3.0.2"; "builtins-0.0.7" = self.by-version."builtins"."0.0.7"; "commondir-0.0.1" = self.by-version."commondir"."0.0.1"; "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7"; "console-browserify-1.1.0" = self.by-version."console-browserify"."1.1.0"; "constants-browserify-0.0.1" = self.by-version."constants-browserify"."0.0.1"; - "crypto-browserify-3.9.9" = self.by-version."crypto-browserify"."3.9.9"; - "deep-equal-0.2.1" = self.by-version."deep-equal"."0.2.1"; + "crypto-browserify-3.9.12" = self.by-version."crypto-browserify"."3.9.12"; + "deep-equal-0.2.2" = self.by-version."deep-equal"."0.2.2"; "defined-0.0.0" = self.by-version."defined"."0.0.0"; "deps-sort-1.3.5" = self.by-version."deps-sort"."1.3.5"; - "domain-browser-1.1.3" = self.by-version."domain-browser"."1.1.3"; + "domain-browser-1.1.4" = self.by-version."domain-browser"."1.1.4"; "duplexer2-0.0.2" = self.by-version."duplexer2"."0.0.2"; "events-1.0.2" = self.by-version."events"."1.0.2"; - "glob-4.3.5" = self.by-version."glob"."4.3.5"; + "glob-4.4.0" = self.by-version."glob"."4.4.0"; "http-browserify-1.7.0" = self.by-version."http-browserify"."1.7.0"; "https-browserify-0.0.0" = self.by-version."https-browserify"."0.0.0"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; "insert-module-globals-6.2.0" = self.by-version."insert-module-globals"."6.2.0"; "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; "labeled-stream-splicer-1.0.2" = self.by-version."labeled-stream-splicer"."1.0.2"; - "module-deps-3.6.4" = self.by-version."module-deps"."3.6.4"; + "module-deps-3.7.1" = self.by-version."module-deps"."3.7.1"; "os-browserify-0.1.2" = self.by-version."os-browserify"."0.1.2"; "parents-1.0.1" = self.by-version."parents"."1.0.1"; "path-browserify-0.0.0" = self.by-version."path-browserify"."0.0.0"; @@ -3576,7 +3620,7 @@ "subarg-1.0.0" = self.by-version."subarg"."1.0.0"; "syntax-error-1.1.2" = self.by-version."syntax-error"."1.1.2"; "through2-1.1.1" = self.by-version."through2"."1.1.1"; - "timers-browserify-1.2.0" = self.by-version."timers-browserify"."1.2.0"; + "timers-browserify-1.3.0" = self.by-version."timers-browserify"."1.3.0"; "tty-browserify-0.0.0" = self.by-version."tty-browserify"."0.0.0"; "umd-2.1.0" = self.by-version."umd"."2.1.0"; "url-0.10.2" = self.by-version."url"."0.10.2"; @@ -3586,7 +3630,7 @@ }; peerDependencies = []; }; - "browserify" = self.by-version."browserify"."8.1.1"; + "browserify" = self.by-version."browserify"."8.1.3"; by-spec."browserify"."7.1.0" = self.by-version."browserify"."7.1.0"; by-version."browserify"."7.1.0" = self.buildNodePackage { @@ -3601,29 +3645,29 @@ "JSONStream-0.8.4" = self.by-version."JSONStream"."0.8.4"; "assert-1.1.2" = self.by-version."assert"."1.1.2"; "browser-pack-3.2.0" = self.by-version."browser-pack"."3.2.0"; - "browser-resolve-1.6.0" = self.by-version."browser-resolve"."1.6.0"; + "browser-resolve-1.7.0" = self.by-version."browser-resolve"."1.7.0"; "browserify-zlib-0.1.4" = self.by-version."browserify-zlib"."0.1.4"; - "buffer-3.0.1" = self.by-version."buffer"."3.0.1"; + "buffer-3.0.2" = self.by-version."buffer"."3.0.2"; "builtins-0.0.7" = self.by-version."builtins"."0.0.7"; "commondir-0.0.1" = self.by-version."commondir"."0.0.1"; "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7"; "console-browserify-1.1.0" = self.by-version."console-browserify"."1.1.0"; "constants-browserify-0.0.1" = self.by-version."constants-browserify"."0.0.1"; - "crypto-browserify-3.9.9" = self.by-version."crypto-browserify"."3.9.9"; - "deep-equal-0.2.1" = self.by-version."deep-equal"."0.2.1"; + "crypto-browserify-3.9.12" = self.by-version."crypto-browserify"."3.9.12"; + "deep-equal-0.2.2" = self.by-version."deep-equal"."0.2.2"; "defined-0.0.0" = self.by-version."defined"."0.0.0"; "deps-sort-1.3.5" = self.by-version."deps-sort"."1.3.5"; - "domain-browser-1.1.3" = self.by-version."domain-browser"."1.1.3"; + "domain-browser-1.1.4" = self.by-version."domain-browser"."1.1.4"; "duplexer2-0.0.2" = self.by-version."duplexer2"."0.0.2"; "events-1.0.2" = self.by-version."events"."1.0.2"; - "glob-4.3.5" = self.by-version."glob"."4.3.5"; + "glob-4.4.0" = self.by-version."glob"."4.4.0"; "http-browserify-1.7.0" = self.by-version."http-browserify"."1.7.0"; "https-browserify-0.0.0" = self.by-version."https-browserify"."0.0.0"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; "insert-module-globals-6.2.0" = self.by-version."insert-module-globals"."6.2.0"; "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; "labeled-stream-splicer-1.0.2" = self.by-version."labeled-stream-splicer"."1.0.2"; - "module-deps-3.6.4" = self.by-version."module-deps"."3.6.4"; + "module-deps-3.7.1" = self.by-version."module-deps"."3.7.1"; "os-browserify-0.1.2" = self.by-version."os-browserify"."0.1.2"; "parents-0.0.3" = self.by-version."parents"."0.0.3"; "path-browserify-0.0.0" = self.by-version."path-browserify"."0.0.0"; @@ -3640,7 +3684,7 @@ "subarg-1.0.0" = self.by-version."subarg"."1.0.0"; "syntax-error-1.1.2" = self.by-version."syntax-error"."1.1.2"; "through2-1.1.1" = self.by-version."through2"."1.1.1"; - "timers-browserify-1.2.0" = self.by-version."timers-browserify"."1.2.0"; + "timers-browserify-1.3.0" = self.by-version."timers-browserify"."1.3.0"; "tty-browserify-0.0.0" = self.by-version."tty-browserify"."0.0.0"; "umd-2.1.0" = self.by-version."umd"."2.1.0"; "url-0.10.2" = self.by-version."url"."0.10.2"; @@ -3698,7 +3742,7 @@ "timers-browserify-1.0.3" = self.by-version."timers-browserify"."1.0.3"; "punycode-1.2.4" = self.by-version."punycode"."1.2.4"; "defined-0.0.0" = self.by-version."defined"."0.0.0"; - "domain-browser-1.1.3" = self.by-version."domain-browser"."1.1.3"; + "domain-browser-1.1.4" = self.by-version."domain-browser"."1.1.4"; "minimist-0.0.10" = self.by-version."minimist"."0.0.10"; }; peerDependencies = []; @@ -3751,7 +3795,7 @@ "timers-browserify-1.0.3" = self.by-version."timers-browserify"."1.0.3"; "punycode-1.2.4" = self.by-version."punycode"."1.2.4"; "defined-0.0.0" = self.by-version."defined"."0.0.0"; - "domain-browser-1.1.3" = self.by-version."domain-browser"."1.1.3"; + "domain-browser-1.1.4" = self.by-version."domain-browser"."1.1.4"; "minimist-0.0.10" = self.by-version."minimist"."0.0.10"; "derequire-0.6.1" = self.by-version."derequire"."0.6.1"; "commondir-0.0.1" = self.by-version."commondir"."0.0.1"; @@ -3786,7 +3830,7 @@ sha1 = "d7c952e12e44192680613ea7f3baa83af585c8ad"; }; deps = { - "bn.js-1.0.0" = self.by-version."bn.js"."1.0.0"; + "bn.js-1.3.0" = self.by-version."bn.js"."1.3.0"; }; peerDependencies = []; }; @@ -3801,7 +3845,7 @@ sha1 = "655975c12006d02b59181da9ab73f856c63c9aa4"; }; deps = { - "bn.js-1.0.0" = self.by-version."bn.js"."1.0.0"; + "bn.js-1.3.0" = self.by-version."bn.js"."1.3.0"; "browserify-rsa-1.1.1" = self.by-version."browserify-rsa"."1.1.1"; "elliptic-1.0.1" = self.by-version."elliptic"."1.0.1"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; @@ -3869,18 +3913,18 @@ }; peerDependencies = []; }; - by-spec."bson"."0.2.18" = - self.by-version."bson"."0.2.18"; - by-version."bson"."0.2.18" = self.buildNodePackage { - name = "bson-0.2.18"; + by-spec."bson"."0.2.19" = + self.by-version."bson"."0.2.19"; + by-version."bson"."0.2.19" = self.buildNodePackage { + name = "bson-0.2.19"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/bson/-/bson-0.2.18.tgz"; - name = "bson-0.2.18.tgz"; - sha1 = "363adc4366bc582988213f3f58cb9a049add6f1c"; + url = "http://registry.npmjs.org/bson/-/bson-0.2.19.tgz"; + name = "bson-0.2.19.tgz"; + sha1 = "b5ad9a5ed3c01354e410ff181cdf70bce838f493"; }; deps = { - "nan-1.5.1" = self.by-version."nan"."1.5.1"; + "nan-1.6.2" = self.by-version."nan"."1.6.2"; }; peerDependencies = []; }; @@ -3899,16 +3943,16 @@ peerDependencies = []; }; by-spec."bson"."~0.2" = - self.by-version."bson"."0.2.18"; + self.by-version."bson"."0.2.19"; by-spec."buffer"."^3.0.0" = - self.by-version."buffer"."3.0.1"; - by-version."buffer"."3.0.1" = self.buildNodePackage { - name = "buffer-3.0.1"; + self.by-version."buffer"."3.0.2"; + by-version."buffer"."3.0.2" = self.buildNodePackage { + name = "buffer-3.0.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/buffer/-/buffer-3.0.1.tgz"; - name = "buffer-3.0.1.tgz"; - sha1 = "d2743fff2b1d92ad532dd5716ecd9217838dfb3e"; + url = "http://registry.npmjs.org/buffer/-/buffer-3.0.2.tgz"; + name = "buffer-3.0.2.tgz"; + sha1 = "4f6513750dbe278300fa903da9d7b4b1745b480e"; }; deps = { "base64-js-0.0.8" = self.by-version."base64-js"."0.0.8"; @@ -4049,6 +4093,22 @@ }; peerDependencies = []; }; + by-spec."bufferutil"."1.0.x" = + self.by-version."bufferutil"."1.0.1"; + by-version."bufferutil"."1.0.1" = self.buildNodePackage { + name = "bufferutil-1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/bufferutil/-/bufferutil-1.0.1.tgz"; + name = "bufferutil-1.0.1.tgz"; + sha1 = "0c53a9ffe8d616c4e2df27d00b808f7a25501e3b"; + }; + deps = { + "bindings-1.2.1" = self.by-version."bindings"."1.2.1"; + "nan-1.6.2" = self.by-version."nan"."1.6.2"; + }; + peerDependencies = []; + }; by-spec."bufferview"."~1" = self.by-version."bufferview"."1.0.1"; by-version."bufferview"."1.0.1" = self.buildNodePackage { @@ -4124,6 +4184,22 @@ }; peerDependencies = []; }; + by-spec."bunyan"."~0.22.0" = + self.by-version."bunyan"."0.22.3"; + by-version."bunyan"."0.22.3" = self.buildNodePackage { + name = "bunyan-0.22.3"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/bunyan/-/bunyan-0.22.3.tgz"; + name = "bunyan-0.22.3.tgz"; + sha1 = "7a19dc1b4c8c645f740241a740f2245147c67ec2"; + }; + deps = { + "mv-2.0.3" = self.by-version."mv"."2.0.3"; + "dtrace-provider-0.2.8" = self.by-version."dtrace-provider"."0.2.8"; + }; + peerDependencies = []; + }; by-spec."bunyan"."~1.0.0" = self.by-version."bunyan"."1.0.1"; by-version."bunyan"."1.0.1" = self.buildNodePackage { @@ -4139,6 +4215,20 @@ }; peerDependencies = []; }; + by-spec."bunyan-prettystream"."~0.1.3" = + self.by-version."bunyan-prettystream"."0.1.3"; + by-version."bunyan-prettystream"."0.1.3" = self.buildNodePackage { + name = "bunyan-prettystream-0.1.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/bunyan-prettystream/-/bunyan-prettystream-0.1.3.tgz"; + name = "bunyan-prettystream-0.1.3.tgz"; + sha1 = "6c3b713266f6ad32007c7b6ab1e998a245349d98"; + }; + deps = { + }; + peerDependencies = []; + }; by-spec."burrito".">=0.2.5 <0.3" = self.by-version."burrito"."0.2.12"; by-version."burrito"."0.2.12" = self.buildNodePackage { @@ -4366,28 +4456,43 @@ }; peerDependencies = []; }; + by-spec."caseless"."~0.9.0" = + self.by-version."caseless"."0.9.0"; + by-version."caseless"."0.9.0" = self.buildNodePackage { + name = "caseless-0.9.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/caseless/-/caseless-0.9.0.tgz"; + name = "caseless-0.9.0.tgz"; + sha1 = "b7b65ce6bf1413886539cfd533f0b30effa9cf88"; + }; + deps = { + }; + peerDependencies = []; + }; by-spec."castnow"."*" = - self.by-version."castnow"."0.4.7"; - by-version."castnow"."0.4.7" = self.buildNodePackage { - name = "castnow-0.4.7"; + self.by-version."castnow"."0.4.9"; + by-version."castnow"."0.4.9" = self.buildNodePackage { + name = "castnow-0.4.9"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/castnow/-/castnow-0.4.7.tgz"; - name = "castnow-0.4.7.tgz"; - sha1 = "155c1314c3f70d2b5ef601164b0c39beb1e33461"; + url = "http://registry.npmjs.org/castnow/-/castnow-0.4.9.tgz"; + name = "castnow-0.4.9.tgz"; + sha1 = "a9d4e42614c29c09f4dfdebcf52f34c7ea37865e"; }; deps = { "array-loop-1.0.0" = self.by-version."array-loop"."1.0.0"; "castv2-client-0.0.8" = self.by-version."castv2-client"."0.0.8"; "chalk-0.5.1" = self.by-version."chalk"."0.5.1"; - "chromecast-player-0.1.6" = self.by-version."chromecast-player"."0.1.6"; + "chromecast-player-0.1.9" = self.by-version."chromecast-player"."0.1.9"; + "debounced-seeker-1.0.0" = self.by-version."debounced-seeker"."1.0.0"; "debug-2.1.1" = self.by-version."debug"."2.1.1"; "fs-extended-0.2.0" = self.by-version."fs-extended"."0.2.0"; "get-youtube-id-0.1.3" = self.by-version."get-youtube-id"."0.1.3"; "got-1.2.2" = self.by-version."got"."1.2.2"; "internal-ip-1.0.0" = self.by-version."internal-ip"."1.0.0"; "keypress-0.2.1" = self.by-version."keypress"."0.2.1"; - "mime-1.2.11" = self.by-version."mime"."1.2.11"; + "mime-1.3.4" = self.by-version."mime"."1.3.4"; "minimist-1.1.0" = self.by-version."minimist"."1.1.0"; "peerflix-0.19.3" = self.by-version."peerflix"."0.19.3"; "playerui-1.2.0" = self.by-version."playerui"."1.2.0"; @@ -4397,12 +4502,12 @@ "router-0.6.2" = self.by-version."router"."0.6.2"; "srt2vtt-1.2.0" = self.by-version."srt2vtt"."1.2.0"; "stream-transcoder-0.0.5" = self.by-version."stream-transcoder"."0.0.5"; - "xml2js-0.4.4" = self.by-version."xml2js"."0.4.4"; + "xml2js-0.4.5" = self.by-version."xml2js"."0.4.5"; "xtend-4.0.0" = self.by-version."xtend"."4.0.0"; }; peerDependencies = []; }; - "castnow" = self.by-version."castnow"."0.4.7"; + "castnow" = self.by-version."castnow"."0.4.9"; by-spec."castv2"."~0.1.4" = self.by-version."castv2"."0.1.4"; by-version."castv2"."0.1.4" = self.buildNodePackage { @@ -4436,14 +4541,14 @@ peerDependencies = []; }; by-spec."chai"."*" = - self.by-version."chai"."1.10.0"; - by-version."chai"."1.10.0" = self.buildNodePackage { - name = "chai-1.10.0"; + self.by-version."chai"."2.0.0"; + by-version."chai"."2.0.0" = self.buildNodePackage { + name = "chai-2.0.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/chai/-/chai-1.10.0.tgz"; - name = "chai-1.10.0.tgz"; - sha1 = "e4031cc87654461a75943e5a35ab46eaf39c1eb9"; + url = "http://registry.npmjs.org/chai/-/chai-2.0.0.tgz"; + name = "chai-2.0.0.tgz"; + sha1 = "9cec0eab7d782628f2df51226a41651869a9f894"; }; deps = { "assertion-error-1.0.0" = self.by-version."assertion-error"."1.0.0"; @@ -4451,16 +4556,16 @@ }; peerDependencies = []; }; - "chai" = self.by-version."chai"."1.10.0"; + "chai" = self.by-version."chai"."2.0.0"; by-spec."chain-node".">=0.0.17" = - self.by-version."chain-node"."3.0.1"; - by-version."chain-node"."3.0.1" = self.buildNodePackage { - name = "chain-node-3.0.1"; + self.by-version."chain-node"."3.1.0"; + by-version."chain-node"."3.1.0" = self.buildNodePackage { + name = "chain-node-3.1.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/chain-node/-/chain-node-3.0.1.tgz"; - name = "chain-node-3.0.1.tgz"; - sha1 = "994ae2fb09491c47c2a727c3d3ee847eb4595cca"; + url = "http://registry.npmjs.org/chain-node/-/chain-node-3.1.0.tgz"; + name = "chain-node-3.1.0.tgz"; + sha1 = "13eca851bbf3ed20877ce15b725ebb7a5c60e54b"; }; deps = { "request-2.36.0" = self.by-version."request"."2.36.0"; @@ -4503,23 +4608,6 @@ }; peerDependencies = []; }; - by-spec."chalk"."^0.4.0" = - self.by-version."chalk"."0.4.0"; - by-version."chalk"."0.4.0" = self.buildNodePackage { - name = "chalk-0.4.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz"; - name = "chalk-0.4.0.tgz"; - sha1 = "5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"; - }; - deps = { - "has-color-0.1.7" = self.by-version."has-color"."0.1.7"; - "ansi-styles-1.0.0" = self.by-version."ansi-styles"."1.0.0"; - "strip-ansi-0.1.1" = self.by-version."strip-ansi"."0.1.1"; - }; - peerDependencies = []; - }; by-spec."chalk"."^0.5.0" = self.by-version."chalk"."0.5.1"; by-version."chalk"."0.5.1" = self.buildNodePackage { @@ -4647,21 +4735,22 @@ by-spec."chmodr"."~0.1.0" = self.by-version."chmodr"."0.1.0"; by-spec."chokidar".">=0.8.2" = - self.by-version."chokidar"."1.0.0-rc2"; - by-version."chokidar"."1.0.0-rc2" = self.buildNodePackage { - name = "chokidar-1.0.0-rc2"; + self.by-version."chokidar"."1.0.0-rc3"; + by-version."chokidar"."1.0.0-rc3" = self.buildNodePackage { + name = "chokidar-1.0.0-rc3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/chokidar/-/chokidar-1.0.0-rc2.tgz"; - name = "chokidar-1.0.0-rc2.tgz"; - sha1 = "7adc3966f8b97492a95b7d8b98ba2c21cbdaa7a1"; + url = "http://registry.npmjs.org/chokidar/-/chokidar-1.0.0-rc3.tgz"; + name = "chokidar-1.0.0-rc3.tgz"; + sha1 = "f95d5e60c7d66eb53136c8999c47e9d4f37118f5"; }; deps = { "anymatch-1.1.0" = self.by-version."anymatch"."1.1.0"; "async-each-0.1.6" = self.by-version."async-each"."0.1.6"; "glob-parent-1.0.0" = self.by-version."glob-parent"."1.0.0"; + "is-binary-path-1.0.0" = self.by-version."is-binary-path"."1.0.0"; "readdirp-1.3.0" = self.by-version."readdirp"."1.3.0"; - "fsevents-0.3.4" = self.by-version."fsevents"."0.3.4"; + "fsevents-0.3.5" = self.by-version."fsevents"."0.3.5"; }; peerDependencies = []; }; @@ -4679,19 +4768,19 @@ }; peerDependencies = []; }; - by-spec."chromecast-player"."0.1.6" = - self.by-version."chromecast-player"."0.1.6"; - by-version."chromecast-player"."0.1.6" = self.buildNodePackage { - name = "chromecast-player-0.1.6"; + by-spec."chromecast-player"."0.1.9" = + self.by-version."chromecast-player"."0.1.9"; + by-version."chromecast-player"."0.1.9" = self.buildNodePackage { + name = "chromecast-player-0.1.9"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/chromecast-player/-/chromecast-player-0.1.6.tgz"; - name = "chromecast-player-0.1.6.tgz"; - sha1 = "a59fcd264f381ebdf885ada79280814e8cd9d425"; + url = "http://registry.npmjs.org/chromecast-player/-/chromecast-player-0.1.9.tgz"; + name = "chromecast-player-0.1.9.tgz"; + sha1 = "854d4264822347b3163ece8c8da2481390a0294e"; }; deps = { "castv2-client-0.0.8" = self.by-version."castv2-client"."0.0.8"; - "chromecast-scanner-0.0.1" = self.by-version."chromecast-scanner"."0.0.1"; + "chromecast-scanner-0.2.0" = self.by-version."chromecast-scanner"."0.2.0"; "mutate.js-0.2.0" = self.by-version."mutate.js"."0.2.0"; "promiscuous-0.6.0" = self.by-version."promiscuous"."0.6.0"; "time-line-1.0.1" = self.by-version."time-line"."1.0.1"; @@ -4700,44 +4789,47 @@ }; peerDependencies = []; }; - by-spec."chromecast-scanner"."0.0.1" = - self.by-version."chromecast-scanner"."0.0.1"; - by-version."chromecast-scanner"."0.0.1" = self.buildNodePackage { - name = "chromecast-scanner-0.0.1"; + by-spec."chromecast-scanner"."0.2.0" = + self.by-version."chromecast-scanner"."0.2.0"; + by-version."chromecast-scanner"."0.2.0" = self.buildNodePackage { + name = "chromecast-scanner-0.2.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/chromecast-scanner/-/chromecast-scanner-0.0.1.tgz"; - name = "chromecast-scanner-0.0.1.tgz"; - sha1 = "96d685ba1864e142b3599171dd679cbdcfb63859"; + url = "http://registry.npmjs.org/chromecast-scanner/-/chromecast-scanner-0.2.0.tgz"; + name = "chromecast-scanner-0.2.0.tgz"; + sha1 = "5b1f17aa92cf382bc413471d9b66caaf16d45d0e"; }; deps = { - "mdns-js2-0.0.5" = self.by-version."mdns-js2"."0.0.5"; + "got-2.4.0" = self.by-version."got"."2.4.0"; + "mdns-js-0.2.9" = self.by-version."mdns-js"."0.2.9"; + "node-ssdp-2.0.1" = self.by-version."node-ssdp"."2.0.1"; + "xtend-4.0.0" = self.by-version."xtend"."4.0.0"; }; peerDependencies = []; }; - by-spec."cint"."^8.0.1" = - self.by-version."cint"."8.1.0"; - by-version."cint"."8.1.0" = self.buildNodePackage { - name = "cint-8.1.0"; + by-spec."cint"."^8.2.1" = + self.by-version."cint"."8.2.1"; + by-version."cint"."8.2.1" = self.buildNodePackage { + name = "cint-8.2.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/cint/-/cint-8.1.0.tgz"; - name = "cint-8.1.0.tgz"; - sha1 = "1541f04a820340fb6d816368857310f55ddd3e7e"; + url = "http://registry.npmjs.org/cint/-/cint-8.2.1.tgz"; + name = "cint-8.2.1.tgz"; + sha1 = "70386b1b48e2773d0d63166a55aff94ef4456a12"; }; deps = { }; peerDependencies = []; }; by-spec."clean-css"."^3.0.1" = - self.by-version."clean-css"."3.0.7"; - by-version."clean-css"."3.0.7" = self.buildNodePackage { - name = "clean-css-3.0.7"; + self.by-version."clean-css"."3.0.10"; + by-version."clean-css"."3.0.10" = self.buildNodePackage { + name = "clean-css-3.0.10"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/clean-css/-/clean-css-3.0.7.tgz"; - name = "clean-css-3.0.7.tgz"; - sha1 = "bce35bf2e28531807608c8419f8315ea4833a7f5"; + url = "http://registry.npmjs.org/clean-css/-/clean-css-3.0.10.tgz"; + name = "clean-css-3.0.10.tgz"; + sha1 = "d477b381baa41f759a829d51f9cb380db90d626e"; }; deps = { "commander-2.5.1" = self.by-version."commander"."2.5.1"; @@ -4773,7 +4865,7 @@ }; deps = { "d-0.1.1" = self.by-version."d"."0.1.1"; - "es5-ext-0.10.5" = self.by-version."es5-ext"."0.10.5"; + "es5-ext-0.10.6" = self.by-version."es5-ext"."0.10.6"; "memoizee-0.3.8" = self.by-version."memoizee"."0.3.8"; "timers-ext-0.1.0" = self.by-version."timers-ext"."0.1.0"; }; @@ -4902,6 +4994,20 @@ peerDependencies = []; }; by-spec."clone".">=0.1.0" = + self.by-version."clone"."1.0.0"; + by-version."clone"."1.0.0" = self.buildNodePackage { + name = "clone-1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/clone/-/clone-1.0.0.tgz"; + name = "clone-1.0.0.tgz"; + sha1 = "bde24f2ee7c478a409fc8a118ae2fcd44deb7f9e"; + }; + deps = { + }; + peerDependencies = []; + }; + by-spec."clone"."^0.2.0" = self.by-version."clone"."0.2.0"; by-version."clone"."0.2.0" = self.buildNodePackage { name = "clone-0.2.0"; @@ -4915,8 +5021,6 @@ }; peerDependencies = []; }; - by-spec."clone"."^0.2.0" = - self.by-version."clone"."0.2.0"; by-spec."clone"."~0.1.5" = self.by-version."clone"."0.1.19"; by-version."clone"."0.1.19" = self.buildNodePackage { @@ -4947,6 +5051,20 @@ }; peerDependencies = []; }; + by-spec."closest-package"."^1.0.0" = + self.by-version."closest-package"."1.0.0"; + by-version."closest-package"."1.0.0" = self.buildNodePackage { + name = "closest-package-1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/closest-package/-/closest-package-1.0.0.tgz"; + name = "closest-package-1.0.0.tgz"; + sha1 = "ef7a73ad90baae43a89db53777b20fcc0350d4cf"; + }; + deps = { + }; + peerDependencies = []; + }; by-spec."cls"."~0.1.3" = self.by-version."cls"."0.1.5"; by-version."cls"."0.1.5" = self.buildNodePackage { @@ -5057,21 +5175,20 @@ peerDependencies = []; }; by-spec."coffee-script"."*" = - self.by-version."coffee-script"."1.8.0"; - by-version."coffee-script"."1.8.0" = self.buildNodePackage { - name = "coffee-script-1.8.0"; + self.by-version."coffee-script"."1.9.0"; + by-version."coffee-script"."1.9.0" = self.buildNodePackage { + name = "coffee-script-1.9.0"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.8.0.tgz"; - name = "coffee-script-1.8.0.tgz"; - sha1 = "9c9f1d2b4a52a000ded15b659791703648263c1d"; + url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.9.0.tgz"; + name = "coffee-script-1.9.0.tgz"; + sha1 = "7492cbbc3f0361cc5d8865aff7237552ff33e1f7"; }; deps = { - "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; }; peerDependencies = []; }; - "coffee-script" = self.by-version."coffee-script"."1.8.0"; + "coffee-script" = self.by-version."coffee-script"."1.9.0"; by-spec."coffee-script"."1.6.3" = self.by-version."coffee-script"."1.6.3"; by-version."coffee-script"."1.6.3" = self.buildNodePackage { @@ -5087,11 +5204,11 @@ peerDependencies = []; }; by-spec."coffee-script".">= 0.0.1" = - self.by-version."coffee-script"."1.8.0"; + self.by-version."coffee-script"."1.9.0"; by-spec."coffee-script".">=1.2.0" = - self.by-version."coffee-script"."1.8.0"; + self.by-version."coffee-script"."1.9.0"; by-spec."coffee-script".">=1.6.2 <2.0.0" = - self.by-version."coffee-script"."1.8.0"; + self.by-version."coffee-script"."1.9.0"; by-spec."coffee-script"."~1.3.3" = self.by-version."coffee-script"."1.3.3"; by-version."coffee-script"."1.3.3" = self.buildNodePackage { @@ -5108,18 +5225,16 @@ }; by-spec."coffee-script"."~1.8.0" = self.by-version."coffee-script"."1.8.0"; - by-spec."collections".">=2.0.1 <3.0.0" = - self.by-version."collections"."2.0.1"; - by-version."collections"."2.0.1" = self.buildNodePackage { - name = "collections-2.0.1"; - bin = false; + by-version."coffee-script"."1.8.0" = self.buildNodePackage { + name = "coffee-script-1.8.0"; + bin = true; src = fetchurl { - url = "http://registry.npmjs.org/collections/-/collections-2.0.1.tgz"; - name = "collections-2.0.1.tgz"; - sha1 = "ee201b142bd1ee5b37a95d62fe13062d87d83db0"; + url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.8.0.tgz"; + name = "coffee-script-1.8.0.tgz"; + sha1 = "9c9f1d2b4a52a000ded15b659791703648263c1d"; }; deps = { - "weak-map-1.0.5" = self.by-version."weak-map"."1.0.5"; + "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; }; peerDependencies = []; }; @@ -5226,6 +5341,8 @@ }; peerDependencies = []; }; + by-spec."colors"."1.0.x" = + self.by-version."colors"."1.0.3"; by-spec."colors"."~0.6.2" = self.by-version."colors"."0.6.2"; by-spec."colors"."~1.0.3" = @@ -5260,15 +5377,15 @@ }; peerDependencies = []; }; - by-spec."columnify"."~1.3.2" = - self.by-version."columnify"."1.3.2"; - by-version."columnify"."1.3.2" = self.buildNodePackage { - name = "columnify-1.3.2"; + by-spec."columnify"."~1.4.1" = + self.by-version."columnify"."1.4.1"; + by-version."columnify"."1.4.1" = self.buildNodePackage { + name = "columnify-1.4.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/columnify/-/columnify-1.3.2.tgz"; - name = "columnify-1.3.2.tgz"; - sha1 = "61bd578a9269ae6fd949ce36fff589f3702c7867"; + url = "http://registry.npmjs.org/columnify/-/columnify-1.4.1.tgz"; + name = "columnify-1.4.1.tgz"; + sha1 = "30555796379865b016189c228cb0061764270ed0"; }; deps = { "strip-ansi-2.0.1" = self.by-version."strip-ansi"."2.0.1"; @@ -5430,6 +5547,8 @@ self.by-version."commander"."2.6.0"; by-spec."commander".">=2.0.0" = self.by-version."commander"."2.6.0"; + by-spec."commander"."^2.6.0" = + self.by-version."commander"."2.6.0"; by-spec."commander"."~0.6.1" = self.by-version."commander"."0.6.1"; by-spec."commander"."~2.0.0" = @@ -5468,14 +5587,14 @@ }; deps = { "q-1.1.2" = self.by-version."q"."1.1.2"; - "recast-0.9.15" = self.by-version."recast"."0.9.15"; + "recast-0.9.18" = self.by-version."recast"."0.9.18"; "commander-2.5.1" = self.by-version."commander"."2.5.1"; "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; "glob-4.2.2" = self.by-version."glob"."4.2.2"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "private-0.1.6" = self.by-version."private"."0.1.6"; "install-0.1.8" = self.by-version."install"."0.1.8"; - "iconv-lite-0.4.6" = self.by-version."iconv-lite"."0.4.6"; + "iconv-lite-0.4.7" = self.by-version."iconv-lite"."0.4.7"; }; peerDependencies = []; }; @@ -5490,7 +5609,7 @@ sha1 = "a99cd96ea000525684b269683ae2222d6eea7b49"; }; deps = { - "ipaddr.js-0.1.6" = self.by-version."ipaddr.js"."0.1.6"; + "ipaddr.js-0.1.8" = self.by-version."ipaddr.js"."0.1.8"; }; peerDependencies = []; }; @@ -5548,7 +5667,7 @@ }; deps = { "buffer-crc32-0.2.5" = self.by-version."buffer-crc32"."0.2.5"; - "crc32-stream-0.3.1" = self.by-version."crc32-stream"."0.3.1"; + "crc32-stream-0.3.2" = self.by-version."crc32-stream"."0.3.2"; "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; }; peerDependencies = []; @@ -5568,20 +5687,22 @@ peerDependencies = []; }; by-spec."compressible"."~2.0.1" = - self.by-version."compressible"."2.0.1"; - by-version."compressible"."2.0.1" = self.buildNodePackage { - name = "compressible-2.0.1"; + self.by-version."compressible"."2.0.2"; + by-version."compressible"."2.0.2" = self.buildNodePackage { + name = "compressible-2.0.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/compressible/-/compressible-2.0.1.tgz"; - name = "compressible-2.0.1.tgz"; - sha1 = "3550115793eb3435f7eb16775afe05df1a333ebc"; + url = "http://registry.npmjs.org/compressible/-/compressible-2.0.2.tgz"; + name = "compressible-2.0.2.tgz"; + sha1 = "d0474a6ba6590a43d39c2ce9a6cfbb6479be76a5"; }; deps = { - "mime-db-1.5.0" = self.by-version."mime-db"."1.5.0"; + "mime-db-1.7.0" = self.by-version."mime-db"."1.7.0"; }; peerDependencies = []; }; + by-spec."compressible"."~2.0.2" = + self.by-version."compressible"."2.0.2"; by-spec."compression"."1.0.0" = self.by-version."compression"."1.0.0"; by-version."compression"."1.0.0" = self.buildNodePackage { @@ -5612,27 +5733,47 @@ deps = { "accepts-1.1.4" = self.by-version."accepts"."1.1.4"; "bytes-1.0.0" = self.by-version."bytes"."1.0.0"; - "compressible-2.0.1" = self.by-version."compressible"."2.0.1"; + "compressible-2.0.2" = self.by-version."compressible"."2.0.2"; "debug-2.0.0" = self.by-version."debug"."2.0.0"; "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; "vary-1.0.0" = self.by-version."vary"."1.0.0"; }; peerDependencies = []; }; - by-spec."compression"."~1.3.0" = - self.by-version."compression"."1.3.0"; - by-version."compression"."1.3.0" = self.buildNodePackage { - name = "compression-1.3.0"; + by-spec."compression"."~1.3.1" = + self.by-version."compression"."1.3.1"; + by-version."compression"."1.3.1" = self.buildNodePackage { + name = "compression-1.3.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/compression/-/compression-1.3.0.tgz"; - name = "compression-1.3.0.tgz"; - sha1 = "03289a1d45e1dbbf8bd509dba50d036657b7bac8"; + url = "http://registry.npmjs.org/compression/-/compression-1.3.1.tgz"; + name = "compression-1.3.1.tgz"; + sha1 = "30986b2f519ba90e57759896301de4955ce00945"; }; deps = { - "accepts-1.2.2" = self.by-version."accepts"."1.2.2"; + "accepts-1.2.4" = self.by-version."accepts"."1.2.4"; "bytes-1.0.0" = self.by-version."bytes"."1.0.0"; - "compressible-2.0.1" = self.by-version."compressible"."2.0.1"; + "compressible-2.0.2" = self.by-version."compressible"."2.0.2"; + "debug-2.1.1" = self.by-version."debug"."2.1.1"; + "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; + "vary-1.0.0" = self.by-version."vary"."1.0.0"; + }; + peerDependencies = []; + }; + by-spec."compression"."~1.4.1" = + self.by-version."compression"."1.4.1"; + by-version."compression"."1.4.1" = self.buildNodePackage { + name = "compression-1.4.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/compression/-/compression-1.4.1.tgz"; + name = "compression-1.4.1.tgz"; + sha1 = "c6f707ac2659e13c7f3e8834321b02cd09338d78"; + }; + deps = { + "accepts-1.2.4" = self.by-version."accepts"."1.2.4"; + "bytes-1.0.0" = self.by-version."bytes"."1.0.0"; + "compressible-2.0.2" = self.by-version."compressible"."2.0.2"; "debug-2.1.1" = self.by-version."debug"."2.1.1"; "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; "vary-1.0.0" = self.by-version."vary"."1.0.0"; @@ -5690,7 +5831,7 @@ }; deps = { "js-yaml-0.3.7" = self.by-version."js-yaml"."0.3.7"; - "coffee-script-1.8.0" = self.by-version."coffee-script"."1.8.0"; + "coffee-script-1.9.0" = self.by-version."coffee-script"."1.9.0"; "vows-0.9.0-rc2" = self.by-version."vows"."0.9.0-rc2"; }; peerDependencies = []; @@ -5721,7 +5862,7 @@ }; deps = { "proto-list-1.2.3" = self.by-version."proto-list"."1.2.3"; - "ini-1.3.2" = self.by-version."ini"."1.3.2"; + "ini-1.3.3" = self.by-version."ini"."1.3.3"; }; peerDependencies = []; }; @@ -5739,7 +5880,7 @@ }; deps = { "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; - "js-yaml-3.2.5" = self.by-version."js-yaml"."3.2.5"; + "js-yaml-3.2.6" = self.by-version."js-yaml"."3.2.6"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "object-assign-2.0.0" = self.by-version."object-assign"."2.0.0"; "osenv-0.1.0" = self.by-version."osenv"."0.1.0"; @@ -5763,8 +5904,8 @@ }; deps = { "qs-2.3.3" = self.by-version."qs"."2.3.3"; - "mime-1.2.11" = self.by-version."mime"."1.2.11"; - "formidable-1.0.16" = self.by-version."formidable"."1.0.16"; + "mime-1.3.4" = self.by-version."mime"."1.3.4"; + "formidable-1.0.17" = self.by-version."formidable"."1.0.17"; }; peerDependencies = []; }; @@ -5833,30 +5974,30 @@ }; peerDependencies = []; }; - by-spec."connect"."2.28.2" = - self.by-version."connect"."2.28.2"; - by-version."connect"."2.28.2" = self.buildNodePackage { - name = "connect-2.28.2"; + by-spec."connect"."2.28.3" = + self.by-version."connect"."2.28.3"; + by-version."connect"."2.28.3" = self.buildNodePackage { + name = "connect-2.28.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/connect/-/connect-2.28.2.tgz"; - name = "connect-2.28.2.tgz"; - sha1 = "dafae5c221c973e2b0883a5a5c9a615000d8260f"; + url = "http://registry.npmjs.org/connect/-/connect-2.28.3.tgz"; + name = "connect-2.28.3.tgz"; + sha1 = "60df681ca6a940675d89546f0df84e299cdc13d1"; }; deps = { "basic-auth-connect-1.0.0" = self.by-version."basic-auth-connect"."1.0.0"; "body-parser-1.10.2" = self.by-version."body-parser"."1.10.2"; "bytes-1.0.0" = self.by-version."bytes"."1.0.0"; "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; - "cookie-parser-1.3.3" = self.by-version."cookie-parser"."1.3.3"; + "cookie-parser-1.3.4" = self.by-version."cookie-parser"."1.3.4"; "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5"; - "compression-1.3.0" = self.by-version."compression"."1.3.0"; + "compression-1.3.1" = self.by-version."compression"."1.3.1"; "connect-timeout-1.5.0" = self.by-version."connect-timeout"."1.5.0"; - "csurf-1.6.5" = self.by-version."csurf"."1.6.5"; + "csurf-1.6.6" = self.by-version."csurf"."1.6.6"; "debug-2.1.1" = self.by-version."debug"."2.1.1"; "depd-1.0.0" = self.by-version."depd"."1.0.0"; - "errorhandler-1.3.2" = self.by-version."errorhandler"."1.3.2"; - "express-session-1.10.1" = self.by-version."express-session"."1.10.1"; + "errorhandler-1.3.4" = self.by-version."errorhandler"."1.3.4"; + "express-session-1.10.3" = self.by-version."express-session"."1.10.3"; "finalhandler-0.3.3" = self.by-version."finalhandler"."0.3.3"; "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; "http-errors-1.2.8" = self.by-version."http-errors"."1.2.8"; @@ -5869,9 +6010,9 @@ "qs-2.3.3" = self.by-version."qs"."2.3.3"; "response-time-2.2.0" = self.by-version."response-time"."2.2.0"; "serve-favicon-2.2.0" = self.by-version."serve-favicon"."2.2.0"; - "serve-index-1.6.0" = self.by-version."serve-index"."1.6.0"; + "serve-index-1.6.2" = self.by-version."serve-index"."1.6.2"; "serve-static-1.8.1" = self.by-version."serve-static"."1.8.1"; - "type-is-1.5.5" = self.by-version."type-is"."1.5.5"; + "type-is-1.5.7" = self.by-version."type-is"."1.5.7"; "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; "vhost-3.0.0" = self.by-version."vhost"."3.0.0"; "pause-0.0.1" = self.by-version."pause"."0.0.1"; @@ -5967,9 +6108,52 @@ peerDependencies = []; }; by-spec."connect"."^2.14.5" = - self.by-version."connect"."2.28.2"; + self.by-version."connect"."2.29.0"; + by-version."connect"."2.29.0" = self.buildNodePackage { + name = "connect-2.29.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/connect/-/connect-2.29.0.tgz"; + name = "connect-2.29.0.tgz"; + sha1 = "c67514d45cd41c7e3a3eecd8613e2a096151caf8"; + }; + deps = { + "basic-auth-connect-1.0.0" = self.by-version."basic-auth-connect"."1.0.0"; + "body-parser-1.12.0" = self.by-version."body-parser"."1.12.0"; + "bytes-1.0.0" = self.by-version."bytes"."1.0.0"; + "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; + "cookie-parser-1.3.4" = self.by-version."cookie-parser"."1.3.4"; + "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6"; + "compression-1.4.1" = self.by-version."compression"."1.4.1"; + "connect-timeout-1.6.0" = self.by-version."connect-timeout"."1.6.0"; + "content-type-1.0.1" = self.by-version."content-type"."1.0.1"; + "csurf-1.7.0" = self.by-version."csurf"."1.7.0"; + "debug-2.1.1" = self.by-version."debug"."2.1.1"; + "depd-1.0.0" = self.by-version."depd"."1.0.0"; + "errorhandler-1.3.4" = self.by-version."errorhandler"."1.3.4"; + "express-session-1.10.3" = self.by-version."express-session"."1.10.3"; + "finalhandler-0.3.3" = self.by-version."finalhandler"."0.3.3"; + "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; + "http-errors-1.3.1" = self.by-version."http-errors"."1.3.1"; + "method-override-2.3.1" = self.by-version."method-override"."2.3.1"; + "morgan-1.5.1" = self.by-version."morgan"."1.5.1"; + "multiparty-3.3.2" = self.by-version."multiparty"."3.3.2"; + "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; + "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; + "qs-2.3.3" = self.by-version."qs"."2.3.3"; + "response-time-2.3.0" = self.by-version."response-time"."2.3.0"; + "serve-favicon-2.2.0" = self.by-version."serve-favicon"."2.2.0"; + "serve-index-1.6.2" = self.by-version."serve-index"."1.6.2"; + "serve-static-1.9.1" = self.by-version."serve-static"."1.9.1"; + "type-is-1.6.0" = self.by-version."type-is"."1.6.0"; + "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; + "vhost-3.0.0" = self.by-version."vhost"."3.0.0"; + "pause-0.0.1" = self.by-version."pause"."0.0.1"; + }; + peerDependencies = []; + }; by-spec."connect"."~2" = - self.by-version."connect"."2.28.2"; + self.by-version."connect"."2.29.0"; by-spec."connect"."~2.26.0" = self.by-version."connect"."2.26.6"; by-version."connect"."2.26.6" = self.buildNodePackage { @@ -5985,11 +6169,11 @@ "body-parser-1.8.4" = self.by-version."body-parser"."1.8.4"; "bytes-1.0.0" = self.by-version."bytes"."1.0.0"; "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; - "cookie-parser-1.3.3" = self.by-version."cookie-parser"."1.3.3"; + "cookie-parser-1.3.4" = self.by-version."cookie-parser"."1.3.4"; "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5"; "compression-1.1.2" = self.by-version."compression"."1.1.2"; "connect-timeout-1.3.0" = self.by-version."connect-timeout"."1.3.0"; - "csurf-1.6.5" = self.by-version."csurf"."1.6.5"; + "csurf-1.6.6" = self.by-version."csurf"."1.6.6"; "debug-2.0.0" = self.by-version."debug"."2.0.0"; "depd-0.4.5" = self.by-version."depd"."0.4.5"; "errorhandler-1.2.4" = self.by-version."errorhandler"."1.2.4"; @@ -6006,8 +6190,8 @@ "response-time-2.0.1" = self.by-version."response-time"."2.0.1"; "serve-favicon-2.1.7" = self.by-version."serve-favicon"."2.1.7"; "serve-index-1.2.1" = self.by-version."serve-index"."1.2.1"; - "serve-static-1.6.4" = self.by-version."serve-static"."1.6.4"; - "type-is-1.5.5" = self.by-version."type-is"."1.5.5"; + "serve-static-1.6.5" = self.by-version."serve-static"."1.6.5"; + "type-is-1.5.7" = self.by-version."type-is"."1.5.7"; "vhost-3.0.0" = self.by-version."vhost"."3.0.0"; "pause-0.0.1" = self.by-version."pause"."0.0.1"; }; @@ -6043,21 +6227,21 @@ peerDependencies = []; }; by-spec."connect-jade-static"."*" = - self.by-version."connect-jade-static"."0.1.5"; - by-version."connect-jade-static"."0.1.5" = self.buildNodePackage { - name = "connect-jade-static-0.1.5"; + self.by-version."connect-jade-static"."0.2.1"; + by-version."connect-jade-static"."0.2.1" = self.buildNodePackage { + name = "connect-jade-static-0.2.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/connect-jade-static/-/connect-jade-static-0.1.5.tgz"; - name = "connect-jade-static-0.1.5.tgz"; - sha1 = "25b456ba526b45926a5152678af3081c7cde0086"; + url = "http://registry.npmjs.org/connect-jade-static/-/connect-jade-static-0.2.1.tgz"; + name = "connect-jade-static-0.2.1.tgz"; + sha1 = "a4aebd0c4525c3fbd58424e1a09f9a86f4e11a31"; }; deps = { - "jade-1.9.1" = self.by-version."jade"."1.9.1"; + "jade-1.9.2" = self.by-version."jade"."1.9.2"; }; peerDependencies = []; }; - "connect-jade-static" = self.by-version."connect-jade-static"."0.1.5"; + "connect-jade-static" = self.by-version."connect-jade-static"."0.2.1"; by-spec."connect-mongo"."*" = self.by-version."connect-mongo"."0.7.0"; by-version."connect-mongo"."0.7.0" = self.buildNodePackage { @@ -6071,8 +6255,8 @@ deps = { "debug-2.1.1" = self.by-version."debug"."2.1.1"; "depd-1.0.0" = self.by-version."depd"."1.0.0"; - "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; - "mongodb-2.0.14" = self.by-version."mongodb"."2.0.14"; + "lodash-3.2.0" = self.by-version."lodash"."3.2.0"; + "mongodb-2.0.16" = self.by-version."mongodb"."2.0.16"; }; peerDependencies = []; }; @@ -6093,7 +6277,7 @@ "multiparty-3.3.2" = self.by-version."multiparty"."3.3.2"; "on-finished-2.1.1" = self.by-version."on-finished"."2.1.1"; "qs-2.2.5" = self.by-version."qs"."2.2.5"; - "type-is-1.5.5" = self.by-version."type-is"."1.5.5"; + "type-is-1.5.7" = self.by-version."type-is"."1.5.7"; }; peerDependencies = []; }; @@ -6161,6 +6345,24 @@ }; peerDependencies = []; }; + by-spec."connect-timeout"."~1.6.0" = + self.by-version."connect-timeout"."1.6.0"; + by-version."connect-timeout"."1.6.0" = self.buildNodePackage { + name = "connect-timeout-1.6.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/connect-timeout/-/connect-timeout-1.6.0.tgz"; + name = "connect-timeout-1.6.0.tgz"; + sha1 = "cd38b4c106d25f4472556f3be98ac4d1c4a8ef3e"; + }; + deps = { + "debug-2.1.1" = self.by-version."debug"."2.1.1"; + "http-errors-1.3.1" = self.by-version."http-errors"."1.3.1"; + "ms-0.7.0" = self.by-version."ms"."0.7.0"; + "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; + }; + peerDependencies = []; + }; by-spec."connection-parse"."0.0.x" = self.by-version."connection-parse"."0.0.7"; by-version."connection-parse"."0.0.7" = self.buildNodePackage { @@ -6266,19 +6468,33 @@ }; peerDependencies = []; }; - by-spec."contextify"."~0.1.5" = - self.by-version."contextify"."0.1.11"; - by-version."contextify"."0.1.11" = self.buildNodePackage { - name = "contextify-0.1.11"; + by-spec."content-type"."~1.0.1" = + self.by-version."content-type"."1.0.1"; + by-version."content-type"."1.0.1" = self.buildNodePackage { + name = "content-type-1.0.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/contextify/-/contextify-0.1.11.tgz"; - name = "contextify-0.1.11.tgz"; - sha1 = "8abffb2b63ad7182a04c5fe36101fc2c237cdfdd"; + url = "http://registry.npmjs.org/content-type/-/content-type-1.0.1.tgz"; + name = "content-type-1.0.1.tgz"; + sha1 = "a19d2247327dc038050ce622b7a154ec59c5e600"; + }; + deps = { + }; + peerDependencies = []; + }; + by-spec."contextify"."~0.1.5" = + self.by-version."contextify"."0.1.13"; + by-version."contextify"."0.1.13" = self.buildNodePackage { + name = "contextify-0.1.13"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/contextify/-/contextify-0.1.13.tgz"; + name = "contextify-0.1.13.tgz"; + sha1 = "4ecac6abf6fd266aff1a7b5c4fcc902932cb4efe"; }; deps = { "bindings-1.2.1" = self.by-version."bindings"."1.2.1"; - "nan-1.3.0" = self.by-version."nan"."1.3.0"; + "nan-1.5.3" = self.by-version."nan"."1.5.3"; }; peerDependencies = []; }; @@ -6397,23 +6613,25 @@ peerDependencies = []; }; by-spec."cookie-parser"."^1.0.1" = - self.by-version."cookie-parser"."1.3.3"; - by-version."cookie-parser"."1.3.3" = self.buildNodePackage { - name = "cookie-parser-1.3.3"; + self.by-version."cookie-parser"."1.3.4"; + by-version."cookie-parser"."1.3.4" = self.buildNodePackage { + name = "cookie-parser-1.3.4"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/cookie-parser/-/cookie-parser-1.3.3.tgz"; - name = "cookie-parser-1.3.3.tgz"; - sha1 = "7e3a2c745f4b460d5a340e578a0baa5d7725fe37"; + url = "http://registry.npmjs.org/cookie-parser/-/cookie-parser-1.3.4.tgz"; + name = "cookie-parser-1.3.4.tgz"; + sha1 = "193035a5be97117a21709b3aa737f6132717bda6"; }; deps = { "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; - "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5"; + "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6"; }; peerDependencies = []; }; by-spec."cookie-parser"."~1.3.3" = - self.by-version."cookie-parser"."1.3.3"; + self.by-version."cookie-parser"."1.3.4"; + by-spec."cookie-parser"."~1.3.4" = + self.by-version."cookie-parser"."1.3.4"; by-spec."cookie-signature"."1.0.0" = self.by-version."cookie-signature"."1.0.0"; by-version."cookie-signature"."1.0.0" = self.buildNodePackage { @@ -6484,15 +6702,15 @@ }; peerDependencies = []; }; - by-spec."cookiejar"."1.3.0" = - self.by-version."cookiejar"."1.3.0"; - by-version."cookiejar"."1.3.0" = self.buildNodePackage { - name = "cookiejar-1.3.0"; + by-spec."cookie-signature"."1.0.6" = + self.by-version."cookie-signature"."1.0.6"; + by-version."cookie-signature"."1.0.6" = self.buildNodePackage { + name = "cookie-signature-1.0.6"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/cookiejar/-/cookiejar-1.3.0.tgz"; - name = "cookiejar-1.3.0.tgz"; - sha1 = "dd00b35679021e99cbd4e855b9ad041913474765"; + url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"; + name = "cookie-signature-1.0.6.tgz"; + sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; }; deps = { }; @@ -6639,7 +6857,7 @@ sha1 = "007c70ef80089dbae6f59eeeec37480799b39595"; }; deps = { - "request-2.51.0" = self.by-version."request"."2.51.0"; + "request-2.53.0" = self.by-version."request"."2.53.0"; }; peerDependencies = []; }; @@ -6662,8 +6880,6 @@ peerDependencies = []; }; "coveralls" = self.by-version."coveralls"."2.11.2"; - by-spec."coveralls"."^2.11.2" = - self.by-version."coveralls"."2.11.2"; by-spec."crc"."0.2.0" = self.by-version."crc"."0.2.0"; by-version."crc"."0.2.0" = self.buildNodePackage { @@ -6707,14 +6923,14 @@ peerDependencies = []; }; by-spec."crc32-stream"."~0.3.1" = - self.by-version."crc32-stream"."0.3.1"; - by-version."crc32-stream"."0.3.1" = self.buildNodePackage { - name = "crc32-stream-0.3.1"; + self.by-version."crc32-stream"."0.3.2"; + by-version."crc32-stream"."0.3.2" = self.buildNodePackage { + name = "crc32-stream-0.3.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/crc32-stream/-/crc32-stream-0.3.1.tgz"; - name = "crc32-stream-0.3.1.tgz"; - sha1 = "615fcf05ed08342a3d1e938041aed84430ce7837"; + url = "http://registry.npmjs.org/crc32-stream/-/crc32-stream-0.3.2.tgz"; + name = "crc32-stream-0.3.2.tgz"; + sha1 = "8c86a5c4ed38c53e36750d662784ad8ec642e38e"; }; deps = { "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; @@ -6733,7 +6949,7 @@ sha1 = "ff6fce0d36747adf3a87918b97b93e302541a157"; }; deps = { - "bn.js-1.0.0" = self.by-version."bn.js"."1.0.0"; + "bn.js-1.3.0" = self.by-version."bn.js"."1.3.0"; "elliptic-1.0.1" = self.by-version."elliptic"."1.0.1"; }; peerDependencies = []; @@ -6756,14 +6972,14 @@ peerDependencies = []; }; by-spec."create-hmac"."^1.1.0" = - self.by-version."create-hmac"."1.1.0"; - by-version."create-hmac"."1.1.0" = self.buildNodePackage { - name = "create-hmac-1.1.0"; + self.by-version."create-hmac"."1.1.3"; + by-version."create-hmac"."1.1.3" = self.buildNodePackage { + name = "create-hmac-1.1.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/create-hmac/-/create-hmac-1.1.0.tgz"; - name = "create-hmac-1.1.0.tgz"; - sha1 = "92f8b6378471f4bc67eefc9dee6622df6b8754be"; + url = "http://registry.npmjs.org/create-hmac/-/create-hmac-1.1.3.tgz"; + name = "create-hmac-1.1.3.tgz"; + sha1 = "29843e9c191ba412ab001bc55ac8b8b9ae54b670"; }; deps = { "create-hash-1.1.0" = self.by-version."create-hash"."1.1.0"; @@ -6771,6 +6987,8 @@ }; peerDependencies = []; }; + by-spec."create-hmac"."^1.1.2" = + self.by-version."create-hmac"."1.1.3"; by-spec."cron".">=1.0.1" = self.by-version."cron"."1.0.6"; by-version."cron"."1.0.6" = self.buildNodePackage { @@ -6833,6 +7051,21 @@ }; peerDependencies = []; }; + by-spec."cryptiles"."2.x.x" = + self.by-version."cryptiles"."2.0.4"; + by-version."cryptiles"."2.0.4" = self.buildNodePackage { + name = "cryptiles-2.0.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/cryptiles/-/cryptiles-2.0.4.tgz"; + name = "cryptiles-2.0.4.tgz"; + sha1 = "09ea1775b9e1c7de7e60a99d42ab6f08ce1a1285"; + }; + deps = { + "boom-2.6.1" = self.by-version."boom"."2.6.1"; + }; + peerDependencies = []; + }; by-spec."crypto"."0.0.3" = self.by-version."crypto"."0.0.3"; by-version."crypto"."0.0.3" = self.buildNodePackage { @@ -6848,31 +7081,31 @@ peerDependencies = []; }; by-spec."crypto-browserify"."^3.0.0" = - self.by-version."crypto-browserify"."3.9.9"; - by-version."crypto-browserify"."3.9.9" = self.buildNodePackage { - name = "crypto-browserify-3.9.9"; + self.by-version."crypto-browserify"."3.9.12"; + by-version."crypto-browserify"."3.9.12" = self.buildNodePackage { + name = "crypto-browserify-3.9.12"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.9.9.tgz"; - name = "crypto-browserify-3.9.9.tgz"; - sha1 = "1296ad1fb0168fb621b44af68dcc7939df0d4af6"; + url = "http://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.9.12.tgz"; + name = "crypto-browserify-3.9.12.tgz"; + sha1 = "3ddbfa01bb3e4c6501b3871787916744b3c97175"; }; deps = { "browserify-aes-1.0.0" = self.by-version."browserify-aes"."1.0.0"; "browserify-sign-2.8.0" = self.by-version."browserify-sign"."2.8.0"; "create-ecdh-1.0.3" = self.by-version."create-ecdh"."1.0.3"; "create-hash-1.1.0" = self.by-version."create-hash"."1.1.0"; - "create-hmac-1.1.0" = self.by-version."create-hmac"."1.1.0"; - "diffie-hellman-2.2.3" = self.by-version."diffie-hellman"."2.2.3"; + "create-hmac-1.1.3" = self.by-version."create-hmac"."1.1.3"; + "diffie-hellman-3.0.1" = self.by-version."diffie-hellman"."3.0.1"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - "pbkdf2-compat-2.0.1" = self.by-version."pbkdf2-compat"."2.0.1"; + "pbkdf2-compat-3.0.2" = self.by-version."pbkdf2-compat"."3.0.2"; "public-encrypt-1.1.2" = self.by-version."public-encrypt"."1.1.2"; "randombytes-2.0.1" = self.by-version."randombytes"."2.0.1"; }; peerDependencies = []; }; by-spec."crypto-browserify"."^3.2.6" = - self.by-version."crypto-browserify"."3.9.9"; + self.by-version."crypto-browserify"."3.9.12"; by-spec."crypto-browserify"."~1.0.9" = self.by-version."crypto-browserify"."1.0.9"; by-version."crypto-browserify"."1.0.9" = self.buildNodePackage { @@ -6887,24 +7120,26 @@ }; peerDependencies = []; }; - by-spec."csrf"."~2.0.4" = - self.by-version."csrf"."2.0.4"; - by-version."csrf"."2.0.4" = self.buildNodePackage { - name = "csrf-2.0.4"; + by-spec."csrf"."~2.0.5" = + self.by-version."csrf"."2.0.6"; + by-version."csrf"."2.0.6" = self.buildNodePackage { + name = "csrf-2.0.6"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/csrf/-/csrf-2.0.4.tgz"; - name = "csrf-2.0.4.tgz"; - sha1 = "4366ddea0e08924aa324b4c7cf5649e413891f46"; + url = "http://registry.npmjs.org/csrf/-/csrf-2.0.6.tgz"; + name = "csrf-2.0.6.tgz"; + sha1 = "a90a9d88fc7411423cb0c5c13e901a8cc588132e"; }; deps = { - "base64-url-1.1.0" = self.by-version."base64-url"."1.1.0"; + "base64-url-1.2.1" = self.by-version."base64-url"."1.2.1"; "rndm-1.1.0" = self.by-version."rndm"."1.1.0"; "scmp-1.0.0" = self.by-version."scmp"."1.0.0"; - "uid-safe-1.0.2" = self.by-version."uid-safe"."1.0.2"; + "uid-safe-1.1.0" = self.by-version."uid-safe"."1.1.0"; }; peerDependencies = []; }; + by-spec."csrf"."~2.0.6" = + self.by-version."csrf"."2.0.6"; by-spec."css"."~1.0.8" = self.by-version."css"."1.0.8"; by-version."css"."1.0.8" = self.buildNodePackage { @@ -7011,25 +7246,43 @@ peerDependencies = []; }; by-spec."csurf"."~1.6.2" = - self.by-version."csurf"."1.6.5"; - by-version."csurf"."1.6.5" = self.buildNodePackage { - name = "csurf-1.6.5"; + self.by-version."csurf"."1.6.6"; + by-version."csurf"."1.6.6" = self.buildNodePackage { + name = "csurf-1.6.6"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/csurf/-/csurf-1.6.5.tgz"; - name = "csurf-1.6.5.tgz"; - sha1 = "da67819fd73d44be3553f5ad1362497264a658ad"; + url = "http://registry.npmjs.org/csurf/-/csurf-1.6.6.tgz"; + name = "csurf-1.6.6.tgz"; + sha1 = "fc4b1aa293f65da87731c049350d01b25bda3ece"; }; deps = { "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5"; - "csrf-2.0.4" = self.by-version."csrf"."2.0.4"; + "csrf-2.0.6" = self.by-version."csrf"."2.0.6"; "http-errors-1.2.8" = self.by-version."http-errors"."1.2.8"; }; peerDependencies = []; }; - by-spec."csurf"."~1.6.5" = - self.by-version."csurf"."1.6.5"; + by-spec."csurf"."~1.6.6" = + self.by-version."csurf"."1.6.6"; + by-spec."csurf"."~1.7.0" = + self.by-version."csurf"."1.7.0"; + by-version."csurf"."1.7.0" = self.buildNodePackage { + name = "csurf-1.7.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/csurf/-/csurf-1.7.0.tgz"; + name = "csurf-1.7.0.tgz"; + sha1 = "f24dc53753fccbdce0505f2abc5b57167b65ff18"; + }; + deps = { + "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; + "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6"; + "csrf-2.0.6" = self.by-version."csrf"."2.0.6"; + "http-errors-1.3.1" = self.by-version."http-errors"."1.3.1"; + }; + peerDependencies = []; + }; by-spec."ctype"."0.5.0" = self.by-version."ctype"."0.5.0"; by-version."ctype"."0.5.0" = self.buildNodePackage { @@ -7097,7 +7350,7 @@ sha1 = "da184c535d18d8ee7ba2aa229b914009fae11309"; }; deps = { - "es5-ext-0.10.5" = self.by-version."es5-ext"."0.10.5"; + "es5-ext-0.10.6" = self.by-version."es5-ext"."0.10.6"; }; peerDependencies = []; }; @@ -7234,6 +7487,20 @@ }; peerDependencies = []; }; + by-spec."debounced-seeker"."^1.0.0" = + self.by-version."debounced-seeker"."1.0.0"; + by-version."debounced-seeker"."1.0.0" = self.buildNodePackage { + name = "debounced-seeker-1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/debounced-seeker/-/debounced-seeker-1.0.0.tgz"; + name = "debounced-seeker-1.0.0.tgz"; + sha1 = "e74befcd1a62ae7a5e5fbfbfa6f5d2bacd962bdd"; + }; + deps = { + }; + peerDependencies = []; + }; by-spec."debug"."*" = self.by-version."debug"."2.1.1"; by-version."debug"."2.1.1" = self.buildNodePackage { @@ -7397,6 +7664,8 @@ self.by-version."debug"."2.1.1"; by-spec."debug"."^2.1.0" = self.by-version."debug"."2.1.1"; + by-spec."debug"."^2.1.1" = + self.by-version."debug"."2.1.1"; by-spec."debug"."~0.7.2" = self.by-version."debug"."0.7.4"; by-spec."debug"."~0.7.4" = @@ -7466,14 +7735,14 @@ peerDependencies = []; }; by-spec."deep-equal"."*" = - self.by-version."deep-equal"."0.2.1"; - by-version."deep-equal"."0.2.1" = self.buildNodePackage { - name = "deep-equal-0.2.1"; + self.by-version."deep-equal"."1.0.0"; + by-version."deep-equal"."1.0.0" = self.buildNodePackage { + name = "deep-equal-1.0.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.2.1.tgz"; - name = "deep-equal-0.2.1.tgz"; - sha1 = "fad7a793224cbf0c3c7786f92ef780e4fc8cc878"; + url = "http://registry.npmjs.org/deep-equal/-/deep-equal-1.0.0.tgz"; + name = "deep-equal-1.0.0.tgz"; + sha1 = "d4564f07d2f0ab3e46110bec16592abd7dc2e326"; }; deps = { }; @@ -7510,7 +7779,19 @@ peerDependencies = []; }; by-spec."deep-equal"."~0.2.1" = - self.by-version."deep-equal"."0.2.1"; + self.by-version."deep-equal"."0.2.2"; + by-version."deep-equal"."0.2.2" = self.buildNodePackage { + name = "deep-equal-0.2.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.2.2.tgz"; + name = "deep-equal-0.2.2.tgz"; + sha1 = "84b745896f34c684e98f2ce0e42abaf43bba017d"; + }; + deps = { + }; + peerDependencies = []; + }; by-spec."deep-extend"."~0.2.5" = self.by-version."deep-extend"."0.2.11"; by-version."deep-extend"."0.2.11" = self.buildNodePackage { @@ -7850,7 +8131,7 @@ deps = { "acorn-0.9.0" = self.by-version."acorn"."0.9.0"; "defined-0.0.0" = self.by-version."defined"."0.0.0"; - "escodegen-1.6.0" = self.by-version."escodegen"."1.6.0"; + "escodegen-1.6.1" = self.by-version."escodegen"."1.6.1"; }; peerDependencies = []; }; @@ -7951,32 +8232,33 @@ by-spec."diff"."~1.0.7" = self.by-version."diff"."1.0.8"; by-spec."diff"."~1.2.0" = - self.by-version."diff"."1.2.1"; - by-version."diff"."1.2.1" = self.buildNodePackage { - name = "diff-1.2.1"; + self.by-version."diff"."1.2.2"; + by-version."diff"."1.2.2" = self.buildNodePackage { + name = "diff-1.2.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/diff/-/diff-1.2.1.tgz"; - name = "diff-1.2.1.tgz"; - sha1 = "82ef7ffcd80039d1f1f25eb6b10500f656236b7a"; + url = "http://registry.npmjs.org/diff/-/diff-1.2.2.tgz"; + name = "diff-1.2.2.tgz"; + sha1 = "27f936a1f5831581024e9ac78fbda7330ce79e85"; }; deps = { }; peerDependencies = []; }; - by-spec."diffie-hellman"."2.2.3" = - self.by-version."diffie-hellman"."2.2.3"; - by-version."diffie-hellman"."2.2.3" = self.buildNodePackage { - name = "diffie-hellman-2.2.3"; + by-spec."diffie-hellman"."^3.0.1" = + self.by-version."diffie-hellman"."3.0.1"; + by-version."diffie-hellman"."3.0.1" = self.buildNodePackage { + name = "diffie-hellman-3.0.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/diffie-hellman/-/diffie-hellman-2.2.3.tgz"; - name = "diffie-hellman-2.2.3.tgz"; - sha1 = "aaf1edb9ed285d91374fba8a1d0f5204681e529a"; + url = "http://registry.npmjs.org/diffie-hellman/-/diffie-hellman-3.0.1.tgz"; + name = "diffie-hellman-3.0.1.tgz"; + sha1 = "13be8fc4ad657278408cd796b554a93e586ed66a"; }; deps = { - "bn.js-1.0.0" = self.by-version."bn.js"."1.0.0"; + "bn.js-1.3.0" = self.by-version."bn.js"."1.3.0"; "miller-rabin-1.1.5" = self.by-version."miller-rabin"."1.1.5"; + "randombytes-2.0.1" = self.by-version."randombytes"."2.0.1"; }; peerDependencies = []; }; @@ -8008,7 +8290,7 @@ sha1 = "e4852c8a0c5519bef4904fcd96d760822f42a446"; }; deps = { - "simplesmtp-0.3.34" = self.by-version."simplesmtp"."0.3.34"; + "simplesmtp-0.3.35" = self.by-version."simplesmtp"."0.3.35"; }; peerDependencies = []; }; @@ -8062,6 +8344,22 @@ }; peerDependencies = []; }; + by-spec."dom-serializer"."0" = + self.by-version."dom-serializer"."0.1.0"; + by-version."dom-serializer"."0.1.0" = self.buildNodePackage { + name = "dom-serializer-0.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz"; + name = "dom-serializer-0.1.0.tgz"; + sha1 = "073c697546ce0780ce23be4a28e293e40bc30c82"; + }; + deps = { + "domelementtype-1.1.3" = self.by-version."domelementtype"."1.1.3"; + "entities-1.1.1" = self.by-version."entities"."1.1.1"; + }; + peerDependencies = []; + }; by-spec."dom-serializer"."~0.0.0" = self.by-version."dom-serializer"."0.0.1"; by-version."dom-serializer"."0.0.1" = self.buildNodePackage { @@ -8079,14 +8377,14 @@ peerDependencies = []; }; by-spec."domain-browser"."~1.1.0" = - self.by-version."domain-browser"."1.1.3"; - by-version."domain-browser"."1.1.3" = self.buildNodePackage { - name = "domain-browser-1.1.3"; + self.by-version."domain-browser"."1.1.4"; + by-version."domain-browser"."1.1.4" = self.buildNodePackage { + name = "domain-browser-1.1.4"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/domain-browser/-/domain-browser-1.1.3.tgz"; - name = "domain-browser-1.1.3.tgz"; - sha1 = "ee8b336f1c53dc990b302eac12b4c7fee24923c1"; + url = "http://registry.npmjs.org/domain-browser/-/domain-browser-1.1.4.tgz"; + name = "domain-browser-1.1.4.tgz"; + sha1 = "90b42769333e909ce3f13bf3e1023ba4a6d6b723"; }; deps = { }; @@ -8168,16 +8466,17 @@ peerDependencies = []; }; by-spec."domutils"."1.5" = - self.by-version."domutils"."1.5.0"; - by-version."domutils"."1.5.0" = self.buildNodePackage { - name = "domutils-1.5.0"; + self.by-version."domutils"."1.5.1"; + by-version."domutils"."1.5.1" = self.buildNodePackage { + name = "domutils-1.5.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/domutils/-/domutils-1.5.0.tgz"; - name = "domutils-1.5.0.tgz"; - sha1 = "bfa4ceb8b7ab6f9423fe59154e04da6cc3ff3949"; + url = "http://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz"; + name = "domutils-1.5.1.tgz"; + sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf"; }; deps = { + "dom-serializer-0.1.0" = self.by-version."dom-serializer"."0.1.0"; "domelementtype-1.1.3" = self.by-version."domelementtype"."1.1.3"; }; peerDependencies = []; @@ -8193,7 +8492,7 @@ sha1 = "b1f53ccd1aa0d7f712fdca22124a666e3ed37215"; }; deps = { - "marked-0.3.2" = self.by-version."marked"."0.3.2"; + "marked-0.3.3" = self.by-version."marked"."0.3.3"; "commander-0.6.1" = self.by-version."commander"."0.6.1"; }; peerDependencies = []; @@ -8210,7 +8509,7 @@ }; deps = { "open-0.0.5" = self.by-version."open"."0.0.5"; - "xhr2-0.1.1" = self.by-version."xhr2"."0.1.1"; + "xhr2-0.1.2" = self.by-version."xhr2"."0.1.2"; }; peerDependencies = []; }; @@ -8259,6 +8558,22 @@ }; by-spec."duplexer2"."~0.0.2" = self.by-version."duplexer2"."0.0.2"; + by-spec."duplexify"."^3.2.0" = + self.by-version."duplexify"."3.2.0"; + by-version."duplexify"."3.2.0" = self.buildNodePackage { + name = "duplexify-3.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/duplexify/-/duplexify-3.2.0.tgz"; + name = "duplexify-3.2.0.tgz"; + sha1 = "293974e3cef2e78fbb234e4fd84e20e0ad9d2d60"; + }; + deps = { + "end-of-stream-1.0.0" = self.by-version."end-of-stream"."1.0.0"; + "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; + }; + peerDependencies = []; + }; by-spec."each-async"."^1.1.0" = self.by-version."each-async"."1.1.1"; by-version."each-async"."1.1.1" = self.buildNodePackage { @@ -8375,14 +8690,14 @@ peerDependencies = []; }; by-spec."ejs".">=0.7.1" = - self.by-version."ejs"."2.2.3"; - by-version."ejs"."2.2.3" = self.buildNodePackage { - name = "ejs-2.2.3"; + self.by-version."ejs"."2.2.4"; + by-version."ejs"."2.2.4" = self.buildNodePackage { + name = "ejs-2.2.4"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/ejs/-/ejs-2.2.3.tgz"; - name = "ejs-2.2.3.tgz"; - sha1 = "8d78070eeb2689d94de660279bb9898de9df1ba0"; + url = "http://registry.npmjs.org/ejs/-/ejs-2.2.4.tgz"; + name = "ejs-2.2.4.tgz"; + sha1 = "f0af7e366c13149dd7ae30106c0c0e1cad11903c"; }; deps = { }; @@ -8414,7 +8729,7 @@ sha1 = "d180376b66a17d74995c837796362ac4d22aefe3"; }; deps = { - "bn.js-1.0.0" = self.by-version."bn.js"."1.0.0"; + "bn.js-1.3.0" = self.by-version."bn.js"."1.3.0"; "brorand-1.0.5" = self.by-version."brorand"."1.0.5"; "hash.js-1.0.2" = self.by-version."hash.js"."1.0.2"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; @@ -8422,18 +8737,18 @@ peerDependencies = []; }; by-spec."embedly".">=1.0.2" = - self.by-version."embedly"."1.0.2"; - by-version."embedly"."1.0.2" = self.buildNodePackage { - name = "embedly-1.0.2"; + self.by-version."embedly"."1.0.4"; + by-version."embedly"."1.0.4" = self.buildNodePackage { + name = "embedly-1.0.4"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/embedly/-/embedly-1.0.2.tgz"; - name = "embedly-1.0.2.tgz"; - sha1 = "0b4002da894869fa5952ea8883a2c8cb88332740"; + url = "http://registry.npmjs.org/embedly/-/embedly-1.0.4.tgz"; + name = "embedly-1.0.4.tgz"; + sha1 = "2f778885b44a3cf6c377c1dc31ce1321956733a6"; }; deps = { "batbelt-0.0.2" = self.by-version."batbelt"."0.0.2"; - "superagent-0.13.0" = self.by-version."superagent"."0.13.0"; + "superagent-0.21.0" = self.by-version."superagent"."0.21.0"; "sprintf-0.1.1" = self.by-version."sprintf"."0.1.1"; "hashish-0.0.4" = self.by-version."hashish"."0.0.4"; }; @@ -8454,39 +8769,25 @@ }; peerDependencies = []; }; - by-spec."emitter-component"."0.0.6" = - self.by-version."emitter-component"."0.0.6"; - by-version."emitter-component"."0.0.6" = self.buildNodePackage { - name = "emitter-component-0.0.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/emitter-component/-/emitter-component-0.0.6.tgz"; - name = "emitter-component-0.0.6.tgz"; - sha1 = "c155d82f6d0c01b5bee856d58074a4cc59795bca"; - }; - deps = { - }; - peerDependencies = []; - }; by-spec."empty-trash"."*" = - self.by-version."empty-trash"."1.1.2"; - by-version."empty-trash"."1.1.2" = self.buildNodePackage { - name = "empty-trash-1.1.2"; + self.by-version."empty-trash"."1.1.3"; + by-version."empty-trash"."1.1.3" = self.buildNodePackage { + name = "empty-trash-1.1.3"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/empty-trash/-/empty-trash-1.1.2.tgz"; - name = "empty-trash-1.1.2.tgz"; - sha1 = "98a28646afff863c26bea58bd9f7cb47bf461633"; + url = "http://registry.npmjs.org/empty-trash/-/empty-trash-1.1.3.tgz"; + name = "empty-trash-1.1.3.tgz"; + sha1 = "41676c594d2786760bbfff0013ca5b865da56627"; }; deps = { - "meow-2.1.0" = self.by-version."meow"."2.1.0"; + "meow-3.0.0" = self.by-version."meow"."3.0.0"; "run-applescript-1.0.1" = self.by-version."run-applescript"."1.0.1"; "update-notifier-0.3.0" = self.by-version."update-notifier"."0.3.0"; "xdg-empty-trash-1.0.0" = self.by-version."xdg-empty-trash"."1.0.0"; }; peerDependencies = []; }; - "empty-trash" = self.by-version."empty-trash"."1.1.2"; + "empty-trash" = self.by-version."empty-trash"."1.1.3"; by-spec."encoding"."~0.1.7" = self.by-version."encoding"."0.1.11"; by-version."encoding"."0.1.11" = self.buildNodePackage { @@ -8498,7 +8799,22 @@ sha1 = "52c65ac15aab467f1338451e2615f988eccc0258"; }; deps = { - "iconv-lite-0.4.6" = self.by-version."iconv-lite"."0.4.6"; + "iconv-lite-0.4.7" = self.by-version."iconv-lite"."0.4.7"; + }; + peerDependencies = []; + }; + by-spec."end-of-stream"."1.0.0" = + self.by-version."end-of-stream"."1.0.0"; + by-version."end-of-stream"."1.0.0" = self.buildNodePackage { + name = "end-of-stream-1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz"; + name = "end-of-stream-1.0.0.tgz"; + sha1 = "d4596e702734a93e40e9af864319eabd99ff2f0e"; + }; + deps = { + "once-1.3.1" = self.by-version."once"."1.3.1"; }; peerDependencies = []; }; @@ -8536,19 +8852,6 @@ self.by-version."end-of-stream"."0.1.5"; by-spec."end-of-stream"."~1.0.0" = self.by-version."end-of-stream"."1.0.0"; - by-version."end-of-stream"."1.0.0" = self.buildNodePackage { - name = "end-of-stream-1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz"; - name = "end-of-stream-1.0.0.tgz"; - sha1 = "d4596e702734a93e40e9af864319eabd99ff2f0e"; - }; - deps = { - "once-1.3.1" = self.by-version."once"."1.3.1"; - }; - peerDependencies = []; - }; by-spec."engine.io"."1.3.1" = self.by-version."engine.io"."1.3.1"; by-version."engine.io"."1.3.1" = self.buildNodePackage { @@ -8655,6 +8958,21 @@ }; peerDependencies = []; }; + by-spec."errno"."^0.1.1" = + self.by-version."errno"."0.1.1"; + by-version."errno"."0.1.1" = self.buildNodePackage { + name = "errno-0.1.1"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/errno/-/errno-0.1.1.tgz"; + name = "errno-0.1.1.tgz"; + sha1 = "fda4aae52d07f67c741e50a5a50612786f9d0ed3"; + }; + deps = { + "prr-0.0.0" = self.by-version."prr"."0.0.0"; + }; + peerDependencies = []; + }; by-spec."errorhandler"."1.0.0" = self.by-version."errorhandler"."1.0.0"; by-version."errorhandler"."1.0.0" = self.buildNodePackage { @@ -8686,17 +9004,17 @@ peerDependencies = []; }; by-spec."errorhandler"."^1.1.1" = - self.by-version."errorhandler"."1.3.2"; - by-version."errorhandler"."1.3.2" = self.buildNodePackage { - name = "errorhandler-1.3.2"; + self.by-version."errorhandler"."1.3.4"; + by-version."errorhandler"."1.3.4" = self.buildNodePackage { + name = "errorhandler-1.3.4"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/errorhandler/-/errorhandler-1.3.2.tgz"; - name = "errorhandler-1.3.2.tgz"; - sha1 = "c14f31c3a506d643afd8108b393350ee4c89d61b"; + url = "http://registry.npmjs.org/errorhandler/-/errorhandler-1.3.4.tgz"; + name = "errorhandler-1.3.4.tgz"; + sha1 = "65a7e0843dcfd0f4a9647c50c0a6217556e0be0e"; }; deps = { - "accepts-1.2.2" = self.by-version."accepts"."1.2.2"; + "accepts-1.2.4" = self.by-version."accepts"."1.2.4"; "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; }; peerDependencies = []; @@ -8717,47 +9035,49 @@ }; peerDependencies = []; }; - by-spec."errorhandler"."~1.3.2" = - self.by-version."errorhandler"."1.3.2"; + by-spec."errorhandler"."~1.3.3" = + self.by-version."errorhandler"."1.3.4"; + by-spec."errorhandler"."~1.3.4" = + self.by-version."errorhandler"."1.3.4"; by-spec."es5-ext"."~0.10.2" = - self.by-version."es5-ext"."0.10.5"; - by-version."es5-ext"."0.10.5" = self.buildNodePackage { - name = "es5-ext-0.10.5"; + self.by-version."es5-ext"."0.10.6"; + by-version."es5-ext"."0.10.6" = self.buildNodePackage { + name = "es5-ext-0.10.6"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/es5-ext/-/es5-ext-0.10.5.tgz"; - name = "es5-ext-0.10.5.tgz"; - sha1 = "8393db0e26248dd4fbb16777cae6c51b012564fd"; + url = "http://registry.npmjs.org/es5-ext/-/es5-ext-0.10.6.tgz"; + name = "es5-ext-0.10.6.tgz"; + sha1 = "e27d5750401a11c08259e3b9b5d3bdd3281df00a"; }; deps = { - "es6-iterator-0.1.2" = self.by-version."es6-iterator"."0.1.2"; - "es6-symbol-0.1.1" = self.by-version."es6-symbol"."0.1.1"; + "es6-iterator-0.1.3" = self.by-version."es6-iterator"."0.1.3"; + "es6-symbol-2.0.1" = self.by-version."es6-symbol"."2.0.1"; }; peerDependencies = []; }; by-spec."es5-ext"."~0.10.4" = - self.by-version."es5-ext"."0.10.5"; + self.by-version."es5-ext"."0.10.6"; by-spec."es5-ext"."~0.10.5" = - self.by-version."es5-ext"."0.10.5"; + self.by-version."es5-ext"."0.10.6"; by-spec."es6-iterator"."~0.1.1" = - self.by-version."es6-iterator"."0.1.2"; - by-version."es6-iterator"."0.1.2" = self.buildNodePackage { - name = "es6-iterator-0.1.2"; + self.by-version."es6-iterator"."0.1.3"; + by-version."es6-iterator"."0.1.3" = self.buildNodePackage { + name = "es6-iterator-0.1.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/es6-iterator/-/es6-iterator-0.1.2.tgz"; - name = "es6-iterator-0.1.2.tgz"; - sha1 = "a37429ead74e5c9ed95068b0dc904c568d9a9b6a"; + url = "http://registry.npmjs.org/es6-iterator/-/es6-iterator-0.1.3.tgz"; + name = "es6-iterator-0.1.3.tgz"; + sha1 = "d6f58b8c4fc413c249b4baa19768f8e4d7c8944e"; }; deps = { "d-0.1.1" = self.by-version."d"."0.1.1"; - "es5-ext-0.10.5" = self.by-version."es5-ext"."0.10.5"; - "es6-symbol-0.1.1" = self.by-version."es6-symbol"."0.1.1"; + "es5-ext-0.10.6" = self.by-version."es5-ext"."0.10.6"; + "es6-symbol-2.0.1" = self.by-version."es6-symbol"."2.0.1"; }; peerDependencies = []; }; - by-spec."es6-iterator"."~0.1.2" = - self.by-version."es6-iterator"."0.1.2"; + by-spec."es6-iterator"."~0.1.3" = + self.by-version."es6-iterator"."0.1.3"; by-spec."es6-promise"."^2.0.0" = self.by-version."es6-promise"."2.0.1"; by-version."es6-promise"."2.0.1" = self.buildNodePackage { @@ -8773,14 +9093,14 @@ peerDependencies = []; }; by-spec."es6-shim".">=0.10.0 <1.0.0-0" = - self.by-version."es6-shim"."0.22.2"; - by-version."es6-shim"."0.22.2" = self.buildNodePackage { - name = "es6-shim-0.22.2"; + self.by-version."es6-shim"."0.25.0"; + by-version."es6-shim"."0.25.0" = self.buildNodePackage { + name = "es6-shim-0.25.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/es6-shim/-/es6-shim-0.22.2.tgz"; - name = "es6-shim-0.22.2.tgz"; - sha1 = "4afe7c54bb92b178e5d464dd5d9c31c5742d7521"; + url = "http://registry.npmjs.org/es6-shim/-/es6-shim-0.25.0.tgz"; + name = "es6-shim-0.25.0.tgz"; + sha1 = "62eea13af4aba9d3e4cb1c79e4b05556132a7a95"; }; deps = { }; @@ -8812,12 +9132,26 @@ }; deps = { "d-0.1.1" = self.by-version."d"."0.1.1"; - "es5-ext-0.10.5" = self.by-version."es5-ext"."0.10.5"; + "es5-ext-0.10.6" = self.by-version."es5-ext"."0.10.6"; + }; + peerDependencies = []; + }; + by-spec."es6-symbol"."~2.0.1" = + self.by-version."es6-symbol"."2.0.1"; + by-version."es6-symbol"."2.0.1" = self.buildNodePackage { + name = "es6-symbol-2.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/es6-symbol/-/es6-symbol-2.0.1.tgz"; + name = "es6-symbol-2.0.1.tgz"; + sha1 = "761b5c67cfd4f1d18afb234f691d678682cb3bf3"; + }; + deps = { + "d-0.1.1" = self.by-version."d"."0.1.1"; + "es5-ext-0.10.6" = self.by-version."es5-ext"."0.10.6"; }; peerDependencies = []; }; - by-spec."es6-symbol"."~0.1.1" = - self.by-version."es6-symbol"."0.1.1"; by-spec."es6-weak-map"."~0.1.2" = self.by-version."es6-weak-map"."0.1.2"; by-version."es6-weak-map"."0.1.2" = self.buildNodePackage { @@ -8830,8 +9164,8 @@ }; deps = { "d-0.1.1" = self.by-version."d"."0.1.1"; - "es5-ext-0.10.5" = self.by-version."es5-ext"."0.10.5"; - "es6-iterator-0.1.2" = self.by-version."es6-iterator"."0.1.2"; + "es5-ext-0.10.6" = self.by-version."es5-ext"."0.10.6"; + "es6-iterator-0.1.3" = self.by-version."es6-iterator"."0.1.3"; "es6-symbol-0.1.1" = self.by-version."es6-symbol"."0.1.1"; }; peerDependencies = []; @@ -8894,8 +9228,8 @@ sha1 = "ffda9cb26b70b34f7cc19f1d88756539afb543bd"; }; deps = { - "esprima-1.2.3" = self.by-version."esprima"."1.2.3"; - "source-map-0.1.43" = self.by-version."source-map"."0.1.43"; + "esprima-2.0.0" = self.by-version."esprima"."2.0.0"; + "source-map-0.3.0" = self.by-version."source-map"."0.3.0"; }; peerDependencies = []; }; @@ -8912,7 +9246,7 @@ deps = { "esprima-1.0.4" = self.by-version."esprima"."1.0.4"; "estraverse-0.0.4" = self.by-version."estraverse"."0.0.4"; - "source-map-0.1.43" = self.by-version."source-map"."0.1.43"; + "source-map-0.3.0" = self.by-version."source-map"."0.3.0"; }; peerDependencies = []; }; @@ -8935,19 +9269,19 @@ peerDependencies = []; }; by-spec."escodegen"."^1.4.1" = - self.by-version."escodegen"."1.6.0"; - by-version."escodegen"."1.6.0" = self.buildNodePackage { - name = "escodegen-1.6.0"; + self.by-version."escodegen"."1.6.1"; + by-version."escodegen"."1.6.1" = self.buildNodePackage { + name = "escodegen-1.6.1"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/escodegen/-/escodegen-1.6.0.tgz"; - name = "escodegen-1.6.0.tgz"; - sha1 = "b7dbcbd6586915d9da977f74ba2650d2e82bccfb"; + url = "http://registry.npmjs.org/escodegen/-/escodegen-1.6.1.tgz"; + name = "escodegen-1.6.1.tgz"; + sha1 = "367de17d8510540d12bc6dcb8b3f918391265815"; }; deps = { "estraverse-1.9.1" = self.by-version."estraverse"."1.9.1"; "esutils-1.1.6" = self.by-version."esutils"."1.1.6"; - "esprima-1.2.3" = self.by-version."esprima"."1.2.3"; + "esprima-1.2.4" = self.by-version."esprima"."1.2.4"; "optionator-0.5.0" = self.by-version."optionator"."0.5.0"; "source-map-0.1.43" = self.by-version."source-map"."0.1.43"; }; @@ -8999,23 +9333,35 @@ peerDependencies = []; }; by-spec."esprima"."1.2.x" = - self.by-version."esprima"."1.2.3"; - by-version."esprima"."1.2.3" = self.buildNodePackage { - name = "esprima-1.2.3"; + self.by-version."esprima"."1.2.4"; + by-version."esprima"."1.2.4" = self.buildNodePackage { + name = "esprima-1.2.4"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/esprima/-/esprima-1.2.3.tgz"; - name = "esprima-1.2.3.tgz"; - sha1 = "173c9c28d0ec7753afb977b6b21b3017367aac1b"; + url = "http://registry.npmjs.org/esprima/-/esprima-1.2.4.tgz"; + name = "esprima-1.2.4.tgz"; + sha1 = "835a0cfc8a628a7117da654bfaced8408a91dba7"; }; deps = { }; peerDependencies = []; }; by-spec."esprima".">= 1.0.0" = - self.by-version."esprima"."1.2.3"; + self.by-version."esprima"."2.0.0"; + by-version."esprima"."2.0.0" = self.buildNodePackage { + name = "esprima-2.0.0"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/esprima/-/esprima-2.0.0.tgz"; + name = "esprima-2.0.0.tgz"; + sha1 = "609ac5c2667eae5433b41eb9ecece2331b41498f"; + }; + deps = { + }; + peerDependencies = []; + }; by-spec."esprima"."^1.2.2" = - self.by-version."esprima"."1.2.3"; + self.by-version."esprima"."1.2.4"; by-spec."esprima"."git+https://github.com/ariya/esprima.git#harmony" = self.by-version."esprima"."1.1.0-dev-harmony"; by-version."esprima"."1.1.0-dev-harmony" = self.buildNodePackage { @@ -9023,8 +9369,8 @@ bin = true; src = fetchgit { url = "https://github.com/ariya/esprima.git"; - rev = "216189496afc6bd3f7021a05253c64f9858b6ff9"; - sha256 = "bdfe327bcc19a2adca183c0f1f5517cff87afdfbadce1a77e43841c1539cedca"; + rev = "a41a40b49046747b3af57341cda048bbd3d9df79"; + sha256 = "a304effb5bc8e53d0752aeb7e10ab15afd8381ef09056d0fc98d94a43e5c748a"; }; deps = { }; @@ -9080,6 +9426,20 @@ }; peerDependencies = []; }; + by-spec."esprima-fb"."12001.1.0-dev-harmony-fb" = + self.by-version."esprima-fb"."12001.1.0-dev-harmony-fb"; + by-version."esprima-fb"."12001.1.0-dev-harmony-fb" = self.buildNodePackage { + name = "esprima-fb-12001.1.0-dev-harmony-fb"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/esprima-fb/-/esprima-fb-12001.1.0-dev-harmony-fb.tgz"; + name = "esprima-fb-12001.1.0-dev-harmony-fb.tgz"; + sha1 = "d84400384ba95ce2678c617ad24a7f40808da915"; + }; + deps = { + }; + peerDependencies = []; + }; by-spec."esprima-fb"."3001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."3001.1.0-dev-harmony-fb"; by-version."esprima-fb"."3001.1.0-dev-harmony-fb" = self.buildNodePackage { @@ -9094,20 +9454,6 @@ }; peerDependencies = []; }; - by-spec."esprima-fb"."8001.1001.0-dev-harmony-fb" = - self.by-version."esprima-fb"."8001.1001.0-dev-harmony-fb"; - by-version."esprima-fb"."8001.1001.0-dev-harmony-fb" = self.buildNodePackage { - name = "esprima-fb-8001.1001.0-dev-harmony-fb"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/esprima-fb/-/esprima-fb-8001.1001.0-dev-harmony-fb.tgz"; - name = "esprima-fb-8001.1001.0-dev-harmony-fb.tgz"; - sha1 = "c3190b05341d45643e093af70485ab4988e34d5e"; - }; - deps = { - }; - peerDependencies = []; - }; by-spec."esprima-fb"."~10001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."10001.1.0-dev-harmony-fb"; by-version."esprima-fb"."10001.1.0-dev-harmony-fb" = self.buildNodePackage { @@ -9288,17 +9634,17 @@ by-spec."etag"."~1.5.1" = self.by-version."etag"."1.5.1"; by-spec."event-emitter"."~0.3.1" = - self.by-version."event-emitter"."0.3.2"; - by-version."event-emitter"."0.3.2" = self.buildNodePackage { - name = "event-emitter-0.3.2"; + self.by-version."event-emitter"."0.3.3"; + by-version."event-emitter"."0.3.3" = self.buildNodePackage { + name = "event-emitter-0.3.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/event-emitter/-/event-emitter-0.3.2.tgz"; - name = "event-emitter-0.3.2.tgz"; - sha1 = "a16acce48a6cddbafb494c1f8b46e8aa98758164"; + url = "http://registry.npmjs.org/event-emitter/-/event-emitter-0.3.3.tgz"; + name = "event-emitter-0.3.3.tgz"; + sha1 = "df8e806541c68ab8ff20a79a1841b91abaa1bee4"; }; deps = { - "es5-ext-0.10.5" = self.by-version."es5-ext"."0.10.5"; + "es5-ext-0.10.6" = self.by-version."es5-ext"."0.10.6"; "d-0.1.1" = self.by-version."d"."0.1.1"; }; peerDependencies = []; @@ -9408,11 +9754,26 @@ "request-2.9.203" = self.by-version."request"."2.9.203"; "connect-2.3.9" = self.by-version."connect"."2.3.9"; "openid-0.5.9" = self.by-version."openid"."0.5.9"; - "xml2js-0.4.4" = self.by-version."xml2js"."0.4.4"; + "xml2js-0.4.5" = self.by-version."xml2js"."0.4.5"; "node-swt-0.1.1" = self.by-version."node-swt"."0.1.1"; "node-wsfederation-0.1.1" = self.by-version."node-wsfederation"."0.1.1"; "debug-0.5.0" = self.by-version."debug"."0.5.0"; - "express-3.19.1" = self.by-version."express"."3.19.1"; + "express-3.19.2" = self.by-version."express"."3.19.2"; + }; + peerDependencies = []; + }; + by-spec."execSync"."^1.0.2" = + self.by-version."execSync"."1.0.2"; + by-version."execSync"."1.0.2" = self.buildNodePackage { + name = "execSync-1.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/execSync/-/execSync-1.0.2.tgz"; + name = "execSync-1.0.2.tgz"; + sha1 = "1f42eda582225180053224ecdd3fd1960fdb3139"; + }; + deps = { + "temp-0.5.1" = self.by-version."temp"."0.5.1"; }; peerDependencies = []; }; @@ -9459,12 +9820,12 @@ "on-finished-2.1.1" = self.by-version."on-finished"."2.1.1"; "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; "path-to-regexp-0.1.3" = self.by-version."path-to-regexp"."0.1.3"; - "proxy-addr-1.0.5" = self.by-version."proxy-addr"."1.0.5"; + "proxy-addr-1.0.6" = self.by-version."proxy-addr"."1.0.6"; "qs-2.3.2" = self.by-version."qs"."2.3.2"; "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; "send-0.10.1" = self.by-version."send"."0.10.1"; "serve-static-1.7.2" = self.by-version."serve-static"."1.7.2"; - "type-is-1.5.5" = self.by-version."type-is"."1.5.5"; + "type-is-1.5.7" = self.by-version."type-is"."1.5.7"; "vary-1.0.0" = self.by-version."vary"."1.0.0"; "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2"; @@ -9492,18 +9853,18 @@ peerDependencies = []; }; by-spec."express"."3.*" = - self.by-version."express"."3.19.1"; - by-version."express"."3.19.1" = self.buildNodePackage { - name = "express-3.19.1"; + self.by-version."express"."3.19.2"; + by-version."express"."3.19.2" = self.buildNodePackage { + name = "express-3.19.2"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/express/-/express-3.19.1.tgz"; - name = "express-3.19.1.tgz"; - sha1 = "2b65f584a4c9856ff656595680f522a106b81693"; + url = "http://registry.npmjs.org/express/-/express-3.19.2.tgz"; + name = "express-3.19.2.tgz"; + sha1 = "7f9b3ad8ae0f29d2df98cb3d8649dec8bcc47bf6"; }; deps = { "basic-auth-1.0.0" = self.by-version."basic-auth"."1.0.0"; - "connect-2.28.2" = self.by-version."connect"."2.28.2"; + "connect-2.28.3" = self.by-version."connect"."2.28.3"; "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0"; "commander-2.6.0" = self.by-version."commander"."2.6.0"; "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5"; @@ -9516,7 +9877,7 @@ "methods-1.1.1" = self.by-version."methods"."1.1.1"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; - "proxy-addr-1.0.5" = self.by-version."proxy-addr"."1.0.5"; + "proxy-addr-1.0.6" = self.by-version."proxy-addr"."1.0.6"; "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; "send-0.11.1" = self.by-version."send"."0.11.1"; "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; @@ -9577,7 +9938,7 @@ peerDependencies = []; }; by-spec."express"."3.x" = - self.by-version."express"."3.19.1"; + self.by-version."express"."3.19.2"; by-spec."express"."4.6.1" = self.by-version."express"."4.6.1"; by-version."express"."4.6.1" = self.buildNodePackage { @@ -9619,17 +9980,17 @@ by-spec."express".">=4.0.0" = self.by-version."express"."5.0.0-alpha.1"; by-spec."express"."^4.0" = - self.by-version."express"."4.11.1"; - by-version."express"."4.11.1" = self.buildNodePackage { - name = "express-4.11.1"; + self.by-version."express"."4.11.2"; + by-version."express"."4.11.2" = self.buildNodePackage { + name = "express-4.11.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/express/-/express-4.11.1.tgz"; - name = "express-4.11.1.tgz"; - sha1 = "36d04dd27aa1667634e987529767f9c99de7903f"; + url = "http://registry.npmjs.org/express/-/express-4.11.2.tgz"; + name = "express-4.11.2.tgz"; + sha1 = "8df3d5a9ac848585f00a0777601823faecd3b148"; }; deps = { - "accepts-1.2.2" = self.by-version."accepts"."1.2.2"; + "accepts-1.2.4" = self.by-version."accepts"."1.2.4"; "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0"; "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5"; "debug-2.1.1" = self.by-version."debug"."2.1.1"; @@ -9643,12 +10004,12 @@ "on-finished-2.2.0" = self.by-version."on-finished"."2.2.0"; "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; "path-to-regexp-0.1.3" = self.by-version."path-to-regexp"."0.1.3"; - "proxy-addr-1.0.5" = self.by-version."proxy-addr"."1.0.5"; + "proxy-addr-1.0.6" = self.by-version."proxy-addr"."1.0.6"; "qs-2.3.3" = self.by-version."qs"."2.3.3"; "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; "send-0.11.1" = self.by-version."send"."0.11.1"; "serve-static-1.8.1" = self.by-version."serve-static"."1.8.1"; - "type-is-1.5.5" = self.by-version."type-is"."1.5.5"; + "type-is-1.5.7" = self.by-version."type-is"."1.5.7"; "vary-1.0.0" = self.by-version."vary"."1.0.0"; "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2"; @@ -9734,12 +10095,12 @@ "on-finished-2.2.0" = self.by-version."on-finished"."2.2.0"; "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; "path-to-regexp-0.1.3" = self.by-version."path-to-regexp"."0.1.3"; - "proxy-addr-1.0.5" = self.by-version."proxy-addr"."1.0.5"; + "proxy-addr-1.0.6" = self.by-version."proxy-addr"."1.0.6"; "qs-2.3.3" = self.by-version."qs"."2.3.3"; "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; "send-0.10.1" = self.by-version."send"."0.10.1"; "serve-static-1.7.2" = self.by-version."serve-static"."1.7.2"; - "type-is-1.5.5" = self.by-version."type-is"."1.5.5"; + "type-is-1.5.7" = self.by-version."type-is"."1.5.7"; "vary-1.0.0" = self.by-version."vary"."1.0.0"; "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2"; @@ -9801,30 +10162,32 @@ peerDependencies = []; }; by-spec."express-session"."^1.0.4" = - self.by-version."express-session"."1.10.1"; - by-version."express-session"."1.10.1" = self.buildNodePackage { - name = "express-session-1.10.1"; + self.by-version."express-session"."1.10.3"; + by-version."express-session"."1.10.3" = self.buildNodePackage { + name = "express-session-1.10.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/express-session/-/express-session-1.10.1.tgz"; - name = "express-session-1.10.1.tgz"; - sha1 = "d5421585df601addbb82a99b05222eeaec2b49d1"; + url = "http://registry.npmjs.org/express-session/-/express-session-1.10.3.tgz"; + name = "express-session-1.10.3.tgz"; + sha1 = "10e09dab2548a0c95d4f1710b89e63016610a268"; }; deps = { "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; - "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5"; + "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6"; "crc-3.2.1" = self.by-version."crc"."3.2.1"; "debug-2.1.1" = self.by-version."debug"."2.1.1"; "depd-1.0.0" = self.by-version."depd"."1.0.0"; "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; - "uid-safe-1.0.2" = self.by-version."uid-safe"."1.0.2"; + "uid-safe-1.1.0" = self.by-version."uid-safe"."1.1.0"; "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; }; peerDependencies = []; }; - by-spec."express-session"."~1.10.1" = - self.by-version."express-session"."1.10.1"; + by-spec."express-session"."~1.10.2" = + self.by-version."express-session"."1.10.3"; + by-spec."express-session"."~1.10.3" = + self.by-version."express-session"."1.10.3"; by-spec."express-session"."~1.8.2" = self.by-version."express-session"."1.8.2"; by-version."express-session"."1.8.2" = self.buildNodePackage { @@ -10048,9 +10411,9 @@ }; deps = { "htmlparser2-3.8.2" = self.by-version."htmlparser2"."3.8.2"; - "mime-1.2.11" = self.by-version."mime"."1.2.11"; + "mime-1.3.4" = self.by-version."mime"."1.3.4"; "q-1.1.2" = self.by-version."q"."1.1.2"; - "request-2.51.0" = self.by-version."request"."2.51.0"; + "request-2.53.0" = self.by-version."request"."2.53.0"; "tldtools-0.0.19" = self.by-version."tldtools"."0.0.19"; }; peerDependencies = []; @@ -10127,7 +10490,7 @@ }; peerDependencies = []; }; - by-spec."fetch-bower".">=2 <3" = + by-spec."fetch-bower"."*" = self.by-version."fetch-bower"."2.0.0"; by-version."fetch-bower"."2.0.0" = self.buildNodePackage { name = "fetch-bower-2.0.0"; @@ -10145,15 +10508,18 @@ }; peerDependencies = []; }; - by-spec."fibers"."1.0.2" = - self.by-version."fibers"."1.0.2"; - by-version."fibers"."1.0.2" = self.buildNodePackage { - name = "fibers-1.0.2"; + "fetch-bower" = self.by-version."fetch-bower"."2.0.0"; + by-spec."fetch-bower".">=2 <3" = + self.by-version."fetch-bower"."2.0.0"; + by-spec."fibers"."1.0.5" = + self.by-version."fibers"."1.0.5"; + by-version."fibers"."1.0.5" = self.buildNodePackage { + name = "fibers-1.0.5"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/fibers/-/fibers-1.0.2.tgz"; - name = "fibers-1.0.2.tgz"; - sha1 = "5e24eb5bd929c2be607047dbf88fa758514d3927"; + url = "http://registry.npmjs.org/fibers/-/fibers-1.0.5.tgz"; + name = "fibers-1.0.5.tgz"; + sha1 = "3bea1f697d8540bb3904961ad50939bdee1df678"; }; deps = { }; @@ -10364,6 +10730,21 @@ }; by-spec."findup-sync"."~0.1.2" = self.by-version."findup-sync"."0.1.3"; + by-spec."findup-sync"."~0.2.0" = + self.by-version."findup-sync"."0.2.1"; + by-version."findup-sync"."0.2.1" = self.buildNodePackage { + name = "findup-sync-0.2.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/findup-sync/-/findup-sync-0.2.1.tgz"; + name = "findup-sync-0.2.1.tgz"; + sha1 = "e0a90a450075c49466ee513732057514b81e878c"; + }; + deps = { + "glob-4.3.5" = self.by-version."glob"."4.3.5"; + }; + peerDependencies = []; + }; by-spec."finished"."1.2.2" = self.by-version."finished"."1.2.2"; by-version."finished"."1.2.2" = self.buildNodePackage { @@ -10495,14 +10876,14 @@ peerDependencies = []; }; by-spec."forever"."*" = - self.by-version."forever"."0.13.0"; - by-version."forever"."0.13.0" = self.buildNodePackage { - name = "forever-0.13.0"; + self.by-version."forever"."0.14.1"; + by-version."forever"."0.14.1" = self.buildNodePackage { + name = "forever-0.14.1"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/forever/-/forever-0.13.0.tgz"; - name = "forever-0.13.0.tgz"; - sha1 = "30857921b37994295a23ca1266628fb3aa2c2c00"; + url = "http://registry.npmjs.org/forever/-/forever-0.14.1.tgz"; + name = "forever-0.14.1.tgz"; + sha1 = "48bed8c2b215be5c1a3bf429275514a4dca1158a"; }; deps = { "colors-0.6.2" = self.by-version."colors"."0.6.2"; @@ -10518,7 +10899,7 @@ }; peerDependencies = []; }; - "forever" = self.by-version."forever"."0.13.0"; + "forever" = self.by-version."forever"."0.14.1"; by-spec."forever-agent"."~0.2.0" = self.by-version."forever-agent"."0.2.0"; by-version."forever-agent"."0.2.0" = self.buildNodePackage { @@ -10619,7 +11000,7 @@ deps = { "async-0.9.0" = self.by-version."async"."0.9.0"; "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; - "mime-types-2.0.7" = self.by-version."mime-types"."2.0.7"; + "mime-types-2.0.9" = self.by-version."mime-types"."2.0.9"; }; peerDependencies = []; }; @@ -10718,29 +11099,15 @@ }; peerDependencies = []; }; - by-spec."formidable"."1.0.9" = - self.by-version."formidable"."1.0.9"; - by-version."formidable"."1.0.9" = self.buildNodePackage { - name = "formidable-1.0.9"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/formidable/-/formidable-1.0.9.tgz"; - name = "formidable-1.0.9.tgz"; - sha1 = "419e3bccead3e8874d539f5b3e72a4c503b31a98"; - }; - deps = { - }; - peerDependencies = []; - }; by-spec."formidable"."1.0.x" = - self.by-version."formidable"."1.0.16"; - by-version."formidable"."1.0.16" = self.buildNodePackage { - name = "formidable-1.0.16"; + self.by-version."formidable"."1.0.17"; + by-version."formidable"."1.0.17" = self.buildNodePackage { + name = "formidable-1.0.17"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/formidable/-/formidable-1.0.16.tgz"; - name = "formidable-1.0.16.tgz"; - sha1 = "4916cfdfc4cbed020b257a6a9505a9ab38c2cd0e"; + url = "http://registry.npmjs.org/formidable/-/formidable-1.0.17.tgz"; + name = "formidable-1.0.17.tgz"; + sha1 = "ef5491490f9433b705faa77249c99029ae348559"; }; deps = { }; @@ -10832,24 +11199,25 @@ }; peerDependencies = []; }; - by-spec."fs-extra"."^0.12.0" = - self.by-version."fs-extra"."0.12.0"; - by-version."fs-extra"."0.12.0" = self.buildNodePackage { - name = "fs-extra-0.12.0"; + by-spec."fs-extra"."^0.16.0" = + self.by-version."fs-extra"."0.16.3"; + by-version."fs-extra"."0.16.3" = self.buildNodePackage { + name = "fs-extra-0.16.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/fs-extra/-/fs-extra-0.12.0.tgz"; - name = "fs-extra-0.12.0.tgz"; - sha1 = "407cf6e11321e440d66f9486fba1cc9eb4c21868"; + url = "http://registry.npmjs.org/fs-extra/-/fs-extra-0.16.3.tgz"; + name = "fs-extra-0.16.3.tgz"; + sha1 = "4a5663cc51582546625a1bce04f09a1f5ceec35b"; }; deps = { - "ncp-0.6.0" = self.by-version."ncp"."0.6.0"; - "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; + "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; "jsonfile-2.0.0" = self.by-version."jsonfile"."2.0.0"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; }; peerDependencies = []; }; + by-spec."fs-extra"."~0.16.0" = + self.by-version."fs-extra"."0.16.3"; by-spec."fs-extra"."~0.6.1" = self.by-version."fs-extra"."0.6.4"; by-version."fs-extra"."0.6.4" = self.buildNodePackage { @@ -10953,15 +11321,15 @@ }; by-spec."fs.extra".">=1.2.1 <2" = self.by-version."fs.extra"."1.3.2"; - by-spec."fsevents"."~0.3.1" = - self.by-version."fsevents"."0.3.4"; - by-version."fsevents"."0.3.4" = self.buildNodePackage { - name = "fsevents-0.3.4"; + by-spec."fsevents"."^0.3.1" = + self.by-version."fsevents"."0.3.5"; + by-version."fsevents"."0.3.5" = self.buildNodePackage { + name = "fsevents-0.3.5"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/fsevents/-/fsevents-0.3.4.tgz"; - name = "fsevents-0.3.4.tgz"; - sha1 = "cd9769e92f803578f2ccc4a3a4da2b8556823d02"; + url = "http://registry.npmjs.org/fsevents/-/fsevents-0.3.5.tgz"; + name = "fsevents-0.3.5.tgz"; + sha1 = "d0938147614066c0e1297647b3b8ab5a4baf4688"; }; deps = { "nan-1.5.3" = self.by-version."nan"."1.5.3"; @@ -11014,7 +11382,7 @@ self.by-version."fstream"."0.1.31"; by-spec."fstream"."~1.0.2" = self.by-version."fstream"."1.0.4"; - by-spec."fstream"."~1.0.3" = + by-spec."fstream"."~1.0.4" = self.by-version."fstream"."1.0.4"; by-spec."fstream-ignore"."0.0.7" = self.by-version."fstream-ignore"."0.0.7"; @@ -11101,19 +11469,22 @@ }; peerDependencies = []; }; - by-spec."gauge"."~1.0.2" = - self.by-version."gauge"."1.0.2"; - by-version."gauge"."1.0.2" = self.buildNodePackage { - name = "gauge-1.0.2"; + by-spec."gauge"."~1.1.0" = + self.by-version."gauge"."1.1.0"; + by-version."gauge"."1.1.0" = self.buildNodePackage { + name = "gauge-1.1.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/gauge/-/gauge-1.0.2.tgz"; - name = "gauge-1.0.2.tgz"; - sha1 = "53e25965dfaf1c85be3a2a0633306a24a67dc2f9"; + url = "http://registry.npmjs.org/gauge/-/gauge-1.1.0.tgz"; + name = "gauge-1.1.0.tgz"; + sha1 = "4f1c13cb6232469f65de92357b34f8ff53c5ca41"; }; deps = { "ansi-0.3.0" = self.by-version."ansi"."0.3.0"; "has-unicode-1.0.0" = self.by-version."has-unicode"."1.0.0"; + "lodash.pad-3.0.0" = self.by-version."lodash.pad"."3.0.0"; + "lodash.padleft-3.0.0" = self.by-version."lodash.padleft"."3.0.0"; + "lodash.padright-3.0.0" = self.by-version."lodash.padright"."3.0.0"; }; peerDependencies = []; }; @@ -11175,34 +11546,8 @@ }; peerDependencies = []; }; - by-spec."get-stdin"."^1.0.0" = - self.by-version."get-stdin"."1.0.0"; - by-version."get-stdin"."1.0.0" = self.buildNodePackage { - name = "get-stdin-1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/get-stdin/-/get-stdin-1.0.0.tgz"; - name = "get-stdin-1.0.0.tgz"; - sha1 = "00bd5a494c81c372f5629bea103bbffe7a1da3ce"; - }; - deps = { - }; - peerDependencies = []; - }; - by-spec."get-stdin"."^3.0.0" = - self.by-version."get-stdin"."3.0.2"; - by-version."get-stdin"."3.0.2" = self.buildNodePackage { - name = "get-stdin-3.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/get-stdin/-/get-stdin-3.0.2.tgz"; - name = "get-stdin-3.0.2.tgz"; - sha1 = "c1ced24b9039b38ded85bdf161e57713b6dd4abe"; - }; - deps = { - }; - peerDependencies = []; - }; + by-spec."get-stdin"."^4.0.1" = + self.by-version."get-stdin"."4.0.1"; by-spec."get-uri"."~0.1.0" = self.by-version."get-uri"."0.1.3"; by-version."get-uri"."0.1.3" = self.buildNodePackage { @@ -11318,14 +11663,14 @@ by-spec."github-url-from-username-repo"."~1.0.2" = self.by-version."github-url-from-username-repo"."1.0.2"; by-spec."glob"."3 || 4" = - self.by-version."glob"."4.3.5"; - by-version."glob"."4.3.5" = self.buildNodePackage { - name = "glob-4.3.5"; + self.by-version."glob"."4.4.0"; + by-version."glob"."4.4.0" = self.buildNodePackage { + name = "glob-4.4.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/glob/-/glob-4.3.5.tgz"; - name = "glob-4.3.5.tgz"; - sha1 = "80fbb08ca540f238acce5d11d1e9bc41e75173d3"; + url = "http://registry.npmjs.org/glob/-/glob-4.4.0.tgz"; + name = "glob-4.4.0.tgz"; + sha1 = "91d63dc1ed1d82b52ba2cb76044852ccafc2130f"; }; deps = { "inflight-1.0.4" = self.by-version."inflight"."1.0.4"; @@ -11389,17 +11734,17 @@ peerDependencies = []; }; by-spec."glob"."4.x" = - self.by-version."glob"."4.3.5"; + self.by-version."glob"."4.4.0"; by-spec."glob".">=3.2.7 <4" = self.by-version."glob"."3.2.11"; by-spec."glob"."^3.2.1" = self.by-version."glob"."3.2.11"; by-spec."glob"."^4.0.2" = - self.by-version."glob"."4.3.5"; + self.by-version."glob"."4.4.0"; by-spec."glob"."^4.0.5" = - self.by-version."glob"."4.3.5"; + self.by-version."glob"."4.4.0"; by-spec."glob"."^4.3.1" = - self.by-version."glob"."4.3.5"; + self.by-version."glob"."4.4.0"; by-spec."glob"."~ 3.2.1" = self.by-version."glob"."3.2.11"; by-spec."glob"."~3.1.21" = @@ -11449,13 +11794,29 @@ }; peerDependencies = []; }; - by-spec."glob"."~4.3.1" = + by-spec."glob"."~4.3.0" = self.by-version."glob"."4.3.5"; - by-spec."glob"."~4.3.2" = + by-version."glob"."4.3.5" = self.buildNodePackage { + name = "glob-4.3.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/glob/-/glob-4.3.5.tgz"; + name = "glob-4.3.5.tgz"; + sha1 = "80fbb08ca540f238acce5d11d1e9bc41e75173d3"; + }; + deps = { + "inflight-1.0.4" = self.by-version."inflight"."1.0.4"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + "minimatch-2.0.1" = self.by-version."minimatch"."2.0.1"; + "once-1.3.1" = self.by-version."once"."1.3.1"; + }; + peerDependencies = []; + }; + by-spec."glob"."~4.3.1" = self.by-version."glob"."4.3.5"; by-spec."glob"."~4.3.5" = self.by-version."glob"."4.3.5"; - by-spec."glob-parent"."~1.0.0" = + by-spec."glob-parent"."^1.0.0" = self.by-version."glob-parent"."1.0.0"; by-version."glob-parent"."1.0.0" = self.buildNodePackage { name = "glob-parent-1.0.0"; @@ -11481,7 +11842,7 @@ sha1 = "9170a5f12b790306fdfe598f313f8f7954fd143b"; }; deps = { - "glob-4.3.5" = self.by-version."glob"."4.3.5"; + "glob-4.4.0" = self.by-version."glob"."4.4.0"; "minimatch-2.0.1" = self.by-version."minimatch"."2.0.1"; "ordered-read-streams-0.1.0" = self.by-version."ordered-read-streams"."0.1.0"; "glob2base-0.0.12" = self.by-version."glob2base"."0.0.12"; @@ -11569,14 +11930,14 @@ peerDependencies = []; }; by-spec."googleapis"."^1.0.20" = - self.by-version."googleapis"."1.1.1"; - by-version."googleapis"."1.1.1" = self.buildNodePackage { - name = "googleapis-1.1.1"; + self.by-version."googleapis"."1.1.3"; + by-version."googleapis"."1.1.3" = self.buildNodePackage { + name = "googleapis-1.1.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/googleapis/-/googleapis-1.1.1.tgz"; - name = "googleapis-1.1.1.tgz"; - sha1 = "cb9da9584f9cd6825df7ce39b4145514fc503b02"; + url = "http://registry.npmjs.org/googleapis/-/googleapis-1.1.3.tgz"; + name = "googleapis-1.1.3.tgz"; + sha1 = "ebfd0c2b3ff89a9445b29ccaeb792b867fab4b50"; }; deps = { "async-0.9.0" = self.by-version."async"."0.9.0"; @@ -11601,7 +11962,7 @@ }; peerDependencies = []; }; - by-spec."got"."^1.0.1" = + by-spec."got"."^1.2.2" = self.by-version."got"."1.2.2"; by-version."got"."1.2.2" = self.buildNodePackage { name = "got-1.2.2"; @@ -11616,8 +11977,31 @@ }; peerDependencies = []; }; - by-spec."got"."^1.2.2" = - self.by-version."got"."1.2.2"; + by-spec."got"."^2.3.2" = + self.by-version."got"."2.4.0"; + by-version."got"."2.4.0" = self.buildNodePackage { + name = "got-2.4.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/got/-/got-2.4.0.tgz"; + name = "got-2.4.0.tgz"; + sha1 = "e4087a2cd59b5d20f2d169dc85d2169ed9e89f56"; + }; + deps = { + "duplexify-3.2.0" = self.by-version."duplexify"."3.2.0"; + "infinity-agent-1.0.2" = self.by-version."infinity-agent"."1.0.2"; + "is-stream-1.0.1" = self.by-version."is-stream"."1.0.1"; + "lowercase-keys-1.0.0" = self.by-version."lowercase-keys"."1.0.0"; + "object-assign-2.0.0" = self.by-version."object-assign"."2.0.0"; + "prepend-http-1.0.1" = self.by-version."prepend-http"."1.0.1"; + "read-all-stream-1.0.2" = self.by-version."read-all-stream"."1.0.2"; + "statuses-1.2.1" = self.by-version."statuses"."1.2.1"; + "timed-out-2.0.0" = self.by-version."timed-out"."2.0.0"; + }; + peerDependencies = []; + }; + by-spec."got"."^2.4.0" = + self.by-version."got"."2.4.0"; by-spec."graceful-fs"."1.2" = self.by-version."graceful-fs"."1.2.3"; by-version."graceful-fs"."1.2.3" = self.buildNodePackage { @@ -11672,6 +12056,8 @@ self.by-version."graceful-fs"."3.0.5"; by-spec."graceful-fs"."^3.0.4" = self.by-version."graceful-fs"."3.0.5"; + by-spec."graceful-fs"."^3.0.5" = + self.by-version."graceful-fs"."3.0.5"; by-spec."graceful-fs"."~1" = self.by-version."graceful-fs"."1.2.3"; by-spec."graceful-fs"."~1.2.0" = @@ -11691,20 +12077,20 @@ by-spec."graceful-fs"."~3.0.5" = self.by-version."graceful-fs"."3.0.5"; by-spec."gridfs-stream"."*" = - self.by-version."gridfs-stream"."0.5.3"; - by-version."gridfs-stream"."0.5.3" = self.buildNodePackage { - name = "gridfs-stream-0.5.3"; + self.by-version."gridfs-stream"."1.0.1"; + by-version."gridfs-stream"."1.0.1" = self.buildNodePackage { + name = "gridfs-stream-1.0.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/gridfs-stream/-/gridfs-stream-0.5.3.tgz"; - name = "gridfs-stream-0.5.3.tgz"; - sha1 = "c0896728fa3ea83f5fa3c9ced461afb7a036d149"; + url = "http://registry.npmjs.org/gridfs-stream/-/gridfs-stream-1.0.1.tgz"; + name = "gridfs-stream-1.0.1.tgz"; + sha1 = "72cd5a8c167adfdefd053807d024758e5a86c0fd"; }; deps = { }; peerDependencies = []; }; - "gridfs-stream" = self.by-version."gridfs-stream"."0.5.3"; + "gridfs-stream" = self.by-version."gridfs-stream"."1.0.1"; by-spec."growl"."1.7.x" = self.by-version."growl"."1.7.0"; by-version."growl"."1.7.0" = self.buildNodePackage { @@ -11794,24 +12180,24 @@ }; "grunt-cli" = self.by-version."grunt-cli"."0.1.13"; by-spec."grunt-contrib-cssmin"."*" = - self.by-version."grunt-contrib-cssmin"."0.11.0"; - by-version."grunt-contrib-cssmin"."0.11.0" = self.buildNodePackage { - name = "grunt-contrib-cssmin-0.11.0"; + self.by-version."grunt-contrib-cssmin"."0.12.1"; + by-version."grunt-contrib-cssmin"."0.12.1" = self.buildNodePackage { + name = "grunt-contrib-cssmin-0.12.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-0.11.0.tgz"; - name = "grunt-contrib-cssmin-0.11.0.tgz"; - sha1 = "0b0888de9d8549c3d844a7fc79a279b4276a7bc7"; + url = "http://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-0.12.1.tgz"; + name = "grunt-contrib-cssmin-0.12.1.tgz"; + sha1 = "8a14644bdd60ee2d66a5a7b941a37de7c8fe532a"; }; deps = { "chalk-0.5.1" = self.by-version."chalk"."0.5.1"; - "clean-css-3.0.7" = self.by-version."clean-css"."3.0.7"; + "clean-css-3.0.10" = self.by-version."clean-css"."3.0.10"; "maxmin-1.0.0" = self.by-version."maxmin"."1.0.0"; }; peerDependencies = [ self.by-version."grunt"."0.4.5"]; }; - "grunt-contrib-cssmin" = self.by-version."grunt-contrib-cssmin"."0.11.0"; + "grunt-contrib-cssmin" = self.by-version."grunt-contrib-cssmin"."0.12.1"; by-spec."grunt-contrib-jshint"."*" = self.by-version."grunt-contrib-jshint"."0.11.0"; by-version."grunt-contrib-jshint"."0.11.0" = self.buildNodePackage { @@ -11843,7 +12229,7 @@ deps = { "async-0.9.0" = self.by-version."async"."0.9.0"; "chalk-0.5.1" = self.by-version."chalk"."0.5.1"; - "less-2.2.0" = self.by-version."less"."2.2.0"; + "less-2.4.0" = self.by-version."less"."2.4.0"; "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; }; peerDependencies = [ @@ -11861,7 +12247,7 @@ sha1 = "87f2165a981e48a45d22f8cc5299d0934031b972"; }; deps = { - "requirejs-2.1.15" = self.by-version."requirejs"."2.1.15"; + "requirejs-2.1.16" = self.by-version."requirejs"."2.1.16"; }; peerDependencies = [ self.by-version."grunt"."0.4.5"]; @@ -11973,52 +12359,52 @@ sha256 = "a51a5beef55c14c68630275d51cf66c44a4462d1b20c0f08aef6d88a62ca077c"; }; deps = { - "coffee-script-1.8.0" = self.by-version."coffee-script"."1.8.0"; - "jade-1.9.1" = self.by-version."jade"."1.9.1"; - "q-2.0.2" = self.by-version."q"."2.0.2"; - "xml2js-0.4.4" = self.by-version."xml2js"."0.4.4"; - "msgpack-0.2.4" = self.by-version."msgpack"."0.2.4"; + "coffee-script-1.9.0" = self.by-version."coffee-script"."1.9.0"; + "jade-1.9.2" = self.by-version."jade"."1.9.2"; + "q-2.0.3" = self.by-version."q"."2.0.3"; + "xml2js-0.4.5" = self.by-version."xml2js"."0.4.5"; + "msgpack-0.2.6" = self.by-version."msgpack"."0.2.6"; }; peerDependencies = []; }; "guifi-earth" = self.by-version."guifi-earth"."0.2.1"; by-spec."gulp"."*" = - self.by-version."gulp"."3.8.10"; - by-version."gulp"."3.8.10" = self.buildNodePackage { - name = "gulp-3.8.10"; + self.by-version."gulp"."3.8.11"; + by-version."gulp"."3.8.11" = self.buildNodePackage { + name = "gulp-3.8.11"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/gulp/-/gulp-3.8.10.tgz"; - name = "gulp-3.8.10.tgz"; - sha1 = "bfb8fc156be97820f02a7f8b3af61a86666f9e31"; + url = "http://registry.npmjs.org/gulp/-/gulp-3.8.11.tgz"; + name = "gulp-3.8.11.tgz"; + sha1 = "d557e0a7283eb4136491969b0497767972f1d28a"; }; deps = { "archy-1.0.0" = self.by-version."archy"."1.0.0"; "chalk-0.5.1" = self.by-version."chalk"."0.5.1"; "deprecated-0.0.1" = self.by-version."deprecated"."0.0.1"; - "gulp-util-3.0.2" = self.by-version."gulp-util"."3.0.2"; + "gulp-util-3.0.3" = self.by-version."gulp-util"."3.0.3"; "interpret-0.3.10" = self.by-version."interpret"."0.3.10"; - "liftoff-0.13.6" = self.by-version."liftoff"."0.13.6"; + "liftoff-2.0.1" = self.by-version."liftoff"."2.0.1"; "minimist-1.1.0" = self.by-version."minimist"."1.1.0"; "orchestrator-0.3.7" = self.by-version."orchestrator"."0.3.7"; "pretty-hrtime-0.2.2" = self.by-version."pretty-hrtime"."0.2.2"; - "semver-4.2.0" = self.by-version."semver"."4.2.0"; + "semver-4.3.0" = self.by-version."semver"."4.3.0"; "tildify-1.0.0" = self.by-version."tildify"."1.0.0"; - "v8flags-1.0.8" = self.by-version."v8flags"."1.0.8"; + "v8flags-2.0.2" = self.by-version."v8flags"."2.0.2"; "vinyl-fs-0.3.13" = self.by-version."vinyl-fs"."0.3.13"; }; peerDependencies = []; }; - "gulp" = self.by-version."gulp"."3.8.10"; + "gulp" = self.by-version."gulp"."3.8.11"; by-spec."gulp-util"."^3.0.0" = - self.by-version."gulp-util"."3.0.2"; - by-version."gulp-util"."3.0.2" = self.buildNodePackage { - name = "gulp-util-3.0.2"; + self.by-version."gulp-util"."3.0.3"; + by-version."gulp-util"."3.0.3" = self.buildNodePackage { + name = "gulp-util-3.0.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/gulp-util/-/gulp-util-3.0.2.tgz"; - name = "gulp-util-3.0.2.tgz"; - sha1 = "7f1ed0be6d8c1e6563d2105c27217c2c9b744883"; + url = "http://registry.npmjs.org/gulp-util/-/gulp-util-3.0.3.tgz"; + name = "gulp-util-3.0.3.tgz"; + sha1 = "3b078d09001a7b5f77bbe2e7402e05d97d78b3e4"; }; deps = { "array-differ-1.0.0" = self.by-version."array-differ"."1.0.0"; @@ -12026,8 +12412,10 @@ "beeper-1.0.0" = self.by-version."beeper"."1.0.0"; "chalk-0.5.1" = self.by-version."chalk"."0.5.1"; "dateformat-1.0.11" = self.by-version."dateformat"."1.0.11"; - "lodash._reinterpolate-2.4.1" = self.by-version."lodash._reinterpolate"."2.4.1"; - "lodash.template-2.4.1" = self.by-version."lodash.template"."2.4.1"; + "lodash.reescape-3.0.1" = self.by-version."lodash.reescape"."3.0.1"; + "lodash.reevaluate-3.0.1" = self.by-version."lodash.reevaluate"."3.0.1"; + "lodash.reinterpolate-3.0.1" = self.by-version."lodash.reinterpolate"."3.0.1"; + "lodash.template-3.2.0" = self.by-version."lodash.template"."3.2.0"; "minimist-1.1.0" = self.by-version."minimist"."1.1.0"; "multipipe-0.1.2" = self.by-version."multipipe"."0.1.2"; "object-assign-2.0.0" = self.by-version."object-assign"."2.0.0"; @@ -12064,7 +12452,7 @@ sha1 = "ffc594c482190c56531ed2d4a5864d0b0b7d2733"; }; deps = { - "send-0.11.1" = self.by-version."send"."0.11.1"; + "send-0.12.1" = self.by-version."send"."0.12.1"; }; peerDependencies = []; }; @@ -12133,20 +12521,6 @@ }; peerDependencies = []; }; - by-spec."has-color"."~0.1.0" = - self.by-version."has-color"."0.1.7"; - by-version."has-color"."0.1.7" = self.buildNodePackage { - name = "has-color-0.1.7"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz"; - name = "has-color-0.1.7.tgz"; - sha1 = "67144a5260c34fc3cca677d041daf52fe7b78b2f"; - }; - deps = { - }; - peerDependencies = []; - }; by-spec."has-cors"."1.0.3" = self.by-version."has-cors"."1.0.3"; by-version."has-cors"."1.0.3" = self.buildNodePackage { @@ -12313,6 +12687,24 @@ }; peerDependencies = []; }; + by-spec."hawk"."~2.3.0" = + self.by-version."hawk"."2.3.1"; + by-version."hawk"."2.3.1" = self.buildNodePackage { + name = "hawk-2.3.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/hawk/-/hawk-2.3.1.tgz"; + name = "hawk-2.3.1.tgz"; + sha1 = "1e731ce39447fa1d0f6d707f7bceebec0fd1ec1f"; + }; + deps = { + "hoek-2.11.0" = self.by-version."hoek"."2.11.0"; + "boom-2.6.1" = self.by-version."boom"."2.6.1"; + "cryptiles-2.0.4" = self.by-version."cryptiles"."2.0.4"; + "sntp-1.0.9" = self.by-version."sntp"."1.0.9"; + }; + peerDependencies = []; + }; by-spec."hbo-dnsd"."0.9.8" = self.by-version."hbo-dnsd"."0.9.8"; by-version."hbo-dnsd"."0.9.8" = self.buildNodePackage { @@ -12377,18 +12769,18 @@ }; "hipache" = self.by-version."hipache"."0.3.1"; by-spec."hiredis"."*" = - self.by-version."hiredis"."0.1.17"; - by-version."hiredis"."0.1.17" = self.buildNodePackage { - name = "hiredis-0.1.17"; + self.by-version."hiredis"."0.2.0"; + by-version."hiredis"."0.2.0" = self.buildNodePackage { + name = "hiredis-0.2.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/hiredis/-/hiredis-0.1.17.tgz"; - name = "hiredis-0.1.17.tgz"; - sha1 = "60a33a968efc9a974e7ebb832f33aa965d3d354e"; + url = "http://registry.npmjs.org/hiredis/-/hiredis-0.2.0.tgz"; + name = "hiredis-0.2.0.tgz"; + sha1 = "34415bd11f8ddb61581ab2da39468515198d14a8"; }; deps = { "bindings-1.2.1" = self.by-version."bindings"."1.2.1"; - "nan-1.1.2" = self.by-version."nan"."1.1.2"; + "nan-1.5.3" = self.by-version."nan"."1.5.3"; }; peerDependencies = []; }; @@ -12420,6 +12812,20 @@ }; peerDependencies = []; }; + by-spec."hoek"."2.x.x" = + self.by-version."hoek"."2.11.0"; + by-version."hoek"."2.11.0" = self.buildNodePackage { + name = "hoek-2.11.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/hoek/-/hoek-2.11.0.tgz"; + name = "hoek-2.11.0.tgz"; + sha1 = "e588ec66a6b405b0e7140308720e1e1cd4f035b7"; + }; + deps = { + }; + peerDependencies = []; + }; by-spec."hooker"."~0.2.3" = self.by-version."hooker"."0.2.3"; by-version."hooker"."0.2.3" = self.buildNodePackage { @@ -12462,7 +12868,7 @@ }; peerDependencies = []; }; - by-spec."hosted-git-info"."^1.4.0" = + by-spec."hosted-git-info"."^1.5.3" = self.by-version."hosted-git-info"."1.5.3"; by-version."hosted-git-info"."1.5.3" = self.buildNodePackage { name = "hosted-git-info-1.5.3"; @@ -12538,7 +12944,7 @@ }; deps = { "domhandler-2.3.0" = self.by-version."domhandler"."2.3.0"; - "domutils-1.5.0" = self.by-version."domutils"."1.5.0"; + "domutils-1.5.1" = self.by-version."domutils"."1.5.1"; "domelementtype-1.1.3" = self.by-version."domelementtype"."1.1.3"; "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; "entities-1.0.0" = self.by-version."entities"."1.0.0"; @@ -12563,7 +12969,7 @@ }; deps = { "domhandler-2.2.1" = self.by-version."domhandler"."2.2.1"; - "domutils-1.5.0" = self.by-version."domutils"."1.5.0"; + "domutils-1.5.1" = self.by-version."domutils"."1.5.1"; "domelementtype-1.1.3" = self.by-version."domelementtype"."1.1.3"; "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; "entities-1.0.0" = self.by-version."entities"."1.0.0"; @@ -12630,7 +13036,23 @@ }; deps = { "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - "statuses-1.2.0" = self.by-version."statuses"."1.2.0"; + "statuses-1.2.1" = self.by-version."statuses"."1.2.1"; + }; + peerDependencies = []; + }; + by-spec."http-errors"."~1.3.1" = + self.by-version."http-errors"."1.3.1"; + by-version."http-errors"."1.3.1" = self.buildNodePackage { + name = "http-errors-1.3.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz"; + name = "http-errors-1.3.1.tgz"; + sha1 = "197e22cdebd4198585e8694ef6786197b91ed942"; + }; + deps = { + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + "statuses-1.2.1" = self.by-version."statuses"."1.2.1"; }; peerDependencies = []; }; @@ -12778,14 +13200,14 @@ peerDependencies = []; }; by-spec."i18next"."*" = - self.by-version."i18next"."1.7.9"; - by-version."i18next"."1.7.9" = self.buildNodePackage { - name = "i18next-1.7.9"; + self.by-version."i18next"."1.7.10"; + by-version."i18next"."1.7.10" = self.buildNodePackage { + name = "i18next-1.7.10"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/i18next/-/i18next-1.7.9.tgz"; - name = "i18next-1.7.9.tgz"; - sha1 = "91e37d8383c899cf9f84057f96cfdcaacf55afbf"; + url = "http://registry.npmjs.org/i18next/-/i18next-1.7.10.tgz"; + name = "i18next-1.7.10.tgz"; + sha1 = "2bc1ce2cc1bc2e93fa73b588359da02197336875"; }; deps = { "cookies-0.5.0" = self.by-version."cookies"."0.5.0"; @@ -12793,7 +13215,7 @@ }; peerDependencies = []; }; - "i18next" = self.by-version."i18next"."1.7.9"; + "i18next" = self.by-version."i18next"."1.7.10"; by-spec."ibrik"."~2.0.0" = self.by-version."ibrik"."2.0.0"; by-version."ibrik"."2.0.0" = self.buildNodePackage { @@ -12812,11 +13234,26 @@ "which-1.0.8" = self.by-version."which"."1.0.8"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "optimist-0.6.1" = self.by-version."optimist"."0.6.1"; - "esprima-1.2.3" = self.by-version."esprima"."1.2.3"; + "esprima-1.2.4" = self.by-version."esprima"."1.2.4"; "fileset-0.1.5" = self.by-version."fileset"."0.1.5"; }; peerDependencies = []; }; + by-spec."iconv"."~2.1.5" = + self.by-version."iconv"."2.1.6"; + by-version."iconv"."2.1.6" = self.buildNodePackage { + name = "iconv-2.1.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/iconv/-/iconv-2.1.6.tgz"; + name = "iconv-2.1.6.tgz"; + sha1 = "cae89175793276e9fe5ffae58abf8c38f2941c42"; + }; + deps = { + "nan-1.6.2" = self.by-version."nan"."1.6.2"; + }; + peerDependencies = []; + }; by-spec."iconv-lite"."0.4.4" = self.by-version."iconv-lite"."0.4.4"; by-version."iconv-lite"."0.4.4" = self.buildNodePackage { @@ -12859,6 +13296,20 @@ }; peerDependencies = []; }; + by-spec."iconv-lite"."0.4.7" = + self.by-version."iconv-lite"."0.4.7"; + by-version."iconv-lite"."0.4.7" = self.buildNodePackage { + name = "iconv-lite-0.4.7"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.7.tgz"; + name = "iconv-lite-0.4.7.tgz"; + sha1 = "89d32fec821bf8597f44609b4bc09bed5c209a23"; + }; + deps = { + }; + peerDependencies = []; + }; by-spec."iconv-lite"."~0.2.11" = self.by-version."iconv-lite"."0.2.11"; by-version."iconv-lite"."0.2.11" = self.buildNodePackage { @@ -12874,9 +13325,9 @@ peerDependencies = []; }; by-spec."iconv-lite"."~0.4.4" = - self.by-version."iconv-lite"."0.4.6"; + self.by-version."iconv-lite"."0.4.7"; by-spec."iconv-lite"."~0.4.5" = - self.by-version."iconv-lite"."0.4.6"; + self.by-version."iconv-lite"."0.4.7"; by-spec."ieee754"."^1.1.4" = self.by-version."ieee754"."1.1.4"; by-version."ieee754"."1.1.4" = self.buildNodePackage { @@ -12922,19 +13373,19 @@ peerDependencies = []; }; by-spec."indent-string"."^1.1.0" = - self.by-version."indent-string"."1.2.0"; - by-version."indent-string"."1.2.0" = self.buildNodePackage { - name = "indent-string-1.2.0"; + self.by-version."indent-string"."1.2.1"; + by-version."indent-string"."1.2.1" = self.buildNodePackage { + name = "indent-string-1.2.1"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/indent-string/-/indent-string-1.2.0.tgz"; - name = "indent-string-1.2.0.tgz"; - sha1 = "4d747797d66745bd54c6a289f5ce19f51750a4b9"; + url = "http://registry.npmjs.org/indent-string/-/indent-string-1.2.1.tgz"; + name = "indent-string-1.2.1.tgz"; + sha1 = "294c5930792f8bb5b14462a4aa425b94f07d3a56"; }; deps = { - "get-stdin-3.0.2" = self.by-version."get-stdin"."3.0.2"; + "get-stdin-4.0.1" = self.by-version."get-stdin"."4.0.1"; "minimist-1.1.0" = self.by-version."minimist"."1.1.0"; - "repeating-1.1.1" = self.by-version."repeating"."1.1.1"; + "repeating-1.1.2" = self.by-version."repeating"."1.1.2"; }; peerDependencies = []; }; @@ -12952,6 +13403,20 @@ }; peerDependencies = []; }; + by-spec."infinity-agent"."^1.0.0" = + self.by-version."infinity-agent"."1.0.2"; + by-version."infinity-agent"."1.0.2" = self.buildNodePackage { + name = "infinity-agent-1.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/infinity-agent/-/infinity-agent-1.0.2.tgz"; + name = "infinity-agent-1.0.2.tgz"; + sha1 = "2e9da2c070b9864a8bc66c0194e1791ed8058025"; + }; + deps = { + }; + peerDependencies = []; + }; by-spec."inflection"."~1.3.0" = self.by-version."inflection"."1.3.8"; by-version."inflection"."1.3.8" = self.buildNodePackage { @@ -13043,23 +13508,23 @@ by-spec."inherits"."~2.0.1" = self.by-version."inherits"."2.0.1"; by-spec."ini"."1" = - self.by-version."ini"."1.3.2"; - by-version."ini"."1.3.2" = self.buildNodePackage { - name = "ini-1.3.2"; + self.by-version."ini"."1.3.3"; + by-version."ini"."1.3.3" = self.buildNodePackage { + name = "ini-1.3.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/ini/-/ini-1.3.2.tgz"; - name = "ini-1.3.2.tgz"; - sha1 = "9ebf4a44daf9d89acd07aab9f89a083d887f6dec"; + url = "http://registry.npmjs.org/ini/-/ini-1.3.3.tgz"; + name = "ini-1.3.3.tgz"; + sha1 = "c07e34aef1de06aff21d413b458e52b21533a11e"; }; deps = { }; peerDependencies = []; }; by-spec."ini"."1.x.x" = - self.by-version."ini"."1.3.2"; + self.by-version."ini"."1.3.3"; by-spec."ini"."^1.2.0" = - self.by-version."ini"."1.3.2"; + self.by-version."ini"."1.3.3"; by-spec."ini"."~1.1.0" = self.by-version."ini"."1.1.0"; by-version."ini"."1.1.0" = self.buildNodePackage { @@ -13089,9 +13554,9 @@ peerDependencies = []; }; by-spec."ini"."~1.3.0" = - self.by-version."ini"."1.3.2"; - by-spec."ini"."~1.3.2" = - self.by-version."ini"."1.3.2"; + self.by-version."ini"."1.3.3"; + by-spec."ini"."~1.3.3" = + self.by-version."ini"."1.3.3"; by-spec."init-package-json"."~1.0.0" = self.by-version."init-package-json"."1.0.1"; by-version."init-package-json"."1.0.1" = self.buildNodePackage { @@ -13103,30 +13568,11 @@ sha1 = "c01b08cc90504ebc448d57b468e66fc08293e8a8"; }; deps = { - "glob-4.3.5" = self.by-version."glob"."4.3.5"; + "glob-4.4.0" = self.by-version."glob"."4.4.0"; "promzard-0.2.2" = self.by-version."promzard"."0.2.2"; "read-1.0.5" = self.by-version."read"."1.0.5"; - "read-package-json-1.2.7" = self.by-version."read-package-json"."1.2.7"; - "semver-4.2.0" = self.by-version."semver"."4.2.0"; - }; - peerDependencies = []; - }; - by-spec."init-package-json"."~1.1.3" = - self.by-version."init-package-json"."1.1.3"; - by-version."init-package-json"."1.1.3" = self.buildNodePackage { - name = "init-package-json-1.1.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/init-package-json/-/init-package-json-1.1.3.tgz"; - name = "init-package-json-1.1.3.tgz"; - sha1 = "1d633c151a4909891afc8ee13cace8b336c0c9c2"; - }; - deps = { - "glob-4.3.5" = self.by-version."glob"."4.3.5"; - "promzard-0.2.2" = self.by-version."promzard"."0.2.2"; - "read-1.0.5" = self.by-version."read"."1.0.5"; - "read-package-json-1.2.7" = self.by-version."read-package-json"."1.2.7"; - "semver-4.2.0" = self.by-version."semver"."4.2.0"; + "read-package-json-1.3.1" = self.by-version."read-package-json"."1.3.1"; + "semver-4.3.0" = self.by-version."semver"."4.3.0"; }; peerDependencies = []; }; @@ -13141,11 +13587,11 @@ sha1 = "b9f027514403b3b3f582c148592ab75214003348"; }; deps = { - "glob-4.3.5" = self.by-version."glob"."4.3.5"; + "glob-4.4.0" = self.by-version."glob"."4.4.0"; "promzard-0.2.2" = self.by-version."promzard"."0.2.2"; "read-1.0.5" = self.by-version."read"."1.0.5"; - "read-package-json-1.2.7" = self.by-version."read-package-json"."1.2.7"; - "semver-4.2.0" = self.by-version."semver"."4.2.0"; + "read-package-json-1.3.1" = self.by-version."read-package-json"."1.3.1"; + "semver-4.3.0" = self.by-version."semver"."4.3.0"; }; peerDependencies = []; }; @@ -13181,7 +13627,7 @@ "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; "mute-stream-0.0.4" = self.by-version."mute-stream"."0.0.4"; "readline2-0.1.1" = self.by-version."readline2"."0.1.1"; - "rx-2.3.24" = self.by-version."rx"."2.3.24"; + "rx-2.3.25" = self.by-version."rx"."2.3.25"; "through-2.3.6" = self.by-version."through"."2.3.6"; }; peerDependencies = []; @@ -13204,7 +13650,7 @@ "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; "mute-stream-0.0.4" = self.by-version."mute-stream"."0.0.4"; "readline2-0.1.1" = self.by-version."readline2"."0.1.1"; - "rx-2.3.24" = self.by-version."rx"."2.3.24"; + "rx-2.3.25" = self.by-version."rx"."2.3.25"; "through-2.3.6" = self.by-version."through"."2.3.6"; }; peerDependencies = []; @@ -13225,7 +13671,7 @@ "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; "mute-stream-0.0.4" = self.by-version."mute-stream"."0.0.4"; "readline2-0.1.1" = self.by-version."readline2"."0.1.1"; - "rx-2.3.24" = self.by-version."rx"."2.3.24"; + "rx-2.3.25" = self.by-version."rx"."2.3.25"; "through-2.3.6" = self.by-version."through"."2.3.6"; }; peerDependencies = []; @@ -13312,8 +13758,8 @@ "inquirer-0.6.0" = self.by-version."inquirer"."0.6.0"; "lodash.debounce-2.4.1" = self.by-version."lodash.debounce"."2.4.1"; "object-assign-1.0.0" = self.by-version."object-assign"."1.0.0"; - "os-name-1.0.2" = self.by-version."os-name"."1.0.2"; - "request-2.51.0" = self.by-version."request"."2.51.0"; + "os-name-1.0.3" = self.by-version."os-name"."1.0.3"; + "request-2.53.0" = self.by-version."request"."2.53.0"; "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1"; }; peerDependencies = []; @@ -13389,14 +13835,14 @@ peerDependencies = []; }; by-spec."ip-regex"."^1.0.0" = - self.by-version."ip-regex"."1.0.2"; - by-version."ip-regex"."1.0.2" = self.buildNodePackage { - name = "ip-regex-1.0.2"; + self.by-version."ip-regex"."1.0.3"; + by-version."ip-regex"."1.0.3" = self.buildNodePackage { + name = "ip-regex-1.0.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/ip-regex/-/ip-regex-1.0.2.tgz"; - name = "ip-regex-1.0.2.tgz"; - sha1 = "1e7daad2c2d0c268729ecca91f8ec463ad58f56b"; + url = "http://registry.npmjs.org/ip-regex/-/ip-regex-1.0.3.tgz"; + name = "ip-regex-1.0.3.tgz"; + sha1 = "dc589076f659f419c222039a33316f1c7387effd"; }; deps = { }; @@ -13431,28 +13877,28 @@ }; peerDependencies = []; }; - by-spec."ipaddr.js"."0.1.6" = - self.by-version."ipaddr.js"."0.1.6"; - by-version."ipaddr.js"."0.1.6" = self.buildNodePackage { - name = "ipaddr.js-0.1.6"; + by-spec."ipaddr.js"."0.1.8" = + self.by-version."ipaddr.js"."0.1.8"; + by-version."ipaddr.js"."0.1.8" = self.buildNodePackage { + name = "ipaddr.js-0.1.8"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.6.tgz"; - name = "ipaddr.js-0.1.6.tgz"; - sha1 = "8f0530b217993873025fd4b72bdfd69bc56a9a12"; + url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.8.tgz"; + name = "ipaddr.js-0.1.8.tgz"; + sha1 = "27442eda77b626c44724b4aa8a1867e8410579ee"; }; deps = { }; peerDependencies = []; }; by-spec."ipaddr.js".">= 0.1.1" = - self.by-version."ipaddr.js"."0.1.6"; + self.by-version."ipaddr.js"."0.1.8"; by-spec."ipaddr.js".">= 0.1.5" = - self.by-version."ipaddr.js"."0.1.6"; + self.by-version."ipaddr.js"."0.1.8"; by-spec."ipaddr.js".">=0.1.2" = - self.by-version."ipaddr.js"."0.1.6"; + self.by-version."ipaddr.js"."0.1.8"; by-spec."ipaddr.js"."^0.1.5" = - self.by-version."ipaddr.js"."0.1.6"; + self.by-version."ipaddr.js"."0.1.8"; by-spec."ironhorse"."*" = self.by-version."ironhorse"."0.0.10"; by-version."ironhorse"."0.0.10" = self.buildNodePackage { @@ -13465,21 +13911,21 @@ }; deps = { "underscore-1.5.2" = self.by-version."underscore"."1.5.2"; - "winston-0.8.3" = self.by-version."winston"."0.8.3"; + "winston-0.9.0" = self.by-version."winston"."0.9.0"; "nconf-0.7.1" = self.by-version."nconf"."0.7.1"; "fs-walk-0.0.1" = self.by-version."fs-walk"."0.0.1"; "async-0.9.0" = self.by-version."async"."0.9.0"; "express-5.0.0-alpha.1" = self.by-version."express"."5.0.0-alpha.1"; - "jade-1.9.1" = self.by-version."jade"."1.9.1"; + "jade-1.9.2" = self.by-version."jade"."1.9.2"; "passport-0.2.1" = self.by-version."passport"."0.2.1"; "passport-http-0.2.2" = self.by-version."passport-http"."0.2.2"; - "js-yaml-3.2.5" = self.by-version."js-yaml"."3.2.5"; - "mongoose-3.8.22" = self.by-version."mongoose"."3.8.22"; - "gridfs-stream-0.5.3" = self.by-version."gridfs-stream"."0.5.3"; + "js-yaml-3.2.6" = self.by-version."js-yaml"."3.2.6"; + "mongoose-3.8.23" = self.by-version."mongoose"."3.8.23"; + "gridfs-stream-1.0.1" = self.by-version."gridfs-stream"."1.0.1"; "temp-0.8.1" = self.by-version."temp"."0.8.1"; "kue-0.8.11" = self.by-version."kue"."0.8.11"; "redis-0.12.1" = self.by-version."redis"."0.12.1"; - "hiredis-0.1.17" = self.by-version."hiredis"."0.1.17"; + "hiredis-0.2.0" = self.by-version."hiredis"."0.2.0"; }; peerDependencies = []; }; @@ -13498,6 +13944,21 @@ }; peerDependencies = []; }; + by-spec."is-binary-path"."^1.0.0" = + self.by-version."is-binary-path"."1.0.0"; + by-version."is-binary-path"."1.0.0" = self.buildNodePackage { + name = "is-binary-path-1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.0.tgz"; + name = "is-binary-path-1.0.0.tgz"; + sha1 = "51a9ab34cc239e8e97d1cb1c874faf25d79d54e5"; + }; + deps = { + "binary-extensions-1.3.0" = self.by-version."binary-extensions"."1.3.0"; + }; + peerDependencies = []; + }; by-spec."is-finite"."^1.0.0" = self.by-version."is-finite"."1.0.0"; by-version."is-finite"."1.0.0" = self.buildNodePackage { @@ -13537,7 +13998,7 @@ sha1 = "2bb6959f797ccd6f9fdc812758bcbc87c4c59074"; }; deps = { - "ip-regex-1.0.2" = self.by-version."ip-regex"."1.0.2"; + "ip-regex-1.0.3" = self.by-version."ip-regex"."1.0.3"; }; peerDependencies = []; }; @@ -13583,6 +14044,20 @@ }; peerDependencies = []; }; + by-spec."is-stream"."^1.0.0" = + self.by-version."is-stream"."1.0.1"; + by-version."is-stream"."1.0.1" = self.buildNodePackage { + name = "is-stream-1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/is-stream/-/is-stream-1.0.1.tgz"; + name = "is-stream-1.0.1.tgz"; + sha1 = "b44ce45b1f0c3df583f6b5debf84dcf9743ac8b5"; + }; + deps = { + }; + peerDependencies = []; + }; by-spec."is-utf8"."^0.2.0" = self.by-version."is-utf8"."0.2.0"; by-version."is-utf8"."0.2.0" = self.buildNodePackage { @@ -13627,6 +14102,8 @@ }; peerDependencies = []; }; + by-spec."isstream"."~0.1.1" = + self.by-version."isstream"."0.1.1"; by-spec."istanbul"."*" = self.by-version."istanbul"."0.3.5"; by-version."istanbul"."0.3.5" = self.buildNodePackage { @@ -13638,7 +14115,7 @@ sha1 = "ef9ca4c1d5e6a5deac2245842051b59763a2de37"; }; deps = { - "esprima-1.2.3" = self.by-version."esprima"."1.2.3"; + "esprima-1.2.4" = self.by-version."esprima"."1.2.4"; "escodegen-1.3.3" = self.by-version."escodegen"."1.3.3"; "handlebars-1.3.0" = self.by-version."handlebars"."1.3.0"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; @@ -13649,7 +14126,7 @@ "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5"; "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2"; "resolve-0.7.4" = self.by-version."resolve"."0.7.4"; - "js-yaml-3.2.5" = self.by-version."js-yaml"."3.2.5"; + "js-yaml-3.2.6" = self.by-version."js-yaml"."3.2.6"; "once-1.3.1" = self.by-version."once"."1.3.1"; }; peerDependencies = []; @@ -13660,28 +14137,27 @@ by-spec."istanbul"."~0.3.2" = self.by-version."istanbul"."0.3.5"; by-spec."jade"."*" = - self.by-version."jade"."1.9.1"; - by-version."jade"."1.9.1" = self.buildNodePackage { - name = "jade-1.9.1"; + self.by-version."jade"."1.9.2"; + by-version."jade"."1.9.2" = self.buildNodePackage { + name = "jade-1.9.2"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/jade/-/jade-1.9.1.tgz"; - name = "jade-1.9.1.tgz"; - sha1 = "5cf8da5b1edb6973dc26d6d9245d0e8ba005cd26"; + url = "http://registry.npmjs.org/jade/-/jade-1.9.2.tgz"; + name = "jade-1.9.2.tgz"; + sha1 = "0b89f9c60d4ead2738e826ba7b2ccac9a5702abe"; }; deps = { "character-parser-1.2.1" = self.by-version."character-parser"."1.2.1"; "commander-2.6.0" = self.by-version."commander"."2.6.0"; "constantinople-3.0.1" = self.by-version."constantinople"."3.0.1"; - "coveralls-2.11.2" = self.by-version."coveralls"."2.11.2"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "transformers-2.1.0" = self.by-version."transformers"."2.1.0"; - "void-elements-1.0.0" = self.by-version."void-elements"."1.0.0"; - "with-4.0.0" = self.by-version."with"."4.0.0"; + "void-elements-2.0.1" = self.by-version."void-elements"."2.0.1"; + "with-4.0.1" = self.by-version."with"."4.0.1"; }; peerDependencies = []; }; - "jade" = self.by-version."jade"."1.9.1"; + "jade" = self.by-version."jade"."1.9.2"; by-spec."jade"."0.26.3" = self.by-version."jade"."0.26.3"; by-version."jade"."0.26.3" = self.buildNodePackage { @@ -13736,7 +14212,7 @@ peerDependencies = []; }; by-spec."jade".">= 0.0.1" = - self.by-version."jade"."1.9.1"; + self.by-version."jade"."1.9.2"; by-spec."jade"."~0.35.0" = self.by-version."jade"."0.35.0"; by-version."jade"."0.35.0" = self.buildNodePackage { @@ -13808,14 +14284,14 @@ peerDependencies = []; }; by-spec."js-yaml"."*" = - self.by-version."js-yaml"."3.2.5"; - by-version."js-yaml"."3.2.5" = self.buildNodePackage { - name = "js-yaml-3.2.5"; + self.by-version."js-yaml"."3.2.6"; + by-version."js-yaml"."3.2.6" = self.buildNodePackage { + name = "js-yaml-3.2.6"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.2.5.tgz"; - name = "js-yaml-3.2.5.tgz"; - sha1 = "c29ee9a9e503e7ab83f071ccacdd0dac25ff9e22"; + url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.2.6.tgz"; + name = "js-yaml-3.2.6.tgz"; + sha1 = "dde1ffbe2726e3fff97efb65fd02dbd6647b8309"; }; deps = { "argparse-0.1.16" = self.by-version."argparse"."0.1.16"; @@ -13823,7 +14299,7 @@ }; peerDependencies = []; }; - "js-yaml" = self.by-version."js-yaml"."3.2.5"; + "js-yaml" = self.by-version."js-yaml"."3.2.6"; by-spec."js-yaml"."0.3.x" = self.by-version."js-yaml"."0.3.7"; by-version."js-yaml"."0.3.7" = self.buildNodePackage { @@ -13871,9 +14347,9 @@ peerDependencies = []; }; by-spec."js-yaml"."3.x" = - self.by-version."js-yaml"."3.2.5"; + self.by-version."js-yaml"."3.2.6"; by-spec."js-yaml"."^3.1.0" = - self.by-version."js-yaml"."3.2.5"; + self.by-version."js-yaml"."3.2.6"; by-spec."js-yaml"."~2.0.5" = self.by-version."js-yaml"."2.0.5"; by-version."js-yaml"."2.0.5" = self.buildNodePackage { @@ -13903,11 +14379,11 @@ deps = { "htmlparser2-3.8.2" = self.by-version."htmlparser2"."3.8.2"; "nwmatcher-1.3.4" = self.by-version."nwmatcher"."1.3.4"; - "request-2.51.0" = self.by-version."request"."2.51.0"; + "request-2.53.0" = self.by-version."request"."2.53.0"; "xmlhttprequest-1.7.0" = self.by-version."xmlhttprequest"."1.7.0"; "cssom-0.3.0" = self.by-version."cssom"."0.3.0"; "cssstyle-0.2.22" = self.by-version."cssstyle"."0.2.22"; - "contextify-0.1.11" = self.by-version."contextify"."0.1.11"; + "contextify-0.1.13" = self.by-version."contextify"."0.1.13"; }; peerDependencies = []; }; @@ -13924,11 +14400,11 @@ deps = { "htmlparser2-3.8.2" = self.by-version."htmlparser2"."3.8.2"; "nwmatcher-1.3.4" = self.by-version."nwmatcher"."1.3.4"; - "request-2.51.0" = self.by-version."request"."2.51.0"; + "request-2.53.0" = self.by-version."request"."2.53.0"; "xmlhttprequest-1.7.0" = self.by-version."xmlhttprequest"."1.7.0"; "cssom-0.3.0" = self.by-version."cssom"."0.3.0"; "cssstyle-0.2.22" = self.by-version."cssstyle"."0.2.22"; - "contextify-0.1.11" = self.by-version."contextify"."0.1.11"; + "contextify-0.1.13" = self.by-version."contextify"."0.1.13"; }; peerDependencies = []; }; @@ -13945,11 +14421,11 @@ deps = { "htmlparser2-3.8.2" = self.by-version."htmlparser2"."3.8.2"; "nwmatcher-1.3.4" = self.by-version."nwmatcher"."1.3.4"; - "request-2.51.0" = self.by-version."request"."2.51.0"; + "request-2.53.0" = self.by-version."request"."2.53.0"; "xmlhttprequest-1.7.0" = self.by-version."xmlhttprequest"."1.7.0"; "cssom-0.3.0" = self.by-version."cssom"."0.3.0"; "cssstyle-0.2.22" = self.by-version."cssstyle"."0.2.22"; - "contextify-0.1.11" = self.by-version."contextify"."0.1.11"; + "contextify-0.1.13" = self.by-version."contextify"."0.1.13"; }; peerDependencies = []; }; @@ -14242,19 +14718,19 @@ }; peerDependencies = []; }; - by-spec."jstransform"."^8.0.0" = - self.by-version."jstransform"."8.2.0"; - by-version."jstransform"."8.2.0" = self.buildNodePackage { - name = "jstransform-8.2.0"; + by-spec."jstransform"."^9.1.0" = + self.by-version."jstransform"."9.1.0"; + by-version."jstransform"."9.1.0" = self.buildNodePackage { + name = "jstransform-9.1.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/jstransform/-/jstransform-8.2.0.tgz"; - name = "jstransform-8.2.0.tgz"; - sha1 = "e43f697f7cc01a1e7c827dd9df5a79d29d0c50bb"; + url = "http://registry.npmjs.org/jstransform/-/jstransform-9.1.0.tgz"; + name = "jstransform-9.1.0.tgz"; + sha1 = "7b3903a1ba4aab972daa0540a4131c5386ad90dd"; }; deps = { "base62-0.1.1" = self.by-version."base62"."0.1.1"; - "esprima-fb-8001.1001.0-dev-harmony-fb" = self.by-version."esprima-fb"."8001.1001.0-dev-harmony-fb"; + "esprima-fb-12001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."12001.1.0-dev-harmony-fb"; "source-map-0.1.31" = self.by-version."source-map"."0.1.31"; }; peerDependencies = []; @@ -14376,7 +14852,7 @@ deps = { "di-0.0.1" = self.by-version."di"."0.0.1"; "socket.io-0.9.16" = self.by-version."socket.io"."0.9.16"; - "chokidar-1.0.0-rc2" = self.by-version."chokidar"."1.0.0-rc2"; + "chokidar-1.0.0-rc3" = self.by-version."chokidar"."1.0.0-rc3"; "glob-3.2.11" = self.by-version."glob"."3.2.11"; "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14"; "http-proxy-0.10.4" = self.by-version."http-proxy"."0.10.4"; @@ -14489,7 +14965,7 @@ }; peerDependencies = [ self.by-version."karma"."0.12.31" - self.by-version."requirejs"."2.1.15"]; + self.by-version."requirejs"."2.1.16"]; }; "karma-requirejs" = self.by-version."karma-requirejs"."0.2.2"; by-spec."karma-sauce-launcher"."*" = @@ -14587,18 +15063,18 @@ }; peerDependencies = []; }; - by-spec."kerberos"."0.0.8" = - self.by-version."kerberos"."0.0.8"; - by-version."kerberos"."0.0.8" = self.buildNodePackage { - name = "kerberos-0.0.8"; + by-spec."kerberos"."0.0.9" = + self.by-version."kerberos"."0.0.9"; + by-version."kerberos"."0.0.9" = self.buildNodePackage { + name = "kerberos-0.0.9"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/kerberos/-/kerberos-0.0.8.tgz"; - name = "kerberos-0.0.8.tgz"; - sha1 = "5685e97a412c5dc6c6fc7b087feb4e59acfb7755"; + url = "http://registry.npmjs.org/kerberos/-/kerberos-0.0.9.tgz"; + name = "kerberos-0.0.9.tgz"; + sha1 = "595bf97e7e8aae5401ae313aea57bbf402e799c5"; }; deps = { - "nan-1.5.1" = self.by-version."nan"."1.5.1"; + "nan-1.6.2" = self.by-version."nan"."1.6.2"; }; peerDependencies = []; }; @@ -14699,11 +15175,11 @@ sha256 = "dd2e42da959c359bf48d16993c6caf1d810241f7f37dfa4da911dd284571236f"; }; deps = { - "express-3.19.1" = self.by-version."express"."3.19.1"; + "express-3.19.2" = self.by-version."express"."3.19.2"; "passport-0.2.1" = self.by-version."passport"."0.2.1"; "passport-google-oauth-0.1.5" = self.by-version."passport-google-oauth"."0.1.5"; "connect-restreamer-1.0.1" = self.by-version."connect-restreamer"."1.0.1"; - "xml2js-0.4.4" = self.by-version."xml2js"."0.4.4"; + "xml2js-0.4.5" = self.by-version."xml2js"."0.4.5"; }; peerDependencies = []; }; @@ -14733,8 +15209,8 @@ sha1 = "3736593669e24f024fdaf723b6a1dc4afd839a71"; }; deps = { - "mime-1.2.11" = self.by-version."mime"."1.2.11"; - "xml2js-0.4.4" = self.by-version."xml2js"."0.4.4"; + "mime-1.3.4" = self.by-version."mime"."1.3.4"; + "xml2js-0.4.5" = self.by-version."xml2js"."0.4.5"; "debug-1.0.4" = self.by-version."debug"."1.0.4"; "stream-counter-1.0.0" = self.by-version."stream-counter"."1.0.0"; "once-1.3.1" = self.by-version."once"."1.3.1"; @@ -14808,7 +15284,7 @@ sha1 = "84f40e5c90745c7e4f7811624d6152c381d931d9"; }; deps = { - "package-json-1.0.1" = self.by-version."package-json"."1.0.1"; + "package-json-1.0.2" = self.by-version."package-json"."1.0.2"; }; peerDependencies = []; }; @@ -14856,14 +15332,14 @@ peerDependencies = []; }; by-spec."lcov-result-merger"."*" = - self.by-version."lcov-result-merger"."1.0.1"; - by-version."lcov-result-merger"."1.0.1" = self.buildNodePackage { - name = "lcov-result-merger-1.0.1"; + self.by-version."lcov-result-merger"."1.0.2"; + by-version."lcov-result-merger"."1.0.2" = self.buildNodePackage { + name = "lcov-result-merger-1.0.2"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/lcov-result-merger/-/lcov-result-merger-1.0.1.tgz"; - name = "lcov-result-merger-1.0.1.tgz"; - sha1 = "8e6bd23b8e600e1495032a928e8a705f1d0276d4"; + url = "http://registry.npmjs.org/lcov-result-merger/-/lcov-result-merger-1.0.2.tgz"; + name = "lcov-result-merger-1.0.2.tgz"; + sha1 = "a7a1cf861daf32deb39949c2eee8c9a9ed475c18"; }; deps = { "through2-0.6.3" = self.by-version."through2"."0.6.3"; @@ -14872,7 +15348,7 @@ }; peerDependencies = []; }; - "lcov-result-merger" = self.by-version."lcov-result-merger"."1.0.1"; + "lcov-result-merger" = self.by-version."lcov-result-merger"."1.0.2"; by-spec."ldapjs"."^0.7.1" = self.by-version."ldapjs"."0.7.1"; by-version."ldapjs"."0.7.1" = self.buildNodePackage { @@ -14894,29 +15370,30 @@ peerDependencies = []; }; by-spec."less"."*" = - self.by-version."less"."2.2.0"; - by-version."less"."2.2.0" = self.buildNodePackage { - name = "less-2.2.0"; + self.by-version."less"."2.4.0"; + by-version."less"."2.4.0" = self.buildNodePackage { + name = "less-2.4.0"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/less/-/less-2.2.0.tgz"; - name = "less-2.2.0.tgz"; - sha1 = "86eec2cad0e4c2a979929292d15750394056a7af"; + url = "http://registry.npmjs.org/less/-/less-2.4.0.tgz"; + name = "less-2.4.0.tgz"; + sha1 = "ce51b38f1c05a0cdd47982fac40dd0a39cec2031"; }; deps = { + "errno-0.1.1" = self.by-version."errno"."0.1.1"; "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; - "mime-1.2.11" = self.by-version."mime"."1.2.11"; - "request-2.51.0" = self.by-version."request"."2.51.0"; - "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; - "source-map-0.1.43" = self.by-version."source-map"."0.1.43"; - "promise-6.1.0" = self.by-version."promise"."6.1.0"; "image-size-0.3.5" = self.by-version."image-size"."0.3.5"; + "mime-1.3.4" = self.by-version."mime"."1.3.4"; + "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; + "promise-6.1.0" = self.by-version."promise"."6.1.0"; + "request-2.53.0" = self.by-version."request"."2.53.0"; + "source-map-0.2.0" = self.by-version."source-map"."0.2.0"; }; peerDependencies = []; }; - "less" = self.by-version."less"."2.2.0"; + "less" = self.by-version."less"."2.4.0"; by-spec."less"."^2.1.0" = - self.by-version."less"."2.2.0"; + self.by-version."less"."2.4.0"; by-spec."levn"."~0.2.5" = self.by-version."levn"."0.2.5"; by-version."levn"."0.2.5" = self.buildNodePackage { @@ -15009,22 +15486,22 @@ peerDependencies = []; }; "libyaml" = self.by-version."libyaml"."0.2.5"; - by-spec."liftoff"."^0.13.2" = - self.by-version."liftoff"."0.13.6"; - by-version."liftoff"."0.13.6" = self.buildNodePackage { - name = "liftoff-0.13.6"; + by-spec."liftoff"."^2.0.1" = + self.by-version."liftoff"."2.0.1"; + by-version."liftoff"."2.0.1" = self.buildNodePackage { + name = "liftoff-2.0.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/liftoff/-/liftoff-0.13.6.tgz"; - name = "liftoff-0.13.6.tgz"; - sha1 = "600e8966b92d1e0150eab5b577652569f4c7d1d8"; + url = "http://registry.npmjs.org/liftoff/-/liftoff-2.0.1.tgz"; + name = "liftoff-2.0.1.tgz"; + sha1 = "caa1ebe02fe5dc81660e50f7896173ea88908abe"; }; deps = { - "findup-sync-0.1.3" = self.by-version."findup-sync"."0.1.3"; - "resolve-1.0.0" = self.by-version."resolve"."1.0.0"; - "minimist-1.1.0" = self.by-version."minimist"."1.1.0"; "extend-1.3.0" = self.by-version."extend"."1.3.0"; + "findup-sync-0.2.1" = self.by-version."findup-sync"."0.2.1"; "flagged-respawn-0.3.1" = self.by-version."flagged-respawn"."0.3.1"; + "minimist-1.1.0" = self.by-version."minimist"."1.1.0"; + "resolve-1.0.0" = self.by-version."resolve"."1.0.0"; }; peerDependencies = []; }; @@ -15043,6 +15520,20 @@ peerDependencies = []; }; by-spec."lodash"."*" = + self.by-version."lodash"."3.2.0"; + by-version."lodash"."3.2.0" = self.buildNodePackage { + name = "lodash-3.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/lodash/-/lodash-3.2.0.tgz"; + name = "lodash-3.2.0.tgz"; + sha1 = "4bf50a3243f9aeb0bac41a55d3d5990675a462fb"; + }; + deps = { + }; + peerDependencies = []; + }; + by-spec."lodash"."2.4.1" = self.by-version."lodash"."2.4.1"; by-version."lodash"."2.4.1" = self.buildNodePackage { name = "lodash-2.4.1"; @@ -15056,12 +15547,12 @@ }; peerDependencies = []; }; - by-spec."lodash"."2.4.1" = - self.by-version."lodash"."2.4.1"; by-spec."lodash".">=2.4.1" = - self.by-version."lodash"."2.4.1"; + self.by-version."lodash"."3.2.0"; by-spec."lodash"."^2.4.1" = self.by-version."lodash"."2.4.1"; + by-spec."lodash"."^3.2.0" = + self.by-version."lodash"."3.2.0"; by-spec."lodash"."~0.9.2" = self.by-version."lodash"."0.9.2"; by-version."lodash"."0.9.2" = self.buildNodePackage { @@ -15106,6 +15597,8 @@ }; by-spec."lodash"."~2.4.1" = self.by-version."lodash"."2.4.1"; + by-spec."lodash"."~3.2.0" = + self.by-version."lodash"."3.2.0"; by-spec."lodash-deep"."^1.1.0" = self.by-version."lodash-deep"."1.5.3"; by-version."lodash-deep"."1.5.3" = self.buildNodePackage { @@ -15117,7 +15610,7 @@ sha1 = "eeddfdd937ed24c2c903fc242cb15a26362321d2"; }; deps = { - "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; + "lodash-3.2.0" = self.by-version."lodash"."3.2.0"; }; peerDependencies = []; }; @@ -15135,44 +15628,86 @@ }; peerDependencies = []; }; - by-spec."lodash._escapehtmlchar"."~2.4.1" = - self.by-version."lodash._escapehtmlchar"."2.4.1"; - by-version."lodash._escapehtmlchar"."2.4.1" = self.buildNodePackage { - name = "lodash._escapehtmlchar-2.4.1"; + by-spec."lodash._basecopy"."^3.0.0" = + self.by-version."lodash._basecopy"."3.0.0"; + by-version."lodash._basecopy"."3.0.0" = self.buildNodePackage { + name = "lodash._basecopy-3.0.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/lodash._escapehtmlchar/-/lodash._escapehtmlchar-2.4.1.tgz"; - name = "lodash._escapehtmlchar-2.4.1.tgz"; - sha1 = "df67c3bb6b7e8e1e831ab48bfa0795b92afe899d"; - }; - deps = { - "lodash._htmlescapes-2.4.1" = self.by-version."lodash._htmlescapes"."2.4.1"; - }; - peerDependencies = []; - }; - by-spec."lodash._escapestringchar"."~2.4.1" = - self.by-version."lodash._escapestringchar"."2.4.1"; - by-version."lodash._escapestringchar"."2.4.1" = self.buildNodePackage { - name = "lodash._escapestringchar-2.4.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/lodash._escapestringchar/-/lodash._escapestringchar-2.4.1.tgz"; - name = "lodash._escapestringchar-2.4.1.tgz"; - sha1 = "ecfe22618a2ade50bfeea43937e51df66f0edb72"; + url = "http://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.0.tgz"; + name = "lodash._basecopy-3.0.0.tgz"; + sha1 = "4e9d01a982cf7f2bac7ba5adb85bb3ae069cb8e6"; }; deps = { }; peerDependencies = []; }; - by-spec."lodash._htmlescapes"."~2.4.1" = - self.by-version."lodash._htmlescapes"."2.4.1"; - by-version."lodash._htmlescapes"."2.4.1" = self.buildNodePackage { - name = "lodash._htmlescapes-2.4.1"; + by-spec."lodash._baseslice"."^3.0.0" = + self.by-version."lodash._baseslice"."3.0.1"; + by-version."lodash._baseslice"."3.0.1" = self.buildNodePackage { + name = "lodash._baseslice-3.0.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz"; - name = "lodash._htmlescapes-2.4.1.tgz"; - sha1 = "32d14bf0844b6de6f8b62a051b4f67c228b624cb"; + url = "http://registry.npmjs.org/lodash._baseslice/-/lodash._baseslice-3.0.1.tgz"; + name = "lodash._baseslice-3.0.1.tgz"; + sha1 = "79c9a951f4b5a90f45f28a51664ab6532395e2f6"; + }; + deps = { + }; + peerDependencies = []; + }; + by-spec."lodash._basetostring"."^3.0.0" = + self.by-version."lodash._basetostring"."3.0.0"; + by-version."lodash._basetostring"."3.0.0" = self.buildNodePackage { + name = "lodash._basetostring-3.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz"; + name = "lodash._basetostring-3.0.0.tgz"; + sha1 = "75a9a4aaaa2b2a8761111ff5431e7d83c1daf0e2"; + }; + deps = { + }; + peerDependencies = []; + }; + by-spec."lodash._basevalues"."^3.0.0" = + self.by-version."lodash._basevalues"."3.0.0"; + by-version."lodash._basevalues"."3.0.0" = self.buildNodePackage { + name = "lodash._basevalues-3.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz"; + name = "lodash._basevalues-3.0.0.tgz"; + sha1 = "5b775762802bde3d3297503e26300820fdf661b7"; + }; + deps = { + }; + peerDependencies = []; + }; + by-spec."lodash._createpad"."^3.0.0" = + self.by-version."lodash._createpad"."3.0.1"; + by-version."lodash._createpad"."3.0.1" = self.buildNodePackage { + name = "lodash._createpad-3.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/lodash._createpad/-/lodash._createpad-3.0.1.tgz"; + name = "lodash._createpad-3.0.1.tgz"; + sha1 = "90c6bdbc84c48edfa026896e31856b1a0ec50842"; + }; + deps = { + "lodash.repeat-3.0.0" = self.by-version."lodash.repeat"."3.0.0"; + }; + peerDependencies = []; + }; + by-spec."lodash._isiterateecall"."^3.0.0" = + self.by-version."lodash._isiterateecall"."3.0.1"; + by-version."lodash._isiterateecall"."3.0.1" = self.buildNodePackage { + name = "lodash._isiterateecall-3.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.1.tgz"; + name = "lodash._isiterateecall-3.0.1.tgz"; + sha1 = "3fb3284b7702ac22cb7d902c00a6fc26a3cd90e5"; }; deps = { }; @@ -15206,50 +15741,45 @@ }; peerDependencies = []; }; - by-spec."lodash._reinterpolate"."^2.4.1" = - self.by-version."lodash._reinterpolate"."2.4.1"; - by-version."lodash._reinterpolate"."2.4.1" = self.buildNodePackage { - name = "lodash._reinterpolate-2.4.1"; + by-spec."lodash._reescape"."^3.0.0" = + self.by-version."lodash._reescape"."3.0.0"; + by-version."lodash._reescape"."3.0.0" = self.buildNodePackage { + name = "lodash._reescape-3.0.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-2.4.1.tgz"; - name = "lodash._reinterpolate-2.4.1.tgz"; - sha1 = "4f1227aa5a8711fc632f5b07a1f4607aab8b3222"; + url = "http://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz"; + name = "lodash._reescape-3.0.0.tgz"; + sha1 = "2b1d6f5dfe07c8a355753e5f27fac7f1cde1616a"; }; deps = { }; peerDependencies = []; }; - by-spec."lodash._reinterpolate"."~2.4.1" = - self.by-version."lodash._reinterpolate"."2.4.1"; - by-spec."lodash._reunescapedhtml"."~2.4.1" = - self.by-version."lodash._reunescapedhtml"."2.4.1"; - by-version."lodash._reunescapedhtml"."2.4.1" = self.buildNodePackage { - name = "lodash._reunescapedhtml-2.4.1"; + by-spec."lodash._reevaluate"."^3.0.0" = + self.by-version."lodash._reevaluate"."3.0.0"; + by-version."lodash._reevaluate"."3.0.0" = self.buildNodePackage { + name = "lodash._reevaluate-3.0.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/lodash._reunescapedhtml/-/lodash._reunescapedhtml-2.4.1.tgz"; - name = "lodash._reunescapedhtml-2.4.1.tgz"; - sha1 = "747c4fc40103eb3bb8a0976e571f7a2659e93ba7"; + url = "http://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz"; + name = "lodash._reevaluate-3.0.0.tgz"; + sha1 = "58bc74c40664953ae0b124d806996daca431e2ed"; }; deps = { - "lodash._htmlescapes-2.4.1" = self.by-version."lodash._htmlescapes"."2.4.1"; - "lodash.keys-2.4.1" = self.by-version."lodash.keys"."2.4.1"; }; peerDependencies = []; }; - by-spec."lodash._shimkeys"."~2.4.1" = - self.by-version."lodash._shimkeys"."2.4.1"; - by-version."lodash._shimkeys"."2.4.1" = self.buildNodePackage { - name = "lodash._shimkeys-2.4.1"; + by-spec."lodash._reinterpolate"."^3.0.0" = + self.by-version."lodash._reinterpolate"."3.0.0"; + by-version."lodash._reinterpolate"."3.0.0" = self.buildNodePackage { + name = "lodash._reinterpolate-3.0.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz"; - name = "lodash._shimkeys-2.4.1.tgz"; - sha1 = "6e9cc9666ff081f0b5a6c978b83e242e6949d203"; + url = "http://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz"; + name = "lodash._reinterpolate-3.0.0.tgz"; + sha1 = "0ccf2d89166af03b3663c796538b75ac6e114d9d"; }; deps = { - "lodash._objecttypes-2.4.1" = self.by-version."lodash._objecttypes"."2.4.1"; }; peerDependencies = []; }; @@ -15270,36 +15800,46 @@ }; peerDependencies = []; }; - by-spec."lodash.defaults"."~2.4.1" = - self.by-version."lodash.defaults"."2.4.1"; - by-version."lodash.defaults"."2.4.1" = self.buildNodePackage { - name = "lodash.defaults-2.4.1"; + by-spec."lodash.escape"."^3.0.0" = + self.by-version."lodash.escape"."3.0.0"; + by-version."lodash.escape"."3.0.0" = self.buildNodePackage { + name = "lodash.escape-3.0.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz"; - name = "lodash.defaults-2.4.1.tgz"; - sha1 = "a7e8885f05e68851144b6e12a8f3678026bc4c54"; + url = "http://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz"; + name = "lodash.escape-3.0.0.tgz"; + sha1 = "fb294c99a7bfb586039f66d6b9c27ed874cb7b51"; }; deps = { - "lodash.keys-2.4.1" = self.by-version."lodash.keys"."2.4.1"; - "lodash._objecttypes-2.4.1" = self.by-version."lodash._objecttypes"."2.4.1"; + "lodash._basetostring-3.0.0" = self.by-version."lodash._basetostring"."3.0.0"; }; peerDependencies = []; }; - by-spec."lodash.escape"."~2.4.1" = - self.by-version."lodash.escape"."2.4.1"; - by-version."lodash.escape"."2.4.1" = self.buildNodePackage { - name = "lodash.escape-2.4.1"; + by-spec."lodash.isarguments"."^3.0.0" = + self.by-version."lodash.isarguments"."3.0.0"; + by-version."lodash.isarguments"."3.0.0" = self.buildNodePackage { + name = "lodash.isarguments-3.0.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/lodash.escape/-/lodash.escape-2.4.1.tgz"; - name = "lodash.escape-2.4.1.tgz"; - sha1 = "2ce12c5e084db0a57dda5e5d1eeeb9f5d175a3b4"; + url = "http://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.0.tgz"; + name = "lodash.isarguments-3.0.0.tgz"; + sha1 = "e94b8658069e52f924a8ea8be6718d2d0baf480f"; + }; + deps = { + }; + peerDependencies = []; + }; + by-spec."lodash.isarray"."^3.0.0" = + self.by-version."lodash.isarray"."3.0.0"; + by-version."lodash.isarray"."3.0.0" = self.buildNodePackage { + name = "lodash.isarray-3.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.0.tgz"; + name = "lodash.isarray-3.0.0.tgz"; + sha1 = "356d4a93ffd7869a03292d8452c29ea398e68aa4"; }; deps = { - "lodash._escapehtmlchar-2.4.1" = self.by-version."lodash._escapehtmlchar"."2.4.1"; - "lodash.keys-2.4.1" = self.by-version."lodash.keys"."2.4.1"; - "lodash._reunescapedhtml-2.4.1" = self.by-version."lodash._reunescapedhtml"."2.4.1"; }; peerDependencies = []; }; @@ -15317,6 +15857,20 @@ }; peerDependencies = []; }; + by-spec."lodash.isnative"."^3.0.0" = + self.by-version."lodash.isnative"."3.0.0"; + by-version."lodash.isnative"."3.0.0" = self.buildNodePackage { + name = "lodash.isnative-3.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/lodash.isnative/-/lodash.isnative-3.0.0.tgz"; + name = "lodash.isnative-3.0.0.tgz"; + sha1 = "39e0a695377296528c14c36793f3801f6d6d0214"; + }; + deps = { + }; + peerDependencies = []; + }; by-spec."lodash.isobject"."~2.4.1" = self.by-version."lodash.isobject"."2.4.1"; by-version."lodash.isobject"."2.4.1" = self.buildNodePackage { @@ -15332,20 +15886,20 @@ }; peerDependencies = []; }; - by-spec."lodash.keys"."~2.4.1" = - self.by-version."lodash.keys"."2.4.1"; - by-version."lodash.keys"."2.4.1" = self.buildNodePackage { - name = "lodash.keys-2.4.1"; + by-spec."lodash.keys"."^3.0.0" = + self.by-version."lodash.keys"."3.0.3"; + by-version."lodash.keys"."3.0.3" = self.buildNodePackage { + name = "lodash.keys-3.0.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz"; - name = "lodash.keys-2.4.1.tgz"; - sha1 = "48dea46df8ff7632b10d706b8acb26591e2b3727"; + url = "http://registry.npmjs.org/lodash.keys/-/lodash.keys-3.0.3.tgz"; + name = "lodash.keys-3.0.3.tgz"; + sha1 = "5089c0bd05d3ade6aba807c9b2b7521c4c344d1c"; }; deps = { - "lodash._isnative-2.4.1" = self.by-version."lodash._isnative"."2.4.1"; - "lodash.isobject-2.4.1" = self.by-version."lodash.isobject"."2.4.1"; - "lodash._shimkeys-2.4.1" = self.by-version."lodash._shimkeys"."2.4.1"; + "lodash.isarguments-3.0.0" = self.by-version."lodash.isarguments"."3.0.0"; + "lodash.isarray-3.0.0" = self.by-version."lodash.isarray"."3.0.0"; + "lodash.isnative-3.0.0" = self.by-version."lodash.isnative"."3.0.0"; }; peerDependencies = []; }; @@ -15364,55 +15918,150 @@ }; peerDependencies = []; }; - by-spec."lodash.template"."^2.4.1" = - self.by-version."lodash.template"."2.4.1"; - by-version."lodash.template"."2.4.1" = self.buildNodePackage { - name = "lodash.template-2.4.1"; + by-spec."lodash.pad"."^3.0.0" = + self.by-version."lodash.pad"."3.0.0"; + by-version."lodash.pad"."3.0.0" = self.buildNodePackage { + name = "lodash.pad-3.0.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/lodash.template/-/lodash.template-2.4.1.tgz"; - name = "lodash.template-2.4.1.tgz"; - sha1 = "9e611007edf629129a974ab3c48b817b3e1cf20d"; + url = "http://registry.npmjs.org/lodash.pad/-/lodash.pad-3.0.0.tgz"; + name = "lodash.pad-3.0.0.tgz"; + sha1 = "1824e4756a3504b3af7b7a5b9d1f7501b43b2c25"; }; deps = { - "lodash.defaults-2.4.1" = self.by-version."lodash.defaults"."2.4.1"; - "lodash.escape-2.4.1" = self.by-version."lodash.escape"."2.4.1"; - "lodash._escapestringchar-2.4.1" = self.by-version."lodash._escapestringchar"."2.4.1"; - "lodash.keys-2.4.1" = self.by-version."lodash.keys"."2.4.1"; - "lodash._reinterpolate-2.4.1" = self.by-version."lodash._reinterpolate"."2.4.1"; - "lodash.templatesettings-2.4.1" = self.by-version."lodash.templatesettings"."2.4.1"; - "lodash.values-2.4.1" = self.by-version."lodash.values"."2.4.1"; + "lodash._basetostring-3.0.0" = self.by-version."lodash._basetostring"."3.0.0"; + "lodash._createpad-3.0.1" = self.by-version."lodash._createpad"."3.0.1"; }; peerDependencies = []; }; - by-spec."lodash.templatesettings"."~2.4.1" = - self.by-version."lodash.templatesettings"."2.4.1"; - by-version."lodash.templatesettings"."2.4.1" = self.buildNodePackage { - name = "lodash.templatesettings-2.4.1"; + by-spec."lodash.padleft"."^3.0.0" = + self.by-version."lodash.padleft"."3.0.0"; + by-version."lodash.padleft"."3.0.0" = self.buildNodePackage { + name = "lodash.padleft-3.0.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-2.4.1.tgz"; - name = "lodash.templatesettings-2.4.1.tgz"; - sha1 = "ea76c75d11eb86d4dbe89a83893bb861929ac699"; + url = "http://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.0.0.tgz"; + name = "lodash.padleft-3.0.0.tgz"; + sha1 = "448ac9e28ceb15d0ce9ae8e59dc9311ad17b4390"; }; deps = { - "lodash.escape-2.4.1" = self.by-version."lodash.escape"."2.4.1"; - "lodash._reinterpolate-2.4.1" = self.by-version."lodash._reinterpolate"."2.4.1"; + "lodash._basetostring-3.0.0" = self.by-version."lodash._basetostring"."3.0.0"; + "lodash._createpad-3.0.1" = self.by-version."lodash._createpad"."3.0.1"; }; peerDependencies = []; }; - by-spec."lodash.values"."~2.4.1" = - self.by-version."lodash.values"."2.4.1"; - by-version."lodash.values"."2.4.1" = self.buildNodePackage { - name = "lodash.values-2.4.1"; + by-spec."lodash.padright"."^3.0.0" = + self.by-version."lodash.padright"."3.0.0"; + by-version."lodash.padright"."3.0.0" = self.buildNodePackage { + name = "lodash.padright-3.0.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/lodash.values/-/lodash.values-2.4.1.tgz"; - name = "lodash.values-2.4.1.tgz"; - sha1 = "abf514436b3cb705001627978cbcf30b1280eea4"; + url = "http://registry.npmjs.org/lodash.padright/-/lodash.padright-3.0.0.tgz"; + name = "lodash.padright-3.0.0.tgz"; + sha1 = "caf2c8222c36d448fe0407b028630e6c5d1b06c6"; }; deps = { - "lodash.keys-2.4.1" = self.by-version."lodash.keys"."2.4.1"; + "lodash._basetostring-3.0.0" = self.by-version."lodash._basetostring"."3.0.0"; + "lodash._createpad-3.0.1" = self.by-version."lodash._createpad"."3.0.1"; + }; + peerDependencies = []; + }; + by-spec."lodash.reescape"."^3.0.0" = + self.by-version."lodash.reescape"."3.0.1"; + by-version."lodash.reescape"."3.0.1" = self.buildNodePackage { + name = "lodash.reescape-3.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/lodash.reescape/-/lodash.reescape-3.0.1.tgz"; + name = "lodash.reescape-3.0.1.tgz"; + sha1 = "16d27d4591a839a10b13cdff61dc9624ed237a23"; + }; + deps = { + "lodash._reescape-3.0.0" = self.by-version."lodash._reescape"."3.0.0"; + }; + peerDependencies = []; + }; + by-spec."lodash.reevaluate"."^3.0.0" = + self.by-version."lodash.reevaluate"."3.0.1"; + by-version."lodash.reevaluate"."3.0.1" = self.buildNodePackage { + name = "lodash.reevaluate-3.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/lodash.reevaluate/-/lodash.reevaluate-3.0.1.tgz"; + name = "lodash.reevaluate-3.0.1.tgz"; + sha1 = "6f67caca85c95bfd48f1df259e253d40988ca764"; + }; + deps = { + "lodash._reevaluate-3.0.0" = self.by-version."lodash._reevaluate"."3.0.0"; + }; + peerDependencies = []; + }; + by-spec."lodash.reinterpolate"."^3.0.0" = + self.by-version."lodash.reinterpolate"."3.0.1"; + by-version."lodash.reinterpolate"."3.0.1" = self.buildNodePackage { + name = "lodash.reinterpolate-3.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/lodash.reinterpolate/-/lodash.reinterpolate-3.0.1.tgz"; + name = "lodash.reinterpolate-3.0.1.tgz"; + sha1 = "61aaa0667f0a5c521a9f8c31a06c72b8b684d6b0"; + }; + deps = { + "lodash._reinterpolate-3.0.0" = self.by-version."lodash._reinterpolate"."3.0.0"; + }; + peerDependencies = []; + }; + by-spec."lodash.repeat"."^3.0.0" = + self.by-version."lodash.repeat"."3.0.0"; + by-version."lodash.repeat"."3.0.0" = self.buildNodePackage { + name = "lodash.repeat-3.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.0.tgz"; + name = "lodash.repeat-3.0.0.tgz"; + sha1 = "c340f4136c99dc5b2e397b3fd50cffbd172a94b0"; + }; + deps = { + "lodash._basetostring-3.0.0" = self.by-version."lodash._basetostring"."3.0.0"; + }; + peerDependencies = []; + }; + by-spec."lodash.template"."^3.0.0" = + self.by-version."lodash.template"."3.2.0"; + by-version."lodash.template"."3.2.0" = self.buildNodePackage { + name = "lodash.template-3.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/lodash.template/-/lodash.template-3.2.0.tgz"; + name = "lodash.template-3.2.0.tgz"; + sha1 = "04f6b39f4fd8aa2eb915a41adddd011ac41567c1"; + }; + deps = { + "lodash._basecopy-3.0.0" = self.by-version."lodash._basecopy"."3.0.0"; + "lodash._baseslice-3.0.1" = self.by-version."lodash._baseslice"."3.0.1"; + "lodash._basevalues-3.0.0" = self.by-version."lodash._basevalues"."3.0.0"; + "lodash._isiterateecall-3.0.1" = self.by-version."lodash._isiterateecall"."3.0.1"; + "lodash._reinterpolate-3.0.0" = self.by-version."lodash._reinterpolate"."3.0.0"; + "lodash.keys-3.0.3" = self.by-version."lodash.keys"."3.0.3"; + "lodash.templatesettings-3.0.1" = self.by-version."lodash.templatesettings"."3.0.1"; + }; + peerDependencies = []; + }; + by-spec."lodash.templatesettings"."^3.0.0" = + self.by-version."lodash.templatesettings"."3.0.1"; + by-version."lodash.templatesettings"."3.0.1" = self.buildNodePackage { + name = "lodash.templatesettings-3.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.0.1.tgz"; + name = "lodash.templatesettings-3.0.1.tgz"; + sha1 = "7e3e332d6216d475a9347eb929339c8ffa209cfe"; + }; + deps = { + "lodash._reescape-3.0.0" = self.by-version."lodash._reescape"."3.0.0"; + "lodash._reevaluate-3.0.0" = self.by-version."lodash._reevaluate"."3.0.0"; + "lodash._reinterpolate-3.0.0" = self.by-version."lodash._reinterpolate"."3.0.0"; + "lodash.escape-3.0.0" = self.by-version."lodash.escape"."3.0.0"; }; peerDependencies = []; }; @@ -15505,6 +16154,20 @@ }; peerDependencies = []; }; + by-spec."lowercase-keys"."^1.0.0" = + self.by-version."lowercase-keys"."1.0.0"; + by-version."lowercase-keys"."1.0.0" = self.buildNodePackage { + name = "lowercase-keys-1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz"; + name = "lowercase-keys-1.0.0.tgz"; + sha1 = "4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"; + }; + deps = { + }; + peerDependencies = []; + }; by-spec."lru-cache"."2" = self.by-version."lru-cache"."2.5.0"; by-version."lru-cache"."2.5.0" = self.buildNodePackage { @@ -15604,7 +16267,7 @@ sha1 = "2738bd9f0d3cf4f84490c5736c48699ac632cda3"; }; deps = { - "es5-ext-0.10.5" = self.by-version."es5-ext"."0.10.5"; + "es5-ext-0.10.6" = self.by-version."es5-ext"."0.10.6"; }; peerDependencies = []; }; @@ -15623,26 +16286,26 @@ peerDependencies = []; }; by-spec."ltx"."*" = - self.by-version."ltx"."0.8.0"; - by-version."ltx"."0.8.0" = self.buildNodePackage { - name = "ltx-0.8.0"; + self.by-version."ltx"."0.9.0"; + by-version."ltx"."0.9.0" = self.buildNodePackage { + name = "ltx-0.9.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/ltx/-/ltx-0.8.0.tgz"; - name = "ltx-0.8.0.tgz"; - sha1 = "08aeb2f68c4c7d20ab35e9dcb7519fd80824c529"; + url = "http://registry.npmjs.org/ltx/-/ltx-0.9.0.tgz"; + name = "ltx-0.9.0.tgz"; + sha1 = "09055d4791b074d58c7d81d7ef0d91a71ef3c8a3"; }; deps = { "sax-0.6.1" = self.by-version."sax"."0.6.1"; - "node-expat-2.3.4" = self.by-version."node-expat"."2.3.4"; + "node-expat-2.3.6" = self.by-version."node-expat"."2.3.6"; }; peerDependencies = []; }; - "ltx" = self.by-version."ltx"."0.8.0"; + "ltx" = self.by-version."ltx"."0.9.0"; by-spec."ltx"."0.x" = - self.by-version."ltx"."0.8.0"; + self.by-version."ltx"."0.9.0"; by-spec."ltx".">= 0.2.0" = - self.by-version."ltx"."0.8.0"; + self.by-version."ltx"."0.9.0"; by-spec."ltx"."^0.5.2" = self.by-version."ltx"."0.5.2"; by-version."ltx"."0.5.2" = self.buildNodePackage { @@ -15655,26 +16318,12 @@ }; deps = { "sax-0.6.1" = self.by-version."sax"."0.6.1"; - "node-expat-2.3.4" = self.by-version."node-expat"."2.3.4"; - }; - peerDependencies = []; - }; - by-spec."ltx"."^0.7.2" = - self.by-version."ltx"."0.7.2"; - by-version."ltx"."0.7.2" = self.buildNodePackage { - name = "ltx-0.7.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ltx/-/ltx-0.7.2.tgz"; - name = "ltx-0.7.2.tgz"; - sha1 = "70a6aa8fa5fd426a422a41ba3d54a15ccdde680c"; - }; - deps = { - "sax-0.6.1" = self.by-version."sax"."0.6.1"; - "node-expat-2.3.4" = self.by-version."node-expat"."2.3.4"; + "node-expat-2.3.6" = self.by-version."node-expat"."2.3.6"; }; peerDependencies = []; }; + by-spec."ltx"."^0.9.0" = + self.by-version."ltx"."0.9.0"; by-spec."ltx"."~0.3.2" = self.by-version."ltx"."0.3.4"; by-version."ltx"."0.3.4" = self.buildNodePackage { @@ -15705,12 +16354,12 @@ }; deps = { "sax-0.6.1" = self.by-version."sax"."0.6.1"; - "node-expat-2.3.4" = self.by-version."node-expat"."2.3.4"; + "node-expat-2.3.6" = self.by-version."node-expat"."2.3.6"; }; peerDependencies = []; }; by-spec."ltx"."~0.x" = - self.by-version."ltx"."0.8.0"; + self.by-version."ltx"."0.9.0"; by-spec."m8".">= 0.4.3" = self.by-version."m8"."0.4.4"; by-version."m8"."0.4.4" = self.buildNodePackage { @@ -15753,7 +16402,7 @@ sha1 = "253220f0091724b1033fadcf9f8aaad68dcad309"; }; deps = { - "request-2.51.0" = self.by-version."request"."2.51.0"; + "request-2.53.0" = self.by-version."request"."2.53.0"; "qs-0.5.6" = self.by-version."qs"."0.5.6"; }; peerDependencies = []; @@ -15815,26 +16464,26 @@ peerDependencies = []; }; by-spec."marked"."*" = - self.by-version."marked"."0.3.2"; - by-version."marked"."0.3.2" = self.buildNodePackage { - name = "marked-0.3.2"; + self.by-version."marked"."0.3.3"; + by-version."marked"."0.3.3" = self.buildNodePackage { + name = "marked-0.3.3"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/marked/-/marked-0.3.2.tgz"; - name = "marked-0.3.2.tgz"; - sha1 = "015db158864438f24a64bdd61a0428b418706d09"; + url = "http://registry.npmjs.org/marked/-/marked-0.3.3.tgz"; + name = "marked-0.3.3.tgz"; + sha1 = "08bad9cac13736f6cceddc202344f1b0bf255390"; }; deps = { }; peerDependencies = []; }; - "marked" = self.by-version."marked"."0.3.2"; + "marked" = self.by-version."marked"."0.3.3"; by-spec."marked".">=0.2.9" = - self.by-version."marked"."0.3.2"; + self.by-version."marked"."0.3.3"; by-spec."marked".">=0.3.1" = - self.by-version."marked"."0.3.2"; + self.by-version."marked"."0.3.3"; by-spec."marked"."^0.3.2" = - self.by-version."marked"."0.3.2"; + self.by-version."marked"."0.3.3"; by-spec."mathjs"."~0.19.0" = self.by-version."mathjs"."0.19.0"; by-version."mathjs"."0.19.0" = self.buildNodePackage { @@ -15864,7 +16513,23 @@ "chalk-0.5.1" = self.by-version."chalk"."0.5.1"; "figures-1.3.5" = self.by-version."figures"."1.3.5"; "gzip-size-1.0.0" = self.by-version."gzip-size"."1.0.0"; - "pretty-bytes-1.0.2" = self.by-version."pretty-bytes"."1.0.2"; + "pretty-bytes-1.0.3" = self.by-version."pretty-bytes"."1.0.3"; + }; + peerDependencies = []; + }; + by-spec."mdns-js"."0.2.x" = + self.by-version."mdns-js"."0.2.9"; + by-version."mdns-js"."0.2.9" = self.buildNodePackage { + name = "mdns-js-0.2.9"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/mdns-js/-/mdns-js-0.2.9.tgz"; + name = "mdns-js-0.2.9.tgz"; + sha1 = "4b0a77da832fe3857736f584b99ee07912f0c1e0"; + }; + deps = { + "debug-2.1.1" = self.by-version."debug"."2.1.1"; + "mdns-js-packet-0.1.8" = self.by-version."mdns-js-packet"."0.1.8"; }; peerDependencies = []; }; @@ -15884,6 +16549,22 @@ }; peerDependencies = []; }; + by-spec."mdns-js-packet"."0.1.x" = + self.by-version."mdns-js-packet"."0.1.8"; + by-version."mdns-js-packet"."0.1.8" = self.buildNodePackage { + name = "mdns-js-packet-0.1.8"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/mdns-js-packet/-/mdns-js-packet-0.1.8.tgz"; + name = "mdns-js-packet-0.1.8.tgz"; + sha1 = "e5a205c6e26e22a1df58e5f38057e80a6f84ee26"; + }; + deps = { + "debug-2.1.1" = self.by-version."debug"."2.1.1"; + "qap-3.1.3" = self.by-version."qap"."3.1.3"; + }; + peerDependencies = []; + }; by-spec."mdns-js-packet"."guerrerocarlos/node-mdns-js-packet" = self.by-version."mdns-js-packet"."0.1.9"; by-version."mdns-js-packet"."0.1.9" = self.buildNodePackage { @@ -15896,22 +16577,7 @@ }; deps = { "debug-2.1.1" = self.by-version."debug"."2.1.1"; - "qap-3.1.2" = self.by-version."qap"."3.1.2"; - }; - peerDependencies = []; - }; - by-spec."mdns-js2"."0.0.5" = - self.by-version."mdns-js2"."0.0.5"; - by-version."mdns-js2"."0.0.5" = self.buildNodePackage { - name = "mdns-js2-0.0.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/mdns-js2/-/mdns-js2-0.0.5.tgz"; - name = "mdns-js2-0.0.5.tgz"; - sha1 = "7df4f4fbdcb21bdd6f29d9c7d4cea43b0198c909"; - }; - deps = { - "debug-0.8.1" = self.by-version."debug"."0.8.1"; + "qap-3.1.3" = self.by-version."qap"."3.1.3"; }; peerDependencies = []; }; @@ -15976,9 +16642,9 @@ }; deps = { "d-0.1.1" = self.by-version."d"."0.1.1"; - "es5-ext-0.10.5" = self.by-version."es5-ext"."0.10.5"; + "es5-ext-0.10.6" = self.by-version."es5-ext"."0.10.6"; "es6-weak-map-0.1.2" = self.by-version."es6-weak-map"."0.1.2"; - "event-emitter-0.3.2" = self.by-version."event-emitter"."0.3.2"; + "event-emitter-0.3.3" = self.by-version."event-emitter"."0.3.3"; "lru-queue-0.1.0" = self.by-version."lru-queue"."0.1.0"; "next-tick-0.2.2" = self.by-version."next-tick"."0.2.2"; "timers-ext-0.1.0" = self.by-version."timers-ext"."0.1.0"; @@ -16011,32 +16677,14 @@ }; deps = { "camelcase-keys-1.0.0" = self.by-version."camelcase-keys"."1.0.0"; - "indent-string-1.2.0" = self.by-version."indent-string"."1.2.0"; + "indent-string-1.2.1" = self.by-version."indent-string"."1.2.1"; "minimist-1.1.0" = self.by-version."minimist"."1.1.0"; "object-assign-2.0.0" = self.by-version."object-assign"."2.0.0"; }; peerDependencies = []; }; - by-spec."meow"."^2.0.0" = - self.by-version."meow"."2.1.0"; - by-version."meow"."2.1.0" = self.buildNodePackage { - name = "meow-2.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/meow/-/meow-2.1.0.tgz"; - name = "meow-2.1.0.tgz"; - sha1 = "3a63f77977c150c16fd84484d0cef677c4182799"; - }; - deps = { - "camelcase-keys-1.0.0" = self.by-version."camelcase-keys"."1.0.0"; - "indent-string-1.2.0" = self.by-version."indent-string"."1.2.0"; - "minimist-1.1.0" = self.by-version."minimist"."1.1.0"; - "object-assign-2.0.0" = self.by-version."object-assign"."2.0.0"; - }; - peerDependencies = []; - }; - by-spec."meow"."^2.1.0" = - self.by-version."meow"."2.1.0"; + by-spec."meow"."^3.0.0" = + self.by-version."meow"."3.0.0"; by-spec."merge-descriptors"."0.0.2" = self.by-version."merge-descriptors"."0.0.2"; by-version."merge-descriptors"."0.0.2" = self.buildNodePackage { @@ -16232,12 +16880,26 @@ sha1 = "41f506bed994b97e7c184a658ae107dad980526e"; }; deps = { - "bn.js-1.0.0" = self.by-version."bn.js"."1.0.0"; + "bn.js-1.3.0" = self.by-version."bn.js"."1.3.0"; "brorand-1.0.5" = self.by-version."brorand"."1.0.5"; }; peerDependencies = []; }; by-spec."mime"."*" = + self.by-version."mime"."1.3.4"; + by-version."mime"."1.3.4" = self.buildNodePackage { + name = "mime-1.3.4"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/mime/-/mime-1.3.4.tgz"; + name = "mime-1.3.4.tgz"; + sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53"; + }; + deps = { + }; + peerDependencies = []; + }; + by-spec."mime"."1.2.11" = self.by-version."mime"."1.2.11"; by-version."mime"."1.2.11" = self.buildNodePackage { name = "mime-1.2.11"; @@ -16251,8 +16913,6 @@ }; peerDependencies = []; }; - by-spec."mime"."1.2.11" = - self.by-version."mime"."1.2.11"; by-spec."mime"."1.2.4" = self.by-version."mime"."1.2.4"; by-version."mime"."1.2.4" = self.buildNodePackage { @@ -16267,20 +16927,6 @@ }; peerDependencies = []; }; - by-spec."mime"."1.2.5" = - self.by-version."mime"."1.2.5"; - by-version."mime"."1.2.5" = self.buildNodePackage { - name = "mime-1.2.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/mime/-/mime-1.2.5.tgz"; - name = "mime-1.2.5.tgz"; - sha1 = "9eed073022a8bf5e16c8566c6867b8832bfbfa13"; - }; - deps = { - }; - peerDependencies = []; - }; by-spec."mime"."1.2.6" = self.by-version."mime"."1.2.6"; by-version."mime"."1.2.6" = self.buildNodePackage { @@ -16309,12 +16955,14 @@ }; peerDependencies = []; }; + by-spec."mime"."1.3.4" = + self.by-version."mime"."1.3.4"; by-spec."mime".">= 0.0.1" = - self.by-version."mime"."1.2.11"; + self.by-version."mime"."1.3.4"; by-spec."mime".">=1.2.11" = - self.by-version."mime"."1.2.11"; + self.by-version."mime"."1.3.4"; by-spec."mime"."^1.2.11" = - self.by-version."mime"."1.2.11"; + self.by-version."mime"."1.3.4"; by-spec."mime"."~1.2.11" = self.by-version."mime"."1.2.11"; by-spec."mime"."~1.2.2" = @@ -16323,34 +16971,34 @@ self.by-version."mime"."1.2.11"; by-spec."mime"."~1.2.9" = self.by-version."mime"."1.2.11"; - by-spec."mime-db"."1.x" = - self.by-version."mime-db"."1.5.0"; - by-version."mime-db"."1.5.0" = self.buildNodePackage { - name = "mime-db-1.5.0"; + by-spec."mime-db".">= 1.1.2 < 2" = + self.by-version."mime-db"."1.7.0"; + by-version."mime-db"."1.7.0" = self.buildNodePackage { + name = "mime-db-1.7.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/mime-db/-/mime-db-1.5.0.tgz"; - name = "mime-db-1.5.0.tgz"; - sha1 = "bd80b576157991c3b46c71be7041fc6d5402a6ee"; + url = "http://registry.npmjs.org/mime-db/-/mime-db-1.7.0.tgz"; + name = "mime-db-1.7.0.tgz"; + sha1 = "36cf66a6c52ea71827bde287f77c254f5ef1b8d3"; }; deps = { }; peerDependencies = []; }; - by-spec."mime-db"."~1.5.0" = - self.by-version."mime-db"."1.5.0"; + by-spec."mime-db"."~1.7.0" = + self.by-version."mime-db"."1.7.0"; by-spec."mime-types"."^2.0.3" = - self.by-version."mime-types"."2.0.7"; - by-version."mime-types"."2.0.7" = self.buildNodePackage { - name = "mime-types-2.0.7"; + self.by-version."mime-types"."2.0.9"; + by-version."mime-types"."2.0.9" = self.buildNodePackage { + name = "mime-types-2.0.9"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.7.tgz"; - name = "mime-types-2.0.7.tgz"; - sha1 = "0cb58d0403aec977357db324eea67e40c32b44b2"; + url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.9.tgz"; + name = "mime-types-2.0.9.tgz"; + sha1 = "e8449aff27b1245ddc6641b524439ae80c4b78a6"; }; deps = { - "mime-db-1.5.0" = self.by-version."mime-db"."1.5.0"; + "mime-db-1.7.0" = self.by-version."mime-db"."1.7.0"; }; peerDependencies = []; }; @@ -16370,12 +17018,14 @@ }; by-spec."mime-types"."~1.0.1" = self.by-version."mime-types"."1.0.2"; + by-spec."mime-types"."~2.0.1" = + self.by-version."mime-types"."2.0.9"; by-spec."mime-types"."~2.0.3" = - self.by-version."mime-types"."2.0.7"; + self.by-version."mime-types"."2.0.9"; by-spec."mime-types"."~2.0.4" = - self.by-version."mime-types"."2.0.7"; - by-spec."mime-types"."~2.0.7" = - self.by-version."mime-types"."2.0.7"; + self.by-version."mime-types"."2.0.9"; + by-spec."mime-types"."~2.0.9" = + self.by-version."mime-types"."2.0.9"; by-spec."mimelib"."~0.2.15" = self.by-version."mimelib"."0.2.18"; by-version."mimelib"."0.2.18" = self.buildNodePackage { @@ -16813,7 +17463,7 @@ "commander-2.0.0" = self.by-version."commander"."2.0.0"; }; peerDependencies = [ - self.by-version."phantomjs"."1.9.13"]; + self.by-version."phantomjs"."1.9.15"]; }; "mocha-phantomjs" = self.by-version."mocha-phantomjs"."3.5.3"; by-spec."mocha-unfunk-reporter"."*" = @@ -16836,18 +17486,18 @@ }; "mocha-unfunk-reporter" = self.by-version."mocha-unfunk-reporter"."0.4.0"; by-spec."module-deps"."^3.6.3" = - self.by-version."module-deps"."3.6.4"; - by-version."module-deps"."3.6.4" = self.buildNodePackage { - name = "module-deps-3.6.4"; + self.by-version."module-deps"."3.7.1"; + by-version."module-deps"."3.7.1" = self.buildNodePackage { + name = "module-deps-3.7.1"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/module-deps/-/module-deps-3.6.4.tgz"; - name = "module-deps-3.6.4.tgz"; - sha1 = "6997857056165e9abade256de6f97dc7effe753f"; + url = "http://registry.npmjs.org/module-deps/-/module-deps-3.7.1.tgz"; + name = "module-deps-3.7.1.tgz"; + sha1 = "5bbaaf9e6ba252cf0912b9839f47a3b1e46e0a42"; }; deps = { "JSONStream-0.7.4" = self.by-version."JSONStream"."0.7.4"; - "browser-resolve-1.6.0" = self.by-version."browser-resolve"."1.6.0"; + "browser-resolve-1.7.0" = self.by-version."browser-resolve"."1.7.0"; "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7"; "detective-4.0.0" = self.by-version."detective"."4.0.0"; "duplexer2-0.0.2" = self.by-version."duplexer2"."0.0.2"; @@ -16855,7 +17505,7 @@ "minimist-0.2.0" = self.by-version."minimist"."0.2.0"; "parents-1.0.1" = self.by-version."parents"."1.0.1"; "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; - "resolve-0.7.4" = self.by-version."resolve"."0.7.4"; + "resolve-1.1.3" = self.by-version."resolve"."1.1.3"; "shallow-copy-0.0.1" = self.by-version."shallow-copy"."0.0.1"; "stream-combiner2-1.0.2" = self.by-version."stream-combiner2"."1.0.2"; "subarg-0.0.1" = self.by-version."subarg"."0.0.1"; @@ -17057,7 +17707,7 @@ sha1 = "65cdd46ec127861e941168fdccf82bf17ad71c4d"; }; deps = { - "bson-0.2.18" = self.by-version."bson"."0.2.18"; + "bson-0.2.19" = self.by-version."bson"."0.2.19"; "kerberos-0.0.4" = self.by-version."kerberos"."0.0.4"; "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; }; @@ -17074,45 +17724,45 @@ sha1 = "4308333aa9b369cc8214a67602527d138bf74e1f"; }; deps = { - "bson-0.2.18" = self.by-version."bson"."0.2.18"; + "bson-0.2.19" = self.by-version."bson"."0.2.19"; "kerberos-0.0.7" = self.by-version."kerberos"."0.0.7"; "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; }; peerDependencies = []; }; by-spec."mongodb".">= 1.2.0 <2.1.0" = - self.by-version."mongodb"."2.0.14"; - by-version."mongodb"."2.0.14" = self.buildNodePackage { - name = "mongodb-2.0.14"; + self.by-version."mongodb"."2.0.16"; + by-version."mongodb"."2.0.16" = self.buildNodePackage { + name = "mongodb-2.0.16"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/mongodb/-/mongodb-2.0.14.tgz"; - name = "mongodb-2.0.14.tgz"; - sha1 = "9834ba645d56d111a5947f610bd96280afddb5e7"; + url = "http://registry.npmjs.org/mongodb/-/mongodb-2.0.16.tgz"; + name = "mongodb-2.0.16.tgz"; + sha1 = "54acb07b0d27d542901ea05359a19b142272b36d"; }; deps = { - "mongodb-core-1.1.9" = self.by-version."mongodb-core"."1.1.9"; + "mongodb-core-1.1.12" = self.by-version."mongodb-core"."1.1.12"; "readable-stream-1.0.31" = self.by-version."readable-stream"."1.0.31"; }; peerDependencies = []; }; by-spec."mongodb"."~2.0" = - self.by-version."mongodb"."2.0.14"; - by-spec."mongodb-core"."1.1.9" = - self.by-version."mongodb-core"."1.1.9"; - by-version."mongodb-core"."1.1.9" = self.buildNodePackage { - name = "mongodb-core-1.1.9"; + self.by-version."mongodb"."2.0.16"; + by-spec."mongodb-core"."1.1.12" = + self.by-version."mongodb-core"."1.1.12"; + by-version."mongodb-core"."1.1.12" = self.buildNodePackage { + name = "mongodb-core-1.1.12"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/mongodb-core/-/mongodb-core-1.1.9.tgz"; - name = "mongodb-core-1.1.9.tgz"; - sha1 = "fc9ede45da21427c8e18f2ccf7cce4efc368eeef"; + url = "http://registry.npmjs.org/mongodb-core/-/mongodb-core-1.1.12.tgz"; + name = "mongodb-core-1.1.12.tgz"; + sha1 = "6f83a64210ab43995d295116736b0a051ce2bdcd"; }; deps = { - "bson-0.2.18" = self.by-version."bson"."0.2.18"; + "bson-0.2.19" = self.by-version."bson"."0.2.19"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "rimraf-2.2.6" = self.by-version."rimraf"."2.2.6"; - "kerberos-0.0.8" = self.by-version."kerberos"."0.0.8"; + "kerberos-0.0.9" = self.by-version."kerberos"."0.0.9"; }; peerDependencies = []; }; @@ -17161,14 +17811,14 @@ }; "mongoose" = self.by-version."mongoose"."3.6.20"; by-spec."mongoose"."3.8.x" = - self.by-version."mongoose"."3.8.22"; - by-version."mongoose"."3.8.22" = self.buildNodePackage { - name = "mongoose-3.8.22"; + self.by-version."mongoose"."3.8.23"; + by-version."mongoose"."3.8.23" = self.buildNodePackage { + name = "mongoose-3.8.23"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/mongoose/-/mongoose-3.8.22.tgz"; - name = "mongoose-3.8.22.tgz"; - sha1 = "e5f21eb1dac5532cdee15241dea50553267eb2e4"; + url = "http://registry.npmjs.org/mongoose/-/mongoose-3.8.23.tgz"; + name = "mongoose-3.8.23.tgz"; + sha1 = "c2dbee69d9d3776006330165f6e2681174c2ce6b"; }; deps = { "mongodb-1.4.28" = self.by-version."mongodb"."1.4.28"; @@ -17183,7 +17833,7 @@ }; peerDependencies = []; }; - by-spec."mongoose".">=3.8.0" = + by-spec."mongoose"."3.9.7" = self.by-version."mongoose"."3.9.7"; by-version."mongoose"."3.9.7" = self.buildNodePackage { name = "mongoose-3.9.7"; @@ -17499,17 +18149,17 @@ peerDependencies = []; }; by-spec."msgpack".">= 0.0.1" = - self.by-version."msgpack"."0.2.4"; - by-version."msgpack"."0.2.4" = self.buildNodePackage { - name = "msgpack-0.2.4"; + self.by-version."msgpack"."0.2.6"; + by-version."msgpack"."0.2.6" = self.buildNodePackage { + name = "msgpack-0.2.6"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/msgpack/-/msgpack-0.2.4.tgz"; - name = "msgpack-0.2.4.tgz"; - sha1 = "17ac333ea5320b45059f80c992d7465fed4fe706"; + url = "http://registry.npmjs.org/msgpack/-/msgpack-0.2.6.tgz"; + name = "msgpack-0.2.6.tgz"; + sha1 = "e0eda501c43972efabb48eb34ee9daaeffd8eb4c"; }; deps = { - "nan-1.0.0" = self.by-version."nan"."1.0.0"; + "nan-1.6.2" = self.by-version."nan"."1.6.2"; }; peerDependencies = []; }; @@ -17527,7 +18177,7 @@ "busboy-0.2.9" = self.by-version."busboy"."0.2.9"; "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; "qs-1.2.2" = self.by-version."qs"."1.2.2"; - "type-is-1.5.5" = self.by-version."type-is"."1.5.5"; + "type-is-1.5.7" = self.by-version."type-is"."1.5.7"; }; peerDependencies = []; }; @@ -17656,17 +18306,17 @@ peerDependencies = []; }; by-spec."mz"."1" = - self.by-version."mz"."1.2.1"; - by-version."mz"."1.2.1" = self.buildNodePackage { - name = "mz-1.2.1"; + self.by-version."mz"."1.3.0"; + by-version."mz"."1.3.0" = self.buildNodePackage { + name = "mz-1.3.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/mz/-/mz-1.2.1.tgz"; - name = "mz-1.2.1.tgz"; - sha1 = "a758a8012cb43b59e209596a0e124cfff87c6923"; + url = "http://registry.npmjs.org/mz/-/mz-1.3.0.tgz"; + name = "mz-1.3.0.tgz"; + sha1 = "06f093fdd9956a06d37e1b1e81344e27478c42f0"; }; deps = { - "native-or-bluebird-1.1.2" = self.by-version."native-or-bluebird"."1.1.2"; + "native-or-bluebird-1.2.0" = self.by-version."native-or-bluebird"."1.2.0"; "thenify-3.1.0" = self.by-version."thenify"."3.1.0"; "thenify-all-1.6.0" = self.by-version."thenify-all"."1.6.0"; }; @@ -17714,38 +18364,30 @@ }; peerDependencies = []; }; - by-spec."nan"."1.5.1" = - self.by-version."nan"."1.5.1"; - by-version."nan"."1.5.1" = self.buildNodePackage { - name = "nan-1.5.1"; + by-spec."nan"."1.6.2" = + self.by-version."nan"."1.6.2"; + by-version."nan"."1.6.2" = self.buildNodePackage { + name = "nan-1.6.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/nan/-/nan-1.5.1.tgz"; - name = "nan-1.5.1.tgz"; - sha1 = "a565e4d4143cb49afdd3fe07e4c8aeaa1e7e0603"; + url = "http://registry.npmjs.org/nan/-/nan-1.6.2.tgz"; + name = "nan-1.6.2.tgz"; + sha1 = "2657d1c43b00f1e847e083832285b7d8f5ba8ec8"; }; deps = { }; peerDependencies = []; }; + by-spec."nan"."1.6.x" = + self.by-version."nan"."1.6.2"; by-spec."nan".">=1.3.0" = - self.by-version."nan"."1.6.1"; - by-version."nan"."1.6.1" = self.buildNodePackage { - name = "nan-1.6.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/nan/-/nan-1.6.1.tgz"; - name = "nan-1.6.1.tgz"; - sha1 = "69bc50b2d727f3df01145a963f7d2e4da5ff9184"; - }; - deps = { - }; - peerDependencies = []; - }; + self.by-version."nan"."1.6.2"; by-spec."nan"."^1.3.0" = - self.by-version."nan"."1.6.1"; + self.by-version."nan"."1.6.2"; by-spec."nan"."^1.5.1" = - self.by-version."nan"."1.6.1"; + self.by-version."nan"."1.6.2"; + by-spec."nan"."^1.6.2" = + self.by-version."nan"."1.6.2"; by-spec."nan"."~0.3.0" = self.by-version."nan"."0.3.2"; by-version."nan"."0.3.2" = self.buildNodePackage { @@ -17802,8 +18444,6 @@ }; peerDependencies = []; }; - by-spec."nan"."~1.1.0" = - self.by-version."nan"."1.1.2"; by-spec."nan"."~1.2.0" = self.by-version."nan"."1.2.0"; by-version."nan"."1.2.0" = self.buildNodePackage { @@ -17818,22 +18458,6 @@ }; peerDependencies = []; }; - by-spec."nan"."~1.3.0" = - self.by-version."nan"."1.3.0"; - by-spec."nan"."~1.4.1" = - self.by-version."nan"."1.4.3"; - by-version."nan"."1.4.3" = self.buildNodePackage { - name = "nan-1.4.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/nan/-/nan-1.4.3.tgz"; - name = "nan-1.4.3.tgz"; - sha1 = "c56b5404698063696f597435f9163c312aea5009"; - }; - deps = { - }; - peerDependencies = []; - }; by-spec."nan"."~1.5.0" = self.by-version."nan"."1.5.3"; by-version."nan"."1.5.3" = self.buildNodePackage { @@ -17848,6 +18472,10 @@ }; peerDependencies = []; }; + by-spec."nan"."~1.5.3" = + self.by-version."nan"."1.5.3"; + by-spec."nan"."~1.6.2" = + self.by-version."nan"."1.6.2"; by-spec."native-buffer-browserify"."~2.0.0" = self.by-version."native-buffer-browserify"."2.0.17"; by-version."native-buffer-browserify"."2.0.17" = self.buildNodePackage { @@ -17877,7 +18505,7 @@ sha1 = "f7d2a3c5464bb6f09d9167e35a7350bd7ffe9b82"; }; deps = { - "ipaddr.js-0.1.6" = self.by-version."ipaddr.js"."0.1.6"; + "ipaddr.js-0.1.8" = self.by-version."ipaddr.js"."0.1.8"; "native-dns-cache-0.0.2" = self.by-version."native-dns-cache"."0.0.2"; "native-dns-packet-0.1.1" = self.by-version."native-dns-packet"."0.1.1"; }; @@ -17911,13 +18539,27 @@ }; deps = { "buffercursor-0.0.12" = self.by-version."buffercursor"."0.0.12"; - "ipaddr.js-0.1.6" = self.by-version."ipaddr.js"."0.1.6"; + "ipaddr.js-0.1.8" = self.by-version."ipaddr.js"."0.1.8"; }; peerDependencies = []; }; by-spec."native-dns-packet".">= 0.0.4" = self.by-version."native-dns-packet"."0.1.1"; by-spec."native-or-bluebird"."1" = + self.by-version."native-or-bluebird"."1.2.0"; + by-version."native-or-bluebird"."1.2.0" = self.buildNodePackage { + name = "native-or-bluebird-1.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/native-or-bluebird/-/native-or-bluebird-1.2.0.tgz"; + name = "native-or-bluebird-1.2.0.tgz"; + sha1 = "39c47bfd7825d1fb9ffad32210ae25daadf101c9"; + }; + deps = { + }; + peerDependencies = []; + }; + by-spec."native-or-bluebird"."~1.1.2" = self.by-version."native-or-bluebird"."1.1.2"; by-version."native-or-bluebird"."1.1.2" = self.buildNodePackage { name = "native-or-bluebird-1.1.2"; @@ -17931,8 +18573,6 @@ }; peerDependencies = []; }; - by-spec."native-or-bluebird"."~1.1.2" = - self.by-version."native-or-bluebird"."1.1.2"; by-spec."natural"."^0.2.0" = self.by-version."natural"."0.2.0"; by-version."natural"."0.2.0" = self.buildNodePackage { @@ -17962,7 +18602,7 @@ }; deps = { "async-0.9.0" = self.by-version."async"."0.9.0"; - "ini-1.3.2" = self.by-version."ini"."1.3.2"; + "ini-1.3.3" = self.by-version."ini"."1.3.3"; "optimist-0.6.1" = self.by-version."optimist"."0.6.1"; }; peerDependencies = []; @@ -17980,7 +18620,7 @@ }; deps = { "async-0.2.9" = self.by-version."async"."0.2.9"; - "ini-1.3.2" = self.by-version."ini"."1.3.2"; + "ini-1.3.3" = self.by-version."ini"."1.3.3"; "optimist-0.6.0" = self.by-version."optimist"."0.6.0"; }; peerDependencies = []; @@ -18015,7 +18655,9 @@ }; peerDependencies = []; }; - by-spec."ncp"."^0.6.0" = + by-spec."ncp"."~0.4.2" = + self.by-version."ncp"."0.4.2"; + by-spec."ncp"."~0.6.0" = self.by-version."ncp"."0.6.0"; by-version."ncp"."0.6.0" = self.buildNodePackage { name = "ncp-0.6.0"; @@ -18029,24 +18671,6 @@ }; peerDependencies = []; }; - by-spec."ncp"."~0.4.2" = - self.by-version."ncp"."0.4.2"; - by-spec."ncp"."~0.6.0" = - self.by-version."ncp"."0.6.0"; - by-spec."ncp"."~1.0.1" = - self.by-version."ncp"."1.0.1"; - by-version."ncp"."1.0.1" = self.buildNodePackage { - name = "ncp-1.0.1"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/ncp/-/ncp-1.0.1.tgz"; - name = "ncp-1.0.1.tgz"; - sha1 = "d15367e5cb87432ba117d2bf80fdf45aecfb4246"; - }; - deps = { - }; - peerDependencies = []; - }; by-spec."negotiator"."0.2.5" = self.by-version."negotiator"."0.2.5"; by-version."negotiator"."0.2.5" = self.buildNodePackage { @@ -18117,15 +18741,15 @@ }; peerDependencies = []; }; - by-spec."negotiator"."0.5.0" = - self.by-version."negotiator"."0.5.0"; - by-version."negotiator"."0.5.0" = self.buildNodePackage { - name = "negotiator-0.5.0"; + by-spec."negotiator"."0.5.1" = + self.by-version."negotiator"."0.5.1"; + by-version."negotiator"."0.5.1" = self.buildNodePackage { + name = "negotiator-0.5.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/negotiator/-/negotiator-0.5.0.tgz"; - name = "negotiator-0.5.0.tgz"; - sha1 = "bb77b3139d80d9b1ee8c913520a18b0d475b1b90"; + url = "http://registry.npmjs.org/negotiator/-/negotiator-0.5.1.tgz"; + name = "negotiator-0.5.1.tgz"; + sha1 = "498f661c522470153c6086ac83019cb3eb66f61c"; }; deps = { }; @@ -18260,7 +18884,7 @@ sha1 = "74f20eca49ebf940799fac44bcb224321582cf98"; }; deps = { - "adm-zip-0.4.4" = self.by-version."adm-zip"."0.4.4"; + "adm-zip-0.4.7" = self.by-version."adm-zip"."0.4.7"; "async-0.2.10" = self.by-version."async"."0.2.10"; "colors-0.6.2" = self.by-version."colors"."0.6.2"; "diff-1.0.8" = self.by-version."diff"."1.0.8"; @@ -18309,27 +18933,28 @@ peerDependencies = []; }; by-spec."node-expat"."*" = - self.by-version."node-expat"."2.3.4"; - by-version."node-expat"."2.3.4" = self.buildNodePackage { - name = "node-expat-2.3.4"; + self.by-version."node-expat"."2.3.6"; + by-version."node-expat"."2.3.6" = self.buildNodePackage { + name = "node-expat-2.3.6"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/node-expat/-/node-expat-2.3.4.tgz"; - name = "node-expat-2.3.4.tgz"; - sha1 = "f2659ee57ca6226d0d0a3957eeae71c1b3f67f61"; + url = "http://registry.npmjs.org/node-expat/-/node-expat-2.3.6.tgz"; + name = "node-expat-2.3.6.tgz"; + sha1 = "b934025a9fc48b91557bb618cf3f4603a1eeb48c"; }; deps = { "bindings-1.2.1" = self.by-version."bindings"."1.2.1"; "debug-2.1.1" = self.by-version."debug"."2.1.1"; - "nan-1.4.3" = self.by-version."nan"."1.4.3"; + "iconv-2.1.6" = self.by-version."iconv"."2.1.6"; + "nan-1.6.2" = self.by-version."nan"."1.6.2"; }; peerDependencies = []; }; - "node-expat" = self.by-version."node-expat"."2.3.4"; + "node-expat" = self.by-version."node-expat"."2.3.6"; by-spec."node-expat".">=1.4.1" = - self.by-version."node-expat"."2.3.4"; + self.by-version."node-expat"."2.3.6"; by-spec."node-expat"."^2.3.0" = - self.by-version."node-expat"."2.3.4"; + self.by-version."node-expat"."2.3.6"; by-spec."node-expat"."~2.1.4" = self.by-version."node-expat"."2.1.4"; by-version."node-expat"."2.1.4" = self.buildNodePackage { @@ -18346,9 +18971,9 @@ peerDependencies = []; }; by-spec."node-expat"."~2.3.0" = - self.by-version."node-expat"."2.3.4"; + self.by-version."node-expat"."2.3.6"; by-spec."node-expat"."~2.3.1" = - self.by-version."node-expat"."2.3.4"; + self.by-version."node-expat"."2.3.6"; by-spec."node-fs"."^0.1.7" = self.by-version."node-fs"."0.1.7"; by-version."node-fs"."0.1.7" = self.buildNodePackage { @@ -18375,16 +19000,16 @@ }; deps = { "fstream-1.0.4" = self.by-version."fstream"."1.0.4"; - "glob-4.3.5" = self.by-version."glob"."4.3.5"; + "glob-4.4.0" = self.by-version."glob"."4.4.0"; "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "nopt-3.0.1" = self.by-version."nopt"."3.0.1"; "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1"; "osenv-0.1.0" = self.by-version."osenv"."0.1.0"; - "request-2.51.0" = self.by-version."request"."2.51.0"; + "request-2.53.0" = self.by-version."request"."2.53.0"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; - "semver-4.2.0" = self.by-version."semver"."4.2.0"; + "semver-4.3.0" = self.by-version."semver"."4.3.0"; "tar-1.0.3" = self.by-version."tar"."1.0.3"; "which-1.0.8" = self.by-version."which"."1.0.8"; }; @@ -18406,7 +19031,7 @@ sha1 = "2eac57771973c6eb49100ef4c9caa6ae0bcd8911"; }; deps = { - "express-4.11.1" = self.by-version."express"."4.11.1"; + "express-4.11.2" = self.by-version."express"."4.11.2"; "serve-favicon-2.2.0" = self.by-version."serve-favicon"."2.2.0"; "async-0.9.0" = self.by-version."async"."0.9.0"; "glob-3.2.11" = self.by-version."glob"."3.2.11"; @@ -18417,8 +19042,8 @@ "opener-1.4.0" = self.by-version."opener"."1.4.0"; "yargs-1.3.3" = self.by-version."yargs"."1.3.3"; "which-1.0.8" = self.by-version."which"."1.0.8"; - "v8-debug-0.3.3" = self.by-version."v8-debug"."0.3.3"; - "v8-profiler-5.2.2" = self.by-version."v8-profiler"."5.2.2"; + "v8-debug-0.3.5" = self.by-version."v8-debug"."0.3.5"; + "v8-profiler-5.2.3" = self.by-version."v8-profiler"."5.2.3"; "semver-3.0.1" = self.by-version."semver"."3.0.1"; }; peerDependencies = []; @@ -18438,29 +19063,31 @@ }; peerDependencies = []; }; - by-spec."node-pre-gyp"."^0.5.0" = - self.by-version."node-pre-gyp"."0.5.31"; - by-version."node-pre-gyp"."0.5.31" = self.buildNodePackage { - name = "node-pre-gyp-0.5.31"; + by-spec."node-pre-gyp"."^0.6.0" = + self.by-version."node-pre-gyp"."0.6.4"; + by-version."node-pre-gyp"."0.6.4" = self.buildNodePackage { + name = "node-pre-gyp-0.6.4"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.5.31.tgz"; - name = "node-pre-gyp-0.5.31.tgz"; - sha1 = "8c91516f0009e4691413c8c3f2d8a060deb607ba"; + url = "http://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.4.tgz"; + name = "node-pre-gyp-0.6.4.tgz"; + sha1 = "86a32ba4073b2735087f7eacb47979af6c70ce08"; }; deps = { "nopt-3.0.1" = self.by-version."nopt"."3.0.1"; - "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1"; - "request-2.51.0" = self.by-version."request"."2.51.0"; - "semver-4.1.1" = self.by-version."semver"."4.1.1"; + "npmlog-1.1.0" = self.by-version."npmlog"."1.1.0"; + "request-2.53.0" = self.by-version."request"."2.53.0"; + "semver-4.3.0" = self.by-version."semver"."4.3.0"; "tar-1.0.3" = self.by-version."tar"."1.0.3"; "tar-pack-2.0.0" = self.by-version."tar-pack"."2.0.0"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; - "rc-0.5.5" = self.by-version."rc"."0.5.5"; + "rc-0.6.0" = self.by-version."rc"."0.6.0"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; }; peerDependencies = []; }; + by-spec."node-pre-gyp"."^0.6.2" = + self.by-version."node-pre-gyp"."0.6.4"; by-spec."node-protobuf"."*" = self.by-version."node-protobuf"."1.2.2"; by-version."node-protobuf"."1.2.2" = self.buildNodePackage { @@ -18473,11 +19100,28 @@ }; deps = { "bindings-1.2.1" = self.by-version."bindings"."1.2.1"; - "nan-1.6.1" = self.by-version."nan"."1.6.1"; + "nan-1.6.2" = self.by-version."nan"."1.6.2"; }; peerDependencies = []; }; "node-protobuf" = self.by-version."node-protobuf"."1.2.2"; + by-spec."node-ssdp"."^2.0.1" = + self.by-version."node-ssdp"."2.0.1"; + by-version."node-ssdp"."2.0.1" = self.buildNodePackage { + name = "node-ssdp-2.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/node-ssdp/-/node-ssdp-2.0.1.tgz"; + name = "node-ssdp-2.0.1.tgz"; + sha1 = "9d78eb7bba74305585ec20d929cd1f0c8b436883"; + }; + deps = { + "ip-0.3.2" = self.by-version."ip"."0.3.2"; + "bunyan-prettystream-0.1.3" = self.by-version."bunyan-prettystream"."0.1.3"; + "bunyan-0.22.3" = self.by-version."bunyan"."0.22.3"; + }; + peerDependencies = []; + }; by-spec."node-stringprep"."*" = self.by-version."node-stringprep"."0.7.0"; by-version."node-stringprep"."0.7.0" = self.buildNodePackage { @@ -18491,7 +19135,7 @@ deps = { "bindings-1.2.1" = self.by-version."bindings"."1.2.1"; "debug-2.0.0" = self.by-version."debug"."2.0.0"; - "nan-1.6.1" = self.by-version."nan"."1.6.1"; + "nan-1.6.2" = self.by-version."nan"."1.6.2"; }; peerDependencies = []; }; @@ -18513,6 +19157,8 @@ }; peerDependencies = []; }; + by-spec."node-stringprep"."^0.7.0" = + self.by-version."node-stringprep"."0.7.0"; by-spec."node-stringprep"."~0.2.0" = self.by-version."node-stringprep"."0.2.3"; by-version."node-stringprep"."0.2.3" = self.buildNodePackage { @@ -18683,7 +19329,7 @@ sha1 = "9abf1dd3b20a3ab0a38f899c882c218d734e8a7b"; }; deps = { - "xml2js-0.4.4" = self.by-version."xml2js"."0.4.4"; + "xml2js-0.4.5" = self.by-version."xml2js"."0.4.5"; }; peerDependencies = []; }; @@ -18698,15 +19344,15 @@ sha1 = "349041a9041d3bcc608cdbf57e60f5b301e7a8c0"; }; deps = { - "node-expat-2.3.4" = self.by-version."node-expat"."2.3.4"; - "ltx-0.8.0" = self.by-version."ltx"."0.8.0"; - "request-2.51.0" = self.by-version."request"."2.51.0"; + "node-expat-2.3.6" = self.by-version."node-expat"."2.3.6"; + "ltx-0.9.0" = self.by-version."ltx"."0.9.0"; + "request-2.53.0" = self.by-version."request"."2.53.0"; "browser-request-0.3.3" = self.by-version."browser-request"."0.3.3"; "faye-websocket-0.9.2" = self.by-version."faye-websocket"."0.9.2"; "browserify-3.19.1" = self.by-version."browserify"."3.19.1"; "brfs-0.0.8" = self.by-version."brfs"."0.0.8"; "node-xmpp-component-1.0.0-alpha1" = self.by-version."node-xmpp-component"."1.0.0-alpha1"; - "node-xmpp-client-1.0.0-alpha19" = self.by-version."node-xmpp-client"."1.0.0-alpha19"; + "node-xmpp-client-1.0.0-alpha20" = self.by-version."node-xmpp-client"."1.0.0-alpha20"; "node-xmpp-server-1.0.0-alpha11" = self.by-version."node-xmpp-server"."1.0.0-alpha11"; "node-xmpp-core-1.0.0-alpha13" = self.by-version."node-xmpp-core"."1.0.0-alpha13"; }; @@ -18724,9 +19370,9 @@ sha1 = "b4e1adf6b4ea859f0d06e12daca9f850286cbb14"; }; deps = { - "node-expat-2.3.4" = self.by-version."node-expat"."2.3.4"; - "ltx-0.8.0" = self.by-version."ltx"."0.8.0"; - "request-2.51.0" = self.by-version."request"."2.51.0"; + "node-expat-2.3.6" = self.by-version."node-expat"."2.3.6"; + "ltx-0.9.0" = self.by-version."ltx"."0.9.0"; + "request-2.53.0" = self.by-version."request"."2.53.0"; "browser-request-0.3.3" = self.by-version."browser-request"."0.3.3"; "faye-websocket-0.9.2" = self.by-version."faye-websocket"."0.9.2"; "browserify-3.19.1" = self.by-version."browserify"."3.19.1"; @@ -18760,14 +19406,14 @@ }; "node-xmpp-client" = self.by-version."node-xmpp-client"."1.0.0-alpha9"; by-spec."node-xmpp-client"."git+https://github.com/node-xmpp/node-xmpp-client.git" = - self.by-version."node-xmpp-client"."1.0.0-alpha19"; - by-version."node-xmpp-client"."1.0.0-alpha19" = self.buildNodePackage { - name = "node-xmpp-client-1.0.0-alpha19"; + self.by-version."node-xmpp-client"."1.0.0-alpha20"; + by-version."node-xmpp-client"."1.0.0-alpha20" = self.buildNodePackage { + name = "node-xmpp-client-1.0.0-alpha20"; bin = false; src = fetchgit { url = "https://github.com/node-xmpp/node-xmpp-client.git"; - rev = "74bf98a62700bee8e32ba7723abd35320917b8d7"; - sha256 = "7dd69c6b8a4b8d7fef0109432c5b8add5560c9a108955b0adce7ee29507b5a26"; + rev = "68bd565dc08da50e2806533a1f616bca6fc853fd"; + sha256 = "9881cf6999293783d5c0459e53ecbf9adf5bfdbcf00cf668b67368ddd1aa4caf"; }; deps = { "request-2.48.0" = self.by-version."request"."2.48.0"; @@ -18809,7 +19455,7 @@ sha1 = "3f85da00c05240bd48cc6c729d74875e6eb97877"; }; deps = { - "ltx-0.8.0" = self.by-version."ltx"."0.8.0"; + "ltx-0.9.0" = self.by-version."ltx"."0.9.0"; "node-xmpp-core-1.0.0-alpha1" = self.by-version."node-xmpp-core"."1.0.0-alpha1"; }; peerDependencies = []; @@ -18867,12 +19513,12 @@ "node-stringprep-0.7.0" = self.by-version."node-stringprep"."0.7.0"; "reconnect-core-0.0.1" = self.by-version."reconnect-core"."0.0.1"; "tls-connect-0.2.2" = self.by-version."tls-connect"."0.2.2"; - "ltx-0.8.0" = self.by-version."ltx"."0.8.0"; + "ltx-0.9.0" = self.by-version."ltx"."0.9.0"; "debug-0.8.1" = self.by-version."debug"."0.8.1"; }; peerDependencies = []; }; - by-spec."node-xmpp-core"."^1.0.0-alpha10" = + by-spec."node-xmpp-core"."^1.0.0-alpha13" = self.by-version."node-xmpp-core"."1.0.0-alpha9"; by-spec."node-xmpp-core"."^1.0.0-alpha6" = self.by-version."node-xmpp-core"."1.0.0-alpha9"; @@ -18885,15 +19531,15 @@ bin = false; src = fetchgit { url = "https://github.com/node-xmpp/node-xmpp-core.git"; - rev = "18a2542664cae823fff404c5b6e79a31c58b52b2"; - sha256 = "6278c890a76613e02676ce6df946f4415e441d279d3fd9af803489c51280a7f0"; + rev = "f90ae47cc977aeb52d343a7c7286aac94439dfeb"; + sha256 = "0434a31d0e68ad4b02c66940571e7a0fed21bb488c3f246f1c4168092c60680c"; }; deps = { - "node-stringprep-0.5.4" = self.by-version."node-stringprep"."0.5.4"; + "node-stringprep-0.7.0" = self.by-version."node-stringprep"."0.7.0"; "reconnect-core-0.0.1" = self.by-version."reconnect-core"."0.0.1"; "tls-connect-0.2.2" = self.by-version."tls-connect"."0.2.2"; - "ltx-0.7.2" = self.by-version."ltx"."0.7.2"; - "debug-0.8.1" = self.by-version."debug"."0.8.1"; + "ltx-0.9.0" = self.by-version."ltx"."0.9.0"; + "debug-2.1.1" = self.by-version."debug"."2.1.1"; }; peerDependencies = []; }; @@ -18927,7 +19573,7 @@ sha1 = "d6d4fce1148f3fa158ed2a381787c51be3168fff"; }; deps = { - "node-expat-2.3.4" = self.by-version."node-expat"."2.3.4"; + "node-expat-2.3.6" = self.by-version."node-expat"."2.3.6"; "node-xmpp-0.15.0" = self.by-version."node-xmpp"."0.15.0"; "node-stringprep-0.6.2" = self.by-version."node-stringprep"."0.6.2"; "ltx-0.6.0" = self.by-version."ltx"."0.6.0"; @@ -18963,13 +19609,14 @@ bin = false; src = fetchgit { url = "https://github.com/node-xmpp/node-xmpp-server.git"; - rev = "bc82930d1396c259610603742849bce165b74f58"; - sha256 = "513927fee92aa81493e16686dedd49ea2946ee978dc23308a2b104bcef9f3b8d"; + rev = "1d4103d7b784a79c1c6b242e479533f4d3b4745e"; + sha256 = "7816f60125b151430c0c38573f9adb493c75fe2f44cd41d89f0c6749a8aa6907"; }; deps = { "hat-0.0.3" = self.by-version."hat"."0.0.3"; "node-xmpp-core-1.0.0-alpha9" = self.by-version."node-xmpp-core"."1.0.0-alpha9"; - "debug-0.7.4" = self.by-version."debug"."0.7.4"; + "debug-2.1.1" = self.by-version."debug"."2.1.1"; + "ws-0.7.1" = self.by-version."ws"."0.7.1"; }; peerDependencies = []; }; @@ -19032,7 +19679,7 @@ }; deps = { "mailcomposer-0.2.12" = self.by-version."mailcomposer"."0.2.12"; - "simplesmtp-0.3.34" = self.by-version."simplesmtp"."0.3.34"; + "simplesmtp-0.3.35" = self.by-version."simplesmtp"."0.3.35"; "optimist-0.6.1" = self.by-version."optimist"."0.6.1"; }; peerDependencies = []; @@ -19049,7 +19696,7 @@ }; deps = { "mailcomposer-0.2.12" = self.by-version."mailcomposer"."0.2.12"; - "simplesmtp-0.3.34" = self.by-version."simplesmtp"."0.3.34"; + "simplesmtp-0.3.35" = self.by-version."simplesmtp"."0.3.35"; "directmail-0.1.8" = self.by-version."directmail"."0.1.8"; "he-0.3.6" = self.by-version."he"."0.3.6"; "public-address-0.1.1" = self.by-version."public-address"."0.1.1"; @@ -19059,24 +19706,24 @@ peerDependencies = []; }; by-spec."nodemon"."*" = - self.by-version."nodemon"."1.3.2"; - by-version."nodemon"."1.3.2" = self.buildNodePackage { - name = "nodemon-1.3.2"; + self.by-version."nodemon"."1.3.7"; + by-version."nodemon"."1.3.7" = self.buildNodePackage { + name = "nodemon-1.3.7"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/nodemon/-/nodemon-1.3.2.tgz"; - name = "nodemon-1.3.2.tgz"; - sha1 = "9d54b0731bb2ce213169ebffd5bed9ea988ae9d8"; + url = "http://registry.npmjs.org/nodemon/-/nodemon-1.3.7.tgz"; + name = "nodemon-1.3.7.tgz"; + sha1 = "447bc2e01bf499cbf5853f9937496e0a04835449"; }; deps = { - "touch-0.0.3" = self.by-version."touch"."0.0.3"; "minimatch-0.3.0" = self.by-version."minimatch"."0.3.0"; "ps-tree-0.0.3" = self.by-version."ps-tree"."0.0.3"; - "update-notifier-0.1.10" = self.by-version."update-notifier"."0.1.10"; + "touch-0.0.3" = self.by-version."touch"."0.0.3"; + "update-notifier-0.3.0" = self.by-version."update-notifier"."0.3.0"; }; peerDependencies = []; }; - "nodemon" = self.by-version."nodemon"."1.3.2"; + "nodemon" = self.by-version."nodemon"."1.3.7"; by-spec."nomnom"."1.6.x" = self.by-version."nomnom"."1.6.2"; by-version."nomnom"."1.6.2" = self.buildNodePackage { @@ -19207,7 +19854,7 @@ deps = { "github-url-from-git-1.4.0" = self.by-version."github-url-from-git"."1.4.0"; "github-url-from-username-repo-1.0.2" = self.by-version."github-url-from-username-repo"."1.0.2"; - "semver-4.2.0" = self.by-version."semver"."4.2.0"; + "semver-4.3.0" = self.by-version."semver"."4.3.0"; }; peerDependencies = []; }; @@ -19216,14 +19863,14 @@ by-spec."normalize-package-data"."~1.0.3" = self.by-version."normalize-package-data"."1.0.3"; by-spec."npm"."*" = - self.by-version."npm"."2.4.1"; - by-version."npm"."2.4.1" = self.buildNodePackage { - name = "npm-2.4.1"; + self.by-version."npm"."2.6.0"; + by-version."npm"."2.6.0" = self.buildNodePackage { + name = "npm-2.6.0"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/npm/-/npm-2.4.1.tgz"; - name = "npm-2.4.1.tgz"; - sha1 = "0212e03b8ade89bec6a59fc75bc2aa03f94f0f53"; + url = "http://registry.npmjs.org/npm/-/npm-2.6.0.tgz"; + name = "npm-2.6.0.tgz"; + sha1 = "94152624b041d3da3bf2764b1a49006f699a7dd8"; }; deps = { "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5"; @@ -19238,7 +19885,7 @@ "chmodr-0.1.0" = self.by-version."chmodr"."0.1.0"; "chownr-0.0.1" = self.by-version."chownr"."0.0.1"; "cmd-shim-2.0.1" = self.by-version."cmd-shim"."2.0.1"; - "columnify-1.3.2" = self.by-version."columnify"."1.3.2"; + "columnify-1.4.1" = self.by-version."columnify"."1.4.1"; "config-chain-1.1.8" = self.by-version."config-chain"."1.1.8"; "dezalgo-1.0.1" = self.by-version."dezalgo"."1.0.1"; "editor-0.1.0" = self.by-version."editor"."0.1.0"; @@ -19252,7 +19899,7 @@ "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; "inflight-1.0.4" = self.by-version."inflight"."1.0.4"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - "ini-1.3.2" = self.by-version."ini"."1.3.2"; + "ini-1.3.3" = self.by-version."ini"."1.3.3"; "init-package-json-1.2.0" = self.by-version."init-package-json"."1.2.0"; "lockfile-1.0.0" = self.by-version."lockfile"."1.0.0"; "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0"; @@ -19265,7 +19912,7 @@ "npm-cache-filename-1.0.1" = self.by-version."npm-cache-filename"."1.0.1"; "npm-install-checks-1.0.5" = self.by-version."npm-install-checks"."1.0.5"; "npm-package-arg-2.1.3" = self.by-version."npm-package-arg"."2.1.3"; - "npm-registry-client-6.0.3" = self.by-version."npm-registry-client"."6.0.3"; + "npm-registry-client-6.1.1" = self.by-version."npm-registry-client"."6.1.1"; "npm-user-validate-0.1.1" = self.by-version."npm-user-validate"."0.1.1"; "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1"; "once-1.3.1" = self.by-version."once"."1.3.1"; @@ -19274,13 +19921,13 @@ "path-is-inside-1.0.1" = self.by-version."path-is-inside"."1.0.1"; "read-1.0.5" = self.by-version."read"."1.0.5"; "read-installed-3.1.5" = self.by-version."read-installed"."3.1.5"; - "read-package-json-1.2.7" = self.by-version."read-package-json"."1.2.7"; + "read-package-json-1.3.1" = self.by-version."read-package-json"."1.3.1"; "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; "realize-package-specifier-1.3.0" = self.by-version."realize-package-specifier"."1.3.0"; - "request-2.51.0" = self.by-version."request"."2.51.0"; + "request-2.53.0" = self.by-version."request"."2.53.0"; "retry-0.6.1" = self.by-version."retry"."0.6.1"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; - "semver-4.2.0" = self.by-version."semver"."4.2.0"; + "semver-4.3.0" = self.by-version."semver"."4.3.0"; "sha-1.3.0" = self.by-version."sha"."1.3.0"; "slide-1.1.6" = self.by-version."slide"."1.1.6"; "sorted-object-1.0.0" = self.by-version."sorted-object"."1.0.0"; @@ -19294,7 +19941,7 @@ }; peerDependencies = []; }; - "npm" = self.by-version."npm"."2.4.1"; + "npm" = self.by-version."npm"."2.6.0"; by-spec."npm"."1.4.28" = self.by-version."npm"."1.4.28"; by-version."npm"."1.4.28" = self.buildNodePackage { @@ -19361,84 +20008,8 @@ }; peerDependencies = []; }; - by-spec."npm"."2.1.x" = - self.by-version."npm"."2.1.18"; - by-version."npm"."2.1.18" = self.buildNodePackage { - name = "npm-2.1.18"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/npm/-/npm-2.1.18.tgz"; - name = "npm-2.1.18.tgz"; - sha1 = "e2af4c5f848fb023851cd2ec129005d33090bd57"; - }; - deps = { - "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5"; - "ansi-0.3.0" = self.by-version."ansi"."0.3.0"; - "ansicolors-0.3.2" = self.by-version."ansicolors"."0.3.2"; - "ansistyles-0.1.3" = self.by-version."ansistyles"."0.1.3"; - "archy-1.0.0" = self.by-version."archy"."1.0.0"; - "async-some-1.0.1" = self.by-version."async-some"."1.0.1"; - "block-stream-0.0.7" = self.by-version."block-stream"."0.0.7"; - "char-spinner-1.0.1" = self.by-version."char-spinner"."1.0.1"; - "child-process-close-0.1.1" = self.by-version."child-process-close"."0.1.1"; - "chmodr-0.1.0" = self.by-version."chmodr"."0.1.0"; - "chownr-0.0.1" = self.by-version."chownr"."0.0.1"; - "cmd-shim-2.0.1" = self.by-version."cmd-shim"."2.0.1"; - "columnify-1.3.2" = self.by-version."columnify"."1.3.2"; - "config-chain-1.1.8" = self.by-version."config-chain"."1.1.8"; - "dezalgo-1.0.1" = self.by-version."dezalgo"."1.0.1"; - "editor-0.1.0" = self.by-version."editor"."0.1.0"; - "fs-vacuum-1.2.5" = self.by-version."fs-vacuum"."1.2.5"; - "fs-write-stream-atomic-1.0.2" = self.by-version."fs-write-stream-atomic"."1.0.2"; - "fstream-1.0.4" = self.by-version."fstream"."1.0.4"; - "fstream-npm-1.0.1" = self.by-version."fstream-npm"."1.0.1"; - "github-url-from-git-1.4.0" = self.by-version."github-url-from-git"."1.4.0"; - "github-url-from-username-repo-1.0.2" = self.by-version."github-url-from-username-repo"."1.0.2"; - "glob-4.3.5" = self.by-version."glob"."4.3.5"; - "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; - "inflight-1.0.4" = self.by-version."inflight"."1.0.4"; - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - "ini-1.3.2" = self.by-version."ini"."1.3.2"; - "init-package-json-1.1.3" = self.by-version."init-package-json"."1.1.3"; - "lockfile-1.0.0" = self.by-version."lockfile"."1.0.0"; - "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0"; - "minimatch-2.0.1" = self.by-version."minimatch"."2.0.1"; - "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; - "node-gyp-1.0.2" = self.by-version."node-gyp"."1.0.2"; - "nopt-3.0.1" = self.by-version."nopt"."3.0.1"; - "normalize-git-url-1.0.0" = self.by-version."normalize-git-url"."1.0.0"; - "normalize-package-data-1.0.3" = self.by-version."normalize-package-data"."1.0.3"; - "npm-cache-filename-1.0.1" = self.by-version."npm-cache-filename"."1.0.1"; - "npm-install-checks-1.0.5" = self.by-version."npm-install-checks"."1.0.5"; - "npm-package-arg-2.1.3" = self.by-version."npm-package-arg"."2.1.3"; - "npm-registry-client-4.0.5" = self.by-version."npm-registry-client"."4.0.5"; - "npm-user-validate-0.1.1" = self.by-version."npm-user-validate"."0.1.1"; - "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1"; - "once-1.3.1" = self.by-version."once"."1.3.1"; - "opener-1.4.0" = self.by-version."opener"."1.4.0"; - "osenv-0.1.0" = self.by-version."osenv"."0.1.0"; - "path-is-inside-1.0.1" = self.by-version."path-is-inside"."1.0.1"; - "read-1.0.5" = self.by-version."read"."1.0.5"; - "read-installed-3.1.5" = self.by-version."read-installed"."3.1.5"; - "read-package-json-1.2.7" = self.by-version."read-package-json"."1.2.7"; - "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; - "realize-package-specifier-1.3.0" = self.by-version."realize-package-specifier"."1.3.0"; - "request-2.51.0" = self.by-version."request"."2.51.0"; - "retry-0.6.1" = self.by-version."retry"."0.6.1"; - "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; - "semver-4.2.0" = self.by-version."semver"."4.2.0"; - "sha-1.3.0" = self.by-version."sha"."1.3.0"; - "slide-1.1.6" = self.by-version."slide"."1.1.6"; - "sorted-object-1.0.0" = self.by-version."sorted-object"."1.0.0"; - "tar-1.0.3" = self.by-version."tar"."1.0.3"; - "text-table-0.2.0" = self.by-version."text-table"."0.2.0"; - "uid-number-0.0.6" = self.by-version."uid-number"."0.0.6"; - "which-1.0.8" = self.by-version."which"."1.0.8"; - "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1"; - "write-file-atomic-1.1.0" = self.by-version."write-file-atomic"."1.1.0"; - }; - peerDependencies = []; - }; + by-spec."npm"."^2.5.1" = + self.by-version."npm"."2.6.0"; by-spec."npm-cache-filename"."^1.0.0" = self.by-version."npm-cache-filename"."1.0.1"; by-version."npm-cache-filename"."1.0.1" = self.buildNodePackage { @@ -19456,27 +20027,28 @@ by-spec."npm-cache-filename"."~1.0.1" = self.by-version."npm-cache-filename"."1.0.1"; by-spec."npm-check-updates"."*" = - self.by-version."npm-check-updates"."1.5.0"; - by-version."npm-check-updates"."1.5.0" = self.buildNodePackage { - name = "npm-check-updates-1.5.0"; + self.by-version."npm-check-updates"."2.0.0-alpha6"; + by-version."npm-check-updates"."2.0.0-alpha6" = self.buildNodePackage { + name = "npm-check-updates-2.0.0-alpha6"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/npm-check-updates/-/npm-check-updates-1.5.0.tgz"; - name = "npm-check-updates-1.5.0.tgz"; - sha1 = "99cecb1f9e8321047a90b418dfdb8828a8c0ad9c"; + url = "http://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.0.0-alpha6.tgz"; + name = "npm-check-updates-2.0.0-alpha6.tgz"; + sha1 = "cc9a00208db31af606ed6bd018ed9354fac23f02"; }; deps = { "async-0.9.0" = self.by-version."async"."0.9.0"; - "cint-8.1.0" = self.by-version."cint"."8.1.0"; - "commander-2.5.1" = self.by-version."commander"."2.5.1"; - "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; - "npm-2.1.18" = self.by-version."npm"."2.1.18"; - "read-package-json-1.2.7" = self.by-version."read-package-json"."1.2.7"; - "semver-4.1.1" = self.by-version."semver"."4.1.1"; + "cint-8.2.1" = self.by-version."cint"."8.2.1"; + "closest-package-1.0.0" = self.by-version."closest-package"."1.0.0"; + "commander-2.6.0" = self.by-version."commander"."2.6.0"; + "lodash-3.2.0" = self.by-version."lodash"."3.2.0"; + "npm-2.6.0" = self.by-version."npm"."2.6.0"; + "read-package-json-1.3.1" = self.by-version."read-package-json"."1.3.1"; + "semver-4.3.0" = self.by-version."semver"."4.3.0"; }; peerDependencies = []; }; - "npm-check-updates" = self.by-version."npm-check-updates"."1.5.0"; + "npm-check-updates" = self.by-version."npm-check-updates"."2.0.0-alpha6"; by-spec."npm-install-checks"."~1.0.2" = self.by-version."npm-install-checks"."1.0.5"; by-version."npm-install-checks"."1.0.5" = self.buildNodePackage { @@ -19488,8 +20060,8 @@ sha1 = "a1b5beabfd60e0535b14f763157c410cb6bdae56"; }; deps = { - "npmlog-1.0.0" = self.by-version."npmlog"."1.0.0"; - "semver-4.2.0" = self.by-version."semver"."4.2.0"; + "npmlog-1.1.0" = self.by-version."npmlog"."1.1.0"; + "semver-4.3.0" = self.by-version."semver"."4.3.0"; }; peerDependencies = []; }; @@ -19506,23 +20078,23 @@ sha1 = "dfba34bd82dd327c10cb43a65c8db6ef0b812bf7"; }; deps = { - "semver-4.2.0" = self.by-version."semver"."4.2.0"; + "semver-4.3.0" = self.by-version."semver"."4.3.0"; }; peerDependencies = []; }; by-spec."npm-package-arg"."^3.0.0" = - self.by-version."npm-package-arg"."3.0.0"; - by-version."npm-package-arg"."3.0.0" = self.buildNodePackage { - name = "npm-package-arg-3.0.0"; + self.by-version."npm-package-arg"."3.1.0"; + by-version."npm-package-arg"."3.1.0" = self.buildNodePackage { + name = "npm-package-arg-3.1.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/npm-package-arg/-/npm-package-arg-3.0.0.tgz"; - name = "npm-package-arg-3.0.0.tgz"; - sha1 = "84e91836fa2e4e35ae26dc984440b1e5b5aee1ee"; + url = "http://registry.npmjs.org/npm-package-arg/-/npm-package-arg-3.1.0.tgz"; + name = "npm-package-arg-3.1.0.tgz"; + sha1 = "8ce9d8ad83ae9fcc433783ca813e4e91f885703e"; }; deps = { "hosted-git-info-1.5.3" = self.by-version."hosted-git-info"."1.5.3"; - "semver-4.2.0" = self.by-version."semver"."4.2.0"; + "semver-4.3.0" = self.by-version."semver"."4.3.0"; }; peerDependencies = []; }; @@ -19539,7 +20111,7 @@ sha1 = "8f338189d32769267886a07ad7b7fd2267446adf"; }; deps = { - "request-2.51.0" = self.by-version."request"."2.51.0"; + "request-2.53.0" = self.by-version."request"."2.53.0"; "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3"; "semver-2.0.11" = self.by-version."semver"."2.0.11"; "slide-1.1.6" = self.by-version."slide"."1.1.6"; @@ -19548,7 +20120,7 @@ "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; "retry-0.6.0" = self.by-version."retry"."0.6.0"; "couch-login-0.1.20" = self.by-version."couch-login"."0.1.20"; - "npmlog-1.0.0" = self.by-version."npmlog"."1.0.0"; + "npmlog-1.1.0" = self.by-version."npmlog"."1.1.0"; }; peerDependencies = []; }; @@ -19567,12 +20139,12 @@ "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "npm-cache-filename-1.0.1" = self.by-version."npm-cache-filename"."1.0.1"; - "request-2.51.0" = self.by-version."request"."2.51.0"; + "request-2.53.0" = self.by-version."request"."2.53.0"; "retry-0.6.0" = self.by-version."retry"."0.6.0"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; "semver-2.3.2" = self.by-version."semver"."2.3.2"; "slide-1.1.6" = self.by-version."slide"."1.1.6"; - "npmlog-1.0.0" = self.by-version."npmlog"."1.0.0"; + "npmlog-1.1.0" = self.by-version."npmlog"."1.1.0"; }; peerDependencies = []; }; @@ -19593,26 +20165,24 @@ "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "normalize-package-data-1.0.3" = self.by-version."normalize-package-data"."1.0.3"; "once-1.3.1" = self.by-version."once"."1.3.1"; - "request-2.51.0" = self.by-version."request"."2.51.0"; + "request-2.53.0" = self.by-version."request"."2.53.0"; "retry-0.6.1" = self.by-version."retry"."0.6.1"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; - "semver-4.2.0" = self.by-version."semver"."4.2.0"; + "semver-4.3.0" = self.by-version."semver"."4.3.0"; "slide-1.1.6" = self.by-version."slide"."1.1.6"; - "npmlog-1.0.0" = self.by-version."npmlog"."1.0.0"; + "npmlog-1.1.0" = self.by-version."npmlog"."1.1.0"; }; peerDependencies = []; }; - by-spec."npm-registry-client"."~4.0.5" = - self.by-version."npm-registry-client"."4.0.5"; - by-spec."npm-registry-client"."~6.0.3" = - self.by-version."npm-registry-client"."6.0.3"; - by-version."npm-registry-client"."6.0.3" = self.buildNodePackage { - name = "npm-registry-client-6.0.3"; + by-spec."npm-registry-client"."~6.1.1" = + self.by-version."npm-registry-client"."6.1.1"; + by-version."npm-registry-client"."6.1.1" = self.buildNodePackage { + name = "npm-registry-client-6.1.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-6.0.3.tgz"; - name = "npm-registry-client-6.0.3.tgz"; - sha1 = "ae19f33b1cd6b4f5e81b7614bde7b97393c57cdc"; + url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-6.1.1.tgz"; + name = "npm-registry-client-6.1.1.tgz"; + sha1 = "ffc74d9d85f3228fcd21a7eaad8a8ed134a5dddb"; }; deps = { "chownr-0.0.1" = self.by-version."chownr"."0.0.1"; @@ -19620,14 +20190,14 @@ "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "normalize-package-data-1.0.3" = self.by-version."normalize-package-data"."1.0.3"; - "npm-package-arg-3.0.0" = self.by-version."npm-package-arg"."3.0.0"; + "npm-package-arg-3.1.0" = self.by-version."npm-package-arg"."3.1.0"; "once-1.3.1" = self.by-version."once"."1.3.1"; - "request-2.51.0" = self.by-version."request"."2.51.0"; + "request-2.53.0" = self.by-version."request"."2.53.0"; "retry-0.6.1" = self.by-version."retry"."0.6.1"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; - "semver-4.2.0" = self.by-version."semver"."4.2.0"; + "semver-4.3.0" = self.by-version."semver"."4.3.0"; "slide-1.1.6" = self.by-version."slide"."1.1.6"; - "npmlog-1.0.0" = self.by-version."npmlog"."1.0.0"; + "npmlog-1.1.0" = self.by-version."npmlog"."1.1.0"; }; peerDependencies = []; }; @@ -19666,7 +20236,7 @@ "temp-0.6.0" = self.by-version."temp"."0.6.0"; "fs.extra-1.3.2" = self.by-version."fs.extra"."1.3.2"; "findit-1.2.0" = self.by-version."findit"."1.2.0"; - "coffee-script-1.8.0" = self.by-version."coffee-script"."1.8.0"; + "coffee-script-1.9.0" = self.by-version."coffee-script"."1.9.0"; }; peerDependencies = []; }; @@ -19728,12 +20298,12 @@ deps = { "config-chain-1.1.8" = self.by-version."config-chain"."1.1.8"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - "ini-1.3.2" = self.by-version."ini"."1.3.2"; + "ini-1.3.3" = self.by-version."ini"."1.3.3"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "nopt-3.0.1" = self.by-version."nopt"."3.0.1"; "once-1.3.1" = self.by-version."once"."1.3.1"; "osenv-0.1.0" = self.by-version."osenv"."0.1.0"; - "semver-4.2.0" = self.by-version."semver"."4.2.0"; + "semver-4.3.0" = self.by-version."semver"."4.3.0"; "uid-number-0.0.5" = self.by-version."uid-number"."0.0.5"; }; peerDependencies = []; @@ -19751,12 +20321,12 @@ deps = { "config-chain-1.1.8" = self.by-version."config-chain"."1.1.8"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - "ini-1.3.2" = self.by-version."ini"."1.3.2"; + "ini-1.3.3" = self.by-version."ini"."1.3.3"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "nopt-3.0.1" = self.by-version."nopt"."3.0.1"; "once-1.3.1" = self.by-version."once"."1.3.1"; "osenv-0.1.0" = self.by-version."osenv"."0.1.0"; - "semver-4.2.0" = self.by-version."semver"."4.2.0"; + "semver-4.3.0" = self.by-version."semver"."4.3.0"; "uid-number-0.0.5" = self.by-version."uid-number"."0.0.5"; }; peerDependencies = []; @@ -19776,7 +20346,7 @@ deps = { "config-chain-1.1.8" = self.by-version."config-chain"."1.1.8"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - "ini-1.3.2" = self.by-version."ini"."1.3.2"; + "ini-1.3.3" = self.by-version."ini"."1.3.3"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "nopt-3.0.1" = self.by-version."nopt"."3.0.1"; "once-1.3.1" = self.by-version."once"."1.3.1"; @@ -19789,19 +20359,19 @@ by-spec."npmconf"."~2.1.1" = self.by-version."npmconf"."2.1.1"; by-spec."npmlog"."*" = - self.by-version."npmlog"."1.0.0"; - by-version."npmlog"."1.0.0" = self.buildNodePackage { - name = "npmlog-1.0.0"; + self.by-version."npmlog"."1.1.0"; + by-version."npmlog"."1.1.0" = self.buildNodePackage { + name = "npmlog-1.1.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/npmlog/-/npmlog-1.0.0.tgz"; - name = "npmlog-1.0.0.tgz"; - sha1 = "ed2f290b60316887c39e0da9f09f8d13847cef0f"; + url = "http://registry.npmjs.org/npmlog/-/npmlog-1.1.0.tgz"; + name = "npmlog-1.1.0.tgz"; + sha1 = "8744168148df1ce3f3387c0bc38154883b4af5f4"; }; deps = { "ansi-0.3.0" = self.by-version."ansi"."0.3.0"; "are-we-there-yet-1.0.2" = self.by-version."are-we-there-yet"."1.0.2"; - "gauge-1.0.2" = self.by-version."gauge"."1.0.2"; + "gauge-1.1.0" = self.by-version."gauge"."1.1.0"; }; peerDependencies = []; }; @@ -19821,9 +20391,11 @@ peerDependencies = []; }; by-spec."npmlog"."0.1 || 1" = - self.by-version."npmlog"."1.0.0"; + self.by-version."npmlog"."1.1.0"; by-spec."npmlog"."~0.1.1" = self.by-version."npmlog"."0.1.1"; + by-spec."npmlog"."~1.1.0" = + self.by-version."npmlog"."1.1.0"; by-spec."nssocket"."~0.5.1" = self.by-version."nssocket"."0.5.3"; by-version."nssocket"."0.5.3" = self.buildNodePackage { @@ -19963,6 +20535,20 @@ }; peerDependencies = []; }; + by-spec."oauth-sign"."~0.6.0" = + self.by-version."oauth-sign"."0.6.0"; + by-version."oauth-sign"."0.6.0" = self.buildNodePackage { + name = "oauth-sign-0.6.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.6.0.tgz"; + name = "oauth-sign-0.6.0.tgz"; + sha1 = "7dbeae44f6ca454e1f168451d630746735813ce3"; + }; + deps = { + }; + peerDependencies = []; + }; by-spec."object-additions"."^0.5.1" = self.by-version."object-additions"."0.5.1"; by-version."object-additions"."0.5.1" = self.buildNodePackage { @@ -20483,17 +21069,16 @@ peerDependencies = []; }; by-spec."os-name"."^1.0.0" = - self.by-version."os-name"."1.0.2"; - by-version."os-name"."1.0.2" = self.buildNodePackage { - name = "os-name-1.0.2"; + self.by-version."os-name"."1.0.3"; + by-version."os-name"."1.0.3" = self.buildNodePackage { + name = "os-name-1.0.3"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/os-name/-/os-name-1.0.2.tgz"; - name = "os-name-1.0.2.tgz"; - sha1 = "cd17bf43e927d0f889ae93dbc5e9930baf918277"; + url = "http://registry.npmjs.org/os-name/-/os-name-1.0.3.tgz"; + name = "os-name-1.0.3.tgz"; + sha1 = "1b379f64835af7c5a7f498b357cb95215c159edf"; }; deps = { - "minimist-1.1.0" = self.by-version."minimist"."1.1.0"; "osx-release-1.0.0" = self.by-version."osx-release"."1.0.0"; "win-release-1.0.0" = self.by-version."win-release"."1.0.0"; }; @@ -20548,6 +21133,22 @@ }; peerDependencies = []; }; + by-spec."osx-trash"."^1.0.0" = + self.by-version."osx-trash"."1.0.0"; + by-version."osx-trash"."1.0.0" = self.buildNodePackage { + name = "osx-trash-1.0.0"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/osx-trash/-/osx-trash-1.0.0.tgz"; + name = "osx-trash-1.0.0.tgz"; + sha1 = "be846a528b8d98e02a920f788857838d57d601d5"; + }; + deps = { + "escape-string-applescript-1.0.0" = self.by-version."escape-string-applescript"."1.0.0"; + "run-applescript-1.0.1" = self.by-version."run-applescript"."1.0.1"; + }; + peerDependencies = []; + }; by-spec."owl-deepcopy"."*" = self.by-version."owl-deepcopy"."0.0.4"; by-version."owl-deepcopy"."0.0.4" = self.buildNodePackage { @@ -20637,17 +21238,17 @@ peerDependencies = []; }; by-spec."package-json"."^1.0.0" = - self.by-version."package-json"."1.0.1"; - by-version."package-json"."1.0.1" = self.buildNodePackage { - name = "package-json-1.0.1"; + self.by-version."package-json"."1.0.2"; + by-version."package-json"."1.0.2" = self.buildNodePackage { + name = "package-json-1.0.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/package-json/-/package-json-1.0.1.tgz"; - name = "package-json-1.0.1.tgz"; - sha1 = "89cc831317c4d17922413d5318b23c904e5cf43e"; + url = "http://registry.npmjs.org/package-json/-/package-json-1.0.2.tgz"; + name = "package-json-1.0.2.tgz"; + sha1 = "b3a5ef5a3072c95bc7b62cb643829428972f669b"; }; deps = { - "got-1.2.2" = self.by-version."got"."1.2.2"; + "got-2.4.0" = self.by-version."got"."2.4.0"; "registry-url-2.1.0" = self.by-version."registry-url"."2.1.0"; }; peerDependencies = []; @@ -20737,7 +21338,7 @@ sha1 = "c8cbc588abc91ade087c02ecbdfd7b66d9a8405f"; }; deps = { - "asn1.js-1.0.2" = self.by-version."asn1.js"."1.0.2"; + "asn1.js-1.0.3" = self.by-version."asn1.js"."1.0.3"; "asn1.js-rfc3280-1.0.0" = self.by-version."asn1.js-rfc3280"."1.0.0"; "pemstrip-0.0.1" = self.by-version."pemstrip"."0.0.1"; }; @@ -21141,7 +21742,7 @@ "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3"; "passport-oauth-0.1.15" = self.by-version."passport-oauth"."0.1.15"; "passport-mixcloud-0.0.2" = self.by-version."passport-mixcloud"."0.0.2"; - "request-2.51.0" = self.by-version."request"."2.51.0"; + "request-2.53.0" = self.by-version."request"."2.53.0"; }; peerDependencies = []; }; @@ -21396,17 +21997,18 @@ }; peerDependencies = []; }; - by-spec."pbkdf2-compat"."2.0.1" = - self.by-version."pbkdf2-compat"."2.0.1"; - by-version."pbkdf2-compat"."2.0.1" = self.buildNodePackage { - name = "pbkdf2-compat-2.0.1"; + by-spec."pbkdf2-compat"."^3.0.1" = + self.by-version."pbkdf2-compat"."3.0.2"; + by-version."pbkdf2-compat"."3.0.2" = self.buildNodePackage { + name = "pbkdf2-compat-3.0.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/pbkdf2-compat/-/pbkdf2-compat-2.0.1.tgz"; - name = "pbkdf2-compat-2.0.1.tgz"; - sha1 = "b6e0c8fa99494d94e0511575802a59a5c142f288"; + url = "http://registry.npmjs.org/pbkdf2-compat/-/pbkdf2-compat-3.0.2.tgz"; + name = "pbkdf2-compat-3.0.2.tgz"; + sha1 = "0b207887e7d45467e9dd1027bbf1414e1f165291"; }; deps = { + "create-hmac-1.1.3" = self.by-version."create-hmac"."1.1.3"; }; peerDependencies = []; }; @@ -21449,20 +22051,20 @@ by-spec."peer-wire-swarm"."^0.9.2" = self.by-version."peer-wire-swarm"."0.9.2"; by-spec."peerflix"."*" = - self.by-version."peerflix"."0.25.0"; - by-version."peerflix"."0.25.0" = self.buildNodePackage { - name = "peerflix-0.25.0"; + self.by-version."peerflix"."0.25.2"; + by-version."peerflix"."0.25.2" = self.buildNodePackage { + name = "peerflix-0.25.2"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/peerflix/-/peerflix-0.25.0.tgz"; - name = "peerflix-0.25.0.tgz"; - sha1 = "9371bb353603101503551fdbdcdbe28a1556a96d"; + url = "http://registry.npmjs.org/peerflix/-/peerflix-0.25.2.tgz"; + name = "peerflix-0.25.2.tgz"; + sha1 = "244997a977c881995a3acce7bd7511c3f4006467"; }; deps = { "airplay-js-0.2.11" = self.by-version."airplay-js"."0.2.11"; "clivas-0.1.4" = self.by-version."clivas"."0.1.4"; "keypress-0.2.1" = self.by-version."keypress"."0.2.1"; - "mime-1.2.11" = self.by-version."mime"."1.2.11"; + "mime-1.3.4" = self.by-version."mime"."1.3.4"; "network-address-0.0.5" = self.by-version."network-address"."0.0.5"; "numeral-1.5.3" = self.by-version."numeral"."1.5.3"; "open-0.0.5" = self.by-version."open"."0.0.5"; @@ -21477,7 +22079,7 @@ }; peerDependencies = []; }; - "peerflix" = self.by-version."peerflix"."0.25.0"; + "peerflix" = self.by-version."peerflix"."0.25.2"; by-spec."peerflix"."^0.19.1" = self.by-version."peerflix"."0.19.3"; by-version."peerflix"."0.19.3" = self.buildNodePackage { @@ -21491,7 +22093,7 @@ deps = { "airplay-js-0.2.11" = self.by-version."airplay-js"."0.2.11"; "clivas-0.1.4" = self.by-version."clivas"."0.1.4"; - "mime-1.2.11" = self.by-version."mime"."1.2.11"; + "mime-1.3.4" = self.by-version."mime"."1.3.4"; "network-address-0.0.4" = self.by-version."network-address"."0.0.4"; "numeral-1.5.3" = self.by-version."numeral"."1.5.3"; "optimist-0.6.1" = self.by-version."optimist"."0.6.1"; @@ -21572,34 +22174,32 @@ peerDependencies = []; }; by-spec."phantomjs"."*" = - self.by-version."phantomjs"."1.9.13"; - by-version."phantomjs"."1.9.13" = self.buildNodePackage { - name = "phantomjs-1.9.13"; + self.by-version."phantomjs"."1.9.15"; + by-version."phantomjs"."1.9.15" = self.buildNodePackage { + name = "phantomjs-1.9.15"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.13.tgz"; - name = "phantomjs-1.9.13.tgz"; - sha1 = "2f9afca241eaf17cad5a137bf9eade948a4d7ef5"; + url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.15.tgz"; + name = "phantomjs-1.9.15.tgz"; + sha1 = "10032c8b36bd3541ecef953e764d5d177c33f72f"; }; deps = { "adm-zip-0.4.4" = self.by-version."adm-zip"."0.4.4"; + "fs-extra-0.16.3" = self.by-version."fs-extra"."0.16.3"; "kew-0.4.0" = self.by-version."kew"."0.4.0"; - "ncp-1.0.1" = self.by-version."ncp"."1.0.1"; "npmconf-2.0.9" = self.by-version."npmconf"."2.0.9"; - "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "progress-1.1.8" = self.by-version."progress"."1.1.8"; "request-2.42.0" = self.by-version."request"."2.42.0"; "request-progress-0.3.1" = self.by-version."request-progress"."0.3.1"; - "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; "which-1.0.8" = self.by-version."which"."1.0.8"; }; peerDependencies = []; }; - "phantomjs" = self.by-version."phantomjs"."1.9.13"; + "phantomjs" = self.by-version."phantomjs"."1.9.15"; by-spec."phantomjs"."~1.9.1" = - self.by-version."phantomjs"."1.9.13"; + self.by-version."phantomjs"."1.9.15"; by-spec."phantomjs"."~1.9.10" = - self.by-version."phantomjs"."1.9.13"; + self.by-version."phantomjs"."1.9.15"; by-spec."pkginfo"."0.2.x" = self.by-version."pkginfo"."0.2.3"; by-version."pkginfo"."0.2.3" = self.buildNodePackage { @@ -21749,6 +22349,20 @@ }; peerDependencies = []; }; + by-spec."pop-iterate"."^1.0.1" = + self.by-version."pop-iterate"."1.0.1"; + by-version."pop-iterate"."1.0.1" = self.buildNodePackage { + name = "pop-iterate-1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/pop-iterate/-/pop-iterate-1.0.1.tgz"; + name = "pop-iterate-1.0.1.tgz"; + sha1 = "ceacfdab4abf353d7a0f2aaa2c1fc7b3f9413ba3"; + }; + deps = { + }; + peerDependencies = []; + }; by-spec."portfinder"."^0.2.1" = self.by-version."portfinder"."0.2.1"; by-version."portfinder"."0.2.1" = self.buildNodePackage { @@ -21780,20 +22394,21 @@ peerDependencies = []; }; by-spec."posix"."*" = - self.by-version."posix"."1.0.4"; - by-version."posix"."1.0.4" = self.buildNodePackage { - name = "posix-1.0.4"; + self.by-version."posix"."2.0.0"; + by-version."posix"."2.0.0" = self.buildNodePackage { + name = "posix-2.0.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/posix/-/posix-1.0.4.tgz"; - name = "posix-1.0.4.tgz"; - sha1 = "628eb17c9c3299a296cf2f9fdc7cbad4fd554a56"; + url = "http://registry.npmjs.org/posix/-/posix-2.0.0.tgz"; + name = "posix-2.0.0.tgz"; + sha1 = "90fd0ec73968d805c890b61ae6cc95ae5803a87d"; }; deps = { + "nan-1.6.2" = self.by-version."nan"."1.6.2"; }; peerDependencies = []; }; - "posix" = self.by-version."posix"."1.0.4"; + "posix" = self.by-version."posix"."2.0.0"; by-spec."posix-getopt"."1.0.0" = self.by-version."posix-getopt"."1.0.0"; by-version."posix-getopt"."1.0.0" = self.buildNodePackage { @@ -21838,18 +22453,32 @@ }; by-spec."prelude-ls"."~1.1.1" = self.by-version."prelude-ls"."1.1.1"; - by-spec."pretty-bytes"."^1.0.0" = - self.by-version."pretty-bytes"."1.0.2"; - by-version."pretty-bytes"."1.0.2" = self.buildNodePackage { - name = "pretty-bytes-1.0.2"; - bin = true; + by-spec."prepend-http"."^1.0.0" = + self.by-version."prepend-http"."1.0.1"; + by-version."prepend-http"."1.0.1" = self.buildNodePackage { + name = "prepend-http-1.0.1"; + bin = false; src = fetchurl { - url = "http://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.2.tgz"; - name = "pretty-bytes-1.0.2.tgz"; - sha1 = "b38f90c0b93d9942a4c4bec6cb5f367d51d80120"; + url = "http://registry.npmjs.org/prepend-http/-/prepend-http-1.0.1.tgz"; + name = "prepend-http-1.0.1.tgz"; + sha1 = "5f13dad9a434fa4f346aa51cf03f3cea15fe4eb3"; }; deps = { - "get-stdin-1.0.0" = self.by-version."get-stdin"."1.0.0"; + }; + peerDependencies = []; + }; + by-spec."pretty-bytes"."^1.0.0" = + self.by-version."pretty-bytes"."1.0.3"; + by-version."pretty-bytes"."1.0.3" = self.buildNodePackage { + name = "pretty-bytes-1.0.3"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.3.tgz"; + name = "pretty-bytes-1.0.3.tgz"; + sha1 = "03a712d028cfc8536f271da55e1844877399242c"; + }; + deps = { + "get-stdin-4.0.1" = self.by-version."get-stdin"."4.0.1"; }; peerDependencies = []; }; @@ -21878,7 +22507,7 @@ sha1 = "ac8799843d8194ea478ee4442e455fd5e054db3e"; }; deps = { - "es6-shim-0.22.2" = self.by-version."es6-shim"."0.22.2"; + "es6-shim-0.25.0" = self.by-version."es6-shim"."0.25.0"; }; peerDependencies = []; }; @@ -22141,23 +22770,25 @@ peerDependencies = []; }; by-spec."proxy-addr"."~1.0.3" = - self.by-version."proxy-addr"."1.0.5"; - by-version."proxy-addr"."1.0.5" = self.buildNodePackage { - name = "proxy-addr-1.0.5"; + self.by-version."proxy-addr"."1.0.6"; + by-version."proxy-addr"."1.0.6" = self.buildNodePackage { + name = "proxy-addr-1.0.6"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.5.tgz"; - name = "proxy-addr-1.0.5.tgz"; - sha1 = "17ad518b637a21a64746319f39fbc72c8628f63b"; + url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.6.tgz"; + name = "proxy-addr-1.0.6.tgz"; + sha1 = "fce3a4c486bf2e188ad1e76e18399a79d02c0e72"; }; deps = { "forwarded-0.1.0" = self.by-version."forwarded"."0.1.0"; - "ipaddr.js-0.1.6" = self.by-version."ipaddr.js"."0.1.6"; + "ipaddr.js-0.1.8" = self.by-version."ipaddr.js"."0.1.8"; }; peerDependencies = []; }; by-spec."proxy-addr"."~1.0.5" = - self.by-version."proxy-addr"."1.0.5"; + self.by-version."proxy-addr"."1.0.6"; + by-spec."proxy-addr"."~1.0.6" = + self.by-version."proxy-addr"."1.0.6"; by-spec."proxy-agent"."1" = self.by-version."proxy-agent"."1.1.0"; by-version."proxy-agent"."1.1.0" = self.buildNodePackage { @@ -22179,6 +22810,20 @@ }; by-spec."proxy-agent"."~1.1.0" = self.by-version."proxy-agent"."1.1.0"; + by-spec."prr"."~0.0.0" = + self.by-version."prr"."0.0.0"; + by-version."prr"."0.0.0" = self.buildNodePackage { + name = "prr-0.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/prr/-/prr-0.0.0.tgz"; + name = "prr-0.0.0.tgz"; + sha1 = "1a84b85908325501411853d0081ee3fa86e2926a"; + }; + deps = { + }; + peerDependencies = []; + }; by-spec."ps-tree"."0.0.x" = self.by-version."ps-tree"."0.0.3"; by-version."ps-tree"."0.0.3" = self.buildNodePackage { @@ -22221,7 +22866,7 @@ sha1 = "90711147083bc5bfbe2b51964f9a6b038adb0d4b"; }; deps = { - "bn.js-1.0.0" = self.by-version."bn.js"."1.0.0"; + "bn.js-1.3.0" = self.by-version."bn.js"."1.3.0"; "browserify-rsa-1.1.1" = self.by-version."browserify-rsa"."1.1.1"; "parse-asn1-2.0.0" = self.by-version."parse-asn1"."2.0.0"; }; @@ -22309,14 +22954,14 @@ }; "pure-css" = self.by-version."pure"."0.5.0-rc-1"; by-spec."pusher"."^1.0.0" = - self.by-version."pusher"."1.0.2"; - by-version."pusher"."1.0.2" = self.buildNodePackage { - name = "pusher-1.0.2"; + self.by-version."pusher"."1.0.4"; + by-version."pusher"."1.0.4" = self.buildNodePackage { + name = "pusher-1.0.4"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/pusher/-/pusher-1.0.2.tgz"; - name = "pusher-1.0.2.tgz"; - sha1 = "9276f7b884bc967bf66f5c3d407fc43c66315969"; + url = "http://registry.npmjs.org/pusher/-/pusher-1.0.4.tgz"; + name = "pusher-1.0.4.tgz"; + sha1 = "bdf7a51a82c86fbdebe96602f1559b6ffea7450b"; }; deps = { "request-2.45.0" = self.by-version."request"."2.45.0"; @@ -22352,18 +22997,19 @@ peerDependencies = []; }; by-spec."q".">= 0.0.1" = - self.by-version."q"."2.0.2"; - by-version."q"."2.0.2" = self.buildNodePackage { - name = "q-2.0.2"; + self.by-version."q"."2.0.3"; + by-version."q"."2.0.3" = self.buildNodePackage { + name = "q-2.0.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/q/-/q-2.0.2.tgz"; - name = "q-2.0.2.tgz"; - sha1 = "4629e6cc668ff8554cfa775dab5aba50bad8f56d"; + url = "http://registry.npmjs.org/q/-/q-2.0.3.tgz"; + name = "q-2.0.3.tgz"; + sha1 = "75b8db0255a1a5af82f58c3f3aaa1efec7d0d134"; }; deps = { - "asap-1.0.0" = self.by-version."asap"."1.0.0"; - "collections-2.0.1" = self.by-version."collections"."2.0.1"; + "asap-2.0.1" = self.by-version."asap"."2.0.1"; + "pop-iterate-1.0.1" = self.by-version."pop-iterate"."1.0.1"; + "weak-map-1.0.5" = self.by-version."weak-map"."1.0.5"; }; peerDependencies = []; }; @@ -22396,14 +23042,14 @@ by-spec."q"."~1.1.2" = self.by-version."q"."1.1.2"; by-spec."qap"."^3.1.2" = - self.by-version."qap"."3.1.2"; - by-version."qap"."3.1.2" = self.buildNodePackage { - name = "qap-3.1.2"; + self.by-version."qap"."3.1.3"; + by-version."qap"."3.1.3" = self.buildNodePackage { + name = "qap-3.1.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/qap/-/qap-3.1.2.tgz"; - name = "qap-3.1.2.tgz"; - sha1 = "3672b8707d0b9b983b18f91fb14237de241bdba8"; + url = "http://registry.npmjs.org/qap/-/qap-3.1.3.tgz"; + name = "qap-3.1.3.tgz"; + sha1 = "394288bf07c8fe16cf36bb2e40a3bb947ed24963"; }; deps = { }; @@ -22439,20 +23085,6 @@ }; peerDependencies = []; }; - by-spec."qs"."0.5.2" = - self.by-version."qs"."0.5.2"; - by-version."qs"."0.5.2" = self.buildNodePackage { - name = "qs-0.5.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/qs/-/qs-0.5.2.tgz"; - name = "qs-0.5.2.tgz"; - sha1 = "e5734acb7009fb918e800fd5c60c2f5b94a7ff43"; - }; - deps = { - }; - peerDependencies = []; - }; by-spec."qs"."0.5.5" = self.by-version."qs"."0.5.5"; by-version."qs"."0.5.5" = self.buildNodePackage { @@ -22674,14 +23306,14 @@ peerDependencies = []; }; by-spec."rai"."~0.1.11" = - self.by-version."rai"."0.1.11"; - by-version."rai"."0.1.11" = self.buildNodePackage { - name = "rai-0.1.11"; + self.by-version."rai"."0.1.12"; + by-version."rai"."0.1.12" = self.buildNodePackage { + name = "rai-0.1.12"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/rai/-/rai-0.1.11.tgz"; - name = "rai-0.1.11.tgz"; - sha1 = "ea0ba30ceecfb77a46d3b2d849e3d4249d056228"; + url = "http://registry.npmjs.org/rai/-/rai-0.1.12.tgz"; + name = "rai-0.1.12.tgz"; + sha1 = "8ccfd014d0f9608630dd73c19b8e4b057754a6a6"; }; deps = { }; @@ -22874,6 +23506,22 @@ }; peerDependencies = []; }; + by-spec."raw-body"."1.3.3" = + self.by-version."raw-body"."1.3.3"; + by-version."raw-body"."1.3.3" = self.buildNodePackage { + name = "raw-body-1.3.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/raw-body/-/raw-body-1.3.3.tgz"; + name = "raw-body-1.3.3.tgz"; + sha1 = "8841af3f64ad50a351dc77f229118b40c28fa58c"; + }; + deps = { + "bytes-1.0.0" = self.by-version."bytes"."1.0.0"; + "iconv-lite-0.4.7" = self.by-version."iconv-lite"."0.4.7"; + }; + peerDependencies = []; + }; by-spec."raw-socket"."*" = self.by-version."raw-socket"."1.2.2"; by-version."raw-socket"."1.2.2" = self.buildNodePackage { @@ -22953,49 +23601,65 @@ "minimist-0.0.10" = self.by-version."minimist"."0.0.10"; "deep-extend-0.2.11" = self.by-version."deep-extend"."0.2.11"; "strip-json-comments-0.1.3" = self.by-version."strip-json-comments"."0.1.3"; - "ini-1.3.2" = self.by-version."ini"."1.3.2"; + "ini-1.3.3" = self.by-version."ini"."1.3.3"; }; peerDependencies = []; }; by-spec."rc"."~0.5.0" = self.by-version."rc"."0.5.5"; - by-spec."rc"."~0.5.1" = - self.by-version."rc"."0.5.5"; by-spec."rc"."~0.5.4" = self.by-version."rc"."0.5.5"; + by-spec."rc"."~0.6.0" = + self.by-version."rc"."0.6.0"; + by-version."rc"."0.6.0" = self.buildNodePackage { + name = "rc-0.6.0"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/rc/-/rc-0.6.0.tgz"; + name = "rc-0.6.0.tgz"; + sha1 = "e1c930059af831c85413fe275ae2f40f4e3c5371"; + }; + deps = { + "minimist-0.0.10" = self.by-version."minimist"."0.0.10"; + "deep-extend-0.2.11" = self.by-version."deep-extend"."0.2.11"; + "strip-json-comments-0.1.3" = self.by-version."strip-json-comments"."0.1.3"; + "ini-1.3.3" = self.by-version."ini"."1.3.3"; + }; + peerDependencies = []; + }; by-spec."react"."*" = - self.by-version."react"."0.13.0-alpha.2"; - by-version."react"."0.13.0-alpha.2" = self.buildNodePackage { - name = "react-0.13.0-alpha.2"; + self.by-version."react"."0.13.0-beta.2"; + by-version."react"."0.13.0-beta.2" = self.buildNodePackage { + name = "react-0.13.0-beta.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/react/-/react-0.13.0-alpha.2.tgz"; - name = "react-0.13.0-alpha.2.tgz"; - sha1 = "ef16c2018564cf12560543abdde2425f995761f8"; + url = "http://registry.npmjs.org/react/-/react-0.13.0-beta.2.tgz"; + name = "react-0.13.0-beta.2.tgz"; + sha1 = "94495988d861802afb9e4dc36acf387463c98614"; }; deps = { "envify-3.2.0" = self.by-version."envify"."3.2.0"; }; peerDependencies = []; }; - "react" = self.by-version."react"."0.13.0-alpha.2"; + "react" = self.by-version."react"."0.13.0-beta.2"; by-spec."react-tools"."*" = - self.by-version."react-tools"."0.13.0-alpha.2"; - by-version."react-tools"."0.13.0-alpha.2" = self.buildNodePackage { - name = "react-tools-0.13.0-alpha.2"; + self.by-version."react-tools"."0.13.0-beta.2"; + by-version."react-tools"."0.13.0-beta.2" = self.buildNodePackage { + name = "react-tools-0.13.0-beta.2"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/react-tools/-/react-tools-0.13.0-alpha.2.tgz"; - name = "react-tools-0.13.0-alpha.2.tgz"; - sha1 = "ef9a43938e203175d97012859217e7a0c08750a6"; + url = "http://registry.npmjs.org/react-tools/-/react-tools-0.13.0-beta.2.tgz"; + name = "react-tools-0.13.0-beta.2.tgz"; + sha1 = "d29e8d67a2d5fd1e4dba0fa4d068cc161a698e04"; }; deps = { "commoner-0.10.1" = self.by-version."commoner"."0.10.1"; - "jstransform-8.2.0" = self.by-version."jstransform"."8.2.0"; + "jstransform-9.1.0" = self.by-version."jstransform"."9.1.0"; }; peerDependencies = []; }; - "react-tools" = self.by-version."react-tools"."0.13.0-alpha.2"; + "react-tools" = self.by-version."react-tools"."0.13.0-beta.2"; by-spec."read"."1" = self.by-version."read"."1.0.5"; by-version."read"."1.0.5" = self.buildNodePackage { @@ -23017,6 +23681,20 @@ self.by-version."read"."1.0.5"; by-spec."read"."~1.0.4" = self.by-version."read"."1.0.5"; + by-spec."read-all-stream"."^1.0.0" = + self.by-version."read-all-stream"."1.0.2"; + by-version."read-all-stream"."1.0.2" = self.buildNodePackage { + name = "read-all-stream-1.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/read-all-stream/-/read-all-stream-1.0.2.tgz"; + name = "read-all-stream-1.0.2.tgz"; + sha1 = "d378cf4ef6e236b188ea42d135e5b180a89e3e92"; + }; + deps = { + }; + peerDependencies = []; + }; by-spec."read-installed"."~2.0.5" = self.by-version."read-installed"."2.0.7"; by-version."read-installed"."2.0.7" = self.buildNodePackage { @@ -23028,7 +23706,7 @@ sha1 = "a82157a5e273576c57f230ecec3702ab215a6d6c"; }; deps = { - "read-package-json-1.2.7" = self.by-version."read-package-json"."1.2.7"; + "read-package-json-1.3.1" = self.by-version."read-package-json"."1.3.1"; "semver-3.0.1" = self.by-version."semver"."3.0.1"; "slide-1.1.6" = self.by-version."slide"."1.1.6"; "util-extend-1.0.1" = self.by-version."util-extend"."1.0.1"; @@ -23048,9 +23726,9 @@ }; deps = { "debuglog-1.0.1" = self.by-version."debuglog"."1.0.1"; - "read-package-json-1.2.7" = self.by-version."read-package-json"."1.2.7"; + "read-package-json-1.3.1" = self.by-version."read-package-json"."1.3.1"; "readdir-scoped-modules-1.0.1" = self.by-version."readdir-scoped-modules"."1.0.1"; - "semver-4.2.0" = self.by-version."semver"."4.2.0"; + "semver-4.3.0" = self.by-version."semver"."4.3.0"; "slide-1.1.6" = self.by-version."slide"."1.1.6"; "util-extend-1.0.1" = self.by-version."util-extend"."1.0.1"; "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; @@ -23058,6 +23736,28 @@ peerDependencies = []; }; by-spec."read-package-json"."1" = + self.by-version."read-package-json"."1.3.1"; + by-version."read-package-json"."1.3.1" = self.buildNodePackage { + name = "read-package-json-1.3.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.3.1.tgz"; + name = "read-package-json-1.3.1.tgz"; + sha1 = "5a965f9fc34b25ffa5e0d93b1d0fc063af6d10b0"; + }; + deps = { + "github-url-from-git-1.4.0" = self.by-version."github-url-from-git"."1.4.0"; + "github-url-from-username-repo-1.0.2" = self.by-version."github-url-from-username-repo"."1.0.2"; + "glob-4.4.0" = self.by-version."glob"."4.4.0"; + "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0"; + "normalize-package-data-1.0.3" = self.by-version."normalize-package-data"."1.0.3"; + "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; + }; + peerDependencies = []; + }; + by-spec."read-package-json"."^1.3.1" = + self.by-version."read-package-json"."1.3.1"; + by-spec."read-package-json"."~1.2.7" = self.by-version."read-package-json"."1.2.7"; by-version."read-package-json"."1.2.7" = self.buildNodePackage { name = "read-package-json-1.2.7"; @@ -23070,17 +23770,15 @@ deps = { "github-url-from-git-1.4.0" = self.by-version."github-url-from-git"."1.4.0"; "github-url-from-username-repo-1.0.2" = self.by-version."github-url-from-username-repo"."1.0.2"; - "glob-4.3.5" = self.by-version."glob"."4.3.5"; + "glob-4.4.0" = self.by-version."glob"."4.4.0"; "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0"; "normalize-package-data-1.0.3" = self.by-version."normalize-package-data"."1.0.3"; "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; }; peerDependencies = []; }; - by-spec."read-package-json"."1.2.x" = - self.by-version."read-package-json"."1.2.7"; - by-spec."read-package-json"."~1.2.7" = - self.by-version."read-package-json"."1.2.7"; + by-spec."read-package-json"."~1.3.1" = + self.by-version."read-package-json"."1.3.1"; by-spec."read-torrent"."^1.0.0" = self.by-version."read-torrent"."1.2.0"; by-version."read-torrent"."1.2.0" = self.buildNodePackage { @@ -23276,6 +23974,8 @@ }; peerDependencies = []; }; + by-spec."readdirp"."^1.3.0" = + self.by-version."readdirp"."1.3.0"; by-spec."readdirp"."~0.2.3" = self.by-version."readdirp"."0.2.5"; by-version."readdirp"."0.2.5" = self.buildNodePackage { @@ -23291,8 +23991,6 @@ }; peerDependencies = []; }; - by-spec."readdirp"."~1.3.0" = - self.by-version."readdirp"."1.3.0"; by-spec."readline2"."~0.1.0" = self.by-version."readline2"."0.1.1"; by-version."readline2"."0.1.1" = self.buildNodePackage { @@ -23345,20 +24043,20 @@ peerDependencies = []; }; by-spec."recast"."~0.9.5" = - self.by-version."recast"."0.9.15"; - by-version."recast"."0.9.15" = self.buildNodePackage { - name = "recast-0.9.15"; + self.by-version."recast"."0.9.18"; + by-version."recast"."0.9.18" = self.buildNodePackage { + name = "recast-0.9.18"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/recast/-/recast-0.9.15.tgz"; - name = "recast-0.9.15.tgz"; - sha1 = "33f82d42c8f69f4c84e666c8cc9b2864c4d42133"; + url = "http://registry.npmjs.org/recast/-/recast-0.9.18.tgz"; + name = "recast-0.9.18.tgz"; + sha1 = "f70921bb9f737d8e1fb06a440315bd7ec14587c9"; }; deps = { "esprima-fb-10001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."10001.1.0-dev-harmony-fb"; "source-map-0.1.43" = self.by-version."source-map"."0.1.43"; "private-0.1.6" = self.by-version."private"."0.1.6"; - "ast-types-0.6.10" = self.by-version."ast-types"."0.6.10"; + "ast-types-0.6.12" = self.by-version."ast-types"."0.6.12"; }; peerDependencies = []; }; @@ -23533,18 +24231,18 @@ peerDependencies = []; }; by-spec."repeating"."^1.1.0" = - self.by-version."repeating"."1.1.1"; - by-version."repeating"."1.1.1" = self.buildNodePackage { - name = "repeating-1.1.1"; + self.by-version."repeating"."1.1.2"; + by-version."repeating"."1.1.2" = self.buildNodePackage { + name = "repeating-1.1.2"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/repeating/-/repeating-1.1.1.tgz"; - name = "repeating-1.1.1.tgz"; - sha1 = "2dfe71fb0baf78249e8ec6a537ec3dd63f48bb22"; + url = "http://registry.npmjs.org/repeating/-/repeating-1.1.2.tgz"; + name = "repeating-1.1.2.tgz"; + sha1 = "dcced290c4d22df9818746eb5257679d27fe0283"; }; deps = { "is-finite-1.0.0" = self.by-version."is-finite"."1.0.0"; - "meow-2.1.0" = self.by-version."meow"."2.1.0"; + "meow-3.0.0" = self.by-version."meow"."3.0.0"; }; peerDependencies = []; }; @@ -23580,39 +24278,40 @@ peerDependencies = []; }; by-spec."request"."2" = - self.by-version."request"."2.51.0"; - by-version."request"."2.51.0" = self.buildNodePackage { - name = "request-2.51.0"; + self.by-version."request"."2.53.0"; + by-version."request"."2.53.0" = self.buildNodePackage { + name = "request-2.53.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.51.0.tgz"; - name = "request-2.51.0.tgz"; - sha1 = "35d00bbecc012e55f907b1bd9e0dbd577bfef26e"; + url = "http://registry.npmjs.org/request/-/request-2.53.0.tgz"; + name = "request-2.53.0.tgz"; + sha1 = "180a3ae92b7b639802e4f9545dd8fcdeb71d760c"; }; deps = { "bl-0.9.4" = self.by-version."bl"."0.9.4"; - "caseless-0.8.0" = self.by-version."caseless"."0.8.0"; + "caseless-0.9.0" = self.by-version."caseless"."0.9.0"; "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2"; "form-data-0.2.0" = self.by-version."form-data"."0.2.0"; "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0"; - "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2"; + "mime-types-2.0.9" = self.by-version."mime-types"."2.0.9"; "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; "qs-2.3.3" = self.by-version."qs"."2.3.3"; "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0"; "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1"; "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1"; - "oauth-sign-0.5.0" = self.by-version."oauth-sign"."0.5.0"; - "hawk-1.1.1" = self.by-version."hawk"."1.1.1"; + "oauth-sign-0.6.0" = self.by-version."oauth-sign"."0.6.0"; + "hawk-2.3.1" = self.by-version."hawk"."2.3.1"; "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0"; "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4"; "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; + "isstream-0.1.1" = self.by-version."isstream"."0.1.1"; }; peerDependencies = []; }; by-spec."request"."2 >=2.20.0" = - self.by-version."request"."2.51.0"; + self.by-version."request"."2.53.0"; by-spec."request"."2 >=2.25.0" = - self.by-version."request"."2.51.0"; + self.by-version."request"."2.53.0"; by-spec."request"."2.16.x" = self.by-version."request"."2.16.6"; by-version."request"."2.16.6" = self.buildNodePackage { @@ -23843,9 +24542,9 @@ peerDependencies = []; }; by-spec."request"."2.x" = - self.by-version."request"."2.51.0"; + self.by-version."request"."2.53.0"; by-spec."request"."2.x.x" = - self.by-version."request"."2.51.0"; + self.by-version."request"."2.53.0"; by-spec."request"."=2.45.0" = self.by-version."request"."2.45.0"; by-version."request"."2.45.0" = self.buildNodePackage { @@ -23876,29 +24575,27 @@ peerDependencies = []; }; by-spec."request".">= 2.2.9" = - self.by-version."request"."2.51.0"; + self.by-version."request"."2.53.0"; by-spec."request".">= 2.9.153" = - self.by-version."request"."2.51.0"; + self.by-version."request"."2.53.0"; + by-spec."request".">=2.2.9" = + self.by-version."request"."2.53.0"; by-spec."request".">=2.27.0" = - self.by-version."request"."2.51.0"; + self.by-version."request"."2.53.0"; by-spec."request".">=2.29.1" = - self.by-version."request"."2.51.0"; + self.by-version."request"."2.53.0"; by-spec."request".">=2.30.1" = - self.by-version."request"."2.51.0"; + self.by-version."request"."2.53.0"; by-spec."request"."^2.34.0" = - self.by-version."request"."2.51.0"; - by-spec."request"."^2.36.0" = - self.by-version."request"."2.51.0"; + self.by-version."request"."2.53.0"; by-spec."request"."^2.40.0" = - self.by-version."request"."2.51.0"; + self.by-version."request"."2.53.0"; by-spec."request"."^2.47.0" = - self.by-version."request"."2.51.0"; - by-spec."request"."^2.48.0" = - self.by-version."request"."2.51.0"; + self.by-version."request"."2.53.0"; by-spec."request"."^2.51.0" = - self.by-version."request"."2.51.0"; + self.by-version."request"."2.53.0"; by-spec."request"."~2" = - self.by-version."request"."2.51.0"; + self.by-version."request"."2.53.0"; by-spec."request"."~2.16.2" = self.by-version."request"."2.16.6"; by-spec."request"."~2.27.0" = @@ -23994,6 +24691,36 @@ }; by-spec."request"."~2.51.0" = self.by-version."request"."2.51.0"; + by-version."request"."2.51.0" = self.buildNodePackage { + name = "request-2.51.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/request/-/request-2.51.0.tgz"; + name = "request-2.51.0.tgz"; + sha1 = "35d00bbecc012e55f907b1bd9e0dbd577bfef26e"; + }; + deps = { + "bl-0.9.4" = self.by-version."bl"."0.9.4"; + "caseless-0.8.0" = self.by-version."caseless"."0.8.0"; + "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2"; + "form-data-0.2.0" = self.by-version."form-data"."0.2.0"; + "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0"; + "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2"; + "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; + "qs-2.3.3" = self.by-version."qs"."2.3.3"; + "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0"; + "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1"; + "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1"; + "oauth-sign-0.5.0" = self.by-version."oauth-sign"."0.5.0"; + "hawk-1.1.1" = self.by-version."hawk"."1.1.1"; + "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0"; + "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4"; + "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; + }; + peerDependencies = []; + }; + by-spec."request"."~2.53.0" = + self.by-version."request"."2.53.0"; by-spec."request-progress"."0.3.0" = self.by-version."request-progress"."0.3.0"; by-version."request-progress"."0.3.0" = self.buildNodePackage { @@ -24040,21 +24767,21 @@ peerDependencies = []; }; by-spec."requirejs"."~2.1" = - self.by-version."requirejs"."2.1.15"; - by-version."requirejs"."2.1.15" = self.buildNodePackage { - name = "requirejs-2.1.15"; + self.by-version."requirejs"."2.1.16"; + by-version."requirejs"."2.1.16" = self.buildNodePackage { + name = "requirejs-2.1.16"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/requirejs/-/requirejs-2.1.15.tgz"; - name = "requirejs-2.1.15.tgz"; - sha1 = "cbcfce55d584ae5983c00a20daa8eade37d18892"; + url = "http://registry.npmjs.org/requirejs/-/requirejs-2.1.16.tgz"; + name = "requirejs-2.1.16.tgz"; + sha1 = "e0203095c6e09721477c40ebdb64e20f2cdc71be"; }; deps = { }; peerDependencies = []; }; by-spec."requirejs"."~2.1.0" = - self.by-version."requirejs"."2.1.15"; + self.by-version."requirejs"."2.1.16"; by-spec."resanitize"."~0.3.0" = self.by-version."resanitize"."0.3.0"; by-version."resanitize"."0.3.0" = self.buildNodePackage { @@ -24098,15 +24825,29 @@ }; peerDependencies = []; }; - by-spec."resolve"."1.0.0" = - self.by-version."resolve"."1.0.0"; - by-version."resolve"."1.0.0" = self.buildNodePackage { - name = "resolve-1.0.0"; + by-spec."resolve"."1.1.0" = + self.by-version."resolve"."1.1.0"; + by-version."resolve"."1.1.0" = self.buildNodePackage { + name = "resolve-1.1.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/resolve/-/resolve-1.0.0.tgz"; - name = "resolve-1.0.0.tgz"; - sha1 = "2a6e3b314dcd57c6519e8e2282af8687e8de61c6"; + url = "http://registry.npmjs.org/resolve/-/resolve-1.1.0.tgz"; + name = "resolve-1.1.0.tgz"; + sha1 = "f9ad602751ed06a13e58cf1eaa1565bbe38d6d93"; + }; + deps = { + }; + peerDependencies = []; + }; + by-spec."resolve"."^1.1.3" = + self.by-version."resolve"."1.1.3"; + by-version."resolve"."1.1.3" = self.buildNodePackage { + name = "resolve-1.1.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/resolve/-/resolve-1.1.3.tgz"; + name = "resolve-1.1.3.tgz"; + sha1 = "0c23ca8cac81c192ac30399489c3185f2b42da9c"; }; deps = { }; @@ -24132,10 +24873,20 @@ self.by-version."resolve"."0.6.3"; by-spec."resolve"."~0.7.1" = self.by-version."resolve"."0.7.4"; - by-spec."resolve"."~0.7.2" = - self.by-version."resolve"."0.7.4"; by-spec."resolve"."~1.0.0" = self.by-version."resolve"."1.0.0"; + by-version."resolve"."1.0.0" = self.buildNodePackage { + name = "resolve-1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/resolve/-/resolve-1.0.0.tgz"; + name = "resolve-1.0.0.tgz"; + sha1 = "2a6e3b314dcd57c6519e8e2282af8687e8de61c6"; + }; + deps = { + }; + peerDependencies = []; + }; by-spec."response-time"."1.0.0" = self.by-version."response-time"."1.0.0"; by-version."response-time"."1.0.0" = self.buildNodePackage { @@ -24181,6 +24932,22 @@ }; peerDependencies = []; }; + by-spec."response-time"."~2.3.0" = + self.by-version."response-time"."2.3.0"; + by-version."response-time"."2.3.0" = self.buildNodePackage { + name = "response-time-2.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/response-time/-/response-time-2.3.0.tgz"; + name = "response-time-2.3.0.tgz"; + sha1 = "27cf2194fa373ef02c04781287416a3138060b68"; + }; + deps = { + "depd-1.0.0" = self.by-version."depd"."1.0.0"; + "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; + }; + peerDependencies = []; + }; by-spec."restify"."2.4.1" = self.by-version."restify"."2.4.1"; by-version."restify"."2.4.1" = self.buildNodePackage { @@ -24227,21 +24994,21 @@ peerDependencies = []; }; by-spec."rethinkdb"."*" = - self.by-version."rethinkdb"."1.15.0"; - by-version."rethinkdb"."1.15.0" = self.buildNodePackage { - name = "rethinkdb-1.15.0"; + self.by-version."rethinkdb"."1.16.0"; + by-version."rethinkdb"."1.16.0" = self.buildNodePackage { + name = "rethinkdb-1.16.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/rethinkdb/-/rethinkdb-1.15.0.tgz"; - name = "rethinkdb-1.15.0.tgz"; - sha1 = "b9005cd79e3800c26739938473dbb4dd769cd022"; + url = "http://registry.npmjs.org/rethinkdb/-/rethinkdb-1.16.0.tgz"; + name = "rethinkdb-1.16.0.tgz"; + sha1 = "530e5ace0f4bce7c7543236e7bd39aead7ea7e1d"; }; deps = { - "bluebird-2.9.1" = self.by-version."bluebird"."2.9.1"; + "bluebird-2.9.9" = self.by-version."bluebird"."2.9.9"; }; peerDependencies = []; }; - "rethinkdb" = self.by-version."rethinkdb"."1.15.0"; + "rethinkdb" = self.by-version."rethinkdb"."1.16.0"; by-spec."retry"."0.6.0" = self.by-version."retry"."0.6.0"; by-version."retry"."0.6.0" = self.buildNodePackage { @@ -24434,7 +25201,7 @@ sha1 = "eb240f55e48bda42b9f546be5fc659221a95c72c"; }; deps = { - "mime-types-2.0.7" = self.by-version."mime-types"."2.0.7"; + "mime-types-2.0.9" = self.by-version."mime-types"."2.0.9"; "xml-1.0.0" = self.by-version."xml"."1.0.0"; }; peerDependencies = []; @@ -24469,6 +25236,8 @@ }; peerDependencies = []; }; + by-spec."run-applescript"."^1.0.1" = + self.by-version."run-applescript"."1.0.1"; by-spec."run-parallel"."^1.0.0" = self.by-version."run-parallel"."1.0.0"; by-version."run-parallel"."1.0.0" = self.buildNodePackage { @@ -24527,14 +25296,14 @@ peerDependencies = []; }; by-spec."rx"."^2.2.27" = - self.by-version."rx"."2.3.24"; - by-version."rx"."2.3.24" = self.buildNodePackage { - name = "rx-2.3.24"; + self.by-version."rx"."2.3.25"; + by-version."rx"."2.3.25" = self.buildNodePackage { + name = "rx-2.3.25"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/rx/-/rx-2.3.24.tgz"; - name = "rx-2.3.24.tgz"; - sha1 = "14f950a4217d7e35daa71bbcbe58eff68ea4b2b7"; + url = "http://registry.npmjs.org/rx/-/rx-2.3.25.tgz"; + name = "rx-2.3.25.tgz"; + sha1 = "2f7c0550532777b41fa692bb790a7886eaff9731"; }; deps = { }; @@ -24605,7 +25374,7 @@ deps = { "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; "async-0.9.0" = self.by-version."async"."0.9.0"; - "adm-zip-0.4.4" = self.by-version."adm-zip"."0.4.4"; + "adm-zip-0.4.7" = self.by-version."adm-zip"."0.4.7"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; }; peerDependencies = []; @@ -24735,20 +25504,20 @@ }; "selenium-webdriver" = self.by-version."selenium-webdriver"."2.44.0"; by-spec."semver"."*" = - self.by-version."semver"."4.2.0"; - by-version."semver"."4.2.0" = self.buildNodePackage { - name = "semver-4.2.0"; + self.by-version."semver"."4.3.0"; + by-version."semver"."4.3.0" = self.buildNodePackage { + name = "semver-4.3.0"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/semver/-/semver-4.2.0.tgz"; - name = "semver-4.2.0.tgz"; - sha1 = "a571fd4adbe974fe32bd9cb4c5e249606f498423"; + url = "http://registry.npmjs.org/semver/-/semver-4.3.0.tgz"; + name = "semver-4.3.0.tgz"; + sha1 = "3757ceed2b91afefe0ba2c3b6bda49c688b0257a"; }; deps = { }; peerDependencies = []; }; - "semver" = self.by-version."semver"."4.2.0"; + "semver" = self.by-version."semver"."4.3.0"; by-spec."semver"."1.1.0" = self.by-version."semver"."1.1.0"; by-version."semver"."1.1.0" = self.buildNodePackage { @@ -24794,7 +25563,7 @@ by-spec."semver"."2 >=2.2.1" = self.by-version."semver"."2.3.2"; by-spec."semver"."2 >=2.2.1 || 3.x || 4" = - self.by-version."semver"."4.2.0"; + self.by-version."semver"."4.3.0"; by-spec."semver"."2 || 3" = self.by-version."semver"."3.0.1"; by-version."semver"."3.0.1" = self.buildNodePackage { @@ -24810,7 +25579,7 @@ peerDependencies = []; }; by-spec."semver"."2 || 3 || 4" = - self.by-version."semver"."4.2.0"; + self.by-version."semver"."4.3.0"; by-spec."semver"."2.0.11" = self.by-version."semver"."2.0.11"; by-version."semver"."2.0.11" = self.buildNodePackage { @@ -24828,39 +25597,25 @@ by-spec."semver"."2.x" = self.by-version."semver"."2.3.2"; by-spec."semver"."2.x || 3.x || 4" = - self.by-version."semver"."4.2.0"; + self.by-version."semver"."4.3.0"; by-spec."semver"."4" = - self.by-version."semver"."4.2.0"; - by-spec."semver"."4.1.x" = - self.by-version."semver"."4.1.1"; - by-version."semver"."4.1.1" = self.buildNodePackage { - name = "semver-4.1.1"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/semver/-/semver-4.1.1.tgz"; - name = "semver-4.1.1.tgz"; - sha1 = "8d63e2e90df847e626d48ae068cd65786b0ed3d3"; - }; - deps = { - }; - peerDependencies = []; - }; + self.by-version."semver"."4.3.0"; by-spec."semver".">=2.0.10 <3.0.0" = self.by-version."semver"."2.3.2"; by-spec."semver".">=2.2.1 <3" = self.by-version."semver"."2.3.2"; by-spec."semver"."^2.2.1" = self.by-version."semver"."2.3.2"; - by-spec."semver"."^2.3.0" = - self.by-version."semver"."2.3.2"; by-spec."semver"."^2.3.0 || 3.x || 4" = - self.by-version."semver"."4.2.0"; + self.by-version."semver"."4.3.0"; by-spec."semver"."^3.0.1" = self.by-version."semver"."3.0.1"; by-spec."semver"."^4.0.0" = - self.by-version."semver"."4.2.0"; + self.by-version."semver"."4.3.0"; by-spec."semver"."^4.1.0" = - self.by-version."semver"."4.2.0"; + self.by-version."semver"."4.3.0"; + by-spec."semver"."^4.3.0" = + self.by-version."semver"."4.3.0"; by-spec."semver"."~1.1.4" = self.by-version."semver"."1.1.4"; by-spec."semver"."~2.0.5" = @@ -24897,8 +25652,20 @@ self.by-version."semver"."2.3.2"; by-spec."semver"."~4.1.0" = self.by-version."semver"."4.1.1"; - by-spec."semver"."~4.2.0" = - self.by-version."semver"."4.2.0"; + by-version."semver"."4.1.1" = self.buildNodePackage { + name = "semver-4.1.1"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/semver/-/semver-4.1.1.tgz"; + name = "semver-4.1.1.tgz"; + sha1 = "8d63e2e90df847e626d48ae068cd65786b0ed3d3"; + }; + deps = { + }; + peerDependencies = []; + }; + by-spec."semver"."~4.3.0" = + self.by-version."semver"."4.3.0"; by-spec."semver-diff"."^0.1.0" = self.by-version."semver-diff"."0.1.0"; by-version."semver-diff"."0.1.0" = self.buildNodePackage { @@ -24925,19 +25692,19 @@ sha1 = "d43024f91aa7843937dc1379002766809f7480d2"; }; deps = { - "semver-4.2.0" = self.by-version."semver"."4.2.0"; + "semver-4.3.0" = self.by-version."semver"."4.3.0"; }; peerDependencies = []; }; by-spec."send"."*" = - self.by-version."send"."0.11.1"; - by-version."send"."0.11.1" = self.buildNodePackage { - name = "send-0.11.1"; + self.by-version."send"."0.12.1"; + by-version."send"."0.12.1" = self.buildNodePackage { + name = "send-0.12.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/send/-/send-0.11.1.tgz"; - name = "send-0.11.1.tgz"; - sha1 = "1beabfd42f9e2709f99028af3078ac12b47092d5"; + url = "http://registry.npmjs.org/send/-/send-0.12.1.tgz"; + name = "send-0.12.1.tgz"; + sha1 = "65e2e4330eae6b4d1082a921bfc8e9c9f1776b31"; }; deps = { "debug-2.1.1" = self.by-version."debug"."2.1.1"; @@ -24946,7 +25713,7 @@ "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; "etag-1.5.1" = self.by-version."etag"."1.5.1"; "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; - "mime-1.2.11" = self.by-version."mime"."1.2.11"; + "mime-1.3.4" = self.by-version."mime"."1.3.4"; "ms-0.7.0" = self.by-version."ms"."0.7.0"; "on-finished-2.2.0" = self.by-version."on-finished"."2.2.0"; "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; @@ -25033,6 +25800,30 @@ }; by-spec."send"."0.11.1" = self.by-version."send"."0.11.1"; + by-version."send"."0.11.1" = self.buildNodePackage { + name = "send-0.11.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/send/-/send-0.11.1.tgz"; + name = "send-0.11.1.tgz"; + sha1 = "1beabfd42f9e2709f99028af3078ac12b47092d5"; + }; + deps = { + "debug-2.1.1" = self.by-version."debug"."2.1.1"; + "depd-1.0.0" = self.by-version."depd"."1.0.0"; + "destroy-1.0.3" = self.by-version."destroy"."1.0.3"; + "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; + "etag-1.5.1" = self.by-version."etag"."1.5.1"; + "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; + "mime-1.2.11" = self.by-version."mime"."1.2.11"; + "ms-0.7.0" = self.by-version."ms"."0.7.0"; + "on-finished-2.2.0" = self.by-version."on-finished"."2.2.0"; + "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; + }; + peerDependencies = []; + }; + by-spec."send"."0.12.1" = + self.by-version."send"."0.12.1"; by-spec."send"."0.3.0" = self.by-version."send"."0.3.0"; by-version."send"."0.3.0" = self.buildNodePackage { @@ -25199,26 +25990,28 @@ }; peerDependencies = []; }; - by-spec."serve-index"."~1.6.0" = - self.by-version."serve-index"."1.6.0"; - by-version."serve-index"."1.6.0" = self.buildNodePackage { - name = "serve-index-1.6.0"; + by-spec."serve-index"."~1.6.1" = + self.by-version."serve-index"."1.6.2"; + by-version."serve-index"."1.6.2" = self.buildNodePackage { + name = "serve-index-1.6.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/serve-index/-/serve-index-1.6.0.tgz"; - name = "serve-index-1.6.0.tgz"; - sha1 = "5a9216ee1fa50f5c49bba4842d041bb7970df0cd"; + url = "http://registry.npmjs.org/serve-index/-/serve-index-1.6.2.tgz"; + name = "serve-index-1.6.2.tgz"; + sha1 = "f144a140b4500faf2e861c02bb7f160bd7dc3af1"; }; deps = { - "accepts-1.2.2" = self.by-version."accepts"."1.2.2"; + "accepts-1.2.4" = self.by-version."accepts"."1.2.4"; "batch-0.5.2" = self.by-version."batch"."0.5.2"; "debug-2.1.1" = self.by-version."debug"."2.1.1"; - "http-errors-1.2.8" = self.by-version."http-errors"."1.2.8"; - "mime-types-2.0.7" = self.by-version."mime-types"."2.0.7"; + "http-errors-1.3.1" = self.by-version."http-errors"."1.3.1"; + "mime-types-2.0.9" = self.by-version."mime-types"."2.0.9"; "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; }; peerDependencies = []; }; + by-spec."serve-index"."~1.6.2" = + self.by-version."serve-index"."1.6.2"; by-spec."serve-static"."1.1.0" = self.by-version."serve-static"."1.1.0"; by-version."serve-static"."1.1.0" = self.buildNodePackage { @@ -25253,14 +26046,14 @@ peerDependencies = []; }; by-spec."serve-static"."~1.6.4" = - self.by-version."serve-static"."1.6.4"; - by-version."serve-static"."1.6.4" = self.buildNodePackage { - name = "serve-static-1.6.4"; + self.by-version."serve-static"."1.6.5"; + by-version."serve-static"."1.6.5" = self.buildNodePackage { + name = "serve-static-1.6.5"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/serve-static/-/serve-static-1.6.4.tgz"; - name = "serve-static-1.6.4.tgz"; - sha1 = "c512e4188d7a9366672db24e40d294f0c6212367"; + url = "http://registry.npmjs.org/serve-static/-/serve-static-1.6.5.tgz"; + name = "serve-static-1.6.5.tgz"; + sha1 = "aca17e0deac4a87729f6078781b7d27f63aa3d9c"; }; deps = { "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; @@ -25308,6 +26101,24 @@ }; peerDependencies = []; }; + by-spec."serve-static"."~1.9.1" = + self.by-version."serve-static"."1.9.1"; + by-version."serve-static"."1.9.1" = self.buildNodePackage { + name = "serve-static-1.9.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/serve-static/-/serve-static-1.9.1.tgz"; + name = "serve-static-1.9.1.tgz"; + sha1 = "a611b2b8a2cfb5f89685f293cb365f3f5eb61451"; + }; + deps = { + "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; + "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; + "send-0.12.1" = self.by-version."send"."0.12.1"; + "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; + }; + peerDependencies = []; + }; by-spec."set-immediate-shim"."^1.0.0" = self.by-version."set-immediate-shim"."1.0.0"; by-version."set-immediate-shim"."1.0.0" = self.buildNodePackage { @@ -25467,14 +26278,14 @@ by-spec."shelljs"."0.3.x" = self.by-version."shelljs"."0.3.0"; by-spec."should"."*" = - self.by-version."should"."4.6.1"; - by-version."should"."4.6.1" = self.buildNodePackage { - name = "should-4.6.1"; + self.by-version."should"."5.0.0"; + by-version."should"."5.0.0" = self.buildNodePackage { + name = "should-5.0.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/should/-/should-4.6.1.tgz"; - name = "should-4.6.1.tgz"; - sha1 = "ce04cb2e8b526fd02ef36110a4f0bcfd614d408e"; + url = "http://registry.npmjs.org/should/-/should-5.0.0.tgz"; + name = "should-5.0.0.tgz"; + sha1 = "ec3f8fae8703e5b422f4bd7f1273934e110d448c"; }; deps = { "should-equal-0.3.1" = self.by-version."should-equal"."0.3.1"; @@ -25483,7 +26294,7 @@ }; peerDependencies = []; }; - "should" = self.by-version."should"."4.6.1"; + "should" = self.by-version."should"."5.0.0"; by-spec."should-equal"."0.3.1" = self.by-version."should-equal"."0.3.1"; by-version."should-equal"."0.3.1" = self.buildNodePackage { @@ -25632,25 +26443,25 @@ peerDependencies = []; }; by-spec."simplesmtp".">= 0.1.22" = - self.by-version."simplesmtp"."0.3.34"; - by-version."simplesmtp"."0.3.34" = self.buildNodePackage { - name = "simplesmtp-0.3.34"; + self.by-version."simplesmtp"."0.3.35"; + by-version."simplesmtp"."0.3.35" = self.buildNodePackage { + name = "simplesmtp-0.3.35"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.34.tgz"; - name = "simplesmtp-0.3.34.tgz"; - sha1 = "5d494ed18b832df304f197b7e4d97b81a6b8e0df"; + url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.35.tgz"; + name = "simplesmtp-0.3.35.tgz"; + sha1 = "017b1eb8b26317ac36d2a2a8a932631880736a03"; }; deps = { - "rai-0.1.11" = self.by-version."rai"."0.1.11"; + "rai-0.1.12" = self.by-version."rai"."0.1.12"; "xoauth2-0.1.8" = self.by-version."xoauth2"."0.1.8"; }; peerDependencies = []; }; by-spec."simplesmtp"."~0.2 || ~0.3.30" = - self.by-version."simplesmtp"."0.3.34"; + self.by-version."simplesmtp"."0.3.35"; by-spec."simplesmtp"."~0.3.30" = - self.by-version."simplesmtp"."0.3.34"; + self.by-version."simplesmtp"."0.3.35"; by-spec."single-line-log"."^0.4.1" = self.by-version."single-line-log"."0.4.1"; by-version."single-line-log"."0.4.1" = self.buildNodePackage { @@ -25700,6 +26511,21 @@ "slasp" = self.by-version."slasp"."0.0.4"; by-spec."slasp"."0.0.4" = self.by-version."slasp"."0.0.4"; + by-spec."sleep"."^1.2.0" = + self.by-version."sleep"."1.2.0"; + by-version."sleep"."1.2.0" = self.buildNodePackage { + name = "sleep-1.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/sleep/-/sleep-1.2.0.tgz"; + name = "sleep-1.2.0.tgz"; + sha1 = "5d99de85b8c9819ed2f66251a04ec462da8c66dc"; + }; + deps = { + "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; + }; + peerDependencies = []; + }; by-spec."sliced"."0.0.3" = self.by-version."sliced"."0.0.3"; by-version."sliced"."0.0.3" = self.buildNodePackage { @@ -25857,6 +26683,21 @@ }; peerDependencies = []; }; + by-spec."sntp"."1.x.x" = + self.by-version."sntp"."1.0.9"; + by-version."sntp"."1.0.9" = self.buildNodePackage { + name = "sntp-1.0.9"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"; + name = "sntp-1.0.9.tgz"; + sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; + }; + deps = { + "hoek-2.11.0" = self.by-version."hoek"."2.11.0"; + }; + peerDependencies = []; + }; by-spec."socket.io"."0.9.14" = self.by-version."socket.io"."0.9.14"; by-version."socket.io"."0.9.14" = self.buildNodePackage { @@ -26094,21 +26935,21 @@ peerDependencies = []; }; by-spec."source-map"."*" = - self.by-version."source-map"."0.1.43"; - by-version."source-map"."0.1.43" = self.buildNodePackage { - name = "source-map-0.1.43"; + self.by-version."source-map"."0.3.0"; + by-version."source-map"."0.3.0" = self.buildNodePackage { + name = "source-map-0.3.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz"; - name = "source-map-0.1.43.tgz"; - sha1 = "c24bc146ca517c1471f5dacbe2571b2b7f9e3346"; + url = "http://registry.npmjs.org/source-map/-/source-map-0.3.0.tgz"; + name = "source-map-0.3.0.tgz"; + sha1 = "8586fb9a5a005e5b501e21cd18b6f21b457ad1f9"; }; deps = { "amdefine-0.1.0" = self.by-version."amdefine"."0.1.0"; }; peerDependencies = []; }; - "source-map" = self.by-version."source-map"."0.1.43"; + "source-map" = self.by-version."source-map"."0.3.0"; by-spec."source-map"."0.1.31" = self.by-version."source-map"."0.1.31"; by-version."source-map"."0.1.31" = self.buildNodePackage { @@ -26156,12 +26997,38 @@ }; by-spec."source-map"."0.1.x" = self.by-version."source-map"."0.1.43"; + by-version."source-map"."0.1.43" = self.buildNodePackage { + name = "source-map-0.1.43"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz"; + name = "source-map-0.1.43.tgz"; + sha1 = "c24bc146ca517c1471f5dacbe2571b2b7f9e3346"; + }; + deps = { + "amdefine-0.1.0" = self.by-version."amdefine"."0.1.0"; + }; + peerDependencies = []; + }; by-spec."source-map".">= 0.1.2" = - self.by-version."source-map"."0.1.43"; + self.by-version."source-map"."0.3.0"; by-spec."source-map".">=0.1.43 <0.2" = self.by-version."source-map"."0.1.43"; - by-spec."source-map"."^0.1.x" = - self.by-version."source-map"."0.1.43"; + by-spec."source-map"."^0.2.0" = + self.by-version."source-map"."0.2.0"; + by-version."source-map"."0.2.0" = self.buildNodePackage { + name = "source-map-0.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz"; + name = "source-map-0.2.0.tgz"; + sha1 = "dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"; + }; + deps = { + "amdefine-0.1.0" = self.by-version."amdefine"."0.1.0"; + }; + peerDependencies = []; + }; by-spec."source-map"."~0.1.31" = self.by-version."source-map"."0.1.43"; by-spec."source-map"."~0.1.33" = @@ -26276,7 +27143,7 @@ }; deps = { "es6-promise-2.0.1" = self.by-version."es6-promise"."2.0.1"; - "request-2.51.0" = self.by-version."request"."2.51.0"; + "request-2.53.0" = self.by-version."request"."2.53.0"; }; peerDependencies = []; }; @@ -26400,19 +27267,21 @@ }; "statsd-librato-backend" = self.by-version."statsd-librato-backend"."0.1.6"; by-spec."statuses"."1" = - self.by-version."statuses"."1.2.0"; - by-version."statuses"."1.2.0" = self.buildNodePackage { - name = "statuses-1.2.0"; + self.by-version."statuses"."1.2.1"; + by-version."statuses"."1.2.1" = self.buildNodePackage { + name = "statuses-1.2.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/statuses/-/statuses-1.2.0.tgz"; - name = "statuses-1.2.0.tgz"; - sha1 = "4445790d65bec29184f50d54810f67e290c1679e"; + url = "http://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz"; + name = "statuses-1.2.1.tgz"; + sha1 = "dded45cc18256d51ed40aec142489d5c61026d28"; }; deps = { }; peerDependencies = []; }; + by-spec."statuses"."^1.2.1" = + self.by-version."statuses"."1.2.1"; by-spec."stream-browserify"."^1.0.0" = self.by-version."stream-browserify"."1.0.0"; by-version."stream-browserify"."1.0.0" = self.buildNodePackage { @@ -26668,7 +27537,7 @@ }; deps = { "addr-to-ip-port-1.4.0" = self.by-version."addr-to-ip-port"."1.4.0"; - "ipaddr.js-0.1.6" = self.by-version."ipaddr.js"."0.1.6"; + "ipaddr.js-0.1.8" = self.by-version."ipaddr.js"."0.1.8"; }; peerDependencies = []; }; @@ -26820,20 +27689,6 @@ }; by-spec."strip-ansi"."^2.0.1" = self.by-version."strip-ansi"."2.0.1"; - by-spec."strip-ansi"."~0.1.0" = - self.by-version."strip-ansi"."0.1.1"; - by-version."strip-ansi"."0.1.1" = self.buildNodePackage { - name = "strip-ansi-0.1.1"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz"; - name = "strip-ansi-0.1.1.tgz"; - sha1 = "39e8a98d044d150660abe4a6808acf70bb7bc991"; - }; - deps = { - }; - peerDependencies = []; - }; by-spec."strip-bom"."^1.0.0" = self.by-version."strip-bom"."1.0.0"; by-version."strip-bom"."1.0.0" = self.buildNodePackage { @@ -26894,14 +27749,14 @@ peerDependencies = []; }; by-spec."stylus"."*" = - self.by-version."stylus"."0.49.3"; - by-version."stylus"."0.49.3" = self.buildNodePackage { - name = "stylus-0.49.3"; + self.by-version."stylus"."0.50.0"; + by-version."stylus"."0.50.0" = self.buildNodePackage { + name = "stylus-0.50.0"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/stylus/-/stylus-0.49.3.tgz"; - name = "stylus-0.49.3.tgz"; - sha1 = "1fbdabe479ed460872c71a6252a67f95040ba511"; + url = "http://registry.npmjs.org/stylus/-/stylus-0.50.0.tgz"; + name = "stylus-0.50.0.tgz"; + sha1 = "2391f0df1ce1dde55a5a8df26b6906a9425ced05"; }; deps = { "css-parse-1.7.0" = self.by-version."css-parse"."1.7.0"; @@ -26913,7 +27768,7 @@ }; peerDependencies = []; }; - "stylus" = self.by-version."stylus"."0.49.3"; + "stylus" = self.by-version."stylus"."0.50.0"; by-spec."stylus"."0.42.2" = self.by-version."stylus"."0.42.2"; by-version."stylus"."0.42.2" = self.buildNodePackage { @@ -26935,6 +27790,24 @@ }; by-spec."stylus"."0.49.x" = self.by-version."stylus"."0.49.3"; + by-version."stylus"."0.49.3" = self.buildNodePackage { + name = "stylus-0.49.3"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/stylus/-/stylus-0.49.3.tgz"; + name = "stylus-0.49.3.tgz"; + sha1 = "1fbdabe479ed460872c71a6252a67f95040ba511"; + }; + deps = { + "css-parse-1.7.0" = self.by-version."css-parse"."1.7.0"; + "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; + "debug-2.1.1" = self.by-version."debug"."2.1.1"; + "sax-0.5.8" = self.by-version."sax"."0.5.8"; + "glob-3.2.11" = self.by-version."glob"."3.2.11"; + "source-map-0.1.43" = self.by-version."source-map"."0.1.43"; + }; + peerDependencies = []; + }; by-spec."subarg"."0.0.1" = self.by-version."subarg"."0.0.1"; by-version."subarg"."0.0.1" = self.buildNodePackage { @@ -26979,27 +27852,7 @@ }; peerDependencies = []; }; - by-spec."superagent"."0.13.0" = - self.by-version."superagent"."0.13.0"; - by-version."superagent"."0.13.0" = self.buildNodePackage { - name = "superagent-0.13.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/superagent/-/superagent-0.13.0.tgz"; - name = "superagent-0.13.0.tgz"; - sha1 = "ddfbfa5c26f16790f9c5bce42815ccbde2ca36f2"; - }; - deps = { - "qs-0.5.2" = self.by-version."qs"."0.5.2"; - "formidable-1.0.9" = self.by-version."formidable"."1.0.9"; - "mime-1.2.5" = self.by-version."mime"."1.2.5"; - "emitter-component-0.0.6" = self.by-version."emitter-component"."0.0.6"; - "methods-0.0.1" = self.by-version."methods"."0.0.1"; - "cookiejar-1.3.0" = self.by-version."cookiejar"."1.3.0"; - }; - peerDependencies = []; - }; - by-spec."superagent"."~0.21.0" = + by-spec."superagent"."0.21.0" = self.by-version."superagent"."0.21.0"; by-version."superagent"."0.21.0" = self.buildNodePackage { name = "superagent-0.21.0"; @@ -27024,6 +27877,8 @@ }; peerDependencies = []; }; + by-spec."superagent"."~0.21.0" = + self.by-version."superagent"."0.21.0"; by-spec."supertest"."*" = self.by-version."supertest"."0.15.0"; by-version."supertest"."0.15.0" = self.buildNodePackage { @@ -27259,6 +28114,8 @@ }; by-spec."tar"."~1.0.1" = self.by-version."tar"."1.0.3"; + by-spec."tar"."~1.0.2" = + self.by-version."tar"."1.0.3"; by-spec."tar"."~1.0.3" = self.by-version."tar"."1.0.3"; by-spec."tar-fs"."0.5.2" = @@ -27371,6 +28228,21 @@ }; by-spec."temp".">=0.5.0" = self.by-version."temp"."0.8.1"; + by-spec."temp"."~0.5.1" = + self.by-version."temp"."0.5.1"; + by-version."temp"."0.5.1" = self.buildNodePackage { + name = "temp-0.5.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/temp/-/temp-0.5.1.tgz"; + name = "temp-0.5.1.tgz"; + sha1 = "77ab19c79aa7b593cbe4fac2441768cad987b8df"; + }; + deps = { + "rimraf-2.1.4" = self.by-version."rimraf"."2.1.4"; + }; + peerDependencies = []; + }; by-spec."temp"."~0.6.0" = self.by-version."temp"."0.6.0"; by-spec."temp"."~0.8.1" = @@ -27400,7 +28272,7 @@ sha1 = "c27cbbc62b7c287edf1a1a3d5cc8426d8aed49f0"; }; deps = { - "native-or-bluebird-1.1.2" = self.by-version."native-or-bluebird"."1.1.2"; + "native-or-bluebird-1.2.0" = self.by-version."native-or-bluebird"."1.2.0"; }; peerDependencies = []; }; @@ -27609,19 +28481,19 @@ peerDependencies = []; }; by-spec."time".">=0.9.2" = - self.by-version."time"."0.11.0"; - by-version."time"."0.11.0" = self.buildNodePackage { - name = "time-0.11.0"; + self.by-version."time"."0.11.1"; + by-version."time"."0.11.1" = self.buildNodePackage { + name = "time-0.11.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/time/-/time-0.11.0.tgz"; - name = "time-0.11.0.tgz"; - sha1 = "955d4ce3d690e506a82b2c2a523a806a64e1d9ec"; + url = "http://registry.npmjs.org/time/-/time-0.11.1.tgz"; + name = "time-0.11.1.tgz"; + sha1 = "acfc8e922a73e3b21a645928cc4061738929edf2"; }; deps = { "bindings-1.2.0" = self.by-version."bindings"."1.2.0"; "debug-0.8.1" = self.by-version."debug"."0.8.1"; - "nan-1.1.2" = self.by-version."nan"."1.1.2"; + "nan-1.6.2" = self.by-version."nan"."1.6.2"; }; peerDependencies = []; }; @@ -27639,15 +28511,29 @@ }; peerDependencies = []; }; - by-spec."timers-browserify"."^1.0.1" = - self.by-version."timers-browserify"."1.2.0"; - by-version."timers-browserify"."1.2.0" = self.buildNodePackage { - name = "timers-browserify-1.2.0"; + by-spec."timed-out"."^2.0.0" = + self.by-version."timed-out"."2.0.0"; + by-version."timed-out"."2.0.0" = self.buildNodePackage { + name = "timed-out-2.0.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/timers-browserify/-/timers-browserify-1.2.0.tgz"; - name = "timers-browserify-1.2.0.tgz"; - sha1 = "411865ceba9e2c0fafc1d2f3b7a6a87bca44194b"; + url = "http://registry.npmjs.org/timed-out/-/timed-out-2.0.0.tgz"; + name = "timed-out-2.0.0.tgz"; + sha1 = "f38b0ae81d3747d628001f41dafc652ace671c0a"; + }; + deps = { + }; + peerDependencies = []; + }; + by-spec."timers-browserify"."^1.0.1" = + self.by-version."timers-browserify"."1.3.0"; + by-version."timers-browserify"."1.3.0" = self.buildNodePackage { + name = "timers-browserify-1.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/timers-browserify/-/timers-browserify-1.3.0.tgz"; + name = "timers-browserify-1.3.0.tgz"; + sha1 = "c518e6ba39f19619e6ae464e447b1511e172e96f"; }; deps = { "process-0.10.0" = self.by-version."process"."0.10.0"; @@ -27680,7 +28566,7 @@ sha1 = "00345a2ca93089d1251322054389d263e27b77e2"; }; deps = { - "es5-ext-0.10.5" = self.by-version."es5-ext"."0.10.5"; + "es5-ext-0.10.6" = self.by-version."es5-ext"."0.10.6"; "next-tick-0.2.2" = self.by-version."next-tick"."0.2.2"; }; peerDependencies = []; @@ -27704,20 +28590,20 @@ by-spec."timespan"."~2.3.0" = self.by-version."timespan"."2.3.0"; by-spec."timezone"."*" = - self.by-version."timezone"."0.0.38"; - by-version."timezone"."0.0.38" = self.buildNodePackage { - name = "timezone-0.0.38"; + self.by-version."timezone"."0.0.39"; + by-version."timezone"."0.0.39" = self.buildNodePackage { + name = "timezone-0.0.39"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/timezone/-/timezone-0.0.38.tgz"; - name = "timezone-0.0.38.tgz"; - sha1 = "76edf157e220a685fb9a6284ecdc860fcb9de608"; + url = "http://registry.npmjs.org/timezone/-/timezone-0.0.39.tgz"; + name = "timezone-0.0.39.tgz"; + sha1 = "6322fafeac82fd96b907cc93cc0148a1082ff733"; }; deps = { }; peerDependencies = []; }; - "timezone" = self.by-version."timezone"."0.0.38"; + "timezone" = self.by-version."timezone"."0.0.39"; by-spec."tinycolor"."0.x" = self.by-version."tinycolor"."0.0.1"; by-version."tinycolor"."0.0.1" = self.buildNodePackage { @@ -27773,25 +28659,27 @@ sha1 = "1df2277a43e291fd0a929c0e096a0a0917d75b1b"; }; deps = { - "request-2.51.0" = self.by-version."request"."2.51.0"; + "request-2.53.0" = self.by-version."request"."2.53.0"; + }; + peerDependencies = []; + }; + by-spec."tldtools".">=0.0.19" = + self.by-version."tldtools"."0.0.23"; + by-version."tldtools"."0.0.23" = self.buildNodePackage { + name = "tldtools-0.0.23"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/tldtools/-/tldtools-0.0.23.tgz"; + name = "tldtools-0.0.23.tgz"; + sha1 = "2d3c29efc7d14a4fc8f84eb3d3f7fcb70000022a"; + }; + deps = { + "request-2.53.0" = self.by-version."request"."2.53.0"; }; peerDependencies = []; }; by-spec."tldtools".">=0.0.6" = - self.by-version."tldtools"."0.0.21"; - by-version."tldtools"."0.0.21" = self.buildNodePackage { - name = "tldtools-0.0.21"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/tldtools/-/tldtools-0.0.21.tgz"; - name = "tldtools-0.0.21.tgz"; - sha1 = "8a8be8b57a8728599617a5b5415348aa6f5a4c35"; - }; - deps = { - "request-2.51.0" = self.by-version."request"."2.51.0"; - }; - peerDependencies = []; - }; + self.by-version."tldtools"."0.0.23"; by-spec."tls-connect"."^0.2.2" = self.by-version."tls-connect"."0.2.2"; by-version."tls-connect"."0.2.2" = self.buildNodePackage { @@ -28071,7 +28959,7 @@ }; deps = { "commander-2.6.0" = self.by-version."commander"."2.6.0"; - "glob-4.3.5" = self.by-version."glob"."4.3.5"; + "glob-4.4.0" = self.by-version."glob"."4.4.0"; "semver-2.3.2" = self.by-version."semver"."2.3.2"; }; peerDependencies = []; @@ -28094,25 +28982,25 @@ peerDependencies = []; }; by-spec."trash"."*" = - self.by-version."trash"."1.3.1"; - by-version."trash"."1.3.1" = self.buildNodePackage { - name = "trash-1.3.1"; + self.by-version."trash"."1.4.1"; + by-version."trash"."1.4.1" = self.buildNodePackage { + name = "trash-1.4.1"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/trash/-/trash-1.3.1.tgz"; - name = "trash-1.3.1.tgz"; - sha1 = "72325b066a66434e57358624f93b580dd2e585d9"; + url = "http://registry.npmjs.org/trash/-/trash-1.4.1.tgz"; + name = "trash-1.4.1.tgz"; + sha1 = "aa8e0ae39c9764ea1b2dcb9ebc324cbcd8d1a928"; }; deps = { - "escape-string-applescript-1.0.0" = self.by-version."escape-string-applescript"."1.0.0"; - "meow-2.1.0" = self.by-version."meow"."2.1.0"; - "run-applescript-1.0.1" = self.by-version."run-applescript"."1.0.1"; + "meow-3.0.0" = self.by-version."meow"."3.0.0"; + "osx-trash-1.0.0" = self.by-version."osx-trash"."1.0.0"; "update-notifier-0.3.0" = self.by-version."update-notifier"."0.3.0"; - "xdg-trash-1.0.5" = self.by-version."xdg-trash"."1.0.5"; + "win-trash-1.0.0" = self.by-version."win-trash"."1.0.0"; + "xdg-trash-1.0.6" = self.by-version."xdg-trash"."1.0.6"; }; peerDependencies = []; }; - "trash" = self.by-version."trash"."1.3.1"; + "trash" = self.by-version."trash"."1.4.1"; by-spec."traverse"."0.6.x" = self.by-version."traverse"."0.6.6"; by-version."traverse"."0.6.6" = self.buildNodePackage { @@ -28306,27 +29194,45 @@ peerDependencies = []; }; by-spec."type-is"."~1.5.1" = - self.by-version."type-is"."1.5.5"; - by-version."type-is"."1.5.5" = self.buildNodePackage { - name = "type-is-1.5.5"; + self.by-version."type-is"."1.5.7"; + by-version."type-is"."1.5.7" = self.buildNodePackage { + name = "type-is-1.5.7"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/type-is/-/type-is-1.5.5.tgz"; - name = "type-is-1.5.5.tgz"; - sha1 = "45248af57f96366d0326ea0868f6bc8607dc4b21"; + url = "http://registry.npmjs.org/type-is/-/type-is-1.5.7.tgz"; + name = "type-is-1.5.7.tgz"; + sha1 = "b9368a593cc6ef7d0645e78b2f4c64cbecd05e90"; }; deps = { "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0"; - "mime-types-2.0.7" = self.by-version."mime-types"."2.0.7"; + "mime-types-2.0.9" = self.by-version."mime-types"."2.0.9"; }; peerDependencies = []; }; by-spec."type-is"."~1.5.2" = - self.by-version."type-is"."1.5.5"; + self.by-version."type-is"."1.5.7"; by-spec."type-is"."~1.5.3" = - self.by-version."type-is"."1.5.5"; + self.by-version."type-is"."1.5.7"; by-spec."type-is"."~1.5.5" = - self.by-version."type-is"."1.5.5"; + self.by-version."type-is"."1.5.7"; + by-spec."type-is"."~1.5.6" = + self.by-version."type-is"."1.5.7"; + by-spec."type-is"."~1.6.0" = + self.by-version."type-is"."1.6.0"; + by-version."type-is"."1.6.0" = self.buildNodePackage { + name = "type-is-1.6.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/type-is/-/type-is-1.6.0.tgz"; + name = "type-is-1.6.0.tgz"; + sha1 = "efcb9223fafad5a03be14d8f6c9e1785f2c0e7c3"; + }; + deps = { + "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0"; + "mime-types-2.0.9" = self.by-version."mime-types"."2.0.9"; + }; + peerDependencies = []; + }; by-spec."typechecker"."~2.0.1" = self.by-version."typechecker"."2.0.8"; by-version."typechecker"."2.0.8" = self.buildNodePackage { @@ -28545,29 +29451,29 @@ sha1 = "5bd148460a2e84f54f193fd20352c8c3d7de6ac8"; }; deps = { - "mz-1.2.1" = self.by-version."mz"."1.2.1"; - "base64-url-1.2.0" = self.by-version."base64-url"."1.2.0"; + "mz-1.3.0" = self.by-version."mz"."1.3.0"; + "base64-url-1.2.1" = self.by-version."base64-url"."1.2.1"; }; peerDependencies = []; }; - by-spec."uid-safe"."1.0.2" = - self.by-version."uid-safe"."1.0.2"; - by-version."uid-safe"."1.0.2" = self.buildNodePackage { - name = "uid-safe-1.0.2"; + by-spec."uid-safe"."1.1.0" = + self.by-version."uid-safe"."1.1.0"; + by-version."uid-safe"."1.1.0" = self.buildNodePackage { + name = "uid-safe-1.1.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/uid-safe/-/uid-safe-1.0.2.tgz"; - name = "uid-safe-1.0.2.tgz"; - sha1 = "bcd1738b653fabe1288d88afd8cd0ae0af5a1580"; + url = "http://registry.npmjs.org/uid-safe/-/uid-safe-1.1.0.tgz"; + name = "uid-safe-1.1.0.tgz"; + sha1 = "58d6c5dabf8dfbd8d52834839806c03fd6143232"; }; deps = { - "base64-url-1.1.0" = self.by-version."base64-url"."1.1.0"; + "base64-url-1.2.1" = self.by-version."base64-url"."1.2.1"; "native-or-bluebird-1.1.2" = self.by-version."native-or-bluebird"."1.1.2"; }; peerDependencies = []; }; - by-spec."uid-safe"."~1.0.2" = - self.by-version."uid-safe"."1.0.2"; + by-spec."uid-safe"."~1.1.0" = + self.by-version."uid-safe"."1.1.0"; by-spec."uid2"."0.0.3" = self.by-version."uid2"."0.0.3"; by-version."uid2"."0.0.3" = self.buildNodePackage { @@ -28586,6 +29492,20 @@ self.by-version."uid2"."0.0.3"; by-spec."uid2"."~0.0.2" = self.by-version."uid2"."0.0.3"; + by-spec."ultron"."1.0.x" = + self.by-version."ultron"."1.0.1"; + by-version."ultron"."1.0.1" = self.buildNodePackage { + name = "ultron-1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ultron/-/ultron-1.0.1.tgz"; + name = "ultron-1.0.1.tgz"; + sha1 = "c9d8d86c9cf2823028eb45629ab725897dd65dc5"; + }; + deps = { + }; + peerDependencies = []; + }; by-spec."umask"."~1.1.0" = self.by-version."umask"."1.1.0"; by-version."umask"."1.1.0" = self.buildNodePackage { @@ -28845,7 +29765,7 @@ "npmconf-2.1.1" = self.by-version."npmconf"."2.1.1"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "body-parser-1.9.3" = self.by-version."body-parser"."1.9.3"; - "cookie-parser-1.3.3" = self.by-version."cookie-parser"."1.3.3"; + "cookie-parser-1.3.4" = self.by-version."cookie-parser"."1.3.4"; "express-session-1.9.3" = self.by-version."express-session"."1.9.3"; "serve-static-1.7.2" = self.by-version."serve-static"."1.7.2"; }; @@ -28919,24 +29839,6 @@ }; peerDependencies = []; }; - by-spec."update-notifier"."~0.1.8" = - self.by-version."update-notifier"."0.1.10"; - by-version."update-notifier"."0.1.10" = self.buildNodePackage { - name = "update-notifier-0.1.10"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/update-notifier/-/update-notifier-0.1.10.tgz"; - name = "update-notifier-0.1.10.tgz"; - sha1 = "215cbe1053369f0d4a44f84b51eba7cb80484695"; - }; - deps = { - "chalk-0.4.0" = self.by-version."chalk"."0.4.0"; - "configstore-0.3.2" = self.by-version."configstore"."0.3.2"; - "request-2.51.0" = self.by-version."request"."2.51.0"; - "semver-2.3.2" = self.by-version."semver"."2.3.2"; - }; - peerDependencies = []; - }; by-spec."uri-path"."0.0.2" = self.by-version."uri-path"."0.0.2"; by-version."uri-path"."0.0.2" = self.buildNodePackage { @@ -29013,6 +29915,22 @@ }; peerDependencies = []; }; + by-spec."utf-8-validate"."1.0.x" = + self.by-version."utf-8-validate"."1.0.1"; + by-version."utf-8-validate"."1.0.1" = self.buildNodePackage { + name = "utf-8-validate-1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/utf-8-validate/-/utf-8-validate-1.0.1.tgz"; + name = "utf-8-validate-1.0.1.tgz"; + sha1 = "d15eb67e28f6bb93c9401eeb7eac7030a183e8d1"; + }; + deps = { + "bindings-1.2.1" = self.by-version."bindings"."1.2.1"; + "nan-1.6.2" = self.by-version."nan"."1.6.2"; + }; + peerDependencies = []; + }; by-spec."utf8"."2.0.0" = self.by-version."utf8"."2.0.0"; by-version."utf8"."2.0.0" = self.buildNodePackage { @@ -29115,7 +30033,7 @@ }; deps = { "async-0.1.22" = self.by-version."async"."0.1.22"; - "deep-equal-0.2.1" = self.by-version."deep-equal"."0.2.1"; + "deep-equal-1.0.0" = self.by-version."deep-equal"."1.0.0"; "i-0.3.2" = self.by-version."i"."0.3.2"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "ncp-0.2.7" = self.by-version."ncp"."0.2.7"; @@ -29135,7 +30053,7 @@ }; deps = { "async-0.2.10" = self.by-version."async"."0.2.10"; - "deep-equal-0.2.1" = self.by-version."deep-equal"."0.2.1"; + "deep-equal-1.0.0" = self.by-version."deep-equal"."1.0.0"; "i-0.3.2" = self.by-version."i"."0.3.2"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "ncp-0.4.2" = self.by-version."ncp"."0.4.2"; @@ -29180,46 +30098,46 @@ by-spec."uuid"."~2.0.1" = self.by-version."uuid"."2.0.1"; by-spec."v8-debug"."~0.3.0" = - self.by-version."v8-debug"."0.3.3"; - by-version."v8-debug"."0.3.3" = self.buildNodePackage { - name = "v8-debug-0.3.3"; + self.by-version."v8-debug"."0.3.5"; + by-version."v8-debug"."0.3.5" = self.buildNodePackage { + name = "v8-debug-0.3.5"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/v8-debug/-/v8-debug-0.3.3.tgz"; - name = "v8-debug-0.3.3.tgz"; - sha1 = "fb2ee93cef9acedca889e534e4706eff5393e82d"; + url = "http://registry.npmjs.org/v8-debug/-/v8-debug-0.3.5.tgz"; + name = "v8-debug-0.3.5.tgz"; + sha1 = "2131d87b58932864d5697831a3414f529c75ad81"; }; deps = { - "node-pre-gyp-0.5.31" = self.by-version."node-pre-gyp"."0.5.31"; - "nan-1.2.0" = self.by-version."nan"."1.2.0"; + "node-pre-gyp-0.6.4" = self.by-version."node-pre-gyp"."0.6.4"; + "nan-1.6.2" = self.by-version."nan"."1.6.2"; }; peerDependencies = []; }; by-spec."v8-profiler"."~5.2.0" = - self.by-version."v8-profiler"."5.2.2"; - by-version."v8-profiler"."5.2.2" = self.buildNodePackage { - name = "v8-profiler-5.2.2"; + self.by-version."v8-profiler"."5.2.3"; + by-version."v8-profiler"."5.2.3" = self.buildNodePackage { + name = "v8-profiler-5.2.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/v8-profiler/-/v8-profiler-5.2.2.tgz"; - name = "v8-profiler-5.2.2.tgz"; - sha1 = "1ad95f6b0ca7717172c61c28f32f19fd4a961995"; + url = "http://registry.npmjs.org/v8-profiler/-/v8-profiler-5.2.3.tgz"; + name = "v8-profiler-5.2.3.tgz"; + sha1 = "6030cc6ec3bf8679e27b3cded3713a584799895f"; }; deps = { - "node-pre-gyp-0.5.31" = self.by-version."node-pre-gyp"."0.5.31"; - "nan-1.2.0" = self.by-version."nan"."1.2.0"; + "node-pre-gyp-0.6.4" = self.by-version."node-pre-gyp"."0.6.4"; + "nan-1.5.3" = self.by-version."nan"."1.5.3"; }; peerDependencies = []; }; - by-spec."v8flags"."^1.0.1" = - self.by-version."v8flags"."1.0.8"; - by-version."v8flags"."1.0.8" = self.buildNodePackage { - name = "v8flags-1.0.8"; + by-spec."v8flags"."^2.0.2" = + self.by-version."v8flags"."2.0.2"; + by-version."v8flags"."2.0.2" = self.buildNodePackage { + name = "v8flags-2.0.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/v8flags/-/v8flags-1.0.8.tgz"; - name = "v8flags-1.0.8.tgz"; - sha1 = "7e7aa6119c82e4fb2393ce1ffd2868b35cd91084"; + url = "http://registry.npmjs.org/v8flags/-/v8flags-2.0.2.tgz"; + name = "v8flags-2.0.2.tgz"; + sha1 = "915730856e88547f8d023cfc07a671aff43adac4"; }; deps = { }; @@ -29535,15 +30453,15 @@ }; peerDependencies = []; }; - by-spec."void-elements"."~1.0.0" = - self.by-version."void-elements"."1.0.0"; - by-version."void-elements"."1.0.0" = self.buildNodePackage { - name = "void-elements-1.0.0"; + by-spec."void-elements"."~2.0.1" = + self.by-version."void-elements"."2.0.1"; + by-version."void-elements"."2.0.1" = self.buildNodePackage { + name = "void-elements-2.0.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/void-elements/-/void-elements-1.0.0.tgz"; - name = "void-elements-1.0.0.tgz"; - sha1 = "6e5db1e35d591f5ac690ce1a340f793a817b2c2a"; + url = "http://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz"; + name = "void-elements-2.0.1.tgz"; + sha1 = "c066afb582bb1cb4128d60ea92392e94d5e9dbec"; }; deps = { }; @@ -29561,7 +30479,7 @@ }; deps = { "eyes-0.1.8" = self.by-version."eyes"."0.1.8"; - "diff-1.2.1" = self.by-version."diff"."1.2.1"; + "diff-1.2.2" = self.by-version."diff"."1.2.2"; "glob-4.3.5" = self.by-version."glob"."4.3.5"; }; peerDependencies = []; @@ -29664,7 +30582,7 @@ }; peerDependencies = []; }; - by-spec."weak-map"."^1.0.4" = + by-spec."weak-map"."^1.0.5" = self.by-version."weak-map"."1.0.5"; by-version."weak-map"."1.0.5" = self.buildNodePackage { name = "weak-map-1.0.5"; @@ -29689,11 +30607,11 @@ sha1 = "b022266b1d5fba25e22d923337c55587048c2953"; }; deps = { - "adm-zip-0.4.4" = self.by-version."adm-zip"."0.4.4"; + "adm-zip-0.4.7" = self.by-version."adm-zip"."0.4.7"; "kew-0.1.7" = self.by-version."kew"."0.1.7"; "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; "npmconf-0.1.16" = self.by-version."npmconf"."0.1.16"; - "phantomjs-1.9.13" = self.by-version."phantomjs"."1.9.13"; + "phantomjs-1.9.15" = self.by-version."phantomjs"."1.9.15"; "tmp-0.0.24" = self.by-version."tmp"."0.0.24"; "follow-redirects-0.0.3" = self.by-version."follow-redirects"."0.0.3"; }; @@ -29797,6 +30715,20 @@ }; peerDependencies = []; }; + by-spec."win-trash"."^1.0.0" = + self.by-version."win-trash"."1.0.0"; + by-version."win-trash"."1.0.0" = self.buildNodePackage { + name = "win-trash-1.0.0"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/win-trash/-/win-trash-1.0.0.tgz"; + name = "win-trash-1.0.0.tgz"; + sha1 = "1153a7a5e1aa703f4b449458674312de2fa3589c"; + }; + deps = { + }; + peerDependencies = []; + }; by-spec."windows-no-runnable"."~0.0.6" = self.by-version."windows-no-runnable"."0.0.6"; by-version."windows-no-runnable"."0.0.6" = self.buildNodePackage { @@ -29828,18 +30760,18 @@ peerDependencies = []; }; by-spec."winston"."*" = - self.by-version."winston"."0.8.3"; - by-version."winston"."0.8.3" = self.buildNodePackage { - name = "winston-0.8.3"; + self.by-version."winston"."0.9.0"; + by-version."winston"."0.9.0" = self.buildNodePackage { + name = "winston-0.9.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/winston/-/winston-0.8.3.tgz"; - name = "winston-0.8.3.tgz"; - sha1 = "64b6abf4cd01adcaefd5009393b1d8e8bec19db0"; + url = "http://registry.npmjs.org/winston/-/winston-0.9.0.tgz"; + name = "winston-0.9.0.tgz"; + sha1 = "b5726e6c42291e305e36286ce7ae9f3b74a527a8"; }; deps = { - "async-0.2.10" = self.by-version."async"."0.2.10"; - "colors-0.6.2" = self.by-version."colors"."0.6.2"; + "async-0.9.0" = self.by-version."async"."0.9.0"; + "colors-1.0.3" = self.by-version."colors"."1.0.3"; "cycle-1.0.3" = self.by-version."cycle"."1.0.3"; "eyes-0.1.8" = self.by-version."eyes"."0.1.8"; "isstream-0.1.1" = self.by-version."isstream"."0.1.1"; @@ -29848,7 +30780,7 @@ }; peerDependencies = []; }; - "winston" = self.by-version."winston"."0.8.3"; + "winston" = self.by-version."winston"."0.9.0"; by-spec."winston"."0.5.1" = self.by-version."winston"."0.5.1"; by-version."winston"."0.5.1" = self.buildNodePackage { @@ -29956,6 +30888,25 @@ }; by-spec."winston"."0.8.x" = self.by-version."winston"."0.8.3"; + by-version."winston"."0.8.3" = self.buildNodePackage { + name = "winston-0.8.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/winston/-/winston-0.8.3.tgz"; + name = "winston-0.8.3.tgz"; + sha1 = "64b6abf4cd01adcaefd5009393b1d8e8bec19db0"; + }; + deps = { + "async-0.2.10" = self.by-version."async"."0.2.10"; + "colors-0.6.2" = self.by-version."colors"."0.6.2"; + "cycle-1.0.3" = self.by-version."cycle"."1.0.3"; + "eyes-0.1.8" = self.by-version."eyes"."0.1.8"; + "isstream-0.1.1" = self.by-version."isstream"."0.1.1"; + "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0"; + "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9"; + }; + peerDependencies = []; + }; by-spec."winston"."~0.8.1" = self.by-version."winston"."0.8.3"; by-spec."winston"."~0.8.3" = @@ -29991,17 +30942,17 @@ peerDependencies = []; }; by-spec."with"."~4.0.0" = - self.by-version."with"."4.0.0"; - by-version."with"."4.0.0" = self.buildNodePackage { - name = "with-4.0.0"; + self.by-version."with"."4.0.1"; + by-version."with"."4.0.1" = self.buildNodePackage { + name = "with-4.0.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/with/-/with-4.0.0.tgz"; - name = "with-4.0.0.tgz"; - sha1 = "7a78d6642d9b72960a71d1c0c45fd6dd1b878dc7"; + url = "http://registry.npmjs.org/with/-/with-4.0.1.tgz"; + name = "with-4.0.1.tgz"; + sha1 = "accd7a7c321f2d83e303e51c02bb7eb1fff19c32"; }; deps = { - "acorn-0.8.0" = self.by-version."acorn"."0.8.0"; + "acorn-0.11.0" = self.by-version."acorn"."0.11.0"; "acorn-globals-1.0.2" = self.by-version."acorn-globals"."1.0.2"; }; peerDependencies = []; @@ -30125,6 +31076,24 @@ }; by-spec."ws"."~0.4.31" = self.by-version."ws"."0.4.32"; + by-spec."ws"."~0.7.1" = + self.by-version."ws"."0.7.1"; + by-version."ws"."0.7.1" = self.buildNodePackage { + name = "ws-0.7.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ws/-/ws-0.7.1.tgz"; + name = "ws-0.7.1.tgz"; + sha1 = "8f1c7864ca08081be3cd0ac330df0d29c5fcd0da"; + }; + deps = { + "options-0.0.6" = self.by-version."options"."0.0.6"; + "ultron-1.0.1" = self.by-version."ultron"."1.0.1"; + "bufferutil-1.0.1" = self.by-version."bufferutil"."1.0.1"; + "utf-8-validate-1.0.1" = self.by-version."utf-8-validate"."1.0.1"; + }; + peerDependencies = []; + }; by-spec."wu"."*" = self.by-version."wu"."2.0.0"; by-version."wu"."2.0.0" = self.buildNodePackage { @@ -30152,7 +31121,7 @@ sha1 = "08d016ed165db0c68a192edeb1cdca0f5d43cb22"; }; deps = { - "nan-1.6.1" = self.by-version."nan"."1.6.1"; + "nan-1.6.2" = self.by-version."nan"."1.6.2"; }; peerDependencies = []; }; @@ -30205,18 +31174,18 @@ peerDependencies = []; }; by-spec."xdg-trash"."^1.0.0" = - self.by-version."xdg-trash"."1.0.5"; - by-version."xdg-trash"."1.0.5" = self.buildNodePackage { - name = "xdg-trash-1.0.5"; + self.by-version."xdg-trash"."1.0.6"; + by-version."xdg-trash"."1.0.6" = self.buildNodePackage { + name = "xdg-trash-1.0.6"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/xdg-trash/-/xdg-trash-1.0.5.tgz"; - name = "xdg-trash-1.0.5.tgz"; - sha1 = "5473316b2a1ec2e9329fbeb4d767ffe939cc1c82"; + url = "http://registry.npmjs.org/xdg-trash/-/xdg-trash-1.0.6.tgz"; + name = "xdg-trash-1.0.6.tgz"; + sha1 = "5d13427235e5155ea518d8e7df614300c460521c"; }; deps = { "each-async-1.1.1" = self.by-version."each-async"."1.1.1"; - "fs-extra-0.12.0" = self.by-version."fs-extra"."0.12.0"; + "fs-extra-0.16.3" = self.by-version."fs-extra"."0.16.3"; "uuid-2.0.1" = self.by-version."uuid"."2.0.1"; "xdg-trashdir-1.1.1" = self.by-version."xdg-trashdir"."1.1.1"; }; @@ -30240,14 +31209,14 @@ peerDependencies = []; }; by-spec."xhr2".">= 0.0.5" = - self.by-version."xhr2"."0.1.1"; - by-version."xhr2"."0.1.1" = self.buildNodePackage { - name = "xhr2-0.1.1"; + self.by-version."xhr2"."0.1.2"; + by-version."xhr2"."0.1.2" = self.buildNodePackage { + name = "xhr2-0.1.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/xhr2/-/xhr2-0.1.1.tgz"; - name = "xhr2-0.1.1.tgz"; - sha1 = "a251b131a1069d7a21b43e769ee0852cb8f70e62"; + url = "http://registry.npmjs.org/xhr2/-/xhr2-0.1.2.tgz"; + name = "xhr2-0.1.2.tgz"; + sha1 = "5f9f78c042e5ad1c0dbfcf0deb3aae7c95defc6f"; }; deps = { }; @@ -30268,18 +31237,18 @@ peerDependencies = []; }; by-spec."xml2js"."*" = - self.by-version."xml2js"."0.4.4"; - by-version."xml2js"."0.4.4" = self.buildNodePackage { - name = "xml2js-0.4.4"; + self.by-version."xml2js"."0.4.5"; + by-version."xml2js"."0.4.5" = self.buildNodePackage { + name = "xml2js-0.4.5"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz"; - name = "xml2js-0.4.4.tgz"; - sha1 = "3111010003008ae19240eba17497b57c729c555d"; + url = "http://registry.npmjs.org/xml2js/-/xml2js-0.4.5.tgz"; + name = "xml2js-0.4.5.tgz"; + sha1 = "fc426751b7cf890aaa909a756eede31c7f38a8fc"; }; deps = { "sax-0.6.1" = self.by-version."sax"."0.6.1"; - "xmlbuilder-2.4.5" = self.by-version."xmlbuilder"."2.4.5"; + "xmlbuilder-2.5.2" = self.by-version."xmlbuilder"."2.5.2"; }; peerDependencies = []; }; @@ -30315,12 +31284,26 @@ }; by-spec."xml2js"."0.4.4" = self.by-version."xml2js"."0.4.4"; + by-version."xml2js"."0.4.4" = self.buildNodePackage { + name = "xml2js-0.4.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz"; + name = "xml2js-0.4.4.tgz"; + sha1 = "3111010003008ae19240eba17497b57c729c555d"; + }; + deps = { + "sax-0.6.1" = self.by-version."sax"."0.6.1"; + "xmlbuilder-2.5.2" = self.by-version."xmlbuilder"."2.5.2"; + }; + peerDependencies = []; + }; by-spec."xml2js".">= 0.0.1" = - self.by-version."xml2js"."0.4.4"; + self.by-version."xml2js"."0.4.5"; by-spec."xml2js".">=0.1.7" = - self.by-version."xml2js"."0.4.4"; + self.by-version."xml2js"."0.4.5"; by-spec."xml2js"."^0.4.4" = - self.by-version."xml2js"."0.4.4"; + self.by-version."xml2js"."0.4.5"; by-spec."xml2json".">=0.3.2" = self.by-version."xml2json"."0.5.1"; by-version."xml2json"."0.5.1" = self.buildNodePackage { @@ -30332,7 +31315,7 @@ sha1 = "4667011bf0b34e8ec9830cf83e9476659a94d9ba"; }; deps = { - "node-expat-2.3.4" = self.by-version."node-expat"."2.3.4"; + "node-expat-2.3.6" = self.by-version."node-expat"."2.3.6"; }; peerDependencies = []; }; @@ -30382,17 +31365,17 @@ peerDependencies = []; }; by-spec."xmlbuilder".">=1.0.0" = - self.by-version."xmlbuilder"."2.4.5"; - by-version."xmlbuilder"."2.4.5" = self.buildNodePackage { - name = "xmlbuilder-2.4.5"; + self.by-version."xmlbuilder"."2.5.2"; + by-version."xmlbuilder"."2.5.2" = self.buildNodePackage { + name = "xmlbuilder-2.5.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.4.5.tgz"; - name = "xmlbuilder-2.4.5.tgz"; - sha1 = "0c1c27c8904162cc7f2572ab51cc2ac466007102"; + url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.5.2.tgz"; + name = "xmlbuilder-2.5.2.tgz"; + sha1 = "5ab88fc508ab2ff14873010b56163d3f92b19325"; }; deps = { - "lodash-node-2.4.1" = self.by-version."lodash-node"."2.4.1"; + "lodash-3.2.0" = self.by-version."lodash"."3.2.0"; }; peerDependencies = []; }; diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index 526b0b88310..f942295dff7 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -128,6 +128,7 @@ , "git-run" , "bower" , "bower2nix" +, "fetch-bower" , "npm-check-updates" , "node-stringprep" , "ltx" From a9e4fc1079d86877ca51f597f2a667a8c6a5f92d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 18 Feb 2015 21:38:23 +0100 Subject: [PATCH 061/197] poppler-qt4: fix rendering, fixes #6366 The subpixel patches seem to cause trouble in recent versions. --- pkgs/development/libraries/poppler/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 08c85931204..226aeab1051 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -61,7 +61,7 @@ let poppler_glib = poppler_drv "glib" { }; poppler_qt4 = poppler_drv "qt4" { - patches = [ qtcairo_patch ]; + #patches = [ qtcairo_patch ]; # text rendering artifacts in recent versions propagatedBuildInputs = [ qt4 poppler_glib ]; NIX_LDFLAGS = "-lpoppler"; postConfigure = '' From 324324b024d4debb2a9f33660148ef10d28c6849 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 18 Feb 2015 22:10:43 +0100 Subject: [PATCH 062/197] Adds ocaml-erm_xml XML Parser for discrete data Homepage: https://github.com/ermine/xml --- .../ocaml-modules/erm_xml/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/ocaml-modules/erm_xml/default.nix diff --git a/pkgs/development/ocaml-modules/erm_xml/default.nix b/pkgs/development/ocaml-modules/erm_xml/default.nix new file mode 100644 index 00000000000..0ff2a725ea2 --- /dev/null +++ b/pkgs/development/ocaml-modules/erm_xml/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchzip, ocaml, findlib }: + +let version = "0.3"; in + +stdenv.mkDerivation { + name = "ocaml-erm_xml-${version}"; + + src = fetchzip { + url = "https://github.com/ermine/xml/archive/v${version}.tar.gz"; + sha256 = "19znk5w0qiw3wij4n6w3h5bcr221yy57jf815fr8k9m8kin710g3"; + }; + + buildInputs = [ ocaml findlib ]; + + createFindlibDestdir = true; + + meta = { + homepage = https://github.com/ermine/xml; + description = "XML Parser for discrete data"; + platforms = ocaml.meta.platforms; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ vbgl ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b7c6d211508..1063912348b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3853,6 +3853,8 @@ let eliom = callPackage ../development/ocaml-modules/eliom { }; + erm_xml = callPackage ../development/ocaml-modules/erm_xml { }; + ezjsonm = callPackage ../development/ocaml-modules/ezjsonm { lwt = ocaml_lwt; sexplib = ocaml_sexplib; From ca8137d4a8d717072598499bdb0707539b0bab6a Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 19 Feb 2015 02:12:09 +0300 Subject: [PATCH 063/197] winetricks: update --- pkgs/misc/emulators/wine/build_winetricks.sh | 17 ------------ pkgs/misc/emulators/wine/winetricks.nix | 27 +++++++++++--------- pkgs/misc/emulators/wine/winetricks.patch | 21 --------------- 3 files changed, 15 insertions(+), 50 deletions(-) delete mode 100644 pkgs/misc/emulators/wine/build_winetricks.sh delete mode 100644 pkgs/misc/emulators/wine/winetricks.patch diff --git a/pkgs/misc/emulators/wine/build_winetricks.sh b/pkgs/misc/emulators/wine/build_winetricks.sh deleted file mode 100644 index 2d19e749f2d..00000000000 --- a/pkgs/misc/emulators/wine/build_winetricks.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!bash -source $stdenv/setup -mkdir -p $out/bin -cp $src/src/winetricks $out/bin/winetricks -chmod +x $out/bin/winetricks -cd $out/bin -patch -u -p0 < $patch - -mkdir -p "$out/share/man/man1" -cp "$src/src/winetricks.1" "$out/share/man/man1/" - -patchShebangs "$out" - -substituteInPlace "$out/bin/winetricks" --replace "/usr/bin/perl" `which perl` - -# add stuff to PATH -sed -i "2i PATH=\"${pathAdd}:\${PATH}\"" "$out/bin/winetricks" diff --git a/pkgs/misc/emulators/wine/winetricks.nix b/pkgs/misc/emulators/wine/winetricks.nix index 8103ff9c43f..e65530e38c3 100644 --- a/pkgs/misc/emulators/wine/winetricks.nix +++ b/pkgs/misc/emulators/wine/winetricks.nix @@ -1,25 +1,28 @@ -{ stdenv, fetchsvn, wine, perl, which, coreutils, zenity, curl +{ stdenv, fetchgit, wine, perl, which, coreutils, zenity, curl , cabextract, unzip, p7zip, gnused, gnugrep, bash } : stdenv.mkDerivation rec { - rev = "1199"; - name = "winetricks-${rev}"; + name = "winetricks-20150206"; - src = fetchsvn { - url = "http://winetricks.googlecode.com/svn/trunk"; - inherit rev; - sha256 = "1kji1n6ps09g8xnl9m7vqk3vkl03abzwnc43c52i8p0adnv06khb"; + src = fetchgit { + url = "https://code.google.com/p/winetricks/"; + rev = "483056823093a90c9186b3d1a4867f481acf5fa1"; + sha256 = "8b86a2a130ced405886775f0f81e7a6b25eb1bc22f357d0fe705fead52fff829"; }; buildInputs = [ perl which ]; - pathAdd = stdenv.lib.concatStringsSep "/bin:" # coreutils is for sha1sum - [ wine perl which coreutils zenity curl cabextract unzip p7zip gnused gnugrep bash ] - + "/bin"; + # coreutils is for sha1sum + pathAdd = stdenv.lib.concatMapStringsSep ":" (x: x + "/bin") + [ wine perl which coreutils zenity curl cabextract unzip p7zip gnused gnugrep bash ]; - patch = ./winetricks.patch; + makeFlags = [ "PREFIX=$(out)" ]; - builder = ./build_winetricks.sh; + postInstall = '' + sed -i \ + -e '2i PATH="${pathAdd}:$PATH"' \ + "$out/bin/winetricks" + ''; meta = { description = "A script to install DLLs needed to work around problems in Wine"; diff --git a/pkgs/misc/emulators/wine/winetricks.patch b/pkgs/misc/emulators/wine/winetricks.patch deleted file mode 100644 index f419a0dcee4..00000000000 --- a/pkgs/misc/emulators/wine/winetricks.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- upstream-winetricks 2013-01-12 13:26:12.333076904 -0800 -+++ winetricks 2013-01-12 14:37:39.675092352 -0800 -@@ -3398,7 +3398,7 @@ - WINETRICKS_OPT_SHAREDPREFIX=${WINETRICKS_OPT_SHAREDPREFIX:-0} - - # Mac folks tend to not have sha1sum, but we can make do with openssl -- if [ -x "`which sha1sum 2>/dev/null`" ] -+ if [ -e "`which sha1sum 2>/dev/null`" ] - then - WINETRICKS_SHA1SUM="sha1sum" - elif [ -x "`which openssl 2>/dev/null`" ] -@@ -3628,7 +3628,7 @@ - if ! test "$WINETRICKS_LIB" - then - WINETRICKS_SRCDIR=`dirname "$0"` -- WINETRICKS_SRCDIR=`cd "$WINETRICKS_SRCDIR"; /bin/pwd` -+ WINETRICKS_SRCDIR=`cd "$WINETRICKS_SRCDIR"; pwd` - - # Which GUI helper to use (none/zenity/kdialog). See winetricks_detect_gui. - WINETRICKS_GUI=none - From 51cc9612b74be68487e4803bb282cfc2075d64e8 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 18 Feb 2015 18:02:05 -0800 Subject: [PATCH 064/197] openexr: 1.7.1 -> 2.2.0 --- .../development/libraries/openexr/default.nix | 41 ++++++++++++------- pkgs/development/libraries/openexr/source.nix | 11 +++++ .../libraries/openexr/stringh.patch | 25 ----------- 3 files changed, 38 insertions(+), 39 deletions(-) create mode 100644 pkgs/development/libraries/openexr/source.nix delete mode 100644 pkgs/development/libraries/openexr/stringh.patch diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index b54375ae062..fcb27c2c0cc 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -1,18 +1,31 @@ -{ stdenv, fetchurl, pkgconfig, zlib, ctl, ilmbase }: - +{ stdenv, callPackage, autoconf, automake, libtool, pkgconfig, zlib, ilmbase }: +let + source = callPackage ./source.nix { }; +in stdenv.mkDerivation rec { - name = "openexr-1.7.1"; + name = "openexr-${source.version}"; - src = fetchurl { - url = "mirror://savannah/openexr/${name}.tar.gz"; - sha256 = "0l2rdbx9lg4qk2ms98hwbsnzpggdrx3pbjl6pcvrrpjqp5m905n6"; + src = source.src; + + prePatch = '' + cd OpenEXR + ''; + + preConfigure = '' + ./bootstrap + ''; + + configureFlags = [ "--enable-imfexamples" ]; + + buildInputs = [ autoconf automake libtool pkgconfig ]; + propagatedBuildInputs = [ ilmbase zlib ]; + + meta = with stdenv.lib; { + homepage = http://www.openexr.com/; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; }; - - buildInputs = [ pkgconfig ctl ]; - - propagatedBuildInputs = [ zlib ilmbase ]; - - configureFlags = "--enable-imfexamples"; - - patches = [ ./stringh.patch ]; + + passthru.source = source; } diff --git a/pkgs/development/libraries/openexr/source.nix b/pkgs/development/libraries/openexr/source.nix new file mode 100644 index 00000000000..30675dc54ec --- /dev/null +++ b/pkgs/development/libraries/openexr/source.nix @@ -0,0 +1,11 @@ +{ fetchFromGitHub }: +rec { + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "openexr"; + repo = "openexr"; + rev = "v${version}"; + sha256 = "030vj2jk3n65x1wl0rmxzpl1bd5mzmld2lzn7sg92svpnghry6a8"; + }; +} diff --git a/pkgs/development/libraries/openexr/stringh.patch b/pkgs/development/libraries/openexr/stringh.patch deleted file mode 100644 index ef8cf06b24a..00000000000 --- a/pkgs/development/libraries/openexr/stringh.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/exrenvmap/main.cpp b/exrenvmap/main.cpp -index c5afcc5..5e993b3 100644 ---- a/exrenvmap/main.cpp -+++ b/exrenvmap/main.cpp -@@ -45,6 +45,7 @@ - #include - #include - #include -+#include - - using namespace Imf; - using namespace std; -diff --git a/exrmaketiled/main.cpp b/exrmaketiled/main.cpp -index 5ce4e95..f93ec08 100644 ---- a/exrmaketiled/main.cpp -+++ b/exrmaketiled/main.cpp -@@ -44,7 +44,7 @@ - - #include - #include --#include -+#include - #include - - using namespace Imf; From e9c1a56f975279de27f94e32b088bfbad188afd9 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 18 Feb 2015 18:02:31 -0800 Subject: [PATCH 065/197] ilmbase: Update to openexr version --- .../development/libraries/ilmbase/default.nix | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix index 3c9ad9cfc33..7f8147261ce 100644 --- a/pkgs/development/libraries/ilmbase/default.nix +++ b/pkgs/development/libraries/ilmbase/default.nix @@ -1,10 +1,24 @@ -{stdenv, fetchurl}: +{ stdenv, openexr, automake, autoconf, libtool }: stdenv.mkDerivation { - name = "ilmbase-1.0.1"; + name = "ilmbase-${openexr.source.version}"; - src = fetchurl { - url = mirror://savannah/openexr/ilmbase-1.0.1.tar.gz; - sha256 = "0z9r3r0bxyhgwhkdwln0dg1lnxz691qnjygrqlg3jym34rxzq52g"; + src = openexr.source.src; + + prePatch = '' + cd IlmBase + ''; + + preConfigure = '' + ./bootstrap + ''; + + buildInputs = [ automake autoconf libtool ]; + + meta = with stdenv.lib; { + homepage = http://www.openexr.com/; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; }; } From f94d0c3aa7a61c1b77e6994adb586f1f2c57f10c Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 18 Feb 2015 18:02:56 -0800 Subject: [PATCH 066/197] ctl: Update to 1.5.2 --- pkgs/development/libraries/ctl/default.nix | 31 +++++++++------------- pkgs/development/libraries/ctl/gcc47.patch | 15 ----------- pkgs/development/libraries/ctl/patch.patch | 24 ----------------- pkgs/development/libraries/ctl/source.nix | 11 ++++++++ pkgs/top-level/all-packages.nix | 2 +- 5 files changed, 24 insertions(+), 59 deletions(-) delete mode 100644 pkgs/development/libraries/ctl/gcc47.patch delete mode 100644 pkgs/development/libraries/ctl/patch.patch create mode 100644 pkgs/development/libraries/ctl/source.nix diff --git a/pkgs/development/libraries/ctl/default.nix b/pkgs/development/libraries/ctl/default.nix index 65489ee8c88..4d30afe6818 100644 --- a/pkgs/development/libraries/ctl/default.nix +++ b/pkgs/development/libraries/ctl/default.nix @@ -1,29 +1,22 @@ -{ stdenv, fetchurl, ilmbase }: +{ stdenv, callPackage, cmake, pkgconfig, ilmbase, libtiff, openexr }: +let + source = callPackage ./source.nix { }; +in stdenv.mkDerivation { - name = "ctl-1.4.1"; + name = "ctl-${source.version}"; - src = fetchurl { - url = mirror://sourceforge/ampasctl/ctl-1.4.1.tar.gz; - sha256 = "16lzgbpxdyhykdwndj1i9vx3h4bfkxqqcrvasvgg70gb5raxj0mj"; - }; + src = source.src; - patches = [ ./patch.patch ./gcc47.patch ]; + buildInputs = [ cmake pkgconfig libtiff ilmbase openexr ]; - propagatedBuildInputs = [ ilmbase ]; - - configureFlags = "--with-ilmbase-prefix=${ilmbase}"; - - #configurePhase = " - #export CXXFLAGS=\"-I${ilmbase}/include -L${ilmbase}/lib\" - #echo $CXXFLAGS - #unset configurePhase; configurePhase - #"; - - meta = { + meta = with stdenv.lib; { description = "Color Transformation Language"; homepage = http://ampasctl.sourceforge.net; - license = "SOME OPEN SOURCE LICENSE"; # TODO which exactly is this? + license = "A.M.P.A.S"; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; }; + passthru.source = source; } diff --git a/pkgs/development/libraries/ctl/gcc47.patch b/pkgs/development/libraries/ctl/gcc47.patch deleted file mode 100644 index 1aa4be4fe6d..00000000000 --- a/pkgs/development/libraries/ctl/gcc47.patch +++ /dev/null @@ -1,15 +0,0 @@ - https://bugs.gentoo.org/426368 - - IlmCtl/CtlInterpreter.cpp | 1 + - 1 file changed, 1 insertion(+) - ---- a/IlmCtl/CtlInterpreter.cpp -+++ b/IlmCtl/CtlInterpreter.cpp -@@ -64,6 +64,7 @@ - #include - #include - #include -+#include - - #ifdef WIN32 - #include diff --git a/pkgs/development/libraries/ctl/patch.patch b/pkgs/development/libraries/ctl/patch.patch deleted file mode 100644 index 1d441f58fcc..00000000000 --- a/pkgs/development/libraries/ctl/patch.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/IlmCtl/CtlLex.cpp b/IlmCtl/CtlLex.cpp -index e662d22..a47311a 100644 ---- a/IlmCtl/CtlLex.cpp -+++ b/IlmCtl/CtlLex.cpp -@@ -57,6 +57,7 @@ - #include - #include - #include -+#include - - - #if 0 -diff --git a/IlmCtlSimd/CtlSimdReg.h b/IlmCtlSimd/CtlSimdReg.h -index 6b000b2..8a39f7c 100644 ---- a/IlmCtlSimd/CtlSimdReg.h -+++ b/IlmCtlSimd/CtlSimdReg.h -@@ -52,6 +52,7 @@ - #include - #include - #include -+#include - - //----------------------------------------------------------------------------- - // diff --git a/pkgs/development/libraries/ctl/source.nix b/pkgs/development/libraries/ctl/source.nix new file mode 100644 index 00000000000..d0cb83c0369 --- /dev/null +++ b/pkgs/development/libraries/ctl/source.nix @@ -0,0 +1,11 @@ +{ fetchFromGitHub }: +rec { + version = "1.5.2"; + + src = fetchFromGitHub { + owner = "ampas"; + repo = "CTL"; + rev = "ctl-${version}"; + sha256 = "0a698rd1cmixh3mk4r1xa6rjli8b8b7dbx89pb43xkgqxy67glwx"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1063912348b..ee1f4a49fbf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6885,7 +6885,7 @@ let }; # this ctl version is needed by openexr_viewers - openexr_ctl = callPackage ../development/libraries/openexr_ctl { }; + openexr_ctl = ctl; openexr = callPackage ../development/libraries/openexr { }; From 47f9a276c3d1f34f37e0f61a62e350e22f44ae7b Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 18 Feb 2015 18:11:34 -0800 Subject: [PATCH 067/197] graphviz: Add a no x dependency version --- pkgs/tools/graphics/graphviz/default.nix | 12 ++++++------ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index 5fecd69d802..31945c9f232 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libpng, libjpeg, expat, libXaw -, yacc, libtool, fontconfig, pango, gd, xlibs, gts, gettext, cairo +, yacc, libtool, fontconfig, pango, gd, xlibs, gts, libdevil, gettext, cairo }: stdenv.mkDerivation rec { @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { patches = [ ./0001-vimdot-lookup-vim-in-PATH.patch ]; buildInputs = - [ pkgconfig libpng libjpeg expat libXaw yacc libtool fontconfig - pango gd gts - ] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibs xlibs.libXrender ] + [ pkgconfig libpng libjpeg expat yacc libtool fontconfig gd gts libdevil + ] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibs xlibs.libXrender pango libXaw ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext; - CPPFLAGS = stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") "-I${cairo}/include/cairo"; + CPPFLAGS = stdenv.lib.optionalString (xlibs != null && stdenv.system == "x86_64-darwin") + "-I${cairo}/include/cairo"; configureFlags = [ "--with-pngincludedir=${libpng}/include" @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''; # "command -v" is POSIX, "which" is not - postInstall = '' + postInstall = stdenv.lib.optionalString (xlibs != null) '' sed -i 's|`which lefty`|"'$out'/bin/lefty"|' $out/bin/dotty sed -i 's|which|command -v|' $out/bin/vimdot ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ee1f4a49fbf..c43979a880f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1438,6 +1438,10 @@ let graphviz = callPackage ../tools/graphics/graphviz { }; + graphviz-nox = callPackage ../tools/graphics/graphviz { + xlibs = null; + }; + /* Readded by Michael Raskin. There are programs in the wild * that do want 2.0 but not 2.22. Please give a day's notice for * objections before removal. The feature is integer coordinates From 524e815af1a1e58aff23aa0f6d6af274f22a5937 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 18 Feb 2015 18:20:53 -0800 Subject: [PATCH 068/197] krb5: 1.13 -> 1.13.1 --- pkgs/development/libraries/kerberos/krb5.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index dda9d17852b..d4e4a59ec5f 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -2,7 +2,7 @@ let pname = "krb5"; - version = "1.13"; + version = "1.13.1"; name = "${pname}-${version}"; webpage = http://web.mit.edu/kerberos/; in @@ -12,7 +12,7 @@ stdenv.mkDerivation (rec { src = fetchurl { url = "${webpage}dist/krb5/1.13/${name}-signed.tar"; - sha256 = "10lmbbcrzknzjnhlfjgb4rc3vzncqhmd0kp82pwd0xxpkap7k3yw"; + sha256 = "0gk6jvr64rf6l4xcyxn8i3fr5d1j7dhqvwyv3vw2qdkzz7yjkxjd"; }; buildInputs = [ pkgconfig perl ncurses yacc openssl openldap ]; From e25150bb106edd69db3e4a831044ca4cac6f33b3 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Wed, 18 Feb 2015 22:18:47 -0500 Subject: [PATCH 069/197] No need for this hack anymore --- pkgs/development/libraries/pcre/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index 768e87f5ad2..77d21abb6d2 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -12,15 +12,11 @@ stdenv.mkDerivation rec { sha256 = "1fs5p1z67m9f4xnyil3s4lhgyld78f7m4d1yawpyhh0cvrbk90zg"; }; - # The compiler on Darwin crashes with an internal error while building the - # C++ interface. Disabling optimizations on that platform remedies the - # problem. In case we ever update the Darwin GCC version, the exception for - # that platform ought to be removed. configureFlags = '' --enable-jit ${if unicodeSupport then "--enable-unicode-properties" else ""} ${if !cplusplusSupport then "--disable-cpp" else ""} - '' + optionalString stdenv.isDarwin "CXXFLAGS=-O0"; + ''; doCheck = with stdenv; !(isCygwin || isFreeBSD); # XXX: test failure on Cygwin From 99eb8705cd796f976001403f36934dfcf815f208 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Thu, 19 Feb 2015 04:47:08 +0100 Subject: [PATCH 070/197] grsecurity: Update stable patch from 3.0-3.14.33-201502180832 -> 3.0-3.14.33-201502181906 --- pkgs/os-specific/linux/kernel/patches.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index dfa65a78e7c..e34c1481110 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -66,9 +66,9 @@ rec { grsecurity_stable = grsecPatch { kversion = "3.14.33"; - revision = "201502180832"; + revision = "201502181906"; branch = "stable"; - sha256 = "1hg8zs6p5fy312ksz3ygffa8vd5pl2l2xbdyxdgcdiakzpqjgfgc"; + sha256 = "1ixsh72mzq630v3af1s3aflijpvzf0gb2nfp0aawfk65bcpkq3d8"; }; grsecurity_unstable = grsecPatch From 66097d8f4f8f8da9257075926c1f5c69d15b0053 Mon Sep 17 00:00:00 2001 From: Jim Garrison Date: Thu, 19 Feb 2015 00:07:20 -0800 Subject: [PATCH 071/197] julia: 0.3.5 -> 0.3.6 --- pkgs/development/compilers/julia/0.3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/julia/0.3.nix b/pkgs/development/compilers/julia/0.3.nix index fe685dae747..9f216c7207f 100644 --- a/pkgs/development/compilers/julia/0.3.nix +++ b/pkgs/development/compilers/julia/0.3.nix @@ -11,7 +11,7 @@ let in stdenv.mkDerivation rec { pname = "julia"; - version = "0.3.5"; + version = "0.3.6"; name = "${pname}-${version}"; dsfmt_ver = "2.2"; @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://github.com/JuliaLang/julia.git"; rev = "refs/tags/v${version}"; - md5 = "abdee0e64f8e9ae3d96e37734e2db40a"; + md5 = "d28e8f428485219f756d80c011d5dd32"; name = "julia-git-v${version}"; }; From a661802d29c7326d7407160eed65899726806036 Mon Sep 17 00:00:00 2001 From: rushmorem Date: Thu, 19 Feb 2015 12:31:12 +0200 Subject: [PATCH 072/197] Update chronos default port Update chronos default port to match the one documented on their website (http://airbnb.github.io/chronos). The one in their repo (the current one) clashes with the marathon documented one. --- nixos/modules/services/scheduling/chronos.nix | 2 +- pkgs/applications/networking/cluster/chronos/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/scheduling/chronos.nix b/nixos/modules/services/scheduling/chronos.nix index 277cdd63280..f36b886a744 100644 --- a/nixos/modules/services/scheduling/chronos.nix +++ b/nixos/modules/services/scheduling/chronos.nix @@ -18,7 +18,7 @@ in { httpPort = mkOption { description = "Chronos listening port"; - default = 8080; + default = 4400; type = types.int; }; diff --git a/pkgs/applications/networking/cluster/chronos/default.nix b/pkgs/applications/networking/cluster/chronos/default.nix index 58d56feea70..14f5d251240 100644 --- a/pkgs/applications/networking/cluster/chronos/default.nix +++ b/pkgs/applications/networking/cluster/chronos/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = https://github.com/airbnb/chronos; + homepage = http://airbnb.github.io/chronos; license = licenses.asl20; description = "Fault tolerant job scheduler for Mesos which handles dependencies and ISO8601 based schedules"; maintainers = with maintainers; [ offline ]; From 74b40e9a433066ae6a87a32a85a229a1a4d4adbf Mon Sep 17 00:00:00 2001 From: rushmorem Date: Thu, 19 Feb 2015 11:32:02 +0200 Subject: [PATCH 073/197] Add marathon mesos framework --- lib/maintainers.nix | 1 + nixos/modules/misc/ids.nix | 1 + nixos/modules/module-list.nix | 1 + .../modules/services/scheduling/marathon.nix | 58 +++++++++++++++++++ .../networking/cluster/marathon/default.nix | 30 ++++++++++ pkgs/top-level/all-packages.nix | 2 + 6 files changed, 93 insertions(+) create mode 100644 nixos/modules/services/scheduling/marathon.nix create mode 100644 pkgs/applications/networking/cluster/marathon/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index d913a28c999..89ab1f5c3cf 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -159,6 +159,7 @@ roelof = "Roelof Wobben "; romildo = "José Romildo Malaquias "; rszibele = "Richard Szibele "; + rushmorem = "Rushmore Mushambi "; rycee = "Robert Helgesson "; sander = "Sander van der Burg "; schristo = "Scott Christopher "; diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index f3cda7b9541..390bab907b3 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -178,6 +178,7 @@ nylon = 168; apache-kafka = 169; panamax = 170; + marathon = 171; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 8ce1c6c20a3..e0255bbbe28 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -315,6 +315,7 @@ ./services/scheduling/chronos.nix ./services/scheduling/cron.nix ./services/scheduling/fcron.nix + ./services/scheduling/marathon.nix ./services/search/elasticsearch.nix ./services/search/solr.nix ./services/security/clamav.nix diff --git a/nixos/modules/services/scheduling/marathon.nix b/nixos/modules/services/scheduling/marathon.nix new file mode 100644 index 00000000000..8513d1174c3 --- /dev/null +++ b/nixos/modules/services/scheduling/marathon.nix @@ -0,0 +1,58 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.marathon; + +in { + + ###### interface + + options.services.marathon = { + enable = mkOption { + description = "Whether to enable the marathon mesos framework."; + default = false; + type = types.uniq types.bool; + }; + + httpPort = mkOption { + description = "Marathon listening port"; + default = 8080; + type = types.int; + }; + + master = mkOption { + description = "Marathon mesos master zookeeper address"; + default = "zk://${head cfg.zookeeperHosts}/mesos"; + type = types.str; + }; + + zookeeperHosts = mkOption { + description = "Marathon mesos zookepper addresses"; + default = [ "localhost:2181" ]; + type = types.listOf types.str; + }; + }; + + ###### implementation + + config = mkIf cfg.enable { + systemd.services.marathon = { + description = "Marathon Service"; + wantedBy = [ "multi-user.target" ]; + after = [ "network-interfaces.target" "zookeeper.service" "mesos-master.service" "mesos-slave.service" ]; + + serviceConfig = { + ExecStart = "${pkgs.marathon}/bin/marathon --master ${cfg.master} --zk zk://${head cfg.zookeeperHosts}/marathon"; + User = "marathon"; + }; + }; + + users.extraUsers.marathon = { + uid = config.ids.uids.marathon; + description = "Marathon mesos framework user"; + }; + }; +} diff --git a/pkgs/applications/networking/cluster/marathon/default.nix b/pkgs/applications/networking/cluster/marathon/default.nix new file mode 100644 index 00000000000..36ce79aaf34 --- /dev/null +++ b/pkgs/applications/networking/cluster/marathon/default.nix @@ -0,0 +1,30 @@ +{ stdenv, makeWrapper, jdk, mesos, fetchurl }: + +stdenv.mkDerivation rec { + name = "marathon-v${version}"; + version = "0.8.0"; + + src = fetchurl { + url = "https://downloads.mesosphere.com/marathon/v${version}/marathon-${version}.tgz"; + sha256 = "794c915e205aebd8273f2b40c6faea1517fc683cdc0169194c4a67ce8779fa41"; + }; + + buildInputs = [ makeWrapper jdk mesos ]; + + installPhase = '' + mkdir -p $out/{bin,libexec/marathon} + cp target/scala-*/marathon*.jar $out/libexec/marathon/${name}.jar + + makeWrapper ${jdk.jre}/bin/java $out/bin/marathon \ + --add-flags "-Xmx512m -jar $out/libexec/marathon/${name}.jar" \ + --prefix "MESOS_NATIVE_LIBRARY" : "$MESOS_NATIVE_LIBRARY" + ''; + + meta = with stdenv.lib; { + homepage = https://mesosphere.github.io/marathon; + description = "Cluster-wide init and control system for services in cgroups or Docker containers."; + license = licenses.asl20; + maintainers = with maintainers; [ rushmorem ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c43979a880f..19838a7b7d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10013,6 +10013,8 @@ let magit = callPackage ../applications/editors/emacs-modes/magit { }; + marathon = callPackage ../applications/networking/cluster/marathon { }; + maudeMode = callPackage ../applications/editors/emacs-modes/maude { }; metaweblog = callPackage ../applications/editors/emacs-modes/metaweblog { }; From e47675db6a66f6437c9981533a2fa4910f86fe11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Thu, 19 Feb 2015 13:34:01 +0100 Subject: [PATCH 074/197] cutecom: new expression --- pkgs/tools/misc/cutecom/default.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/tools/misc/cutecom/default.nix diff --git a/pkgs/tools/misc/cutecom/default.nix b/pkgs/tools/misc/cutecom/default.nix new file mode 100644 index 00000000000..37d5b6cbc7f --- /dev/null +++ b/pkgs/tools/misc/cutecom/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, qt4, cmake }: + +stdenv.mkDerivation rec { + name = "cutecom-0.22.0"; + src = fetchurl { + url = "http://cutecom.sourceforge.net/${name}.tar.gz"; + sha256 = "199fvl463nyn77r3nm8xgzgifs28j5759kkcnc5xbwww2nk20rhv"; + }; + buildInputs = [qt4 cmake]; + + meta = { + description = "A graphical serial terminal"; + version = "0.22.0"; + homepage = http://cutecom.sourceforge.net/; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = [ stdenv.lib.maintainers.bennofs ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c43979a880f..09267e61150 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9807,6 +9807,8 @@ let imagemagick = imagemagick; }; + cutecom = callPackage ../tools/misc/cutecom { }; + cvs = callPackage ../applications/version-management/cvs { }; cvsps = callPackage ../applications/version-management/cvsps { }; From 5762f8f95c802165d374ece8154a6a79aa9a70a0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 19 Feb 2015 14:15:02 +0100 Subject: [PATCH 075/197] Add options to support signed binary caches Typical use: nix.requireSignedBinaryCaches = true; nix.binaryCachePublicKeys = [ "hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs=" ]; (The public key of cache.nixos.org is included by default.) Note that this requires Nix 1.9 and that most of cache.nixos.org hasn't been signed yet. --- nixos/modules/services/misc/nix-daemon.nix | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 81fabd1923f..f231998d8f4 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -41,6 +41,10 @@ let build-chroot-dirs = ${toString cfg.chrootDirs} /bin/sh=${sh} $(echo $extraPaths) binary-caches = ${toString cfg.binaryCaches} trusted-binary-caches = ${toString cfg.trustedBinaryCaches} + binary-cache-public-keys = ${toString cfg.binaryCachePublicKeys} + ${optionalString cfg.requireSignedBinaryCaches '' + signed-binary-caches = * + ''} $extraOptions END ''; @@ -244,6 +248,33 @@ in ''; }; + requireSignedBinaryCaches = mkOption { + type = types.bool; + default = false; + description = '' + If enabled, Nix will only download binaries from binary + caches if they are cryptographically signed with any of the + keys listed in + . If disabled (the + default), signatures are neither required nor checked, so + it's strongly recommended that you use only trustworthy + caches and https to prevent man-in-the-middle attacks. + ''; + }; + + binaryCachePublicKeys = mkOption { + type = types.listOf types.str; + example = [ "hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs=" ]; + description = '' + List of public keys used to sign binary caches. If + is enabled, + then Nix will use a binary from a binary cache if and only + if it is signed by any of the keys + listed here. By default, only the key for + cache.nixos.org is included. + ''; + }; + }; }; @@ -253,6 +284,8 @@ in config = { + nix.binaryCachePublicKeys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ]; + environment.etc."nix/nix.conf".source = nixConf; # List of machines for distributed Nix builds in the format From 72b30b1b3ddc6d5ecbb2f93e976ac79052fbea2a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 18 Feb 2015 17:17:08 +0100 Subject: [PATCH 076/197] wakatime 20150213 -> 3.0.7 --- pkgs/misc/vim-plugins/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 48192d28eea..2b594299c28 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -487,11 +487,11 @@ rec { }; wakatime = buildVimPlugin { - name = "wakatime-20150213"; + name = "wakatime-3.0.7"; src = fetchFromGitHub { - sha256 = "1vbka18av7wgpqhfaqql5mvcgjdmxgz3hzg55ih7r63qx0icpk19"; - rev = "d639c5ea7bbd67e5a3b4974a982f6c4412f4aa3"; + sha256 = "1kn50fz9hnimzic640blmb5wi64vkcn45g15i4ckfzivza4jyc73"; + rev = "30ce2e30670d80ec1ef033ae4415c1f6ea46f18f"; repo = "vim-wakatime"; owner = "wakatime"; }; From 9775f462b768c7dd39c8f002b0604bc654b64488 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 19 Feb 2015 14:45:54 +0100 Subject: [PATCH 077/197] stress-ng 0.03.16 -> 0.03.18 --- pkgs/tools/system/stress-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index c427327bb81..b5380d083cf 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: -let version = "0.03.16"; in +let version = "0.03.18"; in stdenv.mkDerivation rec { name = "stress-ng-${version}"; src = fetchurl { - sha256 = "0dk1ry1xdfbisyv8sywrlmyrr4s28y88ygnwl1h0ylxp4z6py16v"; + sha256 = "0v71h92zfr0n53ws413r4mn9xhh8mavcw9iwhdibxlsn33zhbb4p"; url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz"; }; From a53da93b2bfa5a2731b40b78cfd1aff1ff77facc Mon Sep 17 00:00:00 2001 From: codyopel Date: Wed, 18 Feb 2015 21:31:19 -0500 Subject: [PATCH 078/197] wayland: 1.6.0 -> 1.7.0 & add optionals All non-essential dependencies are now optional, with exception to wayland-scanner which if not enabled causes wayland to fail to build --- .../development/libraries/wayland/default.nix | 38 +++++++++++++++---- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index 8c1ac2deb66..e3cabcc8abf 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -1,21 +1,45 @@ -{ stdenv, fetchurl, libffi, expat, pkgconfig, libxslt, docbook_xsl, doxygen }: +{ stdenv, fetchurl, pkgconfig +, libffi +, scannerSupport ? true, expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0) +, documentationSupport ? false, docbook_xsl ? null, doxygen ? null, graphviz-nox ? null, libxslt ? null, xmlto ? null #, publican ? null +}: -let version = "1.6.0"; in +# Require the optional to be enabled until upstream fixes or removes the configure flag +assert scannerSupport; +assert scannerSupport -> (expat != null); +assert documentationSupport -> ((docbook_xsl != null) && (doxygen != null) && (graphviz-nox != null) && (libxslt != null) && (xmlto != null)); + +let + mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; +in + +with stdenv.lib; stdenv.mkDerivation rec { name = "wayland-${version}"; + version = "1.7.0"; src = fetchurl { url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "0zzwlrmxil10g9rvdgha0y1d8z0x97g65g14kl2qrl2krwni1md7"; + sha256 = "173w0pqzk2m7hjlg15bymrx7ynxgq1ciadg03hzybxwnvfi4gsmx"; }; - buildInputs = [ pkgconfig libffi expat libxslt docbook_xsl doxygen ]; + configureFlags = [ + (mkFlag scannerSupport "scanner") + (mkFlag documentationSupport "documentation") + ]; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ libffi ] + ++ optional scannerSupport expat + ++ optionals documentationSupport [ docbook_xsl doxygen graphviz-nox libxslt xmlto ]; meta = { description = "Reference implementation of the wayland protocol"; - homepage = http://wayland.freedesktop.org/; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + homepage = http://wayland.freedesktop.org/; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ codyopel wkennington ]; }; } From 2cbd639b2aa075cfc5caadbd4dd29612ebdc006b Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 19 Feb 2015 09:56:50 -0800 Subject: [PATCH 079/197] graphviz-nox: Actually build without any deps on mesa or x11 --- pkgs/top-level/all-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aed64994cee..9e5cde07e85 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1440,6 +1440,7 @@ let graphviz-nox = callPackage ../tools/graphics/graphviz { xlibs = null; + libdevil = libdevil-nox; }; /* Readded by Michael Raskin. There are programs in the wild @@ -6078,6 +6079,11 @@ let libdevil = callPackage ../development/libraries/libdevil { }; + libdevil-nox = libdevil.override { + libX11 = null; + mesa = null; + }; + libdiscid = callPackage ../development/libraries/libdiscid { }; libdivsufsort = callPackage ../development/libraries/libdivsufsort { }; From e574da83de877de5818ab75129ba840147c50d77 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 19 Feb 2015 09:57:13 -0800 Subject: [PATCH 080/197] wayland: Always build documentation --- .../development/libraries/wayland/default.nix | 19 +++++++------------ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index e3cabcc8abf..cdd663bf191 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -1,14 +1,10 @@ { stdenv, fetchurl, pkgconfig -, libffi -, scannerSupport ? true, expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0) -, documentationSupport ? false, docbook_xsl ? null, doxygen ? null, graphviz-nox ? null, libxslt ? null, xmlto ? null #, publican ? null +, libffi, docbook_xsl, doxygen, graphviz, libxslt, xmlto +, expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0) }: # Require the optional to be enabled until upstream fixes or removes the configure flag -assert scannerSupport; - -assert scannerSupport -> (expat != null); -assert documentationSupport -> ((docbook_xsl != null) && (doxygen != null) && (graphviz-nox != null) && (libxslt != null) && (xmlto != null)); +assert expat != null; let mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; @@ -25,15 +21,12 @@ stdenv.mkDerivation rec { }; configureFlags = [ - (mkFlag scannerSupport "scanner") - (mkFlag documentationSupport "documentation") + (mkFlag (expat != null) "scanner") ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libffi ] - ++ optional scannerSupport expat - ++ optionals documentationSupport [ docbook_xsl doxygen graphviz-nox libxslt xmlto ]; + buildInputs = [ libffi docbook_xsl doxygen graphviz libxslt xmlto expat ]; meta = { description = "Reference implementation of the wayland protocol"; @@ -42,4 +35,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ codyopel wkennington ]; }; + + passthru.version = version; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e5cde07e85..3a4256185db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7432,7 +7432,9 @@ let wavpack = callPackage ../development/libraries/wavpack { }; - wayland = callPackage ../development/libraries/wayland { }; + wayland = callPackage ../development/libraries/wayland { + graphviz = graphviz-nox; + }; webkit = webkitgtk; From 3d2c7d791ea9c58eaed93e6228bf7f7d59eb1251 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 19 Feb 2015 10:13:44 -0800 Subject: [PATCH 081/197] weston: Update to 1.7.0 --- pkgs/applications/window-managers/weston/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index c78f7d2d241..9b88400ef53 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -5,14 +5,12 @@ # beware of null defaults, as the parameters *are* supplied by callPackage by default }: -let version = "1.6.0"; in - stdenv.mkDerivation rec { - name = "weston-${version}"; + name = "weston-${wayland.version}"; src = fetchurl { url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "0kb1mb54l7adihmr2y77xgsdb00dvifnq886q2mmy0mz7g8sagnw"; + sha256 = "1kb6a494j56sh7iy43xwkjlr3bh0nnkq4bkimwj6qirzbya12i8w"; }; buildInputs = [ From 6265123f7a687143a9ee20888cae5e07fb08c087 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 13 Jan 2015 23:54:18 +0100 Subject: [PATCH 082/197] Add new package screen-message --- pkgs/tools/X11/screen-message/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/X11/screen-message/default.nix diff --git a/pkgs/tools/X11/screen-message/default.nix b/pkgs/tools/X11/screen-message/default.nix new file mode 100644 index 00000000000..977a82230a5 --- /dev/null +++ b/pkgs/tools/X11/screen-message/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchdarcs, autoreconfHook, pkgconfig, gtk3 }: + +stdenv.mkDerivation { + name = "screen-message-0.23"; + + src = fetchdarcs { + url = "http://darcs.nomeata.de/screen-message.debian"; + rev = "0.23-1"; + }; + + buildInputs = [ autoreconfHook pkgconfig gtk3 ]; + + # screen-message installs its binary in $(prefix)/games per default + makeFlags = [ "execgamesdir=$(out)/bin" ]; + + meta = { + homepage = "http://darcs.nomeata.de/cgi-bin/darcsweb.cgi?r=screen-message.debian"; + description = "Displays a short text fullscreen in an X11 window"; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = [ stdenv.lib.maintainers.fpletz ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3a4256185db..5c4abe20523 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2519,6 +2519,8 @@ let screen = callPackage ../tools/misc/screen { }; + screen-message = callPackage ../tools/X11/screen-message { }; + scrot = callPackage ../tools/graphics/scrot { }; scrypt = callPackage ../tools/security/scrypt { }; From 48f4290cd815f5d847e4b5e0a94c119cc7fe3644 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 19 Feb 2015 19:31:29 +0100 Subject: [PATCH 083/197] Update silc-client to 1.1.11 --- .../instant-messengers/silc-client/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/silc-client/default.nix b/pkgs/applications/networking/instant-messengers/silc-client/default.nix index 4ce098e6ca4..133a15aebf8 100644 --- a/pkgs/applications/networking/instant-messengers/silc-client/default.nix +++ b/pkgs/applications/networking/instant-messengers/silc-client/default.nix @@ -5,19 +5,19 @@ # http://marc.info/?l=silc-devel&m=125610477802211 let - basename = "silc-client-1.1.8"; + basename = "silc-client-1.1.11"; in stdenv.mkDerivation { name = basename + stdenv.lib.optionalString enablePlugin "-irssi-plugin"; src = fetchurl { - url = "http://silcnet.org/download/client/sources/${basename}.tar.bz2"; - sha256 = "1qnk35g8sbnfps3bq2k9sy0ymlsijh5n8z59m2ccq4pkmqbfqgv2"; + url = "mirror://sourceforge/silc/silc/client/sources/${basename}.tar.bz2"; + sha256 = "13cp3fmdnj8scjak0d2xal3bfvs2k7ssrwdhp0zl6jar5rwc7prn"; }; - dontDisableStatic = true; + enableParallelBuilding = true; - patches = [ ./server_setup.patch ]; + dontDisableStatic = true; configureFlags = "--with-ncurses=${ncurses}"; From 22bfa410333ef27c71c944a5fcdf5c650ba9ac45 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 19 Feb 2015 19:33:41 +0100 Subject: [PATCH 084/197] Update libressl to 2.1.3 --- pkgs/development/libraries/libressl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index fbeea0573d7..c35f0a7efe5 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libressl-${version}"; - version = "2.0.5"; + version = "2.1.3"; src = fetchurl { url = "mirror://openbsd/LibreSSL/${name}.tar.gz"; - sha256 = "16pwgmj90k10pf03il39lnck5kqw59hj0fp2qhmgsgmrvssn6m1z"; + sha256 = "0z2g609526pc8zmz2frkmhlfgvn8cmj5agj5yq5b33s0f44kfbzb"; }; enableParallelBuilding = true; From a57ec23d55547799de5aa0c78be3add65ca90d8b Mon Sep 17 00:00:00 2001 From: koral Date: Thu, 19 Feb 2015 12:09:38 +0100 Subject: [PATCH 085/197] prosody: added luaevent dependency. --- pkgs/servers/xmpp/prosody/default.nix | 21 +++++++++++------- pkgs/top-level/all-packages.nix | 3 ++- pkgs/top-level/lua-packages.nix | 32 ++++++++++++++++++++++++++- 3 files changed, 46 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix index abe0116ef90..67882b1a02a 100644 --- a/pkgs/servers/xmpp/prosody/default.nix +++ b/pkgs/servers/xmpp/prosody/default.nix @@ -1,12 +1,16 @@ -{ stdenv, fetchurl, lua5, luasocket, luasec, luaexpat, luafilesystem, luabitop, libidn, openssl, makeWrapper, fetchhg }: +{ stdenv, fetchurl, lua5, luasocket, luasec, luaexpat, luafilesystem, luabitop, luaevent ? null, libidn, openssl, makeWrapper, fetchhg, withLibevent ? false }: + +assert withLibevent -> luaevent != null; + +with stdenv.lib; let - libs = [ luasocket luasec luaexpat luafilesystem luabitop ]; + libs = [ luasocket luasec luaexpat luafilesystem luabitop ] ++ optional withLibevent luaevent; getPath = lib : type : "${lib}/lib/lua/${lua5.luaversion}/?.${type};${lib}/share/lua/${lua5.luaversion}/?.${type}"; getLuaPath = lib : getPath lib "lua"; getLuaCPath = lib : getPath lib "so"; - luaPath = stdenv.lib.concatStringsSep ";" (map getLuaPath libs); - luaCPath = stdenv.lib.concatStringsSep ";" (map getLuaCPath libs); + luaPath = concatStringsSep ";" (map getLuaPath libs); + luaCPath = concatStringsSep ";" (map getLuaCPath libs); in stdenv.mkDerivation rec { @@ -23,7 +27,8 @@ stdenv.mkDerivation rec { sha256 = "0010x2rl9f9ihy2nwqan2jdlz25433srj2zna1xh10490mc28hij"; }; - buildInputs = [ lua5 luasocket luasec luaexpat luabitop libidn openssl makeWrapper ]; + buildInputs = [ lua5 luasocket luasec luaexpat luabitop libidn openssl makeWrapper ] + ++ optional withLibevent luaevent; configureFlags = [ "--ostype=linux" @@ -44,9 +49,9 @@ stdenv.mkDerivation rec { meta = { description = "Open-source XMPP application server written in Lua"; - license = stdenv.lib.licenses.mit; + license = licenses.mit; homepage = http://www.prosody.im; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.flosse ]; + platforms = platforms.linux; + maintainers = [ maintainers.flosse ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04a592a7e56..3626339d3db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7876,7 +7876,8 @@ let prosody = recurseIntoAttrs ( callPackage ../servers/xmpp/prosody { lua5 = lua5_1; - inherit (lua51Packages) luasocket luasec luaexpat luafilesystem luabitop; + inherit (lua51Packages) luasocket luasec luaexpat luafilesystem luabitop luaevent; + withLibevent = true; }); elasticmq = callPackage ../servers/elasticmq { }; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index eeff4a47f9e..f2caede41d5 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -7,7 +7,7 @@ { fetchurl, stdenv, lua, callPackage, unzip, zziplib, pkgconfig, libtool , pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat, cairo -, perl, gtk, python, glib, gobjectIntrospection +, perl, gtk, python, glib, gobjectIntrospection, libevent }: let @@ -50,6 +50,36 @@ let }; }; + luaevent = buildLuaPackage rec { + version = "0.4.3"; + name = "luaevent-${version}"; + disabled = isLua52; + + src = fetchurl { + url = "https://github.com/harningt/luaevent/archive/v${version}.tar.gz"; + sha256 = "1ifr949j9xaas0jk0nxpilb44dqvk4c5h4m7ccksz5da3iksfgls"; + }; + + preBuild = '' + makeFlagsArray=( + INSTALL_DIR_LUA="$out/share/lua/${lua.luaversion}" + INSTALL_DIR_BIN="$out/lib/lua/${lua.luaversion}" + LUA_INC_DIR="${lua}/include" + ); + ''; + + buildInputs = [ libevent ]; + + propagatedBuildInputs = [ luasocket ]; + + meta = with stdenv.lib; { + homepage = http://luaforge.net/projects/luaevent/; + description = "Binding of libevent to Lua."; + license = licenses.mit; + maintainers = [ maintainers.koral ]; + }; + }; + luaexpat = buildLuaPackage rec { version = "1.3.0"; name = "expat-${version}"; From 0f9c0348af199f9baed6585be0502ad61c6f7e04 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 19 Feb 2015 23:49:41 +0300 Subject: [PATCH 086/197] rPackages: remove Xvfb where it's not needed --- pkgs/development/r-modules/default.nix | 4 ++-- pkgs/development/r-modules/generic-builder.nix | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 0bb02d0f989..1d23bb692cf 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -3,9 +3,9 @@ { R, pkgs, overrides }: let - inherit (pkgs) fetchurl stdenv lib xvfb_run utillinux; + inherit (pkgs) fetchurl stdenv lib; - buildRPackage = import ./generic-builder.nix { inherit R xvfb_run utillinux ; }; + buildRPackage = pkgs.callPackage ./generic-builder.nix { inherit R; }; # Package template # diff --git a/pkgs/development/r-modules/generic-builder.nix b/pkgs/development/r-modules/generic-builder.nix index bca7c10e0fd..45c377635c9 100644 --- a/pkgs/development/r-modules/generic-builder.nix +++ b/pkgs/development/r-modules/generic-builder.nix @@ -1,9 +1,10 @@ -{ R, xvfb_run, utillinux }: +{ stdenv, R, xvfb_run, utillinux }: { name, buildInputs ? [], ... } @ attrs: -R.stdenv.mkDerivation ({ - buildInputs = buildInputs ++ [R xvfb_run utillinux]; +stdenv.mkDerivation ({ + buildInputs = buildInputs ++ [R] ++ + stdenv.lib.optionals attrs.requireX [utillinux xvfb_run]; configurePhase = '' runHook preConfigure From 88ab59eb736220a57bdf2efa98ec70220f60d57a Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 19 Feb 2015 23:50:42 +0300 Subject: [PATCH 087/197] rPackages: nicer override* functions --- pkgs/development/r-modules/default.nix | 32 ++++++++------------------ 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 1d23bb692cf..dce680b1056 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -51,17 +51,11 @@ let # }); # } overrideNativeBuildInputs = overrides: old: - let - attrNames = builtins.attrNames overrides; - nameValuePairs = map (name: rec { - inherit name; - nativeBuildInputs = builtins.getAttr name overrides; - value = (builtins.getAttr name old).overrideDerivation (attrs: { - nativeBuildInputs = attrs.nativeBuildInputs ++ nativeBuildInputs; - }); - }) attrNames; - in - builtins.listToAttrs nameValuePairs; + lib.mapAttrs (name: value: + (builtins.getAttr name old).overrideDerivation (attrs: { + nativeBuildInputs = attrs.nativeBuildInputs ++ value; + }) + ) overrides; # Overrides package definitions with buildInputs. # For example, @@ -78,17 +72,11 @@ let # }); # } overrideBuildInputs = overrides: old: - let - attrNames = builtins.attrNames overrides; - nameValuePairs = map (name: rec { - inherit name; - buildInputs = builtins.getAttr name overrides; - value = (builtins.getAttr name old).overrideDerivation (attrs: { - buildInputs = attrs.buildInputs ++ buildInputs; - }); - }) attrNames; - in - builtins.listToAttrs nameValuePairs; + lib.mapAttrs (name: value: + (builtins.getAttr name old).overrideDerivation (attrs: { + buildInputs = attrs.buildInputs ++ value; + }) + ) overrides; # Overrides package definition requiring X running to install. # For example, From 3e6531c1742eef569a7507c664f4ae3b569438a6 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 19 Feb 2015 23:51:24 +0300 Subject: [PATCH 088/197] rPackages: add packagesWithRDepends --- pkgs/development/r-modules/default.nix | 36 +++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index dce680b1056..a72b56d622a 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -78,6 +78,29 @@ let }) ) overrides; + # Overrides package definitions with new R dependencies. + # For example, + # + # overrideRDepends { + # foo = [ self.bar ] + # } old + # + # results in + # + # { + # foo = old.foo.overrideDerivation (attrs: { + # nativeBuildInputs = attrs.nativeBuildInputs ++ [ self.bar ]; + # propagatedNativeBuildInputs = attrs.propagatedNativeBuildInputs ++ [ self.bar ]; + # }); + # } + overrideRDepends = overrides: old: + lib.mapAttrs (name: value: + (builtins.getAttr name old).overrideDerivation (attrs: { + nativeBuildInputs = attrs.nativeBuildInputs ++ value; + propagatedNativeBuildInputs = attrs.propagatedNativeBuildInputs ++ value; + }) + ) overrides; + # Overrides package definition requiring X running to install. # For example, # @@ -158,10 +181,11 @@ let let old1 = old0 // (overrideRequireX packagesRequireingX old0); old2 = old1 // (overrideSkipCheck packagesToSkipCheck old1); - old3 = old2 // (overrideNativeBuildInputs packagesWithNativeBuildInputs old2); - old4 = old3 // (overrideBuildInputs packagesWithBuildInputs old3); - old5 = old4 // (overrideBroken brokenPackages old4); - old = old5; + old3 = old2 // (overrideRDepends packagesWithRDepends old2); + old4 = old3 // (overrideNativeBuildInputs packagesWithNativeBuildInputs old3); + old5 = old4 // (overrideBuildInputs packagesWithBuildInputs old4); + old6 = old5 // (overrideBroken brokenPackages old5); + old = old6; in old // (otherOverrides old new); # Recursive override pattern. @@ -173,6 +197,10 @@ let # tweaks for the individual packages and "in self" follow + packagesWithRDepends = { + # sort -t '=' -k 2 + }; + packagesWithNativeBuildInputs = { # sort -t '=' -k 2 RAppArmor = [ pkgs.apparmor ]; From 8450ff3ab8e315998f7e52afaf487352808c7b6a Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 19 Feb 2015 23:53:36 +0300 Subject: [PATCH 089/197] rPackages: fix broken packages --- pkgs/development/r-modules/default.nix | 101 +++++++++--------- .../r-modules/patches/RMySQL.patch | 13 +++ pkgs/development/r-modules/patches/iFes.patch | 13 +++ .../r-modules/patches/openssl.patch | 30 ------ 4 files changed, 77 insertions(+), 80 deletions(-) create mode 100644 pkgs/development/r-modules/patches/RMySQL.patch create mode 100644 pkgs/development/r-modules/patches/iFes.patch delete mode 100644 pkgs/development/r-modules/patches/openssl.patch diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index a72b56d622a..d901c8b6d63 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -199,11 +199,14 @@ let packagesWithRDepends = { # sort -t '=' -k 2 + FactoMineR = [ self.car ]; }; packagesWithNativeBuildInputs = { # sort -t '=' -k 2 + graphscan = [ pkgs.gsl ]; RAppArmor = [ pkgs.apparmor ]; + BNSP = [ pkgs.gsl ]; SOD = [ pkgs.cudatoolkit ]; # requres CL/cl.h curl = [ pkgs.curl pkgs.openldap ]; Rssa = [ pkgs.fftw ]; @@ -219,11 +222,12 @@ let RCA = [ pkgs.gmp ]; gmp = [ pkgs.gmp ]; rcdd = [ pkgs.gmp ]; + Rlibeemd = [ pkgs.gsl ]; igraph = [ pkgs.gmp ]; glpkAPI = [ pkgs.gmp pkgs.glpk ]; sdcTable = [ pkgs.gmp pkgs.glpk ]; Rmpfr = [ pkgs.gmp pkgs.mpfr ]; - BNSP = [ pkgs.gsl ]; + Formula = [ pkgs.gmp ]; BayesSAE = [ pkgs.gsl ]; BayesVarSel = [ pkgs.gsl ]; HiCseg = [ pkgs.gsl ]; @@ -244,10 +248,13 @@ let topicmodels = [ pkgs.gsl ]; RcppGSL = [ pkgs.gsl ]; bnpmr = [ pkgs.gsl ]; + V8 = [ pkgs.v8 ]; geoCount = [ pkgs.gsl ]; + devEMF = [ pkgs.xlibs.libXft ]; gsl = [ pkgs.gsl ]; mvabund = [ pkgs.gsl ]; diversitree = [ pkgs.gsl pkgs.fftw ]; + TKF = [ pkgs.gsl ]; VBmix = [ pkgs.gsl pkgs.fftw pkgs.qt4 ]; RGtk2 = [ pkgs.gtk2 ]; cairoDevice = [ pkgs.gtk2 ]; @@ -260,6 +267,8 @@ let jpeg = [ pkgs.libjpeg ]; EMCluster = [ pkgs.liblapack ]; png = [ pkgs.libpng ]; + pbdMPI = [ pkgs.openmpi ]; + bigGP = [ pkgs.openmpi ]; rtiff = [ pkgs.libtiff ]; tiff = [ pkgs.libtiff ]; Cairo = [ pkgs.libtiff pkgs.libjpeg pkgs.cairo ]; @@ -294,7 +303,7 @@ let BayesXsrc = [ pkgs.readline pkgs.ncurses ]; udunits2 = [ pkgs.udunits pkgs.expat ]; tkrplot = [ pkgs.xlibs.libX11 ]; - rzmq = [ pkgs.zeromq2 ]; + rzmq = [ pkgs.zeromq3 ]; PopGenome = [ pkgs.zlib ]; RJaCGH = [ pkgs.zlib ]; RcppCNPy = [ pkgs.zlib ]; @@ -302,8 +311,9 @@ let rmatio = [ pkgs.zlib ]; RVowpalWabbit = [ pkgs.zlib pkgs.boost ]; seqminer = [ pkgs.zlib pkgs.bzip2 ]; - rphast = [ pkgs.zlib pkgs.bzip2 pkgs.gzip pkgs.readline ]; - rtfbs = [ pkgs.zlib pkgs.bzip2 pkgs.gzip pkgs.readline ]; + seqinr = [ pkgs.zlib ]; + rphast = [ pkgs.pcre pkgs.zlib pkgs.bzip2 pkgs.gzip pkgs.readline ]; + rtfbs = [ pkgs.zlib pkgs.pcre pkgs.bzip2 pkgs.gzip pkgs.readline ]; Rhpc = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.openmpi pkgs.pcre ]; SAVE = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre ]; RcppOctave = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre pkgs.octave ]; @@ -317,6 +327,12 @@ let packagesWithBuildInputs = { # sort -t '=' -k 2 + svKomodo = [ pkgs.which ]; + nat = [ pkgs.which ]; + nat_nblast = [ pkgs.which ]; + nat_templatebrains = [ pkgs.which ]; + RMark = [ pkgs.which ]; + RPushbullet = [ pkgs.which ]; qtpaint = [ pkgs.cmake ]; qtbase = [ pkgs.cmake pkgs.perl ]; gmatrix = [ pkgs.cudatoolkit ]; @@ -341,10 +357,12 @@ let Cairo = [ pkgs.pkgconfig ]; Rsymphony = [ pkgs.pkgconfig pkgs.doxygen pkgs.graphviz pkgs.subversion ]; qtutils = [ pkgs.qt4 ]; + ecoretriever = [ pkgs.which ]; tcltk2 = [ pkgs.tcl pkgs.tk ]; - tikzDevice = [ pkgs.texLive ]; + tikzDevice = [ pkgs.which pkgs.texLive ]; rPython = [ pkgs.which ]; CARramps = [ pkgs.which pkgs.cudatoolkit ]; + gridGraphics = [ pkgs.which ]; gputools = [ pkgs.which pkgs.cudatoolkit ]; rpud = [ pkgs.which pkgs.cudatoolkit ]; adimpro = [ pkgs.which pkgs.xorg.xdpyinfo ]; @@ -374,6 +392,8 @@ let "DeducerPlugInScaling" "DeducerSpatial" "DeducerSurvival" + "HomoPolymer" + "MetSizeR" "DeducerText" "Demerelate" "DescTools" @@ -623,6 +643,7 @@ let "gmatrix" # requires CUDA runtime "npRmpi" # tries to run MPI processes "sprint" # tries to run MPI processes + "pbdMPI" # tries to run MPI processes ]; # Packages which cannot be installed due to lack of dependencies or other reasons. @@ -631,38 +652,12 @@ let "retistruct" # depends on broken RImageJROI "CARrampsOcl" # depends on OpenCL "rpanel" # I could not make Tcl to recognize BWidget. HELP WANTED! - "alm" # jsonlite.so: undefined symbol: XXX - "archivist" # jsonlite.so: undefined symbol: XXX - "bold" # jsonlite.so: undefined symbol: XXX - "enigma" # jsonlite.so: undefined symbol: XXX - "exCon" # jsonlite.so: undefined symbol: XXX - "gender" # jsonlite.so: undefined symbol: XXX - "jSonarR" # jsonlite.so: undefined symbol: XXX - "leafletR" # jsonlite.so: undefined symbol: XXX - "opencpu" # jsonlite.so: undefined symbol: XXX - "pdfetch" # jsonlite.so: undefined symbol: XXX - "polidata" # jsonlite.so: undefined symbol: XXX - "pollstR" # jsonlite.so: undefined symbol: XXX - "rbison" # jsonlite.so: undefined symbol: XXX - "RGA" # jsonlite.so: undefined symbol: XXX - "rHealthDataGov" # jsonlite.so: undefined symbol: XXX - "rinat" # jsonlite.so: undefined symbol: XXX - "rjstat" # jsonlite.so: undefined symbol: XXX - "rmongodb" # jsonlite.so: undefined symbol: XXX - "rnoaa" # jsonlite.so: undefined symbol: XXX - "RSiteCatalyst" # jsonlite.so: undefined symbol: XXX - "rsunlight" # jsonlite.so: undefined symbol: XXX - "rWBclimate" # jsonlite.so: undefined symbol: XXX - "SGP" # jsonlite.so: undefined symbol: XXX - "slackr" # jsonlite.so: undefined symbol: XXX - "SocialMediaMineR" # jsonlite.so: undefined symbol: XXX - "webutils" # jsonlite.so: undefined symbol: XXX - "WikipediR" # jsonlite.so: undefined symbol: XXX "demi" # requires affy, affxparser, and oligo "KANT" # requires affy, and Biobase "pathClass" # requires affy, and Biobase "msarc" # requires AnnotationDbi "ACNE" # requires aroma_affymetrix + "Statomica" # requires Biobase, multtest "aroma_affymetrix" # requires aroma_core "calmate" # requires aroma_core "NSA" # requires aroma_core @@ -689,7 +684,11 @@ let "RAPIDR" # requires Biostrings, Rsamtools, and GenomicRanges "FunctionalNetworks" # requires breastCancerVDX, and Biobase "rJPSGCS" # requires chopsticks - "OpenCL" # requires CL/opencl.h + "OpenCL" # FIXME: requires CL/opencl.h + "Rsymphony" # FIXME: requires SYMPHONY + "V8" # compilation error + "js" # requires broken V8 + "minimist" # requires broken V8 "clpAPI" # requires clp "pcaL1" # requires clp "bmrm" # requires clpAPI @@ -701,8 +700,8 @@ let "ParDNAcopy" # requires DNAcopy "PSCBS" # requires DNAcopy "dcGOR" # requires dnet - "bcool" # requires doMPI "gitter" # requires EBImage + "speaq" # requires MassSpecWavelet "Rcell" # requires EBImage "RockFab" # requires EBImage "babel" # requires edgeR @@ -712,6 +711,7 @@ let "QuasiSeq" # requires edgeR "SimSeq" # requires edgeR "BcDiag" # requires fabia + "BACA" # requires RDAVIDWebService "superbiclust" # requires fabia "curvHDR" # requires flowCore "RbioRXN" # requires fmcsR, and KEGGREST @@ -745,9 +745,9 @@ let "gridDebug" # requires gridGraphviz "RAM" # requires Heatplus "RcppRedis" # requires Hiredis - "HTSDiff" # requires HTSCluster "interval" # requires Icens "FAMT" # requires impute + "fdrDiscreteNull" # requires edgeR "moduleColor" # requires impute "PMA" # requires impute "samr" # requires impute @@ -771,6 +771,7 @@ let "plmDE" # requires limma "SQDA" # requires limma "PerfMeas" # requires limma, graph, and RBGL + "ppiPre" # requires AnnotationDbi, GOSemSim, GO.db "rLindo" # requires LINDO API "magma" # requires MAGMA "HiPLARM" # requires MAGMA or PLASMA @@ -779,7 +780,6 @@ let "bigGP" # requires MPI running. HELP WANTED! "doMPI" # requires MPI running. HELP WANTED! "metaMix" # requires MPI running. HELP WANTED! - "pbdMPI" # requires MPI running. HELP WANTED! "pmclust" # requires MPI running. HELP WANTED! "MSeasyTkGUI" # requires MSeasyTkGUI "hddplot" # requires multtest @@ -899,6 +899,9 @@ let "taxize" # requres bold "cudaBayesreg" # requres Rmath "rsprng" # requres sprng + "rDEA" # no such file or directory + "jomo" # linking errors + "mixture" # mixture.so: undefined symbol: dtrmm_ "evobiR" # requres taxiz "bdvis" # requres taxize "RNeXML" # requres taxize @@ -909,7 +912,6 @@ let "rainfreq" # SDMTools.so: undefined symbol: X "MigClim" # SDMTools.So: Undefined Symbol: X "PatternClass" # SDMTools.So: Undefined Symbol: X - "qtbase" # the smokegen binary cannot find libQtCore.so.4 etc. at runtime "jvmr" # tries to download files during its build "h2o" # tries to download some h2o.jar during its build ]; @@ -919,6 +921,11 @@ let preConfigure = "export CURL_INCLUDES=${pkgs.curl}/include/curl"; }); + iFes = old.iFes.overrideDerivation (attrs: { + patches = [ ./patches/iFes.patch ]; + CUDA_HOME = "${pkgs.cudatoolkit}"; + }); + RcppArmadillo = old.RcppArmadillo.overrideDerivation (attrs: { patchPhase = "patchShebangs configure"; }); @@ -983,9 +990,12 @@ let }); RMySQL = old.RMySQL.overrideDerivation (attrs: { - configureFlags = [ - "--with-mysql-dir=${pkgs.mysql}" - ]; + patches = [ ./patches/RMySQL.patch ]; + MYSQL_DIR="${pkgs.mysql}"; + }); + + devEMF = old.devEMF.overrideDerivation (attrs: { + NIX_CFLAGS_LINK = "-L${pkgs.xlibs.libXft}/lib -lXft"; }); slfm = old.slfm.overrideDerivation (attrs: { @@ -1046,8 +1056,7 @@ let }); openssl = old.openssl.overrideDerivation (attrs: { - patches = [ ./patches/openssl.patch ]; - OPENSSL_HOME = "${pkgs.openssl}"; + OPENSSL_INCLUDES = "${pkgs.openssl}/include"; }); Rserve = old.Rserve.overrideDerivation (attrs: { @@ -1064,14 +1073,6 @@ let ]; }); - # Depends on broken ecespa package. - selectspm = old.selectspm.override { hydraPlatforms = stdenv.lib.platforms.none; }; - - # Depends on broken qtbase package. - qtutils = old.qtutils.override { hydraPlatforms = stdenv.lib.platforms.none; }; - qtpaint = old.qtpaint.override { hydraPlatforms = stdenv.lib.platforms.none; }; - bamboo = old.bamboo.override { hydraPlatforms = stdenv.lib.platforms.none; }; - }; in self diff --git a/pkgs/development/r-modules/patches/RMySQL.patch b/pkgs/development/r-modules/patches/RMySQL.patch new file mode 100644 index 00000000000..dc93b902cd5 --- /dev/null +++ b/pkgs/development/r-modules/patches/RMySQL.patch @@ -0,0 +1,13 @@ +diff -ru3 RMySQL_orig/configure RMySQL/configure +--- RMySQL_orig/configure 2015-02-19 22:49:15.812455730 +0300 ++++ RMySQL/configure 2015-02-19 22:49:42.066407256 +0300 +@@ -1,7 +1,7 @@ + # If $MYSQL_DIR is specified, use that + if [ "$MYSQL_DIR" ]; then +- echo "PKG_CPPFLAGS= -I$MYSQL_DIR/include" > src/Makevars +- echo "PKG_LIBS= -L$MYSQL_DIR/lib -lmysqlclient -lz" >> src/Makevars ++ echo "PKG_CPPFLAGS= -I$MYSQL_DIR/include/mysql" > src/Makevars ++ echo "PKG_LIBS= -L$MYSQL_DIR/lib/mysql -lmysqlclient -lz" >> src/Makevars + exit 0 + fi + diff --git a/pkgs/development/r-modules/patches/iFes.patch b/pkgs/development/r-modules/patches/iFes.patch new file mode 100644 index 00000000000..aca89b8d5a8 --- /dev/null +++ b/pkgs/development/r-modules/patches/iFes.patch @@ -0,0 +1,13 @@ +diff -u3 -r iFes_orig/src/config.mk iFes/src/config.mk +--- iFes_orig/src/config.mk 2014-12-09 14:19:58.000000000 +0300 ++++ iFes/src/config.mk 2015-02-19 22:47:24.426804174 +0300 +@@ -12,7 +12,7 @@ + endif + + # set CUDA_INC to CUDA header dir on your system +-CUDA_INC := $(CUDA_HOME)/include ++CUDA_INC := $(CUDA_HOME)/usr_include + + ARCH := $(shell uname -m) + + diff --git a/pkgs/development/r-modules/patches/openssl.patch b/pkgs/development/r-modules/patches/openssl.patch deleted file mode 100644 index d89c30f61a1..00000000000 --- a/pkgs/development/r-modules/patches/openssl.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -ru -x '*~' openssl_orig/configure openssl/configure ---- openssl_orig/configure 2014-11-08 02:32:33.000000000 +0900 -+++ openssl/configure 2014-11-29 20:57:19.919495325 +0900 -@@ -4,14 +4,15 @@ - # if present, hence this script is not really required. On CRAN, we use - # the $OPENSSL_INCLUDES variable; elsewhere we assume to the standard - # linux location: /usr/include/openssl. --if [ -z "$OPENSSL_INCLUDES" ]; then -- OPENSSL_INCLUDES="/usr/include" --else -- echo "PKG_CPPFLAGS= -I$OPENSSL_INCLUDES" >> src/Makevars --fi -+# if [ -z "$OPENSSL_INCLUDES" ]; then -+# OPENSSL_INCLUDES="/usr/include" -+# else -+# echo "PKG_CPPFLAGS= -I$OPENSSL_INCLUDES" >> src/Makevars -+# fi - --# Verify that openssl RNG is present --if [ ! -e $OPENSSL_INCLUDES/openssl/rand.h ]; then -- echo "File $OPENSSL_INCLUDES/rand.h not found. Make sure libssl-dev (deb) or openssl-devel (rpm) is installed." -- exit 1 --fi -+# # Verify that openssl RNG is present -+# if [ ! -e $OPENSSL_INCLUDES/openssl/rand.h ]; then -+# echo "File $OPENSSL_INCLUDES/rand.h not found. Make sure libssl-dev (deb) or openssl-devel (rpm) is installed." -+# exit 1 -+# fi -+echo "PKG_LIBS= -L"${OPENSSL_HOME}/lib" -lssl -lcrypto" > src/Makevars -\ No newline at end of file From 8d29cb2b00b9323de407bf512a1bac2e2bcd56dc Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 19 Feb 2015 21:13:49 +0000 Subject: [PATCH 090/197] In a test VM it's impossible to connect to itself, so fix this --- nixos/lib/build-vms.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix index 50b3b424166..d0c9e7c6d23 100644 --- a/nixos/lib/build-vms.nix +++ b/nixos/lib/build-vms.nix @@ -70,7 +70,7 @@ rec { # virtualisation.vlans option). networking.extraHosts = flip concatMapStrings machines (m': let config = (getAttr m' nodes).config; in - optionalString (m.first != m' && config.networking.primaryIPAddress != "") + optionalString (config.networking.primaryIPAddress != "") ("${config.networking.primaryIPAddress} " + "${config.networking.hostName}\n")); From af7c1baf95fd5c0d9463f4e42bde5e804c6351fa Mon Sep 17 00:00:00 2001 From: Sibi Date: Sat, 14 Feb 2015 20:23:14 +0530 Subject: [PATCH 091/197] new package: Mailchimp python module --- pkgs/top-level/python-packages.nix | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5cb17e42464..4f6a05b157e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2940,6 +2940,30 @@ let propagatedBuildInputs = with self; [ logilab_common ]; }; + mailchimp = buildPythonPackage rec { + + version = "2.0.9"; + name = "mailchimp-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/m/mailchimp/mailchimp-${version}.tar.gz"; + sha256 = "0351ai0jqv3dzx0xxm1138sa7mb42si6xfygl5ak8wnfc95ff770"; + }; + + # Test fails because specific version of docopt is searched + # (Possible fix: Needs upstream patching in the library) + doCheck = false; + + buildInputs = with self; [ docopt ]; + + propagatedBuildInputs = with self; [ requests ]; + + meta = { + description = "A CLI client and Python API library for the MailChimp email platform"; + homepage = "http://apidocs.mailchimp.com/api/2.0/"; + license = stdenv.lib.licenses.mit; + }; + }; logster = buildPythonPackage { name = "logster-7475c53822"; From 3e44f99055a0c9fddc49dc99301efbc80d497a82 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 19 Feb 2015 19:33:17 -0500 Subject: [PATCH 092/197] Fix grub 1 install --- nixos/modules/system/boot/loader/grub/install-grub.pl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index 74a934c6793..2ef1fca1983 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -448,7 +448,9 @@ sub getDeviceTargets { # check whether to install GRUB EFI or not sub getEfiTarget { - if (($grub ne "") && ($grubEfi ne "")) { + if ($grubVersion == 1) { + return "no" + } elsif (($grub ne "") && ($grubEfi ne "")) { # EFI can only be installed when target is set; # A target is also required then for non-EFI grub if (($grubTarget eq "") || ($grubTargetEfi eq "")) { die } From 8a7097972e424a16221e4f3c7e2b5c59f7143e23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Bernardo=20Galkin?= Date: Thu, 19 Feb 2015 18:05:49 -0800 Subject: [PATCH 093/197] Postgis requires json_c to provide GeoJson support This change adds the needed build dependency and configuration to postgis --- pkgs/development/libraries/postgis/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/development/libraries/postgis/default.nix index 2d1400a2fcb..7c247dd6c1d 100644 --- a/pkgs/development/libraries/postgis/default.nix +++ b/pkgs/development/libraries/postgis/default.nix @@ -1,4 +1,4 @@ -args@{fetchurl, composableDerivation, stdenv, perl, libxml2, postgresql, geos, proj, flex, gdal, pkgconfig, file, ...}: +args@{fetchurl, composableDerivation, stdenv, perl, libxml2, postgresql, geos, proj, flex, gdal, json_c, pkgconfig, file, ...}: /* @@ -88,11 +88,11 @@ in rec { version = "2.1.4"; sha256 = "1z00n5654r7l38ydkn2grbwl5gg0mravjwxfdipp7j18hjiw4wyd"; sql_srcs = ["postgis.sql" "spatial_ref_sys.sql"]; - builtInputs = [gdal pkgconfig]; + builtInputs = [gdal json_c pkgconfig]; dontDisableStatic = true; preConfigure = '' sed -i 's@/usr/bin/file@${file}/bin/file@' configure - configureFlags="$configureFlags --with-gdalconfig=${gdal}/bin/gdal-config" + configureFlags="$configureFlags --with-gdalconfig=${gdal}/bin/gdal-config --with-jsondir=${json_c}" ''; postConfigure = '' sed -i "s|@mkdir -p \$(DESTDIR)\$(PGSQL_BINDIR)||g ; @@ -105,4 +105,4 @@ in rec { ''; }); -} \ No newline at end of file +} From fa24a296be2471c0cde7828d4e55d8bfe0e4d999 Mon Sep 17 00:00:00 2001 From: rushmorem Date: Thu, 19 Feb 2015 15:17:24 +0200 Subject: [PATCH 094/197] Add jshon package Jshon is a JSON parser designed for maximum convenience within the shell (http://kmkeen.com/jshon). --- .../tools/parsing/jshon/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/tools/parsing/jshon/default.nix diff --git a/pkgs/development/tools/parsing/jshon/default.nix b/pkgs/development/tools/parsing/jshon/default.nix new file mode 100644 index 00000000000..fa11671db0b --- /dev/null +++ b/pkgs/development/tools/parsing/jshon/default.nix @@ -0,0 +1,34 @@ +{ stdenv, lib, fetchFromGitHub, jansson }: + +stdenv.mkDerivation rec { + name = "jshon-20140712"; + + rev = "a61d7f2f85f4627bc3facdf951746f0fd62334b7"; + sha256 = "b0365e58553b9613a5636545c5bfd4ad05ab5024f192e1cb1d1824bae4e1a380"; + + src = fetchFromGitHub { + inherit rev sha256; + owner = "keenerd"; + repo = "jshon"; + }; + + buildInputs = [ jansson ]; + + patchPhase = + '' + substituteInPlace Makefile --replace "/usr/" "/" + ''; + + preInstall = + '' + export DESTDIR=$out + ''; + + meta = with lib; { + homepage = http://kmkeen.com/jshon; + description = "JSON parser designed for maximum convenience within the shell."; + license = licenses.free; + platforms = platforms.all; + maintainers = with maintainers; [ rushmorem ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 57052a39d6c..ae4c01865f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5913,6 +5913,8 @@ let jetty_util = callPackage ../development/libraries/java/jetty-util { }; + jshon = callPackage ../development/tools/parsing/jshon { }; + json_glib = callPackage ../development/libraries/json-glib { }; json-c-0-11 = callPackage ../development/libraries/json-c/0.11.nix { }; # vulnerable From cfb68ce4f0cdc8f1fccb4eaf5cf5fe9a27fc858c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Fri, 20 Feb 2015 10:39:47 +0100 Subject: [PATCH 095/197] lmms: update from 1.1.0 to 1.1.2 --- pkgs/applications/audio/lmms/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix index 439b74d791c..663e1827b85 100644 --- a/pkgs/applications/audio/lmms/default.nix +++ b/pkgs/applications/audio/lmms/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "lmms-${version}"; - version = "1.1.0"; + version = "1.1.2"; src = fetchurl { url = "https://github.com/LMMS/lmms/archive/v${version}.tar.gz"; - sha256 = "0kck8aapw1m0jbwd20bwwgbs27z518vv09zs1pjm3v8vnkaxlx65"; + sha256 = "0p0lfy3vmxjf9nwajzyhl2jscpmbi26qqqsy1hsa4ljc0plfz60p"; }; buildInputs = [ From 86cb16965a1f09523b7095397d7d54ccd898c4c3 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 18 Feb 2015 19:55:07 +0100 Subject: [PATCH 096/197] exim: add version 4.85 incl. nixos module --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/mail/exim.nix | 111 +++++++++++++++++++++++++++ pkgs/servers/mail/exim/default.nix | 63 +++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 5 files changed, 179 insertions(+) create mode 100644 nixos/modules/services/mail/exim.nix create mode 100644 pkgs/servers/mail/exim/default.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 390bab907b3..0c863ec8de1 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -179,6 +179,7 @@ apache-kafka = 169; panamax = 170; marathon = 171; + exim = 172; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -319,6 +320,7 @@ gitlab = 165; nylon = 166; panamax = 170; + exim = 172; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e0255bbbe28..c41ae69c1ac 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -166,6 +166,7 @@ ./services/logging/syslogd.nix ./services/logging/syslog-ng.nix ./services/mail/dovecot.nix + ./services/mail/exim.nix ./services/mail/freepops.nix ./services/mail/mail.nix ./services/mail/mlmmj.nix diff --git a/nixos/modules/services/mail/exim.nix b/nixos/modules/services/mail/exim.nix new file mode 100644 index 00000000000..e0890d96a88 --- /dev/null +++ b/nixos/modules/services/mail/exim.nix @@ -0,0 +1,111 @@ +{ config, lib, pkgs, ... }: + +let + inherit (lib) mkIf mkOption singleton types; + inherit (pkgs) coreutils exim; + cfg = config.services.exim; +in + +{ + + ###### interface + + options = { + + services.exim = { + + enable = mkOption { + type = types.bool; + default = false; + description = "Whether to enable the Exim mail transfer agent."; + }; + + config = mkOption { + type = types.string; + default = ""; + description = '' + Verbatim Exim configuration. This should not contain exim_user, + exim_group, exim_path, or spool_directory. + ''; + }; + + user = mkOption { + type = types.string; + default = "exim"; + description = '' + User to use when no root privileges are required. + In particular, this applies when receiving messages and when doing + remote deliveries. (Local deliveries run as various non-root users, + typically as the owner of a local mailbox.) Specifying this value + as root is not supported. + ''; + }; + + group = mkOption { + type = types.string; + default = "exim"; + description = '' + Group to use when no root privileges are required. + ''; + }; + + spoolDir = mkOption { + type = types.string; + default = "/var/spool/exim"; + description = '' + Location of the spool directory of exim. + ''; + }; + + }; + + }; + + + ###### implementation + + config = mkIf cfg.enable { + + environment = { + etc."exim.conf".text = '' + exim_user = ${cfg.user} + exim_group = ${cfg.group} + exim_path = /var/setuid-wrappers/exim + spool_directory = ${cfg.spoolDir} + ${cfg.config} + ''; + systemPackages = [ exim ]; + }; + + users.extraUsers = singleton { + name = cfg.user; + description = "Exim mail transfer agent user"; + uid = config.ids.uids.exim; + group = cfg.group; + }; + + users.extraGroups = singleton { + name = cfg.group; + gid = config.ids.gids.exim; + }; + + security.setuidPrograms = [ "exim" ]; + + systemd.services.exim = { + description = "Exim Mail Daemon"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = "${exim}/bin/exim -bdf -q30m"; + ExecReload = "${coreutils}/bin/kill -HUP $MAINPID"; + }; + preStart = '' + if ! test -d ${cfg.spoolDir}; then + ${coreutils}/bin/mkdir -p ${cfg.spoolDir} + ${coreutils}/bin/chown ${cfg.user}:${cfg.group} ${cfg.spoolDir} + fi + ''; + }; + + }; + +} diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix new file mode 100644 index 00000000000..ae4e1d6f245 --- /dev/null +++ b/pkgs/servers/mail/exim/default.nix @@ -0,0 +1,63 @@ +{ coreutils, fetchurl, db, openssl, pcre, perl, pkgconfig, stdenv }: + +stdenv.mkDerivation rec { + name = "exim-4.85"; + + src = fetchurl { + url = "http://mirror.switch.ch/ftp/mirror/exim/exim/exim4/${name}.tar.bz2"; + sha256 = "195a3ll5ck9viazf9pvgcyc0sziln5g0ggmlm6ax002lphmiy88k"; + }; + + buildInputs = [ coreutils db openssl pcre perl pkgconfig ]; + + preBuild = '' + sed ' + s:^\(BIN_DIRECTORY\)=.*:\1='"$out"'/bin: + s:^\(CONFIGURE_FILE\)=.*:\1=/etc/exim.conf: + s:^\(EXIM_USER\)=.*:\1=ref\:nobody: + s:^\(SPOOL_DIRECTORY\)=.*:\1=/exim-homeless-shelter: + s:^# \(SUPPORT_MAILDIR\)=.*:\1=yes: + s:^EXIM_MONITOR=.*$:# &: + s:^\(FIXED_NEVER_USERS\)=root$:\1=0: + s:^# \(WITH_CONTENT_SCAN\)=.*:\1=yes: + s:^# \(AUTH_PLAINTEXT\)=.*:\1=yes: + s:^# \(SUPPORT_TLS\)=.*:\1=yes: + s:^# \(USE_OPENSSL_PC=openssl\)$:\1: + s:^# \(LOG_FILE_PATH=syslog\)$:\1: + s:^# \(HAVE_IPV6=yes\)$:\1: + s:^# \(CHOWN_COMMAND\)=.*:\1=${coreutils}/bin/chown: + s:^# \(CHGRP_COMMAND\)=.*:\1=${coreutils}/bin/chgrp: + s:^# \(CHMOD_COMMAND\)=.*:\1=${coreutils}/bin/chmod: + s:^# \(MV_COMMAND\)=.*:\1=${coreutils}/bin/mv: + s:^# \(RM_COMMAND\)=.*:\1=${coreutils}/bin/rm: + s:^# \(TOUCH_COMMAND\)=.*:\1=${coreutils}/bin/touch: + s:^# \(PERL_COMMAND\)=.*:\1=${perl}/bin/perl: + #/^\s*#.*/d + #/^\s*$/d + ' < src/EDITME > Local/Makefile + ''; + + installPhase = '' + mkdir -p $out/bin $out/share/man/man8 + cp doc/exim.8 $out/share/man/man8 + + ( cd build-Linux-* + cp exicyclog exim_checkaccess exim_dumpdb exim_lock exim_tidydb \ + exipick exiqsumm exigrep exim_dbmbuild exim exim_fixdb eximstats \ + exinext exiqgrep exiwhat \ + $out/bin ) + + ( cd $out/bin + for i in mailq newaliases rmail rsmtp runq sendmail; do + ln -s exim $i + done ) + ''; + + meta = { + homepage = "http://exim.org/"; + description = "Exim is a mail transfer agent (MTA) for hosts that are running Unix or Unix-like operating systems."; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.tv ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 57052a39d6c..b807c0d15fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7975,6 +7975,8 @@ let etcdctl = callPackage ../development/tools/etcdctl { }; + exim = callPackage ../servers/mail/exim { }; + fcgiwrap = callPackage ../servers/fcgiwrap { }; felix = callPackage ../servers/felix { }; From 49114dec1facc328f8a311248194f835ab6e74ef Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 20 Feb 2015 11:37:32 +0100 Subject: [PATCH 097/197] Adds ocaml-ocplib-endian This OCaml library provides optimised functions to read and write int16/32/64 from strings, bytes and bigarrays, based on primitives added in version 4.01. Homepage: https://github.com/OCamlPro/ocplib-endian --- .../ocaml-modules/ocplib-endian/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/ocaml-modules/ocplib-endian/default.nix diff --git a/pkgs/development/ocaml-modules/ocplib-endian/default.nix b/pkgs/development/ocaml-modules/ocplib-endian/default.nix new file mode 100644 index 00000000000..aede92fc0f0 --- /dev/null +++ b/pkgs/development/ocaml-modules/ocplib-endian/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchzip, ocaml, findlib, cppo }: + +let version = "0.8"; in + +stdenv.mkDerivation { + name = "ocaml-ocplib-endian-${version}"; + + src = fetchzip { + url = "https://github.com/OCamlPro/ocplib-endian/archive/${version}.tar.gz"; + sha256 = "12xjvzw245mj4s02dgi4k2sx5gam7wxi4mbxmz6k18zg64n48yjd"; + }; + + buildInputs = [ ocaml findlib cppo ]; + + createFindlibDestdir = true; + + meta = { + description = "Optimised functions to read and write int16/32/64"; + homepage = https://github.com/OCamlPro/ocplib-endian; + license = stdenv.lib.licenses.lgpl21; + platforms = ocaml.meta.platforms; + maintainers = with stdenv.lib.maintainers; [ vbgl ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 654e8f9a396..19043385de3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3988,6 +3988,8 @@ let ocp-index = callPackage ../development/tools/ocaml/ocp-index { }; + ocplib-endian = callPackage ../development/ocaml-modules/ocplib-endian { }; + ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { }; ojquery = callPackage ../development/ocaml-modules/ojquery { }; From e1f08578aab025c124e3187c4af45293c185b092 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 20 Feb 2015 10:55:10 +0000 Subject: [PATCH 098/197] elasticsearch: update from 1.4.2 to 1.4.3, potentially fixes CVE-2015-1427 --- pkgs/servers/search/elasticsearch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/search/elasticsearch/default.nix b/pkgs/servers/search/elasticsearch/default.nix index a90b52923c2..e9482ddf00a 100644 --- a/pkgs/servers/search/elasticsearch/default.nix +++ b/pkgs/servers/search/elasticsearch/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "elasticsearch-1.4.2"; + name = "elasticsearch-1.4.3"; src = fetchurl { url = "https://download.elasticsearch.org/elasticsearch/elasticsearch/${name}.tar.gz"; - sha256 = "0g5mffzx15y8sj0gsn6kd5l1v15hg2vm4j7r071dmxs5jw26rp9i"; + sha256 = "0s1z814pwasiz9byglil6smgxfylqk7g9w9schfgv40wwi6zkh98"; }; patches = [ ./es-home.patch ]; From 0fbe589331f5189a7f2756dcb9ba0e82c74a5de8 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Fri, 20 Feb 2015 12:06:02 +0100 Subject: [PATCH 099/197] elasticsearch: Update from 1.4.3 to 1.4.4 --- pkgs/servers/search/elasticsearch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/search/elasticsearch/default.nix b/pkgs/servers/search/elasticsearch/default.nix index e9482ddf00a..635934db23c 100644 --- a/pkgs/servers/search/elasticsearch/default.nix +++ b/pkgs/servers/search/elasticsearch/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "elasticsearch-1.4.3"; + name = "elasticsearch-1.4.4"; src = fetchurl { url = "https://download.elasticsearch.org/elasticsearch/elasticsearch/${name}.tar.gz"; - sha256 = "0s1z814pwasiz9byglil6smgxfylqk7g9w9schfgv40wwi6zkh98"; + sha256 = "11l57r0pnx20v6zy047lw5zgq9r3w95k1smsvrj0clk89r3qs5d3"; }; patches = [ ./es-home.patch ]; From c1f50b6222b870ab9a764c5d9580ce591ae65875 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 20 Feb 2015 13:08:15 +0100 Subject: [PATCH 100/197] calibre: update from 2.19.0 to 2.20.0 --- pkgs/applications/misc/calibre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index e52e0ecff2d..ee064865d34 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "calibre-2.19.0"; + name = "calibre-2.20.0"; src = fetchurl { url = "mirror://sourceforge/calibre/${name}.tar.xz"; - sha256 = "1acj1i8hlbi99jjgcs9dl9ap7951m1p460srmkdyjmlljw1qhcbn"; + sha256 = "13246f4vxz4ps3c549hrnwdkwic5jsf7g1faham38z1ixd094lkd"; }; inherit python; From fbc7738867291e101e5982c282ab75dcaa105cba Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 20 Feb 2015 13:49:57 +0100 Subject: [PATCH 101/197] sproxy: mark as broken, don't know what broke it --- pkgs/tools/networking/sproxy/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/sproxy/default.nix b/pkgs/tools/networking/sproxy/default.nix index 10ec9b40cd4..5ecd7d06e26 100644 --- a/pkgs/tools/networking/sproxy/default.nix +++ b/pkgs/tools/networking/sproxy/default.nix @@ -35,5 +35,6 @@ cabal.mkDerivation (self: { meta = { license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; + broken = true; }; }) From e0703e0d67d0add17766cd88793a37935b3d9ee2 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 20 Feb 2015 13:57:39 +0100 Subject: [PATCH 102/197] seeks: use protobuf 2.5 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cd23f716bc4..8d4973563d7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11282,7 +11282,9 @@ let seafile-client = callPackage ../applications/networking/seafile-client { }; - seeks = callPackage ../tools/networking/p2p/seeks { }; + seeks = callPackage ../tools/networking/p2p/seeks { + protobuf = protobuf2_5; + }; seg3d = callPackage ../applications/graphics/seg3d { wxGTK = wxGTK28.override { unicode = false; }; From fb4fc507ef099b9f4bfee10b52b1b92347c817ca Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 20 Feb 2015 14:01:58 +0100 Subject: [PATCH 103/197] Revert "v8: Properly update to 4.1.0.15" This reverts commit 1570cb501c116fbf9438a0d07c127db1c3c421e3. --- pkgs/development/libraries/v8/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index ce0b599c9e9..284afcf1223 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -8,12 +8,12 @@ in stdenv.mkDerivation rec { name = "v8-${version}"; - version = "4.1.0.15"; + version = "3.31.1"; src = fetchurl { url = "https://commondatastorage.googleapis.com/chromium-browser-official/" + "${name}.tar.bz2"; - sha256 = "0ac6kkcjfsbs19i3m1asjx1c040qknj4n31wrjb6nz7mjsdmwg72"; + sha256 = "07xfdf12s6whggm6gak23sn4kc5bvmrdiqz9cx4d9h21y255svmi"; }; patchPhase = '' From 332c32b7721bb5d4798bd205c49ac4b5a075f90d Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 20 Feb 2015 14:02:10 +0100 Subject: [PATCH 104/197] Revert "v8: 3.26.31.15 -> 3.31.1" This reverts commit 098ed10f3902ff2f4050f4d5010bfd4008665fa2. --- pkgs/development/libraries/v8/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 284afcf1223..7eded3e4c5f 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -8,12 +8,12 @@ in stdenv.mkDerivation rec { name = "v8-${version}"; - version = "3.31.1"; + version = "3.26.31.15"; src = fetchurl { url = "https://commondatastorage.googleapis.com/chromium-browser-official/" + "${name}.tar.bz2"; - sha256 = "07xfdf12s6whggm6gak23sn4kc5bvmrdiqz9cx4d9h21y255svmi"; + sha256 = "067pk6hr7wjx7yxhla5la0rnv51kf7837kfydzydjwapsbcx6m8l"; }; patchPhase = '' From 97f9150a56ebad04b7fbd55e1c8676740ffcaf31 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 20 Feb 2015 14:05:11 +0100 Subject: [PATCH 105/197] wml: mark as broken, don't know why it broke --- pkgs/development/web/wml/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/web/wml/default.nix b/pkgs/development/web/wml/default.nix index d3c67ec14d3..6dc7b68c71c 100644 --- a/pkgs/development/web/wml/default.nix +++ b/pkgs/development/web/wml/default.nix @@ -43,5 +43,7 @@ perlPackages.buildPerlPackage rec { description = "Off-line HTML generation toolkit for Unix"; license = licenses.gpl2; platforms = platforms.linux; + # Not sure what broke this build, it used to work + broken = true; }; -} \ No newline at end of file +} From 1d09c1fd34788f1fe0e8e22810d9378b9a486851 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 20 Feb 2015 14:10:49 +0100 Subject: [PATCH 106/197] audiotools: disable for py3k --- pkgs/top-level/python-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 35af75d3b4e..2494a05cd33 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -565,6 +565,8 @@ let audiotools = buildPythonPackage rec { name = "audiotools-2.22"; + disabled = isPy3k; + src = pkgs.fetchurl { url = "mirror://sourceforge/audiotools/${name}.tar.gz"; sha256 = "1c52pggsbxdbj8h92njf4h0jgfndh4yv58ad723pidys47nw1y71"; From 3225bf25b9cf44e82f56917193de9ca1850a060b Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 20 Feb 2015 14:10:54 +0100 Subject: [PATCH 107/197] more-itertools: disable for py3k --- pkgs/top-level/python-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2494a05cd33..a09afe6bcff 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13155,6 +13155,8 @@ let moreItertools = buildPythonPackage rec { name = "more-itertools-2.2"; + disabled = isPy3k; + src = pkgs.fetchurl { url = "https://github.com/erikrose/more-itertools/archive/2.2.tar.gz"; sha256 = "4606417182e0a1289e23fb7f964a64ca9fdaafb7c1999034dc4fa0cc5850c478"; From 7620fdb3acfd23f2d594e0e26f17a53547f68d05 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 20 Feb 2015 14:11:25 +0100 Subject: [PATCH 108/197] sympy: disable for pypy --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a09afe6bcff..194fc2be27a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9852,7 +9852,7 @@ let sympy = buildPythonPackage rec { name = "sympy-0.7.6"; - disabled = isPy34; # some tests fail + disabled = isPy34 || isPyPy; # some tests fail src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/s/sympy/${name}.tar.gz"; From cc837a974b2b156674aab1de0bc9057c70fdd679 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 20 Feb 2015 14:12:26 +0100 Subject: [PATCH 109/197] sqlalchemy9: disable for pypy --- pkgs/top-level/python-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 194fc2be27a..70596269877 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10293,6 +10293,8 @@ let sqlalchemy9 = buildPythonPackage rec { name = "SQLAlchemy-0.9.8"; + disabled = isPyPy; + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/S/SQLAlchemy/${name}.tar.gz"; md5 = "470ca4da4a0081efc830f0d90dd91682"; From 50bf56fd092c785b91f3e494419730ffa4a11bd8 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Fri, 20 Feb 2015 14:26:26 +0100 Subject: [PATCH 110/197] grsecurity: Update stable and test patches stable: 3.0-3.14.33-201502181906 -> 3.0-3.14.33-201502200812 test: 3.0-3.18.7-201502180834 -> 3.0-3.18.7-201502200813 --- pkgs/os-specific/linux/kernel/patches.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index e34c1481110..72ca1a0bb31 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -66,16 +66,16 @@ rec { grsecurity_stable = grsecPatch { kversion = "3.14.33"; - revision = "201502181906"; + revision = "201502200812"; branch = "stable"; - sha256 = "1ixsh72mzq630v3af1s3aflijpvzf0gb2nfp0aawfk65bcpkq3d8"; + sha256 = "1dydrphgz8sfjf7w8b0kqai9k1dld6jv6frhqs6gqjj06wbg1rwd"; }; grsecurity_unstable = grsecPatch { kversion = "3.18.7"; - revision = "201502180834"; + revision = "201502200813"; branch = "test"; - sha256 = "03gl2l4wjdba03nnr0195yx76h6i3kn40ls22g5hbfg6p3y1risa"; + sha256 = "1svvy0sip6p3h8iqlw0rh3lnxqziwz9fw8znyq1rw5cia89dx4c8"; }; grsec_fix_path = From 78834b9254d244c0a167094da5c38fff7ce124d6 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 20 Feb 2015 14:46:15 +0100 Subject: [PATCH 111/197] airfield: mark as broken, don't know what broke it --- pkgs/tools/networking/airfield/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/airfield/default.nix b/pkgs/tools/networking/airfield/default.nix index 35dc507206d..38c802f3c08 100644 --- a/pkgs/tools/networking/airfield/default.nix +++ b/pkgs/tools/networking/airfield/default.nix @@ -34,5 +34,6 @@ in nodePackages.buildNodePackage rec { homepage = https://github.com/emblica/airfield; maintainers = with maintainers; [offline]; platforms = with platforms; linux; + broken = true; }; } From 3391728c63e985bdbd7100c3563604f4c4373be0 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 20 Feb 2015 14:51:24 +0100 Subject: [PATCH 112/197] dragonegg: fix sha256 --- pkgs/development/compilers/llvm/3.5/dragonegg.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/3.5/dragonegg.nix b/pkgs/development/compilers/llvm/3.5/dragonegg.nix index 0f2d4cd7fb6..4bfb4f91287 100644 --- a/pkgs/development/compilers/llvm/3.5/dragonegg.nix +++ b/pkgs/development/compilers/llvm/3.5/dragonegg.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "dragonegg-${version}"; - src = fetch "dragonegg" "1733czbvby1ww3xkwcwmm0km0bpwhfyxvf56wb0zv5gksp3kbgrr"; + src = fetch "dragonegg" "1v1lc9h2nfk3lsk9sx1k4ckwddz813hqjmlp2bx2kwxx9hw364ar"; patches = [(fetchpatch { url = "https://llvm.org/viewvc/llvm-project/dragonegg/trunk/src/x86/ABIHack.inc" From 7afe039842d83d21b3f2f6ad7b318934cd2243f4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 20 Feb 2015 14:29:47 +0100 Subject: [PATCH 113/197] pkgs/development/r-modules: fix evaluation errors --- pkgs/development/r-modules/default.nix | 37 +++++++++++++++++--------- 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index d901c8b6d63..0998668beae 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -648,16 +648,35 @@ let # Packages which cannot be installed due to lack of dependencies or other reasons. brokenPackages = [ # sort -t '#' -k 2 + "V8" # compilation error "metabolomics" # depends on broken crmn + "selectspm" # depends on broken ecespa + "BLCOP" # depends on broken fPortfolio + "MXM" # depends on broken gRbase + "bamboo" # depends on broken jvmr + "flexCWM" # depends on broken mixture + "pmcgd" # depends on broken mixture "retistruct" # depends on broken RImageJROI + "ROI_plugin_symphony" # depends on broken Rsymphony + "ChemoSpec" # depends on broken speaq "CARrampsOcl" # depends on OpenCL + "gmatrix" # depends on proprietary cudatoolkit + "gputools" # depends on proprietary cudatoolkit + "iFes" # depends on proprietary cudatoolkit + "SOD" # depends on proprietary cudatoolkit + "WideLM" # depends on proprietary cudatoolkit + "OpenCL" # FIXME: requires CL/opencl.h + "Rsymphony" # FIXME: requires SYMPHONY "rpanel" # I could not make Tcl to recognize BWidget. HELP WANTED! + "jomo" # linking errors + "mixture" # mixture.so: undefined symbol: dtrmm_ + "rDEA" # no such file or directory "demi" # requires affy, affxparser, and oligo "KANT" # requires affy, and Biobase "pathClass" # requires affy, and Biobase "msarc" # requires AnnotationDbi + "ppiPre" # requires AnnotationDbi, GOSemSim, GO.db "ACNE" # requires aroma_affymetrix - "Statomica" # requires Biobase, multtest "aroma_affymetrix" # requires aroma_core "calmate" # requires aroma_core "NSA" # requires aroma_core @@ -672,6 +691,7 @@ let "IsoGene" # requires Biobase, and affy "mGSZ" # requires Biobase, and limma "GExMap" # requires Biobase and multtest + "Statomica" # requires Biobase, multtest "netweavers" # requires BiocGenerics, Biobase, and limma "NCmisc" # requires BiocInstaller "EMDomics" # requires BiocParallel @@ -683,12 +703,9 @@ let "SeqFeatR" # requires Biostrings, qvalue, and widgetTools "RAPIDR" # requires Biostrings, Rsamtools, and GenomicRanges "FunctionalNetworks" # requires breastCancerVDX, and Biobase - "rJPSGCS" # requires chopsticks - "OpenCL" # FIXME: requires CL/opencl.h - "Rsymphony" # FIXME: requires SYMPHONY - "V8" # compilation error "js" # requires broken V8 "minimist" # requires broken V8 + "rJPSGCS" # requires chopsticks "clpAPI" # requires clp "pcaL1" # requires clp "bmrm" # requires clpAPI @@ -701,17 +718,16 @@ let "PSCBS" # requires DNAcopy "dcGOR" # requires dnet "gitter" # requires EBImage - "speaq" # requires MassSpecWavelet "Rcell" # requires EBImage "RockFab" # requires EBImage "babel" # requires edgeR "edgeRun" # requires edgeR + "fdrDiscreteNull" # requires edgeR "GSAgm" # requires edgeR "HTSCluster" # requires edgeR "QuasiSeq" # requires edgeR "SimSeq" # requires edgeR "BcDiag" # requires fabia - "BACA" # requires RDAVIDWebService "superbiclust" # requires fabia "curvHDR" # requires flowCore "RbioRXN" # requires fmcsR, and KEGGREST @@ -747,7 +763,6 @@ let "RcppRedis" # requires Hiredis "interval" # requires Icens "FAMT" # requires impute - "fdrDiscreteNull" # requires edgeR "moduleColor" # requires impute "PMA" # requires impute "samr" # requires impute @@ -771,10 +786,10 @@ let "plmDE" # requires limma "SQDA" # requires limma "PerfMeas" # requires limma, graph, and RBGL - "ppiPre" # requires AnnotationDbi, GOSemSim, GO.db "rLindo" # requires LINDO API "magma" # requires MAGMA "HiPLARM" # requires MAGMA or PLASMA + "speaq" # requires MassSpecWavelet "MAMA" # requires metaMA "Rmosek" # requires mosek "bigGP" # requires MPI running. HELP WANTED! @@ -821,6 +836,7 @@ let "RSNPset" # requires qvalue "gRbase" # requires RBGL, and graph "RSeed" # requires RBGL, and graph + "BACA" # requires RDAVIDWebService "beadarrayMSV" # requires rggobi "clusterfly" # requires rggobi "PKgraph" # requires rggobi @@ -899,9 +915,6 @@ let "taxize" # requres bold "cudaBayesreg" # requres Rmath "rsprng" # requres sprng - "rDEA" # no such file or directory - "jomo" # linking errors - "mixture" # mixture.so: undefined symbol: dtrmm_ "evobiR" # requres taxiz "bdvis" # requres taxize "RNeXML" # requres taxize From 494fb2deb2092c9e6b9952b91b94983c4ed4a2e8 Mon Sep 17 00:00:00 2001 From: Aycan iRiCAN Date: Fri, 20 Feb 2015 16:13:49 +0200 Subject: [PATCH 114/197] Updated haskellPackages.{rest-wai, rest-snap} --- pkgs/development/libraries/haskell/rest-snap/default.nix | 5 +++-- pkgs/development/libraries/haskell/rest-wai/default.nix | 9 +++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/rest-snap/default.nix b/pkgs/development/libraries/haskell/rest-snap/default.nix index efb4f8e1fed..ac584ae4844 100644 --- a/pkgs/development/libraries/haskell/rest-snap/default.nix +++ b/pkgs/development/libraries/haskell/rest-snap/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "rest-snap"; - version = "0.1.17.14"; - sha256 = "0fd6d85gzp9mr7y7bgfk9wscrhrych9q7cssps8m5l03n83d8asp"; + version = "0.1.17.16"; + sha256 = "02dh2wjhaabg2aabsf7gl5w65kqpb3jigawwh9n2dr4hz6jhvwia"; buildDepends = [ caseInsensitive restCore safe snapCore unorderedContainers uriEncode utf8String @@ -19,3 +19,4 @@ cabal.mkDerivation (self: { maintainers = with self.stdenv.lib.maintainers; [ aycanirican ]; }; }) + diff --git a/pkgs/development/libraries/haskell/rest-wai/default.nix b/pkgs/development/libraries/haskell/rest-wai/default.nix index f986237426c..761519a99e2 100644 --- a/pkgs/development/libraries/haskell/rest-wai/default.nix +++ b/pkgs/development/libraries/haskell/rest-wai/default.nix @@ -1,16 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, caseInsensitive, httpTypes, mimeTypes, mtl, restCore, text -, unorderedContainers, utf8String, wai +, unorderedContainers, wai }: cabal.mkDerivation (self: { pname = "rest-wai"; - version = "0.1.0.4"; - sha256 = "1pxjf0fmsfiywr81zl5xbl6si0x74a7zmz6d5vqv5pvxmpgwgcbg"; + version = "0.1.0.6"; + sha256 = "1pawc1msv8vc43jzq4ynirwv6k7l7bfrh8r6q8m2vk1rnl6zsbxz"; buildDepends = [ caseInsensitive httpTypes mimeTypes mtl restCore text - unorderedContainers utf8String wai + unorderedContainers wai ]; meta = { description = "Rest driver for WAI applications"; @@ -19,3 +19,4 @@ cabal.mkDerivation (self: { maintainers = with self.stdenv.lib.maintainers; [ aycanirican ]; }; }) + From c62e42e9c5f399b99d41abae77eab36cfb4edf58 Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Mon, 16 Feb 2015 19:41:08 +0100 Subject: [PATCH 115/197] Enhance stage-1/2 scripts for better dealing with squashfs --- nixos/modules/system/boot/stage-1-init.sh | 3 +++ nixos/modules/system/boot/stage-2-init.sh | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index 1e173f5ac7a..a34a1360265 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -218,6 +218,9 @@ checkFS() { # Don't check resilient COWs as they validate the fs structures at mount time if [ "$fsType" = btrfs -o "$fsType" = zfs ]; then return 0; fi + # Skip fsck for inherently readonly filesystems. + if [ "$fsType" = squashfs ]; then return 0; fi + # If we couldn't figure out the FS type, then skip fsck. if [ "$fsType" = auto ]; then echo 'cannot check filesystem with type "auto"!' diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh index 356a440b17a..173453a17f7 100644 --- a/nixos/modules/system/boot/stage-2-init.sh +++ b/nixos/modules/system/boot/stage-2-init.sh @@ -50,8 +50,10 @@ echo "booting system configuration $systemConfig" > /dev/kmsg # Make /nix/store a read-only bind mount to enforce immutability of # the Nix store. Note that we can't use "chown root:nixbld" here # because users/groups might not exist yet. -chown 0:30000 /nix/store -chmod 1775 /nix/store +# Silence chown/chmod to fail gracefully on a readonly filesystem +# like squashfs. +chown -f 0:30000 /nix/store +chmod -f 1775 /nix/store if [ -n "@readOnlyStore@" ]; then if ! readonly-mountpoint /nix/store; then mount --bind /nix/store /nix/store From f58c96149d18d96061f1b5a1b176bd33325f543a Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 20 Feb 2015 10:36:16 -0800 Subject: [PATCH 116/197] protobuf: Fix python build --- .../libraries/protobuf/generic.nix | 2 ++ pkgs/top-level/python-packages.nix | 34 ++++++++++++++++--- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix index 929621204a0..16432b4357a 100644 --- a/pkgs/development/libraries/protobuf/generic.nix +++ b/pkgs/development/libraries/protobuf/generic.nix @@ -31,4 +31,6 @@ stdenv.mkDerivation rec { homepage = http://code.google.com/p/protobuf/; }; + + passthru.version = version; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 70596269877..9e8516ad430 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7512,16 +7512,42 @@ let }; }; - protobuf = buildPythonPackage rec { - inherit (pkgs.protobuf) name src; + protobuf = self.protobuf2_6; + protobuf2_6 = self.protobufBuild pkgs.protobuf2_6; + protobuf2_5 = self.protobufBuild pkgs.protobuf2_5; + protobufBuild = protobuf: buildPythonPackage rec { + inherit (protobuf) name src; - propagatedBuildInputs = with self; [ pkgs.protobuf google_apputils ]; - sourceRoot = "${name}-src/python"; + propagatedBuildInputs = with self; [ protobuf google_apputils ]; + + prePatch = '' + while [ ! -d python ]; do + cd * + done + cd python + ''; + + preConfigure = optionalString (versionAtLeast protobuf.version "2.6.0") '' + PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=cpp + PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION_VERSION=2 + ''; + + checkPhase = if versionAtLeast protobuf.version "2.6.0" then '' + python setup.py google_test --cpp_implementation + '' else '' + python setup.py test + ''; + + installFlags = optional (versionAtLeast protobuf.version "2.6.0") "--cpp_implementation"; + + doCheck = true; meta = { description = "Protocol Buffers are Google's data interchange format"; homepage = http://code.google.com/p/protobuf/; }; + + passthru.protobuf = protobuf; }; From 1dd647eba6cca7ec22cfd4516bc39c8ad4670d8a Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 20 Feb 2015 10:42:14 -0800 Subject: [PATCH 117/197] protobuf: Remove v as it is unneeded now --- pkgs/development/libraries/protobuf/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix index 16432b4357a..692891bd5bf 100644 --- a/pkgs/development/libraries/protobuf/generic.nix +++ b/pkgs/development/libraries/protobuf/generic.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "protobuf-v${version}"; + name = "protobuf-${version}"; inherit src; From c21991d478e9b81fdbc9fb460ee4ed6443c1f5ed Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 20 Feb 2015 11:14:28 -0800 Subject: [PATCH 118/197] google_apputils: Update to 0.4.1 --- pkgs/top-level/python-packages.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9e8516ad430..4c8785e2259 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4860,15 +4860,24 @@ let }; google_apputils = buildPythonPackage rec { - name = "google-apputils-0.4.0"; - disabled = isPy3k; + name = "google-apputils-0.4.1"; src = pkgs.fetchurl { - url = http://pypi.python.org/packages/source/g/google-apputils/google-apputils-0.4.0.tar.gz; - sha256 = "18wlivnqxvx1wsw177lckpl32nmr6cq7f5nhk8r72fvjy8wynq5j"; + url = "http://pypi.python.org/packages/source/g/google-apputils/${name}.tar.gz"; + sha256 = "1sxsm5q9vr44qzynj8l7p3l7ffb0zl1jdqhmmzmalkx941nbnj1b"; }; - propagatedBuildInputs = with self; [ pytz gflags dateutil_1_5 mox ]; + preConfigure = '' + sed -i '/ez_setup/d' setup.py + ''; + + propagatedBuildInputs = with self; [ pytz gflags dateutil mox ]; + + checkPhase = '' + ${python.executable} setup.py google_test + ''; + + doCheck = true; meta = with stdenv.lib; { description = "Google Application Utilities for Python"; From db35cb49375b26c151ff2348966f7d0f3b05106b Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Tue, 17 Feb 2015 02:29:57 +0300 Subject: [PATCH 119/197] DISTRHO: fix name (use date) and update pkg --- pkgs/applications/audio/distrho/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix index ec428c7bb1f..f078be02738 100644 --- a/pkgs/applications/audio/distrho/default.nix +++ b/pkgs/applications/audio/distrho/default.nix @@ -1,16 +1,13 @@ { stdenv, fetchgit, alsaLib, fftwSinglePrec, freetype, jack2 , libxslt, lv2, pkgconfig, premake3, xlibs }: -let - rev = "3bfddf7f"; -in stdenv.mkDerivation rec { - name = "distrho-${rev}"; + name = "DISTRHO-Ports-git-2015-01-28"; src = fetchgit { url = "https://github.com/DISTRHO/DISTRHO-Ports.git"; - inherit rev; - sha256 = "55dc52921bb757c3213da5ef6cab40909f39be3e3b41ba4c6cd66ad90bfb2e6c"; + rev = "b4e2dc24802fe6804c60fcd2559a0bca46b7709c"; + sha256 = "661ff6f7cda71a8dd08cbcea3f560e99f0fc2232053cbc9a2aaba854137805c6"; }; patchPhase = '' From bbbb9c0f93c3cde0b1297f35e0a0c817ea66b613 Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Tue, 17 Feb 2015 02:35:00 +0300 Subject: [PATCH 120/197] swh-lv2: fix name (use date) --- pkgs/applications/audio/swh-lv2/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/audio/swh-lv2/default.nix b/pkgs/applications/audio/swh-lv2/default.nix index 9b18ab31abf..2955a9371ff 100644 --- a/pkgs/applications/audio/swh-lv2/default.nix +++ b/pkgs/applications/audio/swh-lv2/default.nix @@ -1,15 +1,12 @@ { stdenv, fetchgit, fftwSinglePrec, libxslt, lv2, pkgconfig }: -let - rev = "ec6b85e19e24ed"; -in stdenv.mkDerivation rec { - name = "swh-lv2-${rev}"; + name = "swh-lv2-git-2013-05-17"; src = fetchgit { - url = "git://github.com/swh/lv2.git"; - inherit rev; - sha256 = "d0d918ee642cd9649215737fcc008ce2bf55f4ea893a1897138b33775ea60d17"; + url = "https://github.com/swh/lv2.git"; + rev = "978d5d8f549fd22048157a6d044af0faeaacbd7f"; + sha256 = "3a9c042785b856623339aedafa5bc019b41beb8034d8594c7bbd6c9c26368065"; }; patchPhase = '' From 6cd330b3e7034ad99d9d0930249362677d7f7009 Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Tue, 17 Feb 2015 02:23:33 +0300 Subject: [PATCH 121/197] twmn: fix name (use date) and update pkg --- pkgs/applications/misc/twmn/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/twmn/default.nix b/pkgs/applications/misc/twmn/default.nix index 65c2ccb5ff0..c8a48eb3f65 100644 --- a/pkgs/applications/misc/twmn/default.nix +++ b/pkgs/applications/misc/twmn/default.nix @@ -1,19 +1,20 @@ -{ fetchurl, stdenv, fetchgit, qt4, pkgconfig, boost, dbus }: +{ fetchurl, stdenv, fetchgit, qt5, pkgconfig, boost }: stdenv.mkDerivation rec { - rev = "9f52882688ba03d7aaab2e3fd83cb05cfbf1a374"; - name = "twmn-${rev}"; + name = "twmn-git-2014-09-23"; src = fetchgit { - inherit rev; url = "https://github.com/sboli/twmn.git"; - sha256 = "1jd2y0ydcpjdmjbx77lw35710sqfwbgyrnpv66mi3gwvrbyiwpf3"; + rev = "9492a47e25547e602dd57efd807033677c90b150"; + sha256 = "9c91e9d3d6d7f9d90d34da6f1a4b9f3dee65605c1e43729417d6921c54dded6b"; }; - buildInputs = [ qt4 pkgconfig boost ]; - propagatedBuildInputs = [ dbus ]; + buildInputs = [ qt5 pkgconfig boost ]; - configurePhase = "qmake"; + configurePhase = '' + sed -i s/-Werror// twmnd/twmnd.pro + qmake + ''; installPhase = '' mkdir -p "$out/bin" From a959cc91cf69a99103106ee4c0d0077c5d2226f7 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 20 Feb 2015 11:16:44 -0800 Subject: [PATCH 122/197] google_apputils: Keep disabled on py3k --- pkgs/top-level/python-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4c8785e2259..4b95e1fe15c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4861,6 +4861,7 @@ let google_apputils = buildPythonPackage rec { name = "google-apputils-0.4.1"; + disabled = isPy3k; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/g/google-apputils/${name}.tar.gz"; From 29fc0daa27c927ae5692be574a36c87d56946a2c Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 20 Feb 2015 11:17:08 -0800 Subject: [PATCH 123/197] protobuf: Mark as disabled on py3k and fix python executable references --- pkgs/top-level/python-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4b95e1fe15c..591cfec9d89 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7527,6 +7527,7 @@ let protobuf2_5 = self.protobufBuild pkgs.protobuf2_5; protobufBuild = protobuf: buildPythonPackage rec { inherit (protobuf) name src; + disabled = isPy3k; propagatedBuildInputs = with self; [ protobuf google_apputils ]; @@ -7543,9 +7544,9 @@ let ''; checkPhase = if versionAtLeast protobuf.version "2.6.0" then '' - python setup.py google_test --cpp_implementation + ${python.executable} setup.py google_test --cpp_implementation '' else '' - python setup.py test + ${python.executable} setup.py test ''; installFlags = optional (versionAtLeast protobuf.version "2.6.0") "--cpp_implementation"; From 8b1110f89af3a24adc95ce5c2a77b988792eb504 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Fri, 20 Feb 2015 20:20:43 +0000 Subject: [PATCH 124/197] Bump development versions of several Disnix tools --- .../package-management/disnix/DisnixWebService/default.nix | 4 ++-- pkgs/tools/package-management/disnix/default.nix | 6 +++--- pkgs/tools/package-management/disnix/disnixos/default.nix | 6 +++--- pkgs/tools/package-management/disnix/dysnomia/default.nix | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix index 44eb9f8f094..6ea1a68181a 100644 --- a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix +++ b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix @@ -3,8 +3,8 @@ stdenv.mkDerivation { name = "DisnixWebService-0.2"; src = fetchurl { - url = http://hydra.nixos.org/build/14768380/download/4/DisnixWebService-0.2.tar.bz2; - sha256 = "1xmsxg95fjcbpnyyrg0sj3g8pqia2gij53ilh6198yd8f37zr4kw"; + url = http://hydra.nixos.org/build/19859888/download/4/DisnixWebService-0.2.tar.bz2; + sha256 = "1gcrgjscd8mkixi5js6j44yiiyyz2vg7bdn5qp42vr4r8rh9zgq4"; }; buildInputs = [ apacheAnt jdk ]; PREFIX = ''''${env.out}''; diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index b4d80e10b64..0e522f46674 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintlOrEmpty, libiconv }: stdenv.mkDerivation { - name = "disnix-0.3prea0484a2c19d1947c21f11b4fc7c3f6049bd11efa"; + name = "disnix-0.3pre0d9af6829c047d9a6fb27bff38af02e9e75ce36f"; src = fetchurl { - url = http://hydra.nixos.org/build/14710186/download/4/disnix-0.3prea0484a2c19d1947c21f11b4fc7c3f6049bd11efa.tar.gz; - sha256 = "06qjaxysnkm31rgjlqy9n7p59q5v3jl57jm9jya7zf2g90syhdn7"; + url = http://hydra.nixos.org/build/19868273/download/4/disnix-0.3pre0d9af6829c047d9a6fb27bff38af02e9e75ce36f.tar.gz; + sha256 = "1d4p913mk9dbs8vda5cv02rzcrsdj5klwnxp4ana6qss74lh9415"; }; buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconv dysnomia ]; diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index 936a5b03d23..ba21ab55754 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, disnix, socat, pkgconfig, getopt }: stdenv.mkDerivation { - name = "disnixos-0.2prec3310e2d8975c45e4ffacec940049fb781739b8d"; + name = "disnixos-0.2pred5b649fa44bd3a1003d6466431ccbd07e79fe50f"; src = fetchurl { - url = http://hydra.nixos.org/build/14721464/download/3/disnixos-0.2prec3310e2d8975c45e4ffacec940049fb781739b8d.tar.gz; - sha256 = "0wd0bhzwipn62lb90fk2s9s52aq60ndriyw7ymah6x3xm40d2cl9"; + url = http://hydra.nixos.org/build/19868070/download/3/disnixos-0.2pred5b649fa44bd3a1003d6466431ccbd07e79fe50f.tar.gz; + sha256 = "0vkj5y8v734m3dmkg71d2jdk7bwgahn44yi62843a0mzjijngdzj"; }; buildInputs = [ socat pkgconfig disnix getopt ]; diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index 347fc65f98b..e5423ab8d64 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -19,10 +19,10 @@ assert enableEjabberdDump -> ejabberd != null; assert enableMongoDatabase -> mongodb != null; stdenv.mkDerivation { - name = "dysnomia-0.3preccaebdfad11bc34850b24f1c2cb5ee6c8f0b7fe2"; + name = "dysnomia-0.3pre828145ee0bbfb72013a19c15db2947e26179f159"; src = fetchurl { - url = http://hydra.nixos.org/build/14156365/download/1/dysnomia-0.3preccaebdfad11bc34850b24f1c2cb5ee6c8f0b7fe2.tar.gz; - sha256 = "0l88vcpnicw86cn6jwrgmg3fs6i3sw3qc9r6lycfkjf5qrnzd1yi"; + url = http://hydra.nixos.org/build/19868062/download/1/dysnomia-0.3pre828145ee0bbfb72013a19c15db2947e26179f159.tar.gz; + sha256 = "0rxf6lhb952p7rwrbxhzj3fsqqbrxaksb60zmyqz3h19wjkpaiki"; }; preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; From 97875ac1757ceb10177b78b4479776fba64e47b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Fri, 20 Feb 2015 21:43:09 +0100 Subject: [PATCH 125/197] bridge-utils: align attrname with pkgname --- nixos/modules/virtualisation/libvirtd.nix | 2 +- nixos/modules/virtualisation/nova.nix | 4 ++-- nixos/modules/virtualisation/xen-dom0.nix | 4 ++-- pkgs/applications/virtualization/docker/default.nix | 4 ++-- pkgs/applications/virtualization/xen/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 3 ++- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index 2d03f0544b6..7410609e064 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -92,7 +92,7 @@ in ++ optional vswitch.enable "vswitchd.service"; path = [ - pkgs.bridge_utils + pkgs.bridge-utils pkgs.dmidecode pkgs.dnsmasq pkgs.ebtables diff --git a/nixos/modules/virtualisation/nova.nix b/nixos/modules/virtualisation/nova.nix index 8795b5b52d5..21e060cf266 100644 --- a/nixos/modules/virtualisation/nova.nix +++ b/nixos/modules/virtualisation/nova.nix @@ -147,7 +147,7 @@ in path = [ pkgs.sudo pkgs.vlan pkgs.nettools pkgs.iptables pkgs.qemu_kvm pkgs.e2fsprogs pkgs.utillinux pkgs.multipath_tools pkgs.iproute - pkgs.bridge_utils + pkgs.bridge-utils ]; exec = "${nova}/bin/nova-compute --flagfile=${novaConf}"; @@ -163,7 +163,7 @@ in path = [ pkgs.sudo pkgs.vlan pkgs.dnsmasq pkgs.nettools pkgs.iptables - pkgs.iproute pkgs.bridge_utils pkgs.radvd + pkgs.iproute pkgs.bridge-utils pkgs.radvd ]; exec = "${nova}/bin/nova-network --flagfile=${novaConf}"; diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix index 566059472c9..f3a24c5cf25 100644 --- a/nixos/modules/virtualisation/xen-dom0.nix +++ b/nixos/modules/virtualisation/xen-dom0.nix @@ -112,7 +112,7 @@ in startOn = "stopped udevtrigger"; path = - [ pkgs.bridge_utils pkgs.gawk pkgs.iproute pkgs.nettools + [ pkgs.bridge-utils pkgs.gawk pkgs.iproute pkgs.nettools pkgs.utillinux pkgs.bash xen pkgs.pciutils pkgs.procps ]; @@ -172,7 +172,7 @@ in # Xen provides udev rules. services.udev.packages = [ xen ]; - services.udev.path = [ pkgs.bridge_utils pkgs.iproute ]; + services.udev.path = [ pkgs.bridge-utils pkgs.iproute ]; }; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index ea7b043c344..eaf983f7bbc 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, go, lxc, sqlite, iproute, bridge_utils, devicemapper, +{ stdenv, fetchurl, makeWrapper, go, lxc, sqlite, iproute, bridge-utils, devicemapper, btrfsProgs, iptables, bash, e2fsprogs, xz}: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0d98c7dfzv1gj5ssbyln4pbkbml6rrmy22v5v4ricbsx9qhhwc1l"; }; - buildInputs = [ makeWrapper go sqlite lxc iproute bridge_utils devicemapper btrfsProgs iptables e2fsprogs ]; + buildInputs = [ makeWrapper go sqlite lxc iproute bridge-utils devicemapper btrfsProgs iptables e2fsprogs ]; dontStrip = true; diff --git a/pkgs/applications/virtualization/xen/default.nix b/pkgs/applications/virtualization/xen/default.nix index 5b0a2845e9c..e6ad49f2035 100644 --- a/pkgs/applications/virtualization/xen/default.nix +++ b/pkgs/applications/virtualization/xen/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, which, zlib, pkgconfig, SDL, openssl , libuuid, gettext, ncurses, dev86, iasl, pciutils, bzip2 , lvm2, utillinux, procps, texinfo, perl, pythonPackages -, glib, bridge_utils, xlibs, pixman, iproute, udev, bison +, glib, bridge-utils, xlibs, pixman, iproute, udev, bison , flex, cmake, ocaml, ocamlPackages, figlet, libaio, yajl , checkpolicy, transfig, glusterfs, fetchgit, xz }: @@ -92,7 +92,7 @@ stdenv.mkDerivation { [ which zlib pkgconfig SDL openssl libuuid gettext ncurses dev86 iasl pciutils bzip2 xz texinfo perl yajl pythonPackages.python pythonPackages.wrapPython - glib bridge_utils pixman iproute udev bison xlibs.libX11 + glib bridge-utils pixman iproute udev bison xlibs.libX11 flex ocaml ocamlPackages.findlib figlet libaio checkpolicy pythonPackages.markdown transfig glusterfs cmake diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d4973563d7..c18d3c014a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8436,7 +8436,7 @@ let beret = callPackage ../games/beret { }; - bridge_utils = callPackage ../os-specific/linux/bridge-utils { }; + bridge-utils = callPackage ../os-specific/linux/bridge-utils { }; busybox = callPackage ../os-specific/linux/busybox { }; @@ -13643,6 +13643,7 @@ let adobeReader = adobe-reader; arduino_core = arduino-core; # added 2015-02-04 asciidocFull = asciidoc-full; # added 2014-06-22 + bridge_utils = bridge-utils; # added 2015-02-20 lttngTools = lttng-tools; # added 2014-07-31 lttngUst = lttng-ust; # added 2014-07-31 jquery_ui = jquery-ui; # added 2014-09-07 From c22435e70d90fd81ca4ac0aa0ae3e2d92267bf7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Fri, 20 Feb 2015 21:45:03 +0100 Subject: [PATCH 126/197] clang-analyzer: align attrname with pkgname --- pkgs/build-support/release/default.nix | 2 +- pkgs/build-support/release/nix-build.nix | 2 +- pkgs/top-level/all-packages.nix | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/release/default.nix b/pkgs/build-support/release/default.nix index d36707dc60f..82919cf819f 100644 --- a/pkgs/build-support/release/default.nix +++ b/pkgs/build-support/release/default.nix @@ -32,7 +32,7 @@ rec { } // args); clangAnalysis = args: nixBuild ( - { inherit clangAnalyzer; + { inherit clang-analyzer; doClangAnalysis = true; } // args); diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix index 6e0088adc3f..d42538c7e5d 100644 --- a/pkgs/build-support/release/nix-build.nix +++ b/pkgs/build-support/release/nix-build.nix @@ -137,7 +137,7 @@ stdenv.mkDerivation ( buildInputs = buildInputs ++ (stdenv.lib.optional doCoverageAnalysis args.makeGCOVReport) ++ - (stdenv.lib.optional doClangAnalysis args.clangAnalyzer) ++ + (stdenv.lib.optional doClangAnalysis args.clang-analyzer) ++ (stdenv.lib.optional doCoverityAnalysis args.cov-build) ++ (stdenv.lib.optional doCoverityAnalysis args.xz); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c18d3c014a8..cc4299883ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3181,7 +3181,7 @@ let clang_34 = wrapCC llvmPackages_34.clang; clang_33 = wrapCC (clangUnwrapped llvm_33 ../development/compilers/llvm/3.3/clang.nix); - clangAnalyzer = callPackage ../development/tools/analysis/clang-analyzer { + clang-analyzer = callPackage ../development/tools/analysis/clang-analyzer { clang = clang_34; llvmPackages = llvmPackages_34; }; @@ -13644,6 +13644,7 @@ let arduino_core = arduino-core; # added 2015-02-04 asciidocFull = asciidoc-full; # added 2014-06-22 bridge_utils = bridge-utils; # added 2015-02-20 + clangAnalyzer = clang-analyzer; # added 2015-02-20 lttngTools = lttng-tools; # added 2014-07-31 lttngUst = lttng-ust; # added 2014-07-31 jquery_ui = jquery-ui; # added 2014-09-07 From 1a35a0ad345d96f0256b69b4e33d421f37b576d7 Mon Sep 17 00:00:00 2001 From: Joachim Schiele Date: Fri, 20 Feb 2015 22:44:10 +0100 Subject: [PATCH 127/197] kino-1.3.4 fixes; thanks to gentoo --- pkgs/applications/video/kino/default.nix | 7 ++- .../video/kino/kino-1.3.4-libav-0.7.patch | 60 +++++++++++++++++++ .../video/kino/kino-1.3.4-libav-0.8.patch | 57 ++++++++++++++++++ .../kino-1.3.4-libavcodec-pkg-config.patch | 11 ++++ .../video/kino/kino-1.3.4-v4l1.patch | 21 +++++++ 5 files changed, 154 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/video/kino/kino-1.3.4-libav-0.7.patch create mode 100644 pkgs/applications/video/kino/kino-1.3.4-libav-0.8.patch create mode 100644 pkgs/applications/video/kino/kino-1.3.4-libavcodec-pkg-config.patch create mode 100644 pkgs/applications/video/kino/kino-1.3.4-v4l1.patch diff --git a/pkgs/applications/video/kino/default.nix b/pkgs/applications/video/kino/default.nix index 7dd089537b7..2f3193a5617 100644 --- a/pkgs/applications/video/kino/default.nix +++ b/pkgs/applications/video/kino/default.nix @@ -52,7 +52,7 @@ { stdenv, fetchurl, gtk, libglade, libxml2, libraw1394, libsamplerate, libdv , pkgconfig, perl, perlXMLParser, libavc1394, libiec61883, libXv, gettext -, libX11, glib, cairo, intltool, ffmpeg +, libX11, glib, cairo, intltool, ffmpeg, libv4l }: stdenv.mkDerivation { @@ -64,7 +64,7 @@ stdenv.mkDerivation { }; buildInputs = [ gtk libglade libxml2 libraw1394 libsamplerate libdv - pkgconfig perl perlXMLParser libavc1394 libiec61883 intltool libXv gettext libX11 glib cairo ffmpeg ]; # TODOoptional packages + pkgconfig perl perlXMLParser libavc1394 libiec61883 intltool libXv gettext libX11 glib cairo ffmpeg libv4l ]; # TODOoptional packages configureFlags = "--enable-local-ffmpeg=no"; #preConfigure = " @@ -72,6 +72,9 @@ stdenv.mkDerivation { # ex #"; + patches = [ ./kino-1.3.4-v4l1.patch ./kino-1.3.4-libav-0.7.patch ./kino-1.3.4-libav-0.8.patch ]; #./kino-1.3.4-libavcodec-pkg-config.patch ]; + + postInstall = " rpath=`patchelf --print-rpath \$out/bin/kino`; for i in $\buildInputs; do diff --git a/pkgs/applications/video/kino/kino-1.3.4-libav-0.7.patch b/pkgs/applications/video/kino/kino-1.3.4-libav-0.7.patch new file mode 100644 index 00000000000..65c5bc38276 --- /dev/null +++ b/pkgs/applications/video/kino/kino-1.3.4-libav-0.7.patch @@ -0,0 +1,60 @@ +--- kino-1.3.4.orig/src/frame.cc 2011-07-17 14:54:59.089481638 +0200 ++++ kino-1.3.4/src/frame.cc 2011-07-17 15:09:23.199481714 +0200 +@@ -1063,7 +1063,12 @@ + AVPicture dest; + int got_picture; + +- avcodec_decode_video( libavcodec, frame, &got_picture, data, GetFrameSize() ); ++ AVPacket pkt; ++ av_init_packet(&pkt); ++ pkt.data = data; ++ pkt.size = GetFrameSize(); ++ ++ avcodec_decode_video2( libavcodec, frame, &got_picture, &pkt ); + if ( got_picture ) + { + avpicture_fill( &dest, static_cast( rgb ), PIX_FMT_RGB24, GetWidth(), GetHeight() ); +@@ -1123,7 +1128,12 @@ + AVPicture output; + int got_picture; + +- avcodec_decode_video( libavcodec, frame, &got_picture, data, GetFrameSize() ); ++ AVPacket pkt; ++ av_init_packet(&pkt); ++ pkt.data = data; ++ pkt.size = GetFrameSize(); ++ ++ avcodec_decode_video2( libavcodec, frame, &got_picture, &pkt ); + if ( got_picture ) + { + avpicture_fill( &output, static_cast( yuv ), PIX_FMT_YUV422, GetWidth(), GetHeight() ); +@@ -1156,7 +1166,12 @@ + AVFrame *frame = avcodec_alloc_frame(); + int got_picture; + +- avcodec_decode_video( libavcodec, frame, &got_picture, data, GetFrameSize() ); ++ AVPacket pkt; ++ av_init_packet(&pkt); ++ pkt.data = data; ++ pkt.size = GetFrameSize(); ++ ++ avcodec_decode_video2( libavcodec, frame, &got_picture, &pkt ); + + int width = GetWidth(), height = GetHeight(); + +@@ -1319,12 +1334,12 @@ + #if defined(HAVE_LIBAVCODEC) + if ( avformatEncoder == NULL ) + { +- avformatEncoder = av_alloc_format_context(); ++ avformatEncoder = avformat_alloc_context(); + if ( avformatEncoder ) + { +- avformatEncoder->oformat = guess_format( "dv", NULL, NULL ); ++ avformatEncoder->oformat = av_guess_format( "dv", NULL, NULL ); + AVStream* vst = av_new_stream( avformatEncoder, 0 ); +- vst->codec->codec_type = CODEC_TYPE_VIDEO; ++ vst->codec->codec_type = AVMEDIA_TYPE_VIDEO; + vst->codec->codec_id = CODEC_ID_DVVIDEO; + vst->codec->bit_rate = 25000000; + vst->start_time = 0; diff --git a/pkgs/applications/video/kino/kino-1.3.4-libav-0.8.patch b/pkgs/applications/video/kino/kino-1.3.4-libav-0.8.patch new file mode 100644 index 00000000000..f98cbda0bc4 --- /dev/null +++ b/pkgs/applications/video/kino/kino-1.3.4-libav-0.8.patch @@ -0,0 +1,57 @@ +--- kino-1.3.4.orig/src/frame.cc 2012-05-14 19:55:42.153772418 -0700 ++++ kino-1.3.4/src/frame.cc 2012-05-14 20:28:34.448838653 -0700 +@@ -101,8 +101,9 @@ + #if defined(HAVE_LIBAVCODEC) + pthread_mutex_lock( &avcodec_mutex ); + av_register_all(); +- libavcodec = avcodec_alloc_context(); +- avcodec_open( libavcodec, avcodec_find_decoder( CODEC_ID_DVVIDEO ) ); ++ libavcodec = avcodec_alloc_context3(NULL); ++ avcodec_open2( libavcodec, ++ avcodec_find_decoder( CODEC_ID_DVVIDEO ), NULL ); + pthread_mutex_unlock( &avcodec_mutex ); + data = ( unsigned char* ) av_mallocz( 144000 ); + #if defined(HAVE_SWSCALE) +@@ -1338,7 +1339,7 @@ + if ( avformatEncoder ) + { + avformatEncoder->oformat = av_guess_format( "dv", NULL, NULL ); +- AVStream* vst = av_new_stream( avformatEncoder, 0 ); ++ AVStream* vst = avformat_new_stream( avformatEncoder, NULL ); + vst->codec->codec_type = AVMEDIA_TYPE_VIDEO; + vst->codec->codec_id = CODEC_ID_DVVIDEO; + vst->codec->bit_rate = 25000000; +@@ -1364,12 +1365,10 @@ + vst->sample_aspect_ratio = avcodecEncoder->sample_aspect_ratio; + #endif + avcodecEncoder->thread_count = 2; +- avcodec_thread_init( avcodecEncoder, avcodecEncoder->thread_count ); + avcodecEncoder->time_base= isPAL ? ( AVRational ){ 1, 25 } : ( AVRational ){ 1001, 30000 }; + avcodecEncoder->pix_fmt = isPAL ? PIX_FMT_YUV420P : PIX_FMT_YUV411P; + avcodecEncoder->flags |= CODEC_FLAG_INTERLACED_DCT; +- av_set_parameters( avformatEncoder, NULL ); +- avcodec_open( avcodecEncoder, avcodec_find_encoder( CODEC_ID_DVVIDEO ) ); ++ avcodec_open2( avcodecEncoder, avcodec_find_encoder( CODEC_ID_DVVIDEO ), NULL ); + av_new_packet( &avpacketEncoder, 144000 ); + tempImage = ( uint8_t* ) av_malloc( + avpicture_get_size( avcodecEncoder->pix_fmt, avcodecEncoder->width, avcodecEncoder->height ) ); +@@ -1475,16 +1474,16 @@ + + // Encode + bytesInFrame = avcodec_encode_video( avcodecEncoder, avpacketEncoder.data, size, output ); +- url_open_buf( &avformatEncoder->pb, data, bytesInFrame, URL_WRONLY ); ++ avformatEncoder->pb = avio_alloc_context(data, bytesInFrame, 0, NULL, NULL, NULL, NULL); + avpacketEncoder.size = bytesInFrame; + if ( !isEncoderHeaderWritten ) + { +- av_write_header( avformatEncoder ); ++ avformat_write_header( avformatEncoder, NULL ); + isEncoderHeaderWritten = true; + } + av_write_frame( avformatEncoder, &avpacketEncoder ); + #if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(0<<8)+0) +- url_close_buf( avformatEncoder->pb ); ++ avio_close( avformatEncoder->pb ); + #else + url_close_buf( &avformatEncoder->pb ); + #endif diff --git a/pkgs/applications/video/kino/kino-1.3.4-libavcodec-pkg-config.patch b/pkgs/applications/video/kino/kino-1.3.4-libavcodec-pkg-config.patch new file mode 100644 index 00000000000..d6a8953cf00 --- /dev/null +++ b/pkgs/applications/video/kino/kino-1.3.4-libavcodec-pkg-config.patch @@ -0,0 +1,11 @@ +--- a/kino-1.3.4/configure.in 2009-09-08 02:35:23.000000000 -0400 ++++ b/kino-1.3.4/configure.in 2014-01-27 14:53:01.366063037 -0500 +@@ -221,7 +221,7 @@ + if (test "x$avcodec_include" != x) || (test "x$avcodec_lib" != x) ; then + local_legacy_ffmpeg_test + else +- PKG_CHECK_MODULES(AVCODEC, libavformat, ++ PKG_CHECK_MODULES(AVCODEC, [libavcodec libavformat libavutil], + [ + AC_DEFINE(HAVE_LIBAVCODEC, 1, [Enable FFMPEG libavcodec]) + AC_SUBST(AVCODEC_LIBS) diff --git a/pkgs/applications/video/kino/kino-1.3.4-v4l1.patch b/pkgs/applications/video/kino/kino-1.3.4-v4l1.patch new file mode 100644 index 00000000000..05ec7386709 --- /dev/null +++ b/pkgs/applications/video/kino/kino-1.3.4-v4l1.patch @@ -0,0 +1,21 @@ +no-1.3.3.orig/ffmpeg/libavdevice/v4l.c 2011-05-17 02:20:37.161004916 +0400 ++++ kino-1.3.3.orig/ffmpeg/libavdevice/v4l.c 2011-05-17 02:21:57.302377529 +0400 +@@ -26,7 +26,7 @@ + #include + #include + #define _LINUX_TIME_H 1 +-#include ++#include + #include + + typedef struct { +--- kino-1.3.3.orig/src/v4l.h 2011-05-17 02:20:38.896969666 +0400 ++++ kino-1.3.3.orig/src/v4l.h 2011-05-17 02:21:39.922730395 +0400 +@@ -40,7 +40,7 @@ + + #define _DEVICE_H_ + #define _LINUX_TIME_H +-#include ++#include + + #include "displayer.h" From 1aed33f68b055180d0d52ff04699b0ca0ab05257 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Fri, 20 Feb 2015 23:16:29 +0100 Subject: [PATCH 128/197] homebank: update to 5.0.0 --- pkgs/applications/office/homebank/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 0fbd2e39812..8ab2d8fedcc 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -2,7 +2,7 @@ let download_root = "http://homebank.free.fr/public/"; - name = "homebank-4.6.3"; + name = "homebank-5.0.0"; lastrelease = download_root + name + ".tar.gz"; oldrelease = download_root + "old/" + name + ".tar.gz"; in @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchurl { urls = [ lastrelease oldrelease ]; - sha256 = "0j39788xz9m7ic277phffznbl35c1dm1g7dgq83va9nni6vipqzn"; + sha256 = "062r61ryn2v1sxyw6zymhxnvnhk19wsr4nyzmiiwx5wrk0nk9m18"; }; buildInputs = [ pkgconfig gtk libofx intltool ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc4299883ba..766d2a3a3cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10484,7 +10484,9 @@ let hipchat = callPackage ../applications/networking/instant-messengers/hipchat { }; - homebank = callPackage ../applications/office/homebank { }; + homebank = callPackage ../applications/office/homebank { + gtk = gtk3; + }; htmldoc = callPackage ../applications/misc/htmldoc { fltk = fltk13; From f2f3c5b4efb2e4bebc6be50f5116dc60d7bf12e2 Mon Sep 17 00:00:00 2001 From: Ryan Scheel Date: Fri, 20 Feb 2015 14:23:04 -0800 Subject: [PATCH 129/197] Update Elixir to v.1.0.3 Tested locally and it works. :D --- pkgs/development/interpreters/elixir/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix index 378edfaf343..ce6081b849c 100644 --- a/pkgs/development/interpreters/elixir/default.nix +++ b/pkgs/development/interpreters/elixir/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, erlang, rebar, makeWrapper, coreutils, curl, bash, cacert }: let - version = "1.0.2"; + version = "1.0.3"; in stdenv.mkDerivation { name = "elixir-${version}"; src = fetchurl { url = "https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz"; - sha256 = "6156ee396e85045358d11a6839e157e8fa9573b7414bddbd2c91843ed2b4b962"; + sha256 = "ec6c4eaffcb771d91bdea9fb274600c624fd16b1891d194b3fcb2b521f52cc75"; }; buildInputs = [ erlang rebar makeWrapper ]; From 61b8aa26f217c752f502c908a4e7209cc14bcb50 Mon Sep 17 00:00:00 2001 From: Siarhei Zirukin Date: Sat, 21 Feb 2015 00:43:40 +0100 Subject: [PATCH 130/197] openal-soft 1.15.1 -> 1.16.0 --- .../libraries/openal-soft/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix index 48f5bfc71e5..eedc9e9ff93 100644 --- a/pkgs/development/libraries/openal-soft/default.nix +++ b/pkgs/development/libraries/openal-soft/default.nix @@ -3,29 +3,32 @@ , pulseSupport ? true, pulseaudio ? null }: +with stdenv.lib; + assert alsaSupport -> alsaLib != null; assert pulseSupport -> pulseaudio != null; stdenv.mkDerivation rec { - version = "1.15.1"; + version = "1.16.0"; name = "openal-soft-${version}"; src = fetchurl { url = "http://kcat.strangesoft.net/openal-releases/${name}.tar.bz2"; - sha256 = "0mmhdqiyb3c9dzvxspm8h2v8jibhi8pfjxnf6m0wn744y1ia2a8f"; + sha256 = "0pqdykdclycfnk66v166srjrry936y39d1dz9wl92qz27wqwsg9g"; }; buildInputs = [ cmake ] - ++ stdenv.lib.optional alsaSupport alsaLib - ++ stdenv.lib.optional pulseSupport pulseaudio; + ++ optional alsaSupport alsaLib + ++ optional pulseSupport pulseaudio; NIX_LDFLAGS = [] - ++ stdenv.lib.optional alsaSupport "-lasound" - ++ stdenv.lib.optional pulseSupport "-lpulse"; + ++ optional alsaSupport "-lasound" + ++ optional pulseSupport "-lpulse"; meta = { description = "OpenAL alternative"; homepage = http://kcat.strangesoft.net/openal.html; - license = stdenv.lib.licenses.gpl2; + license = licenses.lgpl2; + maintainers = with maintainers; [ftrvxmtrx]; }; } From 2290dbb843f817d8249e4207e2ff25d430d90ee6 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Fri, 20 Feb 2015 17:07:46 -0800 Subject: [PATCH 131/197] Update goPackages.dns to a more recent commit Old: 2014-07-15 New: 2015-02-20, with many bugfixes and improvements and test coverage. --- pkgs/top-level/go-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index dfff0b680cd..538506a5c1e 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -167,14 +167,14 @@ let self = _self // overrides; _self = with self; { }; dns = buildGoPackage rec { - rev = "fc67c4b981930a377f8a26a5a1f2c0ccd5dd1514"; + rev = "0bd3fb7026404936cf18204ea527d27f067923cf"; name = "dns-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/miekg/dns"; src = fetchFromGitHub { inherit rev; owner = "miekg"; repo = "dns"; - sha256 = "1csjmkx0gl34r4hmkhdbdxb0693f1p10yrjaj8f2jwli9p9sl4mg"; + sha256 = "1hv2ikpd9gr9idf7zh8nyqgdbnnffs057wsdpd7m44mllbmzhdxn"; }; }; From d382667537d5f967e61ffa5cba9a58c3ad09605d Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Fri, 20 Feb 2015 13:55:33 -0800 Subject: [PATCH 132/197] New package: mesos-dns --- pkgs/servers/dns/mesos-dns/default.nix | 31 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/servers/dns/mesos-dns/default.nix diff --git a/pkgs/servers/dns/mesos-dns/default.nix b/pkgs/servers/dns/mesos-dns/default.nix new file mode 100644 index 00000000000..5b7d96c14cf --- /dev/null +++ b/pkgs/servers/dns/mesos-dns/default.nix @@ -0,0 +1,31 @@ +{ lib, goPackages, fetchFromGitHub }: + +with goPackages; + +buildGoPackage rec { + name = "mesos-dns-${version}"; + version = "0.1"; + + goPackagePath = "github.com/mesosphere/mesos-dns"; + + src = fetchFromGitHub { + owner = "mesosphere"; + repo = "mesos-dns"; + rev = "29940029d4b0c17142373c3280a8b452722b665b"; + sha256 = "1fycywhdyymibsahjqx9vnigk3pdis3hnmfbxp74pmd9xqqlyv1n"; + }; + + # Avoid including the benchmarking test helper in the output: + subPackages = [ "." ]; + + buildInputs = with goPackages; [ go dns ]; + dontInstallSrc = true; + + meta = with lib; { + description = "DNS-based service discovery for Mesos clusters"; + homepage = https://github.com/mesosphere/mesos-dns; + license = licenses.apsl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 766d2a3a3cc..341a2d7102d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4340,6 +4340,8 @@ let pythonProtobuf = pythonPackages.protobuf; }; + mesos-dns = callPackage ../servers/dns/mesos-dns { }; + mujs = callPackage ../development/interpreters/mujs { }; nix-exec = callPackage ../development/interpreters/nix-exec { From a0830c90396d5e8ab5fe6186af115fc73224fbcd Mon Sep 17 00:00:00 2001 From: Henry Till Date: Fri, 20 Feb 2015 20:49:33 -0500 Subject: [PATCH 133/197] hsetroot: fix libX11 error --- pkgs/tools/X11/hsetroot/default.nix | 30 ++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/X11/hsetroot/default.nix b/pkgs/tools/X11/hsetroot/default.nix index e226f1f93c4..eeaf5dac7c6 100644 --- a/pkgs/tools/X11/hsetroot/default.nix +++ b/pkgs/tools/X11/hsetroot/default.nix @@ -1,19 +1,35 @@ -{stdenv, fetchurl, imlib2, libX11, libXext }: +{ stdenv, fetchurl, autoconf, automake, imlib2, libtool, libX11, pkgconfig, xproto }: -stdenv.mkDerivation { - name = "hsetroot-1.0.2"; +stdenv.mkDerivation rec { + name = "hsetroot-${version}"; + version = "1.0.2"; # The primary download site seems to no longer exist; use Gentoo's mirror for now. src = fetchurl { - url = "http://mirror.datapipe.net/gentoo/distfiles/hsetroot-1.0.2.tar.gz"; + url = "http://mirror.datapipe.net/gentoo/distfiles/hsetroot-${version}.tar.gz"; sha256 = "d6712d330b31122c077bfc712ec4e213abe1fe71ab24b9150ae2774ca3154fd7"; }; - buildInputs = [ imlib2 libX11 libXext ]; + # See https://bugs.gentoo.org/show_bug.cgi?id=504056 + underlinkingPatch = fetchurl { + url = http://www.gtlib.gatech.edu/pub/gentoo/gentoo-x86-portage/x11-misc/hsetroot/files/hsetroot-1.0.2-underlinking.patch; + name = "hsetroot-1.0.2-underlinking.patch"; + sha256 = "1px1p3wz7ji725z9nlwb0x0h6lnnvnpz15sblzzq7zrijl3wz65x"; + }; - meta = { + buildInputs = [ autoconf automake imlib2 libtool libX11 pkgconfig xproto ]; + + patches = [ underlinkingPatch ]; + + patchFlags = "-p0"; + + preConfigure = "./autogen.sh"; + + meta = with stdenv.lib; { description = "Allows you to compose wallpapers ('root pixmaps') for X"; homepage = http://thegraveyard.org/hsetroot.html; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; + maintainers = [ maintainers.henrytill ]; + platforms = platforms.unix; }; } From c56256709bcba7182b0820fe697abf0fc703d64c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Val=C3=A9rian=20Galliat?= Date: Sun, 8 Feb 2015 18:35:15 +0100 Subject: [PATCH 134/197] Add io.js --- pkgs/development/web/iojs/default.nix | 31 +++++++++++++++++++ .../web/nodejs/build-node-package.nix | 2 +- pkgs/top-level/all-packages.nix | 7 +++++ 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/web/iojs/default.nix diff --git a/pkgs/development/web/iojs/default.nix b/pkgs/development/web/iojs/default.nix new file mode 100644 index 00000000000..bb596b3060f --- /dev/null +++ b/pkgs/development/web/iojs/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, python, utillinux, nightly ? false }: + +let + version = if nightly then "1.1.1-nightly201502072c3121c606" else "1.1.0"; + inherit (stdenv.lib) optional maintainers licenses platforms; +in stdenv.mkDerivation { + name = "iojs-${version}"; + + src = fetchurl { + url = if nightly + then "https://iojs.org/download/nightly/v${version}/iojs-v${version}.tar.gz" + else "https://iojs.org/dist/v${version}/iojs-v${version}.tar.gz"; + sha256 = if nightly + then "1jjh5f8kpcgdjjib9q1f2hqvrs6p4m4fyfbfy6dsdbzl2hglajvw" + else "0yvz3rw7d73snc1g447l4amqbbyydbyzr9ynykmyld7l3gdsif7h"; + }; + + prePatch = '' + sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i configure + ''; + + buildInputs = [ python ] ++ (optional stdenv.isLinux utillinux); + setupHook = ../nodejs/setup-hook.sh; + + meta = { + description = "A friendly fork of Node.js with an open governance model"; + homepage = https://iojs.org/; + license = licenses.mit; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix index 1965521ba81..4b9e057243c 100644 --- a/pkgs/development/web/nodejs/build-node-package.nix +++ b/pkgs/development/web/nodejs/build-node-package.nix @@ -38,7 +38,7 @@ let sources = runCommand "node-sources" {} '' tar --no-same-owner --no-same-permissions -xf ${nodejs.src} - mv *node* $out + mv $(find . -type d -mindepth 1 -maxdepth 1) $out ''; # Convert deps to attribute set diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 766d2a3a3cc..40fc5a10299 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1729,6 +1729,13 @@ let callPackage ./node-packages.nix { self = nodePackages; } ); + iojs = callPackage ../development/web/iojs { }; + iojs-nightly = callPackage ../development/web/iojs { nightly = true; }; + + iojsPackages = recurseIntoAttrs ( + callPackage ./node-packages.nix { self = iojsPackages; nodejs = iojs; } + ); + ldapvi = callPackage ../tools/misc/ldapvi { }; ldns = callPackage ../development/libraries/ldns { }; From 7fcac2e8e1efaa5cc2d042f9ded1bda1a39296de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Val=C3=A9rian=20Galliat?= Date: Sun, 15 Feb 2015 11:00:24 +0100 Subject: [PATCH 135/197] Update iojs --- pkgs/development/web/iojs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/iojs/default.nix b/pkgs/development/web/iojs/default.nix index bb596b3060f..58368ac7d91 100644 --- a/pkgs/development/web/iojs/default.nix +++ b/pkgs/development/web/iojs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, python, utillinux, nightly ? false }: let - version = if nightly then "1.1.1-nightly201502072c3121c606" else "1.1.0"; + version = if nightly then "1.2.1-nightly20150213f0296933f8" else "1.2.0"; inherit (stdenv.lib) optional maintainers licenses platforms; in stdenv.mkDerivation { name = "iojs-${version}"; @@ -11,8 +11,8 @@ in stdenv.mkDerivation { then "https://iojs.org/download/nightly/v${version}/iojs-v${version}.tar.gz" else "https://iojs.org/dist/v${version}/iojs-v${version}.tar.gz"; sha256 = if nightly - then "1jjh5f8kpcgdjjib9q1f2hqvrs6p4m4fyfbfy6dsdbzl2hglajvw" - else "0yvz3rw7d73snc1g447l4amqbbyydbyzr9ynykmyld7l3gdsif7h"; + then "0v9njaggddi128v58rd34qknph8pn9c653gqd4y29l1mwjvqg62s" + else "17axqswpl252gliak1wjc2l9jk6n5jqdfa9f1vv7x9acj776yrik"; }; prePatch = '' From 6f30dcd456cf2d3ba43f20662006c380cd523771 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sat, 21 Feb 2015 03:34:35 -0600 Subject: [PATCH 136/197] emacs24Macport: upgrade Macport patch to 5.1 -> 5.3 --- pkgs/applications/editors/emacs-24/macport-24.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs-24/macport-24.4.nix b/pkgs/applications/editors/emacs-24/macport-24.4.nix index 694078ffa1f..802faf44c64 100644 --- a/pkgs/applications/editors/emacs-24/macport-24.4.nix +++ b/pkgs/applications/editors/emacs-24/macport-24.4.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { emacsName = "emacs-24.4"; - name = "${emacsName}-mac-5.1"; + name = "${emacsName}-mac-5.3"; #builder = ./builder.sh; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { macportSrc = fetchurl { url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${name}.tar.gz"; - sha256 = "0qn200vv91qxf93x6y8fdi7l3bsni3clqzf8rcjdpbva1qzgcx27"; + sha256 = "0qzzqnql0z0a2p3ciccy8gq79v0s7s717lchcprn3wlaqcrk2g1p"; }; patches = [ ./darwin-new-sections.patch ]; From 81588746aa2462a497e7cd23138d6aa9dfc96e08 Mon Sep 17 00:00:00 2001 From: Suvash Thapaliya Date: Thu, 19 Feb 2015 23:53:44 +0100 Subject: [PATCH 137/197] Add Mosquitto MQTT server package as of now it is just built and copied to the right place so that the server can be run. hopefully i will be tweaking with the configuration files in the future and tweak this a bit more --- pkgs/servers/mqtt/mosquitto/default.nix | 30 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/servers/mqtt/mosquitto/default.nix diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix new file mode 100644 index 00000000000..4fdb475d89b --- /dev/null +++ b/pkgs/servers/mqtt/mosquitto/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, openssl, libuuid }: + +stdenv.mkDerivation rec { + pname = "mosquitto"; + version = "1.4"; + + name = "${pname}-${version}"; + + src = fetchurl { + url = http://mosquitto.org/files/source/mosquitto-1.4.tar.gz; + sha256 = "1imw5ps0cqda41b574k8hgz9gdr8yy58f76fg8gw14pdnvf3l7sr"; + }; + + buildInputs = [ openssl libuuid ]; + + buildFlags = "mosquitto"; + + installPhase = '' + mkdir -p $out/bin + cp src/mosquitto $out/bin/ + ''; + + meta = { + homepage = http://mosquitto.org/; + description = "An open source MQTT v3.1/3.1.1 broker"; + platforms = stdenv.lib.platforms.unix; + # http://www.eclipse.org/legal/epl-v10.html (free software, copyleft) + license = stdenv.lib.licenses.epl10; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 766d2a3a3cc..b87d0607567 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6789,6 +6789,8 @@ let movit = callPackage ../development/libraries/movit { }; + mosquitto = callPackage ../servers/mqtt/mosquitto { }; + mps = callPackage ../development/libraries/mps { }; libmpeg2 = callPackage ../development/libraries/libmpeg2 { }; From 77986803a63a95505658e942d5e59d78279f1818 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 21 Feb 2015 16:05:09 +0100 Subject: [PATCH 138/197] nvidia_x11: fix nvidia-settings after the major update The GUI would no longer find libs it needed. Now it's gtk3 by default, so we don't support gtk2 version for simplicity. ldd finds no missing libs after this commit. --- pkgs/os-specific/linux/nvidia-x11/builder.sh | 55 ++++++++++--------- pkgs/os-specific/linux/nvidia-x11/default.nix | 7 ++- 2 files changed, 34 insertions(+), 28 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 5d6647d1ee0..314b1082dfc 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -29,6 +29,29 @@ buildPhase() { installPhase() { + # Install libGL and friends. + mkdir -p "$out/lib/vendors" + cp -p nvidia.icd $out/lib/vendors/ + + cp -prd *.so.* tls "$out/lib/" + rm "$out"/lib/lib{glx,nvidia-wfb}.so.* # handled separately + + for libname in `find "$out/lib/" -name '*.so.*'` + do + # I'm lazy to differentiate needed libs per-library, as the closure is the same. + # Unfortunately --shrink-rpath would strip too much. + patchelf --set-rpath "$out/lib:$allLibPath" "$libname" + + libname_short=`echo -n "$libname" | sed 's/so\..*/so/'` + ln -srnf "$libname" "$libname_short" + ln -srnf "$libname" "$libname_short.1" + done + + #patchelf --set-rpath $out/lib:$glPath $out/lib/libGL.so.*.* + #patchelf --set-rpath $out/lib:$glPath $out/lib/libvdpau_nvidia.so.*.* + #patchelf --set-rpath $cudaPath $out/lib/libcuda.so.*.* + #patchelf --set-rpath $openclPath $out/lib/libnvidia-opencl.so.*.* + if test -z "$libsOnly"; then # Install the kernel module. @@ -52,9 +75,11 @@ installPhase() { for i in nvidia-settings nvidia-smi; do cp $i $out/bin/$i patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $out/lib:$programPath:$glPath $out/bin/$i + --set-rpath $out/lib:$glPath $out/bin/$i done + patchelf --set-rpath $glPath:$gtk3Path $out/lib/libnvidia-gtk3.so.*.* + # Header files etc. mkdir -p $out/include/nvidia cp -p *.h $out/include/nvidia @@ -76,31 +101,11 @@ installPhase() { # Test a bit. $out/bin/nvidia-settings --version + else + rm $out/lib/libnvidia-gtk3.* fi - - - # Install libGL and friends. - mkdir -p "$out/lib/vendors" - cp -p nvidia.icd $out/lib/vendors/ - - cp -prd *.so.* tls "$out/lib/" - rm "$out"/lib/lib{glx,nvidia-wfb}.so.* # handled separately - - for libname in `find "$out/lib/" -name '*.so.*'` - do - # I'm lazy to differentiate needed libs per-library, as the closure is the same. - # Unfortunately --shrink-rpath would strip too much. - patchelf --set-rpath "$out/lib:$allLibPath" "$libname" - - libname_short=`echo -n "$libname" | sed 's/so\..*/so/'` - ln -srnf "$libname" "$libname_short" - ln -srnf "$libname" "$libname_short.1" - done - - #patchelf --set-rpath $out/lib:$glPath $out/lib/libGL.so.*.* - #patchelf --set-rpath $out/lib:$glPath $out/lib/libvdpau_nvidia.so.*.* - #patchelf --set-rpath $cudaPath $out/lib/libcuda.so.*.* - #patchelf --set-rpath $openclPath $out/lib/libnvidia-opencl.so.*.* + # for simplicity and dependency reduction, don't support the gtk2 interface + rm $out/lib/libnvidia-gtk2.* } diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index f8b6327a654..5dd8eb5450c 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, kernel ? null, xlibs, zlib, perl -, gtk, atk, pango, glib, gdk_pixbuf +, gtk3, atk, pango, glib, gdk_pixbuf, cairo , # Whether to build the libraries only (i.e. not the kernel module or # nvidia-settings). Used to support 32-bit binaries on 64-bit # Linux. @@ -46,8 +46,9 @@ stdenv.mkDerivation { openclPath = makeLibraryPath [zlib]; allLibPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr zlib stdenv.cc.cc]; - programPath = optionalString (!libsOnly) (makeLibraryPath - [ gtk atk pango glib gdk_pixbuf xlibs.libXv ] ); + # we don't support the gtk2 version + gtk3Path = optionalString (!libsOnly) (makeLibraryPath + [ gtk3 atk pango glib gdk_pixbuf cairo ] ); buildInputs = [ perl ]; From a3a467ce77ada3409ebcdc11a80b6621b0b3adca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 21 Feb 2015 16:29:36 +0100 Subject: [PATCH 139/197] nixos/nvidia: use correct 32-bit legacy libs; refactor Fixes #6127. Now we avoid multiple switches among the version possibilities. --- nixos/modules/hardware/video/nvidia.nix | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 325aa5f093f..2b20dc7395a 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -11,20 +11,21 @@ let # FIXME: should introduce an option like # ‘hardware.video.nvidia.package’ for overriding the default NVIDIA # driver. - enabled = elem "nvidia" drivers || elem "nvidiaLegacy173" drivers - || elem "nvidiaLegacy304" drivers || elem "nvidiaLegacy340" drivers; - - nvidia_x11 = + nvidiaForKernel = kernelPackages: if elem "nvidia" drivers then - config.boot.kernelPackages.nvidia_x11 + kernelPackages.nvidia_x11 else if elem "nvidiaLegacy173" drivers then - config.boot.kernelPackages.nvidia_x11_legacy173 + kernelPackages.nvidia_x11_legacy173 else if elem "nvidiaLegacy304" drivers then - config.boot.kernelPackages.nvidia_x11_legacy304 + kernelPackages.nvidia_x11_legacy304 else if elem "nvidiaLegacy340" drivers then - config.boot.kernelPackages.nvidia_x11_legacy340 - else throw "impossible"; + kernelPackages.nvidia_x11_legacy340 + else null; + nvidia_x11 = nvidiaForKernel config.boot.kernelPackages; + nvidia_libs32 = (nvidiaForKernel pkgs_i686.linuxPackages).override { libsOnly = true; kernel = null; }; + + enabled = nvidia_x11 != null; in { @@ -40,7 +41,7 @@ in ''; hardware.opengl.package = nvidia_x11; - hardware.opengl.package32 = pkgs_i686.linuxPackages.nvidia_x11.override { libsOnly = true; kernel = null; }; + hardware.opengl.package32 = nvidia_libs32; environment.systemPackages = [ nvidia_x11 ]; From 382f175f10b1b056d26defb58f80ef5ff7d1846f Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Sat, 21 Feb 2015 16:08:55 +0000 Subject: [PATCH 140/197] ejabberd: fix problem with missing shell while loading a backup --- pkgs/servers/xmpp/ejabberd/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index 5868125c97f..3a77c5cd15c 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -9,7 +9,10 @@ stdenv.mkDerivation rec { }; buildInputs = [ expat erlang zlib openssl pam ]; patchPhase = '' - sed -i -e "s|erl \\\|${erlang}/bin/erl \\\|" src/ejabberdctl.template + sed -i \ + -e "s|erl \\\|${erlang}/bin/erl \\\|" \ + -e 's|EXEC_CMD=\"sh -c\"|EXEC_CMD=\"${stdenv.shell} -c\"|' \ + src/ejabberdctl.template ''; preConfigure = '' cd src From 7bf20213497193695f16f3222a4409e72be52b54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 21 Feb 2015 17:25:43 +0100 Subject: [PATCH 141/197] nvidia_x11: reintroduce libXv for nvidia-settings It was dropped in 77986803a6. --- pkgs/os-specific/linux/nvidia-x11/builder.sh | 2 +- pkgs/os-specific/linux/nvidia-x11/default.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 314b1082dfc..41523b93167 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -75,7 +75,7 @@ installPhase() { for i in nvidia-settings nvidia-smi; do cp $i $out/bin/$i patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $out/lib:$glPath $out/bin/$i + --set-rpath $out/lib:$programPath:$glPath $out/bin/$i done patchelf --set-rpath $glPath:$gtk3Path $out/lib/libnvidia-gtk3.so.*.* diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 5dd8eb5450c..f62649e2daa 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation { # we don't support the gtk2 version gtk3Path = optionalString (!libsOnly) (makeLibraryPath [ gtk3 atk pango glib gdk_pixbuf cairo ] ); + programPath = makeLibraryPath [ xlibs.libXv ]; buildInputs = [ perl ]; From fdcfefee2cb7602052b87562afb8784294fa1b93 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 21 Feb 2015 10:58:37 -0600 Subject: [PATCH 142/197] autonix: tweak manifest format --- pkgs/build-support/autonix/default.nix | 19 +++++++++---------- pkgs/build-support/autonix/manifest.sh | 11 +++++++---- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/pkgs/build-support/autonix/default.nix b/pkgs/build-support/autonix/default.nix index 7751f8019c4..66e2700f192 100644 --- a/pkgs/build-support/autonix/default.nix +++ b/pkgs/build-support/autonix/default.nix @@ -36,9 +36,10 @@ let writeManifestXML = filename: let generateStores = mapAttrs (n: pkg: pkg.store); - manifest = generateStores (importManifest filename { mirror = ""; }); + manifest = importManifest filename { mirror = ""; }; + stores = generateStores manifest; in - writeText "manifest.xml" (builtins.toXML manifest); + writeText "manifest.xml" (builtins.toXML stores); /* Generate a set of Nix expressions for the collection, given a * manifest.nix, dependencies.nix, and renames.nix in the same directory. @@ -69,9 +70,8 @@ let in derive (postResolve (resolve (preResolve packages))); - pkgNameVersion = pkg: nameFromURL pkg.name ".tar"; - pkgAttrName = pkg: (builtins.parseDrvName (pkgNameVersion pkg)).name; - pkgVersion = pkg: (builtins.parseDrvName (pkgNameVersion pkg)).version; + pkgAttrName = pkg: (builtins.parseDrvName pkg.name).name; + pkgVersion = pkg: (builtins.parseDrvName pkg.name).version; depAttrNames = [ "buildInputs" "nativeBuildInputs" @@ -112,7 +112,7 @@ let builtins.listToAttrs (map (p: nameValuePair (toLower (pkgAttrName p)) p) manifest); - orig = import path { inherit mirror; }; + orig = import path { inherit stdenv fetchurl mirror; }; in fold (f: x: f x) orig [ withNames bestVersions ]; @@ -134,11 +134,10 @@ let deps = import (path + "/dependencies.nix") {}; - mkPkg = pkg: pkgManifest: + mkPkg = name: manifest: { - name = nameFromURL pkgManifest.name ".tar"; - src = { inherit (pkgManifest) sha256 name url; }; - inherit (deps."${pkg}") + inherit (manifest) name src; + inherit (deps."${name}") buildInputs nativeBuildInputs propagatedBuildInputs propagatedNativeBuildInputs propagatedUserEnvPkgs; }; diff --git a/pkgs/build-support/autonix/manifest.sh b/pkgs/build-support/autonix/manifest.sh index eb59d5f1330..df0f52a73b5 100755 --- a/pkgs/build-support/autonix/manifest.sh +++ b/pkgs/build-support/autonix/manifest.sh @@ -6,7 +6,7 @@ cat >../manifest.nix <>../manifest.nix < Date: Sat, 21 Feb 2015 10:52:04 -0600 Subject: [PATCH 143/197] remove plasma-5.1 --- pkgs/desktops/plasma-5.1/default.nix | 143 ------- pkgs/desktops/plasma-5.1/dependencies.nix | 220 ---------- pkgs/desktops/plasma-5.1/dependencies.sh | 22 - .../kwin-import-plugin-follow-symlinks.patch | 13 - .../libkscreen/libkscreen-backend-path.patch | 130 ------ pkgs/desktops/plasma-5.1/manifest.nix | 166 -------- pkgs/desktops/plasma-5.1/manifest.sh | 15 - .../plasma-desktop-hwclock.patch | 24 -- .../plasma-desktop-zoneinfo.patch | 18 - pkgs/desktops/plasma-5.1/renames.nix | 24 -- pkgs/desktops/plasma-5.1/setup-hook.sh | 1 - pkgs/desktops/plasma-5.1/startkde/default.nix | 33 -- pkgs/desktops/plasma-5.1/startkde/kdeglobals | 11 - pkgs/desktops/plasma-5.1/startkde/startkde.in | 382 ------------------ .../plasma-5.1/startkde/startupconfigkeys | 5 - pkgs/top-level/all-packages.nix | 6 +- 16 files changed, 2 insertions(+), 1211 deletions(-) delete mode 100644 pkgs/desktops/plasma-5.1/default.nix delete mode 100644 pkgs/desktops/plasma-5.1/dependencies.nix delete mode 100755 pkgs/desktops/plasma-5.1/dependencies.sh delete mode 100644 pkgs/desktops/plasma-5.1/kwin/kwin-import-plugin-follow-symlinks.patch delete mode 100644 pkgs/desktops/plasma-5.1/libkscreen/libkscreen-backend-path.patch delete mode 100644 pkgs/desktops/plasma-5.1/manifest.nix delete mode 100755 pkgs/desktops/plasma-5.1/manifest.sh delete mode 100644 pkgs/desktops/plasma-5.1/plasma-desktop/plasma-desktop-hwclock.patch delete mode 100644 pkgs/desktops/plasma-5.1/plasma-desktop/plasma-desktop-zoneinfo.patch delete mode 100644 pkgs/desktops/plasma-5.1/renames.nix delete mode 100644 pkgs/desktops/plasma-5.1/setup-hook.sh delete mode 100644 pkgs/desktops/plasma-5.1/startkde/default.nix delete mode 100644 pkgs/desktops/plasma-5.1/startkde/kdeglobals delete mode 100644 pkgs/desktops/plasma-5.1/startkde/startkde.in delete mode 100644 pkgs/desktops/plasma-5.1/startkde/startupconfigkeys diff --git a/pkgs/desktops/plasma-5.1/default.nix b/pkgs/desktops/plasma-5.1/default.nix deleted file mode 100644 index 4c6c37a152a..00000000000 --- a/pkgs/desktops/plasma-5.1/default.nix +++ /dev/null @@ -1,143 +0,0 @@ -# Maintainer's Notes: -# -# Minor updates: -# 1. Edit ./manifest.sh to point to the updated URL. Upstream sometimes -# releases updates that include only the changed packages; in this case, -# multiple URLs can be provided and the results will be merged. -# 2. Run ./manifest.sh and ./dependencies.sh. -# 3. Build and enjoy. -# -# Major updates: -# We prefer not to immediately overwrite older versions with major updates, so -# make a copy of this directory first. After copying, be sure to delete ./tmp -# if it exists. Then follow the minor update instructions. - -{ autonix, kf55, pkgs, stdenv, debug ? false }: - -with stdenv.lib; with autonix; - -let - - kf5 = kf55.override { inherit debug; }; - - mirror = "mirror://kde"; - - renames = - builtins.removeAttrs - (import ./renames.nix {}) - ["Backend" "CTest" "KF5Wayland"]; - - scope = - # packages in this collection - (mapAttrs (dep: name: plasma5."${name}") renames) // - # packages from KDE Frameworks 5 - kf5.scope // - # packages pinned to this version of Qt 5 - { - PopplerQt5 = (pkgs.poppler.override { inherit (kf5) qt5; }).poppler_qt5; - } // - # packages from nixpkgs - (with pkgs; - { - inherit epoxy; - Epub = ebook_tools; - Exiv2 = exiv2; - FFmpeg = ffmpeg; - FONTFORGE_EXECUTABLE = fontforge; - Freetype = freetype; - LibSSH = libssh; - ModemManager = modemmanager; - NetworkManager = networkmanager; - PulseAudio = pulseaudio; - Taglib = taglib; - Xapian = xapian; - } - ); - - preResolve = super: - fold (f: x: f x) super - [ - (userEnvPkg "SharedMimeInfo") - (userEnvPkg "SharedDesktopOntologies") - (blacklist ["kwayland"]) - ]; - - postResolve = super: - (builtins.removeAttrs super ["breeze"]) // { - - breeze-qt4 = with pkgs; super.breeze // { - name = "breeze-qt4-" + (builtins.parseDrvName super.breeze.name).version; - buildInputs = [ xlibs.xproto kde4.kdelibs qt4 ]; - nativeBuildInputs = [ cmake pkgconfig ]; - cmakeFlags = - [ - "-DUSE_KDE4=ON" - "-DQT_QMAKE_EXECUTABLE=${qt4}/bin/qmake" - ]; - }; - - breeze-qt5 = with pkgs; super.breeze // { - name = "breeze-qt5-" + (builtins.parseDrvName super.breeze.name).version; - buildInputs = with kf5; - [ - kcompletion kconfig kconfigwidgets kcoreaddons frameworkintegration - ki18n kwindowsystem qt5 - ]; - nativeBuildInputs = [ cmake kf5.extra-cmake-modules pkgconfig ]; - cmakeFlags = [ "-DUSE_KDE4=OFF" ]; - }; - - kwin = with pkgs; super.kwin // { - buildInputs = with xlibs; - super.kwin.buildInputs ++ [ libICE libSM libXcursor ]; - patches = [ ./kwin/kwin-import-plugin-follow-symlinks.patch ]; - }; - - libkscreen = with pkgs; super.libkscreen // { - buildInputs = with xlibs; - super.libkscreen.buildInputs ++ [libXrandr]; - patches = [ ./libkscreen/libkscreen-backend-path.patch ]; - }; - - plasma-desktop = with pkgs; super.plasma-desktop // { - buildInputs = with xlibs; - super.plasma-desktop.buildInputs ++ - [ pkgs.libcanberra libxkbfile libXcursor ]; - patches = [ - ./plasma-desktop/plasma-desktop-hwclock.patch - ./plasma-desktop/plasma-desktop-zoneinfo.patch - ]; - preConfigure = '' - substituteInPlace kcms/dateandtime/helper.cpp \ - --subst-var-by hwclock "${utillinux}/sbin/hwclock" - ''; - }; - - plasma-workspace = with pkgs; super.plasma-workspace // { - buildInputs = with xlibs; - super.plasma-workspace.buildInputs ++ [ libSM libXcursor pam ]; - postInstall = '' - # We use a custom startkde script - rm $out/bin/startkde - ''; - }; - - powerdevil = with pkgs; super.powerdevil // { - buildInputs = with xlibs; super.powerdevil.buildInputs ++ [libXrandr]; - }; - - }; - - plasma5 = generateCollection ./. { - inherit (kf5) mkDerivation; - inherit mirror preResolve postResolve renames scope; - }; - -in - plasma5 // { - inherit scope; - startkde = pkgs.callPackage ./startkde { - inherit (kf5) kconfig kinit kservice; - inherit (plasma5) plasma-desktop plasma-workspace; - }; - } diff --git a/pkgs/desktops/plasma-5.1/dependencies.nix b/pkgs/desktops/plasma-5.1/dependencies.nix deleted file mode 100644 index 9402857e248..00000000000 --- a/pkgs/desktops/plasma-5.1/dependencies.nix +++ /dev/null @@ -1,220 +0,0 @@ -# DO NOT EDIT! This file is generated automatically. -{ }: -{ - baloo = { - buildInputs = [ "ECM" "KF5" "KF5Abc" "KF5Akonadi" "KF5AkonadiMime" "KF5AkonadiServer" "KF5Auth" "KF5CalendarCore" "KF5Config" "KF5Crash" "KF5FileMetaData" "KF5I18n" "KF5IdleTime" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5Mime" "KF5PimUtils" "KF5Solid" "Qt5" "Qt5Test" "Xapian" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5CoreAddons" "KF5FileMetaData" "Qt5Core" "Xapian" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - breeze = { - buildInputs = [ "ECM" "KDE4" "KDecorations" "KF5" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5FrameworkIntegration" "KF5I18n" "KF5WindowSystem" "PkgConfig" "Qt5" "XCB" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kde-cli-tools = { - buildInputs = [ "ECM" "KF5" "KF5Config" "KF5I18n" "KF5IconThemes" "KF5KCMUtils" "KF5KDE4Support" "KF5Su" "KF5WindowSystem" "Qt5" "Qt5Test" "Qt5X11Extras" "X11" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kdeplasma-addons = { - buildInputs = [ "ECM" "GIO" "GLIB2" "GObject" "IBus" "KDE4" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5Plasma" "KF5Runner" "KF5Service" "KF5UnitConversion" "KdepimLibs" "Kexiv2" "Lancelot" "Lancelot-Datamodels" "Qt5" "SCIM" "SharedMimeInfo" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ "SharedMimeInfo" ]; - }; - - kfilemetadata = { - buildInputs = [ "ECM" "EPub" "Exiv2" "FFmpeg" "KF5" "KF5Archive" "KF5I18n" "PopplerQt5" "QMobipocket" "Qt5" "Taglib" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "Qt5Core" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - khelpcenter = { - buildInputs = [ "ECM" "KF5" "KF5Config" "KF5I18n" "KF5Init" "KF5KCMUtils" "KF5KDE4Support" "KF5KHtml" "Qt5" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - khotkeys = { - buildInputs = [ "ECM" "KF5" "KF5DBusAddons" "KF5GlobalAccel" "KF5I18n" "KF5KCMUtils" "KF5KDE4Support" "KF5KIO" "KF5Plasma" "KF5XmlGui" "LibKWorkspace" "Qt5" "X11" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kinfocenter = { - buildInputs = [ "ECM" "EGL" "KF5" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5Service" "KF5Solid" "KF5Wayland" "KF5WidgetsAddons" "KF5XmlGui" "OpenGL" "OpenGLES" "PCIUTILS" "Qt5" "RAW1394" "X11" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kio-extras = { - buildInputs = [ "ECM" "Exiv2" "JPEG" "KF5" "KF5Archive" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5DNSSD" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5KDE4Support" "KF5KHtml" "KF5KIO" "KF5Solid" "LibSSH" "OpenEXR" "Phonon4Qt5" "Qt5" "Qt5Test" "SLP" "Samba" "SharedMimeInfo" ]; - nativeBuildInputs = [ "MD5SUM_EXECUTABLE" "cmake" ]; - propagatedBuildInputs = [ ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ "SharedMimeInfo" ]; - }; - - kmenuedit = { - buildInputs = [ "ECM" "KF5" "KF5DBusAddons" "KF5I18n" "KF5IconThemes" "KF5KDELibs4Support" "KF5KIO" "KF5Sonnet" "KF5XmlGui" "KHotKeysDBusInterface" "Qt5" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - ksysguard = { - buildInputs = [ "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KDE4Support" "KF5NewStuff" "KF5SysGuard" "Qt5" "Sensors" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kwayland = { - buildInputs = [ "ECM" "Qt5" "Wayland" ]; - nativeBuildInputs = [ "WAYLAND_SCANNER_EXECUTABLE" "cmake" ]; - propagatedBuildInputs = [ "Qt5Gui" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kwin = { - buildInputs = [ "ECM" "EGL" "KF5" "KF5Activities" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5Declarative" "KF5DocTools" "KF5GlobalAccel" "KF5I18n" "KF5Init" "KF5KCMUtils" "KF5KIO" "KF5NewStuff" "KF5Notifications" "KF5Plasma" "KF5Service" "KF5Wayland" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "OpenGL" "OpenGLES" "Qt5" "Qt5Multimedia" "Qt5Test" "Wayland" "X11" "XCB" "XKB" "epoxy" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5Config" "KF5Service" "KF5WindowSystem" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kwrited = { - buildInputs = [ "ECM" "KF5" "KF5DBusAddons" "KF5KDE4Support" "KF5Pty" "Qt5" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - libkscreen = { - buildInputs = [ "Doxygen" "ECM" "Qt5" "X11" "XCB" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "Qt5Core" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - libksysguard = { - buildInputs = [ "ECM" "KF5" "KF5Config" "KF5I18n" "KF5KDE4Support" "KF5Plasma" "Qt5" "Qt5X11Extras" "X11" "ZLIB" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "Qt5DBus" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - libmm-qt = { - buildInputs = [ "ECM" "KF5ModemManagerQt" "ModemManager" "Qt4" "Qt5" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "Qt5Core" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - libnm-qt = { - buildInputs = [ "ECM" "KF5NetworkManagerQt" "NetworkManager" "Qt4" "Qt5" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "Qt5Core" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - milou = { - buildInputs = [ "ECM" "KF5" "KF5Declarative" "KF5I18n" "KF5Plasma" "KF5Runner" "KdepimLibs" "Qt5" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - oxygen = { - buildInputs = [ "ECM" "KDE4" "KDE4Workspace" "KDecorations" "KF5" "KF5Completion" "KF5Config" "KF5FrameworkIntegration" "KF5GuiAddons" "KF5I18n" "KF5Service" "KF5WidgetsAddons" "KF5WindowSystem" "PkgConfig" "Qt5" "XCB" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - oxygen-fonts = { - buildInputs = [ "ECM" ]; - nativeBuildInputs = [ "FONTFORGE_EXECUTABLE" "cmake" ]; - propagatedBuildInputs = [ ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - plasma-desktop = { - buildInputs = [ "ECM" "Fontconfig" "Freetype" "GLIB2" "KDE4" "KDecorations" "KF5" "KF5Activities" "KF5Attica" "KF5Auth" "KF5DocTools" "KF5Emoticons" "KF5I18n" "KF5ItemModels" "KF5KCMUtils" "KF5KDELibs4Support" "KF5NewStuff" "KF5NotifyConfig" "KF5Plasma" "KF5PlasmaQuick" "KF5Runner" "KF5Wallet" "KRunnerAppDBusInterface" "KSMServerDBusInterface" "KWinDBusInterface" "LibKWorkspace" "LibTaskManager" "OpenGL" "OpenGLES" "PackageKitQt5" "Phonon4Qt5" "PulseAudio" "Qt4" "Qt5" "ScreenSaverDBusInterface" "Strigi" "USB" "X11" "XCB" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - plasma-nm = { - buildInputs = [ "ECM" "KF5" "KF5Completion" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5Declarative" "KF5I18n" "KF5IconThemes" "KF5Init" "KF5ItemViews" "KF5KDELibs4Support" "KF5KIO" "KF5ModemManagerQt" "KF5NetworkManagerQt" "KF5Notifications" "KF5Plasma" "KF5Service" "KF5Solid" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "MobileBroadbandProviderInfo" "ModemManager" "NetworkManager" "OpenConnect" "OpenSSL" "Qt5" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - plasma-workspace = { - buildInputs = [ "ECM" "KF5" "KF5Activities" "KF5Baloo" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5Declarative" "KF5DocTools" "KF5I18n" "KF5IdleTime" "KF5JsEmbed" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5NO_MODULE" "KF5NewStuff" "KF5NotifyConfig" "KF5Plasma" "KF5PlasmaQuick" "KF5Runner" "KF5Screen" "KF5Solid" "KF5Su" "KF5SysGuard" "KF5TextEditor" "KF5TextWidgets" "KF5Wallet" "KF5WebKit" "KWinDBusInterface" "Phonon4Qt5" "Prison" "Qalculate" "Qt5" "Qt5DBus" "Qt5Qml" "Qt5Quick" "Qt5Script" "Qt5Test" "X11" "XCB" "ZLIB" "dbusmenu-qt5" "libgps" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5KIO" "KF5SysGuard" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - plasma-workspace-wallpapers = { - buildInputs = [ "ECM" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - powerdevil = { - buildInputs = [ "ECM" "KF5" "KF5Auth" "KF5Config" "KF5GlobalAccel" "KF5I18n" "KF5IdleTime" "KF5KDELibs4Support" "KF5KIO" "KF5NotifyConfig" "KF5Solid" "LibKWorkspace" "Qt5" "ScreenSaverDBusInterface" "UDev" "X11" "XCB" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - systemsettings = { - buildInputs = [ "ECM" "KF5" "KF5Config" "KF5DBusAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KHtml" "KF5KIO" "KF5Service" "KF5WindowSystem" "KF5XmlGui" "Qt5" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - -} diff --git a/pkgs/desktops/plasma-5.1/dependencies.sh b/pkgs/desktops/plasma-5.1/dependencies.sh deleted file mode 100755 index e614efc5475..00000000000 --- a/pkgs/desktops/plasma-5.1/dependencies.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -# This script rebuilds dependencies.nix. -# You must run manifest.sh first to download the packages. - -# Without arguments, this will use the version of autonix-deps-kf5 in nixpkgs. -# If you are working on the packages, this is probably what you want. - -# You can also pass the path to a source tree where you have built -# autonix-deps-kf5 yourself. If you are working on autonix-deps-kf5, this is -# probably what you want. - -manifestXML=$(nix-build -E 'with (import ../../.. {}); autonix.writeManifestXML ./manifest.nix') - -autonixDepsKf5="" -if [[ -z $1 ]]; then - autonixDepsKF5=$(nix-build ../../.. -A haskellngPackages.autonix-deps-kf5)/bin -else - autonixDepsKF5="$1/dist/build/kf5-deps" -fi - -exec ${autonixDepsKF5}/kf5-deps "${manifestXML}" diff --git a/pkgs/desktops/plasma-5.1/kwin/kwin-import-plugin-follow-symlinks.patch b/pkgs/desktops/plasma-5.1/kwin/kwin-import-plugin-follow-symlinks.patch deleted file mode 100644 index fd1f35d717e..00000000000 --- a/pkgs/desktops/plasma-5.1/kwin/kwin-import-plugin-follow-symlinks.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/clients/aurorae/src/aurorae.cpp b/clients/aurorae/src/aurorae.cpp -index 26b44a9..d14e226 100644 ---- a/clients/aurorae/src/aurorae.cpp -+++ b/clients/aurorae/src/aurorae.cpp -@@ -73,7 +73,7 @@ void AuroraeFactory::init() - // so let's try to locate our plugin: - QString pluginPath; - for (const QString &path : m_engine->importPathList()) { -- QDirIterator it(path, QDirIterator::Subdirectories); -+ QDirIterator it(path, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (it.hasNext()) { - it.next(); - QFileInfo fileInfo = it.fileInfo(); diff --git a/pkgs/desktops/plasma-5.1/libkscreen/libkscreen-backend-path.patch b/pkgs/desktops/plasma-5.1/libkscreen/libkscreen-backend-path.patch deleted file mode 100644 index d5797924d23..00000000000 --- a/pkgs/desktops/plasma-5.1/libkscreen/libkscreen-backend-path.patch +++ /dev/null @@ -1,130 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 460022f..422a708 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -1,5 +1,7 @@ - include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${QT_INCLUDES}) - -+configure_file(config-libkscreen.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-libkscreen.h) -+ - set(libkscreen_SRCS - backendloader.cpp - config.cpp -diff --git a/src/backendloader.cpp b/src/backendloader.cpp -index b93e469..8aebc14 100644 ---- a/src/backendloader.cpp -+++ b/src/backendloader.cpp -@@ -16,6 +16,7 @@ - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * - *************************************************************************************/ - -+#include "config-libkscreen.h" - #include "backendloader.h" - #include "debug_p.h" - #include "backends/abstractbackend.h" -@@ -40,55 +41,54 @@ bool BackendLoader::init() - const QString backend = qgetenv("KSCREEN_BACKEND").constData(); - const QString backendFilter = QString::fromLatin1("KSC_%1*").arg(backend); - -- const QStringList paths = QCoreApplication::libraryPaths(); -- Q_FOREACH (const QString &path, paths) { -- const QDir dir(path + QDir::separator() + QLatin1String("/kf5/kscreen/"), -- backendFilter, -- QDir::SortFlags(QDir::QDir::NoSort), -- QDir::NoDotAndDotDot | QDir::Files); -- const QFileInfoList finfos = dir.entryInfoList(); -- Q_FOREACH (const QFileInfo &finfo, finfos) { -- // Skip "Fake" backend unless explicitly specified via KSCREEN_BACKEND -- if (backend.isEmpty() && finfo.fileName().contains(QLatin1String("KSC_Fake"))) { -- continue; -- } -+ QString path = QFile::decodeName(CMAKE_INSTALL_PREFIX "/" PLUGIN_INSTALL_DIR "/"); - -- // When on X11, skip the QScreen backend, instead use the XRandR backend, -- // if not specified in KSCREEN_BACKEND -- if (backend.isEmpty() && -- finfo.fileName().contains(QLatin1String("KSC_QScreen")) && -- QX11Info::isPlatformX11()) { -- continue; -- } -+ const QDir dir(path + QDir::separator() + QLatin1String("/kf5/kscreen/"), -+ backendFilter, -+ QDir::SortFlags(QDir::QDir::NoSort), -+ QDir::NoDotAndDotDot | QDir::Files); -+ const QFileInfoList finfos = dir.entryInfoList(); -+ Q_FOREACH (const QFileInfo &finfo, finfos) { -+ // Skip "Fake" backend unless explicitly specified via KSCREEN_BACKEND -+ if (backend.isEmpty() && finfo.fileName().contains(QLatin1String("KSC_Fake"))) { -+ continue; -+ } - -- // When not on X11, skip the XRandR backend, and fall back to QSCreen -- // if not specified in KSCREEN_BACKEND -- if (backend.isEmpty() && -- finfo.fileName().contains(QLatin1String("KSC_XRandR")) && -- !QX11Info::isPlatformX11()) { -- continue; -- } -+ // When on X11, skip the QScreen backend, instead use the XRandR backend, -+ // if not specified in KSCREEN_BACKEND -+ if (backend.isEmpty() && -+ finfo.fileName().contains(QLatin1String("KSC_QScreen")) && -+ QX11Info::isPlatformX11()) { -+ continue; -+ } -+ -+ // When not on X11, skip the XRandR backend, and fall back to QSCreen -+ // if not specified in KSCREEN_BACKEND -+ if (backend.isEmpty() && -+ finfo.fileName().contains(QLatin1String("KSC_XRandR")) && -+ !QX11Info::isPlatformX11()) { -+ continue; -+ } - -- QPluginLoader loader(finfo.filePath()); -- loader.load(); -- QObject *instance = loader.instance(); -- if (!instance) { -+ QPluginLoader loader(finfo.filePath()); -+ loader.load(); -+ QObject *instance = loader.instance(); -+ if (!instance) { -+ loader.unload(); -+ continue; -+ } -+ -+ s_backend = qobject_cast< AbstractBackend* >(instance); -+ if (s_backend) { -+ if (!s_backend->isValid()) { -+ qCDebug(KSCREEN) << "Skipping" << s_backend->name() << "backend"; -+ delete s_backend; -+ s_backend = 0; - loader.unload(); - continue; - } -- -- s_backend = qobject_cast< AbstractBackend* >(instance); -- if (s_backend) { -- if (!s_backend->isValid()) { -- qCDebug(KSCREEN) << "Skipping" << s_backend->name() << "backend"; -- delete s_backend; -- s_backend = 0; -- loader.unload(); -- continue; -- } -- qCDebug(KSCREEN) << "Loading" << s_backend->name() << "backend"; -- return true; -- } -+ qCDebug(KSCREEN) << "Loading" << s_backend->name() << "backend"; -+ return true; - } - } - -diff --git a/src/config-libkscreen.h.cmake b/src/config-libkscreen.h.cmake -new file mode 100644 -index 0000000..a99f3d1 ---- /dev/null -+++ b/src/config-libkscreen.h.cmake -@@ -0,0 +1,2 @@ -+#define CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" -+#define PLUGIN_INSTALL_DIR "${PLUGIN_INSTALL_DIR}" diff --git a/pkgs/desktops/plasma-5.1/manifest.nix b/pkgs/desktops/plasma-5.1/manifest.nix deleted file mode 100644 index 20290d0bd07..00000000000 --- a/pkgs/desktops/plasma-5.1/manifest.nix +++ /dev/null @@ -1,166 +0,0 @@ -# This file is generated automatically. DO NOT EDIT! -{ mirror }: -[ - { - url = "${mirror}/stable/plasma/5.1.2/kwayland-5.1.2.tar.xz"; - sha256 = "0v57gdbhbqq9nm8y6f8xlwwsfib8v8wbh32bb38aa22wkcqbnqh5"; - name = "kwayland-5.1.2.tar.xz"; - store = "/nix/store/r4bjs61x7ad3ff1iy4j111japxzn8gdm-kwayland-5.1.2.tar.xz"; - } - { - url = "${mirror}/stable/plasma/5.1.2/milou-5.1.2.tar.xz"; - sha256 = "0dawmwzdxb289gblnbxw4ryqj45c1rmws7mm0cmqlnxh2ykysska"; - name = "milou-5.1.2.tar.xz"; - store = "/nix/store/d90rryiyw3haw0mlcxzs57b0vsmq2c3g-milou-5.1.2.tar.xz"; - } - { - url = "${mirror}/stable/plasma/5.1.2/plasma-workspace-5.1.2.tar.xz"; - sha256 = "03gwkikxmmbiglyf2cbhm79wri1vfsibpr0qsyydcnqf2bja4adk"; - name = "plasma-workspace-5.1.2.tar.xz"; - store = "/nix/store/9b2pcs64kvdnb0mf7g1gyjgygi8pfrk1-plasma-workspace-5.1.2.tar.xz"; - } - { - url = "${mirror}/stable/plasma/5.1.2/kdeplasma-addons-5.1.2.tar.xz"; - sha256 = "0jfrnvrn4x5cjd3yp21sr53rddcaxw3l05xkcq99lb29jx7x831f"; - name = "kdeplasma-addons-5.1.2.tar.xz"; - store = "/nix/store/9f7154m5aq35lfwj6rfq7ra4c2b0xs4r-kdeplasma-addons-5.1.2.tar.xz"; - } - { - url = "${mirror}/stable/plasma/5.1.2/khotkeys-5.1.2.tar.xz"; - sha256 = "0kyjvrfpf8zqv8milbzdj0y6i37413qmvdhkxy2phqwrnwj4x69q"; - name = "khotkeys-5.1.2.tar.xz"; - store = "/nix/store/lq1v4haiag93w5g6pqwp5r9w8n3xvh1n-khotkeys-5.1.2.tar.xz"; - } - { - url = "${mirror}/stable/plasma/5.1.2/kde-cli-tools-5.1.2.tar.xz"; - sha256 = "1akgj042i52b6mzd0lq8xgrqnwi63wc7k82g8r4kfy8611vxw6wb"; - name = "kde-cli-tools-5.1.2.tar.xz"; - store = "/nix/store/byjdh6cmqimk3i314h3y57s2z3nvpfnw-kde-cli-tools-5.1.2.tar.xz"; - } - { - url = "${mirror}/stable/plasma/5.1.2/libnm-qt-5.1.2.tar.xz"; - sha256 = "1gm3yjlb5iq2l0rm8wqg0hs1f66ca5j8zvw6rrn3z4f2hsw9b8vm"; - name = "libnm-qt-5.1.2.tar.xz"; - store = "/nix/store/yx6jhazzb32580ax7dw4jdzncj1lpx4a-libnm-qt-5.1.2.tar.xz"; - } - { - url = "${mirror}/stable/plasma/5.1.2/oxygen-fonts-5.1.2.tar.xz"; - sha256 = "05f06fsgp6xjv5azs546cq5653k3cyyidbdkggf20yrwlybypg2w"; - name = "oxygen-fonts-5.1.2.tar.xz"; - store = "/nix/store/ppzbxx7vkpymjgvi3skrch2dlx3mwhjg-oxygen-fonts-5.1.2.tar.xz"; - } - { - url = "${mirror}/stable/plasma/5.1.2/khelpcenter-5.1.2.tar.xz"; - sha256 = "0fgwabsvbg4xzzli8k28hqw6rw5wzmp77fpb7qxiaks2qxd6xfvl"; - name = "khelpcenter-5.1.2.tar.xz"; - store = "/nix/store/nq86gdfz5fgkxcndk4knnb3n59y9b17x-khelpcenter-5.1.2.tar.xz"; - } - { - url = "${mirror}/stable/plasma/5.1.2/kmenuedit-5.1.2.tar.xz"; - sha256 = "1f09m8ki1qib0rfvbkd1nqszq5mglc802rz9b7s9hfi0n5la05cj"; - name = "kmenuedit-5.1.2.tar.xz"; - store = "/nix/store/8l7agrg12ghva4103iwm1xdzhqk3iwxp-kmenuedit-5.1.2.tar.xz"; - } - { - url = "${mirror}/stable/plasma/5.1.2/kinfocenter-5.1.2.tar.xz"; - sha256 = "1yp08z0sirm1i21ix27c72l1pygndrh4gnb5rl4r6rj0rymy4xn0"; - name = "kinfocenter-5.1.2.tar.xz"; - store = "/nix/store/jl3s4kimn0xamxc4yhc1jsrz9j0cmws1-kinfocenter-5.1.2.tar.xz"; - } - { - url = "${mirror}/stable/plasma/5.1.2/kwrited-5.1.2.tar.xz"; - sha256 = "0bsm3dkl1zi1h16cd1pc9qcbv2jpjpzcw7m6cg9gbk7icjymn065"; - name = "kwrited-5.1.2.tar.xz"; - store = "/nix/store/ishi0y744yapvf2yf0hm5gam3z5j2687-kwrited-5.1.2.tar.xz"; - } - { - url = "${mirror}/stable/plasma/5.1.2/kio-extras-5.1.2.tar.xz"; - sha256 = "0d4yyssiddcabrfr94ylf4p2f7l5mpg353m67w2x4rdlc7bgc00z"; - name = "kio-extras-5.1.2.tar.xz"; - store = "/nix/store/6pqx9daq9bx7in8dghy041vfn5x829g2-kio-extras-5.1.2.tar.xz"; - } - { - url = "${mirror}/stable/plasma/5.1.2/systemsettings-5.1.2.tar.xz"; - sha256 = "102s7l1xaxqzsswzcsr6qx2mizi1fw85ickj8sm4ql493m3iy0vy"; - name = "systemsettings-5.1.2.tar.xz"; - store = "/nix/store/c56khxzyh8gzi5nxy8i3n2vlwbsmblsz-systemsettings-5.1.2.tar.xz"; - } - { - url = "${mirror}/stable/plasma/5.1.2/powerdevil-5.1.2.tar.xz"; - sha256 = "0bq042phd1rv42qf21672l74mlygzvqknqd0vhfay7lz5hihd3np"; - name = "powerdevil-5.1.2.tar.xz"; - store = "/nix/store/5p6j6949gv1s03cm1yn1v0i18clma3cw-powerdevil-5.1.2.tar.xz"; - } - { - url = "${mirror}/stable/plasma/5.1.2/plasma-desktop-5.1.2.tar.xz"; - sha256 = "0nn1fcb8b4cmh6wzfar7dzmc6r830n6nq78icsbqkl2yi631vmv7"; - name = "plasma-desktop-5.1.2.tar.xz"; - store = "/nix/store/nnk00ddkr0rqbmk6i1q17wimvb6n79m6-plasma-desktop-5.1.2.tar.xz"; - } - { - url = "${mirror}/stable/plasma/5.1.2/libmm-qt-5.1.2.tar.xz"; - sha256 = "1jx3zq5j7dm27k74ayibg0d82f7nm7r40mj92sk0drgzaj0q2wv4"; - name = "libmm-qt-5.1.2.tar.xz"; - store = "/nix/store/z3f23bansr6yqvc8pwcavwy828ykf85z-libmm-qt-5.1.2.tar.xz"; - } - { - url = "${mirror}/stable/plasma/5.1.2/breeze-5.1.2.tar.xz"; - sha256 = "1c7bfr2zdhh84bik5ksyfxvng8c23slasf6lbr86f0mmvwssqhc4"; - name = "breeze-5.1.2.tar.xz"; - store = "/nix/store/h0ra9f62jj3lqsg5hhqsb8cq05fqaq0c-breeze-5.1.2.tar.xz"; - } - { - url = "${mirror}/stable/plasma/5.1.2/ksysguard-5.1.2.tar.xz"; - sha256 = "03bngwq0dpgffcr7dkzk44n995kcawk1fgxf38zkik4qrr2m8xmz"; - name = "ksysguard-5.1.2.tar.xz"; - store = "/nix/store/vrgl460m4h0bzwhakgkj9sddn2pr6057-ksysguard-5.1.2.tar.xz"; - } - { - url = "${mirror}/stable/plasma/5.1.2/kwin-5.1.2.tar.xz"; - sha256 = "1sjb9w8yaicypjdlcnn6a8zaa03fmgn9bsbbr1xfh3kcjm0p2hjf"; - name = "kwin-5.1.2.tar.xz"; - store = "/nix/store/0lcmq4bl3kc48gcps703bby99z0zdl7q-kwin-5.1.2.tar.xz"; - } - { - url = "${mirror}/stable/plasma/5.1.2/oxygen-5.1.2.tar.xz"; - sha256 = "0dwlqc57qwp09bbmknakjndqgajfp948kri8ysakj50qbfzq22ly"; - name = "oxygen-5.1.2.tar.xz"; - store = "/nix/store/al4whqd4gdnyym26kd2yp3c1slyll0bw-oxygen-5.1.2.tar.xz"; - } - { - url = "${mirror}/stable/plasma/5.1.2/libkscreen-5.1.2.tar.xz"; - sha256 = "1kbs042anmc8mifmbxwi7sw0n74kcpf5hpbld5a7nclhm0xpyzb9"; - name = "libkscreen-5.1.2.tar.xz"; - store = "/nix/store/rkmydih2fss2gm84j8rgpd3ybz7pyz5p-libkscreen-5.1.2.tar.xz"; - } - { - url = "${mirror}/stable/plasma/5.1.2/libksysguard-5.1.2.tar.xz"; - sha256 = "061jjqh6i70g5f8qh47znk295wh1j7z3i9imppdlxhymm2sdix5k"; - name = "libksysguard-5.1.2.tar.xz"; - store = "/nix/store/dyipim22aisn9cnk3d9431bi393qsi38-libksysguard-5.1.2.tar.xz"; - } - { - url = "${mirror}/stable/plasma/5.1.2/plasma-workspace-wallpapers-5.1.2.tar.xz"; - sha256 = "18my7r17b6c0wm545knpy68bcgawmr6x1h383br1a3jrahb9smfx"; - name = "plasma-workspace-wallpapers-5.1.2.tar.xz"; - store = "/nix/store/inqv621x6l2yz1kj71d824kc0labpss7-plasma-workspace-wallpapers-5.1.2.tar.xz"; - } - { - url = "${mirror}/stable/plasma/5.1.2/kfilemetadata-5.1.2.tar.xz"; - sha256 = "0ssz2v9dm09ig20m5c2gcgi0dhkbijs7580j75kyabcyxyq33gdi"; - name = "kfilemetadata-5.1.2.tar.xz"; - store = "/nix/store/84jqp15fclxia88dmbr2zpq50m6xzwib-kfilemetadata-5.1.2.tar.xz"; - } - { - url = "${mirror}/stable/plasma/5.1.2/plasma-nm-5.1.2.tar.xz"; - sha256 = "1ifwjbzdjsfcq2vbq58fnx1r8m11wbmcwchnn7ihabbcgj5admp7"; - name = "plasma-nm-5.1.2.tar.xz"; - store = "/nix/store/2czga7b7i36841rs4mnfzd7j7s3rfanv-plasma-nm-5.1.2.tar.xz"; - } - { - url = "${mirror}/stable/plasma/5.1.2/baloo-5.1.2.tar.xz"; - sha256 = "1ynd3amry3wjk8sjlb5knpvjshn0gvs2m1gpbr7r7528ckkv0gpv"; - name = "baloo-5.1.2.tar.xz"; - store = "/nix/store/lcrrxz5yjf88cgifz3zjcq5skdp4jxkk-baloo-5.1.2.tar.xz"; - } -] diff --git a/pkgs/desktops/plasma-5.1/manifest.sh b/pkgs/desktops/plasma-5.1/manifest.sh deleted file mode 100755 index 5191f4f7d87..00000000000 --- a/pkgs/desktops/plasma-5.1/manifest.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -if [ $# -eq 0 ]; then - - # The extra slash at the end of the URL is necessary to stop wget - # from recursing over the whole server! (No, it's not a bug.) - $(nix-build ../../.. -A autonix.manifest) \ - http://download.kde.org/stable/plasma/5.1.2/ \ - -A '*.tar.xz' - -else - - $(nix-build ../../.. -A autonix.manifest) -A '*.tar.xz' "$@" - -fi diff --git a/pkgs/desktops/plasma-5.1/plasma-desktop/plasma-desktop-hwclock.patch b/pkgs/desktops/plasma-5.1/plasma-desktop/plasma-desktop-hwclock.patch deleted file mode 100644 index 53bd43d38e2..00000000000 --- a/pkgs/desktops/plasma-5.1/plasma-desktop/plasma-desktop-hwclock.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/kcms/dateandtime/helper.cpp b/kcms/dateandtime/helper.cpp -index cec5ab8..fc4a6b9 100644 ---- a/kcms/dateandtime/helper.cpp -+++ b/kcms/dateandtime/helper.cpp -@@ -48,10 +48,6 @@ - #include - #endif - --// We cannot rely on the $PATH environment variable, because D-Bus activation --// clears it. So we have to use a reasonable default. --static const QString exePath = QLatin1String("/usr/sbin:/usr/bin:/sbin:/bin"); -- - int ClockHelper::ntp( const QStringList& ntpServers, bool ntpEnabled ) - { - int ret = 0; -@@ -227,7 +223,7 @@ int ClockHelper::tzreset() - - void ClockHelper::toHwclock() - { -- QString hwclock = KStandardDirs::findExe("hwclock", exePath); -+ QString hwclock = "@hwclock@"; - if (!hwclock.isEmpty()) { - KProcess::execute(hwclock, QStringList() << "--systohc"); - } diff --git a/pkgs/desktops/plasma-5.1/plasma-desktop/plasma-desktop-zoneinfo.patch b/pkgs/desktops/plasma-5.1/plasma-desktop/plasma-desktop-zoneinfo.patch deleted file mode 100644 index e924207054d..00000000000 --- a/pkgs/desktops/plasma-5.1/plasma-desktop/plasma-desktop-zoneinfo.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/kcms/dateandtime/helper.cpp b/kcms/dateandtime/helper.cpp -index fc4a6b9..7b64d05 100644 ---- a/kcms/dateandtime/helper.cpp -+++ b/kcms/dateandtime/helper.cpp -@@ -181,7 +181,12 @@ int ClockHelper::tz( const QString& selectedzone ) - - val = selectedzone; - #else -- QString tz = "/usr/share/zoneinfo/" + selectedzone; -+ // NixOS-specific path -+ QString tz = "/etc/zoneinfo/" + selectedzone; -+ if (!QFile::exists(tz)) { -+ // Standard Linux path -+ tz = "/usr/share/zoneinfo/" + selectedzone; -+ } - - if (QFile::exists(tz)) { // make sure the new TZ really exists - QFile::remove("/etc/localtime"); diff --git a/pkgs/desktops/plasma-5.1/renames.nix b/pkgs/desktops/plasma-5.1/renames.nix deleted file mode 100644 index be50cacdc18..00000000000 --- a/pkgs/desktops/plasma-5.1/renames.nix +++ /dev/null @@ -1,24 +0,0 @@ -# DO NOT EDIT! This file is generated automatically. -{ }: -{ -"Backend" = "powerdevil"; -"CTest" = "kdeplasma-addons"; -"ECM" = "extra-cmake-modules"; -"KDecorations" = "kwin"; -"KF5Baloo" = "baloo"; -"KF5FileMetaData" = "kfilemetadata"; -"KF5ModemManagerQt" = "libmm-qt"; -"KF5NetworkManagerQt" = "libnm-qt"; -"KF5Screen" = "libkscreen"; -"KF5SysGuard" = "libksysguard"; -"KF5Wayland" = "kwayland"; -"KF5XmlRpcClientPrivate" = "plasma-workspace"; -"KHotKeysDBusInterface" = "khotkeys"; -"KRunnerAppDBusInterface" = "plasma-workspace"; -"KSMServerDBusInterface" = "plasma-workspace"; -"KWinDBusInterface" = "kwin"; -"LibKWorkspace" = "plasma-workspace"; -"LibTaskManager" = "plasma-workspace"; -"OxygenFont" = "oxygen-fonts"; -"ScreenSaverDBusInterface" = "plasma-workspace"; -} diff --git a/pkgs/desktops/plasma-5.1/setup-hook.sh b/pkgs/desktops/plasma-5.1/setup-hook.sh deleted file mode 100644 index a8d9b7e0e36..00000000000 --- a/pkgs/desktops/plasma-5.1/setup-hook.sh +++ /dev/null @@ -1 +0,0 @@ -addToSearchPath XDG_DATA_DIRS @out@/share diff --git a/pkgs/desktops/plasma-5.1/startkde/default.nix b/pkgs/desktops/plasma-5.1/startkde/default.nix deleted file mode 100644 index 6337769e1aa..00000000000 --- a/pkgs/desktops/plasma-5.1/startkde/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -# We provide our own version of the startkde script in its entirety, rather than -# patching the version provided by kde-workspace, because it requires such -# extensive patching. - -{ stdenv, bash, dbus, gnused, gnugrep, kconfig, kinit, kservice, plasma-desktop -, plasma-workspace, qt5, socat, xorg }: - -let startkde = ./startkde.in; in - -stdenv.mkDerivation { - name = "startkde-0.1"; - phases = "installPhase"; - - inherit bash gnused gnugrep kconfig kinit kservice qt5 socat; - inherit (xorg) mkfontdir xmessage xprop xrdb xset xsetroot; - dbus_tools = dbus.tools; - plasmaWorkspace = plasma-workspace; - plasmaDesktop = plasma-desktop; - startupconfigkeys = ./startupconfigkeys; - kdeglobals = ./kdeglobals; - - installPhase = '' - mkdir -p $out/bin - substituteAll ${startkde} $out/bin/startkde - chmod +x $out/bin/startkde - ''; - - meta = { - description = "Custom startkde script for Nixpkgs"; - maintainers = with stdenv.lib.maintainers; [ ttuegel ]; - license = with stdenv.lib.licenses; [ gpl2Plus ]; - }; -} diff --git a/pkgs/desktops/plasma-5.1/startkde/kdeglobals b/pkgs/desktops/plasma-5.1/startkde/kdeglobals deleted file mode 100644 index bfa610712ed..00000000000 --- a/pkgs/desktops/plasma-5.1/startkde/kdeglobals +++ /dev/null @@ -1,11 +0,0 @@ -[General] -XftAntialias=true -XftHintStyle=hintmedium -XftSubPixel=none -desktopFont=Oxygen-Sans,10,-1,5,50,0,0,0,0,0 -fixed=Oxygen Mono,9,-1,5,50,0,0,0,0,0 -font=Oxygen-Sans,10,-1,5,50,0,0,0,0,0 -menuFont=Oxygen-Sans,10,-1,5,50,0,0,0,0,0 -smallestReadableFont=Oxygen-Sans,8,-1,5,50,0,0,0,0,0 -taskbarFont=Oxygen-Sans,10,-1,5,50,0,0,0,0,0 -toolBarFont=Oxygen-Sans,9,-1,5,50,0,0,0,0,0 \ No newline at end of file diff --git a/pkgs/desktops/plasma-5.1/startkde/startkde.in b/pkgs/desktops/plasma-5.1/startkde/startkde.in deleted file mode 100644 index ff67ed769e2..00000000000 --- a/pkgs/desktops/plasma-5.1/startkde/startkde.in +++ /dev/null @@ -1,382 +0,0 @@ -#!@bash@/bin/bash -x -# -# NIXOS KDE STARTUP SCRIPT -# - -# The KDE icon cache is supposed to update itself -# automatically, but it uses the timestamp on the icon -# theme directory as a trigger. Since in Nix the -# timestamp is always the same, this doesn't work. So as -# a workaround, nuke the icon cache on login. This isn't -# perfect, since it may require logging out after -# installing new applications to update the cache. -# See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html -rm -fv $HOME/.cache/icon-cache.kcache - -# Qt writes a weird ‘libraryPath’ line to -# ~/.config/Trolltech.conf that causes the KDE plugin -# paths of previous KDE invocations to be searched. -# Obviously using mismatching KDE libraries is potentially -# disastrous, so here we nuke references to the Nix store -# in Trolltech.conf. A better solution would be to stop -# Qt from doing this wackiness in the first place. -if [ -e $HOME/.config/Trolltech.conf ]; then - @gnused@/bin/sed -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf -fi - -if test "x$1" = x--failsafe; then - KDE_FAILSAFE=1 # General failsafe flag - KWIN_COMPOSE=N # Disable KWin's compositing - export KWIN_COMPOSE KDE_FAILSAFE -fi - -# When the X server dies we get a HUP signal from xinit. We must ignore it -# because we still need to do some cleanup. -trap 'echo GOT SIGHUP' HUP - -# we have to unset this for Darwin since it will screw up KDE's dynamic-loading -unset DYLD_FORCE_FLAT_NAMESPACE - -# Check if a KDE session already is running and whether it's possible to connect to X -@plasmaWorkspace@/bin/kcheckrunning -kcheckrunning_result=$? -if test $kcheckrunning_result -eq 0 ; then - @xmessage@/bin/xmessage -geometry 500x100 "KDE seems to be already running on this display." - exit 1 -elif test $kcheckrunning_result -eq 2 ; then - echo "\$DISPLAY is not set or cannot connect to the X server." - exit 1 -fi - -# Boot sequence: -# -# kdeinit is used to fork off processes which improves memory usage -# and startup time. -# -# * kdeinit starts klauncher first. -# * Then kded is started. kded is responsible for keeping the sycoca -# database up to date. When an up to date database is present it goes -# into the background and the startup continues. -# * Then kdeinit starts kcminit. kcminit performs initialisation of -# certain devices according to the user's settings -# -# * Then ksmserver is started which takes control of the rest of the startup sequence - -# We need to create config folder so we can write startupconfigkeys -if [ ${XDG_CONFIG_HOME} ]; then - configDir=$XDG_CONFIG_HOME; -else - # This is the default - # http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html - configDir=${HOME}/.config; -fi - -mkdir -p $configDir - -# This is basically setting defaults so we can use them with kstartupconfig5 -cat @startupconfigkeys@ >$configDir/startupconfigkeys - -# preload the user's locale on first start -plasmalocalerc=$configDir/plasma-localerc -test -f $plasmalocalerc || { -cat >$plasmalocalerc <$kdeglobalsfile - -@plasmaWorkspace@/bin/kstartupconfig5 -returncode=$? -if test $returncode -ne 0; then - @xmessage@/bin/xmessage -geometry 500x100 "kstartupconfig5 exited with $returncode" - exit 1 -fi -[ -r $configDir/startupconfig ] && . $configDir/startupconfig - -XCURSOR_PATH=~/.icons:$(echo "$XDG_DATA_DIRS" | tr ":" "\n" | @gnused@/bin/sed 's,$,/icons,g' | tr "\n" ":") -export XCURSOR_PATH - -# XCursor mouse theme needs to be applied here to work even for kded or ksmserver -if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then - - @plasmaDesktop@/bin/kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize" - if test $? -eq 10; then - XCURSOR_THEME=default - export XCURSOR_THEME - elif test -n "$kcminputrc_mouse_cursortheme"; then - XCURSOR_THEME="$kcminputrc_mouse_cursortheme" - export XCURSOR_THEME - fi - if test -n "$kcminputrc_mouse_cursorsize"; then - XCURSOR_SIZE="$kcminputrc_mouse_cursorsize" - export XCURSOR_SIZE - fi -fi - -# Set a left cursor instead of the standard X11 "X" cursor, since I've heard -# from some users that they're confused and don't know what to do. This is -# especially necessary on slow machines, where starting KDE takes one or two -# minutes until anything appears on the screen. -# -# If the user has overwritten fonts, the cursor font may be different now -# so don't move this up. -# -@xsetroot@/bin/xsetroot -cursor_name left_ptr - -dl=$DESKTOP_LOCKED -unset DESKTOP_LOCKED # Don't want it in the environment - -# Make sure that D-Bus is running -# D-Bus autolaunch is broken -if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then - eval `@dbus_tools@/bin/dbus-launch --sh-syntax --exit-with-session` -fi -if @qt5@/bin/qdbus >/dev/null 2>/dev/null; then - : # ok -else - echo 'startkde: Could not start D-Bus. Can you call qdbus?' 1>&2 - test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null - @xmessage@/bin/xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus?" - exit 1 -fi - -ksplash_pid= -if test -z "$dl"; then - # the splashscreen and progress indicator - case "$ksplashrc_ksplash_engine" in - KSplashQML) - ksplash_pid=`@plasmaWorkspace@/bin/ksplashqml "${ksplashrc_ksplash_theme}" --pid` - ;; - None) - ;; - *) - ;; - esac -fi - -# Source scripts found in /plasma-workspace/env/*.sh -# (where correspond to the system and user's configuration -# directories, as identified by Qt's qtpaths, e.g. $HOME/.config -# and /etc/xdg/ on Linux) -# -# This is where you can define environment variables that will be available to -# all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent` -# or eval `gpg-agent --daemon`. -# Note: if you do that, you should also put "ssh-agent -k" as a shutdown script -# -# (see end of this file). -# For anything else (that doesn't set env vars, or that needs a window manager), -# better use the Autostart folder. - -# TODO: Use GenericConfigLocation once we depend on Qt 5.4 -scriptpath=`@qt5@/bin/qtpaths --paths ConfigLocation | tr ':' '\n' | @gnused@/bin/sed 's,$,/plasma-workspace,g'` - -# Add /env/ to the directory to locate the scripts to be sourced -for prefix in `echo $scriptpath`; do - for file in "$prefix"/env/*.sh; do - test -r "$file" && . "$file" - done -done - -# Set the path for Qt plugins provided by KDE -QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`@qt5@/bin/qtpaths --plugin-dir` -# TODO: Do we really need this? -QT_PLUGIN_PATH=$QT_PLUGIN_PATH:$kdehome/lib/kde5/plugins/ -export QT_PLUGIN_PATH - -# Activate the kde font directories. -# -# There are 4 directories that may be used for supplying fonts for KDE. -# -# There are two system directories. These belong to the administrator. -# There are two user directories, where the user may add her own fonts. -# -# The 'override' versions are for fonts that should come first in the list, -# i.e. if you have a font in your 'override' directory, it will be used in -# preference to any other. -# -# The preference order looks like this: -# user override, system override, X, user, system -# -# Where X is the original font database that was set up before this script -# runs. - -usr_odir=$HOME/.fonts/kde-override -usr_fdir=$HOME/.fonts - -if test -n "$KDEDIRS"; then - kdedirs_first=`echo "$KDEDIRS" | @gnused@/bin/sed -e 's/:.*//'` - sys_odir=$kdedirs_first/share/fonts/override - sys_fdir=$kdedirs_first/share/fonts -else - sys_odir=$KDEDIR/share/fonts/override - sys_fdir=$KDEDIR/share/fonts -fi - -# We run mkfontdir on the user's font dirs (if we have permission) to pick -# up any new fonts they may have installed. If mkfontdir fails, we still -# add the user's dirs to the font path, as they might simply have been made -# read-only by the administrator, for whatever reason. - -test -d "$sys_odir" && @xset@/bin/xset +fp "$sys_odir" -test -d "$usr_odir" && ( @mkfontdir@/bin/mkfontdir "$usr_odir" ; @xset@/bin/xset +fp "$usr_odir" ) -test -d "$usr_fdir" && ( @mkfontdir@/bin/mkfontdir "$usr_fdir" ; @xset@/bin/xset fp+ "$usr_fdir" ) -test -d "$sys_fdir" && @xset@/bin/xset fp+ "$sys_fdir" - -# Ask X11 to rebuild its font list. -@xset@/bin/xset fp rehash - -# Get Ghostscript to look into user's KDE fonts dir for additional Fontmap -if test -n "$GS_LIB" ; then - GS_LIB=$usr_fdir:$GS_LIB - export GS_LIB -else - GS_LIB=$usr_fdir - export GS_LIB -fi - -echo 'startkde: Starting up...' 1>&2 - - -# Mark that full KDE session is running (e.g. Konqueror preloading works only -# with full KDE running). The KDE_FULL_SESSION property can be detected by -# any X client connected to the same X session, even if not launched -# directly from the KDE session but e.g. using "ssh -X", kdesu. $KDE_FULL_SESSION -# however guarantees that the application is launched in the same environment -# like the KDE session and that e.g. KDE utilities/libraries are available. -# KDE_FULL_SESSION property is also only available since KDE 3.5.5. -# The matching tests are: -# For $KDE_FULL_SESSION: -# if test -n "$KDE_FULL_SESSION"; then ... whatever -# For KDE_FULL_SESSION property: -# xprop -root | grep "^KDE_FULL_SESSION" >/dev/null 2>/dev/null -# if test $? -eq 0; then ... whatever -# -# Additionally there is (since KDE 3.5.7) $KDE_SESSION_UID with the uid -# of the user running the KDE session. It should be rarely needed (e.g. -# after sudo to prevent desktop-wide functionality in the new user's kded). -# -# Since KDE4 there is also KDE_SESSION_VERSION, containing the major version number. -# Note that this didn't exist in KDE3, which can be detected by its absense and -# the presence of KDE_FULL_SESSION. -# -KDE_FULL_SESSION=true -export KDE_FULL_SESSION -@xprop@/bin/xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true - -KDE_SESSION_VERSION=5 -export KDE_SESSION_VERSION -@xprop@/bin/xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5 - -KDE_SESSION_UID=`id -ru` -export KDE_SESSION_UID - -XDG_CURRENT_DESKTOP=KDE -export XDG_CURRENT_DESKTOP - -# At this point all the environment is ready, let's send it to kwalletd if running -if test -n "$PAM_KWALLET_LOGIN" ; then - env | @socat@/bin/socat STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN -fi - -# At this point all environment variables are set, let's send it to the DBus -# session server to update the activation environment -@plasmaWorkspace@/lib/libexec/ksyncdbusenv -if test $? -ne 0; then - # Startup error - echo 'startkde: Could not sync environment to dbus.' 1>&2 - test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null - @xmessage@/bin/xmessage -geometry 500x100 "Could not sync environment to dbus." - exit 1 -fi - -# We set LD_BIND_NOW to increase the efficiency of kdeinit. -# kdeinit unsets this variable before loading applications. -LD_BIND_NOW=true @kinit@/lib/libexec/kf5/start_kdeinit_wrapper --kded +kcminit_startup -if test $? -ne 0; then - # Startup error - echo 'startkde: Could not start kdeinit5.' 1>&2 - test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null - @xmessage@/bin/xmessage -geometry 500x100 "Could not start kdeinit5." - exit 1 -fi - -# (NixOS) We run kbuildsycoca5 before starting the user session because things -# may be missing or moved if they have run nixos-rebuild and it may not be -# possible for them to start Konsole to run it manually! -@kservice@/bin/kbuildsycoca5 - -# finally, give the session control to the session manager -# see kdebase/ksmserver for the description of the rest of the startup sequence -# if the KDEWM environment variable has been set, then it will be used as KDE's -# window manager instead of kwin. -# if KDEWM is not set, ksmserver will ensure kwin is started. -# kwrapper5 is used to reduce startup time and memory usage -# kwrapper5 does not return useful error codes such as the exit code of ksmserver. -# We only check for 255 which means that the ksmserver process could not be -# started, any problems thereafter, e.g. ksmserver failing to initialize, -# will remain undetected. -test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM" -# If the session should be locked from the start (locked autologin), -# lock now and do the rest of the KDE startup underneath the locker. -KSMSERVEROPTIONS="" -test -n "$dl" && KSMSERVEROPTIONS=" --lockscreen" -@kinit@/bin/kwrapper5 @plasmaWorkspace@/bin/ksmserver $KDEWM $KSMSERVEROPTIONS -if test $? -eq 255; then - # Startup error - echo 'startkde: Could not start ksmserver.' 1>&2 - test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null - @xmessage@/bin/xmessage -geometry 500x100 "Could not start ksmserver." -fi - -wait_drkonqi=`@kconfig@/bin/kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true` - -if test x"$wait_drkonqi"x = x"true"x ; then - # wait for remaining drkonqi instances with timeout (in seconds) - wait_drkonqi_timeout=`@kconfig@/bin/kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900` - wait_drkonqi_counter=0 - while @qt5@/bin/qdbus | @gnugrep@/bin/grep "^[^w]*org.kde.drkonqi" > /dev/null ; do - sleep 5 - wait_drkonqi_counter=$((wait_drkonqi_counter+5)) - if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then - # ask remaining drkonqis to die in a graceful way - @qt5@/bin/qdbus | @gnugrep@/bin/grep 'org.kde.drkonqi-' | while read address ; do - @qt5@/bin/qdbus "$address" "/MainApplication" "quit" - done - break - fi - done -fi - -echo 'startkde: Shutting down...' 1>&2 -# just in case -test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null - -# Clean up -@kinit@/bin/kdeinit5_shutdown - -echo 'startkde: Running shutdown scripts...' 1>&2 - -# Run scripts found in /plasma-workspace/shutdown -for prefix in `echo "$scriptpath"`; do - for file in `ls "$prefix"/shutdown 2> /dev/null | @gnugrep@/bin/egrep -v '(~|\.bak)$'`; do - test -x "$prefix$file" && "$prefix$file" - done -done - -unset KDE_FULL_SESSION -@xprop@/bin/xprop -root -remove KDE_FULL_SESSION -unset KDE_SESSION_VERSION -@xprop@/bin/xprop -root -remove KDE_SESSION_VERSION -unset KDE_SESSION_UID - -echo 'startkde: Done.' 1>&2 diff --git a/pkgs/desktops/plasma-5.1/startkde/startupconfigkeys b/pkgs/desktops/plasma-5.1/startkde/startupconfigkeys deleted file mode 100644 index 0fc92cff8a5..00000000000 --- a/pkgs/desktops/plasma-5.1/startkde/startupconfigkeys +++ /dev/null @@ -1,5 +0,0 @@ -kcminputrc Mouse cursorTheme 'breeze_cursors' -kcminputrc Mouse cursorSize '' -ksplashrc KSplash Theme Breeze -ksplashrc KSplash Engine KSplashQML -kcmfonts General forceFontDPI 0 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 766d2a3a3cc..272d6b159b5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12739,14 +12739,12 @@ let mate-themes = callPackage ../misc/themes/mate-themes { }; - plasma51 = recurseIntoAttrs (callPackage ../desktops/plasma-5.1 { - stdenv = overrideCC stdenv gccStdInc; }); plasma52 = recurseIntoAttrs (callPackage ../desktops/plasma-5.2 {}); plasma5_latest = plasma52; - plasma5_stable = plasma51; + plasma5_stable = plasma52; - kde5 = kf55 // plasma51 // kdeApps_14_12; + kde5 = kf5_stable // plasma5_stable // kdeApps_stable; xfce = xfce4_10; xfce4_10 = recurseIntoAttrs (import ../desktops/xfce { inherit config pkgs newScope; }); From 2e38240c9578c44928bb1cbb5c5106e090267790 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 21 Feb 2015 10:54:12 -0600 Subject: [PATCH 144/197] add qt-5.4 --- .../qt-5/5.4/0001-dlopen-gtkstyle.patch | 63 ++++ .../5.4/0002-dlopen-webkit-nsplugin.patch | 53 +++ .../libraries/qt-5/5.4/0003-glib-2.32.patch | 25 ++ .../qt-5/5.4/0004-dlopen-resolv.patch | 39 ++ .../libraries/qt-5/5.4/0005-dlopen-gl.patch | 25 ++ .../libraries/qt-5/5.4/0006-tzdir.patch | 52 +++ .../qt-5/5.4/0007-dlopen-webkit-gtk.patch | 25 ++ .../qt-5/5.4/0008-dlopen-webkit-udev.patch | 31 ++ .../5.4/0009-dlopen-serialport-udev.patch | 28 ++ .../qt-5/5.4/0010-dlopen-libXcursor.patch | 29 ++ .../qt-5/5.4/0011-dlopen-openssl.patch | 38 ++ .../libraries/qt-5/5.4/0012-dlopen-dbus.patch | 25 ++ .../libraries/qt-5/5.4/default.nix | 356 ++++++++++++++++++ .../libraries/qt-5/5.4/manifest.nix | 274 ++++++++++++++ .../libraries/qt-5/5.4/manifest.sh | 15 + .../libraries/qt-5/5.4/qt-submodule.nix | 58 +++ .../development/libraries/qt-5/5.4/qtbase.nix | 185 +++++++++ .../libraries/qt-5/5.4/setup-hook.sh | 58 +++ pkgs/top-level/all-packages.nix | 2 +- 19 files changed, 1380 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/qt-5/5.4/0001-dlopen-gtkstyle.patch create mode 100644 pkgs/development/libraries/qt-5/5.4/0002-dlopen-webkit-nsplugin.patch create mode 100644 pkgs/development/libraries/qt-5/5.4/0003-glib-2.32.patch create mode 100644 pkgs/development/libraries/qt-5/5.4/0004-dlopen-resolv.patch create mode 100644 pkgs/development/libraries/qt-5/5.4/0005-dlopen-gl.patch create mode 100644 pkgs/development/libraries/qt-5/5.4/0006-tzdir.patch create mode 100644 pkgs/development/libraries/qt-5/5.4/0007-dlopen-webkit-gtk.patch create mode 100644 pkgs/development/libraries/qt-5/5.4/0008-dlopen-webkit-udev.patch create mode 100644 pkgs/development/libraries/qt-5/5.4/0009-dlopen-serialport-udev.patch create mode 100644 pkgs/development/libraries/qt-5/5.4/0010-dlopen-libXcursor.patch create mode 100644 pkgs/development/libraries/qt-5/5.4/0011-dlopen-openssl.patch create mode 100644 pkgs/development/libraries/qt-5/5.4/0012-dlopen-dbus.patch create mode 100644 pkgs/development/libraries/qt-5/5.4/default.nix create mode 100644 pkgs/development/libraries/qt-5/5.4/manifest.nix create mode 100755 pkgs/development/libraries/qt-5/5.4/manifest.sh create mode 100644 pkgs/development/libraries/qt-5/5.4/qt-submodule.nix create mode 100644 pkgs/development/libraries/qt-5/5.4/qtbase.nix create mode 100644 pkgs/development/libraries/qt-5/5.4/setup-hook.sh diff --git a/pkgs/development/libraries/qt-5/5.4/0001-dlopen-gtkstyle.patch b/pkgs/development/libraries/qt-5/5.4/0001-dlopen-gtkstyle.patch new file mode 100644 index 00000000000..3f411139f5b --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/0001-dlopen-gtkstyle.patch @@ -0,0 +1,63 @@ +From 35d5995a58c86a6addbf0aaf0d1be64d39182872 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Mon, 1 Dec 2014 17:21:58 -0600 +Subject: [PATCH] dlopen-gtkstyle + +--- + qtbase/src/widgets/styles/qgtk2painter.cpp | 2 +- + qtbase/src/widgets/styles/qgtkstyle_p.cpp | 12 ++++++------ + 2 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/qtbase/src/widgets/styles/qgtk2painter.cpp b/qtbase/src/widgets/styles/qgtk2painter.cpp +index 7b9bd97..075947a 100644 +--- a/qtbase/src/widgets/styles/qgtk2painter.cpp ++++ b/qtbase/src/widgets/styles/qgtk2painter.cpp +@@ -104,7 +104,7 @@ static void initGtk() + static bool initialized = false; + if (!initialized) { + // enforce the "0" suffix, so we'll open libgtk-x11-2.0.so.0 +- QLibrary libgtk(QLS("gtk-x11-2.0"), 0, 0); ++ QLibrary libgtk(QLS("@gtk@/lib/libgtk-x11-2.0"), 0, 0); + + QGtk2PainterPrivate::gdk_pixmap_new = (Ptr_gdk_pixmap_new)libgtk.resolve("gdk_pixmap_new"); + QGtk2PainterPrivate::gdk_pixbuf_get_from_drawable = (Ptr_gdk_pixbuf_get_from_drawable)libgtk.resolve("gdk_pixbuf_get_from_drawable"); +diff --git a/qtbase/src/widgets/styles/qgtkstyle_p.cpp b/qtbase/src/widgets/styles/qgtkstyle_p.cpp +index 2c64225..3343d32 100644 +--- a/qtbase/src/widgets/styles/qgtkstyle_p.cpp ++++ b/qtbase/src/widgets/styles/qgtkstyle_p.cpp +@@ -334,7 +334,7 @@ void QGtkStylePrivate::gtkWidgetSetFocus(GtkWidget *widget, bool focus) + void QGtkStylePrivate::resolveGtk() const + { + // enforce the "0" suffix, so we'll open libgtk-x11-2.0.so.0 +- QLibrary libgtk(QLS("gtk-x11-2.0"), 0, 0); ++ QLibrary libgtk(QLS("@gtk@/lib/libgtk-x11-2.0"), 0, 0); + + gtk_init = (Ptr_gtk_init)libgtk.resolve("gtk_init"); + gtk_window_new = (Ptr_gtk_window_new)libgtk.resolve("gtk_window_new"); +@@ -432,8 +432,8 @@ void QGtkStylePrivate::resolveGtk() const + pango_font_description_get_family = (Ptr_pango_font_description_get_family)libgtk.resolve("pango_font_description_get_family"); + pango_font_description_get_style = (Ptr_pango_font_description_get_style)libgtk.resolve("pango_font_description_get_style"); + +- gnome_icon_lookup_sync = (Ptr_gnome_icon_lookup_sync)QLibrary::resolve(QLS("gnomeui-2"), 0, "gnome_icon_lookup_sync"); +- gnome_vfs_init= (Ptr_gnome_vfs_init)QLibrary::resolve(QLS("gnomevfs-2"), 0, "gnome_vfs_init"); ++ gnome_icon_lookup_sync = (Ptr_gnome_icon_lookup_sync)QLibrary::resolve(QLS("@libgnomeui@/lib/libgnomeui-2"), 0, "gnome_icon_lookup_sync"); ++ gnome_vfs_init= (Ptr_gnome_vfs_init)QLibrary::resolve(QLS("@gnome_vfs@/lib/libgnomevfs-2"), 0, "gnome_vfs_init"); + } + + /* \internal +@@ -601,9 +601,9 @@ void QGtkStylePrivate::cleanupGtkWidgets() + static bool resolveGConf() + { + if (!QGtkStylePrivate::gconf_client_get_default) { +- QGtkStylePrivate::gconf_client_get_default = (Ptr_gconf_client_get_default)QLibrary::resolve(QLS("gconf-2"), 4, "gconf_client_get_default"); +- QGtkStylePrivate::gconf_client_get_string = (Ptr_gconf_client_get_string)QLibrary::resolve(QLS("gconf-2"), 4, "gconf_client_get_string"); +- QGtkStylePrivate::gconf_client_get_bool = (Ptr_gconf_client_get_bool)QLibrary::resolve(QLS("gconf-2"), 4, "gconf_client_get_bool"); ++ QGtkStylePrivate::gconf_client_get_default = (Ptr_gconf_client_get_default)QLibrary::resolve(QLS("@gconf@/lib/libgconf-2"), 4, "gconf_client_get_default"); ++ QGtkStylePrivate::gconf_client_get_string = (Ptr_gconf_client_get_string)QLibrary::resolve(QLS("@gconf@/lib/libgconf-2"), 4, "gconf_client_get_string"); ++ QGtkStylePrivate::gconf_client_get_bool = (Ptr_gconf_client_get_bool)QLibrary::resolve(QLS("@gconf@/lib/libgconf-2"), 4, "gconf_client_get_bool"); + } + return (QGtkStylePrivate::gconf_client_get_default !=0); + } +-- +2.1.3 + diff --git a/pkgs/development/libraries/qt-5/5.4/0002-dlopen-webkit-nsplugin.patch b/pkgs/development/libraries/qt-5/5.4/0002-dlopen-webkit-nsplugin.patch new file mode 100644 index 00000000000..0752cdcf479 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/0002-dlopen-webkit-nsplugin.patch @@ -0,0 +1,53 @@ +From 8c30f72dbe11752e8ed25f292c6e5695d7733f72 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Mon, 1 Dec 2014 17:22:23 -0600 +Subject: [PATCH] dlopen-webkit-nsplugin + +--- + qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp | 2 +- + qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp | 2 +- + .../WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp +index 679480b..2c373cc 100644 +--- a/qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp ++++ b/qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp +@@ -132,7 +132,7 @@ static void initializeGtk(QLibrary* module = 0) + } + } + +- QLibrary library(QLatin1String("libgtk-x11-2.0"), 0); ++ QLibrary library(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0); + if (library.load()) { + typedef void *(*gtk_init_check_ptr)(int*, char***); + gtk_init_check_ptr gtkInitCheck = (gtk_init_check_ptr)library.resolve("gtk_init_check"); +diff --git a/qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp b/qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp +index de06a2f..363bde5 100644 +--- a/qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp ++++ b/qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp +@@ -697,7 +697,7 @@ static Display *getPluginDisplay() + // support gdk based plugins (like flash) that use a different X connection. + // The code below has the same effect as this one: + // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); +- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); ++ QLibrary library(QLatin1String("@gdk_pixbuf@/lib/libgdk-x11-2.0"), 0); + if (!library.load()) + return 0; + +diff --git a/qtwebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp b/qtwebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp +index d734ff6..62a2197 100644 +--- a/qtwebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp ++++ b/qtwebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp +@@ -64,7 +64,7 @@ static Display* getPluginDisplay() + // The code below has the same effect as this one: + // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); + +- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); ++ QLibrary library(QLatin1String("@gdk_pixbuf@/libgdk-x11-2.0"), 0); + if (!library.load()) + return 0; + +-- +2.1.3 + diff --git a/pkgs/development/libraries/qt-5/5.4/0003-glib-2.32.patch b/pkgs/development/libraries/qt-5/5.4/0003-glib-2.32.patch new file mode 100644 index 00000000000..4abb69da4d8 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/0003-glib-2.32.patch @@ -0,0 +1,25 @@ +From a41c3e3a3a1ce4b373b1bbb98f3a835e9e8a0718 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Mon, 1 Dec 2014 17:22:39 -0600 +Subject: [PATCH] glib-2.32 + +--- + qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h b/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h +index 1f6d25e..087c3fb 100644 +--- a/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h ++++ b/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h +@@ -81,7 +81,7 @@ + #include + #elif PLATFORM(GTK) + #include +-typedef struct _GMutex GMutex; ++typedef union _GMutex GMutex; + typedef struct _GCond GCond; + #endif + +-- +2.1.3 + diff --git a/pkgs/development/libraries/qt-5/5.4/0004-dlopen-resolv.patch b/pkgs/development/libraries/qt-5/5.4/0004-dlopen-resolv.patch new file mode 100644 index 00000000000..e6b921b771d --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/0004-dlopen-resolv.patch @@ -0,0 +1,39 @@ +From 63af41c6eeca28c911c13b1a77afeaf860863c2d Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Mon, 1 Dec 2014 17:22:55 -0600 +Subject: [PATCH] dlopen-resolv + +--- + qtbase/src/network/kernel/qdnslookup_unix.cpp | 2 +- + qtbase/src/network/kernel/qhostinfo_unix.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/qtbase/src/network/kernel/qdnslookup_unix.cpp b/qtbase/src/network/kernel/qdnslookup_unix.cpp +index 8c5a0eb..27ebf16 100644 +--- a/qtbase/src/network/kernel/qdnslookup_unix.cpp ++++ b/qtbase/src/network/kernel/qdnslookup_unix.cpp +@@ -87,7 +87,7 @@ static void resolveLibrary() + if (!lib.load()) + #endif + { +- lib.setFileName(QLatin1String("resolv")); ++ lib.setFileName(QLatin1String("@glibc/lib/resolv")); + if (!lib.load()) + return; + } +diff --git a/qtbase/src/network/kernel/qhostinfo_unix.cpp b/qtbase/src/network/kernel/qhostinfo_unix.cpp +index df8c8b1..613d0e0 100644 +--- a/qtbase/src/network/kernel/qhostinfo_unix.cpp ++++ b/qtbase/src/network/kernel/qhostinfo_unix.cpp +@@ -103,7 +103,7 @@ static void resolveLibrary() + if (!lib.load()) + #endif + { +- lib.setFileName(QLatin1String("resolv")); ++ lib.setFileName(QLatin1String("@glibc@/lib/libresolv")); + if (!lib.load()) + return; + } +-- +2.1.3 + diff --git a/pkgs/development/libraries/qt-5/5.4/0005-dlopen-gl.patch b/pkgs/development/libraries/qt-5/5.4/0005-dlopen-gl.patch new file mode 100644 index 00000000000..d112427bdd6 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/0005-dlopen-gl.patch @@ -0,0 +1,25 @@ +From 6aaf6858bf817172a4c503158e1701c4837ee790 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Mon, 1 Dec 2014 17:23:08 -0600 +Subject: [PATCH] dlopen-gl + +--- + qtbase/src/plugins/platforms/xcb/qglxintegration.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp b/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp +index 67235e0..2220a2e 100644 +--- a/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp ++++ b/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp +@@ -434,7 +434,7 @@ void (*QGLXContext::getProcAddress(const QByteArray &procName)) () + { + extern const QString qt_gl_library_name(); + // QLibrary lib(qt_gl_library_name()); +- QLibrary lib(QLatin1String("GL")); ++ QLibrary lib(QLatin1String("@openglDriver@/lib/libGL")); + glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB"); + } + } +-- +2.1.3 + diff --git a/pkgs/development/libraries/qt-5/5.4/0006-tzdir.patch b/pkgs/development/libraries/qt-5/5.4/0006-tzdir.patch new file mode 100644 index 00000000000..d5a74b25fb3 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/0006-tzdir.patch @@ -0,0 +1,52 @@ +From 775fd74351faaabd45f6751618b28e2b05812d05 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Mon, 1 Dec 2014 17:23:22 -0600 +Subject: [PATCH] tzdir + +--- + qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp | 21 +++++++++++++++------ + 1 file changed, 15 insertions(+), 6 deletions(-) + +diff --git a/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp b/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp +index b4ea91e..a56a245 100644 +--- a/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp ++++ b/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp +@@ -68,7 +68,10 @@ typedef QHash QTzTimeZoneHash; + // Parse zone.tab table, assume lists all installed zones, if not will need to read directories + static QTzTimeZoneHash loadTzTimeZones() + { +- QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); ++ QString path = qgetenv("TZDIR"); ++ path += "/zone.tab"; ++ if (!QFile::exists(path)) ++ path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); + if (!QFile::exists(path)) + path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); + +@@ -559,12 +562,18 @@ void QTzTimeZonePrivate::init(const QByteArray &ianaId) + if (!tzif.open(QIODevice::ReadOnly)) + return; + } else { +- // Open named tz, try modern path first, if fails try legacy path +- tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); ++ // Try TZDIR first ++ QString zoneinfoDir = qgetenv("TZDIR"); ++ zoneinfoDir += "/" + QString::fromLocal8Bit(ianaId); ++ tzif.setFileName(zoneinfoDir); + if (!tzif.open(QIODevice::ReadOnly)) { +- tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId)); +- if (!tzif.open(QIODevice::ReadOnly)) +- return; ++ // Open named tz, try modern path first, if fails try legacy path ++ tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); ++ if (!tzif.open(QIODevice::ReadOnly)) { ++ tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId)); ++ if (!tzif.open(QIODevice::ReadOnly)) ++ return; ++ } + } + } + +-- +2.1.3 + diff --git a/pkgs/development/libraries/qt-5/5.4/0007-dlopen-webkit-gtk.patch b/pkgs/development/libraries/qt-5/5.4/0007-dlopen-webkit-gtk.patch new file mode 100644 index 00000000000..9582b714c90 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/0007-dlopen-webkit-gtk.patch @@ -0,0 +1,25 @@ +From 089db8835c80bf2b7dd91a97a5c6eb26636b6ab9 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Mon, 1 Dec 2014 17:26:39 -0600 +Subject: [PATCH] dlopen-webkit-gtk + +--- + qtwebkit/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/qtwebkit/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp b/qtwebkit/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp +index 8de6521..0b25748 100644 +--- a/qtwebkit/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp ++++ b/qtwebkit/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp +@@ -53,7 +53,7 @@ static void messageHandler(QtMsgType type, const QMessageLogContext&, const QStr + + static bool initializeGtk() + { +- QLibrary gtkLibrary(QLatin1String("libgtk-x11-2.0"), 0); ++ QLibrary gtkLibrary(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0); + if (!gtkLibrary.load()) + return false; + typedef void* (*gtk_init_ptr)(void*, void*); +-- +2.1.3 + diff --git a/pkgs/development/libraries/qt-5/5.4/0008-dlopen-webkit-udev.patch b/pkgs/development/libraries/qt-5/5.4/0008-dlopen-webkit-udev.patch new file mode 100644 index 00000000000..e8a4ba6a215 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/0008-dlopen-webkit-udev.patch @@ -0,0 +1,31 @@ +From 25d2922cce383fcaa4c138e0cc6c8d92328eeacb Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Mon, 1 Dec 2014 17:30:41 -0600 +Subject: [PATCH] dlopen-webkit-udev + +--- + qtwebkit/Source/WebCore/platform/qt/GamepadsQt.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/qtwebkit/Source/WebCore/platform/qt/GamepadsQt.cpp b/qtwebkit/Source/WebCore/platform/qt/GamepadsQt.cpp +index 60ff317..da8ac69 100644 +--- a/qtwebkit/Source/WebCore/platform/qt/GamepadsQt.cpp ++++ b/qtwebkit/Source/WebCore/platform/qt/GamepadsQt.cpp +@@ -111,12 +111,12 @@ private: + bool load() + { + m_libUdev.setLoadHints(QLibrary::ResolveAllSymbolsHint); +- m_libUdev.setFileNameAndVersion(QStringLiteral("udev"), 1); ++ m_libUdev.setFileNameAndVersion(QStringLiteral("@udev@/lib/libudev"), 1); + m_loaded = m_libUdev.load(); + if (resolveMethods()) + return true; + +- m_libUdev.setFileNameAndVersion(QStringLiteral("udev"), 0); ++ m_libUdev.setFileNameAndVersion(QStringLiteral("@udev@/lib/libudev"), 0); + m_loaded = m_libUdev.load(); + return resolveMethods(); + } +-- +2.1.3 + diff --git a/pkgs/development/libraries/qt-5/5.4/0009-dlopen-serialport-udev.patch b/pkgs/development/libraries/qt-5/5.4/0009-dlopen-serialport-udev.patch new file mode 100644 index 00000000000..e1e66a3ce95 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/0009-dlopen-serialport-udev.patch @@ -0,0 +1,28 @@ +From 17c7257e54c00ea2121f2cf95fb2be5e5db6b4ad Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Mon, 1 Dec 2014 17:31:03 -0600 +Subject: [PATCH] dlopen-serialport-udev + +--- + qtserialport/src/serialport/qtudev_p.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/qtserialport/src/serialport/qtudev_p.h b/qtserialport/src/serialport/qtudev_p.h +index 09940ab..45460f9 100644 +--- a/qtserialport/src/serialport/qtudev_p.h ++++ b/qtserialport/src/serialport/qtudev_p.h +@@ -119,9 +119,9 @@ inline void *resolveSymbol(QLibrary *udevLibrary, const char *symbolName) + inline bool resolveSymbols(QLibrary *udevLibrary) + { + if (!udevLibrary->isLoaded()) { +- udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 1); ++ udevLibrary->setFileNameAndVersion(QStringLiteral("@udev@/lib/libudev"), 1); + if (!udevLibrary->load()) { +- udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 0); ++ udevLibrary->setFileNameAndVersion(QStringLiteral("@udev@/lib/libudev"), 0); + if (!udevLibrary->load()) { + qWarning("Failed to load the library: %s, supported version(s): %i and %i", qPrintable(udevLibrary->fileName()), 1, 0); + return false; +-- +2.1.3 + diff --git a/pkgs/development/libraries/qt-5/5.4/0010-dlopen-libXcursor.patch b/pkgs/development/libraries/qt-5/5.4/0010-dlopen-libXcursor.patch new file mode 100644 index 00000000000..49ade86fae3 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/0010-dlopen-libXcursor.patch @@ -0,0 +1,29 @@ +From b56e3737ca97e3de664603976989da4419297eb3 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Mon, 1 Dec 2014 17:33:51 -0600 +Subject: [PATCH] dlopen-libXcursor + +--- + qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp b/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp +index 6dbac90..4b23fc2 100644 +--- a/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp ++++ b/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp +@@ -305,10 +305,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen) + #ifdef XCB_USE_XLIB + static bool function_ptrs_not_initialized = true; + if (function_ptrs_not_initialized) { +- QLibrary xcursorLib(QLatin1String("Xcursor"), 1); ++ QLibrary xcursorLib(QLatin1String("@libXcursor@/lib/libXcursor"), 1); + bool xcursorFound = xcursorLib.load(); + if (!xcursorFound) { // try without the version number +- xcursorLib.setFileName(QLatin1String("Xcursor")); ++ xcursorLib.setFileName(QLatin1String("@libXcursor@/lib/Xcursor")); + xcursorFound = xcursorLib.load(); + } + if (xcursorFound) { +-- +2.1.3 + diff --git a/pkgs/development/libraries/qt-5/5.4/0011-dlopen-openssl.patch b/pkgs/development/libraries/qt-5/5.4/0011-dlopen-openssl.patch new file mode 100644 index 00000000000..d08061dd5dd --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/0011-dlopen-openssl.patch @@ -0,0 +1,38 @@ +From 99d458c93698b2d4f16ff164ed54237279ffbb64 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Mon, 1 Dec 2014 17:35:21 -0600 +Subject: [PATCH] dlopen-openssl + +--- + qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp b/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp +index 4e6200f..d9c3e7d 100644 +--- a/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp ++++ b/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp +@@ -585,8 +585,8 @@ static QPair loadOpenSsl() + #endif + #if defined(SHLIB_VERSION_NUMBER) && !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so + // first attempt: the canonical name is libssl.so. +- libssl->setFileNameAndVersion(QLatin1String("ssl"), QLatin1String(SHLIB_VERSION_NUMBER)); +- libcrypto->setFileNameAndVersion(QLatin1String("crypto"), QLatin1String(SHLIB_VERSION_NUMBER)); ++ libssl->setFileNameAndVersion(QLatin1String("@openssl@/lib/libssl"), QLatin1String(SHLIB_VERSION_NUMBER)); ++ libcrypto->setFileNameAndVersion(QLatin1String("@openssl@/lib/libcrypto"), QLatin1String(SHLIB_VERSION_NUMBER)); + if (libcrypto->load() && libssl->load()) { + // libssl.so. and libcrypto.so. found + return pair; +@@ -597,8 +597,8 @@ static QPair loadOpenSsl() + #endif + + // second attempt: find the development files libssl.so and libcrypto.so +- libssl->setFileNameAndVersion(QLatin1String("ssl"), -1); +- libcrypto->setFileNameAndVersion(QLatin1String("crypto"), -1); ++ libssl->setFileNameAndVersion(QLatin1String("@openssl@/lib/libssl"), -1); ++ libcrypto->setFileNameAndVersion(QLatin1String("@openssl@/lib/libcrypto"), -1); + if (libcrypto->load() && libssl->load()) { + // libssl.so.0 and libcrypto.so.0 found + return pair; +-- +2.1.3 + diff --git a/pkgs/development/libraries/qt-5/5.4/0012-dlopen-dbus.patch b/pkgs/development/libraries/qt-5/5.4/0012-dlopen-dbus.patch new file mode 100644 index 00000000000..f32386e114b --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/0012-dlopen-dbus.patch @@ -0,0 +1,25 @@ +From eec8a79c6cc9e2c65fd43db48ca2347de3ae0c5e Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Mon, 1 Dec 2014 17:38:04 -0600 +Subject: [PATCH] dlopen-dbus + +--- + qtbase/src/dbus/qdbus_symbols.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/qtbase/src/dbus/qdbus_symbols.cpp b/qtbase/src/dbus/qdbus_symbols.cpp +index a7a1b67..661baf1 100644 +--- a/qtbase/src/dbus/qdbus_symbols.cpp ++++ b/qtbase/src/dbus/qdbus_symbols.cpp +@@ -93,7 +93,7 @@ bool qdbus_loadLibDBus() + + static int majorversions[] = { 3, 2, -1 }; + lib->unload(); +- lib->setFileName(QLatin1String("dbus-1")); ++ lib->setFileName(QLatin1String("@dbus_libs@/lib/libdbus-1")); + for (uint i = 0; i < sizeof(majorversions) / sizeof(majorversions[0]); ++i) { + lib->setFileNameAndVersion(lib->fileName(), majorversions[i]); + if (lib->load() && lib->resolve("dbus_connection_open_private")) +-- +2.1.3 + diff --git a/pkgs/development/libraries/qt-5/5.4/default.nix b/pkgs/development/libraries/qt-5/5.4/default.nix new file mode 100644 index 00000000000..0a460f863af --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/default.nix @@ -0,0 +1,356 @@ +# Maintainer's Notes: +# +# Minor updates: +# 1. Edit ./manifest.sh to point to the updated URL. +# 2. Run ./manifest.sh. +# 3. Build and enjoy. +# +# Major updates: +# We prefer not to immediately overwrite older versions with major updates, so +# make a copy of this directory first. After copying, be sure to delete ./tmp +# if it exists. Then follow the minor update instructions. Be sure to check if +# any new components have been added and package them as necessary. + +{ autonix, fetchurl, newScope, stdenv + +, bison2 +, mesa_noglu +, cups +, gnome + +# options +, developerBuild ? false +}: + +with autonix; +with stdenv.lib; + +let + manifest = + importManifest ./manifest.nix { mirror = "http://download.qt.io"; }; + srcs = mapAttrs (name: manifest: manifest.src) manifest; + + version = "5.4.0"; + + callPackage = newScope (self // { inherit qtSubmodule; }); + + qtSubmodule = callPackage ./qt-submodule.nix { + inherit srcs version; + inherit (stdenv) mkDerivation; + }; + + self = + { + + qmake = callPackage ./qmake.nix { inherit (self) base; }; + + activeqt = callPackage + ( + { qtSubmodule, base }: + + qtSubmodule { + name = "qtactiveqt"; + qtInputs = [ base ]; + } + ) + {}; + + /* androidextras = not packaged */ + + base = callPackage ./qtbase.nix { + mesa = mesa_noglu; + cups = if stdenv.isLinux then cups else null; + # GNOME dependencies are not used unless gtkStyle == true + inherit (gnome) libgnomeui GConf gnome_vfs; + bison = bison2; # error: too few arguments to function 'int yylex(... + inherit developerBuild srcs version; + }; + + connectivity = callPackage + ( + { qtSubmodule, base, declarative }: + + qtSubmodule { + name = "qtconnectivity"; + qtInputs = [ base declarative ]; + } + ) + {}; + + declarative = callPackage + ( + { qtSubmodule, python, base, svg, xmlpatterns }: + + qtSubmodule { + name = "qtdeclarative"; + qtInputs = [ base svg xmlpatterns ]; + nativeBuildInputs = [ python ]; + } + ) + {}; + + doc = callPackage + ( + { qtSubmodule, declarative }: + + qtSubmodule { + name = "qtdoc"; + qtInputs = [ declarative ]; + } + ) + {}; + + enginio = callPackage + ( + { qtSubmodule, declarative }: + + qtSubmodule { + name = "qtenginio"; + qtInputs = [ declarative ]; + } + ) + {}; + + graphicaleffects = callPackage + ( + { qtSubmodule, declarative }: + + qtSubmodule { + name = "qtgraphicaleffects"; + qtInputs = [ declarative ]; + } + ) + {}; + + imageformats = callPackage + ( + { qtSubmodule, base }: + + qtSubmodule { + name = "qtimageformats"; + qtInputs = [ base ]; + } + ) + {}; + + location = callPackage + ( + { qtSubmodule, base, multimedia }: + + qtSubmodule { + name = "qtlocation"; + qtInputs = [ base multimedia ]; + } + ) + {}; + + /* macextras = not packaged */ + + multimedia = callPackage + ( + { qtSubmodule, base, declarative + , alsaLib, gstreamer, gst_plugins_base, pulseaudio + }: + + qtSubmodule { + name = "qtmultimedia"; + qtInputs = [ base declarative ]; + buildInputs = [ + alsaLib gstreamer gst_plugins_base pulseaudio + ]; + } + ) + {}; + + quick1 = callPackage + ( + { qtSubmodule, script, svg, webkit, xmlpatterns }: + + qtSubmodule { + name = "qtquick1"; + qtInputs = [ script svg webkit xmlpatterns ]; + } + ) + {}; + + quickcontrols = callPackage + ( + { qtSubmodule, declarative }: + + qtSubmodule { + name = "qtquickcontrols"; + qtInputs = [ declarative ]; + } + ) + {}; + + script = callPackage + ( + { qtSubmodule, base, tools }: + + qtSubmodule { + name = "qtscript"; + qtInputs = [ base tools ]; + patchFlags = "-p2"; # patches originally for monolithic build + patches = [ ./0003-glib-2.32.patch ]; + } + ) + {}; + + sensors = callPackage + ( + { qtSubmodule, base, declarative }: + + qtSubmodule { + name = "qtsensors"; + qtInputs = [ base declarative ]; + } + ) + {}; + + serialport = callPackage + ( + { qtSubmodule, base }: + + qtSubmodule { + name = "qtserialport"; + qtInputs = [ base ]; + patchFlags = "-p2"; # patches originally for monolithic build + patches = [ ./0009-dlopen-serialport-udev.patch ]; + } + ) + {}; + + svg = callPackage + ( + { qtSubmodule, base }: + + qtSubmodule { + name = "qtsvg"; + qtInputs = [ base ]; + } + ) + {}; + + tools = callPackage + ( + { qtSubmodule, activeqt, base, declarative, webkit }: + + qtSubmodule { + name = "qttools"; + qtInputs = [ activeqt base declarative webkit ]; + } + ) + {}; + + translations = callPackage + ( + { qtSubmodule, tools }: + + qtSubmodule { + name = "qttranslations"; + qtInputs = [ tools ]; + } + ) + {}; + + /* wayland = not packaged */ + + /* webchannel = not packaged */ + + /* webengine = not packaged */ + + webkit = callPackage + ( + { qtSubmodule, declarative, location, multimedia, sensors + , fontconfig, gdk_pixbuf, gtk, libwebp, libxml2, libxslt + , sqlite, udev + , bison2, flex, gdb, gperf, perl, pkgconfig, python, ruby + , substituteAll + , flashplayerFix ? false + }: + + qtSubmodule { + name = "qtwebkit"; + qtInputs = [ declarative location multimedia sensors ]; + buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite ]; + nativeBuildInputs = [ + bison2 flex gdb gperf perl pkgconfig python ruby + ]; + patchFlags = "-p2"; # patches originally for monolithic build + patches = + optional flashplayerFix + (substituteAll + { + src = ./0002-dlopen-webkit-nsplugin.patch; + inherit gtk gdk_pixbuf; + } + ) + ++ optional flashplayerFix + (substituteAll + { + src = ./0007-dlopen-webkit-gtk.patch; + inherit gtk; + } + ) + ++ [ + (substituteAll + { + src = ./0008-dlopen-webkit-udev.patch; + inherit udev; + } + ) + ]; + } + ) + {}; + + webkit-examples = callPackage + ( + { qtSubmodule, tools, webkit }: + + qtSubmodule { + name = "qtwebkit-examples"; + qtInputs = [ tools webkit ]; + } + ) + {}; + + websockets = callPackage + ( + { qtSubmodule, base, declarative }: + + qtSubmodule { + name = "qtwebsockets"; + qtInputs = [ base declarative ]; + } + ) + {}; + + /* winextras = not packaged */ + + x11extras = callPackage + ( + { qtSubmodule, base }: + + qtSubmodule { + name = "qtx11extras"; + qtInputs = [ base ]; + } + ) + {}; + + xmlpatterns = callPackage + ( + { qtSubmodule, base }: + + qtSubmodule { + name = "qtxmlpatterns"; + qtInputs = [ base ]; + } + ) + {}; + + }; + +in self diff --git a/pkgs/development/libraries/qt-5/5.4/manifest.nix b/pkgs/development/libraries/qt-5/5.4/manifest.nix new file mode 100644 index 00000000000..38e5f8972be --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/manifest.nix @@ -0,0 +1,274 @@ +# This file is generated automatically. DO NOT EDIT! +{ stdenv, fetchurl, mirror }: +[ + { + name = stdenv.lib.nameFromURL "qtwebengine-opensource-src-5.4.0.tar.xz" ".tar"; + store = "/nix/store/108ywq0s80nanyrjs95nmfxvxmp1ijv2-qtwebengine-opensource-src-5.4.0.tar.xz"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtwebengine-opensource-src-5.4.0.tar.xz"; + sha256 = "0fqmwhl2pxs0w33lqhcwgwdyrj61b8jmd3hc668xwirzsv0ab4db"; + name = "qtwebengine-opensource-src-5.4.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "qtwebkit-examples-opensource-src-5.4.0.tar.xz" ".tar"; + store = "/nix/store/dgy0bd4382cak76d34ins8v1rxvcg2zg-qtwebkit-examples-opensource-src-5.4.0.tar.xz"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtwebkit-examples-opensource-src-5.4.0.tar.xz"; + sha256 = "1xp9y3q0p5w3gj372hwbzb606akf6ynic94ppwzyhrhy70yjyamh"; + name = "qtwebkit-examples-opensource-src-5.4.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "qtsensors-opensource-src-5.4.0.tar.xz" ".tar"; + store = "/nix/store/3ddk1slwp3sl11q3vrh14vczz1g3k77c-qtsensors-opensource-src-5.4.0.tar.xz"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtsensors-opensource-src-5.4.0.tar.xz"; + sha256 = "0ng1mbvv2ffhk7rs3djiz2i7j297flnn1jkgqk6zpfbjyp6363wa"; + name = "qtsensors-opensource-src-5.4.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "qtandroidextras-opensource-src-5.4.0.tar.xz" ".tar"; + store = "/nix/store/h77c86qj0fxr233x0b4n669mfd1kd14k-qtandroidextras-opensource-src-5.4.0.tar.xz"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtandroidextras-opensource-src-5.4.0.tar.xz"; + sha256 = "0j40409x68bj6hbfrz0vqzafkbplzfcnlb7b7m72ddav0jm4ad3w"; + name = "qtandroidextras-opensource-src-5.4.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "qtxmlpatterns-opensource-src-5.4.0.tar.xz" ".tar"; + store = "/nix/store/l30dh38cmmhz1laiwawfyx88d2njnf7s-qtxmlpatterns-opensource-src-5.4.0.tar.xz"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtxmlpatterns-opensource-src-5.4.0.tar.xz"; + sha256 = "09albq9qj82hzphb3y4ivkkly6gjyxmcbghd7m73i9f7kdxnj73r"; + name = "qtxmlpatterns-opensource-src-5.4.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "qtactiveqt-opensource-src-5.4.0.tar.xz" ".tar"; + store = "/nix/store/02axrl74rym70hs4ncwbpx520a6y5lfk-qtactiveqt-opensource-src-5.4.0.tar.xz"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtactiveqt-opensource-src-5.4.0.tar.xz"; + sha256 = "1kvn8dqyr3iw5w55yba9ljldgc15zsa1ibdkhfwj3rk3579mfxba"; + name = "qtactiveqt-opensource-src-5.4.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "qtx11extras-opensource-src-5.4.0.tar.xz" ".tar"; + store = "/nix/store/xqd394dy8j57iwvixy09a8mlklllf817-qtx11extras-opensource-src-5.4.0.tar.xz"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtx11extras-opensource-src-5.4.0.tar.xz"; + sha256 = "0k27q46khwf3hzygb145akns37s8cmwbqyzjff810xxqwb4npim3"; + name = "qtx11extras-opensource-src-5.4.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "qttranslations-opensource-src-5.4.0.tar.xz" ".tar"; + store = "/nix/store/hafxaps23gqkpaq1ryh142jc9fh71kxp-qttranslations-opensource-src-5.4.0.tar.xz"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qttranslations-opensource-src-5.4.0.tar.xz"; + sha256 = "12zrldi5jw6zknwg6p573gvz0f4v22wvwwc5mykj26j8g28qv9xc"; + name = "qttranslations-opensource-src-5.4.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "qtwayland-opensource-src-5.4.0.tar.xz" ".tar"; + store = "/nix/store/ffs7rhirwgyqijcwkv2rn9i0f3126qwp-qtwayland-opensource-src-5.4.0.tar.xz"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtwayland-opensource-src-5.4.0.tar.xz"; + sha256 = "0abgsf67whdppg9q35b359wllz2pfzx6vw2gld6hhnhlx7rgf7k0"; + name = "qtwayland-opensource-src-5.4.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "qtmultimedia-opensource-src-5.4.0.tar.xz" ".tar"; + store = "/nix/store/7ap1klckqnjx03i1024jd1nfw1kbdib3-qtmultimedia-opensource-src-5.4.0.tar.xz"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtmultimedia-opensource-src-5.4.0.tar.xz"; + sha256 = "0ldgz677apqj8jm6b7cmma18jv97va26hjqjs3r26hg6gaidpfas"; + name = "qtmultimedia-opensource-src-5.4.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "qtmacextras-opensource-src-5.4.0.tar.xz" ".tar"; + store = "/nix/store/w526ln2xj4bfqw2xbarhidain51idf3k-qtmacextras-opensource-src-5.4.0.tar.xz"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtmacextras-opensource-src-5.4.0.tar.xz"; + sha256 = "0vq4dhsxwi1csy5qnbbjp3fmgmhqb7ah0nzrsickvv37vyfv85hn"; + name = "qtmacextras-opensource-src-5.4.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "qtimageformats-opensource-src-5.4.0.tar.xz" ".tar"; + store = "/nix/store/yp6paa7psi4fwaih9mcvfxj9vldlmk5k-qtimageformats-opensource-src-5.4.0.tar.xz"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtimageformats-opensource-src-5.4.0.tar.xz"; + sha256 = "0ip0iyn8fz96w5xi8w6dlxx0lhv1glmkdy5myz7zhi0yyy6ng6y8"; + name = "qtimageformats-opensource-src-5.4.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "qttools-opensource-src-5.4.0.tar.xz" ".tar"; + store = "/nix/store/1x2lvbyc2h25zmjyvawrfzn5yya13fjl-qttools-opensource-src-5.4.0.tar.xz"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qttools-opensource-src-5.4.0.tar.xz"; + sha256 = "06klc0vdqfnj8dwqq64602x0wl8ackcim1y33mw6616kzyba11as"; + name = "qttools-opensource-src-5.4.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "qtconnectivity-opensource-src-5.4.0.tar.xz" ".tar"; + store = "/nix/store/33mxdwaih2ysjzyvjgfgq86ys9bd9s8x-qtconnectivity-opensource-src-5.4.0.tar.xz"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtconnectivity-opensource-src-5.4.0.tar.xz"; + sha256 = "0f0hkgqr606q4jj8g70xq72lp9q6kdyfw6rdiin8zhnarjxqark3"; + name = "qtconnectivity-opensource-src-5.4.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "qtwebchannel-opensource-src-5.4.0.tar.xz" ".tar"; + store = "/nix/store/bx82yn9n0srdzlid1blwg196jqyhhgpp-qtwebchannel-opensource-src-5.4.0.tar.xz"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtwebchannel-opensource-src-5.4.0.tar.xz"; + sha256 = "0k2r0qrqrxhw2mjyd9f8r36f04yxfkgw1dmbbdczhw4234jh3sr4"; + name = "qtwebchannel-opensource-src-5.4.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "qtserialport-opensource-src-5.4.0.tar.xz" ".tar"; + store = "/nix/store/3q6b9l2cwszm9jz5csx2jsfqk08nz9nh-qtserialport-opensource-src-5.4.0.tar.xz"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtserialport-opensource-src-5.4.0.tar.xz"; + sha256 = "1hsqs1dy8x5v3l4z8zk9rjprz14w8nv13j4yy47r4nsgf7pikihg"; + name = "qtserialport-opensource-src-5.4.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "qtdoc-opensource-src-5.4.0.tar.xz" ".tar"; + store = "/nix/store/bbqvydxnaw4asp2a9j4pq0d5zi1zaqsf-qtdoc-opensource-src-5.4.0.tar.xz"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtdoc-opensource-src-5.4.0.tar.xz"; + sha256 = "06gx7b3xq3jdprmwfzsy2c1x7klry1wsrfs1iyjgfq9sdja9d1nm"; + name = "qtdoc-opensource-src-5.4.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "qtwinextras-opensource-src-5.4.0.tar.xz" ".tar"; + store = "/nix/store/by4v18v2k0xaz9znh18qfr8fvy8n67qg-qtwinextras-opensource-src-5.4.0.tar.xz"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtwinextras-opensource-src-5.4.0.tar.xz"; + sha256 = "01p3haicfbsg0nb654s16pxl9hr57dksk2w5h2ijghpivqhlzbh3"; + name = "qtwinextras-opensource-src-5.4.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "qtbase-opensource-src-5.4.0.tar.xz" ".tar"; + store = "/nix/store/01rpn59v04bx5f9mw92v6zq2hl4bigcr-qtbase-opensource-src-5.4.0.tar.xz"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtbase-opensource-src-5.4.0.tar.xz"; + sha256 = "1lciiq64qzbgg8kvc2fl98ykpn7fcjv2q6n2ivbw4yz7ll5j9sns"; + name = "qtbase-opensource-src-5.4.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "qtdeclarative-opensource-src-5.4.0.tar.xz" ".tar"; + store = "/nix/store/mc0dz5hbaqf3sannvg4j7zxwqcsj3g0f-qtdeclarative-opensource-src-5.4.0.tar.xz"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtdeclarative-opensource-src-5.4.0.tar.xz"; + sha256 = "1dnpz86asklm3qvm1wyjm3w1kyr319yas8w03ry9m1pnn1sr4z76"; + name = "qtdeclarative-opensource-src-5.4.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "qtgraphicaleffects-opensource-src-5.4.0.tar.xz" ".tar"; + store = "/nix/store/r7hpzw01dxh31px5lm1jv6pz753sawrd-qtgraphicaleffects-opensource-src-5.4.0.tar.xz"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtgraphicaleffects-opensource-src-5.4.0.tar.xz"; + sha256 = "06cblcjd6c7nbq1lc8b7mydambf16qmpargc1x0bh3hq6bji0gx4"; + name = "qtgraphicaleffects-opensource-src-5.4.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "qtquick1-opensource-src-5.4.0.tar.xz" ".tar"; + store = "/nix/store/f449vw01acb5jjf74fhfjrjhp8z00dby-qtquick1-opensource-src-5.4.0.tar.xz"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtquick1-opensource-src-5.4.0.tar.xz"; + sha256 = "1p1js3ck3310kbgvnzsfd0gfd4p9c3fccfas7hzkhcj83iybga6m"; + name = "qtquick1-opensource-src-5.4.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "qt5-opensource-src-5.4.0.tar.xz" ".tar"; + store = "/nix/store/6nh8apj4l1xpqcjq1lkb9g1n50wd6xsz-qt5-opensource-src-5.4.0.tar.xz"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qt5-opensource-src-5.4.0.tar.xz"; + sha256 = "0gw782dvmvz6c8lpgvn7fi0d8wydjrrfarhjrbbwmswa37492s5r"; + name = "qt5-opensource-src-5.4.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "qtscript-opensource-src-5.4.0.tar.xz" ".tar"; + store = "/nix/store/zc0k3d4s867p17bas7clvabdsh2xblhh-qtscript-opensource-src-5.4.0.tar.xz"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtscript-opensource-src-5.4.0.tar.xz"; + sha256 = "1l0f6g1m5p9zgc4pbx6xm5b31ygcl4dayj43hwblpwinxh15gwzm"; + name = "qtscript-opensource-src-5.4.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "qtwebsockets-opensource-src-5.4.0.tar.xz" ".tar"; + store = "/nix/store/camx69vrzl5ciwmc7rygax1iphcdk474-qtwebsockets-opensource-src-5.4.0.tar.xz"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtwebsockets-opensource-src-5.4.0.tar.xz"; + sha256 = "1pybyksa8gwm98f65l3pa8dxbplz882r13b7i0idsg4q9952gk9a"; + name = "qtwebsockets-opensource-src-5.4.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "qtquickcontrols-opensource-src-5.4.0.tar.xz" ".tar"; + store = "/nix/store/y0n7c5safk5174b14a9p6kqw2p2n3vrs-qtquickcontrols-opensource-src-5.4.0.tar.xz"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtquickcontrols-opensource-src-5.4.0.tar.xz"; + sha256 = "07p6z9c1cgyx9qx81mpgnh8dim4q9im714lzk8zyghwi68rl77xm"; + name = "qtquickcontrols-opensource-src-5.4.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "qtenginio-opensource-src-5.4.0.tar.xz" ".tar"; + store = "/nix/store/afpm16dyv3bis6xfr4lnhnd0xrflpi86-qtenginio-opensource-src-5.4.0.tar.xz"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtenginio-opensource-src-5.4.0.tar.xz"; + sha256 = "0k4j5nc33ijifjpii074bar105z1mn98qg1vzn8q5lq0y7jm82gs"; + name = "qtenginio-opensource-src-5.4.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "qtwebkit-opensource-src-5.4.0.tar.xz" ".tar"; + store = "/nix/store/v0l3znjnhnnlbvbdb33ns3npz1p7dlzw-qtwebkit-opensource-src-5.4.0.tar.xz"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtwebkit-opensource-src-5.4.0.tar.xz"; + sha256 = "1hc8s6l70ikf7ld2x84p6d2wwyxdfqw2pdqlma42wpaxfq3j4rvc"; + name = "qtwebkit-opensource-src-5.4.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "qtlocation-opensource-src-5.4.0.tar.xz" ".tar"; + store = "/nix/store/kbgbnl01j85iab7a88x4gi3q2n40n9zr-qtlocation-opensource-src-5.4.0.tar.xz"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtlocation-opensource-src-5.4.0.tar.xz"; + sha256 = "0mnlh6z8hq9j32sxqsd8al811p4iv99wd8bsm97w9nyxbwdhqhp8"; + name = "qtlocation-opensource-src-5.4.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "qtsvg-opensource-src-5.4.0.tar.xz" ".tar"; + store = "/nix/store/h9qfbbj46sc2nhx24354b9cgq9hnssdc-qtsvg-opensource-src-5.4.0.tar.xz"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtsvg-opensource-src-5.4.0.tar.xz"; + sha256 = "12dpqb67mm1h1x3f4811zvk4dbnswsg58ipl57m3mdn7mhmpdvk8"; + name = "qtsvg-opensource-src-5.4.0.tar.xz"; + }; + } +] diff --git a/pkgs/development/libraries/qt-5/5.4/manifest.sh b/pkgs/development/libraries/qt-5/5.4/manifest.sh new file mode 100755 index 00000000000..333bb89afb1 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/manifest.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +if [ $# -eq 0 ]; then + + # The extra slash at the end of the URL is necessary to stop wget + # from recursing over the whole server! (No, it's not a bug.) + $(nix-build ../../../../.. -A autonix.manifest) \ + http://download.qt.io/official_releases/qt/5.4/5.4.0/submodules/ \ + -A '*.tar.xz' + +else + + $(nix-build ../../../.. -A autonix.manifest) -A '*.tar.xz' "$@" + +fi diff --git a/pkgs/development/libraries/qt-5/5.4/qt-submodule.nix b/pkgs/development/libraries/qt-5/5.4/qt-submodule.nix new file mode 100644 index 00000000000..e120d0a920c --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/qt-submodule.nix @@ -0,0 +1,58 @@ +{ stdenv, mkDerivation +, srcs, version +, lndir +, base +}: + +with stdenv.lib; + +args: + +mkDerivation (args // { + + name = "${args.name}-${version}"; + inherit version; + + srcs = args.srcs or [srcs."${args.name}-opensource-src"]; + + qtSubmodule = args.qtSubmodule or true; + dontAddPrefix = args.dontAddPrefix or true; + dontFixLibtool = args.dontFixLibtool or true; + configureScript = args.configureScript or "qmake"; + + preConfigure = '' + export PATH="$out/bin:$PATH" + ''; + + postInstall = '' + rm "$out/bin/qmake" "$out/bin/qt.conf" + + cat "$out/nix-support/qt-inputs" | while read file; do + if [[ -h "$out/$file" ]]; then + rm "$out/$file" + fi + done + + cat "$out/nix-support/qt-inputs" | while read file; do + if [[ -d "$out/$file" ]]; then + rmdir --ignore-fail-on-non-empty -p "$out/$file" + fi + done + + rm "$out/nix-support/qt-inputs" + ''; + + propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []); + + enableParallelBuilding = + args.enableParallelBuilding or true; # often fails on Hydra, as well as qt4 + + meta = args.meta or { + homepage = http://qt-project.org; + description = "A cross-platform application framework for C++"; + license = "GPL/LGPL"; + maintainers = with maintainers; [ bbenoist qknight ttuegel ]; + platforms = platforms.linux; + }; + +}) diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase.nix b/pkgs/development/libraries/qt-5/5.4/qtbase.nix new file mode 100644 index 00000000000..45de927bc8d --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/qtbase.nix @@ -0,0 +1,185 @@ +{ stdenv, substituteAll +, srcs, version + +, xlibs, libX11, libxcb, libXcursor, libXext, libXrender, libXi +, xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilwm, libxkbcommon +, fontconfig, freetype, openssl, dbus, glib, udev, libxml2, libxslt, pcre +, zlib, libjpeg, libpng, libtiff, sqlite, icu + +, coreutils, bison, flex, gdb, gperf, lndir, ruby +, python, perl, pkgconfig + +# optional dependencies +, cups ? null +, mysql ? null, postgresql ? null + +# options +, mesaSupported, mesa, mesa_glu +, buildDocs ? false +, buildExamples ? false +, buildTests ? false +, developerBuild ? false +, gtkStyle ? false, libgnomeui, GConf, gnome_vfs, gtk +}: + +with stdenv.lib; + +stdenv.mkDerivation { + + name = "qtbase-${version}"; + inherit version; + + srcs = with srcs; [ qt5-opensource-src qtbase-opensource-src ]; + sourceRoot = "qt-everywhere-opensource-src-${version}"; + + postUnpack = '' + mv qtbase-opensource-src-${version} ./qt-everywhere-opensource-src-${version}/qtbase + ''; + + prePatch = '' + substituteInPlace configure --replace /bin/pwd pwd + substituteInPlace qtbase/configure --replace /bin/pwd pwd + substituteInPlace qtbase/src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls + substituteInPlace qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \ + --replace /usr/share/X11/locale ${libX11}/share/X11/locale \ + --replace /usr/lib/X11/locale ${libX11}/share/X11/locale + sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i qtbase/mkspecs/*/*.conf + ''; + + patches = + optional gtkStyle + (substituteAll { + src = ./0001-dlopen-gtkstyle.patch; + # substituteAll ignores env vars starting with capital letter + gconf = GConf; + inherit gnome_vfs libgnomeui gtk; + }) + ++ [ + (substituteAll { + src = ./0004-dlopen-resolv.patch; + glibc = stdenv.cc.libc; + }) + (substituteAll { + src = ./0005-dlopen-gl.patch; + openglDriver = if mesaSupported then mesa.driverLink else "/no-such-path"; + }) + ./0006-tzdir.patch + (substituteAll { src = ./0010-dlopen-libXcursor.patch; inherit libXcursor; }) + (substituteAll { src = ./0011-dlopen-openssl.patch; inherit openssl; }) + (substituteAll { src = ./0012-dlopen-dbus.patch; dbus_libs = dbus; }) + ]; + + preConfigure = '' + export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$PWD/qttools/lib:$LD_LIBRARY_PATH" + export MAKEFLAGS=-j$NIX_BUILD_CORES + + sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/src/corelib/Qt5Config.cmake.in" + sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/src/corelib/Qt5CoreMacros.cmake" + sed -i 's/NO_DEFAULT_PATH//' "qtbase/src/gui/Qt5GuiConfigExtras.cmake.in" + sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in" + + export configureFlags+="-plugindir $out/lib/qt5/plugins -importdir $out/lib/qt5/imports -qmldir $out/lib/qt5/qml" + ''; + + prefixKey = "-prefix "; + + # -no-eglfs, -no-directfb, -no-linuxfb and -no-kms because of the current minimalist mesa + # TODO Remove obsolete and useless flags once the build will be totally mastered + configureFlags = '' + -verbose + -confirm-license + -opensource + + -release + -shared + -c++11 + ${optionalString developerBuild "-developer-build"} + -largefile + -accessibility + -rpath + -optimized-qmake + -strip + -reduce-relocations + -system-proxies + + -gui + -widgets + -opengl desktop + -qml-debug + -nis + -iconv + -icu + -pch + -glib + -xcb + -qpa xcb + -${optionalString (cups == null) "no-"}cups + + -no-eglfs + -no-directfb + -no-linuxfb + -no-kms + + -system-zlib + -system-libpng + -system-libjpeg + -system-xcb + -system-xkbcommon + -openssl-linked + -dbus-linked + + -system-sqlite + -${if mysql != null then "plugin" else "no"}-sql-mysql + -${if postgresql != null then "plugin" else "no"}-sql-psql + + -make libs + -make tools + -${optionalString (buildExamples == false) "no"}make examples + -${optionalString (buildTests == false) "no"}make tests + ''; + + propagatedBuildInputs = [ + xlibs.libXcomposite libX11 libxcb libXext libXrender libXi + fontconfig freetype openssl dbus.libs glib udev libxml2 libxslt pcre + zlib libjpeg libpng libtiff sqlite icu + xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon + ] + # Qt doesn't directly need GLU (just GL), but many apps use, it's small and + # doesn't remain a runtime-dep if not used + ++ optionals mesaSupported [ mesa mesa_glu ] + ++ optional (cups != null) cups + ++ optional (mysql != null) mysql + ++ optional (postgresql != null) postgresql; + + buildInputs = [ gdb bison flex gperf ruby ]; + + nativeBuildInputs = [ python perl pkgconfig ]; + + # freetype-2.5.4 changed signedness of some struct fields + NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare"; + + postInstall = + '' + ${optionalString buildDocs '' + make docs && make install_docs + ''} + + # Don't retain build-time dependencies like gdb and ruby. + sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $out/mkspecs/qconfig.pri + + mkdir -p "$out/nix-support" + substitute ${./setup-hook.sh} "$out/nix-support/setup-hook" \ + --subst-var out --subst-var-by lndir "${lndir}" + ''; + + enableParallelBuilding = true; # often fails on Hydra, as well as qt4 + + meta = { + homepage = http://qt-project.org; + description = "A cross-platform application framework for C++"; + license = "GPL/LGPL"; + maintainers = with maintainers; [ bbenoist qknight ttuegel ]; + platforms = platforms.linux; + }; + +} diff --git a/pkgs/development/libraries/qt-5/5.4/setup-hook.sh b/pkgs/development/libraries/qt-5/5.4/setup-hook.sh new file mode 100644 index 00000000000..ac76590d117 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/setup-hook.sh @@ -0,0 +1,58 @@ +addQtModule() { + if [[ -d "$1/mkspecs" ]]; then + + @lndir@/bin/lndir -silent "$1/mkspecs" "$qtOut/mkspecs" + if [[ -n $qtSubmodule ]]; then + find "$1/mkspecs" -printf 'mkspecs/%P\n' >> "$qtOut/nix-support/qt-inputs" + fi + + if [[ -d "$1/bin" ]]; then + @lndir@/bin/lndir -silent "$1/bin" "$qtOut/bin" + if [[ -n $qtSubmodule ]]; then + find "$1/bin" -printf 'bin/%P\n' >> "$qtOut/nix-support/qt-inputs" + fi + fi + + if [[ -d "$1/include" ]]; then + @lndir@/bin/lndir -silent "$1/include" "$qtOut/include" + if [[ -n $qtSubmodule ]]; then + find "$1/include" -printf 'include/%P\n' >> "$qtOut/nix-support/qt-inputs" + fi + fi + + if [[ -n $qtSubmodule ]] && [[ -d "$1/lib" ]]; then + @lndir@/bin/lndir -silent "$1/lib" "$qtOut/lib" + find "$1/lib" -printf 'lib/%P\n' >> "$qtOut/nix-support/qt-inputs" + fi + + propagatedBuildInputs+=" $1" + fi + + if [[ -f "$1/bin/qmake" ]]; then + addToSearchPath PATH "$qtOut/bin" + fi + + if [[ -d "$1/lib/qt5/qml" ]] || [[ -d "$1/lib/qt5/plugins" ]] || [[ -d "$1/lib/qt5/imports" ]]; then + propagatedUserEnvPkgs+=" $1" + fi +} + +qtOut="" +if [[ -z $qtSubmodule ]]; then + qtOut="$PWD/qmake-$name" +else + qtOut=$out +fi + +mkdir -p "$qtOut/bin" "$qtOut/mkspecs" "$qtOut/include" "$qtOut/nix-support" "$qtOut/lib" + +cp "@out@/bin/qmake" "$qtOut/bin" +cat >"$qtOut/bin/qt.conf" < Date: Sat, 21 Feb 2015 10:54:57 -0600 Subject: [PATCH 145/197] add kde-frameworks-5.7 --- .../libraries/kde-frameworks-5.7/default.nix | 199 +++++++ .../kde-frameworks-5.7/dependencies.nix | 500 ++++++++++++++++ .../kde-frameworks-5.7/dependencies.sh | 22 + .../0001-extra-cmake-modules-paths.patch | 74 +++ .../kauth/kauth-policy-install.patch | 13 + ...utils-pluginselector-follow-symlinks.patch | 13 + ...igwidgets-helpclient-follow-symlinks.patch | 13 + .../kdoctools-no-find-docbook-xml.patch | 12 + .../kinit/kinit-libpath.patch | 30 + .../kpackage/0001-allow-external-paths.patch | 25 + ...service-kbuildsycoca-follow-symlinks.patch | 13 + ...ce-kbuildsycoca-no-canonicalize-path.patch | 13 + .../0001-no-qcoreapplication.patch | 48 ++ .../libraries/kde-frameworks-5.7/manifest.nix | 562 ++++++++++++++++++ .../libraries/kde-frameworks-5.7/manifest.sh | 15 + .../plasma-framework-external-paths.patch | 13 + .../libraries/kde-frameworks-5.7/renames.nix | 68 +++ .../kde-frameworks-5.7/setup-hook.sh | 1 + pkgs/top-level/all-packages.nix | 2 + 19 files changed, 1636 insertions(+) create mode 100644 pkgs/development/libraries/kde-frameworks-5.7/default.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.7/dependencies.nix create mode 100755 pkgs/development/libraries/kde-frameworks-5.7/dependencies.sh create mode 100644 pkgs/development/libraries/kde-frameworks-5.7/extra-cmake-modules/0001-extra-cmake-modules-paths.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.7/kauth/kauth-policy-install.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.7/kcmutils/kcmutils-pluginselector-follow-symlinks.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.7/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.7/kdoctools/kdoctools-no-find-docbook-xml.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.7/kinit/kinit-libpath.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.7/kpackage/0001-allow-external-paths.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.7/kservice/kservice-kbuildsycoca-follow-symlinks.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.7/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.7/ktexteditor/0001-no-qcoreapplication.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.7/manifest.nix create mode 100755 pkgs/development/libraries/kde-frameworks-5.7/manifest.sh create mode 100644 pkgs/development/libraries/kde-frameworks-5.7/plasma-framework/plasma-framework-external-paths.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.7/renames.nix create mode 100644 pkgs/development/libraries/kde-frameworks-5.7/setup-hook.sh diff --git a/pkgs/development/libraries/kde-frameworks-5.7/default.nix b/pkgs/development/libraries/kde-frameworks-5.7/default.nix new file mode 100644 index 00000000000..3b899a91d4a --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.7/default.nix @@ -0,0 +1,199 @@ +# Maintainer's Notes: +# +# Minor updates: +# 1. Edit ./manifest.sh to point to the updated URL. Upstream sometimes +# releases updates that include only the changed packages; in this case, +# multiple URLs can be provided and the results will be merged. +# 2. Run ./manifest.sh and ./dependencies.sh. +# 3. Build and enjoy. +# +# Major updates: +# We prefer not to immediately overwrite older versions with major updates, so +# make a copy of this directory first. After copying, be sure to delete ./tmp +# if it exists. Then follow the minor update instructions. + +{ autonix, fetchurl, pkgs, qt5, stdenv, debug ? false }: + +with stdenv.lib; with autonix; + +let + + mkDerivation = drv: + stdenv.mkDerivation + (drv // { + setupHook = ./setup-hook.sh; + + enableParallelBuilding = drv.enableParallelBuilding or true; + cmakeFlags = + (drv.cmakeFlags or []) + ++ [ "-DBUILD_TESTING=OFF" + "-DKDE_DEFAULT_HOME=.kde5" + "-DKDE4_DEFAULT_HOME=.kde" + ] + ++ optional debug "-DCMAKE_BUILD_TYPE=Debug"; + + meta = drv.meta or + { + license = with stdenv.lib.licenses; [ + lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 + ]; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ ttuegel ]; + homepage = "http://www.kde.org"; + }; + }); + + renames = builtins.removeAttrs (import ./renames.nix {}) ["Backend" "CTest"]; + + scope = + # packages in this collection + (mapAttrs (dep: name: kf5."${name}") renames) // + # packages pinned to this version of Qt 5 + { + Phonon4Qt5 = pkgs.phonon_qt5.override { inherit qt5; }; + Qt5 = qt5.base; + Qt5Core = qt5.base; + Qt5DBus = qt5.base; + Qt5Gui = qt5.base; + Qt5LinguistTools = qt5.tools; + Qt5Qml = qt5.declarative; + Qt5Quick = qt5.quickcontrols; + Qt5Script = qt5.script; + Qt5Svg = qt5.svg; + Qt5WebkitWidgets = qt5.webkit; + Qt5Widgets = qt5.base; + Qt5X11Extras = qt5.x11extras; + Qt5XmlPatterns = qt5.xmlpatterns; + dbusmenu-qt5 = pkgs.libdbusmenu_qt5.override { inherit qt5; }; + } // + # packages from the nixpkgs collection + (with pkgs; + { + inherit cmake epoxy; + Boost = boost155; + GIF = giflib; + GLIB2 = glib; + Gpgme = gpgme; + JPEG = libjpeg; + LibGcrypt = libgcrypt; + LibGit2 = libgit2; + LibIntl = gettext; + LibLZMA = lzma; + NetworkManager = networkmanager; + Perl = perl; + PythonInterp = python; + QImageBlitz = qimageblitz; + SharedMimeInfo = shared_mime_info; + ZLIB = zlib; + } + ); + + mirror = "mirror://kde"; + + preResolve = super: + fold (f: x: f x) super + [ + (userEnvPkg "SharedMimeInfo") + (userEnvPkg "SharedDesktopOntologies") + ]; + + postResolve = super: + super // { + extra-cmake-modules = { + inherit (super.extra-cmake-modules) name src; + + propagatedNativeBuildInputs = [ pkgs.cmake pkgs.pkgconfig qt5.tools ]; + cmakeFlags = ["-DBUILD_TESTING=OFF"]; + patches = + [ + ./extra-cmake-modules/0001-extra-cmake-modules-paths.patch + ]; + meta = { + license = with stdenv.lib.licenses; [ bsd2 ]; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ ttuegel ]; + homepage = "http://www.kde.org"; + }; + }; + + frameworkintegration = super.frameworkintegration // { + buildInputs = with pkgs.xlibs; super.frameworkintegration.buildInputs ++ [ libXcursor ]; + }; + + kauth = super.kauth // { + buildInputs = + super.kauth.buildInputs + ++ [(pkgs.polkit_qt5.override { inherit qt5; })]; + patches = [./kauth/kauth-policy-install.patch]; + }; + + kcmutils = super.kcmutils // { + patches = + [./kcmutils/kcmutils-pluginselector-follow-symlinks.patch]; + }; + + kconfigwidgets = super.kconfigwidgets // { + patches = + [./kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch]; + }; + + kdelibs4support = with pkgs; super.kdelibs4support // { + buildInputs = + super.kdelibs4support.buildInputs + ++ [networkmanager xlibs.libSM]; + cmakeFlags = + (super.kdelibs4support.cmakeFlags or []) + ++ [ + "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook" + "-DDocBookXML4_DTD_VERSION=4.5" + ]; + }; + + kdoctools = with pkgs; super.kdoctools // { + cmakeFlags = + (super.kdoctools.cmakeFlags or []) + ++ [ + "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook" + "-DDocBookXML4_DTD_VERSION=4.5" + "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook" + ]; + patches = [./kdoctools/kdoctools-no-find-docbook-xml.patch]; + }; + + ki18n = with pkgs; super.ki18n // { + propagatedNativeBuildInputs = + super.ki18n.propagatedNativeBuildInputs ++ [gettext python]; + }; + + kimageformats = with pkgs; super.kimageformats // { + NIX_CFLAGS_COMPILE = + (super.kimageformats.NIX_CFLAGS_COMPILE or "") + + " -I${ilmbase}/include/OpenEXR"; + }; + + kinit = super.kinit // { patches = [ ./kinit/kinit-libpath.patch ]; }; + + kpackage = super.kpackage // { patches = [ ./kpackage/0001-allow-external-paths.patch ]; }; + + kservice = super.kservice // { + buildInputs = super.kservice.buildInputs ++ [kf5.kwindowsystem]; + patches = + [ + ./kservice/kservice-kbuildsycoca-follow-symlinks.patch + ./kservice/kservice-kbuildsycoca-no-canonicalize-path.patch + ]; + }; + + ktexteditor = super.ktexteditor // { + patches = [ ./ktexteditor/0001-no-qcoreapplication.patch ]; + }; + + }; + + kf5 = generateCollection ./. { + inherit mirror mkDerivation preResolve postResolve renames scope; + }; + +in + + kf5 // { inherit mkDerivation qt5 scope; } diff --git a/pkgs/development/libraries/kde-frameworks-5.7/dependencies.nix b/pkgs/development/libraries/kde-frameworks-5.7/dependencies.nix new file mode 100644 index 00000000000..c4a2977b8e5 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.7/dependencies.nix @@ -0,0 +1,500 @@ +# DO NOT EDIT! This file is generated automatically. +{ }: +{ + attica = { + buildInputs = [ "ECM" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5Network" "Qt5Test" "Qt5Widgets" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "Qt5Core" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + extra-cmake-modules = { + buildInputs = [ "AGG" "Blitz" "BlueZ" "ENCHANT" "Eigen2" "FFmpeg" "Flac" "Flex" "GObject" "GStreamer" "LCMS" "LibArt" "OpenEXR" "PCRE" "QCA2" "QImageBlitz" "Qt5Core" "Qt5LinguistTools" "Qt5QUIET" "Sqlite" "Strigi" "USB" "Xine" "Xmms" ]; + nativeBuildInputs = [ "LibXslt" "QCOLLECTIONGENERATOR_EXECUTABLE" "SPHINX_EXECUTABLE" "cmake" ]; + propagatedBuildInputs = [ ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + frameworkintegration = { + buildInputs = [ "ECM" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Notifications" "KF5WidgetsAddons" "OxygenFont" "Qt5" "Qt5DBus" "Qt5QUIET" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" "XCB" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5IconThemes" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kactivities = { + buildInputs = [ "Boost" "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5DBusAddons" "KF5Declarative" "KF5GlobalAccel" "KF5I18n" "KF5KCMUtils" "KF5KIO" "KF5Service" "KF5WindowSystem" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Gui" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5Sql" "Qt5Test" "Qt5Widgets" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "Qt5Core" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kapidox = { + buildInputs = [ ]; + nativeBuildInputs = [ "PythonInterp" "cmake" ]; + propagatedBuildInputs = [ ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + karchive = { + buildInputs = [ "BZip2" "ECM" "KF5Archive" "LibLZMA" "Qt5Core" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" "ZLIB" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "Qt5Core" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kauth = { + buildInputs = [ "ECM" "KF5CoreAddons" "Qt5" "Qt5DBus" "Qt5QUIET" "Qt5Test" "Qt5Widgets" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5CoreAddons" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kbookmarks = { + buildInputs = [ "ECM" "KF5ConfigWidgets" "KF5CoreAddons" "KF5IconThemes" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" "Qt5Widgets" "Qt5Xml" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5IconThemes" "KF5XmlGui" "Qt5Widgets" "Qt5Xml" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kcmutils = { + buildInputs = [ "ECM" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5Service" "KF5XmlGui" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5Widgets" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5IconThemes" "KF5ItemViews" "KF5Service" "KF5XmlGui" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kcodecs = { + buildInputs = [ "ECM" "Qt5Core" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "Qt5Core" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kcompletion = { + buildInputs = [ "ECM" "KF5Config" "KF5WidgetsAddons" "Qt5" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" "Qt5Widgets" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5Config" "KF5WidgetsAddons" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kconfig = { + buildInputs = [ "ECM" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5Gui" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" "Qt5Xml" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "Qt5Xml" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kconfigwidgets = { + buildInputs = [ "ECM" "KF5Auth" "KF5Codecs" "KF5Config" "KF5CoreAddons" "KF5DocTools" "KF5GuiAddons" "KF5I18n" "KF5WidgetsAddons" "Qt5" "Qt5Test" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5Auth" "KF5Codecs" "KF5Config" "KF5GuiAddons" "KF5I18n" "KF5WidgetsAddons" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kcoreaddons = { + buildInputs = [ "ECM" "FAM" "Qt5" "Qt5Core" "Qt5QUIET" "Qt5Test" "Qt5Widgets" "SharedMimeInfo" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "Qt5Core" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ "SharedMimeInfo" ]; + }; + + kcrash = { + buildInputs = [ "ECM" "KF5CoreAddons" "KF5WindowSystem" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5CoreAddons" "KF5WindowSystem" "Qt5Core" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kdbusaddons = { + buildInputs = [ "ECM" "Qt5DBus" "Qt5NO_MODULE" "Qt5Test" "Qt5X11Extras" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "Qt5DBus" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kdeclarative = { + buildInputs = [ "ECM" "KF5Config" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" "Qt5Gui" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5Test" "epoxy" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5KIO" "Qt5Qml" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kded = { + buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5DocTools" "KF5Init" "KF5Service" "Qt5" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kdelibs4support = { + buildInputs = [ "AGG" "Blitz" "BlueZ" "DocBookXML4" "ECM" "ENCHANT" "Eigen2" "FFmpeg" "Flac" "GObject" "GStreamer" "KDEWin" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5Crash" "KF5DesignerPlugin" "KF5DocTools" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Notifications" "KF5Parts" "KF5Service" "KF5TextWidgets" "KF5UnitConversion" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "LCMS" "LibArt" "NetworkManager" "OpenEXR" "OpenSSL" "PCRE" "QCA2" "QImageBlitz" "QNtrack" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5Designer" "Qt5NO_MODULE" "Qt5Network" "Qt5PrintSupport" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "Sqlite" "USB" "X11" "Xine" "Xmms" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KDEWin" "KF5Auth" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5DesignerPlugin" "KF5DocTools" "KF5Emoticons" "KF5GuiAddons" "KF5IconThemes" "KF5Init" "KF5ItemModels" "KF5KDELibs4Support" "KF5Notifications" "KF5Parts" "KF5TextWidgets" "KF5UnitConversion" "KF5WindowSystem" "Qt5DBus" "Qt5PrintSupport" "Qt5Xml" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kdesignerplugin = { + buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DocTools" "KF5IconThemes" "KF5ItemViews" "KF5KIO" "KF5Plotting" "KF5Sonnet" "KF5TextWidgets" "KF5WebKit" "KF5WidgetsAddons" "KF5XmlGui" "Qt5Core" "Qt5Designer" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" "Qt5Widgets" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kdesu = { + buildInputs = [ "ECM" "KF5CoreAddons" "KF5Pty" "KF5Service" "Qt5Core" "Qt5NO_MODULE" "X11" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5Pty" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kdewebkit = { + buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5JobWidgets" "KF5KIO" "KF5Parts" "KF5Service" "KF5Wallet" "Qt5" "Qt5Core" "Qt5Network" "Qt5WebKitWidgets" "Qt5Widgets" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "Qt5WebKitWidgets" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kdnssd = { + buildInputs = [ "Avahi" "DNSSD" "ECM" "Qt5" "Qt5DBus" "Qt5Network" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "Qt5Network" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kdoctools = { + buildInputs = [ "DocBookXML4" "DocBookXSL" "ECM" "KF5Archive" "KF5DocTools" "KF5I18n" "LibXml2" "Qt5Core" "Qt5NO_MODULE" ]; + nativeBuildInputs = [ "LibXslt" "cmake" ]; + propagatedBuildInputs = [ "KF5Archive" "Qt5Core" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kemoticons = { + buildInputs = [ "ECM" "KF5Archive" "KF5Config" "KF5CoreAddons" "KF5Service" "Qt5" "Qt5Gui" "Qt5Test" "Qt5Widgets" "Qt5Xml" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5Archive" "KF5Service" "Qt5Gui" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kglobalaccel = { + buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5I18n" "KF5WindowSystem" "Qt5" "Qt5DBus" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" "XCB" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "Qt5DBus" "Qt5Widgets" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kguiaddons = { + buildInputs = [ "ECM" "Qt5" "Qt5Gui" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" "XCB" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "Qt5Gui" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + khtml = { + buildInputs = [ "ECM" "GIF" "JPEG" "KDEWin" "KF5Archive" "KF5Codecs" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5JS" "KF5KIO" "KF5Notifications" "KF5Parts" "KF5Sonnet" "KF5TextWidgets" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "OpenSSL" "PNG" "Phonon4Qt5" "Qt5" "Qt5Test" "Qt5X11Extras" "X11" ]; + nativeBuildInputs = [ "Perl" "cmake" ]; + propagatedBuildInputs = [ "KF5Archive" "KF5Bookmarks" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5JS" "KF5KIO" "KF5Notifications" "KF5Parts" "KF5Sonnet" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5Core" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + ki18n = { + buildInputs = [ "ECM" "LibIntl" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5Script" "Qt5Test" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kiconthemes = { + buildInputs = [ "ECM" "KF5ConfigWidgets" "KF5I18n" "KF5ItemViews" "KF5WidgetsAddons" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5Svg" "Qt5Test" "Qt5Widgets" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5I18n" "KF5ItemViews" "KF5WidgetsAddons" "Qt5Widgets" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kidletime = { + buildInputs = [ "ECM" "Qt5" "Qt5DBus" "Qt5Widgets" "Qt5X11Extras" "X11" "X11_XCB" "XCB" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "Qt5Core" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kimageformats = { + buildInputs = [ "ECM" "Jasper" "OpenEXR" "Qt5Gui" "Qt5NO_MODULE" "Qt5PrintSupport" "Qt5QUIET" "Qt5Test" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kinit = { + buildInputs = [ "ECM" "KF5Config" "KF5Crash" "KF5DocTools" "KF5I18n" "KF5KIO" "KF5Service" "KF5WindowSystem" "Libcap" "Qt5" "X11" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kio = { + buildInputs = [ "ACL" "ECM" "GSSAPI" "KF5Archive" "KF5Bookmarks" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5JobWidgets" "KF5Notifications" "KF5Service" "KF5Solid" "KF5TextWidgets" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "LibXml2" "OpenSSL" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5DBus" "Qt5NO_MODULE" "Qt5Network" "Qt5Script" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "Qt5Xml" "Strigi" "X11" "ZLIB" ]; + nativeBuildInputs = [ "LibXslt" "cmake" ]; + propagatedBuildInputs = [ "KF5Bookmarks" "KF5Completion" "KF5Config" "KF5CoreAddons" "KF5ItemViews" "KF5JobWidgets" "KF5Service" "KF5Solid" "KF5XmlGui" "Qt5Network" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kitemmodels = { + buildInputs = [ "ECM" "Grantlee" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5Script" "Qt5Test" "Qt5Widgets" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "Qt5Core" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kitemviews = { + buildInputs = [ "ECM" "Qt5" "Qt5Test" "Qt5Widgets" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "Qt5Widgets" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kjobwidgets = { + buildInputs = [ "ECM" "KF5CoreAddons" "KF5WidgetsAddons" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5CoreAddons" "KF5WidgetsAddons" "Qt5Widgets" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kjs = { + buildInputs = [ "ECM" "PCRE" "Qt5Core" "Qt5NO_MODULE" "Qt5Test" ]; + nativeBuildInputs = [ "Perl" "cmake" ]; + propagatedBuildInputs = [ "Qt5Core" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kjsembed = { + buildInputs = [ "ECM" "KF5DocTools" "KF5I18n" "KF5JS" "Qt5" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5I18n" "KF5JS" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kmediaplayer = { + buildInputs = [ "ECM" "KF5Parts" "KF5XmlGui" "Qt5DBus" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5Parts" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + knewstuff = { + buildInputs = [ "ECM" "KF5Archive" "KF5Attica" "KF5Completion" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KIO" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" "Qt5Xml" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5Archive" "KF5Attica" "KF5KIO" "KF5XmlGui" "Qt5Widgets" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + knotifications = { + buildInputs = [ "ECM" "KF5Codecs" "KF5Config" "KF5CoreAddons" "KF5IconThemes" "KF5Service" "KF5WindowSystem" "Phonon4Qt5" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" "dbusmenu-qt5" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5WindowSystem" "Qt5Widgets" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + knotifyconfig = { + buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5KIO" "KF5Notifications" "KF5Service" "KF5WidgetsAddons" "KF5XmlGui" "Phonon4Qt5" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5I18n" "KF5KIO" "Qt5Widgets" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kpackage = { + buildInputs = [ "ECM" "KF5Archive" "KF5Config" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5Test" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kparts = { + buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5JobWidgets" "KF5KIO" "KF5Notifications" "KF5Service" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5Test" "Qt5Widgets" "Qt5Xml" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5KIO" "KF5Notifications" "KF5TextWidgets" "KF5XmlGui" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kplotting = { + buildInputs = [ "ECM" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "Qt5Widgets" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kpty = { + buildInputs = [ "ECM" "KF5CoreAddons" "KF5I18n" "Qt5" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5CoreAddons" "KF5I18n" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kross = { + buildInputs = [ "ECM" "KF5Completion" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Parts" "KF5Service" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5QUIET" "Qt5Script" "Qt5Test" "Qt5UiTools" "Qt5Widgets" "Qt5Xml" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Parts" "KF5WidgetsAddons" "Qt5Script" "Qt5Widgets" "Qt5Xml" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + krunner = { + buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5KIO" "KF5Plasma" "KF5Service" "KF5Solid" "KF5ThreadWeaver" "Qt5" "Qt5Gui" "Qt5NO_MODULE" "Qt5Quick" "Qt5Test" "Qt5Widgets" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5Plasma" "Qt5Core" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kservice = { + buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5Test" "Qt5Xml" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5Config" "KF5CoreAddons" "KF5DBusAddons" "KF5I18n" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + ktexteditor = { + buildInputs = [ "ECM" "KF5Archive" "KF5Config" "KF5GuiAddons" "KF5I18n" "KF5KIO" "KF5Parts" "KF5Sonnet" "LibGit2" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5PrintSupport" "Qt5Script" "Qt5Test" "Qt5Widgets" "Qt5Xml" "Qt5XmlPatterns" ]; + nativeBuildInputs = [ "Perl" "cmake" ]; + propagatedBuildInputs = [ ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + ktextwidgets = { + buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5Service" "KF5Sonnet" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" "Qt5DBus" "Qt5Test" "Qt5Widgets" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5Completion" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5Service" "KF5Sonnet" "KF5WindowSystem" "Qt5Widgets" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kunitconversion = { + buildInputs = [ "ECM" "KF5I18n" "Qt5" "Qt5Core" "Qt5Network" "Qt5Test" "Qt5Xml" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5Config" "KF5I18n" "Qt5Core" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kwallet = { + buildInputs = [ "ECM" "Gpgme" "KF5Config" "KF5CoreAddons" "KF5DBusAddons" "KF5Gpgmepp" "KF5I18n" "KF5IconThemes" "KF5Notifications" "KF5Service" "KF5WidgetsAddons" "KF5WindowSystem" "LibGcrypt" "Qt5" "Qt5DBus" "Qt5Gui" "Qt5Test" "Qt5Widgets" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5Config" "KF5WindowSystem" "Qt5Core" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kwidgetsaddons = { + buildInputs = [ "ECM" "Qt5" "Qt5Test" "Qt5UiTools" "Qt5Widgets" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "Qt5Widgets" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kwindowsystem = { + buildInputs = [ "ECM" "Qt5" "Qt5Test" "Qt5Widgets" "Qt5WinExtras" "Qt5X11Extras" "X11" "XCB" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "Qt5Widgets" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + kxmlgui = { + buildInputs = [ "ECM" "KF5Attica" "KF5Config" "KF5ConfigWidgets" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5TextWidgets" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" "Qt5DBus" "Qt5Network" "Qt5PrintSupport" "Qt5Test" "Qt5Widgets" "Qt5Xml" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "KF5Attica" "KF5Config" "KF5ConfigWidgets" "KF5GlobalAccel" "KF5IconThemes" "KF5ItemViews" "KF5TextWidgets" "KF5WindowSystem" "Qt5DBus" "Qt5Xml" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + networkmanager-qt = { + buildInputs = [ "ECM" "KF5NetworkManagerQt" "NetworkManager" "Qt4" "Qt5" "Qt5Core" "Qt5DBus" "Qt5NO_MODULE" "Qt5Network" "Qt5Test" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "Qt5Core" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + plasma-framework = { + buildInputs = [ "ECM" "EGL" "Gpgme" "KActivities" "KCoreAddons" "KDE4Support" "KDESu" "KDeclarative" "KF5" "KF5Activities" "KF5Archive" "KF5Auth" "KF5Bookmarks" "KF5Codecs" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5Declarative" "KF5DocTools" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5IdleTime" "KF5Init" "KF5ItemModels" "KF5ItemViews" "KF5JS" "KF5JobWidgets" "KF5KArchive" "KF5KAuth" "KF5KBookmarks" "KF5KCodecs" "KF5KCompletion" "KF5KConfig" "KF5KConfigWidgets" "KF5KCoreAddons" "KF5KCrash" "KF5KDBusAddons" "KF5KDE4Support" "KF5KDESu" "KF5KDeclarative" "KF5KDocTools" "KF5KF5GlobalAccel" "KF5KGuiAddons" "KF5KI18n" "KF5KIO" "KF5KIconThemes" "KF5KIdleTime" "KF5KInit" "KF5KJS" "KF5KJobWidgets" "KF5KNotifications" "KF5KParts" "KF5KService" "KF5KTextWidgets" "KF5KUnitConversion" "KF5KWallet" "KF5KWidgetsAddons" "KF5KWindowSystem" "KF5Kross" "KF5NO_MODULE" "KF5Notifications" "KF5Package" "KF5Parts" "KF5Service" "KF5Solid" "KF5Sonnet" "KF5Su" "KF5TextWidgets" "KF5ThreadWeaver" "KF5UnitConversion" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "KdepimLibs" "OpenGL" "QCA2" "Qt5" "Qt5Gui" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5Script" "Qt5Sql" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "Solid" "X11" "XCB" ]; + nativeBuildInputs = [ "SH" "cmake" ]; + propagatedBuildInputs = [ "KF5Package" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + solid = { + buildInputs = [ "ECM" "IOKit" "MediaPlayerInfo" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5Network" "Qt5QUIET" "Qt5Qml" "Qt5Test" "Qt5Widgets" "Qt5Xml" "UDev" ]; + nativeBuildInputs = [ "BISON" "FLEX" "cmake" ]; + propagatedBuildInputs = [ "Qt5Core" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + sonnet = { + buildInputs = [ "ASPELL" "ECM" "ENCHANT" "HSPELL" "HUNSPELL" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" "ZLIB" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ "Qt5Core" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + + threadweaver = { + buildInputs = [ "ECM" "KF5ThreadWeaver" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5Network" "Qt5Test" "Qt5Widgets" "Qt5Xml" ]; + nativeBuildInputs = [ "SNIPPETEXTRACTOR" "cmake" ]; + propagatedBuildInputs = [ "Qt5Core" ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + +} diff --git a/pkgs/development/libraries/kde-frameworks-5.7/dependencies.sh b/pkgs/development/libraries/kde-frameworks-5.7/dependencies.sh new file mode 100755 index 00000000000..2b220244c59 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.7/dependencies.sh @@ -0,0 +1,22 @@ +#!/bin/sh + +# This script rebuilds dependencies.nix. +# You must run manifest.sh first to download the packages. + +# Without arguments, this will use the version of autonix-deps-kf5 in nixpkgs. +# If you are working on the packages, this is probably what you want. + +# You can also pass the path to a source tree where you have built +# autonix-deps-kf5 yourself. If you are working on autonix-deps-kf5, this is +# probably what you want. + +manifestXML=$(nix-build -E 'with (import ../../../.. {}); autonix.writeManifestXML ./manifest.nix') + +autonixDepsKf5="" +if [[ -z $1 ]]; then + autonixDepsKF5=$(nix-build ../../../.. -A haskellngPackages.autonix-deps-kf5)/bin +else + autonixDepsKF5="$1/dist/build/kf5-deps" +fi + +exec ${autonixDepsKF5}/kf5-deps "${manifestXML}" diff --git a/pkgs/development/libraries/kde-frameworks-5.7/extra-cmake-modules/0001-extra-cmake-modules-paths.patch b/pkgs/development/libraries/kde-frameworks-5.7/extra-cmake-modules/0001-extra-cmake-modules-paths.patch new file mode 100644 index 00000000000..9717716faf5 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.7/extra-cmake-modules/0001-extra-cmake-modules-paths.patch @@ -0,0 +1,74 @@ +From 3cc148e878b69fc3e0228f3e3bf1bbe689dad87c Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Fri, 20 Feb 2015 23:17:39 -0600 +Subject: [PATCH] extra-cmake-modules paths + +--- + kde-modules/KDEInstallDirs.cmake | 37 ++++--------------------------------- + 1 file changed, 4 insertions(+), 33 deletions(-) + +diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake +index b7cd34d..2f868ac 100644 +--- a/kde-modules/KDEInstallDirs.cmake ++++ b/kde-modules/KDEInstallDirs.cmake +@@ -193,37 +193,8 @@ + # (To distribute this file outside of extra-cmake-modules, substitute the full + # License text for the above reference.) + +-# Figure out what the default install directory for libraries should be. +-# This is based on the logic in GNUInstallDirs, but simplified (the +-# GNUInstallDirs code deals with re-configuring, but that is dealt with +-# by the _define_* macros in this module). ++# The default library directory on NixOS is *always* /lib. + set(_LIBDIR_DEFAULT "lib") +-# Override this default 'lib' with 'lib64' iff: +-# - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling +-# - we are NOT on debian +-# - we are on a 64 bits system +-# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf +-# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if +-# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu" +-# See http://wiki.debian.org/Multiarch +-if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU") +- AND NOT CMAKE_CROSSCOMPILING) +- if (EXISTS "/etc/debian_version") # is this a debian system ? +- if(CMAKE_LIBRARY_ARCHITECTURE) +- set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}") +- endif() +- else() # not debian, rely on CMAKE_SIZEOF_VOID_P: +- if(NOT DEFINED CMAKE_SIZEOF_VOID_P) +- message(AUTHOR_WARNING +- "Unable to determine default LIB_INSTALL_LIBDIR directory because no target architecture is known. " +- "Please enable at least one language before including KDEInstallDirs.") +- else() +- if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") +- set(_LIBDIR_DEFAULT "lib64") +- endif() +- endif() +- endif() +-endif() + + set(_gnu_install_dirs_vars + BINDIR +@@ -445,15 +416,15 @@ if(KDE_INSTALL_USE_QT_SYS_PATHS) + "QtQuick2 imports" + QML_INSTALL_DIR) + else() +- _define_relative(QTPLUGINDIR LIBDIR "plugins" ++ _define_relative(QTPLUGINDIR LIBDIR "qt5/plugins" + "Qt plugins" + QT_PLUGIN_INSTALL_DIR) + +- _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "imports" ++ _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "qt5/imports" + "QtQuick1 imports" + IMPORTS_INSTALL_DIR) + +- _define_relative(QMLDIR LIBDIR "qml" ++ _define_relative(QMLDIR LIBDIR "qt5/qml" + "QtQuick2 imports" + QML_INSTALL_DIR) + endif() +-- +2.3.0 + diff --git a/pkgs/development/libraries/kde-frameworks-5.7/kauth/kauth-policy-install.patch b/pkgs/development/libraries/kde-frameworks-5.7/kauth/kauth-policy-install.patch new file mode 100644 index 00000000000..340155256f2 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.7/kauth/kauth-policy-install.patch @@ -0,0 +1,13 @@ +diff --git a/KF5AuthConfig.cmake.in b/KF5AuthConfig.cmake.in +index e859ec7..9a8ab18 100644 +--- a/KF5AuthConfig.cmake.in ++++ b/KF5AuthConfig.cmake.in +@@ -4,7 +4,7 @@ set(KAUTH_STUB_FILES_DIR "${PACKAGE_PREFIX_DIR}/@KF5_DATA_INSTALL_DIR@/kauth/") + + set(KAUTH_BACKEND_NAME "@KAUTH_BACKEND_NAME@") + set(KAUTH_HELPER_BACKEND_NAME "@KAUTH_HELPER_BACKEND_NAME@") +-set(KAUTH_POLICY_FILES_INSTALL_DIR "@KAUTH_POLICY_FILES_INSTALL_DIR@") ++set(KAUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions") + set(KAUTH_HELPER_INSTALL_DIR "@KAUTH_HELPER_INSTALL_DIR@") + + find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@") diff --git a/pkgs/development/libraries/kde-frameworks-5.7/kcmutils/kcmutils-pluginselector-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.7/kcmutils/kcmutils-pluginselector-follow-symlinks.patch new file mode 100644 index 00000000000..47b8dfad180 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.7/kcmutils/kcmutils-pluginselector-follow-symlinks.patch @@ -0,0 +1,13 @@ +diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp +index c63241b..2243f94 100644 +--- a/src/kpluginselector.cpp ++++ b/src/kpluginselector.cpp +@@ -304,7 +304,7 @@ void KPluginSelector::addPlugins(const QString &componentName, + QStringList desktopFileNames; + const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory); + Q_FOREACH (const QString &dir, dirs) { +- QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories); ++ QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); + while (it.hasNext()) { + desktopFileNames.append(it.next()); + } diff --git a/pkgs/development/libraries/kde-frameworks-5.7/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.7/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch new file mode 100644 index 00000000000..3bd946cbd84 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.7/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch @@ -0,0 +1,13 @@ +diff --git a/src/khelpclient.cpp b/src/khelpclient.cpp +index 53a331e..80fbb01 100644 +--- a/src/khelpclient.cpp ++++ b/src/khelpclient.cpp +@@ -48,7 +48,7 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname) + QString docPath; + const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation); + Q_FOREACH (const QString &dir, desktopDirs) { +- QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories); ++ QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); + while (it.hasNext()) { + const QString desktopPath(it.next()); + KDesktopFile desktopFile(desktopPath); diff --git a/pkgs/development/libraries/kde-frameworks-5.7/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/development/libraries/kde-frameworks-5.7/kdoctools/kdoctools-no-find-docbook-xml.patch new file mode 100644 index 00000000000..4e3a33efab3 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.7/kdoctools/kdoctools-no-find-docbook-xml.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5c4863c..f731775 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -46,7 +46,6 @@ set_package_properties(LibXml2 PROPERTIES + ) + + +-find_package(DocBookXML4 "4.5") + + set_package_properties(DocBookXML4 PROPERTIES + TYPE REQUIRED diff --git a/pkgs/development/libraries/kde-frameworks-5.7/kinit/kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks-5.7/kinit/kinit-libpath.patch new file mode 100644 index 00000000000..a6ccb2085d3 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.7/kinit/kinit-libpath.patch @@ -0,0 +1,30 @@ +diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp +index 3c3c913..f510620 100644 +--- a/src/kdeinit/kinit.cpp ++++ b/src/kdeinit/kinit.cpp +@@ -652,15 +652,17 @@ static pid_t launch(int argc, const char *_name, const char *args, + if (!libpath.isEmpty()) { + if (!l.load()) { + if (libpath_relative) { +- // NB: Because Qt makes the actual dlopen() call, the +- // RUNPATH of kdeinit is *not* respected - see +- // https://sourceware.org/bugzilla/show_bug.cgi?id=13945 +- // - so we try hacking it in ourselves +- QString install_lib_dir = QFile::decodeName( +- CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/"); +- libpath = install_lib_dir + libpath; +- l.setFileName(libpath); ++ // Use QT_PLUGIN_PATH to find shared library directories ++ // For KF5, the plugin path is /lib/plugins, so the kdeinit5 ++ // shared libraries should be in /lib/plugins/../ ++ const QRegExp pathSepRegExp(QString::fromLatin1("[:\b]")); ++ const QString up = QString::fromLocal8Bit("/../"); ++ const QStringList paths = QString::fromLocal8Bit(qgetenv("QT_PLUGIN_PATH")).split(pathSepRegExp, QString::KeepEmptyParts); ++ Q_FOREACH (const QString &path, paths) { ++ l.setFileName(path + up + libpath); + l.load(); ++ if (l.isLoaded()) break; ++ } + } + } + if (!l.isLoaded()) { diff --git a/pkgs/development/libraries/kde-frameworks-5.7/kpackage/0001-allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.7/kpackage/0001-allow-external-paths.patch new file mode 100644 index 00000000000..440e979c008 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.7/kpackage/0001-allow-external-paths.patch @@ -0,0 +1,25 @@ +From fbf10d2059fa1f19a0f0cfa2fda0abb6c435fa78 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Wed, 28 Jan 2015 07:15:30 -0600 +Subject: [PATCH] allow external paths + +--- + src/kpackage/package.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/kpackage/package.cpp b/src/kpackage/package.cpp +index eb4a09b..f70f1a1 100644 +--- a/src/kpackage/package.cpp ++++ b/src/kpackage/package.cpp +@@ -758,7 +758,7 @@ PackagePrivate::PackagePrivate() + : QSharedData(), + fallbackPackage(0), + metadata(0), +- externalPaths(false), ++ externalPaths(true), + valid(false), + checkedValid(false) + { +-- +2.1.4 + diff --git a/pkgs/development/libraries/kde-frameworks-5.7/kservice/kservice-kbuildsycoca-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.7/kservice/kservice-kbuildsycoca-follow-symlinks.patch new file mode 100644 index 00000000000..e9bc418544a --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.7/kservice/kservice-kbuildsycoca-follow-symlinks.patch @@ -0,0 +1,13 @@ +diff --git a/src/kbuildsycoca/kbuildsycoca.cpp b/src/kbuildsycoca/kbuildsycoca.cpp +index 69b1427..9c37a49 100644 +--- a/src/kbuildsycoca/kbuildsycoca.cpp ++++ b/src/kbuildsycoca/kbuildsycoca.cpp +@@ -227,7 +227,7 @@ bool KBuildSycoca::build() + QStringList relFiles; + const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, g_resourceSubdir, QStandardPaths::LocateDirectory); + Q_FOREACH (const QString &dir, dirs) { +- QDirIterator it(dir, QDirIterator::Subdirectories); ++ QDirIterator it(dir, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); + while (it.hasNext()) { + const QString filePath = it.next(); + Q_ASSERT(filePath.startsWith(dir)); // due to the line below... diff --git a/pkgs/development/libraries/kde-frameworks-5.7/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.7/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch new file mode 100644 index 00000000000..7e21ebfe86f --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.7/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch @@ -0,0 +1,13 @@ +diff --git a/src/kbuildsycoca/vfolder_menu.cpp b/src/kbuildsycoca/vfolder_menu.cpp +index 2eb1275..e39a36f 100644 +--- a/src/kbuildsycoca/vfolder_menu.cpp ++++ b/src/kbuildsycoca/vfolder_menu.cpp +@@ -412,7 +412,7 @@ VFolderMenu::absoluteDir(const QString &_dir, const QString &baseDir, bool keepR + } + + if (!relative) { +- QString resolved = QDir(dir).canonicalPath(); ++ QString resolved = QDir::cleanPath(dir); + if (!resolved.isEmpty()) { + dir = resolved; + } diff --git a/pkgs/development/libraries/kde-frameworks-5.7/ktexteditor/0001-no-qcoreapplication.patch b/pkgs/development/libraries/kde-frameworks-5.7/ktexteditor/0001-no-qcoreapplication.patch new file mode 100644 index 00000000000..c2e77a537c5 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.7/ktexteditor/0001-no-qcoreapplication.patch @@ -0,0 +1,48 @@ +From 71e28c7c6fdd1142f04c662f45cc8f779e457cda Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Sun, 15 Feb 2015 19:09:17 -0600 +Subject: [PATCH] no qcoreapplication + +--- + src/syntax/data/katehighlightingindexer.cpp | 11 ++++------- + 1 file changed, 4 insertions(+), 7 deletions(-) + +diff --git a/src/syntax/data/katehighlightingindexer.cpp b/src/syntax/data/katehighlightingindexer.cpp +index 3f02e8c..d1a865b 100644 +--- a/src/syntax/data/katehighlightingindexer.cpp ++++ b/src/syntax/data/katehighlightingindexer.cpp +@@ -49,19 +49,16 @@ QStringList readListing(const QString &fileName) + + int main(int argc, char *argv[]) + { +- // get app instance +- QCoreApplication app(argc, argv); +- + // ensure enough arguments are passed +- if (app.arguments().size() < 3) ++ if (argc < 3) + return 1; + + // open schema + QXmlSchema schema; +- if (!schema.load(QUrl::fromLocalFile(app.arguments().at(2)))) ++ if (!schema.load(QUrl::fromLocalFile(QString::fromLocal8Bit(argv[2])))) + return 2; + +- const QString hlFilenamesListing = app.arguments().value(3); ++ const QString hlFilenamesListing = QString::fromLocal8Bit(argv[3]); + if (hlFilenamesListing.isEmpty()) { + return 1; + } +@@ -127,7 +124,7 @@ int main(int argc, char *argv[]) + return anyError; + + // create outfile, after all has worked! +- QFile outFile(app.arguments().at(1)); ++ QFile outFile(QString::fromLocal8Bit(argv[1])); + if (!outFile.open(QIODevice::WriteOnly | QIODevice::Truncate)) + return 7; + +-- +2.1.4 + diff --git a/pkgs/development/libraries/kde-frameworks-5.7/manifest.nix b/pkgs/development/libraries/kde-frameworks-5.7/manifest.nix new file mode 100644 index 00000000000..e2d215889e0 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.7/manifest.nix @@ -0,0 +1,562 @@ +# This file is generated automatically. DO NOT EDIT! +{ stdenv, fetchurl, mirror }: +[ + { + name = stdenv.lib.nameFromURL "kplotting-5.7.0.tar.xz" ".tar"; + store = "/nix/store/qldfj7r4gfnwd9137m5x282kn9clghvc-kplotting-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/kplotting-5.7.0.tar.xz"; + sha256 = "0257ydhyq0f5r2yl0va4y8zcb7vxll1jdz6ykaskg413hm2qxkpi"; + name = "kplotting-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktextwidgets-5.7.0.tar.xz" ".tar"; + store = "/nix/store/kpbcn842lgx6h7cj7rblc60h656qqv49-ktextwidgets-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/ktextwidgets-5.7.0.tar.xz"; + sha256 = "0yhhm9cgn2lbj2ca64szyy11xviaqj5kil5kwivwnndzvaap9ja5"; + name = "ktextwidgets-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ki18n-5.7.0.tar.xz" ".tar"; + store = "/nix/store/x5y7xgpn24rw7ax1xm5m3z0kd1db3k5p-ki18n-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/ki18n-5.7.0.tar.xz"; + sha256 = "16vz9hrm1j5gl5k0mbx36rxxngxbfwwlg7sznplybcghdzf5xwpc"; + name = "ki18n-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "attica-5.7.0.tar.xz" ".tar"; + store = "/nix/store/fa5fimm0kc5yymlj05hcljz4lnyx15xz-attica-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/attica-5.7.0.tar.xz"; + sha256 = "1xxd3062bv65npc3kxpsaw3805sg12fq76wy3qa1mqqy3074hvwh"; + name = "attica-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdesignerplugin-5.7.0.tar.xz" ".tar"; + store = "/nix/store/0nd3wx3gkln1bdpa956b8yjcs7k9ia4j-kdesignerplugin-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/kdesignerplugin-5.7.0.tar.xz"; + sha256 = "0y6yjm9zqi9plfbwqc7p8r0vsxj28drfymsdx4wvwqzfv8nby57q"; + name = "kdesignerplugin-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kservice-5.7.0.tar.xz" ".tar"; + store = "/nix/store/claqclndc0kz33g5nkbpa3w38mh9jqqh-kservice-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/kservice-5.7.0.tar.xz"; + sha256 = "1aziycv2r0y02lcc3hv7kzzlk9sc3c5fmh02sgm4px2wknfd12ja"; + name = "kservice-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kbookmarks-5.7.0.tar.xz" ".tar"; + store = "/nix/store/ww9xz56sdx2i3q8bipgf83gzdisihv0c-kbookmarks-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/kbookmarks-5.7.0.tar.xz"; + sha256 = "1vv3wirszsr5a2parbr6k4wkbp7lhcjqhbadr4fyhq62cvr7ya8l"; + name = "kbookmarks-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kidletime-5.7.0.tar.xz" ".tar"; + store = "/nix/store/qiihgxjbhx39pc1p6g5w933ifzc3gdp8-kidletime-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/kidletime-5.7.0.tar.xz"; + sha256 = "15i9rj7fs6nc40axd19a8ba21wcbzvivwlsr49h27vfbhca4h5x3"; + name = "kidletime-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kpty-5.7.0.tar.xz" ".tar"; + store = "/nix/store/ij41pg9l8j47f42yhycv8nqh7lf2zjv8-kpty-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/kpty-5.7.0.tar.xz"; + sha256 = "0sg11pzrgmdyqxbvd8rbcljmjcacnpnf6wwjqb5rj92fvrd30av0"; + name = "kpty-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdesu-5.7.0.tar.xz" ".tar"; + store = "/nix/store/yxxr5ldkg551dydqjwxds5fm0nsjszwp-kdesu-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/kdesu-5.7.0.tar.xz"; + sha256 = "0bjvkzgkmzxk4wlpk5hcxykf2nidg1c5c65mlhabddg0bns67axd"; + name = "kdesu-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcodecs-5.7.0.tar.xz" ".tar"; + store = "/nix/store/4dx78zbckkn5hyrjmch1wh5n3vkzz8lc-kcodecs-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/kcodecs-5.7.0.tar.xz"; + sha256 = "0pnf435jdm8lifvq8gdy4195vq653ffqrqdw0qh36qn9242csqhj"; + name = "kcodecs-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kinit-5.7.0.tar.xz" ".tar"; + store = "/nix/store/laps2gv18vnzirpm4il51m1kw2p7hslq-kinit-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/kinit-5.7.0.tar.xz"; + sha256 = "1fzmizq877f124kal9vali5a910kv3fx6pwpza502h6rdhslpsx2"; + name = "kinit-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kwindowsystem-5.7.0.tar.xz" ".tar"; + store = "/nix/store/b4c3rpfikpk4bl9y87862h2fvfv22nvx-kwindowsystem-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/kwindowsystem-5.7.0.tar.xz"; + sha256 = "1h3snqhlri98645nyc2p5jbz0s98yrppn3ipd7nyklnwk220prkk"; + name = "kwindowsystem-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kxmlgui-5.7.0.tar.xz" ".tar"; + store = "/nix/store/sb8f1fy08m738adnajy1dd0xz5ipmwkr-kxmlgui-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/kxmlgui-5.7.0.tar.xz"; + sha256 = "1zpwih2v8416r3pn4rklr6xzhcn1jf3zlj4sd75xbnx6y5fbm1q6"; + name = "kxmlgui-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "knotifyconfig-5.7.0.tar.xz" ".tar"; + store = "/nix/store/an7xgl36n79n038b9i9dg7r1ngg0vncg-knotifyconfig-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/knotifyconfig-5.7.0.tar.xz"; + sha256 = "0psv2k6p7d04s3icjw10hxi7676a9kphqcd2pzmcxg4wk50ikqns"; + name = "knotifyconfig-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kunitconversion-5.7.0.tar.xz" ".tar"; + store = "/nix/store/161vcj6bf51i82rmpd9xws4h72xbcypg-kunitconversion-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/kunitconversion-5.7.0.tar.xz"; + sha256 = "1fhh2db23q0d6g9rqsbgv5wbzyzj72x9pjda5vqa549sx8yq04is"; + name = "kunitconversion-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdbusaddons-5.7.0.tar.xz" ".tar"; + store = "/nix/store/lq4kzjg64c30yrinbgmkp5w596bg2121-kdbusaddons-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/kdbusaddons-5.7.0.tar.xz"; + sha256 = "1bn5ayywnhak0933y11lzkw39rkrmrm9m73knvgb46l7x1cchr3v"; + name = "kdbusaddons-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "threadweaver-5.7.0.tar.xz" ".tar"; + store = "/nix/store/9gnqmwvy7pm5sjpfhqqk8grz1mjb2701-threadweaver-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/threadweaver-5.7.0.tar.xz"; + sha256 = "1ab208awll2gnrs37p7k9nwp44sc30swibw75x9jh1w16nklpapa"; + name = "threadweaver-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kparts-5.7.0.tar.xz" ".tar"; + store = "/nix/store/xjiy5yxbmd4g4l61qyrbdrakzxgsrhlb-kparts-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/kparts-5.7.0.tar.xz"; + sha256 = "0ws8mk1q0sd36b3ac39s4xyzhlbh897s0hkw9kyp8yk0779g09sg"; + name = "kparts-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "sonnet-5.7.0.tar.xz" ".tar"; + store = "/nix/store/zz72jdhabwv1wj8mr910lfl17w11ap3i-sonnet-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/sonnet-5.7.0.tar.xz"; + sha256 = "11q0zfpcmvjs994cdcp5rg49lzibi7jaz0jb8h7s5kf27nc96w0r"; + name = "sonnet-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdewebkit-5.7.0.tar.xz" ".tar"; + store = "/nix/store/vyjpw6zsscf23xq0c4dgbldn3vizh4pj-kdewebkit-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/kdewebkit-5.7.0.tar.xz"; + sha256 = "04zb2a6dj89inxppf081hzkzwlyxcsrb3j4x2y6jz8zfpsnnhkxz"; + name = "kdewebkit-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kguiaddons-5.7.0.tar.xz" ".tar"; + store = "/nix/store/1gns8ry1kiiww0lfs8m5yc8ki2sh550c-kguiaddons-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/kguiaddons-5.7.0.tar.xz"; + sha256 = "0f63vn1f5wafzxhc50lr59qd31jav512nwh7y37jl95mrc5yjjrb"; + name = "kguiaddons-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "plasma-framework-5.7.0.tar.xz" ".tar"; + store = "/nix/store/mmwxm2jyi8lyir7g6ws8hjhzcmxkkb08-plasma-framework-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/plasma-framework-5.7.0.tar.xz"; + sha256 = "0r5kks3a0b4cl599r2qlsigdr83psbgjw5xki480xs6caznmqd1m"; + name = "plasma-framework-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdoctools-5.7.0.tar.xz" ".tar"; + store = "/nix/store/d1vx0maspgndbczfshwh3498qxwk9ca5-kdoctools-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/kdoctools-5.7.0.tar.xz"; + sha256 = "01lshra3jjqklbvld004pnj4pic8yrrpgbsy1yxfdfsccnrdf9di"; + name = "kdoctools-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kjobwidgets-5.7.0.tar.xz" ".tar"; + store = "/nix/store/r9q0s6cpwbhjkgrji86gylmj4mfwvikl-kjobwidgets-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/kjobwidgets-5.7.0.tar.xz"; + sha256 = "033y6cmdc8gzckqmxmasmpirfzsg0ga58hf88crrp8y21a03hary"; + name = "kjobwidgets-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcrash-5.7.0.tar.xz" ".tar"; + store = "/nix/store/12105y95jb4xyf4c1z8ya6d81k7z5bji-kcrash-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/kcrash-5.7.0.tar.xz"; + sha256 = "0jq4rqicrvzmj8fra1zhk9b76b0x043z1ny5hf3ikyy9k4axay8z"; + name = "kcrash-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kitemviews-5.7.0.tar.xz" ".tar"; + store = "/nix/store/2wrbbn9rr9xwqkiagiccpmr7v37c6icd-kitemviews-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/kitemviews-5.7.0.tar.xz"; + sha256 = "1ib6hlj7nv84all4j7p6k5ai5n4yslf2i2h2gwyiff2h55p2a686"; + name = "kitemviews-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kio-5.7.0.tar.xz" ".tar"; + store = "/nix/store/fv1l1v4ld92shbih8cjlxyab272aygmq-kio-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/kio-5.7.0.tar.xz"; + sha256 = "0xf43ff41rgrqhici0mw2y2n4h97gkbgdngfngyzgm1vs3xq8wpl"; + name = "kio-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kwidgetsaddons-5.7.0.tar.xz" ".tar"; + store = "/nix/store/difsiryniivbnlh4j2jwssywv2ijb03s-kwidgetsaddons-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/kwidgetsaddons-5.7.0.tar.xz"; + sha256 = "19z5wr5dyq4kmry6iss85zpvjhh9a3pa6vmhbcag61sdid0nfsqx"; + name = "kwidgetsaddons-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kapidox-5.7.0.tar.xz" ".tar"; + store = "/nix/store/d7f0aaamjvv67g9p5dhw98zwqg5sdl3q-kapidox-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/kapidox-5.7.0.tar.xz"; + sha256 = "1zv91a68lzh1rb12if7c67y0gy2004kh3jlcvfy270cd9rxmkywd"; + name = "kapidox-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kimageformats-5.7.0.tar.xz" ".tar"; + store = "/nix/store/09c46cmhryzqnn32kxwfjblmf5fnm7pm-kimageformats-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/kimageformats-5.7.0.tar.xz"; + sha256 = "00gga2yhpdrc9y73zhs3r6vpqb5blc9r7by72i0cap5ac040a4la"; + name = "kimageformats-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdeclarative-5.7.0.tar.xz" ".tar"; + store = "/nix/store/ylm05pqs3izryr45qqa37r82r76l1h3l-kdeclarative-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/kdeclarative-5.7.0.tar.xz"; + sha256 = "13m1pf92508sk4rl54v2pwic99snj2r0sjvmxvzv11cfrddjkr5g"; + name = "kdeclarative-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kemoticons-5.7.0.tar.xz" ".tar"; + store = "/nix/store/msbryhpxvbp8165gyf4cp27f2fjrk09z-kemoticons-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/kemoticons-5.7.0.tar.xz"; + sha256 = "1k5436xc0fv4xx66lzpy2kx7qgzbdv6n56xif1jl85x66gfvfvdv"; + name = "kemoticons-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcompletion-5.7.0.tar.xz" ".tar"; + store = "/nix/store/pnvb112ryqxy1q2yrrz72jak5lhm374p-kcompletion-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/kcompletion-5.7.0.tar.xz"; + sha256 = "1d8q2b8rdk7dmmhnjnkg16dc6bgnq2ahss2n1z2l6fcm305zvyfh"; + name = "kcompletion-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kconfig-5.7.0.tar.xz" ".tar"; + store = "/nix/store/cq1lbqzf4ihy8jnk2jab31wb3dljmpdz-kconfig-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/kconfig-5.7.0.tar.xz"; + sha256 = "0mvdz5vxzqb1vxiy7llgnyi1yyl5jmdyq35v1sf55gb84gyghrgh"; + name = "kconfig-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kpackage-5.7.0.tar.xz" ".tar"; + store = "/nix/store/ph932zwlra3rsjxh37rx0i1pshk08icc-kpackage-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/kpackage-5.7.0.tar.xz"; + sha256 = "0w6ljqs2knm9jvy3hkyk0iiy295mc0dpifvxyqcq4fqj9yvkrxgq"; + name = "kpackage-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "knotifications-5.7.0.tar.xz" ".tar"; + store = "/nix/store/6ppkdiwvy2y3wwxrja117pinmc4lv92a-knotifications-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/knotifications-5.7.0.tar.xz"; + sha256 = "0z9bs21mn9i5jya0dh1sr0vvn362bz64nhbwnwkb5vgy0sl2n923"; + name = "knotifications-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcoreaddons-5.7.0.tar.xz" ".tar"; + store = "/nix/store/63phhh1pcqlsqiqs9399vqfz7c7yw6ry-kcoreaddons-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/kcoreaddons-5.7.0.tar.xz"; + sha256 = "00byxkbwm3gvlharmqvn94jw7l1c1yjv4naczqgqcppl97h0zqyb"; + name = "kcoreaddons-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kitemmodels-5.7.0.tar.xz" ".tar"; + store = "/nix/store/cgxjl2p9p0qmmn6vsb357pvn01zyblr2-kitemmodels-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/kitemmodels-5.7.0.tar.xz"; + sha256 = "0y3zis7rh40nrv135zb3lvl4ix4bqqvby6kcy3b1llxcmhvaglph"; + name = "kitemmodels-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kded-5.7.0.tar.xz" ".tar"; + store = "/nix/store/icy79l7w5vqwmwmg21zji3y8sqpzwcq2-kded-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/kded-5.7.0.tar.xz"; + sha256 = "0146ldipacy43xypl5zshbf751bfi2mkaa5m8hcva4ygmps0xzp3"; + name = "kded-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kconfigwidgets-5.7.0.tar.xz" ".tar"; + store = "/nix/store/lz8kkfgzz18myibj3wcijai5qs0jw03p-kconfigwidgets-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/kconfigwidgets-5.7.0.tar.xz"; + sha256 = "073rv7i04p21ifwfbhikib555067iivzybnrxw6mgb5hxgph8ggv"; + name = "kconfigwidgets-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdelibs4support-5.7.0.tar.xz" ".tar"; + store = "/nix/store/3p606b334sbng7a1ppc9wc9gjw4v0y59-kdelibs4support-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/portingAids/kdelibs4support-5.7.0.tar.xz"; + sha256 = "1vl6s0bd0ykzbbnd6fq7vfxg7aly0k04wr15wlikkapgx3v0h9b5"; + name = "kdelibs4support-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "khtml-5.7.0.tar.xz" ".tar"; + store = "/nix/store/vrdx48h2r0fvjc7h2xzsjihs57gnny38-khtml-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/portingAids/khtml-5.7.0.tar.xz"; + sha256 = "0flr8qz6nws5h52ghxrzxzmn9y85mlms4n0wzh1kski1sszv62i6"; + name = "khtml-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kjs-5.7.0.tar.xz" ".tar"; + store = "/nix/store/sipm1kyl3lwy2fw7lcjn2n2s8qpxhag7-kjs-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/portingAids/kjs-5.7.0.tar.xz"; + sha256 = "1wjhl4j5y8q55bcgzlq3m0w1kafkivfgcdvi96f9rqyr7ij5ry9h"; + name = "kjs-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "krunner-5.7.0.tar.xz" ".tar"; + store = "/nix/store/vid0xggxw5liig84p5jgwf3mafkyk7n5-krunner-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/portingAids/krunner-5.7.0.tar.xz"; + sha256 = "113bxzzvjw1xxkq54nizb4g4rvbbaj58zfwcz6x0pvz5jfz65b7c"; + name = "krunner-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmediaplayer-5.7.0.tar.xz" ".tar"; + store = "/nix/store/629r99dj85wah0cqvpljy45n3zniqys3-kmediaplayer-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/portingAids/kmediaplayer-5.7.0.tar.xz"; + sha256 = "1bdws01m37bbip4j897nwi49jakwl9j4hp3xxls15r2h5q4wylc3"; + name = "kmediaplayer-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kross-5.7.0.tar.xz" ".tar"; + store = "/nix/store/8m4vp5riqrj4b1n2wvydvlz43902f01y-kross-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/portingAids/kross-5.7.0.tar.xz"; + sha256 = "1larhjl2mi5v5a9a5m216idnyvxkbb9ln1czfvsg18nizai9b0bj"; + name = "kross-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kjsembed-5.7.0.tar.xz" ".tar"; + store = "/nix/store/vcmsl5zz6lv1p92vw1k30wlzp0cr43f0-kjsembed-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/portingAids/kjsembed-5.7.0.tar.xz"; + sha256 = "1717d4q4wf182s8rlf76wj7pgzmrh6j1na9myg2pqpa9564nmald"; + name = "kjsembed-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "networkmanager-qt-5.7.0.tar.xz" ".tar"; + store = "/nix/store/rnixw65cmqlkkxmcn21rc73zwk4b0zg2-networkmanager-qt-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/networkmanager-qt-5.7.0.tar.xz"; + sha256 = "1lx1vjsp25hfrg8pvpw3k17sxr9y57m4mgzikaxkh704z826npjk"; + name = "networkmanager-qt-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktexteditor-5.7.0.tar.xz" ".tar"; + store = "/nix/store/m5spysm05hv2ncy392msym59jxd056qi-ktexteditor-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/ktexteditor-5.7.0.tar.xz"; + sha256 = "0ii2aw2kzvxqwlm3cjil8shkr1yfmfcwr3hvrvk99zv6mw0j8kq3"; + name = "ktexteditor-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdnssd-5.7.0.tar.xz" ".tar"; + store = "/nix/store/pabbzdlfgyl58llh6m0l1j5w3r4anpv7-kdnssd-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/kdnssd-5.7.0.tar.xz"; + sha256 = "120rclq82fnjz5z8q3rn9jbmql3fqpr64yspggl6ccv0f2v513dy"; + name = "kdnssd-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "karchive-5.7.0.tar.xz" ".tar"; + store = "/nix/store/z31cgnvxh50m6m7xcpv087zmpdn1la8q-karchive-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/karchive-5.7.0.tar.xz"; + sha256 = "0ppq4ml77bf9n9q216dcsmw9ipmqqaazbaaxxvqn5hmqx9j63mmq"; + name = "karchive-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kauth-5.7.0.tar.xz" ".tar"; + store = "/nix/store/6axbcm8958m691k3jsk3ci41h97aymq3-kauth-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/kauth-5.7.0.tar.xz"; + sha256 = "1254rbagpcp3dpdfjcxr7b07n5dqc0iw93xgpafkhxzn0h687hg2"; + name = "kauth-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kwallet-5.7.0.tar.xz" ".tar"; + store = "/nix/store/7p63gkx0brvnwhzsg2laqnbrq7lgdggr-kwallet-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/kwallet-5.7.0.tar.xz"; + sha256 = "19bmdc7hdvr6bxwrmlhnkclqn6dzlrdg7k870y6p4rhyrj3nvc1h"; + name = "kwallet-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kiconthemes-5.7.0.tar.xz" ".tar"; + store = "/nix/store/h02fsp21lh2dbd3yvpavqh1vgwc6m87v-kiconthemes-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/kiconthemes-5.7.0.tar.xz"; + sha256 = "111rdj347sf1g09zdnss4cq68ks71jxw0b22hnczqq9p60qcj1jg"; + name = "kiconthemes-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "frameworkintegration-5.7.0.tar.xz" ".tar"; + store = "/nix/store/khjj7d173y5qlqqi2z6sc7zmkv5cx5lc-frameworkintegration-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/frameworkintegration-5.7.0.tar.xz"; + sha256 = "0d0s03y99nk8cqnsz4w5v1d06bq5dl5395wgkcrchzcwqspk7z72"; + name = "frameworkintegration-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "extra-cmake-modules-1.7.0.tar.xz" ".tar"; + store = "/nix/store/ga7k0viqdz58drznxba2mjjq4qf0gnj1-extra-cmake-modules-1.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/extra-cmake-modules-1.7.0.tar.xz"; + sha256 = "1lgx13y00b9mv2p10p7bbzx12aav65i4ggcnyaqmp7pv867y33f8"; + name = "extra-cmake-modules-1.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "solid-5.7.0.tar.xz" ".tar"; + store = "/nix/store/rl9gv6hcsxalys9mnm00x34grsclnzh2-solid-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/solid-5.7.0.tar.xz"; + sha256 = "0adzqbcwnqg0f2jbrsy4sqv0p94ikijm6id1yrd89nvn0iiiip14"; + name = "solid-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcmutils-5.7.0.tar.xz" ".tar"; + store = "/nix/store/dql6c4ljy6jkr7zsksrq5wpmqhxsgz37-kcmutils-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/kcmutils-5.7.0.tar.xz"; + sha256 = "1b0rzydyhbv7jk9amj45iryl4r2iy5k2zh8g7qwbwig8jywfhwqs"; + name = "kcmutils-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "knewstuff-5.7.0.tar.xz" ".tar"; + store = "/nix/store/jwckk8a1mpy4mp785mbssy0mkn3zc6b6-knewstuff-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/knewstuff-5.7.0.tar.xz"; + sha256 = "0wg3fg2kyq2j8n2qmahw30binm9pxaqvvydsxpcj97fl0wcaffgl"; + name = "knewstuff-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kactivities-5.7.0.tar.xz" ".tar"; + store = "/nix/store/1s1bl23mrah31k3vqw40vfs6f79b0wnp-kactivities-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/kactivities-5.7.0.tar.xz"; + sha256 = "1d42i0a015qsr4d4rhr574xixfw1w0dgl4qag6slsj6fm5asny19"; + name = "kactivities-5.7.0.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kglobalaccel-5.7.0.tar.xz" ".tar"; + store = "/nix/store/i6ja196cyzixsxbyg6bdivizs75y8pvb-kglobalaccel-5.7.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.7/kglobalaccel-5.7.0.tar.xz"; + sha256 = "0jlknk3g07x9y4vl4n82hy4msfaavqy51fpj1yffya8zbb59c29y"; + name = "kglobalaccel-5.7.0.tar.xz"; + }; + } +] diff --git a/pkgs/development/libraries/kde-frameworks-5.7/manifest.sh b/pkgs/development/libraries/kde-frameworks-5.7/manifest.sh new file mode 100755 index 00000000000..fef8b701d01 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.7/manifest.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +if [ $# -eq 0 ]; then + + # The extra slash at the end of the URL is necessary to stop wget + # from recursing over the whole server! (No, it's not a bug.) + $(nix-build ../../../.. -A autonix.manifest) \ + http://download.kde.org/stable/frameworks/5.7/ \ + -A '*.tar.xz' + +else + + $(nix-build ../../../.. -A autonix.manifest) -A '*.tar.xz' "$@" + +fi diff --git a/pkgs/development/libraries/kde-frameworks-5.7/plasma-framework/plasma-framework-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.7/plasma-framework/plasma-framework-external-paths.patch new file mode 100644 index 00000000000..9a22c0bdbcd --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.7/plasma-framework/plasma-framework-external-paths.patch @@ -0,0 +1,13 @@ +diff --git a/src/plasma/package.cpp b/src/plasma/package.cpp +index 07b3c90..84417e3 100644 +--- a/src/plasma/package.cpp ++++ b/src/plasma/package.cpp +@@ -791,7 +791,7 @@ PackagePrivate::PackagePrivate() + servicePrefix("plasma-applet-"), + fallbackPackage(0), + metadata(0), +- externalPaths(false), ++ externalPaths(true), + valid(false), + checkedValid(false) + { diff --git a/pkgs/development/libraries/kde-frameworks-5.7/renames.nix b/pkgs/development/libraries/kde-frameworks-5.7/renames.nix new file mode 100644 index 00000000000..58ade4e62ac --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.7/renames.nix @@ -0,0 +1,68 @@ +# DO NOT EDIT! This file is generated automatically. +{ }: +{ +"Backend" = "plasma-framework"; +"CTest" = "attica"; +"ECM" = "extra-cmake-modules"; +"KDED" = "kded"; +"KF5Activities" = "kactivities"; +"KF5Archive" = "karchive"; +"KF5Attica" = "attica"; +"KF5Auth" = "kauth"; +"KF5Bookmarks" = "kbookmarks"; +"KF5Codecs" = "kcodecs"; +"KF5Completion" = "kcompletion"; +"KF5Config" = "kconfig"; +"KF5ConfigWidgets" = "kconfigwidgets"; +"KF5CoreAddons" = "kcoreaddons"; +"KF5Crash" = "kcrash"; +"KF5DBusAddons" = "kdbusaddons"; +"KF5DNSSD" = "kdnssd"; +"KF5Declarative" = "kdeclarative"; +"KF5DesignerPlugin" = "kdesignerplugin"; +"KF5DocTools" = "kdoctools"; +"KF5Emoticons" = "kemoticons"; +"KF5FrameworkIntegration" = "frameworkintegration"; +"KF5GlobalAccel" = "kglobalaccel"; +"KF5GuiAddons" = "kguiaddons"; +"KF5I18n" = "ki18n"; +"KF5IconThemes" = "kiconthemes"; +"KF5IdleTime" = "kidletime"; +"KF5Init" = "kinit"; +"KF5ItemModels" = "kitemmodels"; +"KF5ItemViews" = "kitemviews"; +"KF5JS" = "kjs"; +"KF5JobWidgets" = "kjobwidgets"; +"KF5JsEmbed" = "kjsembed"; +"KF5KCMUtils" = "kcmutils"; +"KF5KDE4Support" = "kdelibs4support"; +"KF5KDELibs4Support" = "kdelibs4support"; +"KF5KHtml" = "khtml"; +"KF5KIO" = "kio"; +"KF5Kross" = "kross"; +"KF5MediaPlayer" = "kmediaplayer"; +"KF5NetworkManagerQt" = "networkmanager-qt"; +"KF5NewStuff" = "knewstuff"; +"KF5Notifications" = "knotifications"; +"KF5NotifyConfig" = "knotifyconfig"; +"KF5Package" = "kpackage"; +"KF5Parts" = "kparts"; +"KF5Plasma" = "plasma-framework"; +"KF5PlasmaQuick" = "plasma-framework"; +"KF5Plotting" = "kplotting"; +"KF5Pty" = "kpty"; +"KF5Runner" = "krunner"; +"KF5Service" = "kservice"; +"KF5Solid" = "solid"; +"KF5Sonnet" = "sonnet"; +"KF5Su" = "kdesu"; +"KF5TextEditor" = "ktexteditor"; +"KF5TextWidgets" = "ktextwidgets"; +"KF5ThreadWeaver" = "threadweaver"; +"KF5UnitConversion" = "kunitconversion"; +"KF5Wallet" = "kwallet"; +"KF5WebKit" = "kdewebkit"; +"KF5WidgetsAddons" = "kwidgetsaddons"; +"KF5WindowSystem" = "kwindowsystem"; +"KF5XmlGui" = "kxmlgui"; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.7/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.7/setup-hook.sh new file mode 100644 index 00000000000..a8d9b7e0e36 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.7/setup-hook.sh @@ -0,0 +1 @@ +addToSearchPath XDG_DATA_DIRS @out@/share diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b5624c0970..ebabe408471 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5939,6 +5939,8 @@ let kf55 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.5 { stdenv = overrideCC stdenv gccStdInc; + kf57 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.7 { + qt5 = qt54; }); kf56 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.6 {}); kf5_latest = kf56; From 2e7bf4ff605e9bca48e17f9e89a752bc8502f65b Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 21 Feb 2015 10:56:13 -0600 Subject: [PATCH 146/197] remove kde-frameworks-5.5 and kde-frameworks-5.6 --- .../libraries/kde-frameworks-5.5/default.nix | 185 ------- .../kde-frameworks-5.5/dependencies.nix | 484 ----------------- .../kde-frameworks-5.5/dependencies.sh | 22 - .../0001-libdir-default.patch | 55 -- .../0002-qt5-plugin-dir.patch | 25 - .../kauth/kauth-policy-install.patch | 13 - ...utils-pluginselector-follow-symlinks.patch | 13 - ...igwidgets-helpclient-follow-symlinks.patch | 13 - .../kdoctools-no-find-docbook-xml.patch | 12 - .../kinit/kinit-libpath.patch | 30 -- ...service-kbuildsycoca-follow-symlinks.patch | 13 - ...ce-kbuildsycoca-no-canonicalize-path.patch | 13 - .../libraries/kde-frameworks-5.5/manifest.nix | 364 ------------- .../libraries/kde-frameworks-5.5/manifest.sh | 15 - .../plasma-framework-external-paths.patch | 13 - .../libraries/kde-frameworks-5.5/renames.nix | 66 --- .../kde-frameworks-5.5/setup-hook.sh | 1 - .../libraries/kde-frameworks-5.6/default.nix | 190 ------- .../kde-frameworks-5.6/dependencies.nix | 500 ------------------ .../kde-frameworks-5.6/dependencies.sh | 22 - .../0001-libdir-default.patch | 55 -- .../0002-qt5-plugin-dir.patch | 25 - .../kauth/kauth-policy-install.patch | 13 - ...utils-pluginselector-follow-symlinks.patch | 13 - ...igwidgets-helpclient-follow-symlinks.patch | 13 - .../kdoctools-no-find-docbook-xml.patch | 12 - .../kinit/kinit-libpath.patch | 30 -- .../kpackage/0001-allow-external-paths.patch | 25 - ...service-kbuildsycoca-follow-symlinks.patch | 13 - ...ce-kbuildsycoca-no-canonicalize-path.patch | 13 - .../libraries/kde-frameworks-5.6/manifest.nix | 382 ------------- .../libraries/kde-frameworks-5.6/manifest.sh | 15 - .../plasma-framework-external-paths.patch | 13 - .../libraries/kde-frameworks-5.6/renames.nix | 68 --- .../kde-frameworks-5.6/setup-hook.sh | 1 - pkgs/top-level/all-packages.nix | 17 +- 36 files changed, 8 insertions(+), 2749 deletions(-) delete mode 100644 pkgs/development/libraries/kde-frameworks-5.5/default.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.5/dependencies.nix delete mode 100755 pkgs/development/libraries/kde-frameworks-5.5/dependencies.sh delete mode 100644 pkgs/development/libraries/kde-frameworks-5.5/extra-cmake-modules/0001-libdir-default.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.5/extra-cmake-modules/0002-qt5-plugin-dir.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.5/kauth/kauth-policy-install.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.5/kcmutils/kcmutils-pluginselector-follow-symlinks.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.5/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.5/kdoctools/kdoctools-no-find-docbook-xml.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.5/kinit/kinit-libpath.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.5/kservice/kservice-kbuildsycoca-follow-symlinks.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.5/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.5/manifest.nix delete mode 100755 pkgs/development/libraries/kde-frameworks-5.5/manifest.sh delete mode 100644 pkgs/development/libraries/kde-frameworks-5.5/plasma-framework/plasma-framework-external-paths.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.5/renames.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.5/setup-hook.sh delete mode 100644 pkgs/development/libraries/kde-frameworks-5.6/default.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.6/dependencies.nix delete mode 100755 pkgs/development/libraries/kde-frameworks-5.6/dependencies.sh delete mode 100644 pkgs/development/libraries/kde-frameworks-5.6/extra-cmake-modules/0001-libdir-default.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.6/extra-cmake-modules/0002-qt5-plugin-dir.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.6/kauth/kauth-policy-install.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.6/kcmutils/kcmutils-pluginselector-follow-symlinks.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.6/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.6/kdoctools/kdoctools-no-find-docbook-xml.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.6/kinit/kinit-libpath.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.6/kpackage/0001-allow-external-paths.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.6/kservice/kservice-kbuildsycoca-follow-symlinks.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.6/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.6/manifest.nix delete mode 100755 pkgs/development/libraries/kde-frameworks-5.6/manifest.sh delete mode 100644 pkgs/development/libraries/kde-frameworks-5.6/plasma-framework/plasma-framework-external-paths.patch delete mode 100644 pkgs/development/libraries/kde-frameworks-5.6/renames.nix delete mode 100644 pkgs/development/libraries/kde-frameworks-5.6/setup-hook.sh diff --git a/pkgs/development/libraries/kde-frameworks-5.5/default.nix b/pkgs/development/libraries/kde-frameworks-5.5/default.nix deleted file mode 100644 index aac9eecb931..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.5/default.nix +++ /dev/null @@ -1,185 +0,0 @@ -# Maintainer's Notes: -# -# Minor updates: -# 1. Edit ./manifest.sh to point to the updated URL. Upstream sometimes -# releases updates that include only the changed packages; in this case, -# multiple URLs can be provided and the results will be merged. -# 2. Run ./manifest.sh and ./dependencies.sh. -# 3. Build and enjoy. -# -# Major updates: -# We prefer not to immediately overwrite older versions with major updates, so -# make a copy of this directory first. After copying, be sure to delete ./tmp -# if it exists. Then follow the minor update instructions. - -{ autonix, fetchurl, pkgs, qt5, stdenv, debug ? false }: - -with stdenv.lib; with autonix; - -let - - mkDerivation = drv: - stdenv.mkDerivation - (drv // { - src = fetchurl drv.src; - - setupHook = ./setup-hook.sh; - - enableParallelBuilding = drv.enableParallelBuilding or true; - cmakeFlags = - (drv.cmakeFlags or []) - ++ [ "-DBUILD_TESTING=OFF" - "-DKDE_DEFAULT_HOME=.kde5" - "-DKDE4_DEFAULT_HOME=.kde" - ] - ++ optional debug "-DCMAKE_BUILD_TYPE=Debug"; - - meta = drv.meta or - { - license = with stdenv.lib.licenses; [ - lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 - ]; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ ttuegel ]; - homepage = "http://www.kde.org"; - }; - }); - - renames = builtins.removeAttrs (import ./renames.nix {}) ["Backend" "CTest"]; - - scope = - # packages in this collection - (mapAttrs (dep: name: kf5."${name}") renames) // - # packages pinned to this version of Qt 5 - { - Phonon4Qt5 = pkgs.phonon_qt5.override { inherit qt5; }; - Qt5 = qt5; - Qt5Core = qt5; - Qt5DBus = qt5; - Qt5Test = qt5; - Qt5Widgets = qt5; - Qt5X11Extras = qt5; - dbusmenu-qt5 = pkgs.libdbusmenu_qt5.override { inherit qt5; }; - } // - # packages from the nixpkgs collection - (with pkgs; - { - inherit cmake; - Boost = boost; - GIF = giflib; - GLIB2 = glib; - Gpgme = gpgme; - JPEG = libjpeg; - LibGcrypt = libgcrypt; - LibGit2 = libgit2; - LibIntl = gettext; - LibLZMA = lzma; - Perl = perl; - PythonInterp = python; - QImageBlitz = qimageblitz; - SharedMimeInfo = shared_mime_info; - ZLIB = zlib; - } - ); - - mirror = "mirror://kde"; - - preResolve = super: - fold (f: x: f x) super - [ - (userEnvPkg "SharedMimeInfo") - (userEnvPkg "SharedDesktopOntologies") - ]; - - postResolve = super: - super // { - extra-cmake-modules = { - inherit (super.extra-cmake-modules) name src; - - propagatedNativeBuildInputs = with pkgs; [ cmake pkgconfig ]; - cmakeFlags = ["-DBUILD_TESTING=OFF"]; - patches = - [ - ./extra-cmake-modules/0001-libdir-default.patch - ./extra-cmake-modules/0002-qt5-plugin-dir.patch - ]; - meta = { - license = with stdenv.lib.licenses; [ bsd2 ]; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ ttuegel ]; - homepage = "http://www.kde.org"; - }; - }; - - kauth = with pkgs; super.kauth // { - buildInputs = super.kauth.buildInputs ++ [polkit_qt5]; - patches = [./kauth/kauth-policy-install.patch]; - }; - - kcmutils = super.kcmutils // { - patches = - [./kcmutils/kcmutils-pluginselector-follow-symlinks.patch]; - }; - - kconfigwidgets = super.kconfigwidgets // { - patches = - [./kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch]; - }; - - kdelibs4support = with pkgs; super.kdelibs4support // { - buildInputs = - super.kdelibs4support.buildInputs - ++ [networkmanager xlibs.libSM]; - cmakeFlags = - (super.kdelibs4support.cmakeFlags or []) - ++ [ - "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook" - "-DDocBookXML4_DTD_VERSION=4.5" - ]; - }; - - kdoctools = with pkgs; super.kdoctools // { - cmakeFlags = - (super.kdoctools.cmakeFlags or []) - ++ [ - "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook" - "-DDocBookXML4_DTD_VERSION=4.5" - "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook" - ]; - patches = [./kdoctools/kdoctools-no-find-docbook-xml.patch]; - }; - - ki18n = with pkgs; super.ki18n // { - propagatedNativeBuildInputs = - super.ki18n.propagatedNativeBuildInputs ++ [gettext python]; - }; - - kimageformats = with pkgs; super.kimageformats // { - NIX_CFLAGS_COMPILE = - (super.kimageformats.NIX_CFLAGS_COMPILE or "") - + " -I${ilmbase}/include/OpenEXR"; - }; - - kinit = super.kinit // { patches = [ ./kinit/kinit-libpath.patch ]; }; - - kservice = super.kservice // { - buildInputs = super.kservice.buildInputs ++ [kf5.kwindowsystem]; - patches = - [ - ./kservice/kservice-kbuildsycoca-follow-symlinks.patch - ./kservice/kservice-kbuildsycoca-no-canonicalize-path.patch - ]; - }; - - plasma-framework = super.plasma-framework // { - patches = [ ./plasma-framework/plasma-framework-external-paths.patch ]; - }; - }; - - kf5 = generateCollection ./. { - inherit mirror mkDerivation preResolve postResolve renames scope; - }; - -in - - kf5 // { inherit mkDerivation qt5 scope; } diff --git a/pkgs/development/libraries/kde-frameworks-5.5/dependencies.nix b/pkgs/development/libraries/kde-frameworks-5.5/dependencies.nix deleted file mode 100644 index feafa94e81d..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.5/dependencies.nix +++ /dev/null @@ -1,484 +0,0 @@ -# DO NOT EDIT! This file is generated automatically. -{ }: -{ - attica = { - buildInputs = [ "ECM" "Qt5" "Qt5Widgets" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "Qt5Core" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - extra-cmake-modules = { - buildInputs = [ "AGG" "Blitz" "BlueZ" "ENCHANT" "Eigen2" "FFmpeg" "Flac" "Flex" "GObject" "GStreamer" "LCMS" "LibArt" "OpenEXR" "PCRE" "QCA2" "QImageBlitz" "Qt5Core" "Qt5LinguistTools" "Sqlite" "Strigi" "USB" "Xine" "Xmms" ]; - nativeBuildInputs = [ "LibXslt" "QCOLLECTIONGENERATOR_EXECUTABLE" "SPHINX_EXECUTABLE" "cmake" ]; - propagatedBuildInputs = [ ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - frameworkintegration = { - buildInputs = [ "ECM" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Notifications" "KF5WidgetsAddons" "OxygenFont" "Qt5" "Qt5Test" "XCB" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5IconThemes" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kactivities = { - buildInputs = [ "Boost" "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5DBusAddons" "KF5Declarative" "KF5GlobalAccel" "KF5I18n" "KF5KCMUtils" "KF5KIO" "KF5Service" "KF5WindowSystem" "KF5XmlGui" "Qt5" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "Qt5Core" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kapidox = { - buildInputs = [ ]; - nativeBuildInputs = [ "PythonInterp" "cmake" ]; - propagatedBuildInputs = [ ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - karchive = { - buildInputs = [ "BZip2" "ECM" "KF5Archive" "LibLZMA" "Qt5Core" "Qt5Test" "ZLIB" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "Qt5Core" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kauth = { - buildInputs = [ "ECM" "KF5CoreAddons" "Qt5" "Qt5Test" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5CoreAddons" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kbookmarks = { - buildInputs = [ "ECM" "KF5ConfigWidgets" "KF5CoreAddons" "KF5IconThemes" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5Test" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5IconThemes" "KF5XmlGui" "Qt5Widgets" "Qt5Xml" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kcmutils = { - buildInputs = [ "ECM" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5Service" "KF5XmlGui" "Qt5" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5IconThemes" "KF5ItemViews" "KF5Service" "KF5XmlGui" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kcodecs = { - buildInputs = [ "ECM" "Qt5Core" "Qt5Test" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "Qt5Core" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kcompletion = { - buildInputs = [ "ECM" "KF5Config" "KF5WidgetsAddons" "Qt5" "Qt5Test" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5Config" "KF5WidgetsAddons" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kconfig = { - buildInputs = [ "ECM" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5Gui" "Qt5Test" "Qt5Xml" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "Qt5Xml" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kconfigwidgets = { - buildInputs = [ "ECM" "KF5Auth" "KF5Codecs" "KF5Config" "KF5CoreAddons" "KF5DocTools" "KF5GuiAddons" "KF5I18n" "KF5WidgetsAddons" "Qt5" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5Auth" "KF5Codecs" "KF5Config" "KF5GuiAddons" "KF5I18n" "KF5WidgetsAddons" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kcoreaddons = { - buildInputs = [ "ECM" "FAM" "Qt5" "Qt5Test" "Qt5Widgets" "SharedMimeInfo" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "Qt5Core" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ "SharedMimeInfo" ]; - }; - - kcrash = { - buildInputs = [ "ECM" "KF5CoreAddons" "KF5WindowSystem" "Qt5" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5CoreAddons" "KF5WindowSystem" "Qt5Core" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kdbusaddons = { - buildInputs = [ "ECM" "Qt5DBus" "Qt5Test" "Qt5X11Extras" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "Qt5DBus" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kdeclarative = { - buildInputs = [ "ECM" "KF5" "KF5Config" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" "Qt5Test" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5KIO" "Qt5Qml" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kded = { - buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5DocTools" "KF5Init" "KF5Service" "Qt5" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kdelibs4support = { - buildInputs = [ "AGG" "Blitz" "BlueZ" "DocBookXML4" "ECM" "ENCHANT" "Eigen2" "FFmpeg" "Flac" "GObject" "GStreamer" "KDEWin" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5Crash" "KF5DesignerPlugin" "KF5DocTools" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Notifications" "KF5Parts" "KF5Service" "KF5TextWidgets" "KF5UnitConversion" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "LCMS" "LibArt" "NetworkManager" "OpenEXR" "OpenSSL" "PCRE" "QCA2" "QImageBlitz" "QNtrack" "Qt5" "Qt5X11Extras" "Sqlite" "USB" "X11" "Xine" "Xmms" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KDEWin" "KF5Auth" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5DesignerPlugin" "KF5DocTools" "KF5Emoticons" "KF5GuiAddons" "KF5IconThemes" "KF5Init" "KF5ItemModels" "KF5KDELibs4Support" "KF5Notifications" "KF5Parts" "KF5TextWidgets" "KF5UnitConversion" "KF5WindowSystem" "Qt5DBus" "Qt5PrintSupport" "Qt5Xml" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kdesignerplugin = { - buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DocTools" "KF5IconThemes" "KF5ItemViews" "KF5KIO" "KF5Plotting" "KF5Sonnet" "KF5TextWidgets" "KF5WebKit" "KF5WidgetsAddons" "KF5XmlGui" "Qt5Core" "Qt5Designer" "Qt5Test" "Qt5Widgets" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kdesu = { - buildInputs = [ "ECM" "KF5CoreAddons" "KF5Pty" "KF5Service" "Qt5Core" "X11" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5Pty" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kdewebkit = { - buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5JobWidgets" "KF5KIO" "KF5Parts" "KF5Service" "KF5Wallet" "Qt5" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "Qt5WebKitWidgets" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kdnssd = { - buildInputs = [ "Avahi" "DNSSD" "ECM" "Qt5" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "Qt5Network" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kdoctools = { - buildInputs = [ "DocBookXML4" "DocBookXSL" "ECM" "KF5Archive" "KF5DocTools" "KF5I18n" "LibXml2" "Qt5Core" ]; - nativeBuildInputs = [ "LibXslt" "cmake" ]; - propagatedBuildInputs = [ "KF5Archive" "Qt5Core" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kemoticons = { - buildInputs = [ "ECM" "KF5Archive" "KF5Config" "KF5CoreAddons" "KF5Service" "Qt5" "Qt5Test" "Qt5Xml" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5Archive" "KF5Service" "Qt5Gui" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kglobalaccel = { - buildInputs = [ "ECM" "Qt5" "X11" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "Qt5DBus" "Qt5Widgets" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kguiaddons = { - buildInputs = [ "ECM" "Qt5" "Qt5Gui" "Qt5X11Extras" "X11" "XCB" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "Qt5Gui" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - khtml = { - buildInputs = [ "ECM" "GIF" "JPEG" "KDEWin" "KF5Archive" "KF5Codecs" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5JS" "KF5KIO" "KF5Notifications" "KF5Parts" "KF5Sonnet" "KF5TextWidgets" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "OpenSSL" "PNG" "Phonon4Qt5" "Qt5" "Qt5Test" "Qt5X11Extras" "X11" ]; - nativeBuildInputs = [ "Perl" "cmake" ]; - propagatedBuildInputs = [ "KF5Archive" "KF5Bookmarks" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5JS" "KF5KIO" "KF5Notifications" "KF5Parts" "KF5Sonnet" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5Core" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - ki18n = { - buildInputs = [ "ECM" "LibIntl" "Qt5" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kiconthemes = { - buildInputs = [ "ECM" "KF5ConfigWidgets" "KF5I18n" "KF5ItemViews" "KF5WidgetsAddons" "Qt5" "Qt5DBus" "Qt5Svg" "Qt5Widgets" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5I18n" "KF5ItemViews" "KF5WidgetsAddons" "Qt5Widgets" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kidletime = { - buildInputs = [ "ECM" "Qt5" "X11" "X11_XCB" "XCB" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "Qt5Core" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kimageformats = { - buildInputs = [ "ECM" "Jasper" "OpenEXR" "Qt5Gui" "Qt5PrintSupport" "Qt5Test" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kinit = { - buildInputs = [ "ECM" "KF5Config" "KF5Crash" "KF5DocTools" "KF5I18n" "KF5KIO" "KF5Service" "KF5WindowSystem" "Libcap" "Qt5" "X11" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kio = { - buildInputs = [ "ACL" "ECM" "GSSAPI" "KF5Archive" "KF5Bookmarks" "KF5Codecs" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5JobWidgets" "KF5Notifications" "KF5Service" "KF5Solid" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "LibXml2" "OpenSSL" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5Script" "Qt5Test" "Qt5Widgets" "Strigi" "X11" "ZLIB" ]; - nativeBuildInputs = [ "LibXslt" "cmake" ]; - propagatedBuildInputs = [ "KF5Bookmarks" "KF5Completion" "KF5ItemViews" "KF5JobWidgets" "KF5Service" "KF5Solid" "KF5XmlGui" "Qt5Network" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kitemmodels = { - buildInputs = [ "ECM" "Grantlee" "Qt5" "Qt5Core" "Qt5Script" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "Qt5Core" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kitemviews = { - buildInputs = [ "ECM" "Qt5" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "Qt5Widgets" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kjobwidgets = { - buildInputs = [ "ECM" "KF5CoreAddons" "KF5WidgetsAddons" "Qt5" "Qt5X11Extras" "X11" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5CoreAddons" "KF5WidgetsAddons" "Qt5Widgets" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kjs = { - buildInputs = [ "ECM" "PCRE" "Qt5Core" "Qt5Test" ]; - nativeBuildInputs = [ "Perl" "cmake" ]; - propagatedBuildInputs = [ "Qt5Core" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kjsembed = { - buildInputs = [ "ECM" "KF5DocTools" "KF5I18n" "KF5JS" "Qt5" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5I18n" "KF5JS" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kmediaplayer = { - buildInputs = [ "ECM" "KF5Parts" "KF5XmlGui" "Qt5DBus" "Qt5Test" "Qt5Widgets" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5Parts" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - knewstuff = { - buildInputs = [ "ECM" "KF5Archive" "KF5Attica" "KF5Completion" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KIO" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5Test" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5Archive" "KF5Attica" "KF5KIO" "KF5XmlGui" "Qt5Widgets" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - knotifications = { - buildInputs = [ "ECM" "KF5Codecs" "KF5Config" "KF5CoreAddons" "KF5IconThemes" "KF5Service" "KF5WindowSystem" "Phonon4Qt5" "Qt5" "Qt5X11Extras" "X11" "dbusmenu-qt5" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5WindowSystem" "Qt5Widgets" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - knotifyconfig = { - buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5KIO" "KF5Notifications" "KF5Service" "KF5WidgetsAddons" "KF5XmlGui" "Phonon4Qt5" "Qt5" "Qt5Test" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5I18n" "KF5KIO" "Qt5Widgets" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kparts = { - buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5JobWidgets" "KF5KIO" "KF5Notifications" "KF5Service" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5Test" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5KIO" "KF5Notifications" "KF5TextWidgets" "KF5XmlGui" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kplotting = { - buildInputs = [ "ECM" "Qt5" "Qt5Widgets" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "Qt5Widgets" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kpty = { - buildInputs = [ "ECM" "KF5CoreAddons" "KF5I18n" "Qt5" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5CoreAddons" "KF5I18n" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kross = { - buildInputs = [ "ECM" "KF5Completion" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Parts" "KF5Service" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Parts" "KF5WidgetsAddons" "Qt5Script" "Qt5Widgets" "Qt5Xml" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - krunner = { - buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5KIO" "KF5Plasma" "KF5Service" "KF5Solid" "KF5ThreadWeaver" "Qt5" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5Plasma" "Qt5Core" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kservice = { - buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "Qt5" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5Config" "KF5CoreAddons" "KF5DBusAddons" "KF5I18n" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - ktexteditor = { - buildInputs = [ "ECM" "KF5Archive" "KF5Config" "KF5GuiAddons" "KF5I18n" "KF5KIO" "KF5Parts" "KF5Sonnet" "LibGit2" "Qt5" ]; - nativeBuildInputs = [ "Perl" "cmake" ]; - propagatedBuildInputs = [ ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - ktextwidgets = { - buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5Service" "KF5Sonnet" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5Completion" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5Service" "KF5Sonnet" "KF5WindowSystem" "Qt5Widgets" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kunitconversion = { - buildInputs = [ "ECM" "KF5I18n" "Qt5" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5Config" "KF5I18n" "Qt5Core" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kwallet = { - buildInputs = [ "ECM" "Gpgme" "KF5Config" "KF5CoreAddons" "KF5DBusAddons" "KF5Gpgmepp" "KF5I18n" "KF5IconThemes" "KF5Notifications" "KF5Service" "KF5WidgetsAddons" "KF5WindowSystem" "LibGcrypt" "Qt5" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5Config" "KF5WindowSystem" "Qt5Core" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kwidgetsaddons = { - buildInputs = [ "ECM" "Qt5" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "Qt5Widgets" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kwindowsystem = { - buildInputs = [ "ECM" "Qt5" "Qt5WinExtras" "X11" "XCB" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "Qt5Widgets" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kxmlgui = { - buildInputs = [ "ECM" "KF5Attica" "KF5Config" "KF5ConfigWidgets" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5TextWidgets" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5Attica" "KF5Config" "KF5ConfigWidgets" "KF5GlobalAccel" "KF5IconThemes" "KF5ItemViews" "KF5TextWidgets" "KF5WindowSystem" "Qt5DBus" "Qt5Xml" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - plasma-framework = { - buildInputs = [ "ECM" "EGL" "Gpgme" "KActivities" "KCoreAddons" "KDE4Support" "KDESu" "KDeclarative" "KF5" "KF5Activities" "KF5Archive" "KF5Auth" "KF5Bookmarks" "KF5Codecs" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5Declarative" "KF5DocTools" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5IdleTime" "KF5Init" "KF5ItemModels" "KF5ItemViews" "KF5JS" "KF5JobWidgets" "KF5KArchive" "KF5KAuth" "KF5KBookmarks" "KF5KCodecs" "KF5KCompletion" "KF5KConfig" "KF5KConfigWidgets" "KF5KCoreAddons" "KF5KCrash" "KF5KDBusAddons" "KF5KDE4Support" "KF5KDESu" "KF5KDeclarative" "KF5KDocTools" "KF5KF5GlobalAccel" "KF5KGuiAddons" "KF5KI18n" "KF5KIO" "KF5KIconThemes" "KF5KIdleTime" "KF5KInit" "KF5KJS" "KF5KJobWidgets" "KF5KNotifications" "KF5KParts" "KF5KService" "KF5KTextWidgets" "KF5KUnitConversion" "KF5KWallet" "KF5KWidgetsAddons" "KF5KWindowSystem" "KF5Kross" "KF5NO_MODULE" "KF5Notifications" "KF5Parts" "KF5Service" "KF5Solid" "KF5Sonnet" "KF5Su" "KF5TextWidgets" "KF5ThreadWeaver" "KF5UnitConversion" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "KdepimLibs" "OpenGL" "QCA2" "Qt5" "Qt5Test" "Qt5Widgets" "Solid" "X11" "XCB" ]; - nativeBuildInputs = [ "SH" "cmake" ]; - propagatedBuildInputs = [ ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - solid = { - buildInputs = [ "ECM" "IOKit" "MediaPlayerInfo" "Qt5" "Qt5Qml" "UDev" ]; - nativeBuildInputs = [ "BISON" "FLEX" "cmake" ]; - propagatedBuildInputs = [ "Qt5Core" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - sonnet = { - buildInputs = [ "ASPELL" "ECM" "ENCHANT" "HSPELL" "HUNSPELL" "Qt5" "Qt5Test" "ZLIB" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "Qt5Core" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - threadweaver = { - buildInputs = [ "ECM" "KF5ThreadWeaver" "Qt5" "Qt5Core" "Qt5Test" "Qt5Widgets" ]; - nativeBuildInputs = [ "SNIPPETEXTRACTOR" "cmake" ]; - propagatedBuildInputs = [ "Qt5Core" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - -} diff --git a/pkgs/development/libraries/kde-frameworks-5.5/dependencies.sh b/pkgs/development/libraries/kde-frameworks-5.5/dependencies.sh deleted file mode 100755 index 2b220244c59..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.5/dependencies.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -# This script rebuilds dependencies.nix. -# You must run manifest.sh first to download the packages. - -# Without arguments, this will use the version of autonix-deps-kf5 in nixpkgs. -# If you are working on the packages, this is probably what you want. - -# You can also pass the path to a source tree where you have built -# autonix-deps-kf5 yourself. If you are working on autonix-deps-kf5, this is -# probably what you want. - -manifestXML=$(nix-build -E 'with (import ../../../.. {}); autonix.writeManifestXML ./manifest.nix') - -autonixDepsKf5="" -if [[ -z $1 ]]; then - autonixDepsKF5=$(nix-build ../../../.. -A haskellngPackages.autonix-deps-kf5)/bin -else - autonixDepsKF5="$1/dist/build/kf5-deps" -fi - -exec ${autonixDepsKF5}/kf5-deps "${manifestXML}" diff --git a/pkgs/development/libraries/kde-frameworks-5.5/extra-cmake-modules/0001-libdir-default.patch b/pkgs/development/libraries/kde-frameworks-5.5/extra-cmake-modules/0001-libdir-default.patch deleted file mode 100644 index faed0e6edc9..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.5/extra-cmake-modules/0001-libdir-default.patch +++ /dev/null @@ -1,55 +0,0 @@ -From f1e22a65f94a231edfe01ac6a3fcf30d95b6329f Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Wed, 31 Dec 2014 07:16:45 -0600 -Subject: [PATCH 1/2] libdir default - ---- - kde-modules/KDEInstallDirs.cmake | 31 +------------------------------ - 1 file changed, 1 insertion(+), 30 deletions(-) - -diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake -index e255e87..a79a12a 100644 ---- a/kde-modules/KDEInstallDirs.cmake -+++ b/kde-modules/KDEInstallDirs.cmake -@@ -162,37 +162,8 @@ - # (To distribute this file outside of extra-cmake-modules, substitute the full - # License text for the above reference.) - --# Figure out what the default install directory for libraries should be. --# This is based on the logic in GNUInstallDirs, but simplified (the --# GNUInstallDirs code deals with re-configuring, but that is dealt with --# by the _define_* macros in this module). -+# The default library directory on NixOS is *always* /lib. - set(_LIBDIR_DEFAULT "lib") --# Override this default 'lib' with 'lib64' iff: --# - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling --# - we are NOT on debian --# - we are on a 64 bits system --# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf --# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if --# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu" --# See http://wiki.debian.org/Multiarch --if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU") -- AND NOT CMAKE_CROSSCOMPILING) -- if (EXISTS "/etc/debian_version") # is this a debian system ? -- if(CMAKE_LIBRARY_ARCHITECTURE) -- set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}") -- endif() -- else() # not debian, rely on CMAKE_SIZEOF_VOID_P: -- if(NOT DEFINED CMAKE_SIZEOF_VOID_P) -- message(AUTHOR_WARNING -- "Unable to determine default LIB_INSTALL_LIBDIR directory because no target architecture is known. " -- "Please enable at least one language before including KDEInstallDirs.") -- else() -- if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") -- set(_LIBDIR_DEFAULT "lib64") -- endif() -- endif() -- endif() --endif() - - # Macro for variables that are relative to another variable. We store an empty - # value in the cache (for documentation/GUI cache editor purposes), and store --- -2.1.4 - diff --git a/pkgs/development/libraries/kde-frameworks-5.5/extra-cmake-modules/0002-qt5-plugin-dir.patch b/pkgs/development/libraries/kde-frameworks-5.5/extra-cmake-modules/0002-qt5-plugin-dir.patch deleted file mode 100644 index 5982aa8a06f..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.5/extra-cmake-modules/0002-qt5-plugin-dir.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e4fb9d880cefa743df2b5da3a67db617d66faf63 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Wed, 31 Dec 2014 07:23:59 -0600 -Subject: [PATCH 2/2] qt5 plugin dir - ---- - kde-modules/KDEInstallDirs.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake -index a79a12a..70dbe02 100644 ---- a/kde-modules/KDEInstallDirs.cmake -+++ b/kde-modules/KDEInstallDirs.cmake -@@ -315,7 +315,7 @@ if(KDE_INSTALL_USE_QT_SYS_PATHS) - "QtQuick2 imports" - QML_INSTALL_DIR) - else() -- _define_relative(QTPLUGINDIR LIBDIR "plugins" -+ _define_relative(QTPLUGINDIR LIBDIR "qt5/plugins" - "Qt plugins" - QT_PLUGIN_INSTALL_DIR) - --- -2.1.4 - diff --git a/pkgs/development/libraries/kde-frameworks-5.5/kauth/kauth-policy-install.patch b/pkgs/development/libraries/kde-frameworks-5.5/kauth/kauth-policy-install.patch deleted file mode 100644 index 340155256f2..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.5/kauth/kauth-policy-install.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/KF5AuthConfig.cmake.in b/KF5AuthConfig.cmake.in -index e859ec7..9a8ab18 100644 ---- a/KF5AuthConfig.cmake.in -+++ b/KF5AuthConfig.cmake.in -@@ -4,7 +4,7 @@ set(KAUTH_STUB_FILES_DIR "${PACKAGE_PREFIX_DIR}/@KF5_DATA_INSTALL_DIR@/kauth/") - - set(KAUTH_BACKEND_NAME "@KAUTH_BACKEND_NAME@") - set(KAUTH_HELPER_BACKEND_NAME "@KAUTH_HELPER_BACKEND_NAME@") --set(KAUTH_POLICY_FILES_INSTALL_DIR "@KAUTH_POLICY_FILES_INSTALL_DIR@") -+set(KAUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions") - set(KAUTH_HELPER_INSTALL_DIR "@KAUTH_HELPER_INSTALL_DIR@") - - find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@") diff --git a/pkgs/development/libraries/kde-frameworks-5.5/kcmutils/kcmutils-pluginselector-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.5/kcmutils/kcmutils-pluginselector-follow-symlinks.patch deleted file mode 100644 index 47b8dfad180..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.5/kcmutils/kcmutils-pluginselector-follow-symlinks.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp -index c63241b..2243f94 100644 ---- a/src/kpluginselector.cpp -+++ b/src/kpluginselector.cpp -@@ -304,7 +304,7 @@ void KPluginSelector::addPlugins(const QString &componentName, - QStringList desktopFileNames; - const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory); - Q_FOREACH (const QString &dir, dirs) { -- QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories); -+ QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (it.hasNext()) { - desktopFileNames.append(it.next()); - } diff --git a/pkgs/development/libraries/kde-frameworks-5.5/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.5/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch deleted file mode 100644 index 3bd946cbd84..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.5/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/khelpclient.cpp b/src/khelpclient.cpp -index 53a331e..80fbb01 100644 ---- a/src/khelpclient.cpp -+++ b/src/khelpclient.cpp -@@ -48,7 +48,7 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname) - QString docPath; - const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation); - Q_FOREACH (const QString &dir, desktopDirs) { -- QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories); -+ QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (it.hasNext()) { - const QString desktopPath(it.next()); - KDesktopFile desktopFile(desktopPath); diff --git a/pkgs/development/libraries/kde-frameworks-5.5/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/development/libraries/kde-frameworks-5.5/kdoctools/kdoctools-no-find-docbook-xml.patch deleted file mode 100644 index 4e3a33efab3..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.5/kdoctools/kdoctools-no-find-docbook-xml.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5c4863c..f731775 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -46,7 +46,6 @@ set_package_properties(LibXml2 PROPERTIES - ) - - --find_package(DocBookXML4 "4.5") - - set_package_properties(DocBookXML4 PROPERTIES - TYPE REQUIRED diff --git a/pkgs/development/libraries/kde-frameworks-5.5/kinit/kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks-5.5/kinit/kinit-libpath.patch deleted file mode 100644 index a6ccb2085d3..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.5/kinit/kinit-libpath.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp -index 3c3c913..f510620 100644 ---- a/src/kdeinit/kinit.cpp -+++ b/src/kdeinit/kinit.cpp -@@ -652,15 +652,17 @@ static pid_t launch(int argc, const char *_name, const char *args, - if (!libpath.isEmpty()) { - if (!l.load()) { - if (libpath_relative) { -- // NB: Because Qt makes the actual dlopen() call, the -- // RUNPATH of kdeinit is *not* respected - see -- // https://sourceware.org/bugzilla/show_bug.cgi?id=13945 -- // - so we try hacking it in ourselves -- QString install_lib_dir = QFile::decodeName( -- CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/"); -- libpath = install_lib_dir + libpath; -- l.setFileName(libpath); -+ // Use QT_PLUGIN_PATH to find shared library directories -+ // For KF5, the plugin path is /lib/plugins, so the kdeinit5 -+ // shared libraries should be in /lib/plugins/../ -+ const QRegExp pathSepRegExp(QString::fromLatin1("[:\b]")); -+ const QString up = QString::fromLocal8Bit("/../"); -+ const QStringList paths = QString::fromLocal8Bit(qgetenv("QT_PLUGIN_PATH")).split(pathSepRegExp, QString::KeepEmptyParts); -+ Q_FOREACH (const QString &path, paths) { -+ l.setFileName(path + up + libpath); - l.load(); -+ if (l.isLoaded()) break; -+ } - } - } - if (!l.isLoaded()) { diff --git a/pkgs/development/libraries/kde-frameworks-5.5/kservice/kservice-kbuildsycoca-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.5/kservice/kservice-kbuildsycoca-follow-symlinks.patch deleted file mode 100644 index e9bc418544a..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.5/kservice/kservice-kbuildsycoca-follow-symlinks.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/kbuildsycoca/kbuildsycoca.cpp b/src/kbuildsycoca/kbuildsycoca.cpp -index 69b1427..9c37a49 100644 ---- a/src/kbuildsycoca/kbuildsycoca.cpp -+++ b/src/kbuildsycoca/kbuildsycoca.cpp -@@ -227,7 +227,7 @@ bool KBuildSycoca::build() - QStringList relFiles; - const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, g_resourceSubdir, QStandardPaths::LocateDirectory); - Q_FOREACH (const QString &dir, dirs) { -- QDirIterator it(dir, QDirIterator::Subdirectories); -+ QDirIterator it(dir, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (it.hasNext()) { - const QString filePath = it.next(); - Q_ASSERT(filePath.startsWith(dir)); // due to the line below... diff --git a/pkgs/development/libraries/kde-frameworks-5.5/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.5/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch deleted file mode 100644 index 7e21ebfe86f..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.5/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/kbuildsycoca/vfolder_menu.cpp b/src/kbuildsycoca/vfolder_menu.cpp -index 2eb1275..e39a36f 100644 ---- a/src/kbuildsycoca/vfolder_menu.cpp -+++ b/src/kbuildsycoca/vfolder_menu.cpp -@@ -412,7 +412,7 @@ VFolderMenu::absoluteDir(const QString &_dir, const QString &baseDir, bool keepR - } - - if (!relative) { -- QString resolved = QDir(dir).canonicalPath(); -+ QString resolved = QDir::cleanPath(dir); - if (!resolved.isEmpty()) { - dir = resolved; - } diff --git a/pkgs/development/libraries/kde-frameworks-5.5/manifest.nix b/pkgs/development/libraries/kde-frameworks-5.5/manifest.nix deleted file mode 100644 index b22ea32ca28..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.5/manifest.nix +++ /dev/null @@ -1,364 +0,0 @@ -# This file is generated automatically. DO NOT EDIT! -{ mirror }: -[ - { - url = "${mirror}/stable/frameworks/5.5/extra-cmake-modules-1.5.0.tar.xz"; - sha256 = "0rhvrpakahylfrnwkw5n32xh95609b3ca40qjkd1bcqh9mw8s8n7"; - name = "extra-cmake-modules-1.5.0.tar.xz"; - store = "/nix/store/adn9n0xazi0wdmc7ffwfbxdbm05wvlg9-extra-cmake-modules-1.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/kdoctools-5.5.0.tar.xz"; - sha256 = "19pzafqinngzyk52c2a3l8llfxqh77y436sj3rvkir1falvg7jqi"; - name = "kdoctools-5.5.0.tar.xz"; - store = "/nix/store/i624z246bj0iy36r9fwzwnfanggkp7kj-kdoctools-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/knotifications-5.5.0.tar.xz"; - sha256 = "04fp1gkjv828464xs7y3wm5p8ww2n9alfds8bs76i49gpd42xjyh"; - name = "knotifications-5.5.0.tar.xz"; - store = "/nix/store/5dmvw3gp1hbq03pnp5llav77ggrya3qv-knotifications-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/kdesu-5.5.0.tar.xz"; - sha256 = "0m47ha6xwxv3w9hijdf6z4bb84rr0rw9p4sr5nmb9wdngzrmzcpd"; - name = "kdesu-5.5.0.tar.xz"; - store = "/nix/store/ixyfa6piyz5hcw8y9pkx75cg189y4qf8-kdesu-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/kdnssd-5.5.0.tar.xz"; - sha256 = "1j94162lvnc47y1nfjshpa28biaihyxghi7nz9rjdlr7cf40gp4r"; - name = "kdnssd-5.5.0.tar.xz"; - store = "/nix/store/z381zrhhyjk482arjnbra8pbwib9jrkp-kdnssd-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/kdewebkit-5.5.0.tar.xz"; - sha256 = "0y5d7mabkgc5676aax64hficjy06fqkm8a72jki1hl808pbapvwy"; - name = "kdewebkit-5.5.0.tar.xz"; - store = "/nix/store/xi41pfsfghkayasng6kqn5b65cfgs4vs-kdewebkit-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/kparts-5.5.0.tar.xz"; - sha256 = "0l6na645j2ijais4nqir54jxzn13csigivcg098m6m0mpiz8j4w6"; - name = "kparts-5.5.0.tar.xz"; - store = "/nix/store/l5011v85i02gqnk2hfkif5d7cwq5zm0s-kparts-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/kdeclarative-5.5.0.tar.xz"; - sha256 = "1pb9dlggdr0vzy9bhzsjncnkalvdbrjhgbp1hzba9pyzpmmhx6pq"; - name = "kdeclarative-5.5.0.tar.xz"; - store = "/nix/store/7527cdligx3667bjbjqcjxk3m6ifqldc-kdeclarative-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/ktextwidgets-5.5.0.tar.xz"; - sha256 = "1iqssmpilzxgjs5b2q3f1dpcq4wrwa528an6z9h6rx66lrmbcwml"; - name = "ktextwidgets-5.5.0.tar.xz"; - store = "/nix/store/93xq5dl3xmb713rfv0imh261lb6jr3d8-ktextwidgets-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/solid-5.5.0.tar.xz"; - sha256 = "1vcphw9fj0hqxr612p4dv8ggbb6vh7bnpa8b7l216ixqpg3wg1gs"; - name = "solid-5.5.0.tar.xz"; - store = "/nix/store/knsf1bxiymf8nh65w65bakb1cvzjq2il-solid-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/kpty-5.5.0.tar.xz"; - sha256 = "147zxsdyw4fwn0d99nkbjxgcs5vf6wzvgm9d9fpiyzq2747pmnin"; - name = "kpty-5.5.0.tar.xz"; - store = "/nix/store/yic1isk1ak0fwr9i3k3af986m1k8z87g-kpty-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/sonnet-5.5.0.tar.xz"; - sha256 = "0ck2li0y9z2vlby4axhva409bn5nw06g84mm4g3s86mfjypii3gm"; - name = "sonnet-5.5.0.tar.xz"; - store = "/nix/store/qgqxm6plb4vfj3yja62s4xa62nkbqmyj-sonnet-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/kguiaddons-5.5.0.tar.xz"; - sha256 = "0wlhhwf59bwscj7c1skigglp1fchdxmi8y3rrmm4ss7avbpkbjvb"; - name = "kguiaddons-5.5.0.tar.xz"; - store = "/nix/store/iajck67nc69d2qcczd3hxz41flkb3d7v-kguiaddons-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/kunitconversion-5.5.0.tar.xz"; - sha256 = "0h8rwnfd4dib56q0gndi4rjkrnmpq2bv0nbycsrnhjxvrzbxdfh0"; - name = "kunitconversion-5.5.0.tar.xz"; - store = "/nix/store/7dflp9jdaplbx4xjvy364kmy9h27yq67-kunitconversion-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/kconfigwidgets-5.5.0.tar.xz"; - sha256 = "1816n5qzjh4kgcmkicmsmwv063rx81wxvn4flbnrqxw2nglwyx41"; - name = "kconfigwidgets-5.5.0.tar.xz"; - store = "/nix/store/jgsadidxnli619q5i9cs7qmgkgs8hgqz-kconfigwidgets-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/kimageformats-5.5.0.tar.xz"; - sha256 = "0fhgk4pl8vx77p6jvcwx8vddzdn701rvbpjy3p0250zgzw9qjkin"; - name = "kimageformats-5.5.0.tar.xz"; - store = "/nix/store/qhy1ldzhhr1lij4bg5hp5w97fncqabhq-kimageformats-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/knewstuff-5.5.0.tar.xz"; - sha256 = "0w0j20jh10zpigm1s6x0n0jgpx9czwb72miyfl8cj3h2j07ghdpz"; - name = "knewstuff-5.5.0.tar.xz"; - store = "/nix/store/a49vair6af9159j7bsz9y0gn8q12i0np-knewstuff-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/kdbusaddons-5.5.0.tar.xz"; - sha256 = "1k2k1bwjiv1r5pbzn3ypydgva7kjj2z8csg01jc8p2qii221afjp"; - name = "kdbusaddons-5.5.0.tar.xz"; - store = "/nix/store/322m5kv9whdjgc21vlk2vcjaba8yfcbq-kdbusaddons-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/kio-5.5.0.tar.xz"; - sha256 = "13y7chcln71wk32bcd3h6qld901gnafksd9f4kb0nmnahdv6z73z"; - name = "kio-5.5.0.tar.xz"; - store = "/nix/store/p0xphwbx522h8xacg8bar3dp8fhd26h8-kio-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/kwindowsystem-5.5.0.tar.xz"; - sha256 = "1s243453d43fpnlykmv7ix6wzxhbyl92y8nrbyn73zfb5kc7z0yh"; - name = "kwindowsystem-5.5.0.tar.xz"; - store = "/nix/store/63g4qavmxcgw5njpy9fq2fji5p8ji804-kwindowsystem-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/kcodecs-5.5.0.tar.xz"; - sha256 = "0wh5rcnvkq9c8vf8kll02jpqid5hix17w2ywwpsjfmgi2a4bkjz7"; - name = "kcodecs-5.5.0.tar.xz"; - store = "/nix/store/33fpi9a2ggbj8dfpnzhs1w3jgj6hzw78-kcodecs-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/kcoreaddons-5.5.0.tar.xz"; - sha256 = "00fg1khdndacbd6msgjcz2yan04ib5h0l35a4l7bwpyd1crk6fdj"; - name = "kcoreaddons-5.5.0.tar.xz"; - store = "/nix/store/2p4mz7pxz94sddm7r4j82q4nriz16i3b-kcoreaddons-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/frameworkintegration-5.5.0.tar.xz"; - sha256 = "1781l1wzip4w4inz69si5cqy6gr0vcwx9vmhv93925jga44drpaz"; - name = "frameworkintegration-5.5.0.tar.xz"; - store = "/nix/store/6v1s33dyv1qvzv8x7m9ak4qn79g52ygz-frameworkintegration-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/kwidgetsaddons-5.5.0.tar.xz"; - sha256 = "0s3aybvnlri8pdfms4dmbgzqan656pzlaghsy8065x19dn4hmwl2"; - name = "kwidgetsaddons-5.5.0.tar.xz"; - store = "/nix/store/4f6681v6fp9yzgclf9wbryy63xjvjfvc-kwidgetsaddons-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/kidletime-5.5.0.tar.xz"; - sha256 = "0rb29aqv8npsq161nmkrsxz2kra0jdi1xv2zw9xyapb1yyg4qsk6"; - name = "kidletime-5.5.0.tar.xz"; - store = "/nix/store/1d96ca5sy906lhh16hmv122lr8s3xxrp-kidletime-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/ktexteditor-5.5.0.tar.xz"; - sha256 = "17sbdis5wnj13cxi713ncl1x4b61sdhx5i2j3fdk5gqycmrw93xf"; - name = "ktexteditor-5.5.0.tar.xz"; - store = "/nix/store/jy8cb6vscgzqb4gcsnh5b0b64f3pil0k-ktexteditor-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/knotifyconfig-5.5.0.tar.xz"; - sha256 = "1vj39fsxmypdq5bf1a5sdpld3dfy0hg7k8ikzhy4b83wh5mjzsfy"; - name = "knotifyconfig-5.5.0.tar.xz"; - store = "/nix/store/lc1gdg5j1qk7pjg8spyz2wkrcpwqw0c7-knotifyconfig-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/attica-5.5.0.tar.xz"; - sha256 = "10slxvfcfqxirrnwzfwdnbmlarkcc93d0rvb2110cfvghq3w676m"; - name = "attica-5.5.0.tar.xz"; - store = "/nix/store/53asp14pcyx5a47339g6sc3ni8wdh6l8-attica-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/kxmlgui-5.5.0.tar.xz"; - sha256 = "13n8jp7krsbajnaq8r8135xlqja9sawis7fr1z0li54hskfz18x9"; - name = "kxmlgui-5.5.0.tar.xz"; - store = "/nix/store/mb1fqb5w5c05yg2fsi31jfcc24hvv1jh-kxmlgui-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/kglobalaccel-5.5.0.tar.xz"; - sha256 = "1bkv7nn5x6im0d6mqr9v4grjc2p3vs481ckgcs6g28p7b4a0dfl3"; - name = "kglobalaccel-5.5.0.tar.xz"; - store = "/nix/store/i6dkz0bnw1yx9g8q49414pm9aszkvri3-kglobalaccel-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/plasma-framework-5.5.0.tar.xz"; - sha256 = "0rhmybncdyy1drg08pjvshmfmzd694skc0n9kk535bm90af4ir26"; - name = "plasma-framework-5.5.0.tar.xz"; - store = "/nix/store/jxi0gr530wj58d93hwd9zi5irxy3wrxh-plasma-framework-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/kplotting-5.5.0.tar.xz"; - sha256 = "1gxmngxh1w7wqhy3p4l3lr6283zp8wzsj7sv8gbzd55s3z9vcvp8"; - name = "kplotting-5.5.0.tar.xz"; - store = "/nix/store/5nncccml3icr8i2rr7qc1ai5193wr4z6-kplotting-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/kactivities-5.5.0.tar.xz"; - sha256 = "0ypd2cp82z7gabzg96hpz5s24nmzyd2c7a95k74xibasd2fxld73"; - name = "kactivities-5.5.0.tar.xz"; - store = "/nix/store/n6553bypqcqpnk2yhv9h0jlfbg671c7d-kactivities-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/kiconthemes-5.5.0.tar.xz"; - sha256 = "1jdjhg38bp936qjxjx0xkdkc1b8rly453d3hyf7vki10cfkm8l9i"; - name = "kiconthemes-5.5.0.tar.xz"; - store = "/nix/store/308wv5wyvxdmr792b26ps8wrjxw0s2s1-kiconthemes-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/kservice-5.5.0.tar.xz"; - sha256 = "1hs8g3nnrahi9951xgk0sj5fvpcj572fjj219kj7knv9mwv346zx"; - name = "kservice-5.5.0.tar.xz"; - store = "/nix/store/bizwfxq4ap84fd1g8kr7zdqys2rxfzig-kservice-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/kemoticons-5.5.0.tar.xz"; - sha256 = "0yl2w3f6h4irrbf6kl8npz4jwlzmi4bglwjcqqwhs3s6qz2wni95"; - name = "kemoticons-5.5.0.tar.xz"; - store = "/nix/store/y5inglfgimmn51by0rf6gk9d2k7wrprc-kemoticons-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/ki18n-5.5.0.tar.xz"; - sha256 = "11756hp266nssmkywnyh61pzd32k7y15323f5rlh8ap8hzs2cvjd"; - name = "ki18n-5.5.0.tar.xz"; - store = "/nix/store/06sviq6lrs60zg9541x99x57avrr460m-ki18n-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/karchive-5.5.0.tar.xz"; - sha256 = "06bal0lk9r8nnc0vzqsxjhk6xm6yjapl9x883rhzl9r8y9jxfcx3"; - name = "karchive-5.5.0.tar.xz"; - store = "/nix/store/zdm1v5bc5jxbv4yc1k4brkbk2mw4srzb-karchive-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/portingAids/krunner-5.5.0.tar.xz"; - sha256 = "139213rrkc0hmab4hy6mp501s0z59hjgsvkikcswli7wj1yvl1aj"; - name = "krunner-5.5.0.tar.xz"; - store = "/nix/store/ps29p1lprbpkqk77x623nfdks22sxz7a-krunner-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/portingAids/kdelibs4support-5.5.0.tar.xz"; - sha256 = "07jb21is23mkb2yy6dncw70f6jdcn0bg2vz13mgc86f3glim35wh"; - name = "kdelibs4support-5.5.0.tar.xz"; - store = "/nix/store/i6wdad07jlbk9nw6khccq9ncc9y4w82f-kdelibs4support-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/portingAids/kross-5.5.0.tar.xz"; - sha256 = "1nj4zfw6490saixhv3rwp5r7nrzvbskbhr1wvf4rxdbp0f1q20nb"; - name = "kross-5.5.0.tar.xz"; - store = "/nix/store/6yq7q3g76rbmdyn12rgi423jfakdzwps-kross-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/portingAids/kmediaplayer-5.5.0.tar.xz"; - sha256 = "192sn5vqgaip2y6rl30q6y7gmasgfwq137bcalyc00di15xclp6z"; - name = "kmediaplayer-5.5.0.tar.xz"; - store = "/nix/store/mj667h3y2j1p9ilblv96f1k98f918hp2-kmediaplayer-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/portingAids/kjsembed-5.5.0.tar.xz"; - sha256 = "1niqpbg33gzyxppgyxwrnlh3lrwz1wj8zym9z5lr7kimbyamw5xd"; - name = "kjsembed-5.5.0.tar.xz"; - store = "/nix/store/pn4w12z242ymbdq4zjg1fa1c3a0fblgc-kjsembed-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/portingAids/khtml-5.5.0.tar.xz"; - sha256 = "078444gi0jnpn5qjnv8zv2p0p22h14sxx3rv5kzc3zgbs8c0zqq2"; - name = "khtml-5.5.0.tar.xz"; - store = "/nix/store/yvnwkm5pn8b93rv422082gj1iaqx4sbs-khtml-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/portingAids/kjs-5.5.0.tar.xz"; - sha256 = "0wqvzrqd8c7mi90zf7if5cgqi7g42nmqj1ycn13kkds08varrjb6"; - name = "kjs-5.5.0.tar.xz"; - store = "/nix/store/55s4313gpm9qspabvq8kaahnyw03ybfv-kjs-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/kauth-5.5.0.tar.xz"; - sha256 = "03sf3cc4hg4drf9h118yqswk65f01q3q7mmj6pz8hhmsvf7rjpq0"; - name = "kauth-5.5.0.tar.xz"; - store = "/nix/store/bh72pjz74vhfwhk6zi7zfhrpaqrmj0gj-kauth-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/kitemmodels-5.5.0.tar.xz"; - sha256 = "0j7hifhxrmsdfbp68s4aahmn9jdfy6sy88d2p3z41cg4fw368g2v"; - name = "kitemmodels-5.5.0.tar.xz"; - store = "/nix/store/hx2gy0h93wqcrz0185k8blpvkgqb5rvp-kitemmodels-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/kcmutils-5.5.0.tar.xz"; - sha256 = "0na4dvj6qrh7wrdpf7k2gix8grsyj7a8ckvsrzsm35vmxkj1rppx"; - name = "kcmutils-5.5.0.tar.xz"; - store = "/nix/store/v93p482j7bqlcch6wh4wpmdbzm2rrb1f-kcmutils-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/kconfig-5.5.0.tar.xz"; - sha256 = "116ck6xz8j9mdz528qk2bj3yifi28jr9amdmjq10y8m67qsgfmdx"; - name = "kconfig-5.5.0.tar.xz"; - store = "/nix/store/y79vpd5m36ygn0ka1v030kzabkl1qnn8-kconfig-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/kcrash-5.5.0.tar.xz"; - sha256 = "1ckxphll3vcw3qf8cy3vibn177wc1zkx64g1yfj32ahvc2q5jmw9"; - name = "kcrash-5.5.0.tar.xz"; - store = "/nix/store/hybhzm8b650i2zah4ymzsqx5k23gnd93-kcrash-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/kded-5.5.0.tar.xz"; - sha256 = "102s41g2cd3addrqlvwj1a4q9j2rkla22pmjy535s1myk0s5zzbi"; - name = "kded-5.5.0.tar.xz"; - store = "/nix/store/dv5i4jlw5q7x9s2h64vgvi8lblwsiaw5-kded-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/kitemviews-5.5.0.tar.xz"; - sha256 = "1fwdl2hvp7nfbii38j89irc0cyfciji20kigzr9iiccips1j4w64"; - name = "kitemviews-5.5.0.tar.xz"; - store = "/nix/store/mica7hv5rmmhvdcazm7pknq57d9ln8jx-kitemviews-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/kdesignerplugin-5.5.0.tar.xz"; - sha256 = "1qdcr2gqym367g8w5k1bm6mjm4smc62p4k0aczmjhypa5f9ddkfb"; - name = "kdesignerplugin-5.5.0.tar.xz"; - store = "/nix/store/3qlwbyrnbv48swhsknlj319md1z1sdxl-kdesignerplugin-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/kwallet-5.5.0.tar.xz"; - sha256 = "1z2d5qv9722k27dwnj7ivpxa880jmaghh8vhfd9f1wld7lijwpgs"; - name = "kwallet-5.5.0.tar.xz"; - store = "/nix/store/a2n6x1kfs3qdixn7fsfy0f3rgf1bzb21-kwallet-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/kapidox-5.5.0.tar.xz"; - sha256 = "055fx8xvksz86gqldxcfbacq5kvb0f7qswaqcnipfcabqkny8vh4"; - name = "kapidox-5.5.0.tar.xz"; - store = "/nix/store/m6mp3qg9i6jxgb25ivwcfg0c66y06aay-kapidox-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/threadweaver-5.5.0.tar.xz"; - sha256 = "05j5m7fscppskc9jss2pm7zab3w0glfic685ccvvabllccsvhkn7"; - name = "threadweaver-5.5.0.tar.xz"; - store = "/nix/store/jwq6jvla6bypm1xhh7wv1lh7f2zmx8md-threadweaver-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/kcompletion-5.5.0.tar.xz"; - sha256 = "1l2jaq5f1wjav2vfkfbrrlk4v79q5l3106ij2dyxr0q1m05jvh2v"; - name = "kcompletion-5.5.0.tar.xz"; - store = "/nix/store/pq6fv8xh0nr0q1ki1hyp4mpg58jldmps-kcompletion-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/kbookmarks-5.5.0.tar.xz"; - sha256 = "022w3qddbgz4195nxs7kq0xs66qcagrp57jhpm2x23kp6l92g87s"; - name = "kbookmarks-5.5.0.tar.xz"; - store = "/nix/store/72fld6sj34xhjpg6v64dpn1g7lqpybin-kbookmarks-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/kinit-5.5.0.tar.xz"; - sha256 = "1hw06jhm0bs3p878ij22k7lx9gzaqnd2260iihgg7glr45jxbspn"; - name = "kinit-5.5.0.tar.xz"; - store = "/nix/store/1p4h45a62xcvswk09qa00zs1kjl0f2mj-kinit-5.5.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.5/kjobwidgets-5.5.0.tar.xz"; - sha256 = "0g849ggnwyw4w4lmdwv4mndgyc2kbdgavgf9hgwmqx0kr2anhi24"; - name = "kjobwidgets-5.5.0.tar.xz"; - store = "/nix/store/yfdc0p3mmk31plh50cpx89zfcm3jvx7y-kjobwidgets-5.5.0.tar.xz"; - } -] diff --git a/pkgs/development/libraries/kde-frameworks-5.5/manifest.sh b/pkgs/development/libraries/kde-frameworks-5.5/manifest.sh deleted file mode 100755 index c4a7cc39e52..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.5/manifest.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -if [ $# -eq 0 ]; then - - # The extra slash at the end of the URL is necessary to stop wget - # from recursing over the whole server! (No, it's not a bug.) - $(nix-build ../../../.. -A autonix.manifest) \ - http://download.kde.org/stable/frameworks/5.5/ \ - -A '*.tar.xz' - -else - - $(nix-build ../../../.. -A autonix.manifest) -A '*.tar.xz' "$@" - -fi diff --git a/pkgs/development/libraries/kde-frameworks-5.5/plasma-framework/plasma-framework-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.5/plasma-framework/plasma-framework-external-paths.patch deleted file mode 100644 index 9a22c0bdbcd..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.5/plasma-framework/plasma-framework-external-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/plasma/package.cpp b/src/plasma/package.cpp -index 07b3c90..84417e3 100644 ---- a/src/plasma/package.cpp -+++ b/src/plasma/package.cpp -@@ -791,7 +791,7 @@ PackagePrivate::PackagePrivate() - servicePrefix("plasma-applet-"), - fallbackPackage(0), - metadata(0), -- externalPaths(false), -+ externalPaths(true), - valid(false), - checkedValid(false) - { diff --git a/pkgs/development/libraries/kde-frameworks-5.5/renames.nix b/pkgs/development/libraries/kde-frameworks-5.5/renames.nix deleted file mode 100644 index 23262232f74..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.5/renames.nix +++ /dev/null @@ -1,66 +0,0 @@ -# DO NOT EDIT! This file is generated automatically. -{ }: -{ -"Backend" = "plasma-framework"; -"CTest" = "attica"; -"ECM" = "extra-cmake-modules"; -"KDED" = "kded"; -"KF5Activities" = "kactivities"; -"KF5Archive" = "karchive"; -"KF5Attica" = "attica"; -"KF5Auth" = "kauth"; -"KF5Bookmarks" = "kbookmarks"; -"KF5Codecs" = "kcodecs"; -"KF5Completion" = "kcompletion"; -"KF5Config" = "kconfig"; -"KF5ConfigWidgets" = "kconfigwidgets"; -"KF5CoreAddons" = "kcoreaddons"; -"KF5Crash" = "kcrash"; -"KF5DBusAddons" = "kdbusaddons"; -"KF5DNSSD" = "kdnssd"; -"KF5Declarative" = "kdeclarative"; -"KF5DesignerPlugin" = "kdesignerplugin"; -"KF5DocTools" = "kdoctools"; -"KF5Emoticons" = "kemoticons"; -"KF5FrameworkIntegration" = "frameworkintegration"; -"KF5GlobalAccel" = "kglobalaccel"; -"KF5GuiAddons" = "kguiaddons"; -"KF5I18n" = "ki18n"; -"KF5IconThemes" = "kiconthemes"; -"KF5IdleTime" = "kidletime"; -"KF5Init" = "kinit"; -"KF5ItemModels" = "kitemmodels"; -"KF5ItemViews" = "kitemviews"; -"KF5JS" = "kjs"; -"KF5JobWidgets" = "kjobwidgets"; -"KF5JsEmbed" = "kjsembed"; -"KF5KCMUtils" = "kcmutils"; -"KF5KDE4Support" = "kdelibs4support"; -"KF5KDELibs4Support" = "kdelibs4support"; -"KF5KHtml" = "khtml"; -"KF5KIO" = "kio"; -"KF5Kross" = "kross"; -"KF5MediaPlayer" = "kmediaplayer"; -"KF5NewStuff" = "knewstuff"; -"KF5Notifications" = "knotifications"; -"KF5NotifyConfig" = "knotifyconfig"; -"KF5Parts" = "kparts"; -"KF5Plasma" = "plasma-framework"; -"KF5PlasmaQuick" = "plasma-framework"; -"KF5Plotting" = "kplotting"; -"KF5Pty" = "kpty"; -"KF5Runner" = "krunner"; -"KF5Service" = "kservice"; -"KF5Solid" = "solid"; -"KF5Sonnet" = "sonnet"; -"KF5Su" = "kdesu"; -"KF5TextEditor" = "ktexteditor"; -"KF5TextWidgets" = "ktextwidgets"; -"KF5ThreadWeaver" = "threadweaver"; -"KF5UnitConversion" = "kunitconversion"; -"KF5Wallet" = "kwallet"; -"KF5WebKit" = "kdewebkit"; -"KF5WidgetsAddons" = "kwidgetsaddons"; -"KF5WindowSystem" = "kwindowsystem"; -"KF5XmlGui" = "kxmlgui"; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.5/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.5/setup-hook.sh deleted file mode 100644 index a8d9b7e0e36..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.5/setup-hook.sh +++ /dev/null @@ -1 +0,0 @@ -addToSearchPath XDG_DATA_DIRS @out@/share diff --git a/pkgs/development/libraries/kde-frameworks-5.6/default.nix b/pkgs/development/libraries/kde-frameworks-5.6/default.nix deleted file mode 100644 index a6f3d4ea389..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.6/default.nix +++ /dev/null @@ -1,190 +0,0 @@ -# Maintainer's Notes: -# -# Minor updates: -# 1. Edit ./manifest.sh to point to the updated URL. Upstream sometimes -# releases updates that include only the changed packages; in this case, -# multiple URLs can be provided and the results will be merged. -# 2. Run ./manifest.sh and ./dependencies.sh. -# 3. Build and enjoy. -# -# Major updates: -# We prefer not to immediately overwrite older versions with major updates, so -# make a copy of this directory first. After copying, be sure to delete ./tmp -# if it exists. Then follow the minor update instructions. - -{ autonix, fetchurl, pkgs, qt5, stdenv, debug ? false }: - -with stdenv.lib; with autonix; - -let - - mkDerivation = drv: - stdenv.mkDerivation - (drv // { - src = fetchurl drv.src; - - setupHook = ./setup-hook.sh; - - enableParallelBuilding = drv.enableParallelBuilding or true; - cmakeFlags = - (drv.cmakeFlags or []) - ++ [ "-DBUILD_TESTING=OFF" - "-DKDE_DEFAULT_HOME=.kde5" - "-DKDE4_DEFAULT_HOME=.kde" - ] - ++ optional debug "-DCMAKE_BUILD_TYPE=Debug"; - - meta = drv.meta or - { - license = with stdenv.lib.licenses; [ - lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 - ]; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ ttuegel ]; - homepage = "http://www.kde.org"; - }; - }); - - renames = builtins.removeAttrs (import ./renames.nix {}) ["Backend" "CTest"]; - - scope = - # packages in this collection - (mapAttrs (dep: name: kf5."${name}") renames) // - # packages pinned to this version of Qt 5 - { - Phonon4Qt5 = pkgs.phonon_qt5.override { inherit qt5; }; - Qt5 = qt5; - Qt5Core = qt5; - Qt5DBus = qt5; - Qt5Test = qt5; - Qt5Widgets = qt5; - Qt5X11Extras = qt5; - dbusmenu-qt5 = pkgs.libdbusmenu_qt5.override { inherit qt5; }; - } // - # packages from the nixpkgs collection - (with pkgs; - { - inherit cmake; - Boost = boost155; - GIF = giflib; - GLIB2 = glib; - Gpgme = gpgme; - JPEG = libjpeg; - LibGcrypt = libgcrypt; - LibGit2 = libgit2; - LibIntl = gettext; - LibLZMA = lzma; - NetworkManager = networkmanager; - Perl = perl; - PythonInterp = python; - QImageBlitz = qimageblitz; - SharedMimeInfo = shared_mime_info; - ZLIB = zlib; - } - ); - - mirror = "mirror://kde"; - - preResolve = super: - fold (f: x: f x) super - [ - (userEnvPkg "SharedMimeInfo") - (userEnvPkg "SharedDesktopOntologies") - ]; - - postResolve = super: - super // { - extra-cmake-modules = { - inherit (super.extra-cmake-modules) name src; - - propagatedNativeBuildInputs = with pkgs; [ cmake pkgconfig ]; - cmakeFlags = ["-DBUILD_TESTING=OFF"]; - patches = - [ - ./extra-cmake-modules/0001-libdir-default.patch - ./extra-cmake-modules/0002-qt5-plugin-dir.patch - ]; - meta = { - license = with stdenv.lib.licenses; [ bsd2 ]; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ ttuegel ]; - homepage = "http://www.kde.org"; - }; - }; - - kauth = with pkgs; super.kauth // { - buildInputs = super.kauth.buildInputs ++ [polkit_qt5]; - patches = [./kauth/kauth-policy-install.patch]; - }; - - kcmutils = super.kcmutils // { - patches = - [./kcmutils/kcmutils-pluginselector-follow-symlinks.patch]; - }; - - kconfigwidgets = super.kconfigwidgets // { - patches = - [./kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch]; - }; - - kdelibs4support = with pkgs; super.kdelibs4support // { - buildInputs = - super.kdelibs4support.buildInputs - ++ [networkmanager xlibs.libSM]; - cmakeFlags = - (super.kdelibs4support.cmakeFlags or []) - ++ [ - "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook" - "-DDocBookXML4_DTD_VERSION=4.5" - ]; - }; - - kdoctools = with pkgs; super.kdoctools // { - cmakeFlags = - (super.kdoctools.cmakeFlags or []) - ++ [ - "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook" - "-DDocBookXML4_DTD_VERSION=4.5" - "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook" - ]; - patches = [./kdoctools/kdoctools-no-find-docbook-xml.patch]; - }; - - ki18n = with pkgs; super.ki18n // { - propagatedNativeBuildInputs = - super.ki18n.propagatedNativeBuildInputs ++ [gettext python]; - }; - - kimageformats = with pkgs; super.kimageformats // { - NIX_CFLAGS_COMPILE = - (super.kimageformats.NIX_CFLAGS_COMPILE or "") - + " -I${ilmbase}/include/OpenEXR"; - }; - - kinit = super.kinit // { patches = [ ./kinit/kinit-libpath.patch ]; }; - - kpackage = super.kpackage // { patches = [ ./kpackage/0001-allow-external-paths.patch ]; }; - - kservice = super.kservice // { - buildInputs = super.kservice.buildInputs ++ [kf5.kwindowsystem]; - patches = - [ - ./kservice/kservice-kbuildsycoca-follow-symlinks.patch - ./kservice/kservice-kbuildsycoca-no-canonicalize-path.patch - ]; - }; - - /* - plasma-framework = super.plasma-framework // { - patches = [ ./plasma-framework/plasma-framework-external-paths.patch ]; - }; - */ - }; - - kf5 = generateCollection ./. { - inherit mirror mkDerivation preResolve postResolve renames scope; - }; - -in - - kf5 // { inherit mkDerivation qt5 scope; } diff --git a/pkgs/development/libraries/kde-frameworks-5.6/dependencies.nix b/pkgs/development/libraries/kde-frameworks-5.6/dependencies.nix deleted file mode 100644 index 608bff01b92..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.6/dependencies.nix +++ /dev/null @@ -1,500 +0,0 @@ -# DO NOT EDIT! This file is generated automatically. -{ }: -{ - attica = { - buildInputs = [ "ECM" "Qt5" "Qt5Widgets" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "Qt5Core" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - extra-cmake-modules = { - buildInputs = [ "AGG" "Blitz" "BlueZ" "ENCHANT" "Eigen2" "FFmpeg" "Flac" "Flex" "GObject" "GStreamer" "LCMS" "LibArt" "OpenEXR" "PCRE" "QCA2" "QImageBlitz" "Qt5Core" "Qt5LinguistTools" "Sqlite" "Strigi" "USB" "Xine" "Xmms" ]; - nativeBuildInputs = [ "LibXslt" "QCOLLECTIONGENERATOR_EXECUTABLE" "SPHINX_EXECUTABLE" "cmake" ]; - propagatedBuildInputs = [ ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - frameworkintegration = { - buildInputs = [ "ECM" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Notifications" "KF5WidgetsAddons" "OxygenFont" "Qt5" "Qt5Test" "XCB" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5IconThemes" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kactivities = { - buildInputs = [ "Boost" "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5DBusAddons" "KF5Declarative" "KF5GlobalAccel" "KF5I18n" "KF5KCMUtils" "KF5KIO" "KF5Service" "KF5WindowSystem" "KF5XmlGui" "Qt5" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "Qt5Core" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kapidox = { - buildInputs = [ ]; - nativeBuildInputs = [ "PythonInterp" "cmake" ]; - propagatedBuildInputs = [ ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - karchive = { - buildInputs = [ "BZip2" "ECM" "KF5Archive" "LibLZMA" "Qt5Core" "Qt5Test" "ZLIB" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "Qt5Core" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kauth = { - buildInputs = [ "ECM" "KF5CoreAddons" "Qt5" "Qt5Test" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5CoreAddons" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kbookmarks = { - buildInputs = [ "ECM" "KF5ConfigWidgets" "KF5CoreAddons" "KF5IconThemes" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5Test" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5IconThemes" "KF5XmlGui" "Qt5Widgets" "Qt5Xml" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kcmutils = { - buildInputs = [ "ECM" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5Service" "KF5XmlGui" "Qt5" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5IconThemes" "KF5ItemViews" "KF5Service" "KF5XmlGui" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kcodecs = { - buildInputs = [ "ECM" "Qt5Core" "Qt5Test" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "Qt5Core" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kcompletion = { - buildInputs = [ "ECM" "KF5Config" "KF5WidgetsAddons" "Qt5" "Qt5Test" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5Config" "KF5WidgetsAddons" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kconfig = { - buildInputs = [ "ECM" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5Gui" "Qt5Test" "Qt5Xml" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "Qt5Xml" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kconfigwidgets = { - buildInputs = [ "ECM" "KF5Auth" "KF5Codecs" "KF5Config" "KF5CoreAddons" "KF5DocTools" "KF5GuiAddons" "KF5I18n" "KF5WidgetsAddons" "Qt5" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5Auth" "KF5Codecs" "KF5Config" "KF5GuiAddons" "KF5I18n" "KF5WidgetsAddons" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kcoreaddons = { - buildInputs = [ "ECM" "FAM" "Qt5" "Qt5Test" "Qt5Widgets" "SharedMimeInfo" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "Qt5Core" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ "SharedMimeInfo" ]; - }; - - kcrash = { - buildInputs = [ "ECM" "KF5CoreAddons" "KF5WindowSystem" "Qt5" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5CoreAddons" "KF5WindowSystem" "Qt5Core" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kdbusaddons = { - buildInputs = [ "ECM" "Qt5DBus" "Qt5Test" "Qt5X11Extras" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "Qt5DBus" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kdeclarative = { - buildInputs = [ "ECM" "KF5" "KF5Config" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" "Qt5Test" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5KIO" "Qt5Qml" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kded = { - buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5DocTools" "KF5Init" "KF5Service" "Qt5" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kdelibs4support = { - buildInputs = [ "AGG" "Blitz" "BlueZ" "DocBookXML4" "ECM" "ENCHANT" "Eigen2" "FFmpeg" "Flac" "GObject" "GStreamer" "KDEWin" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5Crash" "KF5DesignerPlugin" "KF5DocTools" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Notifications" "KF5Parts" "KF5Service" "KF5TextWidgets" "KF5UnitConversion" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "LCMS" "LibArt" "NetworkManager" "OpenEXR" "OpenSSL" "PCRE" "QCA2" "QImageBlitz" "QNtrack" "Qt5" "Qt5X11Extras" "Sqlite" "USB" "X11" "Xine" "Xmms" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KDEWin" "KF5Auth" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5DesignerPlugin" "KF5DocTools" "KF5Emoticons" "KF5GuiAddons" "KF5IconThemes" "KF5Init" "KF5ItemModels" "KF5KDELibs4Support" "KF5Notifications" "KF5Parts" "KF5TextWidgets" "KF5UnitConversion" "KF5WindowSystem" "Qt5DBus" "Qt5PrintSupport" "Qt5Xml" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kdesignerplugin = { - buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DocTools" "KF5IconThemes" "KF5ItemViews" "KF5KIO" "KF5Plotting" "KF5Sonnet" "KF5TextWidgets" "KF5WebKit" "KF5WidgetsAddons" "KF5XmlGui" "Qt5Core" "Qt5Designer" "Qt5Test" "Qt5Widgets" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kdesu = { - buildInputs = [ "ECM" "KF5CoreAddons" "KF5Pty" "KF5Service" "Qt5Core" "X11" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5Pty" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kdewebkit = { - buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5JobWidgets" "KF5KIO" "KF5Parts" "KF5Service" "KF5Wallet" "Qt5" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "Qt5WebKitWidgets" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kdnssd = { - buildInputs = [ "Avahi" "DNSSD" "ECM" "Qt5" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "Qt5Network" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kdoctools = { - buildInputs = [ "DocBookXML4" "DocBookXSL" "ECM" "KF5Archive" "KF5DocTools" "KF5I18n" "LibXml2" "Qt5Core" ]; - nativeBuildInputs = [ "LibXslt" "cmake" ]; - propagatedBuildInputs = [ "KF5Archive" "Qt5Core" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kemoticons = { - buildInputs = [ "ECM" "KF5Archive" "KF5Config" "KF5CoreAddons" "KF5Service" "Qt5" "Qt5Test" "Qt5Xml" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5Archive" "KF5Service" "Qt5Gui" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kglobalaccel = { - buildInputs = [ "ECM" "Qt5" "X11" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "Qt5DBus" "Qt5Widgets" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kguiaddons = { - buildInputs = [ "ECM" "Qt5" "Qt5Gui" "Qt5X11Extras" "X11" "XCB" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "Qt5Gui" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - khtml = { - buildInputs = [ "ECM" "GIF" "JPEG" "KDEWin" "KF5Archive" "KF5Codecs" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5JS" "KF5KIO" "KF5Notifications" "KF5Parts" "KF5Sonnet" "KF5TextWidgets" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "OpenSSL" "PNG" "Phonon4Qt5" "Qt5" "Qt5Test" "Qt5X11Extras" "X11" ]; - nativeBuildInputs = [ "Perl" "cmake" ]; - propagatedBuildInputs = [ "KF5Archive" "KF5Bookmarks" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5JS" "KF5KIO" "KF5Notifications" "KF5Parts" "KF5Sonnet" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5Core" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - ki18n = { - buildInputs = [ "ECM" "LibIntl" "Qt5" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kiconthemes = { - buildInputs = [ "ECM" "KF5ConfigWidgets" "KF5I18n" "KF5ItemViews" "KF5WidgetsAddons" "Qt5" "Qt5DBus" "Qt5Svg" "Qt5Widgets" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5I18n" "KF5ItemViews" "KF5WidgetsAddons" "Qt5Widgets" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kidletime = { - buildInputs = [ "ECM" "Qt5" "X11" "X11_XCB" "XCB" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "Qt5Core" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kimageformats = { - buildInputs = [ "ECM" "Jasper" "OpenEXR" "Qt5Gui" "Qt5PrintSupport" "Qt5Test" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kinit = { - buildInputs = [ "ECM" "KF5Config" "KF5Crash" "KF5DocTools" "KF5I18n" "KF5KIO" "KF5Service" "KF5WindowSystem" "Libcap" "Qt5" "X11" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kio = { - buildInputs = [ "ACL" "ECM" "GSSAPI" "KF5Archive" "KF5Bookmarks" "KF5Codecs" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5JobWidgets" "KF5Notifications" "KF5Service" "KF5Solid" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "LibXml2" "OpenSSL" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5Script" "Qt5Test" "Qt5Widgets" "Strigi" "X11" "ZLIB" ]; - nativeBuildInputs = [ "LibXslt" "cmake" ]; - propagatedBuildInputs = [ "KF5Bookmarks" "KF5Completion" "KF5ItemViews" "KF5JobWidgets" "KF5Service" "KF5Solid" "KF5XmlGui" "Qt5Network" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kitemmodels = { - buildInputs = [ "ECM" "Grantlee" "Qt5" "Qt5Core" "Qt5Script" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "Qt5Core" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kitemviews = { - buildInputs = [ "ECM" "Qt5" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "Qt5Widgets" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kjobwidgets = { - buildInputs = [ "ECM" "KF5CoreAddons" "KF5WidgetsAddons" "Qt5" "Qt5X11Extras" "X11" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5CoreAddons" "KF5WidgetsAddons" "Qt5Widgets" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kjs = { - buildInputs = [ "ECM" "PCRE" "Qt5Core" "Qt5Test" ]; - nativeBuildInputs = [ "Perl" "cmake" ]; - propagatedBuildInputs = [ "Qt5Core" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kjsembed = { - buildInputs = [ "ECM" "KF5DocTools" "KF5I18n" "KF5JS" "Qt5" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5I18n" "KF5JS" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kmediaplayer = { - buildInputs = [ "ECM" "KF5Parts" "KF5XmlGui" "Qt5DBus" "Qt5Test" "Qt5Widgets" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5Parts" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - knewstuff = { - buildInputs = [ "ECM" "KF5Archive" "KF5Attica" "KF5Completion" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KIO" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5Test" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5Archive" "KF5Attica" "KF5KIO" "KF5XmlGui" "Qt5Widgets" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - knotifications = { - buildInputs = [ "ECM" "KF5Codecs" "KF5Config" "KF5CoreAddons" "KF5IconThemes" "KF5Service" "KF5WindowSystem" "Phonon4Qt5" "Qt5" "Qt5X11Extras" "X11" "dbusmenu-qt5" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5WindowSystem" "Qt5Widgets" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - knotifyconfig = { - buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5KIO" "KF5Notifications" "KF5Service" "KF5WidgetsAddons" "KF5XmlGui" "Phonon4Qt5" "Qt5" "Qt5Test" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5I18n" "KF5KIO" "Qt5Widgets" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kpackage = { - buildInputs = [ "ECM" "KF5Archive" "KF5Config" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "Qt5" "Qt5Test" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kparts = { - buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5JobWidgets" "KF5KIO" "KF5Notifications" "KF5Service" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5Test" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5KIO" "KF5Notifications" "KF5TextWidgets" "KF5XmlGui" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kplotting = { - buildInputs = [ "ECM" "Qt5" "Qt5Widgets" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "Qt5Widgets" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kpty = { - buildInputs = [ "ECM" "KF5CoreAddons" "KF5I18n" "Qt5" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5CoreAddons" "KF5I18n" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kross = { - buildInputs = [ "ECM" "KF5Completion" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Parts" "KF5Service" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Parts" "KF5WidgetsAddons" "Qt5Script" "Qt5Widgets" "Qt5Xml" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - krunner = { - buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5KIO" "KF5Plasma" "KF5Service" "KF5Solid" "KF5ThreadWeaver" "Qt5" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5Plasma" "Qt5Core" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kservice = { - buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "Qt5" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5Config" "KF5CoreAddons" "KF5DBusAddons" "KF5I18n" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - ktexteditor = { - buildInputs = [ "ECM" "KF5Archive" "KF5Config" "KF5GuiAddons" "KF5I18n" "KF5KIO" "KF5Parts" "KF5Sonnet" "LibGit2" "Qt5" ]; - nativeBuildInputs = [ "Perl" "cmake" ]; - propagatedBuildInputs = [ ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - ktextwidgets = { - buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5Service" "KF5Sonnet" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5Completion" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5Service" "KF5Sonnet" "KF5WindowSystem" "Qt5Widgets" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kunitconversion = { - buildInputs = [ "ECM" "KF5I18n" "Qt5" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5Config" "KF5I18n" "Qt5Core" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kwallet = { - buildInputs = [ "ECM" "Gpgme" "KF5Config" "KF5CoreAddons" "KF5DBusAddons" "KF5Gpgmepp" "KF5I18n" "KF5IconThemes" "KF5Notifications" "KF5Service" "KF5WidgetsAddons" "KF5WindowSystem" "LibGcrypt" "Qt5" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5Config" "KF5WindowSystem" "Qt5Core" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kwidgetsaddons = { - buildInputs = [ "ECM" "Qt5" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "Qt5Widgets" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kwindowsystem = { - buildInputs = [ "ECM" "Qt5" "Qt5WinExtras" "X11" "XCB" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "Qt5Widgets" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - kxmlgui = { - buildInputs = [ "ECM" "KF5Attica" "KF5Config" "KF5ConfigWidgets" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5TextWidgets" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "KF5Attica" "KF5Config" "KF5ConfigWidgets" "KF5GlobalAccel" "KF5IconThemes" "KF5ItemViews" "KF5TextWidgets" "KF5WindowSystem" "Qt5DBus" "Qt5Xml" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - networkmanager-qt = { - buildInputs = [ "ECM" "KF5NetworkManagerQt" "NetworkManager" "Qt4" "Qt5" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "Qt5Core" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - plasma-framework = { - buildInputs = [ "ECM" "EGL" "Gpgme" "KActivities" "KCoreAddons" "KDE4Support" "KDESu" "KDeclarative" "KF5" "KF5Activities" "KF5Archive" "KF5Auth" "KF5Bookmarks" "KF5Codecs" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5Declarative" "KF5DocTools" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5IdleTime" "KF5Init" "KF5ItemModels" "KF5ItemViews" "KF5JS" "KF5JobWidgets" "KF5KArchive" "KF5KAuth" "KF5KBookmarks" "KF5KCodecs" "KF5KCompletion" "KF5KConfig" "KF5KConfigWidgets" "KF5KCoreAddons" "KF5KCrash" "KF5KDBusAddons" "KF5KDE4Support" "KF5KDESu" "KF5KDeclarative" "KF5KDocTools" "KF5KF5GlobalAccel" "KF5KGuiAddons" "KF5KI18n" "KF5KIO" "KF5KIconThemes" "KF5KIdleTime" "KF5KInit" "KF5KJS" "KF5KJobWidgets" "KF5KNotifications" "KF5KParts" "KF5KService" "KF5KTextWidgets" "KF5KUnitConversion" "KF5KWallet" "KF5KWidgetsAddons" "KF5KWindowSystem" "KF5Kross" "KF5NO_MODULE" "KF5Notifications" "KF5Package" "KF5Parts" "KF5Service" "KF5Solid" "KF5Sonnet" "KF5Su" "KF5TextWidgets" "KF5ThreadWeaver" "KF5UnitConversion" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "KdepimLibs" "OpenGL" "QCA2" "Qt5" "Qt5Test" "Qt5Widgets" "Solid" "X11" "XCB" ]; - nativeBuildInputs = [ "SH" "cmake" ]; - propagatedBuildInputs = [ "KF5Package" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - solid = { - buildInputs = [ "ECM" "IOKit" "MediaPlayerInfo" "Qt5" "Qt5Qml" "UDev" ]; - nativeBuildInputs = [ "BISON" "FLEX" "cmake" ]; - propagatedBuildInputs = [ "Qt5Core" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - sonnet = { - buildInputs = [ "ASPELL" "ECM" "ENCHANT" "HSPELL" "HUNSPELL" "Qt5" "Qt5Test" "ZLIB" ]; - nativeBuildInputs = [ "cmake" ]; - propagatedBuildInputs = [ "Qt5Core" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - - threadweaver = { - buildInputs = [ "ECM" "KF5ThreadWeaver" "Qt5" "Qt5Core" "Qt5Test" "Qt5Widgets" ]; - nativeBuildInputs = [ "SNIPPETEXTRACTOR" "cmake" ]; - propagatedBuildInputs = [ "Qt5Core" ]; - propagatedNativeBuildInputs = [ ]; - propagatedUserEnvPkgs = [ ]; - }; - -} diff --git a/pkgs/development/libraries/kde-frameworks-5.6/dependencies.sh b/pkgs/development/libraries/kde-frameworks-5.6/dependencies.sh deleted file mode 100755 index 2b220244c59..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.6/dependencies.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -# This script rebuilds dependencies.nix. -# You must run manifest.sh first to download the packages. - -# Without arguments, this will use the version of autonix-deps-kf5 in nixpkgs. -# If you are working on the packages, this is probably what you want. - -# You can also pass the path to a source tree where you have built -# autonix-deps-kf5 yourself. If you are working on autonix-deps-kf5, this is -# probably what you want. - -manifestXML=$(nix-build -E 'with (import ../../../.. {}); autonix.writeManifestXML ./manifest.nix') - -autonixDepsKf5="" -if [[ -z $1 ]]; then - autonixDepsKF5=$(nix-build ../../../.. -A haskellngPackages.autonix-deps-kf5)/bin -else - autonixDepsKF5="$1/dist/build/kf5-deps" -fi - -exec ${autonixDepsKF5}/kf5-deps "${manifestXML}" diff --git a/pkgs/development/libraries/kde-frameworks-5.6/extra-cmake-modules/0001-libdir-default.patch b/pkgs/development/libraries/kde-frameworks-5.6/extra-cmake-modules/0001-libdir-default.patch deleted file mode 100644 index faed0e6edc9..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.6/extra-cmake-modules/0001-libdir-default.patch +++ /dev/null @@ -1,55 +0,0 @@ -From f1e22a65f94a231edfe01ac6a3fcf30d95b6329f Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Wed, 31 Dec 2014 07:16:45 -0600 -Subject: [PATCH 1/2] libdir default - ---- - kde-modules/KDEInstallDirs.cmake | 31 +------------------------------ - 1 file changed, 1 insertion(+), 30 deletions(-) - -diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake -index e255e87..a79a12a 100644 ---- a/kde-modules/KDEInstallDirs.cmake -+++ b/kde-modules/KDEInstallDirs.cmake -@@ -162,37 +162,8 @@ - # (To distribute this file outside of extra-cmake-modules, substitute the full - # License text for the above reference.) - --# Figure out what the default install directory for libraries should be. --# This is based on the logic in GNUInstallDirs, but simplified (the --# GNUInstallDirs code deals with re-configuring, but that is dealt with --# by the _define_* macros in this module). -+# The default library directory on NixOS is *always* /lib. - set(_LIBDIR_DEFAULT "lib") --# Override this default 'lib' with 'lib64' iff: --# - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling --# - we are NOT on debian --# - we are on a 64 bits system --# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf --# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if --# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu" --# See http://wiki.debian.org/Multiarch --if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU") -- AND NOT CMAKE_CROSSCOMPILING) -- if (EXISTS "/etc/debian_version") # is this a debian system ? -- if(CMAKE_LIBRARY_ARCHITECTURE) -- set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}") -- endif() -- else() # not debian, rely on CMAKE_SIZEOF_VOID_P: -- if(NOT DEFINED CMAKE_SIZEOF_VOID_P) -- message(AUTHOR_WARNING -- "Unable to determine default LIB_INSTALL_LIBDIR directory because no target architecture is known. " -- "Please enable at least one language before including KDEInstallDirs.") -- else() -- if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") -- set(_LIBDIR_DEFAULT "lib64") -- endif() -- endif() -- endif() --endif() - - # Macro for variables that are relative to another variable. We store an empty - # value in the cache (for documentation/GUI cache editor purposes), and store --- -2.1.4 - diff --git a/pkgs/development/libraries/kde-frameworks-5.6/extra-cmake-modules/0002-qt5-plugin-dir.patch b/pkgs/development/libraries/kde-frameworks-5.6/extra-cmake-modules/0002-qt5-plugin-dir.patch deleted file mode 100644 index 5982aa8a06f..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.6/extra-cmake-modules/0002-qt5-plugin-dir.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e4fb9d880cefa743df2b5da3a67db617d66faf63 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Wed, 31 Dec 2014 07:23:59 -0600 -Subject: [PATCH 2/2] qt5 plugin dir - ---- - kde-modules/KDEInstallDirs.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake -index a79a12a..70dbe02 100644 ---- a/kde-modules/KDEInstallDirs.cmake -+++ b/kde-modules/KDEInstallDirs.cmake -@@ -315,7 +315,7 @@ if(KDE_INSTALL_USE_QT_SYS_PATHS) - "QtQuick2 imports" - QML_INSTALL_DIR) - else() -- _define_relative(QTPLUGINDIR LIBDIR "plugins" -+ _define_relative(QTPLUGINDIR LIBDIR "qt5/plugins" - "Qt plugins" - QT_PLUGIN_INSTALL_DIR) - --- -2.1.4 - diff --git a/pkgs/development/libraries/kde-frameworks-5.6/kauth/kauth-policy-install.patch b/pkgs/development/libraries/kde-frameworks-5.6/kauth/kauth-policy-install.patch deleted file mode 100644 index 340155256f2..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.6/kauth/kauth-policy-install.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/KF5AuthConfig.cmake.in b/KF5AuthConfig.cmake.in -index e859ec7..9a8ab18 100644 ---- a/KF5AuthConfig.cmake.in -+++ b/KF5AuthConfig.cmake.in -@@ -4,7 +4,7 @@ set(KAUTH_STUB_FILES_DIR "${PACKAGE_PREFIX_DIR}/@KF5_DATA_INSTALL_DIR@/kauth/") - - set(KAUTH_BACKEND_NAME "@KAUTH_BACKEND_NAME@") - set(KAUTH_HELPER_BACKEND_NAME "@KAUTH_HELPER_BACKEND_NAME@") --set(KAUTH_POLICY_FILES_INSTALL_DIR "@KAUTH_POLICY_FILES_INSTALL_DIR@") -+set(KAUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions") - set(KAUTH_HELPER_INSTALL_DIR "@KAUTH_HELPER_INSTALL_DIR@") - - find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@") diff --git a/pkgs/development/libraries/kde-frameworks-5.6/kcmutils/kcmutils-pluginselector-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.6/kcmutils/kcmutils-pluginselector-follow-symlinks.patch deleted file mode 100644 index 47b8dfad180..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.6/kcmutils/kcmutils-pluginselector-follow-symlinks.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp -index c63241b..2243f94 100644 ---- a/src/kpluginselector.cpp -+++ b/src/kpluginselector.cpp -@@ -304,7 +304,7 @@ void KPluginSelector::addPlugins(const QString &componentName, - QStringList desktopFileNames; - const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory); - Q_FOREACH (const QString &dir, dirs) { -- QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories); -+ QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (it.hasNext()) { - desktopFileNames.append(it.next()); - } diff --git a/pkgs/development/libraries/kde-frameworks-5.6/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.6/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch deleted file mode 100644 index 3bd946cbd84..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.6/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/khelpclient.cpp b/src/khelpclient.cpp -index 53a331e..80fbb01 100644 ---- a/src/khelpclient.cpp -+++ b/src/khelpclient.cpp -@@ -48,7 +48,7 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname) - QString docPath; - const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation); - Q_FOREACH (const QString &dir, desktopDirs) { -- QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories); -+ QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (it.hasNext()) { - const QString desktopPath(it.next()); - KDesktopFile desktopFile(desktopPath); diff --git a/pkgs/development/libraries/kde-frameworks-5.6/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/development/libraries/kde-frameworks-5.6/kdoctools/kdoctools-no-find-docbook-xml.patch deleted file mode 100644 index 4e3a33efab3..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.6/kdoctools/kdoctools-no-find-docbook-xml.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5c4863c..f731775 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -46,7 +46,6 @@ set_package_properties(LibXml2 PROPERTIES - ) - - --find_package(DocBookXML4 "4.5") - - set_package_properties(DocBookXML4 PROPERTIES - TYPE REQUIRED diff --git a/pkgs/development/libraries/kde-frameworks-5.6/kinit/kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks-5.6/kinit/kinit-libpath.patch deleted file mode 100644 index a6ccb2085d3..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.6/kinit/kinit-libpath.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp -index 3c3c913..f510620 100644 ---- a/src/kdeinit/kinit.cpp -+++ b/src/kdeinit/kinit.cpp -@@ -652,15 +652,17 @@ static pid_t launch(int argc, const char *_name, const char *args, - if (!libpath.isEmpty()) { - if (!l.load()) { - if (libpath_relative) { -- // NB: Because Qt makes the actual dlopen() call, the -- // RUNPATH of kdeinit is *not* respected - see -- // https://sourceware.org/bugzilla/show_bug.cgi?id=13945 -- // - so we try hacking it in ourselves -- QString install_lib_dir = QFile::decodeName( -- CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/"); -- libpath = install_lib_dir + libpath; -- l.setFileName(libpath); -+ // Use QT_PLUGIN_PATH to find shared library directories -+ // For KF5, the plugin path is /lib/plugins, so the kdeinit5 -+ // shared libraries should be in /lib/plugins/../ -+ const QRegExp pathSepRegExp(QString::fromLatin1("[:\b]")); -+ const QString up = QString::fromLocal8Bit("/../"); -+ const QStringList paths = QString::fromLocal8Bit(qgetenv("QT_PLUGIN_PATH")).split(pathSepRegExp, QString::KeepEmptyParts); -+ Q_FOREACH (const QString &path, paths) { -+ l.setFileName(path + up + libpath); - l.load(); -+ if (l.isLoaded()) break; -+ } - } - } - if (!l.isLoaded()) { diff --git a/pkgs/development/libraries/kde-frameworks-5.6/kpackage/0001-allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.6/kpackage/0001-allow-external-paths.patch deleted file mode 100644 index 440e979c008..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.6/kpackage/0001-allow-external-paths.patch +++ /dev/null @@ -1,25 +0,0 @@ -From fbf10d2059fa1f19a0f0cfa2fda0abb6c435fa78 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Wed, 28 Jan 2015 07:15:30 -0600 -Subject: [PATCH] allow external paths - ---- - src/kpackage/package.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/kpackage/package.cpp b/src/kpackage/package.cpp -index eb4a09b..f70f1a1 100644 ---- a/src/kpackage/package.cpp -+++ b/src/kpackage/package.cpp -@@ -758,7 +758,7 @@ PackagePrivate::PackagePrivate() - : QSharedData(), - fallbackPackage(0), - metadata(0), -- externalPaths(false), -+ externalPaths(true), - valid(false), - checkedValid(false) - { --- -2.1.4 - diff --git a/pkgs/development/libraries/kde-frameworks-5.6/kservice/kservice-kbuildsycoca-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.6/kservice/kservice-kbuildsycoca-follow-symlinks.patch deleted file mode 100644 index e9bc418544a..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.6/kservice/kservice-kbuildsycoca-follow-symlinks.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/kbuildsycoca/kbuildsycoca.cpp b/src/kbuildsycoca/kbuildsycoca.cpp -index 69b1427..9c37a49 100644 ---- a/src/kbuildsycoca/kbuildsycoca.cpp -+++ b/src/kbuildsycoca/kbuildsycoca.cpp -@@ -227,7 +227,7 @@ bool KBuildSycoca::build() - QStringList relFiles; - const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, g_resourceSubdir, QStandardPaths::LocateDirectory); - Q_FOREACH (const QString &dir, dirs) { -- QDirIterator it(dir, QDirIterator::Subdirectories); -+ QDirIterator it(dir, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (it.hasNext()) { - const QString filePath = it.next(); - Q_ASSERT(filePath.startsWith(dir)); // due to the line below... diff --git a/pkgs/development/libraries/kde-frameworks-5.6/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.6/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch deleted file mode 100644 index 7e21ebfe86f..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.6/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/kbuildsycoca/vfolder_menu.cpp b/src/kbuildsycoca/vfolder_menu.cpp -index 2eb1275..e39a36f 100644 ---- a/src/kbuildsycoca/vfolder_menu.cpp -+++ b/src/kbuildsycoca/vfolder_menu.cpp -@@ -412,7 +412,7 @@ VFolderMenu::absoluteDir(const QString &_dir, const QString &baseDir, bool keepR - } - - if (!relative) { -- QString resolved = QDir(dir).canonicalPath(); -+ QString resolved = QDir::cleanPath(dir); - if (!resolved.isEmpty()) { - dir = resolved; - } diff --git a/pkgs/development/libraries/kde-frameworks-5.6/manifest.nix b/pkgs/development/libraries/kde-frameworks-5.6/manifest.nix deleted file mode 100644 index f8933d2f596..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.6/manifest.nix +++ /dev/null @@ -1,382 +0,0 @@ -# This file is generated automatically. DO NOT EDIT! -{ mirror }: -[ - { - url = "${mirror}/stable/frameworks/5.6/kdbusaddons-5.6.0.tar.xz"; - sha256 = "1gn4dm983d1nw7s8x3v9iq95glk0kpyj5zblylk76q8zjnxrx63r"; - name = "kdbusaddons-5.6.0.tar.xz"; - store = "/nix/store/l77sb2fblas9qd9g1fc01n53yipsg6fz-kdbusaddons-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/kitemmodels-5.6.0.tar.xz"; - sha256 = "0b40hyzp9rdgm2lr2nnqq229zy6xc3y04xgz47h4cngyz2ykiidm"; - name = "kitemmodels-5.6.0.tar.xz"; - store = "/nix/store/vzbgb344m8j1rsmwmvz08rrqswjqf2kn-kitemmodels-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/kded-5.6.0.tar.xz"; - sha256 = "16zl0a1yr5vy18gds1kvw5g1ndl4rv3xgfgwy4bnys65rqw9j4nh"; - name = "kded-5.6.0.tar.xz"; - store = "/nix/store/2cwmng27rxxnkilf5rl61nfmv7f5dwgh-kded-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/attica-5.6.0.tar.xz"; - sha256 = "1qw3fg2pm1zwjc64dmwgqf3w6bn9nhbwa4j1r2mxmsgdvm3m6y80"; - name = "attica-5.6.0.tar.xz"; - store = "/nix/store/1z5gs5p4riv2rzc83np3z2lch6lscbif-attica-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/kimageformats-5.6.0.tar.xz"; - sha256 = "0g09cvgr7l4lfhmwscyri2ivndl3kp9w7rnwx9kmqyrbpaq7a5p6"; - name = "kimageformats-5.6.0.tar.xz"; - store = "/nix/store/6fw40sn37h6kb9z58cj08fi0gafpm7il-kimageformats-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/kxmlgui-5.6.0.tar.xz"; - sha256 = "18d4bbvygrgxln54xwk3cas8ncpxapwxr4566c2402fm03y1j3zw"; - name = "kxmlgui-5.6.0.tar.xz"; - store = "/nix/store/cz3994azp3y1c9pkybjb6n7vq1fvrrdx-kxmlgui-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/kunitconversion-5.6.0.tar.xz"; - sha256 = "1zwmw4m5fa5r48cf28bpygwy3x8vap2xsld1ixnydzzbwc4ry3ix"; - name = "kunitconversion-5.6.0.tar.xz"; - store = "/nix/store/2kx18zpi5vd0j7mdg9yrrqciqqa48bzk-kunitconversion-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/kcompletion-5.6.0.tar.xz"; - sha256 = "0zk50qbm7yfjh01c89xg19yc3qji1qdlan60ggwjqabdwfx097vj"; - name = "kcompletion-5.6.0.tar.xz"; - store = "/nix/store/hs0amwz5nrzzx9gc4qlvw23dvacd12ys-kcompletion-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/kwallet-5.6.0.tar.xz"; - sha256 = "032yi352fdigdbvlqf6pci9srl6hcfc5gq10s90hvfp25xvyvn1k"; - name = "kwallet-5.6.0.tar.xz"; - store = "/nix/store/6cy8nbhblz788i0sq19vddgmm7kw3vkh-kwallet-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/kservice-5.6.0.tar.xz"; - sha256 = "1amwp6vzr4br6a37q2d8krhsvnnhvk2pvccizgml8pmk2kg1jndf"; - name = "kservice-5.6.0.tar.xz"; - store = "/nix/store/cfy088igxfx9p3w0npffidyd53qcf1qz-kservice-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/kiconthemes-5.6.0.tar.xz"; - sha256 = "1q06hlgs1sxnklrhdw7qxyfi4fxxjhza4nwc02p2ym1mfgj76afq"; - name = "kiconthemes-5.6.0.tar.xz"; - store = "/nix/store/alg2frgkj7jjy0rgq8d9c9s7ayhsxgmb-kiconthemes-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/threadweaver-5.6.0.tar.xz"; - sha256 = "1ilwwcfczhz60542ivyvr4a1723fliz5mxv75nb0a3nsd8qh662j"; - name = "threadweaver-5.6.0.tar.xz"; - store = "/nix/store/22135n73yf5bgxhpfigk4vbajgqbv8za-threadweaver-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/sonnet-5.6.0.tar.xz"; - sha256 = "0pkc7sck4lpl1ig8xqam91809s49rr70wqhqjmyd823m35134k88"; - name = "sonnet-5.6.0.tar.xz"; - store = "/nix/store/7m3a4g6jbbkqssm1xjzq4qc0axmdlzvw-sonnet-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/kcrash-5.6.0.tar.xz"; - sha256 = "0ismn2phd1802hb0vpdc5fn3x8h8p8lzdx1zgg1j5mqx3jddhskz"; - name = "kcrash-5.6.0.tar.xz"; - store = "/nix/store/hbv92rvbxwhb4mbf7skqfq7hv23v39hy-kcrash-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/kio-5.6.0.tar.xz"; - sha256 = "06kxl1x96nxkf6pn0hqm5jlpgvj0nzj16d4s3yqh80y8mb3qmy5x"; - name = "kio-5.6.0.tar.xz"; - store = "/nix/store/2p8kx9b47zxcgar5n6cfllxrmxc68k8j-kio-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/kapidox-5.6.0.tar.xz"; - sha256 = "1jai9na4v2brvlcb4bc7dghwbii326lp01qn97n4k2gs6gbaz72d"; - name = "kapidox-5.6.0.tar.xz"; - store = "/nix/store/a1wj3qs2a7p9xbhpv1lnj0fp28wbrk0a-kapidox-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/kdewebkit-5.6.0.tar.xz"; - sha256 = "18q7z8ly3dgn3vnl42swlaqqhf2ajfa8azz5pjswmfhfnxdh1dw7"; - name = "kdewebkit-5.6.0.tar.xz"; - store = "/nix/store/vigpp6rha2r1062nlkld92cg1kdvdqk4-kdewebkit-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/plasma-framework-5.6.0.tar.xz"; - sha256 = "16xfhqkq29jw9wx3h6s8m3alamqqfff676qdik9kh5xxm9kyf3rq"; - name = "plasma-framework-5.6.0.tar.xz"; - store = "/nix/store/6xm3arrwlsl0w3xrcjxwl55fvhpqy34a-plasma-framework-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/kwidgetsaddons-5.6.0.tar.xz"; - sha256 = "179pjyjc8raiga5wv44dwpcjw68b3sc0pyv19rkwdbbym6rwx34d"; - name = "kwidgetsaddons-5.6.0.tar.xz"; - store = "/nix/store/59s52d30qcmlvhrbvzbhkxdm0vbq66k5-kwidgetsaddons-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/kglobalaccel-5.6.0.tar.xz"; - sha256 = "12wgv3nhr2c54vh17mqm96hyfvzjbfmm335dqh2ajqg79w7bk46v"; - name = "kglobalaccel-5.6.0.tar.xz"; - store = "/nix/store/yg49hswx9kr7y4rby96yl62cg8qggcld-kglobalaccel-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/kparts-5.6.0.tar.xz"; - sha256 = "1fd8kmfg6vyii8s5fx968x404wmmly29xfjlgpc2y5phw26v0jm1"; - name = "kparts-5.6.0.tar.xz"; - store = "/nix/store/mlb24addakwmg79h8j42yaiavfdw3xcj-kparts-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/kdesignerplugin-5.6.0.tar.xz"; - sha256 = "0nnxcqzsr4x7z08hz54n30lrbsxcnc14yc64lf8avpjs1cbgg2f6"; - name = "kdesignerplugin-5.6.0.tar.xz"; - store = "/nix/store/9bk81cvs0y7nicnf4z2hggpc2s2iw9mq-kdesignerplugin-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/kidletime-5.6.0.tar.xz"; - sha256 = "1byyj89iy20mwy373z5rxhkjc1adbpjjl14a3vqvc80f87x08hd5"; - name = "kidletime-5.6.0.tar.xz"; - store = "/nix/store/8pqylp14nd42qyh42rxhszgnby8dzz69-kidletime-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/ki18n-5.6.0.tar.xz"; - sha256 = "0g9qzisi9hlz61l6qls5xwqkj98h26f5gnphh8pha3rxkh1nzrzm"; - name = "ki18n-5.6.0.tar.xz"; - store = "/nix/store/zhg3dfsqm51137kyvyc0i1qda7vjb82n-ki18n-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/kinit-5.6.0.tar.xz"; - sha256 = "1k9frj2myzzjjgg98hh5003zqkch4id3nkc0kqdx113g7walm2xy"; - name = "kinit-5.6.0.tar.xz"; - store = "/nix/store/kwr5nfpm93ngvsp10h1spsz93bb92l07-kinit-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/extra-cmake-modules-1.6.0.tar.xz"; - sha256 = "08nad0mb2bxp2alh562qvpma6f4mkhznfla9p1skdb06kb0gz5s6"; - name = "extra-cmake-modules-1.6.0.tar.xz"; - store = "/nix/store/r6qshq5hxyrrddg7gwgwkpvbci6sxrgi-extra-cmake-modules-1.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/knewstuff-5.6.0.tar.xz"; - sha256 = "0h60fhpc3p4l8889spj33lvwzcqplnlbf2clbwiyjpa1j86sfdf0"; - name = "knewstuff-5.6.0.tar.xz"; - store = "/nix/store/m465k9rzic6ax36m3wpv22wr90d6sm9w-knewstuff-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/kitemviews-5.6.0.tar.xz"; - sha256 = "0mjwvi0n55x8xwnbmqw1z6av7vc0gfrs9ljpgi1na4mmk84yqhdd"; - name = "kitemviews-5.6.0.tar.xz"; - store = "/nix/store/vj0ssv01sn36280g64k2dk0pwgzbff9l-kitemviews-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/kpackage-5.6.0.tar.xz"; - sha256 = "1wpvg5s0y31iad874xpyw1z78r72b7w56lxbn732imp5bzajmq2v"; - name = "kpackage-5.6.0.tar.xz"; - store = "/nix/store/iq9739r7pzk7zfzvk0599liylkwn9ml4-kpackage-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/kcmutils-5.6.0.tar.xz"; - sha256 = "0wzzxq3nid80q4a4wzz2yd3vfc6mzjxbdair263kw1xkxcb2l3ng"; - name = "kcmutils-5.6.0.tar.xz"; - store = "/nix/store/gsamabw9mhda9d3b7zwravfhvviym7gd-kcmutils-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/kdeclarative-5.6.0.tar.xz"; - sha256 = "049bknjd383vc4jlmahjrs2mnwdn0jrvz3pkjywlwx7v7ja69l5l"; - name = "kdeclarative-5.6.0.tar.xz"; - store = "/nix/store/zna6r1vkms0ysigsw1xcp0brwmrkkj00-kdeclarative-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/kcodecs-5.6.0.tar.xz"; - sha256 = "1l647c89rs3w6laal28hx25s1215jhl911q85jyzhz528rkd1jx6"; - name = "kcodecs-5.6.0.tar.xz"; - store = "/nix/store/iq1vxp7qbyrfdqh1jvfi0iq9zg17bzrm-kcodecs-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/kdesu-5.6.0.tar.xz"; - sha256 = "0agr28m80b5rnk3l4sjfcwq9cx4krs8f7nxl9ll13zx62gknwjlk"; - name = "kdesu-5.6.0.tar.xz"; - store = "/nix/store/8vnnjbbpnr52av5cga5y8i5iphmv73r6-kdesu-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/extra-cmake-modules-1.6.1.tar.xz"; - sha256 = "1ri6zvhd6k721y0wigl1928dwhg7bvcqs0ifaddvhn8ql694qvgz"; - name = "extra-cmake-modules-1.6.1.tar.xz"; - store = "/nix/store/vpcwwg988l2647laz0mm4j65szby7yya-extra-cmake-modules-1.6.1.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/karchive-5.6.0.tar.xz"; - sha256 = "0ldgwzzl70k4kvhmzp70r63akyprspcrpdnlafa5irdmfcc3sfzj"; - name = "karchive-5.6.0.tar.xz"; - store = "/nix/store/m75chqjl74piz0miwxj14szwb6834r3z-karchive-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/kwindowsystem-5.6.0.tar.xz"; - sha256 = "04qgai4ib2jm2xsmpzm2iszrkma4ns6fn8nkn8m5lbihsrfp6lmz"; - name = "kwindowsystem-5.6.0.tar.xz"; - store = "/nix/store/4a0hdrjz0s172vqnxwz7khysp0yz8pd7-kwindowsystem-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/knotifications-5.6.0.tar.xz"; - sha256 = "1fz0kq8azwc3gdvbr7p07zsrpdsb707cksnzjgnddxm741wzvfr0"; - name = "knotifications-5.6.0.tar.xz"; - store = "/nix/store/r9p9h0ma9v57jpz1iv4gy66jd3wmi0jn-knotifications-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/kactivities-5.6.0.tar.xz"; - sha256 = "1mr375w83y8ivcq9fvswwr637ilyrikyv56bkkchyb18y34f1v1i"; - name = "kactivities-5.6.0.tar.xz"; - store = "/nix/store/0yazfjf3kwj7yqh60napp8i1gwp7vssm-kactivities-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/kdoctools-5.6.0.tar.xz"; - sha256 = "02vbw530gy1d6mygzrpd5pqdqjww2749q0rkj4dl14va7rw9ksx5"; - name = "kdoctools-5.6.0.tar.xz"; - store = "/nix/store/73xzy82hqayfb303cxxvb0pd1xsm68qi-kdoctools-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/frameworkintegration-5.6.0.tar.xz"; - sha256 = "0kh57h2sxpz8my1wb5xx8xhxsa08nfdg3551dphvabl6mpg1jsqh"; - name = "frameworkintegration-5.6.0.tar.xz"; - store = "/nix/store/vljg38z53y37xafjvv7xhfnhb2cfhwby-frameworkintegration-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/kauth-5.6.0.tar.xz"; - sha256 = "0rnwh9cnn3nsk980grl1ycldpr61ihksmphcvq1jj0lpdgw80zan"; - name = "kauth-5.6.0.tar.xz"; - store = "/nix/store/khb8pfz5qn40mrfh859n4fp6qcv593ib-kauth-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/knotifyconfig-5.6.0.tar.xz"; - sha256 = "0ifsnj9gm7fgwd2rb34xqnfy4hxyxr2wgyjd8ryywnp1zf4b6hfi"; - name = "knotifyconfig-5.6.0.tar.xz"; - store = "/nix/store/3mn9094lflb8larwzgz7p8hgf40kgq1a-knotifyconfig-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/solid-5.6.0.tar.xz"; - sha256 = "1lnn6134s2zagcy1qcyxsr4nv31fxafmyk2cil70a0pmpq7ywyw4"; - name = "solid-5.6.0.tar.xz"; - store = "/nix/store/550z8fj4vabpds4d3kzn04mmhi6rb813-solid-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/networkmanager-qt-5.6.0.tar.xz"; - sha256 = "0iwdzb75psvw4b1rg7ijrgz9kijiik7n4grryyib2nvwwgzna3lv"; - name = "networkmanager-qt-5.6.0.tar.xz"; - store = "/nix/store/m48q6fc34yxmiv02qmww8xdh2nrpzk6g-networkmanager-qt-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/portingAids/khtml-5.6.0.tar.xz"; - sha256 = "1i6v3m7wkdj8cpqdp74mxhyyhq1qq8k80vsxjm1nzaqxgwq8gfvq"; - name = "khtml-5.6.0.tar.xz"; - store = "/nix/store/mlrqylbwp2bj7l70fxlkw0a6dcgd3q6x-khtml-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/portingAids/kmediaplayer-5.6.0.tar.xz"; - sha256 = "0z66a2yb4i9q2mk14szs4z8832jl33awaqima9b9xsdh5w4q6llk"; - name = "kmediaplayer-5.6.0.tar.xz"; - store = "/nix/store/47908hvamfll3wn0rbacp455zvs0sv4g-kmediaplayer-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/portingAids/kjsembed-5.6.0.tar.xz"; - sha256 = "08g3ac02c4vi010036kz0jgsmhv7c0s4xxk05pmkm6i7hrnslv7g"; - name = "kjsembed-5.6.0.tar.xz"; - store = "/nix/store/m0is4ahl2rsv4gzwarim4bw1jzzrddmm-kjsembed-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/portingAids/kross-5.6.0.tar.xz"; - sha256 = "0pwscrk89apvysfgr596yb9vywdc6l6dsrhgxmmsplh6v3nqknph"; - name = "kross-5.6.0.tar.xz"; - store = "/nix/store/54p2ms8fjiikpcz15amg1kkip7ddpqfq-kross-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/portingAids/krunner-5.6.0.tar.xz"; - sha256 = "09c11c43pw4hm59h1nixs2bqs22iwvc728fgm7hhmp76xv8vw5sf"; - name = "krunner-5.6.0.tar.xz"; - store = "/nix/store/2bbpl3pkd9h9di2ihlj3ab8gaxjvkfx5-krunner-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/portingAids/kjs-5.6.0.tar.xz"; - sha256 = "0gizs498q2rjmlqgpwh7p1kb3bwdfif28fscya1i6jakdgl8s94c"; - name = "kjs-5.6.0.tar.xz"; - store = "/nix/store/2y2dd7s775c1699g13fbaz5b3pgb079g-kjs-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/portingAids/kdelibs4support-5.6.0.tar.xz"; - sha256 = "057zvf1b6k8gfs19yz90fxj1jzyc2f1pyh03mhbj3a77sph82qc9"; - name = "kdelibs4support-5.6.0.tar.xz"; - store = "/nix/store/flmn2ls5rqyj6hh98c2vvvzmb7lx36a3-kdelibs4support-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/kcoreaddons-5.6.0.tar.xz"; - sha256 = "07z29viwijwmgashwxhz3j9pw9ksvsjywz88871nmggbw8544x0r"; - name = "kcoreaddons-5.6.0.tar.xz"; - store = "/nix/store/8j6zx7269w1z64wblpg0p8f9kc046qrn-kcoreaddons-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/kemoticons-5.6.0.tar.xz"; - sha256 = "1hq1dqhnj8zvna37pbi9xavc3ad41q5ayxb4gn6rn4hglg94fv68"; - name = "kemoticons-5.6.0.tar.xz"; - store = "/nix/store/63488dvgv4qpf60wkhmwrwylq09gnkq2-kemoticons-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/kdnssd-5.6.0.tar.xz"; - sha256 = "0cpfazdq7l9v29bjq08dj6kf8d1g8fjfq4aqljqzlzn4grsmjksq"; - name = "kdnssd-5.6.0.tar.xz"; - store = "/nix/store/rwdp52gpbyaak9r89lkj27mgbjhk8dhn-kdnssd-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/kplotting-5.6.0.tar.xz"; - sha256 = "0hj66zshpnaabvjhi4183fh4xhqg95sv8jjlmzwdzac7ipn09r0c"; - name = "kplotting-5.6.0.tar.xz"; - store = "/nix/store/4jrjvkz1dclccnwhqzh0sjia79d0bs4s-kplotting-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/kconfigwidgets-5.6.0.tar.xz"; - sha256 = "0fb1sxjcqfgvli5ndm03sqadrhqgsk841y6cql0grpyyx42b2s3s"; - name = "kconfigwidgets-5.6.0.tar.xz"; - store = "/nix/store/40sc8j052cpqsk663icz6x426jac6v2b-kconfigwidgets-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/kpty-5.6.0.tar.xz"; - sha256 = "02n2i4q2wasjkrivc80srs208zlgkhi0v7xxcx49xv2djhcm71nb"; - name = "kpty-5.6.0.tar.xz"; - store = "/nix/store/zw7lvzy73w9ffv79jmckr52bw7xsgza6-kpty-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/kbookmarks-5.6.0.tar.xz"; - sha256 = "00qn6jgz1zzz0bbj0z6ki7wcb4q611szvnmif1n7sdmmcczd2b3l"; - name = "kbookmarks-5.6.0.tar.xz"; - store = "/nix/store/qbi1yankzvx098cfksx8wdxh0zv0jqx3-kbookmarks-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/ktexteditor-5.6.0.tar.xz"; - sha256 = "1s57bpr7bb2c4xw384lkik7pbwa21v1ma4vriv3dz91q029qjxgs"; - name = "ktexteditor-5.6.0.tar.xz"; - store = "/nix/store/c4hfl2yny47mxa8iil5xxqwrzwwlfqpl-ktexteditor-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/kguiaddons-5.6.0.tar.xz"; - sha256 = "08md1bch0cdd9ywc1g46ia1h1vqv74s36ar5x9if12jfkhiss13i"; - name = "kguiaddons-5.6.0.tar.xz"; - store = "/nix/store/1riwgwy3yw3n0zi1q7k3rnf3s37d397f-kguiaddons-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/ktextwidgets-5.6.0.tar.xz"; - sha256 = "0b6q7mbdfjfzi3hb2qbjqnmdhycabsiqnrz66l2xa78phmwydvss"; - name = "ktextwidgets-5.6.0.tar.xz"; - store = "/nix/store/442l5jhr4vij2gnnbhf30q98xmyzd6m2-ktextwidgets-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/kjobwidgets-5.6.0.tar.xz"; - sha256 = "16l2xhlqvavzjf9hfjdz3pssa3sjdv6bvmk9dp9prf7j39pxhnw6"; - name = "kjobwidgets-5.6.0.tar.xz"; - store = "/nix/store/9hxzz693csamkrx8x6m7lrm5m76vx0nb-kjobwidgets-5.6.0.tar.xz"; - } - { - url = "${mirror}/stable/frameworks/5.6/kconfig-5.6.0.tar.xz"; - sha256 = "06rx3hwc3hay0g8pnzm9l7mdwk4pqy3waspncdlknabaxcvqmf0a"; - name = "kconfig-5.6.0.tar.xz"; - store = "/nix/store/26q4zhd6m4jjshknmd2r0dgxmscbgncr-kconfig-5.6.0.tar.xz"; - } -] diff --git a/pkgs/development/libraries/kde-frameworks-5.6/manifest.sh b/pkgs/development/libraries/kde-frameworks-5.6/manifest.sh deleted file mode 100755 index d6d7ccae6a5..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.6/manifest.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -if [ $# -eq 0 ]; then - - # The extra slash at the end of the URL is necessary to stop wget - # from recursing over the whole server! (No, it's not a bug.) - $(nix-build ../../../.. -A autonix.manifest) \ - http://download.kde.org/stable/frameworks/5.6/ \ - -A '*.tar.xz' - -else - - $(nix-build ../../../.. -A autonix.manifest) -A '*.tar.xz' "$@" - -fi diff --git a/pkgs/development/libraries/kde-frameworks-5.6/plasma-framework/plasma-framework-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.6/plasma-framework/plasma-framework-external-paths.patch deleted file mode 100644 index 9a22c0bdbcd..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.6/plasma-framework/plasma-framework-external-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/plasma/package.cpp b/src/plasma/package.cpp -index 07b3c90..84417e3 100644 ---- a/src/plasma/package.cpp -+++ b/src/plasma/package.cpp -@@ -791,7 +791,7 @@ PackagePrivate::PackagePrivate() - servicePrefix("plasma-applet-"), - fallbackPackage(0), - metadata(0), -- externalPaths(false), -+ externalPaths(true), - valid(false), - checkedValid(false) - { diff --git a/pkgs/development/libraries/kde-frameworks-5.6/renames.nix b/pkgs/development/libraries/kde-frameworks-5.6/renames.nix deleted file mode 100644 index 58ade4e62ac..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.6/renames.nix +++ /dev/null @@ -1,68 +0,0 @@ -# DO NOT EDIT! This file is generated automatically. -{ }: -{ -"Backend" = "plasma-framework"; -"CTest" = "attica"; -"ECM" = "extra-cmake-modules"; -"KDED" = "kded"; -"KF5Activities" = "kactivities"; -"KF5Archive" = "karchive"; -"KF5Attica" = "attica"; -"KF5Auth" = "kauth"; -"KF5Bookmarks" = "kbookmarks"; -"KF5Codecs" = "kcodecs"; -"KF5Completion" = "kcompletion"; -"KF5Config" = "kconfig"; -"KF5ConfigWidgets" = "kconfigwidgets"; -"KF5CoreAddons" = "kcoreaddons"; -"KF5Crash" = "kcrash"; -"KF5DBusAddons" = "kdbusaddons"; -"KF5DNSSD" = "kdnssd"; -"KF5Declarative" = "kdeclarative"; -"KF5DesignerPlugin" = "kdesignerplugin"; -"KF5DocTools" = "kdoctools"; -"KF5Emoticons" = "kemoticons"; -"KF5FrameworkIntegration" = "frameworkintegration"; -"KF5GlobalAccel" = "kglobalaccel"; -"KF5GuiAddons" = "kguiaddons"; -"KF5I18n" = "ki18n"; -"KF5IconThemes" = "kiconthemes"; -"KF5IdleTime" = "kidletime"; -"KF5Init" = "kinit"; -"KF5ItemModels" = "kitemmodels"; -"KF5ItemViews" = "kitemviews"; -"KF5JS" = "kjs"; -"KF5JobWidgets" = "kjobwidgets"; -"KF5JsEmbed" = "kjsembed"; -"KF5KCMUtils" = "kcmutils"; -"KF5KDE4Support" = "kdelibs4support"; -"KF5KDELibs4Support" = "kdelibs4support"; -"KF5KHtml" = "khtml"; -"KF5KIO" = "kio"; -"KF5Kross" = "kross"; -"KF5MediaPlayer" = "kmediaplayer"; -"KF5NetworkManagerQt" = "networkmanager-qt"; -"KF5NewStuff" = "knewstuff"; -"KF5Notifications" = "knotifications"; -"KF5NotifyConfig" = "knotifyconfig"; -"KF5Package" = "kpackage"; -"KF5Parts" = "kparts"; -"KF5Plasma" = "plasma-framework"; -"KF5PlasmaQuick" = "plasma-framework"; -"KF5Plotting" = "kplotting"; -"KF5Pty" = "kpty"; -"KF5Runner" = "krunner"; -"KF5Service" = "kservice"; -"KF5Solid" = "solid"; -"KF5Sonnet" = "sonnet"; -"KF5Su" = "kdesu"; -"KF5TextEditor" = "ktexteditor"; -"KF5TextWidgets" = "ktextwidgets"; -"KF5ThreadWeaver" = "threadweaver"; -"KF5UnitConversion" = "kunitconversion"; -"KF5Wallet" = "kwallet"; -"KF5WebKit" = "kdewebkit"; -"KF5WidgetsAddons" = "kwidgetsaddons"; -"KF5WindowSystem" = "kwindowsystem"; -"KF5XmlGui" = "kxmlgui"; -} diff --git a/pkgs/development/libraries/kde-frameworks-5.6/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.6/setup-hook.sh deleted file mode 100644 index a8d9b7e0e36..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.6/setup-hook.sh +++ /dev/null @@ -1 +0,0 @@ -addToSearchPath XDG_DATA_DIRS @out@/share diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ebabe408471..5882bb6d16e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5937,14 +5937,11 @@ let automake = automake111x; }; - kf55 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.5 { - stdenv = overrideCC stdenv gccStdInc; kf57 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.7 { qt5 = qt54; }); - kf56 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.6 {}); - kf5_latest = kf56; - kf5_stable = kf55; + kf5_latest = kf57; + kf5_stable = kf57; krb5 = callPackage ../development/libraries/kerberos/krb5.nix { openldap = openldap.override { @@ -10603,11 +10600,11 @@ let }; kdeApps_14_12 = recurseIntoAttrs (callPackage ../applications/kde-apps-14.12 { - kf5 = kf55; - stdenv = overrideCC stdenv gccStdInc; + kf5 = kf57; + qt5 = qt54; }); - kdeApps_latest = kdeApps_14_12; kdeApps_stable = kdeApps_14_12; + kdeApps_latest = kdeApps_14_12; keepnote = callPackage ../applications/office/keepnote { pygtk = pyGtkGlade; @@ -12741,8 +12738,10 @@ let mate-themes = callPackage ../misc/themes/mate-themes { }; + plasma52 = recurseIntoAttrs (callPackage ../desktops/plasma-5.2 { + qt5 = qt54; + kf5 = kf57; }); - plasma52 = recurseIntoAttrs (callPackage ../desktops/plasma-5.2 {}); plasma5_latest = plasma52; plasma5_stable = plasma52; From 95b13b1155021303f42d084224b33d7381c307e3 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 21 Feb 2015 10:56:38 -0600 Subject: [PATCH 147/197] add media-player-info --- pkgs/data/misc/media-player-info/default.nix | 28 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/data/misc/media-player-info/default.nix diff --git a/pkgs/data/misc/media-player-info/default.nix b/pkgs/data/misc/media-player-info/default.nix new file mode 100644 index 00000000000..373e7504ead --- /dev/null +++ b/pkgs/data/misc/media-player-info/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, pkgconfig, python3, udev }: + +let + name = "media-player-info-22"; +in + + stdenv.mkDerivation { + inherit name; + + src = fetchurl { + url = "http://www.freedesktop.org/software/media-player-info/${name}.tar.gz"; + sha256 = "0di3gfx5z8c34yspzyllydr5snzg71r985kbqhrhb1il51qxgrvy"; + }; + + buildInputs = [ udev ]; + nativeBuildInputs = [ pkgconfig python3 ]; + + preConfigure = '' + configureFlags="$configureFlags --with-udevdir=$out/lib/udev" + ''; + + meta = with stdenv.lib; { + description = "A repository of data files describing media player capabilities"; + homepage = "http://www.freedesktop.org/wiki/Software/media-player-info/"; + license = with licenses; [ bsd3 ]; + maintainer = with maintainers; [ ttuegel ]; + }; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5882bb6d16e..894587ed2f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9450,6 +9450,8 @@ let miscfiles = callPackage ../data/misc/miscfiles { }; + media-player-info = callPackage ../data/misc/media-player-info {}; + mobile_broadband_provider_info = callPackage ../data/misc/mobile-broadband-provider-info { }; mph_2b_damase = callPackage ../data/fonts/mph-2b-damase { }; From 0cf073627ca1272af8058b32c01d944aff2f5806 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 21 Feb 2015 10:57:03 -0600 Subject: [PATCH 148/197] remove split qt-5.3 --- .../5.3-submodules/0001-dlopen-gtkstyle.patch | 63 ---- .../0002-dlopen-webkit-nsplugin.patch | 53 --- .../qt-5/5.3-submodules/0003-glib-2.32.patch | 25 -- .../5.3-submodules/0004-dlopen-resolv.patch | 39 --- .../qt-5/5.3-submodules/0005-dlopen-gl.patch | 25 -- .../qt-5/5.3-submodules/0006-tzdir.patch | 52 --- .../0007-dlopen-webkit-gtk.patch | 25 -- .../0008-dlopen-webkit-udev.patch | 31 -- .../0009-dlopen-serialport-udev.patch | 28 -- .../0010-dlopen-libXcursor.patch | 29 -- .../5.3-submodules/0011-dlopen-openssl.patch | 38 -- .../5.3-submodules/0012-dlopen-dbus.patch | 25 -- .../libraries/qt-5/5.3-submodules/default.nix | 330 ------------------ .../qt-5/5.3-submodules/manifest.nix | 166 --------- .../libraries/qt-5/5.3-submodules/manifest.sh | 15 - .../qt-5/5.3-submodules/qt-submodule.nix | 62 ---- .../libraries/qt-5/5.3-submodules/qtbase.nix | 174 --------- 17 files changed, 1180 deletions(-) delete mode 100644 pkgs/development/libraries/qt-5/5.3-submodules/0001-dlopen-gtkstyle.patch delete mode 100644 pkgs/development/libraries/qt-5/5.3-submodules/0002-dlopen-webkit-nsplugin.patch delete mode 100644 pkgs/development/libraries/qt-5/5.3-submodules/0003-glib-2.32.patch delete mode 100644 pkgs/development/libraries/qt-5/5.3-submodules/0004-dlopen-resolv.patch delete mode 100644 pkgs/development/libraries/qt-5/5.3-submodules/0005-dlopen-gl.patch delete mode 100644 pkgs/development/libraries/qt-5/5.3-submodules/0006-tzdir.patch delete mode 100644 pkgs/development/libraries/qt-5/5.3-submodules/0007-dlopen-webkit-gtk.patch delete mode 100644 pkgs/development/libraries/qt-5/5.3-submodules/0008-dlopen-webkit-udev.patch delete mode 100644 pkgs/development/libraries/qt-5/5.3-submodules/0009-dlopen-serialport-udev.patch delete mode 100644 pkgs/development/libraries/qt-5/5.3-submodules/0010-dlopen-libXcursor.patch delete mode 100644 pkgs/development/libraries/qt-5/5.3-submodules/0011-dlopen-openssl.patch delete mode 100644 pkgs/development/libraries/qt-5/5.3-submodules/0012-dlopen-dbus.patch delete mode 100644 pkgs/development/libraries/qt-5/5.3-submodules/default.nix delete mode 100644 pkgs/development/libraries/qt-5/5.3-submodules/manifest.nix delete mode 100755 pkgs/development/libraries/qt-5/5.3-submodules/manifest.sh delete mode 100644 pkgs/development/libraries/qt-5/5.3-submodules/qt-submodule.nix delete mode 100644 pkgs/development/libraries/qt-5/5.3-submodules/qtbase.nix diff --git a/pkgs/development/libraries/qt-5/5.3-submodules/0001-dlopen-gtkstyle.patch b/pkgs/development/libraries/qt-5/5.3-submodules/0001-dlopen-gtkstyle.patch deleted file mode 100644 index 3f411139f5b..00000000000 --- a/pkgs/development/libraries/qt-5/5.3-submodules/0001-dlopen-gtkstyle.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 35d5995a58c86a6addbf0aaf0d1be64d39182872 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Mon, 1 Dec 2014 17:21:58 -0600 -Subject: [PATCH] dlopen-gtkstyle - ---- - qtbase/src/widgets/styles/qgtk2painter.cpp | 2 +- - qtbase/src/widgets/styles/qgtkstyle_p.cpp | 12 ++++++------ - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/qtbase/src/widgets/styles/qgtk2painter.cpp b/qtbase/src/widgets/styles/qgtk2painter.cpp -index 7b9bd97..075947a 100644 ---- a/qtbase/src/widgets/styles/qgtk2painter.cpp -+++ b/qtbase/src/widgets/styles/qgtk2painter.cpp -@@ -104,7 +104,7 @@ static void initGtk() - static bool initialized = false; - if (!initialized) { - // enforce the "0" suffix, so we'll open libgtk-x11-2.0.so.0 -- QLibrary libgtk(QLS("gtk-x11-2.0"), 0, 0); -+ QLibrary libgtk(QLS("@gtk@/lib/libgtk-x11-2.0"), 0, 0); - - QGtk2PainterPrivate::gdk_pixmap_new = (Ptr_gdk_pixmap_new)libgtk.resolve("gdk_pixmap_new"); - QGtk2PainterPrivate::gdk_pixbuf_get_from_drawable = (Ptr_gdk_pixbuf_get_from_drawable)libgtk.resolve("gdk_pixbuf_get_from_drawable"); -diff --git a/qtbase/src/widgets/styles/qgtkstyle_p.cpp b/qtbase/src/widgets/styles/qgtkstyle_p.cpp -index 2c64225..3343d32 100644 ---- a/qtbase/src/widgets/styles/qgtkstyle_p.cpp -+++ b/qtbase/src/widgets/styles/qgtkstyle_p.cpp -@@ -334,7 +334,7 @@ void QGtkStylePrivate::gtkWidgetSetFocus(GtkWidget *widget, bool focus) - void QGtkStylePrivate::resolveGtk() const - { - // enforce the "0" suffix, so we'll open libgtk-x11-2.0.so.0 -- QLibrary libgtk(QLS("gtk-x11-2.0"), 0, 0); -+ QLibrary libgtk(QLS("@gtk@/lib/libgtk-x11-2.0"), 0, 0); - - gtk_init = (Ptr_gtk_init)libgtk.resolve("gtk_init"); - gtk_window_new = (Ptr_gtk_window_new)libgtk.resolve("gtk_window_new"); -@@ -432,8 +432,8 @@ void QGtkStylePrivate::resolveGtk() const - pango_font_description_get_family = (Ptr_pango_font_description_get_family)libgtk.resolve("pango_font_description_get_family"); - pango_font_description_get_style = (Ptr_pango_font_description_get_style)libgtk.resolve("pango_font_description_get_style"); - -- gnome_icon_lookup_sync = (Ptr_gnome_icon_lookup_sync)QLibrary::resolve(QLS("gnomeui-2"), 0, "gnome_icon_lookup_sync"); -- gnome_vfs_init= (Ptr_gnome_vfs_init)QLibrary::resolve(QLS("gnomevfs-2"), 0, "gnome_vfs_init"); -+ gnome_icon_lookup_sync = (Ptr_gnome_icon_lookup_sync)QLibrary::resolve(QLS("@libgnomeui@/lib/libgnomeui-2"), 0, "gnome_icon_lookup_sync"); -+ gnome_vfs_init= (Ptr_gnome_vfs_init)QLibrary::resolve(QLS("@gnome_vfs@/lib/libgnomevfs-2"), 0, "gnome_vfs_init"); - } - - /* \internal -@@ -601,9 +601,9 @@ void QGtkStylePrivate::cleanupGtkWidgets() - static bool resolveGConf() - { - if (!QGtkStylePrivate::gconf_client_get_default) { -- QGtkStylePrivate::gconf_client_get_default = (Ptr_gconf_client_get_default)QLibrary::resolve(QLS("gconf-2"), 4, "gconf_client_get_default"); -- QGtkStylePrivate::gconf_client_get_string = (Ptr_gconf_client_get_string)QLibrary::resolve(QLS("gconf-2"), 4, "gconf_client_get_string"); -- QGtkStylePrivate::gconf_client_get_bool = (Ptr_gconf_client_get_bool)QLibrary::resolve(QLS("gconf-2"), 4, "gconf_client_get_bool"); -+ QGtkStylePrivate::gconf_client_get_default = (Ptr_gconf_client_get_default)QLibrary::resolve(QLS("@gconf@/lib/libgconf-2"), 4, "gconf_client_get_default"); -+ QGtkStylePrivate::gconf_client_get_string = (Ptr_gconf_client_get_string)QLibrary::resolve(QLS("@gconf@/lib/libgconf-2"), 4, "gconf_client_get_string"); -+ QGtkStylePrivate::gconf_client_get_bool = (Ptr_gconf_client_get_bool)QLibrary::resolve(QLS("@gconf@/lib/libgconf-2"), 4, "gconf_client_get_bool"); - } - return (QGtkStylePrivate::gconf_client_get_default !=0); - } --- -2.1.3 - diff --git a/pkgs/development/libraries/qt-5/5.3-submodules/0002-dlopen-webkit-nsplugin.patch b/pkgs/development/libraries/qt-5/5.3-submodules/0002-dlopen-webkit-nsplugin.patch deleted file mode 100644 index 0752cdcf479..00000000000 --- a/pkgs/development/libraries/qt-5/5.3-submodules/0002-dlopen-webkit-nsplugin.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 8c30f72dbe11752e8ed25f292c6e5695d7733f72 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Mon, 1 Dec 2014 17:22:23 -0600 -Subject: [PATCH] dlopen-webkit-nsplugin - ---- - qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp | 2 +- - qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp | 2 +- - .../WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp -index 679480b..2c373cc 100644 ---- a/qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp -+++ b/qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp -@@ -132,7 +132,7 @@ static void initializeGtk(QLibrary* module = 0) - } - } - -- QLibrary library(QLatin1String("libgtk-x11-2.0"), 0); -+ QLibrary library(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0); - if (library.load()) { - typedef void *(*gtk_init_check_ptr)(int*, char***); - gtk_init_check_ptr gtkInitCheck = (gtk_init_check_ptr)library.resolve("gtk_init_check"); -diff --git a/qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp b/qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp -index de06a2f..363bde5 100644 ---- a/qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp -+++ b/qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp -@@ -697,7 +697,7 @@ static Display *getPluginDisplay() - // support gdk based plugins (like flash) that use a different X connection. - // The code below has the same effect as this one: - // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); -- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); -+ QLibrary library(QLatin1String("@gdk_pixbuf@/lib/libgdk-x11-2.0"), 0); - if (!library.load()) - return 0; - -diff --git a/qtwebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp b/qtwebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp -index d734ff6..62a2197 100644 ---- a/qtwebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp -+++ b/qtwebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp -@@ -64,7 +64,7 @@ static Display* getPluginDisplay() - // The code below has the same effect as this one: - // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); - -- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); -+ QLibrary library(QLatin1String("@gdk_pixbuf@/libgdk-x11-2.0"), 0); - if (!library.load()) - return 0; - --- -2.1.3 - diff --git a/pkgs/development/libraries/qt-5/5.3-submodules/0003-glib-2.32.patch b/pkgs/development/libraries/qt-5/5.3-submodules/0003-glib-2.32.patch deleted file mode 100644 index 4abb69da4d8..00000000000 --- a/pkgs/development/libraries/qt-5/5.3-submodules/0003-glib-2.32.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a41c3e3a3a1ce4b373b1bbb98f3a835e9e8a0718 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Mon, 1 Dec 2014 17:22:39 -0600 -Subject: [PATCH] glib-2.32 - ---- - qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h b/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h -index 1f6d25e..087c3fb 100644 ---- a/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h -+++ b/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h -@@ -81,7 +81,7 @@ - #include - #elif PLATFORM(GTK) - #include --typedef struct _GMutex GMutex; -+typedef union _GMutex GMutex; - typedef struct _GCond GCond; - #endif - --- -2.1.3 - diff --git a/pkgs/development/libraries/qt-5/5.3-submodules/0004-dlopen-resolv.patch b/pkgs/development/libraries/qt-5/5.3-submodules/0004-dlopen-resolv.patch deleted file mode 100644 index e6b921b771d..00000000000 --- a/pkgs/development/libraries/qt-5/5.3-submodules/0004-dlopen-resolv.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 63af41c6eeca28c911c13b1a77afeaf860863c2d Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Mon, 1 Dec 2014 17:22:55 -0600 -Subject: [PATCH] dlopen-resolv - ---- - qtbase/src/network/kernel/qdnslookup_unix.cpp | 2 +- - qtbase/src/network/kernel/qhostinfo_unix.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/qtbase/src/network/kernel/qdnslookup_unix.cpp b/qtbase/src/network/kernel/qdnslookup_unix.cpp -index 8c5a0eb..27ebf16 100644 ---- a/qtbase/src/network/kernel/qdnslookup_unix.cpp -+++ b/qtbase/src/network/kernel/qdnslookup_unix.cpp -@@ -87,7 +87,7 @@ static void resolveLibrary() - if (!lib.load()) - #endif - { -- lib.setFileName(QLatin1String("resolv")); -+ lib.setFileName(QLatin1String("@glibc/lib/resolv")); - if (!lib.load()) - return; - } -diff --git a/qtbase/src/network/kernel/qhostinfo_unix.cpp b/qtbase/src/network/kernel/qhostinfo_unix.cpp -index df8c8b1..613d0e0 100644 ---- a/qtbase/src/network/kernel/qhostinfo_unix.cpp -+++ b/qtbase/src/network/kernel/qhostinfo_unix.cpp -@@ -103,7 +103,7 @@ static void resolveLibrary() - if (!lib.load()) - #endif - { -- lib.setFileName(QLatin1String("resolv")); -+ lib.setFileName(QLatin1String("@glibc@/lib/libresolv")); - if (!lib.load()) - return; - } --- -2.1.3 - diff --git a/pkgs/development/libraries/qt-5/5.3-submodules/0005-dlopen-gl.patch b/pkgs/development/libraries/qt-5/5.3-submodules/0005-dlopen-gl.patch deleted file mode 100644 index d112427bdd6..00000000000 --- a/pkgs/development/libraries/qt-5/5.3-submodules/0005-dlopen-gl.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 6aaf6858bf817172a4c503158e1701c4837ee790 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Mon, 1 Dec 2014 17:23:08 -0600 -Subject: [PATCH] dlopen-gl - ---- - qtbase/src/plugins/platforms/xcb/qglxintegration.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp b/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp -index 67235e0..2220a2e 100644 ---- a/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp -+++ b/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp -@@ -434,7 +434,7 @@ void (*QGLXContext::getProcAddress(const QByteArray &procName)) () - { - extern const QString qt_gl_library_name(); - // QLibrary lib(qt_gl_library_name()); -- QLibrary lib(QLatin1String("GL")); -+ QLibrary lib(QLatin1String("@openglDriver@/lib/libGL")); - glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB"); - } - } --- -2.1.3 - diff --git a/pkgs/development/libraries/qt-5/5.3-submodules/0006-tzdir.patch b/pkgs/development/libraries/qt-5/5.3-submodules/0006-tzdir.patch deleted file mode 100644 index d5a74b25fb3..00000000000 --- a/pkgs/development/libraries/qt-5/5.3-submodules/0006-tzdir.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 775fd74351faaabd45f6751618b28e2b05812d05 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Mon, 1 Dec 2014 17:23:22 -0600 -Subject: [PATCH] tzdir - ---- - qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp | 21 +++++++++++++++------ - 1 file changed, 15 insertions(+), 6 deletions(-) - -diff --git a/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp b/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp -index b4ea91e..a56a245 100644 ---- a/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp -+++ b/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp -@@ -68,7 +68,10 @@ typedef QHash QTzTimeZoneHash; - // Parse zone.tab table, assume lists all installed zones, if not will need to read directories - static QTzTimeZoneHash loadTzTimeZones() - { -- QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); -+ QString path = qgetenv("TZDIR"); -+ path += "/zone.tab"; -+ if (!QFile::exists(path)) -+ path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); - if (!QFile::exists(path)) - path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); - -@@ -559,12 +562,18 @@ void QTzTimeZonePrivate::init(const QByteArray &ianaId) - if (!tzif.open(QIODevice::ReadOnly)) - return; - } else { -- // Open named tz, try modern path first, if fails try legacy path -- tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); -+ // Try TZDIR first -+ QString zoneinfoDir = qgetenv("TZDIR"); -+ zoneinfoDir += "/" + QString::fromLocal8Bit(ianaId); -+ tzif.setFileName(zoneinfoDir); - if (!tzif.open(QIODevice::ReadOnly)) { -- tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId)); -- if (!tzif.open(QIODevice::ReadOnly)) -- return; -+ // Open named tz, try modern path first, if fails try legacy path -+ tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); -+ if (!tzif.open(QIODevice::ReadOnly)) { -+ tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId)); -+ if (!tzif.open(QIODevice::ReadOnly)) -+ return; -+ } - } - } - --- -2.1.3 - diff --git a/pkgs/development/libraries/qt-5/5.3-submodules/0007-dlopen-webkit-gtk.patch b/pkgs/development/libraries/qt-5/5.3-submodules/0007-dlopen-webkit-gtk.patch deleted file mode 100644 index 9582b714c90..00000000000 --- a/pkgs/development/libraries/qt-5/5.3-submodules/0007-dlopen-webkit-gtk.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 089db8835c80bf2b7dd91a97a5c6eb26636b6ab9 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Mon, 1 Dec 2014 17:26:39 -0600 -Subject: [PATCH] dlopen-webkit-gtk - ---- - qtwebkit/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/qtwebkit/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp b/qtwebkit/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp -index 8de6521..0b25748 100644 ---- a/qtwebkit/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp -+++ b/qtwebkit/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp -@@ -53,7 +53,7 @@ static void messageHandler(QtMsgType type, const QMessageLogContext&, const QStr - - static bool initializeGtk() - { -- QLibrary gtkLibrary(QLatin1String("libgtk-x11-2.0"), 0); -+ QLibrary gtkLibrary(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0); - if (!gtkLibrary.load()) - return false; - typedef void* (*gtk_init_ptr)(void*, void*); --- -2.1.3 - diff --git a/pkgs/development/libraries/qt-5/5.3-submodules/0008-dlopen-webkit-udev.patch b/pkgs/development/libraries/qt-5/5.3-submodules/0008-dlopen-webkit-udev.patch deleted file mode 100644 index e8a4ba6a215..00000000000 --- a/pkgs/development/libraries/qt-5/5.3-submodules/0008-dlopen-webkit-udev.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 25d2922cce383fcaa4c138e0cc6c8d92328eeacb Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Mon, 1 Dec 2014 17:30:41 -0600 -Subject: [PATCH] dlopen-webkit-udev - ---- - qtwebkit/Source/WebCore/platform/qt/GamepadsQt.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/qtwebkit/Source/WebCore/platform/qt/GamepadsQt.cpp b/qtwebkit/Source/WebCore/platform/qt/GamepadsQt.cpp -index 60ff317..da8ac69 100644 ---- a/qtwebkit/Source/WebCore/platform/qt/GamepadsQt.cpp -+++ b/qtwebkit/Source/WebCore/platform/qt/GamepadsQt.cpp -@@ -111,12 +111,12 @@ private: - bool load() - { - m_libUdev.setLoadHints(QLibrary::ResolveAllSymbolsHint); -- m_libUdev.setFileNameAndVersion(QStringLiteral("udev"), 1); -+ m_libUdev.setFileNameAndVersion(QStringLiteral("@udev@/lib/libudev"), 1); - m_loaded = m_libUdev.load(); - if (resolveMethods()) - return true; - -- m_libUdev.setFileNameAndVersion(QStringLiteral("udev"), 0); -+ m_libUdev.setFileNameAndVersion(QStringLiteral("@udev@/lib/libudev"), 0); - m_loaded = m_libUdev.load(); - return resolveMethods(); - } --- -2.1.3 - diff --git a/pkgs/development/libraries/qt-5/5.3-submodules/0009-dlopen-serialport-udev.patch b/pkgs/development/libraries/qt-5/5.3-submodules/0009-dlopen-serialport-udev.patch deleted file mode 100644 index e1e66a3ce95..00000000000 --- a/pkgs/development/libraries/qt-5/5.3-submodules/0009-dlopen-serialport-udev.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 17c7257e54c00ea2121f2cf95fb2be5e5db6b4ad Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Mon, 1 Dec 2014 17:31:03 -0600 -Subject: [PATCH] dlopen-serialport-udev - ---- - qtserialport/src/serialport/qtudev_p.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/qtserialport/src/serialport/qtudev_p.h b/qtserialport/src/serialport/qtudev_p.h -index 09940ab..45460f9 100644 ---- a/qtserialport/src/serialport/qtudev_p.h -+++ b/qtserialport/src/serialport/qtudev_p.h -@@ -119,9 +119,9 @@ inline void *resolveSymbol(QLibrary *udevLibrary, const char *symbolName) - inline bool resolveSymbols(QLibrary *udevLibrary) - { - if (!udevLibrary->isLoaded()) { -- udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 1); -+ udevLibrary->setFileNameAndVersion(QStringLiteral("@udev@/lib/libudev"), 1); - if (!udevLibrary->load()) { -- udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 0); -+ udevLibrary->setFileNameAndVersion(QStringLiteral("@udev@/lib/libudev"), 0); - if (!udevLibrary->load()) { - qWarning("Failed to load the library: %s, supported version(s): %i and %i", qPrintable(udevLibrary->fileName()), 1, 0); - return false; --- -2.1.3 - diff --git a/pkgs/development/libraries/qt-5/5.3-submodules/0010-dlopen-libXcursor.patch b/pkgs/development/libraries/qt-5/5.3-submodules/0010-dlopen-libXcursor.patch deleted file mode 100644 index 49ade86fae3..00000000000 --- a/pkgs/development/libraries/qt-5/5.3-submodules/0010-dlopen-libXcursor.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b56e3737ca97e3de664603976989da4419297eb3 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Mon, 1 Dec 2014 17:33:51 -0600 -Subject: [PATCH] dlopen-libXcursor - ---- - qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp b/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp -index 6dbac90..4b23fc2 100644 ---- a/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp -+++ b/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp -@@ -305,10 +305,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen) - #ifdef XCB_USE_XLIB - static bool function_ptrs_not_initialized = true; - if (function_ptrs_not_initialized) { -- QLibrary xcursorLib(QLatin1String("Xcursor"), 1); -+ QLibrary xcursorLib(QLatin1String("@libXcursor@/lib/libXcursor"), 1); - bool xcursorFound = xcursorLib.load(); - if (!xcursorFound) { // try without the version number -- xcursorLib.setFileName(QLatin1String("Xcursor")); -+ xcursorLib.setFileName(QLatin1String("@libXcursor@/lib/Xcursor")); - xcursorFound = xcursorLib.load(); - } - if (xcursorFound) { --- -2.1.3 - diff --git a/pkgs/development/libraries/qt-5/5.3-submodules/0011-dlopen-openssl.patch b/pkgs/development/libraries/qt-5/5.3-submodules/0011-dlopen-openssl.patch deleted file mode 100644 index d08061dd5dd..00000000000 --- a/pkgs/development/libraries/qt-5/5.3-submodules/0011-dlopen-openssl.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 99d458c93698b2d4f16ff164ed54237279ffbb64 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Mon, 1 Dec 2014 17:35:21 -0600 -Subject: [PATCH] dlopen-openssl - ---- - qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp b/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp -index 4e6200f..d9c3e7d 100644 ---- a/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp -+++ b/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp -@@ -585,8 +585,8 @@ static QPair loadOpenSsl() - #endif - #if defined(SHLIB_VERSION_NUMBER) && !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so - // first attempt: the canonical name is libssl.so. -- libssl->setFileNameAndVersion(QLatin1String("ssl"), QLatin1String(SHLIB_VERSION_NUMBER)); -- libcrypto->setFileNameAndVersion(QLatin1String("crypto"), QLatin1String(SHLIB_VERSION_NUMBER)); -+ libssl->setFileNameAndVersion(QLatin1String("@openssl@/lib/libssl"), QLatin1String(SHLIB_VERSION_NUMBER)); -+ libcrypto->setFileNameAndVersion(QLatin1String("@openssl@/lib/libcrypto"), QLatin1String(SHLIB_VERSION_NUMBER)); - if (libcrypto->load() && libssl->load()) { - // libssl.so. and libcrypto.so. found - return pair; -@@ -597,8 +597,8 @@ static QPair loadOpenSsl() - #endif - - // second attempt: find the development files libssl.so and libcrypto.so -- libssl->setFileNameAndVersion(QLatin1String("ssl"), -1); -- libcrypto->setFileNameAndVersion(QLatin1String("crypto"), -1); -+ libssl->setFileNameAndVersion(QLatin1String("@openssl@/lib/libssl"), -1); -+ libcrypto->setFileNameAndVersion(QLatin1String("@openssl@/lib/libcrypto"), -1); - if (libcrypto->load() && libssl->load()) { - // libssl.so.0 and libcrypto.so.0 found - return pair; --- -2.1.3 - diff --git a/pkgs/development/libraries/qt-5/5.3-submodules/0012-dlopen-dbus.patch b/pkgs/development/libraries/qt-5/5.3-submodules/0012-dlopen-dbus.patch deleted file mode 100644 index f32386e114b..00000000000 --- a/pkgs/development/libraries/qt-5/5.3-submodules/0012-dlopen-dbus.patch +++ /dev/null @@ -1,25 +0,0 @@ -From eec8a79c6cc9e2c65fd43db48ca2347de3ae0c5e Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Mon, 1 Dec 2014 17:38:04 -0600 -Subject: [PATCH] dlopen-dbus - ---- - qtbase/src/dbus/qdbus_symbols.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/qtbase/src/dbus/qdbus_symbols.cpp b/qtbase/src/dbus/qdbus_symbols.cpp -index a7a1b67..661baf1 100644 ---- a/qtbase/src/dbus/qdbus_symbols.cpp -+++ b/qtbase/src/dbus/qdbus_symbols.cpp -@@ -93,7 +93,7 @@ bool qdbus_loadLibDBus() - - static int majorversions[] = { 3, 2, -1 }; - lib->unload(); -- lib->setFileName(QLatin1String("dbus-1")); -+ lib->setFileName(QLatin1String("@dbus_libs@/lib/libdbus-1")); - for (uint i = 0; i < sizeof(majorversions) / sizeof(majorversions[0]); ++i) { - lib->setFileNameAndVersion(lib->fileName(), majorversions[i]); - if (lib->load() && lib->resolve("dbus_connection_open_private")) --- -2.1.3 - diff --git a/pkgs/development/libraries/qt-5/5.3-submodules/default.nix b/pkgs/development/libraries/qt-5/5.3-submodules/default.nix deleted file mode 100644 index 607da4f589a..00000000000 --- a/pkgs/development/libraries/qt-5/5.3-submodules/default.nix +++ /dev/null @@ -1,330 +0,0 @@ -{ autonix, fetchurl, newScope, stdenv - -, bison2 -, mesa_noglu -, cups -, gnome - -# options -, developerBuild ? false -}: - -with autonix; -with stdenv.lib; - -let - manifest = - importManifest ./manifest.nix { mirror = "http://download.qt.io"; }; - srcs = - mapAttrs (name: src: fetchurl { inherit (src) url sha256 name; }) manifest; - - version = "5.3.2"; - - callPackage = newScope (self // { inherit qtSubmodule; }); - - qtSubmodule = callPackage ./qt-submodule.nix { - inherit srcs version; - inherit (stdenv) mkDerivation; - }; - - self = - { - - activeqt = callPackage - ( - { qtSubmodule, base }: - - qtSubmodule { - name = "qtactiveqt"; - qtInputs = [ base ]; - } - ) - {}; - - base = callPackage ./qtbase.nix { - mesa = mesa_noglu; - cups = if stdenv.isLinux then cups else null; - # GNOME dependencies are not used unless gtkStyle == true - inherit (gnome) libgnomeui GConf gnome_vfs; - bison = bison2; # error: too few arguments to function 'int yylex(... - inherit developerBuild srcs version; - }; - - connectivity = callPackage - ( - { qtSubmodule, base, declarative }: - - qtSubmodule { - name = "qtconnectivity"; - qtInputs = [ base declarative ]; - } - ) - {}; - - declarative = callPackage - ( - { qtSubmodule, python, base, svg, xmlpatterns }: - - qtSubmodule { - name = "qtdeclarative"; - qtInputs = [ base svg xmlpatterns ]; - nativeBuildInputs = [ python ]; - } - ) - {}; - - doc = callPackage - ( - { qtSubmodule, declarative }: - - qtSubmodule { - name = "qtdoc"; - qtInputs = [ declarative ]; - } - ) - {}; - - enginio = callPackage - ( - { qtSubmodule, declarative }: - - qtSubmodule { - name = "qtenginio"; - qtInputs = [ declarative ]; - } - ) - {}; - - graphicaleffects = callPackage - ( - { qtSubmodule, declarative }: - - qtSubmodule { - name = "qtgraphicaleffects"; - qtInputs = [ declarative ]; - } - ) - {}; - - imageformats = callPackage - ( - { qtSubmodule, base }: - - qtSubmodule { - name = "qtimageformats"; - qtInputs = [ base ]; - } - ) - {}; - - location = callPackage - ( - { qtSubmodule, base, multimedia }: - - qtSubmodule { - name = "qtlocation"; - qtInputs = [ base multimedia ]; - } - ) - {}; - - multimedia = callPackage - ( - { qtSubmodule, base, declarative - , alsaLib, gstreamer, gst_plugins_base, pulseaudio - }: - - qtSubmodule { - name = "qtmultimedia"; - qtInputs = [ base declarative ]; - buildInputs = [ - alsaLib gstreamer gst_plugins_base pulseaudio - ]; - } - ) - {}; - - quick1 = callPackage - ( - { qtSubmodule, script, svg, webkit, xmlpatterns }: - - qtSubmodule { - name = "qtquick1"; - qtInputs = [ script svg webkit xmlpatterns ]; - } - ) - {}; - - quickcontrols = callPackage - ( - { qtSubmodule, declarative }: - - qtSubmodule { - name = "qtquickcontrols"; - qtInputs = [ declarative ]; - } - ) - {}; - - script = callPackage - ( - { qtSubmodule, base, tools }: - - qtSubmodule { - name = "qtscript"; - qtInputs = [ base tools ]; - patchFlags = "-p2"; # patches originally for monolithic build - patches = [ ./0003-glib-2.32.patch ]; - } - ) - {}; - - sensors = callPackage - ( - { qtSubmodule, base, declarative }: - - qtSubmodule { - name = "qtsensors"; - qtInputs = [ base declarative ]; - } - ) - {}; - - serialport = callPackage - ( - { qtSubmodule, base }: - - qtSubmodule { - name = "qtserialport"; - qtInputs = [ base ]; - patchFlags = "-p2"; # patches originally for monolithic build - patches = [ ./0009-dlopen-serialport-udev.patch ]; - } - ) - {}; - - svg = callPackage - ( - { qtSubmodule, base }: - - qtSubmodule { - name = "qtsvg"; - qtInputs = [ base ]; - } - ) - {}; - - tools = callPackage - ( - { qtSubmodule, activeqt, base, declarative, webkit }: - - qtSubmodule { - name = "qttools"; - qtInputs = [ activeqt base declarative webkit ]; - } - ) - {}; - - translations = callPackage - ( - { qtSubmodule, tools }: - - qtSubmodule { - name = "qttranslations"; - qtInputs = [ tools ]; - } - ) - {}; - - webkit = callPackage - ( - { qtSubmodule, declarative, location, multimedia, sensors - , fontconfig, gdk_pixbuf, gtk, libwebp, libxml2, libxslt - , sqlite, udev - , bison2, flex, gdb, gperf, perl, pkgconfig, python, ruby - , substituteAll - , flashplayerFix ? false - }: - - qtSubmodule { - name = "qtwebkit"; - qtInputs = [ declarative location multimedia sensors ]; - buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite ]; - nativeBuildInputs = [ - bison2 flex gdb gperf perl pkgconfig python ruby - ]; - patchFlags = "-p2"; # patches originally for monolithic build - patches = - optional flashplayerFix - (substituteAll - { - src = ./0002-dlopen-webkit-nsplugin.patch; - inherit gtk gdk_pixbuf; - } - ) - ++ optional flashplayerFix - (substituteAll - { - src = ./0007-dlopen-webkit-gtk.patch; - inherit gtk; - } - ) - ++ [ - (substituteAll - { - src = ./0008-dlopen-webkit-udev.patch; - inherit udev; - } - ) - ]; - } - ) - {}; - - webkit-examples = callPackage - ( - { qtSubmodule, tools, webkit }: - - qtSubmodule { - name = "qtwebkit-examples"; - qtInputs = [ tools webkit ]; - } - ) - {}; - - websockets = callPackage - ( - { qtSubmodule, base, declarative }: - - qtSubmodule { - name = "qtwebsockets"; - qtInputs = [ base declarative ]; - } - ) - {}; - - x11extras = callPackage - ( - { qtSubmodule, base }: - - qtSubmodule { - name = "qtx11extras"; - qtInputs = [ base ]; - } - ) - {}; - - xmlpatterns = callPackage - ( - { qtSubmodule, base }: - - qtSubmodule { - name = "qtxmlpatterns"; - qtInputs = [ base ]; - } - ) - {}; - - }; - -in self diff --git a/pkgs/development/libraries/qt-5/5.3-submodules/manifest.nix b/pkgs/development/libraries/qt-5/5.3-submodules/manifest.nix deleted file mode 100644 index 72e67575b00..00000000000 --- a/pkgs/development/libraries/qt-5/5.3-submodules/manifest.nix +++ /dev/null @@ -1,166 +0,0 @@ -# This file is generated automatically. DO NOT EDIT! -{ mirror }: -[ - { - url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qttranslations-opensource-src-5.3.2.tar.xz"; - sha256 = "1kf52crdg4a0p2pvm15slr2akiv5vcaj2g4f9iqqirg90pq4idi9"; - name = "qttranslations-opensource-src-5.3.2.tar.xz"; - store = "/nix/store/b49c2shv2x09l8887x9xd78j30azaihg-qttranslations-opensource-src-5.3.2.tar.xz"; - } - { - url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qtconnectivity-opensource-src-5.3.2.tar.xz"; - sha256 = "0vq9v7dw8d3p2x45zzm96wvp8l1n76af3xzjs8p7bscpasw75f9f"; - name = "qtconnectivity-opensource-src-5.3.2.tar.xz"; - store = "/nix/store/7282a9bbvk9yvbp47yp3rh708cc6a2ic-qtconnectivity-opensource-src-5.3.2.tar.xz"; - } - { - url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qtwinextras-opensource-src-5.3.2.tar.xz"; - sha256 = "06g5ny3vfwfvh8aa6dhgypy446bj486ks6a3hwah2mzz911ywfgn"; - name = "qtwinextras-opensource-src-5.3.2.tar.xz"; - store = "/nix/store/iy9p8g3x5jl4ysxsm0zac8ac32x8xh45-qtwinextras-opensource-src-5.3.2.tar.xz"; - } - { - url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qtmultimedia-opensource-src-5.3.2.tar.xz"; - sha256 = "02qf98kv48bvpff85sz49y965if7jlfx98vxf0y78crzr5kaqpr5"; - name = "qtmultimedia-opensource-src-5.3.2.tar.xz"; - store = "/nix/store/q7nvs99p642dwv1lzxay1hws4x5apsf8-qtmultimedia-opensource-src-5.3.2.tar.xz"; - } - { - url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qtquick1-opensource-src-5.3.2.tar.xz"; - sha256 = "1yvkcbgcccy4bzf6xglnbjh23l5p9785lysfxphy7r40a64jwywv"; - name = "qtquick1-opensource-src-5.3.2.tar.xz"; - store = "/nix/store/baqff20xa58d4njisddi6s97g4pjhfki-qtquick1-opensource-src-5.3.2.tar.xz"; - } - { - url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qtgraphicaleffects-opensource-src-5.3.2.tar.xz"; - sha256 = "1z3zpa3lj2kx9999ycg0ixffwr3k0g5wlnizgm41ja9xl5c2d3v8"; - name = "qtgraphicaleffects-opensource-src-5.3.2.tar.xz"; - store = "/nix/store/vkm87abgwl8hpvfamjnnn6cj5gpxzqrf-qtgraphicaleffects-opensource-src-5.3.2.tar.xz"; - } - { - url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qttools-opensource-src-5.3.2.tar.xz"; - sha256 = "0glq97mivf5mwqxanbg2j4n2nky2lpcigr8p8naizbj37p3csfax"; - name = "qttools-opensource-src-5.3.2.tar.xz"; - store = "/nix/store/l9gccd50sxj01bsz30z6ncby9s24bf3y-qttools-opensource-src-5.3.2.tar.xz"; - } - { - url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qtimageformats-opensource-src-5.3.2.tar.xz"; - sha256 = "1m7283m1py4h11qj0rgz8bi7f474n2bnppnvrz0fsx1pnz7cn0yk"; - name = "qtimageformats-opensource-src-5.3.2.tar.xz"; - store = "/nix/store/ikpxw4qp50w7cs54f90njz5llv0xza2l-qtimageformats-opensource-src-5.3.2.tar.xz"; - } - { - url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qtsvg-opensource-src-5.3.2.tar.xz"; - sha256 = "03z33bkkaxcnpnmk4klb775c1nrp835c4bf8r0678mgf0zrw5i8y"; - name = "qtsvg-opensource-src-5.3.2.tar.xz"; - store = "/nix/store/wkp9660hiqavzimc88birm0ww7x5yycx-qtsvg-opensource-src-5.3.2.tar.xz"; - } - { - url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qtwebkit-opensource-src-5.3.2.tar.xz"; - sha256 = "0nrfv57xpzgjk5420jhk2mr46mn0mjdxhg0vw4rcrqg82pnj4wg4"; - name = "qtwebkit-opensource-src-5.3.2.tar.xz"; - store = "/nix/store/9zvifykqvxic9f10672n7lxwxkl90886-qtwebkit-opensource-src-5.3.2.tar.xz"; - } - { - url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qtsensors-opensource-src-5.3.2.tar.xz"; - sha256 = "1r1sjl41v8yij5b5lph7jkb2yxxaj1p8dyx1qzp0awdx5z29sdgr"; - name = "qtsensors-opensource-src-5.3.2.tar.xz"; - store = "/nix/store/x551nn8q8cflm99v2q3gk78vhayqb0bb-qtsensors-opensource-src-5.3.2.tar.xz"; - } - { - url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qtmacextras-opensource-src-5.3.2.tar.xz"; - sha256 = "023q4v6drichy6s6mn3jd2lxzj2cma7y35wyzx3wa7rhvznplzlb"; - name = "qtmacextras-opensource-src-5.3.2.tar.xz"; - store = "/nix/store/kfb05hiq7dc1djiy92nxvskshfjzyydx-qtmacextras-opensource-src-5.3.2.tar.xz"; - } - { - url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qtlocation-opensource-src-5.3.2.tar.xz"; - sha256 = "1mqlk09kccjxzrxxd5kv2w343kmnk8jxgfyb7adkhd8wacmhgd1p"; - name = "qtlocation-opensource-src-5.3.2.tar.xz"; - store = "/nix/store/pcfivvnnw5j5p3gk5r3gdf4iv974l323-qtlocation-opensource-src-5.3.2.tar.xz"; - } - { - url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qtscript-opensource-src-5.3.2.tar.xz"; - sha256 = "1gnpsvlkqfws3rsgzlxnd63w2h9f142hfg4bsb3h4d4rihn0063f"; - name = "qtscript-opensource-src-5.3.2.tar.xz"; - store = "/nix/store/fjsvvkw7a39v85r8mwbpvki9zps1qcms-qtscript-opensource-src-5.3.2.tar.xz"; - } - { - url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qtquickcontrols-opensource-src-5.3.2.tar.xz"; - sha256 = "0knryszjfhk2x7h5d9b07cil0mzqn4hlp5d8maq42w889l0hz2az"; - name = "qtquickcontrols-opensource-src-5.3.2.tar.xz"; - store = "/nix/store/2mlnavd1zjsp1vwnvi2gwgvw6wl3fpgc-qtquickcontrols-opensource-src-5.3.2.tar.xz"; - } - { - url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qtactiveqt-opensource-src-5.3.2.tar.xz"; - sha256 = "07sbgibmj4m9jywdz3ilmz1s6zh57himqhc2a62k78r0xx48chz1"; - name = "qtactiveqt-opensource-src-5.3.2.tar.xz"; - store = "/nix/store/x1zpipa51v97w16dphdbbxn1mg096g2g-qtactiveqt-opensource-src-5.3.2.tar.xz"; - } - { - url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qt5-opensource-src-5.3.2.tar.xz"; - sha256 = "0xj18bbamg921y8y8pzjxs2sciyrwvvr7wzh43pjpkiacs13r08a"; - name = "qt5-opensource-src-5.3.2.tar.xz"; - store = "/nix/store/y1gks060bhnzan3af703i00l50kbmn4z-qt5-opensource-src-5.3.2.tar.xz"; - } - { - url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qtxmlpatterns-opensource-src-5.3.2.tar.xz"; - sha256 = "1fqsxkbzf2iwzc2m5qccw1gan2ddbr15xjgjr9sp84cy0c3h7axc"; - name = "qtxmlpatterns-opensource-src-5.3.2.tar.xz"; - store = "/nix/store/z4g2py09bn400hfxh9n6ssqn9xnr5g7g-qtxmlpatterns-opensource-src-5.3.2.tar.xz"; - } - { - url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qtdoc-opensource-src-5.3.2.tar.xz"; - sha256 = "17ahdsj8hssi1dfwxbxq11mi0lpy75c3z5mwswd13l9lnvpm6d0b"; - name = "qtdoc-opensource-src-5.3.2.tar.xz"; - store = "/nix/store/78sa59m008x9vcpiky2i2maql6d20wa8-qtdoc-opensource-src-5.3.2.tar.xz"; - } - { - url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qtwebkit-examples-opensource-src-5.3.2.tar.xz"; - sha256 = "10k45492afbqffx5jab8784spp9ihclgxqn0kviy5n5pcc41l268"; - name = "qtwebkit-examples-opensource-src-5.3.2.tar.xz"; - store = "/nix/store/39809byxmwz1wzchr6fd0b4qqd2p18mj-qtwebkit-examples-opensource-src-5.3.2.tar.xz"; - } - { - url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qtenginio-opensource-src-5.3.2.tar.xz"; - sha256 = "027pdbgiaf1ypcb054x1mgdn5r9ph6hr09p4h2rrsd3avib4df6m"; - name = "qtenginio-opensource-src-5.3.2.tar.xz"; - store = "/nix/store/dmng42dg4s3sllzv27pz03gj8ys6i3a8-qtenginio-opensource-src-5.3.2.tar.xz"; - } - { - url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qtwebsockets-opensource-src-5.3.2.tar.xz"; - sha256 = "1hiq7bkpffjpmx4kvp4xldgq8sm7r9xyfak410g7p8hg7d0kslv0"; - name = "qtwebsockets-opensource-src-5.3.2.tar.xz"; - store = "/nix/store/74gkwn4mqmq8if54492fk3mv0bgjjs12-qtwebsockets-opensource-src-5.3.2.tar.xz"; - } - { - url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qtandroidextras-opensource-src-5.3.2.tar.xz"; - sha256 = "0a66f8s4wgb9s0k5bqc98kd5qf6qypxn1qhzcwqc3qqrfv69pwmy"; - name = "qtandroidextras-opensource-src-5.3.2.tar.xz"; - store = "/nix/store/0121pysghq6bxjx0l0isjfhjc283ncci-qtandroidextras-opensource-src-5.3.2.tar.xz"; - } - { - url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qtserialport-opensource-src-5.3.2.tar.xz"; - sha256 = "0jsszlv4v45wx8m9rj0398c6i534dwfcjvb7b1wyaq5y135y11m8"; - name = "qtserialport-opensource-src-5.3.2.tar.xz"; - store = "/nix/store/7xkgwk3l565bvcmzadywjcpbydgbv688-qtserialport-opensource-src-5.3.2.tar.xz"; - } - { - url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qtx11extras-opensource-src-5.3.2.tar.xz"; - sha256 = "0lbjq6014nz68xhg0mzmm92pm9r45jgaw82a1c41igz0bg4jhsna"; - name = "qtx11extras-opensource-src-5.3.2.tar.xz"; - store = "/nix/store/93rdyp4p1qz8cd7cn7gixjch23m71xqf-qtx11extras-opensource-src-5.3.2.tar.xz"; - } - { - url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qtdeclarative-opensource-src-5.3.2.tar.xz"; - sha256 = "10i3id206vzvxc3rwa4mykwmbxc13mf8psapq6a06b34p69q2404"; - name = "qtdeclarative-opensource-src-5.3.2.tar.xz"; - store = "/nix/store/kf843n3710cancfcdicb17s8hxg628yr-qtdeclarative-opensource-src-5.3.2.tar.xz"; - } - { - url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qtbase-opensource-src-5.3.2.tar.xz"; - sha256 = "1f3chbblfwyhj4qll6gd05jw7qgvcmqc12xbvpb9kbkdqid0j5ls"; - name = "qtbase-opensource-src-5.3.2.tar.xz"; - store = "/nix/store/l38yd5yrm35r812pdigxczqzv2h3k7r9-qtbase-opensource-src-5.3.2.tar.xz"; - } -] diff --git a/pkgs/development/libraries/qt-5/5.3-submodules/manifest.sh b/pkgs/development/libraries/qt-5/5.3-submodules/manifest.sh deleted file mode 100755 index 6f713511531..00000000000 --- a/pkgs/development/libraries/qt-5/5.3-submodules/manifest.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -if [ $# -eq 0 ]; then - - # The extra slash at the end of the URL is necessary to stop wget - # from recursing over the whole server! (No, it's not a bug.) - $(nix-build ../../../../.. -A autonix.manifest) \ - http://download.qt.io/official_releases/qt/5.3/5.3.2/submodules/ \ - -A '*.tar.xz' - -else - - $(nix-build ../../../.. -A autonix.manifest) -A '*.tar.xz' "$@" - -fi diff --git a/pkgs/development/libraries/qt-5/5.3-submodules/qt-submodule.nix b/pkgs/development/libraries/qt-5/5.3-submodules/qt-submodule.nix deleted file mode 100644 index 6f9278e98ff..00000000000 --- a/pkgs/development/libraries/qt-5/5.3-submodules/qt-submodule.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ stdenv, mkDerivation -, srcs, version -, lndir -, base -}: - -with stdenv.lib; - -args: - -mkDerivation (args // { - - name = "${args.name}-${version}"; - inherit version; - - srcs = args.srcs or [srcs."${args.name}-opensource-src"]; - - preConfigure = '' - mkdir -p "$out" - - for qtInput in ${concatStringsSep " " args.qtInputs}; do - lndir "$qtInput" "$out" - done - - # Only this package's nix-support files go in $out - rm -fr $out/nix-support - - # Override hardcoded paths in qmake - rm -f $out/bin/qmake - cp "${base}/bin/qmake" "$out/bin/qmake" - rm -f $out/bin/qt.conf - cat <$out/bin/qt.conf -[Paths] -Prefix = $out -EOF - export PATH=$out/bin:$PATH - '' + (args.preConfigure or ""); - - dontAddPrefix = args.dontAddPrefix or true; - dontFixLibtool = args.dontFixLibtool or true; - configureScript = args.configureScript or "qmake"; - - postInstall = '' - rm "$out/bin/qmake" "$out/bin/qt.conf" - ''; - - propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []); - - nativeBuildInputs = [ lndir ] ++ (args.nativeBuildInputs or []); - - enableParallelBuilding = - args.enableParallelBuilding or true; # often fails on Hydra, as well as qt4 - - meta = args.meta or { - homepage = http://qt-project.org; - description = "A cross-platform application framework for C++"; - license = "GPL/LGPL"; - maintainers = with maintainers; [ bbenoist qknight ttuegel ]; - platforms = platforms.linux; - }; - -}) diff --git a/pkgs/development/libraries/qt-5/5.3-submodules/qtbase.nix b/pkgs/development/libraries/qt-5/5.3-submodules/qtbase.nix deleted file mode 100644 index 40f29f2d3fe..00000000000 --- a/pkgs/development/libraries/qt-5/5.3-submodules/qtbase.nix +++ /dev/null @@ -1,174 +0,0 @@ -{ stdenv, substituteAll -, srcs, version - -, xlibs, libX11, libxcb, libXcursor, libXext, libXrender, libXi -, xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilwm, libxkbcommon -, fontconfig, freetype, openssl, dbus, glib, udev, libxml2, libxslt, pcre -, zlib, libjpeg, libpng, libtiff, sqlite, icu - -, coreutils, bison, flex, gdb, gperf, ruby -, python, perl, pkgconfig - -# optional dependencies -, cups ? null -, mysql ? null, postgresql ? null - -# options -, mesaSupported, mesa, mesa_glu -, buildDocs ? false -, buildExamples ? false -, buildTests ? false -, developerBuild ? false -, gtkStyle ? false, libgnomeui, GConf, gnome_vfs, gtk -}: - -with stdenv.lib; - -stdenv.mkDerivation { - - name = "qtbase-${version}"; - inherit version; - - srcs = with srcs; [ qt5-opensource-src qtbase-opensource-src ]; - sourceRoot = "qt-everywhere-opensource-src-${version}"; - - postUnpack = '' - mv qtbase-opensource-src-${version} ./qt-everywhere-opensource-src-${version}/qtbase - ''; - - prePatch = '' - substituteInPlace configure --replace /bin/pwd pwd - substituteInPlace qtbase/configure --replace /bin/pwd pwd - substituteInPlace qtbase/src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls - substituteInPlace qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \ - --replace /usr/share/X11/locale ${libX11}/share/X11/locale \ - --replace /usr/lib/X11/locale ${libX11}/share/X11/locale - sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i qtbase/mkspecs/*/*.conf - ''; - - patches = - optional gtkStyle - (substituteAll { - src = ./0001-dlopen-gtkstyle.patch; - # substituteAll ignores env vars starting with capital letter - gconf = GConf; - inherit gnome_vfs libgnomeui gtk; - }) - ++ [ - (substituteAll { - src = ./0004-dlopen-resolv.patch; - glibc = stdenv.cc.libc; - }) - (substituteAll { - src = ./0005-dlopen-gl.patch; - openglDriver = if mesaSupported then mesa.driverLink else "/no-such-path"; - }) - ./0006-tzdir.patch - (substituteAll { src = ./0010-dlopen-libXcursor.patch; inherit libXcursor; }) - (substituteAll { src = ./0011-dlopen-openssl.patch; inherit openssl; }) - (substituteAll { src = ./0012-dlopen-dbus.patch; dbus_libs = dbus; }) - ]; - - preConfigure = '' - export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$PWD/qttools/lib:$LD_LIBRARY_PATH" - export MAKEFLAGS=-j$NIX_BUILD_CORES - ''; - - prefixKey = "-prefix "; - - # -no-eglfs, -no-directfb, -no-linuxfb and -no-kms because of the current minimalist mesa - # TODO Remove obsolete and useless flags once the build will be totally mastered - configureFlags = '' - -verbose - -confirm-license - -opensource - - -release - -shared - -c++11 - ${optionalString developerBuild "-developer-build"} - -largefile - -accessibility - -rpath - -optimized-qmake - -strip - -reduce-relocations - -system-proxies - - -gui - -widgets - -opengl desktop - -qml-debug - -nis - -iconv - -icu - -pch - -glib - -xcb - -qpa xcb - -${optionalString (cups == null) "no-"}cups - - -no-eglfs - -no-directfb - -no-linuxfb - -no-kms - - -system-zlib - -system-libpng - -system-libjpeg - -system-xcb - -system-xkbcommon - -openssl-linked - -dbus-linked - - -system-sqlite - -${if mysql != null then "plugin" else "no"}-sql-mysql - -${if postgresql != null then "plugin" else "no"}-sql-psql - - -make libs - -make tools - -${optionalString (buildExamples == false) "no"}make examples - -${optionalString (buildTests == false) "no"}make tests - ''; - - propagatedBuildInputs = [ - xlibs.libXcomposite libX11 libxcb libXext libXrender libXi - fontconfig freetype openssl dbus.libs glib udev libxml2 libxslt pcre - zlib libjpeg libpng libtiff sqlite icu - xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon - ] - # Qt doesn't directly need GLU (just GL), but many apps use, it's small and - # doesn't remain a runtime-dep if not used - ++ optionals mesaSupported [ mesa mesa_glu ] - ++ optional (cups != null) cups - ++ optional (mysql != null) mysql - ++ optional (postgresql != null) postgresql; - - buildInputs = [ gdb bison flex gperf ruby ]; - - nativeBuildInputs = [ python perl pkgconfig ]; - - # freetype-2.5.4 changed signedness of some struct fields - NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare"; - - postInstall = - '' - ${optionalString buildDocs '' - make docs && make install_docs - ''} - - # Don't retain build-time dependencies like gdb and ruby. - sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $out/mkspecs/qconfig.pri - ''; - - enableParallelBuilding = true; # often fails on Hydra, as well as qt4 - - meta = { - homepage = http://qt-project.org; - description = "A cross-platform application framework for C++"; - license = "GPL/LGPL"; - maintainers = with maintainers; [ bbenoist qknight ttuegel ]; - platforms = platforms.linux; - }; - -} From 8cf78bf5f44940769215833f5310e33d0fef548f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 21 Feb 2015 10:57:50 -0600 Subject: [PATCH 149/197] update various packages to use Qt 5.4 --- pkgs/applications/kde-apps-14.12/default.nix | 59 +- .../kde-apps-14.12/dependencies.nix | 24 +- pkgs/applications/kde-apps-14.12/manifest.nix | 3953 ++++++++++++++--- .../networking/irc/quassel/default.nix | 13 +- pkgs/applications/video/vlc/default.nix | 2 +- pkgs/desktops/plasma-5.2/default.nix | 14 +- pkgs/desktops/plasma-5.2/dependencies.nix | 66 +- pkgs/desktops/plasma-5.2/manifest.nix | 326 +- .../libraries/libdbusmenu-qt/qt5.nix | 4 +- .../phonon-backend-gstreamer/qt5/default.nix | 9 +- .../phonon-backend-vlc/qt5/default.nix | 3 +- .../libraries/phonon/qt5/default.nix | 18 +- .../libraries/polkit-qt-1/default.nix | 2 +- .../development/libraries/poppler/default.nix | 2 +- pkgs/top-level/all-packages.nix | 28 +- 15 files changed, 3613 insertions(+), 910 deletions(-) diff --git a/pkgs/applications/kde-apps-14.12/default.nix b/pkgs/applications/kde-apps-14.12/default.nix index 7495dfffd71..0a186567143 100644 --- a/pkgs/applications/kde-apps-14.12/default.nix +++ b/pkgs/applications/kde-apps-14.12/default.nix @@ -12,7 +12,7 @@ # make a copy of this directory first. After copying, be sure to delete ./tmp # if it exists. Then follow the minor update instructions. -{ autonix, kde4, kf5, pkgs, qt4, stdenv, debug ? false }: +{ autonix, symlinkJoin, kde4, kf5, pkgs, qt4, qt5, stdenv, debug ? false }: with stdenv.lib; with autonix; @@ -20,7 +20,7 @@ let kf5Orig = kf5; in let - kf5 = kf5Orig.override { inherit debug; }; + kf5 = kf5Orig.override { inherit debug qt5; }; mirror = "mirror://kde"; @@ -37,6 +37,22 @@ let "LibKonq" = "kde-baseapps"; }; + mkDerivation = drv: kf5.mkDerivation (drv // { + preHook = (drv.preHook or "") + '' + addQt4Plugins() { + if [[ -d "$1/lib/qt4/plugins" ]]; then + propagatedUserEnvPkgs+=" $1" + fi + + if [[ -d "$1/lib/kde4/plugins" ]]; then + propagatedUserEnvPkgs+=" $1" + fi + } + + envHooks+=(addQt4Plugins) + ''; + }); + scope = # packages in this collection (mapAttrs (dep: name: kdeApps."${name}") renames) // @@ -131,8 +147,36 @@ let (blacklist ["kdewebdev"]) # unknown build failure ]; + l10nPkgQt4 = orig: + let drvName = builtins.parseDrvName orig.name; in + mkDerivation { + name = "${drvName.name}-qt4-${drvName.version}"; + inherit (orig) src; + buildInputs = [ kdeApps.kdelibs ]; + nativeBuildInputs = with pkgs; [ cmake gettext perl ]; + preConfigure = '' + cd 4/ + ''; + }; + + l10nPkgQt5 = orig: + let drvName = builtins.parseDrvName orig.name; in + mkDerivation { + name = "${drvName.name}-qt5-${drvName.version}"; + inherit (orig) src; + buildInputs = with kf5; [ kdoctools ki18n ]; + nativeBuildInputs = with pkgs; [ cmake kf5.extra-cmake-modules gettext perl ]; + preConfigure = '' + cd 5/ + ''; + }; + + l10nPkg = name: orig: symlinkJoin orig.name [(l10nPkgQt4 orig) (l10nPkgQt5 orig)]; + + removeL10nPkgs = filterAttrs (n: v: !(hasPrefix "kde-l10n") n); + postResolve = super: - super // { + (removeL10nPkgs super) // { ark = with pkgs; super.ark // { buildInputs = (super.ark.buildInputs or []) ++ [ makeWrapper ]; @@ -264,9 +308,14 @@ let }; + l10nManifest = + filterAttrs + (n: v: hasPrefix "kde-l10n" n) + (importManifest ./manifest.nix { inherit mirror; }); + kdeApps = generateCollection ./. { - inherit (kf5) mkDerivation; + inherit mkDerivation; inherit mirror preResolve postResolve renames scope; }; -in kdeApps +in kdeApps // (mapAttrs l10nPkg l10nManifest) diff --git a/pkgs/applications/kde-apps-14.12/dependencies.nix b/pkgs/applications/kde-apps-14.12/dependencies.nix index a32fc688828..ee820b7ac74 100644 --- a/pkgs/applications/kde-apps-14.12/dependencies.nix +++ b/pkgs/applications/kde-apps-14.12/dependencies.nix @@ -10,7 +10,7 @@ }; analitza = { - buildInputs = [ "ECM" "Eigen3" "GLEW" "OpenGL" "Qt5" "Qt5OpenGL" ]; + buildInputs = [ "ECM" "Eigen3" "GLEW" "OpenGL" "Qt5" "Qt5NO_MODULE" "Qt5OpenGL" "Qt5Qml" "Qt5Quick" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5Xml" ]; nativeBuildInputs = [ "cmake" ]; propagatedBuildInputs = [ "Qt5Core" ]; propagatedNativeBuildInputs = [ ]; @@ -122,7 +122,7 @@ }; gwenview = { - buildInputs = [ "ECM" "Exiv2" "JPEG" "KF5" "KF5Activities" "KF5Baloo" "KF5KDELibs4Support" "KF5KIO" "Kdcraw" "Kipi" "LCMS2" "PNG" "Phonon4Qt5" "Qt5" "Qt5Test" ]; + buildInputs = [ "ECM" "Exiv2" "JPEG" "KF5" "KF5Activities" "KF5Baloo" "KF5KDELibs4Support" "KF5KIO" "Kdcraw" "Kipi" "LCMS2" "PNG" "Phonon4Qt5" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5DBus" "Qt5OpenGL" "Qt5QUIET" "Qt5Script" "Qt5Svg" "Qt5Test" "Qt5Widgets" ]; nativeBuildInputs = [ "cmake" ]; propagatedBuildInputs = [ ]; propagatedNativeBuildInputs = [ ]; @@ -162,7 +162,7 @@ }; kalgebra = { - buildInputs = [ "Analitza5" "Curses" "ECM" "KF5ConfigWidgets" "KF5DocTools" "KF5I18n" "KF5KIO" "KF5WidgetsAddons" "OpenGL" "Qt5" "Qt5WebKitWidgets" "Readline" ]; + buildInputs = [ "Analitza5" "Curses" "ECM" "KF5ConfigWidgets" "KF5DocTools" "KF5I18n" "KF5KIO" "KF5WidgetsAddons" "OpenGL" "Qt5" "Qt5NO_MODULE" "Qt5OpenGL" "Qt5PrintSupport" "Qt5Qml" "Qt5Quick" "Qt5Svg" "Qt5Test" "Qt5WebKitWidgets" "Qt5Xml" "Readline" ]; nativeBuildInputs = [ "cmake" ]; propagatedBuildInputs = [ ]; propagatedNativeBuildInputs = [ ]; @@ -186,7 +186,7 @@ }; kanagram = { - buildInputs = [ "ECM" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5Crash" "KF5Declarative" "KF5DocTools" "KF5I18n" "KF5KIO" "KF5NewStuff" "KF5Sonnet" "LibKEduVocDocument" "Phonon4Qt5" "Qt5" ]; + buildInputs = [ "ECM" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5Crash" "KF5Declarative" "KF5DocTools" "KF5I18n" "KF5KIO" "KF5NewStuff" "KF5Sonnet" "LibKEduVocDocument" "Phonon4Qt5" "Qt5" "Qt5Core" "Qt5OPTIONAL_COMPONENTS" "Qt5OpenGL" "Qt5PrintSupport" "Qt5Qml" "Qt5Quick" ]; nativeBuildInputs = [ "cmake" ]; propagatedBuildInputs = [ ]; propagatedNativeBuildInputs = [ ]; @@ -202,7 +202,7 @@ }; kapptemplate = { - buildInputs = [ "ECM" "KDE4" "KF5" "KF5Archive" "KF5Completion" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "KF5KIO" "KF5XmlGui" "KdepimLibs" "Qt5" "Qt5Widgets" ]; + buildInputs = [ "ECM" "KDE4" "KF5" "KF5Archive" "KF5Completion" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "KF5KIO" "KF5XmlGui" "KdepimLibs" "Qt5" "Qt5Core" "Qt5Gui" "Qt5Test" "Qt5Widgets" ]; nativeBuildInputs = [ "RBKCONFIG_COMPILER4" "RBUIC4" "XSLTPROC_EXECUTABLE" "cmake" ]; propagatedBuildInputs = [ ]; propagatedNativeBuildInputs = [ ]; @@ -210,7 +210,7 @@ }; kate = { - buildInputs = [ "ECM" "KF5" "KF5Config" "KF5DBusAddons" "KF5DocTools" "KF5GuiAddons" "KF5I18n" "KF5Init" "KF5ItemModels" "KF5JobWidgets" "KF5KIO" "KF5NewStuff" "KF5Notifications" "KF5OPTIONAL_COMPONENTS" "KF5Parts" "KF5Plasma" "KF5Service" "KF5TextEditor" "KF5ThreadWeaver" "KF5Wallet" "KF5WindowSystem" "KF5XmlGui" "LibGit2" "PyKDE4" "PyQt4" "PythonLibrary" "Qt5" "SIP" ]; + buildInputs = [ "ECM" "KF5" "KF5Config" "KF5DBusAddons" "KF5DocTools" "KF5GuiAddons" "KF5I18n" "KF5Init" "KF5ItemModels" "KF5JobWidgets" "KF5KIO" "KF5NewStuff" "KF5Notifications" "KF5OPTIONAL_COMPONENTS" "KF5Parts" "KF5Plasma" "KF5Service" "KF5TextEditor" "KF5ThreadWeaver" "KF5Wallet" "KF5WindowSystem" "KF5XmlGui" "LibGit2" "PyKDE4" "PyQt4" "PythonLibrary" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Script" "Qt5Sql" "Qt5Test" "Qt5Widgets" "SIP" ]; nativeBuildInputs = [ "cmake" ]; propagatedBuildInputs = [ ]; propagatedNativeBuildInputs = [ ]; @@ -978,7 +978,7 @@ }; khangman = { - buildInputs = [ "ECM" "KDE4" "KF5" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5DocTools" "KF5I18n" "KF5NewStuff" "KF5Notifications" "KF5XmlGui" "LibKEduVocDocument" "Phonon4Qt5" "Qt5" ]; + buildInputs = [ "ECM" "KDE4" "KF5" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5DocTools" "KF5I18n" "KF5NewStuff" "KF5Notifications" "KF5XmlGui" "LibKEduVocDocument" "Phonon4Qt5" "Qt5" "Qt5Core" "Qt5Svg" ]; nativeBuildInputs = [ "cmake" ]; propagatedBuildInputs = [ ]; propagatedNativeBuildInputs = [ ]; @@ -1170,7 +1170,7 @@ }; konsole = { - buildInputs = [ "ECM" "KF5" "KF5Bookmarks" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DocTools" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5Init" "KF5KDELibs4Support" "KF5KIO" "KF5Konq" "KF5Notifications" "KF5NotifyConfig" "KF5Parts" "KF5Pty" "KF5Service" "KF5TextWidgets" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "Qt5" "X11" ]; + buildInputs = [ "ECM" "KF5" "KF5Bookmarks" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DocTools" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5Init" "KF5KDELibs4Support" "KF5KIO" "KF5Konq" "KF5Notifications" "KF5NotifyConfig" "KF5Parts" "KF5Pty" "KF5Service" "KF5TextWidgets" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Script" "Qt5Test" "Qt5Widgets" "X11" ]; nativeBuildInputs = [ "cmake" ]; propagatedBuildInputs = [ ]; propagatedNativeBuildInputs = [ ]; @@ -1178,7 +1178,7 @@ }; kopete = { - buildInputs = [ "Alsa" "Boost" "Expat" "GIF" "GLIB2" "IDN" "Jasper" "JsonCpp" "KDE4" "KdepimLibs" "Kleopatra" "LibMeanwhile" "LibOTR" "LibV4L2" "LibXml2" "Libgadu" "Libmsn" "LiboRTP" "Mediastreamer" "OpenSSL" "QCA2" "QGpgme" "QImageBlitz" "Qt4" "Qt5Core" "Qt5Network" "SRTP" "Speex" "Sqlite" "Xmms" "ZLIB" ]; + buildInputs = [ "Alsa" "Boost" "Expat" "GIF" "GLIB2" "IDN" "Jasper" "JsonCpp" "KDE4" "KdepimLibs" "Kleopatra" "LibMeanwhile" "LibOTR" "LibV4L2" "LibXml2" "Libgadu" "Libmsn" "LiboRTP" "Mediastreamer" "OpenSSL" "QCA2" "QGpgme" "QImageBlitz" "Qt4" "Qt5Core" "Qt5Network" "Qt5QUIET" "SRTP" "Speex" "Sqlite" "Xmms" "ZLIB" ]; nativeBuildInputs = [ "LibXslt" "cmake" ]; propagatedBuildInputs = [ ]; propagatedNativeBuildInputs = [ ]; @@ -1458,7 +1458,7 @@ }; libkeduvocdocument = { - buildInputs = [ "ECM" "KF5" "KF5Archive" "KF5I18n" "KF5KIO" "Qt5" ]; + buildInputs = [ "ECM" "KF5" "KF5Archive" "KF5I18n" "KF5KIO" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Xml" ]; nativeBuildInputs = [ "cmake" ]; propagatedBuildInputs = [ ]; propagatedNativeBuildInputs = [ ]; @@ -1546,7 +1546,7 @@ }; okteta = { - buildInputs = [ "ECM" "KF5" "KF5Bookmarks" "KF5Codecs" "KF5Completion" "KF5ConfigWidgets" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "KF5KCMUtils" "KF5KIO" "KF5NewStuff" "KF5Parts" "KF5Service" "KF5WidgetsAddons" "KF5XmlGui" "QCA2" "Qt5" "Qt5Test" "SharedMimeInfo" ]; + buildInputs = [ "ECM" "KF5" "KF5Bookmarks" "KF5Codecs" "KF5Completion" "KF5ConfigWidgets" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "KF5KCMUtils" "KF5KIO" "KF5NewStuff" "KF5Parts" "KF5Service" "KF5WidgetsAddons" "KF5XmlGui" "Qca-qt5" "Qt5" "Qt5Core" "Qt5Designer" "Qt5NO_MODULE" "Qt5Network" "Qt5PrintSupport" "Qt5QUIET" "Qt5Script" "Qt5ScriptTools" "Qt5Test" "Qt5Widgets" "Qt5Xml" "SharedMimeInfo" ]; nativeBuildInputs = [ "cmake" ]; propagatedBuildInputs = [ ]; propagatedNativeBuildInputs = [ ]; @@ -1586,7 +1586,7 @@ }; parley = { - buildInputs = [ "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DocTools" "KF5I18n" "KF5KCMUtils" "KF5KHtml" "KF5KIO" "KF5Kross" "KF5MODULE" "KF5NewStuff" "KF5Notifications" "KF5Sonnet" "KF5XmlGui" "KF5docbook" "KF5produce" "KF5the" "LibAttica" "LibKEduVocDocument" "LibXml2" "Qt5" ]; + buildInputs = [ "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DocTools" "KF5I18n" "KF5KCMUtils" "KF5KHtml" "KF5KIO" "KF5Kross" "KF5MODULE" "KF5NewStuff" "KF5Notifications" "KF5Sonnet" "KF5XmlGui" "KF5docbook" "KF5produce" "KF5the" "LibAttica" "LibKEduVocDocument" "LibXml2" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5Multimedia" "Qt5Svg" "Qt5Test" ]; nativeBuildInputs = [ "LibXslt" "cmake" ]; propagatedBuildInputs = [ ]; propagatedNativeBuildInputs = [ ]; diff --git a/pkgs/applications/kde-apps-14.12/manifest.nix b/pkgs/applications/kde-apps-14.12/manifest.nix index 6751af8858e..8411690b1eb 100644 --- a/pkgs/applications/kde-apps-14.12/manifest.nix +++ b/pkgs/applications/kde-apps-14.12/manifest.nix @@ -1,1258 +1,3775 @@ # This file is generated automatically. DO NOT EDIT! -{ mirror }: +{ stdenv, fetchurl, mirror }: [ { - url = "${mirror}/stable/applications/14.12.1/src/pairs-14.12.1.tar.xz"; - sha256 = "13byliibd6fwa8bsgka8hc64jkprmgsnqh9sks36w7ic22f32qhx"; - name = "pairs-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "pairs-14.12.1.tar.xz" ".tar"; store = "/nix/store/fsaycjsmkm1g92j3syc2a8nwdgfgs99g-pairs-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/pairs-14.12.1.tar.xz"; + sha256 = "13byliibd6fwa8bsgka8hc64jkprmgsnqh9sks36w7ic22f32qhx"; + name = "pairs-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kgamma-14.12.1.tar.xz"; - sha256 = "1ad2c1l2lbc2pdybavnnj834ww82rbm91k0wjgz25xc3l3gkrg9i"; - name = "kgamma-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kgamma-14.12.1.tar.xz" ".tar"; store = "/nix/store/4ggxl3vnlngg1p6irixa42as7gyp3c8k-kgamma-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kgamma-14.12.1.tar.xz"; + sha256 = "1ad2c1l2lbc2pdybavnnj834ww82rbm91k0wjgz25xc3l3gkrg9i"; + name = "kgamma-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/ktux-14.12.1.tar.xz"; - sha256 = "00x5jm26w1a214chdg1fkzki1z3h1dbw5qagal4lkcb98fi5sbcq"; - name = "ktux-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "ktux-14.12.1.tar.xz" ".tar"; store = "/nix/store/n68cvnv9h371cx7q5jqfqs2bdj1rqvyi-ktux-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/ktux-14.12.1.tar.xz"; + sha256 = "00x5jm26w1a214chdg1fkzki1z3h1dbw5qagal4lkcb98fi5sbcq"; + name = "ktux-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/analitza-14.12.1.tar.xz"; - sha256 = "0jgmjda5n5935v37jgaichk5hif67mzlyvxqmr19wwmbiqfbazx8"; - name = "analitza-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "analitza-14.12.1.tar.xz" ".tar"; store = "/nix/store/n8ayxw5rwzlyc015ff1lzwnd2wa3ss4x-analitza-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/analitza-14.12.1.tar.xz"; + sha256 = "0jgmjda5n5935v37jgaichk5hif67mzlyvxqmr19wwmbiqfbazx8"; + name = "analitza-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kubrick-14.12.1.tar.xz"; - sha256 = "0c2ixhd3763pzy92z1ck638wggmq3h4jvnax5ralfhhvn9r2f5bj"; - name = "kubrick-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kubrick-14.12.1.tar.xz" ".tar"; store = "/nix/store/hz00x8miy3gw4gm2ylw0v90d8xnxxqml-kubrick-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kubrick-14.12.1.tar.xz"; + sha256 = "0c2ixhd3763pzy92z1ck638wggmq3h4jvnax5ralfhhvn9r2f5bj"; + name = "kubrick-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/ksirk-14.12.1.tar.xz"; - sha256 = "1sdd117xhn9jclqiczh1cr8apy0akwncmbj82gwm7i1qx31i55fx"; - name = "ksirk-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "ksirk-14.12.1.tar.xz" ".tar"; store = "/nix/store/fv5vdi5m80l7hzkhkidyk5rd1srghl8x-ksirk-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/ksirk-14.12.1.tar.xz"; + sha256 = "1sdd117xhn9jclqiczh1cr8apy0akwncmbj82gwm7i1qx31i55fx"; + name = "ksirk-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/katomic-14.12.1.tar.xz"; - sha256 = "1mjzm4v80cva7kfakjpjkd4sw4fdcyin5f2srck7fl0pnqdpnhqz"; - name = "katomic-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "katomic-14.12.1.tar.xz" ".tar"; store = "/nix/store/9wa79ygill8gb5n281cybrmj4zv627h9-katomic-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/katomic-14.12.1.tar.xz"; + sha256 = "1mjzm4v80cva7kfakjpjkd4sw4fdcyin5f2srck7fl0pnqdpnhqz"; + name = "katomic-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/jovie-14.12.1.tar.xz"; - sha256 = "1xkmybfgn6mbrp6lx8ri0dzmz1nsvg9cxlxan4n5bzwd3zjpycjd"; - name = "jovie-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "jovie-14.12.1.tar.xz" ".tar"; store = "/nix/store/w4b045lmp2viqrvifkm11n282l5khwbd-jovie-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/jovie-14.12.1.tar.xz"; + sha256 = "1xkmybfgn6mbrp6lx8ri0dzmz1nsvg9cxlxan4n5bzwd3zjpycjd"; + name = "jovie-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kdeartwork-14.12.1.tar.xz"; - sha256 = "0jrdyy787wnqx31nrgmf7amhy5ix9w7anfnqrdn4w8yydpvghhqw"; - name = "kdeartwork-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kdeartwork-14.12.1.tar.xz" ".tar"; store = "/nix/store/ky4vpsb0mm22raiq0r6jfxjsdr5c0vmv-kdeartwork-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kdeartwork-14.12.1.tar.xz"; + sha256 = "0jrdyy787wnqx31nrgmf7amhy5ix9w7anfnqrdn4w8yydpvghhqw"; + name = "kdeartwork-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kapman-14.12.1.tar.xz"; - sha256 = "0bkpcjdcax6b3dp236ybaakpxz5b1vkrmmxpczvg6hf2cqwmlsv5"; - name = "kapman-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kapman-14.12.1.tar.xz" ".tar"; store = "/nix/store/l5xwmjgcw6rbmmhy2m5z55hxcf9d12hv-kapman-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kapman-14.12.1.tar.xz"; + sha256 = "0bkpcjdcax6b3dp236ybaakpxz5b1vkrmmxpczvg6hf2cqwmlsv5"; + name = "kapman-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/libkomparediff2-14.12.1.tar.xz"; - sha256 = "0fjqsa83sqd7gcpm818yirnm077g6q616rh9676dzwv0cmc334zx"; - name = "libkomparediff2-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "libkomparediff2-14.12.1.tar.xz" ".tar"; store = "/nix/store/aixz1c1q6rnpqxm805xdirlqg47kw1kr-libkomparediff2-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/libkomparediff2-14.12.1.tar.xz"; + sha256 = "0fjqsa83sqd7gcpm818yirnm077g6q616rh9676dzwv0cmc334zx"; + name = "libkomparediff2-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kde-wallpapers-14.12.1.tar.xz"; - sha256 = "1q28rb8a4rw6v5wvwri3aslc8xwbn0324b07lnkvn58alpmdga8v"; - name = "kde-wallpapers-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kde-wallpapers-14.12.1.tar.xz" ".tar"; store = "/nix/store/kx7kv61rc3ddz7gmm5k5cwp9zh3k70nk-kde-wallpapers-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-wallpapers-14.12.1.tar.xz"; + sha256 = "1q28rb8a4rw6v5wvwri3aslc8xwbn0324b07lnkvn58alpmdga8v"; + name = "kde-wallpapers-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/ark-14.12.1.tar.xz"; - sha256 = "1fimg9f4l373l31kr59fvvsavssvn3ljdrxrgnl6a66v1gwgjsdp"; - name = "ark-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "ark-14.12.1.tar.xz" ".tar"; store = "/nix/store/c21hgh72czi1nqr3lci8lynvsd3qkvzh-ark-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/ark-14.12.1.tar.xz"; + sha256 = "1fimg9f4l373l31kr59fvvsavssvn3ljdrxrgnl6a66v1gwgjsdp"; + name = "ark-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kdesdk-thumbnailers-14.12.1.tar.xz"; - sha256 = "1p3abcnidk07jgr9qn03zfnhqci27683gz25wy271v6gl7b0wp6c"; - name = "kdesdk-thumbnailers-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kdesdk-thumbnailers-14.12.1.tar.xz" ".tar"; store = "/nix/store/b867ygwgvr9g8j54s3gya7c2wpr9gwf8-kdesdk-thumbnailers-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kdesdk-thumbnailers-14.12.1.tar.xz"; + sha256 = "1p3abcnidk07jgr9qn03zfnhqci27683gz25wy271v6gl7b0wp6c"; + name = "kdesdk-thumbnailers-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-wa-14.12.1.tar.xz"; - sha256 = "0aq5n0n0saqkllkwpf9a5scjpsv4bxzx89z2a048kh76i8h9zr5p"; - name = "kde-l10n-wa-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kde-l10n-wa-14.12.1.tar.xz" ".tar"; store = "/nix/store/hp6x10injwcygbd5zqvkkg2k85n62drw-kde-l10n-wa-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-wa-14.12.1.tar.xz"; + sha256 = "0aq5n0n0saqkllkwpf9a5scjpsv4bxzx89z2a048kh76i8h9zr5p"; + name = "kde-l10n-wa-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-it-14.12.1.tar.xz"; - sha256 = "13z9gmaziyvw112phzxc7893lz6wh8q92gb3fj3hmdmzj0vfqv4r"; - name = "kde-l10n-it-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kde-l10n-it-14.12.1.tar.xz" ".tar"; store = "/nix/store/j8x84jy2x4fw72a2mj7zgzkbd2v430np-kde-l10n-it-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-it-14.12.1.tar.xz"; + sha256 = "13z9gmaziyvw112phzxc7893lz6wh8q92gb3fj3hmdmzj0vfqv4r"; + name = "kde-l10n-it-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-km-14.12.1.tar.xz"; - sha256 = "0fdns3fifr4ypz5mi798xc18miwlb7lqz22f18gnrza22vnzwi09"; - name = "kde-l10n-km-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kde-l10n-km-14.12.1.tar.xz" ".tar"; store = "/nix/store/yccjbanz6ijsf5rdd0n53cwygbv5jm4m-kde-l10n-km-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-km-14.12.1.tar.xz"; + sha256 = "0fdns3fifr4ypz5mi798xc18miwlb7lqz22f18gnrza22vnzwi09"; + name = "kde-l10n-km-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-pt-14.12.1.tar.xz"; - sha256 = "13pzz23zf9nnl3a65nrpmwlpnkvr490vfs7yfvvr5w0nrqfwzhp6"; - name = "kde-l10n-pt-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kde-l10n-pt-14.12.1.tar.xz" ".tar"; store = "/nix/store/mzfjypmyhmp3s7mnxk0mwf57s3l440c2-kde-l10n-pt-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-pt-14.12.1.tar.xz"; + sha256 = "13pzz23zf9nnl3a65nrpmwlpnkvr490vfs7yfvvr5w0nrqfwzhp6"; + name = "kde-l10n-pt-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ru-14.12.1.tar.xz"; - sha256 = "1a5ygssdwkm9iqakl1w4pza70g1gwh7mzi6jzhbd4jsn740ykw0r"; - name = "kde-l10n-ru-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kde-l10n-ru-14.12.1.tar.xz" ".tar"; store = "/nix/store/pjdp04f6m3ghqr23lyzxw7w0fgg5i6ll-kde-l10n-ru-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ru-14.12.1.tar.xz"; + sha256 = "1a5ygssdwkm9iqakl1w4pza70g1gwh7mzi6jzhbd4jsn740ykw0r"; + name = "kde-l10n-ru-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-de-14.12.1.tar.xz"; - sha256 = "1iavp7xr2qv8i97sl1kpl9kasi21br91l3mdah382ayhaz5khnlb"; - name = "kde-l10n-de-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kde-l10n-de-14.12.1.tar.xz" ".tar"; store = "/nix/store/4j1r5xz2fslwv0di0dn9x8n49hrxizg4-kde-l10n-de-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-de-14.12.1.tar.xz"; + sha256 = "1iavp7xr2qv8i97sl1kpl9kasi21br91l3mdah382ayhaz5khnlb"; + name = "kde-l10n-de-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-uk-14.12.1.tar.xz"; - sha256 = "1228lpwggkwz9rwnmrmrw4f72hcbng40g1q1bfhjzw078s7j6nxr"; - name = "kde-l10n-uk-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kde-l10n-uk-14.12.1.tar.xz" ".tar"; store = "/nix/store/dz1zi3jrw92cgci5zc8nia3xzq1zykdf-kde-l10n-uk-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-uk-14.12.1.tar.xz"; + sha256 = "1228lpwggkwz9rwnmrmrw4f72hcbng40g1q1bfhjzw078s7j6nxr"; + name = "kde-l10n-uk-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ja-14.12.1.tar.xz"; - sha256 = "191whr3i7qkqj2wjzjqgagb1vs391x9sp688w56ynjjmh58vrvq1"; - name = "kde-l10n-ja-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kde-l10n-ja-14.12.1.tar.xz" ".tar"; store = "/nix/store/ylf7xmqdh9yrz37yaq4f8nddap1gfanc-kde-l10n-ja-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ja-14.12.1.tar.xz"; + sha256 = "191whr3i7qkqj2wjzjqgagb1vs391x9sp688w56ynjjmh58vrvq1"; + name = "kde-l10n-ja-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-kk-14.12.1.tar.xz"; - sha256 = "01ivq7g550i9ik18xnibn7xl5mmm237wrsksjm0xni18s89wwz8b"; - name = "kde-l10n-kk-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kde-l10n-kk-14.12.1.tar.xz" ".tar"; store = "/nix/store/b6n06i5p82k6fq4p4rpl7bf0cyklazxb-kde-l10n-kk-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-kk-14.12.1.tar.xz"; + sha256 = "01ivq7g550i9ik18xnibn7xl5mmm237wrsksjm0xni18s89wwz8b"; + name = "kde-l10n-kk-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-pl-14.12.1.tar.xz"; - sha256 = "0ni41lp6l4l3pa1xf6kkim2k5qcvapm2g65nh5hryiwx9dpgkimv"; - name = "kde-l10n-pl-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kde-l10n-pl-14.12.1.tar.xz" ".tar"; store = "/nix/store/ysarksjh5lcm2yhbphrsqhyzmlp6qclr-kde-l10n-pl-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-pl-14.12.1.tar.xz"; + sha256 = "0ni41lp6l4l3pa1xf6kkim2k5qcvapm2g65nh5hryiwx9dpgkimv"; + name = "kde-l10n-pl-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-sv-14.12.1.tar.xz"; - sha256 = "1r84629cv7c0lkfxii0q133cl710rgiqp5iylb3w32h7c1ji4x19"; - name = "kde-l10n-sv-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kde-l10n-sv-14.12.1.tar.xz" ".tar"; store = "/nix/store/zpq7ayj7ihr1xw4ihcnckqvnagl28lk0-kde-l10n-sv-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-sv-14.12.1.tar.xz"; + sha256 = "1r84629cv7c0lkfxii0q133cl710rgiqp5iylb3w32h7c1ji4x19"; + name = "kde-l10n-sv-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ca-14.12.1.tar.xz"; - sha256 = "1xprgp7l1h7wkfjh6v3yya9xw3r60vhsyk3ly38vcwxy5b6fjigd"; - name = "kde-l10n-ca-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kde-l10n-ca-14.12.1.tar.xz" ".tar"; store = "/nix/store/g5pcas9cz1yq6qz9883l2djfpb77li8a-kde-l10n-ca-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ca-14.12.1.tar.xz"; + sha256 = "1xprgp7l1h7wkfjh6v3yya9xw3r60vhsyk3ly38vcwxy5b6fjigd"; + name = "kde-l10n-ca-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-da-14.12.1.tar.xz"; - sha256 = "0b38wgm8f23l9ya9h67m6zm785fmqi7737xfphjmrjh2i13gxpbl"; - name = "kde-l10n-da-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kde-l10n-da-14.12.1.tar.xz" ".tar"; store = "/nix/store/v6hb004qp3i0p4vp1yslnmz4clb66p8d-kde-l10n-da-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-da-14.12.1.tar.xz"; + sha256 = "0b38wgm8f23l9ya9h67m6zm785fmqi7737xfphjmrjh2i13gxpbl"; + name = "kde-l10n-da-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-he-14.12.1.tar.xz"; - sha256 = "0ynvsrczdraf55gaiwbv9nzwy548zkkbdh475frqfmalzh9b7jww"; - name = "kde-l10n-he-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kde-l10n-he-14.12.1.tar.xz" ".tar"; store = "/nix/store/33f2k043b8gi64mr4wwrs6pwp5b9bq7h-kde-l10n-he-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-he-14.12.1.tar.xz"; + sha256 = "0ynvsrczdraf55gaiwbv9nzwy548zkkbdh475frqfmalzh9b7jww"; + name = "kde-l10n-he-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-lv-14.12.1.tar.xz"; - sha256 = "0x3rlallirrzgn8gfyssyvaj3zaji672n6hfacp2djpfzbfwqq6l"; - name = "kde-l10n-lv-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kde-l10n-lv-14.12.1.tar.xz" ".tar"; store = "/nix/store/7hlk5vyd3pl9rdp22ybsj868w6s7sfz0-kde-l10n-lv-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-lv-14.12.1.tar.xz"; + sha256 = "0x3rlallirrzgn8gfyssyvaj3zaji672n6hfacp2djpfzbfwqq6l"; + name = "kde-l10n-lv-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-hu-14.12.1.tar.xz"; - sha256 = "061kyzz24f6bink3sm4p7q959977ril3m86lm8fa1ddnccw7ya46"; - name = "kde-l10n-hu-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kde-l10n-hu-14.12.1.tar.xz" ".tar"; store = "/nix/store/b2v25j4hlsl7lqb77wk7sj1j5z9q7ldm-kde-l10n-hu-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-hu-14.12.1.tar.xz"; + sha256 = "061kyzz24f6bink3sm4p7q959977ril3m86lm8fa1ddnccw7ya46"; + name = "kde-l10n-hu-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-sr-14.12.1.tar.xz"; - sha256 = "16kcpilb4mp4cfgklc4dr6y389hlmzvwx8wp0y3i2w1r18nwd8m8"; - name = "kde-l10n-sr-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kde-l10n-sr-14.12.1.tar.xz" ".tar"; store = "/nix/store/8a3pmbwm8k7g951yi5d3mv57y9vxn84z-kde-l10n-sr-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-sr-14.12.1.tar.xz"; + sha256 = "16kcpilb4mp4cfgklc4dr6y389hlmzvwx8wp0y3i2w1r18nwd8m8"; + name = "kde-l10n-sr-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-is-14.12.1.tar.xz"; - sha256 = "14r5wrkr39cipx40hqqcx12cvv0vql829689yiy97ypcg4bqndma"; - name = "kde-l10n-is-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kde-l10n-is-14.12.1.tar.xz" ".tar"; store = "/nix/store/l4fy9j1aix7fyisan5f2pa4273misph2-kde-l10n-is-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-is-14.12.1.tar.xz"; + sha256 = "14r5wrkr39cipx40hqqcx12cvv0vql829689yiy97ypcg4bqndma"; + name = "kde-l10n-is-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-mr-14.12.1.tar.xz"; - sha256 = "1nvaxd38c4f9kkhkrv4bb1aczi1iv1bp16kmm47s1y6kzb93zq9h"; - name = "kde-l10n-mr-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kde-l10n-mr-14.12.1.tar.xz" ".tar"; store = "/nix/store/vk6fz8gixl7wv6w20h4inn984839lkkk-kde-l10n-mr-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-mr-14.12.1.tar.xz"; + sha256 = "1nvaxd38c4f9kkhkrv4bb1aczi1iv1bp16kmm47s1y6kzb93zq9h"; + name = "kde-l10n-mr-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-gl-14.12.1.tar.xz"; - sha256 = "1xjh19c7rjd5k3v3c7g0ljz1kz5vv3zhji4rm84j30z12cks3nhh"; - name = "kde-l10n-gl-14.12.1.tar.xz"; - store = "/nix/store/0f4agkrcrb1cn6sdgdpj1bwln6f2ra5i-kde-l10n-gl-14.12.1.tar.xz"; - } - { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-cs-14.12.1.tar.xz"; - sha256 = "1qg9y5173374fpf6yk4v8mlsqdjzp8inirp08qx0lh33jd6rpddb"; - name = "kde-l10n-cs-14.12.1.tar.xz"; - store = "/nix/store/3nk8pxfypvnwbcszm33fn3j7f0kmgdji-kde-l10n-cs-14.12.1.tar.xz"; - } - { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-en_GB-14.12.1.tar.xz"; - sha256 = "04b7amh2247ksr414m3x7bc4p22xm6kxncsax9ggapx613flb2zc"; - name = "kde-l10n-en_GB-14.12.1.tar.xz"; - store = "/nix/store/i5vsmw062i49ki35qqyi0ix6x5fl4jvg-kde-l10n-en_GB-14.12.1.tar.xz"; - } - { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-sk-14.12.1.tar.xz"; - sha256 = "0ic2y081699mv16hpkb3ivdvd4ph51wz3md5bz65pfz404gn7krf"; - name = "kde-l10n-sk-14.12.1.tar.xz"; - store = "/nix/store/p2jc4kci6k5kn1ihy9yv5inp4p4g01n9-kde-l10n-sk-14.12.1.tar.xz"; - } - { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ga-14.12.1.tar.xz"; - sha256 = "0794p0dqa1nnkwwc2ipslzhaakcx3r4b6s03hf7m14r58wmvws28"; - name = "kde-l10n-ga-14.12.1.tar.xz"; - store = "/nix/store/4kbdmqqmv1slh4z56rifg8sw0a9980m4-kde-l10n-ga-14.12.1.tar.xz"; - } - { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-sl-14.12.1.tar.xz"; - sha256 = "0nv2yrk99dkvb49ww6l6za0czy89p1nsilm56f4mdgbvrgzwk9zp"; - name = "kde-l10n-sl-14.12.1.tar.xz"; - store = "/nix/store/hdyxfm2wnigh8wb3ay8y8v7psjrbijy7-kde-l10n-sl-14.12.1.tar.xz"; - } - { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-nb-14.12.1.tar.xz"; - sha256 = "0zj66ydg5pwlx3hwwdxz6i8m330wz0w2l2p4fvf4kjvy49cafrmd"; - name = "kde-l10n-nb-14.12.1.tar.xz"; - store = "/nix/store/ln3d7jpln9kl947fhgknbhg0rh6lnxds-kde-l10n-nb-14.12.1.tar.xz"; - } - { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ko-14.12.1.tar.xz"; - sha256 = "08q0d0q2cm2bmdwwmyavzb07wlbnf5lpl071gjm146kzk0y1kmpg"; - name = "kde-l10n-ko-14.12.1.tar.xz"; - store = "/nix/store/vw8kpmpiyrrqch5wb4164yv0jhkdkpkk-kde-l10n-ko-14.12.1.tar.xz"; - } - { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ro-14.12.1.tar.xz"; - sha256 = "0xprq9jw94i38aaq1drkv1qpgf3rf75745zlagzb430jr1a285lb"; - name = "kde-l10n-ro-14.12.1.tar.xz"; - store = "/nix/store/87kmgghdnkmzvdbk611qmv2nav8m2f0p-kde-l10n-ro-14.12.1.tar.xz"; - } - { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ug-14.12.1.tar.xz"; - sha256 = "1am6yr3qq4l2wgpphxhqfj8ydndvjxmc3cl4gz6zlkddaw4pv5kr"; - name = "kde-l10n-ug-14.12.1.tar.xz"; - store = "/nix/store/h8wfla9jsbhfjvjfnca6yjwpcc90nb5m-kde-l10n-ug-14.12.1.tar.xz"; - } - { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-hr-14.12.1.tar.xz"; - sha256 = "0hjhzf77mckh9xqqxn54w47lsn3fwl2p4rfk22ijlliglrylpajv"; - name = "kde-l10n-hr-14.12.1.tar.xz"; - store = "/nix/store/mja592hds8ajqsx96wb1zxph1n0pxqb0-kde-l10n-hr-14.12.1.tar.xz"; - } - { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-pa-14.12.1.tar.xz"; - sha256 = "0sr6pygs0lk1ar2zn6966ngaf9vjfy207i1bgg6gr3559v5wkx8x"; - name = "kde-l10n-pa-14.12.1.tar.xz"; - store = "/nix/store/9vay8airc00fg0d91lpp84l21akqxn27-kde-l10n-pa-14.12.1.tar.xz"; - } - { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-id-14.12.1.tar.xz"; - sha256 = "018yvdp7l9qjaj7niyjas87dhna1xr0mikpdycw5dbwchpizlr53"; - name = "kde-l10n-id-14.12.1.tar.xz"; - store = "/nix/store/sx4w67x5xq87ragvsysg4jwcpvrk674p-kde-l10n-id-14.12.1.tar.xz"; - } - { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-bs-14.12.1.tar.xz"; - sha256 = "0ybh9wyhym05rlc3s0kl9lh07y96nyl3p4lifj13lcqi975mgnp9"; - name = "kde-l10n-bs-14.12.1.tar.xz"; - store = "/nix/store/l9cx18xxg7ly9nrsfi1lj9vxzg19h9sq-kde-l10n-bs-14.12.1.tar.xz"; - } - { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-pt_BR-14.12.1.tar.xz"; - sha256 = "1wbgns7pq0jxjffgvr6hgfg3san1k2c7wppsvn2cpjiph0v4azz9"; - name = "kde-l10n-pt_BR-14.12.1.tar.xz"; - store = "/nix/store/59bsq0cq07hc9apbfdmaa66jg5n8wlwg-kde-l10n-pt_BR-14.12.1.tar.xz"; - } - { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-bg-14.12.1.tar.xz"; - sha256 = "0m404hxz8dskbdsni021703vdn4lvwpf88hwrdrfnhcv06jazjiq"; - name = "kde-l10n-bg-14.12.1.tar.xz"; - store = "/nix/store/9xiaf2c0lbxy65vrx6hdh884ky6h2s79-kde-l10n-bg-14.12.1.tar.xz"; - } - { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-nds-14.12.1.tar.xz"; - sha256 = "09r79l4ngcsnya6kqj5hj69xq00bf4ndxgkkplwiq137zqamqcfl"; - name = "kde-l10n-nds-14.12.1.tar.xz"; - store = "/nix/store/m8ahg0qxpv2hskl9dl7dgch10adxfia5-kde-l10n-nds-14.12.1.tar.xz"; - } - { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-zh_TW-14.12.1.tar.xz"; - sha256 = "1azwmzg47pk4b23hpnpic3c8phnfz4iy3n6lv50sz98b9whkmf0s"; - name = "kde-l10n-zh_TW-14.12.1.tar.xz"; - store = "/nix/store/mq5v891rzj692h61aak71g71iy963ayw-kde-l10n-zh_TW-14.12.1.tar.xz"; - } - { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-nn-14.12.1.tar.xz"; - sha256 = "1xp44glwk6nnnavw0lrl7ssl5miqfd7b093chfz35g2g92nyaa3g"; - name = "kde-l10n-nn-14.12.1.tar.xz"; - store = "/nix/store/gprdva58d383n4ka677pdbpaz8l05w8i-kde-l10n-nn-14.12.1.tar.xz"; - } - { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ia-14.12.1.tar.xz"; - sha256 = "1kjjg4z4y0fh4kyzy9vzxlw47xkiirh207d7x0b94nksxzbqwg67"; - name = "kde-l10n-ia-14.12.1.tar.xz"; - store = "/nix/store/jhv6zy04igavcq0dxsg9kk3vfh2063m9-kde-l10n-ia-14.12.1.tar.xz"; - } - { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-tr-14.12.1.tar.xz"; - sha256 = "1kdxps75gv2vlf98f958llkk161z2y908bg1fdq4rgdh1n3bylkh"; - name = "kde-l10n-tr-14.12.1.tar.xz"; - store = "/nix/store/hy0v61dnnmpbj84a4imvgxqx3y0fd5qg-kde-l10n-tr-14.12.1.tar.xz"; - } - { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ar-14.12.1.tar.xz"; - sha256 = "121dblyh53fb3qirg7s9givqcn0xswdj2hrnqc8s2x2qas74v6a9"; - name = "kde-l10n-ar-14.12.1.tar.xz"; - store = "/nix/store/jmjbgfmqvcqd1sxdj0a7c73a9yqyzvpz-kde-l10n-ar-14.12.1.tar.xz"; - } - { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-zh_CN-14.12.1.tar.xz"; - sha256 = "0cyi0g55xln8smnlnhl0vfpi0jrihnfp3vrv6j2gz30zzfgkw9dp"; - name = "kde-l10n-zh_CN-14.12.1.tar.xz"; - store = "/nix/store/b9dqgb7nsfgyzhr4vw7fnl287spyjigg-kde-l10n-zh_CN-14.12.1.tar.xz"; - } - { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-es-14.12.1.tar.xz"; - sha256 = "11i4xmsigmi9mqbc5x9l96vsrfh6709fbbfpqa6b28a5jif9anmr"; - name = "kde-l10n-es-14.12.1.tar.xz"; - store = "/nix/store/0ycvh7sgyhjqffzq5ff5mjnv0y4f8pxy-kde-l10n-es-14.12.1.tar.xz"; - } - { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-et-14.12.1.tar.xz"; - sha256 = "0c8vhbi1bi29krh1sway8z0536cn507i1lp8jffb4mk953mm5y9n"; - name = "kde-l10n-et-14.12.1.tar.xz"; - store = "/nix/store/9rbki0767k1hirpx7530lqcw74bfy2b1-kde-l10n-et-14.12.1.tar.xz"; - } - { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-fr-14.12.1.tar.xz"; - sha256 = "1s2glywjbrr2q6ssmalblschrgny4rk3q3aws2ffrrlkanx0qyva"; - name = "kde-l10n-fr-14.12.1.tar.xz"; - store = "/nix/store/pq8r37pcg05p9rc5prcy9r2f5mby7m0z-kde-l10n-fr-14.12.1.tar.xz"; - } - { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-fa-14.12.1.tar.xz"; - sha256 = "0pj3klcdlash8wgvz75nw009jz63rblv038yhrh1qsidjw4vsl85"; - name = "kde-l10n-fa-14.12.1.tar.xz"; - store = "/nix/store/k0amn3lcd7xcssqh8fs46swa9jmksv9x-kde-l10n-fa-14.12.1.tar.xz"; - } - { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-lt-14.12.1.tar.xz"; - sha256 = "0k4m1ixlnmmgbznhgvbmfss0c1fynd492sylcvbsrnqcawq3fqdz"; - name = "kde-l10n-lt-14.12.1.tar.xz"; - store = "/nix/store/cqbsi6sr0mcl3pnzlk0w52disg2xgm1i-kde-l10n-lt-14.12.1.tar.xz"; - } - { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-nl-14.12.1.tar.xz"; - sha256 = "0m0hwib0v5j2bmgkgwjzhbhqnyk8gcm46969rr2qf51snrvynlax"; - name = "kde-l10n-nl-14.12.1.tar.xz"; - store = "/nix/store/8pw7v2ccr5vgl6ic7dnlm5xcqgkbvxyr-kde-l10n-nl-14.12.1.tar.xz"; - } - { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-eu-14.12.1.tar.xz"; - sha256 = "0wcax8gnnk6rwpfl6ph8z5i013rmh08pr159nxpakdsvbcn5ma5v"; - name = "kde-l10n-eu-14.12.1.tar.xz"; - store = "/nix/store/vplfymrx36jk65b0xjmzh2g4l9ky7dfm-kde-l10n-eu-14.12.1.tar.xz"; - } - { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ca@valencia-14.12.1.tar.xz"; - sha256 = "10r6zkisnm4rcyzdxs0jbilbqg78qr9rzj5901q16kz01nm2fpfq"; - name = "kde-l10n-ca_valencia-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-14.12.1.tar.xz" ".tar"; store = "/nix/store/xdh9f96r2l1fnj1z7dl4321aj362kjph-kde-l10n-ca_valencia-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ca_valencia-14.12.1.tar.xz"; + sha256 = "10r6zkisnm4rcyzdxs0jbilbqg78qr9rzj5901q16kz01nm2fpfq"; + name = "kde-l10n-ca_valencia-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-el-14.12.1.tar.xz"; - sha256 = "022kr5cvlz8hxj3s74my680ghp23lj8amykzgr5z9i996q2hs6ps"; - name = "kde-l10n-el-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kde-l10n-gl-14.12.1.tar.xz" ".tar"; + store = "/nix/store/0f4agkrcrb1cn6sdgdpj1bwln6f2ra5i-kde-l10n-gl-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-gl-14.12.1.tar.xz"; + sha256 = "1xjh19c7rjd5k3v3c7g0ljz1kz5vv3zhji4rm84j30z12cks3nhh"; + name = "kde-l10n-gl-14.12.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-cs-14.12.1.tar.xz" ".tar"; + store = "/nix/store/3nk8pxfypvnwbcszm33fn3j7f0kmgdji-kde-l10n-cs-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-cs-14.12.1.tar.xz"; + sha256 = "1qg9y5173374fpf6yk4v8mlsqdjzp8inirp08qx0lh33jd6rpddb"; + name = "kde-l10n-cs-14.12.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-en_GB-14.12.1.tar.xz" ".tar"; + store = "/nix/store/i5vsmw062i49ki35qqyi0ix6x5fl4jvg-kde-l10n-en_GB-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-en_GB-14.12.1.tar.xz"; + sha256 = "04b7amh2247ksr414m3x7bc4p22xm6kxncsax9ggapx613flb2zc"; + name = "kde-l10n-en_GB-14.12.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-sk-14.12.1.tar.xz" ".tar"; + store = "/nix/store/p2jc4kci6k5kn1ihy9yv5inp4p4g01n9-kde-l10n-sk-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-sk-14.12.1.tar.xz"; + sha256 = "0ic2y081699mv16hpkb3ivdvd4ph51wz3md5bz65pfz404gn7krf"; + name = "kde-l10n-sk-14.12.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ga-14.12.1.tar.xz" ".tar"; + store = "/nix/store/4kbdmqqmv1slh4z56rifg8sw0a9980m4-kde-l10n-ga-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ga-14.12.1.tar.xz"; + sha256 = "0794p0dqa1nnkwwc2ipslzhaakcx3r4b6s03hf7m14r58wmvws28"; + name = "kde-l10n-ga-14.12.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-sl-14.12.1.tar.xz" ".tar"; + store = "/nix/store/hdyxfm2wnigh8wb3ay8y8v7psjrbijy7-kde-l10n-sl-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-sl-14.12.1.tar.xz"; + sha256 = "0nv2yrk99dkvb49ww6l6za0czy89p1nsilm56f4mdgbvrgzwk9zp"; + name = "kde-l10n-sl-14.12.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-nb-14.12.1.tar.xz" ".tar"; + store = "/nix/store/ln3d7jpln9kl947fhgknbhg0rh6lnxds-kde-l10n-nb-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-nb-14.12.1.tar.xz"; + sha256 = "0zj66ydg5pwlx3hwwdxz6i8m330wz0w2l2p4fvf4kjvy49cafrmd"; + name = "kde-l10n-nb-14.12.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ko-14.12.1.tar.xz" ".tar"; + store = "/nix/store/vw8kpmpiyrrqch5wb4164yv0jhkdkpkk-kde-l10n-ko-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ko-14.12.1.tar.xz"; + sha256 = "08q0d0q2cm2bmdwwmyavzb07wlbnf5lpl071gjm146kzk0y1kmpg"; + name = "kde-l10n-ko-14.12.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ro-14.12.1.tar.xz" ".tar"; + store = "/nix/store/87kmgghdnkmzvdbk611qmv2nav8m2f0p-kde-l10n-ro-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ro-14.12.1.tar.xz"; + sha256 = "0xprq9jw94i38aaq1drkv1qpgf3rf75745zlagzb430jr1a285lb"; + name = "kde-l10n-ro-14.12.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ug-14.12.1.tar.xz" ".tar"; + store = "/nix/store/h8wfla9jsbhfjvjfnca6yjwpcc90nb5m-kde-l10n-ug-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ug-14.12.1.tar.xz"; + sha256 = "1am6yr3qq4l2wgpphxhqfj8ydndvjxmc3cl4gz6zlkddaw4pv5kr"; + name = "kde-l10n-ug-14.12.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-hr-14.12.1.tar.xz" ".tar"; + store = "/nix/store/mja592hds8ajqsx96wb1zxph1n0pxqb0-kde-l10n-hr-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-hr-14.12.1.tar.xz"; + sha256 = "0hjhzf77mckh9xqqxn54w47lsn3fwl2p4rfk22ijlliglrylpajv"; + name = "kde-l10n-hr-14.12.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-pa-14.12.1.tar.xz" ".tar"; + store = "/nix/store/9vay8airc00fg0d91lpp84l21akqxn27-kde-l10n-pa-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-pa-14.12.1.tar.xz"; + sha256 = "0sr6pygs0lk1ar2zn6966ngaf9vjfy207i1bgg6gr3559v5wkx8x"; + name = "kde-l10n-pa-14.12.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-id-14.12.1.tar.xz" ".tar"; + store = "/nix/store/sx4w67x5xq87ragvsysg4jwcpvrk674p-kde-l10n-id-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-id-14.12.1.tar.xz"; + sha256 = "018yvdp7l9qjaj7niyjas87dhna1xr0mikpdycw5dbwchpizlr53"; + name = "kde-l10n-id-14.12.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-bs-14.12.1.tar.xz" ".tar"; + store = "/nix/store/l9cx18xxg7ly9nrsfi1lj9vxzg19h9sq-kde-l10n-bs-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-bs-14.12.1.tar.xz"; + sha256 = "0ybh9wyhym05rlc3s0kl9lh07y96nyl3p4lifj13lcqi975mgnp9"; + name = "kde-l10n-bs-14.12.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-pt_BR-14.12.1.tar.xz" ".tar"; + store = "/nix/store/59bsq0cq07hc9apbfdmaa66jg5n8wlwg-kde-l10n-pt_BR-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-pt_BR-14.12.1.tar.xz"; + sha256 = "1wbgns7pq0jxjffgvr6hgfg3san1k2c7wppsvn2cpjiph0v4azz9"; + name = "kde-l10n-pt_BR-14.12.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-bg-14.12.1.tar.xz" ".tar"; + store = "/nix/store/9xiaf2c0lbxy65vrx6hdh884ky6h2s79-kde-l10n-bg-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-bg-14.12.1.tar.xz"; + sha256 = "0m404hxz8dskbdsni021703vdn4lvwpf88hwrdrfnhcv06jazjiq"; + name = "kde-l10n-bg-14.12.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-nds-14.12.1.tar.xz" ".tar"; + store = "/nix/store/m8ahg0qxpv2hskl9dl7dgch10adxfia5-kde-l10n-nds-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-nds-14.12.1.tar.xz"; + sha256 = "09r79l4ngcsnya6kqj5hj69xq00bf4ndxgkkplwiq137zqamqcfl"; + name = "kde-l10n-nds-14.12.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-zh_TW-14.12.1.tar.xz" ".tar"; + store = "/nix/store/mq5v891rzj692h61aak71g71iy963ayw-kde-l10n-zh_TW-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-zh_TW-14.12.1.tar.xz"; + sha256 = "1azwmzg47pk4b23hpnpic3c8phnfz4iy3n6lv50sz98b9whkmf0s"; + name = "kde-l10n-zh_TW-14.12.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-nn-14.12.1.tar.xz" ".tar"; + store = "/nix/store/gprdva58d383n4ka677pdbpaz8l05w8i-kde-l10n-nn-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-nn-14.12.1.tar.xz"; + sha256 = "1xp44glwk6nnnavw0lrl7ssl5miqfd7b093chfz35g2g92nyaa3g"; + name = "kde-l10n-nn-14.12.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ia-14.12.1.tar.xz" ".tar"; + store = "/nix/store/jhv6zy04igavcq0dxsg9kk3vfh2063m9-kde-l10n-ia-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ia-14.12.1.tar.xz"; + sha256 = "1kjjg4z4y0fh4kyzy9vzxlw47xkiirh207d7x0b94nksxzbqwg67"; + name = "kde-l10n-ia-14.12.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-tr-14.12.1.tar.xz" ".tar"; + store = "/nix/store/hy0v61dnnmpbj84a4imvgxqx3y0fd5qg-kde-l10n-tr-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-tr-14.12.1.tar.xz"; + sha256 = "1kdxps75gv2vlf98f958llkk161z2y908bg1fdq4rgdh1n3bylkh"; + name = "kde-l10n-tr-14.12.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ar-14.12.1.tar.xz" ".tar"; + store = "/nix/store/jmjbgfmqvcqd1sxdj0a7c73a9yqyzvpz-kde-l10n-ar-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ar-14.12.1.tar.xz"; + sha256 = "121dblyh53fb3qirg7s9givqcn0xswdj2hrnqc8s2x2qas74v6a9"; + name = "kde-l10n-ar-14.12.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-zh_CN-14.12.1.tar.xz" ".tar"; + store = "/nix/store/b9dqgb7nsfgyzhr4vw7fnl287spyjigg-kde-l10n-zh_CN-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-zh_CN-14.12.1.tar.xz"; + sha256 = "0cyi0g55xln8smnlnhl0vfpi0jrihnfp3vrv6j2gz30zzfgkw9dp"; + name = "kde-l10n-zh_CN-14.12.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-es-14.12.1.tar.xz" ".tar"; + store = "/nix/store/0ycvh7sgyhjqffzq5ff5mjnv0y4f8pxy-kde-l10n-es-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-es-14.12.1.tar.xz"; + sha256 = "11i4xmsigmi9mqbc5x9l96vsrfh6709fbbfpqa6b28a5jif9anmr"; + name = "kde-l10n-es-14.12.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-et-14.12.1.tar.xz" ".tar"; + store = "/nix/store/9rbki0767k1hirpx7530lqcw74bfy2b1-kde-l10n-et-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-et-14.12.1.tar.xz"; + sha256 = "0c8vhbi1bi29krh1sway8z0536cn507i1lp8jffb4mk953mm5y9n"; + name = "kde-l10n-et-14.12.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-fr-14.12.1.tar.xz" ".tar"; + store = "/nix/store/pq8r37pcg05p9rc5prcy9r2f5mby7m0z-kde-l10n-fr-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-fr-14.12.1.tar.xz"; + sha256 = "1s2glywjbrr2q6ssmalblschrgny4rk3q3aws2ffrrlkanx0qyva"; + name = "kde-l10n-fr-14.12.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-fa-14.12.1.tar.xz" ".tar"; + store = "/nix/store/k0amn3lcd7xcssqh8fs46swa9jmksv9x-kde-l10n-fa-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-fa-14.12.1.tar.xz"; + sha256 = "0pj3klcdlash8wgvz75nw009jz63rblv038yhrh1qsidjw4vsl85"; + name = "kde-l10n-fa-14.12.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-lt-14.12.1.tar.xz" ".tar"; + store = "/nix/store/cqbsi6sr0mcl3pnzlk0w52disg2xgm1i-kde-l10n-lt-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-lt-14.12.1.tar.xz"; + sha256 = "0k4m1ixlnmmgbznhgvbmfss0c1fynd492sylcvbsrnqcawq3fqdz"; + name = "kde-l10n-lt-14.12.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-nl-14.12.1.tar.xz" ".tar"; + store = "/nix/store/8pw7v2ccr5vgl6ic7dnlm5xcqgkbvxyr-kde-l10n-nl-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-nl-14.12.1.tar.xz"; + sha256 = "0m0hwib0v5j2bmgkgwjzhbhqnyk8gcm46969rr2qf51snrvynlax"; + name = "kde-l10n-nl-14.12.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-eu-14.12.1.tar.xz" ".tar"; + store = "/nix/store/vplfymrx36jk65b0xjmzh2g4l9ky7dfm-kde-l10n-eu-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-eu-14.12.1.tar.xz"; + sha256 = "0wcax8gnnk6rwpfl6ph8z5i013rmh08pr159nxpakdsvbcn5ma5v"; + name = "kde-l10n-eu-14.12.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-14.12.1.tar.xz" ".tar"; + store = "/nix/store/xdh9f96r2l1fnj1z7dl4321aj362kjph-kde-l10n-ca_valencia-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ca@valencia-14.12.1.tar.xz"; + sha256 = "10r6zkisnm4rcyzdxs0jbilbqg78qr9rzj5901q16kz01nm2fpfq"; + name = "kde-l10n-ca_valencia-14.12.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-el-14.12.1.tar.xz" ".tar"; store = "/nix/store/p9a3lyi934i4pc5p8433firhkcs0ybn3-kde-l10n-el-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-el-14.12.1.tar.xz"; + sha256 = "022kr5cvlz8hxj3s74my680ghp23lj8amykzgr5z9i996q2hs6ps"; + name = "kde-l10n-el-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-fi-14.12.1.tar.xz"; - sha256 = "1sxs5z3dkx7hb8l7ilrhzvl2ip02fsb24iqgh0gadqwdfj46gwjn"; - name = "kde-l10n-fi-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kde-l10n-fi-14.12.1.tar.xz" ".tar"; store = "/nix/store/9f3cb3yksriwphrnkmn1knrq0108ka4p-kde-l10n-fi-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-fi-14.12.1.tar.xz"; + sha256 = "1sxs5z3dkx7hb8l7ilrhzvl2ip02fsb24iqgh0gadqwdfj46gwjn"; + name = "kde-l10n-fi-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-hi-14.12.1.tar.xz"; - sha256 = "0a5ilahwh6wpxg4mb3wqg079qfvcxg7zqblwyx6mdwh4d2ly5y1f"; - name = "kde-l10n-hi-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kde-l10n-hi-14.12.1.tar.xz" ".tar"; store = "/nix/store/pfswxr29nz9qylmb7n83cnap95khz248-kde-l10n-hi-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-hi-14.12.1.tar.xz"; + sha256 = "0a5ilahwh6wpxg4mb3wqg079qfvcxg7zqblwyx6mdwh4d2ly5y1f"; + name = "kde-l10n-hi-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/granatier-14.12.1.tar.xz"; - sha256 = "0lifihkssp0g30kv3iigbpr9ghdwwykmzfiv4qwsxaxadil9qqlm"; - name = "granatier-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "granatier-14.12.1.tar.xz" ".tar"; store = "/nix/store/ychwcs2gn4mgmhza315nmf2z35c0ibb7-granatier-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/granatier-14.12.1.tar.xz"; + sha256 = "0lifihkssp0g30kv3iigbpr9ghdwwykmzfiv4qwsxaxadil9qqlm"; + name = "granatier-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kamera-14.12.1.tar.xz"; - sha256 = "1avmsy622rnyyvsx9zwspqx9g4mb5wzc74mvcjrivi3c3mcz2ng6"; - name = "kamera-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kamera-14.12.1.tar.xz" ".tar"; store = "/nix/store/c1n1s1hbj8q4smgxnd4kka9qidh0rvvw-kamera-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kamera-14.12.1.tar.xz"; + sha256 = "1avmsy622rnyyvsx9zwspqx9g4mb5wzc74mvcjrivi3c3mcz2ng6"; + name = "kamera-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kfloppy-14.12.1.tar.xz"; - sha256 = "1ky8n0zk07d3cnap8f3zw5qck2kw4l0dql0fnbk3s58r982af2fd"; - name = "kfloppy-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kfloppy-14.12.1.tar.xz" ".tar"; store = "/nix/store/bl5csvnm20xxaqz5p7d3ymnkbd0df1p1-kfloppy-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kfloppy-14.12.1.tar.xz"; + sha256 = "1ky8n0zk07d3cnap8f3zw5qck2kw4l0dql0fnbk3s58r982af2fd"; + name = "kfloppy-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kdepimlibs-4.14.4.tar.xz"; - sha256 = "04c53ms91r8bpxgn305zzvagi30jli7217kvgdy4z4il6wnvns8r"; - name = "kdepimlibs-4.14.4.tar.xz"; + name = stdenv.lib.nameFromURL "kdepimlibs-4.14.4.tar.xz" ".tar"; store = "/nix/store/v157pqk6clf9yn21cdbvxxvh0sn892rd-kdepimlibs-4.14.4.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kdepimlibs-4.14.4.tar.xz"; + sha256 = "04c53ms91r8bpxgn305zzvagi30jli7217kvgdy4z4il6wnvns8r"; + name = "kdepimlibs-4.14.4.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/libkipi-14.12.1.tar.xz"; - sha256 = "01bpjh40p5cwli018sgyn6jgis1l83icikabcw6vxkp8vsn3q6yg"; - name = "libkipi-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "libkipi-14.12.1.tar.xz" ".tar"; store = "/nix/store/7amx4gdg85lw28amb0v3nd92hk71lphs-libkipi-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/libkipi-14.12.1.tar.xz"; + sha256 = "01bpjh40p5cwli018sgyn6jgis1l83icikabcw6vxkp8vsn3q6yg"; + name = "libkipi-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/khangman-14.12.1.tar.xz"; - sha256 = "1574cdbq5lyq4hl84xwia5z15az4zzh6zvasxvaa5bz94cjkpyns"; - name = "khangman-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "khangman-14.12.1.tar.xz" ".tar"; store = "/nix/store/jyx0msd02v7iikj7czv3y8ckw79rahpa-khangman-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/khangman-14.12.1.tar.xz"; + sha256 = "1574cdbq5lyq4hl84xwia5z15az4zzh6zvasxvaa5bz94cjkpyns"; + name = "khangman-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/konsole-14.12.1.tar.xz"; - sha256 = "0i7mccspglppz0sx2zqfn0861h6ibxkwrcscivqk7yxpq44nb58j"; - name = "konsole-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "konsole-14.12.1.tar.xz" ".tar"; store = "/nix/store/0wy6dhhq6gn6h58vi324yiqa2f5ni5py-konsole-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/konsole-14.12.1.tar.xz"; + sha256 = "0i7mccspglppz0sx2zqfn0861h6ibxkwrcscivqk7yxpq44nb58j"; + name = "konsole-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/killbots-14.12.1.tar.xz"; - sha256 = "0i006gjysfbf9wn0qgbv47fvx8z4v49ikcaqg9y83pl72shnsa1j"; - name = "killbots-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "killbots-14.12.1.tar.xz" ".tar"; store = "/nix/store/yg7gb0aidvcxh4i1z0ja8nvs23vhdf22-killbots-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/killbots-14.12.1.tar.xz"; + sha256 = "0i006gjysfbf9wn0qgbv47fvx8z4v49ikcaqg9y83pl72shnsa1j"; + name = "killbots-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kturtle-14.12.1.tar.xz"; - sha256 = "0sn74w413xx5y3kh0fqf7f47pklz4v22nnv6x11kpkcyx1xmghh9"; - name = "kturtle-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kturtle-14.12.1.tar.xz" ".tar"; store = "/nix/store/s16w00cgm430r315d2v2a041hivc5a1q-kturtle-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kturtle-14.12.1.tar.xz"; + sha256 = "0sn74w413xx5y3kh0fqf7f47pklz4v22nnv6x11kpkcyx1xmghh9"; + name = "kturtle-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kajongg-14.12.1.tar.xz"; - sha256 = "0690jlsnj3s2l51nmx3an75q0m6xv0rssdmshrmbxgp2cqx5b455"; - name = "kajongg-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kajongg-14.12.1.tar.xz" ".tar"; store = "/nix/store/j2qlvd878dlxkaps9v61dw9k1n6nmh4p-kajongg-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kajongg-14.12.1.tar.xz"; + sha256 = "0690jlsnj3s2l51nmx3an75q0m6xv0rssdmshrmbxgp2cqx5b455"; + name = "kajongg-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/bomber-14.12.1.tar.xz"; - sha256 = "0g4cb3jwva9saddf9m2j4k3y1gybh2bv8dxzfb1xqy5cv20qlrfc"; - name = "bomber-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "bomber-14.12.1.tar.xz" ".tar"; store = "/nix/store/8v0k2n5pkvv6wg3q957zqclasmsw2a7c-bomber-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/bomber-14.12.1.tar.xz"; + sha256 = "0g4cb3jwva9saddf9m2j4k3y1gybh2bv8dxzfb1xqy5cv20qlrfc"; + name = "bomber-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kruler-14.12.1.tar.xz"; - sha256 = "0rag54kg5jzgj32fnf4xmawb0hnk52rhjf7i2y5f3156x3iraxxx"; - name = "kruler-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kruler-14.12.1.tar.xz" ".tar"; store = "/nix/store/c61iqdbq71kb6wvnzfq7436hni8anrrn-kruler-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kruler-14.12.1.tar.xz"; + sha256 = "0rag54kg5jzgj32fnf4xmawb0hnk52rhjf7i2y5f3156x3iraxxx"; + name = "kruler-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kmag-14.12.1.tar.xz"; - sha256 = "1wlz3n3z9qcsqvs7rz3a76bh6rkrq0g9p797axcsfp7wzjfilj5c"; - name = "kmag-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kmag-14.12.1.tar.xz" ".tar"; store = "/nix/store/r2c1gika9sw2m5i1mmj3b47n7g19715k-kmag-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kmag-14.12.1.tar.xz"; + sha256 = "1wlz3n3z9qcsqvs7rz3a76bh6rkrq0g9p797axcsfp7wzjfilj5c"; + name = "kmag-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kwalletmanager-14.12.1.tar.xz"; - sha256 = "16pd2iym8v9xxdmazn2i7vq61c9m805h9a7awy8wha8bfdinazvi"; - name = "kwalletmanager-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kwalletmanager-14.12.1.tar.xz" ".tar"; store = "/nix/store/rqrykz2vvj59w1563dgcjpi8fmkwdnm5-kwalletmanager-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kwalletmanager-14.12.1.tar.xz"; + sha256 = "16pd2iym8v9xxdmazn2i7vq61c9m805h9a7awy8wha8bfdinazvi"; + name = "kwalletmanager-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/krfb-14.12.1.tar.xz"; - sha256 = "15kxapi1mwjpbj995k8rxla0h1wwvhd406pbwkpak3a9szljsv72"; - name = "krfb-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "krfb-14.12.1.tar.xz" ".tar"; store = "/nix/store/x147kkpbjm9mmdbapxs040cvb8fci9ab-krfb-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/krfb-14.12.1.tar.xz"; + sha256 = "15kxapi1mwjpbj995k8rxla0h1wwvhd406pbwkpak3a9szljsv72"; + name = "krfb-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/libkcddb-14.12.1.tar.xz"; - sha256 = "1vb8rmb1j0nh2dh8ch19v1qpdxhc4c0am7k11lld45kamg3az0gd"; - name = "libkcddb-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "libkcddb-14.12.1.tar.xz" ".tar"; store = "/nix/store/ar6s1pn0lfgs1iw6q5akr0l5dcrd1x2a-libkcddb-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/libkcddb-14.12.1.tar.xz"; + sha256 = "1vb8rmb1j0nh2dh8ch19v1qpdxhc4c0am7k11lld45kamg3az0gd"; + name = "libkcddb-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/klettres-14.12.1.tar.xz"; - sha256 = "1bj5s3js6v3641s2kgrl6a5bgr25g9lgbvsfzqrp0pil2nx1g6h1"; - name = "klettres-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "klettres-14.12.1.tar.xz" ".tar"; store = "/nix/store/dbf3r79p85w5v6jihmqndcb631kqpb7m-klettres-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/klettres-14.12.1.tar.xz"; + sha256 = "1bj5s3js6v3641s2kgrl6a5bgr25g9lgbvsfzqrp0pil2nx1g6h1"; + name = "klettres-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/klines-14.12.1.tar.xz"; - sha256 = "1hxjqpc1z47dj1ryp116hdzkla4h1awnlmyzq7yjhki2viw32n3f"; - name = "klines-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "klines-14.12.1.tar.xz" ".tar"; store = "/nix/store/xwj5di67f0swj1w0c2235vrbany8ffgn-klines-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/klines-14.12.1.tar.xz"; + sha256 = "1hxjqpc1z47dj1ryp116hdzkla4h1awnlmyzq7yjhki2viw32n3f"; + name = "klines-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/ksystemlog-14.12.1.tar.xz"; - sha256 = "15a92f873vybp3m9icjshbqs8nl6xm4cl9ca3cghmdlcqrn7f92x"; - name = "ksystemlog-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "ksystemlog-14.12.1.tar.xz" ".tar"; store = "/nix/store/aj1drn165rirvr5wjmqfnzsfknnb32gj-ksystemlog-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/ksystemlog-14.12.1.tar.xz"; + sha256 = "15a92f873vybp3m9icjshbqs8nl6xm4cl9ca3cghmdlcqrn7f92x"; + name = "ksystemlog-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/klickety-14.12.1.tar.xz"; - sha256 = "071y9khz57mrw12dvwxhs03jn56j06hw38hcf8d4r4wksbwr3j87"; - name = "klickety-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "klickety-14.12.1.tar.xz" ".tar"; store = "/nix/store/y8p216blw2zrld7mj5c1ji9nwqhrbqsf-klickety-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/klickety-14.12.1.tar.xz"; + sha256 = "071y9khz57mrw12dvwxhs03jn56j06hw38hcf8d4r4wksbwr3j87"; + name = "klickety-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/lokalize-14.12.1.tar.xz"; - sha256 = "1ala2pfqh0a0kqxiyfpp11rcn805g6gcn0m9qjbmdqhl9wviij9h"; - name = "lokalize-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "lokalize-14.12.1.tar.xz" ".tar"; store = "/nix/store/5c1isv8y9s4k7153i5y41jdps6zsp8gl-lokalize-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/lokalize-14.12.1.tar.xz"; + sha256 = "1ala2pfqh0a0kqxiyfpp11rcn805g6gcn0m9qjbmdqhl9wviij9h"; + name = "lokalize-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kdegraphics-thumbnailers-14.12.1.tar.xz"; - sha256 = "198m7iw621azbcp4abv3izq5p29yz9s2apr6ivxpp1iqzpz2x70g"; - name = "kdegraphics-thumbnailers-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kdegraphics-thumbnailers-14.12.1.tar.xz" ".tar"; store = "/nix/store/d315k9787k4c5ww7zp0341cybnwwsy2j-kdegraphics-thumbnailers-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kdegraphics-thumbnailers-14.12.1.tar.xz"; + sha256 = "198m7iw621azbcp4abv3izq5p29yz9s2apr6ivxpp1iqzpz2x70g"; + name = "kdegraphics-thumbnailers-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kde-base-artwork-14.12.1.tar.xz"; - sha256 = "0zd298ii8a3lnfh6lxgw6nmf91kx3days1nqk5arilkbrf7b4952"; - name = "kde-base-artwork-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kde-base-artwork-14.12.1.tar.xz" ".tar"; store = "/nix/store/6v8hm7rgdvfkvakv1jfq3g7jk3zq7x3z-kde-base-artwork-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-base-artwork-14.12.1.tar.xz"; + sha256 = "0zd298ii8a3lnfh6lxgw6nmf91kx3days1nqk5arilkbrf7b4952"; + name = "kde-base-artwork-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/artikulate-14.12.1.tar.xz"; - sha256 = "021hyprapc6fjhls55yn69sndm13krfriwj1vmq5mvqxzr0aid2k"; - name = "artikulate-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "artikulate-14.12.1.tar.xz" ".tar"; store = "/nix/store/xaibvsd6g0xnwpnayb0jxhah9hmb3xin-artikulate-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/artikulate-14.12.1.tar.xz"; + sha256 = "021hyprapc6fjhls55yn69sndm13krfriwj1vmq5mvqxzr0aid2k"; + name = "artikulate-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kaccessible-14.12.1.tar.xz"; - sha256 = "0gp49jxkscdqd35xqmzhr17smiwyxgx8xbr7hkvbm10dzn9kx6x7"; - name = "kaccessible-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kaccessible-14.12.1.tar.xz" ".tar"; store = "/nix/store/s6j8nymsygqkh4vfgkgqwcg6xigda53d-kaccessible-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kaccessible-14.12.1.tar.xz"; + sha256 = "0gp49jxkscdqd35xqmzhr17smiwyxgx8xbr7hkvbm10dzn9kx6x7"; + name = "kaccessible-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/konquest-14.12.1.tar.xz"; - sha256 = "006an4bpfsnzcpm086xjyryd1xlzw0yz2knbzkvsdf3jr9kpmnrr"; - name = "konquest-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "konquest-14.12.1.tar.xz" ".tar"; store = "/nix/store/wxk5v878fibdxxd9m9f6phyc99a56psc-konquest-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/konquest-14.12.1.tar.xz"; + sha256 = "006an4bpfsnzcpm086xjyryd1xlzw0yz2knbzkvsdf3jr9kpmnrr"; + name = "konquest-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/superkaramba-14.12.1.tar.xz"; - sha256 = "10dlnn4knlvkz38c98613x9px85a8dhlfwpp4231r3v5va03xszj"; - name = "superkaramba-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "superkaramba-14.12.1.tar.xz" ".tar"; store = "/nix/store/p3yhp4gg9pfbmnlb6jqk6xhaz2yllx9w-superkaramba-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/superkaramba-14.12.1.tar.xz"; + sha256 = "10dlnn4knlvkz38c98613x9px85a8dhlfwpp4231r3v5va03xszj"; + name = "superkaramba-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kdesdk-kioslaves-14.12.1.tar.xz"; - sha256 = "06f8xxzldsqmch9acmfd95lr48rm94d6qll62bj5zi0bs5qjygbw"; - name = "kdesdk-kioslaves-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kdesdk-kioslaves-14.12.1.tar.xz" ".tar"; store = "/nix/store/ga54jhkjav5i83vmir8j6l51d3gv1cs1-kdesdk-kioslaves-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kdesdk-kioslaves-14.12.1.tar.xz"; + sha256 = "06f8xxzldsqmch9acmfd95lr48rm94d6qll62bj5zi0bs5qjygbw"; + name = "kdesdk-kioslaves-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/cantor-14.12.1.tar.xz"; - sha256 = "100yscp21w7amqmwzh4zsk7kmyn5pf3swlkwipz857wi3wajkm75"; - name = "cantor-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "cantor-14.12.1.tar.xz" ".tar"; store = "/nix/store/xhdgix591fkzqdzw0pch0vv8wk2kkhz5-cantor-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/cantor-14.12.1.tar.xz"; + sha256 = "100yscp21w7amqmwzh4zsk7kmyn5pf3swlkwipz857wi3wajkm75"; + name = "cantor-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kdegraphics-mobipocket-14.12.1.tar.xz"; - sha256 = "0qa0bpfvgbq3x3wlgi1cp3v8xn1wayyjrc07ffdr63w1gfi10mg1"; - name = "kdegraphics-mobipocket-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kdegraphics-mobipocket-14.12.1.tar.xz" ".tar"; store = "/nix/store/pvk5701kz79m2bn13n45ffwy0zjng838-kdegraphics-mobipocket-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kdegraphics-mobipocket-14.12.1.tar.xz"; + sha256 = "0qa0bpfvgbq3x3wlgi1cp3v8xn1wayyjrc07ffdr63w1gfi10mg1"; + name = "kdegraphics-mobipocket-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kde-runtime-14.12.1.tar.xz"; - sha256 = "0cy2dhxw2cvbgqrknb3iy97rip2dcd7nrq3pj649mpq9a3r3cg17"; - name = "kde-runtime-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kde-runtime-14.12.1.tar.xz" ".tar"; store = "/nix/store/yd2zzjmb762dkjbkhjxdsnbg38k53f65-kde-runtime-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-runtime-14.12.1.tar.xz"; + sha256 = "0cy2dhxw2cvbgqrknb3iy97rip2dcd7nrq3pj649mpq9a3r3cg17"; + name = "kde-runtime-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kiriki-14.12.1.tar.xz"; - sha256 = "00j95hcyrnw2li2abkwqsd0dp8ph4wlqzy0d3gzfnkal19j2x2m2"; - name = "kiriki-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kiriki-14.12.1.tar.xz" ".tar"; store = "/nix/store/hxk0628k5s042wcxwd1v7vy951bsjqxp-kiriki-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kiriki-14.12.1.tar.xz"; + sha256 = "00j95hcyrnw2li2abkwqsd0dp8ph4wlqzy0d3gzfnkal19j2x2m2"; + name = "kiriki-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kwordquiz-14.12.1.tar.xz"; - sha256 = "1c03ab89lnnin81lvq3mbcw2d10k3rjlk2fpplcbbnsryq35bivi"; - name = "kwordquiz-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kwordquiz-14.12.1.tar.xz" ".tar"; store = "/nix/store/6a5bi2hpxmry12zq6qkwk2hzlv5h7qkz-kwordquiz-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kwordquiz-14.12.1.tar.xz"; + sha256 = "1c03ab89lnnin81lvq3mbcw2d10k3rjlk2fpplcbbnsryq35bivi"; + name = "kwordquiz-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kate-14.12.1.tar.xz"; - sha256 = "0c3diy846drf5nihvhzhpsp8pl2kviyn6ian61myy2147smkany5"; - name = "kate-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kate-14.12.1.tar.xz" ".tar"; store = "/nix/store/ykssldwmik1x7njph3rmzh9d14n7f0mi-kate-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kate-14.12.1.tar.xz"; + sha256 = "0c3diy846drf5nihvhzhpsp8pl2kviyn6ian61myy2147smkany5"; + name = "kate-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/parley-14.12.1.tar.xz"; - sha256 = "0awzpa9bl1j9gzy3596dhpsg3pqbmmdh87n52z7cjyk8sw0ikk19"; - name = "parley-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "parley-14.12.1.tar.xz" ".tar"; store = "/nix/store/3k84f0vl6l7l65hmbbdlfp2zg348kcmi-parley-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/parley-14.12.1.tar.xz"; + sha256 = "0awzpa9bl1j9gzy3596dhpsg3pqbmmdh87n52z7cjyk8sw0ikk19"; + name = "parley-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/libkdegames-14.12.1.tar.xz"; - sha256 = "0af15lbsjc7w5p3s3nxsb08cvyg7dncjmpw7z1vhgqykzmwpyp56"; - name = "libkdegames-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "libkdegames-14.12.1.tar.xz" ".tar"; store = "/nix/store/clfp83sn2pg1jr82j79szwkx0aysl9a3-libkdegames-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/libkdegames-14.12.1.tar.xz"; + sha256 = "0af15lbsjc7w5p3s3nxsb08cvyg7dncjmpw7z1vhgqykzmwpyp56"; + name = "libkdegames-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/libkcompactdisc-14.12.1.tar.xz"; - sha256 = "10zpv05wmqs1lrby95d5bgvwiqcmkd3ndrdsr6cpayg2lw9nq86d"; - name = "libkcompactdisc-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "libkcompactdisc-14.12.1.tar.xz" ".tar"; store = "/nix/store/ghjddljclnsn3z0rflrrxanbkzxn46m5-libkcompactdisc-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/libkcompactdisc-14.12.1.tar.xz"; + sha256 = "10zpv05wmqs1lrby95d5bgvwiqcmkd3ndrdsr6cpayg2lw9nq86d"; + name = "libkcompactdisc-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kmplot-14.12.1.tar.xz"; - sha256 = "0p0iv3m2648vyr1imzwdfs73rc2q39nl8r7w31z5dhm65rq2zi27"; - name = "kmplot-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kmplot-14.12.1.tar.xz" ".tar"; store = "/nix/store/k78l2m24w71dbczia8bnwi3fhpqghj6b-kmplot-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kmplot-14.12.1.tar.xz"; + sha256 = "0p0iv3m2648vyr1imzwdfs73rc2q39nl8r7w31z5dhm65rq2zi27"; + name = "kmplot-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kuser-14.12.1.tar.xz"; - sha256 = "1zgik2i9z0n58m3fm8g0kgjm9aqa6v1f3331r8nrjir9vd9vr8g7"; - name = "kuser-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kuser-14.12.1.tar.xz" ".tar"; store = "/nix/store/lpdpdbbbgfyib95cq1m1db5fdym6wjxz-kuser-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kuser-14.12.1.tar.xz"; + sha256 = "1zgik2i9z0n58m3fm8g0kgjm9aqa6v1f3331r8nrjir9vd9vr8g7"; + name = "kuser-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kspaceduel-14.12.1.tar.xz"; - sha256 = "1zihp0nc6gs4xymyykldjw22zrxm8qznjaya4z1fw07hwndijvia"; - name = "kspaceduel-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kspaceduel-14.12.1.tar.xz" ".tar"; store = "/nix/store/p1lzq3dbil7klabykd2995j65qwqfldd-kspaceduel-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kspaceduel-14.12.1.tar.xz"; + sha256 = "1zihp0nc6gs4xymyykldjw22zrxm8qznjaya4z1fw07hwndijvia"; + name = "kspaceduel-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/gwenview-14.12.1.tar.xz"; - sha256 = "04g3qkz1g27ph6ha1zrbqpr827vhx9n2nigr0dy95a61qw1m0jww"; - name = "gwenview-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "gwenview-14.12.1.tar.xz" ".tar"; store = "/nix/store/agnpfa5vjjfq79j3x2nf3nfwvvxjl28i-gwenview-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/gwenview-14.12.1.tar.xz"; + sha256 = "04g3qkz1g27ph6ha1zrbqpr827vhx9n2nigr0dy95a61qw1m0jww"; + name = "gwenview-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/oxygen-icons-14.12.1.tar.xz"; - sha256 = "1z27id29s98h20dg27wr28w2qpb25ii1xsrgjk6r33nhj2y39jmg"; - name = "oxygen-icons-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "oxygen-icons-14.12.1.tar.xz" ".tar"; store = "/nix/store/wfnbykydc5zl9d678mpw7hpc1nscynmg-oxygen-icons-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/oxygen-icons-14.12.1.tar.xz"; + sha256 = "1z27id29s98h20dg27wr28w2qpb25ii1xsrgjk6r33nhj2y39jmg"; + name = "oxygen-icons-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kppp-14.12.1.tar.xz"; - sha256 = "0lvcanlskjgra2wn3k1j5jx9vy5k0g381ycg79fazkczsr8is5wf"; - name = "kppp-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kppp-14.12.1.tar.xz" ".tar"; store = "/nix/store/q4fxwbxh1rl3icjzhcyij7wwbchc0xzn-kppp-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kppp-14.12.1.tar.xz"; + sha256 = "0lvcanlskjgra2wn3k1j5jx9vy5k0g381ycg79fazkczsr8is5wf"; + name = "kppp-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kmouth-14.12.1.tar.xz"; - sha256 = "0a3fhlgy8z84n83v59safl71v29px9783dndlqgh1dk8lmki7dmd"; - name = "kmouth-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kmouth-14.12.1.tar.xz" ".tar"; store = "/nix/store/9ny33z3srhnwz8p9fd7i6klmm9y9j08k-kmouth-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kmouth-14.12.1.tar.xz"; + sha256 = "0a3fhlgy8z84n83v59safl71v29px9783dndlqgh1dk8lmki7dmd"; + name = "kmouth-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kig-14.12.1.tar.xz"; - sha256 = "0qs89kpms9ch2r9xj4scvjscn7b7bh5k1nxaln1z654mgp1rl4f8"; - name = "kig-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kig-14.12.1.tar.xz" ".tar"; store = "/nix/store/iwj5hwmm9p278b7yi510fh38710w96rr-kig-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kig-14.12.1.tar.xz"; + sha256 = "0qs89kpms9ch2r9xj4scvjscn7b7bh5k1nxaln1z654mgp1rl4f8"; + name = "kig-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/libkexiv2-14.12.1.tar.xz"; - sha256 = "0qpfccasra3ffq5iz7dpxpzcyk13ywjdaz32n1wfsylfv158w9sg"; - name = "libkexiv2-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "libkexiv2-14.12.1.tar.xz" ".tar"; store = "/nix/store/z8w5hn03zzpbpg7mjdmykylcbvhcd2ac-libkexiv2-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/libkexiv2-14.12.1.tar.xz"; + sha256 = "0qpfccasra3ffq5iz7dpxpzcyk13ywjdaz32n1wfsylfv158w9sg"; + name = "libkexiv2-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kcron-14.12.1.tar.xz"; - sha256 = "0czcxajsdx7xal9cvy9cd4drhvaivx68mhymj5k3n90cka7qda2x"; - name = "kcron-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kcron-14.12.1.tar.xz" ".tar"; store = "/nix/store/ixgf55ccq4gyyazhnbrrrg1qhpgh048s-kcron-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kcron-14.12.1.tar.xz"; + sha256 = "0czcxajsdx7xal9cvy9cd4drhvaivx68mhymj5k3n90cka7qda2x"; + name = "kcron-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/ksnapshot-14.12.1.tar.xz"; - sha256 = "02g48b3i7xglrgp1nxvpbsrq7kqg81s4mf6k9rhfn312n45g1arg"; - name = "ksnapshot-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "ksnapshot-14.12.1.tar.xz" ".tar"; store = "/nix/store/vjc105v5nsibh4pfvrvsjck78f2645lx-ksnapshot-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/ksnapshot-14.12.1.tar.xz"; + sha256 = "02g48b3i7xglrgp1nxvpbsrq7kqg81s4mf6k9rhfn312n45g1arg"; + name = "ksnapshot-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/marble-14.12.1.tar.xz"; - sha256 = "13plghz8d5a8gdkq3nr7m0bvp2p0smqnj987bmsi1cldvliwiijl"; - name = "marble-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "marble-14.12.1.tar.xz" ".tar"; store = "/nix/store/543lrxwg6zz77yz58ihn3dvf9rhy3xzg-marble-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/marble-14.12.1.tar.xz"; + sha256 = "13plghz8d5a8gdkq3nr7m0bvp2p0smqnj987bmsi1cldvliwiijl"; + name = "marble-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kpat-14.12.1.tar.xz"; - sha256 = "02bh34553r7k0vf7sb5nsr6zgmh1xfgyjfyfc22yvknpmz2zz8wb"; - name = "kpat-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kpat-14.12.1.tar.xz" ".tar"; store = "/nix/store/2ssmxyy2vhlipyrh6cs5qgms20cicmhy-kpat-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kpat-14.12.1.tar.xz"; + sha256 = "02bh34553r7k0vf7sb5nsr6zgmh1xfgyjfyfc22yvknpmz2zz8wb"; + name = "kpat-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/poxml-14.12.1.tar.xz"; - sha256 = "1r0iqqszmqmjnkq41xv87sc601fm8s94ga9pn37alni7f7qddfrs"; - name = "poxml-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "poxml-14.12.1.tar.xz" ".tar"; store = "/nix/store/n8504ljfha2rq1r0lrpz0gyyh59rpjln-poxml-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/poxml-14.12.1.tar.xz"; + sha256 = "1r0iqqszmqmjnkq41xv87sc601fm8s94ga9pn37alni7f7qddfrs"; + name = "poxml-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/umbrello-14.12.1.tar.xz"; - sha256 = "0kr60kdfg2pl049n4rkksfs6160jijxdwymx60gj44h8w2dxrx6c"; - name = "umbrello-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "umbrello-14.12.1.tar.xz" ".tar"; store = "/nix/store/m7ia6872rxwbpx88zidqanf1wqni1az6-umbrello-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/umbrello-14.12.1.tar.xz"; + sha256 = "0kr60kdfg2pl049n4rkksfs6160jijxdwymx60gj44h8w2dxrx6c"; + name = "umbrello-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/krdc-14.12.1.tar.xz"; - sha256 = "0jqq60spxb64m9y37q2wd7w1z3h0c0hcjvd6wi694v0zhblg5622"; - name = "krdc-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "krdc-14.12.1.tar.xz" ".tar"; store = "/nix/store/qlj342akja4fh4yp2fib4v4bm3kn2bmg-krdc-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/krdc-14.12.1.tar.xz"; + sha256 = "0jqq60spxb64m9y37q2wd7w1z3h0c0hcjvd6wi694v0zhblg5622"; + name = "krdc-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/ktimer-14.12.1.tar.xz"; - sha256 = "1p4y1kx3w6rqwjnhpjx17246w8gp7l8q2212x7khs8karnfyvxh2"; - name = "ktimer-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "ktimer-14.12.1.tar.xz" ".tar"; store = "/nix/store/39r333hqffzycjszw3wbash4p8cs4vrc-ktimer-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/ktimer-14.12.1.tar.xz"; + sha256 = "1p4y1kx3w6rqwjnhpjx17246w8gp7l8q2212x7khs8karnfyvxh2"; + name = "ktimer-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kremotecontrol-14.12.1.tar.xz"; - sha256 = "0rvf73bj6l7cgbjcpn2bgy00zpdw4sj5zcchgl42xldl75zzr6mc"; - name = "kremotecontrol-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kremotecontrol-14.12.1.tar.xz" ".tar"; store = "/nix/store/p9al8bnc7cy61ccnbmw5vzbvg36rq3yl-kremotecontrol-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kremotecontrol-14.12.1.tar.xz"; + sha256 = "0rvf73bj6l7cgbjcpn2bgy00zpdw4sj5zcchgl42xldl75zzr6mc"; + name = "kremotecontrol-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kde-dev-utils-14.12.1.tar.xz"; - sha256 = "1wpiarm8h4y5yjrdrxkmndps06h08vql70n63aai8crdvgwixdqy"; - name = "kde-dev-utils-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kde-dev-utils-14.12.1.tar.xz" ".tar"; store = "/nix/store/qsdvwqqp7pwbh2vdi5p3w56snysf94f8-kde-dev-utils-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-dev-utils-14.12.1.tar.xz"; + sha256 = "1wpiarm8h4y5yjrdrxkmndps06h08vql70n63aai8crdvgwixdqy"; + name = "kde-dev-utils-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/knavalbattle-14.12.1.tar.xz"; - sha256 = "1jd4b2kmlknh1xz055xysasfs90810m8sg4iwyzqv2j5kj8i4x4l"; - name = "knavalbattle-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "knavalbattle-14.12.1.tar.xz" ".tar"; store = "/nix/store/6ic12j8bm99jckl82p347717mrhl5v6r-knavalbattle-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/knavalbattle-14.12.1.tar.xz"; + sha256 = "1jd4b2kmlknh1xz055xysasfs90810m8sg4iwyzqv2j5kj8i4x4l"; + name = "knavalbattle-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/libksane-14.12.1.tar.xz"; - sha256 = "0a4hp2d0h26nkggmkiswywlw0aj5wkk8c6s9wy2h7m7qcmyq4gk0"; - name = "libksane-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "libksane-14.12.1.tar.xz" ".tar"; store = "/nix/store/72jv9b0id1ql2pbz8vdcm77n7s7br3vk-libksane-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/libksane-14.12.1.tar.xz"; + sha256 = "0a4hp2d0h26nkggmkiswywlw0aj5wkk8c6s9wy2h7m7qcmyq4gk0"; + name = "libksane-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/libkdcraw-14.12.1.tar.xz"; - sha256 = "0svalln7g862d6f5k76vdggqc1h1x9gagm6v56yzr9dypz81y40m"; - name = "libkdcraw-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "libkdcraw-14.12.1.tar.xz" ".tar"; store = "/nix/store/j4y0bpk9zir6270cmxmfxn10bphgbdw8-libkdcraw-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/libkdcraw-14.12.1.tar.xz"; + sha256 = "0svalln7g862d6f5k76vdggqc1h1x9gagm6v56yzr9dypz81y40m"; + name = "libkdcraw-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/blinken-14.12.1.tar.xz"; - sha256 = "1fvgq57qhx305qxmhzm628p283dyk9nnp33q5vgcxxfw726mi5pq"; - name = "blinken-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "blinken-14.12.1.tar.xz" ".tar"; store = "/nix/store/xl2fn6zcfr99ir7l10y8dd79ns4msgyp-blinken-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/blinken-14.12.1.tar.xz"; + sha256 = "1fvgq57qhx305qxmhzm628p283dyk9nnp33q5vgcxxfw726mi5pq"; + name = "blinken-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/step-14.12.1.tar.xz"; - sha256 = "15wlgig9b932ck1hwdld0q8nh74rh820wj4nc6ifys83wv43jnzh"; - name = "step-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "step-14.12.1.tar.xz" ".tar"; store = "/nix/store/1v6hadh7m1i58hc62c6z2qs2ycsi02rw-step-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/step-14.12.1.tar.xz"; + sha256 = "15wlgig9b932ck1hwdld0q8nh74rh820wj4nc6ifys83wv43jnzh"; + name = "step-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kdegraphics-strigi-analyzer-14.12.1.tar.xz"; - sha256 = "03lajpwia7fmlnr9l0g44knwghz8b2i70i659nkvypw6qd89cccr"; - name = "kdegraphics-strigi-analyzer-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kdegraphics-strigi-analyzer-14.12.1.tar.xz" ".tar"; store = "/nix/store/0invqcgsx7scwmihagccpgdfq3aa52w8-kdegraphics-strigi-analyzer-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kdegraphics-strigi-analyzer-14.12.1.tar.xz"; + sha256 = "03lajpwia7fmlnr9l0g44knwghz8b2i70i659nkvypw6qd89cccr"; + name = "kdegraphics-strigi-analyzer-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kde-baseapps-14.12.1.tar.xz"; - sha256 = "0l31842mmriirkcqsdmj7s31yjwr5im8di7z7dfjgjqy0j1q1jzc"; - name = "kde-baseapps-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kde-baseapps-14.12.1.tar.xz" ".tar"; store = "/nix/store/rjsmd2babmjdbwvr5n5gv1f9wcag4iln-kde-baseapps-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-baseapps-14.12.1.tar.xz"; + sha256 = "0l31842mmriirkcqsdmj7s31yjwr5im8di7z7dfjgjqy0j1q1jzc"; + name = "kde-baseapps-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kde-dev-scripts-14.12.1.tar.xz"; - sha256 = "0g3i26vm3n2jc69mpwy94b60ff9c6fsr4yrl1h4f3408f4g4sjj4"; - name = "kde-dev-scripts-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kde-dev-scripts-14.12.1.tar.xz" ".tar"; store = "/nix/store/h2hcdrv66b95ajbj5wrz1aspq4fr85pd-kde-dev-scripts-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-dev-scripts-14.12.1.tar.xz"; + sha256 = "0g3i26vm3n2jc69mpwy94b60ff9c6fsr4yrl1h4f3408f4g4sjj4"; + name = "kde-dev-scripts-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kollision-14.12.1.tar.xz"; - sha256 = "1l2c34l95kj4f8y156yirc35vfb2yblnkkjq1bfkmiavsb6vzhd5"; - name = "kollision-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kollision-14.12.1.tar.xz" ".tar"; store = "/nix/store/8kf7fxqm2avmamkdidsglx7rvl30cj1n-kollision-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kollision-14.12.1.tar.xz"; + sha256 = "1l2c34l95kj4f8y156yirc35vfb2yblnkkjq1bfkmiavsb6vzhd5"; + name = "kollision-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kgoldrunner-14.12.1.tar.xz"; - sha256 = "0sgr2034mr5gmmg81qp9sqjw2sn2cgdw8bl9dq2iid43czih5zbw"; - name = "kgoldrunner-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kgoldrunner-14.12.1.tar.xz" ".tar"; store = "/nix/store/82jk65vx3xpg2ydn3fzg6v2w07xgihhc-kgoldrunner-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kgoldrunner-14.12.1.tar.xz"; + sha256 = "0sgr2034mr5gmmg81qp9sqjw2sn2cgdw8bl9dq2iid43czih5zbw"; + name = "kgoldrunner-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kolf-14.12.1.tar.xz"; - sha256 = "0arxis9q9qzbv35qq52pl4j5xzqhdwypjhxwdiqammqksdnln8lw"; - name = "kolf-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kolf-14.12.1.tar.xz" ".tar"; store = "/nix/store/y7m9zzkm4wz23myj568sdjpn86f6m4iy-kolf-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kolf-14.12.1.tar.xz"; + sha256 = "0arxis9q9qzbv35qq52pl4j5xzqhdwypjhxwdiqammqksdnln8lw"; + name = "kolf-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/okular-14.12.1.tar.xz"; - sha256 = "1my3d91lm6wz8gh9g7pw4rrdxkc22vr9v02b22qqvxb2z8mdq5cb"; - name = "okular-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "okular-14.12.1.tar.xz" ".tar"; store = "/nix/store/8ipl9g3hgm04x1xpvyy8ahlbvjq6birx-okular-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/okular-14.12.1.tar.xz"; + sha256 = "1my3d91lm6wz8gh9g7pw4rrdxkc22vr9v02b22qqvxb2z8mdq5cb"; + name = "okular-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/libkmahjongg-14.12.1.tar.xz"; - sha256 = "00s4akfgr33n1bg2bds1fxccnig9hybm95qq95ii6ky4jyjc6b78"; - name = "libkmahjongg-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "libkmahjongg-14.12.1.tar.xz" ".tar"; store = "/nix/store/jl34m0f1m497dpwnmmw2svy9ig9x7x5q-libkmahjongg-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/libkmahjongg-14.12.1.tar.xz"; + sha256 = "00s4akfgr33n1bg2bds1fxccnig9hybm95qq95ii6ky4jyjc6b78"; + name = "libkmahjongg-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kbreakout-14.12.1.tar.xz"; - sha256 = "1cvqjch9ymjii7xmlg1clscbv6245m5bnf77dxz6nkzsrcy4khbx"; - name = "kbreakout-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kbreakout-14.12.1.tar.xz" ".tar"; store = "/nix/store/ab28gj1xwh9calkkf87xqnh84x8cjq08-kbreakout-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kbreakout-14.12.1.tar.xz"; + sha256 = "1cvqjch9ymjii7xmlg1clscbv6245m5bnf77dxz6nkzsrcy4khbx"; + name = "kbreakout-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kgpg-14.12.1.tar.xz"; - sha256 = "0cfhmlp200dbhdkckf7xvfbfsz985zw7vp6vin4w378dzyw55lmb"; - name = "kgpg-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kgpg-14.12.1.tar.xz" ".tar"; store = "/nix/store/8bfm6nbnd3clpdy108yab44vv7552c1i-kgpg-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kgpg-14.12.1.tar.xz"; + sha256 = "0cfhmlp200dbhdkckf7xvfbfsz985zw7vp6vin4w378dzyw55lmb"; + name = "kgpg-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kscd-14.12.1.tar.xz"; - sha256 = "0ag9i649ah627b5xsacvz1q05pijfrbwrg34bpcc61px9zsgk18l"; - name = "kscd-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kscd-14.12.1.tar.xz" ".tar"; store = "/nix/store/lfsycaw8n7kjsbnkga24cfqmpr0rpff8-kscd-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kscd-14.12.1.tar.xz"; + sha256 = "0ag9i649ah627b5xsacvz1q05pijfrbwrg34bpcc61px9zsgk18l"; + name = "kscd-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kcalc-14.12.1.tar.xz"; - sha256 = "0qsfllwhn1gd675k5fxbfcfflnn86cbh3nzn70bc2lmxmwrlzbj2"; - name = "kcalc-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kcalc-14.12.1.tar.xz" ".tar"; store = "/nix/store/5avv44x780sz0v874cl781k7camn6xcj-kcalc-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kcalc-14.12.1.tar.xz"; + sha256 = "0qsfllwhn1gd675k5fxbfcfflnn86cbh3nzn70bc2lmxmwrlzbj2"; + name = "kcalc-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kfourinline-14.12.1.tar.xz"; - sha256 = "0mhykajapvbcrasadyjjjz7sps3vmmw1hhijfjbswkb62ikmwc6k"; - name = "kfourinline-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kfourinline-14.12.1.tar.xz" ".tar"; store = "/nix/store/qbgn1hkh15gv93wbrfg2bh14zsfgxfva-kfourinline-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kfourinline-14.12.1.tar.xz"; + sha256 = "0mhykajapvbcrasadyjjjz7sps3vmmw1hhijfjbswkb62ikmwc6k"; + name = "kfourinline-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/picmi-14.12.1.tar.xz"; - sha256 = "0nrg4qza4h99k59w92v3qy68xlkdslqrlqi62fg94i88rl9l6ypq"; - name = "picmi-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "picmi-14.12.1.tar.xz" ".tar"; store = "/nix/store/s1m8hz32vjf2v38p2rkznrx4mgn6rzr3-picmi-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/picmi-14.12.1.tar.xz"; + sha256 = "0nrg4qza4h99k59w92v3qy68xlkdslqrlqi62fg94i88rl9l6ypq"; + name = "picmi-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kdewebdev-14.12.1.tar.xz"; - sha256 = "0iv2r5vxkk8bg8p2zpq2dqnq0vvwhmjls0gdg30gyc4w04a7jcqr"; - name = "kdewebdev-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kdewebdev-14.12.1.tar.xz" ".tar"; store = "/nix/store/9mqr7imp19hgjl7bn5sbp2d3xmgrr3p1-kdewebdev-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kdewebdev-14.12.1.tar.xz"; + sha256 = "0iv2r5vxkk8bg8p2zpq2dqnq0vvwhmjls0gdg30gyc4w04a7jcqr"; + name = "kdewebdev-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kmines-14.12.1.tar.xz"; - sha256 = "13f070kh0rfs5pmw3lnlwxwvx2ph2q8n1vm9lvr6kw1ablngiacm"; - name = "kmines-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kmines-14.12.1.tar.xz" ".tar"; store = "/nix/store/nx62f1snc9d786yi1vsh0vzixkgrv9gr-kmines-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kmines-14.12.1.tar.xz"; + sha256 = "13f070kh0rfs5pmw3lnlwxwvx2ph2q8n1vm9lvr6kw1ablngiacm"; + name = "kmines-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/filelight-14.12.1.tar.xz"; - sha256 = "1dzcgric6rxhxhi84lgbsmkfk6s6b96px8019njnp744jys2ikv8"; - name = "filelight-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "filelight-14.12.1.tar.xz" ".tar"; store = "/nix/store/syf2l3yk3wga82cyak82janjsjhgvbd5-filelight-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/filelight-14.12.1.tar.xz"; + sha256 = "1dzcgric6rxhxhi84lgbsmkfk6s6b96px8019njnp744jys2ikv8"; + name = "filelight-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/amor-14.12.1.tar.xz"; - sha256 = "0p0fgp3j6x1f83kxdvmkcy4ladhg206m261fbpa92zyxp2ylnl0a"; - name = "amor-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "amor-14.12.1.tar.xz" ".tar"; store = "/nix/store/5nkk3cqvi177qd3mq0n687r5swcrixfd-amor-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/amor-14.12.1.tar.xz"; + sha256 = "0p0fgp3j6x1f83kxdvmkcy4ladhg206m261fbpa92zyxp2ylnl0a"; + name = "amor-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kdiamond-14.12.1.tar.xz"; - sha256 = "12frpi62f4w86ygxa68dvx1nj8n7w7lsgizfdyc6lix6l5vfzn7x"; - name = "kdiamond-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kdiamond-14.12.1.tar.xz" ".tar"; store = "/nix/store/6pbb85yp6xhd3x5w0a5ql6ms10yj1pj3-kdiamond-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kdiamond-14.12.1.tar.xz"; + sha256 = "12frpi62f4w86ygxa68dvx1nj8n7w7lsgizfdyc6lix6l5vfzn7x"; + name = "kdiamond-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kteatime-14.12.1.tar.xz"; - sha256 = "0my0fjiblkkfy2148axc7gp1nsx5lr2y8zn6d2labai2f6dy1bpf"; - name = "kteatime-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kteatime-14.12.1.tar.xz" ".tar"; store = "/nix/store/89l402jmb83ji7xvkz82kz024l012yaz-kteatime-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kteatime-14.12.1.tar.xz"; + sha256 = "0my0fjiblkkfy2148axc7gp1nsx5lr2y8zn6d2labai2f6dy1bpf"; + name = "kteatime-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/juk-14.12.1.tar.xz"; - sha256 = "0wzjrk5w5y0f6bc98pr7xni1j8krdyjsk3agcwkhb4d4c0aa5gka"; - name = "juk-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "juk-14.12.1.tar.xz" ".tar"; store = "/nix/store/gjxwckkx3mikzkpxs7vzk830nj42fj6q-juk-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/juk-14.12.1.tar.xz"; + sha256 = "0wzjrk5w5y0f6bc98pr7xni1j8krdyjsk3agcwkhb4d4c0aa5gka"; + name = "juk-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/mplayerthumbs-14.12.1.tar.xz"; - sha256 = "0z9iw1syv61y4fb4dlr9n8w78ri7wpznys5bd5sn0hxbkwnavs6b"; - name = "mplayerthumbs-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "mplayerthumbs-14.12.1.tar.xz" ".tar"; store = "/nix/store/kdk1frzcpvc11ln0vamc6m0m7h1xfnj5-mplayerthumbs-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/mplayerthumbs-14.12.1.tar.xz"; + sha256 = "0z9iw1syv61y4fb4dlr9n8w78ri7wpznys5bd5sn0hxbkwnavs6b"; + name = "mplayerthumbs-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kget-14.12.1.tar.xz"; - sha256 = "1jr15bcc09pypihva7pjsq6rlj0kqqhqvprxdggmwa7fnyyjxrg4"; - name = "kget-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kget-14.12.1.tar.xz" ".tar"; store = "/nix/store/v34rq3l61yyxsml99xp18adg85ki53r1-kget-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kget-14.12.1.tar.xz"; + sha256 = "1jr15bcc09pypihva7pjsq6rlj0kqqhqvprxdggmwa7fnyyjxrg4"; + name = "kget-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/libkface-14.12.1.tar.xz"; - sha256 = "198z0n286qnngrln24s1dfghkddz5zy7qr8af0jkywxdj3j2ks3a"; - name = "libkface-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "libkface-14.12.1.tar.xz" ".tar"; store = "/nix/store/8l4frnslphg2rbpmaikwi0j7w4hfw56r-libkface-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/libkface-14.12.1.tar.xz"; + sha256 = "198z0n286qnngrln24s1dfghkddz5zy7qr8af0jkywxdj3j2ks3a"; + name = "libkface-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kcolorchooser-14.12.1.tar.xz"; - sha256 = "1yw1cxg2caddncnhqyck1fh7g43svgcb8pb15wp5rz7qqs0p65mf"; - name = "kcolorchooser-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kcolorchooser-14.12.1.tar.xz" ".tar"; store = "/nix/store/ygwdm76ijc39y3blkfl7s6g21328dk1p-kcolorchooser-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kcolorchooser-14.12.1.tar.xz"; + sha256 = "1yw1cxg2caddncnhqyck1fh7g43svgcb8pb15wp5rz7qqs0p65mf"; + name = "kcolorchooser-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/dragon-14.12.1.tar.xz"; - sha256 = "0wqmjb7zl883mcmx4x8ss0x64r79wrphfxkyva6sifcy596y2wxh"; - name = "dragon-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "dragon-14.12.1.tar.xz" ".tar"; store = "/nix/store/2iwy70md4cqg461x92sbxwbfzmj4y1xz-dragon-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/dragon-14.12.1.tar.xz"; + sha256 = "0wqmjb7zl883mcmx4x8ss0x64r79wrphfxkyva6sifcy596y2wxh"; + name = "dragon-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kjumpingcube-14.12.1.tar.xz"; - sha256 = "1h7nypr5b8b5az7c2gszihlhq9k2dn92cabjmif9rlkrvl6nahcy"; - name = "kjumpingcube-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kjumpingcube-14.12.1.tar.xz" ".tar"; store = "/nix/store/5n1arbyl0fjp5b5xdlgyha4nwpxbczyz-kjumpingcube-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kjumpingcube-14.12.1.tar.xz"; + sha256 = "1h7nypr5b8b5az7c2gszihlhq9k2dn92cabjmif9rlkrvl6nahcy"; + name = "kjumpingcube-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kapptemplate-14.12.1.tar.xz"; - sha256 = "00df6ckfaglnnxizzqmci10h8hiqjv0fgi8xb3x4d3aszb049k1y"; - name = "kapptemplate-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kapptemplate-14.12.1.tar.xz" ".tar"; store = "/nix/store/fxh9hhx7z5bv151xrxw26h91pz09lw9z-kapptemplate-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kapptemplate-14.12.1.tar.xz"; + sha256 = "00df6ckfaglnnxizzqmci10h8hiqjv0fgi8xb3x4d3aszb049k1y"; + name = "kapptemplate-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/ksquares-14.12.1.tar.xz"; - sha256 = "0b1av02srxfd9ji51f2pcb5phmlqdz2lzik1n97yzn6f0xh19h9y"; - name = "ksquares-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "ksquares-14.12.1.tar.xz" ".tar"; store = "/nix/store/16zwzi9y1215imff1phggjza00j9y4br-ksquares-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/ksquares-14.12.1.tar.xz"; + sha256 = "0b1av02srxfd9ji51f2pcb5phmlqdz2lzik1n97yzn6f0xh19h9y"; + name = "ksquares-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/bovo-14.12.1.tar.xz"; - sha256 = "08in3ppksxp7zdgrv5lvjxzlvc6srfjcicagqbj2r8nrfmngjlim"; - name = "bovo-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "bovo-14.12.1.tar.xz" ".tar"; store = "/nix/store/gfficdhz1w80xmvn9842jx1fwpd81lqi-bovo-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/bovo-14.12.1.tar.xz"; + sha256 = "08in3ppksxp7zdgrv5lvjxzlvc6srfjcicagqbj2r8nrfmngjlim"; + name = "bovo-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/ksaneplugin-14.12.1.tar.xz"; - sha256 = "00bsd58kfvhp36rbwsmbk3yqjx8gca3r42q5z3fvd0jpf7y8xxip"; - name = "ksaneplugin-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "ksaneplugin-14.12.1.tar.xz" ".tar"; store = "/nix/store/pafvmq1gg81mjpwyf388k311qwf7pgcj-ksaneplugin-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/ksaneplugin-14.12.1.tar.xz"; + sha256 = "00bsd58kfvhp36rbwsmbk3yqjx8gca3r42q5z3fvd0jpf7y8xxip"; + name = "ksaneplugin-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/rocs-14.12.1.tar.xz"; - sha256 = "033irmbjs6d8q7zdvz7vzx61d0gmgxb96cypwlwjmww1czgy9zcg"; - name = "rocs-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "rocs-14.12.1.tar.xz" ".tar"; store = "/nix/store/n25f8hphjdbwbk9z488i4bjmfai5vzsx-rocs-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/rocs-14.12.1.tar.xz"; + sha256 = "033irmbjs6d8q7zdvz7vzx61d0gmgxb96cypwlwjmww1czgy9zcg"; + name = "rocs-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kompare-14.12.1.tar.xz"; - sha256 = "1js49gfffbv6nplr907dkcq3j6xi6h1276n0fbkpd7y31cca6mi7"; - name = "kompare-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kompare-14.12.1.tar.xz" ".tar"; store = "/nix/store/ikirdy65sp1w2w38p28nkzic0zhw5iyp-kompare-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kompare-14.12.1.tar.xz"; + sha256 = "1js49gfffbv6nplr907dkcq3j6xi6h1276n0fbkpd7y31cca6mi7"; + name = "kompare-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kalzium-14.12.1.tar.xz"; - sha256 = "180qq9h046hax0jl13iy9mzbzhn66y41p8cj5447qgrnjbdk5qa8"; - name = "kalzium-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kalzium-14.12.1.tar.xz" ".tar"; store = "/nix/store/4zh8mah5lsisbnv07nas6wqv6xvsqzy4-kalzium-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kalzium-14.12.1.tar.xz"; + sha256 = "180qq9h046hax0jl13iy9mzbzhn66y41p8cj5447qgrnjbdk5qa8"; + name = "kalzium-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/ksudoku-14.12.1.tar.xz"; - sha256 = "1majccia02g7icqh8pad3m91nj94j228s66v25szlwacg2zc86zr"; - name = "ksudoku-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "ksudoku-14.12.1.tar.xz" ".tar"; store = "/nix/store/1pbw74v9j5r9x36b2r7yq5k8n9fbcvwz-ksudoku-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/ksudoku-14.12.1.tar.xz"; + sha256 = "1majccia02g7icqh8pad3m91nj94j228s66v25szlwacg2zc86zr"; + name = "ksudoku-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/cervisia-14.12.1.tar.xz"; - sha256 = "1xgvk1qar2mg5awkwsc0wzyzmskgv9r6bgbczyy0fjjd9xh0mp75"; - name = "cervisia-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "cervisia-14.12.1.tar.xz" ".tar"; store = "/nix/store/2ifpmknn9aw760hsz4j7cf7kc6x704hl-cervisia-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/cervisia-14.12.1.tar.xz"; + sha256 = "1xgvk1qar2mg5awkwsc0wzyzmskgv9r6bgbczyy0fjjd9xh0mp75"; + name = "cervisia-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kcharselect-14.12.1.tar.xz"; - sha256 = "0rb4dr7ygiks45c73nwab9wg9zdn1xgq93yhkpp23bkfq9ca7z4f"; - name = "kcharselect-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kcharselect-14.12.1.tar.xz" ".tar"; store = "/nix/store/3qpkmwxn855x58k5za6r67rniyzkj006-kcharselect-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kcharselect-14.12.1.tar.xz"; + sha256 = "0rb4dr7ygiks45c73nwab9wg9zdn1xgq93yhkpp23bkfq9ca7z4f"; + name = "kcharselect-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kbruch-14.12.1.tar.xz"; - sha256 = "180gbax6lrn5qr1l7x1c3i0i2kh1by4j80bif66jxwra505by50z"; - name = "kbruch-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kbruch-14.12.1.tar.xz" ".tar"; store = "/nix/store/mvjdshn07gw1jn31y7igfzrzdmkpw98d-kbruch-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kbruch-14.12.1.tar.xz"; + sha256 = "180gbax6lrn5qr1l7x1c3i0i2kh1by4j80bif66jxwra505by50z"; + name = "kbruch-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/knetwalk-14.12.1.tar.xz"; - sha256 = "00b2zkiv3i99k6ri3xljas2fc2ihri84cmckgwrzvpxbdha8wpj8"; - name = "knetwalk-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "knetwalk-14.12.1.tar.xz" ".tar"; store = "/nix/store/y0pg73qfkvfdrk3r7xz7yfgzl2s24vg5-knetwalk-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/knetwalk-14.12.1.tar.xz"; + sha256 = "00b2zkiv3i99k6ri3xljas2fc2ihri84cmckgwrzvpxbdha8wpj8"; + name = "knetwalk-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/palapeli-14.12.1.tar.xz"; - sha256 = "1zdbhn7dfrzb18k3rjgm934gjib5kazkgblsl15jxlzw2yfy458i"; - name = "palapeli-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "palapeli-14.12.1.tar.xz" ".tar"; store = "/nix/store/7vjjf69hw3kkwxmnlxfcg44wh7yy1s5i-palapeli-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/palapeli-14.12.1.tar.xz"; + sha256 = "1zdbhn7dfrzb18k3rjgm934gjib5kazkgblsl15jxlzw2yfy458i"; + name = "palapeli-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/okteta-14.12.1.tar.xz"; - sha256 = "1mw32cjj2kw36frki26nycwi48p1s0wi2v9h85v9dwgk6235i7d8"; - name = "okteta-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "okteta-14.12.1.tar.xz" ".tar"; store = "/nix/store/mk87jrnhqgcarmc658k4f2fpm1181i3g-okteta-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/okteta-14.12.1.tar.xz"; + sha256 = "1mw32cjj2kw36frki26nycwi48p1s0wi2v9h85v9dwgk6235i7d8"; + name = "okteta-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/ksnakeduel-14.12.1.tar.xz"; - sha256 = "14ryx9ydwi23lhf5xr5mn77ixzkirwdg43mrh2cc0rnq440mzalv"; - name = "ksnakeduel-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "ksnakeduel-14.12.1.tar.xz" ".tar"; store = "/nix/store/1mbdk8jijasnkhrzavpv89mzbfrz9b6n-ksnakeduel-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/ksnakeduel-14.12.1.tar.xz"; + sha256 = "14ryx9ydwi23lhf5xr5mn77ixzkirwdg43mrh2cc0rnq440mzalv"; + name = "ksnakeduel-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kdelibs-4.14.4.tar.xz"; - sha256 = "0h255hhl46r7ax9hm9sr7qddljwzfky2ssh695ml3svfwg52mihl"; - name = "kdelibs-4.14.4.tar.xz"; + name = stdenv.lib.nameFromURL "kdelibs-4.14.4.tar.xz" ".tar"; store = "/nix/store/nky571v70dk45hy9jfvii63amga1qx55-kdelibs-4.14.4.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kdelibs-4.14.4.tar.xz"; + sha256 = "0h255hhl46r7ax9hm9sr7qddljwzfky2ssh695ml3svfwg52mihl"; + name = "kdelibs-4.14.4.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kdesdk-strigi-analyzers-14.12.1.tar.xz"; - sha256 = "1bsf1dgb2039jjzqy6pr66yw08kxbn5xpna0bfmrbiw4pprlmbi4"; - name = "kdesdk-strigi-analyzers-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kdesdk-strigi-analyzers-14.12.1.tar.xz" ".tar"; store = "/nix/store/6sfiw6s55wnsnsyh0sas9s3f8fbpwnw4-kdesdk-strigi-analyzers-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kdesdk-strigi-analyzers-14.12.1.tar.xz"; + sha256 = "1bsf1dgb2039jjzqy6pr66yw08kxbn5xpna0bfmrbiw4pprlmbi4"; + name = "kdesdk-strigi-analyzers-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/svgpart-14.12.1.tar.xz"; - sha256 = "18r6n6wh8yg5wmd5wyc8sf6k994ghfknanlp7l1pcqwqa6wfv6rx"; - name = "svgpart-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "svgpart-14.12.1.tar.xz" ".tar"; store = "/nix/store/hcxrbw696pca5z4p95ws7373x55bi9lj-svgpart-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/svgpart-14.12.1.tar.xz"; + sha256 = "18r6n6wh8yg5wmd5wyc8sf6k994ghfknanlp7l1pcqwqa6wfv6rx"; + name = "svgpart-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kdenetwork-filesharing-14.12.1.tar.xz"; - sha256 = "0id8qmr432ygkfmcq3mfr3zv0w58393w0z5pd86k8nnkz43nh208"; - name = "kdenetwork-filesharing-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kdenetwork-filesharing-14.12.1.tar.xz" ".tar"; store = "/nix/store/dazj5495njhw8bdyizpx0af9r20bvj5a-kdenetwork-filesharing-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kdenetwork-filesharing-14.12.1.tar.xz"; + sha256 = "0id8qmr432ygkfmcq3mfr3zv0w58393w0z5pd86k8nnkz43nh208"; + name = "kdenetwork-filesharing-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/ffmpegthumbs-14.12.1.tar.xz"; - sha256 = "1q6ayhxrsq3y5yvrawsvr88pzl7vcz5ms6dq0sgd4mad83kwl5yj"; - name = "ffmpegthumbs-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "ffmpegthumbs-14.12.1.tar.xz" ".tar"; store = "/nix/store/11nyk47q1i4qh92kdzw3l6gi5nqhja5b-ffmpegthumbs-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/ffmpegthumbs-14.12.1.tar.xz"; + sha256 = "1q6ayhxrsq3y5yvrawsvr88pzl7vcz5ms6dq0sgd4mad83kwl5yj"; + name = "ffmpegthumbs-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kmix-14.12.1.tar.xz"; - sha256 = "1zk1c1m1zihb4wih2330a95gd1skakwsx0vccxp8np3nsh71z3fa"; - name = "kmix-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kmix-14.12.1.tar.xz" ".tar"; store = "/nix/store/5y3gdnaa0a8nhpd5a2abp3ixcdnmg9im-kmix-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kmix-14.12.1.tar.xz"; + sha256 = "1zk1c1m1zihb4wih2330a95gd1skakwsx0vccxp8np3nsh71z3fa"; + name = "kmix-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/audiocd-kio-14.12.1.tar.xz"; - sha256 = "1wi3mwx9v7lh71ciar29c1bprwh2lgq46yq3kx5gq7wz20cx54hh"; - name = "audiocd-kio-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "audiocd-kio-14.12.1.tar.xz" ".tar"; store = "/nix/store/6h2dlw28xi87axxdglbkjz2jyjl78ijv-audiocd-kio-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/audiocd-kio-14.12.1.tar.xz"; + sha256 = "1wi3mwx9v7lh71ciar29c1bprwh2lgq46yq3kx5gq7wz20cx54hh"; + name = "audiocd-kio-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/lskat-14.12.1.tar.xz"; - sha256 = "19q5qzfh1dczkdz612hw21849h438dhl21ghbfm5hi5m04vmn8rc"; - name = "lskat-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "lskat-14.12.1.tar.xz" ".tar"; store = "/nix/store/awrjks0ihywpqygz8aqwrxn53yd8sljb-lskat-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/lskat-14.12.1.tar.xz"; + sha256 = "19q5qzfh1dczkdz612hw21849h438dhl21ghbfm5hi5m04vmn8rc"; + name = "lskat-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kmahjongg-14.12.1.tar.xz"; - sha256 = "1pbq9f6zb96v98sz94kz979z5scpqzvc5fp4nxs2dg1rx1la8qxl"; - name = "kmahjongg-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kmahjongg-14.12.1.tar.xz" ".tar"; store = "/nix/store/kk2rlvdl5hm4b0ms3i5pvs1r6lh5ipbh-kmahjongg-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kmahjongg-14.12.1.tar.xz"; + sha256 = "1pbq9f6zb96v98sz94kz979z5scpqzvc5fp4nxs2dg1rx1la8qxl"; + name = "kmahjongg-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kde-workspace-4.11.15.tar.xz"; - sha256 = "1y7df6mar72lzy1dan7v5wwgf2w669b0hkrdb6ai1s3whmqr611a"; - name = "kde-workspace-4.11.15.tar.xz"; + name = stdenv.lib.nameFromURL "kde-workspace-4.11.15.tar.xz" ".tar"; store = "/nix/store/pmn8vgwjdszsl46pra65vn5i7pxfj7g4-kde-workspace-4.11.15.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kde-workspace-4.11.15.tar.xz"; + sha256 = "1y7df6mar72lzy1dan7v5wwgf2w669b0hkrdb6ai1s3whmqr611a"; + name = "kde-workspace-4.11.15.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/libkdeedu-14.12.1.tar.xz"; - sha256 = "03jic27ghfz2gpbn2nb69qiiip4vgy3y4as8qx328cl39l5vh8d4"; - name = "libkdeedu-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "libkdeedu-14.12.1.tar.xz" ".tar"; store = "/nix/store/1l6fwf3bb28myf3k3hsiv27gk8ar6gz1-libkdeedu-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/libkdeedu-14.12.1.tar.xz"; + sha256 = "03jic27ghfz2gpbn2nb69qiiip4vgy3y4as8qx328cl39l5vh8d4"; + name = "libkdeedu-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/ktouch-14.12.1.tar.xz"; - sha256 = "07z1nkyc4hxjd39pczkv1z6dxdjn3334wnv778mdrf98lm77vjxd"; - name = "ktouch-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "ktouch-14.12.1.tar.xz" ".tar"; store = "/nix/store/wvgsj2m324xic0rjr6kyi7pfwqnfpmzq-ktouch-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/ktouch-14.12.1.tar.xz"; + sha256 = "07z1nkyc4hxjd39pczkv1z6dxdjn3334wnv778mdrf98lm77vjxd"; + name = "ktouch-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kblocks-14.12.1.tar.xz"; - sha256 = "0qk5g5karl29g4hbpl7lfgahv71as3mj6j604cpd2wiwma05qa2s"; - name = "kblocks-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kblocks-14.12.1.tar.xz" ".tar"; store = "/nix/store/wgjmvym6jg44xr5mzgw3pb77w1ya8s2h-kblocks-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kblocks-14.12.1.tar.xz"; + sha256 = "0qk5g5karl29g4hbpl7lfgahv71as3mj6j604cpd2wiwma05qa2s"; + name = "kblocks-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kqtquickcharts-14.12.1.tar.xz"; - sha256 = "026am7l64m721vv3l79z6v3avxq94z1vrzx1ifwf8p001inf4ydy"; - name = "kqtquickcharts-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kqtquickcharts-14.12.1.tar.xz" ".tar"; store = "/nix/store/5ppmqjmqizw31x1yjnzmicybln433l9a-kqtquickcharts-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kqtquickcharts-14.12.1.tar.xz"; + sha256 = "026am7l64m721vv3l79z6v3avxq94z1vrzx1ifwf8p001inf4ydy"; + name = "kqtquickcharts-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/sweeper-14.12.1.tar.xz"; - sha256 = "0c3kqnjwi5q24k7b05dr5mygd3ps0r1s9cbs49r9zikswz7gky1d"; - name = "sweeper-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "sweeper-14.12.1.tar.xz" ".tar"; store = "/nix/store/1nwklpfvdggaxadjc3396j8qgwdl619h-sweeper-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/sweeper-14.12.1.tar.xz"; + sha256 = "0c3kqnjwi5q24k7b05dr5mygd3ps0r1s9cbs49r9zikswz7gky1d"; + name = "sweeper-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kopete-14.12.1.tar.xz"; - sha256 = "1pkgzlq7scz0pvmn2dis128rh2hdfxhbg6imn4mwrizmlpaycb98"; - name = "kopete-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kopete-14.12.1.tar.xz" ".tar"; store = "/nix/store/gcj1qvbh1m7hbbyfdsl1nypc07nzy0yn-kopete-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kopete-14.12.1.tar.xz"; + sha256 = "1pkgzlq7scz0pvmn2dis128rh2hdfxhbg6imn4mwrizmlpaycb98"; + name = "kopete-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kbounce-14.12.1.tar.xz"; - sha256 = "1x726x5x6cpdnig0wmam7zzigj33afwswdmxxgspnpimkybwpy0f"; - name = "kbounce-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kbounce-14.12.1.tar.xz" ".tar"; store = "/nix/store/w5dhnrmkm982i7kw1j9j5rf09z22cka9-kbounce-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kbounce-14.12.1.tar.xz"; + sha256 = "1x726x5x6cpdnig0wmam7zzigj33afwswdmxxgspnpimkybwpy0f"; + name = "kbounce-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kanagram-14.12.1.tar.xz"; - sha256 = "07lz09armwr4j594pn30d617ngxcn8n3yxikm79ck5020gx4wvgx"; - name = "kanagram-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kanagram-14.12.1.tar.xz" ".tar"; store = "/nix/store/cxxfxxpmnk70i9cx0cgx7k6jdg32s73f-kanagram-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kanagram-14.12.1.tar.xz"; + sha256 = "07lz09armwr4j594pn30d617ngxcn8n3yxikm79ck5020gx4wvgx"; + name = "kanagram-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/zeroconf-ioslave-14.12.1.tar.xz"; - sha256 = "12ri1dbbzc9dwx2n843979yvh93a9yrzpprk9jdmjr1hkna8rgmy"; - name = "zeroconf-ioslave-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "zeroconf-ioslave-14.12.1.tar.xz" ".tar"; store = "/nix/store/5jhzsqxdfzh1zw1d103np2rm34jdj945-zeroconf-ioslave-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/zeroconf-ioslave-14.12.1.tar.xz"; + sha256 = "12ri1dbbzc9dwx2n843979yvh93a9yrzpprk9jdmjr1hkna8rgmy"; + name = "zeroconf-ioslave-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/libkeduvocdocument-14.12.1.tar.xz"; - sha256 = "0nqjcddjmapgadlkv97banjk5fh7p355hfxcbspksyndsgplz1hv"; - name = "libkeduvocdocument-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "libkeduvocdocument-14.12.1.tar.xz" ".tar"; store = "/nix/store/zcxv7zv41p63pij7d37wdp4hcll77ldc-libkeduvocdocument-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/libkeduvocdocument-14.12.1.tar.xz"; + sha256 = "0nqjcddjmapgadlkv97banjk5fh7p355hfxcbspksyndsgplz1hv"; + name = "libkeduvocdocument-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kmousetool-14.12.1.tar.xz"; - sha256 = "0k38qj2hv9k846fba4sxdg1biplbdn5hfmfhx5qmc6g6h8xrs2dr"; - name = "kmousetool-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kmousetool-14.12.1.tar.xz" ".tar"; store = "/nix/store/dv7j6rb4688zzlp36l45f2h0vzykvybj-kmousetool-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kmousetool-14.12.1.tar.xz"; + sha256 = "0k38qj2hv9k846fba4sxdg1biplbdn5hfmfhx5qmc6g6h8xrs2dr"; + name = "kmousetool-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kolourpaint-14.12.1.tar.xz"; - sha256 = "15vkd7i35myfi9m11p52g8x7dlkvf06fa400r9vbw321fza2gyjc"; - name = "kolourpaint-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kolourpaint-14.12.1.tar.xz" ".tar"; store = "/nix/store/dqi11m0gnkyrfppdlibvgv2gbycpjqm6-kolourpaint-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kolourpaint-14.12.1.tar.xz"; + sha256 = "15vkd7i35myfi9m11p52g8x7dlkvf06fa400r9vbw321fza2gyjc"; + name = "kolourpaint-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kgeography-14.12.1.tar.xz"; - sha256 = "04g2sw2r1i8kc85n9igk15kmk3hc8gdci52lxk4ca04bxcif7061"; - name = "kgeography-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kgeography-14.12.1.tar.xz" ".tar"; store = "/nix/store/zl0qg5scvgmzsq6c7l4s2rs4dh6v243h-kgeography-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kgeography-14.12.1.tar.xz"; + sha256 = "04g2sw2r1i8kc85n9igk15kmk3hc8gdci52lxk4ca04bxcif7061"; + name = "kgeography-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/dolphin-plugins-14.12.1.tar.xz"; - sha256 = "0sjfm5ry54h56vbbch11js50a70pvwbkinyxxgyvs6g260ngpkx2"; - name = "dolphin-plugins-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "dolphin-plugins-14.12.1.tar.xz" ".tar"; store = "/nix/store/1cknwl7y4djaq1cwjj3g38k8w8gi6zwc-dolphin-plugins-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/dolphin-plugins-14.12.1.tar.xz"; + sha256 = "0sjfm5ry54h56vbbch11js50a70pvwbkinyxxgyvs6g260ngpkx2"; + name = "dolphin-plugins-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kreversi-14.12.1.tar.xz"; - sha256 = "1011262n5zh6hji7xxgq3k2hkgh0hqhpvk9krw22plda4nww2xwc"; - name = "kreversi-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kreversi-14.12.1.tar.xz" ".tar"; store = "/nix/store/rbc1h7c1v7bdzgwxqw5xs2x19rn4z9q4-kreversi-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kreversi-14.12.1.tar.xz"; + sha256 = "1011262n5zh6hji7xxgq3k2hkgh0hqhpvk9krw22plda4nww2xwc"; + name = "kreversi-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kdepim-runtime-4.14.4.tar.xz"; - sha256 = "08axhahiqv77cr6ssvh1cadqjvv1064w5l94wxadnyq3vz8kl6kz"; - name = "kdepim-runtime-4.14.4.tar.xz"; + name = stdenv.lib.nameFromURL "kdepim-runtime-4.14.4.tar.xz" ".tar"; store = "/nix/store/rwsx6c3s4nc7vkcfk0c39jbp7f5f0rvp-kdepim-runtime-4.14.4.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kdepim-runtime-4.14.4.tar.xz"; + sha256 = "08axhahiqv77cr6ssvh1cadqjvv1064w5l94wxadnyq3vz8kl6kz"; + name = "kdepim-runtime-4.14.4.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kdf-14.12.1.tar.xz"; - sha256 = "1cvd7ydk277crv1wiw7sn72mv9lf5pqk56gylfmzr63mr7dyj5iz"; - name = "kdf-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kdf-14.12.1.tar.xz" ".tar"; store = "/nix/store/5caacq7s0yh79mqykwj5wydj3b5gyl83-kdf-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kdf-14.12.1.tar.xz"; + sha256 = "1cvd7ydk277crv1wiw7sn72mv9lf5pqk56gylfmzr63mr7dyj5iz"; + name = "kdf-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kiten-14.12.1.tar.xz"; - sha256 = "0518zbvgn3w00b7lxfivrgrp8xrpb09rf9cf9zdxdl2z37gxmvmv"; - name = "kiten-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kiten-14.12.1.tar.xz" ".tar"; store = "/nix/store/8dl8yv38wpv199jjgw3kdl8rajxnnc77-kiten-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kiten-14.12.1.tar.xz"; + sha256 = "0518zbvgn3w00b7lxfivrgrp8xrpb09rf9cf9zdxdl2z37gxmvmv"; + name = "kiten-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kdenetwork-strigi-analyzers-14.12.1.tar.xz"; - sha256 = "1xdb3hm7iad2wvbwqaa5bbqzgg6xdbbv68xfjajpx8k9cn20kh9r"; - name = "kdenetwork-strigi-analyzers-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kdenetwork-strigi-analyzers-14.12.1.tar.xz" ".tar"; store = "/nix/store/1widcjdd8hzy1dnabg9px06yjc0k7ncf-kdenetwork-strigi-analyzers-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kdenetwork-strigi-analyzers-14.12.1.tar.xz"; + sha256 = "1xdb3hm7iad2wvbwqaa5bbqzgg6xdbbv68xfjajpx8k9cn20kh9r"; + name = "kdenetwork-strigi-analyzers-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kcachegrind-14.12.1.tar.xz"; - sha256 = "01fa9b73ymym5qyd5lirb4cf6c37x02a1a9ls2qgzswflm557d49"; - name = "kcachegrind-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kcachegrind-14.12.1.tar.xz" ".tar"; store = "/nix/store/k4y83g821js66c35bc6x2r8m1924vd4f-kcachegrind-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kcachegrind-14.12.1.tar.xz"; + sha256 = "01fa9b73ymym5qyd5lirb4cf6c37x02a1a9ls2qgzswflm557d49"; + name = "kcachegrind-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kstars-14.12.1.tar.xz"; - sha256 = "08px9765vl6hpmy39wyhlbm4d3y5wh82w33g2fppx4d9bxmpz166"; - name = "kstars-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kstars-14.12.1.tar.xz" ".tar"; store = "/nix/store/plbszpr250pr7x41578a4b5n329wgl4l-kstars-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kstars-14.12.1.tar.xz"; + sha256 = "08px9765vl6hpmy39wyhlbm4d3y5wh82w33g2fppx4d9bxmpz166"; + name = "kstars-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kdepim-4.14.4.tar.xz"; - sha256 = "0jpbc84xv07j2qynkn4mhmwlldbmjg6v7dqc1028kfk7sbcahhf2"; - name = "kdepim-4.14.4.tar.xz"; + name = stdenv.lib.nameFromURL "kdepim-4.14.4.tar.xz" ".tar"; store = "/nix/store/shap58rcwhg13766v7zm28nxr6rn09gw-kdepim-4.14.4.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kdepim-4.14.4.tar.xz"; + sha256 = "0jpbc84xv07j2qynkn4mhmwlldbmjg6v7dqc1028kfk7sbcahhf2"; + name = "kdepim-4.14.4.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/ktuberling-14.12.1.tar.xz"; - sha256 = "1ghymw6ljvkd9wi4j0f1n8gjkhxfkqvmb8n36lasrfr27v57z68v"; - name = "ktuberling-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "ktuberling-14.12.1.tar.xz" ".tar"; store = "/nix/store/c4m2nwfbjwqgc9ydq6macg4zkmrsd7v6-ktuberling-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/ktuberling-14.12.1.tar.xz"; + sha256 = "1ghymw6ljvkd9wi4j0f1n8gjkhxfkqvmb8n36lasrfr27v57z68v"; + name = "ktuberling-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kblackbox-14.12.1.tar.xz"; - sha256 = "0cxyzlsvhw9rg3b9c558zbqr3ijbzyx5as9g92ald8w7qjja5jnv"; - name = "kblackbox-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kblackbox-14.12.1.tar.xz" ".tar"; store = "/nix/store/rnz72ryzp7mcxk83l71rw7br3k6hamr9-kblackbox-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kblackbox-14.12.1.tar.xz"; + sha256 = "0cxyzlsvhw9rg3b9c558zbqr3ijbzyx5as9g92ald8w7qjja5jnv"; + name = "kblackbox-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kalgebra-14.12.1.tar.xz"; - sha256 = "0pn4scp7y7ih60jaq39kanwgsc2aslb41v9xw8322kk8q4gyc8g4"; - name = "kalgebra-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kalgebra-14.12.1.tar.xz" ".tar"; store = "/nix/store/c3gmynlqgyhdx3nghhwgk8i85qqysjsj-kalgebra-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kalgebra-14.12.1.tar.xz"; + sha256 = "0pn4scp7y7ih60jaq39kanwgsc2aslb41v9xw8322kk8q4gyc8g4"; + name = "kalgebra-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kdeedu-data-14.12.1.tar.xz"; - sha256 = "0hyqwkva7bgi43fgad4caz8q4pcb9kx5czpc3d8nksk5q28a1llg"; - name = "kdeedu-data-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kdeedu-data-14.12.1.tar.xz" ".tar"; store = "/nix/store/53ksfs7gxzr33sgdbfxk4ydjzzl2c7y3-kdeedu-data-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kdeedu-data-14.12.1.tar.xz"; + sha256 = "0hyqwkva7bgi43fgad4caz8q4pcb9kx5czpc3d8nksk5q28a1llg"; + name = "kdeedu-data-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kigo-14.12.1.tar.xz"; - sha256 = "100rrip6w08ld2xgwdm2dryk8qa92dssdz0a0iykgklddq6dvxr1"; - name = "kigo-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kigo-14.12.1.tar.xz" ".tar"; store = "/nix/store/ggvs29ryi85ig0r9z3jq259kvyq1k1h0-kigo-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kigo-14.12.1.tar.xz"; + sha256 = "100rrip6w08ld2xgwdm2dryk8qa92dssdz0a0iykgklddq6dvxr1"; + name = "kigo-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/print-manager-14.12.1.tar.xz"; - sha256 = "1ad9a23cfivyzfgajg1bn10n2glp2ks8yqkl5f0xk5alyldzbir6"; - name = "print-manager-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "print-manager-14.12.1.tar.xz" ".tar"; store = "/nix/store/p445xkdbm1dqqb3p2x10rag6xccidp9c-print-manager-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/print-manager-14.12.1.tar.xz"; + sha256 = "1ad9a23cfivyzfgajg1bn10n2glp2ks8yqkl5f0xk5alyldzbir6"; + name = "print-manager-14.12.1.tar.xz"; + }; } { - url = "${mirror}/stable/applications/14.12.1/src/kshisen-14.12.1.tar.xz"; - sha256 = "1b0csn1ngpcwcl8iwv02hy1gb6hk13453khzgya6ckixk5szcdy7"; - name = "kshisen-14.12.1.tar.xz"; + name = stdenv.lib.nameFromURL "kshisen-14.12.1.tar.xz" ".tar"; store = "/nix/store/1hx5ws8bbzh0lnmjp0x8ln1s7rv3x62a-kshisen-14.12.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.1/src/kshisen-14.12.1.tar.xz"; + sha256 = "1b0csn1ngpcwcl8iwv02hy1gb6hk13453khzgya6ckixk5szcdy7"; + name = "kshisen-14.12.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "lskat-14.12.2.tar.xz" ".tar"; + store = "/nix/store/w24lqbmni5n7w2xdmw1khzixg9f2p64m-lskat-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/lskat-14.12.2.tar.xz"; + sha256 = "0c5zg0lkzcgf7ff1hqy6rh8cq5z4935p7rmm463pl933djpbl5bn"; + name = "lskat-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kpat-14.12.2.tar.xz" ".tar"; + store = "/nix/store/1w6n38dac3mslyfl5blf1cas013m9h8g-kpat-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kpat-14.12.2.tar.xz"; + sha256 = "1rhs752b3ncbpbmrc9zknww0dsihh3lvwvh629v1s6xc0vqvcar4"; + name = "kpat-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdesdk-strigi-analyzers-14.12.2.tar.xz" ".tar"; + store = "/nix/store/738qaln8qxvsdnqiy6adk9sh28rfjkgy-kdesdk-strigi-analyzers-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kdesdk-strigi-analyzers-14.12.2.tar.xz"; + sha256 = "08db2nhkw265i2dfbka5q6vm7bxbjywk1p52hhjc57a2qvqfb5ww"; + name = "kdesdk-strigi-analyzers-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "zeroconf-ioslave-14.12.2.tar.xz" ".tar"; + store = "/nix/store/fl2nm7vv3k36vyf2wml8pv4sskh53ycr-zeroconf-ioslave-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/zeroconf-ioslave-14.12.2.tar.xz"; + sha256 = "0jx35018amdcgmxi9c7alc4c80qywzakqdrzyq5i7jxjcl3y1ly0"; + name = "zeroconf-ioslave-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmix-14.12.2.tar.xz" ".tar"; + store = "/nix/store/jrmw028qjd86q4mjyasx64iyssaj7wk7-kmix-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kmix-14.12.2.tar.xz"; + sha256 = "1jx2mkrdx5jgrjr02snb199xradpxaw42dw8y7icbpmkihxmxry1"; + name = "kmix-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmag-14.12.2.tar.xz" ".tar"; + store = "/nix/store/g87b5njzgp7jrydvwvc2xwpnwv0p33kd-kmag-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kmag-14.12.2.tar.xz"; + sha256 = "0bcrr67v6h9vc69341b662z7dbgxm3yrazfkfsdlxp1ahqspl6w5"; + name = "kmag-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "mplayerthumbs-14.12.2.tar.xz" ".tar"; + store = "/nix/store/35izrbqhb52zlfs2x1qsjc0k1l2d1pkk-mplayerthumbs-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/mplayerthumbs-14.12.2.tar.xz"; + sha256 = "1kwpd3j64zm78qwn42q3kgipywdlcpvibng06x032yv6i8wmi6m1"; + name = "mplayerthumbs-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kbreakout-14.12.2.tar.xz" ".tar"; + store = "/nix/store/hqsma0ww8philxqp1hk22sk3lf711y4i-kbreakout-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kbreakout-14.12.2.tar.xz"; + sha256 = "12y03rbm13pg1c8xpgclklin5vjzsidyaiamhh5bqpqsxsqcnh5n"; + name = "kbreakout-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kreversi-14.12.2.tar.xz" ".tar"; + store = "/nix/store/cixkkb370365vic33rl9n9846ll44rqx-kreversi-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kreversi-14.12.2.tar.xz"; + sha256 = "05zkwswpy5sw9ab3gc012pgvl0wq8f2lb0qhdr96rvxgp8m273j5"; + name = "kreversi-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "jovie-14.12.2.tar.xz" ".tar"; + store = "/nix/store/xmvafr9hszzwndqazdzsn9i90cwi0afs-jovie-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/jovie-14.12.2.tar.xz"; + sha256 = "0yfn5n3n3knacvpr3cqiii0hldbxc6m09k1g53hlksay61s2r56v"; + name = "jovie-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-sr-14.12.2.tar.xz" ".tar"; + store = "/nix/store/yhs96yv9mv61pp521mpay8i0dgqlmm1y-kde-l10n-sr-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-sr-14.12.2.tar.xz"; + sha256 = "07f8x34q8bdcsvc3a76zpd0sjxnq5ja6ghl3d9a0a4ix0hyyv8zd"; + name = "kde-l10n-sr-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-hi-14.12.2.tar.xz" ".tar"; + store = "/nix/store/l2499bc6hfv5x284cs4bjvqbmbxr0aij-kde-l10n-hi-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-hi-14.12.2.tar.xz"; + sha256 = "12ky5zmds18n2sgivrnpds8qjkd64397ia9h8h9s5s9l3cwgipb2"; + name = "kde-l10n-hi-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-tr-14.12.2.tar.xz" ".tar"; + store = "/nix/store/kpcnzwp6wg76slwd2zdmzmg09iydims6-kde-l10n-tr-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-tr-14.12.2.tar.xz"; + sha256 = "1d326cxhfx0434x45lq9wgn5csvmclgd6fmyqzwlax88vm57gg62"; + name = "kde-l10n-tr-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-pl-14.12.2.tar.xz" ".tar"; + store = "/nix/store/p36g7i6w8hgsz3wdax3ldxzv3djmw258-kde-l10n-pl-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-pl-14.12.2.tar.xz"; + sha256 = "0knjhk0941qf28l4izz2ssfri88s09k0vxd3d6xblg51r6m0b2sk"; + name = "kde-l10n-pl-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-km-14.12.2.tar.xz" ".tar"; + store = "/nix/store/iyab41x341l7b1acprqv7azbdbxbd0lw-kde-l10n-km-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-km-14.12.2.tar.xz"; + sha256 = "108pcxflcbhisixivg6153sm8rrbdrrh6rbvxib307dh1q1sl7ix"; + name = "kde-l10n-km-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-eu-14.12.2.tar.xz" ".tar"; + store = "/nix/store/sqlfyy4bhzgnv75msvyv2m7sx8vwhb0g-kde-l10n-eu-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-eu-14.12.2.tar.xz"; + sha256 = "0x8dihag23ljyw50qpg3bqyhfg8p4f6k1daz2102wkqdbwhzk1ch"; + name = "kde-l10n-eu-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-nds-14.12.2.tar.xz" ".tar"; + store = "/nix/store/63qi174y5jw1cs3q0wzb5jk4j64q4zqp-kde-l10n-nds-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-nds-14.12.2.tar.xz"; + sha256 = "1nyz71cpin9cqffjaca9wv9s5v9n358agb1ncamg5iqj176cxvrl"; + name = "kde-l10n-nds-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-et-14.12.2.tar.xz" ".tar"; + store = "/nix/store/f4jmy4xgm9a50a4r6nlvjz61ihw3w14j-kde-l10n-et-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-et-14.12.2.tar.xz"; + sha256 = "1a4kih4lb4sqwasvqhqj06r37rj00vjlhwihlr7jk8z373yg6kk3"; + name = "kde-l10n-et-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ko-14.12.2.tar.xz" ".tar"; + store = "/nix/store/j4jf2n3bikb23kzg55i538jjhz7gn2jx-kde-l10n-ko-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ko-14.12.2.tar.xz"; + sha256 = "0vv4xdis64nc66i81fnilnkl8max6wm07kzwiqahdnrbrza8vqab"; + name = "kde-l10n-ko-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-kk-14.12.2.tar.xz" ".tar"; + store = "/nix/store/ha5w0palyj9b7ajwd5xdqppgjnx1vsv0-kde-l10n-kk-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-kk-14.12.2.tar.xz"; + sha256 = "0bvghaggmzm8a12gl2z6ykgf8qabiagjmmddiqihbnvdi27ia78c"; + name = "kde-l10n-kk-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-hu-14.12.2.tar.xz" ".tar"; + store = "/nix/store/9cjm0q29zj5p7if67m6ax4vp9bsp1xmq-kde-l10n-hu-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-hu-14.12.2.tar.xz"; + sha256 = "0s2h123kbylc9ijxv6yfj5l593zgy5ar843rn82jjpvfbq3qj11n"; + name = "kde-l10n-hu-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-fr-14.12.2.tar.xz" ".tar"; + store = "/nix/store/l1nsi3pqrb0wv2v650sa8xax75kpinxx-kde-l10n-fr-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-fr-14.12.2.tar.xz"; + sha256 = "01lkgx857vmxl90si1b55gyz27iqdbk7qkn5v40n356zzaicrxva"; + name = "kde-l10n-fr-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-sk-14.12.2.tar.xz" ".tar"; + store = "/nix/store/qmf7y72b47pnq0b0gmxhw3slsgmy2awf-kde-l10n-sk-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-sk-14.12.2.tar.xz"; + sha256 = "0diajsp56l6dg96m9nij834dmky1gh48wd8ji5zs37fvpmdc96r0"; + name = "kde-l10n-sk-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-es-14.12.2.tar.xz" ".tar"; + store = "/nix/store/var4wc2isqx94ay6lq8fnnynb1566sgm-kde-l10n-es-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-es-14.12.2.tar.xz"; + sha256 = "01ha5db71rzkr3a0mlq80ag0fagivvjh26ck0y8da101lgl01i4r"; + name = "kde-l10n-es-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ca-14.12.2.tar.xz" ".tar"; + store = "/nix/store/3h7wyirznwm4zh6flqq1j2hacayvm423-kde-l10n-ca-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ca-14.12.2.tar.xz"; + sha256 = "1gcypc9l95iry45vh4pl1i7hwrdnm4lgnwnfnw1l7016lhgfjr8m"; + name = "kde-l10n-ca-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-14.12.2.tar.xz" ".tar"; + store = "/nix/store/v1zrvmd2lvn0y3brh0j4h5k97sgqj6jn-kde-l10n-ca_valencia-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ca_valencia-14.12.2.tar.xz"; + sha256 = "0ivr9rxk220rxdw37yx5ipdd8ik43jn43b50cbanw6hx3h39bpiv"; + name = "kde-l10n-ca_valencia-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-cs-14.12.2.tar.xz" ".tar"; + store = "/nix/store/mi03yzrjslab56mj7qw22d2lzl2kk4pj-kde-l10n-cs-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-cs-14.12.2.tar.xz"; + sha256 = "0rb6wnw0944zpllm4cac063r7hl5rq28x3b5a6has0cz4mqk9jw9"; + name = "kde-l10n-cs-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ar-14.12.2.tar.xz" ".tar"; + store = "/nix/store/9lw0j1h2pwvl1zpcl8cjba2xqc7lwkp9-kde-l10n-ar-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ar-14.12.2.tar.xz"; + sha256 = "0nkv2pj4f3hjrv25l8kqm9cqv0j7h3crrzyqzq026zzz6znlq190"; + name = "kde-l10n-ar-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-nl-14.12.2.tar.xz" ".tar"; + store = "/nix/store/ix18mmzjf395q3wj2qcbpm1z9jvywm4k-kde-l10n-nl-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-nl-14.12.2.tar.xz"; + sha256 = "0izpvjmlh8yk1nnzpxa59n6lv4fk7575j8nwjapy0ynrknps4fff"; + name = "kde-l10n-nl-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-de-14.12.2.tar.xz" ".tar"; + store = "/nix/store/xa7h417v8b57fzimvggiyfx7hys197kz-kde-l10n-de-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-de-14.12.2.tar.xz"; + sha256 = "1y54csccymc7hpbsm8kjw4v9ypgvxqcqahwvan2x84fvn7p80inb"; + name = "kde-l10n-de-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-fa-14.12.2.tar.xz" ".tar"; + store = "/nix/store/44rprv2vwz090i48pnykzws4blyryxw8-kde-l10n-fa-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-fa-14.12.2.tar.xz"; + sha256 = "04qxb6qaj1cb174m6svd83m34fv8hwws8v4a20igkh09b5bl3dsx"; + name = "kde-l10n-fa-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-wa-14.12.2.tar.xz" ".tar"; + store = "/nix/store/5051arszznb40q77d34zcwnaaxwv5wx1-kde-l10n-wa-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-wa-14.12.2.tar.xz"; + sha256 = "08il92kssd4d1zdkks4777pk8l2n3k4abv589x8rja4rlmpxrscq"; + name = "kde-l10n-wa-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-nb-14.12.2.tar.xz" ".tar"; + store = "/nix/store/hvcw01d444zkmyw1zpds2mnw7xmx4wca-kde-l10n-nb-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-nb-14.12.2.tar.xz"; + sha256 = "1q461np49d0n0zhby9dd8knf7y3w9vi1r49bzlqwd1y4hb3alnms"; + name = "kde-l10n-nb-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-uk-14.12.2.tar.xz" ".tar"; + store = "/nix/store/xqqsvrfab53ybxfm0hq63bnlqpn6pz62-kde-l10n-uk-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-uk-14.12.2.tar.xz"; + sha256 = "0avr2c9drnkv7ndz9mqjayf6pivk6hbghmj6rli91lvqavjp6vlb"; + name = "kde-l10n-uk-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ug-14.12.2.tar.xz" ".tar"; + store = "/nix/store/kc6d1lkncc3djfn8zybhz6xzz7nzickb-kde-l10n-ug-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ug-14.12.2.tar.xz"; + sha256 = "17jizdwkfh3gfi9ykpszqw49fzswgps7xlbq9j8pjflyk36rya9i"; + name = "kde-l10n-ug-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-zh_TW-14.12.2.tar.xz" ".tar"; + store = "/nix/store/35mka79zjlplbis7b6dhiz48wls25gc6-kde-l10n-zh_TW-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-zh_TW-14.12.2.tar.xz"; + sha256 = "0h3nfp51w7r601d6rpi55nzrmpywp3dalwqjwx4a6rnlawf3s2hr"; + name = "kde-l10n-zh_TW-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-fi-14.12.2.tar.xz" ".tar"; + store = "/nix/store/qs4xzws3s0vamj17m98fxcqqvp8hyyw7-kde-l10n-fi-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-fi-14.12.2.tar.xz"; + sha256 = "1q8j8v7i7lz3qk22adr1cj0bs6qw36540bj0vdzpa3390fn3i2ra"; + name = "kde-l10n-fi-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-el-14.12.2.tar.xz" ".tar"; + store = "/nix/store/yz0rzw7m437glx49xdxp4zz7ic51g5nq-kde-l10n-el-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-el-14.12.2.tar.xz"; + sha256 = "0wcbzs0s1nqafa0hi0abb17yw3jnxcq2mxyk4h5p9g7q7pkvh6s8"; + name = "kde-l10n-el-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-bg-14.12.2.tar.xz" ".tar"; + store = "/nix/store/fcqsn91fsip4bi7y763y07i3ii4ji8zs-kde-l10n-bg-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-bg-14.12.2.tar.xz"; + sha256 = "099af2qdxjy8whfaw0hzmlywb7l7bmpssga90xyahr7nh6l8vwnz"; + name = "kde-l10n-bg-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-lt-14.12.2.tar.xz" ".tar"; + store = "/nix/store/nbb6gg7pc3yzjxs3gj7l0363i5d1bq1h-kde-l10n-lt-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-lt-14.12.2.tar.xz"; + sha256 = "1lkjmcj77mmk6lvh1h51k8i9nn33b0q9vgbampj33qgax1d7a4mk"; + name = "kde-l10n-lt-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-pa-14.12.2.tar.xz" ".tar"; + store = "/nix/store/92dr7l2vrh1j4bxj2zy21prpfb1v9ba6-kde-l10n-pa-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-pa-14.12.2.tar.xz"; + sha256 = "1fagcrjjm7s0kpkfflkjx6rbgzprf7qidpbgwzw3jjf501vfdpkn"; + name = "kde-l10n-pa-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-hr-14.12.2.tar.xz" ".tar"; + store = "/nix/store/2iqdi982l5gbh3ajibgznzxg6ryjn49p-kde-l10n-hr-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-hr-14.12.2.tar.xz"; + sha256 = "11dabhhz676ria4nwvkx49igzm481fl9996j3p6rzd4kbhrksgq0"; + name = "kde-l10n-hr-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-bs-14.12.2.tar.xz" ".tar"; + store = "/nix/store/rfkj26fa9pi0mraxd8mgnh758dhp0m7n-kde-l10n-bs-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-bs-14.12.2.tar.xz"; + sha256 = "1x4m0cksbiy25s8pynskmasy7kkzm8i8mp5dvsx3wsh0msf4pg1i"; + name = "kde-l10n-bs-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ga-14.12.2.tar.xz" ".tar"; + store = "/nix/store/sw87zcl7ddd68wlws5689h7r7g5bbcgl-kde-l10n-ga-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ga-14.12.2.tar.xz"; + sha256 = "0ayambdzdfnky6bwnk5ghnch18y4ran6inrb8v4i1c407zn74ydx"; + name = "kde-l10n-ga-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-zh_CN-14.12.2.tar.xz" ".tar"; + store = "/nix/store/id89acc90qgfqjcidjfsx1sn62yk7c56-kde-l10n-zh_CN-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-zh_CN-14.12.2.tar.xz"; + sha256 = "0876r1bp36w0iljrlhlnxfizapvw0h2qmpjnf5s7vf5iisrvsbrb"; + name = "kde-l10n-zh_CN-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ru-14.12.2.tar.xz" ".tar"; + store = "/nix/store/rki0855bdgqwi8ajwmnl9jdm1hgn18xs-kde-l10n-ru-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ru-14.12.2.tar.xz"; + sha256 = "0i2fb0fa1drg99m5k5d8sdv04g809c3dz507wlrb9bnmarapahhn"; + name = "kde-l10n-ru-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-gl-14.12.2.tar.xz" ".tar"; + store = "/nix/store/xhqd4bxhv3p1mwr4j7h59858dc782ycs-kde-l10n-gl-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-gl-14.12.2.tar.xz"; + sha256 = "1mpzxlk93bf50ajk3m9ly19fdn34rnpznap6bad05zj9wczin9km"; + name = "kde-l10n-gl-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-da-14.12.2.tar.xz" ".tar"; + store = "/nix/store/8p2ygqhbbzxmnrjjxyris3281bdklbm9-kde-l10n-da-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-da-14.12.2.tar.xz"; + sha256 = "1lqs9fpp1dj8r0mpnjy8m7aa9jg8iv30k7wdpxpcf634m2p06911"; + name = "kde-l10n-da-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-sl-14.12.2.tar.xz" ".tar"; + store = "/nix/store/gdrvx87d6y9q47alc0s2251dzm04wpdi-kde-l10n-sl-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-sl-14.12.2.tar.xz"; + sha256 = "01yj9wh5zr72vgxman2j49ihhcyxr2yw820g2cz68bbqh829riiq"; + name = "kde-l10n-sl-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-id-14.12.2.tar.xz" ".tar"; + store = "/nix/store/qcs4fdkjrkgva632nqyi1z24h517fvl7-kde-l10n-id-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-id-14.12.2.tar.xz"; + sha256 = "1cc1yfps29fakra3xfnnzf6blqsydx4r9scsd0w0f8xxk3mr87j7"; + name = "kde-l10n-id-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ja-14.12.2.tar.xz" ".tar"; + store = "/nix/store/klsqxbpagy7jj2ha51hqr7h9qpd4qg9s-kde-l10n-ja-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ja-14.12.2.tar.xz"; + sha256 = "0i7x21yvj3ipg96jmfqs7kaixqa82f5s58mpi34vyypcc1ap4731"; + name = "kde-l10n-ja-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-pt-14.12.2.tar.xz" ".tar"; + store = "/nix/store/lmg22mpi05l0944ihv9z72jg1i8xs2zc-kde-l10n-pt-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-pt-14.12.2.tar.xz"; + sha256 = "123j4h4bhy0xdhazl18yccp17283k98s4f09f24r5b54yzw5cs0k"; + name = "kde-l10n-pt-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-mr-14.12.2.tar.xz" ".tar"; + store = "/nix/store/pgw29ki339a22l9c7incm93qvmjhvwif-kde-l10n-mr-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-mr-14.12.2.tar.xz"; + sha256 = "02z4hq74gxgvcnx0za74zlyx01m407bc3219wiqb88ly5b6g59af"; + name = "kde-l10n-mr-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-he-14.12.2.tar.xz" ".tar"; + store = "/nix/store/4p5v5j7l1j5xvz83jilwmmg22v5pl1y0-kde-l10n-he-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-he-14.12.2.tar.xz"; + sha256 = "02lmsvdyw878hk55r5dqm065n3f1czgq0icspi25ibxgvhf0nmji"; + name = "kde-l10n-he-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-it-14.12.2.tar.xz" ".tar"; + store = "/nix/store/pzpmizw0hsfczli3wk7mihsad2ziwnjy-kde-l10n-it-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-it-14.12.2.tar.xz"; + sha256 = "09sfiv36q40sy9w3nqld89lgmpd8kba6xav683a28a1i0ipsjjbc"; + name = "kde-l10n-it-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ia-14.12.2.tar.xz" ".tar"; + store = "/nix/store/7gphdvwvll05pn6dn3wxydy66d4an0hc-kde-l10n-ia-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ia-14.12.2.tar.xz"; + sha256 = "03jkjrbgp59xiwrbj9hp55y3qhpcyg1gxwv0vcbvxaxpg1zg7s1x"; + name = "kde-l10n-ia-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-nn-14.12.2.tar.xz" ".tar"; + store = "/nix/store/6xryf5sf70rqzsp6zirfc85hbq8mq93q-kde-l10n-nn-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-nn-14.12.2.tar.xz"; + sha256 = "1wr73m10liqvd7fkq3gqh4y2ibwgm200cbk6dv58xr25jjh1ji2l"; + name = "kde-l10n-nn-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ro-14.12.2.tar.xz" ".tar"; + store = "/nix/store/zjdd8bp4639ylb7wr2h0a6zl4ka4hv5j-kde-l10n-ro-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ro-14.12.2.tar.xz"; + sha256 = "0p4b7bngb3j2xsixk3s5wks7050famwbh00cgdpq8gd02i01iplc"; + name = "kde-l10n-ro-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-is-14.12.2.tar.xz" ".tar"; + store = "/nix/store/hm9hivcnjbbhxnr2k1p95lfa57y9qpa0-kde-l10n-is-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-is-14.12.2.tar.xz"; + sha256 = "1fz1azj7z127zpf257hzavsd0r3k7j1gd3wgw5i9prr3n0xp589j"; + name = "kde-l10n-is-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-en_GB-14.12.2.tar.xz" ".tar"; + store = "/nix/store/hp26lgcf3jrgcqsrai43kvimlpq9gs48-kde-l10n-en_GB-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-en_GB-14.12.2.tar.xz"; + sha256 = "1vmgrbx31683j47na433h2sps961h5av1rkqrmspdpls32g3hjq4"; + name = "kde-l10n-en_GB-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-sv-14.12.2.tar.xz" ".tar"; + store = "/nix/store/y18jr4kswbh1qlhw83xyig9rri07yya3-kde-l10n-sv-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-sv-14.12.2.tar.xz"; + sha256 = "1a702cyyhg5dk9bmfxmpsyj4h9lk2hrm8rcdzwy6lmhvclgc4iqj"; + name = "kde-l10n-sv-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-pt_BR-14.12.2.tar.xz" ".tar"; + store = "/nix/store/bcssbybfddwdy45n5sfr8aw2a6xxpn27-kde-l10n-pt_BR-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-pt_BR-14.12.2.tar.xz"; + sha256 = "0lvjzcpv6j4i3xavkcbjbz17mxzj59rqiq9gxhvqnk6wihzwr3d1"; + name = "kde-l10n-pt_BR-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-lv-14.12.2.tar.xz" ".tar"; + store = "/nix/store/xszl4r8c43w086w15mf61lis5ar4ig24-kde-l10n-lv-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-lv-14.12.2.tar.xz"; + sha256 = "1i8xd2apf8gr657w8jzc2vj4s7izh1kpqnz1n75yk2b8gbr0aiqq"; + name = "kde-l10n-lv-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktimer-14.12.2.tar.xz" ".tar"; + store = "/nix/store/5bknljgh37bx5v4c0vnmigasa3xq3cka-ktimer-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/ktimer-14.12.2.tar.xz"; + sha256 = "15bar1j2var6i1jawq0nc4zkifl1qghciqyqavx39sm1cxphqirf"; + name = "ktimer-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksirk-14.12.2.tar.xz" ".tar"; + store = "/nix/store/xmalh942dl6rygwk4jxpirabx2l8n0j4-ksirk-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/ksirk-14.12.2.tar.xz"; + sha256 = "0ab8vbk5640jaq6r0f0f5nidf0xx62lb140hq42flmid0hw6ls57"; + name = "ksirk-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdenetwork-strigi-analyzers-14.12.2.tar.xz" ".tar"; + store = "/nix/store/hl424krxwgahhhykhwhq2lxmrjdvfrxh-kdenetwork-strigi-analyzers-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kdenetwork-strigi-analyzers-14.12.2.tar.xz"; + sha256 = "1802iy6w5wchj2lj6b7yp32nj4pbh1pn44v2pvhafg0nj49rn0iv"; + name = "kdenetwork-strigi-analyzers-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "cantor-14.12.2.tar.xz" ".tar"; + store = "/nix/store/sv2xx8whd4smmx447iaxg3akivyk74gs-cantor-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/cantor-14.12.2.tar.xz"; + sha256 = "0hcxr28083qadm7b6pjqh959dvj79dvymkigxv851ainvspr82km"; + name = "cantor-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkdeedu-14.12.2.tar.xz" ".tar"; + store = "/nix/store/ka3asqxgpas752w1h3agc2c1ka3brp19-libkdeedu-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/libkdeedu-14.12.2.tar.xz"; + sha256 = "0w7wkcr46fp3gidfgm4gp3q26vxp4szfbqmk4624ysrdi85aa6br"; + name = "libkdeedu-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "bomber-14.12.2.tar.xz" ".tar"; + store = "/nix/store/dw2kr8sgmcrw2p3vy1cqdq2jk93i7rmr-bomber-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/bomber-14.12.2.tar.xz"; + sha256 = "12ff8rikxb1x7j4b5jg41ph5pgp60vn133npzalq5vsldmrgj3h9"; + name = "bomber-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kopete-14.12.2.tar.xz" ".tar"; + store = "/nix/store/iifrjlqyrylq47kvmb7idgig4y05yp69-kopete-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kopete-14.12.2.tar.xz"; + sha256 = "025pwhvcidszg4mv8hw8hya9xvgw08yvkzigxsk4pjn5vm49y16i"; + name = "kopete-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "oxygen-icons-14.12.2.tar.xz" ".tar"; + store = "/nix/store/c1s7763fzbnnslcn95spcv0swp6gx3xb-oxygen-icons-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/oxygen-icons-14.12.2.tar.xz"; + sha256 = "0dc0zkl7ivigcf5vf72gqnijm8p64bq4ibqkr02k8yv7yqq123wz"; + name = "oxygen-icons-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmplot-14.12.2.tar.xz" ".tar"; + store = "/nix/store/ff917gin734l0i1w84xdq2s6hjkjjmwp-kmplot-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kmplot-14.12.2.tar.xz"; + sha256 = "1j7fnqi02pqwc0pgv0qgykm2hih5ncg7pbkwyskj5sds8xs86f55"; + name = "kmplot-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmahjongg-14.12.2.tar.xz" ".tar"; + store = "/nix/store/jv7gpjyhacvmdvbdy5j34nrm06zk2aig-kmahjongg-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kmahjongg-14.12.2.tar.xz"; + sha256 = "0dc9majrsg2fgl8s8wqyhyjl3d40qf4m7wxx9m7076sa2h8hj4g9"; + name = "kmahjongg-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kolf-14.12.2.tar.xz" ".tar"; + store = "/nix/store/x3c14mkaxp4swyxaa7js7yq1rgrx7gvf-kolf-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kolf-14.12.2.tar.xz"; + sha256 = "1yiq1sw6a74s8pq7cs4rl8rvawcb3rrw2kbwdgcaqvq0krgnlc8h"; + name = "kolf-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "bovo-14.12.2.tar.xz" ".tar"; + store = "/nix/store/habi2k9mvpz6l5lj2i2yfig6ghxrkf5g-bovo-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/bovo-14.12.2.tar.xz"; + sha256 = "0z20lywx4x4pqdbqqhz0m84vzml6kxn53sl17z0lgnf74zh0vqam"; + name = "bovo-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "audiocd-kio-14.12.2.tar.xz" ".tar"; + store = "/nix/store/qjs07i14179wq2gj40gcj99q0i7fgsmr-audiocd-kio-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/audiocd-kio-14.12.2.tar.xz"; + sha256 = "1lix6yzradscrr79b4fj5lqs1f6wlrzyr0qwk5mvb9g326p8c4sr"; + name = "audiocd-kio-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kaccessible-14.12.2.tar.xz" ".tar"; + store = "/nix/store/byi9jaq7vijdfqzbqyyl8plk0mgb6cf2-kaccessible-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kaccessible-14.12.2.tar.xz"; + sha256 = "1xq40cl7pqm65k9h3yvhn7zjb80z3lpqyp823wm6nz6qld4hr4bg"; + name = "kaccessible-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "konquest-14.12.2.tar.xz" ".tar"; + store = "/nix/store/47visnxvfz3h8wa0485wiq5659y5li8k-konquest-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/konquest-14.12.2.tar.xz"; + sha256 = "1h9ql9alyprh8ykfzfgj3nkch40hdp1vyfkshm5kaab15b657bgy"; + name = "konquest-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkdegames-14.12.2.tar.xz" ".tar"; + store = "/nix/store/ccx7yrjpgljpv0f61jlczmx738y7skpd-libkdegames-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/libkdegames-14.12.2.tar.xz"; + sha256 = "1pxq9gzw5m5i8d1v1d34mvmfr138hwfvq5z9pg2h9zw5y3hs9g7s"; + name = "libkdegames-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "dragon-14.12.2.tar.xz" ".tar"; + store = "/nix/store/swpywmriiwy1npn7k3gcazisra9gfzqb-dragon-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/dragon-14.12.2.tar.xz"; + sha256 = "0gd9zr9fj4r2789bi6f836y7m6df08p05vizdy04cf9s2hjkr9wy"; + name = "dragon-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "juk-14.12.2.tar.xz" ".tar"; + store = "/nix/store/nsrq6d9bini4804hkkzsny91rfxcgp01-juk-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/juk-14.12.2.tar.xz"; + sha256 = "08brdx7hfm48hmhc0rg0r3c4brb3mkb0r23j2ps0y210pwarkwh0"; + name = "juk-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "cervisia-14.12.2.tar.xz" ".tar"; + store = "/nix/store/vjbvvbnqg3fjghc19159ikqm6yii6z30-cervisia-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/cervisia-14.12.2.tar.xz"; + sha256 = "120a8brfllk6jybn4zpyj0w5bpv2dvibcqbh37qh9ld2h6v9rrr2"; + name = "cervisia-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdesdk-kioslaves-14.12.2.tar.xz" ".tar"; + store = "/nix/store/1nli1nsr1a3j7wprpjhwmmy418l6ibx4-kdesdk-kioslaves-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kdesdk-kioslaves-14.12.2.tar.xz"; + sha256 = "14vk4aqdwny4iidsvznfzss51k1376lp4v65bmqbpwf2kg6mis2s"; + name = "kdesdk-kioslaves-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdelibs-4.14.5.tar.xz" ".tar"; + store = "/nix/store/cr9ncrb5lfgi7nyrdqlrh2c3xlj2a5rp-kdelibs-4.14.5.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kdelibs-4.14.5.tar.xz"; + sha256 = "1jizh61vz83za06mb23hhakx99jf2c59c02fz5kld9mnxzzl5fgm"; + name = "kdelibs-4.14.5.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmousetool-14.12.2.tar.xz" ".tar"; + store = "/nix/store/9vi7j77n4x5qpl4jphl3cc52cc34wymq-kmousetool-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kmousetool-14.12.2.tar.xz"; + sha256 = "06ifiay1mxcfb0bzzcf14xkvd4iwy9va37x3jm0xxhy9641cxq7i"; + name = "kmousetool-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kalgebra-14.12.2.tar.xz" ".tar"; + store = "/nix/store/4v4hcxa9v1hykiypb159p0618nf0dij9-kalgebra-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kalgebra-14.12.2.tar.xz"; + sha256 = "10iz0vjn8mscgkb0vra8ac0rbdyw45xzz5rydlkczr9w3hxnccyy"; + name = "kalgebra-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "granatier-14.12.2.tar.xz" ".tar"; + store = "/nix/store/ilynhcqbrfbhafhvmbag1j7nrkiicszs-granatier-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/granatier-14.12.2.tar.xz"; + sha256 = "16v0pyjby6yyrqm64p4a0lkxf0bb50smkz680b1yp3mcc5nm22mw"; + name = "granatier-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "klines-14.12.2.tar.xz" ".tar"; + store = "/nix/store/64fb2pidpaccqzk5wddvvxma515fk6nl-klines-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/klines-14.12.2.tar.xz"; + sha256 = "10km97mbz9z816ki12jki46mb0h2829l24spiai9pk8mbvkyqx3w"; + name = "klines-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmines-14.12.2.tar.xz" ".tar"; + store = "/nix/store/1g8n4bq8p2dn5mvncb6a046kjmndgfpy-kmines-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kmines-14.12.2.tar.xz"; + sha256 = "04axmsgq3wcim5fs9jgwgbb9z7p0a96qxhm50s5dwk4lv6fhzzv9"; + name = "kmines-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "superkaramba-14.12.2.tar.xz" ".tar"; + store = "/nix/store/l32ji88v0j54mhvsqdg7ysqqalnwjx4p-superkaramba-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/superkaramba-14.12.2.tar.xz"; + sha256 = "0y3ld6hpbjjqkpmrpbxmznv5vjdiyh3rw6dqbygap33qvw6b3d0d"; + name = "superkaramba-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdiamond-14.12.2.tar.xz" ".tar"; + store = "/nix/store/67i12gxqd5p15vdl8b5a87xl28fn9aqv-kdiamond-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kdiamond-14.12.2.tar.xz"; + sha256 = "0g3al1p68q4ypdjrnq6sf738w84x3a2l71fpg7qb5kgpaixpspjj"; + name = "kdiamond-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kigo-14.12.2.tar.xz" ".tar"; + store = "/nix/store/inss9axxxz7szp7icfwsrms9jyc4c855-kigo-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kigo-14.12.2.tar.xz"; + sha256 = "09b5hdfh46mi5qpgq0j02qw2wfrsach6lw9ydg0ybplyfvmp27l5"; + name = "kigo-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdenetwork-filesharing-14.12.2.tar.xz" ".tar"; + store = "/nix/store/5dh19ycmzai2k5xwgiwmpi05nn60k089-kdenetwork-filesharing-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kdenetwork-filesharing-14.12.2.tar.xz"; + sha256 = "08parv67kilxh2nzgbmj3q9g6pzncjjr23rl6ylh3vv8p2vr2v5h"; + name = "kdenetwork-filesharing-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kajongg-14.12.2.tar.xz" ".tar"; + store = "/nix/store/px8xd5vjs7y6g7h4vyyiksn818waffy0-kajongg-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kajongg-14.12.2.tar.xz"; + sha256 = "1863hczxmzrwvkv2y7kj2anf56fpwih70plsa25mkmli6l5x120q"; + name = "kajongg-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdepimlibs-4.14.5.tar.xz" ".tar"; + store = "/nix/store/670zy2wyah5qw0rp7kmzdv9q3hl2cl25-kdepimlibs-4.14.5.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kdepimlibs-4.14.5.tar.xz"; + sha256 = "12p03dljr6sldl4pxww4gb18mrvdi61r85ippmljknr4sq26kd8m"; + name = "kdepimlibs-4.14.5.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksystemlog-14.12.2.tar.xz" ".tar"; + store = "/nix/store/nqwz22sa222dkr9a6mmgyc2k9xahbv8h-ksystemlog-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/ksystemlog-14.12.2.tar.xz"; + sha256 = "1j22944ham5x3y8qf7gka81nnq66f81lwrc65zmzvbf7vyj813kq"; + name = "ksystemlog-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kturtle-14.12.2.tar.xz" ".tar"; + store = "/nix/store/aw9ahw1ywy5m8k8j0a2l5qfg0n2n2yn6-kturtle-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kturtle-14.12.2.tar.xz"; + sha256 = "087wfff2qpl2shxjwj30lna480skx8j1z4rlvkbyywc645gd0afb"; + name = "kturtle-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kppp-14.12.2.tar.xz" ".tar"; + store = "/nix/store/6w3pnklzw2kd761dfg3ya4k0xawnyp27-kppp-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kppp-14.12.2.tar.xz"; + sha256 = "1hdywnsvpybfc5hcja2msfdim9g37pgggkjp4kkahc9gv62z1m0i"; + name = "kppp-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-base-artwork-14.12.2.tar.xz" ".tar"; + store = "/nix/store/bbi9jdxjb1hm2cd6flh08h7ql90m9ppw-kde-base-artwork-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-base-artwork-14.12.2.tar.xz"; + sha256 = "16jg0pm6wqqsl5g8hf55iacgxjh5x92shmf9263xpc1fiq29770c"; + name = "kde-base-artwork-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "artikulate-14.12.2.tar.xz" ".tar"; + store = "/nix/store/iq6qjaw0n37gq49r4lmkjzyasvghcss5-artikulate-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/artikulate-14.12.2.tar.xz"; + sha256 = "09jvjal3r6bl77aby1wzbpyr4rxqmghc759yrg1rbqca1filzd5w"; + name = "artikulate-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkdcraw-14.12.2.tar.xz" ".tar"; + store = "/nix/store/dawjc253wxbw6624zjr0v2yrq9i47v75-libkdcraw-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/libkdcraw-14.12.2.tar.xz"; + sha256 = "0xj3dhyz7mf65dqiw2zz6mp3xmfaczmr7axhy0h6z1ynbyl1vkcm"; + name = "libkdcraw-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdeartwork-14.12.2.tar.xz" ".tar"; + store = "/nix/store/zb2sqh3qjd53nmqhs9m24kag1f3dxiah-kdeartwork-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kdeartwork-14.12.2.tar.xz"; + sha256 = "1svw3ah03g751iy37i06kw4d6jzgc8yy9cjayf3xp80m37fpjlws"; + name = "kdeartwork-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "klickety-14.12.2.tar.xz" ".tar"; + store = "/nix/store/dmi1azffqm3c8gjk1d300a0a2jps2j4v-klickety-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/klickety-14.12.2.tar.xz"; + sha256 = "0rlp4bgzg7i892a89zrgaj0m1zwbb2g8ap9np3dpqljaf2la9rg3"; + name = "klickety-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kspaceduel-14.12.2.tar.xz" ".tar"; + store = "/nix/store/f5ycj631mpfnyb8mngzxmvgngyk6lsw8-kspaceduel-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kspaceduel-14.12.2.tar.xz"; + sha256 = "175n2jbx9m3yhsp10bj1fk9d2vfv2dlqd1qw7l3kmca5nr7ripzb"; + name = "kspaceduel-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kate-14.12.2.tar.xz" ".tar"; + store = "/nix/store/49b5c3cm0ysi2w89a161ysmirpmckcls-kate-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kate-14.12.2.tar.xz"; + sha256 = "0n6b5jcyb428gx9xflsqjs1jhk51n12yxyfzl6cvg29vai453fff"; + name = "kate-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kgpg-14.12.2.tar.xz" ".tar"; + store = "/nix/store/ddc07v0j09547gnspl7c7fgcrbvv0fk0-kgpg-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kgpg-14.12.2.tar.xz"; + sha256 = "1ihxkcx162jp4b2qgpwa65iq90n1bz21l6fli1z530247h7vzlbw"; + name = "kgpg-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "khangman-14.12.2.tar.xz" ".tar"; + store = "/nix/store/jvxwahcgixjygdvvyiprgwhi1c70cb5k-khangman-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/khangman-14.12.2.tar.xz"; + sha256 = "0piyyqvfawgk3mbm51saigaswcpbk86my5v8mvha220sgzamnj9l"; + name = "khangman-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kgoldrunner-14.12.2.tar.xz" ".tar"; + store = "/nix/store/whd0iampjk6i5fm234gcsly38sxh5nb6-kgoldrunner-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kgoldrunner-14.12.2.tar.xz"; + sha256 = "1ijykdnfslp2vp3y0ji0bbf9zj83rbcywvg0kgiza963vzhf7rcw"; + name = "kgoldrunner-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdesdk-thumbnailers-14.12.2.tar.xz" ".tar"; + store = "/nix/store/bvj41rw9x0014q6k67d2f6w8xqwpf9zi-kdesdk-thumbnailers-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kdesdk-thumbnailers-14.12.2.tar.xz"; + sha256 = "1jyn507y7h2j8cb6nblc2lcf16ld9rn9cvi4xhj4sq9ccz0w7vz1"; + name = "kdesdk-thumbnailers-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "amor-14.12.2.tar.xz" ".tar"; + store = "/nix/store/kpv805bhwfkn95rnp8hzl42c26h8678l-amor-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/amor-14.12.2.tar.xz"; + sha256 = "0wqh3csi0isfj3zpmsay5p38sbajfbrhkv6lms5nqr4k81kcpq55"; + name = "amor-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktux-14.12.2.tar.xz" ".tar"; + store = "/nix/store/jfkymr2flr7p986z1larn1i2qndrij8i-ktux-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/ktux-14.12.2.tar.xz"; + sha256 = "1pml908z08y0ik4d0rncavrg26lqvchza113kxmyxc7ak95bwypd"; + name = "ktux-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "rocs-14.12.2.tar.xz" ".tar"; + store = "/nix/store/vn70b248ilfjrxv9sz30c4m1czb5n6fl-rocs-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/rocs-14.12.2.tar.xz"; + sha256 = "1nb0xq051081wps0i3g6p6vawj89vaa27di1hi2nhm1y0hx95m1j"; + name = "rocs-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcachegrind-14.12.2.tar.xz" ".tar"; + store = "/nix/store/fxn7qcaa57vxyc2qfnxycfv8hpvqn190-kcachegrind-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kcachegrind-14.12.2.tar.xz"; + sha256 = "17v1ap9jfzlk30xhx9m5456bqky4m0iywvq34r8zpwkbg4a49la9"; + name = "kcachegrind-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktouch-14.12.2.tar.xz" ".tar"; + store = "/nix/store/bishs7m7snrvyrvcxhly4p4d148rmfxy-ktouch-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/ktouch-14.12.2.tar.xz"; + sha256 = "1c7mi9cs17z72hg9v44yki85lqsnl96vgrckz5qcvca2b4w3bjd3"; + name = "ktouch-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "svgpart-14.12.2.tar.xz" ".tar"; + store = "/nix/store/3l7a1yydrkd824xfjsxla8swzcv7r8rx-svgpart-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/svgpart-14.12.2.tar.xz"; + sha256 = "1zkc6p8ycpm4pa2p9yq4ajkcnqi8m3mmv8ghdgi2q3a58fvf2zz5"; + name = "svgpart-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmouth-14.12.2.tar.xz" ".tar"; + store = "/nix/store/xwq02smnzwz54i165vpgm8aaamcy02xp-kmouth-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kmouth-14.12.2.tar.xz"; + sha256 = "0qmh1kpl1asy5av976461i9fp81qan00jbqvfhi5dnli9zfrfmb9"; + name = "kmouth-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdegraphics-strigi-analyzer-14.12.2.tar.xz" ".tar"; + store = "/nix/store/vv15hxdzvvgj3xhw5pig0kbzm3206j72-kdegraphics-strigi-analyzer-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kdegraphics-strigi-analyzer-14.12.2.tar.xz"; + sha256 = "1acfdcg0h9kb6171lqqrnihvgynrp0har6frq0igpkz475crmkid"; + name = "kdegraphics-strigi-analyzer-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kruler-14.12.2.tar.xz" ".tar"; + store = "/nix/store/g13aw9ppjbwj5rcyy46ccp9yw81bxa2d-kruler-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kruler-14.12.2.tar.xz"; + sha256 = "08rwsmjbbaapgn98avagn8i3qmvw5fzq84snxy4a74dzf14aph5z"; + name = "kruler-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kollision-14.12.2.tar.xz" ".tar"; + store = "/nix/store/lzky584al80dy5xrwvax7xs974p5s5xq-kollision-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kollision-14.12.2.tar.xz"; + sha256 = "0v6hq3biiybrdd4lblzcadh5kpy21kjlkb5iqga95h7xxm6vd4dq"; + name = "kollision-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkcompactdisc-14.12.2.tar.xz" ".tar"; + store = "/nix/store/g6zkyj2i5s910qb9snnabr4ivklvgajn-libkcompactdisc-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/libkcompactdisc-14.12.2.tar.xz"; + sha256 = "0xi1yrls8nsq9flll9250yfqx076p0xdxrywpiivx3yv64znjz7h"; + name = "libkcompactdisc-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcharselect-14.12.2.tar.xz" ".tar"; + store = "/nix/store/fcm4sghdd7dl98zagm7xfg7lfcbhpi6p-kcharselect-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kcharselect-14.12.2.tar.xz"; + sha256 = "0fsmh3wsiz49wgc2l1p8caclhx03mmf4q7v7l72yf59c3pczh74c"; + name = "kcharselect-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "umbrello-14.12.2.tar.xz" ".tar"; + store = "/nix/store/r7gzmhlg6wlbhhxyx11n88pnd3qs1nbg-umbrello-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/umbrello-14.12.2.tar.xz"; + sha256 = "1p9sdwalzi5j59xplzzd96m8dsvzc1r1isbljgj55h8pc3sn1am2"; + name = "umbrello-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kapman-14.12.2.tar.xz" ".tar"; + store = "/nix/store/1dqlriz6zxb6ss4gq2ccswn6swzxk1fp-kapman-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kapman-14.12.2.tar.xz"; + sha256 = "00qdq5fabm6pljclchiqi0wa3cxdfxbiqs5vw86190ki23qgqfkw"; + name = "kapman-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "marble-14.12.2.tar.xz" ".tar"; + store = "/nix/store/hwhbjrqg3qycpsq6kxd17fmmic1iv1ls-marble-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/marble-14.12.2.tar.xz"; + sha256 = "04khv00h3w0i6igp8b4zh0xyyl7a3aqhbszj2qlpydghr1ghz2js"; + name = "marble-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "knavalbattle-14.12.2.tar.xz" ".tar"; + store = "/nix/store/b17whbxz6q409ghxcxaia83v95adkdrg-knavalbattle-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/knavalbattle-14.12.2.tar.xz"; + sha256 = "07a9z0s12v2f5irs3d93pqjsrwv4zs7sckgvsbgaklbxwar1p26n"; + name = "knavalbattle-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "klettres-14.12.2.tar.xz" ".tar"; + store = "/nix/store/krcpms45cvn7dnv22rp9bdri7v76bcvd-klettres-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/klettres-14.12.2.tar.xz"; + sha256 = "0ca23y3d2s2m4mzqvw3jknsns0da3gzhqa7g4hicl35v4cbi8w7z"; + name = "klettres-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkipi-14.12.2.tar.xz" ".tar"; + store = "/nix/store/b247bpgxvgl1msrrfah432n99hi6h4h2-libkipi-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/libkipi-14.12.2.tar.xz"; + sha256 = "0dp3n4awc4glwlnygq8k6119hxl2lq0l66a8a2m84bhgf1xqn05j"; + name = "libkipi-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "step-14.12.2.tar.xz" ".tar"; + store = "/nix/store/djjlbx20jk6pv82jrk626k183hkn65qx-step-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/step-14.12.2.tar.xz"; + sha256 = "1r11csc1hlkrydrznprdvq5sxnmhlpb1v08ns96bs27nxbz29zw4"; + name = "step-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kompare-14.12.2.tar.xz" ".tar"; + store = "/nix/store/n3w571knhskpnv263dv67vncy1h4613i-kompare-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kompare-14.12.2.tar.xz"; + sha256 = "0ma1kwn7psrffs2fn80did8gmv3cr527lb40n1jrvksq15fcfl5k"; + name = "kompare-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "krdc-14.12.2.tar.xz" ".tar"; + store = "/nix/store/r4q34i2lsi4dcpqvpqzc8c628l99nrh1-krdc-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/krdc-14.12.2.tar.xz"; + sha256 = "069gp9ahq78pl2ax77c4k0sfvb3g70gl9ph8ariarhh3f5lvzh25"; + name = "krdc-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kbounce-14.12.2.tar.xz" ".tar"; + store = "/nix/store/0wq7q4n2xxkw0vn49ajjv07b9yc316b8-kbounce-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kbounce-14.12.2.tar.xz"; + sha256 = "1iw6gwy01ri7kqc5qkk296rzbz3j1swhshxkv05vqpv69vwnfxpp"; + name = "kbounce-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kolourpaint-14.12.2.tar.xz" ".tar"; + store = "/nix/store/kbkrcfralyq2hal04r5qbsc9cw40yf2d-kolourpaint-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kolourpaint-14.12.2.tar.xz"; + sha256 = "1r0xs4pisaqg53nc6zgn7bh95346wsb9756d9lq6zgp8jf2lcs4h"; + name = "kolourpaint-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kiten-14.12.2.tar.xz" ".tar"; + store = "/nix/store/nb1lzzscqr6g5m770aw8zjqxmng6c23s-kiten-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kiten-14.12.2.tar.xz"; + sha256 = "1y1anhvdmcflkmhya24my80c2hfpnhw8w1b2mqqr4xyjbl0plaqs"; + name = "kiten-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkomparediff2-14.12.2.tar.xz" ".tar"; + store = "/nix/store/la8lyk56j0crfjfj1h9yjxgws3f9shbl-libkomparediff2-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/libkomparediff2-14.12.2.tar.xz"; + sha256 = "122078hvi34zg183r8i2ni37xi00bzv7nr5251lhgh0fd45d565i"; + name = "libkomparediff2-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kscd-14.12.2.tar.xz" ".tar"; + store = "/nix/store/h9n5pglbgwqxiwdpxf0zrkyfcnqvjgyh-kscd-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kscd-14.12.2.tar.xz"; + sha256 = "055fdr9l79xjcrl33sxmk82dsbchjjwgmd75dw0sbhwfxs99dvif"; + name = "kscd-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-dev-scripts-14.12.2.tar.xz" ".tar"; + store = "/nix/store/ah46p15xxk89lrydhxzvyl83q3jjs5mr-kde-dev-scripts-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-dev-scripts-14.12.2.tar.xz"; + sha256 = "1fclm5wvz58565fx366sia4cjqrb2cr843skw4jpzhh4wb1v9v8i"; + name = "kde-dev-scripts-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ark-14.12.2.tar.xz" ".tar"; + store = "/nix/store/v5cdrabvrfx1dvjibhzj6a1m200p53ks-ark-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/ark-14.12.2.tar.xz"; + sha256 = "1aj7dshigv25qki93drpfwgzdycvvh3kl52a0im7g2k6aj1yjg6b"; + name = "ark-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kamera-14.12.2.tar.xz" ".tar"; + store = "/nix/store/jgnxszypng4x7wlhz0rg8390bkh87lgf-kamera-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kamera-14.12.2.tar.xz"; + sha256 = "16zjdx7b1nqh0nfbz0qplvqhl2jnl6l0jc3lfxifiqxsbzr9wlrr"; + name = "kamera-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kapptemplate-14.12.2.tar.xz" ".tar"; + store = "/nix/store/mfrl2pk66facvk13mm0609ign7ilympz-kapptemplate-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kapptemplate-14.12.2.tar.xz"; + sha256 = "18dpbvdhi8qpfxhrcjkk71cr4b7gf6achg24gn6i4rcq8bbbv07m"; + name = "kapptemplate-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkexiv2-14.12.2.tar.xz" ".tar"; + store = "/nix/store/nqh3y6b9y2zgrkb07yrs07sqcxqmwwsv-libkexiv2-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/libkexiv2-14.12.2.tar.xz"; + sha256 = "0fjrvk2dcd4xzbs5v6nrabchkqbvf4qhljlc10797a378sdc8znp"; + name = "libkexiv2-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdegraphics-mobipocket-14.12.2.tar.xz" ".tar"; + store = "/nix/store/cf4mzk51419c0v7ld561gb8jk496qgaw-kdegraphics-mobipocket-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kdegraphics-mobipocket-14.12.2.tar.xz"; + sha256 = "1n2n2pd8ca5lnyv2r98jr4k9sm7lsvc5plw11xy28q829aayg8jj"; + name = "kdegraphics-mobipocket-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksquares-14.12.2.tar.xz" ".tar"; + store = "/nix/store/yl49rnhq8zxyprh004g1qnqiw148x8kj-ksquares-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/ksquares-14.12.2.tar.xz"; + sha256 = "11hznb7jdamq8hnbxggdj33jrhdnxzrhapc1rsj1ms546z01flnb"; + name = "ksquares-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kget-14.12.2.tar.xz" ".tar"; + store = "/nix/store/ahgf7lvgcy0fzg9wzwc0agi77bj652lx-kget-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kget-14.12.2.tar.xz"; + sha256 = "1jadb5x8bn80gwviw73cq715sw9hzx8lpj33d19vv18l2sqyb449"; + name = "kget-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-baseapps-14.12.2.tar.xz" ".tar"; + store = "/nix/store/cv1vcvvi2nfic2p51vv6jf1nc2dwv7jm-kde-baseapps-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-baseapps-14.12.2.tar.xz"; + sha256 = "05j034g5h9cd2xw64h5zyjl8biq66p3b0z4z0z0i4min4hp52f7w"; + name = "kde-baseapps-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcolorchooser-14.12.2.tar.xz" ".tar"; + store = "/nix/store/2rxc1y0r19zx61g6n9kgfp1rzgbs44xw-kcolorchooser-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kcolorchooser-14.12.2.tar.xz"; + sha256 = "063ahsbzd1mfrkc45gjsnhj11v68x7d1a718lxsabkjjx59qpbck"; + name = "kcolorchooser-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "okular-14.12.2.tar.xz" ".tar"; + store = "/nix/store/dg4a3cj0wssfw3z10bwqxqrkjk3dmqaj-okular-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/okular-14.12.2.tar.xz"; + sha256 = "1ahw7a8i1hxa8hw0407f9x1s02zn659nprx9bfi1mvxhcn5zbwq8"; + name = "okular-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "killbots-14.12.2.tar.xz" ".tar"; + store = "/nix/store/x89vahdh994ax46rl3mx3dxyigph3zq4-killbots-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/killbots-14.12.2.tar.xz"; + sha256 = "1zvjwimbjld408hplb439f4k8rm6aanlvycpmf4fdiwrcg4zjq6c"; + name = "killbots-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "krfb-14.12.2.tar.xz" ".tar"; + store = "/nix/store/3d0583a63pwkq8sszvl172d69j648gnq-krfb-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/krfb-14.12.2.tar.xz"; + sha256 = "112bv9yyhg7zyhkqavjqgvkzbjm54hw4nfqrj3jmcwbjbnlzkkxm"; + name = "krfb-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kfloppy-14.12.2.tar.xz" ".tar"; + store = "/nix/store/6sm1200z80xxra4ibjmpgi5b626is1kc-kfloppy-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kfloppy-14.12.2.tar.xz"; + sha256 = "0a738m6r54g4ibinxwh70d7sp736r8lr63ca8hx90a1yl5samr1b"; + name = "kfloppy-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kblackbox-14.12.2.tar.xz" ".tar"; + store = "/nix/store/i36hvnhadldbxl9yl9sgwzgbmip6nazh-kblackbox-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kblackbox-14.12.2.tar.xz"; + sha256 = "1j9d33k8732dbwdnv85kr51jmjvnlcljya5q2zp6m97cy7xrf3n5"; + name = "kblackbox-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kalzium-14.12.2.tar.xz" ".tar"; + store = "/nix/store/hnk7d2fjhvzd1j1c0pjc4kqh3a4zv7bv-kalzium-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kalzium-14.12.2.tar.xz"; + sha256 = "16ngwp9lf15l06yzazymrdbszkq9sx14wh4k8w1sydryl15xl77n"; + name = "kalzium-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkface-14.12.2.tar.xz" ".tar"; + store = "/nix/store/a6cidm1dwqxq34q0wffn8b553xwg3sxv-libkface-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/libkface-14.12.2.tar.xz"; + sha256 = "1mp19n7jhs9x74b8rlnrdc7ig1dx0v5pjvl6b4fmzfglk9akhh7v"; + name = "libkface-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kremotecontrol-14.12.2.tar.xz" ".tar"; + store = "/nix/store/zi3aqkz4w4s4ldzscvwby1r6xkldxpdb-kremotecontrol-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kremotecontrol-14.12.2.tar.xz"; + sha256 = "1sbzycb2b4s7v1lr6d7g4xqadwcxh5jlsl01jl3dpni83phxzk3q"; + name = "kremotecontrol-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kblocks-14.12.2.tar.xz" ".tar"; + store = "/nix/store/bpi59fwiqf4rn8xgkzkhyzr6ajv1d2la-kblocks-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kblocks-14.12.2.tar.xz"; + sha256 = "0wcb6sgbr7gm9hh3gb31zmw6rqmflzis44ry1zb7yql0kf95y5ka"; + name = "kblocks-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ffmpegthumbs-14.12.2.tar.xz" ".tar"; + store = "/nix/store/g4xg6d0syp06k3znj4xyiyv9ykiq64pf-ffmpegthumbs-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/ffmpegthumbs-14.12.2.tar.xz"; + sha256 = "1261dkxyj07gjs6rk7wh8vkxk9554b675d68w4yfzf4agb8kdb8b"; + name = "ffmpegthumbs-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdepim-runtime-4.14.5.tar.xz" ".tar"; + store = "/nix/store/0s00l7a87bg4qzbd43z7yp6pqff1icn4-kdepim-runtime-4.14.5.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kdepim-runtime-4.14.5.tar.xz"; + sha256 = "00pmiifhf6km9v2hn3xiapr4vwrrijnvyjirprs99p8h39kifblc"; + name = "kdepim-runtime-4.14.5.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "print-manager-14.12.2.tar.xz" ".tar"; + store = "/nix/store/1cdzh2b6wq0nmkvjx6spl70pj3538sl9-print-manager-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/print-manager-14.12.2.tar.xz"; + sha256 = "02vz69aj56hx9jdckacjd7yzr1cmwmlqd7b3n92zmn9bx152sx86"; + name = "print-manager-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdf-14.12.2.tar.xz" ".tar"; + store = "/nix/store/vk3f3512rv381dpcwihmxgx4av3d92af-kdf-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kdf-14.12.2.tar.xz"; + sha256 = "14dgcrmny2gvi3m4y95di6w3gv1bld6pbj5i5qaphhxk5gl489a0"; + name = "kdf-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-wallpapers-14.12.2.tar.xz" ".tar"; + store = "/nix/store/rslsx2zc6zf7hls6l1m598a04r6l2h7k-kde-wallpapers-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-wallpapers-14.12.2.tar.xz"; + sha256 = "1q9p1ay2n4anr822wx7lc45hwwyyl1328ick704x6kd1rz1qwjiq"; + name = "kde-wallpapers-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdegraphics-thumbnailers-14.12.2.tar.xz" ".tar"; + store = "/nix/store/2zkg1fh4kr78r8qg5nrn72k431vxd96z-kdegraphics-thumbnailers-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kdegraphics-thumbnailers-14.12.2.tar.xz"; + sha256 = "0kvqbdmjnrn5fx9ci9f4fnwk8b20d9cvxdb966cwrzz6x6rik7ww"; + name = "kdegraphics-thumbnailers-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "sweeper-14.12.2.tar.xz" ".tar"; + store = "/nix/store/pb6xr7b484aszpwr3pvd2pywliij31y0-sweeper-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/sweeper-14.12.2.tar.xz"; + sha256 = "1k0brig6m5y5pv05lmpmc0m6wiz981jyx1brhy3ixv40bivm4cf6"; + name = "sweeper-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "picmi-14.12.2.tar.xz" ".tar"; + store = "/nix/store/6im1sz3rqm53siyfapz4p518vaa05nvz-picmi-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/picmi-14.12.2.tar.xz"; + sha256 = "1xnxsvpigsf4mjnxxp5w5nvp817az7c7p11z960z5f18adxg7frr"; + name = "picmi-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksnakeduel-14.12.2.tar.xz" ".tar"; + store = "/nix/store/qprvh7y50d15356kdspb4cxqvm9xc30i-ksnakeduel-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/ksnakeduel-14.12.2.tar.xz"; + sha256 = "1gw9sv67jnwcxsm4qw21hjbv3fbnxw6ibr4l8zrcccahlz3lc8x1"; + name = "ksnakeduel-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksnapshot-14.12.2.tar.xz" ".tar"; + store = "/nix/store/yak0kczv35nhxbgr15mqr6zy9ncvg5jh-ksnapshot-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/ksnapshot-14.12.2.tar.xz"; + sha256 = "15ka0h8bc7n5023ghwgxvq36bjaipimcs09nrg3z4nvdzds6xsfr"; + name = "ksnapshot-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kgamma-14.12.2.tar.xz" ".tar"; + store = "/nix/store/xz6x2nvcwz2k7df7p8s8wx42309a2rhd-kgamma-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kgamma-14.12.2.tar.xz"; + sha256 = "1lzvgdqh3i8klnj243rfak6sksnh3z10diki65zzl8wsjyagizq9"; + name = "kgamma-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "okteta-14.12.2.tar.xz" ".tar"; + store = "/nix/store/ydd7za8ax4jb54rap067rzkwfv2ars7y-okteta-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/okteta-14.12.2.tar.xz"; + sha256 = "1xdyg54zzylj8s6zr4z5npi9pvqx3bjma68j3p7ymqvaa71a1c0n"; + name = "okteta-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kgeography-14.12.2.tar.xz" ".tar"; + store = "/nix/store/99n02c3v71ycxvywrqn14zrsjgli2nkz-kgeography-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kgeography-14.12.2.tar.xz"; + sha256 = "10bzwbxg4k487700mnkmk642b5jzvpadcmd8y3h3af91syd0v7zp"; + name = "kgeography-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "knetwalk-14.12.2.tar.xz" ".tar"; + store = "/nix/store/6z45z434l9dw981lqixg0jw7mb2s1j47-knetwalk-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/knetwalk-14.12.2.tar.xz"; + sha256 = "102bd37i3z57xkq6rs7l2s4qlwayaky4qb07bh3c589g2s9nxl28"; + name = "knetwalk-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkeduvocdocument-14.12.2.tar.xz" ".tar"; + store = "/nix/store/ypdsbibg2isd991n9bmdkgi5wi59ibnk-libkeduvocdocument-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/libkeduvocdocument-14.12.2.tar.xz"; + sha256 = "1rf2signnpx7ik3p7vrvlkbv0g3m280pc1qz1fxzw2kjn9ais2r7"; + name = "libkeduvocdocument-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdeedu-data-14.12.2.tar.xz" ".tar"; + store = "/nix/store/i5wnc7wqbmnac1awgd45iz9d91b7misv-kdeedu-data-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kdeedu-data-14.12.2.tar.xz"; + sha256 = "09ch89pghjipxsr9j50a58xww6cxhrkh9z7ns6bh5kg9b6hc47rq"; + name = "kdeedu-data-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "parley-14.12.2.tar.xz" ".tar"; + store = "/nix/store/lix9qbdd1ganlhwap696qdcyhq3awjgz-parley-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/parley-14.12.2.tar.xz"; + sha256 = "0kq0nm732x723f1yml0cq3w1p7ah5m3q0lj0pvrvg5z393a1ki14"; + name = "parley-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdepim-4.14.5.tar.xz" ".tar"; + store = "/nix/store/b3kdfd6nv23lziv5nf21g00wl7di3vz9-kdepim-4.14.5.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kdepim-4.14.5.tar.xz"; + sha256 = "07bg60b96wg107sn49h4phks55z6h69kdsznpfr09dsxf53vl2sc"; + name = "kdepim-4.14.5.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "blinken-14.12.2.tar.xz" ".tar"; + store = "/nix/store/aip7i17kab1fcv43qx999cxwr8b05gdp-blinken-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/blinken-14.12.2.tar.xz"; + sha256 = "1dkdgfmpccbpb4i4h34dg407q6h18mq7x4k2d66bly0pkwhkwkbw"; + name = "blinken-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "dolphin-plugins-14.12.2.tar.xz" ".tar"; + store = "/nix/store/hc68363pfz7k528lcv6p8gfj4r3bi061-dolphin-plugins-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/dolphin-plugins-14.12.2.tar.xz"; + sha256 = "0lc6l84p3ixk2wzj4hbxwgvsmin3kw8xw40b3jrq2w1y21zbvf3h"; + name = "dolphin-plugins-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kwalletmanager-14.12.2.tar.xz" ".tar"; + store = "/nix/store/6ycc8cckv9ybw5fj6qwn53ccn5dghcz0-kwalletmanager-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kwalletmanager-14.12.2.tar.xz"; + sha256 = "0bynykq9j6xh0a712934vyvq3yr94676xhdvf1iazky1cwwmiryi"; + name = "kwalletmanager-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kfourinline-14.12.2.tar.xz" ".tar"; + store = "/nix/store/vd8smizcfqw4zsks5sbf03chbxk9dqiq-kfourinline-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kfourinline-14.12.2.tar.xz"; + sha256 = "14s4lb9kygaa16sq4xfmmabv31kg3rw7dw7k2f4vwqqh3s1168yc"; + name = "kfourinline-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksudoku-14.12.2.tar.xz" ".tar"; + store = "/nix/store/rvr5bpfppyd168gfqimfavs9g4ys2412-ksudoku-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/ksudoku-14.12.2.tar.xz"; + sha256 = "10c148lksrh49mfvlx7q5i7xxjanhngm2s9d7ifx5xyqlpik2zcv"; + name = "ksudoku-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkcddb-14.12.2.tar.xz" ".tar"; + store = "/nix/store/j2pwfcwc6n5r8klnbxf0gpal2pinan7g-libkcddb-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/libkcddb-14.12.2.tar.xz"; + sha256 = "088hhnnm09xfqkc0j2l252qgl7nlqmsdbchbr5cninf8n9ivz99d"; + name = "libkcddb-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkmahjongg-14.12.2.tar.xz" ".tar"; + store = "/nix/store/gz25xkmky3kpl4hw2x9ahzr5xp3113f9-libkmahjongg-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/libkmahjongg-14.12.2.tar.xz"; + sha256 = "0min3bpd2h0lch4412ybryk1bn3rs2s4936kcjn6mn0412xyjvdf"; + name = "libkmahjongg-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcalc-14.12.2.tar.xz" ".tar"; + store = "/nix/store/g7hglkwmv8kdw0cjly5pysb3i4piapkx-kcalc-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kcalc-14.12.2.tar.xz"; + sha256 = "0vm861cd9y8ax7mfnv2aszip2z0grmjvhzp10x5f7gq1fhm1db64"; + name = "kcalc-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksaneplugin-14.12.2.tar.xz" ".tar"; + store = "/nix/store/m69i89q12sb8mpc1bhs0a2miyrkfnq7y-ksaneplugin-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/ksaneplugin-14.12.2.tar.xz"; + sha256 = "1scgp9p2jb5vwwdvbgmsbr3mmijiq40m5x7nd9qx7scwn2wqjvq9"; + name = "ksaneplugin-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "palapeli-14.12.2.tar.xz" ".tar"; + store = "/nix/store/cynl1ai536dqs4cnlji5db1jybpzh7s6-palapeli-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/palapeli-14.12.2.tar.xz"; + sha256 = "1fg2ikq19g92bqfp3j27mawl284xqiwd1nr8dg94khbb111210r7"; + name = "palapeli-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libksane-14.12.2.tar.xz" ".tar"; + store = "/nix/store/4qwqpcwraxr0a8wy81plb3l3ij3jh3s5-libksane-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/libksane-14.12.2.tar.xz"; + sha256 = "07nw3mjc645angwyllzff0hb7i7lp6wl3fw88zqd380w5j13a46h"; + name = "libksane-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-workspace-4.11.16.tar.xz" ".tar"; + store = "/nix/store/afz1vd72namq3xca96zx1c9l6n8jzk4p-kde-workspace-4.11.16.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-workspace-4.11.16.tar.xz"; + sha256 = "11mzr55vr7x2yym4gdaj9bcvp2qpbs3vlbfmhs74r5n08vmsdq3s"; + name = "kde-workspace-4.11.16.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kqtquickcharts-14.12.2.tar.xz" ".tar"; + store = "/nix/store/wbjy41ymgplkg26cm94k6vny2vjl6160-kqtquickcharts-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kqtquickcharts-14.12.2.tar.xz"; + sha256 = "0v5ng9spcbv22lhpx4hzfg3n56wfrjdxg6nls6sw52zbq12lagqn"; + name = "kqtquickcharts-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "lokalize-14.12.2.tar.xz" ".tar"; + store = "/nix/store/zl8sxjy6mp1z6r3dajvf5ly5zsiasxjd-lokalize-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/lokalize-14.12.2.tar.xz"; + sha256 = "04jmsysvx6ysyl3126bq7xg76y7ppzjfd55j7q7i18nrkcgw4y4i"; + name = "lokalize-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kig-14.12.2.tar.xz" ".tar"; + store = "/nix/store/0sf32n3kd0fyvp4sdyv5yk4abn8gy54w-kig-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kig-14.12.2.tar.xz"; + sha256 = "0c137jnkzpzv43yf7crymghybgz70d6q6mlfww53if2119sznzd4"; + name = "kig-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kanagram-14.12.2.tar.xz" ".tar"; + store = "/nix/store/gscz4fvz0xh0szcs0jr95xiif4115vj2-kanagram-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kanagram-14.12.2.tar.xz"; + sha256 = "1s2zn876b3css74r79acq6wys4qlq9xgb3z376xfl71rzadvisvf"; + name = "kanagram-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "katomic-14.12.2.tar.xz" ".tar"; + store = "/nix/store/mljg8qpz9axmnzw9jarzz82a4qarvbwn-katomic-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/katomic-14.12.2.tar.xz"; + sha256 = "0ns6apxaild1iiix03vjzvz45ba442agn4aqkbgik9x9wdr9yr7l"; + name = "katomic-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "filelight-14.12.2.tar.xz" ".tar"; + store = "/nix/store/3mm64rsb14p9cyhw31jzvqbs6nppva9x-filelight-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/filelight-14.12.2.tar.xz"; + sha256 = "047bki2gnwvflb57vij1576d12ml4ga9b1q44dz9rq97wwfbwqnj"; + name = "filelight-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcron-14.12.2.tar.xz" ".tar"; + store = "/nix/store/9whfiwhxk7v4cfj1s863w6i789kgcbpf-kcron-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kcron-14.12.2.tar.xz"; + sha256 = "02s782x69xrymv3wbjcfm52v246gn3illdga7g1rmhs7kmi6q7rg"; + name = "kcron-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kuser-14.12.2.tar.xz" ".tar"; + store = "/nix/store/dj7svyjh962g9c3j2bgprhmmnyi45pbj-kuser-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kuser-14.12.2.tar.xz"; + sha256 = "0p2qwv24qxzx637v5fjwzscvxa7j84j91s4c4gj5hq8939anx7q2"; + name = "kuser-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kteatime-14.12.2.tar.xz" ".tar"; + store = "/nix/store/8zydgf0ncr96fgvyya9rg32ahavxm4c0-kteatime-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kteatime-14.12.2.tar.xz"; + sha256 = "1vq21jw50w56i9bwx91hlw6a2m46q83mz2mg11cdc1nxk5gm1359"; + name = "kteatime-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "analitza-14.12.2.tar.xz" ".tar"; + store = "/nix/store/im52lp4p99k9fn2ja5hch6m6glmlk7da-analitza-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/analitza-14.12.2.tar.xz"; + sha256 = "0sjlsh8x4qzyg59zkvmrd312qvbhmf17349l0b989xm0m1nwmqfx"; + name = "analitza-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-dev-utils-14.12.2.tar.xz" ".tar"; + store = "/nix/store/5rmimmbz973alzhx2xm4r80lf556v14c-kde-dev-utils-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-dev-utils-14.12.2.tar.xz"; + sha256 = "007w4761cv2wxqhkk7mz2pgk7zmvzkfbmy0biriy836vx99xjdky"; + name = "kde-dev-utils-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-runtime-14.12.2.tar.xz" ".tar"; + store = "/nix/store/91wk4lximnfqs5ly2q340rqn87h84axl-kde-runtime-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kde-runtime-14.12.2.tar.xz"; + sha256 = "0cs07gbx7v6ilrbp4bgl20h1yrbh07sbrrf167pyd4lfx5rz9cgk"; + name = "kde-runtime-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "pairs-14.12.2.tar.xz" ".tar"; + store = "/nix/store/whl3f2bs6018bg3i10akdsjvky2wgvwd-pairs-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/pairs-14.12.2.tar.xz"; + sha256 = "0gs76fgyszs9lrvszi57vldx6avfyiz8hdg5axb7nmyikiqnislm"; + name = "pairs-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kiriki-14.12.2.tar.xz" ".tar"; + store = "/nix/store/adksl0r448kybmvhs10crw43isw90i3y-kiriki-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kiriki-14.12.2.tar.xz"; + sha256 = "0r7i6fh9apjhxc7khqb4lachqr95ypiagk7cr52kwpl8bd9zcz2p"; + name = "kiriki-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kwordquiz-14.12.2.tar.xz" ".tar"; + store = "/nix/store/qz2v6fj2akwll4s904z638pzwpyf18yx-kwordquiz-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kwordquiz-14.12.2.tar.xz"; + sha256 = "03isbq1dbq5w0pd8jpb93hp6z4nwi28q5ccszvldisfna5abpkjf"; + name = "kwordquiz-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kjumpingcube-14.12.2.tar.xz" ".tar"; + store = "/nix/store/jhh4r8rqhcx1jbqycy1i0x5x4ivqgjhg-kjumpingcube-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kjumpingcube-14.12.2.tar.xz"; + sha256 = "1a030z8bcxyj70in7g574p80hsm32b8s7mqnl3abmw4315dc43kf"; + name = "kjumpingcube-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "konsole-14.12.2.tar.xz" ".tar"; + store = "/nix/store/ahyi8a1vsdyr3zdkiljrwmjz73dxknwi-konsole-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/konsole-14.12.2.tar.xz"; + sha256 = "06rrhmmx8sdq084wb2a2pgvmi43fkjbmjsikr695c548qp76yzig"; + name = "konsole-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdewebdev-14.12.2.tar.xz" ".tar"; + store = "/nix/store/gm8jph57vbjm15f2w0k2qijghdm9v9yw-kdewebdev-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kdewebdev-14.12.2.tar.xz"; + sha256 = "0n4p7jflrrjq47wcy20avgjiz1c5qgwmw8nqxmaaxj8vnwk2vx37"; + name = "kdewebdev-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kstars-14.12.2.tar.xz" ".tar"; + store = "/nix/store/s6n79j8914ms33xvjrx74s22axlh20b3-kstars-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kstars-14.12.2.tar.xz"; + sha256 = "0fwfpjmr4i9kh1f3360ahhk01m8zrkipvdj0wn16a3mxvghr6vki"; + name = "kstars-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kubrick-14.12.2.tar.xz" ".tar"; + store = "/nix/store/kqvqadr6n5n2200w3gr5h978y6376gbv-kubrick-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kubrick-14.12.2.tar.xz"; + sha256 = "0r7w6787gc2kcvjgddr0lw0liihis4a5s8rim3ycjlmh60bfw2ac"; + name = "kubrick-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kshisen-14.12.2.tar.xz" ".tar"; + store = "/nix/store/2m09vphyfk4wfl4pzxns8lgh00nin1pa-kshisen-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kshisen-14.12.2.tar.xz"; + sha256 = "110fv7iqbv63sw0q8m1fj0x45ivmmhw2v32sx7my0hvch4rxif1f"; + name = "kshisen-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "gwenview-14.12.2.tar.xz" ".tar"; + store = "/nix/store/aq90r77wq4qs67j8dvw89zppbrj5rhgz-gwenview-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/gwenview-14.12.2.tar.xz"; + sha256 = "0ky9f8v3473f7ic2gaymc89f6yqnpi6vsbwlnqgjfwbq8ry47w4n"; + name = "gwenview-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kbruch-14.12.2.tar.xz" ".tar"; + store = "/nix/store/29vsbhggrymqqgvs490jxykrf6mhvmhg-kbruch-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/kbruch-14.12.2.tar.xz"; + sha256 = "12gs4l5wazkym3krcfc0sjzx9kji6ca3blmprw7hfwk1yqgd36rk"; + name = "kbruch-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktuberling-14.12.2.tar.xz" ".tar"; + store = "/nix/store/ccqbkxaxm7swcm1qf9rkvjs6fgfiafay-ktuberling-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/ktuberling-14.12.2.tar.xz"; + sha256 = "0y5icsgkypcr2z9w8zbhn9z877dak2kjf0if5ag1lpmjlj0y397h"; + name = "ktuberling-14.12.2.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "poxml-14.12.2.tar.xz" ".tar"; + store = "/nix/store/8i8lf5v6bi77ijr3b8xwny3yrapqnxrg-poxml-14.12.2.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/14.12.2/src/poxml-14.12.2.tar.xz"; + sha256 = "0d2iqgpxxfzvi9aim2xsz96gjpy1zcjr0f5fsha0hns6m6mdp1lh"; + name = "poxml-14.12.2.tar.xz"; + }; } ] diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 5e042579a84..343e53bc947 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -29,7 +29,10 @@ in with stdenv; mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ cmake makeWrapper qt ] + buildInputs = [ cmake makeWrapper ] + ++ (if useQt5 then [ qt.base ] else [ qt ]) + ++ (if useQt5 && (monolithic || daemon) then [ qt.script ] else []) + ++ (if useQt5 && previews then [ qt.webkit qt.webkitwidgets ] else []) ++ lib.optional withKDE kdelibs ++ lib.optional withKDE automoc4 ++ lib.optional withKDE phonon @@ -58,17 +61,17 @@ in with stdenv; mkDerivation rec { meta = with stdenv.lib; { homepage = http://quassel-irc.org/; - description = "Qt4/KDE4 distributed IRC client suppporting a remote daemon"; + description = "Qt4/KDE4/Qt5 distributed IRC client suppporting a remote daemon"; longDescription = '' Quassel IRC is a cross-platform, distributed IRC client, meaning that one (or multiple) client(s) can attach to and detach from a central core -- much like the popular combination of screen and a text-based IRC client such - as WeeChat, but graphical (based on Qt4/KDE4). + as WeeChat, but graphical (based on Qt4/KDE4 or Qt5). ''; license = stdenv.lib.licenses.gpl3; - maintainers = [ maintainers.phreedom ]; + maintainers = with maintainers; [ phreedom ttuegel ]; repositories.git = https://github.com/quassel/quassel.git; - inherit (qt.meta) platforms; + inherit ((if useQt5 then qt.base else qt).meta) platforms; }; } diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 97cc2f7e0a8..82930eb8bd8 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { libkate libtiger libv4l samba liboggz libass libdvbpsi libva xlibs.xlibs xlibs.libXv xlibs.libXvMC xlibs.libXpm xlibs.xcbutilkeysyms libdc1394 libraw1394 libopus libebml libmatroska libvdpau - ] ++ [(if withQt5 then qt5 else qt4)]; + ] ++ (if withQt5 then with qt5; [ base ] else [qt4]); nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/desktops/plasma-5.2/default.nix b/pkgs/desktops/plasma-5.2/default.nix index f647d2c553b..2384d926fc4 100644 --- a/pkgs/desktops/plasma-5.2/default.nix +++ b/pkgs/desktops/plasma-5.2/default.nix @@ -12,15 +12,15 @@ # make a copy of this directory first. After copying, be sure to delete ./tmp # if it exists. Then follow the minor update instructions. -{ autonix, kf56, pkgs, stdenv, debug ? false }: +{ autonix, kf5, pkgs, qt5, stdenv, debug ? false }: with stdenv.lib; with autonix; +let kf5Orig = kf5; in + let - kf5 = kf56.override { inherit debug; }; - - inherit (kf5) qt5; + kf5 = kf5Orig.override { inherit debug qt5; }; mirror = "mirror://kde"; @@ -38,7 +38,7 @@ let { LibBlueDevil = pkgs.libbluedevil; PolkitQt5-1 = pkgs.polkit_qt5.override { inherit qt5; }; - PopplerQt5 = (pkgs.poppler.override { inherit (kf5) qt5; }).poppler_qt5; + PopplerQt5 = (pkgs.poppler.override { inherit qt5; }).poppler_qt5; } // # packages from nixpkgs (with pkgs; @@ -90,7 +90,7 @@ let buildInputs = with kf5; with plasma5; [ kcompletion kconfig kconfigwidgets kcoreaddons kdecoration - frameworkintegration ki18n kwindowsystem qt5 + frameworkintegration ki18n kwindowsystem qt5.base qt5.x11extras ]; nativeBuildInputs = [ cmake kf5.extra-cmake-modules pkgconfig ]; cmakeFlags = [ "-DUSE_KDE4=OFF" ]; @@ -155,7 +155,7 @@ let in plasma5 // { - inherit scope; + inherit kf5 scope; startkde = pkgs.callPackage ./startkde { inherit (kf5) kconfig kinit kservice; inherit (plasma5) plasma-desktop plasma-workspace; diff --git a/pkgs/desktops/plasma-5.2/dependencies.nix b/pkgs/desktops/plasma-5.2/dependencies.nix index 74e519927d0..fe0b72c0daa 100644 --- a/pkgs/desktops/plasma-5.2/dependencies.nix +++ b/pkgs/desktops/plasma-5.2/dependencies.nix @@ -2,7 +2,7 @@ { }: { baloo = { - buildInputs = [ "ECM" "KF5" "KF5Auth" "KF5Config" "KF5Crash" "KF5FileMetaData" "KF5I18n" "KF5IdleTime" "KF5KDELibs4Support" "KF5KIO" "KF5Solid" "Qt5" "Xapian" ]; + buildInputs = [ "ECM" "KF5" "KF5Auth" "KF5Config" "KF5Crash" "KF5FileMetaData" "KF5I18n" "KF5IdleTime" "KF5KDELibs4Support" "KF5KIO" "KF5Solid" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5Quick" "Qt5Sql" "Qt5Test" "Qt5Widgets" "Xapian" ]; nativeBuildInputs = [ "cmake" ]; propagatedBuildInputs = [ "KF5CoreAddons" "KF5FileMetaData" "Qt5Core" "Xapian" ]; propagatedNativeBuildInputs = [ ]; @@ -10,7 +10,7 @@ }; bluedevil = { - buildInputs = [ "ECM" "KF5" "KF5CoreAddons" "KF5DBusAddons" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5MODULE" "KF5Notifications" "KF5WidgetsAddons" "LibBlueDevil" "Qt5" "SharedMimeInfo" ]; + buildInputs = [ "ECM" "KF5" "KF5CoreAddons" "KF5DBusAddons" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5MODULE" "KF5Notifications" "KF5WidgetsAddons" "LibBlueDevil" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Widgets" "SharedMimeInfo" ]; nativeBuildInputs = [ "cmake" ]; propagatedBuildInputs = [ ]; propagatedNativeBuildInputs = [ ]; @@ -18,7 +18,7 @@ }; breeze = { - buildInputs = [ "ECM" "KDE4" "KDecoration2" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5FrameworkIntegration" "KF5I18n" "KF5Service" "KF5WindowSystem" "PkgConfig" "Qt5" "XCB" ]; + buildInputs = [ "ECM" "KDE4" "KDecoration2" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5FrameworkIntegration" "KF5I18n" "KF5Service" "KF5WindowSystem" "PkgConfig" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Widgets" "Qt5X11Extras" "XCB" ]; nativeBuildInputs = [ "cmake" ]; propagatedBuildInputs = [ ]; propagatedNativeBuildInputs = [ ]; @@ -26,7 +26,7 @@ }; kde-cli-tools = { - buildInputs = [ "ECM" "KF5" "KF5Config" "KF5I18n" "KF5IconThemes" "KF5KCMUtils" "KF5KDELibs4Support" "KF5Su" "KF5WindowSystem" "Qt5" "Qt5Test" "Qt5X11Extras" "X11" ]; + buildInputs = [ "ECM" "KF5" "KF5Config" "KF5I18n" "KF5IconThemes" "KF5KCMUtils" "KF5KDELibs4Support" "KF5Su" "KF5WindowSystem" "Qt5" "Qt5DBus" "Qt5QUIET" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" ]; nativeBuildInputs = [ "cmake" ]; propagatedBuildInputs = [ ]; propagatedNativeBuildInputs = [ ]; @@ -34,7 +34,7 @@ }; kde-gtk-config = { - buildInputs = [ "ECM" "GTK2" "GTK3" "KF5" "KF5Archive" "KF5ConfigWidgets" "KF5I18n" "KF5KCMUtils" "KF5NewStuff" "Qt5" ]; + buildInputs = [ "ECM" "GTK2" "GTK3" "KF5" "KF5Archive" "KF5ConfigWidgets" "KF5I18n" "KF5KCMUtils" "KF5NewStuff" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" ]; nativeBuildInputs = [ "cmake" ]; propagatedBuildInputs = [ ]; propagatedNativeBuildInputs = [ ]; @@ -42,7 +42,7 @@ }; kdecoration = { - buildInputs = [ "ECM" "Qt5" ]; + buildInputs = [ "ECM" "Qt5" "Qt5Core" "Qt5Gui" "Qt5Test" ]; nativeBuildInputs = [ "cmake" ]; propagatedBuildInputs = [ "Qt5Gui" ]; propagatedNativeBuildInputs = [ ]; @@ -50,7 +50,7 @@ }; kdeplasma-addons = { - buildInputs = [ "ECM" "GIO" "GLIB2" "GObject" "IBus" "KDE4" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5Kross" "KF5Plasma" "KF5Runner" "KF5Service" "KF5UnitConversion" "KdepimLibs" "Kexiv2" "Lancelot" "Lancelot-Datamodels" "Qt5" "Qt5X11Extras" "SCIM" "SharedMimeInfo" "X11" "XCB" ]; + buildInputs = [ "ECM" "GIO" "GLIB2" "GObject" "IBus" "KDE4" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5Kross" "KF5Plasma" "KF5Runner" "KF5Service" "KF5UnitConversion" "KdepimLibs" "Kexiv2" "Lancelot" "Lancelot-Datamodels" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Qml" "Qt5Quick" "Qt5Widgets" "Qt5X11Extras" "SCIM" "SharedMimeInfo" "X11" "XCB" ]; nativeBuildInputs = [ "cmake" ]; propagatedBuildInputs = [ ]; propagatedNativeBuildInputs = [ ]; @@ -58,7 +58,7 @@ }; kfilemetadata = { - buildInputs = [ "ECM" "EPub" "Exiv2" "FFmpeg" "KF5" "KF5Archive" "KF5I18n" "PopplerQt5" "QMobipocket" "Qt5" "Taglib" ]; + buildInputs = [ "ECM" "EPub" "Exiv2" "FFmpeg" "KF5" "KF5Archive" "KF5I18n" "PopplerQt5" "QMobipocket" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Xml" "Taglib" ]; nativeBuildInputs = [ "cmake" ]; propagatedBuildInputs = [ "Qt5Core" ]; propagatedNativeBuildInputs = [ ]; @@ -66,7 +66,7 @@ }; khelpcenter = { - buildInputs = [ "ECM" "KF5" "KF5Config" "KF5I18n" "KF5Init" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KHtml" "Qt5" ]; + buildInputs = [ "ECM" "KF5" "KF5Config" "KF5I18n" "KF5Init" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KHtml" "Qt5" "Qt5DBus" "Qt5Widgets" ]; nativeBuildInputs = [ "cmake" ]; propagatedBuildInputs = [ ]; propagatedNativeBuildInputs = [ ]; @@ -74,7 +74,7 @@ }; khotkeys = { - buildInputs = [ "ECM" "KF5" "KF5DBusAddons" "KF5GlobalAccel" "KF5I18n" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5Plasma" "KF5XmlGui" "LibKWorkspace" "Qt5" "X11" ]; + buildInputs = [ "ECM" "KF5" "KF5DBusAddons" "KF5GlobalAccel" "KF5I18n" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5Plasma" "KF5XmlGui" "LibKWorkspace" "Qt5" "Qt5X11Extras" "X11" ]; nativeBuildInputs = [ "cmake" ]; propagatedBuildInputs = [ ]; propagatedNativeBuildInputs = [ ]; @@ -82,7 +82,7 @@ }; kinfocenter = { - buildInputs = [ "ECM" "EGL" "KF5" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5Service" "KF5Solid" "KF5Wayland" "KF5WidgetsAddons" "KF5XmlGui" "OpenGL" "OpenGLES" "PCIUTILS" "Qt5" "RAW1394" "X11" ]; + buildInputs = [ "ECM" "EGL" "KF5" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5Service" "KF5Solid" "KF5Wayland" "KF5WidgetsAddons" "KF5XmlGui" "OpenGL" "OpenGLES" "PCIUTILS" "Qt5" "Qt5Core" "Qt5Gui" "Qt5Widgets" "RAW1394" "X11" ]; nativeBuildInputs = [ "cmake" ]; propagatedBuildInputs = [ ]; propagatedNativeBuildInputs = [ ]; @@ -90,7 +90,7 @@ }; kio-extras = { - buildInputs = [ "ECM" "Exiv2" "JPEG" "KF5" "KF5Archive" "KF5Bookmarks" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5DNSSD" "KF5DocTools" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KDELibs4Support" "KF5KHtml" "KF5KIO" "KF5Pty" "KF5Solid" "LibSSH" "Mtp" "OpenEXR" "Phonon4Qt5" "Qt5" "Qt5Test" "SLP" "Samba" "SharedMimeInfo" ]; + buildInputs = [ "ECM" "Exiv2" "JPEG" "KF5" "KF5Archive" "KF5Bookmarks" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5DNSSD" "KF5DocTools" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KDELibs4Support" "KF5KHtml" "KF5KIO" "KF5Pty" "KF5Solid" "LibSSH" "Mtp" "OpenEXR" "Phonon4Qt5" "Qt5" "Qt5DBus" "Qt5Network" "Qt5QUIET" "Qt5Svg" "Qt5Test" "Qt5Widgets" "SLP" "Samba" "SharedMimeInfo" ]; nativeBuildInputs = [ "MD5SUM_EXECUTABLE" "cmake" ]; propagatedBuildInputs = [ ]; propagatedNativeBuildInputs = [ ]; @@ -98,7 +98,7 @@ }; kmenuedit = { - buildInputs = [ "ECM" "KF5" "KF5DBusAddons" "KF5I18n" "KF5IconThemes" "KF5KDELibs4Support" "KF5KIO" "KF5Sonnet" "KF5XmlGui" "KHotKeysDBusInterface" "Qt5" ]; + buildInputs = [ "ECM" "KF5" "KF5DBusAddons" "KF5I18n" "KF5IconThemes" "KF5KDELibs4Support" "KF5KIO" "KF5Sonnet" "KF5XmlGui" "KHotKeysDBusInterface" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Xml" ]; nativeBuildInputs = [ "cmake" ]; propagatedBuildInputs = [ ]; propagatedNativeBuildInputs = [ ]; @@ -106,7 +106,7 @@ }; kscreen = { - buildInputs = [ "ECM" "KF5" "KF5ConfigWidgets" "KF5DBusAddons" "KF5GlobalAccel" "KF5I18n" "KF5Screen" "KF5XmlGui" "Qt5" ]; + buildInputs = [ "ECM" "KF5" "KF5ConfigWidgets" "KF5DBusAddons" "KF5GlobalAccel" "KF5I18n" "KF5Screen" "KF5XmlGui" "Qt5" "Qt5QuickWidgets" "Qt5Test" "Qt5X11Extras" ]; nativeBuildInputs = [ "cmake" ]; propagatedBuildInputs = [ ]; propagatedNativeBuildInputs = [ ]; @@ -114,7 +114,7 @@ }; ksshaskpass = { - buildInputs = [ "ECM" "KF5" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "KF5Wallet" "KF5WidgetsAddons" "Qt5" ]; + buildInputs = [ "ECM" "KF5" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "KF5Wallet" "KF5WidgetsAddons" "Qt5" "Qt5Core" ]; nativeBuildInputs = [ "cmake" ]; propagatedBuildInputs = [ ]; propagatedNativeBuildInputs = [ ]; @@ -122,7 +122,7 @@ }; ksysguard = { - buildInputs = [ "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KDELibs4Support" "KF5NewStuff" "KF5SysGuard" "Qt5" "Sensors" ]; + buildInputs = [ "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KDELibs4Support" "KF5NewStuff" "KF5SysGuard" "Qt5" "Qt5Core" "Qt5Widgets" "Sensors" ]; nativeBuildInputs = [ "cmake" ]; propagatedBuildInputs = [ ]; propagatedNativeBuildInputs = [ ]; @@ -130,7 +130,7 @@ }; kwayland = { - buildInputs = [ "ECM" "Qt5" "Qt5Concurrent" "Qt5Widgets" "Wayland" "WaylandScanner" ]; + buildInputs = [ "ECM" "Qt5" "Qt5Concurrent" "Qt5Gui" "Qt5QUIET" "Qt5Test" "Qt5Widgets" "Wayland" "WaylandScanner" ]; nativeBuildInputs = [ "cmake" ]; propagatedBuildInputs = [ "Qt5Gui" ]; propagatedNativeBuildInputs = [ ]; @@ -138,7 +138,7 @@ }; kwin = { - buildInputs = [ "ECM" "EGL" "KDecoration2" "KF5" "KF5Activities" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5Declarative" "KF5DocTools" "KF5GlobalAccel" "KF5I18n" "KF5Init" "KF5KCMUtils" "KF5KIO" "KF5NewStuff" "KF5Notifications" "KF5Plasma" "KF5Service" "KF5Wayland" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "Libinput" "Qt5" "Qt5Multimedia" "Qt5Test" "UDev" "Wayland" "X11" "XCB" "XKB" "epoxy" ]; + buildInputs = [ "ECM" "EGL" "KDecoration2" "KF5" "KF5Activities" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5Declarative" "KF5DocTools" "KF5GlobalAccel" "KF5I18n" "KF5Init" "KF5KCMUtils" "KF5KIO" "KF5NewStuff" "KF5Notifications" "KF5Plasma" "KF5Service" "KF5Wayland" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "Libinput" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5DBus" "Qt5Multimedia" "Qt5QUIET" "Qt5Quick" "Qt5QuickWidgets" "Qt5Script" "Qt5Test" "Qt5UiTools" "Qt5Widgets" "Qt5X11Extras" "UDev" "Wayland" "X11" "XCB" "XKB" "epoxy" ]; nativeBuildInputs = [ "cmake" ]; propagatedBuildInputs = [ ]; propagatedNativeBuildInputs = [ ]; @@ -146,7 +146,7 @@ }; kwrited = { - buildInputs = [ "ECM" "KF5" "KF5CoreAddons" "KF5DBusAddons" "KF5I18n" "KF5Notifications" "KF5Pty" "Qt5" ]; + buildInputs = [ "ECM" "KF5" "KF5CoreAddons" "KF5DBusAddons" "KF5I18n" "KF5Notifications" "KF5Pty" "Qt5" "Qt5Widgets" ]; nativeBuildInputs = [ "cmake" ]; propagatedBuildInputs = [ ]; propagatedNativeBuildInputs = [ ]; @@ -154,7 +154,7 @@ }; libbluedevil = { - buildInputs = [ "Doxygen" "Qt5" ]; + buildInputs = [ "Doxygen" "Qt5" "Qt5Core" "Qt5DBus" ]; nativeBuildInputs = [ "cmake" ]; propagatedBuildInputs = [ ]; propagatedNativeBuildInputs = [ ]; @@ -162,7 +162,7 @@ }; libkscreen = { - buildInputs = [ "Doxygen" "ECM" "Qt5" "X11" "XCB" ]; + buildInputs = [ "Doxygen" "ECM" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Gui" "Qt5Test" "Qt5X11Extras" "X11" "XCB" ]; nativeBuildInputs = [ "cmake" ]; propagatedBuildInputs = [ "Qt5Core" ]; propagatedNativeBuildInputs = [ ]; @@ -170,7 +170,7 @@ }; libksysguard = { - buildInputs = [ "ECM" "KF5" "KF5Auth" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5Plasma" "KF5Service" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" "Qt5WebKitWidgets" "Qt5X11Extras" "X11" "ZLIB" ]; + buildInputs = [ "ECM" "KF5" "KF5Auth" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5Plasma" "KF5Service" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" "Qt5DBus" "Qt5Network" "Qt5Script" "Qt5Test" "Qt5WebKitWidgets" "Qt5Widgets" "Qt5X11Extras" "X11" "ZLIB" ]; nativeBuildInputs = [ "cmake" ]; propagatedBuildInputs = [ "KF5Config" "KF5I18n" "KF5IconThemes" "Qt5Core" "Qt5Network" "Qt5Widgets" ]; propagatedNativeBuildInputs = [ ]; @@ -178,7 +178,7 @@ }; libmm-qt = { - buildInputs = [ "ECM" "KF5ModemManagerQt" "ModemManager" "Qt4" "Qt5" ]; + buildInputs = [ "ECM" "KF5ModemManagerQt" "ModemManager" "Qt4" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Xml" ]; nativeBuildInputs = [ "cmake" ]; propagatedBuildInputs = [ "Qt5Core" ]; propagatedNativeBuildInputs = [ ]; @@ -186,7 +186,7 @@ }; milou = { - buildInputs = [ "ECM" "KF5" "KF5Declarative" "KF5I18n" "KF5Plasma" "KF5Runner" "KdepimLibs" "Qt5" ]; + buildInputs = [ "ECM" "KF5" "KF5Declarative" "KF5I18n" "KF5Plasma" "KF5Runner" "KdepimLibs" "Qt5" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5Script" "Qt5Test" "Qt5Widgets" ]; nativeBuildInputs = [ "cmake" ]; propagatedBuildInputs = [ ]; propagatedNativeBuildInputs = [ ]; @@ -194,7 +194,7 @@ }; muon = { - buildInputs = [ "AkabeiClient" "AppstreamQt" "BODEGA" "DebconfKDE" "ECM" "KF5" "KF5Attica" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5Declarative" "KF5I18n" "KF5KDELibs4Support" "KF5NewStuff" "KF5Notifications" "KF5Plasma" "KF5Solid" "KF5Wallet" "KF5WidgetsAddons" "Phonon4Qt5" "QApt" "Qca-qt5" "Qt5" "QtOAuth" "packagekitqt5" ]; + buildInputs = [ "AkabeiClient" "AppstreamQt" "BODEGA" "DebconfKDE" "ECM" "KF5" "KF5Attica" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5Declarative" "KF5I18n" "KF5KDELibs4Support" "KF5NewStuff" "KF5Notifications" "KF5Plasma" "KF5Solid" "KF5Wallet" "KF5WidgetsAddons" "Phonon4Qt5" "QApt" "Qca-qt5" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5Network" "Qt5Qml" "Qt5QuickWidgets" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5Xml" "QtOAuth" "packagekitqt5" ]; nativeBuildInputs = [ "cmake" ]; propagatedBuildInputs = [ ]; propagatedNativeBuildInputs = [ ]; @@ -202,7 +202,7 @@ }; oxygen = { - buildInputs = [ "ECM" "KDE4" "KDE4Workspace" "KF5" "KF5Completion" "KF5Config" "KF5FrameworkIntegration" "KF5GuiAddons" "KF5I18n" "KF5Service" "KF5WidgetsAddons" "KF5WindowSystem" "PkgConfig" "Qt5" "XCB" ]; + buildInputs = [ "ECM" "KDE4" "KDE4Workspace" "KF5" "KF5Completion" "KF5Config" "KF5FrameworkIntegration" "KF5GuiAddons" "KF5I18n" "KF5Service" "KF5WidgetsAddons" "KF5WindowSystem" "PkgConfig" "Qt5" "Qt5Widgets" "Qt5X11Extras" "XCB" ]; nativeBuildInputs = [ "cmake" ]; propagatedBuildInputs = [ ]; propagatedNativeBuildInputs = [ ]; @@ -218,7 +218,7 @@ }; plasma-desktop = { - buildInputs = [ "Boost" "ECM" "Fontconfig" "Freetype" "GLIB2" "KDE4" "KF5" "KF5Activities" "KF5Attica" "KF5Auth" "KF5Baloo" "KF5DocTools" "KF5Emoticons" "KF5I18n" "KF5ItemModels" "KF5KCMUtils" "KF5KDELibs4Support" "KF5NewStuff" "KF5NotifyConfig" "KF5Plasma" "KF5PlasmaQuick" "KF5Runner" "KF5Wallet" "KRunnerAppDBusInterface" "KSMServerDBusInterface" "KWinDBusInterface" "LibKWorkspace" "LibTaskManager" "OpenGL" "OpenGLES" "PackageKitQt5" "Phonon4Qt5" "PulseAudio" "Qt4" "Qt5" "ScreenSaverDBusInterface" "Strigi" "USB" "X11" "XCB" ]; + buildInputs = [ "Boost" "ECM" "Fontconfig" "Freetype" "GLIB2" "KDE4" "KF5" "KF5Activities" "KF5Attica" "KF5Auth" "KF5Baloo" "KF5DocTools" "KF5Emoticons" "KF5I18n" "KF5ItemModels" "KF5KCMUtils" "KF5KDELibs4Support" "KF5NewStuff" "KF5NotifyConfig" "KF5Plasma" "KF5PlasmaQuick" "KF5Runner" "KF5Wallet" "KRunnerAppDBusInterface" "KSMServerDBusInterface" "KWinDBusInterface" "LibKWorkspace" "LibTaskManager" "OpenGL" "OpenGLES" "PackageKitQt5" "Phonon4Qt5" "PulseAudio" "Qt4" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5Quick" "Qt5QuickWidgets" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "ScreenSaverDBusInterface" "Strigi" "USB" "X11" "XCB" ]; nativeBuildInputs = [ "cmake" ]; propagatedBuildInputs = [ ]; propagatedNativeBuildInputs = [ ]; @@ -226,7 +226,7 @@ }; plasma-nm = { - buildInputs = [ "ECM" "KF5" "KF5Completion" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5Declarative" "KF5I18n" "KF5IconThemes" "KF5Init" "KF5ItemViews" "KF5KDELibs4Support" "KF5KIO" "KF5ModemManagerQt" "KF5NetworkManagerQt" "KF5Notifications" "KF5Plasma" "KF5Service" "KF5Solid" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "MobileBroadbandProviderInfo" "ModemManager" "NetworkManager" "OpenConnect" "OpenSSL" "Qt5" ]; + buildInputs = [ "ECM" "KF5" "KF5Completion" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5Declarative" "KF5I18n" "KF5IconThemes" "KF5Init" "KF5ItemViews" "KF5KDELibs4Support" "KF5KIO" "KF5ModemManagerQt" "KF5NetworkManagerQt" "KF5Notifications" "KF5Plasma" "KF5Service" "KF5Solid" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "MobileBroadbandProviderInfo" "ModemManager" "NetworkManager" "OpenConnect" "OpenSSL" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Network" "Qt5Quick" "Qt5Widgets" ]; nativeBuildInputs = [ "cmake" ]; propagatedBuildInputs = [ ]; propagatedNativeBuildInputs = [ ]; @@ -234,7 +234,7 @@ }; plasma-workspace = { - buildInputs = [ "ECM" "KF5" "KF5Activities" "KF5Baloo" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5Declarative" "KF5DocTools" "KF5GlobalAccel" "KF5I18n" "KF5IdleTime" "KF5JsEmbed" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5NO_MODULE" "KF5NewStuff" "KF5NotifyConfig" "KF5Plasma" "KF5PlasmaQuick" "KF5Runner" "KF5Screen" "KF5Solid" "KF5Su" "KF5SysGuard" "KF5TextEditor" "KF5TextWidgets" "KF5Wallet" "KF5Wayland" "KF5WebKit" "KWinDBusInterface" "Phonon4Qt5" "Prison" "Qalculate" "Qt5" "Qt5DBus" "Qt5Qml" "Qt5Quick" "Qt5Script" "Qt5Test" "Qt5WebKitWidgets" "Wayland" "WaylandScanner" "X11" "XCB" "ZLIB" "dbusmenu-qt5" "libgps" ]; + buildInputs = [ "ECM" "KF5" "KF5Activities" "KF5Baloo" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5Declarative" "KF5DocTools" "KF5GlobalAccel" "KF5I18n" "KF5IdleTime" "KF5JsEmbed" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5NO_MODULE" "KF5NewStuff" "KF5NotifyConfig" "KF5Plasma" "KF5PlasmaQuick" "KF5Runner" "KF5Screen" "KF5Solid" "KF5Su" "KF5SysGuard" "KF5TextEditor" "KF5TextWidgets" "KF5Wallet" "KF5Wayland" "KF5WebKit" "KWinDBusInterface" "Phonon4Qt5" "Prison" "Qalculate" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5Network" "Qt5Qml" "Qt5Quick" "Qt5QuickWidgets" "Qt5Script" "Qt5Sql" "Qt5Test" "Qt5WebKitWidgets" "Qt5Widgets" "Qt5X11Extras" "Wayland" "WaylandScanner" "X11" "XCB" "ZLIB" "dbusmenu-qt5" "libgps" ]; nativeBuildInputs = [ "cmake" ]; propagatedBuildInputs = [ "KF5KIO" "KF5SysGuard" ]; propagatedNativeBuildInputs = [ ]; @@ -250,7 +250,7 @@ }; polkit-kde-agent = { - buildInputs = [ "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5I18n" "KF5IconThemes" "KF5Notifications" "KF5WidgetsAddons" "KF5WindowSystem" "PolkitQt5-1" "Qt5" ]; + buildInputs = [ "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5I18n" "KF5IconThemes" "KF5Notifications" "KF5WidgetsAddons" "KF5WindowSystem" "PolkitQt5-1" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Widgets" ]; nativeBuildInputs = [ "cmake" ]; propagatedBuildInputs = [ ]; propagatedNativeBuildInputs = [ ]; @@ -258,7 +258,7 @@ }; powerdevil = { - buildInputs = [ "ECM" "KF5" "KF5Auth" "KF5Config" "KF5GlobalAccel" "KF5I18n" "KF5IdleTime" "KF5KDELibs4Support" "KF5KIO" "KF5NotifyConfig" "KF5Solid" "LibKWorkspace" "Qt5" "ScreenSaverDBusInterface" "UDev" "X11" "XCB" ]; + buildInputs = [ "ECM" "KF5" "KF5Auth" "KF5Config" "KF5GlobalAccel" "KF5I18n" "KF5IdleTime" "KF5KDELibs4Support" "KF5KIO" "KF5NotifyConfig" "KF5Solid" "LibKWorkspace" "Qt5" "Qt5DBus" "Qt5Widgets" "Qt5X11Extras" "ScreenSaverDBusInterface" "UDev" "X11" "XCB" ]; nativeBuildInputs = [ "cmake" ]; propagatedBuildInputs = [ ]; propagatedNativeBuildInputs = [ ]; @@ -266,7 +266,7 @@ }; sddm-kcm = { - buildInputs = [ "ECM" "KF5" "KF5Auth" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5KIO" "KF5XmlGui" "Qt5" "X11" "XCB" ]; + buildInputs = [ "ECM" "KF5" "KF5Auth" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5KIO" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5Designer" "Qt5Gui" "Qt5Quick" "Qt5QuickWidgets" "Qt5Widgets" "Qt5X11Extras" "X11" "XCB" ]; nativeBuildInputs = [ "cmake" ]; propagatedBuildInputs = [ ]; propagatedNativeBuildInputs = [ ]; @@ -274,7 +274,7 @@ }; systemsettings = { - buildInputs = [ "ECM" "KF5" "KF5Config" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KCMUtils" "KF5KHtml" "KF5KIO" "KF5Service" "KF5WindowSystem" "KF5XmlGui" "Qt5" ]; + buildInputs = [ "ECM" "KF5" "KF5Config" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KCMUtils" "KF5KHtml" "KF5KIO" "KF5Service" "KF5WindowSystem" "KF5XmlGui" "Qt5" "Qt5Widgets" ]; nativeBuildInputs = [ "cmake" ]; propagatedBuildInputs = [ ]; propagatedNativeBuildInputs = [ ]; diff --git a/pkgs/desktops/plasma-5.2/manifest.nix b/pkgs/desktops/plasma-5.2/manifest.nix index 5eb5d3ff78f..23bfa7867be 100644 --- a/pkgs/desktops/plasma-5.2/manifest.nix +++ b/pkgs/desktops/plasma-5.2/manifest.nix @@ -1,214 +1,328 @@ # This file is generated automatically. DO NOT EDIT! -{ mirror }: +{ stdenv, fetchurl, mirror }: [ { - url = "${mirror}/stable/plasma/5.2.0/ksshaskpass-5.2.0.tar.xz"; - sha256 = "17xjlb1gwxcdxzfadv0brr6ainnw25m681p013na182zigx9f9bv"; - name = "ksshaskpass-5.2.0.tar.xz"; + name = stdenv.lib.nameFromURL "kwin-5.2.0.1.tar.xz" ".tar"; + store = "/nix/store/n6p747v05l1bs1l6802apii9wad8111v-kwin-5.2.0.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.0/kwin-5.2.0.1.tar.xz"; + sha256 = "0jfzrhcnfi4v8qa0hcj0hmvjq0gd7ampq9qvl0s4bd3n6g92pn5f"; + name = "kwin-5.2.0.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksshaskpass-5.2.0.tar.xz" ".tar"; store = "/nix/store/gv341fwlrzw3svd2vr5b8wxcjk93r64v-ksshaskpass-5.2.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.0/ksshaskpass-5.2.0.tar.xz"; + sha256 = "17xjlb1gwxcdxzfadv0brr6ainnw25m681p013na182zigx9f9bv"; + name = "ksshaskpass-5.2.0.tar.xz"; + }; } { - url = "${mirror}/stable/plasma/5.2.0/kio-extras-5.2.0.tar.xz"; - sha256 = "1c5qhp6axzbn5mla9q6qk0aalm0n4hvs6c4d9pclbcv58ysv3vw5"; - name = "kio-extras-5.2.0.tar.xz"; + name = stdenv.lib.nameFromURL "kio-extras-5.2.0.tar.xz" ".tar"; store = "/nix/store/iilra8kczb0waqigff390x2j2svkv5ba-kio-extras-5.2.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.0/kio-extras-5.2.0.tar.xz"; + sha256 = "1c5qhp6axzbn5mla9q6qk0aalm0n4hvs6c4d9pclbcv58ysv3vw5"; + name = "kio-extras-5.2.0.tar.xz"; + }; } { - url = "${mirror}/stable/plasma/5.2.0/kmenuedit-5.2.0.tar.xz"; - sha256 = "1qg7dh42lyp6mrckxjz07mmhk589d3wr080vljbm6hkgqm3aq7zr"; - name = "kmenuedit-5.2.0.tar.xz"; + name = stdenv.lib.nameFromURL "kmenuedit-5.2.0.tar.xz" ".tar"; store = "/nix/store/4qcwcvnyqnpa6b7my8aqrp6v2zadz91m-kmenuedit-5.2.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.0/kmenuedit-5.2.0.tar.xz"; + sha256 = "1qg7dh42lyp6mrckxjz07mmhk589d3wr080vljbm6hkgqm3aq7zr"; + name = "kmenuedit-5.2.0.tar.xz"; + }; } { - url = "${mirror}/stable/plasma/5.2.0/libbluedevil-5.2.0.tar.xz"; - sha256 = "0s06kn9aqkyyfj1n6cb2hhnnqymwzljavfwj0f88mrkjrdf65bq9"; - name = "libbluedevil-5.2.0.tar.xz"; + name = stdenv.lib.nameFromURL "libbluedevil-5.2.0.tar.xz" ".tar"; store = "/nix/store/d7nkh5p51ab5ag94yi3ggxjpbwn2k6g3-libbluedevil-5.2.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.0/libbluedevil-5.2.0.tar.xz"; + sha256 = "0s06kn9aqkyyfj1n6cb2hhnnqymwzljavfwj0f88mrkjrdf65bq9"; + name = "libbluedevil-5.2.0.tar.xz"; + }; } { - url = "${mirror}/stable/plasma/5.2.0/libkscreen-5.2.0.tar.xz"; - sha256 = "1v75qi7b0m8fqdj5b38ypwgp1djkg408a4csn57y3pjgp7k69k53"; - name = "libkscreen-5.2.0.tar.xz"; + name = stdenv.lib.nameFromURL "libkscreen-5.2.0.tar.xz" ".tar"; store = "/nix/store/49pgxmxbn2qs5dzgf3iiwcaazj9ipiy3-libkscreen-5.2.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.0/libkscreen-5.2.0.tar.xz"; + sha256 = "1v75qi7b0m8fqdj5b38ypwgp1djkg408a4csn57y3pjgp7k69k53"; + name = "libkscreen-5.2.0.tar.xz"; + }; } { - url = "${mirror}/stable/plasma/5.2.0/kde-gtk-config-5.2.0.tar.xz"; - sha256 = "1gafqrb5sg6jm4g3kivnwax05lq6gilzg8pc8k6dsnchyqzilbki"; - name = "kde-gtk-config-5.2.0.tar.xz"; + name = stdenv.lib.nameFromURL "kde-gtk-config-5.2.0.tar.xz" ".tar"; store = "/nix/store/vf2cvrr4p7ydz36ir0cjd3p0yqa3cwpj-kde-gtk-config-5.2.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.0/kde-gtk-config-5.2.0.tar.xz"; + sha256 = "1gafqrb5sg6jm4g3kivnwax05lq6gilzg8pc8k6dsnchyqzilbki"; + name = "kde-gtk-config-5.2.0.tar.xz"; + }; } { - url = "${mirror}/stable/plasma/5.2.0/kdeplasma-addons-5.2.0.tar.xz"; - sha256 = "168bl9g1s9piy0bwrx7f8pbvn3jamw1rp90rihydamm3s54p1ykw"; - name = "kdeplasma-addons-5.2.0.tar.xz"; + name = stdenv.lib.nameFromURL "kdeplasma-addons-5.2.0.tar.xz" ".tar"; store = "/nix/store/4qgb1w08k6ffyipfwbrj19pgpihg3pk7-kdeplasma-addons-5.2.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.0/kdeplasma-addons-5.2.0.tar.xz"; + sha256 = "168bl9g1s9piy0bwrx7f8pbvn3jamw1rp90rihydamm3s54p1ykw"; + name = "kdeplasma-addons-5.2.0.tar.xz"; + }; } { - url = "${mirror}/stable/plasma/5.2.0/plasma-desktop-5.2.0.tar.xz"; - sha256 = "0xld7kxa8p78kw5f1a75nc0n69jn6vfp8nm40qqdhy2y3m5cc8p9"; - name = "plasma-desktop-5.2.0.tar.xz"; + name = stdenv.lib.nameFromURL "plasma-desktop-5.2.0.tar.xz" ".tar"; store = "/nix/store/sjqqnbp8s802rz6ydn3if77hr57njwpk-plasma-desktop-5.2.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.0/plasma-desktop-5.2.0.tar.xz"; + sha256 = "0xld7kxa8p78kw5f1a75nc0n69jn6vfp8nm40qqdhy2y3m5cc8p9"; + name = "plasma-desktop-5.2.0.tar.xz"; + }; } { - url = "${mirror}/stable/plasma/5.2.0/systemsettings-5.2.0.tar.xz"; - sha256 = "0yk1zn0kkjb9rcmqa2n10igcnk2fm06gfn7fgb4mcb2vjvv7a8y0"; - name = "systemsettings-5.2.0.tar.xz"; + name = stdenv.lib.nameFromURL "systemsettings-5.2.0.tar.xz" ".tar"; store = "/nix/store/b0pjfkpqsvfywawinn6a3q42r675q0gw-systemsettings-5.2.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.0/systemsettings-5.2.0.tar.xz"; + sha256 = "0yk1zn0kkjb9rcmqa2n10igcnk2fm06gfn7fgb4mcb2vjvv7a8y0"; + name = "systemsettings-5.2.0.tar.xz"; + }; } { - url = "${mirror}/stable/plasma/5.2.0/polkit-kde-agent-1-5.2.0.tar.xz"; - sha256 = "14b5z2ijlrv7h2bh6dxyd6r4qschzh1l2iqix63nbfa5nxyfc67q"; - name = "polkit-kde-agent-1-5.2.0.tar.xz"; + name = stdenv.lib.nameFromURL "polkit-kde-agent-1-5.2.0.tar.xz" ".tar"; store = "/nix/store/ri0bgnblm2s7jsyvarvn0nrmnsgbv9wv-polkit-kde-agent-1-5.2.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.0/polkit-kde-agent-1-5.2.0.tar.xz"; + sha256 = "14b5z2ijlrv7h2bh6dxyd6r4qschzh1l2iqix63nbfa5nxyfc67q"; + name = "polkit-kde-agent-1-5.2.0.tar.xz"; + }; } { - url = "${mirror}/stable/plasma/5.2.0/milou-5.2.0.tar.xz"; - sha256 = "02gd7012zbiaxhb6wliapfcb4spjrdgnhvhl3y64ixqrx2b032a5"; - name = "milou-5.2.0.tar.xz"; + name = stdenv.lib.nameFromURL "milou-5.2.0.tar.xz" ".tar"; store = "/nix/store/gsmn9sv15f7iwk8hbh074rnm03ig5yhi-milou-5.2.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.0/milou-5.2.0.tar.xz"; + sha256 = "02gd7012zbiaxhb6wliapfcb4spjrdgnhvhl3y64ixqrx2b032a5"; + name = "milou-5.2.0.tar.xz"; + }; } { - url = "${mirror}/stable/plasma/5.2.0/kinfocenter-5.2.0.tar.xz"; - sha256 = "151flq4w6m94jgfrzbf3w3v11xybx92xd0nv0bdh5vvaxg97dac9"; - name = "kinfocenter-5.2.0.tar.xz"; + name = stdenv.lib.nameFromURL "kinfocenter-5.2.0.tar.xz" ".tar"; store = "/nix/store/xfnj3gy03ynfaazy82gkxijm9fykwk4x-kinfocenter-5.2.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.0/kinfocenter-5.2.0.tar.xz"; + sha256 = "151flq4w6m94jgfrzbf3w3v11xybx92xd0nv0bdh5vvaxg97dac9"; + name = "kinfocenter-5.2.0.tar.xz"; + }; } { - url = "${mirror}/stable/plasma/5.2.0/kdecoration-5.2.0.tar.xz"; - sha256 = "135i1maqp0q9aa312l0dqfkmxjq12mri2zjwg03wzgmmy5b9wm52"; - name = "kdecoration-5.2.0.tar.xz"; + name = stdenv.lib.nameFromURL "kdecoration-5.2.0.tar.xz" ".tar"; store = "/nix/store/dqqb6cvwcd43yanifka0kmx1pdhryjcj-kdecoration-5.2.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.0/kdecoration-5.2.0.tar.xz"; + sha256 = "135i1maqp0q9aa312l0dqfkmxjq12mri2zjwg03wzgmmy5b9wm52"; + name = "kdecoration-5.2.0.tar.xz"; + }; } { - url = "${mirror}/stable/plasma/5.2.0/kde-cli-tools-5.2.0.tar.xz"; - sha256 = "0lr3ir8kfq1x0yn0ahhlks0ikxxqbyj6jdmkdlr8hz5ivcpr64mq"; - name = "kde-cli-tools-5.2.0.tar.xz"; + name = stdenv.lib.nameFromURL "kde-cli-tools-5.2.0.tar.xz" ".tar"; store = "/nix/store/zfnbl0kbh4x3lpalc7irjgynl53mcf52-kde-cli-tools-5.2.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.0/kde-cli-tools-5.2.0.tar.xz"; + sha256 = "0lr3ir8kfq1x0yn0ahhlks0ikxxqbyj6jdmkdlr8hz5ivcpr64mq"; + name = "kde-cli-tools-5.2.0.tar.xz"; + }; } { - url = "${mirror}/stable/plasma/5.2.0/kscreen-5.2.0.tar.xz"; - sha256 = "09f77vszpni93ahm31gsb7lg4lidchppa1kd9s8q98yf2rb9hl55"; - name = "kscreen-5.2.0.tar.xz"; + name = stdenv.lib.nameFromURL "kscreen-5.2.0.tar.xz" ".tar"; store = "/nix/store/w2gq2s7lgf637qn0f5a0dh06i7mkjhki-kscreen-5.2.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.0/kscreen-5.2.0.tar.xz"; + sha256 = "09f77vszpni93ahm31gsb7lg4lidchppa1kd9s8q98yf2rb9hl55"; + name = "kscreen-5.2.0.tar.xz"; + }; } { - url = "${mirror}/stable/plasma/5.2.0/plasma-workspace-wallpapers-5.2.0.tar.xz"; - sha256 = "1xb500w5y9jn6xyayw5v28qsy6xp0pfb3ydciga77h1xd59wp0ym"; - name = "plasma-workspace-wallpapers-5.2.0.tar.xz"; + name = stdenv.lib.nameFromURL "plasma-workspace-wallpapers-5.2.0.tar.xz" ".tar"; store = "/nix/store/3rzwgwlzbmin9sjpp614bavjmrqqwk9x-plasma-workspace-wallpapers-5.2.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.0/plasma-workspace-wallpapers-5.2.0.tar.xz"; + sha256 = "1xb500w5y9jn6xyayw5v28qsy6xp0pfb3ydciga77h1xd59wp0ym"; + name = "plasma-workspace-wallpapers-5.2.0.tar.xz"; + }; } { - url = "${mirror}/stable/plasma/5.2.0/sddm-kcm-5.2.0.tar.xz"; - sha256 = "0ds4qlgwzbpa32w3mlhf64p64n1jifm6797v6jb5v3qjnamlpk96"; - name = "sddm-kcm-5.2.0.tar.xz"; + name = stdenv.lib.nameFromURL "sddm-kcm-5.2.0.tar.xz" ".tar"; store = "/nix/store/q3wbyymqnxwcv9c58fxc4fg2c6pc2d5r-sddm-kcm-5.2.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.0/sddm-kcm-5.2.0.tar.xz"; + sha256 = "0ds4qlgwzbpa32w3mlhf64p64n1jifm6797v6jb5v3qjnamlpk96"; + name = "sddm-kcm-5.2.0.tar.xz"; + }; } { - url = "${mirror}/stable/plasma/5.2.0/libksysguard-5.2.0.tar.xz"; - sha256 = "0jfyy90zdajpxy5yy9w14n8r8jx7d6bdwss7h8rrkp5zljp9nzwp"; - name = "libksysguard-5.2.0.tar.xz"; + name = stdenv.lib.nameFromURL "libksysguard-5.2.0.tar.xz" ".tar"; store = "/nix/store/n50iq06yz6z2n2n7wh10ww7cks22zz4z-libksysguard-5.2.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.0/libksysguard-5.2.0.tar.xz"; + sha256 = "0jfyy90zdajpxy5yy9w14n8r8jx7d6bdwss7h8rrkp5zljp9nzwp"; + name = "libksysguard-5.2.0.tar.xz"; + }; } { - url = "${mirror}/stable/plasma/5.2.0/oxygen-5.2.0.tar.xz"; - sha256 = "1wad5m36h31y99v4gwx19n3k14xxc0hvp9c4n3g67fyy8pjnr0ax"; - name = "oxygen-5.2.0.tar.xz"; + name = stdenv.lib.nameFromURL "oxygen-5.2.0.tar.xz" ".tar"; store = "/nix/store/60kb2hhwlmykfx5mc2s8hyd8zh6ngrpv-oxygen-5.2.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.0/oxygen-5.2.0.tar.xz"; + sha256 = "1wad5m36h31y99v4gwx19n3k14xxc0hvp9c4n3g67fyy8pjnr0ax"; + name = "oxygen-5.2.0.tar.xz"; + }; } { - url = "${mirror}/stable/plasma/5.2.0/khelpcenter-5.2.0.tar.xz"; - sha256 = "1a5z2bvxjdwp81jnyrdf7q591k6ql504argl7lg3pbvph08rc0rs"; - name = "khelpcenter-5.2.0.tar.xz"; + name = stdenv.lib.nameFromURL "khelpcenter-5.2.0.tar.xz" ".tar"; store = "/nix/store/dfi8w8dsk5cxbyhm5kznja6kxda23n8j-khelpcenter-5.2.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.0/khelpcenter-5.2.0.tar.xz"; + sha256 = "1a5z2bvxjdwp81jnyrdf7q591k6ql504argl7lg3pbvph08rc0rs"; + name = "khelpcenter-5.2.0.tar.xz"; + }; } { - url = "${mirror}/stable/plasma/5.2.0/baloo-5.6.0.tar.xz"; - sha256 = "1py0npkf8s46zwbg23cn49f777fc9cid1njg8crc8h71md71j614"; - name = "baloo-5.6.0.tar.xz"; + name = stdenv.lib.nameFromURL "baloo-5.6.0.tar.xz" ".tar"; store = "/nix/store/sgm5dcgmw5cwz60hhhqnlgxq1ck1cffh-baloo-5.6.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.0/baloo-5.6.0.tar.xz"; + sha256 = "1py0npkf8s46zwbg23cn49f777fc9cid1njg8crc8h71md71j614"; + name = "baloo-5.6.0.tar.xz"; + }; } { - url = "${mirror}/stable/plasma/5.2.0/plasma-workspace-5.2.0.tar.xz"; - sha256 = "1swii172mv32837kgcxnmafs1blpgpdn6hda07f1aanaz4scxvj3"; - name = "plasma-workspace-5.2.0.tar.xz"; + name = stdenv.lib.nameFromURL "plasma-workspace-5.2.0.tar.xz" ".tar"; store = "/nix/store/g2ar4zpsc36zalpd5frzdpxscgzg727b-plasma-workspace-5.2.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.0/plasma-workspace-5.2.0.tar.xz"; + sha256 = "1swii172mv32837kgcxnmafs1blpgpdn6hda07f1aanaz4scxvj3"; + name = "plasma-workspace-5.2.0.tar.xz"; + }; } { - url = "${mirror}/stable/plasma/5.2.0/kwrited-5.2.0.tar.xz"; - sha256 = "0rg1ml7m6f2kql4qi9pg8dd66hr7rxqgyjg3rs66diibz383cjzb"; - name = "kwrited-5.2.0.tar.xz"; + name = stdenv.lib.nameFromURL "kwrited-5.2.0.tar.xz" ".tar"; store = "/nix/store/r5qz9f2s7q0i00lsp86fv1b500cr2x0n-kwrited-5.2.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.0/kwrited-5.2.0.tar.xz"; + sha256 = "0rg1ml7m6f2kql4qi9pg8dd66hr7rxqgyjg3rs66diibz383cjzb"; + name = "kwrited-5.2.0.tar.xz"; + }; } { - url = "${mirror}/stable/plasma/5.2.0/libmm-qt-5.2.0.tar.xz"; - sha256 = "07flvspy3qs2mhjxnwy3l8giw296p3501ad1hr3bnjidm2iykc6s"; - name = "libmm-qt-5.2.0.tar.xz"; + name = stdenv.lib.nameFromURL "libmm-qt-5.2.0.tar.xz" ".tar"; store = "/nix/store/6fzkxwzqysgwjzmiyg16fdasp64gik52-libmm-qt-5.2.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.0/libmm-qt-5.2.0.tar.xz"; + sha256 = "07flvspy3qs2mhjxnwy3l8giw296p3501ad1hr3bnjidm2iykc6s"; + name = "libmm-qt-5.2.0.tar.xz"; + }; } { - url = "${mirror}/stable/plasma/5.2.0/plasma-nm-5.2.0.tar.xz"; - sha256 = "0br2mqx8g660jcs1hiwssg6fdiddn4zk78kdmcgkpq93y5ysdf5c"; - name = "plasma-nm-5.2.0.tar.xz"; + name = stdenv.lib.nameFromURL "plasma-nm-5.2.0.tar.xz" ".tar"; store = "/nix/store/9n79gfai09ydrjf12ckqviqaf5jkwar8-plasma-nm-5.2.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.0/plasma-nm-5.2.0.tar.xz"; + sha256 = "0br2mqx8g660jcs1hiwssg6fdiddn4zk78kdmcgkpq93y5ysdf5c"; + name = "plasma-nm-5.2.0.tar.xz"; + }; } { - url = "${mirror}/stable/plasma/5.2.0/kwayland-5.2.0.tar.xz"; - sha256 = "1w872ask0w9gbw46dx3si124gmzkapj7naysgrb5zdcdf8avcgqy"; - name = "kwayland-5.2.0.tar.xz"; + name = stdenv.lib.nameFromURL "kwayland-5.2.0.tar.xz" ".tar"; store = "/nix/store/jidv4bi8f2iyg3zhdqip5f7lkwmgav94-kwayland-5.2.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.0/kwayland-5.2.0.tar.xz"; + sha256 = "1w872ask0w9gbw46dx3si124gmzkapj7naysgrb5zdcdf8avcgqy"; + name = "kwayland-5.2.0.tar.xz"; + }; } { - url = "${mirror}/stable/plasma/5.2.0/ksysguard-5.2.0.tar.xz"; - sha256 = "0kd103kzxgsgrrhfjacy50gg6wsvqa9ix9xk5nb59bbdzj0b4km1"; - name = "ksysguard-5.2.0.tar.xz"; + name = stdenv.lib.nameFromURL "ksysguard-5.2.0.tar.xz" ".tar"; store = "/nix/store/s4xb576g8hjpl39ysbmzlsw19a99zssy-ksysguard-5.2.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.0/ksysguard-5.2.0.tar.xz"; + sha256 = "0kd103kzxgsgrrhfjacy50gg6wsvqa9ix9xk5nb59bbdzj0b4km1"; + name = "ksysguard-5.2.0.tar.xz"; + }; } { - url = "${mirror}/stable/plasma/5.2.0/kfilemetadata-5.6.0.tar.xz"; - sha256 = "0vg9lc6d2q6bx53lixcmdhfgwqqr3hfl6g3pvgss237kd3fbb94n"; - name = "kfilemetadata-5.6.0.tar.xz"; + name = stdenv.lib.nameFromURL "kfilemetadata-5.6.0.tar.xz" ".tar"; store = "/nix/store/rvjxs89p415z52nhzrmci6s91nb0fy5a-kfilemetadata-5.6.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.0/kfilemetadata-5.6.0.tar.xz"; + sha256 = "0vg9lc6d2q6bx53lixcmdhfgwqqr3hfl6g3pvgss237kd3fbb94n"; + name = "kfilemetadata-5.6.0.tar.xz"; + }; } { - url = "${mirror}/stable/plasma/5.2.0/bluedevil-5.2.0.tar.xz"; - sha256 = "01a3h0jp9nq9fs1zv4wp7jgmpv4nscflb3nkz93dg0g1bis1kgnh"; - name = "bluedevil-5.2.0.tar.xz"; + name = stdenv.lib.nameFromURL "bluedevil-5.2.0.tar.xz" ".tar"; store = "/nix/store/w4s1zfgmallmqq400pvh6zy9qrss6206-bluedevil-5.2.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.0/bluedevil-5.2.0.tar.xz"; + sha256 = "01a3h0jp9nq9fs1zv4wp7jgmpv4nscflb3nkz93dg0g1bis1kgnh"; + name = "bluedevil-5.2.0.tar.xz"; + }; } { - url = "${mirror}/stable/plasma/5.2.0/breeze-5.2.0.tar.xz"; - sha256 = "1s8381nhszb2d7b0r6rmngnkgw28xxsfhnginbcb6zkljgprnkkh"; - name = "breeze-5.2.0.tar.xz"; + name = stdenv.lib.nameFromURL "breeze-5.2.0.tar.xz" ".tar"; store = "/nix/store/yyq50zwlb2xxahkb6w0zvz41rz2gg4k1-breeze-5.2.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.0/breeze-5.2.0.tar.xz"; + sha256 = "1s8381nhszb2d7b0r6rmngnkgw28xxsfhnginbcb6zkljgprnkkh"; + name = "breeze-5.2.0.tar.xz"; + }; } { - url = "${mirror}/stable/plasma/5.2.0/oxygen-fonts-5.2.0.tar.xz"; - sha256 = "102hycnk4naysmyj87mv1sm41aq214f3wjzzi429r0i135wdblki"; - name = "oxygen-fonts-5.2.0.tar.xz"; + name = stdenv.lib.nameFromURL "oxygen-fonts-5.2.0.tar.xz" ".tar"; store = "/nix/store/96is0p4rp0nqv9yllqrk9xhv4fa86gan-oxygen-fonts-5.2.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.0/oxygen-fonts-5.2.0.tar.xz"; + sha256 = "102hycnk4naysmyj87mv1sm41aq214f3wjzzi429r0i135wdblki"; + name = "oxygen-fonts-5.2.0.tar.xz"; + }; } { - url = "${mirror}/stable/plasma/5.2.0/powerdevil-5.2.0.tar.xz"; - sha256 = "1mi60xn4pgwrq4w3i45gxqjqqfwjxzkkyx89fkwwj1xv68bkwshs"; - name = "powerdevil-5.2.0.tar.xz"; + name = stdenv.lib.nameFromURL "powerdevil-5.2.0.tar.xz" ".tar"; store = "/nix/store/lqny6rqbrgpadkm6d1s52i9959zwhjh8-powerdevil-5.2.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.0/powerdevil-5.2.0.tar.xz"; + sha256 = "1mi60xn4pgwrq4w3i45gxqjqqfwjxzkkyx89fkwwj1xv68bkwshs"; + name = "powerdevil-5.2.0.tar.xz"; + }; } { - url = "${mirror}/stable/plasma/5.2.0/muon-5.2.0.tar.xz"; - sha256 = "15vcrm7y5khpc0rngzqbhizg2w0rz6adf5v3cpwafmqaq3iqlcb7"; - name = "muon-5.2.0.tar.xz"; + name = stdenv.lib.nameFromURL "muon-5.2.0.tar.xz" ".tar"; store = "/nix/store/f7i8c6ig71506aqcmj3mp8yapyid5zki-muon-5.2.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.0/muon-5.2.0.tar.xz"; + sha256 = "15vcrm7y5khpc0rngzqbhizg2w0rz6adf5v3cpwafmqaq3iqlcb7"; + name = "muon-5.2.0.tar.xz"; + }; } { - url = "${mirror}/stable/plasma/5.2.0/khotkeys-5.2.0.tar.xz"; - sha256 = "187757g70wjq1v9r7nf3fxc6233sb5m28s4aswlm7rjvys5lmkch"; - name = "khotkeys-5.2.0.tar.xz"; + name = stdenv.lib.nameFromURL "khotkeys-5.2.0.tar.xz" ".tar"; store = "/nix/store/6sqh6vy8i8xg5xqh0b2ic1a3wb1nv2p8-khotkeys-5.2.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.0/khotkeys-5.2.0.tar.xz"; + sha256 = "187757g70wjq1v9r7nf3fxc6233sb5m28s4aswlm7rjvys5lmkch"; + name = "khotkeys-5.2.0.tar.xz"; + }; } { - url = "${mirror}/stable/plasma/5.2.0/kwin-5.2.0.tar.xz"; - sha256 = "0ys76xllgr2034bxpr5m1qm5v8qp8wnzn09f6gghcvnm3lqki79q"; - name = "kwin-5.2.0.tar.xz"; + name = stdenv.lib.nameFromURL "kwin-5.2.0.tar.xz" ".tar"; store = "/nix/store/hrv9ikwphl3mg8sk6i8b9q3wj5ca24ni-kwin-5.2.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.0/kwin-5.2.0.tar.xz"; + sha256 = "0ys76xllgr2034bxpr5m1qm5v8qp8wnzn09f6gghcvnm3lqki79q"; + name = "kwin-5.2.0.tar.xz"; + }; } ] diff --git a/pkgs/development/libraries/libdbusmenu-qt/qt5.nix b/pkgs/development/libraries/libdbusmenu-qt/qt5.nix index 99a13edf8f4..5f76162453c 100644 --- a/pkgs/development/libraries/libdbusmenu-qt/qt5.nix +++ b/pkgs/development/libraries/libdbusmenu-qt/qt5.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1dbhaljyivbv3wc184zpjfjmn24zb6aj72wgg1gg1xl5f783issd"; }; - buildInputs = [ qt5 ]; + buildInputs = [ qt5.base ]; nativeBuildInputs = [ cmake ]; cmakeFlags = "-DWITH_DOC=OFF"; @@ -18,6 +18,6 @@ stdenv.mkDerivation { homepage = "http://launchpad.net/libdbusmenu-qt"; description = "Provides a Qt implementation of the DBusMenu spec"; maintainers = [ maintainers.ttuegel ]; - inherit (qt5.meta) platforms; + inherit (qt5.base.meta) platforms; }; } diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix b/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix index 8553e060c56..bc34d249b46 100644 --- a/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix +++ b/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, cmake, qt5, pkgconfig, phonon_qt5, gst_all_1 }: +{ stdenv, fetchurl, cmake, gst_all_1, phonon_qt5, pkgconfig, qt5, debug ? false }: + +with stdenv.lib; let version = "4.8.2"; @@ -13,14 +15,15 @@ stdenv.mkDerivation rec { sha256 = "1q1ix6zsfnh6gfnpmwp67s376m7g7ahpjl1qp2fqakzb5cgzgq10"; }; - buildInputs = with gst_all_1; [ phonon_qt5 qt5 gstreamer gst-plugins-base ]; + buildInputs = with gst_all_1; [ gstreamer gst-plugins-base phonon_qt5 qt5.base ]; nativeBuildInputs = [ cmake pkgconfig ]; cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" "-DPHONON_BUILD_PHONON4QT5=ON" - ]; + ] + ++ optional debug "-DCMAKE_BUILD_TYPE=Debug"; meta = with stdenv.lib; { homepage = http://phonon.kde.org/; diff --git a/pkgs/development/libraries/phonon-backend-vlc/qt5/default.nix b/pkgs/development/libraries/phonon-backend-vlc/qt5/default.nix index 9e826cb65dc..b7e4dc7c2b0 100644 --- a/pkgs/development/libraries/phonon-backend-vlc/qt5/default.nix +++ b/pkgs/development/libraries/phonon-backend-vlc/qt5/default.nix @@ -11,7 +11,6 @@ let qt4 = null; withQt5 = true; }; - phonon_ = phonon.override { inherit qt4 qt5 withQt5; }; in stdenv.mkDerivation { @@ -24,7 +23,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake pkgconfig xz ]; - buildInputs = [ vlc_ phonon_qt5 qt5]; + buildInputs = [ vlc_ phonon_qt5 qt5.base ]; cmakeFlags = ["-DPHONON_BUILD_PHONON4QT5=ON"]; diff --git a/pkgs/development/libraries/phonon/qt5/default.nix b/pkgs/development/libraries/phonon/qt5/default.nix index 187684ca5be..248e0427709 100644 --- a/pkgs/development/libraries/phonon/qt5/default.nix +++ b/pkgs/development/libraries/phonon/qt5/default.nix @@ -1,24 +1,28 @@ -{ stdenv, fetchurl, cmake, automoc4, pulseaudio, qt5 }: +{ stdenv, fetchurl, cmake, mesa, pkgconfig, pulseaudio, qt5, debug ? false }: with stdenv.lib; let - v = "4.8.1"; + v = "4.8.3"; in stdenv.mkDerivation rec { name = "phonon-${v}"; src = fetchurl { - url = "mirror://kde/stable/phonon/${v}/phonon-${v}.tar.xz"; - sha256 = "1l97h1jj3gvl1chx1qbipizfvjgqc05wrhdcflc76c2krlk03jmn"; + url = "mirror://kde/stable/phonon/${v}/src/phonon-${v}.tar.xz"; + sha256 = "05nshngk03ln90vsjz44dx8al576f4vd5fvhs1l0jmx13jb9q551"; }; - buildInputs = [ qt5 pulseaudio ]; + buildInputs = [ mesa qt5.base qt5.quick1 qt5.tools pulseaudio ]; - nativeBuildInputs = [ cmake automoc4 ]; + nativeBuildInputs = [ cmake pkgconfig ]; - cmakeFlags = ["-DPHONON_BUILD_PHONON4QT5=ON"]; + cmakeFlags = [ + "-DPHONON_BUILD_PHONON4QT5=ON" + "-DCMAKE_INSTALL_LIBDIR=lib" + ] + ++ optional debug "-DCMAKE_BUILD_TYPE=Debug"; meta = { homepage = http://phonon.kde.org/; diff --git a/pkgs/development/libraries/polkit-qt-1/default.nix b/pkgs/development/libraries/polkit-qt-1/default.nix index c60ae560fe5..b887134e5b9 100644 --- a/pkgs/development/libraries/polkit-qt-1/default.nix +++ b/pkgs/development/libraries/polkit-qt-1/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake automoc4 pkgconfig ]; - propagatedBuildInputs = [ polkit glib (if withQt5 then qt5 else qt4) ]; + propagatedBuildInputs = [ polkit glib ] ++ (if withQt5 then [qt5.base] else [qt4]); meta = { description = "A Qt wrapper around PolKit"; diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 226aeab1051..2c310603b78 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -72,7 +72,7 @@ let }; poppler_qt5 = poppler_drv "qt5" { - propagatedBuildInputs = [ qt5 poppler_glib ]; + propagatedBuildInputs = [ qt5.base poppler_glib ]; postConfigure = '' mkdir -p "$out/lib/pkgconfig" install -c -m 644 poppler-qt5.pc "$out/lib/pkgconfig" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 894587ed2f9..be76e17bf15 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6074,7 +6074,9 @@ let }; libdbusmenu_qt = callPackage ../development/libraries/libdbusmenu-qt { }; - libdbusmenu_qt5 = callPackage ../development/libraries/libdbusmenu-qt/qt5.nix {}; + libdbusmenu_qt5 = callPackage ../development/libraries/libdbusmenu-qt/qt5.nix { + qt5 = qt54; + }; libdc1394 = callPackage ../development/libraries/libdc1394 { }; @@ -6970,10 +6972,16 @@ let phonon_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc/qt4 {}; - phonon_qt5 = callPackage ../development/libraries/phonon/qt5 {}; + phonon_qt5 = callPackage ../development/libraries/phonon/qt5 { + qt5 = qt54; + }; - phonon_qt5_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer/qt5 {}; - phonon_qt5_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc/qt5 {}; + phonon_qt5_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer/qt5 { + qt5 = qt54; + }; + phonon_qt5_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc/qt5 { + qt5 = qt54; + }; physfs = callPackage ../development/libraries/physfs { }; @@ -6998,15 +7006,15 @@ let }; polkit_qt5 = callPackage ../development/libraries/polkit-qt-1 { - inherit qt5; withQt5 = true; + qt5 = qt54; }; policykit = callPackage ../development/libraries/policykit { }; poppler = callPackage ../development/libraries/poppler { lcms = lcms2; }; popplerQt4 = poppler.poppler_qt4; - popplerQt5 = poppler.poppler_qt5; + poppler_qt5 = poppler.poppler_qt5; popt = callPackage ../development/libraries/popt { }; @@ -11179,7 +11187,7 @@ let client = false; withKDE = false; useQt5 = true; - qt = qt5; + qt = qt54; dconf = gnome3.dconf; tag = "-qt5"; }; @@ -11720,6 +11728,12 @@ let ffmpeg = ffmpeg_2_2; }; + vlc_qt5 = vlc.override { + qt4 = null; + qt5 = qt54; + withQt5 = true; + }; + vmpk = callPackage ../applications/audio/vmpk { }; vnstat = callPackage ../applications/networking/vnstat { }; From 7a180b77063ace9b2295c34d8db4df1e889efa71 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 21 Feb 2015 10:59:22 -0600 Subject: [PATCH 150/197] gitignore: pkgs/development/libraries/qt-5/*/tmp/ --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index a20a02b9a67..74de941b768 100644 --- a/.gitignore +++ b/.gitignore @@ -14,5 +14,5 @@ result-* /pkgs/applications/kde-apps-*/tmp/ /pkgs/development/libraries/kde-frameworks-*/tmp/ -/pkgs/development/libraries/qt-5/*-submodules/tmp/ +/pkgs/development/libraries/qt-5/*/tmp/ /pkgs/desktops/plasma-*/tmp/ \ No newline at end of file From a79936561b06845e549fd04be3b71bdea1179060 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 21 Feb 2015 11:00:03 -0600 Subject: [PATCH 151/197] environment: use Qt 5 Qml import paths --- nixos/modules/programs/environment.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix index 4d93d2d35b4..e0379a2c02a 100644 --- a/nixos/modules/programs/environment.nix +++ b/nixos/modules/programs/environment.nix @@ -47,7 +47,8 @@ in KDEDIRS = [ "" ]; STRIGI_PLUGIN_PATH = [ "/lib/strigi/" ]; QT_PLUGIN_PATH = [ "/lib/qt4/plugins" "/lib/kde4/plugins" "/lib/qt5/plugins" ]; - QML2_IMPORT_PATH = [ "/lib/qml" ]; + QML_IMPORT_PATH = [ "/lib/qt5/imports" ]; + QML2_IMPORT_PATH = [ "/lib/qt5/qml" ]; QTWEBKIT_PLUGIN_PATH = [ "/lib/mozilla/plugins/" ]; GTK_PATH = [ "/lib/gtk-2.0" "/lib/gtk-3.0" ]; XDG_CONFIG_DIRS = [ "/etc/xdg" ]; From b050babd3eb8144a6789c32de5529e2cadbeb800 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 21 Feb 2015 11:00:25 -0600 Subject: [PATCH 152/197] kde5: fix Phonon GStreamer backend --- nixos/modules/services/x11/desktop-managers/kde5.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index 6d6479da2a1..4842197d4e4 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -11,12 +11,14 @@ let phononBackends = { gstreamer = [ pkgs.phonon_backend_gstreamer + pkgs.gst_all.gstreamer pkgs.gst_all.gstPluginsBase pkgs.gst_all.gstPluginsGood pkgs.gst_all.gstPluginsUgly pkgs.gst_all.gstPluginsBad pkgs.gst_all.gstFfmpeg # for mp3 playback pkgs.phonon_qt5_backend_gstreamer + pkgs.gst_all_1.gstreamer pkgs.gst_all_1.gst-plugins-base pkgs.gst_all_1.gst-plugins-good pkgs.gst_all_1.gst-plugins-ugly From e5de75bf2a60120083cf47259a84fdb41a2be467 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 21 Feb 2015 11:01:10 -0600 Subject: [PATCH 153/197] kde5: install kde-frameworks version used by plasma --- nixos/modules/services/x11/desktop-managers/kde5.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index 4842197d4e4..db9de9835b5 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -35,7 +35,7 @@ let phononBackendPackages = flip concatMap cfg.phononBackends (name: attrByPath [name] (throw "unknown phonon backend `${name}'") phononBackends); - kf5 = pkgs.kf5_stable; + kf5 = plasma5.kf5; plasma5 = pkgs.plasma5_stable; @@ -87,17 +87,17 @@ in setuid = true; }; - environment.systemPackages = with plasma5; with kf5; + environment.systemPackages = (builtins.attrValues (removeAttrs plasma5 - [ "deepOverride" "override" "overrideDerivation" + [ "deepOverride" "kf5" "override" "overrideDerivation" "recurseForDerivations" "scope" ])) ++ (builtins.attrValues (removeAttrs kf5 - [ "deepOverride" "extra-cmake-modules" "mkDerivation" "override" - "overrideDerivation" "recurseForDerivations" "scope" + [ "deepOverride" "mkDerivation" "override" "overrideDerivation" + "recurseForDerivations" "qt5" "scope" ])) ++ [ @@ -115,7 +115,7 @@ in pkgs.orion # GTK theme, nearly identical to Breeze ] - ++ (optional config.networking.networkmanager.enable plasma-nm) + ++ (optional config.networking.networkmanager.enable plasma5.plasma-nm) ++ phononBackendPackages; environment.pathsToLink = [ "/share" ]; From 532650e4bb343ef84a3886fd490454b2656be5fc Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 21 Feb 2015 11:01:44 -0600 Subject: [PATCH 154/197] kde5: change notice about default Phonon backend --- nixos/modules/services/x11/desktop-managers/kde5.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index db9de9835b5..7952cb5d8f0 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -58,8 +58,8 @@ in default = ["gstreamer"]; example = ["gstreamer" "vlc"]; description = '' - Phonon backends to use in KDE. Only the VLC and gstreamer backends are - available. The VLC backend is preferred by upstream. + Phonon backends to use in KDE. Only the VLC and GStreamer backends are + available. The GStreamer backend is preferred by upstream. ''; }; From 7eb8a9b41fed8900b4e6b3dc01caf63843acf135 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 21 Feb 2015 11:01:56 -0600 Subject: [PATCH 155/197] kde5: install media-player-info udev rules for solid --- nixos/modules/services/x11/desktop-managers/kde5.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index 7952cb5d8f0..010a49975e1 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -138,6 +138,9 @@ in services.udisks2.enable = true; services.upower.enable = config.powerManagement.enable; + # Extra UDEV rules used by Solid + services.udev.packages = [ pkgs.media-player-info ]; + security.pam.services.kde = { allowNullPassword = true; }; }; From db50ddd9ea3cd9afff07e69abfca2345d07eda26 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sat, 21 Feb 2015 17:36:07 +0000 Subject: [PATCH 156/197] direnv: update to v2.6.0 --- pkgs/tools/misc/direnv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index 739908e3699..f21b879d5e5 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -1,14 +1,14 @@ { fetchurl, stdenv, go }: let - version = "2.4.0"; + version = "2.6.0"; in stdenv.mkDerivation { name = "direnv-${version}"; src = fetchurl { url = "http://github.com/zimbatm/direnv/archive/v${version}.tar.gz"; name = "direnv-${version}.tar.gz"; - sha256 = "aab8028cc1d68461dd1f6c3c9d000eef10273c52399fe5d1dd917f2f4a1a349a"; + sha256 = "b85aac4d6a4ddf2daf193aabb3b2faf89e56507d33d763ab74cc7eb0b524ac03"; }; buildInputs = [ go ]; From 8051e87848d8592c8e06ae38a4d879a11d9393cc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 20 Feb 2015 13:19:54 +0100 Subject: [PATCH 157/197] hackage-packages.nix: re-generate from Hackage 2015-02-20T13:19:54+0100 --- .../haskell-modules/hackage-packages.nix | 651 +++++++++++------- 1 file changed, 418 insertions(+), 233 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 8e4b2ebfc9d..fe3a8c617ae 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -4713,6 +4713,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "GGg" = callPackage + ({ mkDerivation, base, bimap }: + mkDerivation { + pname = "GGg"; + version = "0.1.0.2"; + sha256 = "129z0391zm7v4ixwwq2irqhpb43s5pd0imgh3i9i5l9ahq9lk1h7"; + isLibrary = false; + isExecutable = true; + buildDepends = [ base bimap ]; + homepage = "https://github.com/xnil/GGg"; + description = "GGg cipher"; + license = stdenv.lib.licenses.mit; + }) {}; + "GHood" = callPackage ({ mkDerivation, array, base, process }: mkDerivation { @@ -7220,6 +7234,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "HaTeX-qq" = callPackage + ({ mkDerivation, antiquoter, base, haskell-src-meta, HaTeX + , template-haskell, text, uniplate + }: + mkDerivation { + pname = "HaTeX-qq"; + version = "0.0.0.0"; + sha256 = "1frqwgvjbr3pjzm9z98q1wn93q065vg773267p20la3h0ybq10rv"; + buildDepends = [ + antiquoter base haskell-src-meta HaTeX template-haskell text + uniplate + ]; + jailbreak = true; + description = "Quasiquoters for HaTeX"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "HaVSA" = callPackage ({ mkDerivation, base, HUnit, logict, QuickCheck, test-framework , test-framework-hunit, test-framework-quickcheck @@ -8050,8 +8081,8 @@ self: { ({ mkDerivation, base, bytestring, HsOpenSSL, unix }: mkDerivation { pname = "HsOpenSSL-x509-system"; - version = "0.1.0.0"; - sha256 = "0q1rmn266893m20c30c0pvwkws0j7dph0cfz2g0xr31qwhjl0i7z"; + version = "0.1.0.1"; + sha256 = "06i40ng2f0q3rrhp9i30b4q38klf5k9vn1m91b1mpf5hf30iz6qg"; buildDepends = [ base bytestring HsOpenSSL unix ]; homepage = "https://github.com/redneb/HsOpenSSL-x509-system"; description = "Use the system's native CA certificate store with HsOpenSSL"; @@ -10888,8 +10919,8 @@ self: { }: mkDerivation { pname = "OpenGL"; - version = "2.10.0.1"; - sha256 = "0ym4f5l8dbag3ysks29wyvrhskbp3nacc47z6m9hxbm7xx4wpbx1"; + version = "2.10.0.2"; + sha256 = "05w6yvn1bj4p7sqr8qnhabb5qjnigir7sxgf74k0fwk1aniikgys"; buildDepends = [ base bytestring GLURaw OpenGLRaw text ]; extraLibraries = [ libX11 mesa ]; homepage = "http://www.haskell.org/haskellwiki/Opengl"; @@ -10913,8 +10944,8 @@ self: { ({ mkDerivation, base, mesa }: mkDerivation { pname = "OpenGLRaw"; - version = "2.0.0.0"; - sha256 = "01ix6bkj9w263sr06rn3wbiw3qzpgx7lznyqwmw0clmwz2qb9vvq"; + version = "2.3.0.0"; + sha256 = "03hlk0j03a963534swqvagrckl9y2s8hh07a7pczc104nw45jxln"; buildDepends = [ base ]; extraLibraries = [ mesa ]; homepage = "http://www.haskell.org/haskellwiki/Opengl"; @@ -17224,6 +17255,7 @@ self: { isLibrary = false; isExecutable = true; buildDepends = [ base optparse-applicative text ]; + jailbreak = true; homepage = "https://github.com/danchoi/align-text"; description = "A simple unix filter to align text on specified substrings"; license = stdenv.lib.licenses.mit; @@ -18243,8 +18275,8 @@ self: { }: mkDerivation { pname = "amqp"; - version = "0.12"; - sha256 = "0bivp7lfnsazd0ng080jf85x9jqzna3r82kxzxy2f12pc5xawn9v"; + version = "0.12.1"; + sha256 = "0s1v64b0m7xv7nrjmfpamfj40vh7cl9l5z7ccilbry5y4qacpsv9"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -18782,25 +18814,28 @@ self: { ({ mkDerivation, base, blaze-builder, blaze-html, blaze-markup , bytestring, bytestring-lexing, case-insensitive , data-default-class, exceptions, hashable, http-date, http-types - , HUnit, mime-types, monad-control, mtl, process, stringsearch - , template-haskell, test-framework, test-framework-hunit, text - , time, transformers, transformers-base, unix-compat - , unordered-containers, vault, wai, wai-extra + , HUnit, mime-types, monad-control, mtl, process, QuickCheck + , stringsearch, template-haskell, test-framework + , test-framework-hunit, test-framework-quickcheck, text, time + , transformers, transformers-base, unix-compat + , unordered-containers, vault, wai, wai-extra, web-routing }: mkDerivation { pname = "apiary"; - version = "1.2.3"; - sha256 = "043qyvmzd2gmjzz3k7xf43a61gb9z1skj8d55lq0k7m84vm2yjb7"; + version = "1.3.0"; + sha256 = "1d182rqrkkp76hhq71rlh7plrcnnarhhzwm21619p7yw781dfcjy"; + editedCabalFile = "a33e324c2280f4b84405bd625f6fb6b281352bc6c4dab01275b8a62114b0da16"; buildDepends = [ base blaze-builder blaze-html blaze-markup bytestring bytestring-lexing case-insensitive data-default-class exceptions hashable http-date http-types mime-types monad-control mtl process stringsearch template-haskell text time transformers transformers-base unix-compat unordered-containers vault wai + web-routing ]; testDepends = [ - base bytestring http-types HUnit mtl test-framework - test-framework-hunit wai wai-extra + base bytestring http-types HUnit mtl QuickCheck test-framework + test-framework-hunit test-framework-quickcheck wai wai-extra ]; jailbreak = true; homepage = "https://github.com/philopon/apiary"; @@ -18812,16 +18847,17 @@ self: { ({ mkDerivation, apiary, apiary-session, authenticate, base , blaze-builder, bytestring, cereal, data-default-class , http-client, http-client-tls, http-types, monad-control - , resourcet, text, wai + , resourcet, text, wai, web-routing }: mkDerivation { pname = "apiary-authenticate"; - version = "1.2.1"; - sha256 = "0nflplgpnynn4jf4nnwv9xn95wwrmcyx2sf5bgvny9fzbjhcp8v9"; + version = "1.3.0"; + sha256 = "00ayjrkp8zdil6pc0prxv39l8rw44c225k85vnp3681qsb76am55"; + editedCabalFile = "c97a06886c850111b3fa48e7000077c71b1198b9c4458e0bca77abd69673e12f"; buildDepends = [ apiary apiary-session authenticate base blaze-builder bytestring cereal data-default-class http-client http-client-tls http-types - monad-control resourcet text wai + monad-control resourcet text wai web-routing ]; homepage = "https://github.com/philopon/apiary"; description = "authenticate support for apiary web framework"; @@ -18835,8 +18871,8 @@ self: { }: mkDerivation { pname = "apiary-clientsession"; - version = "1.2.0"; - sha256 = "0wzia2i15hc7v467mhj9aamvy44fc70axmsj7j54j84v03zl5m62"; + version = "1.3.0"; + sha256 = "158zhcgrxgwn8ljh93qlls71wdfbd8081214cfmxb9k41l927y55"; buildDepends = [ apiary apiary-cookie apiary-session base bytestring cereal clientsession data-default-class time unix-compat vault @@ -18848,14 +18884,16 @@ self: { "apiary-cookie" = callPackage ({ mkDerivation, apiary, base, blaze-builder, blaze-html - , bytestring, cookie, time, wai + , bytestring, cookie, time, wai, web-routing }: mkDerivation { pname = "apiary-cookie"; - version = "1.2.0"; - sha256 = "03684bijn6xmpyg3afd5a9jr5kp80brk5kvdrckn3bkdrwpvz40n"; + version = "1.3.0"; + sha256 = "1y152d92ksz64iqgv2ck4s4dxlpmg72gfk9yq6f2wx0axjwm16nm"; + editedCabalFile = "cc3edd1f078c168eae05bc559a1ff96077e3d2ae158b081909ac7c9f7fe051c6"; buildDepends = [ apiary base blaze-builder blaze-html bytestring cookie time wai + web-routing ]; homepage = "https://github.com/philopon/apiary"; description = "Cookie support for apiary web framework"; @@ -18866,8 +18904,9 @@ self: { ({ mkDerivation, apiary, base, blaze-builder, wai-extra }: mkDerivation { pname = "apiary-eventsource"; - version = "1.2.0"; - sha256 = "1ng36kj802rvmwmwz9pahg18ry60zga7lp36bnf1n7gh7ypxp7j0"; + version = "1.3.0"; + sha256 = "192bhk54z1gw9r9gnws19z8b81i0v163vb2s09alad8c7v5d8ksp"; + editedCabalFile = "ba4f13a331bfe4d0330e022352bba6878191a90eca5407971a2de4bb6f14c6c5"; buildDepends = [ apiary base blaze-builder wai-extra ]; homepage = "https://github.com/philopon/apiary"; description = "eventsource support for apiary web framework"; @@ -18880,8 +18919,8 @@ self: { }: mkDerivation { pname = "apiary-helics"; - version = "1.2.1"; - sha256 = "1wzmdgc0k6g1ah42ymw8dh4iyphjz42v698dn1dqb5gvbxh21ksm"; + version = "1.3.0"; + sha256 = "04wbh5hn0ycr2mp4b3y9na61k26rd3y10724xwssfxjmk3lnh2bn"; buildDepends = [ apiary base bytestring data-default-class helics helics-wai monad-control text transformers vault wai @@ -18899,8 +18938,8 @@ self: { }: mkDerivation { pname = "apiary-logger"; - version = "1.2.1"; - sha256 = "18pa9mx3599szcw7lpmklc2xfzn9r6knkq0qad0ljkn4rdhd7hjp"; + version = "1.3.0"; + sha256 = "01kljhlkp6kdwbl4mxgvjd9h6iwrxkbgkik0wpv3rgzizacls1c3"; buildDepends = [ apiary base data-default-class fast-logger lifted-base monad-control monad-logger transformers transformers-base @@ -18916,8 +18955,8 @@ self: { }: mkDerivation { pname = "apiary-memcached"; - version = "1.2.2"; - sha256 = "1blxvqdas55p56227f4cmfh02n2xvx43rcfkxqkh7jgchan6278m"; + version = "1.3.0"; + sha256 = "11niagwak3qr493nq9h35px54qj5hn199ra97h99959hhh0d9gfa"; buildDepends = [ apiary base bytestring data-default-class memcached-binary monad-control text transformers @@ -18934,8 +18973,8 @@ self: { }: mkDerivation { pname = "apiary-mongoDB"; - version = "1.2.1"; - sha256 = "1xx1qmpp9ndci2ypiarvlnkz4vzc7b9qrpsz0442nwvnlxh716lq"; + version = "1.3.0"; + sha256 = "14k9b2cq0s3v4n4akyn4n65kcim02j5dki40zckf0754mxyh2ghi"; buildDepends = [ apiary base bson data-default-class lifted-base monad-control mongoDB resource-pool text time transformers @@ -18947,17 +18986,16 @@ self: { "apiary-persistent" = callPackage ({ mkDerivation, apiary, apiary-logger, base, monad-control - , monad-logger, persistent, persistent-sqlite, resource-pool - , resourcet, transformers, transformers-base + , monad-logger, persistent, resource-pool, resourcet, transformers + , transformers-base, web-routing }: mkDerivation { pname = "apiary-persistent"; - version = "1.2.1"; - sha256 = "01hkrq1c2sji6w9fdk7riflshnkjk7sg059bw3q60vxpkk5zzkdq"; + version = "1.3.0"; + sha256 = "0mr86mx3fplcbapgasi6famz16b0svzvn92bssdisfcqvs43ki8a"; buildDepends = [ apiary apiary-logger base monad-control monad-logger persistent - persistent-sqlite resource-pool resourcet transformers - transformers-base + resource-pool resourcet transformers transformers-base web-routing ]; homepage = "https://github.com/philopon/apiary"; description = "persistent support for apiary web framework"; @@ -18967,41 +19005,43 @@ self: { "apiary-purescript" = callPackage ({ mkDerivation, apiary, base, bytestring, data-default-class , filepath, Glob, parsec, purescript, text, unordered-containers - , utf8-string }: mkDerivation { pname = "apiary-purescript"; - version = "1.2.2"; - sha256 = "1i7a9abw8ni0qr24j7kpkp83ml4p5gbz602x4pb8f7z91rqqk8y8"; + version = "1.3.1"; + sha256 = "1pc8w90d3cnyrabgmn7ns1mf3pgzsvib5zq9c54926xavhb1h6nq"; buildDepends = [ apiary base bytestring data-default-class filepath Glob parsec - purescript text unordered-containers utf8-string + purescript text unordered-containers ]; - jailbreak = true; homepage = "https://github.com/philopon/apiary"; description = "purescript compiler for apiary web framework"; license = stdenv.lib.licenses.mit; }) {}; "apiary-session" = callPackage - ({ mkDerivation, apiary, base, wai }: + ({ mkDerivation, apiary, base, wai, web-routing }: mkDerivation { pname = "apiary-session"; - version = "1.2.0"; - sha256 = "0x02cvdsrjm70aivi8ya291s29s9h059xff01nq66dj1dd272a3h"; - buildDepends = [ apiary base wai ]; + version = "1.3.0"; + sha256 = "0sw33mbivb5849rsl1x5fbbh17is867l0n1f0vyrxrgpbvb58zi1"; + buildDepends = [ apiary base wai web-routing ]; homepage = "https://github.com/philopon/apiary"; description = "session support for apiary web framework"; license = stdenv.lib.licenses.mit; }) {}; "apiary-websockets" = callPackage - ({ mkDerivation, apiary, base, wai-websockets, websockets }: + ({ mkDerivation, apiary, base, wai-websockets, web-routing + , websockets + }: mkDerivation { pname = "apiary-websockets"; - version = "1.2.0"; - sha256 = "1f76zb835aqvmqv1mxh06nfg4vidxnivp036l2gk8xzl4cq61s1c"; - buildDepends = [ apiary base wai-websockets websockets ]; + version = "1.3.0"; + sha256 = "0kb4vjksdwr4p9qmbi7h0if4czdbp9mb2kb8xjgprdsn3wx13wzj"; + buildDepends = [ + apiary base wai-websockets web-routing websockets + ]; homepage = "https://github.com/philopon/apiary"; description = "websockets support for apiary web framework"; license = stdenv.lib.licenses.mit; @@ -20391,19 +20431,19 @@ self: { "attoparsec" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq - , QuickCheck, scientific, test-framework + , QuickCheck, quickcheck-unicode, scientific, test-framework , test-framework-quickcheck2, text, vector }: mkDerivation { pname = "attoparsec"; - version = "0.12.1.2"; - sha256 = "1vazyr3fdahdg1q503sbj0zv4xj7sm7j32mjm856bm51j2s0rhlc"; + version = "0.12.1.3"; + sha256 = "1m5sk60k9x4hs0qpglj5adr3n5zwpvarpylkjkx2xx63p74cj82f"; buildDepends = [ array base bytestring containers deepseq scientific text ]; testDepends = [ - array base bytestring deepseq QuickCheck scientific test-framework - test-framework-quickcheck2 text vector + array base bytestring deepseq QuickCheck quickcheck-unicode + scientific test-framework test-framework-quickcheck2 text vector ]; homepage = "https://github.com/bos/attoparsec"; description = "Fast combinator parsing for bytestrings and text"; @@ -20827,10 +20867,9 @@ self: { ({ mkDerivation, base, dependent-sum, mtl, process, shake }: mkDerivation { pname = "avr-shake"; - version = "0.0.1.0"; - sha256 = "08n9yk1dc0sisinapys4dvkyg4n96j9nmszrj7m9jrgjzks238fj"; + version = "0.0.1.1"; + sha256 = "0avj9idsk70c7gzkm18kcsvh3xhg57r8aifhdpyihzyvp87k61pn"; buildDepends = [ base dependent-sum mtl process shake ]; - jailbreak = true; homepage = "https://github.com/mokus0/avr-shake"; description = "AVR Crosspack actions for shake build systems"; license = stdenv.lib.licenses.publicDomain; @@ -26194,8 +26233,8 @@ self: { }: mkDerivation { pname = "cabal-bounds"; - version = "0.9"; - sha256 = "0dr5j7g5v0i3b0v1vsfgfzfnq8290mncjhlfnjsbpparq8yvxgd1"; + version = "0.9.2"; + sha256 = "162h4fcr5n6k2l20vxhlnrqfh2x6dvka14zibj0xq1g12ik8dz4j"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -26591,8 +26630,8 @@ self: { }: mkDerivation { pname = "cabal-rpm"; - version = "0.9.3"; - sha256 = "0xsq77qawvvi2nbxc9z9czyph3pkswvkcclf7xxls1pj254fq4yc"; + version = "0.9.4"; + sha256 = "15h56aqzzxdxkk3rx6j03nkv1503f8ypzq6hbdflilqd0v63asa4"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -26737,11 +26776,9 @@ self: { ({ mkDerivation, base, Cabal, QuickCheck }: mkDerivation { pname = "cabal-test-quickcheck"; - version = "0.1.3"; - sha256 = "1q1zl15xfr1id3w5ih5843fdxrmf595ri1hhxg2r9kwyy48hhh2r"; + version = "0.1.4"; + sha256 = "012pl06x5jjiyhc98x5245zj1lcgkr9wcyv3rjc6z59y8mynv7ri"; buildDepends = [ base Cabal QuickCheck ]; - testDepends = [ base Cabal ]; - jailbreak = true; homepage = "https://github.com/zmthy/cabal-test-quickcheck"; description = "QuickCheck for Cabal"; license = stdenv.lib.licenses.mit; @@ -27496,22 +27533,23 @@ self: { }) {}; "casadi-bindings" = callPackage - ({ mkDerivation, base, casadi-bindings-core + ({ mkDerivation, base, casadi, casadi-bindings-core , casadi-bindings-internal, containers, linear, vector }: mkDerivation { pname = "casadi-bindings"; - version = "2.2.0.4"; - sha256 = "1qn3ghsp340mmq9a49icsr33pyibdqlnw1mg1i1gqglvwlanqysw"; + version = "2.2.0.5"; + sha256 = "0i3ly7zcy8qhgkid2zw982dmb6fh7b48q0qmc8fjj4yji6v1jka3"; buildDepends = [ base casadi-bindings-core casadi-bindings-internal containers linear vector ]; + pkgconfigDepends = [ casadi ]; homepage = "http://github.com/ghorn/casadi-bindings"; description = "mid-level bindings to CasADi"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) { casadi = null;}; "casadi-bindings-control" = callPackage ({ mkDerivation, base, casadi-bindings-core @@ -28542,8 +28580,8 @@ self: { }: mkDerivation { pname = "chatter"; - version = "0.5.0.0"; - sha256 = "15nj3b7w5whkifnik4fmykh21znr2vli9mm8ypbpwwzx8577d08m"; + version = "0.5.0.1"; + sha256 = "0saavfnxd6l6w3ybvdmi14ia06ssc4lndb0ba8hhyqb3qzz7l7zs"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -29198,8 +29236,8 @@ self: { }: mkDerivation { pname = "clac"; - version = "0.3.0"; - sha256 = "0vqsp0wp5kf40wxclwpqvkn057ndajxn2nx16ndb60r7xmh59inp"; + version = "0.4.0"; + sha256 = "1p9gjdcwknls6p488bi00g1zfpbizg854c5636n0xzk8iapcap4x"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -30662,8 +30700,8 @@ self: { ({ mkDerivation, base, lens, linear, profunctors }: mkDerivation { pname = "colors"; - version = "0.3"; - sha256 = "04kd3fpj4k4bfqgaabpq7hxqmhsg7ny0qipfx61im2rh663p8zjp"; + version = "0.3.0.1"; + sha256 = "0fnqcgix6d9y3yvkzakkw3xkqxbpqg1kffalxsr8g144qzvfbzax"; buildDepends = [ base lens linear profunctors ]; homepage = "https://github.com/fumieval/colors"; description = "A type for colors"; @@ -31613,8 +31651,8 @@ self: { }: mkDerivation { pname = "conduit"; - version = "1.2.3.1"; - sha256 = "04n330f9iad6asmry81aqvb7wyh7b962d6pvcfnpm327z4llnvbq"; + version = "1.2.4"; + sha256 = "1vqajj5mwnknqcjc5pj883jz4iwjj6is4jr701bzr0n6ngvn7qvh"; buildDepends = [ base exceptions lifted-base mmorph mtl resourcet transformers transformers-base void @@ -31795,30 +31833,29 @@ self: { , base-unicode-symbols, base64-bytestring, bytestring, Cabal , case-insensitive, connection, data-default, deepseq, directory , dlist, enclosed-exceptions, errors, http-client, http-client-tls - , http-types, monad-control, mtl, network-uri, optparse-applicative - , process, profunctors, text, tls, transformers - , unordered-containers, wai, warp, warp-tls, x509, x509-system - , x509-validation, yaml + , http-types, monad-control, mtl, mtl-compat, network-uri + , optparse-applicative, process, profunctors, text, tls + , transformers, transformers-compat, unordered-containers, wai + , warp, warp-tls, x509, x509-system, x509-validation, yaml }: mkDerivation { pname = "configuration-tools"; - version = "0.2.11"; - sha256 = "1vxmhjiscxx348s67lqp2w7r112mgg0n55darjjfkd45vfw8av0q"; + version = "0.2.12"; + sha256 = "1cpdy3aizdba55mmq903s9p6az3zkkxm3h7jq0iz9s38r3srxij7"; buildDepends = [ aeson ansi-wl-pprint attoparsec base base-unicode-symbols base64-bytestring bytestring Cabal case-insensitive connection data-default deepseq directory dlist enclosed-exceptions errors - http-client http-client-tls http-types monad-control mtl + http-client http-client-tls http-types monad-control mtl mtl-compat network-uri optparse-applicative process profunctors text tls - transformers unordered-containers x509 x509-system x509-validation - yaml + transformers transformers-compat unordered-containers x509 + x509-system x509-validation yaml ]; testDepends = [ base base-unicode-symbols bytestring Cabal enclosed-exceptions - errors http-types monad-control mtl text unordered-containers wai - warp warp-tls yaml + errors http-types monad-control mtl mtl-compat text + transformers-compat unordered-containers wai warp warp-tls yaml ]; - jailbreak = true; homepage = "https://github.com/alephcloud/hs-configuration-tools"; description = "Tools for specifying and parsing configurations"; license = stdenv.lib.licenses.mit; @@ -33526,6 +33563,7 @@ self: { array base binary comonad containers data-lens logfloat monad-codec parallel sgd vector vector-binary vector-th-unbox ]; + jailbreak = true; homepage = "https://github.com/kawu/crf-chain2-tiers"; description = "Second-order, tiered, constrained, linear conditional random fields"; license = stdenv.lib.licenses.bsd3; @@ -36394,16 +36432,20 @@ self: { }: mkDerivation { pname = "dbmigrations"; - version = "0.8"; - sha256 = "0m1zvc61y0n7p66iwsb8wzwgivxnc08cm1h3xvf1jnwrv294dwch"; + version = "0.8.1"; + sha256 = "1fbj0w5ybq3b3v0961389xzd4iyljfn9123djgl43xibk6xa9jk8"; isLibrary = true; isExecutable = true; buildDepends = [ base bytestring configurator containers directory fgl filepath HDBC - HDBC-postgresql HDBC-sqlite3 HUnit mtl process random - template-haskell text time yaml-light + HDBC-postgresql HDBC-sqlite3 mtl random template-haskell text time + yaml-light + ]; + testDepends = [ + base bytestring containers directory fgl filepath HDBC + HDBC-postgresql HDBC-sqlite3 HUnit mtl process template-haskell + time yaml-light ]; - jailbreak = true; description = "An implementation of relational database \"migrations\""; license = stdenv.lib.licenses.bsd3; }) {}; @@ -37366,8 +37408,8 @@ self: { ({ mkDerivation, base, containers, dependent-sum }: mkDerivation { pname = "dependent-map"; - version = "0.1.1.2"; - sha256 = "1g8mq8189c6wr1rik70019gqrnk84c613x9cn5383p7hhfyc0rnn"; + version = "0.1.1.3"; + sha256 = "1by83rrv8dfn5lxrpx3qzs1lg31fhnzlqy979h8ampyxd0w93pa4"; buildDepends = [ base containers dependent-sum ]; homepage = "https://github.com/mokus0/dependent-map"; description = "Dependent finite maps (partial dependent products)"; @@ -39609,8 +39651,8 @@ self: { }: mkDerivation { pname = "docopt"; - version = "0.6.0.1"; - sha256 = "0rdzyb48d5arrilsncp7zjn3gw0sdcda7fnpvc045n1npzpi53aj"; + version = "0.6.0.2"; + sha256 = "1i57n3la71ny9nww5hrm5lvwidqk20rh3xfxf37m77zm0sjwsyk2"; buildDepends = [ base containers parsec ]; testDepends = [ aeson ansi-terminal base bytestring containers parsec split @@ -40719,28 +40761,26 @@ self: { "dynobud" = callPackage ({ mkDerivation, base, bytestring, cairo, casadi-bindings - , casadi-bindings-core, casadi-bindings-internal, cereal, Chart - , Chart-cairo, Chart-gtk, cmdargs, colour, containers, data-default - , data-default-class, distributive, ghc-prim, glib, gtk, hmatrix - , HUnit, jacobi-roots, lens, linear, mtl, not-gloss, primitive - , process, QuickCheck, reflection, semigroups, spatial-math, stm - , tagged, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, time, transformers + , casadi-bindings-core, cereal, Chart, Chart-cairo, Chart-gtk + , cmdargs, colour, containers, data-default, data-default-class + , distributive, glib, gtk, hmatrix, HUnit, jacobi-roots, lens + , linear, mtl, not-gloss, process, QuickCheck, reflection + , semigroups, spatial-math, stm, test-framework + , test-framework-hunit, test-framework-quickcheck2, text, time , unordered-containers, vector, zeromq4-haskell }: mkDerivation { pname = "dynobud"; - version = "1.0.0.0"; - sha256 = "018s2n4sbks43ifvd0vng65r0j8q18z1b38mny9lwfbpp60d2ql4"; + version = "1.1.0.0"; + sha256 = "1bgzas5ywvvym0xgi1bajkx2z65wpzrc6p2r77dk0wlmdrpgb1rf"; isLibrary = true; isExecutable = true; buildDepends = [ - base bytestring cairo casadi-bindings casadi-bindings-core - casadi-bindings-internal cereal Chart Chart-cairo Chart-gtk cmdargs - colour containers data-default data-default-class distributive - ghc-prim glib gtk hmatrix jacobi-roots lens linear mtl not-gloss - primitive process reflection semigroups spatial-math stm tagged - text time transformers unordered-containers vector zeromq4-haskell + base bytestring cairo casadi-bindings casadi-bindings-core cereal + Chart Chart-cairo Chart-gtk cmdargs colour containers data-default + data-default-class distributive glib gtk hmatrix jacobi-roots lens + linear mtl not-gloss process reflection semigroups spatial-math stm + text time unordered-containers vector zeromq4-haskell ]; testDepends = [ base casadi-bindings hmatrix HUnit linear QuickCheck test-framework @@ -41591,6 +41631,7 @@ self: { version = "0.2.1"; sha256 = "0i79qxaknh39b5zjcknsdzrwzf9jxz8kjgzrzyw8x4bf2sgb5ak7"; buildDepends = [ base extensible transformers ]; + jailbreak = true; homepage = "https://github.com/fumieval/elevator"; description = "Immediately lifts to a desired level"; license = stdenv.lib.licenses.bsd3; @@ -43586,8 +43627,8 @@ self: { ({ mkDerivation, base, binary, deepseq, template-haskell }: mkDerivation { pname = "extensible"; - version = "0.2.10"; - sha256 = "1klmgis01qpc8cc95zi0bdbsiyn66cwy7d5l7axc0w4cxdm42dsc"; + version = "0.3"; + sha256 = "0a55ngp62z6a8awrps921zz6s2n27x4hpgsr80xphjgrfmrb9z9k"; buildDepends = [ base binary deepseq template-haskell ]; homepage = "https://github.com/fumieval/extensible"; description = "Extensible, efficient, lens-friendly data types"; @@ -43659,8 +43700,8 @@ self: { }: mkDerivation { pname = "extra"; - version = "1.0.1"; - sha256 = "1nmcgi24b3n0bqiychx96zf07vjy4129f9qpwh57ir90bmsixij6"; + version = "1.1"; + sha256 = "0i8vv5y7rmfbcnfkqm2ac027nw6csvjbivfywgxd93xig42rzg4y"; buildDepends = [ base directory filepath process time unix ]; testDepends = [ base directory filepath QuickCheck time unix ]; homepage = "https://github.com/ndmitchell/extra#readme"; @@ -46239,8 +46280,8 @@ self: { }: mkDerivation { pname = "fpco-api"; - version = "1.2.0.4"; - sha256 = "1hyvnra01c7jqh3n0zpnff6m9z2xjiq6fp4484qb7km58mw1hm2v"; + version = "1.2.0.5"; + sha256 = "1r80a6vimpy4nviskl62c4ivp2l8wrg3vhzgdg53nnfa5j6lmha2"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -47911,12 +47952,12 @@ self: { }) {}; "generic-trie" = callPackage - ({ mkDerivation, base, containers }: + ({ mkDerivation, base, containers, transformers }: mkDerivation { pname = "generic-trie"; - version = "0.1"; - sha256 = "1cqzbwc6php2xr95a609fd29bvsclcbwcgx4r7mj0p9x891a8dcf"; - buildDepends = [ base containers ]; + version = "0.3.0.1"; + sha256 = "09f4rasw8q2yi7dakcr21igy02vhgiasylw6lzsz225kl58vjwz7"; + buildDepends = [ base containers transformers ]; homepage = "http://github.com/glguy/tries"; description = "A map, where the keys may be complex structured data"; license = stdenv.lib.licenses.bsd3; @@ -48241,6 +48282,7 @@ self: { pname = "gf"; version = "3.6"; sha256 = "10s8vgca36jz7b9sbd3n1in13xifwc7h42qwd58yq1lvk3j1fizx"; + editedCabalFile = "d297db7ea916a307daa375bf1fb6119edacb403812dbcf031e453aa6dd1fd67a"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -49075,8 +49117,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "5.20150205"; - sha256 = "1idmm5psg6dllpazri7xnpgcjrn6z2dcddnvylfsq2vypsh1kirv"; + version = "5.20150219"; + sha256 = "0psx113vjb1wicaywknhn13x0la5hrggwf8b0rs4gxd472ix5ha6"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -49340,6 +49382,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "gitdo" = callPackage + ({ mkDerivation, aeson, aeson-lens, base, bytestring, foldl, lens + , mtl, optparse-applicative, sqlite-simple, system-filepath, text + , turtle, wreq + }: + mkDerivation { + pname = "gitdo"; + version = "0.1.0.0"; + sha256 = "0krna2rqdscnrd86d7ipq4gad7dzk1w5lnk8757a13qnd5jqrxdl"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + aeson aeson-lens base bytestring foldl lens mtl + optparse-applicative sqlite-simple system-filepath text turtle wreq + ]; + homepage = "https://github.com/mattyhall/gitdo"; + description = "Create Github issues out of TODO comments in code"; + license = stdenv.lib.licenses.mit; + }) {}; + "github" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , byteable, bytestring, case-insensitive, conduit, containers @@ -51362,8 +51424,8 @@ self: { }: mkDerivation { pname = "growler"; - version = "0.5.0"; - sha256 = "19h5fkhk1k70k79fp6h013y8rnv1ys46kpvxjmcfxac5nzhlbzid"; + version = "0.5.0.1"; + sha256 = "1h0a64zcx9xinpgcjknrldnqrh614jc04fj14klgs1jsy43nf64n"; buildDepends = [ aeson base blaze-builder bytestring case-insensitive either http-types lens monad-control mtl pipes pipes-aeson pipes-wai @@ -53742,8 +53804,8 @@ self: { }: mkDerivation { pname = "halma"; - version = "0.1.0.0"; - sha256 = "1q6fh1pqlmz6lv5gzmsvq6638nn3279fz62yp9na0sq9pxdjsq66"; + version = "0.1.0.1"; + sha256 = "1k12f3ag54qqnl391i5sw3lmlrsjn693yjkigv9ypaghan02gh9p"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -56592,17 +56654,21 @@ self: { }) {}; "haskhol-core" = callPackage - ({ mkDerivation, base, containers, deepseq, parsec, pretty - , template-haskell + ({ mkDerivation, acid-state, base, containers, deepseq, filepath + , ghc-prim, hashable, mtl, parsec, pretty, safecopy, shelly + , template-haskell, text, text-show, th-lift, unordered-containers }: mkDerivation { pname = "haskhol-core"; - version = "1.0.0"; - sha256 = "0akcs3jlf1bqxck9jb1vc654fi2kcn71ckqymsqwpl6bj7w057vc"; + version = "1.1.0"; + sha256 = "0vlzybbplqggvgnj61yl0g2rak2qbsp7hly9srgr6wd6qm9l1nxx"; buildDepends = [ - base containers deepseq parsec pretty template-haskell + acid-state base containers deepseq filepath ghc-prim hashable mtl + parsec pretty safecopy shelly template-haskell text text-show + th-lift unordered-containers ]; - homepage = "haskhol.org"; + jailbreak = true; + homepage = "http://haskhol.org"; description = "The core logical system of HaskHOL, an EDSL for HOL theorem proving"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -59021,8 +59087,8 @@ self: { }: mkDerivation { pname = "hexpat"; - version = "0.20.7"; - sha256 = "03r5j54a250f01km6i8qja1h1k512ds2bp7r0yk2jpbbar2y7c08"; + version = "0.20.8"; + sha256 = "0nz44cxigg91hix8h35bx0dk2l9pmn6jj1p5mvdh0cl7gvv6yf5s"; buildDepends = [ base bytestring containers deepseq List text transformers utf8-string @@ -59476,8 +59542,8 @@ self: { ({ mkDerivation, base, harp }: mkDerivation { pname = "hharp"; - version = "0.1.0.0"; - sha256 = "1n2pi90yr9dmxp5iirp6hm8inliwpl3pnhgx7xnn4zl0z21bjgb5"; + version = "0.1.1.0"; + sha256 = "1f7k1jlc2ncxyxmc6rl603nw0lynqwv0dmj11hrcdmv282h4ff6s"; buildDepends = [ base ]; extraLibraries = [ harp ]; jailbreak = true; @@ -65649,6 +65715,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hsverilog" = callPackage + ({ mkDerivation, base, containers, hspec, hspec-contrib + , hspec-expectations-lifted, shakespeare, text, transformers + }: + mkDerivation { + pname = "hsverilog"; + version = "0.1.0"; + sha256 = "1qk34zl1894ra9w0w2gzg8ivz230ymgyjghsd2cwn00fcsyafa7a"; + buildDepends = [ base containers shakespeare text transformers ]; + testDepends = [ + base containers hspec hspec-contrib hspec-expectations-lifted + shakespeare text transformers + ]; + description = "Synthesizable Verilog DSL supporting for multiple clock and reset"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hswip" = callPackage ({ mkDerivation, base, haskell98, mtl, ncurses, readline, swipl }: mkDerivation { @@ -65930,6 +66013,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "html5-entity" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, haskell-src + , text, unordered-containers + }: + mkDerivation { + pname = "html5-entity"; + version = "0.1.0.1"; + sha256 = "1mad38pq2cdxkgr8qa3g7pznavgsxlp4bxv77yhbrh75rns8n7id"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson base bytestring containers haskell-src text + unordered-containers + ]; + homepage = "https://github.com/zudov/html5-entity/"; + description = "A library for looking up and validating HTML5 entities"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "htodo" = callPackage ({ mkDerivation, base, HDBC, HDBC-sqlite3 }: mkDerivation { @@ -66337,8 +66439,8 @@ self: { }: mkDerivation { pname = "http-date"; - version = "0.0.4"; - sha256 = "1pbm066i1cpa3z2kfsqpva0qixnx87s76dpafz3wf6dkaqj8n8i5"; + version = "0.0.5"; + sha256 = "12vvv5vjwbmgsmrmkxs72z4qvkbb7gns749j7dmnf39sy7c5s93g"; buildDepends = [ array attoparsec base bytestring ]; testDepends = [ base bytestring doctest hspec old-locale time ]; description = "HTTP Date parser/formatter"; @@ -66427,14 +66529,13 @@ self: { }: mkDerivation { pname = "http-media"; - version = "0.5.0"; - sha256 = "1g9vidz67pql2lhhfqj6mjin1ddld5c67cb48bxa3m5dcsckri5l"; + version = "0.5.1"; + sha256 = "0jfnbmdpagpw882a9gnf8pp9b63pm6w20xb2w6yv6h4ljvl6f07c"; buildDepends = [ base bytestring case-insensitive containers ]; testDepends = [ base bytestring Cabal cabal-test-quickcheck case-insensitive containers QuickCheck ]; - jailbreak = true; homepage = "https://github.com/zmthy/http-media"; description = "Processing HTTP Content-Type and Accept headers"; license = stdenv.lib.licenses.mit; @@ -67810,6 +67911,7 @@ self: { pname = "hyperloglog"; version = "0.3"; sha256 = "1agywf7142d02m8pza84pzw908g1fjgc6799w7h93mwq63c0708m"; + editedCabalFile = "6a6ade94dda076697ee8a68b39f7197921c32794626fd56f1654e81f3b1bd6a1"; buildDepends = [ approximate base binary bits bytes cereal cereal-vector comonad deepseq distributive generic-deriving hashable hashable-extras lens @@ -73591,8 +73693,8 @@ self: { }: mkDerivation { pname = "language-c-quote"; - version = "0.10.1.3"; - sha256 = "0kbnqrplwb5w9jfljsrjxisnrnxbc0221hpznvq4m1ldx2mkrh1k"; + version = "0.10.2"; + sha256 = "036jjhzx98k1vgdlkx1mlwvb2wz3sw8sflb7c4wxcg05hjnb05ki"; buildDepends = [ array base bytestring containers exception-mtl exception-transformers filepath haskell-src-meta mainland-pretty @@ -73855,8 +73957,8 @@ self: { }: mkDerivation { pname = "language-lua"; - version = "0.6.2"; - sha256 = "0zic1ahh5wzikiafvz8npnj6qamksfc5d23lqqbdf1jq8as363n8"; + version = "0.6.3"; + sha256 = "0x7fafp78ipk4r2l2iagk7xgpbq5gwnqs33d4r4hk7k89jgjkv6c"; buildDepends = [ array base deepseq mtl parsec safe ]; testDepends = [ base deepseq directory filepath parsec QuickCheck tasty tasty-hunit @@ -75947,6 +76049,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "linearscan-hoopl" = callPackage + ({ mkDerivation, base, containers, free, hoopl, hspec + , hspec-expectations, lens-family-core, linearscan, transformers + }: + mkDerivation { + pname = "linearscan-hoopl"; + version = "0.1.0.0"; + sha256 = "19ahl0056szf49icv4sg0zcm2gmyy9sy8mj60d9c0iisj7qyblqj"; + buildDepends = [ + base containers free hoopl linearscan transformers + ]; + testDepends = [ + base containers hoopl hspec hspec-expectations lens-family-core + linearscan transformers + ]; + homepage = "http://github.com/jwiegley/linearscan-hoopl"; + description = "Make it easy to use the linearscan register allocator with Hoopl"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "linebreak" = callPackage ({ mkDerivation, base, hyphenation }: mkDerivation { @@ -77137,8 +77259,8 @@ self: { ({ mkDerivation, array, base }: mkDerivation { pname = "logfloat"; - version = "0.12.1"; - sha256 = "1k13jjqv4df341hcj9hzrlisfx9wrsmyqvzi6ricx341d9z4ch05"; + version = "0.13.0.1"; + sha256 = "1v8n4x3mspsf5q0b9xf5rf8c6xwqc5qvyv1s0zjsqw823i2vkgag"; buildDepends = [ array base ]; homepage = "http://code.haskell.org/~wren/"; description = "Log-domain floating point numbers"; @@ -77532,8 +77654,8 @@ self: { ({ mkDerivation, base, data-default, gl, linear, vector }: mkDerivation { pname = "lowgl"; - version = "0.3.1.0"; - sha256 = "16i88aq9fsin5g1n7r72fgn2dv7asp8c47hf6g8bq3imbbxhd2id"; + version = "0.3.1.1"; + sha256 = "1c354ddx9niimfnppbg43d0v2dfr5s9s5dkppi0sld06jxaakxc5"; buildDepends = [ base data-default gl linear vector ]; description = "Basic gl wrapper and reference"; license = stdenv.lib.licenses.bsd2; @@ -79333,8 +79455,8 @@ self: { }: mkDerivation { pname = "matrix"; - version = "0.3.4.1"; - sha256 = "12fw3hi7gkilrr7rsf1rwipimv2xqxb9rkl24k3yqjy06jbimhq9"; + version = "0.3.4.2"; + sha256 = "0i45k524z4hf43dab9dgis3ggcswjm0chlxqfc2rqh581gx85sgm"; buildDepends = [ base deepseq loop primitive vector ]; testDepends = [ base QuickCheck tasty tasty-quickcheck ]; description = "A native implementation of matrix operations"; @@ -80307,8 +80429,8 @@ self: { }: mkDerivation { pname = "mime-mail"; - version = "0.4.7"; - sha256 = "1lbnmanxcfd41agy2i5raywnd7dxrznwg833vm4nvaw73ix77cx4"; + version = "0.4.8.1"; + sha256 = "01das7dv5xrvbbmhz2jkd8s3nbp93vz89dnliz3q04aqc5wvdbh5"; buildDepends = [ base base64-bytestring blaze-builder bytestring filepath process random text @@ -81932,8 +82054,8 @@ self: { }: mkDerivation { pname = "mono-traversable"; - version = "0.8.0.1"; - sha256 = "19b4d21cgnp1iq3fcayi0phjp1lk1l09njpp6wpxcj2jcdi2l9sz"; + version = "0.9.0"; + sha256 = "1iw475jkm6szl82z9y7535c6ifzbg2faixryx39gv1mhg898brmm"; buildDepends = [ base bytestring comonad containers dlist dlist-instances hashable semigroupoids semigroups text transformers unordered-containers @@ -82739,8 +82861,8 @@ self: { }: mkDerivation { pname = "multiarg"; - version = "0.30.0.0"; - sha256 = "0iymwa87gh1cinj6gzbgh1z0mcgqf9sqrrnzm60vff7ak7yjq85g"; + version = "0.30.0.2"; + sha256 = "1c64w53s67m4w9m6jwal6h6529795kw2cnx99v718w2n64slp8n2"; isLibrary = true; isExecutable = true; buildDepends = [ base utf8-string ]; @@ -84127,8 +84249,8 @@ self: { }: mkDerivation { pname = "neil"; - version = "0.8"; - sha256 = "12p10s5im87am7y5dx5wr0dzbv8g80lnlazg59zx83vai42hl043"; + version = "0.9"; + sha256 = "0cg4x4b2x81d3mbk8nhwqib3pr154hd0snh160bfbm3b31yfr19k"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -84570,8 +84692,8 @@ self: { }: mkDerivation { pname = "network-attoparsec"; - version = "0.9.1"; - sha256 = "10nx1k47gwvb8av7fskd5jii0d6vpchj8cagm2285pg7dzv5apb7"; + version = "0.9.2"; + sha256 = "02f5fl5ylcz68ijvjbmx864j7nr45vxjscvslqn2gyh328zqq8dy"; buildDepends = [ attoparsec base bytestring mtl network ]; testDepends = [ attoparsec base bytestring exceptions hspec mtl network @@ -85123,26 +85245,28 @@ self: { "network-transport-zeromq" = callPackage ({ mkDerivation, async, base, binary, bytestring, containers - , exceptions, network-transport, network-transport-tests, random - , semigroups, stm, stm-chans, tasty, tasty-hunit, transformers - , void, zeromq4-haskell + , criterion, data-accessor, distributed-process + , distributed-process-tests, exceptions, network, network-transport + , network-transport-tests, random, semigroups, stm, stm-chans + , tasty, tasty-hunit, test-framework, transformers, zeromq4-haskell }: mkDerivation { pname = "network-transport-zeromq"; - version = "0.2"; - sha256 = "11ynb69y1zr4fhpja2wdf0h4yibhkjyfm499mlwjcrcn06wsz1wq"; + version = "0.2.1"; + sha256 = "0bfznyxf893k0yf4cm53bmmcpyrs7llpf6fd077rccn37x1kj0ih"; isLibrary = true; isExecutable = true; buildDepends = [ - async base binary bytestring containers exceptions - network-transport random semigroups stm stm-chans transformers void - zeromq4-haskell + async base binary bytestring containers criterion data-accessor + distributed-process exceptions network-transport random semigroups + stm stm-chans transformers zeromq4-haskell ]; testDepends = [ - base network-transport network-transport-tests tasty tasty-hunit - zeromq4-haskell + base bytestring containers distributed-process-tests network + network-transport network-transport-tests stm stm-chans tasty + tasty-hunit test-framework zeromq4-haskell ]; - jailbreak = true; + homepage = "https://github.com/tweag/network-transport-zeromq"; description = "ZeroMQ backend for network-transport"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -86255,18 +86379,15 @@ self: { }) {}; "objective" = callPackage - ({ mkDerivation, adjunctions, base, comonad, containers, either - , elevator, extensible, free, hashable, kan-extensions - , minioperational, profunctors, transformers, unordered-containers - , void, witherable + ({ mkDerivation, base, containers, either, free, hashable + , profunctors, transformers, unordered-containers, void, witherable }: mkDerivation { pname = "objective"; - version = "0.6.5.1"; - sha256 = "0s4va8gm1x0kc2gpsl704g5p1bbqrn6z5y5dap2kzciw791m7l1k"; + version = "1"; + sha256 = "1gpz3cpdhnbjfzyqix8bwzfba9lbsa6y0qjbzzrlahmw8i373c6f"; buildDepends = [ - adjunctions base comonad containers either elevator extensible free - hashable kan-extensions minioperational profunctors transformers + base containers either free hashable profunctors transformers unordered-containers void witherable ]; homepage = "https://github.com/fumieval/objective"; @@ -86283,9 +86404,8 @@ self: { }: mkDerivation { pname = "octohat"; - version = "0.1"; - sha256 = "1xiqs5q2cpgr6vgj3wpwildhnd08c2kwk52hzpwnnarwfif29r49"; - editedCabalFile = "8f268dfdda4d4fe6215f17223f11751da0bf15c4989282aae70c82ffe1a6e35c"; + version = "0.1.2"; + sha256 = "1mqakxvi2rh4w8bvd1galpcj33yjabj5c3kz1baw75p7sw2b081r"; buildDepends = [ aeson base base-compat base16-bytestring base64-bytestring bytestring containers cryptohash dotenv either errors http-client @@ -86295,6 +86415,7 @@ self: { testDepends = [ base base-compat dotenv hspec hspec-expectations text transformers ]; + homepage = "https://github.com/stackbuilders/octohat"; description = "A tested, minimal wrapper around GitHub's API"; license = stdenv.lib.licenses.mit; }) {}; @@ -86920,6 +87041,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "openssh-github-keys" = callPackage + ({ mkDerivation, base, directory, dotenv, filepath, hspec, octohat + , optparse-applicative, text, unix + }: + mkDerivation { + pname = "openssh-github-keys"; + version = "0.1.0.0"; + sha256 = "0zm7rypr2lsvidl8sl64nh7zc3r0m1yz606n9g7n3gr2dya4c032"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + base directory dotenv filepath octohat optparse-applicative text + unix + ]; + testDepends = [ base hspec octohat text ]; + homepage = "https://github.com/stackbuilders/openssh-github-keys"; + description = "Fetch OpenSSH keys from a Github team"; + license = stdenv.lib.licenses.mit; + }) {}; + "openssl-createkey" = callPackage ({ mkDerivation, base, directory, HsOpenSSL, time, unix }: mkDerivation { @@ -87200,12 +87341,11 @@ self: { }: mkDerivation { pname = "optparse-applicative"; - version = "0.11.0.1"; - sha256 = "0jdzajj9w0dghv751m59l3imzm2x9lx9cqb6094mncnx8k6cf6f9"; + version = "0.11.0.2"; + sha256 = "0ni52ii9555jngljvzxn1ngicr6i2w647ww3rzhdrmng04y95iii"; buildDepends = [ ansi-wl-pprint base process transformers transformers-compat ]; - jailbreak = true; homepage = "https://github.com/pcapriotti/optparse-applicative"; description = "Utilities and combinators for parsing command line options"; license = stdenv.lib.licenses.bsd3; @@ -87680,8 +87820,8 @@ self: { }: mkDerivation { pname = "pagerduty"; - version = "0.0.1"; - sha256 = "1cd7zwqbbm3vhzjjydsipwdb9kzync5zxpbsb2kf11gwrcwdcsss"; + version = "0.0.1.1"; + sha256 = "0k3jj18vs1mp7k6jdqgrvs1nyzkc6gxcqnqp560nvfxpj18km9cb"; buildDepends = [ aeson base bifunctors bytestring bytestring-conversion conduit data-default-class exceptions generics-sop http-client http-types @@ -88604,8 +88744,8 @@ self: { ({ mkDerivation, base, hspec, HUnit, QuickCheck, text, time }: mkDerivation { pname = "path-pieces"; - version = "0.1.5"; - sha256 = "05rya4gvpmm3pa4qp6cvvh4552qsrsgi61i1cx0aj8slakqrk8xw"; + version = "0.2.0"; + sha256 = "116zx2ryzywh2rd4q16a5vh04gw92as9vgfvraw3a66xn0m6g5y0"; buildDepends = [ base text time ]; testDepends = [ base hspec HUnit QuickCheck text ]; description = "Components of paths"; @@ -88712,8 +88852,8 @@ self: { }: mkDerivation { pname = "paypal-adaptive-hoops"; - version = "0.8.0.0"; - sha256 = "03hf55q0jly3y6czspw4680cb4999qfz2qgzpp4p1plwvss23lsr"; + version = "0.10.0.0"; + sha256 = "11v9s1hm1iyc03d20nzpp2djvxpikrqg915bjvgfcmw9zlfsh5qn"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -89813,8 +89953,8 @@ self: { }: mkDerivation { pname = "pgdl"; - version = "7.4"; - sha256 = "1n9cyj8yki922vm26bgnxpd4j1ps50gqllgncnk2gg5q7g6y3nz1"; + version = "7.5"; + sha256 = "00v80ppb3fl89jd8kdzs3phskbm3d2c27f8hxckdfrrq05wa56b3"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -90761,12 +90901,12 @@ self: { }) {}; "plailude" = callPackage - ({ mkDerivation, base, bytestring, mtl, time }: + ({ mkDerivation, base, bytestring, mtl, time, unix }: mkDerivation { pname = "plailude"; - version = "0.4.1.1"; - sha256 = "05br21gsmcqssi6wcp0pyyv1gx9q9imh6079vxigy9iacwq5hi0q"; - buildDepends = [ base bytestring mtl time ]; + version = "0.5.1"; + sha256 = "0c9q2pb7v1qv9v7xl8vcj3jncqsphz13accppxd7k6chmirrdnkh"; + buildDepends = [ base bytestring mtl time unix ]; jailbreak = true; homepage = "https://secure.plaimi.net/works/plailude"; description = "plaimi's prelude"; @@ -91958,8 +92098,8 @@ self: { }: mkDerivation { pname = "postgrest"; - version = "0.2.5.3"; - sha256 = "0kk4p3kcyp6wdjsnyyss1sfs8rjpjnhc8i79lagd30v7f244rv9b"; + version = "0.2.6.0"; + sha256 = "0aqf4d8a90zxxbnyx8f2ijnkv598akmzy4gp1lishzgrvfhdrywi"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -94859,6 +94999,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "radix" = callPackage + ({ mkDerivation, base, filepath }: + mkDerivation { + pname = "radix"; + version = "1.0.0.0"; + sha256 = "1hkz0fd1w72g6wnx9dq7z249195kjlhalcd1y8z13gj6yqn1sl9s"; + isLibrary = false; + isExecutable = true; + buildDepends = [ base filepath ]; + homepage = "https://github.com/thomaseding/radix"; + description = "Command-line tool for emitting numbers in various bases"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "rados-haskell" = callPackage ({ mkDerivation, async, base, bytestring, containers, hspec, HUnit , mtl, rados, uuid @@ -94902,8 +95056,8 @@ self: { ({ mkDerivation, base, terminfo, text }: mkDerivation { pname = "rainbow"; - version = "0.20.0.6"; - sha256 = "0y9mzfh9j7603wlgls664xlm5dj8ywbff7a1lmvi8awyz9yn80yz"; + version = "0.20.4.0"; + sha256 = "1h6rih0dn5ll8sz0j1w1wi9f6b8592fzf7c1mvl1d8bplcgahqhs"; buildDepends = [ base terminfo text ]; homepage = "https://www.github.com/massysett/rainbow"; description = "Print text to terminal with colors and effects"; @@ -94926,18 +95080,18 @@ self: { }) {}; "rainbox" = callPackage - ({ mkDerivation, array, base, QuickCheck, rainbow, rainbow-tests - , random, tasty, tasty-quickcheck, text, transformers + ({ mkDerivation, array, barecheck, base, ChasingBottoms, QuickCheck + , rainbow, tasty, tasty-quickcheck, text, transformers }: mkDerivation { pname = "rainbox"; - version = "0.8.0.0"; - sha256 = "0w90fdhb686whd64xyaxpk83cx8gms0y37amfwlvbwh821zfnjii"; + version = "0.10.0.0"; + sha256 = "0yq9xk11rckdb72hqis0mwff82qm4hk2nahgns3fr5fxg4c7wrj1"; isLibrary = true; isExecutable = true; buildDepends = [ array base rainbow text transformers ]; testDepends = [ - array base QuickCheck rainbow rainbow-tests random tasty + array barecheck base ChasingBottoms QuickCheck rainbow tasty tasty-quickcheck text transformers ]; homepage = "http://www.github.com/massysett/rainbox"; @@ -96091,8 +96245,8 @@ self: { }: mkDerivation { pname = "reducers"; - version = "3.10.3"; - sha256 = "0hi77mgc2f38y0xfykn7x6gdl6xg710skpx4z76s8c0wwnd28pr6"; + version = "3.10.3.1"; + sha256 = "0qmd93jdh0qjyc9if9hr2yjanrqx5nlbz5j0daiywzxcb0hi7ri8"; buildDepends = [ array base bytestring comonad containers fingertree hashable keys pointed semigroupoids semigroups text transformers @@ -116116,6 +116270,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "types-compat" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "types-compat"; + version = "0.1.0"; + sha256 = "14szcqcff3zl7092qnrxgiyh1gbnkx7y557n491r3am42c79d90r"; + buildDepends = [ base ]; + homepage = "https://github.com/philopon/apiary"; + description = "ghc-7.6/7.8 compatible GHC.TypeLits, Data.Typeable and Data.Proxy."; + license = stdenv.lib.licenses.mit; + }) {}; + "typesafe-endian" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -116385,8 +116551,9 @@ self: { }: mkDerivation { pname = "uhc-light"; - version = "1.1.8.6"; - sha256 = "0p2lhs94yynglw6xk04hw173557g96ig7x4digyavldd0153k65r"; + version = "1.1.8.7"; + sha256 = "05ki2zmravvnikn9d5ldiaxafyqnf2ghh7w2jpq1gzpx2mwslrrp"; + editedCabalFile = "d2ebe192f81a8eec4d1c0bc1b5a52a78c00d1839754ec75a88c16bc63c722f2d"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -116406,8 +116573,8 @@ self: { }: mkDerivation { pname = "uhc-util"; - version = "0.1.4.0"; - sha256 = "17d629840h6ilrmqaq0pfb7n9yncaraysp24rhg1nqmpfb0cilnd"; + version = "0.1.5.0"; + sha256 = "1im2hn285lmi2gvlhyi78hhhq0mb72hv74jn2cwrzqb03lav8q52"; buildDepends = [ array base binary bytestring containers directory fgl hashable ListLike mtl process syb time time-compat uulib @@ -117015,8 +117182,8 @@ self: { ({ mkDerivation, base, template-haskell, units }: mkDerivation { pname = "units-defs"; - version = "2.0"; - sha256 = "0jpm0rnnw3fl4hsmcwgyr738z9p4hjw6gcgr725zw35gm6lg3c3y"; + version = "2.0.0.1"; + sha256 = "04k9wjyq23ml89nnjx2lwxiik54wc4rcbmpvvr7fh9wgsl74k6pv"; buildDepends = [ base template-haskell units ]; homepage = "http://github.com/goldfirere/units-defs"; description = "Definitions for use with the units package"; @@ -118660,8 +118827,8 @@ self: { }: mkDerivation { pname = "vcache"; - version = "0.1"; - sha256 = "1w0adp7bq73kw0l27a5cgwy6hm6wmi7f48lakb98m62w89qy8xkk"; + version = "0.1.1"; + sha256 = "1xg7vrkqr6hjkpy6larz72dfk6f63kdr7qvjfrv1wrgpvdvia2jm"; buildDepends = [ base bytestring containers direct-murmur-hash easy-file filelock lmdb random stm transformers @@ -121031,14 +121198,14 @@ self: { "web-routing" = callPackage ({ mkDerivation, base, bytestring, doctest, primitive, text - , unordered-containers + , types-compat, unordered-containers }: mkDerivation { pname = "web-routing"; - version = "0.4.2"; - sha256 = "0cvdq0k0p0agxj9imxvf6mxr7vhmg1nr3c0ww9whdnfn52bbljv9"; + version = "0.5.0"; + sha256 = "074yllv21djz9g3qh8wl1dn3riy0ax2i2z4c6wh8732c6pwbxygx"; buildDepends = [ - base bytestring primitive text unordered-containers + base bytestring primitive text types-compat unordered-containers ]; testDepends = [ base doctest ]; homepage = "https://github.com/philopon/web-routing"; @@ -124398,8 +124565,8 @@ self: { }: mkDerivation { pname = "yesod-auth"; - version = "1.4.2"; - sha256 = "05q9l4yh6nlbdh1m7a1i4n2n3y61b9lcfx46ibsay51ykw09p08x"; + version = "1.4.3"; + sha256 = "05x4mzf6c1ab2bf724wmsl6dqhqqjw12j44q0c4v4szcp4fngsab"; buildDepends = [ aeson authenticate base base16-bytestring base64-bytestring binary blaze-builder blaze-html blaze-markup byteable bytestring conduit @@ -124437,6 +124604,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-auth-basic" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, exceptions + , hlint, hspec, text, wai, word8, yesod, yesod-test + }: + mkDerivation { + pname = "yesod-auth-basic"; + version = "0.1.0.1"; + sha256 = "1q4fb2s71bg7r282327rsgvgcghq911knm8wf5yfq53s0k4dxkki"; + buildDepends = [ + base base64-bytestring bytestring exceptions text wai word8 yesod + ]; + testDepends = [ base hlint hspec text yesod yesod-test ]; + jailbreak = true; + description = "Yesod Middleware for HTTP Basic Authentication"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "yesod-auth-bcrypt" = callPackage ({ mkDerivation, base, bcrypt, bytestring, text, yesod-auth , yesod-core, yesod-form, yesod-persistent @@ -124730,8 +124914,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.4.8"; - sha256 = "02c5c8d688dsxxqz9kgh2niyh9775cjmnympab9mwjkq6m3wblpq"; + version = "1.4.8.1"; + sha256 = "1ynhxzc4q80zamyyabjhiz7mgh7wjzqm23xlx67x7lpwz0q18hpb"; buildDepends = [ aeson auto-update base blaze-builder blaze-html blaze-markup bytestring case-insensitive cereal clientsession conduit @@ -125298,6 +125482,7 @@ self: { base bytestring containers hspec HUnit path-pieces template-haskell text ]; + jailbreak = true; homepage = "http://www.yesodweb.com/"; description = "Efficient routing for Yesod"; license = stdenv.lib.licenses.mit; From aa8b539611acbdf8e15ed8309222eed92a4a80b9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 20 Feb 2015 13:31:43 +0100 Subject: [PATCH 158/197] haskell-asn1-encoding fails its test suite on Linux/i686 --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6d02f4c6cb9..ae74c4b726a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -526,6 +526,9 @@ self: super: { # https://github.com/afcowie/http-streams/issues/80 http-streams = dontCheck super.http-streams; + # https://github.com/vincenthz/hs-asn1/issues/12 + asn1-encoding = dontCheck super.asn1-encoding; + } // { # Not on Hackage. From 81082affeb77bf6dec735e39185c8017c79a2b55 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 20 Feb 2015 13:35:53 +0100 Subject: [PATCH 159/197] haskell-c2hs fails its test suite on Linux/i686 --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ae74c4b726a..74872e16f28 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -529,6 +529,9 @@ self: super: { # https://github.com/vincenthz/hs-asn1/issues/12 asn1-encoding = dontCheck super.asn1-encoding; + # https://github.com/NixOS/nixpkgs/issues/6343 + c2hs = dontCheck super.c2hs; + } // { # Not on Hackage. From b4ed8845a922eb0c5dcc09d7cbadcd47ae580c16 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 20 Feb 2015 13:37:13 +0100 Subject: [PATCH 160/197] haskell-uhc-light: Haddock syntax errors have been fixed --- pkgs/development/haskell-modules/configuration-common.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 74872e16f28..b2a441b0fe4 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -101,7 +101,6 @@ self: super: { markdown-unlit = dontHaddock super.markdown-unlit; network-conduit = dontHaddock super.network-conduit; shakespeare-text = dontHaddock super.shakespeare-text; - uhc-light = dontHaddock super.uhc-light; # https://github.com/UU-ComputerScience/uhc/issues/45 wai-test = dontHaddock super.wai-test; # jailbreak doesn't get the job done because the Cabal file uses conditionals a lot. From 14fe14955131449d0031a64f9ba0264e7c5ada46 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 20 Feb 2015 23:04:33 +0100 Subject: [PATCH 161/197] haskell-types-compat: Haddock fails with an internal error --- pkgs/development/haskell-modules/configuration-common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b2a441b0fe4..ad88c0cd582 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -101,6 +101,7 @@ self: super: { markdown-unlit = dontHaddock super.markdown-unlit; network-conduit = dontHaddock super.network-conduit; shakespeare-text = dontHaddock super.shakespeare-text; + types-compat = dontHaddock super.types-compat; # https://github.com/philopon/apiary/issues/15 wai-test = dontHaddock super.wai-test; # jailbreak doesn't get the job done because the Cabal file uses conditionals a lot. From 862d224c69562f0ce0e0b0bd2e00ebcf8ed27ffd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 21 Feb 2015 14:41:29 +0100 Subject: [PATCH 162/197] haskell-wxc: fix build Our 'wxGTK' attribute refers to wxwidgets 2.8 by default, but haskell-wxc needs version 2.9 or later. Resolves https://github.com/NixOS/nixpkgs/issues/6478. --- .../haskell-modules/configuration-common.nix | 8 ++++++++ pkgs/development/haskell-modules/hackage-packages.nix | 3 --- pkgs/development/haskell-modules/wxc-no-ldconfig.patch | 10 ++++++++++ 3 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/haskell-modules/wxc-no-ldconfig.patch diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ad88c0cd582..f57928a49fe 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -532,6 +532,14 @@ self: super: { # https://github.com/NixOS/nixpkgs/issues/6343 c2hs = dontCheck super.c2hs; + # wxc needs help deciding which version of GTK to use. + wxc = overrideCabal (super.wxc.override { wxGTK = pkgs.wxGTK29; }) (drv: { + patches = [ ./wxc-no-ldconfig.patch ]; + doHaddock = false; + postInstall = "cp -v dist/build/libwxc.so.${drv.version} $out/lib/libwxc.so"; + }); + wxcore = super.wxcore.override { wxGTK = pkgs.wxGTK29; }; + } // { # Not on Hackage. diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index fe3a8c617ae..482ef44f374 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -122369,7 +122369,6 @@ self: { homepage = "http://haskell.org/haskellwiki/WxHaskell"; description = "wxHaskell"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wxAsteroids" = callPackage @@ -122417,7 +122416,6 @@ self: { homepage = "http://haskell.org/haskellwiki/WxHaskell"; description = "wxHaskell C++ wrapper"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs.xlibs) libX11; inherit (pkgs) mesa; inherit (pkgs) wxGTK;}; @@ -122437,7 +122435,6 @@ self: { homepage = "http://haskell.org/haskellwiki/WxHaskell"; description = "wxHaskell core"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs.xlibs) libX11; inherit (pkgs) mesa; inherit (pkgs) wxGTK;}; diff --git a/pkgs/development/haskell-modules/wxc-no-ldconfig.patch b/pkgs/development/haskell-modules/wxc-no-ldconfig.patch new file mode 100644 index 00000000000..72a8648cab6 --- /dev/null +++ b/pkgs/development/haskell-modules/wxc-no-ldconfig.patch @@ -0,0 +1,10 @@ +Only in wxc-0.91.0.0: dist +diff -ubr wxc-0.91.0.0-orig/Setup.hs wxc-0.91.0.0/Setup.hs +--- wxc-0.91.0.0-orig/Setup.hs 2014-10-31 13:30:15.514809137 +0100 ++++ wxc-0.91.0.0/Setup.hs 2014-10-31 13:33:53.606372005 +0100 +@@ -507,5 +507,3 @@ + inst_lib_dir = libdir $ absoluteInstallDirs pkg_descr local_bld_info NoCopyDest + + installOrdinaryFile (verbosity flags) (bld_dir lib_name) (inst_lib_dir lib_name) +- ldconfig inst_lib_dir +- From 79c33623a5bc881ec0e1eb8c751f8a2d6a3056e4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 21 Feb 2015 14:46:56 +0100 Subject: [PATCH 163/197] haskell-apiary: test suite depends on obsolete QuickCheck 1.x --- .../haskell-modules/configuration-common.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f57928a49fe..b265da478fa 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -540,6 +540,23 @@ self: super: { }); wxcore = super.wxcore.override { wxGTK = pkgs.wxGTK29; }; + # Depends on obsolete QuickCheck 1.x. + test-framework-quickcheck = markBroken super.test-framework-quickcheck; + + # Depends on broken test-framework-quickcheck. + apiary = dontCheck super.apiary; + apiary-authenticate = dontCheck super.apiary-authenticate; + apiary-clientsession = dontCheck super.apiary-clientsession; + apiary-cookie = dontCheck super.apiary-cookie; + apiary-eventsource = dontCheck super.apiary-eventsource; + apiary-logger = dontCheck super.apiary-logger; + apiary-memcached = dontCheck super.apiary-memcached; + apiary-mongoDB = dontCheck super.apiary-mongoDB; + apiary-persistent = dontCheck super.apiary-persistent; + apiary-purescript = dontCheck super.apiary-purescript; + apiary-session = dontCheck super.apiary-session; + apiary-websockets = dontCheck super.apiary-websockets; + } // { # Not on Hackage. From 5b475709c8f69ea6f2ff224cb24a1e3932c3f72b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 21 Feb 2015 15:11:30 +0100 Subject: [PATCH 164/197] haskell-elevator doesn't compile. --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b265da478fa..3f098da190e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -557,6 +557,10 @@ self: super: { apiary-session = dontCheck super.apiary-session; apiary-websockets = dontCheck super.apiary-websockets; + # https://github.com/fumieval/elevator/issues/2 + elevator = markBroken super.elevator; + minioperational = markBroken super.minioperational; + } // { # Not on Hackage. From 05b97395ae05b4b89538998333cef8e7c2abb5c6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 21 Feb 2015 15:13:32 +0100 Subject: [PATCH 165/197] haskell-hmm does not compile. --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 3f098da190e..da59527dff4 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -561,6 +561,9 @@ self: super: { elevator = markBroken super.elevator; minioperational = markBroken super.minioperational; + # https://github.com/mikeizbicki/hmm/issues/12 + hmm = markBroken super.hmm; + } // { # Not on Hackage. From ac2c57ea2c918d06c355dbc790d44d25ba277b38 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 21 Feb 2015 13:54:22 -0600 Subject: [PATCH 166/197] poppler_qt5: use Qt 5.4 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be76e17bf15..ed6e8a9de3f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7012,7 +7012,7 @@ let policykit = callPackage ../development/libraries/policykit { }; - poppler = callPackage ../development/libraries/poppler { lcms = lcms2; }; + poppler = callPackage ../development/libraries/poppler { lcms = lcms2; qt5 = qt54; }; popplerQt4 = poppler.poppler_qt4; poppler_qt5 = poppler.poppler_qt5; From 68f2db74ffbf079696c2ac4143ffdec71a86831d Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 21 Feb 2015 13:59:28 -0600 Subject: [PATCH 167/197] kde5: always use plasma-nm --- .../services/x11/desktop-managers/kde5.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index 010a49975e1..2bcb99f3b94 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -88,18 +88,6 @@ in }; environment.systemPackages = - (builtins.attrValues - (removeAttrs plasma5 - [ "deepOverride" "kf5" "override" "overrideDerivation" - "recurseForDerivations" "scope" - ])) - ++ - (builtins.attrValues - (removeAttrs kf5 - [ "deepOverride" "mkDerivation" "override" "overrideDerivation" - "recurseForDerivations" "qt5" "scope" - ])) - ++ [ pkgs.qt4 # qtconfig is the only way to set Qt 4 theme @@ -115,7 +103,8 @@ in pkgs.orion # GTK theme, nearly identical to Breeze ] - ++ (optional config.networking.networkmanager.enable plasma5.plasma-nm) + ++ filter isDerivation (builtins.attrValues plasma5) + ++ filter isDerivation (builtins.attrValues kf5) ++ phononBackendPackages; environment.pathsToLink = [ "/share" ]; From 142a5ce2b3f6403f2c486cdeec4ed7714e551adf Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sat, 21 Feb 2015 14:04:52 -0500 Subject: [PATCH 168/197] makebootfat: initial package at version 1.4 http://advancemame.sourceforge.net/boot-readme.html --- pkgs/tools/misc/makebootfat/default.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/tools/misc/makebootfat/default.nix diff --git a/pkgs/tools/misc/makebootfat/default.nix b/pkgs/tools/misc/makebootfat/default.nix new file mode 100644 index 00000000000..03c913b7224 --- /dev/null +++ b/pkgs/tools/misc/makebootfat/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "makebootfat-1.4"; + + src = fetchurl { + url = "mirror://sourceforge/advancemame/${name}.tar.gz"; + sha256 = "0v0g1xax0y6hmw2x10nfhchp9n7vqyvgc33gcxqax8jdq2pxm1q2"; + }; + + meta = with stdenv.lib; { + description = "Create bootable USB disks using the FAT filesystem and syslinux"; + homepage = "http://advancemame.sourceforge.net/boot-readme.html"; + license = licenses.gpl2; + maintainers = [ maintainers.emery ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 766d2a3a3cc..1d6fdd6f6e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1704,6 +1704,8 @@ let kzipmix = callPackage_i686 ../tools/compression/kzipmix { }; + makebootfat = callPackage ../tools/misc/makebootfat { }; + minidlna = callPackage ../tools/networking/minidlna { ffmpeg = ffmpeg_0_10; }; From 11fce52c7c14f1e15196f0f2a2f903ac9f45bf21 Mon Sep 17 00:00:00 2001 From: Ambroz Bizjak Date: Sat, 21 Feb 2015 23:48:15 +0100 Subject: [PATCH 169/197] gcc-arm-embedded: Update to 4.9-2014q4. --- pkgs/top-level/all-packages.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 05661758a8f..5c1615ee393 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3499,7 +3499,12 @@ let releaseType = "update"; sha256 = "ce92859550819d4a3d1a6e2672ea64882b30afa2c08cf67fa8e1d93788c2c577"; }; - gcc-arm-embedded = gcc-arm-embedded-4_8; + gcc-arm-embedded-4_9 = callPackage_i686 ../development/compilers/gcc-arm-embedded { + version = "4.9-2014q4-20141203"; + releaseType = "major"; + sha256 = "a440bcf68e36b291697567816e756877cd3b5782298e3e3c44eb0812a471980f"; + }; + gcc-arm-embedded = gcc-arm-embedded-4_9; gforth = callPackage ../development/compilers/gforth {}; From 7c37b4d672e3e083a348442bddff541c7c341204 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 21 Feb 2015 18:17:04 -0600 Subject: [PATCH 170/197] dropbox: update to version 3.2.6 --- pkgs/applications/networking/dropbox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index d49162d0723..df64ea1f2d8 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -25,9 +25,9 @@ let else if stdenv.system == "i686-linux" then "ld-linux.so.2" else throw "Dropbox client for: ${stdenv.system} not supported!"; - version = "2.10.52"; - sha256 = if stdenv.system == "x86_64-linux" then "0fn2frp00f0p0r6v5czzxfbw1ifan9w12k3ry8gq1m4bvx6g27p6" - else if stdenv.system == "i686-linux" then "1rm5kspb53zqgaz48v8x3ffk1mcfi0nh0zsmsdniyrgqbis5mmm9" + version = "3.2.6"; + sha256 = if stdenv.system == "x86_64-linux" then "1pih4dgqsxx9s8vjmn49qdrrgfkkw8wl3m68x7mdz6wqb4lj3sry" + else if stdenv.system == "i686-linux" then "0nnxj32xvhn312a16fhhxjf0brbivaw6m0s8d8qdn44qmg9fr4bz" else throw "Dropbox client for: ${stdenv.system} not supported!"; # relative location where the dropbox libraries are stored From e2dabcfcfe11038b07646e58453b1a0371350df9 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 21 Feb 2015 18:38:32 -0600 Subject: [PATCH 171/197] zotero: update to 4.0.26 --- pkgs/applications/office/zotero/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 2ed05f9aa8b..9283072c0c1 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -4,10 +4,10 @@ let xpi = fetchurl { url = "https://download.zotero.org/extension/zotero-${version}.xpi"; - sha256 = "0di6d3s95fmb4pmghl4ix7lq5pmqrddd4y8dmnpsrhbj0awzxw3s"; + sha256 = "15wdbwnaxs748psjnxw40wld45npjjmvwx70c0jx2p63y6ks2gcx"; }; - version = "4.0.25.2"; + version = "4.0.26"; in stdenv.mkDerivation { @@ -16,7 +16,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://github.com/zotero/zotero-standalone-build/archive/${version}.tar.gz"; - sha256 = "0wjmpz7fy3ij8q22s885kv8xrgc3yx7f1mwrvb6lnpc2xl54rl5g"; + sha256 = "11gbislxkhfycnii05v6d8h9qdp5rk5xag7kdnsih67gicnn467g"; }; nativeBuildInputs = [ perl unzipNLS ]; From 63d61cee7fa0d6d0bb9d0c8e4ecca8872896f805 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Sat, 21 Feb 2015 02:41:37 -0500 Subject: [PATCH 172/197] teyjus: 2.0-b2 --- lib/maintainers.nix | 1 + pkgs/development/compilers/teyjus/default.nix | 28 +++++++++++++++++++ .../compilers/teyjus/fix-lex-to-flex.patch | 23 +++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 4 files changed, 56 insertions(+) create mode 100644 pkgs/development/compilers/teyjus/default.nix create mode 100644 pkgs/development/compilers/teyjus/fix-lex-to-flex.patch diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 89ab1f5c3cf..dc97f7e456a 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -27,6 +27,7 @@ aycanirican = "Aycan iRiCAN "; balajisivaraman = "Balaji Sivaraman"; bbenoist = "Baptist BENOIST "; + bcdarwin = "Ben Darwin "; bdimcheff = "Brandon Dimcheff "; bennofs = "Benno Fünfstück "; benley = "Benjamin Staffin "; diff --git a/pkgs/development/compilers/teyjus/default.nix b/pkgs/development/compilers/teyjus/default.nix new file mode 100644 index 00000000000..b16b32a6a06 --- /dev/null +++ b/pkgs/development/compilers/teyjus/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, omake, ocaml, flex, bison }: + +stdenv.mkDerivation { + name = "teyjus-2.0b2"; + + src = fetchurl { + url = "https://teyjus.googlecode.com/files/teyjus-source-2.0-b2.tar.gz"; + sha256 = "f589fb460d7095a6e674b7a6413772c41b98654c38602c3e8c477a976da99052"; + }; + + patches = [ ./fix-lex-to-flex.patch ]; + + buildInputs = [ omake ocaml flex bison ]; + + buildPhase = "omake all"; + + checkPhase = "omake check"; + + installPhase = "mkdir -p $out/bin && cp tj* $out/bin"; + + meta = with stdenv.lib; { + description = "An efficient implementation of the Lambda Prolog language"; + homepage = https://code.google.com/p/teyjus/; + license = stdenv.lib.licenses.gpl3; + maintainers = [ maintainers.bcdarwin ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/compilers/teyjus/fix-lex-to-flex.patch b/pkgs/development/compilers/teyjus/fix-lex-to-flex.patch new file mode 100644 index 00000000000..d2da1d3facc --- /dev/null +++ b/pkgs/development/compilers/teyjus/fix-lex-to-flex.patch @@ -0,0 +1,23 @@ +diff --git a/source/OMakefile b/source/OMakefile +index 6b19d84..095b8b6 100644 +--- a/source/OMakefile ++++ b/source/OMakefile +@@ -164,12 +164,17 @@ LNK_MAIN = $(FNT)/linkerfront + DEP_MAIN = $(FNT)/dependfront + + ############################################################ ++# Nixpkgs specific changes ++# ++ ++LEX = flex ++ ++############################################################ + # Platform specific changes + # + + if $(mem $(OSTYPE), Cygwin Win32) + YACC = bison -by +- LEX = flex + CFLAGS += -mno-cygwin + INC_C[] += $(INC)/byteswap $(INC)/search + export diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c1615ee393..8a00b867d30 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4166,6 +4166,10 @@ let tbb = callPackage ../development/libraries/tbb { }; + teyjus = callPackage ../development/compilers/teyjus { + omake = omake_rc1; + }; + tinycc = callPackage ../development/compilers/tinycc { }; urweb = callPackage ../development/compilers/urweb { }; From 18e594eddbd7027869b754ba74d59fea8dcbd102 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 21 Feb 2015 20:19:21 -0600 Subject: [PATCH 173/197] hplip: update to 3.15.2 --- pkgs/misc/drivers/hplip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 60e276defde..b40aab73a4d 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -6,11 +6,11 @@ let - name = "hplip-3.14.10"; + name = "hplip-3.15.2"; src = fetchurl { url = "mirror://sourceforge/hplip/${name}.tar.gz"; - sha256 = "164mm30yb61psk5j4ziybxdd310y09fixgl09hmb59ny261wvcqi"; + sha256 = "0z7n62vdbr0p0kls1m2sr3nhvkhx3rawcbzd0zdl0lnq8fkyq0jz"; }; hplip_state = @@ -23,7 +23,7 @@ let plugin = fetchurl { url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run"; - sha256 = "10cvgy1h84fwh7xpw4x6cbkpisqbn3nbcqrgd9xz5fc6mn0b95dk"; + sha256 = "0j8z8m3ygwahka7jv3hpzvfz187lh3kzzjhcy7grgaw2k01v5frm"; }; in From d15d0bebc3950a2a1494a5b5fbb34b6507d176d8 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 21 Feb 2015 20:58:43 -0600 Subject: [PATCH 174/197] kde5: remove file collisions --- nixos/modules/services/x11/desktop-managers/kde5.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index 2bcb99f3b94..9c3c65dcfaa 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -93,8 +93,6 @@ in kdeApps.kde-baseapps kdeApps.kde-base-artwork - kdeApps.kde-workspace - kdeApps.kde-runtime kdeApps.kmix kdeApps.konsole kdeApps.oxygen-icons From e149afe3a1eae95bb776c609e3977fbef39f01a6 Mon Sep 17 00:00:00 2001 From: Nathaniel Baxter Date: Sun, 22 Feb 2015 15:16:39 +1100 Subject: [PATCH 175/197] quazip: update from 0.7 to 0.7.1 --- pkgs/development/libraries/quazip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix index 7b1e70e0eed..4db9d8b4665 100644 --- a/pkgs/development/libraries/quazip/default.nix +++ b/pkgs/development/libraries/quazip/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, zip, zlib, qt }: stdenv.mkDerivation rec { - name = "quazip-0.7"; + name = "quazip-0.7.1"; src = fetchurl { url = "mirror://sourceforge/quazip/${name}.tar.gz"; - sha256 = "8af5e7f9bff98b5a2982800a292eae0176c2b41a98a8deab14f4e1cbe07674a4"; + sha256 = "1pijy6zn8kdx9m6wrckid24vkgp250hklbpmgrpixiam6l889jbq"; }; configurePhase = "cd quazip && qmake quazip.pro"; From 0aad4b7ee418a5a4a6aa0c2da8a590480a63562a Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 28 Jan 2015 08:12:51 +0100 Subject: [PATCH 176/197] chromium: Update all channels to latest versions. Overview of the updated versions: stable: 40.0.2214.91 -> 40.0.2214.115 beta: 41.0.2272.16 -> 41.0.2272.64 dev: 41.0.2272.16 -> 42.0.2305.3 Introduces 42.0.2305.3 as the new dev version, which no longer requires our user namespaces sandbox patch. Thanks to everyone participating in https://crbug.com/312380 for finally having this upstream. In the course of supporting the official namespace sandbox (that's what the user namespace sandbox is called), a few things needed to be fixed for version 42: * Add an updated nix_plugin_paths.patch, because the old one tries to patch the path for libpdf, which is now natively included in Chromium. * Don't copy libpdf.so to libexec path for version 42, it's no longer needed as it's completely built-in now. * Disable SUID sandbox directly in the source instead of going the easy route of passing --disable-setuid-sandbox. The reason is that with the command line flag a nasty nagbar will appear. Signed-off-by: aszlig --- .../networking/browsers/chromium/browser.nix | 6 +- .../networking/browsers/chromium/common.nix | 6 +- .../networking/browsers/chromium/default.nix | 4 +- .../browsers/chromium/source/default.nix | 13 ++- .../chromium/source/nix_plugin_paths_42.patch | 93 +++++++++++++++++++ .../browsers/chromium/source/sources.nix | 24 ++--- 6 files changed, 127 insertions(+), 19 deletions(-) create mode 100644 pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_42.patch diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 6dcc1dbf860..41617d0182a 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -12,8 +12,10 @@ mkChromiumDerivation (base: rec { cp -v "$buildPath/"*.pak "$buildPath/"*.bin "$libExecPath/" cp -v "$buildPath/icudtl.dat" "$libExecPath/" cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/" - cp -v "$buildPath/libpdf.so" "$buildPath/libffmpegsumo.so" "$libExecPath/" - + cp -v "$buildPath/libffmpegsumo.so" "$libExecPath/" + ${optionalString (versionOlder base.version "42.0.0.0") '' + cp -v "$buildPath/libpdf.so" "$libExecPath/" + ''} cp -v "$buildPath/chrome" "$libExecPath/$packageName" mkdir -vp "$out/share/man/man1" diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 9c8e7d08382..14d53357b89 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -135,11 +135,11 @@ let -exec chmod u+w {} + ''; - postPatch = '' + postPatch = optionalString (versionOlder version "42.0.0.0") '' sed -i -e '/base::FilePath exe_dir/,/^ *} *$/c \ sandbox_binary = base::FilePath(getenv("CHROMIUM_SANDBOX_BINARY_PATH")); ' sandbox/linux/suid/client/setuid_sandbox_client.cc - + '' + '' sed -i -e '/module_path *=.*libexif.so/ { s|= [^;]*|= base::FilePath().AppendASCII("${libexif}/lib/libexif.so")| }' chrome/utility/media_galleries/image_metadata_extractor.cc @@ -166,7 +166,9 @@ let use_openssl = useOpenSSL; selinux = enableSELinux; use_cups = cupsSupport; + } // optionalAttrs (versionOlder version "42.0.0.0") { linux_sandbox_chrome_path="${libExecPath}/${packageName}"; + } // { werror = ""; clang = false; enable_hidpi = hiDPISupport; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index c41b2e2c4e7..85b2e9b8051 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -73,13 +73,15 @@ in stdenv.mkDerivation { sandboxBinary = "${chromium.sandbox}/bin/chromium-sandbox"; mkEnvVar = key: val: "--set '${key}' '${val}'"; envVars = chromium.plugins.settings.envVars or {}; + isVer42 = !stdenv.lib.versionOlder chromium.browser.version "42.0.0.0"; flags = chromium.plugins.settings.flags or []; + setBinPath = "--set CHROMIUM_SANDBOX_BINARY_PATH \"${sandboxBinary}\""; in with stdenv.lib; '' mkdir -p "$out/bin" "$out/share/applications" ln -s "${chromium.browser}/share" "$out/share" makeWrapper "${browserBinary}" "$out/bin/chromium" \ - --set CHROMIUM_SANDBOX_BINARY_PATH "${sandboxBinary}" \ + ${optionalString (!isVer42) setBinPath} \ ${concatStrings (mapAttrsToList mkEnvVar envVars)} \ --add-flags "${concatStringsSep " " flags}" diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix index 15f2feb5a43..1a48c2d037c 100644 --- a/pkgs/applications/networking/browsers/chromium/source/default.nix +++ b/pkgs/applications/networking/browsers/chromium/source/default.nix @@ -9,7 +9,9 @@ with (import ./update.nix { inherit (stdenv) system; }).getChannel channel; -stdenv.mkDerivation { +let + pre42 = versionOlder version "42.0.0.0"; +in stdenv.mkDerivation { name = "chromium-source-${version}"; src = fetchurl main; @@ -22,7 +24,11 @@ stdenv.mkDerivation { prePatch = "patchShebangs ."; - patches = [ ./sandbox_userns_36.patch ./nix_plugin_paths.patch ]; + patches = if pre42 then [ + ./sandbox_userns_36.patch ./nix_plugin_paths.patch + ] else [ + ./nix_plugin_paths_42.patch + ]; postPatch = '' sed -i -r \ @@ -32,6 +38,9 @@ stdenv.mkDerivation { build/common.gypi chrome/chrome_tests.gypi '' + optionalString useOpenSSL '' cat $opensslPatches | patch -p1 -d third_party/openssl/openssl + '' + optionalString (!pre42) '' + sed -i -e '/LOG.*no_suid_error/d' \ + "$main/content/browser/browser_main_loop.cc" ''; outputs = [ "out" "sandbox" "bundled" "main" ]; diff --git a/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_42.patch b/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_42.patch new file mode 100644 index 00000000000..fb09763c997 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_42.patch @@ -0,0 +1,93 @@ +diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc +index 8a205a6..d5c24e1 100644 +--- a/chrome/common/chrome_paths.cc ++++ b/chrome/common/chrome_paths.cc +@@ -97,21 +97,14 @@ static base::LazyInstance + g_invalid_specified_user_data_dir = LAZY_INSTANCE_INITIALIZER; + + // Gets the path for internal plugins. +-bool GetInternalPluginsDirectory(base::FilePath* result) { +-#if defined(OS_MACOSX) && !defined(OS_IOS) +- // If called from Chrome, get internal plugins from a subdirectory of the +- // framework. +- if (base::mac::AmIBundled()) { +- *result = chrome::GetFrameworkBundlePath(); +- DCHECK(!result->empty()); +- *result = result->Append("Internet Plug-Ins"); +- return true; +- } +- // In tests, just look in the module directory (below). +-#endif +- +- // The rest of the world expects plugins in the module directory. +- return PathService::Get(base::DIR_MODULE, result); ++bool GetInternalPluginsDirectory(base::FilePath* result, ++ const std::string& ident) { ++ std::string full_env = std::string("NIX_CHROMIUM_PLUGIN_PATH_") + ident; ++ const char* value = getenv(full_env.c_str()); ++ if (value == NULL) ++ return PathService::Get(base::DIR_MODULE, result); ++ else ++ *result = base::FilePath(value); + } + + } // namespace +@@ -248,11 +241,11 @@ bool PathProvider(int key, base::FilePath* result) { + create_dir = true; + break; + case chrome::DIR_INTERNAL_PLUGINS: +- if (!GetInternalPluginsDirectory(&cur)) ++ if (!GetInternalPluginsDirectory(&cur, "ALL")) + return false; + break; + case chrome::DIR_PEPPER_FLASH_PLUGIN: +- if (!GetInternalPluginsDirectory(&cur)) ++ if (!GetInternalPluginsDirectory(&cur, "PEPPERFLASH")) + return false; + cur = cur.Append(kPepperFlashBaseDirectory); + break; +@@ -285,7 +278,7 @@ bool PathProvider(int key, base::FilePath* result) { + cur = cur.Append(FILE_PATH_LITERAL("script.log")); + break; + case chrome::FILE_FLASH_PLUGIN: +- if (!GetInternalPluginsDirectory(&cur)) ++ if (!GetInternalPluginsDirectory(&cur, "FILEFLASH")) + return false; + cur = cur.Append(kInternalFlashPluginFileName); + break; +@@ -295,7 +288,7 @@ bool PathProvider(int key, base::FilePath* result) { + cur = cur.Append(chrome::kPepperFlashPluginFilename); + break; + case chrome::FILE_EFFECTS_PLUGIN: +- if (!GetInternalPluginsDirectory(&cur)) ++ if (!GetInternalPluginsDirectory(&cur, "FILE_EFFECTS")) + return false; + cur = cur.Append(kEffectsPluginFileName); + break; +@@ -308,7 +301,7 @@ bool PathProvider(int key, base::FilePath* result) { + // We currently need a path here to look up whether the plugin is disabled + // and what its permissions are. + case chrome::FILE_NACL_PLUGIN: +- if (!GetInternalPluginsDirectory(&cur)) ++ if (!GetInternalPluginsDirectory(&cur, "NACL")) + return false; + cur = cur.Append(kInternalNaClPluginFileName); + break; +@@ -343,7 +336,7 @@ bool PathProvider(int key, base::FilePath* result) { + cur = cur.DirName(); + } + #else +- if (!GetInternalPluginsDirectory(&cur)) ++ if (!GetInternalPluginsDirectory(&cur, "PNACL")) + return false; + #endif + cur = cur.Append(FILE_PATH_LITERAL("pnacl")); +@@ -372,7 +365,7 @@ bool PathProvider(int key, base::FilePath* result) { + // In the component case, this is the source adapter. Otherwise, it is the + // actual Pepper module that gets loaded. + case chrome::FILE_WIDEVINE_CDM_ADAPTER: +- if (!GetInternalPluginsDirectory(&cur)) ++ if (!GetInternalPluginsDirectory(&cur, "WIDEVINE")) + return false; + cur = cur.AppendASCII(kWidevineCdmAdapterFileName); + break; diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix index 5f40e63125d..daefa263510 100644 --- a/pkgs/applications/networking/browsers/chromium/source/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix @@ -1,21 +1,21 @@ # This file is autogenerated from update.sh in the parent directory. { dev = { - version = "41.0.2272.16"; - sha256 = "14l3l5gcjqszqjb3zmwxsyfci495fi315sznvm2n2ark24mf03yq"; - sha256bin32 = "0xqhzlmbyh5w678j7iwssd81z1bpggpzxni1y79xn5lhc26c50jd"; - sha256bin64 = "0c9j75xqv4jx57asiaadarz714h1adscvb4h5ng7mbmr268qp6f2"; + version = "42.0.2305.3"; + sha256 = "00338x1x78wcvaxcnnq5cng30450gsyqnlwplgyq7zjsrpqpprvn"; + sha256bin32 = "1xxmyfmdksqpwwf3wxhxrxvqnvjxlwkhkrdzkmra7d74hz7mqjz7"; + sha256bin64 = "0q4hvvkjzy46x9hfhchywakzrd0jfwhxxsv96cz3yfcqwasf42x7"; }; beta = { - version = "41.0.2272.16"; - sha256 = "14l3l5gcjqszqjb3zmwxsyfci495fi315sznvm2n2ark24mf03yq"; - sha256bin32 = "0xqhzlmbyh5w678j7iwssd81z1bpggpzxni1y79xn5lhc26c50jd"; - sha256bin64 = "0c9j75xqv4jx57asiaadarz714h1adscvb4h5ng7mbmr268qp6f2"; + version = "41.0.2272.64"; + sha256 = "0jq864636527fpnrkdaalp73hjcd581imdk13bxfi6g4ic0sizkg"; + sha256bin32 = "12sisp6bk6qvgikzxi616d8cnrrgs2593kyq7sv3276wjz34a07m"; + sha256bin64 = "1vz89r43byd0shjvr6bvmwlsh97fx281hlzfv49q9k49piyfylgp"; }; stable = { - version = "40.0.2214.91"; - sha256 = "0ja1wvjn0g8xs20j87s3gl9h70yzx8rfa3k126wnl9gay6gxlbzp"; - sha256bin32 = "0mfg66s7fqx6v8n0hilsw40i5ximasbqhrmw4fpnpa0x0i77bphj"; - sha256bin64 = "14lqm8m937b9sl5k7sc939aar76ij9790c807yahk6q36mfyd269"; + version = "40.0.2214.115"; + sha256 = "19d6zd71w3zvqwb0ncdapfwkckjgqmb1jfg228jvaispp9nvjq92"; + sha256bin32 = "1sv8sj0xp14q5693jcwwipinx539d5rgvhqcxm6b030024jjh8sr"; + sha256bin64 = "1zgb9g6fr29i7f9s1s1dcih1qjiz62ir90k0fsam9df99gzmmyc0"; }; } From c92dbffeac75afe93c05c1ef216e927f075755c5 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 7 Feb 2015 04:58:02 +0100 Subject: [PATCH 177/197] chromium: Split up the source tarball on the fly. So far we've done the source code split up by using the generic unpackPhase and copying it all over into the different outputs. However, this had the problem of generating the I/O load of about three times the size of the source tree: First at fetchurl of the tarball (although it's not as much because it's compressed), second at unpackPhase and third at installPhase. Now we don't use installPhase anymore and directly unpack into the output paths, which unfortunately becomes quite a bit more complex because we need to transform the paths of the tar file on the fly. I've also tried using GNU Tar's --to-command option to even untar *and* patch it at the same time, but forking for every single file in the tarball gets REALLY slow and also gets even more complex than this two stage approach because you need to make sure that the patch file is applied correctly, for example for files that don't yet exist but are to be created by the patch file. We're using --anchored and --no-wildcards-match-slash here to prevent accidentally excluding files we don't want to exclude. One example is something like v8/tools/gyp/v8.gyp. So the current approach is some compromise between complexity and speed and should hopefully get rid of the Hydra build timeouts by lowering I/O load. See here for examples of builds having this issue: http://hydra.nixos.org/build/19045023 http://hydra.nixos.org/build/19044973 http://hydra.nixos.org/build/19044968 http://hydra.nixos.org/build/19045019 Signed-off-by: aszlig --- .../browsers/chromium/source/default.nix | 74 ++++++++++--------- 1 file changed, 41 insertions(+), 33 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix index 1a48c2d037c..e0e22364763 100644 --- a/pkgs/applications/networking/browsers/chromium/source/default.nix +++ b/pkgs/applications/networking/browsers/chromium/source/default.nix @@ -10,7 +10,16 @@ with (import ./update.nix { }).getChannel channel; let + transform = flags: concatStringsSep ";" (map (subst: subst + flags) [ + "s,^[^/]+(.*)$,$main\\1," + "s,$main/(build|tools)(/.*)?$,$out/\\1\\2," + "s,$main/third_party(/.*)?$,$bundled\\1," + "s,$main/sandbox(/.*)?$,$sandbox\\1," + "s,^/,," + ]); + pre42 = versionOlder version "42.0.0.0"; + in stdenv.mkDerivation { name = "chromium-source-${version}"; @@ -18,11 +27,25 @@ in stdenv.mkDerivation { buildInputs = [ python ]; # cannot patch shebangs otherwise - phases = [ "unpackPhase" "patchPhase" "installPhase" ]; + phases = [ "unpackPhase" "patchPhase" ]; + outputs = [ "out" "sandbox" "bundled" "main" ]; + + unpackPhase = '' + tar xf "$src" -C / \ + --transform="${transform "xS"}" \ + --anchored \ + --no-wildcards-match-slash \ + --exclude='*/tools/gyp' \ + --exclude='*/.*' + ''; opensslPatches = optional useOpenSSL openssl.patches; - prePatch = "patchShebangs ."; + prePatch = '' + for i in $outputs; do + eval patchShebangs "\$$i" + done + ''; patches = if pre42 then [ ./sandbox_userns_36.patch ./nix_plugin_paths.patch @@ -30,48 +53,33 @@ in stdenv.mkDerivation { ./nix_plugin_paths_42.patch ]; + patchPhase = let + diffmod = sym: "/^${sym} /{s/^${sym} //;${transform ""};s/^/${sym} /}"; + allmods = "${diffmod "---"};${diffmod "\\+\\+\\+"}"; + sedexpr = "/^(---|\\+\\+\\+) *\\/dev\\/null/b;${allmods}"; + in '' + runHook prePatch + for i in $patches; do + header "applying patch $i" 3 + sed -r -e "${sedexpr}" "$i" | patch -d / -p0 + stopNest + done + runHook postPatch + ''; + postPatch = '' sed -i -r \ -e 's/-f(stack-protector)(-all)?/-fno-\1/' \ -e 's|/bin/echo|echo|' \ -e "/python_arch/s/: *'[^']*'/: '""'/" \ - build/common.gypi chrome/chrome_tests.gypi + "$out/build/common.gypi" "$main/chrome/chrome_tests.gypi" '' + optionalString useOpenSSL '' - cat $opensslPatches | patch -p1 -d third_party/openssl/openssl + cat $opensslPatches | patch -p1 -d "$bundled/openssl/openssl" '' + optionalString (!pre42) '' sed -i -e '/LOG.*no_suid_error/d' \ "$main/content/browser/browser_main_loop.cc" ''; - outputs = [ "out" "sandbox" "bundled" "main" ]; - installPhase = '' - mkdir -p "$out" "$sandbox" "$bundled" "$main" - - header "copying browser main sources to $main" - find . -mindepth 1 -maxdepth 1 \ - \! -path ./sandbox \ - \! -path ./third_party \ - \! -path ./build \ - \! -path ./tools \ - \! -name '.*' \ - -print | xargs cp -rt "$main" - stopNest - - header "copying sandbox components to $sandbox" - cp -rt "$sandbox" sandbox/* - stopNest - - header "copying third party sources to $bundled" - cp -rt "$bundled" third_party/* - stopNest - - header "copying build requisites to $out" - cp -rt "$out" build tools - stopNest - - rm -rf "$out/tools/gyp" # XXX: Don't even copy it in the first place. - ''; - passthru = { inherit version channel; plugins = fetchurl binary; From 9de4caddc19ce97a7f3cb4af9d9e948ae335a02d Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 20 Feb 2015 19:01:46 +0100 Subject: [PATCH 178/197] nixos/tests/chromium: Check new userns sandbox. Since Chromium version 42, we have a new user namespaces sandbox in the upstream project. It's more integrated so the chrome://sandbox page reports it as "Namespace Sandbox" instead of SUID sandbox, which we were re-using (or abusing?) in our patch. So if either "SUID Sandbox" or "Namespace Sandbox" reports with "Yes", it's fine on our side. Signed-off-by: aszlig --- nixos/tests/chromium.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix index efae0ec4045..368d0e43c46 100644 --- a/nixos/tests/chromium.nix +++ b/nixos/tests/chromium.nix @@ -154,7 +154,7 @@ import ./make-test.nix ( my $clipboard = $machine->succeed("${pkgs.xclip}/bin/xclip -o"); die "sandbox not working properly: $clipboard" - unless $clipboard =~ /suid sandbox.*yes/mi + unless $clipboard =~ /(?:suid|namespace) sandbox.*yes/mi && $clipboard =~ /pid namespaces.*yes/mi && $clipboard =~ /network namespaces.*yes/mi && $clipboard =~ /seccomp.*sandbox.*yes/mi; From 26f024626c45dcc2fd82f91f6c0dea63521d8bc4 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 22 Feb 2015 07:54:06 +0100 Subject: [PATCH 179/197] Revert "chromium: remove preferLocalBuild" This reverts commit fdb5cf8107d6ecb5c775c2ad026551dbd11248f1. The reason I'm reverting this is that the implications this had on the IO load of Hydra are fixed by c92dbffeac75afe93c05c1ef216e927f075755c5. Signed-off-by: aszlig --- .../networking/browsers/chromium/source/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix index e0e22364763..54430bb5be9 100644 --- a/pkgs/applications/networking/browsers/chromium/source/default.nix +++ b/pkgs/applications/networking/browsers/chromium/source/default.nix @@ -80,6 +80,8 @@ in stdenv.mkDerivation { "$main/content/browser/browser_main_loop.cc" ''; + preferLocalBuild = true; + passthru = { inherit version channel; plugins = fetchurl binary; From 0696b0ef7843bbd50592bad64efeb61634052a8e Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 22 Feb 2015 08:05:51 +0100 Subject: [PATCH 180/197] Re-revert "chromium: remove preferLocalBuild". This reverts commit 26f024626c45dcc2fd82f91f6c0dea63521d8bc4. I actually wasn't reading the "remove" in the commit message, so sorry for the brainfart/noise. Signed-off-by: aszlig --- .../networking/browsers/chromium/source/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix index 54430bb5be9..e0e22364763 100644 --- a/pkgs/applications/networking/browsers/chromium/source/default.nix +++ b/pkgs/applications/networking/browsers/chromium/source/default.nix @@ -80,8 +80,6 @@ in stdenv.mkDerivation { "$main/content/browser/browser_main_loop.cc" ''; - preferLocalBuild = true; - passthru = { inherit version channel; plugins = fetchurl binary; From 030895f075af7308bbbdbe2945a43e65342a326c Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 22 Feb 2015 08:09:04 +0100 Subject: [PATCH 181/197] nixos/dhcpcd: Only run resume commands if enabled. The networkd implementation sets systemd.services.dhcpcd.enable to false in nixos/modules/tasks/network-interfaces-systemd.nix. So we need to respect that in the dhcpcd module. If we don't, the resumeCommand is set nevertheless, which causes the post-resume.service to fail after resuming: Failed to reload dhcpcd.service: Unit dhcpcd.service is masked. post-resume.service: main process exited, code=exited, status=1/FAILURE Failed to start Post-Resume Actions. Dependency failed for Post-Resume Actions. Unit post-resume.service entered failed state. post-resume.service failed. Signed-off-by: aszlig --- nixos/modules/services/networking/dhcpcd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix index 0430d31b99a..8552395fdb1 100644 --- a/nixos/modules/services/networking/dhcpcd.nix +++ b/nixos/modules/services/networking/dhcpcd.nix @@ -184,7 +184,7 @@ in } ]; - powerManagement.resumeCommands = + powerManagement.resumeCommands = mkIf config.systemd.services.dhcpcd.enable '' # Tell dhcpcd to rebind its interfaces if it's running. ${config.systemd.package}/bin/systemctl reload dhcpcd.service From 7cd6dd9ada44602e9df778aa290b7e166d0ac7bb Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 22 Feb 2015 08:14:53 +0100 Subject: [PATCH 182/197] inkscape: Clean up and update to version 0.91. This now also includes support vor visio and cdr and also adds the missing dependency on libexif. Forcing -lX11 in NIX_LDFLAGS is no longer needed in 0.91, so we drop that as well as the patch and the --with-python configure flag, which is now no longer even valid. Tests now seem to run fine without -j1 as well. I also tested it against the DXF test file mentioned in #3449, to be sure we don't regress here. Signed-off-by: aszlig --- .../graphics/inkscape/default.nix | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 38ceefa4523..c370cc069c5 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -1,20 +1,22 @@ { stdenv, fetchurl, pkgconfig, perl, perlXMLParser, gtk, libXft , libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper, intltool -, gsl, python, pyxml, lxml, poppler, imagemagick, libwpg }: +, gsl, python, pyxml, lxml, poppler, imagemagick, libwpg, librevenge +, libvisio, libcdr, libexif +}: stdenv.mkDerivation rec { - name = "inkscape-0.48.5"; + name = "inkscape-0.91"; src = fetchurl { - url = "mirror://sourceforge/inkscape/${name}.tar.bz2"; - sha256 = "0sfr7a1vr1066rrkkqbqvcqs3gawalj68ralnhd6k87jz62fcv1b"; + url = "https://inkscape.global.ssl.fastly.net/media/resources/file/" + + "${name}.tar.bz2"; + sha256 = "06ql3x732x2rlnanv0a8aharsnj91j5kplksg574090rks51z42d"; }; - patches = [ ./configure-python-libs.patch ]; - - postPatch = stdenv.lib.optionalString doCheck - ''sed -i 's:#include "../../src:#include "src:' src/cxxtests.cpp''; + postPatch = '' + patchShebangs share/extensions + ''; propagatedBuildInputs = [ # Python is used at run-time to execute scripts, e.g., those from @@ -25,14 +27,12 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig perl perlXMLParser gtk libXft libpng zlib popt boehmgc libxml2 libxslt glib gtkmm glibmm libsigcxx lcms boost gettext - makeWrapper intltool gsl poppler imagemagick libwpg + makeWrapper intltool gsl poppler imagemagick libwpg librevenge + libvisio libcdr libexif ]; - configureFlags = "--with-python"; - enableParallelBuilding = true; doCheck = true; - checkFlags = "-j1"; postInstall = '' # Make sure PyXML modules can be found at run-time. @@ -43,11 +43,9 @@ stdenv.mkDerivation rec { --prefix PATH : ${python}/bin || \ exit 2 done - rm $out/share/icons/hicolor/icon-theme.cache + rm "$out/share/icons/hicolor/icon-theme.cache" ''; - NIX_LDFLAGS = "-lX11"; - meta = with stdenv.lib; { license = "GPL"; homepage = http://www.inkscape.org; From 089bdce621c1e5e5ff85b5a6e8077c21bcee2685 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 22 Feb 2015 08:31:25 +0100 Subject: [PATCH 183/197] Re-re-revert "chromium: remove preferLocalBuild". This reverts commit 0696b0ef7843bbd50592bad64efeb61634052a8e. Okay, now finally, let's get this straight. We actually *want* preferLocalBuild, *because* we have improved the source splitup in c92dbffeac75afe93c05c1ef216e927f075755c5. The idea is to use local builds in order to prevent the source being pushed to a remote machine, splitted up there (and thus copied again) and then being copied *again* FROM the remote machine. "DOH!" - as @edolstra or @rbvermaa would call it... and good d^Hnight. Signed-off-by: aszlig --- .../networking/browsers/chromium/source/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix index e0e22364763..54430bb5be9 100644 --- a/pkgs/applications/networking/browsers/chromium/source/default.nix +++ b/pkgs/applications/networking/browsers/chromium/source/default.nix @@ -80,6 +80,8 @@ in stdenv.mkDerivation { "$main/content/browser/browser_main_loop.cc" ''; + preferLocalBuild = true; + passthru = { inherit version channel; plugins = fetchurl binary; From 62b17c8bf1f866d1483fd6884136f5c10af31451 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Val=C3=A9rian=20Galliat?= Date: Sun, 22 Feb 2015 12:00:34 +0100 Subject: [PATCH 184/197] io.js: shared libraries @lethalman courtesy . --- pkgs/development/web/iojs/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/iojs/default.nix b/pkgs/development/web/iojs/default.nix index 58368ac7d91..3129b10f7b8 100644 --- a/pkgs/development/web/iojs/default.nix +++ b/pkgs/development/web/iojs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, utillinux, nightly ? false }: +{ stdenv, fetchurl, python, utillinux, openssl, http-parser, zlib, nightly ? false }: let version = if nightly then "1.2.1-nightly20150213f0296933f8" else "1.2.0"; @@ -19,7 +19,9 @@ in stdenv.mkDerivation { sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i configure ''; - buildInputs = [ python ] ++ (optional stdenv.isLinux utillinux); + configureFlags = [ "--shared-openssl" "--shared-http-parser" "--shared-zlib" ]; + + buildInputs = [ python openssl http-parser zlib ] ++ (optional stdenv.isLinux utillinux); setupHook = ../nodejs/setup-hook.sh; meta = { From dd4e1d4225bf097a4986fc553faab0f494a24861 Mon Sep 17 00:00:00 2001 From: Ambroz Bizjak Date: Sun, 22 Feb 2015 11:02:09 +0100 Subject: [PATCH 185/197] avr-gcc-with-avr-libc: Update to latest versions. Also modernize the Nix expression. --- .../misc/avr-gcc-with-avr-libc/default.nix | 135 ++++++++---------- pkgs/top-level/all-packages.nix | 5 +- 2 files changed, 62 insertions(+), 78 deletions(-) diff --git a/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix b/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix index 9338585dc30..cbd38903aac 100644 --- a/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix +++ b/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix @@ -1,88 +1,75 @@ -{ stdenv, fetchurl, writeTextFile, coreutils, gnumake, gcc, gnutar, bzip2 - , gnugrep, gnused, gawk, diffutils, patch - , gmp, mpfr, libmpc }: +{ stdenv, fetchurl, texinfo, gmp, mpfr, libmpc, zlib }: stdenv.mkDerivation { name = "avr-gcc-libc"; - srcBinutils = fetchurl { - url = "mirror://gnu/binutils/binutils-2.21.1.tar.bz2"; - sha256 = "0m7nmd7gc9d9md43wbrv65hz6lbi2crqwryzpigv19ray1lzmv6d"; - }; + srcs = [ + (fetchurl { + url = "mirror://gnu/binutils/binutils-2.25.tar.bz2"; + sha256 = "08r9i26b05zcwb9zxb6zllpfdiiicdfsgbpsjlrjmvx3rxjzrpi2"; + }) - srcGCC = fetchurl { - url = "mirror://gcc/releases/gcc-4.6.3/gcc-core-4.6.3.tar.bz2"; - sha256 = "1hai090f0svf886nyhn4glmfw54v9lz88w2izkx5iqhd3j400gi8"; - }; + (fetchurl { + url = "mirror://gcc/releases/gcc-4.8.4/gcc-4.8.4.tar.bz2"; + sha256 = "4a80aa23798b8e9b5793494b8c976b39b8d9aa2e53cd5ed5534aff662a7f8695"; + }) - srcGCCGPP = fetchurl { - url = "mirror://gcc/releases/gcc-4.6.3/gcc-g++-4.6.3.tar.bz2"; - sha256 = "1s199gb6p65r5k69cdfqqcz5hgifw9bhyj65n2b91s80x4rwgq5k"; - }; - - srcAVRLibc = fetchurl { - url = http://download.savannah.gnu.org/releases/avr-libc/old-releases/avr-libc-1.7.1.tar.bz2; - sha256 = "1b1s4cf787izlm3r094vvkzrzb3w3bg6bwiz2wz71cg7q07kzzn6"; - }; - - phases = "doAll"; - - # don't call any wired $buildInputs/nix-support/* scripts or such. This makes the build fail - builder = writeTextFile { - name = "avrbinutilsgccavrlibc-builder-script"; - text = '' - PATH=${coreutils}/bin:${gnumake}/bin:${gcc}/bin:${gnutar}/bin:${bzip2}/bin:${gnugrep}/bin:${gnused}/bin:${gawk}/bin:${diffutils}/bin:${patch}/bin - # that's all a bit too hacky...! - for i in `cat ${gcc}/nix-support/propagated-user-env-packages`; do - echo adding $i - PATH=$PATH:$i/bin - done - mkdir -p "$out" - export > env-vars - - for i in "${gmp}" "${mpfr}" "${libmpc}"; do - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$i/include " - export NIX_LDFLAGS="$NIX_LDFLAGS -L$i/lib " - done + (fetchurl { + url = http://download.savannah.gnu.org/releases/avr-libc/avr-libc-1.8.1.tar.bz2; + sha256 = "0sd9qkvhmk9av4g1f8dsjwc309hf1g0731bhvicnjb3b3d42l1n3"; + }) + ]; + + sourceRoot = "."; + nativeBuildInputs = [ texinfo ]; + + buildInputs = [ gmp mpfr libmpc zlib ]; + + # 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 - PATH=$PATH:$out/bin + 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 - prefix=$out + # 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 - tar jxf $srcBinutils - cd binutils-*/ - mkdir obj-avr - cd obj-avr - ../configure --target=avr --prefix="$prefix" --disable-nls --prefix=$prefix - make $MAKE_FLAGS - make install - - cd $TMP - tar jxf $srcGCC - tar jxf $srcGCCGPP - cd gcc-* - mkdir obj-avr - cd obj-avr - ../configure --target=avr --prefix="$prefix" --disable-nls --enable-languages=c,c++ --disable-libssp --with-dwarf2 - make $MAKE_FLAGS - make install - - cd $TMP - tar jxf $srcAVRLibc - cd avr-libc-* - patch -Np1 -i ${./avr-libc-fix-gcc-4.6.0.patch} - ./configure --prefix="$prefix" --build=`./config.guess` --host=avr - make $MAKE_FLAGS - make install - ''; - }; + # 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 .. - homepage = []; # dito - platforms = platforms.linux; + 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 .. + homepage = []; # dito + platforms = platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c1615ee393..5b60646334a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4569,10 +4569,7 @@ let samples = true; }; - avrgcclibc = callPackage ../development/misc/avr-gcc-with-avr-libc { - gcc = gcc46; - stdenv = overrideCC stdenv gcc46; - }; + avrgcclibc = callPackage ../development/misc/avr-gcc-with-avr-libc {}; avr8burnomat = callPackage ../development/misc/avr8-burn-omat { }; From 419a4166a794f5178862f43038d797f4fc918994 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 21 Feb 2015 13:23:48 +0100 Subject: [PATCH 186/197] nixos/haproxy: small cleanup * Add option types * Rewrite option descriptions * /var/run/haproxy.pid => /run/haproxy.pid (canonical location) --- nixos/modules/services/networking/haproxy.nix | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/networking/haproxy.nix b/nixos/modules/services/networking/haproxy.nix index c2e2c2d7a41..887ea79c34b 100644 --- a/nixos/modules/services/networking/haproxy.nix +++ b/nixos/modules/services/networking/haproxy.nix @@ -9,13 +9,16 @@ with lib; services.haproxy = { enable = mkOption { + type = types.bool; default = false; - description = " - Enable the HAProxy. - "; + description = '' + Whether to enable HAProxy, the reliable, high performance TCP/HTTP + load balancer. + ''; }; config = mkOption { + type = types.lines; default = '' global @@ -51,9 +54,10 @@ with lib; stats refresh 5s stats realm Haproxy statistics ''; - description = " - Default configuration. - "; + description = '' + Contents of the HAProxy configuration file, + haproxy.conf. + ''; }; }; @@ -68,10 +72,10 @@ with lib; wantedBy = [ "multi-user.target" ]; serviceConfig = { Type = "forking"; - PIDFile = "/var/run/haproxy.pid"; + PIDFile = "/run/haproxy.pid"; ExecStartPre = "${pkgs.haproxy}/sbin/haproxy -c -q -f ${haproxyCfg}"; - ExecStart = "${pkgs.haproxy}/sbin/haproxy -D -f ${haproxyCfg} -p /var/run/haproxy.pid"; - ExecReload = "-${pkgs.bash}/bin/bash -c \"exec ${pkgs.haproxy}/sbin/haproxy -D -f ${haproxyCfg} -p /var/run/haproxy.pid -sf $MAINPID\""; + ExecStart = "${pkgs.haproxy}/sbin/haproxy -D -f ${haproxyCfg} -p /run/haproxy.pid"; + ExecReload = "-${pkgs.bash}/bin/bash -c \"exec ${pkgs.haproxy}/sbin/haproxy -D -f ${haproxyCfg} -p /run/haproxy.pid -sf $MAINPID\""; }; }; From 397066cf5d404579b09b306aac442344aea6e240 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Sun, 22 Feb 2015 19:37:05 +0800 Subject: [PATCH 187/197] dvtm: Update to 0.14 --- pkgs/tools/misc/dvtm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/dvtm/default.nix b/pkgs/tools/misc/dvtm/default.nix index 29cd3b52417..32d6b6fa6ef 100644 --- a/pkgs/tools/misc/dvtm/default.nix +++ b/pkgs/tools/misc/dvtm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "dvtm-0.13"; + name = "dvtm-0.14"; meta = { description = "Dynamic virtual terminal manager"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/${name}.tar.gz"; - sha256 = "0s15i3ilrfh069m3qimam25w56flmm65c34ima5y3f50kmyblpaj"; + sha256 = "0ykl8dz7ivjgdzhmhlgidnp2ffh5gxq9lbg276w7iid4z10v76wa"; }; buildInputs = [ ncurses ]; From 6e070cb9d90b56c1e4079274a4579c1e5b8d3125 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 22 Feb 2015 12:38:32 +0100 Subject: [PATCH 188/197] avr-gcc-with-avr-libc: remove unused gcc-4.6 patch Unused since dd4e1d4225 (avr-gcc-with-avr-libc: Update to latest versions.) --- .../avr-libc-fix-gcc-4.6.0.patch | 29 ------------------- 1 file changed, 29 deletions(-) delete mode 100644 pkgs/development/misc/avr-gcc-with-avr-libc/avr-libc-fix-gcc-4.6.0.patch diff --git a/pkgs/development/misc/avr-gcc-with-avr-libc/avr-libc-fix-gcc-4.6.0.patch b/pkgs/development/misc/avr-gcc-with-avr-libc/avr-libc-fix-gcc-4.6.0.patch deleted file mode 100644 index e59e40091bf..00000000000 --- a/pkgs/development/misc/avr-gcc-with-avr-libc/avr-libc-fix-gcc-4.6.0.patch +++ /dev/null @@ -1,29 +0,0 @@ -# Patch from Gentoo - -diff -ur 1/include/avr/pgmspace.h 2/include/avr/pgmspace.h ---- 1/include/avr/pgmspace.h 2011-05-31 18:19:44.524000823 +0200 -+++ 2/include/avr/pgmspace.h 2011-05-31 18:20:27.576000824 +0200 -@@ -252,7 +252,7 @@ - # define PSTR(s) ((const PROGMEM char *)(s)) - #else /* !DOXYGEN */ - /* The real thing. */ --# define PSTR(s) (__extension__({static char __c[] PROGMEM = (s); &__c[0];})) -+# define PSTR(s) (__extension__({static const char __c[] PROGMEM = (s); &__c[0];})) - #endif /* DOXYGEN */ - - #define __LPM_classic__(addr) \ -diff -ur 1/libc/stdlib/dtostre.c 2/libc/stdlib/dtostre.c ---- 1/libc/stdlib/dtostre.c 2011-05-31 18:19:44.639000823 +0200 -+++ 2/libc/stdlib/dtostre.c 2011-05-31 18:20:27.639000824 +0200 -@@ -37,9 +37,9 @@ - char * - dtostre (double val, char *sbeg, unsigned char prec, unsigned char flags) - { -- __attribute__((progmem)) static char str_nan[2][4] = -+ __attribute__((progmem)) static const char str_nan[2][4] = - {"nan", "NAN"}; -- __attribute__((progmem)) static char str_inf[2][sizeof(str_nan[0])] = -+ __attribute__((progmem)) static const char str_inf[2][sizeof(str_nan[0])] = - {"inf", "INF"}; - char *d; /* dst */ - char *s; /* src */ From 4e9990196104eb670d3e5108bde0666575b0f47e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 14 Feb 2015 23:52:22 +0100 Subject: [PATCH 189/197] nixos: Adding OATH in pam. (cherry picked from commit cb3cba54a1b87c376d0801238cb827eadb18e39e) Conflicts: nixos/modules/security/pam.nix --- nixos/modules/security/pam.nix | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 65761865859..dcb2d549475 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -63,6 +63,14 @@ let ''; }; + oathAuth = mkOption { + default = config.security.pam.enableOATH; + type = types.bool; + description = '' + If set, the OATH Toolkit will be used. + ''; + }; + sshAgentAuth = mkOption { default = false; type = types.bool; @@ -206,6 +214,8 @@ let "auth sufficient pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth"} ${optionalString cfg.otpwAuth "auth sufficient ${pkgs.otpw}/lib/security/pam_otpw.so"} + ${optionalString cfg.oathAuth + "auth sufficient ${pkgs.oathToolkit}/lib/security/pam_oath.so"} window=5 usersfile=/etc/users.oath ${optionalString config.users.ldap.enable "auth sufficient ${pam_ldap}/lib/security/pam_ldap.so use_first_pass"} ${optionalString config.krb5.enable '' @@ -241,6 +251,8 @@ let "session optional ${pam_krb5}/lib/security/pam_krb5.so"} ${optionalString cfg.otpwAuth "session optional ${pkgs.otpw}/lib/security/pam_otpw.so"} + ${optionalString cfg.oathAuth + "session optional ${pkgs.oathToolkit}/lib/security/pam_oath.so"} window=5 usersfile=/etc/users.oath ${optionalString cfg.startSession "session optional ${pkgs.systemd}/lib/security/pam_systemd.so"} ${optionalString cfg.forwardXAuth @@ -338,6 +350,13 @@ in ''; }; + security.pam.enableOATH = mkOption { + default = false; + description = '' + Enable the OATH (one-time password) PAM module. + ''; + }; + users.motd = mkOption { default = null; example = "Today is Sweetmorn, the 4th day of The Aftermath in the YOLD 3178."; @@ -357,7 +376,8 @@ in [ pkgs.pam ] ++ optional config.users.ldap.enable pam_ldap ++ optionals config.krb5.enable [pam_krb5 pam_ccreds] - ++ optionals config.security.pam.enableOTPW [ pkgs.otpw ]; + ++ optionals config.security.pam.enableOTPW [ pkgs.otpw ] + ++ optionals config.security.pam.enableOATH [ pkgs.oathToolkit ]; environment.etc = mapAttrsToList (n: v: makePAMService v) config.security.pam.services; From 9fbbefb9941befc0370710c7f286a919ace4eb4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 22 Feb 2015 15:21:33 +0100 Subject: [PATCH 190/197] Update xclip to a more recent version (svn) This can do -target, so it can work with images. (cherry picked from commit 58a004999b6721fb8e55e397c0c3293d4f96fb7b) --- pkgs/tools/misc/xclip/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/xclip/default.nix b/pkgs/tools/misc/xclip/default.nix index 4afcc0ac36d..3671cb4e789 100644 --- a/pkgs/tools/misc/xclip/default.nix +++ b/pkgs/tools/misc/xclip/default.nix @@ -1,14 +1,17 @@ -{ stdenv, fetchurl, x11, libXmu }: +{ stdenv, fetchsvn, x11, libXmu, autoconf, automake, libtool }: stdenv.mkDerivation rec { - name = "xclip-0.12"; + # The last release from 2012, 0.12, lacks '-targets' + name = "xclip-0.12-svn-20140209"; - src = fetchurl { - url = "mirror://sourceforge/xclip/${name}.tar.gz"; - sha256 = "0ibcf46rldnv0r424qcnai1fa5iq3lm5q5rdd7snsi5sb78gmixp"; + src = fetchsvn { + url = "svn://svn.code.sf.net/p/xclip/code/trunk"; + sha256 = "0d6r38xas5l79l700sdm14l41vvjqhah613367ha8kcvx54zkddz"; }; - buildInputs = [ x11 libXmu ]; + preConfigure = "autoreconf -vfi"; + + buildInputs = [ x11 libXmu autoconf automake libtool ]; meta = { description = "Tool to access the X clipboard from a console application"; From c2c561ad4d4c8bec40ebd5991dc6e8057d11a3eb Mon Sep 17 00:00:00 2001 From: Shaun Bruce Date: Fri, 20 Feb 2015 10:14:05 +0000 Subject: [PATCH 191/197] Added pymongo-2.8 python package --- pkgs/top-level/python-packages.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 168e2532f36..7c262470400 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8742,6 +8742,23 @@ let }; }; + pymongo = buildPythonPackage rec { + name = "pymongo-2.8"; + + src = pkgs.fetchurl { + url = "http://pypi.python.org/packages/source/p/pymongo/${name}.tar.gz"; + sha256 = "0d9rlxghqg9dqmcmrlf1lw9ap2g6npv6q4slp5agnm7vci9zchq5"; + }; + + doCheck = false; + + meta = { + homepage = "http://github.com/mongodb/mongo-python-driver"; + license = [ "Apache-2.0" ]; + description = "Python driver for MongoDB "; + }; + }; + pysphere = buildPythonPackage rec { name = "pysphere-0.1.8"; From 6667e964e9a44190de027759c10bff156903946e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 22 Feb 2015 16:03:54 +0100 Subject: [PATCH 192/197] xclip: set meta.platforms --- pkgs/tools/misc/xclip/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/xclip/default.nix b/pkgs/tools/misc/xclip/default.nix index 3671cb4e789..20d5e66cfa2 100644 --- a/pkgs/tools/misc/xclip/default.nix +++ b/pkgs/tools/misc/xclip/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { description = "Tool to access the X clipboard from a console application"; homepage = http://sourceforge.net/projects/xclip/; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.all; }; } From 44fc3b26d284667500dfae3c8db3f985e3a29a84 Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Sun, 22 Feb 2015 18:12:34 +0300 Subject: [PATCH 193/197] distrho: fix name --- pkgs/applications/audio/distrho/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix index f078be02738..a8c710f2099 100644 --- a/pkgs/applications/audio/distrho/default.nix +++ b/pkgs/applications/audio/distrho/default.nix @@ -2,7 +2,7 @@ , libxslt, lv2, pkgconfig, premake3, xlibs }: stdenv.mkDerivation rec { - name = "DISTRHO-Ports-git-2015-01-28"; + name = "distrho-ports-git-2015-01-28"; src = fetchgit { url = "https://github.com/DISTRHO/DISTRHO-Ports.git"; From 25a674531035ead4ebd097e6e97eceed1582ded8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 22 Feb 2015 16:42:14 +0100 Subject: [PATCH 194/197] nixos/fail2ban: capitalize service description --- nixos/modules/services/security/fail2ban.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/security/fail2ban.nix b/nixos/modules/services/security/fail2ban.nix index c40f41e07d4..6288b1b3ba8 100644 --- a/nixos/modules/services/security/fail2ban.nix +++ b/nixos/modules/services/security/fail2ban.nix @@ -95,7 +95,7 @@ in environment.etc."fail2ban/filter.d".source = "${pkgs.fail2ban}/etc/fail2ban/filter.d/*.conf"; systemd.services.fail2ban = - { description = "Fail2ban intrusion prevention system"; + { description = "Fail2ban Intrusion Prevention System"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; From d5017499a24e64e76ecb7d3c581468747f4a30cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 22 Feb 2015 16:46:49 +0100 Subject: [PATCH 195/197] nixos/redis: capitalize service description --- nixos/modules/services/databases/redis.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index b91c389e90a..f2612d0b43b 100644 --- a/nixos/modules/services/databases/redis.nix +++ b/nixos/modules/services/databases/redis.nix @@ -201,7 +201,7 @@ in environment.systemPackages = [ cfg.package ]; systemd.services.redis_init = - { description = "Redis server initialisation"; + { description = "Redis Server Initialisation"; wantedBy = [ "redis.service" ]; before = [ "redis.service" ]; @@ -216,7 +216,7 @@ in }; systemd.services.redis = - { description = "Redis server"; + { description = "Redis Server"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; From 80101c8329312eaa8a71e4a097bf4964783a09be Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 22 Feb 2015 17:45:12 +0100 Subject: [PATCH 196/197] Disable some broken R packages. --- pkgs/development/r-modules/cran-packages.nix | 2 +- pkgs/development/r-modules/default.nix | 519 ++++++++++--------- 2 files changed, 262 insertions(+), 259 deletions(-) diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix index fa8d40d71fc..2418192e5fb 100644 --- a/pkgs/development/r-modules/cran-packages.nix +++ b/pkgs/development/r-modules/cran-packages.nix @@ -6323,5 +6323,5 @@ zoo = derive { name="zoo"; version="1.7-11"; sha256="0fp726rp9mqsfmm391bmckk76lq zooimage = derive { name="zooimage"; version="3.0-5"; sha256="1r3slmyw0dyqfa40dr5xga814z09ibhmmby8p1cii5lh61xm4c39"; depends=[svMisc svDialogs mlearning filehash jpeg png]; }; zoom = derive { name="zoom"; version="2.0.4"; sha256="03f5rxfr6ncf1j6vpn7pip21q7ylj4bx0a5xphqb6x6i33lxf1g5"; depends=[]; }; ztable = derive { name="ztable"; version="0.1.5"; sha256="1jfqnqy9544gfvz3bsb48v4177nwp4b4n9l2743asq8sbq305b5r"; depends=[]; }; -zyp = derive { name="zyp"; version="0.10-1"; sha256="0f1fqqxysf3psnvn08s5qly2c958h1hhznjjj8mvpjr5g6hqlr1k"; depends=[Kendall]; }; +zyp = derive { name="zyp"; version="0.10-1"; sha256="0f1fqqxysf3psnvn08s5qly2c958h1hhznjjj8mvpjr5g6hqlr1k"; depends=[Kendall]; }; } diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 0998668beae..c1100c79fac 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -647,286 +647,289 @@ let ]; # Packages which cannot be installed due to lack of dependencies or other reasons. - brokenPackages = [ # sort -t '#' -k 2 - "V8" # compilation error - "metabolomics" # depends on broken crmn - "selectspm" # depends on broken ecespa - "BLCOP" # depends on broken fPortfolio - "MXM" # depends on broken gRbase - "bamboo" # depends on broken jvmr - "flexCWM" # depends on broken mixture - "pmcgd" # depends on broken mixture - "retistruct" # depends on broken RImageJROI - "ROI_plugin_symphony" # depends on broken Rsymphony - "ChemoSpec" # depends on broken speaq - "CARrampsOcl" # depends on OpenCL - "gmatrix" # depends on proprietary cudatoolkit - "gputools" # depends on proprietary cudatoolkit - "iFes" # depends on proprietary cudatoolkit - "SOD" # depends on proprietary cudatoolkit - "WideLM" # depends on proprietary cudatoolkit - "OpenCL" # FIXME: requires CL/opencl.h - "Rsymphony" # FIXME: requires SYMPHONY - "rpanel" # I could not make Tcl to recognize BWidget. HELP WANTED! - "jomo" # linking errors - "mixture" # mixture.so: undefined symbol: dtrmm_ - "rDEA" # no such file or directory - "demi" # requires affy, affxparser, and oligo - "KANT" # requires affy, and Biobase - "pathClass" # requires affy, and Biobase - "msarc" # requires AnnotationDbi - "ppiPre" # requires AnnotationDbi, GOSemSim, GO.db + brokenPackages = [ "ACNE" # requires aroma_affymetrix - "aroma_affymetrix" # requires aroma_core - "calmate" # requires aroma_core - "NSA" # requires aroma_core - "beadarrayFilter" # requires beadarray - "compendiumdb" # requires Biobase - "ktspair" # requires Biobase - "MetaLandSim" # requires Biobase - "permGPU" # requires Biobase - "propOverlap" # requires Biobase - "RobLoxBioC" # requires Biobase - "RobLox" # requires Biobase - "IsoGene" # requires Biobase, and affy - "mGSZ" # requires Biobase, and limma - "GExMap" # requires Biobase and multtest - "Statomica" # requires Biobase, multtest - "netweavers" # requires BiocGenerics, Biobase, and limma - "NCmisc" # requires BiocInstaller - "EMDomics" # requires BiocParallel - "PepPrep" # requires biomaRt - "snplist" # requires biomaRt - "ionflows" # requires Biostrings - "RADami" # requires Biostrings - "SimRAD" # requires Biostrings, and ShortRead - "SeqFeatR" # requires Biostrings, qvalue, and widgetTools - "RAPIDR" # requires Biostrings, Rsamtools, and GenomicRanges - "FunctionalNetworks" # requires breastCancerVDX, and Biobase - "js" # requires broken V8 - "minimist" # requires broken V8 - "rJPSGCS" # requires chopsticks - "clpAPI" # requires clp - "pcaL1" # requires clp - "bmrm" # requires clpAPI - "sequenza" # requires copynumber - "cplexAPI" # requires CPLEX - "Rcplex" # requires cplexAPI - "empiricalFDR_DESeq2" # requires DESeq2, and GenomicRanges - "CHAT" # requires DNAcopy - "ParDNAcopy" # requires DNAcopy - "PSCBS" # requires DNAcopy - "dcGOR" # requires dnet - "gitter" # requires EBImage - "Rcell" # requires EBImage - "RockFab" # requires EBImage - "babel" # requires edgeR - "edgeRun" # requires edgeR - "fdrDiscreteNull" # requires edgeR - "GSAgm" # requires edgeR - "HTSCluster" # requires edgeR - "QuasiSeq" # requires edgeR - "SimSeq" # requires edgeR - "BcDiag" # requires fabia - "superbiclust" # requires fabia - "curvHDR" # requires flowCore - "RbioRXN" # requires fmcsR, and KEGGREST - "qdap" # requires gender - "orQA" # requires genefilter - "apmsWAPP" # requires genefilter, Biobase, multtest, edgeR, DESeq, and aroma.light - "ExomeDepth" # requires GenomicRanges, and Rsamtools - "rggobi" # requires GGobi - "miRtest" # requires globaltest, GlobalAncova, and limma - "PANDA" # requires GO.db - "BiSEp" # requires GOSemSim, GO.db, and org.Hs.eg.db - "PubMedWordcloud" # requires GOsummaries - "eulerian" # requires graph - "gRapHD" # requires graph - "msSurv" # requires graph - "PairViz" # requires graph - "iRefR" # requires graph, and RBGL - "pcalg" # requires graph, and RBGL - "protiq" # requires graph, and RBGL - "RnavGraph" # requires graph, and RBGL - "classGraph" # requires graph, and Rgraphviz - "epoc" # requires graph, and Rgraphviz - "gridGraphviz" # requires graph, and Rgraphviz - "QuACN" # requires graph, RBGL - "D2C" # requires gRbase - "gRain" # requires gRbase - "gRc" # requires gRbase - "gRim" # requires gRbase - "LogisticDx" # requires gRbase - "topologyGSA" # requires gRbase - "gridDebug" # requires gridGraphviz - "RAM" # requires Heatplus - "RcppRedis" # requires Hiredis - "interval" # requires Icens - "FAMT" # requires impute - "moduleColor" # requires impute - "PMA" # requires impute - "samr" # requires impute - "swamp" # requires impute - "WGCNA" # requires impute - "MetaDE" # requires impute, and Biobase - "FHtest" # requires interval - "MSIseq" # requires IRanges - "SNPtools" # requires IRanges, GenomicRanges, Biostrings, and Rsamtools - "RefFreeEWAS" # requires isva - "PhViD" # requires LBE + "Actigraphy" # SDMTools.so: undefined symbol: X + "adaptsmoFMRI" # requires spatstat + "ads" # requires spatstat + "agridat" # requires pcaMethods + "aLFQ" # requires protiq "AntWeb" # requires leafletR - "ecoengine" # requires leafletR - "spocc" # requires leafletR - "RDieHarder" # requires libdieharder - "sybilSBML" # requires libSBML - "CORM" # requires limma - "DAAGbio" # requires limma - "DCGL" # requires limma - "metaMA" # requires limma - "plmDE" # requires limma - "SQDA" # requires limma - "PerfMeas" # requires limma, graph, and RBGL - "rLindo" # requires LINDO API - "magma" # requires MAGMA - "HiPLARM" # requires MAGMA or PLASMA - "speaq" # requires MassSpecWavelet - "MAMA" # requires metaMA - "Rmosek" # requires mosek + "aoristic" # requires spatstat + "apmsWAPP" # requires genefilter, Biobase, multtest, edgeR, DESeq, and aroma.light + "aroma_affymetrix" # requires aroma_core + "aroma_cn" # requires PSCBS + "aroma_core" # requires PSCBS + "ArrayBin" # requires SAGx + "babel" # requires edgeR + "BACA" # requires RDAVIDWebService + "bamboo" # depends on broken jvmr + "BcDiag" # requires fabia + "bdvis" # requres taxize + "beadarrayFilter" # requires beadarray + "beadarrayMSV" # requires rggobi "bigGP" # requires MPI running. HELP WANTED! - "doMPI" # requires MPI running. HELP WANTED! - "metaMix" # requires MPI running. HELP WANTED! - "pmclust" # requires MPI running. HELP WANTED! - "MSeasyTkGUI" # requires MSeasyTkGUI - "hddplot" # requires multtest - "mutoss" # requires multtest - "PCS" # requires multtest - "structSSI" # requires multtest - "TcGSA" # requires multtest - "mutossGUI" # requires mutoss - "Biograph" # requires mvna - "MSeasy" # requires mzR, and xcms "bigpca" # requires NCmisc - "reader" # requires NCmisc - "ROracle" # requires OCI + "Biograph" # requires mvna + "biotools" # requires rpanel + "BiSEp" # requires GOSemSim, GO.db, and org.Hs.eg.db + "BLCOP" # depends on broken fPortfolio + "bmrm" # requires clpAPI + "branchLars" # requires Rgraphviz "BRugs" # requires OpenBUGS - "x_ent" # requires opencpu + "calmate" # requires aroma_core + "CARrampsOcl" # depends on OpenCL + "CHAT" # requires DNAcopy + "ChemoSpec" # depends on broken speaq + "classGraph" # requires graph, and Rgraphviz + "clpAPI" # requires clp + "clusterfly" # requires rggobi + "compendiumdb" # requires Biobase + "CORM" # requires limma + "cplexAPI" # requires CPLEX + "cqrReg" # requires Rmosek + "crmn" # requires pcaMethods, and Biobase + "CrypticIBDcheck" # requires rJPSGCS + "cudaBayesreg" # requres Rmath + "curvHDR" # requires flowCore + "D2C" # requires gRbase + "DAAGbio" # requires limma + "dagbag" # requires Rlapack + "DBKGrad" # requires SDD + "dbmss" # requires spatstat + "DCGL" # requires limma + "dcGOR" # requires dnet + "demi" # requires affy, affxparser, and oligo + "DepthProc" # requires samr + "Digiroo2" # requires spatstat + "dixon" # requires spatstat + "dnet" # requires supraHex, graph, Rgraphviz, and Biobase + "doMPI" # requires MPI running. HELP WANTED! + "dpcR" # requires spatstat + "DSpat" # requires spatstat + "ecespa" # requires spatstat + "ecoengine" # requires leafletR + "ecospat" # requires spatstat + "edgeRun" # requires edgeR + "EMA" # requires siggenes, affy, multtest, gcrma, biomaRt, and AnnotationDbi + "EMDomics" # requires BiocParallel + "empiricalFDR_DESeq2" # requires DESeq2, and GenomicRanges + "epoc" # requires graph, and Rgraphviz + "erpR" # requires rpanel + "ETAS" # requires spatstat + "eulerian" # requires graph + "evobiR" # requres taxiz + "evora" # requires qvalue + "ExomeDepth" # requires GenomicRanges, and Rsamtools + "FAMT" # requires impute + "fdrDiscreteNull" # requires edgeR + "FHtest" # requires interval + "flexCWM" # depends on broken mixture + "fPortfolio" # requires rneos + "FunctionalNetworks" # requires breastCancerVDX, and Biobase + "gamlss_demo" # requires rpanel + "GeneticTools" # requires snpStats + "GExMap" # requires Biobase and multtest + "gitter" # requires EBImage + "gmatrix" # depends on proprietary cudatoolkit + "GOGANPA" # requires WGCNA + "gputools" # depends on proprietary cudatoolkit + "gRain" # requires gRbase + "gRapHD" # requires graph + "gRbase" # requires RBGL, and graph + "gRc" # requires gRbase + "gridDebug" # requires gridGraphviz + "gridGraphviz" # requires graph, and Rgraphviz + "GriegSmith" # requires spatstat + "gRim" # requires gRbase + "GSAgm" # requires edgeR + "GUIDE" # requires rpanel + "h2o" # tries to download some h2o.jar during its build + "hasseDiagram" # requires Rgraphviz + "hddplot" # requires multtest + "HierO" # requires rneos + "HiPLARM" # requires MAGMA or PLASMA + "hpoPlot" # requires Rgraphviz + "HTSCluster" # requires edgeR + "iFes" # depends on proprietary cudatoolkit + "imputeLCMD" # requires pcaMethods, and impute + "intamapInteractive" # requires spatstat + "interval" # requires Icens + "ionflows" # requires Biostrings + "iRefR" # requires graph, and RBGL + "IsoGene" # requires Biobase, and affy + "isva" # requires qvalue + "jomo" # linking errors + "js" # requires broken V8 + "jvmr" # tries to download files during its build + "KANT" # requires affy, and Biobase + "ktspair" # requires Biobase + "latticeDensity" # requires spatstat + "leapp" # requires sva + "lefse" # SDMTools.so: undefined symbol: X + "lgcp" # requires rpanel + "LinRegInteractive" # requires Rpanel + "LogisticDx" # requires gRbase + "LOST" # requires pcaMethods + "ltsk" # requires Rlapack and Rblas + "magma" # requires MAGMA + "MAMA" # requires metaMA + "MEET" # requires pcaMethods, and seqLogo + "metabolomics" # depends on broken crmn + "MetaDE" # requires impute, and Biobase + "MetaLandSim" # requires Biobase + "metaMA" # requires limma + "metaMix" # requires MPI running. HELP WANTED! + "mGSZ" # requires Biobase, and limma + "MigClim" # SDMTools.So: Undefined Symbol: X + "minimist" # requires broken V8 + "miRtest" # requires globaltest, GlobalAncova, and limma + "mixture" # mixture.so: undefined symbol: dtrmm_ + "moduleColor" # requires impute + "msarc" # requires AnnotationDbi + "MSeasy" # requires mzR, and xcms + "MSeasyTkGUI" # requires MSeasyTkGUI + "MSIseq" # requires IRanges + "msSurv" # requires graph + "multiDimBio" # requires pcaMethods + "mutossGUI" # requires mutoss + "mutoss" # requires multtest + "MXM" # depends on broken gRbase + "NBPSeq" # requires qvalue + "NCmisc" # requires BiocInstaller + "netClass" # requires samr + "nettools" # requires WGCNA + "netweavers" # requires BiocGenerics, Biobase, and limma + "NLPutils" # requires qdap + "NSA" # requires aroma_core + "OpenCL" # FIXME: requires CL/opencl.h + "optBiomarker" # requires rpanel + "ora" # requires ROracle + "orQA" # requires genefilter + "PairViz" # requires graph + "PANDA" # requires GO.db + "ParDNAcopy" # requires DNAcopy + "pathClass" # requires affy, and Biobase + "PatternClass" # SDMTools.So: Undefined Symbol: X "pbdBASE" # requires pbdMPI "pbdDEMO" # requires pbdMPI "pbdDMAT" # requires pbdMPI "pbdSLAP" # requires pbdMPI - "qtlnet" # requires pcalg - "agridat" # requires pcaMethods - "LOST" # requires pcaMethods - "multiDimBio" # requires pcaMethods - "crmn" # requires pcaMethods, and Biobase - "imputeLCMD" # requires pcaMethods, and impute - "MEET" # requires pcaMethods, and seqLogo - "saps" # requires piano, and survcomp - "smart" # requires PMA - "surveillance" # requires polyCub - "aLFQ" # requires protiq - "aroma_cn" # requires PSCBS - "aroma_core" # requires PSCBS - "NLPutils" # requires qdap - "RQuantLib" # requires QuantLib - "evora" # requires qvalue - "isva" # requires qvalue - "NBPSeq" # requires qvalue - "pi0" # requires qvalue - "RSNPset" # requires qvalue - "gRbase" # requires RBGL, and graph - "RSeed" # requires RBGL, and graph - "BACA" # requires RDAVIDWebService - "beadarrayMSV" # requires rggobi - "clusterfly" # requires rggobi - "PKgraph" # requires rggobi - "SeqGrapheR" # requires rggobi - "branchLars" # requires Rgraphviz - "hasseDiagram" # requires Rgraphviz - "hpoPlot" # requires Rgraphviz - "strum" # requires Rgraphviz - "CrypticIBDcheck" # requires rJPSGCS - "dagbag" # requires Rlapack - "ltsk" # requires Rlapack and Rblas - "cqrReg" # requires Rmosek - "REBayes" # requires Rmosek - "fPortfolio" # requires rneos - "HierO" # requires rneos - "ora" # requires ROracle - "biotools" # requires rpanel - "erpR" # requires rpanel - "gamlss_demo" # requires rpanel - "GUIDE" # requires rpanel - "lgcp" # requires rpanel - "optBiomarker" # requires rpanel - "SDD" # requires rpanel - "soilphysics" # requires rpanel - "vows" # requires rpanel - "LinRegInteractive" # requires Rpanel - "RVideoPoker" # requires Rpanel - "semiArtificial" # requires RSNNS + "pcaL1" # requires clp + "pcalg" # requires graph, and RBGL "PCGSE" # requires safe - "ArrayBin" # requires SAGx - "DepthProc" # requires samr - "netClass" # requires samr - "RSAP" # requires SAPNWRFCSDK - "DBKGrad" # requires SDD - "RcmdrPlugin_seeg" # requires seeg - "EMA" # requires siggenes, affy, multtest, gcrma, biomaRt, and AnnotationDbi - "GeneticTools" # requires snpStats - "snpEnrichment" # requires snpStats - "snpStatsWriter" # requires snpStats - "wgsea" # requires snpStats - "rysgran" # requires soiltexture - "adaptsmoFMRI" # requires spatstat - "ads" # requires spatstat - "aoristic" # requires spatstat - "dbmss" # requires spatstat - "Digiroo2" # requires spatstat - "dixon" # requires spatstat - "dpcR" # requires spatstat - "DSpat" # requires spatstat - "ecespa" # requires spatstat - "ecospat" # requires spatstat - "ETAS" # requires spatstat - "GriegSmith" # requires spatstat - "intamapInteractive" # requires spatstat - "latticeDensity" # requires spatstat + "PCS" # requires multtest + "PepPrep" # requires biomaRt + "PerfMeas" # requires limma, graph, and RBGL + "permGPU" # requires Biobase + "PhViD" # requires LBE + "pi0" # requires qvalue + "PKgraph" # requires rggobi + "plmDE" # requires limma + "plsRcox" # requires survcomp + "PMA" # requires impute + "pmcgd" # depends on broken mixture + "pmclust" # requires MPI running. HELP WANTED! "polyCub" # requires spatstat + "ppiPre" # requires AnnotationDbi, GOSemSim, GO.db + "propOverlap" # requires Biobase + "protiq" # requires graph, and RBGL + "PSCBS" # requires DNAcopy + "pubmed_mineR" # requires SSOAP + "PubMedWordcloud" # requires GOsummaries + "qdap" # requires gender + "qtlnet" # requires pcalg + "qtpaint" # can't find QtCore libraries + "QuACN" # requires graph, RBGL + "QuasiSeq" # requires edgeR + "RADami" # requires Biostrings + "raincpc" # SDMTools.so: undefined symbol: X + "rainfreq" # SDMTools.so: undefined symbol: X + "RAM" # requires Heatplus + "RAPIDR" # requires Biostrings, Rsamtools, and GenomicRanges + "RbioRXN" # requires fmcsR, and KEGGREST + "Rcell" # requires EBImage + "RcmdrPlugin_seeg" # requires seeg + "Rcplex" # requires cplexAPI + "RcppRedis" # requires Hiredis + "rDEA" # no such file or directory + "RDieHarder" # requires libdieharder + "reader" # requires NCmisc + "REBayes" # requires Rmosek + "RefFreeEWAS" # requires isva + "retistruct" # depends on broken RImageJROI + "rggobi" # requires GGobi "RImageJROI" # requires spatstat + "rJPSGCS" # requires chopsticks + "rLindo" # requires LINDO API + "Rmosek" # requires mosek + "RnavGraph" # requires graph, and RBGL + "rneos" # requires XMLRPC + "RNeXML" # requres taxize + "RobLoxBioC" # requires Biobase + "RobLox" # requires Biobase + "RockFab" # requires EBImage + "ROI_plugin_symphony" # depends on broken Rsymphony + "ROracle" # requires OCI + "rpanel" # I could not make Tcl to recognize BWidget. HELP WANTED! + "RQuantLib" # requires QuantLib + "RSAP" # requires SAPNWRFCSDK + "RSeed" # requires RBGL, and graph + "rsig" # requires survcomp + "RSNPset" # requires qvalue + "rsprng" # requres sprng + "Rsymphony" # FIXME: requires SYMPHONY + "RVideoPoker" # requires Rpanel + "rysgran" # requires soiltexture + "samr" # requires impute + "saps" # requires piano, and survcomp + "SDD" # requires rpanel "seeg" # requires spatstat + "selectspm" # depends on broken ecespa + "semiArtificial" # requires RSNNS + "SeqFeatR" # requires Biostrings, qvalue, and widgetTools + "SeqGrapheR" # requires rggobi + "sequenza" # requires copynumber "SGCS" # requires spatstat "siar" # requires spatstat + "SimRAD" # requires Biostrings, and ShortRead + "SimSeq" # requires edgeR "siplab" # requires spatstat + "smart" # requires PMA + "snpEnrichment" # requires snpStats + "snplist" # requires biomaRt + "snpStatsWriter" # requires snpStats + "SNPtools" # requires IRanges, GenomicRanges, Biostrings, and Rsamtools + "SOD" # depends on proprietary cudatoolkit + "soilphysics" # requires rpanel "sparr" # requires spatstat "spatialsegregation" # requires spatstat "SpatialVx" # requires spatstat + "speaq" # requires MassSpecWavelet + "spocc" # requires leafletR + "SQDA" # requires limma + "Statomica" # requires Biobase, multtest + "StochKit2R" # tarball is invalid on server "stpp" # requires spatstat - "trip" # requires spatstat - "pubmed_mineR" # requires SSOAP - "dnet" # requires supraHex, graph, Rgraphviz, and Biobase - "plsRcox" # requires survcomp - "rsig" # requires survcomp - "leapp" # requires sva - "ttScreening" # requires sva, and limma - "GOGANPA" # requires WGCNA - "nettools" # requires WGCNA - "rneos" # requires XMLRPC + "structSSI" # requires multtest + "strum" # requires Rgraphviz + "superbiclust" # requires fabia + "surveillance" # requires polyCub + "swamp" # requires impute + "sybilSBML" # requires libSBML "taxize" # requres bold - "cudaBayesreg" # requres Rmath - "rsprng" # requres sprng - "evobiR" # requres taxiz - "bdvis" # requres taxize - "RNeXML" # requres taxize + "TcGSA" # requires multtest + "topologyGSA" # requires gRbase "TR8" # requres taxize - "Actigraphy" # SDMTools.so: undefined symbol: X - "lefse" # SDMTools.so: undefined symbol: X - "raincpc" # SDMTools.so: undefined symbol: X - "rainfreq" # SDMTools.so: undefined symbol: X - "MigClim" # SDMTools.So: Undefined Symbol: X - "PatternClass" # SDMTools.So: Undefined Symbol: X - "jvmr" # tries to download files during its build - "h2o" # tries to download some h2o.jar during its build + "trip" # requires spatstat + "ttScreening" # requires sva, and limma + "V8" # compilation error + "vows" # requires rpanel + "WGCNA" # requires impute + "wgsea" # requires snpStats + "WideLM" # depends on proprietary cudatoolkit + "x_ent" # requires opencpu + "zoib" # tarball is invalid on server ]; otherOverrides = old: new: { From 82a00d1686534adc4bb409794f6d4333daabf944 Mon Sep 17 00:00:00 2001 From: Brendan Long Date: Sun, 22 Feb 2015 11:23:01 -0600 Subject: [PATCH 197/197] syncthing: Update to 0.10.23 --- pkgs/applications/networking/syncthing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index b31a6528c24..a1ad5ddc779 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -4,12 +4,12 @@ with goPackages; buildGoPackage rec { name = "syncthing-${version}"; - version = "0.10.22"; + version = "0.10.23"; goPackagePath = "github.com/syncthing/syncthing"; src = fetchgit { url = "git://github.com/syncthing/syncthing.git"; rev = "refs/tags/v${version}"; - sha256 = "d96eff0dac5d542388d643f4b9e29ade6f7c52a570a00a48e7b5f81882d719dc"; + sha256 = "1f1a83d9e5f1b235d62ecbd86d3afb682d88c2471354ad308f00d2ef668e797e"; }; subPackages = [ "cmd/syncthing" ];